summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/emulation/viper-keym.el5
-rw-r--r--lisp/emulation/viper.el5
3 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11df73f8649..f334200b218 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-25 Michael Kifer <kifer@cs.stonybrook.edu>
+
+ * viper-keym.el (viper-ESC-key): use different values in terminal and
+ window modes.
+
+ * viper.el (viper-emacs-state-mode-list): delete mail-mode, add
+ jde-javadoc-checker-report-mode.
+
2005-11-24 Chong Yidong <cyd@stupidchicken.com>
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 2af0a9bbfa8..c8a5d53b504 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -200,9 +200,10 @@ Enter as a sexp. Examples: \"\\C-z\", [(control ?z)]."
:type 'string
:group 'viper)
-(defcustom viper-ESC-key [(escape)] ; "\e"
+(defcustom viper-ESC-key (if (viper-window-display-p) [(escape)] "\e")
"Key used to ESC.
-Enter as a sexp. Examples: \"\\e\", [(escape)]."
+Enter as a sexp. Examples: \"\\e\", [(escape)].
+If running in a terminal, [(escape)] is not understood, so must use \"\\e\"."
:type 'sexp
:group 'viper
:set (lambda (symbol value)
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 7bcaf8be399..754eff3906d 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -9,7 +9,7 @@
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Keywords: emulations
-(defconst viper-version "3.11.5 of October 5, 2005"
+(defconst viper-version "3.11.5 of November 25, 2005"
"The current version of Viper")
;; This file is part of GNU Emacs.
@@ -429,7 +429,6 @@ widget."
occur-mode
mh-folder-mode
- mail-mode
gnus-group-mode
gnus-summary-mode
@@ -442,6 +441,8 @@ widget."
rcirc-mode
+ jde-javadoc-checker-report-mode
+
view-mode
vm-mode
vm-summary-mode)