* lisp/dired.el (dired-mark-pop-up): Let-bind display-buffer-mark-dedicated to `soft'.

Fixes: debbugs:17554

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2daf277166f525333710a1b4b4e0984b3232048b..de2a8bd085bead25073abc687c462565fa66ea4d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-18  Juri Linkov  <juri@jurta.org>
+
+       * dired.el (dired-mark-pop-up): Let-bind display-buffer-mark-dedicated
+       to `soft'.  (Bug#17554)
+
 2014-06-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * delsel.el (electric-newline-and-maybe-indent): Mark it as well

diff --git a/lisp/dired.el b/lisp/dired.el
index 07fe6fe7d149cba6da1720790d537939b25676f3..e4f297e8cc80bc07fed04b6772e0f81b646a2724 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3099,7 +3099,10 @@ argument or confirmation)."
          ;; 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

diff --git a/lisp/window.el b/lisp/window.el
index e9f4fd0b1d2f0f1121d121660b4d8c280bfd7070..28dd6a8ab2660114925a87a1aab7c01036b2eb12 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5966,7 +5966,7 @@ live."
 ;; 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.