[PATCH] Don't use installed non-package Lisp when running from the source tree.

Ar an séú lá is fiche de mí na Samhain, scríobh Ilpo Nyyssönen: Ilpo, if you have the time to check, does the below fix your problem? If you don’t, then that’s okay too. (This is in response to your mail to xemacs-buildreports of the 26th of November, m3r6vq7o9t.fsf(a)iny.iki.fi , subject [Failure] XEmacs 21.5-b27 "fiddleheads" (+CVS-20061125) i686-pc-linux.) lisp/ChangeLog addition: 2006-12-03 Aidan Kehoe <kehoea(a)parhasard.net&gt; * loadup.el: * loadup.el (running-from-build-directory-p): New. * startup.el (startup-setup-paths): Never use the installed files if we're running from under the build directory. Prevents conflicts with them. XEmacs Trunk source patch: Diff command: cvs -q diff -Nu Files affected: lisp/startup.el =================================================================== RCS lisp/loadup.el =================================================================== RCS Index: lisp/loadup.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/loadup.el,v retrieving revision 1.32 diff -u -u -r1.32 loadup.el --- lisp/loadup.el 2006/07/16 12:23:58 1.32 +++ lisp/loadup.el 2006/12/03 14:52:30 ＠＠ -57,6 +57,7 ＠＠ "Root of tree containing the Lisp source code for the current build. Differs from `lisp-directory' if this XEmacs has been installed. ") +;; Evaluated at dump time, of course. (defconst build-directory (expand-file-name ".." invocation-directory) "Root of tree containing object files and executables produced by build. Differs from `source-directory' if configured with --srcdir option, a practice ＠＠ -71,6 +72,12 ＠＠ (defvar Installation-string nil "Description of XEmacs installation.") + +(defun running-from-build-directory-p () + "Is this XEmacs running from under the directory it was built in? +Checks the actual file executed rather than the current directory at +startup." + (equal (expand-file-name ".." invocation-directory) build-directory)) ;(start-profiling) Index: lisp/startup.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/startup.el,v retrieving revision 1.57 diff -u -u -r1.57 startup.el --- lisp/startup.el 2006/10/30 11:17:46 1.57 +++ lisp/startup.el 2006/12/03 14:52:31 ＠＠ -1493,22 +1493,24 ＠＠ 'external-debugging-output) ) - (setq lisp-directory (paths-find-lisp-directory emacs-roots)) + (setq lisp-directory + ;; Never use the installed files if we're running from under the + ;; build directory. + (if (running-from-build-directory-p) + source-lisp + (paths-find-lisp-directory emacs-roots)) + mule-lisp-directory + (when (featurep 'mule) + (if (running-from-build-directory-p) + (paths-construct-path (list source-lisp "mule")) + (paths-find-mule-lisp-directory emacs-roots lisp-directory)))) - (if debug-paths - (princ (format "lisp-directory:\n%S\n" lisp-directory) - 'external-debugging-output)) - - (if (featurep 'mule) - (progn - (setq mule-lisp-directory - (paths-find-mule-lisp-directory emacs-roots - lisp-directory)) - (if debug-paths - (princ (format "mule-lisp-directory:\n%S\n" - mule-lisp-directory) - 'external-debugging-output))) - (setq mule-lisp-directory '())) + (when debug-paths + (princ (format "lisp-directory:\n%S\n" lisp-directory) + 'external-debugging-output) + (princ (format "mule-lisp-directory:\n%S\n" + mule-lisp-directory) + 'external-debugging-output)) (setq site-directory (and (null inhibit-site-lisp) (paths-find-site-lisp-directory emacs-roots))) -- Santa Maradona, priez pour moi! _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches