From 1634169a01128e2f73bac3d5ee9e5a724427d17e Mon Sep 17 00:00:00 2001
From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 4 Mar 1997 03:08:27 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog     |  47 ++++++++-
 lisp/gnus-ems.el   |   2 +-
 lisp/gnus-score.el |  18 ++--
 lisp/gnus.el       | 254 ++++++++++++++++++++++++++++++---------------
 lisp/nndoc.el      |  16 ++-
 lisp/nnfolder.el   |  11 +-
 lisp/nnheader.el   |   3 +-
 lisp/nnmail.el     |   6 +-
 texi/gnus.texi     |  82 ++++++++-------
 9 files changed, 296 insertions(+), 143 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57a63df7c..2b232f676 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,49 @@
-Fri Aug  4 03:44:13 1995  Lars Magne Ingebrigtsen  <lingebri@sunsci4.cern.ch>
+Sat Aug  5 00:12:33 1995  Lars Magne Ingebrigtsen  <lingebri@sunsci4.cern.ch>
+
+	* gnus.el (gnus-summary-next-article): Don't bug out on the end of
+	the group buffer.
+
+	* nnmail.el (nnmail-move-inbox): Use it.
+
+	* gnus.el (gnus-summary-best-unread-article): Would go to articles
+	below the default score before the articles with default score.
+
+	* gnus-score.el (gnus-summary-increase-score): Only allow
+	substring and regexp on body.
+
+	* gnus.el (gnus-score-find-alist): Would produce recursive lists.
+	(gnus-summary-mode-map): Changed mucho keys.
+
+	* gnus-score.el (gnus-summary-header): Don't give errors when
+	doing score-effect. 
+
+	* gnus.el (gnus-group-apropos): Ignore nil actives.
+	(gnus-remove-some-windows): Would bug out.
+	(gnus-update-group-mark-positions): New function.
+	(gnus-group-mark-group): Follow the group line spec on process
+	marks. 
+
+	* nndoc.el (nndoc-retrieve-headers): Did not do Lines right with
+	digests that had a non-blank separator line.
+	(nndoc-request-article): Did not do anything right with the above.
+	(nndoc-set-header-dependent-regexps): Did not like more than a
+	single space after Content-Type.
+
+Fri Aug  4 23:56:58 1995  Lars Magne Ingebrigtsen  <lingebri@sunsci4.cern.ch>
+
+	* nnfolder.el (nnfolder-request-group): Be sure to activate. 
+
+Fri Aug  4 23:50:12 1995  Lars Magne Ingebrigtsen  <lingebri@sunscipw.cern.ch>
+
+	* gnus-ems.el (gnus-ems-redefine): XEmacs insertion of pseudos was
+	buggy. 
+
+Fri Aug  4 22:34:20 1995  Lars Magne Ingebrigtsen  <lingebri@sunsci4.cern.ch>
+
+	* gnus.el (gnus-newsgroup-reads): New variable. Used throughout
+	the file.
+
+Fri Aug  4 03:44:13 1995  Lars Magne Ingebrigtsen  <lingebri@sunscipw.cern.ch>
 
 	* gnus.el: 0.99.5 is released. (Hah!)
 
diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index f3dcec50a..fe929b63c 100644
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -405,7 +405,7 @@ NOTE: This command only works with newsgroups that use real or simulated NNTP."
 			      'gnus-level 0
 			      'gnus-pseudo (car pslist)))
 	      (remove-text-properties
-	       b (gnus-point-at-eol)
+	       (1+ b) (1+ (gnus-point-at-eol))
 	       '(gnus-number nil gnus-mark nil gnus-level nil))
 	      (forward-line -1)
 	      (gnus-sethash (int-to-string gnus-reffed-article-number)
diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index c4f47036b..eba752884 100644
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -128,8 +128,8 @@ of the last successful match.")
 	 (char-to-header 
 	  '((?a "from" nil nil string)
 	    (?s "subject" nil nil string)
-	    (?b "body" "" nil string)
-	    (?h "head" "" nil string)
+	    (?b "body" "" nil body-string)
+	    (?h "head" "" nil body-string)
 	    (?i "message-id" nil t string)
 	    (?t "references" "message-id" t string)
 	    (?x "xref" nil nil string)
@@ -141,6 +141,8 @@ of the last successful match.")
 	    (?e e "exact string" string)
 	    (?f f "fuzzy string" string)
 	    (?r r "regexp string" string)
+	    (?s s "substring" body-string)
+	    (?r s "regexp string" body-string)
 	    (?b before "before date" date)
 	    (?a at "at date" date) 
 	    (?n now "this date" date)
@@ -282,15 +284,19 @@ of the last successful match.")
       (setq alist (cdr alist))))
   (select-window (get-buffer-window gnus-summary-buffer)))
 
