lisp/ChangeLog addition:

2007-04-27  Didier Verna  <didier@xemacs.org>

	* gnus-util.el (gnus-orify-regexp): Moved and renamed to ...
	* gmm-utils.el (gmm-regexp-concat): here.
	* message.el: Don't require 'gnus-util.
	(message-dont-reply-to-names): Handle name change above.
	* gnus-sum.el (gnus-ignored-from-addresses): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c61009..8f9e0fc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-27  Didier Verna  <didier@xemacs.org>
+
+       * gnus-util.el (gnus-orify-regexp): Moved and renamed to ...
+       * gmm-utils.el (gmm-regexp-concat): here.
+       * message.el: Don't require 'gnus-util.
+       (message-dont-reply-to-names): Handle name change above.
+       * gnus-sum.el (gnus-ignored-from-addresses): Ditto.
+
 2007-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-util.el (mm-charset-synonym-alist): Don't make it a user option

diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el
index 9241e96..54ea581 100644 (file)
--- a/lisp/gmm-utils.el
+++ b/lisp/gmm-utils.el
@@ -49,6 +49,19 @@ jabbering all the time."
   :type 'integer
   :group 'gmm)
 
+;;;###autoload
+(defun gmm-regexp-concat (regexp)
+  "Potentially concat a list of regexps into a single one.
+The concatenation is done with logical ORs."
+  (cond ((null regexp)
+        nil)
+       ((stringp regexp)
+        regexp)
+       ((listp regexp)
+        (mapconcat (lambda (elt) (concat "\\(" elt "\\)"))
+                   regexp
+                   "\\|"))))
+
 ;;;###autoload
 (defun gmm-message (level &rest args)
   "If LEVEL is lower than `gmm-verbose' print ARGS using `message'.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 346e7b0..5dd6704 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1084,7 +1084,7 @@ This can be a regexp or a list of regexps."
                 (repeat :tag "Regexp List" regexp)))
 
 (defsubst gnus-ignored-from-addresses ()
-  (gnus-orify-regexp gnus-ignored-from-addresses))
+  (gmm-regexp-concat gnus-ignored-from-addresses))
 
 (defcustom gnus-summary-to-prefix "-> "
   "*String prefixed to the To field in the summary line when

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index a2969fa..631e4be 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -76,17 +76,6 @@ This is a compatibility function for different Emacsen."
    ((fboundp 'replace-in-string)
     (defalias 'gnus-replace-in-string 'replace-in-string))))
 
-(defun gnus-orify-regexp (regexp)
-  "Potentially convert a list of regexps into a single one."
-  (cond ((null regexp)
-        nil)
-       ((stringp regexp)
-        regexp)
-       ((listp regexp)
-        (mapconcat (lambda (elt) (concat "\\(" elt "\\)"))
-                   regexp
-                   "\\|"))))
-
 (defun gnus-boundp (variable)
   "Return non-nil if VARIABLE is bound and non-nil."
   (and (boundp variable)

diff --git a/lisp/message.el b/lisp/message.el
index b865c2f..6e8027f 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -50,7 +50,7 @@
 (require 'mml)
 (require 'rfc822)
 (require 'ecomplete)
-(require 'gnus-util)
+
 
 (defgroup message '((user-mail-address custom-variable)
                    (user-full-name custom-variable))
@@ -1215,7 +1215,7 @@ exclude your own user name only."
                 (repeat :tag "Regexp List" regexp)))
 
 (defsubst message-dont-reply-to-names ()
-  (gnus-orify-regexp message-dont-reply-to-names))
+  (gmm-regexp-concat message-dont-reply-to-names))
 
 (defvar message-shoot-gnksa-feet nil
   "*A list of GNKSA feet you are allowed to shoot.