diff options
| author | Glenn Morris | 2014-08-10 18:13:38 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-08-10 18:13:38 -0700 |
| commit | 727f37e6cc0f0147c2b316422cfd6f80edf0e7fd (patch) | |
| tree | d3ed2aee11790ad41f1b594dd13f5c57e4ee30d2 | |
| parent | f314e84fce8b394da20aa1d69121c74fb34f9a1e (diff) | |
| download | emacs-727f37e6cc0f0147c2b316422cfd6f80edf0e7fd.tar.gz emacs-727f37e6cc0f0147c2b316422cfd6f80edf0e7fd.zip | |
* lisp/subr.el (with-output-to-temp-buffer): Doc fix; from elisp manual.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/subr.el | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ba8dac2c4e9..a878b936e66 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-08-11 Glenn Morris <rgm@gnu.org> | 1 | 2014-08-11 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * subr.el (with-output-to-temp-buffer): Doc fix; from elisp manual. | ||
| 4 | |||
| 3 | * files.el (basic-save-buffer-2): Revert 2013-01-31 change, which | 5 | * files.el (basic-save-buffer-2): Revert 2013-01-31 change, which |
| 4 | chose coding system for writing before backing up, since it causes | 6 | chose coding system for writing before backing up, since it causes |
| 5 | a more serious problem than the one it solves. (Closes Bug#18141, | 7 | a more serious problem than the one it solves. (Closes Bug#18141, |
diff --git a/lisp/subr.el b/lisp/subr.el index ac0e130b4e0..116032fd0ba 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -3099,6 +3099,11 @@ buffer temporarily current, and the window that was used to display it | |||
| 3099 | temporarily selected. But it doesn't run `temp-buffer-show-hook' | 3099 | temporarily selected. But it doesn't run `temp-buffer-show-hook' |
| 3100 | if it uses `temp-buffer-show-function'. | 3100 | if it uses `temp-buffer-show-function'. |
| 3101 | 3101 | ||
| 3102 | By default, the setup hook puts the buffer into Help mode before running BODY. | ||
| 3103 | If BODY does not change the major mode, the show hook makes the buffer | ||
| 3104 | read-only, and scans it for function and variable names to make them into | ||
| 3105 | clickable cross-references. | ||
| 3106 | |||
| 3102 | See the related form `with-temp-buffer-window'." | 3107 | See the related form `with-temp-buffer-window'." |
| 3103 | (declare (debug t)) | 3108 | (declare (debug t)) |
| 3104 | (let ((old-dir (make-symbol "old-dir")) | 3109 | (let ((old-dir (make-symbol "old-dir")) |