emacs: lisp/mail/mh-speed.el comparison

comparison lisp/mail/mh-speed.el @ 49120:30c4902b654d

Upgraded to MH-E version 7.1.

author	Bill Wohler <wohler@newt.com>
date	Wed, 08 Jan 2003 23:21:16 +0000
parents	8aaba207e44b
children

comparison

equal deleted inserted replaced

-:938f153410ae
+:30c4902b654d
 ;;; mh-speed.el --- Speedbar interface for MH-E.
 ;; Copyright (C) 2002 Free Software Foundation, Inc.
-;; Author: Bill Wohler <wohler@newt.com>
+;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
 ;; Keywords: mail
 ;; See: mh-e.el
 ;; This file is part of GNU Emacs.
 ;; Speedbar support for MH-E package.
 ;;; Change Log:
-;; $Id: mh-speed.el,v 1.26 2002/11/13 19:36:00 wohler Exp $
+;; $Id: mh-speed.el,v 1.34 2003/01/07 21:15:20 satyaki Exp $
 ;;; Code:
 ;; Requires
 (require 'cl)
-(require 'mh-utils)
 (require 'mh-e)
 (require 'speedbar)
-;; Autoloads
-(autoload 'mh-index-goto-nearest-msg "mh-index")
-(autoload 'mh-index-parse-folder "mh-index")
-(autoload 'mh-visit-folder "mh-e")
-;; User customizable
-(defcustom mh-large-folder 200
-"The number of messages that indicates a large folder.
-If the number of messages in a folder exceeds this value, confirmation is
-required when the folder is visited from the speedbar."
-:type 'integer
-:group 'mh)
-(defcustom mh-speed-flists-interval 60
-"Time between calls to flists in seconds.
-If 0, flists is not called repeatedly."
-:type 'integer
-:group 'mh)
-(defcustom mh-speed-run-flists-flag t
-"Non-nil means flists is used.
-If non-nil, flists is executed every `mh-speed-flists-interval' seconds to
-update the display of the number of unseen and total messages in each folder.
-If resources are limited, this can be set to nil and the speedbar display can
-be updated manually with the \\[mh-speed-flists] command."
-:type 'boolean
-:group 'mh)
-(defface mh-speedbar-folder-face
-'((((class color) (background light))
-(:foreground "blue4"))
-(((class color) (background dark))
-(:foreground "light blue")))
-"Face used for folders in the speedbar buffer."
-:group 'mh)
-(defface mh-speedbar-selected-folder-face
-'((((class color) (background light))
-(:foreground "red" :underline t))
-(((class color) (background dark))
-(:foreground "red" :underline t))
-(t (:underline t)))
-"Face used for the current folder."
-:group 'mh)
-(defface mh-speedbar-folder-with-unseen-messages-face
-'((t (:inherit mh-speedbar-folder-face :bold t)))
-"Face used for folders in the speedbar buffer which have unread messages."
-:group 'mh)
-(defface mh-speedbar-selected-folder-with-unseen-messages-face
-'((t (:inherit mh-speedbar-selected-folder-face :bold t)))
-"Face used for the current folder when it has unread messages."
-:group 'mh)
 ;; Global variables
 (defvar mh-speed-refresh-flag nil)
 (defvar mh-speed-last-selected-folder nil)
 (defvar mh-speed-folder-map (make-hash-table :test #'equal))
 (copy-tree speedbar-stealthy-function-list))
 (push 'mh-speed-stealth-update
 (cdr (assoc "files" speedbar-stealthy-function-list))))
 ;; Functions called by speedbar to initialize display...
+;;;###mh-autoload
 (defun mh-folder-speedbar-buttons (buffer)
 "Interface function to create MH-E speedbar buffer.
 BUFFER is the MH-E buffer for which the speedbar buffer is to be created."
 (unless (get-text-property (point-min) 'mh-level)
 (erase-buffer)
 `(mh-folder nil mh-expanded nil mh-children-p t mh-level 0))
 (mh-speed-stealth-update t)
 (when mh-speed-run-flists-flag
 (mh-speed-flists nil))))
+;;;###mh-autoload
 (defalias 'mh-show-speedbar-buttons 'mh-folder-speedbar-buttons)
-(defalias 'mh-index-folder-speedbar-buttons 'mh-folder-speedbar-buttons)
+;;;###mh-autoload
-(defalias 'mh-index-show-speedbar-buttons 'mh-folder-speedbar-buttons)
 (defalias 'mh-letter-speedbar-buttons 'mh-folder-speedbar-buttons)
 ;; Keymaps for speedbar...
 (defvar mh-folder-speedbar-key-map (speedbar-make-specialized-keymap)
 "Specialized speedbar keymap for MH-E buffers.")
 (gnus-define-keys mh-folder-speedbar-key-map
-"+"		mh-speed-expand-folder
+"+"           mh-speed-expand-folder
-"-"		mh-speed-contract-folder
+"-"           mh-speed-contract-folder
-"\r"		mh-speed-view
+"\r"          mh-speed-view
-"f"		mh-speed-flists
+"f"           mh-speed-flists
-"i"		mh-speed-invalidate-map)
+"i"           mh-speed-invalidate-map)
 (defvar mh-show-speedbar-key-map mh-folder-speedbar-key-map)
-(defvar mh-index-folder-speedbar-key-map mh-folder-speedbar-key-map)
-(defvar mh-index-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
 ["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)
-(defvar mh-index-folder-speedbar-menu-items mh-folder-speedbar-menu-items)
-(defvar mh-index-show-speedbar-menu-items mh-folder-speedbar-menu-items)
 (defvar mh-letter-speedbar-menu-items mh-folder-speedbar-menu-items)
 (defmacro mh-speed-select-attached-frame ()
 "Compatibility macro to handle speedbar versions 0.11a and 0.14beta4."
 (cond ((fboundp 'dframe-select-attached-frame)
 Otherwise you get the disconcerting behavior of folders popping open on their
 own when you are trying to navigate around in the speedbar buffer.
 The update is always carried out if FORCE is non-nil."
 (let* ((lastf (selected-frame))
-	 (newcf (save-excursion
+(newcf (save-excursion
 (mh-speed-select-attached-frame)
 (prog1 (mh-speed-extract-folder-name (buffer-name))
 (select-frame lastf))))
-	 (lastb (current-buffer))
+(lastb (current-buffer))
-	 (case-fold-search t))
+(case-fold-search t))
 (when (or force
 (and mh-speed-refresh-flag (not (eq lastf speedbar-frame)))
 (and (stringp newcf)
 (equal (substring newcf 0 1) "+")
 (not (equal newcf mh-speed-last-selected-folder))))
 The function will expand out parent folders of FOLDER if needed."
 (let ((prefix folder)
 (suffix-list ())
 (last-slash t))
 (while (and (not (gethash prefix mh-speed-folder-map)) last-slash)
-(setq last-slash (search "/" prefix :from-end t))
+(setq last-slash (mh-search-from-end ?/ prefix))
 (when (integerp last-slash)
 (push (substring prefix (1+ last-slash)) suffix-list)
 (setq prefix (substring prefix 0 last-slash))))
 (let ((prefix-position (gethash prefix mh-speed-folder-map)))
 (if prefix-position
 (cond ((eq major-mode 'mh-folder-mode)
 mh-current-folder)
 ((eq major-mode 'mh-show-mode)
 (set-buffer mh-show-folder-buffer)
 mh-current-folder)
-((eq major-mode 'mh-index-folder-mode)
+((eq major-mode 'mh-letter-mode)
-(save-excursion
-(mh-index-goto-nearest-msg)
-(mh-index-parse-folder)))
-((or (eq major-mode 'mh-index-show-mode)
-(eq major-mode 'mh-letter-mode))
 (when (string-match mh-user-path buffer-file-name)
 (let* ((rel-path (substring buffer-file-name (match-end 0)))
-(directory-end (search "/" rel-path :from-end t)))
+(directory-end (mh-search-from-end ?/ rel-path)))
 (when directory-end
 (format "+%s" (substring rel-path 0 directory-end)))))))))
 (defun mh-speed-add-buttons (folder level)
 "Add speedbar button for FOLDER which is at indented by LEVEL amount."
 (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
 mh-expanded nil
 mh-children-p ,(not (not (cdr f)))
-,@(if counts `(mh-count (,(car counts) . ,(cdr counts))) ())
+,@(if counts `(mh-count
-mh-level ,level))))))
+(,(car counts) . ,(cdr counts))) ())
+mh-level ,level))))))
 folder-list)))
+;;;###mh-autoload
 (defun mh-speed-toggle (&rest args)
 "Toggle the display of child folders.
 The otional ARGS are ignored and there for compatibilty with speedbar."
 (interactive)
 (declare (ignore args))
 `(mh-expanded t)))))))
 (defalias 'mh-speed-expand-folder 'mh-speed-toggle)
 (defalias 'mh-speed-contract-folder 'mh-speed-toggle)
-(defun mh-speed-folder-size ()
+;;;###mh-autoload
-"Find folder size if folder on current line."
-(let ((folder (get-text-property (line-beginning-position) 'mh-folder)))
-(or (cdr (get-text-property (line-beginning-position) 'mh-count))
-(and (null folder) 0)
-(with-temp-buffer
-(call-process (expand-file-name "flist" mh-progs) nil t nil
-"-norecurse" folder)
-(goto-char (point-min))
-(unless (re-search-forward "out of " (line-end-position) t)
-(error "Call to flist failed on folder %s" folder))
-(car (read-from-string
-(buffer-substring-no-properties (point)
-(line-end-position))))))))
 (defun mh-speed-view (&rest args)
 "View folder on current line.
 Optional ARGS are ignored."
 (interactive)
 (declare (ignore args))
 (let* ((folder (get-text-property (line-beginning-position) 'mh-folder))
-(range
+(range (and (stringp folder) (mh-read-msg-range folder))))
-(cond ((save-excursion
-(beginning-of-line)
-(re-search-forward "([1-9][0-9]*/[0-9]+)"
-(line-end-position) t))
-mh-unseen-seq)
-		 ((> (mh-speed-folder-size) mh-large-folder)
-		  (let* ((size (mh-speed-folder-size))
-			 (prompt
-			  (format "How many messages from %s (default: %s): "
-				  folder size))
-			 (in (read-string prompt nil nil
-					  (number-to-string size)))
-			 (result (car (ignore-errors (read-from-string in)))))
-		    (cond ((null result) (format "last:%s" size))
-			  ((numberp result) (format "last:%s" result))
-			  (t (format "%s" result)))))
-		 (t nil))))
 (when (stringp folder)
 (speedbar-with-attached-buffer
 (mh-visit-folder folder range)
 (delete-other-windows)))))
 (results ()))
 (with-temp-buffer
 (apply #'call-process arg-list)
 (goto-char (point-min))
 (while (not (and (eolp) (bolp)))
-(let ((folder-end (or (search-forward "+ " (line-end-position) t)
+(goto-char (line-end-position))
-(search-forward " " (line-end-position) t))))
+(let ((has-pos (search-backward " has " (line-beginning-position) t)))
-(when (integerp folder-end)
+(when (integerp has-pos)
-(let ((name (buffer-substring (line-beginning-position)
+(while (or (equal (char-after has-pos) ? )
-(match-beginning 0))))
+(equal (char-after has-pos) ?+))
+(decf has-pos))
+(incf has-pos)
+(let ((name (buffer-substring (line-beginning-position) has-pos)))
 (let ((first-char (substring name 0 1)))
 (unless (or (string-equal first-char ".")
 (string-equal first-char "#")
 (string-equal first-char ","))
 (push
 (cons name
 (search-forward "(others)" (line-end-position) t))
 results)))))
 (forward-line 1))))
 (setq results (nreverse results))
 (when (stringp folder)
 (setq results (cdr results))
 (let ((folder-name-len (length (format "%s/" (substring folder 1)))))
 (cons (substring (car f) folder-name-len)
 (cdr f)))
 results))))
 results))
+;;;###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
 (unless (and (processp mh-speed-flists-process)
 (not (eq (process-status mh-speed-flists-process)
 'exit)))
 (setq mh-speed-flists-process
 (start-process (expand-file-name "flists" mh-progs) nil
-"flists" "-recurse"))
+"flists" "-recurse"
+"-sequence" (symbol-name mh-unseen-seq)))
 (set-process-filter mh-speed-flists-process
 'mh-speed-parse-flists-output)))))))
 ;; Copied from mh-make-folder-list-filter...
 (defun mh-speed-parse-flists-output (process output)
 (while (setq line-end (string-match "\n" output position))
 (setq line (format "%s%s"
 mh-speed-partial-line
 (substring output position line-end))
 mh-speed-partial-line "")
-(when (string-match "+? " line)
+(multiple-value-setq (folder unseen total)
-(setq folder (format "+%s" (subseq line 0 (match-beginning 0))))
+(mh-parse-flist-output-line line))
-(when (string-match " has " line)
+(when (and folder unseen total)
-(setq unseen (car (read-from-string line (match-end 0))))
+(setf (gethash folder mh-speed-flists-cache) (cons unseen total))
-(when (string-match "; out of " line)
+(save-excursion
-(setq total (car (read-from-string line (match-end 0))))
+(when (buffer-live-p (get-buffer speedbar-buffer))
-(setf (gethash folder mh-speed-flists-cache)
+(set-buffer speedbar-buffer)
-(cons unseen total))
+(speedbar-with-writable
-(save-excursion
+(when (get-text-property (point-min) 'mh-level)
-(when (buffer-live-p (get-buffer speedbar-buffer))
+(let ((pos (gethash folder mh-speed-folder-map))
-(set-buffer speedbar-buffer)
+face)
-(speedbar-with-writable
+(when pos
-(when (get-text-property (point-min) 'mh-level)
+(goto-char pos)
-(let ((pos (gethash folder mh-speed-folder-map))
+(goto-char (line-beginning-position))
-face)
+(cond
-(when pos
+((null (get-text-property (point) 'mh-count))
-(goto-char pos)
+(goto-char (line-end-position))
-(goto-char (line-beginning-position))
+(setq face (get-text-property (1- (point)) 'face))
-(cond
+(insert (format " (%s/%s)" unseen total))
-((null (get-text-property (point) 'mh-count))
+(mh-speed-highlight 'unknown face)
-(goto-char (line-end-position))
+(goto-char (line-beginning-position))
-(setq face (get-text-property (1- (point))
+(add-text-properties (point) (1+ (point))
-'face))
+`(mh-count (,unseen . ,total))))
-(insert (format " (%s/%s)" unseen total))
+((not (equal (get-text-property (point) 'mh-count)
-(mh-speed-highlight 'unknown face)
+(cons unseen total)))
-(goto-char (line-beginning-position))
+(goto-char (line-end-position))
-(add-text-properties
+(setq face (get-text-property (1- (point)) 'face))
-(point) (1+ (point))
+(re-search-backward " " (line-beginning-position) t)
-`(mh-count (,unseen . ,total))))
+(delete-region (point) (line-end-position))
-((not
+(insert (format " (%s/%s)" unseen total))
-(equal (get-text-property (point) 'mh-count)
+(mh-speed-highlight 'unknown face)
-(cons unseen total)))
+(goto-char (line-beginning-position))
-(goto-char (line-end-position))
+(add-text-properties
-(setq face (get-text-property (1- (point))
+(point) (1+ (point))
-'face))
+`(mh-count (,unseen . ,total))))))))))))
-(re-search-backward
-" " (line-beginning-position) t)
-(delete-region (point) (line-end-position))
-(insert (format " (%s/%s)" unseen total))
-(mh-speed-highlight 'unknown face)
-(goto-char (line-beginning-position))
-(add-text-properties
-(point) (1+ (point))
-`(mh-count (,unseen . ,total))))))))))))))
 (setq position (1+ line-end)))
 (set-match-data prevailing-match-data))
-(setq mh-speed-partial-line (subseq output position))))
+(setq mh-speed-partial-line (substring output position))))
+;;;###mh-autoload
 (defun mh-speed-invalidate-map (folder)
 "Remove FOLDER from various optimization caches."
 (interactive (list ""))
 (save-excursion
 (set-buffer speedbar-buffer)
 (let* ((speedbar-update-flag nil)
-(last-slash (search "/" folder :from-end t))
+(last-slash (mh-search-from-end ?/ folder))
 (parent (if last-slash (substring folder 0 last-slash) nil))
 (parent-position (gethash parent mh-speed-folder-map))
 (parent-change nil))
 (remhash parent mh-speed-folders-cache)
 (remhash folder mh-speed-folders-cache)
 (setq mh-speed-last-selected-folder nil)
 (setq mh-speed-refresh-flag t)))
 (when (equal folder "")
 (clrhash mh-speed-folders-cache)))))
+;;;###mh-autoload
 (defun mh-speed-add-folder (folder)
 "Add FOLDER since it is being created.
 The function invalidates the latest ancestor that is present."
 (save-excursion
 (set-buffer speedbar-buffer)
 (let ((speedbar-update-flag nil)
-(last-slash (search "/" folder :from-end t))
+(last-slash (mh-search-from-end ?/ folder))
 (ancestor folder)
 (ancestor-pos nil))
 (block while-loop
 (while last-slash
 (setq ancestor (substring ancestor 0 last-slash))
 (setq ancestor-pos (gethash ancestor mh-speed-folder-map))
 (when ancestor-pos
 (return-from while-loop))
-(setq last-slash (search "/" ancestor :from-end t))))
+(setq last-slash (mh-search-from-end ?/ ancestor))))
 (unless ancestor-pos (setq ancestor nil))
 (goto-char (or ancestor-pos (gethash nil mh-speed-folder-map)))
 (speedbar-with-writable
 (mh-speedbar-change-expand-button-char ?+)
 (add-text-properties
 (defun mh-speedbar-change-expand-button-char (char)
 "Change the expansion button character to CHAR for the current line."
 (save-excursion
 (beginning-of-line)
 (if (re-search-forward "\\[.\\]" (line-end-position) t)
-	(speedbar-with-writable
+(speedbar-with-writable
 (backward-char 2)
-	  (delete-char 1)
+(delete-char 1)
-	  (insert-char char 1 t)
+(insert-char char 1 t)
-	  (put-text-property (point) (1- (point)) 'invisible nil)
+(put-text-property (point) (1- (point)) 'invisible nil)
-	  ;; make sure we fix the image on the text here.
+;; make sure we fix the image on the text here.
-	  (speedbar-insert-image-button-maybe (- (point) 2) 3)))))
+(speedbar-insert-image-button-maybe (- (point) 2) 3)))))
 (provide 'mh-speed)
 ;;; Local Variables:
+;;; indent-tabs-mode: nil
 ;;; sentence-end-double-space: nil
 ;;; End:
 ;;; mh-speed.el ends here

Mercurial > emacs

comparison lisp/mail/mh-speed.el @ 49120:30c4902b654d