# HG changeset patch
# User Michael Kifer <kifer@cs.stonybrook.edu>
# Date 959275292 0
# Node ID 6e9f065ce5721fcfd9155fab5e734f775abf7d0c
# Parent  d08b497f3ce1806ef4c417d1377040bf2a17b61f
2000-05-25  Michael Kifer  <kifer@cs.sunysb.edu>

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

diff -r d08b497f3ce1 -r 6e9f065ce572 lisp/ChangeLog
--- 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
diff -r d08b497f3ce1 -r 6e9f065ce572 lisp/ediff-diff.el
--- 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)