diff options
| author | Miles Bader | 2000-11-27 12:11:00 +0000 |
|---|---|---|
| committer | Miles Bader | 2000-11-27 12:11:00 +0000 |
| commit | 2d795c92abaf9da80e7e94f2da047e5383a50d99 (patch) | |
| tree | 9cd8597b4b3e8334c743f569e584c1ed206a15ba | |
| parent | 7e6369044dc68e1e217e7fd6a7adda3cebe2f57e (diff) | |
| download | emacs-2d795c92abaf9da80e7e94f2da047e5383a50d99.tar.gz emacs-2d795c92abaf9da80e7e94f2da047e5383a50d99.zip | |
(dired-get-filename): Return filename verbatim if LOCALP is `verbatim'.
| -rw-r--r-- | lisp/dired.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 926bbee73a4..306ecb2c56c 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -1399,7 +1399,8 @@ otherwise, display it in another buffer." | |||
| 1399 | "In dired, return name of file mentioned on this line. | 1399 | "In dired, return name of file mentioned on this line. |
| 1400 | Value returned normally includes the directory name. | 1400 | Value returned normally includes the directory name. |
| 1401 | Optional arg LOCALP with value `no-dir' means don't include directory | 1401 | Optional arg LOCALP with value `no-dir' means don't include directory |
| 1402 | name in result. A value of t means construct name relative to | 1402 | name in result. A value of `verbatim' means to return the name exactly as |
| 1403 | it occurs in the buffer, and a value of t means construct name relative to | ||
| 1403 | `default-directory', which still may contain slashes if in a subdirectory. | 1404 | `default-directory', which still may contain slashes if in a subdirectory. |
| 1404 | Optional arg NO-ERROR-IF-NOT-FILEP means return nil if no filename on | 1405 | Optional arg NO-ERROR-IF-NOT-FILEP means return nil if no filename on |
| 1405 | this line, otherwise an error occurs." | 1406 | this line, otherwise an error occurs." |
| @@ -1431,6 +1432,8 @@ Optional arg NO-ERROR-IF-NOT-FILEP means return nil if no filename on | |||
| 1431 | (not default-file-name-coding-system) | 1432 | (not default-file-name-coding-system) |
| 1432 | (setq file (encode-coding-string file buffer-file-coding-system))) | 1433 | (setq file (encode-coding-string file buffer-file-coding-system))) |
| 1433 | (cond | 1434 | (cond |
| 1435 | ((eq localp 'verbatim) | ||
| 1436 | file) | ||
| 1434 | ((and (eq localp 'no-dir) already-absolute) | 1437 | ((and (eq localp 'no-dir) already-absolute) |
| 1435 | (file-name-nondirectory file)) | 1438 | (file-name-nondirectory file)) |
| 1436 | ((or already-absolute (eq localp 'no-dir)) | 1439 | ((or already-absolute (eq localp 'no-dir)) |