diff options
| author | Richard M. Stallman | 2001-12-16 18:36:50 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2001-12-16 18:36:50 +0000 |
| commit | 784bc7cdd9b59362d43376c72ce87bce9e519ae9 (patch) | |
| tree | c4ee6e3505ed68693d3ca94817538d6f161cd8e5 | |
| parent | 13a8e91749a9ea898617035aac1185bf81c66c3f (diff) | |
| download | emacs-784bc7cdd9b59362d43376c72ce87bce9e519ae9.tar.gz emacs-784bc7cdd9b59362d43376c72ce87bce9e519ae9.zip | |
(temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/subr.el | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8172b60ba7d..85ed8b4c7b1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2001-12-16 Richard M. Stallman <rms@gnu.org> | 1 | 2001-12-16 Richard M. Stallman <rms@gnu.org> |
| 2 | 2 | ||
| 3 | * subr.el (temp-buffer-show-hook, temp-buffer-setup-hook): Add defvars. | ||
| 4 | |||
| 3 | * startup.el (command-line-1): Display startup screen | 5 | * startup.el (command-line-1): Display startup screen |
| 4 | even if there are command line args. | 6 | even if there are command line args. |
| 5 | Add a note about how to go to editing your files. | 7 | Add a note about how to go to editing your files. |
diff --git a/lisp/subr.el b/lisp/subr.el index 6296d6a9bb5..f34db188a0f 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -1084,6 +1084,19 @@ Overlays might be moved and or split." | |||
| 1084 | (defvar suspend-resume-hook nil | 1084 | (defvar suspend-resume-hook nil |
| 1085 | "Normal hook run by `suspend-emacs', after Emacs is continued.") | 1085 | "Normal hook run by `suspend-emacs', after Emacs is continued.") |
| 1086 | 1086 | ||
| 1087 | (defvar temp-buffer-show-hook nil | ||
| 1088 | "Normal hook run by `with-output-to-temp-buffer' after displaying the buffer. | ||
| 1089 | When the hook runs, the temporary buffer is current, and the window it | ||
| 1090 | was displayed in is selected. This hook is normally set up with a | ||
| 1091 | function to make the buffer read only, and find function names and | ||
| 1092 | variable names in it, provided the major mode is still Help mode.") | ||
| 1093 | |||
| 1094 | (defvar temp-buffer-setup-hook nil | ||
| 1095 | "Normal hook run by `with-output-to-temp-buffer' at the start. | ||
| 1096 | When the hook runs, the temporary buffer is current. | ||
| 1097 | This hook is normally set up with a function to put the buffer in Help | ||
| 1098 | mode.") | ||
| 1099 | |||
| 1087 | ;; Avoid compiler warnings about this variable, | 1100 | ;; Avoid compiler warnings about this variable, |
| 1088 | ;; which has a special meaning on certain system types. | 1101 | ;; which has a special meaning on certain system types. |
| 1089 | (defvar buffer-file-type nil | 1102 | (defvar buffer-file-type nil |