Undedicate window when quitting should switch to previous buffer.

* window.el (quit-window): Undedicate window when switching to
previous buffer.  Reported by Thierry Volpiatto
<thierry.volpiatto@gmail.com>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0db6356426e178b6e835edb957fd4918ce8ee153..3534cf36bf34971dc6b718bfaf056b2f0d58305c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-22  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (quit-window): Undedicate window when switching to
+       previous buffer.  Reported by Thierry Volpiatto
+       <thierry.volpiatto@gmail.com>.
+
 2011-09-21  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-handle-shell-command): Set process sentinel

diff --git a/lisp/window.el b/lisp/window.el
index ffbe710593e2103a9bef1e04119fc52d8ade933c..21d02f76042a92a9d86606045bd2bd186c39b24f 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2937,6 +2937,8 @@ one.  If non-nil, reset `quit-restore' parameter to nil."
       ;; Show some other buffer in WINDOW and reset the quit-restore
       ;; parameter.
       (set-window-parameter window 'quit-restore nil)
+      ;; Make sure that WINDOW is no more dedicated.
+      (set-window-dedicated-p window nil)
       (switch-to-prev-buffer window 'bury-or-kill)))
 
     ;; Kill WINDOW's old-buffer if requested