summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-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 @@
+2014-10-10 Leo Liu <sdl.web@gmail.com>
+
+ * window.el (temp-buffer-window-show): Make BUFFER a required arg.
+ (Bug#18656)
+
2014-10-10 Stefan Monnier <monnier@iro.umontreal.ca>
* 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."
;; Return the buffer.
buffer)))
-(defun temp-buffer-window-show (&optional buffer action)
+(defun temp-buffer-window-show (buffer &optional action)
"Show temporary buffer BUFFER in a window.
Return the window showing BUFFER. Pass ACTION as action argument
to `display-buffer'."