2000-05-25 Michael Kifer <kifer@cs.sunysb.edu>

	* ediff-diff.el (ediff-exec-process): delete --binary option from
	non-buffer ediff jobs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2bc3c44f8f82e4587d22ba6a358fceac46d0c32..cbf2a147f00639706e40f2269fc813579914ce90 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 3311977d581f512e6e80a3b41980cb286569b604..845416d07d94b1714435638ced22784be4d5fd1a 100644 (file)
--- 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)