diff options
author | Glenn Morris <rgm@gnu.org> | 2013-11-22 17:55:16 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2013-11-22 17:55:16 -0800 |
commit | 17e0445be4a6a4f437f4be4924074c90d6477481 (patch) | |
tree | c78a4df4e1c2f9daf840c96d15dc9e00dd71c68d /leim | |
parent | 72648ef2605b654caf515ef020c2cac70cd0d741 (diff) |
Empty elements in EMACSLOADPATH now stand for the default
* src/lread.c (load_path_check): Take path to check as argument.
(load_path_default): New, split from init_lread.
(init_lread): Move calc of default load-path to load_path_default.
Empty elements in EMACSLOADPATH now stand for the default.
(load-path): Doc fix.
* src/emacs.c (decode_env_path): Add option to treat empty elements
as nil rather than ".".
* src/callproc.c (init_callproc_1, init_callproc):
* src/image.c (Vx_bitmap_file_path):
* src/lisp.h (decode_env_path):
* lread.c (Vsource_directory):
Update for new argument spec of decode_env_path.
* leim/Makefile.in (RUN_EMACS): Empty EMACSLOADPATH rather than unsetting.
* lisp/Makefile.in (emacs): Empty EMACSLOADPATH rather than unsetting.
* test/automated/Makefile.in (emacs):
Empty EMACSLOADPATH rather than unsetting.
* doc/emacs/cmdargs.texi (General Variables):
Empty elements in EMACSLOADPATH now mean the default load-path.
* doc/lispref/loading.texi (Library Search):
Empty elements in EMACSLOADPATH now mean the default load-path.
* etc/NEWS: Mention this.
Fixes: debbugs:12100
Diffstat (limited to 'leim')
-rw-r--r-- | leim/ChangeLog | 4 | ||||
-rw-r--r-- | leim/Makefile.in | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index 6b16d71c21..ec5d995815 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2013-11-23 Glenn Morris <rgm@gnu.org> + + * Makefile.in (RUN_EMACS): Empty EMACSLOADPATH rather than unsetting. + 2013-11-04 Eli Zaretskii <eliz@gnu.org> * Makefile.in (RUN_EMACS): Don't set LC_ALL=C. (Bug#15260) diff --git a/leim/Makefile.in b/leim/Makefile.in index a5c05d567e..5a6f2ff479 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -32,8 +32,7 @@ EMACS = ../src/emacs # How to run Emacs. # Prevent any setting of EMACSLOADPATH in user environment causing problems. -RUN_EMACS = unset EMACSLOADPATH; "${EMACS}" -batch \ - --no-site-file --no-site-lisp +RUN_EMACS = EMACSLOADPATH= "${EMACS}" -batch --no-site-file --no-site-lisp MKDIR_P = @MKDIR_P@ |