diff options
| author | Glenn Morris | 2013-11-22 17:55:16 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-11-22 17:55:16 -0800 |
| commit | 17e0445be4a6a4f437f4be4924074c90d6477481 (patch) | |
| tree | c78a4df4e1c2f9daf840c96d15dc9e00dd71c68d /src/image.c | |
| parent | 72648ef2605b654caf515ef020c2cac70cd0d741 (diff) | |
| download | emacs-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 'src/image.c')
| -rw-r--r-- | src/image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/image.c b/src/image.c index 37a19e4f5a5..167ee2da303 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -9502,7 +9502,7 @@ A cross is always drawn on black & white displays. */); | |||
| 9502 | 9502 | ||
| 9503 | DEFVAR_LISP ("x-bitmap-file-path", Vx_bitmap_file_path, | 9503 | DEFVAR_LISP ("x-bitmap-file-path", Vx_bitmap_file_path, |
| 9504 | doc: /* List of directories to search for window system bitmap files. */); | 9504 | doc: /* List of directories to search for window system bitmap files. */); |
| 9505 | Vx_bitmap_file_path = decode_env_path (0, PATH_BITMAPS); | 9505 | Vx_bitmap_file_path = decode_env_path (0, PATH_BITMAPS, 0); |
| 9506 | 9506 | ||
| 9507 | DEFVAR_LISP ("image-cache-eviction-delay", Vimage_cache_eviction_delay, | 9507 | DEFVAR_LISP ("image-cache-eviction-delay", Vimage_cache_eviction_delay, |
| 9508 | doc: /* Maximum time after which images are removed from the cache. | 9508 | doc: /* Maximum time after which images are removed from the cache. |