aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/ediff-diff.el6
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