[Emacs-diffs] /srv/bzr/emacs/trunk r105222: Fix pop-to-buffer call in switch-to-buffer.

[martin rudalics]

------------------------------------------------------------
revno: 105222
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-15 09:12:09 +0200
message:
  Fix pop-to-buffer call in switch-to-buffer.
  
  * window.el (switch-to-buffer): Call pop-to-buffer with normalized
  buffer argument (Bug#9083) and self-identifying label argument.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-15 02:16:55 +0000
+++ b/lisp/ChangeLog    2011-07-15 07:12:09 +0000
@@ -1,3 +1,8 @@
+2011-07-15  Martin Rudalics  <address@hidden>
+
+       * window.el (switch-to-buffer): Call pop-to-buffer with normalized
+       buffer argument (Bug#9083) and self-identifying label argument.
+
 2011-07-15  Glenn Morris  <address@hidden>
 
        * emacs-lisp/debug.el (debug): Doc fix.  (Bug#8273)

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-07-14 08:30:34 +0000
+++ b/lisp/window.el    2011-07-15 07:12:09 +0000
@@ -5953,13 +5953,13 @@
    (list (read-buffer-to-switch "Switch to buffer: ") nil nil))
   (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
     (if (null force-same-window)
-       (pop-to-buffer buffer-or-name
-                      '(same-window (reuse-window-dedicated . weak))
-                      norecord nil)
+       (pop-to-buffer
+        buffer '(same-window (reuse-window-dedicated . weak))
+        norecord 'switch-to-buffer)
       (cond
        ;; Don't call set-window-buffer if it's not needed since it
        ;; might signal an error (e.g. if the window is dedicated).
-       ((eq buffer (window-buffer)) nil)
+       ((eq buffer (window-buffer)))
        ((window-minibuffer-p)
        (error "Cannot switch buffers in minibuffer window"))
        ((eq (window-dedicated-p) t)