[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105065: Fix incorrect args to displa
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105065: Fix incorrect args to display-buffer-reuse-window in revno 105058. |
Date: |
Sat, 09 Jul 2011 21:40:32 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105065
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-07-09 21:40:32 -0400
message:
Fix incorrect args to display-buffer-reuse-window in revno 105058.
* lisp/window.el (display-buffer): Fix arguments to
display-buffer-reuse-window in last change.
modified:
lisp/ChangeLog
lisp/window.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-07-09 19:32:42 +0000
+++ b/lisp/ChangeLog 2011-07-10 01:40:32 +0000
@@ -1,3 +1,8 @@
+2011-07-10 Chong Yidong <address@hidden>
+
+ * window.el (display-buffer): Fix arguments to
+ display-buffer-reuse-window in last change.
+
2011-07-09 Bob Nnamtrop <address@hidden> (tiny change)
* emulation/viper-cmd.el (viper-change-state-to-vi): Limit
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2011-07-09 12:32:38 +0000
+++ b/lisp/window.el 2011-07-10 01:40:32 +0000
@@ -5737,19 +5737,19 @@
(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)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105065: Fix incorrect args to display-buffer-reuse-window in revno 105058.,
Chong Yidong <=