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

[Michael Kifer]

Index: emacs/lisp/emulation/viper-init.el
diff -c emacs/lisp/emulation/viper-init.el:1.35 
emacs/lisp/emulation/viper-init.el:1.36
*** emacs/lisp/emulation/viper-init.el:1.35     Tue Sep 20 17:47:26 2005
--- emacs/lisp/emulation/viper-init.el  Thu Oct  6 00:09:47 2005
***************
*** 115,125 ****
  
  ;;; Macros
  
- ;; Fool the compiler to avoid warnings.
- ;; Viper calls make-variable-buffer-local from within other functions, which
- ;; triggers compiler warnings.
- (defalias 'viper-make-variable-buffer-local 'make-variable-buffer-local)
- 
  (defmacro viper-deflocalvar (var default-value &optional documentation)
    `(progn
      (defvar ,var ,default-value
--- 115,120 ----
***************
*** 1019,1037 ****
  (defun viper-restore-cursor-type ()
    (condition-case nil
        (if viper-xemacs-p
!         (setq bar-cursor nil)
        (setq cursor-type default-cursor-type))
      (error nil)))
  
  (defun viper-set-insert-cursor-type ()
    (if viper-xemacs-p
!       (setq bar-cursor 2)
      (setq cursor-type '(bar . 2))))
  
  
! ;;; Local Variables:
! ;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
! ;;; End:
  
! ;;; arch-tag: 4efa2416-1fcb-4690-be10-1a2a0248d250
  ;;; viper-init.el ends here
--- 1014,1032 ----
  (defun viper-restore-cursor-type ()
    (condition-case nil
        (if viper-xemacs-p
!         (set (make-local-variable 'bar-cursor) nil)
        (setq cursor-type default-cursor-type))
      (error nil)))
  
  (defun viper-set-insert-cursor-type ()
    (if viper-xemacs-p
!       (set (make-local-variable 'bar-cursor) 2)
      (setq cursor-type '(bar . 2))))
  
  
! ;; Local Variables:
! ;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
! ;; End:
  
! ;; arch-tag: 4efa2416-1fcb-4690-be10-1a2a0248d250
  ;;; viper-init.el ends here