--- a/lisp/gnus/gnus-score.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/gnus/gnus-score.el	Mon Aug 13 09:02:59 2007 +0200
@@ -1,5 +1,5 @@
 ;;; gnus-score.el --- scoring code for Gnus
-;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <amanda@iesd.auc.dk>
 ;;	Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
@@ -27,11 +27,10 @@
 ;;; Code:
 
 (require 'gnus)
-(require 'gnus-sum)
-(require 'gnus-range)
+(eval-when-compile (require 'cl))
 
-(defcustom gnus-global-score-files nil
-  "List of global score files and directories.
+(defvar gnus-global-score-files nil
+  "*List of global score files and directories.
 Set this variable if you want to use people's score files.  One entry
 for each score file or each score file directory.  Gnus will decide
 by itself what score files are applicable to which group.
@@ -42,12 +41,10 @@
 
  (setq gnus-global-score-files
        '(\"/ftp.ifi.uio.no:/pub/larsi/ding/score/soc.motss.SCORE\"
-         \"/ftp.some-where:/pub/score\"))"
-  :group 'gnus-score-files
-  :type '(repeat file))
+         \"/ftp.some-where:/pub/score\"))")
 
-(defcustom gnus-score-file-single-match-alist nil
-  "Alist mapping regexps to lists of score files.
+(defvar gnus-score-file-single-match-alist nil
+  "*Alist mapping regexps to lists of score files.
 Each element of this alist should be of the form
 	(\"REGEXP\" [ \"SCORE-FILE-1\" ] [ \"SCORE-FILE-2\" ] ... )
 
@@ -57,12 +54,10 @@
 use multiple matches, see gnus-score-file-multiple-match-alist).
 
 These score files are loaded in addition to any files returned by
-gnus-score-find-score-files-function (which see)."
-  :group 'gnus-score-files
-  :type '(repeat (cons regexp (repeat file))))
+gnus-score-find-score-files-function (which see).")
 
-(defcustom gnus-score-file-multiple-match-alist nil
-  "Alist mapping regexps to lists of score files.
+(defvar gnus-score-file-multiple-match-alist nil
+  "*Alist mapping regexps to lists of score files.
 Each element of this alist should be of the form
 	(\"REGEXP\" [ \"SCORE-FILE-1\" ] [ \"SCORE-FILE-2\" ] ... )
 
@@ -73,23 +68,16 @@
 gnus-score-file-single-match-alist).
 
 These score files are loaded in addition to any files returned by
-gnus-score-find-score-files-function (which see)."
-  :group 'gnus-score-files
-  :type '(repeat (cons regexp (repeat file))))
+gnus-score-find-score-files-function (which see).")
 
-(defcustom gnus-score-file-suffix "SCORE"
-  "Suffix of the score files."
-  :group 'gnus-score-files
-  :type 'string)
+(defvar gnus-score-file-suffix "SCORE"
+  "*Suffix of the score files.")
 
-(defcustom gnus-adaptive-file-suffix "ADAPT"
-  "Suffix of the adaptive score files."
-  :group 'gnus-score-files
-  :group 'gnus-score-adapt
-  :type 'string)
+(defvar gnus-adaptive-file-suffix "ADAPT"
+  "*Suffix of the adaptive score files.")
 
-(defcustom gnus-score-find-score-files-function 'gnus-score-find-bnews
-  "Function used to find score files.
+(defvar gnus-score-find-score-files-function 'gnus-score-find-bnews
+  "*Function used to find score files.
 The function will be called with the group name as the argument, and
 should return a list of score files to apply to that group.  The score
 files do not actually have to exist.
@@ -104,180 +92,48 @@
 
 This variable can also be a list of functions to be called.  Each
 function should either return a list of score files, or a list of
-score alists."
-  :group 'gnus-score-files
-  :type '(radio (function-item gnus-score-find-single)
-		(function-item gnus-score-find-hierarchical)
-		(function-item gnus-score-find-bnews)
-		(function :tag "Other")))
+score alists.")
+
+(defvar gnus-score-interactive-default-score 1000
+  "*Scoring commands will raise/lower the score with this number as the default.")
 
-(defcustom gnus-score-interactive-default-score 1000
-  "*Scoring commands will raise/lower the score with this number as the default."
-  :group 'gnus-score-default
-  :type 'integer)
-
-(defcustom gnus-score-expiry-days 7
+(defvar gnus-score-expiry-days 7
   "*Number of days before unused score file entries are expired.
-If this variable is nil, no score file entries will be expired."
-  :group 'gnus-score-expire
-  :type '(choice (const :tag "never" nil)
-		 number))
+If this variable is nil, no score file entries will be expired.")
 
-(defcustom gnus-update-score-entry-dates t
+(defvar gnus-update-score-entry-dates t
   "*In non-nil, update matching score entry dates.
 If this variable is nil, then score entries that provide matches
-will be expired along with non-matching score entries."
-  :group 'gnus-score-expire
-  :type 'boolean)
-
-(defcustom gnus-orphan-score nil
-  "*All orphans get this score added.  Set in the score file."
-  :group 'gnus-score-default
-  :type 'integer)
-
-(defcustom gnus-decay-scores nil
-  "*If non-nil, decay non-permanent scores."
-  :group 'gnus-score-decay
-  :type 'boolean)
-
-(defcustom gnus-decay-score-function 'gnus-decay-score
-  "*Function called to decay a score.
-It is called with one parameter -- the score to be decayed."
-  :group 'gnus-score-decay
-  :type '(radio (function-item gnus-decay-score)
-		(function :tag "Other")))
-
-(defcustom gnus-score-decay-constant 3
-  "*Decay all \"small\" scores with this amount."
-  :group 'gnus-score-decay
-  :type 'integer)
-
-(defcustom gnus-score-decay-scale .05
-  "*Decay all \"big\" scores with this factor."
-  :group 'gnus-score-decay
-  :type 'number)
-
-(defcustom gnus-home-score-file nil
-  "Variable to control where interactive score entries are to go.
-It can be:
-
- * A string
-   This file file will be used as the home score file.
+will be expired along with non-matching score entries.")
 
- * A function
-   The result of this function will be used as the home score file.
-   The function will be passed the name of the group as its
-   parameter.
-
- * A list
-   The elements in this list can be:
-
-   * `(regexp file-name ...)'
-     If the `regexp' matches the group name, the first `file-name' will
-     will be used as the home score file.  (Multiple filenames are
-     allowed so that one may use gnus-score-file-single-match-alist to
-     set this variable.)
-
-   * A function.
-     If the function returns non-nil, the result will be used
-     as the home score file.  The function will be passed the
-     name of the group as its parameter.
-
-   * A string.  Use the string as the home score file.
+(defvar gnus-orphan-score nil
+  "*All orphans get this score added. Set in the score file.")
 
-   The list will be traversed from the beginning towards the end looking
-   for matches."
-  :group 'gnus-score-files
-  :type '(choice string
-		 (repeat (choice string
-				 (cons regexp (repeat file))
-				 function))
-		 function))
-
-(defcustom gnus-home-adapt-file nil
-  "Variable to control where new adaptive score entries are to go.
-This variable allows the same syntax as `gnus-home-score-file'."
-  :group 'gnus-score-adapt
-  :group 'gnus-score-files
-  :type '(choice string
-		 (repeat (choice string
-				 (cons regexp (repeat file))
-				 function))
-		 function))
-
-(defcustom gnus-default-adaptive-score-alist
+(defvar gnus-default-adaptive-score-alist  
   '((gnus-kill-file-mark)
     (gnus-unread-mark)
-    (gnus-read-mark (from 3) (subject 30))
+    (gnus-read-mark (from  3) (subject  30))
     (gnus-catchup-mark (subject -10))
     (gnus-killed-mark (from -1) (subject -20))
     (gnus-del-mark (from -2) (subject -15)))
-"Alist of marks and scores."
-:group 'gnus-score-adapt
-:type '(repeat (cons (symbol :tag "Mark")
-		     (repeat (list (choice :tag "Header"
-					   (const from)
-					   (const subject)
-					   (symbol :tag "other"))
-				   (integer :tag "Score"))))))
-
-(defcustom gnus-ignored-adaptive-words nil
-  "List of words to be ignored when doing adaptive word scoring."
-  :group 'gnus-score-adapt
-  :type '(repeat string))
+"*Alist of marks and scores.")
 
-(defcustom gnus-default-ignored-adaptive-words
-  '("a" "i" "the" "to" "of" "and" "in" "is" "it" "for" "that" "if" "you"
-    "this" "be" "on" "with" "not" "have" "are" "or" "as" "from" "can"
-    "but" "by" "at" "an" "will" "no" "all" "was" "do" "there" "my" "one"
-    "so" "we" "they" "what" "would" "any" "which" "about" "get" "your"
-    "use" "some" "me" "then" "name" "like" "out" "when" "up" "time"
-    "other" "more" "only" "just" "end" "also" "know" "how" "new" "should"
-    "been" "than" "them" "he" "who" "make" "may" "people" "these" "now"
-    "their" "here" "into" "first" "could" "way" "had" "see" "work" "well"
-    "were" "two" "very" "where" "while" "us" "because" "good" "same"
-    "even" "much" "most" "many" "such" "long" "his" "over" "last" "since"
-    "right" "before" "our" "without" "too" "those" "why" "must" "part"
-    "being" "current" "back" "still" "go" "point" "value" "each" "did"
-    "both" "true" "off" "say" "another" "state" "might" "under" "start"
-    "try" "re")
-  "Default list of words to be ignored when doing adaptive word scoring."
-  :group 'gnus-score-adapt
-  :type '(repeat string))
+(defvar gnus-score-mimic-keymap nil
+  "*Have the score entry functions pretend that they are a keymap.")
 
-(defcustom gnus-default-adaptive-word-score-alist
-  `((,gnus-read-mark . 30)
-    (,gnus-catchup-mark . -10)
-    (,gnus-killed-mark . -20)
-    (,gnus-del-mark . -15))
-"Alist of marks and scores."
-:group 'gnus-score-adapt
-:type '(repeat (cons (character :tag "Mark")
-		     (integer :tag "Score"))))
-
-(defcustom gnus-score-mimic-keymap nil
-  "*Have the score entry functions pretend that they are a keymap."
-  :group 'gnus-score-default
-  :type 'boolean)
-
-(defcustom gnus-score-exact-adapt-limit 10
+(defvar gnus-score-exact-adapt-limit 10
   "*Number that says how long a match has to be before using substring matching.
 When doing adaptive scoring, one normally uses fuzzy or substring
 matching.  However, if the header one matches is short, the possibility
 for false positives is great, so if the length of the match is less
 than this variable, exact matching will be used.
 
-If this variable is nil, exact matching will always be used."
-  :group 'gnus-score-adapt
-  :type '(choice (const nil) integer))
+If this variable is nil, exact matching will always be used.")
 
-(defcustom gnus-score-uncacheable-files "ADAPT$"
-  "All score files that match this regexp will not be cached."
-  :group 'gnus-score-adapt
-  :group 'gnus-score-files
-  :type 'regexp)
+(defvar gnus-score-uncacheable-files "ADAPT$"
+  "*All score files that match this regexp will not be cached.")
 
-(defcustom gnus-score-default-header nil
+(defvar gnus-score-default-header nil
   "Default header when entering new scores.
 
 Should be one of the following symbols.
@@ -293,20 +149,9 @@
  d: date
  f: followup
 
-If nil, the user will be asked for a header."
-  :group 'gnus-score-default
-  :type '(choice (const :tag "from" a)
-		 (const :tag "subject" s)
-		 (const :tag "body" b)
-		 (const :tag "head" h)
-		 (const :tag "message-id" i)
-		 (const :tag "references" t)
-		 (const :tag "xref" x)
-		 (const :tag "lines" l)
-		 (const :tag "date" d)
-		 (const :tag "followup" f)))
+If nil, the user will be asked for a header.")
 
-(defcustom gnus-score-default-type nil
+(defvar gnus-score-default-type nil
   "Default match type when entering new scores.
 
 Should be one of the following symbols.
@@ -322,25 +167,12 @@
  >: greater than number
  =: equal to number
 
-If nil, the user will be asked for a match type."
-  :group 'gnus-score-default
-  :type '(choice (const :tag "substring" s)
-		 (const :tag "exact string" e)
-		 (const :tag "fuzzy string" f)
-		 (const :tag "regexp string" r)
-		 (const :tag "before date" b)
-		 (const :tag "at date" a)
-		 (const :tag "this date" n)
-		 (const :tag "less than number" <)
-		 (const :tag "greater than number" >)
-		 (const :tag "equal than number" =)))
+If nil, the user will be asked for a match type.")
 
-(defcustom gnus-score-default-fold nil
-  "Use case folding for new score file entries iff not nil."
-  :group 'gnus-score-default
-  :type 'boolean)
+(defvar gnus-score-default-fold nil
+  "Use case folding for new score file entries iff not nil.")
 
-(defcustom gnus-score-default-duration nil
+(defvar gnus-score-default-duration nil
   "Default duration of effect when entering new scores.
 
 Should be one of the following symbols.
@@ -349,31 +181,15 @@
  p: permanent
  i: immediate
 
-If nil, the user will be asked for a duration."
-  :group 'gnus-score-default
-  :type '(choice (const :tag "temporary" t)
-		 (const :tag "permanent" p)
-		 (const :tag "immediate" i)))
+If nil, the user will be asked for a duration.")
 
-(defcustom gnus-score-after-write-file-function nil
-  "Function called with the name of the score file just written to disk."
-  :group 'gnus-score-files
-  :type 'function)
+(defvar gnus-score-after-write-file-function nil
+  "*Function called with the name of the score file just written to disk.")
 
 
 
 ;; Internal variables.
 
-(defvar gnus-adaptive-word-syntax-table
-  (let ((table (copy-syntax-table (standard-syntax-table)))
-	(numbers '(?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9)))
-    (while numbers
-      (modify-syntax-entry (pop numbers) " " table))
-    (modify-syntax-entry ?' "w" table)
-    table)
-  "Syntax table used when doing adaptive word scoring.")
-
-(defvar gnus-scores-exclude-files nil)
 (defvar gnus-internal-global-score-files nil)
 (defvar gnus-score-file-list nil)
 
@@ -381,13 +197,12 @@
 
 (defvar gnus-score-help-winconf nil)
 (defvar gnus-adaptive-score-alist gnus-default-adaptive-score-alist)
-(defvar gnus-adaptive-word-score-alist gnus-default-adaptive-word-score-alist)
 (defvar gnus-score-trace nil)
 (defvar gnus-score-edit-buffer nil)
 
 (defvar gnus-score-alist nil
   "Alist containing score information.
-The keys can be symbols or strings.  The following symbols are defined.
+The keys can be symbols or strings.  The following symbols are defined. 
 
 touched: If this alist has been modified.
 mark:    Automatically mark articles below this.
@@ -395,7 +210,7 @@
 files:   List of other score files to load when loading this one.
 eval:    Sexp to be evaluated when the score file is loaded.
 
-String entries have the form (HEADER (MATCH TYPE SCORE DATE) ...)
+String entries have the form (HEADER (MATCH TYPE SCORE DATE) ...) 
 where HEADER is the header being scored, MATCH is the string we are
 looking for, TYPE is a flag indicating whether it should use regexp or
 substring matching, SCORE is the score to add and DATE is the date
@@ -412,10 +227,10 @@
     ("subject" 1 gnus-score-string)
     ("from" 2 gnus-score-string)
     ("date" 3 gnus-score-date)
-    ("message-id" 4 gnus-score-string)
-    ("references" 5 gnus-score-string)
-    ("chars" 6 gnus-score-integer)
-    ("lines" 7 gnus-score-integer)
+    ("message-id" 4 gnus-score-string) 
+    ("references" 5 gnus-score-string) 
+    ("chars" 6 gnus-score-integer) 
+    ("lines" 7 gnus-score-integer) 
     ("xref" 8 gnus-score-string)
     ("head" -1 gnus-score-body)
     ("body" -1 gnus-score-body)
@@ -423,22 +238,25 @@
     ("followup" 2 gnus-score-followup)
     ("thread" 5 gnus-score-thread)))
 
+(eval-and-compile
+  (autoload 'gnus-uu-ctl-map "gnus-uu" nil nil 'keymap))
+
 ;;; Summary mode score maps.
 
-(gnus-define-keys (gnus-summary-score-map "V" gnus-summary-mode-map)
-  "s" gnus-summary-set-score
-  "a" gnus-summary-score-entry
-  "S" gnus-summary-current-score
-  "c" gnus-score-change-score-file
-  "C" gnus-score-customize
-  "m" gnus-score-set-mark-below
-  "x" gnus-score-set-expunge-below
-  "R" gnus-summary-rescore
-  "e" gnus-score-edit-current-scores
-  "f" gnus-score-edit-file
-  "F" gnus-score-flush-cache
-  "t" gnus-score-find-trace
-  "w" gnus-score-find-favourite-words)
+(gnus-define-keys
+ (gnus-summary-score-map "V" gnus-summary-mode-map)
+ "s" gnus-summary-set-score
+ "a" gnus-summary-score-entry
+ "S" gnus-summary-current-score
+ "c" gnus-score-change-score-file
+ "m" gnus-score-set-mark-below
+ "x" gnus-score-set-expunge-below
+ "R" gnus-summary-rescore
+ "e" gnus-score-edit-current-scores
+ "f" gnus-score-edit-file
+ "F" gnus-score-flush-cache
+ "t" gnus-score-find-trace
+ "C" gnus-score-customize)
 
 ;; Summary score file commands
 
@@ -453,11 +271,20 @@
   (interactive "P")
   (gnus-summary-increase-score (- (gnus-score-default score))))
 
+(defvar gnus-score-default-header nil
+  "*The default header to score on when entering a score rule interactively.")
+
+(defvar gnus-score-default-type nil
+  "*The default score type to use when entering a score rule interactively.")
+
+(defvar gnus-score-default-duration nil
+  "*The default score duration to use on when entering a score rule interactively.")
+
 (defun gnus-score-kill-help-buffer ()
   (when (get-buffer "*Score Help*")
     (kill-buffer "*Score Help*")
-    (when gnus-score-help-winconf
-      (set-window-configuration gnus-score-help-winconf))))
+    (and gnus-score-help-winconf
+	 (set-window-configuration gnus-score-help-winconf))))
 
 (defun gnus-summary-increase-score (&optional score)
   "Make a score entry based on the current article.
@@ -469,7 +296,7 @@
   (let* ((nscore (gnus-score-default score))
 	 (prefix (if (< nscore 0) ?L ?I))
 	 (increase (> nscore 0))
-	 (char-to-header
+	 (char-to-header 
 	  '((?a "from" nil nil string)
 	    (?s "subject" nil nil string)
 	    (?b "body" "" nil body-string)
@@ -487,32 +314,32 @@
 	    (?f f "fuzzy string" string)
 	    (?r r "regexp string" string)
 	    (?z s "substring" body-string)
-	    (?p r "regexp string" body-string)
+	    (?p s "regexp string" body-string)
 	    (?b before "before date" date)
-	    (?a at "at date" date)
+	    (?a at "at date" date) 
 	    (?n now "this date" date)
 	    (?< < "less than number" number)
-	    (?> > "greater than number" number)
+	    (?> > "greater than number" number) 
 	    (?= = "equal to number" number)))
 	 (char-to-perm
-	  (list (list ?t (current-time-string) "temporary")
+	  (list (list ?t (current-time-string) "temporary") 
 		'(?p perm "permanent") '(?i now "immediate")))
 	 (mimic gnus-score-mimic-keymap)
-	 (hchar (and gnus-score-default-header
+	 (hchar (and gnus-score-default-header 
 		     (aref (symbol-name gnus-score-default-header) 0)))
 	 (tchar (and gnus-score-default-type
 		     (aref (symbol-name gnus-score-default-type) 0)))
 	 (pchar (and gnus-score-default-duration
 		     (aref (symbol-name gnus-score-default-duration) 0)))
 	 entry temporary type match)
-
+    
     (unwind-protect
 	(progn
 
 	  ;; First we read the header to score.
 	  (while (not hchar)
 	    (if mimic
-		(progn
+		(progn 
 		  (sit-for 1)
 		  (message "%c-" prefix))
 	      (message "%s header (%s?): " (if increase "Increase" "Lower")
@@ -528,11 +355,11 @@
 	    (if mimic (error "%c %c" prefix hchar) (error "")))
 
 	  (when (/= (downcase hchar) hchar)
-	    ;; This was a majuscule, so we end reading and set the defaults.
+	    ;; This was a majuscle, so we end reading and set the defaults.
 	    (if mimic (message "%c %c" prefix hchar) (message ""))
 	    (setq tchar (or tchar ?s)
 		  pchar (or pchar ?t)))
-
+    
 	  ;; We continue reading - the type.
 	  (while (not tchar)
 	    (if mimic
@@ -541,8 +368,8 @@
 	      (message "%s header '%s' with match type (%s?): "
 		       (if increase "Increase" "Lower")
 		       (nth 1 entry)
-		       (mapconcat (lambda (s)
-				    (if (eq (nth 4 entry)
+		       (mapconcat (lambda (s) 
+				    (if (eq (nth 4 entry) 
 					    (nth 3 s))
 					(char-to-string (car s))
 				      ""))
@@ -553,11 +380,11 @@
 	      (gnus-score-insert-help
 	       "Match type"
 	       (delq nil
-		     (mapcar (lambda (s)
-			       (if (eq (nth 4 entry)
+		     (mapcar (lambda (s) 
+			       (if (eq (nth 4 entry) 
 				       (nth 3 s))
 				   s nil))
-			     char-to-type))
+			     char-to-type ))
 	       2)))
 
 	  (gnus-score-kill-help-buffer)
@@ -565,7 +392,7 @@
 	    (if mimic (error "%c %c" prefix hchar) (error "")))
 
 	  (when (/= (downcase tchar) tchar)
-	    ;; It was a majuscule, so we end reading and use the default.
+	    ;; It was a majuscle, so we end reading and use the default.
 	    (if mimic (message "%c %c %c" prefix hchar tchar)
 	      (message ""))
 	    (setq pchar (or pchar ?p)))
@@ -587,13 +414,7 @@
 	  (if mimic (message "%c %c %c" prefix hchar tchar pchar)
 	    (message ""))
 	  (unless (setq temporary (cadr (assq pchar char-to-perm)))
-	    ;; Deal with der(r)ided superannuated paradigms.
-	    (when (and (eq (1+ prefix) 77)
-		       (eq (+ hchar 12) 109)
-		       (eq tchar 114)
-		       (eq (- pchar 4) 111))
-	      (error "You rang?"))
-	    (if mimic
+	    (if mimic 
 		(error "%c %c %c %c" prefix hchar tchar pchar)
 	      (error ""))))
       ;; Always kill the score help buffer.
@@ -602,15 +423,15 @@
     ;; We have all the data, so we enter this score.
     (setq match (if (string= (nth 2 entry) "") ""
 		  (gnus-summary-header (or (nth 2 entry) (nth 1 entry)))))
-
+      
     ;; Modify the match, perhaps.
-    (cond
+    (cond 
      ((equal (nth 1 entry) "xref")
       (when (string-match "^Xref: *" match)
 	(setq match (substring match (match-end 0))))
       (when (string-match "^[^:]* +" match)
 	(setq match (substring match (match-end 0))))))
-
+    
     (when (memq type '(r R regexp Regexp))
       (setq match (regexp-quote match)))
 
@@ -618,13 +439,13 @@
      (nth 1 entry)			; Header
      match				; Match
      type				; Type
-     (if (eq score 's) nil score)	; Score
-     (if (eq temporary 'perm)		; Temp
+     (if (eq 's score) nil score)	; Score
+     (if (eq 'perm temporary)		; Temp
 	 nil
-       temporary)
+        temporary)
      (not (nth 3 entry)))		; Prompt
     ))
-
+  
 (defun gnus-score-insert-help (string alist idx)
   (setq gnus-score-help-winconf (current-window-configuration))
   (save-excursion
@@ -640,13 +461,13 @@
       ;; find the longest string to display
       (while list
 	(setq n (length (nth idx (car list))))
-	(unless (> max n)
-	  (setq max n))
+	(or (> max n)
+	    (setq max n))
 	(setq list (cdr list)))
       (setq max (+ max 4))		; %c, `:', SPACE, a SPACE at end
-      (setq n (/ (1- (window-width)) max)) ; items per line
+      (setq n (/ (1- (window-width)) max))	; items per line
       (setq width (/ (1- (window-width)) n)) ; width of each item
-      ;; insert `n' items, each in a field of width `width'
+      ;; insert `n' items, each in a field of width `width' 
       (while alist
 	(if (< i n)
 	    ()
@@ -665,7 +486,7 @@
     (let ((window-min-height 1))
       (shrink-window-if-larger-than-buffer))
     (select-window (get-buffer-window gnus-summary-buffer))))
-
+  
 (defun gnus-summary-header (header &optional no-err)
   ;; Return HEADER for current articles, or error.
   (let ((article (gnus-summary-article-number))
@@ -683,7 +504,7 @@
 
 (defun gnus-newsgroup-score-alist ()
   (or
-   (let ((param-file (gnus-group-find-parameter
+   (let ((param-file (gnus-group-get-parameter 
 		      gnus-newsgroup-name 'score-file)))
      (when param-file
        (gnus-score-load param-file)))
@@ -693,13 +514,13 @@
 
 (defsubst gnus-score-get (symbol &optional alist)
   ;; Get SYMBOL's definition in ALIST.
-  (cdr (assoc symbol
-	      (or alist
+  (cdr (assoc symbol 
+	      (or alist 
 		  gnus-score-alist
 		  (gnus-newsgroup-score-alist)))))
 
-(defun gnus-summary-score-entry (header match type score date
-					&optional prompt silent)
+(defun gnus-summary-score-entry 
+  (header match type score date &optional prompt silent)
   "Enter score file entry.
 HEADER is the header being scored.
 MATCH is the string we are looking for.
@@ -723,8 +544,7 @@
 		(current-time-string))
 	       (t nil))))
   ;; Regexp is the default type.
-  (when (eq type t)
-    (setq type 'r))
+  (if (eq type t) (setq type 'r))
   ;; Simplify matches...
   (cond ((or (eq type 'r) (eq type 's) (eq type nil))
 	 (setq match (if match (gnus-simplify-subject-re match) "")))
@@ -733,53 +553,48 @@
   (let ((score (gnus-score-default score))
 	(header (format "%s" (downcase header)))
 	new)
-    (when prompt
-      (setq match (read-string
-		   (format "Match %s on %s, %s: "
-			   (cond ((eq date 'now)
-				  "now")
-				 ((stringp date)
-				  "temp")
-				 (t "permanent"))
-			   header
-			   (if (< score 0) "lower" "raise"))
-		   (if (numberp match)
-		       (int-to-string match)
-		     match))))
+    (and prompt (setq match (read-string 
+			     (format "Match %s on %s, %s: " 
+				     (cond ((eq date 'now)
+					    "now")
+					   ((stringp date)
+					    "temp")
+					   (t "permanent"))
+				     header
+				     (if (< score 0) "lower" "raise"))
+			     (if (numberp match)
+				 (int-to-string match)
+			       match))))
 
     ;; Get rid of string props.
     (setq match (format "%s" match))
 
-    ;; If this is an integer comparison, we transform from string to int.
-    (when (eq (nth 2 (assoc header gnus-header-index)) 'gnus-score-integer)
-      (setq match (string-to-int match)))
+    ;; If this is an integer comparison, we transform from string to int. 
+    (and (eq (nth 2 (assoc header gnus-header-index)) 'gnus-score-integer)
+	 (setq match (string-to-int match)))
 
     (unless (eq date 'now)
       ;; Add the score entry to the score file.
       (when (= score gnus-score-interactive-default-score)
-	(setq score nil))
+	   (setq score nil))
       (let ((old (gnus-score-get header))
 	    elem)
 	(setq new
-	      (cond
-	       (type
-		(list match score
-		      (and date (if (numberp date) date
-				  (gnus-day-number date)))
-		      type))
+	      (cond 
+	       (type (list match score (and date (gnus-day-number date)) type))
 	       (date (list match score (gnus-day-number date)))
 	       (score (list match score))
 	       (t (list match))))
 	;; We see whether we can collapse some score entries.
 	;; This isn't quite correct, because there may be more elements
-	;; later on with the same key that have matching elems...  Hm.
+	;; later on with the same key that have matching elems... Hm.
 	(if (and old
 		 (setq elem (assoc match old))
 		 (eq (nth 3 elem) (nth 3 new))
 		 (or (and (numberp (nth 2 elem)) (numberp (nth 2 new)))
 		     (and (not (nth 2 elem)) (not (nth 2 new)))))
 	    ;; Yup, we just add this new score to the old elem.
-	    (setcar (cdr elem) (+ (or (nth 1 elem)
+	    (setcar (cdr elem) (+ (or (nth 1 elem) 
 				      gnus-score-interactive-default-score)
 				  (or (nth 1 new)
 				      gnus-score-interactive-default-score)))
@@ -802,7 +617,7 @@
   "Simulate the effect of a score file entry.
 HEADER is the header being scored.
 MATCH is the string we are looking for.
-TYPE is the score type.
+TYPE is a flag indicating if it is a regexp or substring.
 SCORE is the score to add."
   (interactive (list (completing-read "Header: "
 				      gnus-header-index
@@ -812,28 +627,27 @@
 		     (y-or-n-p "Use regexp match? ")
 		     (prefix-numeric-value current-prefix-arg)))
   (save-excursion
-    (unless (and (stringp match) (> (length match) 0))
-      (error "No match"))
+    (or (and (stringp match) (> (length match) 0))
+	(error "No match"))
     (goto-char (point-min))
     (let ((regexp (cond ((eq type 'f)
 			 (gnus-simplify-subject-fuzzy match))
-			((eq type 'r)
+			((eq type 'r) 
 			 match)
 			((eq type 'e)
 			 (concat "\\`" (regexp-quote match) "\\'"))
-			(t
+			(t 
 			 (regexp-quote match)))))
       (while (not (eobp))
 	(let ((content (gnus-summary-header header 'noerr))
 	      (case-fold-search t))
 	  (and content
-	       (when (if (eq type 'f)
-			 (string-equal (gnus-simplify-subject-fuzzy content)
-				       regexp)
-		       (string-match regexp content))
-		 (gnus-summary-raise-score score))))
-	(beginning-of-line 2))))
-  (gnus-set-mode-line 'summary))
+	       (if (if (eq type 'f)
+		       (string-equal (gnus-simplify-subject-fuzzy content)
+				     regexp)
+		     (string-match regexp content))
+		   (gnus-summary-raise-score score))))
+	(beginning-of-line 2)))))
 
 (defun gnus-summary-score-crossposting (score date)
   ;; Enter score file entry for current crossposting.
@@ -842,16 +656,15 @@
   (let ((xref (gnus-summary-header "xref"))
 	(start 0)
 	group)
-    (unless xref
-      (error "This article is not crossposted"))
+    (or xref (error "This article is not crossposted"))
     (while (string-match " \\([^ \t]+\\):" xref start)
       (setq start (match-end 0))
-      (when (not (string=
-		  (setq group
-			(substring xref (match-beginning 1) (match-end 1)))
-		  gnus-newsgroup-name))
-	(gnus-summary-score-entry
-	 "xref" (concat " " group ":") nil score date t)))))
+      (if (not (string= 
+		(setq group 
+		      (substring xref (match-beginning 1) (match-end 1)))
+		gnus-newsgroup-name))
+	  (gnus-summary-score-entry
+	   "xref" (concat " " group ":") nil score date t)))))
 
 
 ;;;
@@ -863,7 +676,7 @@
 ;; Added by Per Abrahamsen <amanda@iesd.auc.dk>.
 (defun gnus-score-set-mark-below (score)
   "Automatically mark articles with score below SCORE as read."
-  (interactive
+  (interactive 
    (list (or (and current-prefix-arg (prefix-numeric-value current-prefix-arg))
 	     (string-to-int (read-string "Mark below: ")))))
   (setq score (or score gnus-summary-default-score 0))
@@ -897,7 +710,7 @@
 
 (defun gnus-score-set-expunge-below (score)
   "Automatically expunge articles with score below SCORE."
-  (interactive
+  (interactive 
    (list (or (and current-prefix-arg (prefix-numeric-value current-prefix-arg))
 	     (string-to-int (read-string "Set expunge below: ")))))
   (setq score (or score gnus-summary-default-score 0))
@@ -911,7 +724,7 @@
   (when (gnus-buffer-live-p gnus-summary-buffer)
     (save-excursion
       (save-restriction
-	(message-narrow-to-headers)
+	(goto-char (point-min))
 	(let ((id (mail-fetch-field "message-id")))
 	  (when id
 	    (set-buffer gnus-summary-buffer)
@@ -936,8 +749,8 @@
 
 (defun gnus-score-set (symbol value &optional alist)
   ;; Set SYMBOL to VALUE in ALIST.
-  (let* ((alist
-	  (or alist
+  (let* ((alist 
+	  (or alist 
 	      gnus-score-alist
 	      (gnus-newsgroup-score-alist)))
 	 (entry (assoc symbol alist)))
@@ -956,7 +769,7 @@
   "Raise the score of the current article by N."
   (interactive "p")
   (gnus-set-global-variables)
-  (gnus-summary-set-score (+ (gnus-summary-article-score)
+  (gnus-summary-set-score (+ (gnus-summary-article-score) 
 			     (or n gnus-score-interactive-default-score ))))
 
 (defun gnus-summary-set-score (n)
@@ -970,12 +783,12 @@
       (gnus-summary-update-mark
        (if (= n (or gnus-summary-default-score 0)) ? 
 	 (if (< n (or gnus-summary-default-score 0))
-	     gnus-score-below-mark gnus-score-over-mark))
-       'score))
+	     gnus-score-below-mark gnus-score-over-mark)) 'score))
     (let* ((article (gnus-summary-article-number))
 	   (score (assq article gnus-newsgroup-scored)))
       (if score (setcdr score n)
-	(push (cons article n) gnus-newsgroup-scored)))
+	(setq gnus-newsgroup-scored
+	      (cons (cons article n) gnus-newsgroup-scored))))
     (gnus-summary-update-line)))
 
 (defun gnus-summary-current-score ()
@@ -986,7 +799,7 @@
 
 (defun gnus-score-change-score-file (file)
   "Change current score alist."
-  (interactive
+  (interactive 
    (list (read-file-name "Change to score file: " gnus-kill-files-directory)))
   (gnus-score-load-file file)
   (gnus-set-mode-line 'summary))
@@ -995,10 +808,8 @@
 (defun gnus-score-edit-current-scores (file)
   "Edit the current score alist."
   (interactive (list gnus-current-score-file))
-  (gnus-set-global-variables)
   (let ((winconf (current-window-configuration)))
-    (when (buffer-name gnus-summary-buffer)
-      (gnus-score-save))
+    (and (buffer-name gnus-summary-buffer) (gnus-score-save))
     (gnus-make-directory (file-name-directory file))
     (setq gnus-score-edit-buffer (find-file-noselect file))
     (gnus-configure-windows 'edit-score)
@@ -1006,17 +817,16 @@
     (setq gnus-score-edit-exit-function 'gnus-score-edit-done)
     (make-local-variable 'gnus-prev-winconf)
     (setq gnus-prev-winconf winconf))
-  (gnus-message
-   4 (substitute-command-keys
+  (gnus-message 
+   4 (substitute-command-keys 
       "\\<gnus-score-mode-map>\\[gnus-score-edit-exit] to save edits")))
-
+  
 (defun gnus-score-edit-file (file)
   "Edit a score file."
-  (interactive
+  (interactive 
    (list (read-file-name "Edit score file: " gnus-kill-files-directory)))
   (gnus-make-directory (file-name-directory file))
-  (when (buffer-name gnus-summary-buffer)
-    (gnus-score-save))
+  (and (buffer-name gnus-summary-buffer) (gnus-score-save))
   (let ((winconf (current-window-configuration)))
     (setq gnus-score-edit-buffer (find-file-noselect file))
     (gnus-configure-windows 'edit-score)
@@ -1024,16 +834,16 @@
     (setq gnus-score-edit-exit-function 'gnus-score-edit-done)
     (make-local-variable 'gnus-prev-winconf)
     (setq gnus-prev-winconf winconf))
-  (gnus-message
-   4 (substitute-command-keys
+  (gnus-message 
+   4 (substitute-command-keys 
       "\\<gnus-score-mode-map>\\[gnus-score-edit-exit] to save edits")))
-
+  
 (defun gnus-score-load-file (file)
   ;; Load score file FILE.  Returns a list a retrieved score-alists.
-  (let* ((file (expand-file-name
+  (let* ((file (expand-file-name 
 		(or (and (string-match
 			  (concat "^" (expand-file-name
-				       gnus-kill-files-directory))
+				       gnus-kill-files-directory)) 
 			  (expand-file-name file))
 			 file)
 		    (concat (file-name-as-directory gnus-kill-files-directory)
@@ -1048,14 +858,14 @@
       (setq gnus-score-alist nil)
       (setq alist (gnus-score-load-score-alist file))
       ;; We add '(touched) to the alist to signify that it hasn't been
-      ;; touched (yet).
-      (unless (assq 'touched alist)
-	(push (list 'touched nil) alist))
+      ;; touched (yet). 
+      (or (assq 'touched alist) (setq alist (cons (list 'touched nil) alist)))
       ;; If it is a global score file, we make it read-only.
       (and global
 	   (not (assq 'read-only alist))
-	   (push (list 'read-only t) alist))
-      (push (cons file alist) gnus-score-cache))
+	   (setq alist (cons (list 'read-only t) alist)))
+      (setq gnus-score-cache
+	    (cons (cons file alist) gnus-score-cache)))
     (let ((a alist)
 	  found)
       (while a
@@ -1080,31 +890,23 @@
 	   (car (gnus-score-get 'thread-mark-and-expunge alist)))
 	  (adapt-file (car (gnus-score-get 'adapt-file alist)))
 	  (local (gnus-score-get 'local alist))
-	  (decay (car (gnus-score-get 'decay alist)))
 	  (eval (car (gnus-score-get 'eval alist))))
-      ;; Perform possible decays.
-      (when (and gnus-decay-scores
-		 (gnus-decay-scores
-		  alist (or decay (gnus-time-to-day (current-time)))))
-	(gnus-score-set 'touched '(t) alist)
-	(gnus-score-set 'decay (list (gnus-time-to-day (current-time)))))
       ;; We do not respect eval and files atoms from global score
-      ;; files.
+      ;; files. 
       (and files (not global)
 	   (setq lists (apply 'append lists
 			      (mapcar (lambda (file)
-					(gnus-score-load-file file))
+					(gnus-score-load-file file)) 
 				      (if adapt-file (cons adapt-file files)
 					files)))))
       (and eval (not global) (eval eval))
       ;; We then expand any exclude-file directives.
-      (setq gnus-scores-exclude-files
-	    (nconc
-	     (mapcar
-	      (lambda (sfile)
+      (setq gnus-scores-exclude-files 
+	    (nconc 
+	     (mapcar 
+	      (lambda (sfile) 
 		(expand-file-name sfile (file-name-directory file)))
-	      exclude-files)
-	     gnus-scores-exclude-files))
+	      exclude-files) gnus-scores-exclude-files))
       (if (not local)
 	  ()
 	(save-excursion
@@ -1116,8 +918,7 @@
 		   (make-local-variable (caar local))
 		   (set (caar local) (nth 1 (car local)))))
 	    (setq local (cdr local)))))
-      (when orphan
-	(setq gnus-orphan-score orphan))
+      (if orphan (setq gnus-orphan-score orphan))
       (setq gnus-adaptive-score-alist
 	    (cond ((equal adapt '(t))
 		   (setq gnus-newsgroup-adaptive t)
@@ -1130,13 +931,13 @@
 		  (t
 		   ;;(setq gnus-newsgroup-adaptive gnus-use-adaptive-scoring)
 		   gnus-default-adaptive-score-alist)))
-      (setq gnus-thread-expunge-below
+      (setq gnus-thread-expunge-below 
 	    (or thread-mark-and-expunge gnus-thread-expunge-below))
-      (setq gnus-summary-mark-below
+      (setq gnus-summary-mark-below 
 	    (or mark mark-and-expunge gnus-summary-mark-below))
-      (setq gnus-summary-expunge-below
+      (setq gnus-summary-expunge-below 
 	    (or expunge mark-and-expunge gnus-summary-expunge-below))
-      (setq gnus-newsgroup-adaptive-score-file
+      (setq gnus-newsgroup-adaptive-score-file 
 	    (or adapt-file gnus-newsgroup-adaptive-score-file)))
     (setq gnus-current-score-file file)
     (setq gnus-score-alist alist)
@@ -1149,21 +950,19 @@
 	(setq gnus-score-alist (cdr cache))
       (setq gnus-score-alist nil)
       (gnus-score-load-score-alist file)
-      (unless gnus-score-alist
-	(setq gnus-score-alist (copy-alist '((touched nil)))))
-      (push (cons file gnus-score-alist) gnus-score-cache))))
+      (or gnus-score-alist
+	  (setq gnus-score-alist (copy-alist '((touched nil)))))
+      (setq gnus-score-cache
+	    (cons (cons file gnus-score-alist) gnus-score-cache)))))
 
 (defun gnus-score-remove-from-cache (file)
-  (setq gnus-score-cache
+  (setq gnus-score-cache 
 	(delq (assoc file gnus-score-cache) gnus-score-cache)))
 
 (defun gnus-score-load-score-alist (file)
-  "Read score FILE."
   (let (alist)
     (if (not (file-readable-p file))
-	;; Couldn't read file.
 	(setq gnus-score-alist nil)
-      ;; Read file.
       (save-excursion
 	(gnus-set-work-buffer)
 	(insert-file-contents file)
@@ -1173,8 +972,12 @@
 	  (setq alist
 		(condition-case ()
 		    (read (current-buffer))
-		  (error
-		   (gnus-error 3.2 "Problem with score file %s" file))))))
+		  (error 
+		   (progn
+		     (gnus-message 3 "Problem with score file %s" file)
+		     (ding) 
+		     (sit-for 2)
+		     nil))))))
       (if (eq (car alist) 'setq)
 	  ;; This is an old-style score file.
 	  (setq gnus-score-alist (gnus-score-transform-old-to-new alist))
@@ -1185,7 +988,7 @@
 
 (defun gnus-score-check-syntax (alist file)
   "Check the syntax of the score ALIST."
-  (cond
+  (cond 
    ((null alist)
     nil)
    ((not (consp alist))
@@ -1202,14 +1005,14 @@
 	  ((not (listp (car a)))
 	   (format "Illegal score element %s in %s" (car a) file))
 	  ((stringp (caar a))
-	   (cond
+	   (cond 
 	    ((not (listp (setq sr (cdar a))))
 	     (format "Illegal header match %s in %s" (nth 1 (car a)) file))
 	    (t
 	     (setq type (caar a))
 	     (while (and sr (not err))
 	       (setq s (pop sr))
-	       (setq
+	       (setq 
 		err
 		(cond
 		 ((if (member (downcase type) '("lines" "chars"))
@@ -1230,18 +1033,18 @@
 	    (gnus-message 3 err)
 	    (sit-for 2)
 	    nil)
-	alist)))))
+	alist)))))    
 
 (defun gnus-score-transform-old-to-new (alist)
   (let* ((alist (nth 2 alist))
 	 out entry)
-    (when (eq (car alist) 'quote)
-      (setq alist (nth 1 alist)))
+    (if (eq (car alist) 'quote)
+	(setq alist (nth 1 alist)))
     (while alist
       (setq entry (car alist))
       (if (stringp (car entry))
 	  (let ((scor (cdr entry)))
-	    (push entry out)
+	    (setq out (cons entry out))
 	    (while scor
 	      (setcar scor
 		      (list (caar scor) (nth 2 (car scor))
@@ -1249,62 +1052,67 @@
 				 (gnus-day-number (nth 3 (car scor))))
 			    (if (nth 1 (car scor)) 'r 's)))
 	      (setq scor (cdr scor))))
-	(push (if (not (listp (cdr entry)))
-		  (list (car entry) (cdr entry))
-		entry)
-	      out))
+	(setq out (cons (if (not (listp (cdr entry))) 
+			    (list (car entry) (cdr entry))
+			  entry)
+			out)))
       (setq alist (cdr alist)))
     (cons (list 'touched t) (nreverse out))))
-
+  
 (defun gnus-score-save ()
   ;; Save all score information.
-  (let ((cache gnus-score-cache)
-	entry score file)
+  (let ((cache gnus-score-cache))
     (save-excursion
       (setq gnus-score-alist nil)
-      (nnheader-set-temp-buffer " *Gnus Scores*")
-      (while cache
-	(current-buffer)
-	(setq entry (pop cache)
-	      file (car entry)
-	      score (cdr entry))
-	(if (or (not (equal (gnus-score-get 'touched score) '(t)))
-		(gnus-score-get 'read-only score)
-		(and (file-exists-p file)
-		     (not (file-writable-p file))))
-	    ()
-	  (setq score (setcdr entry (delq (assq 'touched score) score)))
-	  (erase-buffer)
-	  (let (emacs-lisp-mode-hook)
-	    (if (string-match
-		 (concat (regexp-quote gnus-adaptive-file-suffix)
-			 "$")
-		 file)
-		;; This is an adaptive score file, so we do not run
-		;; it through `pp'.  These files can get huge, and
-		;; are not meant to be edited by human hands.
-		(gnus-prin1 score)
-	      ;; This is a normal score file, so we print it very
-	      ;; prettily.
-	      (pp score (current-buffer))))
-	  (gnus-make-directory (file-name-directory file))
-	  ;; If the score file is empty, we delete it.
-	  (if (zerop (buffer-size))
-	      (delete-file file)
-	    ;; There are scores, so we write the file.
-	    (when (file-writable-p file)
-	      (gnus-write-buffer file)
-	      (when gnus-score-after-write-file-function
-		(funcall gnus-score-after-write-file-function file)))))
-	(and gnus-score-uncacheable-files
-	     (string-match gnus-score-uncacheable-files file)
-	     (gnus-score-remove-from-cache file)))
+      (set-buffer (get-buffer-create "*Score*"))
+      (buffer-disable-undo (current-buffer))
+      (let (entry score file)
+	(while cache
+	  (setq entry (car cache)
+		cache (cdr cache)
+		file (car entry)
+		score (cdr entry))
+	  (if (or (not (equal (gnus-score-get 'touched score) '(t)))
+		  (gnus-score-get 'read-only score)
+		  (and (file-exists-p file)
+		       (not (file-writable-p file))))
+	      ()
+	    (setq score (setcdr entry (delq (assq 'touched score) score)))
+	    (erase-buffer)
+	    (let (emacs-lisp-mode-hook)
+	      (if (string-match 
+		   (concat (regexp-quote gnus-adaptive-file-suffix)
+			   "$") file)
+		  ;; This is an adaptive score file, so we do not run
+		  ;; it through `pp'.  These files can get huge, and
+		  ;; are not meant to be edited by human hands.
+		  (prin1 score (current-buffer))
+		;; This is a normal score file, so we print it very
+		;; prettily. 
+		(pp score (current-buffer))))
+	    (if (not (gnus-make-directory (file-name-directory file)))
+		()
+	      ;; If the score file is empty, we delete it.
+	      (if (zerop (buffer-size))
+		  (delete-file file)
+		;; There are scores, so we write the file. 
+ 		(when (file-writable-p file)
+		  (write-region (point-min) (point-max) file nil 'silent)
+		  (and gnus-score-after-write-file-function
+		       (funcall gnus-score-after-write-file-function file)))))
+	    (and gnus-score-uncacheable-files
+		 (string-match gnus-score-uncacheable-files file)
+		 (gnus-score-remove-from-cache file)))))
       (kill-buffer (current-buffer)))))
-
-(defun gnus-score-load-files (score-files)
-  "Load all score files in SCORE-FILES."
-  ;; Load the score files.
-  (let (scores)
+  
+(defun gnus-score-headers (score-files &optional trace)
+  ;; Score `gnus-newsgroup-headers'.
+  (let (scores news)
+    ;; PLM: probably this is not the best place to clear orphan-score
+    (setq gnus-orphan-score nil)
+    (setq gnus-scores-articles nil)
+    (setq gnus-scores-exclude-files nil)
+    ;; Load the score files.
     (while score-files
       (if (stringp (car score-files))
 	  ;; It is a string, which means that it's a score file name,
@@ -1323,16 +1131,6 @@
 	       (member (car c) gnus-scores-exclude-files)
 	       (setq scores (delq (car s) scores)))
 	  (setq s (cdr s)))))
-    scores))
-
-(defun gnus-score-headers (score-files &optional trace)
-  ;; Score `gnus-newsgroup-headers'.
-  (let (scores news)
-    ;; PLM: probably this is not the best place to clear orphan-score
-    (setq gnus-orphan-score nil
-	  gnus-scores-articles nil
-	  gnus-scores-exclude-files nil
-	  scores (gnus-score-load-files score-files))
     (setq news scores)
     ;; Do the scoring.
     (while news
@@ -1353,10 +1151,10 @@
 	    ;; WARNING: The assq makes the function O(N*S) while it could
 	    ;; be written as O(N+S), where N is (length gnus-newsgroup-headers)
 	    ;; and S is (length gnus-newsgroup-scored).
-	    (unless (assq (mail-header-number header) gnus-newsgroup-scored)
-	      (setq gnus-scores-articles ;Total of 2 * N cons-cells used.
-		    (cons (cons header (or gnus-summary-default-score 0))
-			  gnus-scores-articles))))
+	    (or (assq (mail-header-number header) gnus-newsgroup-scored)
+		(setq gnus-scores-articles ;Total of 2 * N cons-cells used.
+		      (cons (cons header (or gnus-summary-default-score 0))
+			    gnus-scores-articles))))
 
 	  (save-excursion
 	    (set-buffer (get-buffer-create "*Headers*"))
@@ -1365,8 +1163,8 @@
 	    ;; Set the global variant of this variable.
 	    (setq gnus-current-score-file current-score-file)
 	    ;; score orphans
-	    (when gnus-orphan-score
-	      (setq gnus-score-index
+	    (when gnus-orphan-score 
+	      (setq gnus-score-index 
 		    (nth 1 (assoc "references" gnus-header-index)))
 	      (gnus-score-orphans gnus-orphan-score))
 	    ;; Run each header through the score process.
@@ -1387,21 +1185,14 @@
 
 	  ;; Add articles to `gnus-newsgroup-scored'.
 	  (while gnus-scores-articles
-	    (when (or (/= gnus-summary-default-score
-			  (cdar gnus-scores-articles))
-		      gnus-save-score)
-	      (push (cons (mail-header-number (caar gnus-scores-articles))
-			  (cdar gnus-scores-articles))
-		    gnus-newsgroup-scored))
+	    (or (= gnus-summary-default-score (cdar gnus-scores-articles))
+		(setq gnus-newsgroup-scored
+		      (cons (cons (mail-header-number 
+				   (caar gnus-scores-articles))
+				  (cdar gnus-scores-articles))
+			    gnus-newsgroup-scored)))
 	    (setq gnus-scores-articles (cdr gnus-scores-articles)))
 
-	  (let (score)
-	    (while (setq score (pop scores))
-	      (while score
-		(when (listp (caar score))
-		  (gnus-score-advanced (car score) trace))
-		(pop score))))
-
 	  (gnus-message 5 "Scoring...done"))))))
 
 
@@ -1414,15 +1205,15 @@
             this (aref (car art) index)
             tref (aref (car art) refind)
             articles (cdr articles))
-      (when (string-equal tref "")	;no references line
-	(push this id-list)))
+      (if (string-equal tref "")        ;no references line
+          (setq id-list (cons this id-list))))
     id-list))
 
 ;; Orphan functions written by plm@atcmp.nl (Peter Mutsaers).
 (defun gnus-score-orphans (score)
   (let ((new-thread-ids (gnus-get-new-thread-ids gnus-scores-articles))
         alike articles art arts this last this-id)
-
+    
     (setq gnus-scores-articles (sort gnus-scores-articles 'gnus-score-string<)
 	  articles gnus-scores-articles)
 
@@ -1433,22 +1224,24 @@
             this (aref (car art) gnus-score-index)
             articles (cdr articles))
       ;;completely skip if this is empty (not a child, so not an orphan)
-      (when (not (string= this ""))
-	(if (equal last this)
-	    ;; O(N*H) cons-cells used here, where H is the number of
-	    ;; headers.
-	    (push art alike)
-	  (when last
-	    ;; Insert the line, with a text property on the
-	    ;; terminating newline referring to the articles with
-	    ;; this line.
-	    (insert last ?\n)
-	    (put-text-property (1- (point)) (point) 'articles alike))
-	  (setq alike (list art)
-		last this))))
-    (when last				; Bwadr, duplicate code.
-      (insert last ?\n)
-      (put-text-property (1- (point)) (point) 'articles alike))
+      (if (not (string= this ""))
+          (if (equal last this)
+              ;; O(N*H) cons-cells used here, where H is the number of
+              ;; headers.
+              (setq alike (cons art alike))
+            (if last
+                (progn
+                  ;; Insert the line, with a text property on the
+                  ;; terminating newline referring to the articles with
+                  ;; this line.
+                  (insert last ?\n)
+                  (put-text-property (1- (point)) (point) 'articles alike)))
+            (setq alike (list art)
+                  last this))))
+    (and last                           ; Bwadr, duplicate code.
+         (progn
+           (insert last ?\n)                    
+           (put-text-property (1- (point)) (point) 'articles alike)))
 
     ;; PLM: now delete those lines that contain an entry from new-thread-ids
     (while new-thread-ids
@@ -1456,7 +1249,7 @@
             new-thread-ids (cdr new-thread-ids))
       (goto-char (point-min))
       (while (search-forward this-id nil t)
-        ;; found a match.  remove this line
+        ;; found a match. remove this line
 	(beginning-of-line)
 	(kill-line 1)))
 
@@ -1471,7 +1264,7 @@
                            arts (cdr arts))
                      (setcdr art (+ score (cdr art))))
                    (forward-line))))))
-
+             
 
 (defun gnus-score-integer (scores header now expire &optional trace)
   (let ((gnus-score-index (nth 1 (assoc header gnus-header-index)))
@@ -1483,7 +1276,7 @@
 	    scores (cdr scores)
 	    entries (assoc header alist))
       (while (cdr entries)		;First entry is the header index.
-	(let* ((rest (cdr entries))
+	(let* ((rest (cdr entries))		
 	       (kill (car rest))
 	       (match (nth 0 kill))
 	       (type (or (nth 3 kill) '>))
@@ -1501,14 +1294,18 @@
 	  ;; matches on numbers that any cleverness will take more
 	  ;; time than one would gain.
 	  (while articles
-	    (when (funcall match-func
-			   (or (aref (caar articles) gnus-score-index) 0)
-			   match)
-	      (when trace
-		(push (cons (car-safe (rassq alist gnus-score-cache)) kill)
-		      gnus-score-trace))
-	      (setq found t)
-	      (setcdr (car articles) (+ score (cdar articles))))
+	    (and (funcall match-func 
+			  (or (aref (caar articles) gnus-score-index) 0)
+			  match)
+		 (progn
+		   (and trace (setq gnus-score-trace 
+				    (cons
+				     (cons
+				      (car-safe (rassq alist gnus-score-cache))
+				      kill)
+				     gnus-score-trace)))
+		   (setq found t)
+		   (setcdr (car articles) (+ score (cdar articles)))))
 	    (setq articles (cdr articles)))
 	  ;; Update expire date
 	  (cond ((null date))		;Permanent entry.
@@ -1524,7 +1321,7 @@
 
 (defun gnus-score-date (scores header now expire &optional trace)
   (let ((gnus-score-index (nth 1 (assoc header gnus-header-index)))
-	entries alist match match-func article)
+	entries alist)
 
     ;; Find matches.
     (while scores
@@ -1532,48 +1329,45 @@
 	    scores (cdr scores)
 	    entries (assoc header alist))
       (while (cdr entries)		;First entry is the header index.
-	(let* ((rest (cdr entries))
+	(let* ((rest (cdr entries))		
 	       (kill (car rest))
+	       (match (timezone-make-date-sortable (nth 0 kill)))
 	       (type (or (nth 3 kill) 'before))
 	       (score (or (nth 1 kill) gnus-score-interactive-default-score))
 	       (date (nth 2 kill))
 	       (found nil)
+	       (match-func 
+		(cond ((eq type 'after) 'string<)
+		      ((eq type 'before) 'gnus-string>)
+		      ((eq type 'at) 'string=)
+		      (t (error "Illegal match type: %s" type))))
 	       (articles gnus-scores-articles)
 	       l)
-	  (cond
-	   ((eq type 'after)
-	    (setq match-func 'string<
-		  match (gnus-date-iso8601 (nth 0 kill))))
-	   ((eq type 'before)
-	    (setq match-func 'gnus-string>
-		  match (gnus-date-iso8601 (nth 0 kill))))
-	   ((eq type 'at)
-	    (setq match-func 'string=
-		  match (gnus-date-iso8601 (nth 0 kill))))
-	   ((eq type 'regexp)
-	    (setq match-func 'string-match
-		  match (nth 0 kill)))
-	   (t (error "Illegal match type: %s" type)))
 	  ;; Instead of doing all the clever stuff that
 	  ;; `gnus-score-string' does to minimize searches and stuff,
 	  ;; I will assume that people generally will put so few
 	  ;; matches on numbers that any cleverness will take more
 	  ;; time than one would gain.
-	  (while (setq article (pop articles))
-	    (when (and
-		   (setq l (aref (car article) gnus-score-index))
-		   (funcall match-func match (gnus-date-iso8601 l)))
-	      (when trace
-		(push (cons (car-safe (rassq alist gnus-score-cache)) kill)
-		      gnus-score-trace))
-	      (setq found t)
-	      (setcdr article (+ score (cdr article)))))
+	  (while articles
+	    (and
+	     (setq l (aref (caar articles) gnus-score-index))
+	     (funcall match-func match (timezone-make-date-sortable l))
+	     (progn
+	       (and trace (setq gnus-score-trace 
+				(cons
+				 (cons
+				  (car-safe (rassq alist gnus-score-cache))
+				  kill)
+				 gnus-score-trace)))
+	       (setq found t)
+	       (setcdr (car articles) (+ score (cdar articles)))))
+	    (setq articles (cdr articles)))
 	  ;; Update expire date
 	  (cond ((null date))		;Permanent entry.
 		((and found gnus-update-score-entry-dates) ;Match, update date.
 		 (gnus-score-set 'touched '(t) alist)
 		 (setcar (nthcdr 2 kill) now))
-		((and expire (< date expire)) ;Old entry, remove.
+		((and expire (< date expire))	;Old entry, remove.
 		 (gnus-score-set 'touched '(t) alist)
 		 (setcdr entries (cdr rest))
 		 (setq rest entries)))
@@ -1582,12 +1376,12 @@
 
 (defun gnus-score-body (scores header now expire &optional trace)
   (save-excursion
+    (set-buffer nntp-server-buffer)
     (setq gnus-scores-articles
 	  (sort gnus-scores-articles
 		(lambda (a1 a2)
 		  (< (mail-header-number (car a1))
 		     (mail-header-number (car a2))))))
-    (set-buffer nntp-server-buffer)
     (save-restriction
       (let* ((buffer-read-only nil)
 	     (articles gnus-scores-articles)
@@ -1599,16 +1393,20 @@
 				 (t 'gnus-request-article)))
 	     entries alist ofunc article last)
 	(when articles
-	  (setq last (mail-header-number (caar (last articles))))
+	  (while (cdr articles)
+	    (setq articles (cdr articles)))
+	  (setq last (mail-header-number (caar articles)))
+	  (setq articles gnus-scores-articles)
 	  ;; Not all backends support partial fetching.  In that case,
 	  ;; we just fetch the entire article.
-	  (unless (gnus-check-backend-function
-		   (and (string-match "^gnus-" (symbol-name request-func))
-			(intern (substring (symbol-name request-func)
-					   (match-end 0))))
-		   gnus-newsgroup-name)
-	    (setq ofunc request-func)
-	    (setq request-func 'gnus-request-article))
+	  (or (gnus-check-backend-function 
+	       (and (string-match "^gnus-" (symbol-name request-func))
+		    (intern (substring (symbol-name request-func)
+				       (match-end 0))))
+	       gnus-newsgroup-name)
+	      (progn
+		(setq ofunc request-func)
+		(setq request-func 'gnus-request-article)))
 	  (while articles
 	    (setq article (mail-header-number (caar articles)))
 	    (gnus-message 7 "Scoring on article %s of %s..." article last)
@@ -1618,32 +1416,33 @@
 	      ;; If just parts of the article is to be searched, but the
 	      ;; backend didn't support partial fetching, we just narrow
 	      ;; to the relevant parts.
-	      (when ofunc
-		(if (eq ofunc 'gnus-request-head)
+	      (if ofunc
+		  (if (eq ofunc 'gnus-request-head)
+		      (narrow-to-region
+		       (point)
+		       (or (search-forward "\n\n" nil t) (point-max)))
 		    (narrow-to-region
-		     (point)
-		     (or (search-forward "\n\n" nil t) (point-max)))
-		  (narrow-to-region
-		   (or (search-forward "\n\n" nil t) (point))
-		   (point-max))))
+		     (or (search-forward "\n\n" nil t) (point))
+		     (point-max))))
 	      (setq scores all-scores)
 	      ;; Find matches.
 	      (while scores
-		(setq alist (pop scores)
+		(setq alist (car scores)
+		      scores (cdr scores)
 		      entries (assoc header alist))
 		(while (cdr entries)	;First entry is the header index.
-		  (let* ((rest (cdr entries))
+		  (let* ((rest (cdr entries))		
 			 (kill (car rest))
 			 (match (nth 0 kill))
 			 (type (or (nth 3 kill) 's))
-			 (score (or (nth 1 kill)
+			 (score (or (nth 1 kill) 
 				    gnus-score-interactive-default-score))
 			 (date (nth 2 kill))
 			 (found nil)
-			 (case-fold-search
+			 (case-fold-search 
 			  (not (or (eq type 'R) (eq type 'S)
 				   (eq type 'Regexp) (eq type 'String))))
-			 (search-func
+			 (search-func 
 			  (cond ((or (eq type 'r) (eq type 'R)
 				     (eq type 'regexp) (eq type 'Regexp))
 				 're-search-forward)
@@ -1653,33 +1452,32 @@
 				(t
 				 (error "Illegal match type: %s" type)))))
 		    (goto-char (point-min))
-		    (when (funcall search-func match nil t)
-		      ;; Found a match, update scores.
-		      (setcdr (car articles) (+ score (cdar articles)))
-		      (setq found t)
-		      (when trace
-			(push
-			 (cons (car-safe (rassq alist gnus-score-cache)) kill)
-			 gnus-score-trace)))
+		    (if (funcall search-func match nil t)
+			;; Found a match, update scores.
+			(progn
+			  (setcdr (car articles) (+ score (cdar articles)))
+			  (setq found t)
+			  (and trace (setq gnus-score-trace 
+					   (cons
+					    (cons
+					     (car-safe
+					      (rassq alist gnus-score-cache))
+					     kill)
+					    gnus-score-trace)))))
 		    ;; Update expire date
-		    (unless trace
-		      (cond
-		       ((null date))	;Permanent entry.
-		       ((and found gnus-update-score-entry-dates)
-			;; Match, update date.
-			(gnus-score-set 'touched '(t) alist)
-			(setcar (nthcdr 2 kill) now))
-		       ((and expire (< date expire)) ;Old entry, remove.
-			(gnus-score-set 'touched '(t) alist)
-			(setcdr entries (cdr rest))
-			(setq rest entries))))
+		    (cond
+		     ((null date))	;Permanent entry.
+		     ((and found gnus-update-score-entry-dates) ;Match, update date.
+		      (gnus-score-set 'touched '(t) alist)
+		      (setcar (nthcdr 2 kill) now))
+		     ((and expire (< date expire)) ;Old entry, remove.
+		      (gnus-score-set 'touched '(t) alist)
+		      (setcdr entries (cdr rest))
+		      (setq rest entries)))
 		    (setq entries rest)))))
 	    (setq articles (cdr articles)))))))
   nil)
 
-(defun gnus-score-thread (scores header now expire &optional trace)
-  (gnus-score-followup scores header now expire trace t))
-
 (defun gnus-score-followup (scores header now expire &optional trace thread)
   ;; Insert the unique article headers in the buffer.
   (let ((gnus-score-index (nth 1 (assoc header gnus-header-index)))
@@ -1695,7 +1493,7 @@
       (set-buffer gnus-summary-buffer)
       (gnus-score-load-file
        (or gnus-newsgroup-adaptive-score-file
-	   (gnus-score-file-name
+	   (gnus-score-file-name 
 	    gnus-newsgroup-name gnus-adaptive-file-suffix))))
 
     (setq gnus-scores-articles (sort gnus-scores-articles 'gnus-score-string<)
@@ -1707,23 +1505,25 @@
 	    this (aref (car art) gnus-score-index)
 	    articles (cdr articles))
       (if (equal last this)
-	  (push art alike)
-	(when last
-	  (insert last ?\n)
-	  (put-text-property (1- (point)) (point) 'articles alike))
+	  (setq alike (cons art alike))
+	(if last
+	    (progn
+	      (insert last ?\n)
+	      (put-text-property (1- (point)) (point) 'articles alike)))
 	(setq alike (list art)
 	      last this)))
-    (when last				; Bwadr, duplicate code.
-      (insert last ?\n)
-      (put-text-property (1- (point)) (point) 'articles alike))
-
+    (and last				; Bwadr, duplicate code.
+	 (progn
+	   (insert last ?\n)			
+	   (put-text-property (1- (point)) (point) 'articles alike)))
+  
     ;; Find matches.
     (while scores
       (setq alist (car scores)
 	    scores (cdr scores)
 	    entries (assoc header alist))
       (while (cdr entries)		;First entry is the header index.
-	(let* ((rest (cdr entries))
+	(let* ((rest (cdr entries))		
 	       (kill (car rest))
 	       (match (nth 0 kill))
 	       (type (or (nth 3 kill) 's))
@@ -1731,10 +1531,10 @@
 	       (date (nth 2 kill))
 	       (found nil)
 	       (mt (aref (symbol-name type) 0))
-	       (case-fold-search
+	       (case-fold-search 
 		(not (or (= mt ?R) (= mt ?S) (= mt ?E) (= mt ?F))))
 	       (dmt (downcase mt))
-	       (search-func
+	       (search-func 
 		(cond ((= dmt ?r) 're-search-forward)
 		      ((or (= dmt ?e) (= dmt ?s) (= dmt ?f)) 'search-forward)
 		      (t (error "Illegal match type: %s" type))))
@@ -1747,13 +1547,13 @@
 		     (= (progn (end-of-line) (point))
 			(match-end 0))
 		     (progn
-		       (setq found (setq arts (get-text-property
+		       (setq found (setq arts (get-text-property 
 					       (point) 'articles)))
 		       ;; Found a match, update scores.
 		       (while arts
 			 (setq art (car arts)
 			       arts (cdr arts))
-			 (gnus-score-add-followups
+			 (gnus-score-add-followups 
 			  (car art) score all-scores thread))))
 		(end-of-line))
 	    (while (funcall search-func match nil t)
@@ -1769,7 +1569,7 @@
 		((and found gnus-update-score-entry-dates) ;Match, update date.
 		 (gnus-score-set 'touched '(t) alist)
 		 (setcar (nthcdr 2 kill) now))
-		((and expire (< date expire)) ;Old entry, remove.
+		((and expire (< date expire))	;Old entry, remove.
 		 (gnus-score-set 'touched '(t) alist)
 		 (setcdr entries (cdr rest))
 		 (setq rest entries)))
@@ -1795,7 +1595,7 @@
 	     (assoc id entry)
 	     (setq dont t)))
       (unless dont
-	(gnus-summary-score-entry
+	(gnus-summary-score-entry 
 	 (if thread "thread" "references")
 	 id 's score (current-time-string) nil t)))))
 
@@ -1803,12 +1603,11 @@
   ;; Score ARTICLES according to HEADER in SCORE-LIST.
   ;; Update matching entries to NOW and remove unmatched entries older
   ;; than EXPIRE.
-
+  
   ;; Insert the unique article headers in the buffer.
   (let ((gnus-score-index (nth 1 (assoc header gnus-header-index)))
 	;; gnus-score-index is used as a free variable.
-	alike last this art entries alist articles
-	fuzzies arts words kill)
+	alike last this art entries alist articles scores fuzzy)
 
     ;; Sorting the articles costs os O(N*log N) but will allow us to
     ;; only match with each unique header.  Thus the actual matching
@@ -1820,224 +1619,172 @@
 	  articles gnus-scores-articles)
 
     (erase-buffer)
-    (while (setq art (pop articles))
-      (setq this (aref (car art) gnus-score-index))
+    (while articles
+      (setq art (car articles)
+	    this (aref (car art) gnus-score-index)
+	    articles (cdr articles))
       (if (equal last this)
 	  ;; O(N*H) cons-cells used here, where H is the number of
 	  ;; headers.
-	  (push art alike)
-	(when last
-	  ;; Insert the line, with a text property on the
-	  ;; terminating newline referring to the articles with
-	  ;; this line.
-	  (insert last ?\n)
-	  (put-text-property (1- (point)) (point) 'articles alike))
+	  (setq alike (cons art alike))
+	(if last
+	    (progn
+	      ;; Insert the line, with a text property on the
+	      ;; terminating newline referring to the articles with
+	      ;; this line.
+	      (insert last ?\n)
+	      (put-text-property (1- (point)) (point) 'articles alike)))
 	(setq alike (list art)
 	      last this)))
-    (when last				; Bwadr, duplicate code.
-      (insert last ?\n)
-      (put-text-property (1- (point)) (point) 'articles alike))
+    (and last				; Bwadr, duplicate code.
+	 (progn
+	   (insert last ?\n)			
+	   (put-text-property (1- (point)) (point) 'articles alike)))
 
-    ;; Go through all the score alists and pick out the entries
-    ;; for this header.
-    (while score-list
-      (setq alist (pop score-list)
-	    ;; There's only one instance of this header for
-	    ;; each score alist.
+    ;; Find ordinary matches.
+    (setq scores score-list) 
+    (while scores
+      (setq alist (car scores)
+	    scores (cdr scores)
 	    entries (assoc header alist))
       (while (cdr entries)		;First entry is the header index.
-	(let* ((kill (cadr entries))
+	(let* ((rest (cdr entries))		
+	       (kill (car rest))
 	       (match (nth 0 kill))
 	       (type (or (nth 3 kill) 's))
 	       (score (or (nth 1 kill) gnus-score-interactive-default-score))
 	       (date (nth 2 kill))
 	       (found nil)
 	       (mt (aref (symbol-name type) 0))
-	       (case-fold-search (not (memq mt '(?R ?S ?E ?F))))
+	       (case-fold-search 
+		(not (or (= mt ?R) (= mt ?S) (= mt ?E) (= mt ?F))))
 	       (dmt (downcase mt))
-	       (search-func
+	       (search-func 
 		(cond ((= dmt ?r) 're-search-forward)
 		      ((or (= dmt ?e) (= dmt ?s) (= dmt ?f)) 'search-forward)
-		      ((= dmt ?w) nil)
-		      (t (error "Illegal match type: %s" type)))))
-	  (cond
-	   ;; Fuzzy matches.  We save these for later.
-	   ((= dmt ?f)
-	    (push (cons entries alist) fuzzies))
-	   ;; Word matches.  Save these for even later.
-	   ((= dmt ?w)
-	    (push (cons entries alist) words))
-	   ;; Exact matches.
-	   ((= dmt ?e)
-	    ;; Do exact matching.
+		      (t (error "Illegal match type: %s" type))))
+	       arts art)
+	  (if (= dmt ?f)
+	      (setq fuzzy t)
+	    ;; Do non-fuzzy matching.
 	    (goto-char (point-min))
-	    (while (and (not (eobp))
-			(funcall search-func match nil t))
-	      ;; Is it really exact?
-	      (and (eolp)
-		   (= (gnus-point-at-bol) (match-beginning 0))
-		   ;; Yup.
-		   (progn
-		     (setq found (setq arts (get-text-property
-					     (point) 'articles)))
-		     ;; Found a match, update scores.
-		     (if trace
-			 (while (setq art (pop arts))
-			   (setcdr art (+ score (cdr art)))
-			   (push
-			    (cons
-			     (car-safe (rassq alist gnus-score-cache))
-			     kill)
+	    (if (= dmt ?e)
+		;; Do exact matching.
+		(while (and (not (eobp)) 
+			    (funcall search-func match nil t))
+		  (and (= (progn (beginning-of-line) (point))
+			  (match-beginning 0))
+		       (= (progn (end-of-line) (point))
+			  (match-end 0))
+		       (progn
+			 (setq found (setq arts (get-text-property 
+						 (point) 'articles)))
+			 ;; Found a match, update scores.
+			 (if trace
+			     (while arts
+			       (setq art (car arts)
+				     arts (cdr arts))
+			       (setcdr art (+ score (cdr art)))
+			       (setq gnus-score-trace
+				     (cons
+				      (cons
+				       (car-safe
+					(rassq alist gnus-score-cache))
+				       kill)
+				      gnus-score-trace)))
+			   (while arts
+			     (setq art (car arts)
+				   arts (cdr arts))
+			     (setcdr art (+ score (cdr art)))))))
+		  (forward-line 1))
+	      ;; Do regexp and substring matching.
+	      (and (string= match "") (setq match "\n"))
+	      (while (and (not (eobp))
+			  (funcall search-func match nil t))
+		(goto-char (match-beginning 0))
+		(end-of-line)
+		(setq found (setq arts (get-text-property (point) 'articles)))
+		;; Found a match, update scores.
+		(if trace
+		    (while arts
+		      (setq art (pop arts))
+		      (setcdr art (+ score (cdr art)))
+		      (push (cons
+			      (car-safe (rassq alist gnus-score-cache))
+			      kill)
 			    gnus-score-trace))
-		       (while (setq art (pop arts))
-			 (setcdr art (+ score (cdr art)))))))
-	      (forward-line 1)))
-	   ;; Regexp and substring matching.
-	   (t
-	    (goto-char (point-min))
-	    (when (string= match "")
-	      (setq match "\n"))
-	    (while (and (not (eobp))
-			(funcall search-func match nil t))
-	      (goto-char (match-beginning 0))
-	      (end-of-line)
-	      (setq found (setq arts (get-text-property (point) 'articles)))
-	      ;; Found a match, update scores.
-	      (if trace
-		  (while (setq art (pop arts))
-		    (setcdr art (+ score (cdr art)))
-		    (push (cons (car-safe (rassq alist gnus-score-cache)) kill)
-			  gnus-score-trace))
-		(while (setq art (pop arts))
-		  (setcdr art (+ score (cdr art)))))
-	      (forward-line 1))))
-	  ;; Update expiry date
-	  (if trace
-	      (setq entries (cdr entries))
-	    (cond
-	     ;; Permanent entry.
-	     ((null date)
-	      (setq entries (cdr entries)))
-	     ;; We have a match, so we update the date.
-	     ((and found gnus-update-score-entry-dates)
+		  (while arts
+		    (setq art (pop arts))
+		    (setcdr art (+ score (cdr art)))))
+		(forward-line 1)))
+	    ;; Update expire date
+	    (cond 
+	     ((null date))		;Permanent entry.
+	     ((and found gnus-update-score-entry-dates) ;Match, update date.
 	      (gnus-score-set 'touched '(t) alist)
-	      (setcar (nthcdr 2 kill) now)
-	      (setq entries (cdr entries)))
-	     ;; This entry has expired, so we remove it.
-	     ((and expire (< date expire))
+	      (setcar (nthcdr 2 kill) now))
+	     ((and expire (< date expire)) ;Old entry, remove.
 	      (gnus-score-set 'touched '(t) alist)
-	      (setcdr entries (cddr entries)))
-	     ;; No match; go to next entry.
-	     (t
-	      (setq entries (cdr entries))))))))
+	      (setcdr entries (cdr rest))
+	      (setq rest entries))))
+	  (setq entries rest))))
 
     ;; Find fuzzy matches.
-    (when fuzzies
-      ;; Simplify the entire buffer for easy matching.
+    (when fuzzy
+      (setq scores score-list)
       (gnus-simplify-buffer-fuzzy)
-      (while (setq kill (cadaar fuzzies))
-	(let* ((match (nth 0 kill))
-	       (type (nth 3 kill))
-	       (score (or (nth 1 kill) gnus-score-interactive-default-score))
-	       (date (nth 2 kill))
-	       (mt (aref (symbol-name type) 0))
-	       (case-fold-search (not (= mt ?F)))
-	       found)
-	  (goto-char (point-min))
-	  (while (and (not (eobp))
-		      (search-forward match nil t))
-	    (when (and (= (gnus-point-at-bol) (match-beginning 0))
-		       (eolp))
-	      (setq found (setq arts (get-text-property (point) 'articles)))
-	      (if trace
-		  (while (setq art (pop arts))
-		    (setcdr art (+ score (cdr art)))
-		    (push (cons
-			   (car-safe (rassq (cdar fuzzies) gnus-score-cache))
-			   kill)
-			  gnus-score-trace))
-		;; Found a match, update scores.
-		(while (setq art (pop arts))
-		  (setcdr art (+ score (cdr art))))))
-	    (forward-line 1))
-	  ;; Update expiry date
-	  (cond
-	   ;; Permanent.
-	   ((null date)
-	    )
-	   ;; Match, update date.
-	   ((and found gnus-update-score-entry-dates)
-	    (gnus-score-set 'touched '(t) (cdar fuzzies))
-	    (setcar (nthcdr 2 kill) now))
-	   ;; Old entry, remove.
-	   ((and expire (< date expire))
-	    (gnus-score-set 'touched '(t) (cdar fuzzies))
-	    (setcdr (caar fuzzies) (cddaar fuzzies))))
-	  (setq fuzzies (cdr fuzzies)))))
-
-    (when words
-      ;; Enter all words into the hashtb.
-      (let ((hashtb (gnus-make-hashtable
-		     (* 10 (count-lines (point-min) (point-max))))))
-	(gnus-enter-score-words-into-hashtb hashtb)
-	(while (setq kill (cadaar words))
-	  (let* ((score (or (nth 1 kill) gnus-score-interactive-default-score))
+      (while scores
+	(setq alist (car scores)
+	      scores (cdr scores)
+	      entries (assoc header alist))
+	(while (cdr entries)		;First entry is the header index.
+	  (let* ((rest (cdr entries))		
+		 (kill (car rest))
+		 (match (nth 0 kill))
+		 (type (or (nth 3 kill) 's))
+		 (score (or (nth 1 kill) gnus-score-interactive-default-score))
 		 (date (nth 2 kill))
-		 found)
-	    (when (setq arts (intern-soft (nth 0 kill) hashtb))
-	      (setq arts (symbol-value arts))
-	      (setq found t)
-	      (if trace
-		  (while (setq art (pop arts))
-		    (setcdr art (+ score (cdr art)))
-		    (push (cons
-			   (car-safe (rassq (cdar words) gnus-score-cache))
-			   kill)
-			  gnus-score-trace))
-		;; Found a match, update scores.
-		(while (setq art (pop arts))
-		  (setcdr art (+ score (cdr art))))))
-	    ;; Update expiry date
-	    (cond
-	     ;; Permanent.
-	     ((null date)
-	      )
-	     ;; Match, update date.
-	     ((and found gnus-update-score-entry-dates)
-	      (gnus-score-set 'touched '(t) (cdar words))
-	      (setcar (nthcdr 2 kill) now))
-	     ;; Old entry, remove.
-	     ((and expire (< date expire))
-	      (gnus-score-set 'touched '(t) (cdar words))
-	      (setcdr (caar words) (cddaar words))))
-	    (setq words (cdr words))))))
-    nil))
-
-(defun gnus-enter-score-words-into-hashtb (hashtb)
-  ;; Find all the words in the buffer and enter them into
-  ;; the hashtable.
-  (let ((syntab (syntax-table))
-	word val)
-    (goto-char (point-min))
-    (unwind-protect
-	(progn
-	  (set-syntax-table gnus-adaptive-word-syntax-table)
-	  (while (re-search-forward "\\b\\w+\\b" nil t)
-	    (setq val
-		  (gnus-gethash
-		   (setq word (downcase (buffer-substring
-					 (match-beginning 0) (match-end 0))))
-		   hashtb))
-	    (gnus-sethash
-	     word
-	     (append (get-text-property (gnus-point-at-eol) 'articles) val)
-	     hashtb)))
-      (set-syntax-table syntab))
-    ;; Make all the ignorable words ignored.
-    (let ((ignored (append gnus-ignored-adaptive-words
-			   gnus-default-ignored-adaptive-words)))
-      (while ignored
-	(gnus-sethash (pop ignored) nil hashtb)))))
+		 (found nil)
+		 (mt (aref (symbol-name type) 0))
+		 (case-fold-search (not (= mt ?F)))
+		 (dmt (downcase mt))
+		 arts art)
+	    (when (= dmt ?f)
+	      (goto-char (point-min))
+	      (while (and (not (eobp)) 
+			  (search-forward match nil t))
+		(when (and (= (progn (beginning-of-line) (point))
+			      (match-beginning 0))
+			   (= (progn (end-of-line) (point))
+			      (match-end 0)))
+		  (setq found (setq arts (get-text-property 
+					  (point) 'articles)))
+		  ;; Found a match, update scores.
+		  (if trace
+		      (while arts
+			(setq art (pop arts))
+			(setcdr art (+ score (cdr art)))
+			(push (cons
+			       (car-safe (rassq alist gnus-score-cache))
+			       kill)
+			      gnus-score-trace))
+		    (while arts
+		      (setq art (pop arts))
+		      (setcdr art (+ score (cdr art))))))
+		(forward-line 1))
+	      ;; Update expire date
+	      (unless trace
+		(cond 
+		 ((null date))		;Permanent entry.
+		 ((and found gnus-update-score-entry-dates) ;Match, update date.
+		  (gnus-score-set 'touched '(t) alist)
+		  (setcar (nthcdr 2 kill) now))
+		 ((and expire (< date expire)) ;Old entry, remove.
+		  (gnus-score-set 'touched '(t) alist)
+		  (setcdr entries (cdr rest))
+		  (setq rest entries)))))
+	    (setq entries rest))))))
+  nil)
 
 (defun gnus-score-string< (a1 a2)
   ;; Compare headers in articles A2 and A2.
@@ -2045,203 +1792,113 @@
   (string-lessp (aref (car a1) gnus-score-index)
 		(aref (car a2) gnus-score-index)))
 
+(defun gnus-score-build-cons (article)
+  ;; Build a `gnus-newsgroup-scored' type cons from ARTICLE.
+  (cons (mail-header-number (car article)) (cdr article)))
+
 (defun gnus-current-score-file-nondirectory (&optional score-file)
   (let ((score-file (or score-file gnus-current-score-file)))
-    (if score-file
+    (if score-file 
 	(gnus-short-group-name (file-name-nondirectory score-file))
       "none")))
 
 (defun gnus-score-adaptive ()
-  "Create adaptive score rules for this newsgroup."
-  (when gnus-newsgroup-adaptive
-    ;; We change the score file to the adaptive score file.
-    (save-excursion
-      (set-buffer gnus-summary-buffer)
-      (gnus-score-load-file
-       (or gnus-newsgroup-adaptive-score-file
-	   (gnus-score-file-name
-	    gnus-newsgroup-name gnus-adaptive-file-suffix))))
-    ;; Perform ordinary line scoring.
-    (when (or (not (listp gnus-newsgroup-adaptive))
-	      (memq 'line gnus-newsgroup-adaptive))
+  (save-excursion
+    (let* ((malist (gnus-copy-sequence gnus-adaptive-score-alist))
+	   (alist malist)
+	   (date (current-time-string)) 
+	   (data gnus-newsgroup-data)
+	   elem headers match)
+      ;; First we transform the adaptive rule alist into something
+      ;; that's faster to process.
+      (while malist
+	(setq elem (car malist))
+	(if (symbolp (car elem))
+	    (setcar elem (symbol-value (car elem))))
+	(setq elem (cdr elem))
+	(while elem
+	  (setcdr (car elem) 
+		  (cons (if (eq (caar elem) 'followup)
+			    "references"
+			  (symbol-name (caar elem)))
+			(cdar elem)))
+	  (setcar (car elem) 
+		  `(lambda (h)
+		     (,(intern 
+			(concat "mail-header-" 
+				(if (eq (caar elem) 'followup)
+				    "message-id"
+				  (downcase (symbol-name (caar elem))))))
+		      h)))
+	  (setq elem (cdr elem)))
+	(setq malist (cdr malist)))
+      ;; We change the score file to the adaptive score file.
       (save-excursion
-	(let* ((malist (gnus-copy-sequence gnus-adaptive-score-alist))
-	       (alist malist)
-	       (date (current-time-string))
-	       (data gnus-newsgroup-data)
-	       elem headers match)
-	  ;; First we transform the adaptive rule alist into something
-	  ;; that's faster to process.
-	  (while malist
-	    (setq elem (car malist))
-	    (when (symbolp (car elem))
-	      (setcar elem (symbol-value (car elem))))
-	    (setq elem (cdr elem))
-	    (while elem
-	      (setcdr (car elem)
-		      (cons (if (eq (caar elem) 'followup)
-				"references"
-			      (symbol-name (caar elem)))
-			    (cdar elem)))
-	      (setcar (car elem)
-		      `(lambda (h)
-			 (,(intern
-			    (concat "mail-header-"
-				    (if (eq (caar elem) 'followup)
-					"message-id"
-				      (downcase (symbol-name (caar elem))))))
-			  h)))
-	      (setq elem (cdr elem)))
-	    (setq malist (cdr malist)))
-	  ;; Then we score away.
-	  (while data
-	    (setq elem (cdr (assq (gnus-data-mark (car data)) alist)))
-	    (if (or (not elem)
-		    (gnus-data-pseudo-p (car data)))
-		()
-	      (when (setq headers (gnus-data-header (car data)))
-		(while elem
-		  (setq match (funcall (caar elem) headers))
-		  (gnus-summary-score-entry
-		   (nth 1 (car elem)) match
-		   (cond
-		    ((numberp match)
-		     '=)
-		    ((equal (nth 1 (car elem)) "date")
-		     'a)
-		    (t
-		     ;; Whether we use substring or exact matches is
-		     ;; controlled here.
-		     (if (or (not gnus-score-exact-adapt-limit)
-			     (< (length match) gnus-score-exact-adapt-limit))
-			 'e
-		       (if (equal (nth 1 (car elem)) "subject")
-			   'f 's))))
-		   (nth 2 (car elem)) date nil t)
-		  (setq elem (cdr elem)))))
-	    (setq data (cdr data))))))
-
-    ;; Perform adaptive word scoring.
-    (when (and (listp gnus-newsgroup-adaptive)
-	       (memq 'word gnus-newsgroup-adaptive))
-      (nnheader-temp-write nil
-	(let* ((hashtb (gnus-make-hashtable 1000))
-	       (date (gnus-day-number (current-time-string)))
-	       (data gnus-newsgroup-data)
-	       (syntab (syntax-table))
-	       word d score val)
-	  (unwind-protect
-	      (progn
-		(set-syntax-table gnus-adaptive-word-syntax-table)
-		;; Go through all articles.
-		(while (setq d (pop data))
-		  (when (and
-			 (not (gnus-data-pseudo-p d))
-			 (setq score
-			       (cdr (assq
-				     (gnus-data-mark d)
-				     gnus-adaptive-word-score-alist))))
-		    ;; This article has a mark that should lead to
-		    ;; adaptive word rules, so we insert the subject
-		    ;; and find all words in that string.
-		    (insert (mail-header-subject (gnus-data-header d)))
-		    (downcase-region (point-min) (point-max))
-		    (goto-char (point-min))
-		    (while (re-search-forward "\\b\\w+\\b" nil t)
-		      ;; Put the word and score into the hashtb.
-		      (setq val (gnus-gethash (setq word (match-string 0))
-					      hashtb))
-		      (gnus-sethash word (+ (or val 0) score) hashtb))
-		    (erase-buffer))))
-	    (set-syntax-table syntab))
-	  ;; Make all the ignorable words ignored.
-	  (let ((ignored (append gnus-ignored-adaptive-words
-				 gnus-default-ignored-adaptive-words)))
-	    (while ignored
-	      (gnus-sethash (pop ignored) nil hashtb)))
-	  ;; Now we have all the words and scores, so we
-	  ;; add these rules to the ADAPT file.
-	  (set-buffer gnus-summary-buffer)
-	  (mapatoms
-	   (lambda (word)
-	     (when (symbol-value word)
-	       (gnus-summary-score-entry
-		"subject" (symbol-name word) 'w (symbol-value word)
-		date nil t)))
-	   hashtb))))))
+	(set-buffer gnus-summary-buffer)
+	(gnus-score-load-file 
+	 (or gnus-newsgroup-adaptive-score-file
+	     (gnus-score-file-name 
+	      gnus-newsgroup-name gnus-adaptive-file-suffix))))
+      ;; The we score away.
+      (while data
+	(setq elem (cdr (assq (gnus-data-mark (car data)) alist)))
+	(if (or (not elem)
+		(gnus-data-pseudo-p (car data)))
+	    ()
+	  (when (setq headers (gnus-data-header (car data)))
+	    (while elem 
+	      (setq match (funcall (caar elem) headers))
+	      (gnus-summary-score-entry 
+	       (nth 1 (car elem)) match
+	       (cond
+		((numberp match)
+		 '=)
+		((equal (nth 1 (car elem)) "date")
+		 'a)
+		(t
+		 ;; Whether we use substring or exact matches are controlled
+		 ;; here.  
+		 (if (or (not gnus-score-exact-adapt-limit)
+			 (< (length match) gnus-score-exact-adapt-limit))
+		     'e 
+		   (if (equal (nth 1 (car elem)) "subject")
+		       'f 's))))
+	       (nth 2 (car elem)) date nil t)
+	      (setq elem (cdr elem)))))
+	(setq data (cdr data))))))
 
 (defun gnus-score-edit-done ()
   (let ((bufnam (buffer-file-name (current-buffer)))
 	(winconf gnus-prev-winconf))
-    (when winconf
-      (set-window-configuration winconf))
+    (and winconf (set-window-configuration winconf))
     (gnus-score-remove-from-cache bufnam)
     (gnus-score-load-file bufnam)))
 
 (defun gnus-score-find-trace ()
   "Find all score rules that applies to the current article."
   (interactive)
-  (let ((old-scored gnus-newsgroup-scored))
-    (let ((gnus-newsgroup-headers
-	   (list (gnus-summary-article-header)))
-	  (gnus-newsgroup-scored nil)
-	  trace)
+  (let ((gnus-newsgroup-headers
+	 (list (gnus-summary-article-header)))
+	(gnus-newsgroup-scored nil)
+	(buf (current-buffer))
+	trace)
+    (when (get-buffer "*Gnus Scores*")
       (save-excursion
-	(nnheader-set-temp-buffer "*Score Trace*"))
-      (setq gnus-score-trace nil)
-      (gnus-possibly-score-headers 'trace)
-      (if (not (setq trace gnus-score-trace))
-	  (gnus-error
-	   1 "No score rules apply to the current article (default score %d)."
-	   gnus-summary-default-score)
-	(set-buffer "*Score Trace*")
-	(gnus-add-current-to-buffer-list)
-	(while trace
-	  (insert (format "%S  ->  %s\n" (cdar trace)
-			  (file-name-nondirectory (caar trace))))
-	  (setq trace (cdr trace)))
-	(goto-char (point-min))
-	(gnus-configure-windows 'score-trace)))
-    (set-buffer gnus-summary-buffer)
-    (setq gnus-newsgroup-scored old-scored)))
-
-(defun gnus-score-find-favourite-words ()
-  "List words used in scoring."
-  (interactive)
-  (let ((alists (gnus-score-load-files (gnus-all-score-files)))
-	alist rule rules kill)
-    ;; Go through all the score alists for this group
-    ;; and find all `w' rules.
-    (while (setq alist (pop alists))
-      (while (setq rule (pop alist))
-	(when (and (stringp (car rule))
-		   (equal "subject" (downcase (pop rule))))
-	  (while (setq kill (pop rule))
-	    (when (memq (nth 3 kill) '(w W word Word))
-	      (push (cons (or (nth 1 kill)
-			      gnus-score-interactive-default-score)
-			  (car kill))
-		    rules))))))
-    (setq rules (sort rules (lambda (r1 r2)
-			      (string-lessp (cdr r1) (cdr r2)))))
-    ;; Add up words that have appeared several times.
-    (let ((r rules))
-      (while (cdr r)
-	(if (equal (cdar r) (cdadr r))
-	    (progn
-	      (setcar (car r) (+ (caar r) (caadr r)))
-	      (setcdr r (cddr r)))
-	  (pop r))))
-    ;; Insert the words.
-    (nnheader-set-temp-buffer "*Score Words*")
-    (if (not (setq rules (sort rules (lambda (r1 r2) (> (car r1) (car r2))))))
-	(gnus-error 3 "No word score rules")
-      (while rules
-	(insert (format "%-5d: %s\n" (caar rules) (cdar rules)))
-	(pop rules))
+	(set-buffer "*Gnus Scores*")
+	(erase-buffer)))
+    (setq gnus-score-trace nil)
+    (gnus-possibly-score-headers 'trace)
+    (if (not (setq trace gnus-score-trace))
+	(gnus-error 1 "No score rules apply to the current article.")
+      (pop-to-buffer "*Gnus Scores*")
       (gnus-add-current-to-buffer-list)
+      (erase-buffer)
+      (while trace
+	(insert (format "%S  ->  %s\n" (cdar trace)
+			(file-name-nondirectory (caar trace))))
+	(setq trace (cdr trace)))
       (goto-char (point-min))
-      (gnus-configure-windows 'score-words))))
+      (pop-to-buffer buf))))
 
 (defun gnus-summary-rescore ()
   "Redo the entire scoring process in the current summary."
@@ -2251,7 +1908,7 @@
   (setq gnus-newsgroup-scored nil)
   (gnus-possibly-score-headers)
   (gnus-score-update-all-lines))
-
+  
 (defun gnus-score-flush-cache ()
   "Flush the cache of score files."
   (interactive)
@@ -2293,7 +1950,7 @@
     (gnus-summary-next-subject 1 t)))
 
 (defun gnus-score-default (level)
-  (if level (prefix-numeric-value level)
+  (if level (prefix-numeric-value level) 
     gnus-score-interactive-default-score))
 
 (defun gnus-summary-raise-thread (&optional score)
@@ -2309,8 +1966,8 @@
 	  (setq articles (cdr articles))))
       (setq e (point)))
     (let ((gnus-summary-check-current t))
-      (unless (zerop (gnus-summary-next-subject 1 t))
-	(goto-char e))))
+      (or (zerop (gnus-summary-next-subject 1 t))
+	  (goto-char e))))
   (gnus-summary-recenter)
   (gnus-summary-position-point)
   (gnus-set-mode-line 'summary))
@@ -2330,25 +1987,25 @@
   (interactive "P")
   (gnus-summary-raise-thread (- (1- (gnus-score-default score)))))
 
-;;; Finding score files.
+;;; Finding score files. 
 
 (defun gnus-score-score-files (group)
   "Return a list of all possible score files."
   ;; Search and set any global score files.
-  (when gnus-global-score-files
-    (unless gnus-internal-global-score-files
-      (gnus-score-search-global-directories gnus-global-score-files)))
+  (and gnus-global-score-files 
+       (or gnus-internal-global-score-files
+	   (gnus-score-search-global-directories gnus-global-score-files)))
   ;; Fix the kill-file dir variable.
-  (setq gnus-kill-files-directory
+  (setq gnus-kill-files-directory 
 	(file-name-as-directory gnus-kill-files-directory))
   ;; If we can't read it, there are no score files.
   (if (not (file-exists-p (expand-file-name gnus-kill-files-directory)))
       (setq gnus-score-file-list nil)
     (if (not (gnus-use-long-file-name 'not-score))
 	;; We do not use long file names, so we have to do some
-	;; directory traversing.
-	(setq gnus-score-file-list
-	      (cons nil
+	;; directory traversing.  
+	(setq gnus-score-file-list 
+	      (cons nil 
 		    (or gnus-short-name-score-file-cache
 			(prog2
 			    (gnus-message 6 "Finding all score files...")
@@ -2361,49 +2018,46 @@
 		(not (car gnus-score-file-list))
 		(gnus-file-newer-than gnus-kill-files-directory
 				      (car gnus-score-file-list)))
-	(setq gnus-score-file-list
+	(setq gnus-score-file-list 
 	      (cons (nth 5 (file-attributes gnus-kill-files-directory))
-		    (nreverse
-		     (directory-files
-		      gnus-kill-files-directory t
+		    (nreverse 
+		     (directory-files 
+		      gnus-kill-files-directory t 
 		      (gnus-score-file-regexp)))))))
     (cdr gnus-score-file-list)))
 
 (defun gnus-score-score-files-1 (dir)
   "Return all possible score files under DIR."
-  (let ((files (list (expand-file-name dir)))
+  (let ((files (directory-files (expand-file-name dir) t nil t))
 	(regexp (gnus-score-file-regexp))
-	(case-fold-search nil)
-	seen out file)
+	out file)
     (while (setq file (pop files))
-      (cond
+      (cond 
        ;; Ignore "." and "..".
        ((member (file-name-nondirectory file) '("." ".."))
 	nil)
-       ;; Add subtrees of directory to also be searched.
-       ((and (file-directory-p file)
-	     (not (member (file-truename file) seen)))
-	(push (file-truename file) seen)
-	(setq files (nconc (directory-files file t nil t) files)))
+       ;; Recurse down directories.
+       ((file-directory-p file)
+	(setq out (nconc (gnus-score-score-files-1 file) out)))
        ;; Add files to the list of score files.
        ((string-match regexp file)
 	(push file out))))
     (or out
 	;; Return a dummy value.
 	(list "~/News/this.file.does.not.exist.SCORE"))))
-
+       
 (defun gnus-score-file-regexp ()
   "Return a regexp that match all score files."
   (concat "\\(" (regexp-quote gnus-score-file-suffix )
 	  "\\|" (regexp-quote gnus-adaptive-file-suffix) "\\)\\'"))
-
+	
 (defun gnus-score-find-bnews (group)
   "Return a list of score files for GROUP.
 The score files are those files in the ~/News/ directory which matches
 GROUP using BNews sys file syntax."
   (let* ((sfiles (append (gnus-score-score-files group)
 			 gnus-internal-global-score-files))
-	 (kill-dir (file-name-as-directory
+	 (kill-dir (file-name-as-directory 
 		    (expand-file-name gnus-kill-files-directory)))
 	 (klen (length kill-dir))
 	 (score-regexp (gnus-score-file-regexp))
@@ -2413,14 +2067,14 @@
       (set-buffer (get-buffer-create "*gnus score files*"))
       (buffer-disable-undo (current-buffer))
       ;; Go through all score file names and create regexp with them
-      ;; as the source.
+      ;; as the source.  
       (while sfiles
 	(erase-buffer)
 	(insert (car sfiles))
 	(goto-char (point-min))
 	;; First remove the suffix itself.
 	(when (re-search-forward (concat "." score-regexp) nil t)
-	  (replace-match "" t t)
+	  (replace-match "" t t) 
 	  (goto-char (point-min))
 	  (if (looking-at (regexp-quote kill-dir))
 	      ;; If the file name was just "SCORE", `klen' is one character
@@ -2435,16 +2089,17 @@
 			 "[/:" (if trans (char-to-string trans) "") "]")))
 	    (while (re-search-forward regexp nil t)
 	      (replace-match "." t t)))
-	  ;; Kludge to get rid of "nntp+" problems.
+	  ;; Cludge to get rid of "nntp+" problems.
 	  (goto-char (point-min))
-	  (when (looking-at "nn[a-z]+\\+")
-	    (search-forward "+")
-	    (forward-char -1)
-	    (insert "\\")
-	    (forward-char 1))
+	  (and (looking-at "nn[a-z]+\\+")
+	       (progn
+		 (search-forward "+")
+		 (forward-char -1)
+		 (insert "\\")))
 	  ;; Kludge to deal with "++".
-	  (while (search-forward "+" nil t)
-	    (replace-match "\\+" t t))
+	  (goto-char (point-min))
+	  (while (search-forward "++" nil t)
+	    (replace-match "\\+\\+" t t))
 	  ;; Translate "all" to ".*".
 	  (goto-char (point-min))
 	  (while (search-forward "all" nil t)
@@ -2454,26 +2109,26 @@
 	  (if (looking-at "not.")
 	      (progn
 		(setq not-match t)
-		(setq regexp (concat "^" (buffer-substring 5 (point-max)))))
-	    (setq regexp (concat "^" (buffer-substring 1 (point-max))))
+		(setq regexp (buffer-substring 5 (point-max))))
+	    (setq regexp (buffer-substring 1 (point-max)))
 	    (setq not-match nil))
 	  ;; Finally - if this resulting regexp matches the group name,
 	  ;; we add this score file to the list of score files
 	  ;; applicable to this group.
-	  (when (or (and not-match
-			 (not (string-match regexp group)))
-		    (and (not not-match)
-			 (string-match regexp group)))
-	    (push (car sfiles) ofiles)))
+	  (if (or (and not-match
+		       (not (string-match regexp group)))
+		  (and (not not-match)
+		       (string-match regexp group)))
+	      (setq ofiles (cons (car sfiles) ofiles))))
 	(setq sfiles (cdr sfiles)))
       (kill-buffer (current-buffer))
       ;; Slight kludge here - the last score file returned should be
-      ;; the local score file, whether it exists or not.  This is so
+      ;; the local score file, whether it exists or not. This is so
       ;; that any score commands the user enters will go to the right
       ;; file, and not end up in some global score file.
       (let ((localscore (gnus-score-file-name group)))
 	(setq ofiles (cons localscore (delete localscore ofiles))))
-      (gnus-sort-score-files (nreverse ofiles)))))
+      (nreverse ofiles))))
 
 (defun gnus-score-find-single (group)
   "Return list containing the score file for GROUP."
@@ -2484,61 +2139,17 @@
 (defun gnus-score-find-hierarchical (group)
   "Return list of score files for GROUP.
 This includes the score file for the group and all its parents."
-  (let* ((prefix (gnus-group-real-prefix group))
-	 (all (list nil))
-	 (group (gnus-group-real-name group))
-	 (start 0))
+  (let ((all (copy-sequence '(nil)))
+	(start 0))
     (while (string-match "\\." group (1+ start))
       (setq start (match-beginning 0))
-      (push (substring group 0 start) all))
-    (push group all)
-    (setq all
-	  (nconc
-	   (mapcar (lambda (group)
-		     (gnus-score-file-name group gnus-adaptive-file-suffix))
-		   (setq all (nreverse all)))
-	   (mapcar 'gnus-score-file-name all)))
-    (if (equal prefix "")
-	all
-      (mapcar
-       (lambda (file)
-	 (concat (file-name-directory file) prefix
-		 (file-name-nondirectory file)))
-       all))))
-
-(defun gnus-score-file-rank (file)
-  "Return a number that says how specific score FILE is.
-Destroys the current buffer."
-  (if (member file gnus-internal-global-score-files)
-      0
-    (when (string-match
-	   (concat "^" (regexp-quote
-			(expand-file-name
-			 (file-name-as-directory gnus-kill-files-directory))))
-	   file)
-      (setq file (substring file (match-end 0))))
-    (insert file)
-    (goto-char (point-min))
-    (let ((beg (point))
-	  elems)
-      (while (re-search-forward "[./]" nil t)
-	(push (buffer-substring beg (1- (point)))
-	      elems))
-      (erase-buffer)
-      (setq elems (delete "all" elems))
-      (length elems))))
-
-(defun gnus-sort-score-files (files)
-  "Sort FILES so that the most general files come first."
-  (nnheader-temp-write nil
-    (let ((alist
-	   (mapcar
-	    (lambda (file)
-	      (cons (inline (gnus-score-file-rank file)) file))
-	    files)))
-      (mapcar
-       (lambda (f) (cdr f))
-       (sort alist (lambda (f1 f2) (< (car f1) (car f2))))))))
+      (setq all (cons (substring group 0 start) all)))
+    (setq all (cons group all))
+    (nconc
+     (mapcar (lambda (newsgroup)
+	       (gnus-score-file-name newsgroup gnus-adaptive-file-suffix))
+	     (setq all (nreverse all)))
+     (mapcar 'gnus-score-file-name all))))
 
 (defun gnus-score-find-alist (group)
   "Return list of score files for GROUP.
@@ -2550,86 +2161,51 @@
 	(cdr score-files)		;ensures caching groups with no matches
       ;; handle the multiple match alist
       (while alist
-	(when (string-match (caar alist) group)
-	  (setq score-files
-		(nconc score-files (copy-sequence (cdar alist)))))
+	(and (string-match (caar alist) group)
+	     (setq score-files
+		   (nconc score-files (copy-sequence (cdar alist)))))
 	(setq alist (cdr alist)))
       (setq alist gnus-score-file-single-match-alist)
       ;; handle the single match alist
       (while alist
-	(when (string-match (caar 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
-	  (setq score-files
-		(nconc score-files (copy-sequence (cdar alist))))
-	  (setq alist nil))
+	(and (string-match (caar 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 (cdar alist))))
+	       (setq alist nil)))
 	(setq alist (cdr alist)))
       ;; cache the score files
-      (push (cons group score-files) gnus-score-file-alist-cache)
+      (setq gnus-score-file-alist-cache
+	    (cons (cons group score-files) gnus-score-file-alist-cache))
       score-files)))
 
-(defun gnus-all-score-files (&optional group)
-  "Return a list of all score files for the current group."
+(defun gnus-possibly-score-headers (&optional trace)
   (let ((funcs gnus-score-find-score-files-function)
-	(group (or group gnus-newsgroup-name))
 	score-files)
     ;; Make sure funcs is a list.
     (and funcs
 	 (not (listp funcs))
 	 (setq funcs (list funcs)))
     ;; Get the initial score files for this group.
-    (when funcs
-      (setq score-files (nreverse (gnus-score-find-alist group))))
-    ;; Add any home adapt files.
-    (let ((home (gnus-home-score-file group t)))
-      (when home
-	(push home score-files)
-	(setq gnus-newsgroup-adaptive-score-file home)))
-    ;; Check whether there is a `adapt-file' group parameter.
-    (let ((param-file (gnus-group-find-parameter group 'adapt-file)))
-      (when param-file
-	(push param-file score-files)
-	(setq gnus-newsgroup-adaptive-score-file param-file)))
+    (when funcs 
+      (setq score-files (gnus-score-find-alist gnus-newsgroup-name)))
     ;; Go through all the functions for finding score files (or actual
     ;; scores) and add them to a list.
     (while funcs
       (when (gnus-functionp (car funcs))
-	(setq score-files
-	      (nconc score-files (nreverse (funcall (car funcs) group)))))
+	(setq score-files 
+	      (nconc score-files (funcall (car funcs) gnus-newsgroup-name))))
       (setq funcs (cdr funcs)))
-    ;; Add any home score files.
-    (let ((home (gnus-home-score-file group)))
-      (when home
-	(push home score-files)))
     ;; Check whether there is a `score-file' group parameter.
-    (let ((param-file (gnus-group-find-parameter group 'score-file)))
+    (let ((param-file (gnus-group-get-parameter 
+		       gnus-newsgroup-name 'score-file)))
       (when param-file
 	(push param-file score-files)))
-    ;; Expand all files names.
-    (let ((files score-files))
-      (while files
-	(when (stringp (car files))
-	  (setcar files (expand-file-name
-			 (car files) gnus-kill-files-directory)))
-	(pop files)))
-    (setq score-files (nreverse score-files))
-    ;; Remove any duplicate score files.
-    (while (and score-files
-		(member (car score-files) (cdr score-files)))
-      (pop score-files))
-    (let ((files score-files))
-      (while (cdr files)
- 	(if (member (cadr files) (cddr files))
- 	    (setcdr files (cddr files))
- 	  (pop files))))
     ;; Do the scoring if there are any score files for this group.
-    score-files))
-
-(defun gnus-possibly-score-headers (&optional trace)
-  "Do scoring if scoring is required."
-  (let ((score-files (gnus-all-score-files)))
     (when score-files
       (gnus-score-headers score-files trace))))
 
@@ -2641,7 +2217,7 @@
       ((or (null newsgroup)
 	   (string-equal newsgroup ""))
        ;; The global score file is placed at top of the directory.
-       (expand-file-name
+       (expand-file-name 
 	suffix gnus-kill-files-directory))
       ((gnus-use-long-file-name 'not-score)
        ;; Append ".SCORE" to newsgroup name.
@@ -2662,10 +2238,10 @@
   (let (out)
     (while files
       (if (string-match "/$" (car files))
-	  (setq out (nconc (directory-files
+	  (setq out (nconc (directory-files 
 			    (car files) t
 			    (concat (gnus-score-file-regexp) "$"))))
-	(push (car files) out))
+	(setq out (cons (car files) out)))
       (setq files (cdr files)))
     (setq gnus-internal-global-score-files out)))
 
@@ -2677,83 +2253,6 @@
       (gnus-message 1 "New score file entries will be case insensitive.")
     (gnus-message 1 "New score file entries will be case sensitive.")))
 
-;;; Home score file.
-
-(defun gnus-home-score-file (group &optional adapt)
-  "Return the home score file for GROUP.
-If ADAPT, return the home adaptive file instead."
-  (let ((list (if adapt gnus-home-adapt-file gnus-home-score-file))
-	elem found)
-    ;; Make sure we have a list.
-    (unless (listp list)
-      (setq list (list list)))
-    ;; Go through the list and look for matches.
-    (while (and (not found)
-		(setq elem (pop list)))
-      (setq found
-	    (cond
-	     ;; Simple string.
-	     ((stringp elem)
-	      elem)
-	     ;; Function.
-	     ((gnus-functionp elem)
-	      (funcall elem group))
-	     ;; Regexp-file cons
-	     ((consp elem)
-	      (when (string-match (car elem) group)
-		(cadr elem))))))
-    (when found
-      (nnheader-concat gnus-kill-files-directory found))))
-
-(defun gnus-hierarchial-home-score-file (group)
-  "Return the score file of the top-level hierarchy of GROUP."
-  (if (string-match "^[^.]+\\." group)
-      (concat (match-string 0 group) gnus-score-file-suffix)
-    ;; Group name without any dots.
-    (concat group (if (gnus-use-long-file-name 'not-score) "." "/")
-	    gnus-score-file-suffix)))
-
-(defun gnus-hierarchial-home-adapt-file (group)
-  "Return the adapt file of the top-level hierarchy of GROUP."
-  (if (string-match "^[^.]+\\." group)
-      (concat (match-string 0 group) gnus-adaptive-file-suffix)
-    ;; Group name without any dots.
-    (concat group (if (gnus-use-long-file-name 'not-score) "." "/")
-	    gnus-adaptive-file-suffix)))
-
-;;;
-;;; Score decays
-;;;
-
-(defun gnus-decay-score (score)
-  "Decay SCORE."
-  (floor
-   (- score
-      (* (if (< score 0) 1 -1)
-	 (min score
-	      (max gnus-score-decay-constant
-		   (* (abs score)
-		      gnus-score-decay-scale)))))))
-
-(defun gnus-decay-scores (alist day)
-  "Decay non-permanent scores in ALIST."
-  (let ((times (- (gnus-time-to-day (current-time)) day))
-	kill entry updated score n)
-    (unless (zerop times)		;Done decays today already?
-      (while (setq entry (pop alist))
-	(when (stringp (car entry))
-	  (setq entry (cdr entry))
-	  (while (setq kill (pop entry))
-	    (when (nth 2 kill)
-	      (setq updated t)
-	      (setq score (or (car kill) gnus-score-interactive-default-score)
-		    n times)
-	      (while (natnump (decf n))
-		(setq score (funcall gnus-decay-score-function score)))
-	      (setcar kill score))))))
-    ;; Return whether this score file needs to be saved.  By Je-haysuss!
-    updated))
-
 (provide 'gnus-score)
 
 ;;; gnus-score.el ends here