aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2014-10-10 20:39:49 +0800
committerLeo Liu2014-10-10 20:39:49 +0800
commitf5f949f7b4aa5b69e16ea966c4c24ed2d0c439e7 (patch)
treef8db1baf0d9894333ba76ab252ec46a1ec239b9e
parent28c3bdd8d6cd66cf00c00feae8a34d4893ebd103 (diff)
downloademacs-f5f949f7b4aa5b69e16ea966c4c24ed2d0c439e7.tar.gz
emacs-f5f949f7b4aa5b69e16ea966c4c24ed2d0c439e7.zip
* lisp/window.el (temp-buffer-window-show): Make BUFFER a required arg.
Fixes: debbugs:18656
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4048f759ae6..3a30a87b595 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-10-10 Leo Liu <sdl.web@gmail.com>
2
3 * window.el (temp-buffer-window-show): Make BUFFER a required arg.
4 (Bug#18656)
5
12014-10-10 Stefan Monnier <monnier@iro.umontreal.ca> 62014-10-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * select.el (gui-selection-exists-p-alist): New method. 8 * select.el (gui-selection-exists-p-alist): New method.
diff --git a/lisp/window.el b/lisp/window.el
index 472901b62b9..91a0e159a84 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -108,7 +108,7 @@ Return the buffer."
108 ;; Return the buffer. 108 ;; Return the buffer.
109 buffer))) 109 buffer)))
110 110
111(defun temp-buffer-window-show (&optional buffer action) 111(defun temp-buffer-window-show (buffer &optional action)
112 "Show temporary buffer BUFFER in a window. 112 "Show temporary buffer BUFFER in a window.
113Return the window showing BUFFER. Pass ACTION as action argument 113Return the window showing BUFFER. Pass ACTION as action argument
114to `display-buffer'." 114to `display-buffer'."