From 9516b9f4f62772fa6f2025b6afc15ca9d2dc21c1 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Tue, 25 Oct 2005 23:34:40 +0000 Subject: [PATCH] Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-621 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 147-148) - Update from CVS 2005-10-25 Reiner Steib * lisp/gnus/gnus-score.el (gnus-default-adaptive-score-alist): Set defaults depending on gnus-score-decay-constant. 2005-10-25 Lars Magne Ingebrigtsen * lisp/gnus/nnslashdot.el (nnslashdot-request-article) (nnslashdot-retrieve-headers-1): Update to new HTML. 2005-10-23 Simon Josefsson * lisp/gnus/imap.el (imap-gssapi-program): Align command line parameters with latest GNU SASL. (imap-gssapi-open): Ignore 'Trying ...' messages from GNU SASL. --- lisp/gnus/ChangeLog | 16 +++++++++++++ lisp/gnus/gnus-score.el | 21 +++++++++++----- lisp/gnus/imap.el | 7 ++++-- lisp/gnus/nnslashdot.el | 53 ++++++++++++++++------------------------- 4 files changed, 56 insertions(+), 41 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 6f67d320f28..d6d4d99a853 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -12,6 +12,22 @@ * gnus-sum.el (gnus-ignored-from-addresses): Handle case where user-mail-name is an empty string. +2005-10-25 Reiner Steib + + * gnus-score.el (gnus-default-adaptive-score-alist): Set defaults + depending on gnus-score-decay-constant. + +2005-10-25 Lars Magne Ingebrigtsen + + * nnslashdot.el (nnslashdot-request-article) + (nnslashdot-retrieve-headers-1): Update to new HTML. + +2005-10-23 Simon Josefsson + + * imap.el (imap-gssapi-program): Align command line parameters + with latest GNU SASL. + (imap-gssapi-open): Ignore 'Trying ...' messages from GNU SASL. + 2005-10-20 Hiroshi Fujishima (tiny change) * mail-source.el (mail-source-fetch-pop): Require pop3. diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el index 22a579c3d69..2858ecb8343 100644 --- a/lisp/gnus/gnus-score.el +++ b/lisp/gnus/gnus-score.el @@ -221,13 +221,22 @@ This variable allows the same syntax as `gnus-home-score-file'." (function :value fun))) (defcustom gnus-default-adaptive-score-alist - '((gnus-kill-file-mark) + `((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." + (gnus-read-mark + (from , (+ 2 gnus-score-decay-constant)) + (subject , (+ 27 gnus-score-decay-constant))) + (gnus-catchup-mark + (subject , (+ -7 (* -1 gnus-score-decay-constant)))) + (gnus-killed-mark + (from , (- -1 gnus-score-decay-constant)) + (subject , (+ -17 (* -1 gnus-score-decay-constant)))) + (gnus-del-mark + (from , (- -1 gnus-score-decay-constant)) + (subject , (+ -12 (* -1 gnus-score-decay-constant))))) + "Alist of marks and scores. +If you use score decays, you might want to set values higher than +`gnus-score-decay-constant'." :group 'gnus-score-adapt :type '(repeat (cons (symbol :tag "Mark") (repeat (list (choice :tag "Header" diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el index 062f1be4c94..b66d9eded8a 100644 --- a/lisp/gnus/imap.el +++ b/lisp/gnus/imap.el @@ -182,8 +182,7 @@ the list is tried until a successful connection is made." :type '(repeat string)) (defcustom imap-gssapi-program (list - (concat "gsasl --client --connect %s:%p " - "--imap --application-data " + (concat "gsasl %s %p " "--mechanism GSSAPI " "--authentication-id %l") "imtest -m gssapi -u %l -p %p %s") @@ -600,6 +599,10 @@ sure of changing the value of `foo'." (or (not (looking-at "S: ")) (forward-char 3) t) + ;; GNU SASL may print 'Trying ...' first. + (or (not (looking-at "Trying ")) + (forward-line) + t) (not (and (imap-parse-greeting) ;; success in imtest 1.6: (re-search-forward diff --git a/lisp/gnus/nnslashdot.el b/lisp/gnus/nnslashdot.el index 9350a284e3d..522f94acabc 100644 --- a/lisp/gnus/nnslashdot.el +++ b/lisp/gnus/nnslashdot.el @@ -87,7 +87,7 @@ (nnslashdot-possibly-change-server group server) (condition-case why (unless gnus-nov-is-evil - (nnslashdot-retrieve-headers-1 articles group)) + (nnslashdot-retrieve-headers-1 articles group)) (search-failed (nnslashdot-lose why)))) (deffoo nnslashdot-retrieve-headers-1 (articles group) @@ -142,41 +142,30 @@ (setq article (if (and article (< start article)) article start)) (goto-char point) (while (re-search-forward - "<\\(b\\|H4\\)>\\([^<]+\\).*score:\\([^)]+\\))" + "\\([^<]+\\).*\n.*score:\\([^)]+\\))" nil t) (setq cid (match-string 1) - subject (match-string 3) - score (match-string 5)) + subject (match-string 2) + score (match-string 3)) (unless (assq article (nth 4 entry)) (setcar (nthcdr 4 entry) (cons (cons article cid) (nth 4 entry))) (setq changed t)) (when (string-match "^Re: *" subject) (setq subject (concat "Re: " (substring subject (match-end 0))))) - (setq subject (mm-url-decode-entities-string subject)) - (search-forward "
") - (cond - ((looking-at - "by[ \t\n]+]+>\\([^<]+\\)[ \t\n]*(\\(<[^>]+>\\)*\\([^<>)]+\\))") - (goto-char (- (match-end 0) 5)) - (setq from (concat - (mm-url-decode-entities-string (match-string 1)) - " <" (match-string 3) ">"))) - ((looking-at "by[ \t\n]+]+>\\([^<(]+\\) (\\([0-9]+\\))") - (goto-char (- (match-end 0) 5)) - (setq from (concat - (mm-url-decode-entities-string (match-string 1)) - " <" (match-string 2) ">"))) - ((looking-at "by \\([^<>]*\\)[\t\n\r ]+on ") - (goto-char (- (match-end 0) 5)) - (setq from (mm-url-decode-entities-string (match-string 1)))) - (t - (setq from ""))) + (setq subject (mm-url-decode-entities-string subject) + from "") + (when (re-search-forward "by[ \t\n]+<[^>]+>\\([^<(]+\\)" nil t) + (setq from + (concat + (mm-url-decode-entities-string (match-string 1)) + " "))) (search-forward "on ") (setq date (nnslashdot-date-to-date - (buffer-substring (point) (progn (skip-chars-forward "^()<>\n\r") (point))))) - (setq lines (/ (abs (- (search-forward ""))) + (buffer-substring + (point) (progn (skip-chars-forward "^()<>\n\r") (point))))) + (setq lines (/ (abs (- (search-forward ""))) 70)) (if (not (re-search-forward ".*cid=\\([0-9]+\\)\">Parent" nil t)) @@ -255,23 +244,21 @@ (when (numberp article) (if (= article 1) (progn - (re-search-forward - "Posted by") - (search-forward "
") + (search-forward "Posted by") + (search-forward "
") (setq contents (buffer-substring (point) (progn - (re-search-forward - "\\|\\|< [ \t\r\n]*" cid)) (setq contents (buffer-substring - (re-search-forward "]*>") - (search-forward ""))))))) + (search-forward "
") + (search-forward "
"))))))) (search-failed (nnslashdot-lose why))) (when contents -- 2.39.5