[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109831: Consider frame's buffer pred
From: |
martin rudalics |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109831: Consider frame's buffer predicate in switch-to-prev-/next-buffer. |
Date: |
Fri, 31 Aug 2012 18:51:49 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109831
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2012-08-31 18:51:49 +0200
message:
Consider frame's buffer predicate in switch-to-prev-/next-buffer.
* window.el (switch-to-prev-buffer, switch-to-next-buffer):
Consider frame's buffer predicate when choosing the buffer.
(Bug#12081)
modified:
lisp/ChangeLog
lisp/window.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-08-30 17:09:11 +0000
+++ b/lisp/ChangeLog 2012-08-31 16:51:49 +0000
@@ -1,3 +1,9 @@
+2012-08-31 Alp Aker <address@hidden>
+
+ * window.el (switch-to-prev-buffer, switch-to-next-buffer):
+ Consider frame's buffer predicate when choosing the buffer.
+ (Bug#12081)
+
2012-08-30 Richard Stallman <address@hidden>
* simple.el (special-mode-map): Delete binding for `z'.
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2012-08-30 03:45:51 +0000
+++ b/lisp/window.el 2012-08-31 16:51:49 +0000
@@ -2979,6 +2979,7 @@
(old-buffer (window-buffer window))
;; Save this since it's destroyed by `set-window-buffer'.
(next-buffers (window-next-buffers window))
+ (pred (frame-parameter frame 'buffer-predicate))
entry buffer new-buffer killed-buffers visible)
(when (window-dedicated-p window)
(error "Window %s is dedicated to buffer %s" window old-buffer))
@@ -2991,6 +2992,7 @@
(or (buffer-live-p buffer)
(not (setq killed-buffers
(cons buffer killed-buffers))))
+ (or (null pred) (funcall pred buffer))
(not (eq buffer old-buffer))
(or bury-or-kill (not (memq buffer next-buffers))))
(if (and (not switch-to-visible-buffer)
@@ -3013,6 +3015,7 @@
(when (and (buffer-live-p buffer)
(not (eq buffer old-buffer))
(not (eq (aref (buffer-name buffer) 0) ?\s))
+ (or (null pred) (funcall pred buffer))
(or bury-or-kill (not (memq buffer next-buffers))))
(if (get-buffer-window buffer frame)
;; Try to avoid showing a buffer visible in some other window.
@@ -3031,6 +3034,7 @@
(not (setq killed-buffers
(cons buffer killed-buffers))))
(not (eq buffer old-buffer))
+ (or (null pred) (funcall pred buffer))
(setq entry (assq buffer (window-prev-buffers window))))
(setq new-buffer buffer)
(set-window-buffer-start-and-point
@@ -3075,6 +3079,7 @@
(frame (window-frame window))
(old-buffer (window-buffer window))
(next-buffers (window-next-buffers window))
+ (pred (frame-parameter frame 'buffer-predicate))
buffer new-buffer entry killed-buffers visible)
(when (window-dedicated-p window)
(error "Window %s is dedicated to buffer %s" window old-buffer))
@@ -3086,6 +3091,7 @@
(not (setq killed-buffers
(cons buffer killed-buffers))))
(not (eq buffer old-buffer))
+ (or (null pred) (funcall pred buffer))
(setq entry (assq buffer (window-prev-buffers window))))
(setq new-buffer buffer)
(set-window-buffer-start-and-point
@@ -3096,6 +3102,7 @@
(dolist (buffer (buffer-list frame))
(when (and (buffer-live-p buffer) (not (eq buffer old-buffer))
(not (eq (aref (buffer-name buffer) 0) ?\s))
+ (or (null pred) (funcall pred buffer))
(not (assq buffer (window-prev-buffers window))))
(if (get-buffer-window buffer frame)
;; Try to avoid showing a buffer visible in some other window.
@@ -3110,6 +3117,7 @@
(or (buffer-live-p buffer)
(not (setq killed-buffers
(cons buffer killed-buffers))))
+ (or (null pred) (funcall pred buffer))
(not (eq buffer old-buffer)))
(if (and (not switch-to-visible-buffer)
(get-buffer-window buffer frame))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109831: Consider frame's buffer predicate in switch-to-prev-/next-buffer.,
martin rudalics <=