aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Steingold2012-03-22 16:49:04 -0400
committerSam Steingold2012-03-22 16:49:04 -0400
commite71cebb3c3a3b2f7eb5a28178d9c4763a1a3edb0 (patch)
tree4174fcf0de02cade51bbafd8838210ae0aee3a95
parent9e1a1109f7ba74795897cbcb4cb9bbc5d4046bf6 (diff)
downloademacs-e71cebb3c3a3b2f7eb5a28178d9c4763a1a3edb0.tar.gz
emacs-e71cebb3c3a3b2f7eb5a28178d9c4763a1a3edb0.zip
* lisp/window.el (switch-to-prev-buffer): Revert last patch because the
bug turned out to be an advertised feature (Elisp manual 28.14).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el14
2 files changed, 13 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0d01df98af..652c9ad7e44 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-03-22 Sam Steingold <sds@gnu.org>
2
3 * window.el (switch-to-prev-buffer): Revert last patch because the
4 bug turned out to be an advertised feature (Elisp manual 28.14).
5
12012-03-22 Glenn Morris <rgm@gnu.org> 62012-03-22 Glenn Morris <rgm@gnu.org>
2 7
3 * vc/vc-bzr.el (vc-bzr-status-switches): New option. (Bug#6724) 8 * vc/vc-bzr.el (vc-bzr-status-switches): New option. (Bug#6724)
diff --git a/lisp/window.el b/lisp/window.el
index 894d113cdc7..cb7368fc7ff 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2602,12 +2602,14 @@ shall not be switched to in future invocations of this command."
2602 (not (eq new-buffer old-buffer)) 2602 (not (eq new-buffer old-buffer))
2603 (or bury-or-kill 2603 (or bury-or-kill
2604 (not (memq new-buffer next-buffers)))) 2604 (not (memq new-buffer next-buffers))))
2605 (if (get-buffer-window new-buffer) 2605 ;; _DO_ show visible buffers as advertized in Elisp manual 28.14
2606 ;; Try to avoid showing a buffer visible in some other window. 2606 ;; on `switch-to-prev-buffer' & `switch-to-next-buffer'
2607 (setq visible new-buffer) 2607 ;;(if (get-buffer-window new-buffer)
2608 (set-window-buffer-start-and-point 2608 ;; ;; Try to avoid showing a buffer visible in some other window.
2609 window new-buffer (nth 1 entry) (nth 2 entry)) 2609 ;; (setq visible new-buffer)
2610 (throw 'found t)))) 2610 (set-window-buffer-start-and-point
2611 window new-buffer (nth 1 entry) (nth 2 entry))
2612 (throw 'found t)))
2611 ;; Scan reverted buffer list of WINDOW's frame next, skipping 2613 ;; Scan reverted buffer list of WINDOW's frame next, skipping
2612 ;; entries of next buffers. Note that when we bury or kill a 2614 ;; entries of next buffers. Note that when we bury or kill a
2613 ;; buffer we don't reverse the global buffer list to avoid showing 2615 ;; buffer we don't reverse the global buffer list to avoid showing