summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog44
-rw-r--r--lisp/add-log.el30
-rw-r--r--lisp/cus-edit.el59
-rw-r--r--lisp/diff-mode.el34
-rw-r--r--lisp/generic-x.el10
-rw-r--r--lisp/hilit-chg.el14
-rw-r--r--lisp/info.el12
-rw-r--r--lisp/isearch.el6
-rw-r--r--lisp/log-view.el9
-rw-r--r--lisp/obsolete/old-whitespace.el8
-rw-r--r--lisp/paren.el11
-rw-r--r--lisp/pcvs-info.el21
-rw-r--r--lisp/progmodes/ebrowse.el23
-rw-r--r--lisp/progmodes/make-mode.el2
-rw-r--r--lisp/progmodes/sh-script.el8
-rw-r--r--lisp/smerge-mode.el12
-rw-r--r--lisp/textmodes/flyspell.el10
-rw-r--r--lisp/textmodes/tex-mode.el6
-rw-r--r--lisp/wid-edit.el22
-rw-r--r--lisp/woman.el8
20 files changed, 166 insertions, 183 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66e5caea47d..76cb0f150f4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,49 @@
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
compiler.
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 30c9520a66d..c8b34a6e081 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -1,7 +1,8 @@
;;; add-log.el --- change log maintenance commands for Emacs
;; 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
;; Keywords: tools
@@ -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."
:version "21.1"
:group 'change-log)
-;; backward-compatibility alias
-(put 'change-log-date-face 'face-alias 'change-log-date)
+(define-obsolete-face-alias 'change-log-date-face 'change-log-date "22.1")
(defface change-log-name
'((t (:inherit font-lock-constant-face)))
"Face for highlighting author names."
:version "21.1"
:group 'change-log)
-;; backward-compatibility alias
-(put 'change-log-name-face 'face-alias 'change-log-name)
+(define-obsolete-face-alias 'change-log-name-face 'change-log-name "22.1")
(defface change-log-email
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting author email addresses."
:version "21.1"
:group 'change-log)
-;; backward-compatibility alias
-(put 'change-log-email-face 'face-alias 'change-log-email)
+(define-obsolete-face-alias 'change-log-email-face 'change-log-email "22.1")
(defface change-log-file
'((t (:inherit font-lock-function-name-face)))
"Face for highlighting file names."
:version "21.1"
:group 'change-log)
-;; backward-compatibility alias
-(put 'change-log-file-face 'face-alias 'change-log-file)
+(define-obsolete-face-alias 'change-log-file-face 'change-log-file "22.1")
(defface change-log-list
'((t (:inherit font-lock-keyword-face)))
"Face for highlighting parenthesized lists of functions or variables."
:version "21.1"
:group 'change-log)
-;; backward-compatibility alias
-(put 'change-log-list-face 'face-alias 'change-log-list)
+(define-obsolete-face-alias 'change-log-list-face 'change-log-list "22.1")
(defface change-log-conditionals
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting conditionals of the form `[...]'."
:version "21.1"
:group 'change-log)
-;; backward-compatibility alias
-(put 'change-log-conditionals-face 'face-alias 'change-log-conditionals)
+(define-obsolete-face-alias 'change-log-conditionals-face
+ 'change-log-conditionals "22.1")
(defface change-log-function
'((t (:inherit font-lock-variable-name-face)))
"Face for highlighting items of the form `<....>'."
:version "21.1"
:group 'change-log)
-;; backward-compatibility alias
-(put 'change-log-function-face 'face-alias 'change-log-function)
+(define-obsolete-face-alias 'change-log-function-face
+ 'change-log-function "22.1")
(defface change-log-acknowledgement
'((t (:inherit font-lock-comment-face)))
"Face for highlighting acknowledgments."
:version "21.1"
:group 'change-log)
-;; backward-compatibility alias
-(put 'change-log-acknowledgement-face 'face-alias 'change-log-acknowledgement)
+(define-obsolete-face-alias 'change-log-acknowledgement-face
+ 'change-log-acknowledgement "22.1")
(defconst change-log-file-names-re "^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)")
(defconst change-log-start-entry-re "^\\sw.........[0-9:+ ]*")
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index e0413c19d6c..d2a3244e8f9 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1,7 +1,7 @@
;;; cus-edit.el --- tools for customizing Emacs and Lisp packages
;;
-;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Maintainer: FSF
@@ -1813,8 +1813,7 @@ item in another window.\n\n"))
(:weight bold :slant italic :underline t)))
"Face used when the customize item is invalid."
:group 'custom-magic-faces)
-;; backward-compatibility alias
-(put 'custom-invalid-face 'face-alias 'custom-invalid)
+(define-obsolete-face-alias 'custom-invalid-face 'custom-invalid "22.1")
(defface custom-rogue '((((class color))
(:foreground "pink" :background "black"))
@@ -1822,8 +1821,7 @@ item in another window.\n\n"))
(:underline t)))
"Face used when the customize item is not defined for customization."
:group 'custom-magic-faces)
-;; backward-compatibility alias
-(put 'custom-rogue-face 'face-alias 'custom-rogue)
+(define-obsolete-face-alias 'custom-rogue-face 'custom-rogue "22.1")
(defface custom-modified '((((min-colors 88) (class color))
(:foreground "white" :background "blue1"))
@@ -1833,8 +1831,7 @@ item in another window.\n\n"))
(:slant italic :bold)))
"Face used when the customize item has been modified."
:group 'custom-magic-faces)
-;; backward-compatibility alias
-(put 'custom-modified-face 'face-alias 'custom-modified)
+(define-obsolete-face-alias 'custom-modified-face 'custom-modified "22.1")
(defface custom-set '((((min-colors 88) (class color))
(:foreground "blue1" :background "white"))
@@ -1844,8 +1841,7 @@ item in another window.\n\n"))
(:slant italic)))
"Face used when the customize item has been set."
:group 'custom-magic-faces)
-;; backward-compatibility alias
-(put 'custom-set-face 'face-alias 'custom-set)
+(define-obsolete-face-alias 'custom-set-face 'custom-set "22.1")
(defface custom-changed '((((min-colors 88) (class color))
(:foreground "white" :background "blue1"))
@@ -1855,8 +1851,7 @@ item in another window.\n\n"))
(:slant italic)))
"Face used when the customize item has been changed."
:group 'custom-magic-faces)
-;; backward-compatibility alias
-(put 'custom-changed-face 'face-alias 'custom-changed)
+(define-obsolete-face-alias 'custom-changed-face 'custom-changed "22.1")
(defface custom-themed '((((min-colors 88) (class color))
(:foreground "white" :background "blue1"))
@@ -1870,8 +1865,7 @@ item in another window.\n\n"))
(defface custom-saved '((t (:underline t)))
"Face used when the customize item has been saved."
:group 'custom-magic-faces)
-;; backward-compatibility alias
-(put 'custom-saved-face 'face-alias 'custom-saved)
+(define-obsolete-face-alias 'custom-saved-face 'custom-saved "22.1")
(defconst custom-magic-alist
'((nil "#" underline "\
@@ -2068,8 +2062,7 @@ and `face'."
"Face for custom buffer buttons if `custom-raised-buttons' is non-nil."
:version "21.1"
:group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-button-face 'face-alias 'custom-button)
+(define-obsolete-face-alias 'custom-button-face 'custom-button "22.1")
(defface custom-button-mouse
'((((type x w32 ns) (class color))
@@ -2105,8 +2098,8 @@ and `face'."
"Face for pressed custom buttons if `custom-raised-buttons' is non-nil."
:version "21.1"
:group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-button-pressed-face 'face-alias 'custom-button-pressed)
+(define-obsolete-face-alias 'custom-button-pressed-face
+ 'custom-button-pressed "22.1")
(defface custom-button-pressed-unraised
'((default :inherit custom-button-unraised)
@@ -2124,8 +2117,8 @@ and `face'."
(defface custom-documentation '((t nil))
"Face used for documentation strings in customization buffers."
:group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-documentation-face 'face-alias 'custom-documentation)
+(define-obsolete-face-alias 'custom-documentation-face
+ 'custom-documentation "22.1")
(defface custom-state '((((class color)
(background dark))
@@ -2136,8 +2129,7 @@ and `face'."
(t nil))
"Face used for State descriptions in the customize buffer."
:group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-state-face 'face-alias 'custom-state)
+(define-obsolete-face-alias 'custom-state-face 'custom-state "22.1")
(defface custom-link
'((t :inherit link))
@@ -2370,8 +2362,7 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
"Face used for comments on variables or faces."
:version "21.1"
:group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-comment-face 'face-alias 'custom-comment)
+(define-obsolete-face-alias 'custom-comment-face 'custom-comment "22.1")
;; like font-lock-comment-face
(defface custom-comment-tag
@@ -2384,8 +2375,7 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
(t (:weight bold)))
"Face used for the comment tag on variables or faces."
:group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-comment-tag-face 'face-alias 'custom-comment-tag)
+(define-obsolete-face-alias 'custom-comment-tag-face 'custom-comment-tag "22.1")
(define-widget 'custom-comment 'string
"User comment."
@@ -2438,14 +2428,14 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
(t (:weight bold)))
"Face used for unpushable variable tags."
:group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-variable-tag-face 'face-alias 'custom-variable-tag)
+(define-obsolete-face-alias 'custom-variable-tag-face
+ 'custom-variable-tag "22.1")
(defface custom-variable-button '((t (:underline t :weight bold)))
"Face used for pushable variable tags."
:group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-variable-button-face 'face-alias 'custom-variable-button)
+(define-obsolete-face-alias 'custom-variable-button-face
+ 'custom-variable-button "22.1")
(defcustom custom-variable-default-form 'edit
"Default form of displaying variable values."
@@ -3217,8 +3207,7 @@ Only match frames that support the specified face attributes.")
`((t :inherit custom-variable-tag))
"Face used for face tags."
:group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-face-tag-face 'face-alias 'custom-face-tag)
+(define-obsolete-face-alias 'custom-face-tag-face 'custom-face-tag "22.1")
(defcustom custom-face-default-form 'selected
"Default form of displaying face definition."
@@ -3802,8 +3791,7 @@ and so forth. The remaining group tags are shown with `custom-group-tag'."
(t (:weight bold)))
"Face used for group tags."
:group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-group-tag-face-1 'face-alias 'custom-group-tag-1)
+(define-obsolete-face-alias 'custom-group-tag-face-1 'custom-group-tag-1 "22.1")
(defface custom-group-tag
`((((class color)
@@ -3818,8 +3806,7 @@ and so forth. The remaining group tags are shown with `custom-group-tag'."
(t (:weight bold)))
"Face used for low level group tags."
:group 'custom-faces)
-;; backward-compatibility alias
-(put 'custom-group-tag-face 'face-alias 'custom-group-tag)
+(define-obsolete-face-alias 'custom-group-tag-face 'custom-group-tag "22.1")
(define-widget 'custom-group 'custom
"Customize group."
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index cf4947d20fd..56bcde521ac 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1,7 +1,7 @@
;;; diff-mode.el --- a mode for viewing/editing context diffs
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,2005, 2006,
+;; 2007, 2008, 2009 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: convenience patch diff
@@ -242,8 +242,7 @@ try to refine the current hunk, as well."
(t :weight bold))
"`diff-mode' face inherited by hunk and index header faces."
:group 'diff-mode)
-;; backward-compatibility alias
-(put 'diff-header-face 'face-alias 'diff-header)
+(define-obsolete-face-alias 'diff-header-face 'diff-header "22.1")
(defvar diff-header-face 'diff-header)
(defface diff-file-header
@@ -258,40 +257,35 @@ try to refine the current hunk, as well."
(t :weight bold)) ; :height 1.3
"`diff-mode' face used to highlight file header lines."
:group 'diff-mode)
-;; backward-compatibility alias
-(put 'diff-file-header-face 'face-alias 'diff-file-header)
+(define-obsolete-face-alias 'diff-file-header-face 'diff-file-header "22.1")
(defvar diff-file-header-face 'diff-file-header)
(defface diff-index
'((t :inherit diff-file-header))
"`diff-mode' face used to highlight index header lines."
:group 'diff-mode)
-;; backward-compatibility alias
-(put 'diff-index-face 'face-alias 'diff-index)
+(define-obsolete-face-alias 'diff-index-face 'diff-index "22.1")
(defvar diff-index-face 'diff-index)
(defface diff-hunk-header
'((t :inherit diff-header))
"`diff-mode' face used to highlight hunk header lines."
:group 'diff-mode)
-;; backward-compatibility alias
-(put 'diff-hunk-header-face 'face-alias 'diff-hunk-header)
+(define-obsolete-face-alias 'diff-hunk-header-face 'diff-hunk-header "22.1")
(defvar diff-hunk-header-face 'diff-hunk-header)
(defface diff-removed
'((t :inherit diff-changed))
"`diff-mode' face used to highlight removed lines."
:group 'diff-mode)
-;; backward-compatibility alias
-(put 'diff-removed-face 'face-alias 'diff-removed)
+(define-obsolete-face-alias 'diff-removed-face 'diff-removed "22.1")
(defvar diff-removed-face 'diff-removed)
(defface diff-added
'((t :inherit diff-changed))
"`diff-mode' face used to highlight added lines."
:group 'diff-mode)
-;; backward-compatibility alias
-(put 'diff-added-face 'face-alias 'diff-added)
+(define-obsolete-face-alias 'diff-added-face 'diff-added "22.1")
(defvar diff-added-face 'diff-added)
(defface diff-changed
@@ -301,8 +295,7 @@ try to refine the current hunk, as well."
:foreground "yellow" :weight bold :slant italic))
"`diff-mode' face used to highlight changed lines."
:group 'diff-mode)
-;; backward-compatibility alias
-(put 'diff-changed-face 'face-alias 'diff-changed)
+(define-obsolete-face-alias 'diff-changed-face 'diff-changed "22.1")
(defvar diff-changed-face 'diff-changed)
(defface diff-indicator-removed
@@ -330,24 +323,21 @@ try to refine the current hunk, as well."
'((t :inherit diff-header))
"`diff-mode' face used to highlight function names produced by \"diff -p\"."
:group 'diff-mode)
-;; backward-compatibility alias
-(put 'diff-function-face 'face-alias 'diff-function)
+(define-obsolete-face-alias 'diff-function-face 'diff-function "22.1")
(defvar diff-function-face 'diff-function)
(defface diff-context
'((((class color grayscale) (min-colors 88)) :inherit shadow))
"`diff-mode' face used to highlight context and other side-information."
:group 'diff-mode)
-;; backward-compatibility alias
-(put 'diff-context-face 'face-alias 'diff-context)
+(define-obsolete-face-alias 'diff-context-face 'diff-context "22.1")
(defvar diff-context-face 'diff-context)
(defface diff-nonexistent
'((t :inherit diff-file-header))
"`diff-mode' face used to highlight nonexistent files in recursive diffs."
:group 'diff-mode)
-;; backward-compatibility alias
-(put 'diff-nonexistent-face 'face-alias 'diff-nonexistent)
+(define-obsolete-face-alias 'diff-nonexistent-face 'diff-nonexistent "22.1")
(defvar diff-nonexistent-face 'diff-nonexistent)
(defconst diff-yank-handler '(diff-yank-function))
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 3677c9732a9..06e663441bd 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1,7 +1,7 @@
;;; generic-x.el --- A collection of generic modes
-;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009 Free Software Foundation, Inc.
;; Author: Peter Breton <pbreton@cs.umb.edu>
;; Created: Tue Oct 08 1996
@@ -1775,8 +1775,7 @@ like an INI file. You can add this hook to `find-file-hook'."
(t (:weight bold)))
"Font Lock mode face used to highlight TABs."
:group 'generic-x)
-;; backward-compatibility alias
-(put 'show-tabs-tab-face 'face-alias 'show-tabs-tab)
+(define-obsolete-face-alias 'show-tabs-tab-face 'show-tabs-tab "22.1")
(defface show-tabs-space
'((((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'."
(t (:weight bold)))
"Font Lock mode face used to highlight spaces."
:group 'generic-x)
-;; backward-compatibility alias
-(put 'show-tabs-space-face 'face-alias 'show-tabs-space)
+(define-obsolete-face-alias 'show-tabs-space-face 'show-tabs-space "22.1")
(define-generic-mode show-tabs-generic-mode
nil ;; no comment char
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index d24274aa13c..8b6a884424b 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -1,7 +1,7 @@
;;; hilit-chg.el --- minor mode displaying buffer changes with special face
-;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009 Free Software Foundation, Inc.
;; Author: Richard Sharman <rsharman@pobox.com>
;; Keywords: faces
@@ -195,8 +195,8 @@
(t (:inverse-video t)))
"Face used for highlighting changes."
:group 'highlight-changes)
-;; backward-compatibility alias
-(put 'highlight-changes-face 'face-alias 'highlight-changes)
+(define-obsolete-face-alias 'highlight-changes-face
+ 'highlight-changes "22.1")
;; This looks pretty ugly, actually. Maybe the underline should be removed.
(defface highlight-changes-delete
@@ -205,13 +205,11 @@
(t (:inverse-video t)))
"Face used for highlighting deletions."
:group 'highlight-changes)
-;; backward-compatibility alias
-(put 'highlight-changes-delete-face 'face-alias 'highlight-changes-delete)
-
+(define-obsolete-face-alias 'highlight-changes-delete-face
+ 'highlight-changes-delete "22.1")
;; A (not very good) default list of colors to rotate through.
-;;
(define-obsolete-variable-alias 'highlight-changes-colours
'highlight-changes-colors "22.1")
diff --git a/lisp/info.el b/lisp/info.el
index be61127176c..c0caf742877 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -83,32 +83,28 @@ The Lisp code is executed when the node is selected.")
(t :height 1.2 :inherit info-title-2))
"Face for info titles at level 1."
:group 'info)
-;; backward-compatibility alias
-(put 'Info-title-1-face 'face-alias 'info-title-1)
+(define-obsolete-face-alias 'Info-title-1-face 'info-title-1 "22.1")
(defface info-title-2
'((((type tty pc) (class color)) :foreground "lightblue" :weight bold)
(t :height 1.2 :inherit info-title-3))
"Face for info titles at level 2."
:group 'info)
-;; backward-compatibility alias
-(put 'Info-title-2-face 'face-alias 'info-title-2)
+(define-obsolete-face-alias 'Info-title-2-face 'info-title-2 "22.1")
(defface info-title-3
'((((type tty pc) (class color)) :weight bold)
(t :height 1.2 :inherit info-title-4))
"Face for info titles at level 3."
:group 'info)
-;; backward-compatibility alias
-(put 'Info-title-3-face 'face-alias 'info-title-3)
+(define-obsolete-face-alias 'Info-title-3-face 'info-title-3 "22.1")
(defface info-title-4
'((((type tty pc) (class color)) :weight bold)
(t :weight bold :inherit variable-pitch))
"Face for info titles at level 4."
:group 'info)
-;; backward-compatibility alias
-(put 'Info-title-4-face 'face-alias 'info-title-4)
+(define-obsolete-face-alias 'Info-title-4-face 'info-title-4 "22.1")
(defface info-menu-header
'((((type tty pc))
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 663142ec687..30873e8ceeb 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1,7 +1,7 @@
;;; isearch.el --- incremental search minor mode
-;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001,
+;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
;; Free Software Foundation, Inc.
;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
@@ -322,7 +322,7 @@ A value of nil means highlight all matches."
"Face for lazy highlighting of matches other than the current one."
:group 'lazy-highlight
:group 'basic-faces)
-(put 'isearch-lazy-highlight-face 'face-alias 'lazy-highlight)
+(define-obsolete-face-alias 'isearch-lazy-highlight-face 'lazy-highlight "22.1")
(defvar lazy-highlight-face 'lazy-highlight)
(define-obsolete-variable-alias 'isearch-lazy-highlight-face
'lazy-highlight-face
diff --git a/lisp/log-view.el b/lisp/log-view.el
index 8b9c74660c5..01fb0b2f0a8 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -1,7 +1,7 @@
;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: rcs sccs cvs log version-control
@@ -178,8 +178,7 @@
(t (:weight bold)))
"Face for the file header line in `log-view-mode'."
:group 'log-view)
-;; backward-compatibility alias
-(put 'log-view-file-face 'face-alias 'log-view-file)
+(define-obsolete-face-alias 'log-view-file-face 'log-view-file "22.1")
(defvar log-view-file-face 'log-view-file)
(defface log-view-message
@@ -189,7 +188,7 @@
"Face for the message header line in `log-view-mode'."
:group 'log-view)
;; backward-compatibility alias
-(put 'log-view-message-face 'face-alias 'log-view-message)
+(define-obsolete-face-alias 'log-view-message-face 'log-view-message "22.1")
(defvar log-view-message-face 'log-view-message)
(defvar log-view-file-re
diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el
index 017aeb69f09..94592f61d43 100644
--- a/lisp/obsolete/old-whitespace.el
+++ b/lisp/obsolete/old-whitespace.el
@@ -1,7 +1,7 @@
;;; whitespace.el --- warn about and clean bogus whitespaces in the file
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009 Free Software Foundation, Inc.
;; Author: Rajesh Vaidheeswarran <rv@gnu.org>
;; Keywords: convenience
@@ -308,8 +308,8 @@ To disable timer scans, set this to zero."
(:background "white")))
"Face used for highlighting the bogus whitespaces that exist in the buffer."
:group 'whitespace-faces)
-;; backward-compatibility alias
-(put 'whitespace-highlight-face 'face-alias 'whitespace-highlight)
+(define-obsolete-face-alias 'whitespace-highlight-face
+ 'whitespace-highlight "22.1")
(if (not (assoc 'whitespace-mode minor-mode-alist))
(setq minor-mode-alist (cons '(whitespace-mode whitespace-mode-line)
diff --git a/lisp/paren.el b/lisp/paren.el
index 9648471d373..d5607c23f65 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -1,7 +1,7 @@
;;; paren.el --- highlight matching paren
-;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009 Free Software Foundation, Inc.
;; Author: rms@gnu.org
;; Maintainer: FSF
@@ -87,16 +87,15 @@ otherwise)."
:background "gray"))
"Show Paren mode face used for a matching paren."
:group 'paren-showing-faces)
-;; backward-compatibility alias
-(put 'show-paren-match-face 'face-alias 'show-paren-match)
+(define-obsolete-face-alias 'show-paren-match-face 'show-paren-match "22.1")
(defface show-paren-mismatch
'((((class color)) (:foreground "white" :background "purple"))
(t (:inverse-video t)))
"Show Paren mode face used for a mismatching paren."
:group 'paren-showing-faces)
-;; backward-compatibility alias
-(put 'show-paren-mismatch-face 'face-alias 'show-paren-mismatch)
+(define-obsolete-face-alias 'show-paren-mismatch-face
+ 'show-paren-mismatch "22.1")
(defvar show-paren-highlight-openparen t
"*Non-nil turns on openparen highlighting when matching forward.")
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index fa7f3f6cdc3..d1c60a6a96a 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -70,8 +70,7 @@ to confuse some users sometimes."
(t (:weight bold)))
"PCL-CVS face used to highlight directory changes."
:group 'pcl-cvs)
-;; backward-compatibility alias
-(put 'cvs-header-face 'face-alias 'cvs-header)
+(define-obsolete-face-alias 'cvs-header-face 'cvs-header "22.1")
(defface cvs-filename
'((((class color) (background dark))
@@ -81,8 +80,7 @@ to confuse some users sometimes."
(t ()))
"PCL-CVS face used to highlight file names."
:group 'pcl-cvs)
-;; backward-compatibility alias
-(put 'cvs-filename-face 'face-alias 'cvs-filename)
+(define-obsolete-face-alias 'cvs-filename-face 'cvs-filename "22.1")
(defface cvs-unknown
'((((class color) (background dark))
@@ -92,8 +90,7 @@ to confuse some users sometimes."
(t (:slant italic)))
"PCL-CVS face used to highlight unknown file status."
:group 'pcl-cvs)
-;; backward-compatibility alias
-(put 'cvs-unknown-face 'face-alias 'cvs-unknown)
+(define-obsolete-face-alias 'cvs-unknown-face 'cvs-unknown "22.1")
(defface cvs-handled
'((((class color) (background dark))
@@ -103,8 +100,7 @@ to confuse some users sometimes."
(t ()))
"PCL-CVS face used to highlight handled file status."
:group 'pcl-cvs)
-;; backward-compatibility alias
-(put 'cvs-handled-face 'face-alias 'cvs-handled)
+(define-obsolete-face-alias 'cvs-handled-face 'cvs-handled "22.1")
(defface cvs-need-action
'((((class color) (background dark))
@@ -114,8 +110,7 @@ to confuse some users sometimes."
(t (:slant italic)))
"PCL-CVS face used to highlight status of files needing action."
:group 'pcl-cvs)
-;; backward-compatibility alias
-(put 'cvs-need-action-face 'face-alias 'cvs-need-action)
+(define-obsolete-face-alias 'cvs-need-action-face 'cvs-need-action "22.1")
(defface cvs-marked
'((((min-colors 88) (class color) (background dark))
@@ -127,15 +122,13 @@ to confuse some users sometimes."
(t (:weight bold)))
"PCL-CVS face used to highlight marked file indicator."
:group 'pcl-cvs)
-;; backward-compatibility alias
-(put 'cvs-marked-face 'face-alias 'cvs-marked)
+(define-obsolete-face-alias 'cvs-marked-face 'cvs-marked "22.1")
(defface cvs-msg
'((t (:slant italic)))
"PCL-CVS face used to highlight CVS messages."
:group 'pcl-cvs)
-;; backward-compatibility alias
-(put 'cvs-msg-face 'face-alias 'cvs-msg)
+(define-obsolete-face-alias 'cvs-msg-face 'cvs-msg "22.1")
(defvar cvs-fi-up-to-date-face 'cvs-handled)
(defvar cvs-fi-unknown-face 'cvs-unknown)
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index f9cb486eb18..41a77151c1a 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -162,8 +162,7 @@ This space is used to display markers."
(t (:foreground "red")))
"*The face used for the mark character in the tree."
:group 'ebrowse-faces)
-;; backward-compatibility alias
-(put 'ebrowse-tree-mark-face 'face-alias 'ebrowse-tree-mark)
+(define-obsolete-face-alias 'ebrowse-tree-mark-face 'ebrowse-tree-mark "22.1")
(defface ebrowse-root-class
@@ -171,24 +170,21 @@ This space is used to display markers."
(t (:weight bold :foreground "blue")))
"*The face used for root classes in the tree."
:group 'ebrowse-faces)
-;; backward-compatibility alias
-(put 'ebrowse-root-class-face 'face-alias 'ebrowse-root-class)
+(define-obsolete-face-alias 'ebrowse-root-class-face 'ebrowse-root-class "22.1")
(defface ebrowse-file-name
'((t (:italic t)))
"*The face for filenames displayed in the tree."
:group 'ebrowse-faces)
-;; backward-compatibility alias
-(put 'ebrowse-file-name-face 'face-alias 'ebrowse-file-name)
+(define-obsolete-face-alias 'ebrowse-file-name-face 'ebrowse-file-name "22.1")
(defface ebrowse-default
'((t nil))
"*Face for everything else in the tree not having other faces."
:group 'ebrowse-faces)
-;; backward-compatibility alias
-(put 'ebrowse-default-face 'face-alias 'ebrowse-default)
+(define-obsolete-face-alias 'ebrowse-default-face 'ebrowse-default "22.1")
(defface ebrowse-member-attribute
@@ -196,16 +192,16 @@ This space is used to display markers."
(t (:foreground "red")))
"*Face used to display member attributes."
:group 'ebrowse-faces)
-;; backward-compatibility alias
-(put 'ebrowse-member-attribute-face 'face-alias 'ebrowse-member-attribute)
+(define-obsolete-face-alias 'ebrowse-member-attribute-face
+ 'ebrowse-member-attribute "22.1")
(defface ebrowse-member-class
'((t (:foreground "purple")))
"*Face used to display the class title in member buffers."
:group 'ebrowse-faces)
-;; backward-compatibility alias
-(put 'ebrowse-member-class-face 'face-alias 'ebrowse-member-class)
+(define-obsolete-face-alias 'ebrowse-member-class-face
+ 'ebrowse-member-class "22.1")
(defface ebrowse-progress
@@ -213,8 +209,7 @@ This space is used to display markers."
(t (:background "blue")))
"*Face for progress indicator."
:group 'ebrowse-faces)
-;; backward-compatibility alias
-(put 'ebrowse-progress-face 'face-alias 'ebrowse-progress)
+(define-obsolete-face-alias 'ebrowse-progress-face 'ebrowse-progress "22.1")
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index cff6ec24bf1..7eb3df185e9 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -104,7 +104,7 @@
(t (:reverse-video t)))
"Face to use for highlighting leading spaces in Font-Lock mode."
:group 'makefile)
-(put 'makefile-space-face 'face-alias 'makefile-space)
+(define-obsolete-face-alias 'makefile-space-face 'makefile-space "22.1")
(defface makefile-targets
;; This needs to go along both with foreground and background colors (i.e. shell)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index d948f9f61f9..70b96ba807d 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1,7 +1,7 @@
;;; sh-script.el --- shell-script editing commands for Emacs
-;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002, 2003,
+;; 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; Author: Daniel Pfeiffer <occitan@esperanto.org>
;; Version: 2.0f
@@ -889,9 +889,7 @@ See `sh-feature'.")
(:weight bold)))
"Face to show quoted execs like ``"
:group 'sh-indentation)
-
-;; backward-compatibility alias
-(put 'sh-heredoc-face 'face-alias 'sh-heredoc)
+(define-obsolete-face-alias 'sh-heredoc-face 'sh-heredoc "22.1")
(defvar sh-heredoc-face 'sh-heredoc)
(defface sh-escaped-newline '((t :inherit font-lock-string-face))
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index a942d09c6a0..289c4afd983 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -89,8 +89,7 @@ Used in `smerge-diff-base-mine' and related functions."
(:foreground "cyan")))
"Face for your code."
:group 'smerge)
-;; backward-compatibility alias
-(put 'smerge-mine-face 'face-alias 'smerge-mine)
+(define-obsolete-face-alias 'smerge-mine-face 'smerge-mine "22.1")
(defvar smerge-mine-face 'smerge-mine)
(defface smerge-other
@@ -100,8 +99,7 @@ Used in `smerge-diff-base-mine' and related functions."
(:foreground "lightgreen")))
"Face for the other code."
:group 'smerge)
-;; backward-compatibility alias
-(put 'smerge-other-face 'face-alias 'smerge-other)
+(define-obsolete-face-alias 'smerge-other-face 'smerge-other "22.1")
(defvar smerge-other-face 'smerge-other)
(defface smerge-base
@@ -113,8 +111,7 @@ Used in `smerge-diff-base-mine' and related functions."
(:foreground "orange")))
"Face for the base code."
:group 'smerge)
-;; backward-compatibility alias
-(put 'smerge-base-face 'face-alias 'smerge-base)
+(define-obsolete-face-alias 'smerge-base-face 'smerge-base "22.1")
(defvar smerge-base-face 'smerge-base)
(defface smerge-markers
@@ -124,8 +121,7 @@ Used in `smerge-diff-base-mine' and related functions."
(:background "grey30")))
"Face for the conflict markers."
:group 'smerge)
-;; backward-compatibility alias
-(put 'smerge-markers-face 'face-alias 'smerge-markers)
+(define-obsolete-face-alias 'smerge-markers-face 'smerge-markers "22.1")
(defvar smerge-markers-face 'smerge-markers)
(defface smerge-refined-change
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index f3a15b2c5cc..f7794e1bf6d 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1,7 +1,7 @@
;;; flyspell.el --- on-the-fly spell checker
-;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009 Free Software Foundation, Inc.
;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr>
;; Maintainer: FSF
@@ -440,8 +440,7 @@ property of the major mode name.")
(t (:bold t)))
"Face used for marking a misspelled word in Flyspell."
:group 'flyspell)
-;; backward-compatibility alias
-(put 'flyspell-incorrect-face 'face-alias 'flyspell-incorrect)
+(define-obsolete-face-alias 'flyspell-incorrect-face 'flyspell-incorrect "22.1")
(defface flyspell-duplicate
'((((class color)) (:foreground "Gold3" :bold t :underline t))
@@ -449,8 +448,7 @@ property of the major mode name.")
"Face used for marking a misspelled word that appears twice in the buffer.
See also `flyspell-duplicate-distance'."
:group 'flyspell)
-;; backward-compatibility alias
-(put 'flyspell-duplicate-face 'face-alias 'flyspell-duplicate)
+(define-obsolete-face-alias 'flyspell-duplicate-face 'flyspell-duplicate "22.1")
(defvar flyspell-overlay nil)
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index ed975ab45c6..b45cb25b3b7 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -719,8 +719,7 @@ Not smaller than the value set by `tex-suscript-height-minimum'."
'((t :inherit font-lock-string-face))
"Face used to highlight TeX math expressions."
:group 'tex)
-;; backward-compatibility alias
-(put 'tex-math-face 'face-alias 'tex-math)
+(define-obsolete-face-alias 'tex-math-face 'tex-math "22.1")
(defvar tex-math-face 'tex-math)
(defface tex-verbatim
@@ -728,8 +727,7 @@ Not smaller than the value set by `tex-suscript-height-minimum'."
'((t :family "courier"))
"Face used to highlight TeX verbatim environments."
:group 'tex)
-;; backward-compatibility alias
-(put 'tex-verbatim-face 'face-alias 'tex-verbatim)
+(define-obsolete-face-alias 'tex-verbatim-face 'tex-verbatim "22.1")
(defvar tex-verbatim-face 'tex-verbatim)
(defun tex-font-lock-verb (end)
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index ef89a01e050..e9156e729db 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -104,8 +104,8 @@ This exists as a variable so it can be set locally in certain buffers.")
"Face used for documentation text."
:group 'widget-documentation
:group 'widget-faces)
-;; backward compatibility alias
-(put 'widget-documentation-face 'face-alias 'widget-documentation)
+(define-obsolete-face-alias 'widget-documentation-face
+ 'widget-documentation "22.1")
(defvar widget-button-face 'widget-button
"Face used for buttons in widgets.
@@ -114,8 +114,7 @@ This exists as a variable so it can be set locally in certain buffers.")
(defface widget-button '((t (:weight bold)))
"Face used for widget buttons."
:group 'widget-faces)
-;; backward compatibility alias
-(put 'widget-button-face 'face-alias 'widget-button)
+(define-obsolete-face-alias 'widget-button-face 'widget-button "22.1")
(defcustom widget-mouse-face 'highlight
"Face used for widget buttons when the mouse is above them."
@@ -138,8 +137,7 @@ This exists as a variable so it can be set locally in certain buffers.")
:slant italic))
"Face used for editable fields."
:group 'widget-faces)
-;; backward-compatibility alias
-(put 'widget-field-face 'face-alias 'widget-field)
+(define-obsolete-face-alias 'widget-field-face 'widget-field "22.1")
(defface widget-single-line-field '((((type tty))
:background "green3"
@@ -154,8 +152,8 @@ This exists as a variable so it can be set locally in certain buffers.")
:slant italic))
"Face used for editable fields spanning only a single line."
:group 'widget-faces)
-;; backward-compatibility alias
-(put 'widget-single-line-field-face 'face-alias 'widget-single-line-field)
+(define-obsolete-face-alias 'widget-single-line-field-face
+ 'widget-single-line-field "22.1")
;;; This causes display-table to be loaded, and not usefully.
;;;(defvar widget-single-line-display-table
@@ -455,8 +453,8 @@ new value.")
'((t :inherit shadow))
"Face used for inactive widgets."
:group 'widget-faces)
-;; backward-compatibility alias
-(put 'widget-inactive-face 'face-alias 'widget-inactive)
+(define-obsolete-face-alias 'widget-inactive-face
+ 'widget-inactive "22.1")
(defun widget-specify-inactive (widget from to)
"Make WIDGET inactive for user modifications."
@@ -920,8 +918,8 @@ Recommended as a parent keymap for modes using widgets.")
(:weight bold :underline t)))
"Face used for pressed buttons."
:group 'widget-faces)
-;; backward-compatibility alias
-(put 'widget-button-pressed-face 'face-alias 'widget-button-pressed)
+(define-obsolete-face-alias 'widget-button-pressed-face
+ 'widget-button-pressed "22.1")
(defvar widget-button-click-moves-point nil
"If non-nil, `widget-button-click' moves point to a button after invoking it.
diff --git a/lisp/woman.el b/lisp/woman.el
index 90185c6c846..302a96419e0 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -946,25 +946,25 @@ or different fonts."
'((t :inherit italic))
"Face for italic font in man pages."
:group 'woman-faces)
-(put 'woman-italic-face 'face-alias 'woman-italic)
+(define-obsolete-face-alias 'woman-italic-face 'woman-italic "22.1")
(defface woman-bold
'((t :inherit bold))
"Face for bold font in man pages."
:group 'woman-faces)
-(put 'woman-bold-face 'face-alias 'woman-bold)
+(define-obsolete-face-alias 'woman-bold-face 'woman-bold "22.1")
(defface woman-unknown
'((t :inherit font-lock-warning-face))
"Face for all unknown fonts in man pages."
:group 'woman-faces)
-(put 'woman-unknown-face 'face-alias 'woman-unknown)
+(define-obsolete-face-alias 'woman-unknown-face 'woman-unknown "22.1")
(defface woman-addition
'((t :inherit font-lock-builtin-face))
"Face for all WoMan additions to man pages."
:group 'woman-faces)
-(put 'woman-addition-face 'face-alias 'woman-addition)
+(define-obsolete-face-alias 'woman-addition-face 'woman-addition "22.1")
(defun woman-default-faces ()
"Set foreground colors of italic and bold faces to their default values."
View Lorry Controller Status