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

[Michael Kifer]

Index: emacs/lisp/emulation/viper-cmd.el
diff -c emacs/lisp/emulation/viper-cmd.el:1.50 
emacs/lisp/emulation/viper-cmd.el:1.51
*** emacs/lisp/emulation/viper-cmd.el:1.50      Sat Sep 24 13:43:59 2005
--- emacs/lisp/emulation/viper-cmd.el   Thu Oct  6 00:09:47 2005
***************
*** 494,506 ****
                       viper-empty-keymap))
               ))
        
!   ;; in emacs with emulation-mode-map-alists, nothing needs to be done
    (unless
        (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
!     (setq minor-mode-map-alist
!         (viper-append-filter-alist
!          (append viper--intercept-key-maps viper--key-maps)
!          minor-mode-map-alist)))
    )
  
  
--- 494,513 ----
                       viper-empty-keymap))
               ))
        
!   ;; This var is not local in Emacs, so we make it local.  It must be local
!   ;; because although the stack of minor modes can be the same for all 
buffers,
!   ;; the associated *keymaps* can be different.  In Viper,
!   ;; viper-vi-local-user-map, viper-insert-local-user-map, and others can have
!   ;; different keymaps for different buffers.  Also, the keymaps associated
!   ;; with viper-vi/insert-state-modifier-minor-mode can be different.
!   ;; ***This is needed only in case emulation-mode-map-alists is not defined.
!   ;; In emacs with emulation-mode-map-alists, nothing needs to be done
    (unless
        (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
!     (set (make-local-variable 'minor-mode-map-alist)
!          (viper-append-filter-alist
!           (append viper--intercept-key-maps viper--key-maps)
!           minor-mode-map-alist)))
    )
  
  
***************
*** 509,515 ****
  
  ;; Modifies mode-line-buffer-identification.
  (defun viper-refresh-mode-line ()
!   (setq viper-mode-string
        (cond ((eq viper-current-state 'emacs-state) viper-emacs-state-id)
              ((eq viper-current-state 'vi-state) viper-vi-state-id)
              ((eq viper-current-state 'replace-state) viper-replace-state-id)
--- 516,522 ----
  
  ;; Modifies mode-line-buffer-identification.
  (defun viper-refresh-mode-line ()
!   (set (make-local-variable 'viper-mode-string)
        (cond ((eq viper-current-state 'emacs-state) viper-emacs-state-id)
              ((eq viper-current-state 'vi-state) viper-vi-state-id)
              ((eq viper-current-state 'replace-state) viper-replace-state-id)
***************
*** 4781,4787 ****
              level-changed t)
        (insert "
  Please specify your level of familiarity with the venomous VI PERil
! (and the VI Plan for Emacs Rescue).
  You can change it at any time by typing `M-x viper-set-expert-level RET'
  
   1 -- BEGINNER: Almost all Emacs features are suppressed.
--- 4788,4794 ----
              level-changed t)
        (insert "
  Please specify your level of familiarity with the venomous VI PERil
! \(and the VI Plan for Emacs Rescue).
  You can change it at any time by typing `M-x viper-set-expert-level RET'
  
   1 -- BEGINNER: Almost all Emacs features are suppressed.
***************
*** 5000,5004 ****
  
  
  
! ;;; arch-tag: 739a6450-5fda-44d0-88b0-325053d888c2
  ;;; viper-cmd.el ends here
--- 5007,5011 ----
  
  
  
! ;; arch-tag: 739a6450-5fda-44d0-88b0-325053d888c2
  ;;; viper-cmd.el ends here