(gnus-continuum-version): Make inactive, since it doesn't really

message anything to the user.

Also check in nnmail stuff I forgot to check in.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7b4c6b..430579b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus.el (gnus-continuum-version): Make inactive, since it doesn't
+       really message anything to the user.
+
        * nnmail.el (nnmail-article-group): Allow using the fancy split method
        directly.
 

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 64819f5..5b38a9c 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -3205,7 +3205,6 @@ If ARG, insert string at point."
 
 (defun gnus-continuum-version (&optional version)
   "Return VERSION as a floating point number."
-  (interactive)
   (unless version
     (setq version gnus-version))
   (when (or (string-match "^\\([^ ]+\\)? ?Gnus v?\\([0-9.]+\\)$" version)

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 3669864..463f87e 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1149,10 +1149,10 @@ FUNC will be called with the group name to determine the article number."
          (setq nnmail-split-trace nil))
        (if (or (and (symbolp nnmail-split-methods)
                     (fboundp nnmail-split-methods))
-               (and (listp ruleset)
+               (and (listp nnmail-split-methods)
                     ;; Not a regular split method, so it has to be a
                     ;; fancy one.
-                    (not (let ((top-element (car-safe ruleset)))
+                    (not (let ((top-element (car-safe nnmail-split-methods)))
                            (and (= 2 (length top-element))
                                 (stringp (nth 0 top-element))
                                 (stringp (nth 1 top-element)))))))