aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-09-01 07:46:01 +0000
committerGlenn Morris2009-09-01 07:46:01 +0000
commit49c539a128756bba53430ca5f6254583d70aacf5 (patch)
tree45a23eec405063b76a97e1d978f854cdee159a63
parentc4f6e489aa5c0d3559f442587b32b01cf7dbdb8d (diff)
downloademacs-49c539a128756bba53430ca5f6254583d70aacf5.tar.gz
emacs-49c539a128756bba53430ca5f6254583d70aacf5.zip
(texinfo-heading-face): Mark face aliases with "-face" suffix as obsolete.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/textmodes/texinfo.el6
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76cb0f150f4..895d30750b8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -42,6 +42,7 @@
42 * textmodes/flyspell.el (flyspell-incorrect-face) 42 * textmodes/flyspell.el (flyspell-incorrect-face)
43 (flyspell-duplicate-face): 43 (flyspell-duplicate-face):
44 * textmodes/tex-mode.el (tex-math-face, tex-verbatim-face): 44 * textmodes/tex-mode.el (tex-math-face, tex-verbatim-face):
45 * textmodes/texinfo.el (texinfo-heading-face):
45 Mark face aliases with "-face" suffix as obsolete. 46 Mark face aliases with "-face" suffix as obsolete.
46 47
47 * mail/feedmail.el (file-name-buffer-file-type-alist): Define for 48 * mail/feedmail.el (file-name-buffer-file-type-alist): Define for
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index b936c45b50c..d7098639ae5 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -1,7 +1,8 @@
1;;; texinfo.el --- major mode for editing Texinfo files -*- coding: utf-8 -*- 1;;; texinfo.el --- major mode for editing Texinfo files -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1985, 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, 3;; Copyright (C) 1985, 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997,
4;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 4;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5;; Free Software Foundation, Inc.
5 6
6;; Author: Robert J. Chassell 7;; Author: Robert J. Chassell
7;; Date: [See date below for texinfo-version] 8;; Date: [See date below for texinfo-version]
@@ -338,8 +339,7 @@ Subexpression 1 is what goes into the corresponding `@end' statement.")
338 '((t (:inherit font-lock-function-name-face))) 339 '((t (:inherit font-lock-function-name-face)))
339 "Face used for section headings in `texinfo-mode'." 340 "Face used for section headings in `texinfo-mode'."
340 :group 'texinfo) 341 :group 'texinfo)
341;; backward-compatibility alias 342(define-obsolete-face-alias 'texinfo-heading-face 'texinfo-heading "22.1")
342(put 'texinfo-heading-face 'face-alias 'texinfo-heading)
343(defvar texinfo-heading-face 'texinfo-heading) 343(defvar texinfo-heading-face 'texinfo-heading)
344 344
345(defvar texinfo-font-lock-keywords 345(defvar texinfo-font-lock-keywords