diff options
| author | Richard M. Stallman | 1997-09-03 22:31:25 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-09-03 22:31:25 +0000 |
| commit | be417b22ba0628c2f99a4e32c7bf2027f8975196 (patch) | |
| tree | bb158cbd05b2dbf0b2d93e27160e66aa290e8e92 | |
| parent | ab685b6b9f8768aeae44bdd764d8e22c2944134e (diff) | |
| download | emacs-be417b22ba0628c2f99a4e32c7bf2027f8975196.tar.gz emacs-be417b22ba0628c2f99a4e32c7bf2027f8975196.zip | |
(dired-get-filename): Don't call encode-coding-string if FILE is nil.
| -rw-r--r-- | lisp/dired.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index e3273f732f0..f01349a361a 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -1299,8 +1299,8 @@ Optional arg NO-ERROR-IF-NOT-FILEP means return nil if no filename on | |||
| 1299 | "\\([^\\]\\|\\`\\)\"" file "\\1\\\\\"" nil t) | 1299 | "\\([^\\]\\|\\`\\)\"" file "\\1\\\\\"" nil t) |
| 1300 | file) | 1300 | file) |
| 1301 | "\""))))) | 1301 | "\""))))) |
| 1302 | (if buffer-file-coding-system | 1302 | (and file buffer-file-coding-system |
| 1303 | (setq file (encode-coding-string file buffer-file-coding-system))) | 1303 | (setq file (encode-coding-string file buffer-file-coding-system))) |
| 1304 | (if (eq localp 'no-dir) | 1304 | (if (eq localp 'no-dir) |
| 1305 | file | 1305 | file |
| 1306 | (and file (concat (dired-current-directory localp) file))))) | 1306 | (and file (concat (dired-current-directory localp) file))))) |