aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2013-11-22 17:55:16 -0800
committerGlenn Morris2013-11-22 17:55:16 -0800
commit17e0445be4a6a4f437f4be4924074c90d6477481 (patch)
treec78a4df4e1c2f9daf840c96d15dc9e00dd71c68d /lisp
parent72648ef2605b654caf515ef020c2cac70cd0d741 (diff)
downloademacs-17e0445be4a6a4f437f4be4924074c90d6477481.tar.gz
emacs-17e0445be4a6a4f437f4be4924074c90d6477481.zip
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 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f9b6f6ee356..97f4c007c72 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-11-23 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (emacs): Empty EMACSLOADPATH rather than unsetting.
4
12013-11-22 Leo Liu <sdl.web@gmail.com> 52013-11-22 Leo Liu <sdl.web@gmail.com>
2 6
3 * progmodes/octave.el (inferior-octave-startup): Spit out error 7 * progmodes/octave.el (inferior-octave-startup): Spit out error
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index d00330c3a9b..eb52b317e7b 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -106,7 +106,7 @@ COMPILE_FIRST = \
106 106
107# The actual Emacs command run in the targets below. 107# The actual Emacs command run in the targets below.
108# Prevent any setting of EMACSLOADPATH in user environment causing problems. 108# Prevent any setting of EMACSLOADPATH in user environment causing problems.
109emacs = unset EMACSLOADPATH; "$(EMACS)" $(EMACSOPT) 109emacs = EMACSLOADPATH= "$(EMACS)" $(EMACSOPT)
110 110
111# Common command to find subdirectories 111# Common command to find subdirectories
112setwins=for file in `find . -type d -print`; do \ 112setwins=for file in `find . -type d -print`; do \