Mercurial > emacs
changeset 29206:6e9f065ce572
2000-05-25 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-diff.el (ediff-exec-process): delete --binary option from
non-buffer ediff jobs.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Thu, 25 May 2000 17:21:32 +0000 |
| parents | d08b497f3ce1 |
| children | 6c4e371d4efd |
| files | lisp/ChangeLog lisp/ediff-diff.el |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu May 25 16:59:22 2000 +0000 +++ b/lisp/ChangeLog Thu May 25 17:21:32 2000 +0000 @@ -1,3 +1,8 @@ +2000-05-25 Michael Kifer <kifer@cs.sunysb.edu> + + * ediff-diff.el (ediff-exec-process): delete --binary option from + non-buffer ediff jobs. + 2000-05-25 Eli Zaretskii <eliz@is.elta.co.il> * hilit-chg.el (highlight-changes-mode): Ask about color or
--- a/lisp/ediff-diff.el Thu May 25 16:59:22 2000 +0000 +++ b/lisp/ediff-diff.el Thu May 25 17:21:32 2000 +0000 @@ -1134,6 +1134,9 @@ 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)