diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-11-25 20:06:23 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-11-25 20:06:23 -0500 |
| commit | 624780f09dd117edbe8b2b71be44622fc7002f91 (patch) | |
| tree | 268725fa70a8295b1c621646a7ad82eea11176f1 /nt | |
| parent | 3f73284a46437b46bbd79f2594c3bcefde83a2e8 (diff) | |
| download | emacs-624780f09dd117edbe8b2b71be44622fc7002f91.tar.gz | |
Preload leim-list.el
* Makefile.in (abs_builddir): New, set by configure.
(buildlisppath): Add leim/.
(epaths-force-w32): Set BLD.
* lisp/loadup.el: Load leim-list.el when found.
* lisp/startup.el (normal-top-level): Skip re-loading leim/leim-list.el.
* nt/epaths.nt (PATH_DUMPLOADSEARCH): Add leim/.
* src/callproc.c (init_callproc): Don't assume PATH_DUMPLOADSEARCH
is a single directory.
* src/epaths.in (PATH_DUMPLOADSEARCH): Add leim/.
Fixes: debbugs:4789
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/epaths.nt | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 1b766f0f349..61a84995bc6 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2013-11-26 Glenn Morris <rgm@gnu.org> + + * epaths.nt (PATH_DUMPLOADSEARCH): Add leim/. + 2013-11-12 Dani Moncayo <dmoncayo@gmail.com> * msysconfig.sh: Remove. diff --git a/nt/epaths.nt b/nt/epaths.nt index 6e297476528..553d80c2e5e 100644 --- a/nt/epaths.nt +++ b/nt/epaths.nt @@ -12,8 +12,7 @@ the host system (e.g., i686-pc-mingw32), and @SRC@ by the root of the Emacs source tree used to build Emacs. */ /* -Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software -Foundation, Inc. +Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -51,10 +50,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define PATH_SITELOADSEARCH "%emacs_dir%/share/emacs/@VER@/site-lisp;%emacs_dir%/share/emacs/site-lisp" /* Like PATH_LOADSEARCH, but used only during the build process - when Emacs is dumping. Configure (using "make epaths-force") sets - this to $buildlisppath, which normally has the value: <srcdir>/lisp. + when Emacs is dumping. Configure (using "make epaths-force-w32") sets + this to $buildlisppath, which normally has the value: + <srcdir>/lisp;<builddir>/leim. */ -#define PATH_DUMPLOADSEARCH "@SRC@/lisp" +#define PATH_DUMPLOADSEARCH "@SRC@/lisp;@BLD@/leim" /* The extra search path for programs to invoke. This is appended to whatever the PATH environment variable says to set the Lisp |