Commit 9516b9f4 authored by Miles Bader's avatar Miles Bader
Browse files

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  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-score.el (gnus-default-adaptive-score-alist): Set defaults
   depending on gnus-score-decay-constant.

2005-10-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>

   * lisp/gnus/nnslashdot.el (nnslashdot-request-article)
   (nnslashdot-retrieve-headers-1): Update to new HTML.

2005-10-23  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/imap.el (imap-gssapi-program): Align command line parameters
   with latest GNU SASL.
   (imap-gssapi-open): Ignore 'Trying ...' messages from GNU SASL.
parent e7b382ed
...@@ -12,6 +12,22 @@ ...@@ -12,6 +12,22 @@
* gnus-sum.el (gnus-ignored-from-addresses): Handle case where * gnus-sum.el (gnus-ignored-from-addresses): Handle case where
user-mail-name is an empty string. user-mail-name is an empty string.
2005-10-25 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-score.el (gnus-default-adaptive-score-alist): Set defaults
depending on gnus-score-decay-constant.
2005-10-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* nnslashdot.el (nnslashdot-request-article)
(nnslashdot-retrieve-headers-1): Update to new HTML.
2005-10-23 Simon Josefsson <jas@extundo.com>
* 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 <hiroshi.fujishima@gmail.com> (tiny change) 2005-10-20 Hiroshi Fujishima <hiroshi.fujishima@gmail.com> (tiny change)
* mail-source.el (mail-source-fetch-pop): Require pop3. * mail-source.el (mail-source-fetch-pop): Require pop3.
......
...@@ -221,13 +221,22 @@ This variable allows the same syntax as `gnus-home-score-file'." ...@@ -221,13 +221,22 @@ This variable allows the same syntax as `gnus-home-score-file'."
(function :value fun))) (function :value fun)))
(defcustom gnus-default-adaptive-score-alist (defcustom gnus-default-adaptive-score-alist
'((gnus-kill-file-mark) `((gnus-kill-file-mark)
(gnus-unread-mark) (gnus-unread-mark)
(gnus-read-mark (from 3) (subject 30)) (gnus-read-mark
(gnus-catchup-mark (subject -10)) (from , (+ 2 gnus-score-decay-constant))
(gnus-killed-mark (from -1) (subject -20)) (subject , (+ 27 gnus-score-decay-constant)))
(gnus-del-mark (from -2) (subject -15))) (gnus-catchup-mark
"*Alist of marks and scores." (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 :group 'gnus-score-adapt
:type '(repeat (cons (symbol :tag "Mark") :type '(repeat (cons (symbol :tag "Mark")
(repeat (list (choice :tag "Header" (repeat (list (choice :tag "Header"
......
...@@ -182,8 +182,7 @@ the list is tried until a successful connection is made." ...@@ -182,8 +182,7 @@ the list is tried until a successful connection is made."
:type '(repeat string)) :type '(repeat string))
(defcustom imap-gssapi-program (list (defcustom imap-gssapi-program (list
(concat "gsasl --client --connect %s:%p " (concat "gsasl %s %p "
"--imap --application-data "
"--mechanism GSSAPI " "--mechanism GSSAPI "
"--authentication-id %l") "--authentication-id %l")
"imtest -m gssapi -u %l -p %p %s") "imtest -m gssapi -u %l -p %p %s")
...@@ -600,6 +599,10 @@ sure of changing the value of `foo'." ...@@ -600,6 +599,10 @@ sure of changing the value of `foo'."
(or (not (looking-at "S: ")) (or (not (looking-at "S: "))
(forward-char 3) (forward-char 3)
t) t)
;; GNU SASL may print 'Trying ...' first.
(or (not (looking-at "Trying "))
(forward-line)
t)
(not (and (imap-parse-greeting) (not (and (imap-parse-greeting)
;; success in imtest 1.6: ;; success in imtest 1.6:
(re-search-forward (re-search-forward
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
(nnslashdot-possibly-change-server group server) (nnslashdot-possibly-change-server group server)
(condition-case why (condition-case why
(unless gnus-nov-is-evil (unless gnus-nov-is-evil
(nnslashdot-retrieve-headers-1 articles group)) (nnslashdot-retrieve-headers-1 articles group))
(search-failed (nnslashdot-lose why)))) (search-failed (nnslashdot-lose why))))
(deffoo nnslashdot-retrieve-headers-1 (articles group) (deffoo nnslashdot-retrieve-headers-1 (articles group)
...@@ -142,41 +142,30 @@ ...@@ -142,41 +142,30 @@
(setq article (if (and article (< start article)) article start)) (setq article (if (and article (< start article)) article start))
(goto-char point) (goto-char point)
(while (re-search-forward (while (re-search-forward
"<a name=\"\\([0-9]+\\)\"><\\(b\\|H4\\)>\\([^<]+\\)</\\(b\\|H4\\)>.*score:\\([^)]+\\))" "<a name=\"\\([0-9]+\\)\">\\([^<]+\\)</a>.*\n.*score:\\([^)]+\\))"
nil t) nil t)
(setq cid (match-string 1) (setq cid (match-string 1)
subject (match-string 3) subject (match-string 2)
score (match-string 5)) score (match-string 3))
(unless (assq article (nth 4 entry)) (unless (assq article (nth 4 entry))
(setcar (nthcdr 4 entry) (cons (cons article cid) (nth 4 entry))) (setcar (nthcdr 4 entry) (cons (cons article cid) (nth 4 entry)))
(setq changed t)) (setq changed t))
(when (string-match "^Re: *" subject) (when (string-match "^Re: *" subject)
(setq subject (concat "Re: " (substring subject (match-end 0))))) (setq subject (concat "Re: " (substring subject (match-end 0)))))
(setq subject (mm-url-decode-entities-string subject)) (setq subject (mm-url-decode-entities-string subject)
(search-forward "<BR>") from "")
(cond (when (re-search-forward "by[ \t\n]+<[^>]+>\\([^<(]+\\)" nil t)
((looking-at (setq from
"by[ \t\n]+<a[^>]+>\\([^<]+\\)</a>[ \t\n]*(\\(<[^>]+>\\)*\\([^<>)]+\\))") (concat
(goto-char (- (match-end 0) 5)) (mm-url-decode-entities-string (match-string 1))
(setq from (concat " <nobody@slashdot.org>")))
(mm-url-decode-entities-string (match-string 1))
" <" (match-string 3) ">")))
((looking-at "by[ \t\n]+<a[^>]+>\\([^<(]+\\) (\\([0-9]+\\))</a>")
(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 "")))
(search-forward "on ") (search-forward "on ")
(setq date (setq date
(nnslashdot-date-to-date (nnslashdot-date-to-date
(buffer-substring (point) (progn (skip-chars-forward "^()<>\n\r") (point))))) (buffer-substring
(setq lines (/ (abs (- (search-forward "<td") (point) (progn (skip-chars-forward "^()<>\n\r") (point)))))
(search-forward "</td>"))) (setq lines (/ (abs (- (search-forward "<div")
(search-forward "</div>")))
70)) 70))
(if (not (if (not
(re-search-forward ".*cid=\\([0-9]+\\)\">Parent</A>" nil t)) (re-search-forward ".*cid=\\([0-9]+\\)\">Parent</A>" nil t))
...@@ -255,23 +244,21 @@ ...@@ -255,23 +244,21 @@
(when (numberp article) (when (numberp article)
(if (= article 1) (if (= article 1)
(progn (progn
(re-search-forward (search-forward "Posted by")
"Posted by") (search-forward "<div class=\"intro\">")
(search-forward "<BR>")
(setq contents (setq contents
(buffer-substring (buffer-substring
(point) (point)
(progn (progn
(re-search-forward (search-forward "commentwrap")
"<IFRAME\\|<SCRIPT LANGUAGE=\"JAVASCRIPT\">\\|<!-- no ad 6 -->\\|&lt;&nbsp;[ \t\r\n]*<A HREF=\"\\(\\(http:\\)?//slashdot\\.org\\)?/article")
(match-beginning 0))))) (match-beginning 0)))))
(setq cid (cdr (assq article (setq cid (cdr (assq article
(nth 4 (assoc group nnslashdot-groups))))) (nth 4 (assoc group nnslashdot-groups)))))
(search-forward (format "<a name=\"%s\">" cid)) (search-forward (format "<a name=\"%s\">" cid))
(setq contents (setq contents
(buffer-substring (buffer-substring
(re-search-forward "<td[^>]*>") (search-forward "<div class=\"commentBody\">")
(search-forward "</td>"))))))) (search-forward "</div>")))))))
(search-failed (nnslashdot-lose why))) (search-failed (nnslashdot-lose why)))
(when contents (when contents
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment