From b3424b97e9e4280ce636cebd62997d80a7d92ac4 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Thu, 8 Jan 2004 23:55:15 +0000
Subject: [PATCH] Synch to No Gnus 200401082352.

---
 lisp/ChangeLog    |   15 +++++++++++++++
 lisp/canlock.el   |    5 ++---
 lisp/gnus-sum.el  |    2 +-
 lisp/gnus-uu.el   |    2 +-
 lisp/html2text.el |    8 ++++----
 lisp/mml.el       |    5 ++---
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21de9bb..137284c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2004-01-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* canlock.el (canlock-insert-header): Remove excessive grouping in
+	regexp.
+
+	* gnus-sum.el (gnus-summary-read-document): Ditto.
+
+	* gnus-uu.el (gnus-uu-part-number): Ditto.
+
+	* html2text.el (html2text-remove-tags): Ditto.
+	(html2text-format-tags): Ditto.
+	(html2text-format-single-elements): Ditto.
+
+	* mml.el (mml-parse-1): Ditto.
+
 2004-01-08  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus-sum.el (gnus-summary-update-mark): Revert previous change.
diff --git a/lisp/canlock.el b/lisp/canlock.el
index ef62579..310c9cf 100644
--- a/lisp/canlock.el
+++ b/lisp/canlock.el
@@ -163,9 +163,8 @@ message."
 	  (unless id-for-key
 	    (setq id-for-key (canlock-fetch-id-for-key)))
 	  (if (and (setq control (mail-fetch-field "Control"))
-		   (string-match
-		    "^cancel[\t ]+\\(<[^\t\n @<>]+@[^\t\n @<>]+>\\)"
-		    control))
+		   (string-match "^cancel[\t ]+<[^\t\n @<>]+@[^\t\n @<>]+>"
+				 control))
 	      (setq id-for-lock nil)
 	    (unless id-for-lock
 	      (setq id-for-lock (mail-fetch-field "Message-ID"))))
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 96a986a..2514f32 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8289,7 +8289,7 @@ Obeys the standard process/prefix convention."
 	    ;; the wrong guess.
 	    (message-narrow-to-head)
 	    (goto-char (point-min))
-	    (delete-matching-lines "^\\(Path\\):\\|^From ")
+	    (delete-matching-lines "^Path:\\|^From ")
 	    (widen)
 	    (if (setq egroup
 		      (gnus-group-read-ephemeral-group
diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 7a55ce5..b44228a 100644
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1382,7 +1382,7 @@ When called interactively, prompt for REGEXP."
 	  (setq part (match-string 0 subject))
 	  (setq subject (substring subject (match-end 0)))))
     (or part
-	(while (string-match "\\([0-9]+\\)[^0-9]+\\([0-9]+\\)" subject)
+	(while (string-match "[0-9]+[^0-9]+[0-9]+" subject)
 	  (setq part (match-string 0 subject))
 	  (setq subject (substring subject (match-end 0)))))
     (or part "")))
diff --git a/lisp/html2text.el b/lisp/html2text.el
index 41fea4b..8822ea9 100644
--- a/lisp/html2text.el
+++ b/lisp/html2text.el
@@ -462,7 +462,7 @@ See the documentation for that variable."
   (interactive)
   (dolist (tag tag-list)
     (html2text-buffer-head)
-    (while (re-search-forward (format "\\(</?%s[^>]*>\\)" tag) (point-max) t)
+    (while (re-search-forward (format "</?%s[^>]*>" tag) (point-max) t)
       (delete-region (match-beginning 0) (match-end 0)))))
 
 (defun html2text-format-tags ()
@@ -472,12 +472,12 @@ See the documentation for that variable."
     (let ((tag      (car tag-and-function))
 	  (function (cdr tag-and-function)))
       (html2text-buffer-head)
-      (while (re-search-forward (format "\\(<%s\\( [^>]*\\)?>\\)" tag)
+      (while (re-search-forward (format "<%s\\( [^>]*\\)?>" tag)
 				(point-max) t)
 	(let ((p1)
 	      (p2 (point))
 	      (p3) (p4)
-	      (attr (match-string 1)))
+	      (attr (match-string 0)))
 	  (search-backward "<" (point-min) t)
 	  (setq p1 (point))
 	  (re-search-forward (format "</%s>" tag) (point-max) t)
@@ -511,7 +511,7 @@ See the documentation for that variable."
     (let ((tag      (car tag-and-function))
 	  (function (cdr tag-and-function)))
       (html2text-buffer-head)
-      (while (re-search-forward (format "\\(<%s\\( [^>]*\\)?>\\)" tag)
+      (while (re-search-forward (format "<%s\\( [^>]*\\)?>" tag)
 				(point-max) t)
 	(let ((p1)
 	      (p2 (point)))
diff --git a/lisp/mml.el b/lisp/mml.el
index a889abe..40b4a0d 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -160,9 +160,8 @@ one charsets.")
 	       (method (cdr (assq 'method taginfo)))
 	       tags)
 	  (save-excursion
-	    (if
-		(re-search-forward
-		 "<#\\(/\\)?\\(multipart\\|part\\|external\\|mml\\)." nil t)
+	    (if (re-search-forward
+		 "<#/?\\(multipart\\|part\\|external\\|mml\\)." nil t)
 		(setq secure-mode "multipart")
 	      (setq secure-mode "part")))
 	  (save-excursion
-- 
1.7.10.4