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-diff.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-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index e3675064010..d2dff294d2e 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -1450,7 +1450,9 @@ arguments to `skip-chars-forward'." (condition-case nil (let ((res (apply 'call-process ediff-cmp-program nil nil nil - (append ediff-cmp-options (list f1 f2))))) + (append ediff-cmp-options (list (expand-file-name f1) + (expand-file-name f2)))) + )) (and (numberp res) (eq res 0))) (error (format "Cannot execute program %S." ediff-cmp-program))) )) |