From 7997f1ca362d13356b7a964de799d395b70ef454 Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Thu, 25 May 2000 17:21:32 +0000 Subject: 2000-05-25 Michael Kifer * ediff-diff.el (ediff-exec-process): delete --binary option from non-buffer ediff jobs. --- lisp/ediff-diff.el | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lisp/ediff-diff.el') 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) -- cgit v1.2.1