[Spambayes-checkins] spambayes/contrib muttrc, 1.4, 1.5 spambayes.el, 1.5, 1.6

[Neale Pickett]

Update of /cvsroot/spambayes/spambayes/contrib
In directory sc8-pr-cvs1:/tmp/cvs-serv15297/contrib

Modified Files:
	muttrc spambayes.el 
Log Message:
* s/hammie/sb_filter/
* Contrib file cleanup (more bomb-proof)
* sb_filter options cleanup
* sb_mboxtrain bombproofing (won't try to write out messages if it can't
  parse them)


Index: muttrc
===================================================================
RCS file: /cvsroot/spambayes/spambayes/contrib/muttrc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** muttrc	15 Oct 2003 05:02:08 -0000	1.4
--- muttrc	17 Nov 2003 21:47:47 -0000	1.5
***************
*** 21,28 ****
  ## helping out with the muttisms.
  ##
! macro index S "|sb_filter.py -s | procmail\n"
! macro pager S "|sb_filter.py -s | procmail\n"
! macro index H "|sb_filter.py -g | procmail\n"
! macro pager H "|sb_filter.py -g | procmail\n"
  color index red black "~h 'X-Spambayes-Disposition: spam' ~F"
  
--- 21,28 ----
  ## helping out with the muttisms.
  ##
! macro index S "|sb_filter.py -s -f | procmail\n"
! macro pager S "|sb_filter.py -s -f | procmail\n"
! macro index H "|sb_filter.py -g -f | procmail\n"
! macro pager H "|sb_filter.py -g -f | procmail\n"
  color index red black "~h 'X-Spambayes-Disposition: spam' ~F"
  
***************
*** 33,38 ****
  ## forever.
  ##
! #macro index S "<delete-message>|sb_filter.py -s | procmail\n"
! #macro pager S "<delete-message>|sb_filter.py -s | procmail\n"
! #macro index H "<delete-message>|sb_filter.py -g | procmail\n"
! #macro pager H "<delete-message>|sb_filter.py -g | procmail\n"
--- 33,38 ----
  ## forever.
  ##
! #macro index S "<delete-message>|sb_filter.py -s -f | procmail\n"
! #macro pager S "<delete-message>|sb_filter.py -s -f | procmail\n"
! #macro index H "<delete-message>|sb_filter.py -g -f | procmail\n"
! #macro pager H "<delete-message>|sb_filter.py -g -f | procmail\n"

Index: spambayes.el
===================================================================
RCS file: /cvsroot/spambayes/spambayes/contrib/spambayes.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** spambayes.el	15 Oct 2003 05:02:08 -0000	1.5
--- spambayes.el	17 Nov 2003 21:47:47 -0000	1.6
***************
*** 1,5 ****
  ;; spambayes.el -- integrate spambayes into Gnus and VM
  ;; Copyright (C) 2003 Neale Pickett <neale at woozle.org>
! ;; Time-stamp: <2003-10-14 21:59:11 neale>
  
  ;; This is free software; you can redistribute it and/or modify it under
--- 1,5 ----
  ;; spambayes.el -- integrate spambayes into Gnus and VM
  ;; Copyright (C) 2003 Neale Pickett <neale at woozle.org>
! ;; Time-stamp: <2003-11-17 11:49:29 neale>
  
  ;; This is free software; you can redistribute it and/or modify it under
***************
*** 32,37 ****
  ;;     (define-key gnus-summary-mode-map [(B) (h)] 'spambayes-gnus-refile-as-ham)))
  ;;
! ;; In summary mode, "B h" will refile a message as ham, and "B s",
! ;; appropriately enough, will refile a message as spam.
  ;;
  ;;
--- 32,39 ----
  ;;     (define-key gnus-summary-mode-map [(B) (h)] 'spambayes-gnus-refile-as-ham)))
  ;;
! ;; In summary mode, "B h" will train a message as ham and refile, and "B
! ;; s", appropriately enough, will train a message as spam and refile.
! ;; If you misfile something, simply locate it again and refile
! ;; it--sb_filter will know that you're retraining the message.
  ;;
  ;;
***************
*** 118,132 ****
  		    (with-temp-buffer
  		      (gnus-request-article-this-buffer n group)
! 		      (shell-command-on-region
! 		       (point-min)
! 		       (point-max)
! 		       (concat
! 			spambayes-filter-program
! 			(if is-spam " -s" " -g")
! 			" -f")
! 		       (current-buffer)
! 		       t)
! 		      (gnus-request-replace-article n group (current-buffer)))
! 		    (message "Retrained article.")))
      (let ((group gnus-newsgroup-name)
  	  (list gnus-newsgroup-processable))
--- 120,137 ----
  		    (with-temp-buffer
  		      (gnus-request-article-this-buffer n group)
! 		      (cond
! 		       ((zerop (shell-command-on-region
! 			       (point-min)
! 			       (point-max)
! 			       (concat
! 				spambayes-filter-program
! 				(if is-spam " -s" " -g")
! 				" -f")
! 			       (current-buffer)
! 			       t))
! 			(gnus-request-replace-article n group (current-buffer))
! 			(message "Retrained article."))
! 		       (t
! 			(message "Unable to parse article--leaving it alone."))))))
      (let ((group gnus-newsgroup-name)
  	  (list gnus-newsgroup-processable))