diff options
| author | Philipp Stephani | 2017-03-03 18:36:08 +0100 |
|---|---|---|
| committer | Philipp Stephani | 2017-04-04 11:37:10 +0200 |
| commit | f4b50dad8d5eade04f495c693c0bca46060b25cb (patch) | |
| tree | 0738ac90a39540d2d2affc066ce625471e3c0298 /lisp/vc/ediff-diff.el | |
| parent | 2c68192c6b029bb839193c81cf2a16dad26305c6 (diff) | |
| download | emacs-f4b50dad8d5eade04f495c693c0bca46060b25cb.tar.gz emacs-f4b50dad8d5eade04f495c693c0bca46060b25cb.zip | |
Make ediff handle remote and quoted file names
Quoted file names need to be unquoted before passed to
subprocesses (Bug#25950).
* lisp/vc/ediff-diff.el (ediff-exec-process): Handle remote and quoted
file names.
* test/lisp/vc/ediff-diff-tests.el
(ediff-diff-tests--ediff-exec-process--quoted-file): Add unit test.
Diffstat (limited to 'lisp/vc/ediff-diff.el')
| -rw-r--r-- | lisp/vc/ediff-diff.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index 37f22340d71..cfa08ef3604 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el | |||
| @@ -1149,7 +1149,11 @@ delimiter regions")) | |||
| 1149 | ediff-coding-system-for-write | 1149 | ediff-coding-system-for-write |
| 1150 | ediff-coding-system-for-read)) | 1150 | ediff-coding-system-for-read)) |
| 1151 | args) | 1151 | args) |
| 1152 | (setq args (append (split-string options) files)) | 1152 | (setq args (append (split-string options) |
| 1153 | (mapcar (lambda (file) | ||
| 1154 | (file-name-unquote | ||
| 1155 | (or (file-local-copy file) file))) | ||
| 1156 | files))) | ||
| 1153 | (setq args (delete "" (delq nil args))) ; delete nil and "" from arguments | 1157 | (setq args (delete "" (delq nil args))) ; delete nil and "" from arguments |
| 1154 | ;; the --binary option, if present, should be used only for buffer jobs | 1158 | ;; the --binary option, if present, should be used only for buffer jobs |
| 1155 | ;; or for refining the differences | 1159 | ;; or for refining the differences |