Mercurial > emacs
diff lisp/ediff.el @ 35411:be20c22dc16d
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.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Fri, 19 Jan 2001 07:13:03 +0000 |
| parents | fdb5d08ced13 |
| children | f6386773ce30 |
line wrap: on
line diff
--- a/lisp/ediff.el Fri Jan 19 05:23:16 2001 +0000 +++ b/lisp/ediff.el Fri Jan 19 07:13:03 2001 +0000 @@ -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-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