[Emacs-diffs] emacs-24 r117253: * lisp/dired.el (dired-mark-pop-up): Let-bind display-buffer-mark-dedicated to `soft'.

[Juri Linkov]

------------------------------------------------------------
revno: 117253
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17554
committer: Juri Linkov <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-06-18 10:57:27 +0300
message:
  * lisp/dired.el (dired-mark-pop-up): Let-bind display-buffer-mark-dedicated 
to `soft'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/dired.el                  dired.el-20091113204419-o5vbwnq5f7feedwu-482
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-17 13:40:03 +0000
+++ b/lisp/ChangeLog    2014-06-18 07:57:27 +0000
@@ -1,3 +1,8 @@
+2014-06-18  Juri Linkov  <address@hidden>
+
+       * dired.el (dired-mark-pop-up): Let-bind display-buffer-mark-dedicated
+       to `soft'.  (Bug#17554)
+
 2014-06-17  Stefan Monnier  <address@hidden>
 
        * delsel.el (electric-newline-and-maybe-indent): Mark it as well

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2014-05-08 19:22:43 +0000
+++ b/lisp/dired.el     2014-06-18 07:57:27 +0000
@@ -3099,7 +3099,10 @@
          ;; If FILES defaulted to the current line's file.
          (= (length files) 1))
       (apply function args)
-    (let ((buffer (get-buffer-create (or buffer-or-name " *Marked Files*"))))
+    (let ((buffer (get-buffer-create (or buffer-or-name " *Marked Files*")))
+         ;; Mark *Marked Files* window as softly-dedicated, to prevent
+         ;; other buffers e.g. *Completions* from reusing it (bug#17554).
+         (display-buffer-mark-dedicated 'soft))
       (with-current-buffer buffer
        (with-current-buffer-window
         buffer

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2014-06-03 12:38:17 +0000
+++ b/lisp/window.el    2014-06-18 07:57:27 +0000
@@ -5966,7 +5966,7 @@
 ;; FIXME: By the way, there could be more levels of dedication:
 ;; - `barely' dedicated doesn't prevent reuse of the window, only records that
 ;;   the window hasn't been used for something else yet.
-;; - `softly' dedicated only allows reuse when asked explicitly.
+;; - `soft' (`softly') dedicated only allows reuse when asked explicitly.
 ;; - `strongly' never allows reuse.
 (defvar display-buffer-mark-dedicated nil
   "If non-nil, `display-buffer' marks the windows it creates as dedicated.