diff options
| author | Radon Rosborough | 2018-02-17 13:36:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2018-02-17 13:36:16 +0200 |
| commit | 24acb31c04b4048b85311d794e600ecd7ce60d3b (patch) | |
| tree | 0a5a8c098c07b0f69f5ac96be546dc8c43013880 /src | |
| parent | 8224430bd9d71dfcf2524b758d8ac14a1d93b0d5 (diff) | |
| download | emacs-24acb31c04b4048b85311d794e600ecd7ce60d3b.tar.gz emacs-24acb31c04b4048b85311d794e600ecd7ce60d3b.zip | |
Add early init file, stop package-initialize insertion
Discussion on emacs-devel leading up to this change (approximately 150
messages):
- https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00154.html
- https://lists.gnu.org/archive/html/emacs-devel/2017-08/msg00433.html
- https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00023.html
- https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00599.html
- https://lists.gnu.org/archive/html/emacs-devel/2017-10/msg00332.html
* lisp/startup.el (early-init-file): New variable.
(load-user-init-file): New function.
(command-line): Load the early init file using `load-user-init-file'.
Move the check for an invalid username to just before that, and move
the initialization of the package system to just after. Load the
regular init file using `load-user-init-file'.
* lisp/emacs-lisp/package.el (package--ensure-init-file): Remove
definition, usage, and documentation.
(package--init-file-ensured): Remove definition and usage.
* src/lread.c (Vuser_init_file): Note change in semantics due to its
usage while loading the early init file.
* doc/emacs/custom.texi: Document early init file.
* doc/emacs/package.texi: Document changes to when package-initialize
is called. Change terminology for package 'loading'.
* doc/lispref/os.texi: Document early init file. Update startup
summary.
* doc/lispref/package.texi: Document changes to when
package-initialize is called, and advise against calling it in the
init file. Change terminology for package 'loading'.
* doc/misc/org.texi: Don't recommend to call package-initialize in the
init file.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lread.c b/src/lread.c index 7cacd47d510..d009bd0cd2a 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -4922,7 +4922,7 @@ directory. These file names are converted to absolute at startup. */); | |||
| 4922 | If the file loaded had extension `.elc', and the corresponding source file | 4922 | If the file loaded had extension `.elc', and the corresponding source file |
| 4923 | exists, this variable contains the name of source file, suitable for use | 4923 | exists, this variable contains the name of source file, suitable for use |
| 4924 | by functions like `custom-save-all' which edit the init file. | 4924 | by functions like `custom-save-all' which edit the init file. |
| 4925 | While Emacs loads and evaluates the init file, value is the real name | 4925 | While Emacs loads and evaluates any init file, value is the real name |
| 4926 | of the file, regardless of whether or not it has the `.elc' extension. */); | 4926 | of the file, regardless of whether or not it has the `.elc' extension. */); |
| 4927 | Vuser_init_file = Qnil; | 4927 | Vuser_init_file = Qnil; |
| 4928 | 4928 | ||