[Emacs-diffs] Changes to emacs/lisp/mh-e/mh-junk.el

[D . Goel]

Index: emacs/lisp/mh-e/mh-junk.el
diff -c emacs/lisp/mh-e/mh-junk.el:1.8 emacs/lisp/mh-e/mh-junk.el:1.9
*** emacs/lisp/mh-e/mh-junk.el:1.8      Mon Jul  4 17:15:52 2005
--- emacs/lisp/mh-e/mh-junk.el  Sun Sep 18 12:48:32 2005
***************
*** 63,71 ****
                                 (substring mh-junk-disposition 1)))
                        (t (concat "+" mh-junk-disposition)))))
        (mh-iterate-on-range msg range
!         (message (format "Blacklisting message %d..." msg))
          (funcall (symbol-function blacklist-func) msg)
!         (message (format "Blacklisting message %d...done" msg))
          (if (not (memq msg mh-seen-list))
              (setq mh-seen-list (cons msg mh-seen-list)))
          (if dest
--- 63,71 ----
                                 (substring mh-junk-disposition 1)))
                        (t (concat "+" mh-junk-disposition)))))
        (mh-iterate-on-range msg range
!         (message "Blacklisting message %d..." msg)
          (funcall (symbol-function blacklist-func) msg)
!         (message "Blacklisting message %d...done" msg)
          (if (not (memq msg mh-seen-list))
              (setq mh-seen-list (cons msg mh-seen-list)))
          (if dest
***************
*** 87,95 ****
      (unless whitelist-func
        (error "Customize `mh-junk-program' appropriately"))
      (mh-iterate-on-range msg range
!       (message (format "Whitelisting message %d..." msg))
        (funcall (symbol-function whitelist-func) msg)
!       (message (format "Whitelisting message %d...done" msg))
        (mh-refile-a-msg nil (intern mh-inbox)))
      (mh-next-msg)))
  
--- 87,95 ----
      (unless whitelist-func
        (error "Customize `mh-junk-program' appropriately"))
      (mh-iterate-on-range msg range
!       (message "Whitelisting message %d..." msg)
        (funcall (symbol-function whitelist-func) msg)
!       (message "Whitelisting message %d...done" msg)
        (mh-refile-a-msg nil (intern mh-inbox)))
      (mh-next-msg)))
  
***************
*** 179,185 ****
          (msg-file (mh-msg-filename msg mh-current-folder))
          (sender))
      (save-excursion
!       (message (format "Reporting message %d..." msg))
        (mh-truncate-log-buffer)
        (call-process mh-spamassassin-executable msg-file mh-log-buffer nil
                      ;;"--report" "--remove-from-whitelist"
--- 179,185 ----
          (msg-file (mh-msg-filename msg mh-current-folder))
          (sender))
      (save-excursion
!       (message "Reporting message %d..." msg)
        (mh-truncate-log-buffer)
        (call-process mh-spamassassin-executable msg-file mh-log-buffer nil
                      ;;"--report" "--remove-from-whitelist"
***************
*** 188,194 ****
            (message "Recategorizing this message as spam...")
            (call-process mh-sa-learn-executable msg-file mh-log-buffer nil
                          "--single" "--spam" "--local" "--no-rebuild"))
!       (message (format "Blacklisting message %d..." msg))
        (set-buffer (get-buffer-create mh-temp-buffer))
        (erase-buffer)
        (call-process (expand-file-name mh-scan-prog mh-progs)
--- 188,194 ----
            (message "Recategorizing this message as spam...")
            (call-process mh-sa-learn-executable msg-file mh-log-buffer nil
                          "--single" "--spam" "--local" "--no-rebuild"))
!       (message "Blacklisting message %d..." msg)
        (set-buffer (get-buffer-create mh-temp-buffer))
        (erase-buffer)
        (call-process (expand-file-name mh-scan-prog mh-progs)
***************
*** 200,207 ****
            (progn
              (setq sender (match-string 0))
              (mh-spamassassin-add-rule "blacklist_from" sender)
!             (message (format "Blacklisting message %d...done" msg)))
!         (message (format "Blacklisting message %d...not done (from my 
address)" msg))))))
  
  (defun mh-spamassassin-whitelist (msg)
    "Whitelist MSG with SpamAssassin.
--- 200,207 ----
            (progn
              (setq sender (match-string 0))
              (mh-spamassassin-add-rule "blacklist_from" sender)
!             (message "Blacklisting message %d...done" msg))
!         (message "Blacklisting message %d...not done (from my address)" 
msg)))))
  
  (defun mh-spamassassin-whitelist (msg)
    "Whitelist MSG with SpamAssassin.
***************
*** 230,243 ****
          (message "Recategorizing this message as ham...")
          (call-process mh-sa-learn-executable msg-file mh-temp-buffer nil
                        "--single" "--ham" "--local --no-rebuild"))
!       (message (format "Whitelisting message %d..." msg))
        (setq from
              (car (mh-funcall-if-exists
                    ietf-drums-parse-address (mh-get-header-field "From:"))))
        (kill-buffer nil)
        (unless (or (null from) (equal from ""))
          (mh-spamassassin-add-rule "whitelist_from" from))
!       (message (format "Whitelisting message %d...done" msg)))))
  
  (defun mh-spamassassin-add-rule (rule body)
    "Add a new rule to `~/.spamassassin/user_prefs'.
--- 230,243 ----
          (message "Recategorizing this message as ham...")
          (call-process mh-sa-learn-executable msg-file mh-temp-buffer nil
                        "--single" "--ham" "--local --no-rebuild"))
!       (message "Whitelisting message %d..." msg)
        (setq from
              (car (mh-funcall-if-exists
                    ietf-drums-parse-address (mh-get-header-field "From:"))))
        (kill-buffer nil)
        (unless (or (null from) (equal from ""))
          (mh-spamassassin-add-rule "whitelist_from" from))
!       (message "Whitelisting message %d...done" msg))))
  
  (defun mh-spamassassin-add-rule (rule body)
    "Add a new rule to `~/.spamassassin/user_prefs'.