From: Miles Bader <miles@gnu.org>
Date: Wed, 15 Jun 2005 00:17:41 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-419
X-Git-Tag: emacs-pretest-22.0.90~8919
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5d370313684626a2ec1f0f24e54db6499b1c651;p=emacs.git

Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-419

Remove "-face" suffix from ld-script faces

2005-06-14  Miles Bader  <miles@gnu.org>

   * lisp/progmodes/ld-script.el (ld-script-location-counter):
   Remove "-face" suffix from face name.
   (ld-script-location-counter-face):
   New backward-compatibility alias for renamed face.
   (ld-script-location-counter-face): Use renamed face.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cae0df4661..884b9e0023a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,15 @@
 2005-06-14  Miles Bader  <miles@gnu.org>
 
+	* progmodes/ld-script.el (ld-script-location-counter):
+	Remove "-face" suffix from face name.
+	(ld-script-location-counter-face): 
+	New backward-compatibility alias for renamed face.
+	(ld-script-location-counter-face): Use renamed face.
+
 	* progmodes/cperl-mode.el (cperl-nonoverridable, cperl-array)
 	(cperl-hash): Remove "-face" suffix from face names.
 	(cperl-nonoverridable-face, cperl-array-face, cperl-hash-face):
-	New backward-compatibility alias for renamed faces.
+	New backward-compatibility aliases for renamed faces.
 	(cperl-find-pods-heres, cperl-init-faces, cperl-ps-print-init)
 	(cperl-ps-print-face-properties): Use renamed cperl-mode faces.
 
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 120cae538d5..ef24604ba7b 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -1,6 +1,6 @@
 ;;; ld-script.el --- GNU linker script editing mode for Emacs
 
-;; Copyright (C) 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 ;; Author: Masatake YAMATO<jet@gyve.org>
 ;; Keywords: languages, faces
@@ -34,11 +34,13 @@
   :prefix "ld-script-"
   :group 'languages)
 
-(defvar ld-script-location-counter-face 'ld-script-location-counter-face)
-(defface ld-script-location-counter-face
+(defvar ld-script-location-counter-face 'ld-script-location-counter)
+(defface ld-script-location-counter
   '((t (:weight bold :inherit font-lock-builtin-face)))
   "Face for location counter in GNU ld script."
   :group 'ld-script)
+;; backward-compatibility alias
+(put 'ld-script-location-counter-face 'face-alias 'ld-script-location-counter)
 
 ;; Syntax rules
 (defvar ld-script-mode-syntax-table