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

[Bill Wohler]

Index: emacs/lisp/mh-e/mh-speed.el
diff -c emacs/lisp/mh-e/mh-speed.el:1.2 emacs/lisp/mh-e/mh-speed.el:1.3
*** emacs/lisp/mh-e/mh-speed.el:1.2     Mon Feb  3 15:55:30 2003
--- emacs/lisp/mh-e/mh-speed.el Fri Apr 25 01:52:00 2003
***************
*** 1,6 ****
  ;;; mh-speed.el --- Speedbar interface for MH-E.
  
! ;; Copyright (C) 2002 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 Free Software Foundation, Inc.
  
  ;; Author: Satyaki Das <address@hidden>
  ;; Maintainer: Bill Wohler <address@hidden>
***************
*** 31,38 ****
  
  ;;; Change Log:
  
- ;; $Id: mh-speed.el,v 1.2 2003/02/03 20:55:30 wohler Exp $
- 
  ;;; Code:
  
  ;; Requires
--- 31,36 ----
***************
*** 70,76 ****
                              'mh-speedbar-folder-face 0)
      (forward-line -1)
      (setf (gethash nil mh-speed-folder-map)
!           (set-marker (make-marker) (1+ (line-beginning-position))))
      (add-text-properties
       (line-beginning-position) (1+ (line-beginning-position))
       `(mh-folder nil mh-expanded nil mh-children-p t mh-level 0))
--- 68,75 ----
                              '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))
!                       (1+ (line-beginning-position))))
      (add-text-properties
       (line-beginning-position) (1+ (line-beginning-position))
       `(mh-folder nil mh-expanded nil mh-children-p t mh-level 0))
