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/lisp.h | |
| 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/lisp.h')
| -rw-r--r-- | src/lisp.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lisp.h b/src/lisp.h index a9aac2cc0bb..376235a402d 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* Fundamental definitions for GNU Emacs Lisp interpreter. | 1 | /* Fundamental definitions for GNU Emacs Lisp interpreter. |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1987, 1993-1995, 1997-2013 Free Software Foundation, | 3 | Copyright (C) 1985-1987, 1993-1995, 1997-2013 Free Software Foundation, Inc. |
| 4 | Inc. | ||
| 5 | 4 | ||
| 6 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 7 | 6 | ||
| @@ -4058,7 +4057,7 @@ extern int initial_argc; | |||
| 4058 | #if defined (HAVE_X_WINDOWS) || defined (HAVE_NS) | 4057 | #if defined (HAVE_X_WINDOWS) || defined (HAVE_NS) |
| 4059 | extern bool display_arg; | 4058 | extern bool display_arg; |
| 4060 | #endif | 4059 | #endif |
| 4061 | extern Lisp_Object decode_env_path (const char *, const char *); | 4060 | extern Lisp_Object decode_env_path (const char *, const char *, bool); |
| 4062 | extern Lisp_Object empty_unibyte_string, empty_multibyte_string; | 4061 | extern Lisp_Object empty_unibyte_string, empty_multibyte_string; |
| 4063 | extern Lisp_Object Qfile_name_handler_alist; | 4062 | extern Lisp_Object Qfile_name_handler_alist; |
| 4064 | extern _Noreturn void terminate_due_to_signal (int, int); | 4063 | extern _Noreturn void terminate_due_to_signal (int, int); |