Mercurial > emacs

--- a/lisp/ChangeLog	Tue Jun 14 22:49:30 2005 +0000
+++ b/lisp/ChangeLog	Tue Jun 14 22:49:47 2005 +0000
@@ -1,5 +1,19 @@
 2005-06-14  Miles Bader  <miles@gnu.org>

+	* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
+	(ebrowse-file-name, ebrowse-default, ebrowse-member-attribute)
+	(ebrowse-member-class, ebrowse-progress):
+	Remove "-face" suffix from face names.
+	(ebrowse-tree-mark-face, ebrowse-root-class-face)
+	(ebrowse-file-name-face, ebrowse-default-face)
+	(ebrowse-member-attribute-face, ebrowse-member-class-face)
+	(ebrowse-progress-face):
+	New backward-compatibility aliases for renamed faces.
+	(ebrowse-show-progress, ebrowse-show-file-name-at-point)
+	(ebrowse-set-mark-props, ebrowse-draw-tree-fn)
+	(ebrowse-draw-member-buffer-class-line, ebrowse-draw-member-long-fn)
+	(ebrowse-draw-member-short-fn): Use renamed ebrowse faces.
+
 	* progmodes/antlr-mode.el (antlr-default, antlr-keyword, antlr-syntax)
 	(antlr-ruledef, antlr-tokendef, antlr-ruleref, antlr-tokenref)
 	(antlr-literal): Remove "-face" suffix and "font-lock-" from face
--- a/lisp/progmodes/ebrowse.el	Tue Jun 14 22:49:30 2005 +0000
+++ b/lisp/progmodes/ebrowse.el	Tue Jun 14 22:49:47 2005 +0000
@@ -157,50 +157,64 @@
   :group 'ebrowse)


-(defface ebrowse-tree-mark-face
+(defface ebrowse-tree-mark
   '((((min-colors 88)) (:foreground "red1"))
     (t (:foreground "red")))
   "*The face used for the mark character in the tree."
   :group 'ebrowse-faces)
-
-
-(defface ebrowse-root-class-face
+;; backward-compatibility alias
+(put 'ebrowse-tree-mark-face 'face-alias 'ebrowse-tree-mark)
+
+
+(defface ebrowse-root-class
   '((((min-colors 88)) (:weight bold :foreground "blue1"))
     (t (:weight bold :foreground "blue")))
   "*The face used for root classes in the tree."
   :group 'ebrowse-faces)
-
-
-(defface ebrowse-file-name-face
+;; backward-compatibility alias
+(put 'ebrowse-root-class-face 'face-alias 'ebrowse-root-class)
+
+
+(defface ebrowse-file-name
   '((t (:italic t)))
   "*The face for filenames displayed in the tree."
   :group 'ebrowse-faces)
-
-
-(defface ebrowse-default-face
+;; backward-compatibility alias
+(put 'ebrowse-file-name-face 'face-alias 'ebrowse-file-name)
+
+
+(defface ebrowse-default
   '((t nil))
   "*Face for everything else in the tree not having other faces."
   :group 'ebrowse-faces)
-
-
-(defface ebrowse-member-attribute-face
+;; backward-compatibility alias
+(put 'ebrowse-default-face 'face-alias 'ebrowse-default)
+
+
+(defface ebrowse-member-attribute
   '((((min-colors 88)) (:foreground "red1"))
     (t (:foreground "red")))
   "*Face used to display member attributes."
   :group 'ebrowse-faces)
-
-
-(defface ebrowse-member-class-face
+;; backward-compatibility alias
+(put 'ebrowse-member-attribute-face 'face-alias 'ebrowse-member-attribute)
+
+
+(defface ebrowse-member-class
   '((t (:foreground "purple")))
   "*Face used to display the class title in member buffers."
   :group 'ebrowse-faces)
-
-
-(defface ebrowse-progress-face
+;; backward-compatibility alias
+(put 'ebrowse-member-class-face 'face-alias 'ebrowse-member-class)
+
+
+(defface ebrowse-progress
   '((((min-colors 88)) (:background "blue1"))
     (t (:background "blue")))
   "*Face for progress indicator."
   :group 'ebrowse-faces)
+;; backward-compatibility alias
+(put 'ebrowse-progress-face 'face-alias 'ebrowse-progress)


@@ -883,7 +897,7 @@
     (message (concat title ": "
 		     (propertize (make-string ebrowse-n-boxes
 					      (if (display-color-p) ?\  ?+))
-				 'face 'ebrowse-progress-face)))))
+				 'face 'ebrowse-progress)))))


 ;;; Reading a tree from disk
@@ -1310,7 +1324,7 @@
 			     (ebrowse-ts-class tree))
 			    "unknown")
 		    ")"))
-	  (ebrowse-set-face start (point) 'ebrowse-file-name-face)
+	  (ebrowse-set-face start (point) 'ebrowse-file-name)
 	  (beginning-of-line)
 	  (forward-line 1))))))

@@ -1828,7 +1842,7 @@
    start end
    `(mouse-face highlight ebrowse-what mark ebrowse-tree ,tree
 		help-echo "double-mouse-1: mark/unmark"))
-  (ebrowse-set-face start end 'ebrowse-tree-mark-face))
+  (ebrowse-set-face start end 'ebrowse-tree-mark))


 (defun* ebrowse-draw-tree-fn (&aux stack1 stack2 start)
@@ -1855,8 +1869,8 @@
 	  (when (ebrowse-template-p class)
 	    (insert "<>"))
 	  (ebrowse-set-face start (point) (if (zerop level)
-					      'ebrowse-root-class-face
-					    'ebrowse-default-face))
+					      'ebrowse-root-class
+					    'ebrowse-default))
 	  (setf start-of-class-name start
 		end-of-class-name (point))
 	  ;; If filenames are to be displayed...
@@ -1867,7 +1881,7 @@
 		    (or (ebrowse-cs-file class)
 			"unknown")
 		    ")")
-	    (ebrowse-set-face start (point) 'ebrowse-file-name-face))
+	    (ebrowse-set-face start (point) 'ebrowse-file-name))
 	  (ebrowse-set-mark-props start-of-line (1+ start-of-line) tree)
 	  (add-text-properties
 	   start-of-class-name end-of-class-name
@@ -2694,7 +2708,7 @@
       (insert "<>"))
     (setq class-name-end (point))
     (insert ":\n\n")
-    (ebrowse-set-face start (point) 'ebrowse-member-class-face)
+    (ebrowse-set-face start (point) 'ebrowse-member-class)
     (add-text-properties
      class-name-start class-name-end
      '(ebrowse-what class-name
@@ -2810,7 +2824,7 @@
 	    (ebrowse-draw-member-attributes member-struc)
 	    (insert ">")
 	    (ebrowse-set-face start (point)
-			      'ebrowse-member-attribute-face)))
+			      'ebrowse-member-attribute)))
 	(insert " ")
 	(ebrowse-draw-member-regexp member-struc))))
   (insert "\n")
@@ -2841,7 +2855,7 @@
 	    (ebrowse-draw-member-attributes member)
 	    (insert "> ")
 	    (ebrowse-set-face start-of-entry (point)
-			      'ebrowse-member-attribute-face))
+			      'ebrowse-member-attribute))
 	  ;; insert member name truncated to column width
 	  (setq start-of-name (point))
 	  (insert (substring name 0