ecb + ebrowse (ebrowse.el diff, emacs 21)

[John S. Yates, Jr.]

613a614,618
> (defvar ebrowse--show-inherited-first-flag nil
>   "Non-nil means list inherited members first in a member buffer.
> Buffer-local in Ebrowse member buffers.")
> 
> 
2183a2189
>     (define-key map1 "o" 'ebrowse-toggle-base-class-display-order)
2457a2464,2470
> (defun ebrowse-toggle-base-class-display-order ()
>   "Toggle the display order of members inherited from base classes."
>   (interactive)
>   (setf ebrowse--show-inherited-first-flag (not 
> ebrowse--show-inherited-first-flag))
>   (ebrowse-redisplay-member-buffer))
> 
> 
2670a2684,2692
>       ;; Show inherited members first if appropriate
>       (when (and
>              ebrowse--show-inherited-flag
>              ebrowse--show-inherited-first-flag)
>       (dolist (super (reverse (ebrowse-base-classes 
> ebrowse--displayed-class)))
>         (goto-char (point-max))
>         (if (bolp) (insert"\n"))
>         (ebrowse-draw-member-buffer-class-line super)
>         (funcall display-fn (funcall ebrowse--accessor super) super)))
2671a2694,2695
>       (goto-char (point-max))
>       (if (bolp) (insert"\n"))
2674,2675c2698,2701
<       ;; Show inherited members if corresponding switch is on
<       (when ebrowse--show-inherited-flag
---
>       ;; Show inherited members last if appropriate
>       (when (and
>              ebrowse--show-inherited-flag
>              (not ebrowse--show-inherited-first-flag))
2678c2704
<         (insert (if (bolp) "\n\n" "\n"))
---
>         (if (bolp) (insert"\n"))
2698c2724
<     (insert ":\n\n")
---
>     (insert ":\n")
2758,2766c2784,2793
<   (insert (if (ebrowse-template-p member) "T" "-")
<         (if (ebrowse-extern-c-p member) "C" "-")
<         (if (ebrowse-virtual-p member) "v" "-")
<         (if (ebrowse-inline-p member) "i" "-")
<         (if (ebrowse-const-p member) "c" "-")
<         (if (ebrowse-pure-virtual-p member) "0" "-")
<         (if (ebrowse-mutable-p member) "m" "-")
<         (if (ebrowse-explicit-p member) "e" "-")
<         (if (ebrowse-throw-list-p member) "t" "-")))
---
>   (insert (if (ebrowse-template-p member) "T" ".")
>         (if (ebrowse-extern-c-p member) "C" " ")
>         (if (ebrowse-virtual-p member) "v" ".")
>         (if (ebrowse-inline-p member) "i" " ")
>         (if (ebrowse-const-p member) "c" ".")
>         (if (ebrowse-pure-virtual-p member) "P" " ")
>         (if (ebrowse-mutable-p member) "m" ".")
>         (if (ebrowse-explicit-p member) "e" " ")
>         (if (ebrowse-throw-list-p member) "t" ".")
>           ))
2793a2821,2826
>       (when ebrowse--attributes-flag
>         (let ((start (point)))
>           (ebrowse-draw-member-attributes member-struc)
>           (ebrowse-set-face start (point)
>                             'ebrowse-member-attribute-face)))
>       (insert " ")
2794a2828
>       (setf start (point))
2806,2807d2839
<       (setf start (point))
<       (indent-to ebrowse--decl-column)
2809,2818c2841
<       (when ebrowse--attributes-flag
<         (let ((start (point)))
<           (insert "<")
<           (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")
---
>         (insert "\n"))))
2842d2864
<           (insert "<")
2844d2865
<           (insert "> ")
3138a3160,3164
>     ["Inherited First" ebrowse-toggle-base-class-display-order
>      :help "Toggle display order of inherited members"
>      :style toggle
>      :selected ebrowse--show-inherited-first-flag
>      :active t]