diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-07-09 21:40:32 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-07-09 21:40:32 -0400 |
| commit | 8e0bc3e91a47c111b12915c16a2901181295d0bc (patch) | |
| tree | 15fe981744fce14d734de60c0a4cf79078148693 | |
| parent | 3fcf7a1c80f62a8044d0e5f0132bb7065d6823b3 (diff) | |
| download | emacs-8e0bc3e91a47c111b12915c16a2901181295d0bc.tar.gz | |
Fix incorrect args to display-buffer-reuse-window in 2011-07-09T12:32:38Z!rudalics@gmx.at.
* lisp/window.el (display-buffer): Fix arguments to
display-buffer-reuse-window in last change.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/window.el | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6cdc0d38810..f5a6c1eeaf4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-07-10 Chong Yidong <cyd@stupidchicken.com> + + * window.el (display-buffer): Fix arguments to + display-buffer-reuse-window in last change. + 2011-07-09 Bob Nnamtrop <bobnnamtrop@gmail.com> (tiny change) * emulation/viper-cmd.el (viper-change-state-to-vi): Limit diff --git a/lisp/window.el b/lisp/window.el index 3bc4b3e56e6..999e408bdb1 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -5737,19 +5737,19 @@ this list as arguments." (or (and (window-live-p window) window) ;; on the selected frame, (display-buffer-reuse-window - buffer '(nil nil nil) other-window) + buffer '(nil nil nil) nil other-window) ;; showing BUFFER on any visible frame, (display-buffer-reuse-window - buffer '(nil same visible) other-window) + buffer '(nil same visible) nil other-window) ;; not showing BUFFER on any visible frame, (display-buffer-reuse-window - buffer '(nil other visible) other-window) + buffer '(nil other visible) nil other-window) ;; showing BUFFER on any visible or iconified frame, (display-buffer-reuse-window - buffer '(nil same 0) other-window) + buffer '(nil same 0) nil other-window) ;; not showing BUFFER on any visible or iconified frame. (display-buffer-reuse-window - buffer '(nil other 0) other-window) + buffer '(nil other 0) nil other-window) ;; If everything failed so far, try popping up a new frame ;; regardless of graphic-only restrictions. (display-buffer-pop-up-frame buffer))))) |