summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>2007-08-19 13:47:08 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>2007-08-19 13:47:08 +0000
commit69441214fa14492b0e3f65ae0c85fb5315f39411 (patch)
treecddcd51438b3ad283701726d87af1f13e1febc4f /lisp/ediff.el
parentae0195c0432748ff17b35850c51884302050e187 (diff)
downloademacs-69441214fa14492b0e3f65ae0c85fb5315f39411.tar.gz
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
* viper.el (viper-remove-hooks): remove some additional viper hooks when the user calls viper-go-away. (viper-go-away): restore the default of default-major-mode. Save the value of default-major-mode before vaperization. * viper-cmd.el: Replace error "" with "Viper bell". * viper-ex.el: Replace error "" with "Viper bell". * ediff-util.el (ediff-make-temp-file): use the coding system of the buffer for which file is created.
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 39700782e0e..7475834fba6 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -8,7 +8,7 @@
;; Keywords: comparing, merging, patching, tools, unix
(defconst ediff-version "2.81.2" "The current version of Ediff")
-(defconst ediff-date "June 13, 2007" "Date of last update")
+(defconst ediff-date "August 18, 2007" "Date of last update")
;; This file is part of GNU Emacs.