[Emacs-diffs] Changes to emacs/lisp/progmodes/ebrowse.el

[Miles Bader]

Index: emacs/lisp/progmodes/ebrowse.el
diff -c emacs/lisp/progmodes/ebrowse.el:1.30 
emacs/lisp/progmodes/ebrowse.el:1.31
*** emacs/lisp/progmodes/ebrowse.el:1.30        Thu May 26 16:39:27 2005
--- emacs/lisp/progmodes/ebrowse.el     Tue Jun 14 22:49:46 2005
***************
*** 157,206 ****
    :group 'ebrowse)
  
  
! (defface ebrowse-tree-mark-face
    '((((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
    '((((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
    '((t (:italic t)))
    "*The face for filenames displayed in the tree."
    :group 'ebrowse-faces)
  
  
! (defface ebrowse-default-face
    '((t nil))
    "*Face for everything else in the tree not having other faces."
    :group 'ebrowse-faces)
  
  
! (defface ebrowse-member-attribute-face
    '((((min-colors 88)) (:foreground "red1"))
      (t (:foreground "red")))
    "*Face used to display member attributes."
    :group 'ebrowse-faces)
  
  
! (defface ebrowse-member-class-face
    '((t (:foreground "purple")))
    "*Face used to display the class title in member buffers."
    :group 'ebrowse-faces)
  
  
! (defface ebrowse-progress-face
    '((((min-colors 88)) (:background "blue1"))
      (t (:background "blue")))
    "*Face for progress indicator."
    :group 'ebrowse-faces)
  
  
  
--- 157,220 ----
    :group 'ebrowse)
  
  
! (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
    '((((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
    '((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
    '((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
    '((((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
    '((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
    '((((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,889 ****
      (message (concat title ": "
                     (propertize (make-string ebrowse-n-boxes
                                              (if (display-color-p) ?\  ?+))
!                                'face 'ebrowse-progress-face)))))
  
  
  ;;; Reading a tree from disk
--- 897,903 ----
      (message (concat title ": "
                     (propertize (make-string ebrowse-n-boxes
                                              (if (display-color-p) ?\  ?+))
!                                'face 'ebrowse-progress)))))
  
  
  ;;; Reading a tree from disk
***************
*** 1310,1316 ****
                             (ebrowse-ts-class tree))
                            "unknown")
                    ")"))
!         (ebrowse-set-face start (point) 'ebrowse-file-name-face)
          (beginning-of-line)
          (forward-line 1))))))
  
--- 1324,1330 ----
                             (ebrowse-ts-class tree))
                            "unknown")
                    ")"))
!         (ebrowse-set-face start (point) 'ebrowse-file-name)
          (beginning-of-line)
          (forward-line 1))))))
  
***************
*** 1828,1834 ****
     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))
  
  
  (defun* ebrowse-draw-tree-fn (&aux stack1 stack2 start)
--- 1842,1848 ----
     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))
  
  
  (defun* ebrowse-draw-tree-fn (&aux stack1 stack2 start)
***************
*** 1855,1862 ****
          (when (ebrowse-template-p class)
            (insert "<>"))
          (ebrowse-set-face start (point) (if (zerop level)
!                                             'ebrowse-root-class-face
!                                           'ebrowse-default-face))
          (setf start-of-class-name start
                end-of-class-name (point))
          ;; If filenames are to be displayed...
--- 1869,1876 ----
          (when (ebrowse-template-p class)
            (insert "<>"))
          (ebrowse-set-face start (point) (if (zerop level)
!                                             'ebrowse-root-class
!                                           'ebrowse-default))
          (setf start-of-class-name start
                end-of-class-name (point))
          ;; If filenames are to be displayed...
***************
*** 1867,1873 ****
                    (or (ebrowse-cs-file class)
                        "unknown")
                    ")")
!           (ebrowse-set-face start (point) 'ebrowse-file-name-face))
          (ebrowse-set-mark-props start-of-line (1+ start-of-line) tree)
          (add-text-properties
           start-of-class-name end-of-class-name
--- 1881,1887 ----
                    (or (ebrowse-cs-file class)
                        "unknown")
                    ")")
!           (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,2700 ****
        (insert "<>"))
      (setq class-name-end (point))
      (insert ":\n\n")
!     (ebrowse-set-face start (point) 'ebrowse-member-class-face)
      (add-text-properties
       class-name-start class-name-end
       '(ebrowse-what class-name
--- 2708,2714 ----
        (insert "<>"))
      (setq class-name-end (point))
      (insert ":\n\n")
!     (ebrowse-set-face start (point) 'ebrowse-member-class)
      (add-text-properties
       class-name-start class-name-end
       '(ebrowse-what class-name
***************
*** 2810,2816 ****
            (ebrowse-draw-member-attributes member-struc)
            (insert ">")
            (ebrowse-set-face start (point)
!                             'ebrowse-member-attribute-face)))
        (insert " ")
        (ebrowse-draw-member-regexp member-struc))))
    (insert "\n")
--- 2824,2830 ----
            (ebrowse-draw-member-attributes member-struc)
            (insert ">")
            (ebrowse-set-face start (point)
!                             'ebrowse-member-attribute)))
        (insert " ")
        (ebrowse-draw-member-regexp member-struc))))
    (insert "\n")
***************
*** 2841,2847 ****
            (ebrowse-draw-member-attributes member)
            (insert "> ")
            (ebrowse-set-face start-of-entry (point)
!                             'ebrowse-member-attribute-face))
          ;; insert member name truncated to column width
          (setq start-of-name (point))
          (insert (substring name 0
--- 2855,2861 ----
            (ebrowse-draw-member-attributes member)
            (insert "> ")
            (ebrowse-set-face start-of-entry (point)
!                             'ebrowse-member-attribute))
          ;; insert member name truncated to column width
          (setq start-of-name (point))
          (insert (substring name 0