diff options
| author | Chong Yidong | 2008-10-06 16:16:56 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-10-06 16:16:56 +0000 |
| commit | 90503d9633729365554f465f8e6f59c9f68bd95d (patch) | |
| tree | c0f9df1e89e3f608a4eac8e09896efd7a41f25c1 /src | |
| parent | 8cc11c8cba1da91cef1d947e20cbbf43a85e7cf2 (diff) | |
| download | emacs-90503d9633729365554f465f8e6f59c9f68bd95d.tar.gz emacs-90503d9633729365554f465f8e6f59c9f68bd95d.zip | |
(Vbefore_init_time, Vafter_init_time): Moved from startup.el.
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c index 2fb975c0fc1..56ddb733432 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -131,6 +131,9 @@ Lisp_Object Vinvocation_directory; | |||
| 131 | nil means get them only from PATH_LOADSEARCH. */ | 131 | nil means get them only from PATH_LOADSEARCH. */ |
| 132 | Lisp_Object Vinstallation_directory; | 132 | Lisp_Object Vinstallation_directory; |
| 133 | 133 | ||
| 134 | /* The values of `current-time' before and after Emacs initialization. */ | ||
| 135 | Lisp_Object Vbefore_init_time, Vafter_init_time; | ||
| 136 | |||
| 134 | /* Hook run by `kill-emacs' before it does really anything. */ | 137 | /* Hook run by `kill-emacs' before it does really anything. */ |
| 135 | Lisp_Object Vkill_emacs_hook; | 138 | Lisp_Object Vkill_emacs_hook; |
| 136 | 139 | ||
| @@ -2497,6 +2500,15 @@ was found. */); | |||
| 2497 | DEFVAR_LISP ("previous-system-time-locale", &Vprevious_system_time_locale, | 2500 | DEFVAR_LISP ("previous-system-time-locale", &Vprevious_system_time_locale, |
| 2498 | doc: /* Most recently used system locale for time. */); | 2501 | doc: /* Most recently used system locale for time. */); |
| 2499 | Vprevious_system_time_locale = Qnil; | 2502 | Vprevious_system_time_locale = Qnil; |
| 2503 | |||
| 2504 | DEFVAR_LISP ("before-init-time", &Vbefore_init_time, | ||
| 2505 | doc: /* Value of `current-time' before Emacs begins initialization. */); | ||
| 2506 | Vbefore_init_time = Qnil; | ||
| 2507 | |||
| 2508 | DEFVAR_LISP ("after-init-time", &Vafter_init_time, | ||
| 2509 | doc: /* Value of `current-time' after loading the init files. | ||
| 2510 | This is nil during initialization. */); | ||
| 2511 | Vafter_init_time = Qnil; | ||
| 2500 | } | 2512 | } |
| 2501 | 2513 | ||
| 2502 | /* arch-tag: 7bfd356a-c720-4612-8ab6-aa4222931c2e | 2514 | /* arch-tag: 7bfd356a-c720-4612-8ab6-aa4222931c2e |