aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-09-16 12:43:46 +0800
committerChong Yidong2012-09-16 12:43:46 +0800
commitfdc2806d0b023bc6a3c6c8abf8cfc72b8214a68b (patch)
treefb0b71485a75368e5a6d0f86ac0ee77c57daf4a1
parentf1be615c41027bfc11425c9e62598bc25fa323e1 (diff)
downloademacs-fdc2806d0b023bc6a3c6c8abf8cfc72b8214a68b.tar.gz
emacs-fdc2806d0b023bc6a3c6c8abf8cfc72b8214a68b.zip
* window.el (special-display-popup-frame): Doc fix.
Fixes: debbugs:8853
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/window.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d2ff692309..936a451ccb4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-09-16 Chong Yidong <cyd@gnu.org> 12012-09-16 Chong Yidong <cyd@gnu.org>
2 2
3 * window.el (special-display-popup-frame): Doc fix (Bug#8853).
4
3 * progmodes/compile.el (compilation-parse-errors): Accept list 5 * progmodes/compile.el (compilation-parse-errors): Accept list
4 values similar to font-lock-keywords (Bug#12136). Suggested by 6 values similar to font-lock-keywords (Bug#12136). Suggested by
5 Oleksandr Manzyuk. 7 Oleksandr Manzyuk.
diff --git a/lisp/window.el b/lisp/window.el
index dd1f55450c3..d9f3ccbd5c2 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4768,8 +4768,8 @@ the selected window. If they contain (same-frame . t), display
4768BUFFER in a window of the selected frame. 4768BUFFER in a window of the selected frame.
4769 4769
4770If ARGS is a list whose car is a symbol, use (car ARGS) as a 4770If ARGS is a list whose car is a symbol, use (car ARGS) as a
4771function to do the work. Pass it BUFFER as first argument, 4771function to do the work. Pass it BUFFER as first argument, and
4772and (cdr ARGS) as second." 4772pass the elements of (cdr ARGS) as the remaining arguments."
4773 (if (and args (symbolp (car args))) 4773 (if (and args (symbolp (car args)))
4774 (apply (car args) buffer (cdr args)) 4774 (apply (car args) buffer (cdr args))
4775 (let ((window (get-buffer-window buffer 0))) 4775 (let ((window (get-buffer-window buffer 0)))