(tempo-local-tags, tempo-user-elements, tempo-use-tag-list):

[gnu-emacs] / lisp / emulation / viper-keym.el

diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index eb23130c44a620a123c77bb77d9018c893113030..9ff7cd83f4fc06da2ce48397aae9f2ffa46df5fc 100644 (file)
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -1,4 +1,6 @@
-;;; viper-keym.el -- Main Viper keymaps
+;;; viper-keym.el --- main Viper keymaps
+
+;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -28,6 +30,10 @@
 (defvar vip-vi-intercept-map (make-sparse-keymap))
 (defvar vip-insert-intercept-map (make-sparse-keymap))
 (defvar vip-emacs-intercept-map (make-sparse-keymap))
+
+;; keymap used to zap all keymaps other than function-key-map,
+;; devide-function-key-map, etc.
+(defvar vip-overriding-map (make-sparse-keymap))
   
 (vip-deflocalvar vip-vi-local-user-map (make-sparse-keymap)
   "Keymap for user-defined local bindings.
@@ -87,6 +93,11 @@ vip-insert-basic-map. Not recommended, except for novice users.")
 ;; This keymap should stay empty
 (defvar vip-empty-keymap (make-sparse-keymap))
 
+;; This was the main Vi mode in old versions of VIP which may have been
+;; extensively used by VIP users. We declare it as a global var
+;; and, after .vip is loaded, we add this keymap to vip-vi-basic-map.
+(defvar vip-mode-map (make-sparse-keymap))
+
 
 ;;; Variables used by minor modes
 
@@ -292,7 +303,7 @@ vip-insert-basic-map. Not recommended, except for novice users.")
 (define-key vip-vi-basic-map "t" 'vip-goto-char-forward)
 (define-key vip-vi-basic-map "u" 'vip-undo)
 (define-key vip-vi-basic-map "v" 'find-file)
-(define-key vip-vi-basic-map "\C-v" 'vip-find-file-other-frame)
+(define-key vip-vi-basic-map "\C-v" 'find-file-other-frame)
 (define-key vip-vi-basic-map "w" 'vip-forward-word)
 (define-key vip-vi-basic-map "x" 'vip-delete-char)
 (define-key vip-vi-basic-map "y" 'vip-command-argument)
@@ -426,8 +437,8 @@ Arguments: (major-mode vip-state keymap)"
     (vip-set-mode-vars-for vip-current-state)))
 
     
+;; Displays variables that control Viper's keymaps
 (defun vip-debug-keymaps ()
-  "Displays variables that control Viper's keymaps."
   (interactive)
   (with-output-to-temp-buffer " *vip-debug*"
     (princ (format "Buffer name:  %s\n\n" (buffer-name)))