procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't set removed variable facemenu-unlisted-faces

Browse source 
* lisp/vc/ediff-init.el (ediff-hide-face): Redefine as obsolete
function alias for 'ignore'; the variable 'facemenu-unlisted-faces'
was removed in Emacs 22.  Remove all calls.

* lisp/mh-e/mh-e.el: Add comment saying that the variable
'facemenu-unlisted-faces' is removed.
This commit is contained in:
Stefan Kangas 2021-02-04 08:16:33 +01:00
parent b01ee9a114
commit e4cafc5430
2 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/mh-e/mh-e.el
View file

@ -3412,6 +3412,7 @@ sequence."
;;; Faces (:group 'mh-faces + group where faces described)
(if (boundp 'facemenu-unlisted-faces)
;; This variable was removed in Emacs 22.1.
(add-to-list 'facemenu-unlisted-faces "^mh-"))
;; To add a new face:

28
lisp/vc/ediff-init.el
View file

@ -797,13 +797,6 @@ to temp files in buffer jobs and when Ediff needs to find fine differences."
(message "Pixmap not found for %S: %s" (face-name face) pixmap)
(sit-for 1)))))
(defun ediff-hide-face (face)
(if (and (ediff-has-face-support-p)
(boundp 'add-to-list)
(boundp 'facemenu-unlisted-faces))
(add-to-list 'facemenu-unlisted-faces face)))
(defface ediff-current-diff-A
'((((class color) (min-colors 88) (background light))
@ -824,7 +817,6 @@ to temp files in buffer jobs and when Ediff needs to find fine differences."
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-current-diff-A'
this variable represents.")
(ediff-hide-face ediff-current-diff-face-A)
(defface ediff-current-diff-B
'((((class color) (min-colors 88) (background light))
@ -846,7 +838,6 @@ this variable represents.")
this variable. Instead, use the customization
widget to customize the actual face `ediff-current-diff-B'
this variable represents.")
(ediff-hide-face ediff-current-diff-face-B)
(defface ediff-current-diff-C
'((((class color) (min-colors 88) (background light))
@ -867,7 +858,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-current-diff-C'
this variable represents.")
(ediff-hide-face ediff-current-diff-face-C)
(defface ediff-current-diff-Ancestor
'((((class color) (min-colors 88) (background light))
@ -890,7 +880,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-current-diff-Ancestor'
this variable represents.")
(ediff-hide-face ediff-current-diff-face-Ancestor)
(defface ediff-fine-diff-A
'((((class color) (min-colors 88) (background light))
@ -911,7 +900,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-fine-diff-A'
this variable represents.")
(ediff-hide-face ediff-fine-diff-face-A)
(defface ediff-fine-diff-B
'((((class color) (min-colors 88) (background light))
@ -932,7 +920,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-fine-diff-B'
this variable represents.")
(ediff-hide-face ediff-fine-diff-face-B)
(defface ediff-fine-diff-C
'((((class color) (min-colors 88) (background light))
@ -956,7 +943,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-fine-diff-C'
this variable represents.")
(ediff-hide-face ediff-fine-diff-face-C)
(defface ediff-fine-diff-Ancestor
'((((class color) (min-colors 88) (background light))
@ -981,7 +967,6 @@ ancestor buffer."
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-fine-diff-Ancestor'
this variable represents.")
(ediff-hide-face ediff-fine-diff-face-Ancestor)
;; Some installs don't have stipple or Stipple. So, try them in turn.
(defvar stipple-pixmap
@ -1012,7 +997,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-even-diff-A'
this variable represents.")
(ediff-hide-face ediff-even-diff-face-A)
(defface ediff-even-diff-B
`((((class color) (min-colors 88))
@ -1031,7 +1015,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-even-diff-B'
this variable represents.")
(ediff-hide-face ediff-even-diff-face-B)
(defface ediff-even-diff-C
`((((type pc))
@ -1053,7 +1036,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-even-diff-C'
this variable represents.")
(ediff-hide-face ediff-even-diff-face-C)
(defface ediff-even-diff-Ancestor
`((((type pc))
@ -1075,7 +1057,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-even-diff-Ancestor'
this variable represents.")
(ediff-hide-face ediff-even-diff-face-Ancestor)
;; Association between buffer types and even-diff-face symbols
(defconst ediff-even-diff-face-alist
@ -1103,8 +1084,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-odd-diff-A'
this variable represents.")
(ediff-hide-face ediff-odd-diff-face-A)
(defface ediff-odd-diff-B
'((((type pc))
@ -1125,7 +1104,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-odd-diff-B'
this variable represents.")
(ediff-hide-face ediff-odd-diff-face-B)
(defface ediff-odd-diff-C
'((((type pc))
@ -1146,7 +1124,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-odd-diff-C'
this variable represents.")
(ediff-hide-face ediff-odd-diff-face-C)
(defface ediff-odd-diff-Ancestor
'((((class color) (min-colors 88))
@ -1165,7 +1142,6 @@ this variable represents.")
DO NOT CHANGE this variable. Instead, use the customization
widget to customize the actual face object `ediff-odd-diff-Ancestor'
this variable represents.")
(ediff-hide-face ediff-odd-diff-face-Ancestor)
;; Association between buffer types and odd-diff-face symbols
(defconst ediff-odd-diff-face-alist
@ -1571,6 +1547,8 @@ This default should work without changes."
(ediff-file-attributes filename 5))
;;; Obsolete
(defun ediff-convert-standard-filename (fname)
(declare (obsolete convert-standard-filename "28.1"))
(convert-standard-filename fname))
@ -1578,5 +1556,7 @@ This default should work without changes."
(define-obsolete-function-alias 'ediff-with-syntax-table
#'with-syntax-table "27.1")
(define-obsolete-function-alias 'ediff-hide-face #'ignore "28.1")
(provide 'ediff-init)
;;; ediff-init.el ends here