From: Jesper Harder <harder@ifa.au.dk>
Date: Sun, 11 May 2003 02:09:22 +0000 (+0000)
Subject: * gnus-sum.el (gnus-summary-enter-digest-group): Don't do article
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=ab83a01af3212d008bd56cd5484d59255fd3debc;p=gnus

* gnus-sum.el (gnus-summary-enter-digest-group): Don't do article
washing etc.
(gnus-handle-ephemeral-exit): Don't reload article after exiting.

* nndoc.el (nndoc-type-alist): `mime-digest' should be before
`mime-parts'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b348376c7..297ce1c63 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2003-05-11  Jesper Harder  <harder@ifa.au.dk>
+
+	* gnus-sum.el (gnus-summary-enter-digest-group): Don't do article
+	washing etc.
+	(gnus-handle-ephemeral-exit): Don't reload article after exiting.
+
+	* nndoc.el (nndoc-type-alist): `mime-digest' should be before
+	`mime-parts'.
+
 2003-05-10  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus-cite.el (gnus-article-hide-citation-maybe): Make toggling
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index d3a9414b2..48d5c9423 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -6616,7 +6616,10 @@ The state which existed when entering the ephemeral is reset."
 	(progn
 	  ;; The current article may be from the ephemeral group
 	  ;; thus it is best that we reload this article
-	  (gnus-summary-show-article)
+	  ;;
+	  ;; If we're exiting from a large digest, this can be
+	  ;; extremely slow.  So, it's better not to reload it. -- jh.
+	  ;;(gnus-summary-show-article)
 	  (if (and (boundp 'gnus-pick-mode) (symbol-value 'gnus-pick-mode))
 	      (gnus-configure-windows 'pick 'force)
 	    (gnus-configure-windows (cdr quit-config) 'force)))
@@ -8142,8 +8145,12 @@ If FORCE, force a digest interpretation.  If not, try
 to guess what the document format is."
   (interactive "P")
   (let ((conf gnus-current-window-configuration))
-    (save-excursion
-      (gnus-summary-select-article))
+    (save-window-excursion
+      (save-excursion
+	(let (gnus-article-prepare-hook
+	      gnus-display-mime-function
+	      gnus-break-pages)
+	  (gnus-summary-select-article))))
     (setq gnus-current-window-configuration conf)
     (let* ((name (format "%s-%d"
 			 (gnus-group-prefixed-name
diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 00d799e15..28b783d3c 100644
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -58,6 +58,13 @@ from the document.")
   `((mmdf
      (article-begin .  "^\^A\^A\^A\^A\n")
      (body-end .  "^\^A\^A\^A\^A\n"))
+    (mime-digest
+     (article-begin . "")
+     (head-begin . "^ ?\n")
+     (head-end . "^ ?$")
+     (body-end . "")
+     (file-end . "")
+     (subtype digest guess))
     (mime-parts
      (generate-head-function . nndoc-generate-mime-parts-head)
      (article-transform-function . nndoc-transform-mime-parts))
@@ -94,13 +101,7 @@ from the document.")
      (head-end . "^\t")
      (generate-head-function . nndoc-generate-clari-briefs-head)
      (article-transform-function . nndoc-transform-clari-briefs))
-    (mime-digest
-     (article-begin . "")
-     (head-begin . "^ ?\n")
-     (head-end . "^ ?$")
-     (body-end . "")
-     (file-end . "")
-     (subtype digest guess))
+    
     (standard-digest
      (first-article . ,(concat "^" (make-string 70 ?-) "\n *\n+"))
      (article-begin . ,(concat "^\n" (make-string 30 ?-) "\n *\n+"))