Mercurial > emacs

comparison lisp/emulation/viper-init.el @ 65856:d64aeb0dc54e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu> * ediff-merge.el (ediff-merge-region-is-non-clash): new defsubst. (ediff-merge-region-is-non-clash-to-skip): previouslu called ediff-merge-region-is-non-clash. * ediff-mult.el (ediff-append-custom-diff,ediff-meta-show-patch): use insert-buffer-substring. * ediff-ptch.el (ediff-fixup-patch-map): use better heuristics for selecting files to patch. Also bug fixes. * ediff-util.el (ediff-setup): bug fix. (ediff-next-difference): Never skip clashes that differ in white space only. * ediff-wind.el (ediff-setup-control-frame,ediff-destroy-control-frame): check the menubar feature. * viper-cmd.el (viper-normalize-minor-mode-map-alist, viper-refresh-mode-line): use make-local-variable to localize some vars instead of make-variable-buffer-local. Suggested by Stefan Monnier. * viper-init.el (viper-make-variable-buffer-local): delete alias. (viper-restore-cursor-type,viper-set-insert-cursor-type): use make-local-variable instead of make-variable-buffer-local. Suggested by Stefan Monnier. * viper.el (viper-mode): don't use viper-make-variable-buffer-local. (viper-comint-mode-hook): use make-local-variable on require-final-newline. (viper-non-hook-settings): don't use make-variable-buffer-local.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Thu, 06 Oct 2005 00:09:49 +0000
parents 511f8e9d22ca
children 067115a6e738 08b4dd6a6e87 aa89c814f853
comparison
equal deleted inserted replaced
65855:97ab21c68453 65856:d64aeb0dc54e
112 (viper-emacs-p (memq (viper-device-type) '(pc))) 112 (viper-emacs-p (memq (viper-device-type) '(pc)))
113 (viper-xemacs-p (memq (viper-device-type) '(tty pc))))) 113 (viper-xemacs-p (memq (viper-device-type) '(tty pc)))))
114 114
115 115
116 ;;; Macros 116 ;;; Macros
117
118 ;; Fool the compiler to avoid warnings.
119 ;; Viper calls make-variable-buffer-local from within other functions, which
120 ;; triggers compiler warnings.
121 (defalias 'viper-make-variable-buffer-local 'make-variable-buffer-local)
122 117
123 (defmacro viper-deflocalvar (var default-value &optional documentation) 118 (defmacro viper-deflocalvar (var default-value &optional documentation)
124 `(progn 119 `(progn
125 (defvar ,var ,default-value 120 (defvar ,var ,default-value
126 ,(format "%s\n\(buffer local\)" documentation)) 121 ,(format "%s\n\(buffer local\)" documentation))
1017 :group 'viper-hooks) 1012 :group 'viper-hooks)
1018 1013
1019 (defun viper-restore-cursor-type () 1014 (defun viper-restore-cursor-type ()
1020 (condition-case nil 1015 (condition-case nil
1021 (if viper-xemacs-p 1016 (if viper-xemacs-p
1022 (setq bar-cursor nil) 1017 (set (make-local-variable 'bar-cursor) nil)
1023 (setq cursor-type default-cursor-type)) 1018 (setq cursor-type default-cursor-type))
1024 (error nil))) 1019 (error nil)))
1025 1020
1026 (defun viper-set-insert-cursor-type () 1021 (defun viper-set-insert-cursor-type ()
1027 (if viper-xemacs-p 1022 (if viper-xemacs-p
1028 (setq bar-cursor 2) 1023 (set (make-local-variable 'bar-cursor) 2)
1029 (setq cursor-type '(bar . 2)))) 1024 (setq cursor-type '(bar . 2))))
1030 1025
1031 1026
1032 ;;; Local Variables: 1027 ;; Local Variables:
1033 ;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun) 1028 ;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
1034 ;;; End: 1029 ;; End:
1035 1030
1036 ;;; arch-tag: 4efa2416-1fcb-4690-be10-1a2a0248d250 1031 ;; arch-tag: 4efa2416-1fcb-4690-be10-1a2a0248d250
1037 ;;; viper-init.el ends here 1032 ;;; viper-init.el ends here