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 /src | |
| 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 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/callproc.c | 8 | ||||
| -rw-r--r-- | src/epaths.in | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bf4392d519d..9a32c174d8f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2013-11-26 Glenn Morris <rgm@gnu.org> + + Preload leim-list.el. + * epaths.in (PATH_DUMPLOADSEARCH): Add leim/. + * callproc.c (init_callproc): Don't assume PATH_DUMPLOADSEARCH + is a single directory. + 2013-11-25 Paul Eggert <eggert@cs.ucla.edu> bool-vector-subsetp is now the normal direction (Bug#15912). diff --git a/src/callproc.c b/src/callproc.c index dfe315ab8db..b44f680b352 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1607,16 +1607,16 @@ init_callproc (void) if (data_dir == 0) { Lisp_Object tem, tem1, srcdir; + Lisp_Object lispdir = Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH, 0)); + + srcdir = Fexpand_file_name (build_string ("../src/"), lispdir); - srcdir = Fexpand_file_name (build_string ("../src/"), - build_unibyte_string (PATH_DUMPLOADSEARCH)); tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory); tem1 = Ffile_exists_p (tem); if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1)) { Lisp_Object newdir; - newdir = Fexpand_file_name (build_string ("../etc/"), - build_unibyte_string (PATH_DUMPLOADSEARCH)); + newdir = Fexpand_file_name (build_string ("../etc/"), lispdir); tem = Fexpand_file_name (build_string ("GNU"), newdir); tem1 = Ffile_exists_p (tem); if (!NILP (tem1)) diff --git a/src/epaths.in b/src/epaths.in index 1f5701e5337..02e755935c4 100644 --- a/src/epaths.in +++ b/src/epaths.in @@ -1,7 +1,6 @@ /* Hey Emacs, this is -*- C -*- code! */ /* -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. @@ -42,9 +41,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* 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. + this to $buildlisppath, which normally has the value: + <srcdir>/lisp:<builddir>/leim. */ -#define PATH_DUMPLOADSEARCH "../lisp" +#define PATH_DUMPLOADSEARCH "../lisp:../leim" /* The extra search path for programs to invoke. This is appended to whatever the PATH environment variable says to set the Lisp |