Commit c4f6e489 authored by Glenn Morris's avatar Glenn Morris
Browse files

Mark face aliases with "-face" suffix as obsolete.

parent d80619fa
2009-09-01 Glenn Morris <rgm@gnu.org> 2009-09-01 Glenn Morris <rgm@gnu.org>
* add-log.el (change-log-date-face, change-log-name-face)
(change-log-email-face, change-log-file-face, change-log-list-face)
(change-log-conditionals-face, change-log-function-face)
(change-log-acknowledgement-face):
* cus-edit.el (custom-invalid-face, custom-rogue-face)
(custom-modified-face, custom-set-face, custom-changed-face)
(custom-saved-face, custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face, custom-comment-face)
(custom-comment-tag-face, custom-variable-tag-face)
(custom-variable-button-face, custom-face-tag-face)
(custom-group-tag-face-1, custom-group-tag-face):
* diff-mode.el (diff-header-face, diff-file-header-face)
(diff-index-face, diff-hunk-header-face, diff-removed-face)
(diff-added-face, diff-changed-face, diff-function-face)
(diff-context-face, diff-nonexistent-face):
* generic-x.el (show-tabs-tab-face, show-tabs-space-face):
* hilit-chg.el (highlight-changes-face, highlight-changes-delete-face):
* info.el (Info-title-1-face, Info-title-2-face, Info-title-3-face)
(Info-title-4-face):
* isearch.el (isearch-lazy-highlight-face):
* log-view.el (log-view-file-face, log-view-message-face):
* paren.el (show-paren-match-face, show-paren-mismatch-face):
* pcvs-info.el (cvs-header-face, cvs-filename-face, cvs-unknown-face)
(cvs-handled-face, cvs-need-action-face, cvs-marked-face)
(cvs-msg-face):
* smerge-mode.el (smerge-mine-face, smerge-other-face)
(smerge-base-face, smerge-markers-face):
* wid-edit.el (widget-documentation-face, widget-button-face)
(widget-field-face, widget-single-line-field-face)
(widget-inactive-face, widget-button-pressed-face):
* woman.el (woman-italic-face, woman-bold-face, woman-unknown-face)
(woman-addition-face):
* obsolete/old-whitespace.el (whitespace-highlight-face):
* progmodes/ebrowse.el (ebrowse-tree-mark-face)
(ebrowse-root-class-face, ebrowse-file-name-face)
(ebrowse-default-face, ebrowse-member-attribute-face)
(ebrowse-member-class-face, ebrowse-progress-face):
* progmodes/make-mode.el (makefile-space-face):
* progmodes/sh-script.el (sh-heredoc-face):
* textmodes/flyspell.el (flyspell-incorrect-face)
(flyspell-duplicate-face):
* textmodes/tex-mode.el (tex-math-face, tex-verbatim-face):
Mark face aliases with "-face" suffix as obsolete.
* mail/feedmail.el (file-name-buffer-file-type-alist): Define for * mail/feedmail.el (file-name-buffer-file-type-alist): Define for
compiler. compiler.
......
;;; add-log.el --- change log maintenance commands for Emacs ;;; add-log.el --- change log maintenance commands for Emacs
;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2001, ;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2001,
;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
;; Free Software Foundation, Inc.
;; Maintainer: FSF ;; Maintainer: FSF
;; Keywords: tools ;; Keywords: tools
...@@ -180,64 +181,59 @@ Note: The search is conducted only within 10%, at the beginning of the file." ...@@ -180,64 +181,59 @@ Note: The search is conducted only within 10%, at the beginning of the file."
"Face used to highlight dates in date lines." "Face used to highlight dates in date lines."
:version "21.1" :version "21.1"
:group 'change-log) :group 'change-log)
;; backward-compatibility alias (define-obsolete-face-alias 'change-log-date-face 'change-log-date "22.1")
(put 'change-log-date-face 'face-alias 'change-log-date)
(defface change-log-name (defface change-log-name
'((t (:inherit font-lock-constant-face))) '((t (:inherit font-lock-constant-face)))
"Face for highlighting author names." "Face for highlighting author names."
:version "21.1" :version "21.1"
:group 'change-log) :group 'change-log)
;; backward-compatibility alias (define-obsolete-face-alias 'change-log-name-face 'change-log-name "22.1")
(put 'change-log-name-face 'face-alias 'change-log-name)
(defface change-log-email (defface change-log-email
'((t (:inherit font-lock-variable-name-face))) '((t (:inherit font-lock-variable-name-face)))
"Face for highlighting author email addresses." "Face for highlighting author email addresses."
:version "21.1" :version "21.1"
:group 'change-log) :group 'change-log)
;; backward-compatibility alias (define-obsolete-face-alias 'change-log-email-face 'change-log-email "22.1")
(put 'change-log-email-face 'face-alias 'change-log-email)
(defface change-log-file (defface change-log-file
'((t (:inherit font-lock-function-name-face))) '((t (:inherit font-lock-function-name-face)))
"Face for highlighting file names." "Face for highlighting file names."
:version "21.1" :version "21.1"
:group 'change-log) :group 'change-log)
;; backward-compatibility alias (define-obsolete-face-alias 'change-log-file-face 'change-log-file "22.1")
(put 'change-log-file-face 'face-alias 'change-log-file)
(defface change-log-list (defface change-log-list
'((t (:inherit font-lock-keyword-face))) '((t (:inherit font-lock-keyword-face)))
"Face for highlighting parenthesized lists of functions or variables." "Face for highlighting parenthesized lists of functions or variables."
:version "21.1" :version "21.1"
:group 'change-log) :group 'change-log)
;; backward-compatibility alias (define-obsolete-face-alias 'change-log-list-face 'change-log-list "22.1")
(put 'change-log-list-face 'face-alias 'change-log-list)
(defface change-log-conditionals (defface change-log-conditionals
'((t (:inherit font-lock-variable-name-face))) '((t (:inherit font-lock-variable-name-face)))
"Face for highlighting conditionals of the form `[...]'." "Face for highlighting conditionals of the form `[...]'."
:version "21.1" :version "21.1"
:group 'change-log) :group 'change-log)
;; backward-compatibility alias (define-obsolete-face-alias 'change-log-conditionals-face
(put 'change-log-conditionals-face 'face-alias 'change-log-conditionals) 'change-log-conditionals "22.1")
(defface change-log-function (defface change-log-function
'((t (:inherit font-lock-variable-name-face))) '((t (:inherit font-lock-variable-name-face)))
"Face for highlighting items of the form `<....>'." "Face for highlighting items of the form `<....>'."
:version "21.1" :version "21.1"
:group 'change-log) :group 'change-log)
;; backward-compatibility alias (define-obsolete-face-alias 'change-log-function-face
(put 'change-log-function-face 'face-alias 'change-log-function) 'change-log-function "22.1")
(defface change-log-acknowledgement (defface change-log-acknowledgement
'((t (:inherit font-lock-comment-face))) '((t (:inherit font-lock-comment-face)))
"Face for highlighting acknowledgments." "Face for highlighting acknowledgments."
:version "21.1" :version "21.1"
:group 'change-log) :group 'change-log)
;; backward-compatibility alias (define-obsolete-face-alias 'change-log-acknowledgement-face
(put 'change-log-acknowledgement-face 'face-alias 'change-log-acknowledgement) 'change-log-acknowledgement "22.1")
(defconst change-log-file-names-re "^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)") (defconst change-log-file-names-re "^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)")
(defconst change-log-start-entry-re "^\\sw.........[0-9:+ ]*") (defconst change-log-start-entry-re "^\\sw.........[0-9:+ ]*")
......
;;; cus-edit.el --- tools for customizing Emacs and Lisp packages ;;; cus-edit.el --- tools for customizing Emacs and Lisp packages
;; ;;
;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; ;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Maintainer: FSF ;; Maintainer: FSF
...@@ -1813,8 +1813,7 @@ item in another window.\n\n")) ...@@ -1813,8 +1813,7 @@ item in another window.\n\n"))
(:weight bold :slant italic :underline t))) (:weight bold :slant italic :underline t)))
"Face used when the customize item is invalid." "Face used when the customize item is invalid."
:group 'custom-magic-faces) :group 'custom-magic-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-invalid-face 'custom-invalid "22.1")
(put 'custom-invalid-face 'face-alias 'custom-invalid)
(defface custom-rogue '((((class color)) (defface custom-rogue '((((class color))
(:foreground "pink" :background "black")) (:foreground "pink" :background "black"))
...@@ -1822,8 +1821,7 @@ item in another window.\n\n")) ...@@ -1822,8 +1821,7 @@ item in another window.\n\n"))
(:underline t))) (:underline t)))
"Face used when the customize item is not defined for customization." "Face used when the customize item is not defined for customization."
:group 'custom-magic-faces) :group 'custom-magic-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-rogue-face 'custom-rogue "22.1")
(put 'custom-rogue-face 'face-alias 'custom-rogue)
(defface custom-modified '((((min-colors 88) (class color)) (defface custom-modified '((((min-colors 88) (class color))
(:foreground "white" :background "blue1")) (:foreground "white" :background "blue1"))
...@@ -1833,8 +1831,7 @@ item in another window.\n\n")) ...@@ -1833,8 +1831,7 @@ item in another window.\n\n"))
(:slant italic :bold))) (:slant italic :bold)))
"Face used when the customize item has been modified." "Face used when the customize item has been modified."
:group 'custom-magic-faces) :group 'custom-magic-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-modified-face 'custom-modified "22.1")
(put 'custom-modified-face 'face-alias 'custom-modified)
(defface custom-set '((((min-colors 88) (class color)) (defface custom-set '((((min-colors 88) (class color))
(:foreground "blue1" :background "white")) (:foreground "blue1" :background "white"))
...@@ -1844,8 +1841,7 @@ item in another window.\n\n")) ...@@ -1844,8 +1841,7 @@ item in another window.\n\n"))
(:slant italic))) (:slant italic)))
"Face used when the customize item has been set." "Face used when the customize item has been set."
:group 'custom-magic-faces) :group 'custom-magic-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-set-face 'custom-set "22.1")
(put 'custom-set-face 'face-alias 'custom-set)
(defface custom-changed '((((min-colors 88) (class color)) (defface custom-changed '((((min-colors 88) (class color))
(:foreground "white" :background "blue1")) (:foreground "white" :background "blue1"))
...@@ -1855,8 +1851,7 @@ item in another window.\n\n")) ...@@ -1855,8 +1851,7 @@ item in another window.\n\n"))
(:slant italic))) (:slant italic)))
"Face used when the customize item has been changed." "Face used when the customize item has been changed."
:group 'custom-magic-faces) :group 'custom-magic-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-changed-face 'custom-changed "22.1")
(put 'custom-changed-face 'face-alias 'custom-changed)
(defface custom-themed '((((min-colors 88) (class color)) (defface custom-themed '((((min-colors 88) (class color))
(:foreground "white" :background "blue1")) (:foreground "white" :background "blue1"))
...@@ -1870,8 +1865,7 @@ item in another window.\n\n")) ...@@ -1870,8 +1865,7 @@ item in another window.\n\n"))
(defface custom-saved '((t (:underline t))) (defface custom-saved '((t (:underline t)))
"Face used when the customize item has been saved." "Face used when the customize item has been saved."
:group 'custom-magic-faces) :group 'custom-magic-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-saved-face 'custom-saved "22.1")
(put 'custom-saved-face 'face-alias 'custom-saved)
(defconst custom-magic-alist (defconst custom-magic-alist
'((nil "#" underline "\ '((nil "#" underline "\
...@@ -2068,8 +2062,7 @@ and `face'." ...@@ -2068,8 +2062,7 @@ and `face'."
"Face for custom buffer buttons if `custom-raised-buttons' is non-nil." "Face for custom buffer buttons if `custom-raised-buttons' is non-nil."
:version "21.1" :version "21.1"
:group 'custom-faces) :group 'custom-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-button-face 'custom-button "22.1")
(put 'custom-button-face 'face-alias 'custom-button)
(defface custom-button-mouse (defface custom-button-mouse
'((((type x w32 ns) (class color)) '((((type x w32 ns) (class color))
...@@ -2105,8 +2098,8 @@ and `face'." ...@@ -2105,8 +2098,8 @@ and `face'."
"Face for pressed custom buttons if `custom-raised-buttons' is non-nil." "Face for pressed custom buttons if `custom-raised-buttons' is non-nil."
:version "21.1" :version "21.1"
:group 'custom-faces) :group 'custom-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-button-pressed-face
(put 'custom-button-pressed-face 'face-alias 'custom-button-pressed) 'custom-button-pressed "22.1")
(defface custom-button-pressed-unraised (defface custom-button-pressed-unraised
'((default :inherit custom-button-unraised) '((default :inherit custom-button-unraised)
...@@ -2124,8 +2117,8 @@ and `face'." ...@@ -2124,8 +2117,8 @@ and `face'."
(defface custom-documentation '((t nil)) (defface custom-documentation '((t nil))
"Face used for documentation strings in customization buffers." "Face used for documentation strings in customization buffers."
:group 'custom-faces) :group 'custom-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-documentation-face
(put 'custom-documentation-face 'face-alias 'custom-documentation) 'custom-documentation "22.1")
(defface custom-state '((((class color) (defface custom-state '((((class color)
(background dark)) (background dark))
...@@ -2136,8 +2129,7 @@ and `face'." ...@@ -2136,8 +2129,7 @@ and `face'."
(t nil)) (t nil))
"Face used for State descriptions in the customize buffer." "Face used for State descriptions in the customize buffer."
:group 'custom-faces) :group 'custom-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-state-face 'custom-state "22.1")
(put 'custom-state-face 'face-alias 'custom-state)
(defface custom-link (defface custom-link
'((t :inherit link)) '((t :inherit link))
...@@ -2370,8 +2362,7 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." ...@@ -2370,8 +2362,7 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
"Face used for comments on variables or faces." "Face used for comments on variables or faces."
:version "21.1" :version "21.1"
:group 'custom-faces) :group 'custom-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-comment-face 'custom-comment "22.1")
(put 'custom-comment-face 'face-alias 'custom-comment)
;; like font-lock-comment-face ;; like font-lock-comment-face
(defface custom-comment-tag (defface custom-comment-tag
...@@ -2384,8 +2375,7 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." ...@@ -2384,8 +2375,7 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
(t (:weight bold))) (t (:weight bold)))
"Face used for the comment tag on variables or faces." "Face used for the comment tag on variables or faces."
:group 'custom-faces) :group 'custom-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-comment-tag-face 'custom-comment-tag "22.1")
(put 'custom-comment-tag-face 'face-alias 'custom-comment-tag)
(define-widget 'custom-comment 'string (define-widget 'custom-comment 'string
"User comment." "User comment."
...@@ -2438,14 +2428,14 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." ...@@ -2438,14 +2428,14 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
(t (:weight bold))) (t (:weight bold)))
"Face used for unpushable variable tags." "Face used for unpushable variable tags."
:group 'custom-faces) :group 'custom-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-variable-tag-face
(put 'custom-variable-tag-face 'face-alias 'custom-variable-tag) 'custom-variable-tag "22.1")
(defface custom-variable-button '((t (:underline t :weight bold))) (defface custom-variable-button '((t (:underline t :weight bold)))
"Face used for pushable variable tags." "Face used for pushable variable tags."
:group 'custom-faces) :group 'custom-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-variable-button-face
(put 'custom-variable-button-face 'face-alias 'custom-variable-button) 'custom-variable-button "22.1")
(defcustom custom-variable-default-form 'edit (defcustom custom-variable-default-form 'edit
"Default form of displaying variable values." "Default form of displaying variable values."
...@@ -3217,8 +3207,7 @@ Only match frames that support the specified face attributes.") ...@@ -3217,8 +3207,7 @@ Only match frames that support the specified face attributes.")
`((t :inherit custom-variable-tag)) `((t :inherit custom-variable-tag))
"Face used for face tags." "Face used for face tags."
:group 'custom-faces) :group 'custom-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-face-tag-face 'custom-face-tag "22.1")
(put 'custom-face-tag-face 'face-alias 'custom-face-tag)
(defcustom custom-face-default-form 'selected (defcustom custom-face-default-form 'selected
"Default form of displaying face definition." "Default form of displaying face definition."
...@@ -3802,8 +3791,7 @@ and so forth. The remaining group tags are shown with `custom-group-tag'." ...@@ -3802,8 +3791,7 @@ and so forth. The remaining group tags are shown with `custom-group-tag'."
(t (:weight bold))) (t (:weight bold)))
"Face used for group tags." "Face used for group tags."
:group 'custom-faces) :group 'custom-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-group-tag-face-1 'custom-group-tag-1 "22.1")
(put 'custom-group-tag-face-1 'face-alias 'custom-group-tag-1)
(defface custom-group-tag (defface custom-group-tag
`((((class color) `((((class color)
...@@ -3818,8 +3806,7 @@ and so forth. The remaining group tags are shown with `custom-group-tag'." ...@@ -3818,8 +3806,7 @@ and so forth. The remaining group tags are shown with `custom-group-tag'."
(t (:weight bold))) (t (:weight bold)))
"Face used for low level group tags." "Face used for low level group tags."
:group 'custom-faces) :group 'custom-faces)
;; backward-compatibility alias (define-obsolete-face-alias 'custom-group-tag-face 'custom-group-tag "22.1")
(put 'custom-group-tag-face 'face-alias 'custom-group-tag)
(define-widget 'custom-group 'custom (define-widget 'custom-group 'custom
"Customize group." "Customize group."
......
;;; diff-mode.el --- a mode for viewing/editing context diffs ;;; diff-mode.el --- a mode for viewing/editing context diffs
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,2005, 2006,
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; 2007, 2008, 2009 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: convenience patch diff ;; Keywords: convenience patch diff
...@@ -242,8 +242,7 @@ try to refine the current hunk, as well." ...@@ -242,8 +242,7 @@ try to refine the current hunk, as well."
(t :weight bold)) (t :weight bold))
"`diff-mode' face inherited by hunk and index header faces." "`diff-mode' face inherited by hunk and index header faces."
:group 'diff-mode) :group 'diff-mode)
;; backward-compatibility alias (define-obsolete-face-alias 'diff-header-face 'diff-header "22.1")
(put 'diff-header-face 'face-alias 'diff-header)
(defvar diff-header-face 'diff-header) (defvar diff-header-face 'diff-header)
(defface diff-file-header (defface diff-file-header
...@@ -258,40 +257,35 @@ try to refine the current hunk, as well." ...@@ -258,40 +257,35 @@ try to refine the current hunk, as well."
(t :weight bold)) ; :height 1.3 (t :weight bold)) ; :height 1.3
"`diff-mode' face used to highlight file header lines." "`diff-mode' face used to highlight file header lines."
:group 'diff-mode) :group 'diff-mode)
;; backward-compatibility alias (define-obsolete-face-alias 'diff-file-header-face 'diff-file-header "22.1")
(put 'diff-file-header-face 'face-alias 'diff-file-header)
(defvar diff-file-header-face 'diff-file-header) (defvar diff-file-header-face 'diff-file-header)
(defface diff-index (defface diff-index
'((t :inherit diff-file-header)) '((t :inherit diff-file-header))
"`diff-mode' face used to highlight index header lines." "`diff-mode' face used to highlight index header lines."
:group 'diff-mode) :group 'diff-mode)
;; backward-compatibility alias (define-obsolete-face-alias 'diff-index-face 'diff-index "22.1")
(put 'diff-index-face 'face-alias 'diff-index)
(defvar diff-index-face 'diff-index) (defvar diff-index-face 'diff-index)
(defface diff-hunk-header (defface diff-hunk-header
'((t :inherit diff-header)) '((t :inherit diff-header))
"`diff-mode' face used to highlight hunk header lines." "`diff-mode' face used to highlight hunk header lines."
:group 'diff-mode) :group 'diff-mode)
;; backward-compatibility alias (define-obsolete-face-alias 'diff-hunk-header-face 'diff-hunk-header "22.1")
(put 'diff-hunk-header-face 'face-alias 'diff-hunk-header)
(defvar diff-hunk-header-face 'diff-hunk-header) (defvar diff-hunk-header-face 'diff-hunk-header)
(defface diff-removed (defface diff-removed
'((t :inherit diff-changed)) '((t :inherit diff-changed))
"`diff-mode' face used to highlight removed lines." "`diff-mode' face used to highlight removed lines."
:group 'diff-mode) :group 'diff-mode)
;; backward-compatibility alias (define-obsolete-face-alias 'diff-removed-face 'diff-removed "22.1")
(put 'diff-removed-face 'face-alias 'diff-removed)
(defvar diff-removed-face 'diff-removed) (defvar diff-removed-face 'diff-removed)
(defface diff-added (defface diff-added
'((t :inherit diff-changed)) '((t :inherit diff-changed))
"`diff-mode' face used to highlight added lines." "`diff-mode' face used to highlight added lines."
:group 'diff-mode) :group 'diff-mode)
;; backward-compatibility alias (define-obsolete-face-alias 'diff-added-face 'diff-added "22.1")
(put 'diff-added-face 'face-alias 'diff-added)
(defvar diff-added-face 'diff-added) (defvar diff-added-face 'diff-added)
(defface diff-changed (defface diff-changed
...@@ -301,8 +295,7 @@ try to refine the current hunk, as well." ...@@ -301,8 +295,7 @@ try to refine the current hunk, as well."
:foreground "yellow" :weight bold :slant italic)) :foreground "yellow" :weight bold :slant italic))
"`diff-mode' face used to highlight changed lines." "`diff-mode' face used to highlight changed lines."
:group 'diff-mode) :group 'diff-mode)
;; backward-compatibility alias (define-obsolete-face-alias 'diff-changed-face 'diff-changed "22.1")
(put 'diff-changed-face 'face-alias 'diff-changed)
(defvar diff-changed-face 'diff-changed) (defvar diff-changed-face 'diff-changed)
(defface diff-indicator-removed (defface diff-indicator-removed
...@@ -330,24 +323,21 @@ try to refine the current hunk, as well." ...@@ -330,24 +323,21 @@ try to refine the current hunk, as well."
'((t :inherit diff-header)) '((t :inherit diff-header))
"`diff-mode' face used to highlight function names produced by \"diff -p\"." "`diff-mode' face used to highlight function names produced by \"diff -p\"."
:group 'diff-mode) :group 'diff-mode)
;; backward-compatibility alias (define-obsolete-face-alias 'diff-function-face 'diff-function "22.1")
(put 'diff-function-face 'face-alias 'diff-function)
(defvar diff-function-face 'diff-function) (defvar diff-function-face 'diff-function)
(defface diff-context (defface diff-context
'((((class color grayscale) (min-colors 88)) :inherit shadow)) '((((class color grayscale) (min-colors 88)) :inherit shadow))
"`diff-mode' face used to highlight context and other side-information." "`diff-mode' face used to highlight context and other side-information."
:group 'diff-mode) :group 'diff-mode)
;; backward-compatibility alias (define-obsolete-face-alias 'diff-context-face 'diff-context "22.1")
(put 'diff-context-face 'face-alias 'diff-context)
(defvar diff-context-face 'diff-context) (defvar diff-context-face 'diff-context)
(defface diff-nonexistent (defface diff-nonexistent
'((t :inherit diff-file-header)) '((t :inherit diff-file-header))
"`diff-mode' face used to highlight nonexistent files in recursive diffs." "`diff-mode' face used to highlight nonexistent files in recursive diffs."
:group 'diff-mode) :group 'diff-mode)
;; backward-compatibility alias (define-obsolete-face-alias 'diff-nonexistent-face 'diff-nonexistent "22.1")
(put 'diff-nonexistent-face 'face-alias 'diff-nonexistent)
(defvar diff-nonexistent-face 'diff-nonexistent) (defvar diff-nonexistent-face 'diff-nonexistent)
(defconst diff-yank-handler '(diff-yank-function)) (defconst diff-yank-handler '(diff-yank-function))
......
;;; generic-x.el --- A collection of generic modes ;;; generic-x.el --- A collection of generic modes
;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; 2008, 2009 Free Software Foundation, Inc.
;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Author: Peter Breton <pbreton@cs.umb.edu>
;; Created: Tue Oct 08 1996 ;; Created: Tue Oct 08 1996
...@@ -1775,8 +1775,7 @@ like an INI file. You can add this hook to `find-file-hook'." ...@@ -1775,8 +1775,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(t (:weight bold))) (t (:weight bold)))
"Font Lock mode face used to highlight TABs." "Font Lock mode face used to highlight TABs."
:group 'generic-x) :group 'generic-x)
;; backward-compatibility alias (define-obsolete-face-alias 'show-tabs-tab-face 'show-tabs-tab "22.1")
(put 'show-tabs-tab-face 'face-alias 'show-tabs-tab)
(defface show-tabs-space (defface show-tabs-space
'((((class grayscale) (background light)) (:background "DimGray" :weight bold)) '((((class grayscale) (background light)) (:background "DimGray" :weight bold))
...@@ -1786,8 +1785,7 @@ like an INI file. You can add this hook to `find-file-hook'." ...@@ -1786,8 +1785,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(t (:weight bold))) (t (:weight bold)))
"Font Lock mode face used to highlight spaces." "Font Lock mode face used to highlight spaces."
:group 'generic-x) :group 'generic-x)
;; backward-compatibility alias (define-obsolete-face-alias 'show-tabs-space-face 'show-tabs-space "22.1")
(put 'show-tabs-space-face 'face-alias 'show-tabs-space)
(define-generic-mode show-tabs-generic-mode (define-generic-mode show-tabs-generic-mode
nil ;; no comment char nil ;; no comment char
......