diff options
| author | Chong Yidong | 2012-03-12 00:10:07 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-03-12 00:10:07 +0800 |
| commit | 2cc775f91d7edf763bf4ad81a777040091d1efc3 (patch) | |
| tree | 34988c7e86f33e45565f3a4e87fb59ad79b091ed /doc | |
| parent | 0c93eabf3580a528e05ccc336df18ea4792d093f (diff) | |
| download | emacs-2cc775f91d7edf763bf4ad81a777040091d1efc3.tar.gz emacs-2cc775f91d7edf763bf4ad81a777040091d1efc3.zip | |
Doc fixes for save-window-excursion.
* lisp/subr.el (save-window-excursion): Doc fix.
* doc/lispref/windows.texi (Window Configurations): save-window-excursion is
now a macro.
* doc/lispref/display.texi (Temporary Displays): with-output-to-temp-buffer is
now a macro.
Fixes: debbugs:9979
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/ChangeLog | 8 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 4 | ||||
| -rw-r--r-- | doc/lispref/windows.texi | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 201128b9757..4b4521c4323 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2012-03-11 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * windows.texi (Window Configurations): save-window-excursion is | ||
| 4 | now a macro. | ||
| 5 | |||
| 6 | * display.texi (Temporary Displays): with-output-to-temp-buffer is | ||
| 7 | now a macro. | ||
| 8 | |||
| 1 | 2012-03-10 Eli Zaretskii <eliz@gnu.org> | 9 | 2012-03-10 Eli Zaretskii <eliz@gnu.org> |
| 2 | 10 | ||
| 3 | * strings.texi (String Basics): | 11 | * strings.texi (String Basics): |
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 281ddda9cec..c70418be52b 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -1031,7 +1031,7 @@ You can use a display table to substitute other text for the ellipsis | |||
| 1031 | buffer and then present it to the user for perusal rather than for | 1031 | buffer and then present it to the user for perusal rather than for |
| 1032 | editing. Many help commands use this feature. | 1032 | editing. Many help commands use this feature. |
| 1033 | 1033 | ||
| 1034 | @defspec with-output-to-temp-buffer buffer-name forms@dots{} | 1034 | @defmac with-output-to-temp-buffer buffer-name forms@dots{} |
| 1035 | This function executes @var{forms} while arranging to insert any output | 1035 | This function executes @var{forms} while arranging to insert any output |
| 1036 | they print into the buffer named @var{buffer-name}, which is first | 1036 | they print into the buffer named @var{buffer-name}, which is first |
| 1037 | created if necessary, and put into Help mode. Finally, the buffer is | 1037 | created if necessary, and put into Help mode. Finally, the buffer is |
| @@ -1083,7 +1083,7 @@ The value of the last form in @var{forms} is returned. | |||
| 1083 | ---------- Buffer: foo ---------- | 1083 | ---------- Buffer: foo ---------- |
| 1084 | @end group | 1084 | @end group |
| 1085 | @end example | 1085 | @end example |
| 1086 | @end defspec | 1086 | @end defmac |
| 1087 | 1087 | ||
| 1088 | @defopt temp-buffer-show-function | 1088 | @defopt temp-buffer-show-function |
| 1089 | If this variable is non-@code{nil}, @code{with-output-to-temp-buffer} | 1089 | If this variable is non-@code{nil}, @code{with-output-to-temp-buffer} |
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 07be7fa9079..b541b2419c8 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi | |||
| @@ -3142,7 +3142,7 @@ as @code{save-window-excursion}: | |||
| 3142 | @end example | 3142 | @end example |
| 3143 | @end defun | 3143 | @end defun |
| 3144 | 3144 | ||
| 3145 | @defspec save-window-excursion forms@dots{} | 3145 | @defmac save-window-excursion forms@dots{} |
| 3146 | This special form records the window configuration, executes @var{forms} | 3146 | This special form records the window configuration, executes @var{forms} |
| 3147 | in sequence, then restores the earlier window configuration. The window | 3147 | in sequence, then restores the earlier window configuration. The window |
| 3148 | configuration includes, for each window, the value of point and the | 3148 | configuration includes, for each window, the value of point and the |
| @@ -3179,7 +3179,7 @@ For example: | |||
| 3179 | ;; @r{The screen is now split again.} | 3179 | ;; @r{The screen is now split again.} |
| 3180 | @end group | 3180 | @end group |
| 3181 | @end example | 3181 | @end example |
| 3182 | @end defspec | 3182 | @end defmac |
| 3183 | 3183 | ||
| 3184 | @defun window-configuration-p object | 3184 | @defun window-configuration-p object |
| 3185 | This function returns @code{t} if @var{object} is a window configuration. | 3185 | This function returns @code{t} if @var{object} is a window configuration. |