(dired-get-filename): Don't call encode-coding-string if FILE is nil.

be417b22 · Richard M. Stallman · ab685b6b · be417b22
Commit be417b22 authored Sep 03, 1997 by Richard M. Stallman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lisp/dired.el lisp/dired.el +2 -2

No files found.
--- 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
 			      "\\([^\\]\\|\\`\\)\"" file "\\1\\\\\"" nil t)
 			     file)
 			 "\"")))))
-    (if buffer-file-coding-system
-	(setq file (encode-coding-string file buffer-file-coding-system)))
+    (and file buffer-file-coding-system
+	 (setq file (encode-coding-string file buffer-file-coding-system)))
    (if (eq localp 'no-dir)
 	file
      (and file (concat (dired-current-directory localp) file)))))