[Emacs-diffs] Changes to emacs/lisp/mh-e/mh-speed.el

[Miles Bader]

Index: emacs/lisp/mh-e/mh-speed.el
diff -c emacs/lisp/mh-e/mh-speed.el:1.9 emacs/lisp/mh-e/mh-speed.el:1.10
*** emacs/lisp/mh-e/mh-speed.el:1.9     Sat May 28 22:04:54 2005
--- emacs/lisp/mh-e/mh-speed.el Fri Jun 17 01:29:30 2005
***************
*** 1,6 ****
  ;;; mh-speed.el --- Speedbar interface for MH-E.
  
! ;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
  
  ;; Author: Satyaki Das <address@hidden>
  ;; Maintainer: Bill Wohler <address@hidden>
--- 1,6 ----
  ;;; mh-speed.el --- Speedbar interface for MH-E.
  
! ;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
  ;; Author: Satyaki Das <address@hidden>
  ;; Maintainer: Bill Wohler <address@hidden>
***************
*** 67,73 ****
      (erase-buffer)
      (clrhash mh-speed-folder-map)
      (speedbar-make-tag-line 'bracket ?+ 'mh-speed-toggle nil " " 'ignore nil
!                             'mh-speedbar-folder-face 0)
      (forward-line -1)
      (setf (gethash nil mh-speed-folder-map)
            (set-marker (or (gethash nil mh-speed-folder-map) (make-marker))
--- 67,73 ----
      (erase-buffer)
      (clrhash mh-speed-folder-map)
      (speedbar-make-tag-line 'bracket ?+ 'mh-speed-toggle nil " " 'ignore nil
!                             'mh-speedbar-folder 0)
      (forward-line -1)
      (setf (gethash nil mh-speed-folder-map)
            (set-marker (or (gethash nil mh-speed-folder-map) (make-marker))
***************
*** 149,160 ****
        (set-buffer speedbar-buffer)
  
        ;; Remove highlight from previous match...
!       (mh-speed-highlight mh-speed-last-selected-folder
!                           'mh-speedbar-folder-face)
  
        ;; If we found a match highlight it...
        (when (mh-speed-goto-folder newcf)
!         (mh-speed-highlight newcf 'mh-speedbar-selected-folder-face))
  
        (setq mh-speed-last-selected-folder newcf)
        (speedbar-position-cursor-on-line)
--- 149,159 ----
        (set-buffer speedbar-buffer)
  
        ;; Remove highlight from previous match...
!       (mh-speed-highlight mh-speed-last-selected-folder 'mh-speedbar-folder)
  
        ;; If we found a match highlight it...
        (when (mh-speed-goto-folder newcf)
!         (mh-speed-highlight newcf 'mh-speedbar-selected-folder))
  
        (setq mh-speed-last-selected-folder newcf)
        (speedbar-position-cursor-on-line)
***************
*** 166,183 ****
  
  (defun mh-speed-normal-face (face)
    "Return normal face for given FACE."
!   (cond ((eq face 'mh-speedbar-folder-with-unseen-messages-face)
!          'mh-speedbar-folder-face)
!         ((eq face 'mh-speedbar-selected-folder-with-unseen-messages-face)
!          'mh-speedbar-selected-folder-face)
          (t face)))
  
  (defun mh-speed-bold-face (face)
    "Return bold face for given FACE."
!   (cond ((eq face 'mh-speedbar-folder-face)
!          'mh-speedbar-folder-with-unseen-messages-face)
!         ((eq face 'mh-speedbar-selected-folder-face)
!          'mh-speedbar-selected-folder-with-unseen-messages-face)
          (t face)))
  
  (defun mh-speed-highlight (folder face)
--- 165,182 ----
  
  (defun mh-speed-normal-face (face)
    "Return normal face for given FACE."
!   (cond ((eq face 'mh-speedbar-folder-with-unseen-messages)
!          'mh-speedbar-folder)
!         ((eq face 'mh-speedbar-selected-folder-with-unseen-messages)
!          'mh-speedbar-selected-folder)
          (t face)))
  
  (defun mh-speed-bold-face (face)
    "Return bold face for given FACE."
!   (cond ((eq face 'mh-speedbar-folder)
!          'mh-speedbar-folder-with-unseen-messages)
!         ((eq face 'mh-speedbar-selected-folder)
!          'mh-speedbar-selected-folder-with-unseen-messages)
          (t face)))
  
  (defun mh-speed-highlight (folder face)
***************
*** 272,279 ****
                        ""))
              'mh-speed-view nil
              (if (and counts (> (car counts) 0))
!                 'mh-speedbar-folder-with-unseen-messages-face
!               'mh-speedbar-folder-face)
              level)
             (save-excursion
               (forward-line -1)
--- 271,278 ----
                        ""))
              'mh-speed-view nil
              (if (and counts (> (car counts) 0))
!                 'mh-speedbar-folder-with-unseen-messages
!               'mh-speedbar-folder)
              level)
             (save-excursion
               (forward-line -1)
***************
*** 496,503 ****
                (add-text-properties
                 (line-beginning-position) (1+ (line-beginning-position))
                 `(mh-children-p ,(equal parent-change ?+)))))
!           (mh-speed-highlight mh-speed-last-selected-folder
!                               'mh-speedbar-folder-face)
            (setq mh-speed-last-selected-folder nil)
            (setq mh-speed-refresh-flag t)))
        (when (equal folder "")
--- 495,501 ----
                (add-text-properties
                 (line-beginning-position) (1+ (line-beginning-position))
                 `(mh-children-p ,(equal parent-change ?+)))))
!           (mh-speed-highlight mh-speed-last-selected-folder 
'mh-speedbar-folder)
            (setq mh-speed-last-selected-folder nil)
            (setq mh-speed-refresh-flag t)))
        (when (equal folder "")