diff options
| author | Tino Calancha <tino.calancha@gmail.com> | 2017-07-21 13:32:48 +0900 |
|---|---|---|
| committer | Tino Calancha <tino.calancha@gmail.com> | 2017-07-21 13:32:48 +0900 |
| commit | 1d559e384b467b3f74e8b78695f124b561c884d9 (patch) | |
| tree | 004b3d906159213f7f0dd8bf8fdb785dcbf68ab2 /lisp/dired.el | |
| parent | 76268499ddde14f84426ddf84d4997bf8dfb5b65 (diff) | |
| download | emacs-1d559e384b467b3f74e8b78695f124b561c884d9.tar.gz | |
dired: Revert buffer when DIRNAME is a cons
* lisp/dired.el (dired-internal-noselect): Revert buffer if DIR-OR-LIST
is a cons, or dired-directory is a cons and DIR-OR-LIST a string (Bug#7131).
Update the comments.
* test/lisp/dired-tests.el (dired-test-bug7131): Test should pass.
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 4fb4fe78f89..9d500a9f52d 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -872,13 +872,15 @@ periodically reverts at specified time intervals." :version "23.2") (defun dired-internal-noselect (dir-or-list &optional switches mode) - ;; If there is an existing dired buffer for DIRNAME, just leave - ;; buffer as it is (don't even call dired-revert). + ;; If DIR-OR-LIST is a string and there is an existing dired buffer + ;; for it, just leave buffer as it is (don't even call dired-revert). ;; This saves time especially for deep trees or with ange-ftp. ;; The user can type `g' easily, and it is more consistent with find-file. ;; But if SWITCHES are given they are probably different from the ;; buffer's old value, so call dired-sort-other, which does ;; revert the buffer. + ;; Revert the buffer if DIR-OR-LIST is a cons or `dired-directory' + ;; is a cons and DIR-OR-LIST is a string. ;; A pity we can't possibly do "Directory has changed - refresh? " ;; like find-file does. ;; Optional argument MODE is passed to dired-find-buffer-nocreate, @@ -898,6 +900,11 @@ periodically reverts at specified time intervals." (setq dired-directory dir-or-list) ;; this calls dired-revert (dired-sort-other switches)) + ;; Always revert when `dir-or-list' is a cons. Also revert + ;; if `dired-directory' is a cons but `dir-or-list' is not. + ((or (consp dir-or-list) (consp dired-directory)) + (setq dired-directory dir-or-list) + (revert-buffer)) ;; Always revert regardless of whether it has changed or not. ((eq dired-auto-revert-buffer t) (revert-buffer)) |