Mercurial > emacs
diff lisp/ediff-mult.el @ 73486:db25befb2938
2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-prefix-arg-com): define gg as G0
* viper-ex.el (ex-read): quote file argument.
* ediff-diff.el (ediff-same-file-contents): expand file names.
* ediff-mult.el (ediff-append-custom-diff): quote shell file arguments.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Mon, 23 Oct 2006 19:20:15 +0000 |
| parents | aba79a1f03ed |
| children | e3694f1cb928 7eeafaaa9eab |
line wrap: on
line diff
--- a/lisp/ediff-mult.el Mon Oct 23 16:46:47 2006 +0000 +++ b/lisp/ediff-mult.el Mon Oct 23 19:20:15 2006 +0000 @@ -1637,11 +1637,15 @@ (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer))) (erase-buffer) (shell-command - (format "%s %s %s %s" - ediff-custom-diff-program ediff-custom-diff-options - (ediff-get-session-objA-name session) - (ediff-get-session-objB-name session)) - t)) + (format + "%s %s %s %s" + (shell-quote-argument ediff-custom-diff-program) + ediff-custom-diff-options + (shell-quote-argument (ediff-get-session-objA-name session)) + (shell-quote-argument (ediff-get-session-objB-name session)) + ) + t) + ) (save-excursion (set-buffer meta-diff-buff) (goto-char (point-max))