aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2006-07-03 14:32:01 +0000
committerChong Yidong2006-07-03 14:32:01 +0000
commitb99489fee1436ad69ef8eefa6247eda8a141fa35 (patch)
treed1b91077b16e43fdb970964a8c5f4b91ece0be6b
parentb6a675073037e81f781db98e0210f8cc58de8227 (diff)
downloademacs-b99489fee1436ad69ef8eefa6247eda8a141fa35.tar.gz
emacs-b99489fee1436ad69ef8eefa6247eda8a141fa35.zip
* emulation/viper-init.el, calendar/calendar.el:
* progmodes/make-mode.el: Delete calls to facemenu-unlisted-faces.
-rw-r--r--lisp/calendar/calendar.el6
-rw-r--r--lisp/emulation/viper-init.el14
-rw-r--r--lisp/progmodes/make-mode.el2
3 files changed, 0 insertions, 22 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 6abcb74a3e2..38bcc887ec0 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -213,12 +213,6 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
213;; backward-compatibility alias 213;; backward-compatibility alias
214(put 'holiday-face 'face-alias 'holiday) 214(put 'holiday-face 'face-alias 'holiday)
215 215
216(eval-after-load "facemenu"
217 '(progn
218 (add-to-list 'facemenu-unlisted-faces 'diary)
219 (add-to-list 'facemenu-unlisted-faces 'calendar-today)
220 (add-to-list 'facemenu-unlisted-faces 'holiday)))
221
222(defcustom diary-entry-marker 216(defcustom diary-entry-marker
223 (if (not (display-color-p)) 217 (if (not (display-color-p))
224 "+" 218 "+"
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 661fc6ede7f..80938b0282a 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -854,11 +854,6 @@ Related buffers can be cycled through via :R and :P commands."
854 854
855;;; Face-saving tricks 855;;; Face-saving tricks
856 856
857(defun viper-hide-face (face)
858 (if (and (viper-has-face-support-p) viper-emacs-p)
859 (add-to-list 'facemenu-unlisted-faces face)))
860
861
862(defgroup viper-highlighting nil 857(defgroup viper-highlighting nil
863 "Hilighting of replace region, search pattern, minibuffer, etc." 858 "Hilighting of replace region, search pattern, minibuffer, etc."
864 :prefix "viper-" 859 :prefix "viper-"
@@ -876,8 +871,6 @@ Related buffers can be cycled through via :R and :P commands."
876DO NOT CHANGE this variable. Instead, use the customization widget 871DO NOT CHANGE this variable. Instead, use the customization widget
877to customize the actual face object `viper-search' 872to customize the actual face object `viper-search'
878this variable represents.") 873this variable represents.")
879(viper-hide-face viper-search-face)
880
881 874
882(defface viper-replace-overlay 875(defface viper-replace-overlay
883 '((((class color)) (:foreground "Black" :background "darkseagreen2")) 876 '((((class color)) (:foreground "Black" :background "darkseagreen2"))
@@ -890,8 +883,6 @@ this variable represents.")
890DO NOT CHANGE this variable. Instead, use the customization widget 883DO NOT CHANGE this variable. Instead, use the customization widget
891to customize the actual face object `viper-replace-overlay' 884to customize the actual face object `viper-replace-overlay'
892this variable represents.") 885this variable represents.")
893(viper-hide-face viper-replace-overlay-face)
894
895 886
896(defface viper-minibuffer-emacs 887(defface viper-minibuffer-emacs
897 '((((class color)) (:foreground "Black" :background "darkseagreen2")) 888 '((((class color)) (:foreground "Black" :background "darkseagreen2"))
@@ -904,8 +895,6 @@ this variable represents.")
904DO NOT CHANGE this variable. Instead, use the customization widget 895DO NOT CHANGE this variable. Instead, use the customization widget
905to customize the actual face object `viper-minibuffer-emacs' 896to customize the actual face object `viper-minibuffer-emacs'
906this variable represents.") 897this variable represents.")
907(viper-hide-face viper-minibuffer-emacs-face)
908
909 898
910(defface viper-minibuffer-insert 899(defface viper-minibuffer-insert
911 '((((class color)) (:foreground "Black" :background "pink")) 900 '((((class color)) (:foreground "Black" :background "pink"))
@@ -918,8 +907,6 @@ this variable represents.")
918DO NOT CHANGE this variable. Instead, use the customization widget 907DO NOT CHANGE this variable. Instead, use the customization widget
919to customize the actual face object `viper-minibuffer-insert' 908to customize the actual face object `viper-minibuffer-insert'
920this variable represents.") 909this variable represents.")
921(viper-hide-face viper-minibuffer-insert-face)
922
923 910
924(defface viper-minibuffer-vi 911(defface viper-minibuffer-vi
925 '((((class color)) (:foreground "DarkGreen" :background "grey")) 912 '((((class color)) (:foreground "DarkGreen" :background "grey"))
@@ -932,7 +919,6 @@ this variable represents.")
932DO NOT CHANGE this variable. Instead, use the customization widget 919DO NOT CHANGE this variable. Instead, use the customization widget
933to customize the actual face object `viper-minibuffer-vi' 920to customize the actual face object `viper-minibuffer-vi'
934this variable represents.") 921this variable represents.")
935(viper-hide-face viper-minibuffer-vi-face)
936 922
937;; the current face to be used in the minibuffer 923;; the current face to be used in the minibuffer
938(viper-deflocalvar 924(viper-deflocalvar
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 0a87aaa42de..109455e9e61 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -306,8 +306,6 @@ not be enclosed in { } or ( )."
306 "\\(^\\..*\\)\\|\\(.*~$\\)\\|\\(.*,v$\\)\\|\\(\\.[chy]\\)" 306 "\\(^\\..*\\)\\|\\(.*~$\\)\\|\\(.*,v$\\)\\|\\(\\.[chy]\\)"
307 "Regex for filenames that will NOT be included in the target list.") 307 "Regex for filenames that will NOT be included in the target list.")
308 308
309(if (fboundp 'facemenu-unlisted-faces)
310 (add-to-list 'facemenu-unlisted-faces 'makefile-space))
311(defvar makefile-space 'makefile-space 309(defvar makefile-space 'makefile-space
312 "Face to use for highlighting leading spaces in Font-Lock mode.") 310 "Face to use for highlighting leading spaces in Font-Lock mode.")
313 311