diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-10-06 00:09:49 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-10-06 00:09:49 +0000 |
| commit | e2de3a29450c31966bcb8336c1f52b2ad495298a (patch) | |
| tree | b0eabde48df09afaec7eb3f7ec30876c0711196b /lisp/emulation/viper-init.el | |
| parent | 20ef86730cca82a1a2e212a665c0b119ed2d70b2 (diff) | |
| download | emacs-e2de3a29450c31966bcb8336c1f52b2ad495298a.tar.gz | |
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.
Diffstat (limited to 'lisp/emulation/viper-init.el')
| -rw-r--r-- | lisp/emulation/viper-init.el | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 8aa7e4649d4..33713e8a869 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -115,11 +115,6 @@ In all likelihood, you don't need to bother with this setting." ;;; 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 @@ -1019,19 +1014,19 @@ Should be set in `~/.viper' file." (defun viper-restore-cursor-type () (condition-case nil (if viper-xemacs-p - (setq bar-cursor nil) + (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 - (setq bar-cursor 2) + (set (make-local-variable 'bar-cursor) 2) (setq cursor-type '(bar . 2)))) -;;; Local Variables: -;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun) -;;; End: +;; Local Variables: +;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun) +;; End: -;;; arch-tag: 4efa2416-1fcb-4690-be10-1a2a0248d250 +;; arch-tag: 4efa2416-1fcb-4690-be10-1a2a0248d250 ;;; viper-init.el ends here |