aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-06-19 15:05:15 -0400
committerChong Yidong2011-06-19 15:05:15 -0400
commit208530377bed60fd0696b3ba031d5aee2c54fe91 (patch)
tree315fff6aab3d752a7a75d4132a3914d4e204f5a4
parent6a8230feb314a144bfcf2356e73405143cc59227 (diff)
downloademacs-208530377bed60fd0696b3ba031d5aee2c54fe91.tar.gz
emacs-208530377bed60fd0696b3ba031d5aee2c54fe91.zip
* frame.el (special-display-popup-frame): Doc fix (Bug#8853).
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/frame.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca5a2f9f056..f6d665e0f0e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12011-06-19 Chong Yidong <cyd@stupidchicken.com> 12011-06-19 Chong Yidong <cyd@stupidchicken.com>
2 2
3 * frame.el (special-display-popup-frame): Doc fix (Bug#8853).
4
3 * info.el (Info-apropos-toc-nodes): Minor doc fix (Bug#8833). 5 * info.el (Info-apropos-toc-nodes): Minor doc fix (Bug#8833).
4 6
52011-06-18 Chong Yidong <cyd@stupidchicken.com> 72011-06-18 Chong Yidong <cyd@stupidchicken.com>
diff --git a/lisp/frame.el b/lisp/frame.el
index f2d82431f89..3b8abb1ad6c 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -160,7 +160,7 @@ BUFFER in a window of the selected frame.
160 160
161If ARGS is a list whose car is a symbol, use (car ARGS) as a 161If ARGS is a list whose car is a symbol, use (car ARGS) as a
162function to do the work. Pass it BUFFER as first argument, 162function to do the work. Pass it BUFFER as first argument,
163and (cdr ARGS) as second." 163and (cdr ARGS) as the rest of the arguments."
164 (if (and args (symbolp (car args))) 164 (if (and args (symbolp (car args)))
165 (apply (car args) buffer (cdr args)) 165 (apply (car args) buffer (cdr args))
166 (let ((window (get-buffer-window buffer 0))) 166 (let ((window (get-buffer-window buffer 0)))