Synch to No Gnus 200408300820.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6d64df..f168fc0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,28 @@
 2004-08-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * gnus-agent.el (gnus-agent-restore-gcc): Use ^ and regexp-quote.
+
+       * gnus-sum.el (gnus-summary-morse-message): Use search-forward
+       instead of re-search-forward.
+
+       * gnus-uu.el (gnus-uu-save-article): Ditto.
+       (gnus-uu-post-encode-uuencode): Ditto.
+
+       * html2text.el (html2text-clean-list-items): Ditto.
+       (html2text-clean-dtdd): Ditto.
+       (html2text-format-tags): Ditto.
+
+       * message.el (message-send-mail-with-sendmail): Fix regexp.
+       (message-fill-field-general): Use search-forward instead of
+       re-search-forward.
+       (unbold-region): Ditto.
+
+       * nnrss.el (nnrss-request-article): Ditto.
+
+       * nnslashdot.el (nnslashdot-request-article): Ditto.
+
+       * nnweb.el (nnweb-gmane-wash-article): Ditto.
+
        * gnus-sum.el (gnus-summary-make-menu-bar): Avoid the
        "Unrecognized menu descriptor" error in XEmacs.
 

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 6f7961d..8456a3a 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -708,7 +708,8 @@ be a select method."
   "Restore GCC field from saved header."
   (save-excursion
     (goto-char (point-min))
-    (while (re-search-forward (concat gnus-agent-gcc-header ":") nil t)
+    (while (re-search-forward
+           (concat "^" (regexp-quote gnus-agent-gcc-header) ":") nil t)
       (replace-match "Gcc:" 'fixedcase))))
 
 (defun gnus-agent-any-covered-gcc ()

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index dec1100..70eb325 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8997,7 +8997,7 @@ forward."
            (when (message-goto-body)
              (gnus-narrow-to-body))
            (goto-char (point-min))
-           (while (re-search-forward "·" (point-max) t)
+           (while (search-forward "·" (point-max) t)
              (replace-match "."))
            (unmorse-region (point-min) (point-max))
            (widen)

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 82e1381..f7908cd 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1,6 +1,6 @@
 ;;; gnus-uu.el --- extract (uu)encoded files in Gnus
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-;;        2001, 2002, 2003 Free Software Foundation, Inc.
+;;        2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Created: 2 Oct 1993
@@ -851,7 +851,7 @@ When called interactively, prompt for REGEXP."
              (put-text-property (point-min) (point-max) 'invisible nil)
              (put-text-property (point-min) (point-max) 'intangible nil))
            (goto-char (point-min))
-           (re-search-forward "\n\n")
+           (search-forward "\n\n")
            (unless gnus-uu-digest-buffer
              ;; Quote all 30-dash lines.
              (save-excursion
@@ -1886,7 +1886,7 @@ The user will be asked for a file name."
   (when (gnus-uu-post-encode-file "uuencode" path file-name)
     (goto-char (point-min))
     (forward-line 1)
-    (while (re-search-forward " " nil t)
+    (while (search-forward " " nil t)
       (replace-match "`"))
     t))
 

diff --git a/lisp/html2text.el b/lisp/html2text.el
index b5c7478..1fa0c0b 100644 (file)
--- a/lisp/html2text.el
+++ b/lisp/html2text.el
@@ -176,12 +176,12 @@ formatting, and then moved afterward.")
   (goto-char p1)
   (let ((item-nr 0)
        (items   0))
-    (while (re-search-forward "<li>" p2 t)
+    (while (search-forward "<li>" p2 t)
       (setq items (1+ items)))
     (goto-char p1)
     (while (< item-nr items)
       (setq item-nr (1+ item-nr))
-      (re-search-forward "<li>" (point-max) t)
+      (search-forward "<li>" (point-max) t)
       (cond
        ((string= list-type "ul") (insert " o "))
        ((string= list-type "ol") (insert (format " %s: " item-nr)))
@@ -191,7 +191,7 @@ formatting, and then moved afterward.")
   (goto-char p1)
   (let ((items   0)
        (item-nr 0))
-    (while (re-search-forward "<dt>" p2 t)
+    (while (search-forward "<dt>" p2 t)
       (setq items (1+ items)))
     (goto-char p1)
     (while (< item-nr items)
@@ -370,7 +370,7 @@ See the documentation for that variable."
              (attr (match-string 0)))
          (search-backward "<" (point-min) t)
          (setq p1 (point))
-         (re-search-forward (format "</%s>" tag) (point-max) t)
+         (search-forward (format "</%s>" tag) (point-max) t)
          (setq p4 (point))
          (search-backward "</" (point-min) t)
          (setq p3 (point))

diff --git a/lisp/message.el b/lisp/message.el
index c8f9fad..06e3f19 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4324,7 +4324,7 @@ This sub function is for exclusive use of `message-send-mail'."
            (save-excursion
              (set-buffer errbuf)
              (goto-char (point-min))
-             (while (re-search-forward "\n\n* *" nil t)
+             (while (re-search-forward "\n+ *" nil t)
                (replace-match "; "))
              (if (not (zerop (buffer-size)))
                  (error "Sending...failed to %s"
@@ -5793,7 +5793,7 @@ If the current line has `message-yank-prefix', insert it on the new line."
     (when (looking-at "[ \t]*$")
       (message-delete-line))
     (goto-char begin)
-    (re-search-forward ":" nil t)
+    (search-forward ":" nil t)
     (when (looking-at "\n[ \t]+")
       (replace-match " " t t))
     (goto-char (point-max))))
@@ -7209,7 +7209,7 @@ which specify the range to operate on."
     (let ((end1 (make-marker)))
       (move-marker end1 (max start end))
       (goto-char (min start end))
-      (while (re-search-forward "\b" end1 t)
+      (while (search-forward "\b" end1 t)
        (if (eq (char-after) (char-after (- (point) 2)))
            (delete-char -2))))))
 

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 8028831..665dd7d 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -170,7 +170,7 @@ ARTICLE is the article number of the current headline.")
              (when text
                (insert text)
                (goto-char point)
-               (while (re-search-forward "\n" nil t)
+               (while (search-forward "\n" nil t)
                  (replace-match " "))
                (goto-char (point-max))
                (insert "\n\n"))
@@ -181,7 +181,7 @@ ARTICLE is the article number of the current headline.")
              (when text
                (insert "<html><head></head><body>\n" text "\n</body></html>")
                (goto-char point)
-               (while (re-search-forward "\n" nil t)
+               (while (search-forward "\n" nil t)
                  (replace-match " "))
                (goto-char (point-max))
                (insert "\n\n"))

diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index 614de21..f871beb 100644 (file)
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -1,5 +1,6 @@
 ;;; nnslashdot.el --- interfacing with Slashdot
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -253,8 +254,7 @@
            (when (numberp article)
              (if (= article 1)
                  (progn
-                   (re-search-forward
-                    "Posted by")
+                   (search-forward "Posted by")
                    (search-forward "<BR>")
                    (setq contents
                          (buffer-substring

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index c6d4d3f..8976209 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -1,5 +1,5 @@
 ;;; nnweb.el --- retrieving articles via web search engines
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -489,7 +489,7 @@ Valid types include `google', `dejanews', and `gmane'.")
 (defun nnweb-gmane-wash-article ()
   (let ((case-fold-search t))
     (goto-char (point-min))
-    (re-search-forward "<!--X-Head-of-Message-->" nil t)
+    (search-forward "<!--X-Head-of-Message-->" nil t)
     (delete-region (point-min) (point))
     (goto-char (point-min))
     (while (looking-at "^<li><em>\\([^ ]+\\)</em>.*</li>")