Commit 7997f1ca authored by Michael Kifer's avatar Michael Kifer
Browse files

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

	* ediff-diff.el (ediff-exec-process): delete --binary option from
	non-buffer ediff jobs.
parent e7a903e8
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
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment