Face names should not end in -face (term-face)

* lisp/term.el (term): Rename from `term-face'.
(term-current-face, ansi-term-color-vector)
(term-default-fg-color, term-default-bg-color, term-ansi-reset):
Update all users.

* doc/emacs/misc.texi (Terminal emulator): Rename `term-face' to `term'.

* etc/NEWS: Related edit.

5 files changed, 19 insertions, 8 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d975112f0fb..9390daef38d 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-10  Glenn Morris  <rgm@gnu.org>
+
+        * misc.texi (Terminal emulator): Rename `term-face' to `term'.
+
 2012-11-09  Glenn Morris  <rgm@gnu.org>
 
         * emacs.texi (Acknowledgments): Add profiler author.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index cac5e8dc9dd..244920a23ae 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1209,7 +1209,7 @@ VT100-style escape sequences, which are accepted by most modern
 terminals, including @command{xterm}.  (Hence, you can actually run
 Emacs inside an Emacs Term window.)
 
-  The @code{term-face} face specifies the default appearance of text
+  The @code{term} face specifies the default appearance of text
 in the terminal emulator (the default is the same appearance as the
 @code{default} face).  When terminal control codes are used to change
 the appearance of text, these are represented in the terminal emulator
diff --git a/etc/NEWS b/etc/NEWS
index 5983664c607..cbf59b9e011 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -573,7 +573,7 @@ at point, or the Nth column if a numeric prefix argument is given.
 ** Term
 +++
 *** The variables `term-default-fg-color' and `term-default-bg-color' are
-now deprecated in favor of the customizable `term-face' face.
+now deprecated in favor of the customizable face `term'.
 
 *** You can customize how to display ANSI terminal colors and styles
 by customizing the corresponding `term-color-<COLOR>',
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c5dd2eca746..9284fd5d5de 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-10  Glenn Morris  <rgm@gnu.org>
+
+        * term.el (term): Rename from `term-face'.
+        (term-current-face, ansi-term-color-vector)
+        (term-default-fg-color, term-default-bg-color, term-ansi-reset):
+        Update all users.
+
 2012-11-09  Jan Djärv  <jan.h.d@swipnet.se>
 
         * server.el (server-create-window-system-frame): Improved comment.
diff --git a/lisp/term.el b/lisp/term.el
index 7567bd38f5a..860b5336b56 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -452,7 +452,7 @@ state 4: term-terminal-parameter contains pending output.")
   "A queue of strings whose echo we want suppressed.")
 (defvar term-terminal-parameter)
 (defvar term-terminal-previous-parameter)
-(defvar term-current-face 'term-face)
+(defvar term-current-face 'term)
 (defvar term-scroll-start 0 "Top-most line (inclusive) of scrolling region.")
 (defvar term-scroll-end) ; Number of line (zero-based) after scrolling region.
 (defvar term-pager-count nil
@@ -759,7 +759,7 @@ Buffer local variable.")
 
 ;;; Faces
 (defvar ansi-term-color-vector
-  [term-face
+  [term
    term-color-black
    term-color-red
    term-color-green
@@ -771,17 +771,17 @@ Buffer local variable.")
 
 (defcustom term-default-fg-color nil
   "If non-nil, default color for foreground in Term mode.
-This is deprecated in favor of customizing the `term-face' face."
+This is deprecated in favor of customizing the `term' face."
   :group 'term
   :type 'string)
 
 (defcustom term-default-bg-color nil
   "If non-nil, default color for foreground in Term mode.
-This is deprecated in favor of customizing the `term-face' face."
+This is deprecated in favor of customizing the `term' face."
   :group 'term
   :type 'string)
 
-(defface term-face
+(defface term
   `((t
      :foreground ,term-default-fg-color
      :background ,term-default-bg-color
@@ -988,7 +988,7 @@ is buffer-local."
     dt))
 
 (defun term-ansi-reset ()
-  (setq term-current-face 'term-face)
+  (setq term-current-face 'term)
   (setq term-ansi-current-underline nil)
   (setq term-ansi-current-bold nil)
   (setq term-ansi-current-reverse nil)