From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 3 Jul 2006 14:32:01 +0000 (+0000)
Subject: * emulation/viper-init.el, calendar/calendar.el:
X-Git-Tag: emacs-pretest-22.0.90~1754
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b99489fee1436ad69ef8eefa6247eda8a141fa35;p=emacs.git

* emulation/viper-init.el, calendar/calendar.el:
	* progmodes/make-mode.el: Delete calls to facemenu-unlisted-faces.
---

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."
 ;; backward-compatibility alias
 (put 'holiday-face 'face-alias 'holiday)
 
-(eval-after-load "facemenu"
-  '(progn
-     (add-to-list 'facemenu-unlisted-faces 'diary)
-     (add-to-list 'facemenu-unlisted-faces 'calendar-today)
-     (add-to-list 'facemenu-unlisted-faces 'holiday)))
-
 (defcustom diary-entry-marker
   (if (not (display-color-p))
       "+"
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."
 
 ;;; Face-saving tricks
 
-(defun viper-hide-face (face)
-  (if (and (viper-has-face-support-p) viper-emacs-p)
-      (add-to-list 'facemenu-unlisted-faces face)))
-
-
 (defgroup viper-highlighting nil
   "Hilighting of replace region, search pattern, minibuffer, etc."
   :prefix "viper-"
@@ -876,8 +871,6 @@ Related buffers can be cycled through via :R and :P commands."
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-search'
 this variable represents.")
-(viper-hide-face viper-search-face)
-
 
 (defface viper-replace-overlay
   '((((class color)) (:foreground "Black" :background "darkseagreen2"))
@@ -890,8 +883,6 @@ this variable represents.")
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-replace-overlay'
 this variable represents.")
-(viper-hide-face viper-replace-overlay-face)
-
 
 (defface viper-minibuffer-emacs
   '((((class color)) (:foreground "Black" :background "darkseagreen2"))
@@ -904,8 +895,6 @@ this variable represents.")
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-minibuffer-emacs'
 this variable represents.")
-(viper-hide-face viper-minibuffer-emacs-face)
-
 
 (defface viper-minibuffer-insert
   '((((class color)) (:foreground "Black" :background "pink"))
@@ -918,8 +907,6 @@ this variable represents.")
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-minibuffer-insert'
 this variable represents.")
-(viper-hide-face viper-minibuffer-insert-face)
-
 
 (defface viper-minibuffer-vi
   '((((class color)) (:foreground "DarkGreen" :background "grey"))
@@ -932,7 +919,6 @@ this variable represents.")
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-minibuffer-vi'
 this variable represents.")
-(viper-hide-face viper-minibuffer-vi-face)
 
 ;; the current face to be used in the minibuffer
 (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 ( )."
   "\\(^\\..*\\)\\|\\(.*~$\\)\\|\\(.*,v$\\)\\|\\(\\.[chy]\\)"
   "Regex for filenames that will NOT be included in the target list.")
 
-(if (fboundp 'facemenu-unlisted-faces)
-    (add-to-list 'facemenu-unlisted-faces 'makefile-space))
 (defvar makefile-space 'makefile-space
   "Face to use for highlighting leading spaces in Font-Lock mode.")