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

[Michael Kifer]

Index: emacs/lisp/emulation/viper.el
diff -c emacs/lisp/emulation/viper.el:1.69 emacs/lisp/emulation/viper.el:1.70
*** emacs/lisp/emulation/viper.el:1.69  Mon Dec 24 00:50:31 2001
--- emacs/lisp/emulation/viper.el       Mon Jan  7 23:36:00 2002
***************
*** 3,14 ****
  ;;             and a venomous VI PERil.
  ;;             Viper Is also a Package for Emacs Rebels.
  
! ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01 Free Software Foundation, 
Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  ;; Keywords: emulations
  
! (defconst viper-version "3.11.1 of September 9, 2001"
    "The current version of Viper")
  
  ;; This file is part of GNU Emacs.
--- 3,14 ----
  ;;             and a venomous VI PERil.
  ;;             Viper Is also a Package for Emacs Rebels.
  
! ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software 
Foundation, Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  ;; Keywords: emulations
  
! (defconst viper-version "3.11.2 of January 4, 2002"
    "The current version of Viper")
  
  ;; This file is part of GNU Emacs.
***************
*** 353,361 ****
  ;; Non-viper variables that need to be saved in case the user decides to
  ;; de-viperize emacs.
  (defvar viper-saved-non-viper-variables nil)
- ;; Contains user settings for vars affected by viper-set-expert-level 
function.
- ;; Not a user option.
- (defvar viper-saved-user-settings nil)
               
  (defcustom viper-mode (cond (noninteractive nil)
                            (t 'ask))
--- 353,358 ----
***************
*** 1056,1081 ****
  
    ) ; end viper-non-hook-settings
  
- ;; Viperized read-key-sequence
- (defun viper-read-key-sequence (prompt &optional continue-echo)
-   (let (inhibit-quit event keyseq)
-     (setq keyseq (read-key-sequence prompt continue-echo))
-     (setq event (if viper-xemacs-p
-                   (elt keyseq 0) ; XEmacs returns vector of events
-                 (elt (listify-key-sequence keyseq) 0)))
-     (if (viper-ESC-event-p event)
-       (let (unread-command-events)
-         (viper-set-unread-command-events keyseq)
-         (if (viper-fast-keysequence-p)
-             (let ((viper-vi-global-user-minor-mode  nil)
-                   (viper-vi-local-user-minor-mode  nil)
-                   (viper-replace-minor-mode nil) ; actually unnecessary
-                   (viper-insert-global-user-minor-mode  nil)
-                   (viper-insert-local-user-minor-mode  nil))
-               (setq keyseq (read-key-sequence prompt continue-echo))) 
-           (setq keyseq (read-key-sequence prompt continue-echo)))))
-     keyseq))
- 
  
  
  ;; Ask only if this-command/last-command are nil, i.e., when loading
--- 1053,1058 ----
***************
*** 1122,1135 ****
  
  
  
- ;; Get viper standard value of SYMBOL.  If symbol is customized, get its
- ;; standard value.  Otherwise, get the value saved in the alist STORAGE.  If
- ;; STORAGE is nil, use viper-saved-user-settings. 
- (defun viper-standard-value (symbol &optional storage)
-   (or (eval (car (get symbol 'customized-value)))
-       (eval (car (get symbol 'saved-value)))
-       (nth 1 (assoc symbol (or storage viper-saved-user-settings)))))
- 
  
  
  ;; save non-viper vars that Viper might change
--- 1099,1104 ----