diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-05-25 17:21:32 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-05-25 17:21:32 +0000 |
| commit | 7997f1ca362d13356b7a964de799d395b70ef454 (patch) | |
| tree | 455d23b4c78ebe8cc7949c6c9c646a5d47b72bdc /lisp/ediff-diff.el | |
| parent | e7a903e81f21db5fc041c9f10bf7821aeb3bcd3f (diff) | |
| download | emacs-7997f1ca362d13356b7a964de799d395b70ef454.tar.gz | |
2000-05-25 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-diff.el (ediff-exec-process): delete --binary option from
non-buffer ediff jobs.
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 3311977d581..845416d07d9 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -1134,6 +1134,9 @@ delimiter regions")) args) (setq args (append (split-string options) files)) (setq args (delete "" (delq nil args))) ; delete nil and "" from arguments + ;; the --binary option, if present, should be used only for buffer jobs + (or (string-match "buffer" (symbol-name ediff-job-name)) + (setq args (delete "--binary" args))) (unwind-protect (let ((directory default-directory) proc) |