procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Remove "-face" suffix from ebrowse faces

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

   * lisp/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.
This commit is contained in:
Miles Bader 2005-06-14 22:49:47 +00:00
parent 7a3dfaeead
commit 4f2d55da49
2 changed files with 44 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lisp/ChangeLog
View file

@ -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

46
lisp/progmodes/ebrowse.el
View file

@ -157,50 +157,64 @@ This space is used to display markers."
: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)
;; backward-compatibility alias
(put 'ebrowse-tree-mark-face 'face-alias 'ebrowse-tree-mark)
(defface ebrowse-root-class-face
(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)
;; backward-compatibility alias
(put 'ebrowse-root-class-face 'face-alias 'ebrowse-root-class)
(defface ebrowse-file-name-face
(defface ebrowse-file-name
'((t (:italic t)))
"*The face for filenames displayed in the tree."
:group 'ebrowse-faces)
;; backward-compatibility alias
(put 'ebrowse-file-name-face 'face-alias 'ebrowse-file-name)
(defface ebrowse-default-face
(defface ebrowse-default
'((t nil))
"*Face for everything else in the tree not having other faces."
:group 'ebrowse-faces)
;; backward-compatibility alias
(put 'ebrowse-default-face 'face-alias 'ebrowse-default)
(defface ebrowse-member-attribute-face
(defface ebrowse-member-attribute
'((((min-colors 88)) (:foreground "red1"))
(t (:foreground "red")))
"*Face used to display member attributes."
:group 'ebrowse-faces)
;; backward-compatibility alias
(put 'ebrowse-member-attribute-face 'face-alias 'ebrowse-member-attribute)
(defface ebrowse-member-class-face
(defface ebrowse-member-class
'((t (:foreground "purple")))
"*Face used to display the class title in member buffers."
:group 'ebrowse-faces)
;; backward-compatibility alias
(put 'ebrowse-member-class-face 'face-alias 'ebrowse-member-class)
(defface ebrowse-progress-face
(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 @@ this is the first progress message displayed."
(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 @@ With PREFIX, insert that many filenames."
(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 @@ TREE denotes the class shown."
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 @@ This function may look weird, but this is faster than recursion."
(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 @@ This function may look weird, but this is faster than recursion."
(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 @@ the class cursor is on."
(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 @@ TREE is the class tree of MEMBER-LIST."
(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 @@ TREE is the class tree in which the members are found."
(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