* message.el (message-forward-rmail-make-body): Directly use

rmail-msg-restore-non-pruned-header to avoid calling
vertical-motion.

* gnus-cache.el (gnus-summary-insert-cached-articles):
(gnus-summary-limit-include-cached): gnus-newsgroup-cached is sorted.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd0fbd7..30922a7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
+2002-02-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-forward-rmail-make-body): Directly use
+       rmail-msg-restore-non-pruned-header to avoid calling
+       vertical-motion.
+
 2002-02-02  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * gnus-cache.el (gnus-summary-insert-cached-articles): 
+       (gnus-summary-limit-include-cached): gnus-newsgroup-cached is sorted.
+
        * gnus-group.el (gnus-group-mark-article-read): Nreverse
        gnus-newsgroups-unselected.
 

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 3c454a9..b2a6823 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -362,7 +362,7 @@ Returns the list of articles removed."
 (defun gnus-summary-insert-cached-articles ()
   "Insert all the articles cached for this group into the current buffer."
   (interactive)
-  (let ((cached (sort (copy-sequence gnus-newsgroup-cached) '>))
+  (let ((cached gnus-newsgroup-cached)
        (gnus-verbose (max 6 gnus-verbose)))
     (if (not cached)
        (gnus-message 3 "No cached articles for this group")
@@ -375,11 +375,10 @@ Returns the list of articles removed."
 (defun gnus-summary-limit-include-cached ()
   "Limit the summary buffer to articles that are cached."
   (interactive)
-  (let ((cached (sort (copy-sequence gnus-newsgroup-cached) '>))
-       (gnus-verbose (max 6 gnus-verbose)))
-    (if cached
+  (let ((gnus-verbose (max 6 gnus-verbose)))
+    (if gnus-newsgroup-cached
         (progn
-          (gnus-summary-limit cached)
+          (gnus-summary-limit gnus-newsgroup-cached)
           (gnus-summary-position-point))
         (gnus-message 3 "No cached articles for this group"))))
 

diff --git a/lisp/lpath.el b/lisp/lpath.el
index bd8ac38..6874ace 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -32,7 +32,7 @@
               frames-on-display-list
               make-mode-line-mouse-map
               rmail-select-summary rmail-summary-exists rmail-update-summary
-              rmail-toggle-header
+              rmail-msg-is-pruned rmail-msg-restore-non-pruned-header
               sc-cite-regexp set-font-family set-font-size temp-directory
               string-as-multibyte
               tool-bar-add-item tool-bar-add-item-from-menu

diff --git a/lisp/message.el b/lisp/message.el
index 17df850..e26a85f 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5022,8 +5022,8 @@ Optional DIGEST will use digest to forward."
 (defun message-forward-rmail-make-body (forward-buffer)
   (save-window-excursion
     (set-buffer forward-buffer)
-    (let (rmail-enable-mime)
-      (rmail-toggle-header 0)))
+    (if (rmail-msg-is-pruned)
+       (rmail-msg-restore-non-pruned-header)))
   (message-forward-make-body forward-buffer))
 
 ;;;###autoload