;;; Code:
-(require 'gnus-load)
+(require 'gnus)
(require 'gnus-sum)
(require 'gnus-range)
-(defvar gnus-global-score-files nil
- "*List of global score files and directories.
+(defcustom 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.
(setq gnus-global-score-files
'(\"/ftp.ifi.uio.no:/pub/larsi/ding/score/soc.motss.SCORE\"
- \"/ftp.some-where:/pub/score\"))")
+ \"/ftp.some-where:/pub/score\"))"
+ :group 'gnus-score
+ :type '(repeat file))
-(defvar gnus-score-file-single-match-alist nil
- "*Alist mapping regexps to lists of score files.
+(defcustom 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\" ] ... )
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).")
+gnus-score-find-score-files-function (which see)."
+ :group 'gnus-score
+ :type '(repeat (cons regexp (repeat file))))
-(defvar gnus-score-file-multiple-match-alist nil
- "*Alist mapping regexps to lists of score files.
+(defcustom 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\" ] ... )
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).")
-
-(defvar gnus-score-file-suffix "SCORE"
- "*Suffix of the score files.")
-
-(defvar gnus-adaptive-file-suffix "ADAPT"
- "*Suffix of the adaptive score files.")
-
-(defvar gnus-score-find-score-files-function 'gnus-score-find-bnews
- "*Function used to find score files.
+gnus-score-find-score-files-function (which see)."
+ :group 'gnus-score
+ :type '(repeat (cons regexp (repeat file))))
+
+(defcustom gnus-score-file-suffix "SCORE"
+ "Suffix of the score files."
+ :group 'gnus-score
+ :type 'string)
+
+(defcustom gnus-adaptive-file-suffix "ADAPT"
+ "Suffix of the adaptive score files."
+ :group 'gnus-score
+ :type 'string)
+
+(defcustom 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.
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.")
-
-(defvar gnus-score-interactive-default-score 1000
- "*Scoring commands will raise/lower the score with this number as the default.")
-
-(defvar gnus-score-expiry-days 7
+score alists."
+ :group 'gnus-score
+ :type '(radio (function-item gnus-score-find-single)
+ (function-item gnus-score-find-hierarchical)
+ (function-item gnus-score-find-bnews)
+ (function :tag "Other")))
+
+(defcustom gnus-score-interactive-default-score 1000
+ "*Scoring commands will raise/lower the score with this number as the default."
+ :group 'gnus-score
+ :type 'integer)
+
+(defcustom 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.")
+If this variable is nil, no score file entries will be expired."
+ :group 'gnus-score
+ :type '(choice (const :tag "never" nil)
+ number))
-(defvar gnus-update-score-entry-dates t
+(defcustom 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.")
+will be expired along with non-matching score entries."
+ :group 'gnus-score
+ :type 'boolean)
-(defvar gnus-orphan-score nil
- "*All orphans get this score added. Set in the score file.")
+(defcustom gnus-orphan-score nil
+ "*All orphans get this score added. Set in the score file."
+ :group 'gnus-score
+ :type 'integer)
-(defvar gnus-decay-scores nil
- "*If non-nil, decay non-permanent scores.")
+(defcustom gnus-decay-scores nil
+ "*If non-nil, decay non-permanent scores."
+ :group 'gnus-score
+ :type 'boolean)
-(defvar gnus-decay-score-function 'gnus-decay-score
+(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.")
-
-(defvar gnus-score-decay-constant 3
- "*Decay all \"small\" scores with this amount.")
-
-(defvar gnus-score-decay-scale .05
- "*Decay all \"big\" scores with this factor.")
-
-(defvar gnus-home-score-file nil
- "Variable to control where interative score entries are to go.
+It is called with one parameter -- the score to be decayed."
+ :group 'gnus-score
+ :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
+ :type 'integer)
+
+(defcustom gnus-score-decay-scale .05
+ "*Decay all \"big\" scores with this factor."
+ :group 'gnus-score
+ :type 'number)
+
+(defcustom gnus-home-score-file nil
+ "Variable to control where interactive score entries are to go.
It can be:
* A string
* 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:
* A function.
If the function returns non-nil, the result will be used
- as the home score file.
+ 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.
+ * A string. Use the string as the home score file.
The list will be traversed from the beginning towards the end looking
- for matches.")
-
-(defvar gnus-home-adapt-file nil
+ for matches."
+ :group 'gnus-score
+ :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'.")
-
-(defvar gnus-default-adaptive-score-alist
+This variable allows the same syntax as `gnus-home-score-file'."
+ :group 'gnus-score
+ :type '(choice string
+ (repeat (choice string
+ (cons regexp (repeat file))
+ function))
+ function))
+
+(defcustom gnus-default-adaptive-score-alist
'((gnus-kill-file-mark)
(gnus-unread-mark)
(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.")
-
-(defvar gnus-ignored-adaptive-words nil
- "*List of words to be ignored when doing adaptive word scoring.")
-
-(defvar gnus-default-ignored-adaptive-words
+"Alist of marks and scores."
+:group 'gnus-score
+: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
+ :type '(repeat string))
+
+(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"
"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.")
+ "try" "re")
+ "Default list of words to be ignored when doing adaptive word scoring."
+ :group 'gnus-score
+ :type '(repeat string))
-(defvar gnus-default-adaptive-word-score-alist
+(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.")
+"Alist of marks and scores."
+:group 'gnus-score
+:type '(repeat (cons (character :tag "Mark")
+ (integer :tag "Score"))))
-(defvar gnus-score-mimic-keymap nil
- "*Have the score entry functions pretend that they are a keymap.")
+(defcustom gnus-score-mimic-keymap nil
+ "*Have the score entry functions pretend that they are a keymap."
+ :group 'gnus-score
+ :type 'boolean)
-(defvar gnus-score-exact-adapt-limit 10
+(defcustom 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.")
+If this variable is nil, exact matching will always be used."
+ :group 'gnus-score
+ :type '(choice (const nil) integer))
-(defvar gnus-score-uncacheable-files "ADAPT$"
- "*All score files that match this regexp will not be cached.")
+(defcustom gnus-score-uncacheable-files "ADAPT$"
+ "All score files that match this regexp will not be cached."
+ :group 'gnus-score
+ :type 'regexp)
-(defvar gnus-score-default-header nil
+(defcustom gnus-score-default-header nil
"Default header when entering new scores.
Should be one of the following symbols.
d: date
f: followup
-If nil, the user will be asked for a header.")
-
-(defvar gnus-score-default-type nil
+If nil, the user will be asked for a header."
+ :group 'gnus-score
+ :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)))
+
+(defcustom gnus-score-default-type nil
"Default match type when entering new scores.
Should be one of the following symbols.
>: greater than number
=: equal to number
-If nil, the user will be asked for a match type.")
-
-(defvar gnus-score-default-fold nil
- "Use case folding for new score file entries iff not nil.")
-
-(defvar gnus-score-default-duration nil
+If nil, the user will be asked for a match type."
+ :group 'gnus-score
+ :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" =)))
+
+(defcustom gnus-score-default-fold nil
+ "Use case folding for new score file entries iff not nil."
+ :group 'gnus-score
+ :type 'boolean)
+
+(defcustom gnus-score-default-duration nil
"Default duration of effect when entering new scores.
Should be one of the following symbols.
p: permanent
i: immediate
-If nil, the user will be asked for a duration.")
+If nil, the user will be asked for a duration."
+ :group 'gnus-score
+ :type '(choice (const :tag "temporary" t)
+ (const :tag "permanent" p)
+ (const :tag "immediate" i)))
-(defvar gnus-score-after-write-file-function nil
- "*Function called with the name of the score file just written to disk.")
+(defcustom gnus-score-after-write-file-function nil
+ "Function called with the name of the score file just written to disk."
+ :group 'gnus-score
+ :type 'function)
\f
(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-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)
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
("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)
("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)
"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
"f" gnus-score-edit-file
"F" gnus-score-flush-cache
"t" gnus-score-find-trace
- "w" gnus-score-find-favourite-words
- "C" gnus-score-customize)
+ "w" gnus-score-find-favourite-words)
;; Summary score file commands
(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*")
- (and gnus-score-help-winconf
- (set-window-configuration gnus-score-help-winconf))))
+ (when 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.
(?f f "fuzzy string" string)
(?r r "regexp string" string)
(?z s "substring" body-string)
- (?p s "regexp string" body-string)
+ (?p r "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
(if mimic (error "%c %c" prefix hchar) (error "")))
(when (/= (downcase hchar) hchar)
- ;; This was a majuscle, so we end reading and set the defaults.
+ ;; This was a majuscule, 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)))
(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))
""))
(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)
(if mimic (error "%c %c" prefix hchar) (error "")))
(when (/= (downcase tchar) tchar)
- ;; It was a majuscle, so we end reading and use the default.
+ ;; It was a majuscule, so we end reading and use the default.
(if mimic (message "%c %c %c" prefix hchar tchar)
(message ""))
(setq pchar (or pchar ?p)))
(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
(error "%c %c %c %c" prefix hchar tchar pchar)
(error ""))))
(nth 1 entry) ; Header
match ; Match
type ; Type
- (if (eq 's score) nil score) ; Score
- (if (eq 'perm temporary) ; Temp
+ (if (eq score 's) nil score) ; Score
+ (if (eq temporary 'perm) ; Temp
nil
- temporary)
+ temporary)
(not (nth 3 entry))) ; Prompt
))
;; find the longest string to display
(while list
(setq n (length (nth idx (car list))))
- (or (> max n)
- (setq max n))
+ (unless (> 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'
(while alist
(current-time-string))
(t nil))))
;; Regexp is the default type.
- (if (eq type t) (setq type 'r))
+ (when (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) "")))
(setq match (format "%s" 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)))
+ (when (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
(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)))
(y-or-n-p "Use regexp match? ")
(prefix-numeric-value current-prefix-arg)))
(save-excursion
- (or (and (stringp match) (> (length match) 0))
- (error "No match"))
+ (unless (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) "\\'"))
(let ((content (gnus-summary-header header 'noerr))
(case-fold-search t))
(and content
- (if (if (eq type 'f)
- (string-equal (gnus-simplify-subject-fuzzy content)
- regexp)
- (string-match regexp content))
- (gnus-summary-raise-score score))))
+ (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)))))
(defun gnus-summary-score-crossposting (score date)
(let ((xref (gnus-summary-header "xref"))
(start 0)
group)
- (or xref (error "This article is not crossposted"))
+ (unless xref
+ (error "This article is not crossposted"))
(while (string-match " \\([^ \t]+\\):" xref start)
(setq start (match-end 0))
- (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)))))
+ (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)))))
\f
;;;
"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)
(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)
- (setq gnus-newsgroup-scored
- (cons (cons article n) gnus-newsgroup-scored))))
+ (push (cons article n) gnus-newsgroup-scored)))
(gnus-summary-update-line)))
(defun gnus-summary-current-score ()
"Edit the current score alist."
(interactive (list gnus-current-score-file))
(let ((winconf (current-window-configuration)))
- (and (buffer-name gnus-summary-buffer) (gnus-score-save))
- (make-directory (file-name-directory file) t)
+ (when (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)
(gnus-score-mode)
"Edit a score file."
(interactive
(list (read-file-name "Edit score file: " gnus-kill-files-directory)))
- (make-directory (file-name-directory file) t)
- (and (buffer-name gnus-summary-buffer) (gnus-score-save))
+ (gnus-make-directory (file-name-directory file))
+ (when (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)
(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)
(setq alist (gnus-score-load-score-alist file))
;; We add '(touched) to the alist to signify that it hasn't been
;; touched (yet).
- (or (assq 'touched alist) (setq alist (cons (list 'touched nil) alist)))
+ (unless (assq 'touched alist)
+ (push (list 'touched nil) alist))
;; If it is a global score file, we make it read-only.
(and global
(not (assq 'read-only alist))
- (setq alist (cons (list 'read-only t) alist)))
- (setq gnus-score-cache
- (cons (cons file alist) gnus-score-cache)))
+ (push (list 'read-only t) alist))
+ (push (cons file alist) gnus-score-cache))
(let ((a alist)
found)
(while a
(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))
(setq gnus-scores-exclude-files
(nconc
(mapcar
- (lambda (sfile)
+ (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
(make-local-variable (caar local))
(set (caar local) (nth 1 (car local)))))
(setq local (cdr local)))))
- (if orphan (setq gnus-orphan-score orphan))
+ (when orphan
+ (setq gnus-orphan-score orphan))
(setq gnus-adaptive-score-alist
(cond ((equal adapt '(t))
(setq gnus-newsgroup-adaptive t)
(setq gnus-score-alist (cdr cache))
(setq gnus-score-alist nil)
(gnus-score-load-score-alist file)
- (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)))))
+ (unless gnus-score-alist
+ (setq gnus-score-alist (copy-alist '((touched nil)))))
+ (push (cons file gnus-score-alist) gnus-score-cache))))
(defun gnus-score-remove-from-cache (file)
(setq gnus-score-cache
(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)
- (if (eq (car alist) 'quote)
- (setq alist (nth 1 alist)))
+ (when (eq (car alist) 'quote)
+ (setq alist (nth 1 alist)))
(while alist
(setq entry (car alist))
(if (stringp (car entry))
(let ((scor (cdr entry)))
- (setq out (cons entry out))
+ (push entry out)
(while scor
(setcar scor
(list (caar scor) (nth 2 (car scor))
(gnus-day-number (nth 3 (car scor))))
(if (nth 1 (car scor)) 'r 's)))
(setq scor (cdr scor))))
- (setq out (cons (if (not (listp (cdr entry)))
- (list (car entry) (cdr entry))
- entry)
- out)))
+ (push (if (not (listp (cdr entry)))
+ (list (car entry) (cdr entry))
+ entry)
+ out))
(setq alist (cdr alist)))
(cons (list 'touched t) (nreverse out))))
entry score file)
(save-excursion
(setq gnus-score-alist nil)
- (nnheader-set-temp-buffer "*Score*")
+ (nnheader-set-temp-buffer " *Gnus Scores*")
(while cache
(current-buffer)
(setq entry (pop cache)
(let (emacs-lisp-mode-hook)
(if (string-match
(concat (regexp-quote gnus-adaptive-file-suffix)
- "$") file)
+ "$")
+ 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.
;; This is a normal score file, so we print it very
;; prettily.
(pp score (current-buffer))))
- (if (and (not (file-exists-p (file-name-directory file)))
- (make-directory (file-name-directory file) t))
- (gnus-error 1 "Can't create directory %s"
- (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)
- (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))))
+ (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)))
(kill-buffer (current-buffer)))))
(defun gnus-score-load-files (score-files)
;; 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).
- (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))))
+ (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))))
(save-excursion
(set-buffer (get-buffer-create "*Headers*"))
this (aref (car art) index)
tref (aref (car art) refind)
articles (cdr articles))
- (if (string-equal tref "") ;no references line
- (setq id-list (cons this id-list))))
+ (when (string-equal tref "") ;no references line
+ (push this id-list)))
id-list))
;; Orphan functions written by plm@atcmp.nl (Peter Mutsaers).
this (aref (car art) gnus-score-index)
articles (cdr articles))
;;completely skip if this is empty (not a child, so not an orphan)
- (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)))
+ (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))
;; PLM: now delete those lines that contain an entry from new-thread-ids
(while new-thread-ids
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)))
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) '>))
;; time than one would gain.
(while articles
(when (funcall match-func
- (or (aref (caar articles) gnus-score-index) 0)
- match)
+ (or (aref (caar articles) gnus-score-index) 0)
+ match)
(when trace
(push (cons (car-safe (rassq alist gnus-score-cache)) kill)
gnus-score-trace))
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))
(type (or (nth 3 kill) 'before))
(score (or (nth 1 kill) gnus-score-interactive-default-score))
((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)))
(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)
;; 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.
- (if ofunc
- (if (eq ofunc 'gnus-request-head)
- (narrow-to-region
- (point)
- (or (search-forward "\n\n" nil t) (point-max)))
+ (when ofunc
+ (if (eq ofunc 'gnus-request-head)
(narrow-to-region
- (or (search-forward "\n\n" nil t) (point))
- (point-max))))
+ (point)
+ (or (search-forward "\n\n" nil t) (point-max)))
+ (narrow-to-region
+ (or (search-forward "\n\n" nil t) (point))
+ (point-max))))
(setq scores all-scores)
;; Find matches.
(while scores
- (setq alist (car scores)
- scores (cdr scores)
+ (setq alist (pop 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)
(t
(error "Illegal match type: %s" type)))))
(goto-char (point-min))
- (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)))))
+ (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)))
;; 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.
- (gnus-score-set 'touched '(t) alist)
- (setcdr entries (cdr rest))
- (setq rest entries)))
+ (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)))))
(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)))
this (aref (car art) gnus-score-index)
articles (cdr articles))
(if (equal last this)
- (setq alike (cons art alike))
- (if last
- (progn
- (insert last ?\n)
- (put-text-property (1- (point)) (point) 'articles alike)))
+ (push art alike)
+ (when last
+ (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)))
+ (when last ; Bwadr, duplicate code.
+ (insert last ?\n)
+ (put-text-property (1- (point)) (point) 'articles alike))
;; Find matches.
(while 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))
((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)))
(if (equal last this)
;; O(N*H) cons-cells used here, where H is the number of
;; headers.
- (setq alike (cons art alike))
+ (push art alike)
(when last
;; Insert the line, with a text property on the
;; terminating newline referring to the articles with
(setq alike (list art)
last this)))
(when last ; Bwadr, duplicate code.
- (insert last ?\n)
+ (insert last ?\n)
(put-text-property (1- (point)) (point) 'articles alike))
;; Go through all the score alists and pick out the entries
(cond
;; Fuzzy matches. We save these for later.
((= dmt ?f)
- (push entries fuzzies))
+ (push (cons entries alist) fuzzies))
;; Word matches. Save these for even later.
((= dmt ?w)
- (push entries words))
+ (push (cons entries alist) words))
;; Exact matches.
((= dmt ?e)
;; Do exact matching.
(goto-char (point-min))
- (while (and (not (eobp))
+ (while (and (not (eobp))
(funcall search-func match nil t))
;; Is it really exact?
(and (eolp)
(if trace
(while (setq art (pop arts))
(setcdr art (+ score (cdr art)))
- (setq gnus-score-trace
- (cons
- (cons
- (car-safe
- (rassq alist gnus-score-cache))
- kill)
- gnus-score-trace)))
+ (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)))
(when fuzzies
;; Simplify the entire buffer for easy matching.
(gnus-simplify-buffer-fuzzy)
- (while (setq kill (cadar fuzzies))
+ (while (setq kill (cadaar fuzzies))
(let* ((match (nth 0 kill))
(type (nth 3 kill))
(score (or (nth 1 kill) gnus-score-interactive-default-score))
(case-fold-search (not (= mt ?F)))
found)
(goto-char (point-min))
- (while (and (not (eobp))
+ (while (and (not (eobp))
(search-forward match nil t))
(when (and (= (gnus-point-at-bol) (match-beginning 0))
(eolp))
(while (setq art (pop arts))
(setcdr art (+ score (cdr art)))
(push (cons
- (car-safe (rassq alist gnus-score-cache)) kill)
+ (car-safe (rassq (cdar fuzzies) gnus-score-cache))
+ kill)
gnus-score-trace))
;; Found a match, update scores.
(while (setq art (pop arts))
)
;; Match, update date.
((and found gnus-update-score-entry-dates)
- (gnus-score-set 'touched '(t) alist)
+ (gnus-score-set 'touched '(t) (cdar fuzzies))
(setcar (nthcdr 2 kill) now))
;; Old entry, remove.
- ((and expire (< date expire))
- (gnus-score-set 'touched '(t) alist)
- (setcdr (car fuzzies) (cddar fuzzies))))
+ ((and expire (< date expire))
+ (gnus-score-set 'touched '(t) (cdar fuzzies))
+ (setcdr (caar fuzzies) (cddaar fuzzies))))
(setq fuzzies (cdr fuzzies)))))
(when words
(let ((hashtb (gnus-make-hashtable
(* 10 (count-lines (point-min) (point-max))))))
(gnus-enter-score-words-into-hashtb hashtb)
- (while (setq kill (cadar words))
+ (while (setq kill (cadaar words))
(let* ((score (or (nth 1 kill) gnus-score-interactive-default-score))
(date (nth 2 kill))
found)
(while (setq art (pop arts))
(setcdr art (+ score (cdr art)))
(push (cons
- (car-safe (rassq alist gnus-score-cache)) kill)
+ (car-safe (rassq (cdar words) gnus-score-cache))
+ kill)
gnus-score-trace))
;; Found a match, update scores.
(while (setq art (pop arts))
)
;; Match, update date.
((and found gnus-update-score-entry-dates)
- (gnus-score-set 'touched '(t) alist)
+ (gnus-score-set 'touched '(t) (cdar words))
(setcar (nthcdr 2 kill) now))
;; Old entry, remove.
- ((and expire (< date expire))
- (gnus-score-set 'touched '(t) alist)
- (setcdr (car words) (cddar words))))
+ ((and expire (< date expire))
+ (gnus-score-set 'touched '(t) (cdar words))
+ (setcdr (caar words) (cddaar words))))
(setq words (cdr words))))))
nil))
;; Find all the words in the buffer and enter them into
;; the hashtable.
(let ((syntab (syntax-table))
- word val)
+ word val)
(goto-char (point-min))
(unwind-protect
(progn
(or gnus-newsgroup-adaptive-score-file
(gnus-score-file-name
gnus-newsgroup-name gnus-adaptive-file-suffix))))
- (cond
- ;; Perform ordinary line scoring.
- ((or (not (listp gnus-use-adaptive-scoring))
- (memq 'line gnus-use-adaptive-scoring))
+ ;; Perform ordinary line scoring.
+ (when (or (not (listp gnus-use-adaptive-scoring))
+ (memq 'line gnus-use-adaptive-scoring))
(save-excursion
(let* ((malist (gnus-copy-sequence gnus-adaptive-score-alist))
(alist malist)
- (date (current-time-string))
+ (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))))
+ (when (symbolp (car elem))
+ (setcar elem (symbol-value (car elem))))
(setq elem (cdr elem))
(while elem
- (setcdr (car elem)
+ (setcdr (car elem)
(cons (if (eq (caar elem) 'followup)
"references"
(symbol-name (caar elem)))
(cdar elem)))
- (setcar (car elem)
+ (setcar (car elem)
`(lambda (h)
(,(intern
(concat "mail-header-"
(setq elem (cdr elem)))))
(setq data (cdr data))))))
- ;; Perform adaptive word scoring.
- ((memq 'word gnus-use-adaptive-scoring)
+ ;; Perform adaptive word scoring.
+ (when (and (listp gnus-use-adaptive-scoring)
+ (memq 'word gnus-use-adaptive-scoring))
(nnheader-temp-write nil
(let* ((hashtb (gnus-make-hashtable 1000))
(date (gnus-day-number (current-time-string)))
word d score val)
(unwind-protect
(progn
- (set-syntax-table syntab)
+ (set-syntax-table gnus-adaptive-word-syntax-table)
;; Go through all articles.
(while (setq d (pop data))
- (when (setq score
- (cdr (assq
- (gnus-data-mark d)
- gnus-default-adaptive-word-score-alist)))
+ (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.
(gnus-summary-score-entry
"subject" (symbol-name word) 'w (symbol-value word)
date nil t)))
- hashtb)))))))
+ hashtb))))))
(defun gnus-score-edit-done ()
(let ((bufnam (buffer-file-name (current-buffer)))
(winconf gnus-prev-winconf))
- (and winconf (set-window-configuration winconf))
+ (when winconf
+ (set-window-configuration winconf))
(gnus-score-remove-from-cache bufnam)
(gnus-score-load-file bufnam)))
"List words used in scoring."
(interactive)
(let ((alists (gnus-score-load-files (gnus-all-score-files)))
- alist rule rules)
+ alist rule rules kill)
;; Go through all the score alists for this group
;; and find all `w' rules.
(while (setq alist (pop alists))
- (when (and (stringp (setq rule (pop alist)))
- (equal "subject" (downcase (pop rule))))
- (while rule
- (when (memq (nth 3 (car rule)) '(w W word Word))
- (push (cons (or (nth 1 rule) gnus-score-interactive-default-score)
- (car rule))
- rules))
- (pop rule))))
+ (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.
(pop r))))
;; Insert the words.
(nnheader-set-temp-buffer "*Score Words*")
- (setq rules (sort rules (lambda (r1 r2) (> (car r1) (car r2)))))
- (while rules
- (insert (format "%-5d: %s\n" (caar rules) (cdar rules)))
- (pop rules))
- (gnus-add-current-to-buffer-list)
- (gnus-configure-windows '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))
+ (gnus-add-current-to-buffer-list)
+ (gnus-configure-windows 'score-words)
+ (goto-char (point-min)))))
(defun gnus-summary-rescore ()
"Redo the entire scoring process in the current summary."
(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)
(setq articles (cdr articles))))
(setq e (point)))
(let ((gnus-summary-check-current t))
- (or (zerop (gnus-summary-next-subject 1 t))
- (goto-char e))))
+ (unless (zerop (gnus-summary-next-subject 1 t))
+ (goto-char e))))
(gnus-summary-recenter)
(gnus-summary-position-point)
(gnus-set-mode-line 'summary))
(defun gnus-score-score-files (group)
"Return a list of all possible score files."
;; Search and set any global score files.
- (and gnus-global-score-files
- (or gnus-internal-global-score-files
- (gnus-score-search-global-directories gnus-global-score-files)))
+ (when gnus-global-score-files
+ (unless 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
(file-name-as-directory gnus-kill-files-directory))
(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
"[/:" (if trans (char-to-string trans) "") "]")))
(while (re-search-forward regexp nil t)
(replace-match "." t t)))
- ;; Cludge to get rid of "nntp+" problems.
+ ;; Kludge to get rid of "nntp+" problems.
(goto-char (point-min))
- (and (looking-at "nn[a-z]+\\+")
- (progn
- (search-forward "+")
- (forward-char -1)
- (insert "\\")))
+ (when (looking-at "nn[a-z]+\\+")
+ (progn
+ (search-forward "+")
+ (forward-char -1)
+ (insert "\\")))
;; Kludge to deal with "++".
(goto-char (point-min))
(while (search-forward "++" nil t)
(if (looking-at "not.")
(progn
(setq not-match t)
- (setq regexp (buffer-substring 5 (point-max))))
- (setq regexp (buffer-substring 1 (point-max)))
+ (setq regexp (concat "^" (buffer-substring 5 (point-max)))))
+ (setq regexp (concat "^" (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.
- (if (or (and not-match
- (not (string-match regexp group)))
- (and (not not-match)
- (string-match regexp group)))
- (setq ofiles (cons (car sfiles) ofiles))))
+ (when (or (and not-match
+ (not (string-match regexp group)))
+ (and (not not-match)
+ (string-match regexp group)))
+ (push (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))))
- (nreverse ofiles))))
+ (gnus-sort-score-files (nreverse ofiles)))))
(defun gnus-score-find-single (group)
"Return list containing the score file for GROUP."
(start 0))
(while (string-match "\\." group (1+ start))
(setq start (match-beginning 0))
- (setq all (cons (substring group 0 start) all)))
- (setq all (cons group all))
+ (push (substring group 0 start) all))
+ (push 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-file-rank (file)
+ "Return a number that says how specific score FILE is.
+Destroys the current buffer."
+ (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))))))))
+
(defun gnus-score-find-alist (group)
"Return list of score files for GROUP.
The list is determined from the variable gnus-score-file-alist."
(cdr score-files) ;ensures caching groups with no matches
;; handle the multiple match alist
(while alist
- (and (string-match (caar alist) group)
- (setq score-files
- (nconc score-files (copy-sequence (cdar alist)))))
+ (when (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
- (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)))
+ (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))
(setq alist (cdr alist)))
;; cache the score files
- (setq gnus-score-file-alist-cache
- (cons (cons group score-files) gnus-score-file-alist-cache))
+ (push (cons group score-files) gnus-score-file-alist-cache)
score-files)))
(defun gnus-all-score-files ()
(setq funcs (list funcs)))
;; Get the initial score files for this group.
(when funcs
- (setq score-files (gnus-score-find-alist group)))
+ (setq score-files (nreverse (gnus-score-find-alist group))))
;; Add any home adapt files.
(let ((home (gnus-home-score-file group t)))
(when home
(while funcs
(when (gnus-functionp (car funcs))
(setq score-files
- (nconc score-files (funcall (car funcs) group))))
+ (nconc score-files (nreverse (funcall (car funcs) group)))))
(setq funcs (cdr funcs)))
;; Add any home score files.
(let ((home (gnus-home-score-file group)))
(let ((param-file (gnus-group-find-parameter group '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)
+ (when (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))
(setq out (nconc (directory-files
(car files) t
(concat (gnus-score-file-regexp) "$"))))
- (setq out (cons (car files) out)))
+ (push (car files) out))
(setq files (cdr files)))
(setq gnus-internal-global-score-files out)))
"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?
+ (unless (zerop times) ;Done decays today already?
(while (setq entry (pop alist))
(when (stringp (car entry))
(setq entry (cdr entry))
projects / gnus / blobdiff