diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2006-10-23 19:20:15 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2006-10-23 19:20:15 +0000 |
| commit | 7eb605c752b669ea2aa89040f512f91ce4a3de63 (patch) | |
| tree | 630f5b2ea9e197c3e2681bf0e6f282ec4f6fd2d9 /lisp/ediff-mult.el | |
| parent | 6c2962c2287aa702dd81d60e1da7c267ce166a6f (diff) | |
| download | emacs-7eb605c752b669ea2aa89040f512f91ce4a3de63.tar.gz | |
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.
Diffstat (limited to 'lisp/ediff-mult.el')
| -rw-r--r-- | lisp/ediff-mult.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index b33ad7c1859..2ee573a4cb9 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -1637,11 +1637,15 @@ Useful commands: (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)) |