[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/mail/uce.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/mail/uce.el |
Date: |
Fri, 04 Apr 2003 01:22:37 -0500 |
Index: emacs/lisp/mail/uce.el
diff -c emacs/lisp/mail/uce.el:1.10 emacs/lisp/mail/uce.el:1.11
*** emacs/lisp/mail/uce.el:1.10 Sun Feb 17 12:00:33 2002
--- emacs/lisp/mail/uce.el Tue Feb 4 08:14:00 2003
***************
*** 117,123 ****
(require 'sendmail)
;; Those sections of code which are dependent upon
;; RMAIL are only evaluated if we have received a message with RMAIL...
! ;;(require 'rmail)
(defgroup uce nil
"Facilitate reply to unsolicited commercial email."
--- 117,123 ----
(require 'sendmail)
;; Those sections of code which are dependent upon
;; RMAIL are only evaluated if we have received a message with RMAIL...
! ;;(require 'rmail)
(defgroup uce nil
"Facilitate reply to unsolicited commercial email."
***************
*** 137,143 ****
:type 'hook
:group 'uce)
! (defcustom uce-message-text
"Recently, I have received an Unsolicited Commercial E-mail from you.
I do not like UCE's and I would like to inform you that sending
unsolicited messages to someone while he or she may have to pay for
--- 137,143 ----
:type 'hook
:group 'uce)
! (defcustom uce-message-text
"Recently, I have received an Unsolicited Commercial E-mail from you.
I do not like UCE's and I would like to inform you that sending
unsolicited messages to someone while he or she may have to pay for
***************
*** 148,155 ****
services you are mistaken. Spamming will only make people hate you, not
buy from you.
! If you have any list of people you send unsolicited commercial emails to,
! REMOVE me from such list immediately. I suggest that you make this list
just empty.
----------------------------------------------------
--- 148,155 ----
services you are mistaken. Spamming will only make people hate you, not
buy from you.
! If you have any list of people you send unsolicited commercial emails to,
! REMOVE me from such list immediately. I suggest that you make this list
just empty.
----------------------------------------------------
***************
*** 192,198 ****
:group 'uce)
(defcustom uce-signature mail-signature
! "Text to put as your signature after the note to UCE sender.
Value nil means none, t means insert `~/.signature' file (if it happens
to exist), if this variable is a string this string will be inserted
as your signature."
--- 192,198 ----
:group 'uce)
(defcustom uce-signature mail-signature
! "Text to put as your signature after the note to UCE sender.
Value nil means none, t means insert `~/.signature' file (if it happens
to exist), if this variable is a string this string will be inserted
as your signature."
***************
*** 221,227 ****
(let ((message-buffer
(cond ((eq uce-mail-reader 'gnus) gnus-original-article-buffer)
((eq uce-mail-reader 'rmail) "RMAIL")
! (t (error
"Variable uce-mail-reader set to unrecognized value"))))
(full-header-p (and (eq uce-mail-reader 'rmail)
(not (rmail-msg-is-pruned)))))
--- 221,227 ----
(let ((message-buffer
(cond ((eq uce-mail-reader 'gnus) gnus-original-article-buffer)
((eq uce-mail-reader 'rmail) "RMAIL")
! (t (error
"Variable uce-mail-reader set to unrecognized value"))))
(full-header-p (and (eq uce-mail-reader 'rmail)
(not (rmail-msg-is-pruned)))))
***************
*** 246,252 ****
end-of-hostname (string-match "[ ,>]" to first-at-sign)
sender-host (substring to first-at-sign end-of-hostname))
(if (string-match "\\." sender-host)
! (setq to (format "%s, postmaster%s, abuse%s"
to sender-host sender-host))))
(setq mail-send-actions nil)
(setq mail-reply-buffer nil)
--- 246,252 ----
end-of-hostname (string-match "[ ,>]" to first-at-sign)
sender-host (substring to first-at-sign end-of-hostname))
(if (string-match "\\." sender-host)
! (setq to (format "%s, postmaster%s, abuse%s"
to sender-host sender-host))))
(setq mail-send-actions nil)
(setq mail-reply-buffer nil)
***************
*** 258,264 ****
(rmail-toggle-header 1)
(widen)
(rmail-maybe-set-message-counters)
! (copy-region-as-kill (rmail-msgbeg rmail-current-message)
(rmail-msgend rmail-current-message))))))
;; Restore the pruned header state we found.
(if full-header-p
--- 258,264 ----
(rmail-toggle-header 1)
(widen)
(rmail-maybe-set-message-counters)
! (copy-region-as-kill (rmail-msgbeg rmail-current-message)
(rmail-msgend rmail-current-message))))))
;; Restore the pruned header state we found.
(if full-header-p
***************
*** 286,292 ****
(beginning-of-buffer)
(search-forward "*** EOOH ***\n")
(beginning-of-line)
! (forward-line -1)))
(re-search-backward "^Received:")
(beginning-of-line)
;; Is this always good? It's the only thing I saw when I checked
--- 286,292 ----
(beginning-of-buffer)
(search-forward "*** EOOH ***\n")
(beginning-of-line)
! (forward-line -1)))
(re-search-backward "^Received:")
(beginning-of-line)
;; Is this always good? It's the only thing I saw when I checked
***************
*** 304,310 ****
(forward-char -1)
;; And add its postmaster to the list of addresses.
(if (string-match "\\." (buffer-substring temp (point)))
! (setq to (format "%s, address@hidden"
to (buffer-substring temp (point)))))
;; Also look at the message-id, it helps *very* often.
(if (and (search-forward "\nMessage-Id: " nil t)
--- 304,310 ----
(forward-char -1)
;; And add its postmaster to the list of addresses.
(if (string-match "\\." (buffer-substring temp (point)))
! (setq to (format "%s, address@hidden"
to (buffer-substring temp (point)))))
;; Also look at the message-id, it helps *very* often.
(if (and (search-forward "\nMessage-Id: " nil t)
***************
*** 320,326 ****
(search-forward ">")
(forward-char -1)
(if (string-match "\\." (buffer-substring temp (point)))
! (setq to (format "%s, address@hidden"
to (buffer-substring temp (point)))))))
(cond ((eq uce-mail-reader 'gnus)
;; Does Gnus always have Lines: in the end?
--- 320,326 ----
(search-forward ">")
(forward-char -1)
(if (string-match "\\." (buffer-substring temp (point)))
! (setq to (format "%s, address@hidden"
to (buffer-substring temp (point)))))))
(cond ((eq uce-mail-reader 'gnus)
;; Does Gnus always have Lines: in the end?
***************
*** 384,390 ****
;; might be to set up special key bindings, replace standart
;; functions in mail-mode, etc.
(run-hooks 'mail-setup-hook 'uce-setup-hook))))
!
(defun uce-insert-ranting (&optional ignored)
"Insert text of the usual reply to UCE into current buffer."
(interactive "P")
--- 384,390 ----
;; might be to set up special key bindings, replace standart
;; functions in mail-mode, etc.
(run-hooks 'mail-setup-hook 'uce-setup-hook))))
!
(defun uce-insert-ranting (&optional ignored)
"Insert text of the usual reply to UCE into current buffer."
(interactive "P")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/mail/uce.el,
Miles Bader <=