-(defun gnus-summary-header (header)
+(defun gnus-summary-header (header &optional no-err)
   ;; Return HEADER for current articles, or error.
   (let ((article (gnus-summary-article-number))
 	headers)
     (if article
 	(if (setq headers (gnus-get-header-by-number article))
 	    (aref headers (nth 1 (assoc header gnus-header-index)))
-	  (error "Pseudo-articles can't be scored"))
-      (error "No article on current line"))))
+	  (if no-err
+	      nil
+	    (error "Pseudo-articles can't be scored")))
+      (if no-err
+	  (error "No article on current line")
+	nil))))
 
 (defun gnus-summary-score-entry 
   (header match type score date &optional prompt silent)
@@ -401,7 +407,7 @@ SCORE is the score to add."
 			(type match)
 			(t (concat "\\`.*" (regexp-quote match) ".*\\'")))))
       (while (not (eobp))
-	(let ((content (gnus-summary-header header))
+	(let ((content (gnus-summary-header header 'noerr))
 	      (case-fold-search t))
 	  (and content
 	       (if (if (eq type 'f)
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 2d6fa5afb..fa48336a3 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1,4 +1,4 @@
-;;; gnus.el --- a newsreader for GNU Emacs
+;; gnus.el --- a newsreader for GNU Emacs
 ;; Copyright (C) 1987,88,89,90,93,94,95 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -1308,7 +1308,7 @@ variable (string, integer, character, etc).")
 (defconst gnus-maintainer "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)"
   "The mail address of the Gnus maintainers.")
 
-(defconst gnus-version "(ding) Gnus v0.99.5"
+(defconst gnus-version "(ding) Gnus v0.99.6"
   "Version number for this version of Gnus.")
 
 (defvar gnus-info-nodes
@@ -1416,6 +1416,9 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
 (defvar gnus-newsgroup-unselected nil
   "List of unselected unread articles in the current newsgroup.")
 
+(defvar gnus-newsgroup-reads nil
+  "Alist of read articles and article marks in the current newsgroup.")
+
 (defvar gnus-newsgroup-marked nil
   "List of ticked articles in the current newsgroup (a subset of unread art).")
 
@@ -1468,6 +1471,7 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
 (defvar gnus-article-mode-line-format-spec nil)
 (defvar gnus-group-mode-line-format-spec nil)
 (defvar gnus-summary-mark-positions nil)
+(defvar gnus-group-mark-positions nil)
 
 (defvar gnus-summary-expunge-below nil)
 (defvar gnus-reffed-article-number nil)
@@ -1484,6 +1488,7 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
     gnus-newsgroup-last-folder gnus-newsgroup-last-file 
     gnus-newsgroup-auto-expire gnus-newsgroup-unreads 
     gnus-newsgroup-unselected gnus-newsgroup-marked
+    gnus-newsgroup-reads
     gnus-newsgroup-replied gnus-newsgroup-expirable
     gnus-newsgroup-processable gnus-newsgroup-killed
     gnus-newsgroup-bookmarks gnus-newsgroup-dormant
@@ -1891,6 +1896,17 @@ Thank you for your help in stamping out bugs.
 					(- (point) 2))) pos))
       (setq gnus-summary-mark-positions pos))))
 
+(defun gnus-update-group-mark-positions ()
+  (save-excursion
+    (let ((gnus-process-mark 128)
+	  (gnus-group-marked '("dummy.group")))
+      (gnus-set-work-buffer)
+      (gnus-group-insert-group-line nil "dummy.group" 0 nil 0 nil)
+      (goto-char (point-min))
+      (setq gnus-group-mark-positions
+	    (list (cons 'process (and (search-forward "\200" nil t)
+				      (- (point) 2))))))))
+
 (defun gnus-mouse-face-function (form)
   (` (let ((string (, form)))
        (put-text-property 0 (length string) 'mouse-face gnus-mouse-face string)
@@ -2551,16 +2567,21 @@ If optional argument RE-ONLY is non-nil, strip `Re:' only."
 		 (delete-window (get-buffer-window buf)))))
 	(setq buffers (cdr buffers)))
       ;; Remove windows on *all* summary buffers.
-      (walk-windows
-       (lambda (win)
-	 (let ((buf (window-buffer win)))
-	   (if (string-match  "^\\*Summary" (buffer-name buf))
-	       (if first
-		   (progn
-		     (select-window win)
-		     (switch-to-buffer nntp-server-buffer)
-		     (setq first nil))
-		 (delete-window win)))))))))
+      (let (wins)
+	(walk-windows
+	 (lambda (win)
+	   (let ((buf (window-buffer win)))
+	     (if (string-match  "^\\*Summary" (buffer-name buf))
+		 (if first
+		     (progn
+		       (select-window win)
+		       (switch-to-buffer nntp-server-buffer)
+		       (setq first nil))
+		   (setq wins (cons win wins)))))))
+	(while wins
+	  (delete-window (car wins))
+	  (setq wins (cdr wins)))))))
+      
 			  
 (defun gnus-version ()
   "Version numbers of this version of Gnus."
@@ -3677,7 +3698,8 @@ If FIRST-TOO, the current line is also eligible as a target."
 	     (setq group (gnus-group-group-name))
 	     (progn
 	       (beginning-of-line)
-	       (forward-char 2)
+	       (forward-char 
+		(or (cdr (assq 'process gnus-group-mark-positions)) 2))
 	       (delete-char 1)
 	       (if unmark
 		   (progn
@@ -4621,7 +4643,8 @@ If N is negative, this group and the N-1 previous groups will be checked."
     ;; Go through all newsgroups that are known to Gnus.
     (mapatoms 
      (lambda (group)
-       (and (string-match regexp (symbol-name group))
+       (and (symbol-name group)
+	    (string-match regexp (symbol-name group))
 	    (setq groups (cons (symbol-name group) groups))))
      gnus-active-hashtb)
     ;; Go through all descriptions that are known to Gnus. 
@@ -5283,14 +5306,11 @@ buffer.
   (define-key gnus-summary-article-map "e" 'gnus-summary-end-of-article)
   (define-key gnus-summary-article-map "^" 'gnus-summary-refer-parent-article)
   (define-key gnus-summary-article-map "r" 'gnus-summary-refer-parent-article)
-  (define-key gnus-summary-article-map "w" 'gnus-summary-stop-page-breaking)
-  (define-key gnus-summary-article-map "c" 'gnus-summary-caesar-message)
   (define-key gnus-summary-article-map "g" 'gnus-summary-show-article)
-  (define-key gnus-summary-article-map "t" 'gnus-summary-toggle-header)
-  (define-key gnus-summary-article-map "m" 'gnus-summary-toggle-mime)
   (define-key gnus-summary-article-map "s" 'gnus-summary-isearch-article)
 
 
+
   (define-prefix-command 'gnus-summary-wash-map)
   (define-key gnus-summary-mode-map "W" 'gnus-summary-wash-map)
   (define-key gnus-summary-wash-map "h" 'gnus-article-hide-headers)
@@ -5299,13 +5319,18 @@ buffer.
   (define-key gnus-summary-wash-map "\C-c" 'gnus-article-hide-citation-maybe)
   (define-key gnus-summary-wash-map "o" 'gnus-article-treat-overstrike)
   (define-key gnus-summary-wash-map "w" 'gnus-article-word-wrap)
-  (define-key gnus-summary-wash-map "m" 'gnus-article-remove-cr)
+  (define-key gnus-summary-wash-map "M" 'gnus-article-remove-cr)
   (define-key gnus-summary-wash-map "q" 'gnus-article-de-quoted-unreadable)
   (define-key gnus-summary-wash-map "f" 'gnus-article-display-x-face)
   (define-key gnus-summary-wash-map "t" 'gnus-article-date-ut)
   (define-key gnus-summary-wash-map "\C-t" 'gnus-article-date-local)
   (define-key gnus-summary-wash-map "T" 'gnus-article-date-lapsed)
 
+  (define-key gnus-summary-wash-map "l" 'gnus-summary-stop-page-breaking)
+  (define-key gnus-summary-wash-map "r" 'gnus-summary-caesar-message)
+  (define-key gnus-summary-wash-map "G" 'gnus-summary-toggle-header)
+  (define-key gnus-summary-wash-map "m" 'gnus-summary-toggle-mime)
+
   (define-key gnus-summary-wash-map "A" 'gnus-article-highlight)
   (define-key gnus-summary-wash-map "a" 'gnus-article-hide)
   (define-key gnus-summary-wash-map "H" 'gnus-article-highlight-headers)
@@ -5349,29 +5374,29 @@ buffer.
 ;  (define-key gnus-summary-save-map "s" 'gnus-soup-add-article)
 
   (define-key gnus-summary-mode-map "X" 'gnus-uu-extract-map)
-  
+
   (define-prefix-command 'gnus-summary-various-map)
   (define-key gnus-summary-mode-map "V" 'gnus-summary-various-map)
-  (define-key gnus-summary-various-map "u" 'gnus-summary-universal-argument)
-  (define-key gnus-summary-various-map "\C-s" 'gnus-summary-search-article-forward)
-  (define-key gnus-summary-various-map "\C-r" 'gnus-summary-search-article-backward)
-  (define-key gnus-summary-various-map "r" 'gnus-summary-refer-article)
-  (define-key gnus-summary-various-map "&" 'gnus-summary-execute-command)
-  (define-key gnus-summary-various-map "T" 'gnus-summary-toggle-truncation)
-  (define-key gnus-summary-various-map "e" 'gnus-summary-expand-window)
-  (define-key gnus-summary-various-map "D" 'gnus-summary-enter-digest-group)
-  (define-key gnus-summary-various-map "k" 'gnus-summary-edit-local-kill)
-  (define-key gnus-summary-various-map "K" 'gnus-summary-edit-global-kill)
+    (define-key gnus-summary-mode-map "\M-&" 'gnus-summary-universal-argument)
+;  (define-key gnus-summary-various-map "\C-s" 'gnus-summary-search-article-forward)
+;  (define-key gnus-summary-various-map "\C-r" 'gnus-summary-search-article-backward)
+;  (define-key gnus-summary-various-map "r" 'gnus-summary-refer-article)
+;  (define-key gnus-summary-various-map "&" 'gnus-summary-execute-command)
+;  (define-key gnus-summary-various-map "T" 'gnus-summary-toggle-truncation)
+;  (define-key gnus-summary-various-map "e" 'gnus-summary-expand-window)
+  (define-key gnus-summary-article-map "D" 'gnus-summary-enter-digest-group)
+;  (define-key gnus-summary-various-map "k" 'gnus-summary-edit-local-kill)
+;  (define-key gnus-summary-various-map "K" 'gnus-summary-edit-global-kill)
 
   (define-key gnus-summary-various-map "S" 'gnus-summary-score-map)
 
-  (define-prefix-command 'gnus-summary-sort-map)
-  (define-key gnus-summary-various-map "s" 'gnus-summary-sort-map)
-  (define-key gnus-summary-sort-map "n" 'gnus-summary-sort-by-number)
-  (define-key gnus-summary-sort-map "a" 'gnus-summary-sort-by-author)
-  (define-key gnus-summary-sort-map "s" 'gnus-summary-sort-by-subject)
-  (define-key gnus-summary-sort-map "d" 'gnus-summary-sort-by-date)
-  (define-key gnus-summary-sort-map "i" 'gnus-summary-sort-by-score)
+;  (define-prefix-command 'gnus-summary-sort-map)
+;  (define-key gnus-summary-various-map "s" 'gnus-summary-sort-map)
+;  (define-key gnus-summary-sort-map "n" 'gnus-summary-sort-by-number)
+;  (define-key gnus-summary-sort-map "a" 'gnus-summary-sort-by-author)
+;  (define-key gnus-summary-sort-map "s" 'gnus-summary-sort-by-subject)
+;  (define-key gnus-summary-sort-map "d" 'gnus-summary-sort-by-date)
+;  (define-key gnus-summary-sort-map "i" 'gnus-summary-sort-by-score)
 
   (define-key gnus-summary-mode-map "I" 'gnus-summary-increase-score)
   (define-key gnus-summary-mode-map "L" 'gnus-summary-lower-score)
@@ -5523,6 +5548,7 @@ article number."
 	 (vectorp header)
 	 (header-subject header))))
 
+;; Various summary mode internalish functions.
 
 (defun gnus-mouse-pick-article (e)
   (interactive "e")
@@ -5961,7 +5987,11 @@ If NO-ARTICLE is non-nil, no article is selected initially."
 		 ;; It is below, so we mark it as read.
 		 (setq gnus-newsgroup-unreads
 		       (delq (header-number (car headers))
-			     gnus-newsgroup-unreads)))
+			     gnus-newsgroup-unreads))
+		 (setq gnus-newsgroup-reads 
+		       (cons (cons (header-number (car headers))
+				   gnus-low-score-mark) 
+			     gnus-newsgroup-reads)))
 	       (setq headers (cdr headers))))
 	 ;; Ok, these refer back to valid articles, but if
 	 ;; `gnus-thread-ignore-subject' is nil, we have to check that
@@ -5984,7 +6014,11 @@ If NO-ARTICLE is non-nil, no article is selected initially."
 			   (setq new-roots (cons (car headers) new-roots))
 			 (setq gnus-newsgroup-unreads
 			       (delq (header-number (car headers))
-				     gnus-newsgroup-unreads)))
+				     gnus-newsgroup-unreads))
+			 (setq gnus-newsgroup-reads
+			       (cons (cons (header-number (car headers)) 
+					   gnus-low-score-mark) 
+				     gnus-newsgroup-reads)))
 		       (setcdr prev (cdr headers)))
 		   (setq prev headers))
 		 (setq headers (cdr headers)))))
@@ -6003,6 +6037,9 @@ If NO-ARTICLE is non-nil, no article is selected initially."
 			    (setq prev headers))
 		   (setq gnus-newsgroup-unreads 
 			 (delq article gnus-newsgroup-unreads))
+		   (setq gnus-newsgroup-reads 
+			 (cons (cons article gnus-low-score-mark) 
+			       gnus-newsgroup-reads))
 		   (setcdr prev (cdr headers)))
 		 (setq headers (cdr headers))))
 	   ;; It was not expunged, but we look at expunged children.
@@ -6016,6 +6053,9 @@ If NO-ARTICLE is non-nil, no article is selected initially."
 		   (setq prev headers)
 		 (setq gnus-newsgroup-unreads 
 		       (delq article gnus-newsgroup-unreads))
+		 (setq gnus-newsgroup-reads 
+		       (cons (cons article gnus-low-score-mark)
+			     gnus-newsgroup-reads))
 		 (setcdr prev (cdr headers)))
 	       (setq headers (cdr headers)))))))
      gnus-newsgroup-dependencies)
@@ -6052,6 +6092,9 @@ If NO-ARTICLE is non-nil, no article is selected initially."
 			(progn
 			  (setq gnus-newsgroup-unreads
 				(delq number gnus-newsgroup-unreads))
+			  (setq gnus-newsgroup-reads
+				(cons (cons number gnus-low-score-mark)
+				      gnus-newsgroup-reads))
 			  t)))))
 	nil
       (list (cons head tail)))))
@@ -6318,8 +6361,11 @@ or a straight list of headers."
 			      gnus-summary-expunge-below))
 		      (setq header nil)
 		      (setq gnus-newsgroup-unreads 
-			    (delq number gnus-newsgroup-unreads)))))
-
+			    (delq number gnus-newsgroup-unreads))
+		      (setq gnus-newsgroup-reads
+			    (cons (cons number gnus-low-score-mark)
+				  gnus-newsgroup-reads)))))
+	  
 	  (and
 	   header
 	   (progn
@@ -6331,7 +6377,8 @@ or a straight list of headers."
 		 ((memq number gnus-newsgroup-dormant) gnus-dormant-mark)
 		 ((memq number gnus-newsgroup-unreads) gnus-unread-mark)
 		 ((memq number gnus-newsgroup-expirable) gnus-expirable-mark)
-		 (t gnus-ancient-mark))
+		 (t (or (cdr (assq number gnus-newsgroup-reads))
+			gnus-ancient-mark)))
 		(memq number gnus-newsgroup-replied)
 		(memq number gnus-newsgroup-expirable)
 		(if (and (eq gnus-summary-make-false-root 'empty)
@@ -6382,7 +6429,10 @@ or a straight list of headers."
 		    gnus-summary-default-score 0)
 		gnus-summary-expunge-below))
 	(setq gnus-newsgroup-unreads 
-	      (delq number gnus-newsgroup-unreads)))
+	      (delq number gnus-newsgroup-unreads))
+	(setq gnus-newsgroup-reads
+	      (cons (cons number gnus-low-score-mark)
+		    gnus-newsgroup-reads)))
        (t
 	(gnus-summary-insert-line
 	 nil header 0 nil 
@@ -6390,7 +6440,8 @@ or a straight list of headers."
 	       ((memq number gnus-newsgroup-dormant) gnus-dormant-mark)
 	       ((memq number gnus-newsgroup-unreads) gnus-unread-mark)
 	       ((memq number gnus-newsgroup-expirable) gnus-expirable-mark)
-	       (t gnus-ancient-mark))
+	       (t (or (cdr (assq number gnus-newsgroup-reads))
+		      gnus-ancient-mark)))
 	 (memq number gnus-newsgroup-replied)
 	 (memq number gnus-newsgroup-expirable)
 	 (header-subject header) nil
@@ -7959,8 +8010,11 @@ If BACKWARD, the previous article is selected instead of the next."
 		(if (memq key keystrokes)
 		    (let ((obuf (current-buffer)))
 		      (switch-to-buffer gnus-group-buffer)
-		      (gnus-group-jump-to-group group)
-		      (execute-kbd-macro (char-to-string key))
+		      (and group
+			   (gnus-group-jump-to-group group))
+		      (condition-case ()
+			  (execute-kbd-macro (char-to-string key))
+			(error (ding) nil))
 		      (setq group (gnus-group-group-name))
 		      (switch-to-buffer obuf)))))
 	    (if (equal key cmd)
@@ -8107,9 +8161,28 @@ Return nil if there are no unread articles."
 		 (setq article art)
 		 (setq best (cdr (car scored))))))
       (setq scored (cdr scored)))
-    (if article 
-	(gnus-summary-goto-article article)
+    (cond
+     ((or (not article) (null gnus-newsgroup-unreads))
+      ;; We didn't find any scored articles, so we just jump to the
+      ;; first article. 
       (gnus-summary-first-unread-article))
+     ((> best gnus-summary-default-score)
+      ;; We found one, and it's bigger than the default score, so we
+      ;; select it.
+      (gnus-summary-goto-article article))
+     (t
+      ;; We found an article, but it has a score lower than the
+      ;; defaults, so we try to find an article with the default
+      ;; score. 
+      (goto-char (point-min))
+      (while (and (or (not (= (gnus-summary-article-mark) gnus-unread-mark))
+		      (not (eq (cdr (memq (gnus-summary-article-number)
+					  gnus-newsgroup-scored))
+			       gnus-summary-default-score)))
+		  (zerop (forward-line 1))
+		  (not (eobp))))
+      ;; We jump to the article we have finally found.
+      (gnus-summary-goto-article (gnus-summary-article-number))))
     (gnus-summary-position-cursor)))
 
 (defun gnus-summary-goto-article (article &optional all-headers)
@@ -8584,7 +8657,10 @@ and `request-accept' functions. (Ie. mail newsgroups at present.)"
 	    (setq gnus-newsgroup-marked (delq article gnus-newsgroup-marked))
 	    (setq gnus-newsgroup-unreads (delq article gnus-newsgroup-unreads))
 	    (setq gnus-newsgroup-dormant
-		  (delq article gnus-newsgroup-dormant)))
+		  (delq article gnus-newsgroup-dormant))
+	    (setq gnus-newsgroup-reads
+		  (cons (cons article gnus-canceled-mark)
+			gnus-newsgroup-reads)))
 	(gnus-message 1 "Couldn't move article %s" (car articles)))
       (gnus-summary-remove-process-mark (car articles))
       (setq articles (cdr articles)))))
@@ -9180,6 +9256,8 @@ returned."
     (setq gnus-newsgroup-unreads (delq article gnus-newsgroup-unreads))
     (setq gnus-newsgroup-marked (delq article gnus-newsgroup-marked))
     (setq gnus-newsgroup-dormant (delq article gnus-newsgroup-dormant))
+    (setq gnus-newsgroup-reads
+	  (cons (cons article mark) gnus-newsgroup-reads))
     ;; Possibly remove from cache, if that is used. 
     (and gnus-use-cache (gnus-cache-enter-remove-article article))
     (and gnus-newsgroup-auto-expire 
@@ -9204,6 +9282,9 @@ returned."
     (setq gnus-newsgroup-marked (delq article gnus-newsgroup-marked))
     (setq gnus-newsgroup-dormant (delq article gnus-newsgroup-dormant))
     (setq gnus-newsgroup-expirable (delq article gnus-newsgroup-expirable))
+    (setq gnus-newsgroup-reads
+	  (delq (assq article gnus-newsgroup-reads)
+		gnus-newsgroup-reads))
     (if (= mark gnus-ticked-mark)
 	(setq gnus-newsgroup-marked (cons article gnus-newsgroup-marked)))
     (if (= mark gnus-dormant-mark)
@@ -9299,6 +9380,8 @@ marked."
     (setq gnus-newsgroup-unreads (delq article gnus-newsgroup-unreads))
     (setq gnus-newsgroup-marked (delq article gnus-newsgroup-marked))
     (setq gnus-newsgroup-dormant (delq article gnus-newsgroup-dormant))
+    (setq gnus-newsgroup-reads 
+	  (cons (cons article mark) gnus-newsgroup-reads))
     ;; Possibly remove from cache, if that is used. 
     (and gnus-use-cache (gnus-cache-enter-remove-article article))))
 
@@ -9311,6 +9394,9 @@ marked."
     (setq gnus-newsgroup-marked (delq article gnus-newsgroup-marked))
     (setq gnus-newsgroup-dormant (delq article gnus-newsgroup-dormant))
     (setq gnus-newsgroup-expirable (delq article gnus-newsgroup-expirable))
+    (setq gnus-newsgroup-reads
+	  (delq (assq article gnus-newsgroup-reads)
+		gnus-newsgroup-reads))
     (if (= mark gnus-ticked-mark)
 	(setq gnus-newsgroup-marked (cons article gnus-newsgroup-marked)))
     (if (= mark gnus-dormant-mark)
@@ -9625,10 +9711,10 @@ The number of articles marked as read is returned."
 	    (let ((unreads (length gnus-newsgroup-unreads)))
 	      (gnus-summary-show-all-threads)
 	      (if (gnus-summary-first-subject (not all))
-		  (while (and (if to-here (< (point) to-here) t)
-			      (gnus-summary-mark-article-as-read
-			       gnus-catchup-mark)
-			      (gnus-summary-search-subject nil (not all)))))
+		  (while (and 
+			  (if to-here (< (point) to-here) t)
+			  (gnus-summary-mark-article-as-read gnus-catchup-mark)
+			  (gnus-summary-search-subject nil (not all)))))
 	      (- unreads (length gnus-newsgroup-unreads))
 	      (or to-here
 		  (setq gnus-newsgroup-unreads gnus-newsgroup-marked)))))
@@ -10359,8 +10445,8 @@ is initialized from the SAVEDIR environment variable."
   ;; Duplicate almost all summary keystrokes in the article mode map.
   (let ((commands 
 	 (list 
-	  " " "\177" "p" "N" "P" "\M-\C-n" "\M-\C-p"
-	  "\M-n" "\M-p" "." "," "\M-s" "\M-r" "<" ">" "j" "^" "\M-^"
+	  "p" "N" "P" "\M-\C-n" "\M-\C-p"
+	  "\M-n" "\M-p" "." "," "\M-s" "\M-r" "<" ">" "j"
 	  "u" "!" "U" "d" "D" "E" "\M-u" "\M-U" "k" "\C-k" "\M-\C-k"
 	  "\M-\C-l" "e" "#" "\M-#" "\M-\C-t" "\M-\C-s" "\M-\C-h"
 	  "\M-\C-f" "\M-\C-b" "\M-\C-u" "\M-\C-d" "&" "\C-w"
@@ -10390,7 +10476,7 @@ is initialized from the SAVEDIR environment variable."
 
   (let ((commands (list "q" "Q"  "c" "r" "R" "\C-c\C-f" "m"  "a" "f" "F"
 ;;			"Zc" "ZC" "ZE" "ZQ" "ZZ" "Zn" "ZR" "ZG" "ZN" "ZP" 
-			 "=" "n")))
+			 "=" "n"  "^" "\M-^")))
     (while commands
       (define-key gnus-article-mode-map (car commands) 
 	'gnus-article-summary-command-nosave)
@@ -11315,8 +11401,9 @@ If NEWSGROUP is nil, return the global kill file name instead."
       ()
     (setq gnus-dribble-eval-file nil)
     (save-excursion
-      (set-buffer gnus-dribble-buffer)
-      (eval-buffer (current-buffer)))))
+      (let ((gnus-dribble-ignore t))
+	(set-buffer gnus-dribble-buffer)
+	(eval-buffer (current-buffer))))))
 
 (defun gnus-dribble-delete-file ()
   (if (file-exists-p (gnus-dribble-file-name))
@@ -11968,16 +12055,17 @@ The `-n' option line from .newsrc is respected."
 	(setq groups (or groups gnus-backup-default-subscribed-newsgroups))
 	(mapatoms
 	 (lambda (sym)
-	   (setq group (symbol-name sym))
-	   (let ((do-sub (gnus-matches-options-n group)))
-	     (cond ((eq do-sub 'subscribe)
-		    (gnus-sethash group group gnus-killed-hashtb)
-		    (funcall 
-		     gnus-subscribe-options-newsgroup-method group))
-		   ((eq do-sub 'ignore)
-		    nil)
-		   (t
-		    (setq gnus-killed-list (cons group gnus-killed-list))))))
+	   (if (null (setq group (symbol-name sym)))
+	       ()
+	     (let ((do-sub (gnus-matches-options-n group)))
+	       (cond 
+		((eq do-sub 'subscribe)
+		 (gnus-sethash group group gnus-killed-hashtb)
+		 (funcall gnus-subscribe-options-newsgroup-method group))
+		((eq do-sub 'ignore)
+		 nil)
+		(t
+		 (setq gnus-killed-list (cons group gnus-killed-list)))))))
 	 gnus-active-hashtb)
 	(while groups
 	  (if (gnus-gethash (car groups) gnus-active-hashtb)
@@ -13723,27 +13811,26 @@ The list is determined from the variable gnus-score-file-alist."
 	score-files)
     ;; if this group has been seen before, return the cached entry
     (if (setq score-files (assoc group gnus-score-file-alist-cache))
-	(cdr score-files)	; ensures caching of groups with no matches
+	(cdr score-files)      ; ensures caching of groups with no matches
       ;; handle the multiple match alist
       (while alist
 	(and (string-match (car (car alist)) group)
 	     (setq score-files
-		   (nconc score-files (cdr (car alist)))))
+		   (nconc score-files (copy-sequence (cdr (car alist))))))
 	(setq alist (cdr alist)))
       (setq alist gnus-score-file-single-match-alist)
       ;; handle the single match alist
-      (catch 'done
-	(while alist
-	  (and (string-match (car (car alist)) group)
-	       ;; progn used just in case ("regexp") has no files
-	       ;; and score-files is still nil. -sj
-	       ;; this can be construed as a "stop searching here" feature :>
-	       ;; and used to simplify regexps in the single-alist 
-	       (progn
-		 (setq score-files
-		       (append score-files (cdr (car alist))))
-		 (throw 'done nil)))
-	  (setq alist (cdr alist))))
+      (while alist
+	(and (string-match (car (car alist)) group)
+	     ;; progn used just in case ("regexp") has no files
+	     ;; and score-files is still nil. -sj
+	     ;; this can be construed as a "stop searching here" feature :>
+	     ;; and used to simplify regexps in the single-alist 
+	     (progn
+	       (setq score-files
+		     (nconc score-files (copy-sequence (cdr (car alist)))))
+	       (setq alist nil)))
+	(setq alist (cdr alist)))
       ;; cache the score files
       (setq gnus-score-file-alist-cache
 	    (cons (cons group score-files) gnus-score-file-alist-cache))
@@ -13757,8 +13844,7 @@ The list is determined from the variable gnus-score-file-alist."
 	 (setq func (list func)))
     ;; Go through all the functions for finding score files (or actual
     ;; scores) and add them to a list.
-    (setq score-files (copy-sequence
-		       (gnus-score-find-alist gnus-newsgroup-name)))
+    (setq score-files (gnus-score-find-alist gnus-newsgroup-name))
     (while func
       (and (symbolp (car func))
 	   (fboundp (car func))
diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 5554628f9..c8d8e81d7 100644
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -134,6 +134,7 @@ Possible values:
 	    (insert (format "221 %d Article retrieved.\n" article))
 	    (insert-buffer-substring nndoc-current-buffer beg p)
 	    (goto-char (point-max))
+	    (or (= (char-after (1- (point))) ?\n) (insert "\n"))
 	    (insert (format "Lines: %d\n" lines))
 	    (insert ".\n"))
 
@@ -200,6 +201,19 @@ Possible values:
 	      (goto-char (point-min))
 	      (while (re-search-forward "^- -"nil t)
 		(replace-match "-" t t))))
+	;; Some assholish digests do not have a blank line after the
+	;; headers. Aargh!
+	(goto-char (point-min))
+	(if (search-forward "\n\n" nil t)
+	    () ; We let this one pass.
+	  (if (re-search-forward "^[ \t]+$" nil t)
+	      (replace-match "" t t) ; We nix out a line of blanks.
+	    (while (and (looking-at "[^ ]+:")
+			(zerop (forward-line 1))))
+	    ;; We just insert a couple of lines. If you read digests
+	    ;; that are so badly formatted, you don't deserve any
+	    ;; better. Blphphpht!
+	    (insert "\n\n")))
 	t))))
 
 (defun nndoc-request-group (group &optional server dont-check)
@@ -291,7 +305,7 @@ Possible values:
 	(goto-char (point-min))
 	(if (and
 	     (re-search-forward
-	      (concat "\n\n\\|^Content-Type: multipart/digest;[ \t\n]*[ \t]"
+	      (concat "\n\n\\|^Content-Type: *multipart/digest;[ \t\n]*[ \t]"
 		      "boundary=\"\\([^\"\n]*[^\" \t\n]\\)\"")
 	      nil t)
 	     (match-beginning 1))
diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 528b9d0bd..6eb1cecbb 100644
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -216,20 +216,13 @@ such things as moving mail.  All buffers always get killed upon server close.")
 
 (defun nnfolder-request-group (group &optional server dont-check)
   (save-excursion
+    (nnmail-activate 'nnfolder)
     (nnfolder-possibly-change-group group)
     (and (assoc group nnfolder-group-alist)
 	 (progn
 	   (if dont-check
 	       t
-	     (nnfolder-get-new-mail group))
-	   (let ((timestamp (nth 5 (file-attributes nnfolder-active-file))))
-	     ;; Make sure we get the latest active file
-	     (if (or (not nnfolder-active-timestamp)
-		     (> (nth 0 timestamp) (nth 0 nnfolder-active-timestamp))
-		     (> (nth 1 timestamp) (nth 1 nnfolder-active-timestamp)))
-		 (progn
-		   (setq nnfolder-active-timestamp timestamp)
-		   (nnmail-activate 'nnfolder)))
+	     (nnfolder-get-new-mail group)
 	     (let* ((active (assoc group nnfolder-group-alist))
 		    (group (car active))
 		    (range (car (cdr active)))
diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 3dafc02c5..4ac438431 100644
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -216,7 +216,8 @@
        (and (file-exists-p file)
 	    (not (file-directory-p file))
 	    (insert-file-contents file))
-       (set-visited-file-name file)))))
+       (set-visited-file-name file)
+       (set-buffer-modified-p nil)))))
 
 (provide 'nnheader)
 
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 111683b2f..b74845c56 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -109,6 +109,10 @@ several files - eg. \".spool[0-9]*\".")
 (defvar nnmail-resplit-incoming nil
   "*If non-nil, re-split incoming procmail sorted mail.")
 
+(defvar nnmail-movemail-program "movemail"
+  "*A command to be executed to move mail from the inbox.
+The default is \"movemail\".")
+
 (defvar nnmail-read-incoming-hook nil
   "*Hook that will be run after the incoming mail has been transferred.
 The incoming mail is moved from `nnmail-spool-file' (which normally is
@@ -389,7 +393,7 @@ perfomed.")
 		 (setq errors (generate-new-buffer " *nnmail loss*"))
 		 (buffer-disable-undo errors)
 		 (call-process
-		  (expand-file-name "movemail" exec-directory)
+		  (expand-file-name nnmail-movemail-program exec-directory)
 		  nil errors nil inbox tofile)
 		 (if (not (buffer-modified-p errors))
 		     ;; No output => movemail won
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 29524ed4a..224c7a9ec 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1783,6 +1783,10 @@ while processing it.  This is usually done in the same directory that
 the mail backend inhabits (i.e., @file{~/Mail/}), but if this variable is
 non-@code{nil}, it will be used instead.
 
+@vindex nnmail-movemail-program
+@code{nnmail-movemail-program} is executed to move mail from the user's
+inbox to her home directory. The default is @samp{"movemail"}.
+
 @vindex nnmail-delete-incoming
 If @code{nnmail-delete-incoming} is non-@code{nil}, the mail backends
 will delete the temporary incoming file after splitting mail into the
@@ -4866,8 +4870,8 @@ Why isn't anything real anymore? How did we get here?
 @section Various Article Stuff 
 
 @table @kbd
-@item A w
-@kindex A w (Summary)
+@item W l
+@kindex W l (Summary)
 @findex gnus-summary-stop-page-breaking
 Remove page breaks from the current article
 (@code{gnus-summary-stop-page-breaking}).
@@ -4876,8 +4880,8 @@ Remove page breaks from the current article
 @findex gnus-summary-isearch-article
 Perform an isearch in the article buffer
 (@code{gnus-summary-isearch-article}). 
-@item A c
-@kindex A c (Summary)
+@item W r
+@kindex W r (Summary)
 @findex gnus-summary-caesar-message
 Do a Caesar rotate (rot13) on the article buffer
 (@code{gnus-summary-caesar-message}). 
@@ -4888,13 +4892,13 @@ Do a Caesar rotate (rot13) on the article buffer
 given a prefix, don't actually refetch any articles, just jump to the
 current article and configure the windows to display the current
 article.
-@item A t
-@kindex A t (Summary)
+@item W G
+@kindex W G (Summary)
 @findex gnus-summary-toggle-header
 Toggle whether to display all headers in the article buffer
 (@code{gnus-summary-toggle-header}). 
-@item A m
-@kindex A m (Summary)
+@item W m
+@kindex W m (Summary)
 @findex gnus-summary-toggle-mime
 Toggle whether to run the article through @sc{mime} before displaying
 (@code{gnus-summary-toggle-mime}).
@@ -4923,8 +4927,8 @@ Treat overstrike (@code{gnus-article-treat-overstrike}).
 @kindex W w (Summary)
 @findex gnus-article-word-wrap
 Do word wrap (@code{gnus-article-word-wrap}).
-@item W m
-@kindex W m (Summary)
+@item W M
+@kindex W M (Summary)
 @findex gnus-article-remove-cr
 Remove CR (@code{gnus-article-remove-cr}).
 @item W q
@@ -4955,24 +4959,24 @@ You can have the summary buffer sorted in various ways, even though I
 can't really see why you'd want that.
 
 @table @kbd
-@item V s n
-@kindex V s n (Summary)
+@item C-c C-s C-n
+@kindex C-c C-s C-n (Summary)
 @findex gnus-summary-sort-by-number
 Sort by article number (@code{gnus-summary-sort-by-number}).
-@item V s a
-@kindex V s a (Summary)
+@item C-c C-s C-a
+@kindex C-c C-s C-a (Summary)
 @findex gnus-summary-sort-by-author
 Sort by author (@code{gnus-summary-sort-by-author}).
-@item V s s
-@kindex V s s (Summary)
+@item C-c C-s C-s
+@kindex C-c C-s C-s (Summary)
 @findex gnus-summary-sort-by-subject
 Sort by subject (@code{gnus-summary-sort-by-subject}).
-@item V s d
-@kindex V s d (Summary)
+@item C-c C-s C-d
+@kindex C-c C-s C-d (Summary)
 @findex gnus-summary-sort-by-date
 Sort by date (@code{gnus-summary-sort-by-date}).
-@item V s i
-@kindex V s i (Summary)
+@item C-c C-s C-i
+@kindex C-c C-s C-i (Summary)
 @findex gnus-summary-sort-by-score
 Sort by score (@code{gnus-summary-sort-by-score}).
 @end table
@@ -5003,7 +5007,7 @@ summary buffer, point will just move to this article.
 @findex gnus-summary-refer-article
 @kindex M-^ (Summary)
 You can also ask the @sc{nntp} server for an arbitrary article, no
-matter what group it belongs to.  @kbd{V r}
+matter what group it belongs to.  @kbd{M-^}
 (@code{gnus-summary-refer-article}) will ask you for a
 @code{Message-Id}, which is one of those long thingies that look
 something like @samp{<38o6up$6f2@@hymir.ifi.uio.no>}.  You have to get
@@ -5691,13 +5695,13 @@ interpreting it.
 Two functions for editing a GNUS kill file:
 
 @table @kbd
-@item V k
-@kindex V k (Summary)
+@item M-k
+@kindex M-k (Summary)
 @findex gnus-summary-edit-local-kill
 Edit this group's kill file (@code{gnus-summary-edit-local-kill}).
 
-@item V K
-@kindex V K (Summary)
+@item M-K
+@kindex M-K (Summary)
 @findex gnus-summary-edit-global-kill
 Edit the general kill file (@code{gnus-summary-edit-global-kill}).
 @end table
@@ -5838,24 +5842,24 @@ Go to the Gnus info node (@code{gnus-info-find-node}).
 @subsection Searching for Articles
 
 @table @kbd
-@item V C-s
-@kindex V C-s (Summary)
+@item M-s
+@kindex M-s (Summary)
 @findex gnus-summary-search-article-forward
 Search through all subsequent articles for a regexp
 (@code{gnus-summary-search-article-forward}). 
-@item V C-r
-@kindex V C-r (Summary)
+@item M-r
+@kindex M-r (Summary)
 @findex gnus-summary-search-article-backward
 Search through all previous articles for a regexp
 (@code{gnus-summary-search-article-backward}). 
-@item V &
-@kindex V & (Summary)
+@item &
+@kindex & (Summary)
 @findex gnus-summary-execute-command
 This command will prompt you for a header field, a regular expression to
 match on this field, and a command to be executed if the match is made
 (@code{gnus-summary-execute-command}).
-@item V u
-@kindex V u (Summary)
+@item M-&
+@kindex M-& (Summary)
 @findex gnus-summary-universal-argument
 Perform any operation on all articles that have been marked with
 the process mark (@code{gnus-summary-universal-argument}).
@@ -5865,18 +5869,18 @@ the process mark (@code{gnus-summary-universal-argument}).
 @subsection Really Various Summary Commands
 
 @table @kbd
-@item V D
-@kindex V D (Summary)
+@item A D
+@kindex A D (Summary)
 @findex gnus-summary-enter-digest-group
 If the current article is a digest, you might use this command to enter
 you into a group based on the current digest to ease reading
 (@code{gnus-summary-enter-digest-group}).
-@item V T
-@kindex V T (Summary)
+@item C-t
+@kindex C-t (Summary)
 @findex gnus-summary-toggle-truncation
 Toggle truncation of summary lines (@code{gnus-summary-toggle-truncation}).
-@item V e
-@kindex V e (Summary)
+@item =
+@kindex = (Summary)
 @findex gnus-summary-expand-window
 Expand the summary buffer window (@code{gnus-summary-expand-window}).
 If given a prefix, force an @code{article} window configuration. 
-- 
2.34.1