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 7cae0df4661a4130f2b35f3ac021befcde5a2b2e..884b9e0023a1123da8a42a889ee7d4e68b50fae6 100644 (file)
--- 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 120cae538d5daad2ff8624747e7676ad4aa95af8..ef24604ba7bfd94da2235bfc8d8039230bef6e8e 100644 (file)
--- 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