Mercurial > emacs

diff lisp/ediff-diff.el @ 29412:ecd388a0937d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2000-06-05 Michael Kifer <kifer@cs.sunysb.edu> * ediff-init.el (ediff-has-face-support-p): make it paint faces on tty's. * ediff-diff.el (ediff-exec-process): use --binary for fine differences whenever apropriate. * viper-cmd.el (viper-smart-suffix-list): rearranged list members. * viper.el (find-file,find-file-other-window): get viper to do wildcards.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Mon, 05 Jun 2000 00:07:02 +0000
parents 6e9f065ce572
children f7f64f1ccc38
line wrap: on
line diff
--- a/lisp/ediff-diff.el	Sun Jun 04 23:40:58 2000 +0000
+++ b/lisp/ediff-diff.el	Mon Jun 05 00:07:02 2000 +0000
@@ -1135,7 +1135,9 @@
     (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 for refining the differences
     (or (string-match "buffer" (symbol-name ediff-job-name))
+	(eq buffer ediff-fine-diff-buffer)
 	(setq args (delete "--binary" args)))
     (unwind-protect
 	(let ((directory default-directory)