diff options
| author | Juanma Barranquero | 2007-02-01 22:06:46 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-02-01 22:06:46 +0000 |
| commit | 099de3907837d1eee8aae991ffeaefea706389bc (patch) | |
| tree | 20cd2a55e440b0ec69fd674d06d57052f25bcd64 /src | |
| parent | f2c661c44c803c7958d6a1f9be579b634608b386 (diff) | |
| download | emacs-099de3907837d1eee8aae991ffeaefea706389bc.tar.gz emacs-099de3907837d1eee8aae991ffeaefea706389bc.zip | |
(syms_of_lread) <user-init-file>: Doc fix.
Wording by Eli Zaretskii.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lread.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 152b374e17d..515f5a334cb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-02-01 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * lread.c (syms_of_lread) <user-init-file>: Doc fix. | ||
| 4 | Wording by Eli Zaretskii. | ||
| 5 | |||
| 1 | 2007-01-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 6 | 2007-01-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * gtkutil.c (update_frame_tool_bar): Initialize h/vmargin to 0. | 8 | * gtkutil.c (update_frame_tool_bar): Initialize h/vmargin to 0. |
diff --git a/src/lread.c b/src/lread.c index b77a621f518..86b48a56396 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -4104,7 +4104,9 @@ directory. These file names are converted to absolute at startup. */); | |||
| 4104 | doc: /* File name, including directory, of user's initialization file. | 4104 | doc: /* File name, including directory, of user's initialization file. |
| 4105 | If the file loaded had extension `.elc', and the corresponding source file | 4105 | If the file loaded had extension `.elc', and the corresponding source file |
| 4106 | exists, this variable contains the name of source file, suitable for use | 4106 | exists, this variable contains the name of source file, suitable for use |
| 4107 | by functions like `custom-save-all' which edit the init file. */); | 4107 | by functions like `custom-save-all' which edit the init file. |
| 4108 | While Emacs loads and evaluates the init file, value is the real name | ||
| 4109 | of the file, regardless of whether or not it has the `.elc' extension. */); | ||
| 4108 | Vuser_init_file = Qnil; | 4110 | Vuser_init_file = Qnil; |
| 4109 | 4111 | ||
| 4110 | DEFVAR_LISP ("current-load-list", &Vcurrent_load_list, | 4112 | DEFVAR_LISP ("current-load-list", &Vcurrent_load_list, |