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 | 2550055a67cc37c4ed14b510b8cb4d70a9d73819 (patch) | |
| tree | 5d31162f55eb2a74375c523f1eac9d0f3cadf4f6 /lisp/ediff.el | |
| parent | d26b89b8119a012726fd16f0660d54cf65a2e8bc (diff) | |
| download | emacs-2550055a67cc37c4ed14b510b8cb4d70a9d73819.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.el')
| -rw-r--r-- | lisp/ediff.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index 7e68f26708a..5fd8e67ff25 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -7,7 +7,7 @@ ;; Keywords: comparing, merging, patching, tools, unix (defconst ediff-version "2.75" "The current version of Ediff") -(defconst ediff-date "October 29, 2000" "Date of last update") +(defconst ediff-date "January 19, 2001" "Date of last update") ;; This file is part of GNU Emacs. @@ -1257,10 +1257,10 @@ buffer. If odd -- assume it is in a file." (buffer-file-name patch-buf)))) (t default-directory))) (setq source-file - ;; the default is the directory, not the visited file name (read-file-name "File to patch (directory, if multifile patch): " - source-dir (ediff-get-default-file-name))) + ;; use an explicit initial file + source-dir nil nil (ediff-get-default-file-name))) (ediff-dispatch-file-patching-job patch-buf source-file))) ;;;###autoload |