Synch to No Gnus 200510211917.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c931f78..90e559a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnslashdot.el (nnslashdot-retrieve-headers-1): Update to new
+       HTML.
+       (nnslashdot-request-article): Ditto.
+
+       * lpath.el (featurep): Add nobreak-char-display.
+
 2005-10-20  Hiroshi Fujishima  <hiroshi.fujishima@gmail.com>  (tiny change)
 
        * mail-source.el (mail-source-fetch-pop): Require pop3.

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 346b806..ce638a3 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -56,7 +56,8 @@
                 w3-prepare-buffer w3-region window-pixel-height
                 window-pixel-width))
   (maybe-bind '(help-echo-owns-message mail-mode-hook mm-w3m-mode-map
-                                      show-nonbreak-escape)))
+                                      show-nonbreak-escape
+                                      nobreak-char-display)))
 
 (when (and (featurep 'xemacs)
           (not (featurep 'mule)))

diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index a17c65f..6e1696b 100644 (file)
--- a/lisp/nnslashdot.el
+++ b/lisp/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
-                 "<a name=\"\\([0-9]+\\)\"><\\(b\\|H4\\)>\\([^<]+\\)</\\(b\\|H4\\)>.*score:\\([^)]+\\))"
+                 "<a name=\"\\([0-9]+\\)\">\\([^<]+\\)</a>.*\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 "<BR>")
-           (cond 
-            ((looking-at
-              "by[ \t\n]+<a[^>]+>\\([^<]+\\)</a>[ \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]+<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 "")))
+           (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))
+                    " <nobody@slashdot.org>")))
            (search-forward "on ")
            (setq date
                  (nnslashdot-date-to-date
-                  (buffer-substring (point) (progn (skip-chars-forward "^()<>\n\r") (point)))))
-           (setq lines (/ (abs (- (search-forward "<td")
-                                  (search-forward "</td>")))
+                  (buffer-substring
+                   (point) (progn (skip-chars-forward "^()<>\n\r") (point)))))
+           (setq lines (/ (abs (- (search-forward "<div")
+                                  (search-forward "</div>")))
                           70))
            (if (not
                 (re-search-forward ".*cid=\\([0-9]+\\)\">Parent</A>" nil t))
@@ -256,21 +245,20 @@
              (if (= article 1)
                  (progn
                    (search-forward "Posted by")
-                   (search-forward "<BR>")
+                   (search-forward "<div class=\"intro\">")
                    (setq contents
                          (buffer-substring
                           (point)
                           (progn
-                            (re-search-forward
-                             "<IFRAME\\|<SCRIPT LANGUAGE=\"JAVASCRIPT\">\\|<!-- no ad 6 -->\\|&lt;&nbsp;[ \t\r\n]*<A HREF=\"\\(\\(http:\\)?//slashdot\\.org\\)?/article")
+                            (search-forward "commentwrap")
                             (match-beginning 0)))))
                (setq cid (cdr (assq article
                                     (nth 4 (assoc group nnslashdot-groups)))))
                (search-forward (format "<a name=\"%s\">" cid))
                (setq contents
                      (buffer-substring
-                      (re-search-forward "<td[^>]*>")
-                      (search-forward "</td>")))))))
+                      (search-forward "<div class=\"commentBody\">")
+                      (search-forward "</div>")))))))
       (search-failed (nnslashdot-lose why)))
 
     (when contents