mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
* ediff-diff.el (ediff-exec-process): delete --binary option from
	non-buffer ediff jobs.
This commit is contained in:
Michael Kifer 2000-05-25 17:21:32 +00:00
parent e7a903e81f
commit 7997f1ca36
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

3
lisp/ediff-diff.el
View file

@ -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)