diff options
| author | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
| commit | 4b73dac2885aa7eb23b66c299065e19bd118a4fb (patch) | |
| tree | 18452b36b890faf52d40f555ebe4dc3c6e020bc6 /lisp/dired.el | |
| parent | 0d824cc5e79e7d29a01929a51dfd673a117c77e8 (diff) | |
| parent | 984a14904658da42ca9dea50a811a901ddc56e60 (diff) | |
| download | emacs-xwidget_mvp.tar.gz | |
merge masterxwidget_mvp
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 0a1b064fb20..63124fce5e5 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1,6 +1,6 @@ ;;; dired.el --- directory-browsing commands -*- lexical-binding: t -*- -;; Copyright (C) 1985-1986, 1992-1997, 2000-2015 Free Software +;; Copyright (C) 1985-1986, 1992-1997, 2000-2016 Free Software ;; Foundation, Inc. ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de> @@ -2810,7 +2810,9 @@ It runs the hook `dired-initial-position-hook'." (defun dired-current-directory (&optional localp) "Return the name of the subdirectory to which this line belongs. This returns a string with trailing slash, like `default-directory'. -Optional argument means return a file name relative to `default-directory'." +Optional argument means return a file name relative to `default-directory', +in which case the value could be an empty string if `default-directory' +is the directory where the file on this line resides." (let ((here (point)) (alist (or dired-subdir-alist ;; probably because called in a non-dired buffer |