diff options
| author | Michael Kifer | 2000-06-05 00:07:02 +0000 |
|---|---|---|
| committer | Michael Kifer | 2000-06-05 00:07:02 +0000 |
| commit | 560ef11a16d6d25446e62753fe6e89d4e54f47fd (patch) | |
| tree | 36b6c909e9185968a787387b3d5263a2113ebdf1 /lisp/ediff-diff.el | |
| parent | be22f4cc631ce75fe7d8459fd294d5279bdacadd (diff) | |
| download | emacs-560ef11a16d6d25446e62753fe6e89d4e54f47fd.tar.gz emacs-560ef11a16d6d25446e62753fe6e89d4e54f47fd.zip | |
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.
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 845416d07d9..a7236bd1d35 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el | |||
| @@ -1135,7 +1135,9 @@ delimiter regions")) | |||
| 1135 | (setq args (append (split-string options) files)) | 1135 | (setq args (append (split-string options) files)) |
| 1136 | (setq args (delete "" (delq nil args))) ; delete nil and "" from arguments | 1136 | (setq args (delete "" (delq nil args))) ; delete nil and "" from arguments |
| 1137 | ;; the --binary option, if present, should be used only for buffer jobs | 1137 | ;; the --binary option, if present, should be used only for buffer jobs |
| 1138 | ;; or for refining the differences | ||
| 1138 | (or (string-match "buffer" (symbol-name ediff-job-name)) | 1139 | (or (string-match "buffer" (symbol-name ediff-job-name)) |
| 1140 | (eq buffer ediff-fine-diff-buffer) | ||
| 1139 | (setq args (delete "--binary" args))) | 1141 | (setq args (delete "--binary" args))) |
| 1140 | (unwind-protect | 1142 | (unwind-protect |
| 1141 | (let ((directory default-directory) | 1143 | (let ((directory default-directory) |