[Emacs-diffs] trunk r116793: Ensure dired-display-file displays it in other window.

[Richard M. Stallman]

------------------------------------------------------------
revno: 116793
revision-id: address@hidden
parent: address@hidden
author: Richard Stallman
committer: Richard Stallman <address@hidden>
branch nick: trunk
timestamp: Tue 2014-03-18 08:07:01 -0400
message:
  Ensure dired-display-file displays it in other window.
  
  * dired.el (dired-display-file): Force use of other window.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/dired.el                  dired.el-20091113204419-o5vbwnq5f7feedwu-482

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-18 06:06:33 +0000
+++ b/lisp/ChangeLog    2014-03-18 12:07:01 +0000
@@ -7,6 +7,10 @@
        (http://lists.gnu.org/archive/html/emacs-devel/2014-03/msg00488.html)
        (comment-start-skip): Update the docstring.
 
+2014-03-18  Richard Stallman  <address@hidden>
+
+       * dired.el (dired-display-file): Force use of other window.
+
 2014-03-18  Daniel Colascione  <address@hidden>
 
        * startup.el (tty-handle-args): Remove debug message from 2007.
@@ -1600,6 +1604,7 @@
        * net/shr.el (shr-tag-img): Prefer the title over the alt text
        (bug#16537).
 
+>>>>>>> MERGE-SOURCE
 2014-01-24  Juanma Barranquero  <address@hidden>
 
        * net/eww.el (eww-download-callback):

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2014-03-16 09:26:58 +0000
+++ b/lisp/dired.el     2014-03-18 12:07:01 +0000
@@ -2136,7 +2136,8 @@
 (defun dired-display-file ()
   "In Dired, display this file or directory in another window."
   (interactive)
-  (display-buffer (find-file-noselect (dired-get-file-for-visit))))
+  (display-buffer (find-file-noselect (dired-get-file-for-visit))
+                 t))
 
 ;;; Functions for extracting and manipulating file names in Dired buffers.
 
@@ -3639,6 +3640,7 @@
        ;; Remove a switch of the form -XtY for some X and Y.
        (setq dired-actual-switches
              (replace-match "" t t dired-actual-switches 3))))
+
     ;; Now, if we weren't sorting by date before, add the -t switch.
     ;; Some simple-minded ls implementations (eg ftp servers) only
     ;; allow a single option string, so try not to add " -t" if possible.
@@ -3671,6 +3673,9 @@
 set the minor mode accordingly, others appear literally in the mode line.
 With optional second arg NO-REVERT, don't refresh the listing afterwards."
   (dired-sort-R-check switches)
+  (unless (string-match "\\(\\`\\| \\)-\\([b-zA-Z]*\\)a"
+                       switches)
+    (debug "No -a in Dired switches"))
   (setq dired-actual-switches switches)
   (dired-sort-set-mode-line)
   (or no-revert (revert-buffer)))