Identify unsafe combinations of Bcc and encryption

[gnus] / lisp / spam-report.el

diff --git a/lisp/spam-report.el b/lisp/spam-report.el
index 2f06156..5871b08 100644 (file)
--- a/lisp/spam-report.el
+++ b/lisp/spam-report.el
@@ -1,7 +1,6 @@
 ;;; spam-report.el --- Reporting spam
 
 ;;; spam-report.el --- Reporting spam
 

-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2002-2015 Free Software Foundation, Inc.

 
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: network, spam, mail, gmane, report
 
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: network, spam, mail, gmane, report


@@ -44,7 +43,7 @@ If you are using spam.el, consider setting gnus-spam-process-newsgroups
 or the gnus-group-spam-exit-processor-report-gmane group/topic parameter
 instead."
   :type '(radio (const nil)
 or the gnus-group-spam-exit-processor-report-gmane group/topic parameter
 instead."
   :type '(radio (const nil)

-               (regexp :value "^nntp\+.*:gmane\."))
+               (regexp :value "^nntp\\+.*:gmane\\."))

   :group 'spam-report)
 
 (defcustom spam-report-gmane-use-article-number t
   :group 'spam-report)
 
 (defcustom spam-report-gmane-use-article-number t


@@ -82,7 +81,7 @@ The function must accept the arguments `host' and `report'."
   "Email address that spam articles are resent to when reporting.
 If not set, the user will be prompted to enter a value which will be
 saved for future use."
   "Email address that spam articles are resent to when reporting.
 If not set, the user will be prompted to enter a value which will be
 saved for future use."

-  :type 'string
+  :type '(choice (const :tag "Prompt" nil) string)

   :group 'spam-report)
 
 (defvar spam-report-url-ping-temp-agent-function nil
   :group 'spam-report)
 
 (defvar spam-report-url-ping-temp-agent-function nil


@@ -95,22 +94,21 @@ undo that change.")
   "Report an article as spam by resending via email.
 Reports is as ham when HAM is set."
   (dolist (article articles)
   "Report an article as spam by resending via email.
 Reports is as ham when HAM is set."
   (dolist (article articles)

-    (gnus-message 6 
+    (gnus-message 6

                  "Reporting %s article %d to <%s>..."
                  (if ham "ham" "spam")
                  article spam-report-resend-to)
     (unless spam-report-resend-to
                  "Reporting %s article %d to <%s>..."
                  (if ham "ham" "spam")
                  article spam-report-resend-to)
     (unless spam-report-resend-to

-      (customize-set-variable 
+      (customize-set-variable

        spam-report-resend-to
        (read-from-minibuffer "email address to resend SPAM/HAM to? ")))
        spam-report-resend-to
        (read-from-minibuffer "email address to resend SPAM/HAM to? ")))

-    ;; This is ganked from the `gnus-summary-resend-message' function.
+    ;; This is yanked from the `gnus-summary-resend-message' function.

     ;; It involves rendering the SPAM, which is undesirable, but there does
     ;; not seem to be a nicer way to achieve this.
     ;; select this particular article
     (gnus-summary-select-article nil nil nil article)
     ;; resend it to the destination address
     ;; It involves rendering the SPAM, which is undesirable, but there does
     ;; not seem to be a nicer way to achieve this.
     ;; select this particular article
     (gnus-summary-select-article nil nil nil article)
     ;; resend it to the destination address

-    (save-excursion
-      (set-buffer gnus-original-article-buffer)
+    (with-current-buffer gnus-original-article-buffer

       (message-resend spam-report-resend-to))))
 
 (defun spam-report-resend-ham (articles)
       (message-resend spam-report-resend-to))))
 
 (defun spam-report-resend-ham (articles)


@@ -257,6 +255,7 @@ This is initialized based on `user-mail-address'."
                 80))
          (error "Could not open connection to %s" host))
       (set-marker (process-mark tcp-connection) (point-min))
                 80))
          (error "Could not open connection to %s" host))
       (set-marker (process-mark tcp-connection) (point-min))

+      (gnus-set-process-query-on-exit-flag tcp-connection nil)

       (process-send-string
        tcp-connection
        (format "GET %s HTTP/1.1\nUser-Agent: %s\nHost: %s\n\n"
       (process-send-string
        tcp-connection
        (format "GET %s HTTP/1.1\nUser-Agent: %s\nHost: %s\n\n"


@@ -267,7 +266,7 @@ This is initialized based on `user-mail-address'."
        (gnus-message 7 "Waiting for response from %s..." host)
        (while (and (memq (process-status tcp-connection) '(open run))
                    (zerop (buffer-size)))
        (gnus-message 7 "Waiting for response from %s..." host)
        (while (and (memq (process-status tcp-connection) '(open run))
                    (zerop (buffer-size)))

-         (accept-process-output tcp-connection))
+         (accept-process-output tcp-connection 1))

        (gnus-message 7 "Waiting for response from %s... done" host)))))
 
 ;;;###autoload
        (gnus-message 7 "Waiting for response from %s... done" host)))))
 
 ;;;###autoload


@@ -292,8 +291,7 @@ symbol `ask', query before flushing the queue file."
     (gnus-message 7 "Processing requests using `%s'."
                  spam-report-url-ping-function))
   (or file (setq file spam-report-requests-file))
     (gnus-message 7 "Processing requests using `%s'."
                  spam-report-url-ping-function))
   (or file (setq file spam-report-requests-file))

-  (save-excursion
-    (set-buffer (find-file-noselect file))
+  (with-current-buffer (find-file-noselect file)

     (goto-char (point-min))
     (while (and (not (eobp))
                (re-search-forward
     (goto-char (point-min))
     (while (and (not (eobp))
                (re-search-forward


@@ -309,7 +307,7 @@ symbol `ask', query before flushing the queue file."
     (if (or (eq keep nil)
            (and (eq keep 'ask)
                 (y-or-n-p
     (if (or (eq keep nil)
            (and (eq keep 'ask)
                 (y-or-n-p

-                 (format
+                 (gnus-format-message

                   "Flush requests from `%s'? " (current-buffer)))))
        (progn
          (gnus-message 7 "Flushing request file `%s'"
                   "Flush requests from `%s'? " (current-buffer)))))
        (progn
          (gnus-message 7 "Flushing request file `%s'"


@@ -385,5 +383,4 @@ Process queued spam reports."
 
 (provide 'spam-report)
 
 
 (provide 'spam-report)
 

-;; arch-tag: f6683295-ec89-4ab5-8803-8cc842293022

 ;;; spam-report.el ends here.
 ;;; spam-report.el ends here.