From 5256e00468200ab86590ce40d9e75ec79be2c55d Mon Sep 17 00:00:00 2001
From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sat, 6 Nov 1999 20:43:39 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog   |  1 -
 lisp/gnus-art.el | 26 +++++++++++++-------------
 lisp/gnus-uu.el  |  5 +++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c307cde7..7cc45c6d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -20,7 +20,6 @@
 	* gnus-srvr.el (gnus-browse-foreign-server): Use both `read' and
  	`buffer-substring'.
 
->>>>>>> 5.132
 1999-11-06 04:24:30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-art.el (article-date-ut): Keep the updated timer.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 6969737c6..605d6570b 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -214,7 +214,7 @@ asynchronously.	 The compressed face will be piped to this command."
 
 (defcustom gnus-emphasis-alist
   (let ((format
-	 "\\(\\s-\\|^\\|[-\"]\\|\\s(\\|\\s)\\)\\(%s\\(\\w+\\(\\s-+\\w+\\)*[.,]?\\)%s\\)\\(\\s-\\|[-?!.,;:\"]\\|\\s(\\|\\s)\\)")
+	 "\\(\\s-\\|^\\|[-\"]\\|\\s(\\)\\(%s\\(\\w+\\(\\s-+\\w+\\)*[.,]?\\)%s\\)\\(\\s-\\|[-,;:\"]\\s-\\|[?!.]+\\s-\\|\\s)\\)")
 	(types
 	 '(("_" "_" underline)
 	   ("/" "/" italic)
@@ -265,7 +265,7 @@ is the face used for highlighting."
   :group 'gnus-article-emphasis)
 
 (defface gnus-emphasis-underline-italic '((t (:italic t :underline t)))
-  "Face used for displaying underlined italic emphasized text (_*word*_)."
+  "Face used for displaying underlined italic emphasized text (_/word/_)."
   :group 'gnus-article-emphasis)
 
 (defface gnus-emphasis-bold-italic '((t (:bold t :italic t)))
@@ -4536,18 +4536,8 @@ For example:
 (defvar length)
 (defun gnus-treat-predicate (val)
   (cond
-   (condition
-    (eq condition val))
    ((null val)
     nil)
-   ((eq val t)
-    t)
-   ((eq val 'head)
-    nil)
-   ((eq val 'last)
-    (eq part-number total-parts))
-   ((numberp val)
-    (< length val))
    ((and (listp val)
 	 (stringp (car val)))
     (apply 'gnus-or (mapcar `(lambda (s)
@@ -4563,9 +4553,19 @@ For example:
        ((eq pred 'not)
 	(not (gnus-treat-predicate (car val))))
        ((eq pred 'typep)
-	(equal (cadr val) type))
+	(equal (car val) type))
        (t
 	(error "%S is not a valid predicate" pred)))))
+   (condition
+    (eq condition val))
+   ((eq val t)
+    t)
+   ((eq val 'head)
+    nil)
+   ((eq val 'last)
+    (eq part-number total-parts))
+   ((numberp val)
+    (< length val))
    (t
     (error "%S is not a valid value" val))))
 
diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index a765241a0..b68af25b9 100644
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -625,8 +625,9 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
   (interactive)
   (gnus-save-hidden-threads
     (let ((level (gnus-summary-thread-level)))
-      (while (and (gnus-summary-set-process-mark (gnus-summary-article-number))
-		  (zerop (gnus-summary-next-subject 1))
+      (while (and (gnus-summary-set-process-mark
+		   (gnus-summary-article-number))
+		  (zerop (gnus-summary-next-subject 1 nil t))
 		  (> (gnus-summary-thread-level) level)))))
   (gnus-summary-position-point))
 
-- 
2.25.1