Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ede60f..a2b189e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,26 @@
+2001-03-21 20:00:43  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnultimate.el (nnultimate-retrieve-headers): Work for other
+       boards. 
+
+2001-03-21  Didier Verna  <didier@lrde.epita.fr>
+
+       * gnus-start.el:
+       * gnus-start.el (gnus-subscribe-newsgroup-hooks): New.
+       * gnus-start.el (gnus-subscribe-newsgroup): use it.
+
+
+2001-03-15 09:47:23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnultimate.el (nnultimate-retrieve-headers): Understand
+       long-form month names.
+
 2001-03-18 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-       
+
        * gnus-sum.el (gnus-summary-show-all-headers):
        gnus-article-show-all-headers is broken. Use
        gnus-summary-toggle-header instead.
-       
+
        * mml2015.el (mml2015-gpg-extract-from): No error.
 
 2001-03-18 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
@@ -59,7 +76,7 @@
        (message-forward-subject-author-subject): Use it.
        (message-make-forward-subject): Use it.
        (message-forward): Use it.
-       
+
        * gnus-uu.el (gnus-uu-digest-mail-forward): Use it.
 
        * mm-util.el, message.el, rfc2047.el, gnus-sum.el, gnus-score.el:
@@ -98,7 +115,7 @@
 
        * rfc2047.el (rfc2047-unfold-region): Fix arg of
        `skip-chars-forward'.
-       
+
 2001-03-07 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nndraft.el (nndraft-request-group): Restore auto save files if
@@ -132,7 +149,7 @@
 
        * gnus-sum.el (gnus-summary-make-menu-bar): Make
        gnus-article-post-menu here.
-       
+
        * gnus-art.el (gnus-article-make-menu-bar): Make summary-menu bar
        if it has not been made.
 
@@ -147,9 +164,9 @@
 
 2001-03-01 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
        From Katsumi Yamaoka <yamaoka@jpl.org>.
-       
+
        * dgnushack.el (coerce, merge, subseq): defmacro.
-       
+
 2001-03-01 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * lpath.el (nndraft-request-group): Move it here from nndraft.el.
@@ -184,7 +201,7 @@
        * nnml.el (nnml-generate-active-info): Fix the case when there is
        no file.
 
-       * gnus-sum.el (gnus-summary-import-article): Display it. Enable edit. 
+       * gnus-sum.el (gnus-summary-import-article): Display it. Enable edit.
        (gnus-summary-create-article): New.
 
        * gnus-group.el (gnus-group-mark-article-read): New.
@@ -199,7 +216,7 @@
        gnus-article-edit-exit.
        (gnus-article-edit-exit): Confirm and insert original-article-buffer.
 
-       * gnus.el (gnus-parameters): New. 
+       * gnus.el (gnus-parameters): New.
        Suggested by NAGY Andras <nagya@inf.elte.hu>.
        (gnus-parameters-get-parameter): New.
        (gnus-group-find-parameter): Use it.
@@ -250,7 +267,7 @@
        New.
        (gnus-mime-display-multipart-related-as-mixed): New.
        (gnus-mime-display-part): Use them.
-               
+
 2001-02-20 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-start.el (gnus-setup-news): Allow gnus-group-line-format to be
@@ -272,7 +289,7 @@
        * gnus-sum.el (gnus-thread-sort-functions): Doc fix.  Refer to
        gnus-article-sort-functions.
        (gnus-article-sort-functions): Doc fix.  Refer to
-       gnus-thread-sort-functions. 
+       gnus-thread-sort-functions.
 
 2001-02-18 20:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
        From Paul Jarc <prj@po.cwru.edu>.
@@ -338,7 +355,7 @@
        (gnus-summary-setup-default-charset): Use them.
 
        * gnus-start.el (gnus-read-descriptions-file): Use them.
-       
+
        * gnus-cus.el (gnus-group-parameters): Remove them.
 
 2001-02-14 00:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
@@ -347,7 +364,7 @@
 
 2001-02-13 21:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
-       * gnus-sum.el (gnus-summary-read-group-1): Remove 
+       * gnus-sum.el (gnus-summary-read-group-1): Remove
        gnus-summary-set-local-parameters.
        (gnus-summary-setup-buffer): Put it here.
 
@@ -422,7 +439,7 @@
 2001-02-09 20:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * dgnushack.el : Add URLDIR.
-       
+
        * Makefile.in (EMACS_COMP): Ditto.
 
 2001-02-09 19:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
@@ -435,7 +452,7 @@
 
        * mm-view.el (mm-inline-message): Use it.
        (mm-view-message): Ditto.
-       
+
        * mm-partial.el (mm-inline-partial): Ditto.
 
        * mm-extern.el (mm-inline-external-body): Ditto.
@@ -450,7 +467,7 @@
        * message.el (message-cancel-news): Allow to shoot foot.
        (message-supersede): Ditto.
 
-2001-02-08  Tommi Vainikainen <thv@iki.fi> 
+2001-02-08  Tommi Vainikainen <thv@iki.fi>
 
        * gnus-sum.el (gnus-simplify-subject-re): Use
        message-subject-re-regexp.
@@ -469,7 +486,7 @@
        between 00 and FF.  Don't check charset.
 
        * mm-encode.el (mm-encode-content-transfer-encoding): Use unibyte
-       in Emacs 20.  
+       in Emacs 20.
        * rfc2047.el (rfc2047-q-encode-region): Ditto.
 
 2001-02-07 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
@@ -546,9 +563,9 @@
        * gnus-sum.el (gnus-summary-make-menu-bar): Use t if XEmacs.
 
        * gnus-group.el (gnus-group-make-menu-bar): Ditto.
-       
+
        * message.el (message-mode-menu): Ditto.
-       
+
        * gnus-art.el (defvar): eval-when-compile.
 
 2001-02-02 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
@@ -577,7 +594,7 @@
 2001-01-26  Dave Love  <fx@gnu.org>
 
        * mm-util.el (mm-multibyte-string-p): New.
-       
+
 ;;     * qp.el: Remove un-logged bogus changes from 2000-12-20.
 ;;     (quoted-printable-encode-region): Doc fix.  Don't call
 ;;     string-as-multibyte on class.  Clarify line-folding.
@@ -619,7 +636,7 @@
 2001-01-30 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-util.el (gnus-string-equal): New function.
-       
+
        * gnus-art.el (article-hide-boring-headers): Use it.
 
 2001-01-27  Karl Kleinpaste <karl@charcoal.com>
@@ -655,7 +672,7 @@
        (gnus-server-insert-server-line): Use it.
 
 2001-01-24 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
-       
+
        * mm-util.el (mm-mime-mule-charset-alist): Preferred MIME names
        GB2312 and Big5.
 
@@ -676,7 +693,7 @@
 
 2001-01-11 11:49:02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-       * gnus-int.el (gnus-check-server): Allow breaking the opening. 
+       * gnus-int.el (gnus-check-server): Allow breaking the opening.
 
 2001-01-23 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
@@ -696,7 +713,7 @@
        * gnus.el: Fix copyright. Remove trailing spaces.
 
        * message.el (message-forward): Use mule4.
-       
+
 2001-01-20 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-util.el (mm-string-as-unibyte): New.
@@ -808,7 +825,7 @@
        verify certificate.  Default is changed to only check integrity.
        Improved security status texts.  If a certificate doesn't contain
        a email address, don't fail.
-       
+
        * smime.el (smime-noverify-region):
        (smime-noverify-buffer): New functions.  Verifies integrity only.
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 8928a7d..424476f 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2155,6 +2155,34 @@ always hide."
                    (looking-at "[ \t]*$"))
          (gnus-delete-line))))))
 
+(defun article-replace-with-quoted-text ()
+  "Replace the entire article with the quoted text in the article."
+  (interactive)
+  (unless gnus-cite-prefix-alist
+    (error "No quoted text in the article"))
+  (gnus-summary-show-article t)
+  (save-excursion
+    (set-buffer gnus-article-buffer)
+    (gnus-cite-parse-maybe t)
+    (let ((prefix (concat "^" (caar gnus-cite-prefix-alist)))
+         (buffer-read-only nil)
+         (body nil))
+      (dolist (line (sort (copy-sequence (cdar gnus-cite-prefix-alist)) '<))
+       (save-excursion
+         (set-buffer gnus-original-article-buffer)
+         (goto-char (point-min))
+         (forward-line (1- line))
+         (push (buffer-substring (point) (progn (forward-line 1) (point)))
+               body)))
+      (article-goto-body)
+      (forward-line -1)
+      (delete-region (point) (point-max))
+      (mapcar #'insert (mapcar #'string-as-unibyte (nreverse body)))
+      (goto-char (point-min))
+      (while (re-search-forward prefix nil t)
+       (replace-match "" t t))
+      (gnus-article-prepare-display))))
+
 (defun article-narrow-to-head ()
   "Narrow the buffer to the head of the message.
 Point is left at the beginning of the narrowed-to region."
@@ -3089,6 +3117,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is
      article-strip-trailing-space
      article-strip-blank-lines
      article-strip-all-blank-lines
+     article-replace-with-quoted-text
      article-date-local
      article-date-english
      article-date-iso8601

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index c4640ba..62cbfdd 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -270,6 +270,12 @@ claim them."
                function
                (repeat function)))
 
+(defcustom gnus-subscribe-newsgroup-hooks nil
+  "*Hooks run after you subscribe to a new group. The hooks will be called
+with new group's name as argument."
+  :group 'gnus-group-new
+  :type 'hook)
+
 (defcustom gnus-subscribe-options-newsgroup-method
   'gnus-subscribe-alphabetically
   "*Function(s) called to subscribe newsgroups mentioned on \"options -n\" lines.
@@ -583,6 +589,7 @@ the first newsgroup."
      gnus-level-killed (gnus-gethash (or next "dummy.group")
                                     gnus-newsrc-hashtb))
     (gnus-message 5 "Subscribe newsgroup: %s" newsgroup)
+    (run-hook-with-args 'gnus-subscribe-newsgroup-hooks newsgroup)
     t))
 
 (defun gnus-read-active-file-p ()

diff --git a/lisp/nnultimate.el b/lisp/nnultimate.el
index f4dd670..4ed3377 100644 (file)
--- a/lisp/nnultimate.el
+++ b/lisp/nnultimate.el
@@ -81,7 +81,7 @@
            "postings.*editpost\\|forumdisplay\\|getbio")
           headers article subject score from date lines parent point
           contents tinfo fetchers map elem a href garticles topic old-max
-          inc datel table string current-page total-contents pages
+          inc datel table current-page total-contents pages
           farticles forum-contents parse furl-fetched mmap farticle)
       (setq map mapping)
       (while (and (setq article (car articles))
@@ -133,11 +133,9 @@
              (setq contents
                    (ignore-errors (w3-parse-buffer (current-buffer))))
              (setq table (nnultimate-find-forum-table contents))
-             (setq string (mapconcat 'identity (nnweb-text table) ""))
-             (when (string-match "topic is \\([0-9]\\) pages" string)
-               (setq pages (string-to-number (match-string 1 string)))
-               (setcdr table nil)
-               (setq table (nnultimate-find-forum-table contents)))
+             (goto-char (point-min))
+             (when (re-search-forward "topic is \\([0-9]+\\) pages" nil t)
+               (setq pages (string-to-number (match-string 1))))
              (setq contents (cdr (nth 2 (car (nth 2 table)))))
              (setq total-contents (nconc total-contents contents))
              (incf current-page))
@@ -166,13 +164,21 @@
              (setq date (substring (car datel) (match-end 0))
                    datel nil))
            (pop datel))
-         (setq date (delete "" (split-string date "[- \n\t\r \81 \81 \81 ]")))
+         (setq date (delete "" (split-string
+                                date "[-, \n\t\r \81 \81 \81 ]")))
          (if (or (member "AM" date)
                  (member "PM" date))
-             (setq date (format "%s %s %s %s"
-                                (car (rassq (string-to-number (nth 0 date))
-                                            parse-time-months))
-                                (nth 1 date) (nth 2 date) (nth 3 date)))
+             (setq date (format
+                         "%s %s %s %s"
+                         (nth 1 date)
+                         (if (and (>= (length (nth 0 date)) 3)
+                                  (assoc (downcase
+                                          (substring (nth 0 date) 0 3))
+                                         parse-time-months))
+                             (substring (nth 0 date) 0 3)
+                           (car (rassq (string-to-number (nth 0 date))
+                                       parse-time-months)))
+                         (nth 2 date) (nth 3 date)))
            (setq date (format "%s %s %s %s"
                               (car (rassq (string-to-number (nth 1 date))
                                           parse-time-months))