[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.5 emacs/lisp/mh-e/mh-speed.el:1.6
*** emacs/lisp/mh-e/mh-speed.el:1.5     Tue Jul 13 03:06:24 2004
--- emacs/lisp/mh-e/mh-speed.el Sun Aug 15 22:00:06 2004
***************
*** 34,43 ****
  ;;; Code:
  
  ;; Requires
! (require 'mh-utils)
  (mh-require-cl)
  (require 'mh-e)
  (require 'speedbar)
  
  ;; Global variables
  (defvar mh-speed-refresh-flag nil)
--- 34,44 ----
  ;;; Code:
  
  ;; Requires
! (eval-when-compile (require 'mh-acros))
  (mh-require-cl)
  (require 'mh-e)
  (require 'speedbar)
+ (require 'timer)
  
  ;; Global variables
  (defvar mh-speed-refresh-flag nil)
***************
*** 90,115 ****
    "+"           mh-speed-expand-folder
    "-"           mh-speed-contract-folder
    "\r"          mh-speed-view
!   "f"           mh-speed-flists
!   "i"           mh-speed-invalidate-map)
  
  (defvar mh-show-speedbar-key-map mh-folder-speedbar-key-map)
  (defvar mh-letter-speedbar-key-map mh-folder-speedbar-key-map)
  
  ;; Menus for speedbar...
  (defvar mh-folder-speedbar-menu-items
!   '(["Visit Folder" mh-speed-view
       (save-excursion
         (set-buffer speedbar-buffer)
         (get-text-property (line-beginning-position) 'mh-folder))]
!     ["Expand nested folders" mh-speed-expand-folder
       (and (get-text-property (line-beginning-position) 'mh-children-p)
            (not (get-text-property (line-beginning-position) 'mh-expanded)))]
!     ["Contract nested folders" mh-speed-contract-folder
       (and (get-text-property (line-beginning-position) 'mh-children-p)
            (get-text-property (line-beginning-position) 'mh-expanded))]
!     ["Run Flists" mh-speed-flists t]
!     ["Invalidate cached folders" mh-speed-invalidate-map t])
    "Extra menu items for speedbar.")
  
  (defvar mh-show-speedbar-menu-items mh-folder-speedbar-menu-items)
--- 91,115 ----
    "+"           mh-speed-expand-folder
    "-"           mh-speed-contract-folder
    "\r"          mh-speed-view
!   "r"           mh-speed-refresh)
  
  (defvar mh-show-speedbar-key-map mh-folder-speedbar-key-map)
  (defvar mh-letter-speedbar-key-map mh-folder-speedbar-key-map)
  
  ;; Menus for speedbar...
  (defvar mh-folder-speedbar-menu-items
!   '("--"
!     ["Visit Folder" mh-speed-view
       (save-excursion
         (set-buffer speedbar-buffer)
         (get-text-property (line-beginning-position) 'mh-folder))]
!     ["Expand Nested Folders" mh-speed-expand-folder
       (and (get-text-property (line-beginning-position) 'mh-children-p)
            (not (get-text-property (line-beginning-position) 'mh-expanded)))]
!     ["Contract Nested Folders" mh-speed-contract-folder
       (and (get-text-property (line-beginning-position) 'mh-children-p)
            (get-text-property (line-beginning-position) 'mh-expanded))]
!     ["Refresh Speedbar" mh-speed-refresh t])
    "Extra menu items for speedbar.")
  
  (defvar mh-show-speedbar-menu-items mh-folder-speedbar-menu-items)
***************
*** 352,357 ****
--- 352,365 ----
  (defvar mh-speed-current-folder nil)
  (defvar mh-speed-flists-folder nil)
  
+ (defmacro mh-process-kill-without-query (process)
+   "PROCESS can be killed without query on Emacs exit.
+ Avoid using `process-kill-without-query' if possible since it is now
+ obsolete."
+   (if (fboundp 'set-process-query-on-exit-flag)
+       `(set-process-query-on-exit-flag ,process nil)
+     `(process-kill-without-query ,process)))
+ 
  ;;;###mh-autoload
  (defun mh-speed-flists (force &rest folders)
    "Execute flists -recurse and update message counts.
***************
*** 396,401 ****
--- 404,410 ----
                              (or mh-speed-flists-folder '("-recurse"))))
                 ;; Run flists on all folders the next time around...
                 (setq mh-speed-flists-folder nil)
+                (mh-process-kill-without-query mh-speed-flists-process)
                 (set-process-filter mh-speed-flists-process
                                     'mh-speed-parse-flists-output)))))))
  
***************
*** 494,499 ****
--- 503,516 ----
        (when (equal folder "")
          (clrhash mh-sub-folders-cache)))))
  
+ (defun mh-speed-refresh ()
+   "Refresh the speedbar.
+ Use this function to refresh the speedbar if folders have been added or
+ deleted or message ranges have been updated outside of MH-E."
+   (interactive)
+   (mh-speed-flists t)
+   (mh-speed-invalidate-map ""))
+ 
  ;;;###mh-autoload
  (defun mh-speed-add-folder (folder)
    "Add FOLDER since it is being created.