***************
*** 278,284 ****
             (save-excursion
               (forward-line -1)
               (setf (gethash folder-name mh-speed-folder-map)
!                    (set-marker (make-marker) (1+ (line-beginning-position))))
               (add-text-properties
                (line-beginning-position) (1+ (line-beginning-position))
                `(mh-folder ,folder-name
--- 277,285 ----
             (save-excursion
               (forward-line -1)
               (setf (gethash folder-name mh-speed-folder-map)
!                    (set-marker (or (gethash folder-name mh-speed-folder-map)
!                                    (make-marker))
!                                (1+ (line-beginning-position))))
               (add-text-properties
                (line-beginning-position) (1+ (line-beginning-position))
                `(mh-folder ,folder-name
***************
*** 309,316 ****
               (setq start-region (point))
               (while (and (get-text-property (point) 'mh-level)
                           (> (get-text-property (point) 'mh-level) level))
!                (remhash (get-text-property (point) 'mh-folder)
!                         mh-speed-folder-map)
                 (forward-line))
               (delete-region start-region (point))
               (forward-line -1)
--- 310,319 ----
               (setq start-region (point))
               (while (and (get-text-property (point) 'mh-level)
                           (> (get-text-property (point) 'mh-level) level))
!                (let ((folder (get-text-property (point) 'mh-folder)))
!                  (when (gethash folder mh-speed-folder-map)
!                    (set-marker (gethash folder mh-speed-folder-map) nil)
!                    (remhash folder mh-speed-folder-map)))
                 (forward-line))
               (delete-region start-region (point))
               (forward-line -1)
***************
*** 344,367 ****
         (delete-other-windows)))))
  
  (defvar mh-speed-current-folder nil)
  
  ;;;###mh-autoload
! (defun mh-speed-flists (force)
    "Execute flists -recurse and update message counts.
! If FORCE is non-nil the timer is reset."
    (interactive (list t))
    (when force
!     (when (timerp mh-speed-flists-timer)
!       (cancel-timer mh-speed-flists-timer))
!     (setq mh-speed-flists-timer nil)
      (when (and (processp mh-speed-flists-process)
                 (not (eq (process-status mh-speed-flists-process) 'exit)))
        (kill-process mh-speed-flists-process)
        (setq mh-speed-flists-process nil)))
    (unless mh-speed-flists-timer
      (setq mh-speed-flists-timer
            (run-at-time
!            nil mh-speed-flists-interval
             (lambda ()
               (unless (and (processp mh-speed-flists-process)
                            (not (eq (process-status mh-speed-flists-process)
--- 347,375 ----
         (delete-other-windows)))))
  
  (defvar mh-speed-current-folder nil)
+ (defvar mh-speed-flists-folder nil)
  
  ;;;###mh-autoload
! (defun mh-speed-flists (force &optional folder)
    "Execute flists -recurse and update message counts.
! If FORCE is non-nil the timer is reset. If FOLDER is non-nil then flists is 
run
! only for that one folder."
    (interactive (list t))
    (when force
!     (when mh-speed-flists-timer
!       (cancel-timer mh-speed-flists-timer)
!       (setq mh-speed-flists-timer nil))
      (when (and (processp mh-speed-flists-process)
                 (not (eq (process-status mh-speed-flists-process) 'exit)))
+       (set-process-filter mh-speed-flists-process t)
        (kill-process mh-speed-flists-process)
+       (setq mh-speed-partial-line "")
        (setq mh-speed-flists-process nil)))
+   (setq mh-speed-flists-folder folder)
    (unless mh-speed-flists-timer
      (setq mh-speed-flists-timer
            (run-at-time
!            nil (and mh-speed-run-flists-flag mh-speed-flists-interval)
             (lambda ()
               (unless (and (processp mh-speed-flists-process)
                            (not (eq (process-status mh-speed-flists-process)
***************
*** 376,383 ****
                 (setq mh-speed-flists-process
                       (start-process "*flists*" nil
                                      (expand-file-name "flists" mh-progs)
!                                     "-recurse"
                                      "-sequence" (symbol-name mh-unseen-seq)))
                 (set-process-filter mh-speed-flists-process
                                     'mh-speed-parse-flists-output)))))))
  
--- 384,394 ----
                 (setq mh-speed-flists-process
                       (start-process "*flists*" nil
                                      (expand-file-name "flists" mh-progs)
!                                     (or mh-speed-flists-folder "-recurse")
!                                     (if mh-speed-flists-folder "-noall" 
"-all")
                                      "-sequence" (symbol-name mh-unseen-seq)))
+                ;; Run flists on all folders the next time around...
+                (setq mh-speed-flists-folder nil)
                 (set-process-filter mh-speed-flists-process
                                     'mh-speed-parse-flists-output)))))))
  
***************
*** 397,403 ****
                  mh-speed-partial-line "")
            (multiple-value-setq (folder unseen total)
              (mh-parse-flist-output-line line mh-speed-current-folder))
!           (when (and folder unseen total)
              (setf (gethash folder mh-speed-flists-cache) (cons unseen total))
              (save-excursion
                (when (buffer-live-p (get-buffer speedbar-buffer))
--- 408,417 ----
                  mh-speed-partial-line "")
            (multiple-value-setq (folder unseen total)
              (mh-parse-flist-output-line line mh-speed-current-folder))
!           (when (and folder unseen total
!                      (let ((old-pair (gethash folder mh-speed-flists-cache)))
!                        (or (not (equal (car old-pair) unseen))
!                            (not (equal (cdr old-pair) total)))))
              (setf (gethash folder mh-speed-flists-cache) (cons unseen total))
              (save-excursion
                (when (buffer-live-p (get-buffer speedbar-buffer))
***************
*** 514,520 ****
            (insert-char char 1 t)
            (put-text-property (point) (1- (point)) 'invisible nil)
            ;; make sure we fix the image on the text here.
!           (speedbar-insert-image-button-maybe (- (point) 2) 3)))))
  
  (provide 'mh-speed)
  
--- 528,535 ----
            (insert-char char 1 t)
            (put-text-property (point) (1- (point)) 'invisible nil)
            ;; make sure we fix the image on the text here.
!           (mh-funcall-if-exists
!            speedbar-insert-image-button-maybe (- (point) 2) 3)))))
  
  (provide 'mh-speed)