From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 3 Sep 1997 22:31:25 +0000 (+0000)
Subject: (dired-get-filename): Don't call encode-coding-string if FILE is nil.
X-Git-Tag: emacs-20.1~212
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be417b22ba0628c2f99a4e32c7bf2027f8975196;p=emacs.git

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

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
 			      "\\([^\\]\\|\\`\\)\"" 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)))))