summaryrefslogtreecommitdiff
path: root/lisp/dired.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-09-09 05:37:20 +0000
committerRichard M. Stallman <rms@gnu.org>1997-09-09 05:37:20 +0000
commit05dd46c201f8f36790bffd24b35e9ba37f4f1135 (patch)
tree253c184077539c4897acc8834288f8e050f31a44 /lisp/dired.el
parent89e1ec1dd0060c6d90455de884ae1d42dcb1ed13 (diff)
downloademacs-05dd46c201f8f36790bffd24b35e9ba37f4f1135.tar.gz
(dired-get-filename): Don't call encode-coding-string
if file-name-coding-system is non-nil.
Diffstat (limited to 'lisp/dired.el')
-rw-r--r--lisp/dired.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/dired.el b/lisp/dired.el
index 118c4c8bdee..29d397ca56a 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1300,6 +1300,7 @@ Optional arg NO-ERROR-IF-NOT-FILEP means return nil if no filename on
file)
"\"")))))
(and file buffer-file-coding-system
+ (not file-name-coding-system)
(setq file (encode-coding-string file buffer-file-coding-system)))
(if (eq localp 'no-dir)
file