aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2018-02-27 16:18:30 -0500
committerStefan Monnier2018-02-27 16:18:30 -0500
commitd56b8fa3296c5b1b7abe6cc4048142949a64ac02 (patch)
treedfda0ffbb0c67d3bfd31255d969fa631ba370a9f
parent49408d74180da4f682c5aa2d584ea417e27baacd (diff)
downloademacs-d56b8fa3296c5b1b7abe6cc4048142949a64ac02.tar.gz
emacs-d56b8fa3296c5b1b7abe6cc4048142949a64ac02.zip
* lisp/dired.el (dired-get-filename): Don't string-to-multibyte
We don't need to convert manually to multibyte now that Emacs doesn't silently convert (uni)bytes into latin-N chars depending on locale any more.
-rw-r--r--lisp/dired.el7
1 files changed, 1 insertions, 6 deletions
diff --git a/lisp/dired.el b/lisp/dired.el
index ef069d23453..1c283c5de3f 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2352,12 +2352,7 @@ Otherwise, an error occurs in these cases."
2352 (setq start (match-end 0)))))) 2352 (setq start (match-end 0))))))
2353 2353
2354 ;; Hence we don't need to worry about converting `\\' back to `\'. 2354 ;; Hence we don't need to worry about converting `\\' back to `\'.
2355 (setq file (read (concat "\"" file "\""))) 2355 (setq file (read (concat "\"" file "\"")))))
2356 ;; The above `read' will return a unibyte string if FILE
2357 ;; contains eight-bit-control/graphic characters.
2358 (if (and enable-multibyte-characters
2359 (not (multibyte-string-p file)))
2360 (setq file (string-to-multibyte file)))))
2361 (and file (files--name-absolute-system-p file) 2356 (and file (files--name-absolute-system-p file)
2362 (setq already-absolute t)) 2357 (setq already-absolute t))
2363 (cond 2358 (cond