aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong2012-03-12 00:10:07 +0800
committerChong Yidong2012-03-12 00:10:07 +0800
commit2cc775f91d7edf763bf4ad81a777040091d1efc3 (patch)
tree34988c7e86f33e45565f3a4e87fb59ad79b091ed /lisp
parent0c93eabf3580a528e05ccc336df18ea4792d093f (diff)
downloademacs-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 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/subr.el11
2 files changed, 7 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49d67384920..b1afb033404 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-03-11 Chong Yidong <cyd@gnu.org> 12012-03-11 Chong Yidong <cyd@gnu.org>
2 2
3 * subr.el (save-window-excursion): Doc fix (Bug#9979).
4
3 * dabbrev.el (dabbrev--find-expansion): Update progress reporter 5 * dabbrev.el (dabbrev--find-expansion): Update progress reporter
4 when finished (Bug#10963). 6 when finished (Bug#10963).
5 7
diff --git a/lisp/subr.el b/lisp/subr.el
index 00a030c744c..866535ce882 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3026,13 +3026,12 @@ the buffer list."
3026 (set-buffer ,old-buffer)))))) 3026 (set-buffer ,old-buffer))))))
3027 3027
3028(defmacro save-window-excursion (&rest body) 3028(defmacro save-window-excursion (&rest body)
3029 "Execute BODY, preserving window sizes and contents. 3029 "Execute BODY, then restore previous window configuration.
3030Return the value of the last form in BODY. 3030Return the value of the last form in BODY.
3031Restore which buffer appears in which window, where display starts, 3031Restore which buffer appears in which window, where display
3032and the value of point and mark for each window. 3032starts, and the value of point and mark for each window, as well
3033Also restore the choice of selected window. 3033as the choice of selected window, and which buffer is current.
3034Also restore which buffer is current. 3034The value of point in the current buffer is not restored.
3035Does not restore the value of point in current buffer.
3036 3035
3037BEWARE: Most uses of this macro introduce bugs. 3036BEWARE: Most uses of this macro introduce bugs.
3038E.g. it should not be used to try and prevent some code from opening 3037E.g. it should not be used to try and prevent some code from opening