diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-09-20 17:47:28 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-09-20 17:47:28 +0000 |
| commit | 15c77b9ecd23bfcb6c831bbc25d35ec8d0723fad (patch) | |
| tree | 65a1226ad4376299b55254a51ccf406c445ac5e7 /lisp/ediff.el | |
| parent | 41ea4df8c30cb9c1c7254188c5aa812d9875f383 (diff) | |
| download | emacs-15c77b9ecd23bfcb6c831bbc25d35ec8d0723fad.tar.gz | |
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-ptch.el (ediff-file-name-sans-prefix): treat nil as an empty
string.
(ediff-fixup-patch-map): better heuristic for intuiting the file names
to patch.
(ediff-prompt-for-patch-file): more intuitive prompt.
* ediff-util.el: use insert-buffer-substring.
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): bug fix.
* viper-cmd.el (viper-change-state): don't move over the field
boundaries in the minibuffer.
(viper-set-minibuffer-style): add viper-minibuffer-post-command-hook.
(viper-minibuffer-post-command-hook): new hook.
(viper-line): don't move cursor at bolp.
* viper-ex.el (ex-pwd, viper-info-on-file): fixed message
* viper-init.el: add alias to make-variable-buffer-local to avoid
compiler warnings.
* viper-macs.el (ex-map): better messages.
* viper-utils.el (viper-beginning-of-field): new function.
* viper.el: replace make-variable-buffer-local with
viper-make-variable-buffer-local everywhere, to avoid warnings.
Diffstat (limited to 'lisp/ediff.el')
| -rw-r--r-- | lisp/ediff.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index 35b28a3e550..a4b5bd77368 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -7,8 +7,8 @@ ;; Created: February 2, 1994 ;; Keywords: comparing, merging, patching, tools, unix -(defconst ediff-version "2.80" "The current version of Ediff") -(defconst ediff-date "July 8, 2005" "Date of last update") +(defconst ediff-version "2.80.1" "The current version of Ediff") +(defconst ediff-date "September 19, 2005" "Date of last update") ;; This file is part of GNU Emacs. |