diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/window.el | 2 |
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 @@ | |||
| 1 | 2014-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 | |||
| 1 | 2014-10-10 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-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. |
| 113 | Return the window showing BUFFER. Pass ACTION as action argument | 113 | Return the window showing BUFFER. Pass ACTION as action argument |
| 114 | to `display-buffer'." | 114 | to `display-buffer'." |