comparison lisp/emulation/viper-init.el @ 83310:e58cb448e07c

Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350-422) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-350 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-351 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-352 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-353 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-354 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-355 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-356 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-357 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-358 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-359 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-360 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-361 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-362 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-363 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-364 Remove "-face" suffix from widget faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-365 Remove "-face" suffix from custom faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366 Remove "-face" suffix from change-log faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-367 Remove "-face" suffix from compilation faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368 Remove "-face" suffix from diff-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-369 lisp/longlines.el (longlines-visible-face): Face removed * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-370 Remove "-face" suffix from woman faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-371 Remove "-face" suffix from whitespace-highlight face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-372 Remove "-face" suffix from ruler-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-373 Remove "-face" suffix from show-paren faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374 Remove "-face" suffix from log-view faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375 Remove "-face" suffix from smerge faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-376 Remove "-face" suffix from show-tabs faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377 Remove "-face" suffix from highlight-changes faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-378 Remove "-face" suffix from and downcase info faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-379 Remove "-face" suffix from pcvs faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-380 Update uses of renamed pcvs faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-381 Tweak ChangeLog * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-382 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-383 Remove "-face" suffix from strokes-char face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-384 Remove "-face" suffix from compare-windows face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-385 Remove "-face" suffix from calendar faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-386 Remove "-face" suffix from diary-button face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-387 Remove "-face" suffix from testcover faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-388 Remove "-face" suffix from viper faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-389 Remove "-face" suffix from org faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-390 Remove "-face" suffix from sgml-namespace face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-391 Remove "-face" suffix from table-cell face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-392 Remove "-face" suffix from tex-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-393 Remove "-face" suffix from texinfo-heading face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-394 Remove "-face" suffix from flyspell faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-395 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-396 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-397 Remove "-face" suffix from gomoku faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-398 Remove "-face" suffix from mpuz faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-399 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-400 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-401 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-402 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-403 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-404 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-405 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-406 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-407 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-408 Remove "-face" suffix from Buffer-menu-buffer face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-409 Remove "-face" suffix from antlr-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-410 Remove "-face" suffix from ebrowse faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-411 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-412 Remove "-face" suffix from flymake faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-413 Remove "-face" suffix from idlwave faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414 Remove "-face" suffix from sh-script faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-415 Remove "-face" suffix from vhdl-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-416 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-417 Remove "-face" suffix from which-func face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-418 Remove "-face" suffix from cperl-mode faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-419 Remove "-face" suffix from ld-script faces * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-420 Fix cperl-mode font-lock problem * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-421 Tweak which-func face * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-422 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-80 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-81 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-82 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-350
author Karoly Lorentey <lorentey@elte.hu>
date Wed, 15 Jun 2005 12:57:51 +0000
parents 389421e988c2 ac0fb9e12515
children 6c13700d1c13
comparison
equal deleted inserted replaced
83309:6aee1e9b0bd7 83310:e58cb448e07c
1 ;;; viper-init.el --- some common definitions for Viper 1 ;;; viper-init.el --- some common definitions for Viper
2 2
3 ;; Copyright (C) 1997, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. 3 ;; Copyright (C) 1997, 98, 99, 2000, 01, 02, 05 Free Software Foundation, Inc.
4 4
5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> 5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
6 6
7 ;; This file is part of GNU Emacs. 7 ;; This file is part of GNU Emacs.
8 8
848 "Hilighting of replace region, search pattern, minibuffer, etc." 848 "Hilighting of replace region, search pattern, minibuffer, etc."
849 :prefix "viper-" 849 :prefix "viper-"
850 :group 'viper) 850 :group 'viper)
851 851
852 852
853 (defface viper-search-face 853 (defface viper-search
854 '((((class color)) (:foreground "Black" :background "khaki")) 854 '((((class color)) (:foreground "Black" :background "khaki"))
855 (t (:underline t :stipple "gray3"))) 855 (t (:underline t :stipple "gray3")))
856 "*Face used to flash out the search pattern." 856 "*Face used to flash out the search pattern."
857 :group 'viper-highlighting) 857 :group 'viper-highlighting)
858 ;; backward-compatibility alias
859 (put 'viper-search-face 'face-alias 'viper-search)
858 ;; An internal variable. Viper takes the face from here. 860 ;; An internal variable. Viper takes the face from here.
859 (defvar viper-search-face 'viper-search-face 861 (defvar viper-search-face 'viper-search
860 "Face used to flash out the search pattern. 862 "Face used to flash out the search pattern.
861 DO NOT CHANGE this variable. Instead, use the customization widget 863 DO NOT CHANGE this variable. Instead, use the customization widget
862 to customize the actual face object `viper-search-face' 864 to customize the actual face object `viper-search-face'
863 this variable represents.") 865 this variable represents.")
864 (viper-hide-face 'viper-search-face) 866 (viper-hide-face 'viper-search)
865 867
866 868
867 (defface viper-replace-overlay-face 869 (defface viper-replace-overlay
868 '((((class color)) (:foreground "Black" :background "darkseagreen2")) 870 '((((class color)) (:foreground "Black" :background "darkseagreen2"))
869 (t (:underline t :stipple "gray3"))) 871 (t (:underline t :stipple "gray3")))
870 "*Face for highlighting replace regions on a window display." 872 "*Face for highlighting replace regions on a window display."
871 :group 'viper-highlighting) 873 :group 'viper-highlighting)
874 ;; backward-compatibility alias
875 (put 'viper-replace-overlay-face 'face-alias 'viper-replace-overlay)
872 ;; An internal variable. Viper takes the face from here. 876 ;; An internal variable. Viper takes the face from here.
873 (defvar viper-replace-overlay-face 'viper-replace-overlay-face 877 (defvar viper-replace-overlay-face 'viper-replace-overlay
874 "Face for highlighting replace regions on a window display. 878 "Face for highlighting replace regions on a window display.
875 DO NOT CHANGE this variable. Instead, use the customization widget 879 DO NOT CHANGE this variable. Instead, use the customization widget
876 to customize the actual face object `viper-replace-overlay-face' 880 to customize the actual face object `viper-replace-overlay-face'
877 this variable represents.") 881 this variable represents.")
878 (viper-hide-face 'viper-replace-overlay-face) 882 (viper-hide-face 'viper-replace-overlay)
879 883
880 884
881 (defface viper-minibuffer-emacs-face 885 (defface viper-minibuffer-emacs
882 '((((class color)) (:foreground "Black" :background "darkseagreen2")) 886 '((((class color)) (:foreground "Black" :background "darkseagreen2"))
883 (t (:weight bold))) 887 (t (:weight bold)))
884 "Face used in the Minibuffer when it is in Emacs state." 888 "Face used in the Minibuffer when it is in Emacs state."
885 :group 'viper-highlighting) 889 :group 'viper-highlighting)
890 ;; backward-compatibility alias
891 (put 'viper-minibuffer-emacs-face 'face-alias 'viper-minibuffer-emacs)
886 ;; An internal variable. Viper takes the face from here. 892 ;; An internal variable. Viper takes the face from here.
887 (defvar viper-minibuffer-emacs-face 'viper-minibuffer-emacs-face 893 (defvar viper-minibuffer-emacs-face 'viper-minibuffer-emacs
888 "Face used in the Minibuffer when it is in Emacs state. 894 "Face used in the Minibuffer when it is in Emacs state.
889 DO NOT CHANGE this variable. Instead, use the customization widget 895 DO NOT CHANGE this variable. Instead, use the customization widget
890 to customize the actual face object `viper-minibuffer-emacs-face' 896 to customize the actual face object `viper-minibuffer-emacs-face'
891 this variable represents.") 897 this variable represents.")
892 (viper-hide-face 'viper-minibuffer-emacs-face) 898 (viper-hide-face 'viper-minibuffer-emacs)
893 899
894 900
895 (defface viper-minibuffer-insert-face 901 (defface viper-minibuffer-insert
896 '((((class color)) (:foreground "Black" :background "pink")) 902 '((((class color)) (:foreground "Black" :background "pink"))
897 (t (:slant italic))) 903 (t (:slant italic)))
898 "Face used in the Minibuffer when it is in Insert state." 904 "Face used in the Minibuffer when it is in Insert state."
899 :group 'viper-highlighting) 905 :group 'viper-highlighting)
906 ;; backward-compatibility alias
907 (put 'viper-minibuffer-insert-face 'face-alias 'viper-minibuffer-insert)
900 ;; An internal variable. Viper takes the face from here. 908 ;; An internal variable. Viper takes the face from here.
901 (defvar viper-minibuffer-insert-face 'viper-minibuffer-insert-face 909 (defvar viper-minibuffer-insert-face 'viper-minibuffer-insert
902 "Face used in the Minibuffer when it is in Insert state. 910 "Face used in the Minibuffer when it is in Insert state.
903 DO NOT CHANGE this variable. Instead, use the customization widget 911 DO NOT CHANGE this variable. Instead, use the customization widget
904 to customize the actual face object `viper-minibuffer-insert-face' 912 to customize the actual face object `viper-minibuffer-insert-face'
905 this variable represents.") 913 this variable represents.")
906 (viper-hide-face 'viper-minibuffer-insert-face) 914 (viper-hide-face 'viper-minibuffer-insert)
907 915
908 916
909 (defface viper-minibuffer-vi-face 917 (defface viper-minibuffer-vi
910 '((((class color)) (:foreground "DarkGreen" :background "grey")) 918 '((((class color)) (:foreground "DarkGreen" :background "grey"))
911 (t (:inverse-video t))) 919 (t (:inverse-video t)))
912 "Face used in the Minibuffer when it is in Vi state." 920 "Face used in the Minibuffer when it is in Vi state."
913 :group 'viper-highlighting) 921 :group 'viper-highlighting)
922 ;; backward-compatibility alias
923 (put 'viper-minibuffer-vi-face 'face-alias 'viper-minibuffer-vi)
914 ;; An internal variable. Viper takes the face from here. 924 ;; An internal variable. Viper takes the face from here.
915 (defvar viper-minibuffer-vi-face 'viper-minibuffer-vi-face 925 (defvar viper-minibuffer-vi-face 'viper-minibuffer-vi
916 "Face used in the Minibuffer when it is in Vi state. 926 "Face used in the Minibuffer when it is in Vi state.
917 DO NOT CHANGE this variable. Instead, use the customization widget 927 DO NOT CHANGE this variable. Instead, use the customization widget
918 to customize the actual face object `viper-minibuffer-vi-face' 928 to customize the actual face object `viper-minibuffer-vi-face'
919 this variable represents.") 929 this variable represents.")
920 (viper-hide-face 'viper-minibuffer-vi-face) 930 (viper-hide-face 'viper-minibuffer-vi)
921 931
922 ;; the current face to be used in the minibuffer 932 ;; the current face to be used in the minibuffer
923 (viper-deflocalvar 933 (viper-deflocalvar
924 viper-minibuffer-current-face viper-minibuffer-emacs-face "") 934 viper-minibuffer-current-face viper-minibuffer-emacs-face "")
925 935