(http://lists.gnu.org/archive/html/emacs-devel/2014-03/msg00488.html)
(comment-start-skip): Update the docstring.
+2014-03-18 Richard Stallman <rms@gnu.org>
+
+ * dired.el (dired-display-file): Force use of other window.
+
2014-03-18 Daniel Colascione <dancol@dancol.org>
* startup.el (tty-handle-args): Remove debug message from 2007.
* net/shr.el (shr-tag-img): Prefer the title over the alt text
(bug#16537).
+>>>>>>> MERGE-SOURCE
2014-01-24 Juanma Barranquero <lekktu@gmail.com>
* net/eww.el (eww-download-callback):
(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))
\f
;;; Functions for extracting and manipulating file names in Dired buffers.
;; 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.
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)))