diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-01-19 07:13:03 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2001-01-19 07:13:03 +0000 |
| commit | 88d26a9d4b164503b8a29ccd25a32557d12fb320 (patch) | |
| tree | c987a4a92aea7604b9ec804bc2a939c77b131bd1 /lisp/ediff-util.el | |
| parent | e706b1b3b001f971daef6d6d5008831dd44b25bd (diff) | |
| download | emacs-88d26a9d4b164503b8a29ccd25a32557d12fb320.tar.gz | |
2001-01-19 Michael Kifer <kifer@cs.sunysb.edu>
* viper.el: call initial-major-mode on startup.
* ediff.el (ediff-patch-file): use better defaults.
* ediff-vers.el: fix for 8+3 DOS file systems
2001-01-19 Colin Walters <walters@cis.ohio-state.edu>
* ediff-util.el (ediff-compare-custom-diffs-maybe): put diff in
diff mode, if available.
2001-01-19 Vin Shelton <acs@xemacs.org>
* ediff-hook.el (ediff-xemacs-init-menus): fixed add-menu-button
2001-01-19 Steve Youngs <youngs@xemacs.org>
* ediff-init.el (subst-char-in-string): Define and use it, unless
it's already defined.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index ea0538178a7..ef55dbb69a1 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -3113,6 +3113,13 @@ Without an argument, it saves customized diff argument, if available (ediff-exec-process ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize ediff-custom-diff-options file-A file-B) + (condition-case nil + ;; put the diff file in diff-mode, if it is available + (prog + (require 'diff-mode) + (with-current-buffer ediff-custom-diff-buffer + (diff-mode))) + (error)) (delete-file file-A) (delete-file file-B) )) |