From: Michael Kifer <kifer@cs.stonybrook.edu>
Date: Thu, 25 May 2000 17:21:32 +0000 (+0000)
Subject: 2000-05-25  Michael Kifer  <kifer@cs.sunysb.edu>
X-Git-Tag: emacs-pretest-21.0.90~3706
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7997f1ca362d13356b7a964de799d395b70ef454;p=emacs.git

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 d2bc3c44f8f..cbf2a147f00 100644
--- 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 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)