summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>2000-02-28 06:16:44 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>2000-02-28 06:16:44 +0000
commit55d7ff38f14396444ef366bfe74eee6dadcf9853 (patch)
treea8137d4485668b1f6b3bab36682127a990b681a5 /lisp/ediff.el
parent387023ee15566c21fd04a9137a0d6c1fd2410269 (diff)
downloademacs-55d7ff38f14396444ef366bfe74eee6dadcf9853.tar.gz
* viper-cmd.el (viper-envelop-ESC-key): added the option to
translate all ESC key sequences. (viper-goto-mark-subr): restore markers for files for which they were saved. * viper-init.el (viper-translate-all-ESC-keysequences): new variable. * viper-util.el (viper-set-replace-overlay-glyphs, viper-set-replace-overlay): always check if the replacement overlay is live. * viper.el (viper-vi-state-mode-list): added major modes. * ediff-wind.el: minor comment changes. * ediff.el: copyright notice date fix.
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 1f8582b8269..efab0dec0d1 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -1,6 +1,6 @@
;;; ediff.el --- a comprehensive visual interface to diff & patch
-;; Copyright (C) 1994, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.sunysb.edu>
;; Created: February 2, 1994