From 8ea74b0e4570fe6e3ee583b0655bf6137d82dc28 Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Sun, 10 Jul 2005 18:46:24 +0000 Subject: * viper-cmd.el (viper--key-maps): new variable. (viper-normalize-minor-mode-map-alist): use viper--key-maps and emulation-mode-map-alists. (viper-envelop-ESC-key): use viper-subseq. (viper-search-forward/backward/next): disable debug-on-error. * viper-keym.el (viper-toggle-key,viper-quoted-insert-key, viper-ESC-key): new defcustoms. * viper-macs.el (ex-map-read-args): use viper-subseq. * viper-util.el (viper-key-to-emacs-key): use viper-subseq. (viper-subseq): copy of subseq from cl.el. * viper.el (viper-go-away,viper-set-hooks): use emulation-mode-map-alists, advise self-insert-command, add-minor-mode. * viper-mous.el (viper-current-frame-saved): use defvar. * viper-init.el: got rid of -face in face names. * ediff-diff.el (ediff-extract-diffs,ediff-extract-diffs3): Make it work with longlines mode * ediff-mult.el (ediff-meta-mode-hook): new variable. * ediff-ptch.el (ediff-file-name-sans-prefix): quote regexp. * ediff-init: got rid of -face in face names. --- lisp/emulation/viper-init.el | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'lisp/emulation/viper-init.el') diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 6e188f21a9d..8d9aed94770 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -855,15 +855,13 @@ Related buffers can be cycled through via :R and :P commands." (t (:underline t :stipple "gray3"))) "*Face used to flash out the search pattern." :group 'viper-highlighting) -;; backward-compatibility alias -(put 'viper-search-face 'face-alias 'viper-search) ;; An internal variable. Viper takes the face from here. (defvar viper-search-face 'viper-search "Face used to flash out the search pattern. DO NOT CHANGE this variable. Instead, use the customization widget -to customize the actual face object `viper-search-face' +to customize the actual face object `viper-search' this variable represents.") -(viper-hide-face 'viper-search) +(viper-hide-face viper-search-face) (defface viper-replace-overlay @@ -871,15 +869,13 @@ this variable represents.") (t (:underline t :stipple "gray3"))) "*Face for highlighting replace regions on a window display." :group 'viper-highlighting) -;; backward-compatibility alias -(put 'viper-replace-overlay-face 'face-alias 'viper-replace-overlay) ;; An internal variable. Viper takes the face from here. (defvar viper-replace-overlay-face 'viper-replace-overlay "Face for highlighting replace regions on a window display. DO NOT CHANGE this variable. Instead, use the customization widget -to customize the actual face object `viper-replace-overlay-face' +to customize the actual face object `viper-replace-overlay' this variable represents.") -(viper-hide-face 'viper-replace-overlay) +(viper-hide-face viper-replace-overlay-face) (defface viper-minibuffer-emacs @@ -887,15 +883,13 @@ this variable represents.") (t (:weight bold))) "Face used in the Minibuffer when it is in Emacs state." :group 'viper-highlighting) -;; backward-compatibility alias -(put 'viper-minibuffer-emacs-face 'face-alias 'viper-minibuffer-emacs) ;; An internal variable. Viper takes the face from here. (defvar viper-minibuffer-emacs-face 'viper-minibuffer-emacs "Face used in the Minibuffer when it is in Emacs state. DO NOT CHANGE this variable. Instead, use the customization widget -to customize the actual face object `viper-minibuffer-emacs-face' +to customize the actual face object `viper-minibuffer-emacs' this variable represents.") -(viper-hide-face 'viper-minibuffer-emacs) +(viper-hide-face viper-minibuffer-emacs-face) (defface viper-minibuffer-insert @@ -903,15 +897,13 @@ this variable represents.") (t (:slant italic))) "Face used in the Minibuffer when it is in Insert state." :group 'viper-highlighting) -;; backward-compatibility alias -(put 'viper-minibuffer-insert-face 'face-alias 'viper-minibuffer-insert) ;; An internal variable. Viper takes the face from here. (defvar viper-minibuffer-insert-face 'viper-minibuffer-insert "Face used in the Minibuffer when it is in Insert state. DO NOT CHANGE this variable. Instead, use the customization widget -to customize the actual face object `viper-minibuffer-insert-face' +to customize the actual face object `viper-minibuffer-insert' this variable represents.") -(viper-hide-face 'viper-minibuffer-insert) +(viper-hide-face viper-minibuffer-insert-face) (defface viper-minibuffer-vi @@ -919,15 +911,13 @@ this variable represents.") (t (:inverse-video t))) "Face used in the Minibuffer when it is in Vi state." :group 'viper-highlighting) -;; backward-compatibility alias -(put 'viper-minibuffer-vi-face 'face-alias 'viper-minibuffer-vi) ;; An internal variable. Viper takes the face from here. (defvar viper-minibuffer-vi-face 'viper-minibuffer-vi "Face used in the Minibuffer when it is in Vi state. DO NOT CHANGE this variable. Instead, use the customization widget -to customize the actual face object `viper-minibuffer-vi-face' +to customize the actual face object `viper-minibuffer-vi' this variable represents.") -(viper-hide-face 'viper-minibuffer-vi) +(viper-hide-face viper-minibuffer-vi-face) ;; the current face to be used in the minibuffer (viper-deflocalvar -- cgit v1.2.1