(gnus-article-unfold-long-headers): New variable.

[gnus] / lisp / nnweb.el

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index f055c6f..e93373e 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -79,7 +79,7 @@ Valid types include `google', `dejanews', and `gmane'.")
      (reference . identity)
      (map . nnweb-gmane-create-mapping)
      (search . nnweb-gmane-search)
-     (address . "http://search.gmane.org/cgi-bin/omega.cgi")
+     (address . "http://search.gmane.org/nov.php")
      (identifier . nnweb-gmane-identity)))
   "Type-definition alist.")
 
@@ -171,7 +171,8 @@ Valid types include `google', `dejanews', and `gmane'.")
                       (when (string-match "^<\\(.*\\)>$" article)
                         (setq art (match-string 1 article)))
                       (when (and fetch art)
-                        (setq url (format fetch art))
+                        (setq url (format fetch
+                                          (mm-url-form-encode-xwfu art)))
                         (mm-with-unibyte-current-buffer
                           (mm-url-insert url))
                         (if (nnweb-definition 'reference t)
@@ -307,8 +308,8 @@ Valid types include `google', `dejanews', and `gmane'.")
 (defun nnweb-google-wash-article ()
   ;; We have Google's masked e-mail addresses here.  :-/
   (let ((case-fold-search t)
-       (start-re "<pre>\n *")
-       (end-re "\n *</pre>"))
+       (start-re "<pre>[\r\n ]*")
+       (end-re "[\r\n ]*</pre>"))
     (goto-char (point-min))
     (if (save-excursion
          (or (re-search-forward "The requested message.*could not be found."
@@ -415,7 +416,7 @@ Valid types include `google', `dejanews', and `gmane'.")
            (goto-char (point-min))
            (incf i 100)
            (if (or (not (re-search-forward
-                         "<a href=\"\n\\([^>\"]+\\)\"><img src=\"[^\"]+next"
+                         "<a href=\"\n\\([^>\" \n\t]+\\)[^<]*<img src=[^>]+next"
                          nil t))
                    (>= i nnweb-max-hits))
                (setq more nil)
@@ -471,7 +472,7 @@ Valid types include `google', `dejanews', and `gmane'.")
        (forward-line 1)
        ;; Thanks to Olly Betts we now have NOV lines in our buffer!
        (while (not (eobp))
-         (unless (eolp)
+         (unless (or (eolp) (looking-at "\x0d"))
            (let ((header (nnheader-parse-nov)))
              (let ((xref (mail-header-xref header))
                    (from (mail-header-from header))
@@ -522,7 +523,6 @@ Valid types include `google', `dejanews', and `gmane'.")
     "?"
     (mm-url-encode-www-form-urlencoded
      `(("query" . ,search)
-       ("FMT" . "nov")
        ("HITSPERPAGE" . ,(number-to-string nnweb-max-hits))))))
   (setq buffer-file-name nil)
   (set-buffer-multibyte t)