summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>2005-06-03 08:04:04 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>2005-06-03 08:04:04 +0000
commit899a431bae4a7b48a266c5da56610a5ea44febad (patch)
tree38050620920c4ff4b5bd4dc2c4f3267dfe76eef2 /lisp/ediff.el
parentd06e384795d5ca4e82c88273847eeb9d01380046 (diff)
downloademacs-899a431bae4a7b48a266c5da56610a5ea44febad.tar.gz
2005-06-03 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-diff.el (ediff-same-contents) Eliminate CL-type functions. * ediff-mult.el (ediff-intersect-directories) Make sure that ".." and "." files are deleted from all file lists before comparison * viper-keym.el (viper-toggle-key,viper-quoted-insert-key,viper-ESC-key): Made them customizable. * viper.el (viper-non-hook-settings): fixed the names of defadvices.
Diffstat (limited to 'lisp/ediff.el')
-rw-r--r--lisp/ediff.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 2a2b481ec59..00a7e2f512a 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -7,7 +7,7 @@
;; Keywords: comparing, merging, patching, tools, unix
(defconst ediff-version "2.80" "The current version of Ediff")
-(defconst ediff-date "February 19, 2005" "Date of last update")
+(defconst ediff-date "June 3, 2005" "Date of last update")
;; This file is part of GNU Emacs.