[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.85 emacs/lisp/emulation/viper.el:1.86
*** emacs/lisp/emulation/viper.el:1.85  Tue Sep 20 17:47:25 2005
--- emacs/lisp/emulation/viper.el       Thu Oct  6 00:09:47 2005
***************
*** 9,15 ****
  ;; Author: Michael Kifer <address@hidden>
  ;; Keywords: emulations
  
! (defconst viper-version "3.11.5 of September 19, 2005"
    "The current version of Viper")
  
  ;; This file is part of GNU Emacs.
--- 9,15 ----
  ;; Author: Michael Kifer <address@hidden>
  ;; Keywords: emulations
  
! (defconst viper-version "3.11.5 of October 5, 2005"
    "The current version of Viper")
  
  ;; This file is part of GNU Emacs.
***************
*** 605,612 ****
                    ))
              (viper-set-expert-level 'dont-change-unless)))
  
-       (if viper-xemacs-p
-           (viper-make-variable-buffer-local 'bar-cursor))
        (if (eq major-mode 'viper-mode)
            (setq major-mode 'fundamental-mode))
  
--- 605,610 ----
***************
*** 627,634 ****
  
  ;; This hook designed to enable Vi-style editing in comint-based modes."
  (defun viper-comint-mode-hook ()
!   (setq require-final-newline nil
!       viper-ex-style-editing nil
        viper-ex-style-motion nil)
    (viper-change-state-to-insert))
  
--- 625,632 ----
  
  ;; This hook designed to enable Vi-style editing in comint-based modes."
  (defun viper-comint-mode-hook ()
!   (set (make-local-variable 'require-final-newline) nil)
!   (setq viper-ex-style-editing nil
        viper-ex-style-motion nil)
    (viper-change-state-to-insert))
  
***************
*** 1000,1016 ****
  ;; these are primarily advices and Vi-ish variable settings
  (defun viper-non-hook-settings ()
  
-   ;; 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
-   (unless
-       (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
-     (viper-make-variable-buffer-local 'minor-mode-map-alist))
- 
    ;; Viper changes the default mode-line-buffer-identification
    (setq-default mode-line-buffer-identification '(" %b"))
  
--- 998,1003 ----
***************
*** 1018,1025 ****
    (setq next-line-add-newlines nil
        require-final-newline t)
  
-   (viper-make-variable-buffer-local 'require-final-newline)
- 
    ;; don't bark when mark is inactive
    (if viper-emacs-p
        (setq mark-even-if-inactive t))
--- 1005,1010 ----
***************
*** 1027,1033 ****
    (setq scroll-step 1)
  
    ;; Variable displaying the current Viper state in the mode line.
-   (viper-deflocalvar viper-mode-string viper-emacs-state-id)
    (or (memq 'viper-mode-string global-mode-string)
        (setq global-mode-string
            (append '("" viper-mode-string) (cdr global-mode-string))))
--- 1012,1017 ----
***************
*** 1336,1344 ****
  (provide 'viper)
  
  
! ;;; Local Variables:
! ;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
! ;;; End:
  
! ;;; arch-tag: 5f3e844c-c4e6-4bbd-9b73-63bdc14e7d79
  ;;; viper.el ends here
--- 1320,1328 ----
  (provide 'viper)
  
  
! ;; Local Variables:
! ;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
! ;; End:
  
! ;; arch-tag: 5f3e844c-c4e6-4bbd-9b73-63bdc14e7d79
  ;;; viper.el ends here