[Emacs-diffs] master e911587 2/2: Remove some more face aliases obsolete since 22.1

[Glenn Morris]

branch: master
commit e911587fb61bbc7f4be41e0a044cb6dee8f9e615
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Remove some more face aliases obsolete since 22.1
    
    * lisp/generic-x.el (show-tabs-tab-face, show-tabs-space-face):
    * lisp/eshell/em-prompt.el (eshell-prompt-face):
    * lisp/vc/smerge-mode.el (smerge-base-face, smerge-markers-face):
    Remove face "-face" aliases, obsolete since 22.1.
---
 lisp/eshell/em-prompt.el | 1 -
 lisp/generic-x.el        | 2 --
 lisp/vc/smerge-mode.el   | 2 --
 3 files changed, 5 deletions(-)

diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index da2cfe4..e61b0eb 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -80,7 +80,6 @@ re-entered for it to take effect."
 For highlighting other kinds of strings -- similar to shell mode's
 behavior -- simply use an output filer which changes text properties."
   :group 'eshell-prompt)
-(define-obsolete-face-alias 'eshell-prompt-face 'eshell-prompt "22.1")
 
 (defcustom eshell-before-prompt-hook nil
   "A list of functions to call before outputting the prompt."
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index ea2a100..3e3ddc5 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1610,7 +1610,6 @@ 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)
-(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))
@@ -1620,7 +1619,6 @@ 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)
-(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/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index ea99d31..99a074c 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -104,7 +104,6 @@ Used in `smerge-diff-base-upper' and related functions."
     (((class color))
      :foreground "yellow"))
   "Face for the base code.")
-(define-obsolete-face-alias 'smerge-base-face 'smerge-base "22.1")
 (defvar smerge-base-face 'smerge-base)
 
 (defface smerge-markers
@@ -113,7 +112,6 @@ Used in `smerge-diff-base-upper' and related functions."
     (((background dark))
      (:background "grey30")))
   "Face for the conflict markers.")
-(define-obsolete-face-alias 'smerge-markers-face 'smerge-markers "22.1")
 (defvar smerge-markers-face 'smerge-markers)
 
 (defface smerge-refined-changed