[Emacs-diffs] Changes to emacs/lisp/mail/rmailsum.el

[Richard M . Stallman]

Index: emacs/lisp/mail/rmailsum.el
diff -c emacs/lisp/mail/rmailsum.el:1.133 emacs/lisp/mail/rmailsum.el:1.134
*** emacs/lisp/mail/rmailsum.el:1.133   Thu May 26 15:17:48 2005
--- emacs/lisp/mail/rmailsum.el Sun Jul  3 16:29:14 2005
***************
*** 54,59 ****
--- 54,67 ----
      ("{ \\([^\n}]+\\) }" 1 font-lock-comment-face))           ; Labels.
    "Additional expressions to highlight in Rmail Summary mode.")
  
+ (defvar rmail-summary-redo
+   "(FUNCTION . ARGS) to regenerate this Rmail summary buffer.")
+ 
+ (defvar rmail-summary-overlay nil)
+ (put 'rmail-summary-overlay 'permanent-local t)
+ 
+ (defvar rmail-summary-mode-map nil)
+ 
  ;; Entry points for making a summary buffer.
  
  ;; Regenerate the contents of the summary
***************
*** 165,170 ****
--- 173,180 ----
  
  (defvar rmail-summary-symbol-number 0)
  
+ (defvar rmail-new-summary-line-count)
+ 
  (defun rmail-new-summary (description redo-form function &rest args)
    "Create a summary of selected messages.
  DESCRIPTION makes part of the mode line of the summary buffer.
***************
*** 187,193 ****
        (setq mesg rmail-current-message)
        ;; Filter the messages; make or get their summary lines.
        (let ((summary-msgs ())
!           (new-summary-line-count 0))
        (let ((msgnum 1)
              (buffer-read-only nil)
              (old-min (point-min-marker))
--- 197,203 ----
        (setq mesg rmail-current-message)
        ;; Filter the messages; make or get their summary lines.
        (let ((summary-msgs ())
!           (rmail-new-summary-line-count 0))
        (let ((msgnum 1)
              (buffer-read-only nil)
              (old-min (point-min-marker))
***************
*** 263,273 ****
  (defun rmail-make-summary-line (msg)
    (let ((line (or (aref rmail-summary-vector (1- msg))
                  (progn
!                   (setq new-summary-line-count
!                         (1+ new-summary-line-count))
!                   (if (zerop (% new-summary-line-count 10))
                        (message "Computing summary lines...%d"
!                                new-summary-line-count))
                    (rmail-make-summary-line-1 msg)))))
      ;; Fix up the part of the summary that says "deleted" or "unseen".
      (aset line 5
--- 273,283 ----
  (defun rmail-make-summary-line (msg)
    (let ((line (or (aref rmail-summary-vector (1- msg))
                  (progn
!                   (setq rmail-new-summary-line-count
!                         (1+ rmail-new-summary-line-count))
!                   (if (zerop (% rmail-new-summary-line-count 10))
                        (message "Computing summary lines...%d"
!                                rmail-new-summary-line-count))
                    (rmail-make-summary-line-1 msg)))))
      ;; Fix up the part of the summary that says "deleted" or "unseen".
      (aset line 5
***************
*** 842,849 ****
                      (rmail-show-message msg-num t))))))
        (rmail-summary-update-highlight nil)))))
  
- (defvar rmail-summary-mode-map nil)
- 
  (if rmail-summary-mode-map
      nil
    (setq rmail-summary-mode-map (make-keymap))
--- 852,857 ----
***************
*** 1037,1045 ****
  (define-key rmail-summary-mode-map [menu-bar move next]
    '("Next" . rmail-summary-next-all))
  
- (defvar rmail-summary-overlay nil)
- (put 'rmail-summary-overlay 'permanent-local t)
- 
  (defun rmail-summary-mouse-goto-message (event)
    "Select the message whose summary line you click on."
    (interactive "@e")
--- 1045,1050 ----
***************
*** 1191,1197 ****
        (or (eq buffer (window-buffer (next-window (frame-first-window))))
            (delete-other-windows)))
      (pop-to-buffer rmail-view-buffer))
!   (beginning-of-buffer)
    (pop-to-buffer rmail-summary-buffer))
  
  (defun rmail-summary-bury ()
--- 1196,1203 ----
        (or (eq buffer (window-buffer (next-window (frame-first-window))))
            (delete-other-windows)))
      (pop-to-buffer rmail-view-buffer))
!   (with-no-warnings
!     (beginning-of-buffer))
    (pop-to-buffer rmail-summary-buffer))
  
  (defun rmail-summary-bury ()
***************
*** 1275,1286 ****
  (defun rmail-summary-first-message ()
    "Show first message in Rmail file from summary buffer."
    (interactive)
!   (beginning-of-buffer))
  
  (defun rmail-summary-last-message ()
    "Show last message in Rmail file from summary buffer."
    (interactive)
!   (end-of-buffer)
    (forward-line -1))
  
  (defvar rmail-summary-edit-map nil)
--- 1281,1294 ----
  (defun rmail-summary-first-message ()
    "Show first message in Rmail file from summary buffer."
    (interactive)
!   (with-no-warnings
!     (beginning-of-buffer)))
  
  (defun rmail-summary-last-message ()
    "Show last message in Rmail file from summary buffer."
    (interactive)
!   (with-no-warnings
!     (end-of-buffer))
    (forward-line -1))
  
  (defvar rmail-summary-edit-map nil)