bug#20861: 24.4/5; [PATCH] Consistency of switch-to-visible-buffer

["Jürgen Hartmann" <juergen_hartmann_@hotmail.com>]

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

Martin Rudalics wrote:

> Thanks Jürgen
>
> Unfortunately your patch does not apply to current master/trunk here
> (even with a large fuzz factor).  Can you try to make a patch against
> the current version of window.el?  You should be able to retrieve it
> from
>
> http://git.savannah.gnu.org/cgit/emacs.git/plain/lisp/window.el
>
> You don't have to compile it, I'll check that here.  Also please post
> the patch as attachment and in unified format.
>
> Thanks in advance, martin

Been there, done that.

Thank you Martin Rudalics.

Jürgen

 		 	   		  

[-- Attachment #2: buffer-cycling.patch --]
[-- Type: application/octet-stream, Size: 1880 bytes --]

diff -ruN original/window.el changed/window.el
--- original/window.el	2015-06-22 11:12:17.385663505 +0200
+++ changed/window.el	2015-06-22 11:35:00.646695905 +0200
@@ -3874,12 +3874,10 @@
 (defcustom switch-to-visible-buffer t
   "If non-nil, allow switching to an already visible buffer.
 If this variable is non-nil, `switch-to-prev-buffer' and
-`switch-to-next-buffer' may switch to an already visible buffer
-provided the buffer was shown before in the window specified as
-argument to those functions.  If this variable is nil,
-`switch-to-prev-buffer' and `switch-to-next-buffer' always try to
-avoid switching to a buffer that is already visible in another
-window on the same frame."
+`switch-to-next-buffer' may switch to an already visible buffer.
+If this variable is nil, `switch-to-prev-buffer' and
+`switch-to-next-buffer' always try to avoid switching to a buffer
+that is already visible in another window on the same frame."
   :type 'boolean
   :version "24.1"
   :group 'windows)
@@ -3950,7 +3948,8 @@
                    (or (null pred) (funcall pred buffer))
 		   (not (eq (aref (buffer-name buffer) 0) ?\s))
 		   (or bury-or-kill (not (memq buffer next-buffers))))
-	  (if (get-buffer-window buffer frame)
+	  (if (and (not switch-to-visible-buffer)
+		   (get-buffer-window buffer frame))
 	      ;; Try to avoid showing a buffer visible in some other window.
 	      (unless visible
 		(setq visible buffer))
@@ -4052,7 +4051,8 @@
                    (or (null pred) (funcall pred buffer))
 		   (not (eq (aref (buffer-name buffer) 0) ?\s))
 		   (not (assq buffer (window-prev-buffers window))))
-	  (if (get-buffer-window buffer frame)
+	  (if (and (not switch-to-visible-buffer)
+		   (get-buffer-window buffer frame))
 	      ;; Try to avoid showing a buffer visible in some other window.
 	      (setq visible buffer)
 	    (setq new-buffer buffer)