From 0680ea10b45687dd50abf36a540b2eb3c098c855 Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Fri, 25 Nov 2005 07:18:07 +0000 Subject: [PATCH] 2005-11-25 Michael Kifer * 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. --- lisp/ChangeLog | 8 ++++++++ lisp/emulation/viper-keym.el | 5 +++-- lisp/emulation/viper.el | 5 +++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 11df73f864..f334200b21 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2005-11-25 Michael Kifer + + * 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 * 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 2af0a9bbfa..c8a5d53b50 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 7bcaf8be39..754eff3906 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -9,7 +9,7 @@ ;; Author: Michael Kifer ;; 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) -- 2.20.1