[Emacs-diffs] Changes to emacs/lisp/emulation/viper-keym.el

[Michael Kifer]

Index: emacs/lisp/emulation/viper-keym.el
diff -c emacs/lisp/emulation/viper-keym.el:1.31 
emacs/lisp/emulation/viper-keym.el:1.32
*** emacs/lisp/emulation/viper-keym.el:1.31     Tue May 17 17:29:06 2005
--- emacs/lisp/emulation/viper-keym.el  Fri Jun  3 08:04:03 2005
***************
*** 50,65 ****
  
  ;;; Variables
  
! (defvar viper-toggle-key "\C-z"
    "The key used to change states from emacs to Vi and back.
  In insert mode, this key also functions as Meta.
  Must be set in .viper file or prior to loading Viper.
! This setting cannot be changed interactively.")
  
! (defvar viper-ESC-key "\e"
    "Key used to ESC.
  Must be set in .viper file or prior to loading Viper.
! This setting cannot be changed interactively.")
  
  ;;; Emacs keys in other states.
  
--- 50,74 ----
  
  ;;; Variables
  
! (defcustom viper-toggle-key "\C-z"
    "The key used to change states from emacs to Vi and back.
  In insert mode, this key also functions as Meta.
  Must be set in .viper file or prior to loading Viper.
! This setting cannot be changed interactively."
!   :type 'string
!   :group 'viper)
! 
! (defcustom viper-quoted-insert-key "\C-v"
!   "The key used to quote special characters when inserting them in Insert 
state."
!   :type 'string
!   :group 'viper)
  
! (defcustom viper-ESC-key "\e"
    "Key used to ESC.
  Must be set in .viper file or prior to loading Viper.
! This setting cannot be changed interactively."
!   :type 'string
!   :group 'viper)
  
  ;;; Emacs keys in other states.
  
***************
*** 242,248 ****
  (define-key viper-insert-basic-map "\C-t" 'viper-forward-indent)
  (define-key viper-insert-basic-map
    (if viper-xemacs-p [(shift tab)] [S-tab]) 'viper-insert-tab)
! (define-key viper-insert-basic-map "\C-v" 'quoted-insert)
  (define-key viper-insert-basic-map "\C-?" 'viper-del-backward-char-in-insert)
  (define-key viper-insert-basic-map [backspace] 
'viper-del-backward-char-in-insert)
  (define-key viper-insert-basic-map "\C-\\" 'viper-alternate-Meta-key)
--- 251,257 ----
  (define-key viper-insert-basic-map "\C-t" 'viper-forward-indent)
  (define-key viper-insert-basic-map
    (if viper-xemacs-p [(shift tab)] [S-tab]) 'viper-insert-tab)
! (define-key viper-insert-basic-map viper-quoted-insert-key 'quoted-insert)
  (define-key viper-insert-basic-map "\C-?" 'viper-del-backward-char-in-insert)
  (define-key viper-insert-basic-map [backspace] 
'viper-del-backward-char-in-insert)
  (define-key viper-insert-basic-map "\C-\\" 'viper-alternate-Meta-key)