[gnus git] branch master updated: n0-17-90-g8f8da5a =1= Require spam-stat in a normal fashion without binding `spam-stat-install-hooks' to avoid compilation warnings.

       via  8f8da5a1c7653cd841884f77c3e01f48d7e8722a (commit)
      from  e9ec7671168ff4f308feb00f08683042639c47df (commit)


- Log -----------------------------------------------------------------
commit 8f8da5a1c7653cd841884f77c3e01f48d7e8722a
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sun Jun 26 13:23:45 2011 +0200

    Require spam-stat in a normal fashion without binding `spam-stat-install-hooks' to avoid compilation warnings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e4fca9..5103f1a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-26  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* spam.el (spam-stat): Require in a normal fashion without binding
+	`spam-stat-install-hooks' to avoid compilation warnings.
+
+	* spam-stat.el (spam-stat-install-hooks): Removed.
+	(spam-stat-install-hooks): Don't run automatically.
+
 2011-06-26  Timo Juhani Lindfors <[email protected]>  (tiny change)
 
 	* gnus-msg.el (gnus-summary-reply-to-list-with-original): New command
diff --git a/lisp/spam-stat.el b/lisp/spam-stat.el
index b56d0c4..8b56c7b 100644
--- a/lisp/spam-stat.el
+++ b/lisp/spam-stat.el
@@ -138,12 +138,6 @@ See `spam-stat-to-hash-table' for the format of the file."
   :type 'file
   :group 'spam-stat)
 
-(defcustom spam-stat-install-hooks t
-  "Whether spam-stat should install its hooks in Gnus.
-This is set to nil if you use spam-stat through spam.el."
-  :type 'boolean
-  :group 'spam-stat)
-
 (defcustom spam-stat-unknown-word-score 0.2
   "The score to use for unknown words.
 Also used for words that don't appear often enough."
@@ -658,9 +652,6 @@ COUNT defaults to 5"
   (add-hook 'gnus-select-article-hook
 	    'spam-stat-store-gnus-article-buffer))
 
-(when spam-stat-install-hooks
-  (spam-stat-install-hooks-function))
-
 (defun spam-stat-unload-hook ()
   "Uninstall the spam-stat function hooks."
   (interactive)
diff --git a/lisp/spam.el b/lisp/spam.el
index cbffeea..33dbaaa 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -2260,23 +2260,16 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
   (autoload 'spam-stat-save "spam-stat")
   (autoload 'spam-stat-split-fancy "spam-stat"))
 
-(eval-and-compile
-  (when (condition-case nil
-            (let ((spam-stat-install-hooks nil))
-              (require 'spam-stat))
-          (file-error
-           (defalias 'spam-stat-register-ham-routine 'ignore)
-           (defalias 'spam-stat-register-spam-routine 'ignore)
-           nil))
+(require 'spam-stat)
 
-    (defun spam-check-stat ()
+(defun spam-check-stat ()
       "Check the spam-stat backend for the classification of this message"
       (let ((spam-stat-split-fancy-spam-group spam-split-group) ; override
             (spam-stat-buffer (buffer-name)) ; stat the current buffer
             category return)
         (spam-stat-split-fancy)))
 
-    (defun spam-stat-register-spam-routine (articles &optional unregister)
+(defun spam-stat-register-spam-routine (articles &optional unregister)
       (dolist (article articles)
         (let ((article-string (spam-get-article-as-string article)))
           (with-temp-buffer
@@ -2285,10 +2278,10 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
                 (spam-stat-buffer-change-to-non-spam)
               (spam-stat-buffer-is-spam))))))
 
-    (defun spam-stat-unregister-spam-routine (articles)
+(defun spam-stat-unregister-spam-routine (articles)
       (spam-stat-register-spam-routine articles t))
 
-    (defun spam-stat-register-ham-routine (articles &optional unregister)
+(defun spam-stat-register-ham-routine (articles &optional unregister)
       (dolist (article articles)
         (let ((article-string (spam-get-article-as-string article)))
           (with-temp-buffer
@@ -2297,14 +2290,14 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
                 (spam-stat-buffer-change-to-spam)
               (spam-stat-buffer-is-non-spam))))))
 
-    (defun spam-stat-unregister-ham-routine (articles)
+(defun spam-stat-unregister-ham-routine (articles)
       (spam-stat-register-ham-routine articles t))
 
-    (defun spam-maybe-spam-stat-load ()
+(defun spam-maybe-spam-stat-load ()
       (when spam-use-stat (spam-stat-load)))
 
-    (defun spam-maybe-spam-stat-save ()
-      (when spam-use-stat (spam-stat-save)))))
+(defun spam-maybe-spam-stat-save ()
+  (when spam-use-stat (spam-stat-save)))
 
 ;;}}}
 

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog    |    8 ++++++
 lisp/spam-stat.el |    9 ------
 lisp/spam.el      |   73 ++++++++++++++++++++++++-----------------------------
 3 files changed, 41 insertions(+), 49 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project