diff options
| author | Juanma Barranquero | 2007-06-08 19:58:33 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-06-08 19:58:33 +0000 |
| commit | 7e9fa161dccd2990ea344c4b4b7188383de76a55 (patch) | |
| tree | 5345c01554d0976e500eb6fcf52269e9f4926c46 | |
| parent | a74d1c97ee9c08955735db3652ba485352c48379 (diff) | |
| download | emacs-7e9fa161dccd2990ea344c4b4b7188383de76a55.tar.gz emacs-7e9fa161dccd2990ea344c4b4b7188383de76a55.zip | |
(empty_unibyte_string): Rename from empty_string.
(empty_multibyte_string): New canonical empty string.
(syms_of_emacs): Don't initialize empty_string.
| -rw-r--r-- | src/emacs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/emacs.c b/src/emacs.c index e235856847f..51a7770bacd 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -133,8 +133,8 @@ Lisp_Object Vinstallation_directory; | |||
| 133 | /* Hook run by `kill-emacs' before it does really anything. */ | 133 | /* Hook run by `kill-emacs' before it does really anything. */ |
| 134 | Lisp_Object Vkill_emacs_hook; | 134 | Lisp_Object Vkill_emacs_hook; |
| 135 | 135 | ||
| 136 | /* An empty lisp string. To avoid having to build any other. */ | 136 | /* Empty lisp strings. To avoid having to build any others. */ |
| 137 | Lisp_Object empty_string; | 137 | Lisp_Object empty_unibyte_string, empty_multibyte_string; |
| 138 | 138 | ||
| 139 | /* Search path separator. */ | 139 | /* Search path separator. */ |
| 140 | Lisp_Object Vpath_separator; | 140 | Lisp_Object Vpath_separator; |
| @@ -2474,9 +2474,6 @@ see `kill-emacs-query-functions' instead. | |||
| 2474 | The hook is not run in batch mode, i.e., if `noninteractive' is non-nil. */); | 2474 | The hook is not run in batch mode, i.e., if `noninteractive' is non-nil. */); |
| 2475 | Vkill_emacs_hook = Qnil; | 2475 | Vkill_emacs_hook = Qnil; |
| 2476 | 2476 | ||
| 2477 | empty_string = build_string (""); | ||
| 2478 | staticpro (&empty_string); | ||
| 2479 | |||
| 2480 | DEFVAR_INT ("emacs-priority", &emacs_priority, | 2477 | DEFVAR_INT ("emacs-priority", &emacs_priority, |
| 2481 | doc: /* Priority for Emacs to run at. | 2478 | doc: /* Priority for Emacs to run at. |
| 2482 | This value is effective only if set before Emacs is dumped, | 2479 | This value is effective only if set before Emacs is dumped, |