aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2020-09-16 13:34:58 +0200
committerLars Ingebrigtsen2020-09-16 13:34:58 +0200
commit96f1fedf4dd662dbd5bba7eebc0b9c9e926fbce6 (patch)
tree873fe8a45350dede85c40bd78ebaaf2a9ef93404
parentb43287e41307ea2cb331b8915c8b1088ba9e5e9f (diff)
downloademacs-96f1fedf4dd662dbd5bba7eebc0b9c9e926fbce6.tar.gz
emacs-96f1fedf4dd662dbd5bba7eebc0b9c9e926fbce6.zip
Fix problem with previous dired.el change
* lisp/dired.el (dired-get-filename): dired-current-directory can't be called before the dired buffer has been set up. (add-hook 'dired-mode-hook 'dired-sort-toggle) calls dired-get-filename in a way that exposes this problem, so avoid it.
-rw-r--r--lisp/dired.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/dired.el b/lisp/dired.el
index 1b6da1f9617..7839ace8030 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2610,7 +2610,9 @@ it occurs in the buffer, and a value of t means construct name relative to
2610Optional arg NO-ERROR-IF-NOT-FILEP means treat `.' and `..' as 2610Optional arg NO-ERROR-IF-NOT-FILEP means treat `.' and `..' as
2611regular filenames and return nil if no filename on this line. 2611regular filenames and return nil if no filename on this line.
2612Otherwise, an error occurs in these cases." 2612Otherwise, an error occurs in these cases."
2613 (let ((hidden (dired-subdir-hidden-p (dired-current-directory))) 2613 (let ((hidden (and dired-subdir-alist
2614 (dired-subdir-hidden-p
2615 (dired-current-directory))))
2614 case-fold-search file p1 p2 already-absolute) 2616 case-fold-search file p1 p2 already-absolute)
2615 (when hidden 2617 (when hidden
2616 (dired-unhide-subdir)) 2618 (dired-unhide-subdir))