procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* dired.el (dired-get-filename): Always pass filename through

Browse source 
`read' to ensure unquoting is performed (Bug#2862).
This commit is contained in:
Chong Yidong 2009-04-02 22:16:17 +00:00
parent 96fe38a867
commit 1be9bd1e9d
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2009-04-02 Chong Yidong <cyd@stupidchicken.com>
* dired.el (dired-get-filename): Always pass filename through
`read' to ensure unquoting is performed (Bug#2862).
2009-04-02 Stefan Monnier <monnier@iro.umontreal.ca>
* doc-view.el (doc-view-mode): Don't give up if the file doesn't exist.

13
lisp/dired.el
View file

@ -1950,11 +1950,14 @@ Otherwise, an error occurs in these cases."
;; Get rid of the mouse-face property that file names have.
(set-text-properties 0 (length file) nil file)
;; Unquote names quoted by ls or by dired-insert-directory.
(while (string-match
"\\(?:[^\\]\\|\\`\\)\\(\\\\[0-7][0-7][0-7]\\)" file)
(setq file (replace-match
(read (concat "\"" (match-string 1 file) "\""))
nil t file 1)))
;; This code was written using `read' to unquote, because
;; it's faster than substituting \007 (4 chars) -> ^G (1
;; char) etc. in a lisp loop. Unfortunately, this decision
;; has necessitated hacks such as dealing with filenames
;; with quotation marks in their names.
(while (string-match "\\(?:[^\\]\\|\\`\\)\\(\"\\)" file)
(setq file (replace-match "\\\"" nil t file 1)))
(setq file (read (concat "\"" file "\"")))
;; The above `read' will return a unibyte string if FILE
;; contains eight-bit-control/graphic characters.
(if (and enable-multibyte-characters