Small patch to emacsbug.el

Small patch to emacsbug.el

[Peder O. Klingenberg]

[-- Attachment #1: Type: text/plain, Size: 844 bytes --]

Earlier today I was bitten by something that has irritated be before as
well.  When reporting bugs from an "emacs -Q", emacs doesn't know my
email address.  No problem, I can edit the From: header.

However, I like to use my local sendmail as transport, because I have
already told that how and where to forward my mail, and it seems like a
perfectly good option.  But message.el then decides to make up its own
envelope-from, regardless of From: header.  That makes the mail bounce.

Attached is a patch to emacsbug.el that checks if what message.el would
do results in a bogus address, and if so, defaults to the From: header
instead.

(This is my first patch submission, let me know if it should be done
differently.  Copyright paperwork is on file since ages ago.)

...Peder...
-- 
I wish a new life awaited _me_ in some off-world colony.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: emacsbug.patch --]
[-- Type: text/x-diff, Size: 2288 bytes --]

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 821d4fd..75317c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-28  Peder O. Klingenberg  <peder@klingenberg.no>
+
+	* mail/emacsbug.el (report-emacs-bug): Make a better guess at
+	  envelope-from when reporting through sendmail.
+
 2014-10-24  Martin Rudalics  <rudalics@gmx.at>
 
 	* mouse.el (mouse-drag-line): Don't use mouse-pixel-position.
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 9145150..4ed212e 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -137,6 +137,12 @@ This requires either the OS X \"open\" command, or the freedesktop
 			   (concat "mailto:" to)))
 	(error "Subject, To or body not found")))))
 
+;; It's the default mail mode, so it seems OK to use its features.
+(autoload 'message-bogus-recipient-p "message")
+(autoload 'message-make-address "message")
+(defvar message-send-mail-function)
+(defvar message-sendmail-envelope-from)
+
 ;;;###autoload
 (defun report-emacs-bug (topic &optional recent-keys)
   "Report a bug in GNU Emacs.
@@ -165,7 +171,12 @@ Prompts for bug subject.  Leaves you in a mail buffer."
       ;; that report-emacs-bug-orig-text remains valid.  (Bug#5178)
       (message-sort-headers)
       ;; Stop message-mode stealing the properties we will add.
-      (set (make-local-variable 'message-strip-special-text-properties) nil))
+      (set (make-local-variable 'message-strip-special-text-properties) nil)
+      ;; Make sure we default to the From: address as envelope when sending
+      ;; through sendmail.
+      (when (and (not message-sendmail-envelope-from)
+		 (message-bogus-recipient-p (message-make-address)))
+	(set (make-local-variable 'message-sendmail-envelope-from) 'header)))
     (rfc822-goto-eoh)
     (forward-line 1)
     ;; Move the mail signature to the proper place.
@@ -364,10 +375,6 @@ usually do not have translators for other languages.\n\n")))
 
 (define-obsolete-function-alias 'report-emacs-bug-info 'info-emacs-bug "24.3")
 
-;; It's the default mail mode, so it seems OK to use its features.
-(autoload 'message-bogus-recipient-p "message")
-(defvar message-send-mail-function)
-
 (defun report-emacs-bug-hook ()
   "Do some checking before sending a bug report."
   (save-excursion

Re: Small patch to emacsbug.el

[Eli Zaretskii]

> From: peder@news.klingenberg.no (Peder O. Klingenberg)
> Date: Tue, 28 Oct 2014 14:49:55 +0100
> 
> +;; It's the default mail mode, so it seems OK to use its features.
> +(autoload 'message-bogus-recipient-p "message")
> +(autoload 'message-make-address "message")
> +(defvar message-send-mail-function)
> +(defvar message-sendmail-envelope-from)

What if the user overrides that default, and uses a different mail
mode?

Re: Small patch to emacsbug.el

[Peder O. Klingenberg]

On Tue, Oct 28 2014 at 18:16, Eli Zaretskii wrote:

> What if the user overrides that default, and uses a different mail
> mode?

Then I guess that user will have some unused functions loaded, as well
as some variables defined that she has no use for?  I was basically just
cargo-culting the existing code.

Existing code in emacsbug.el has 

  ;; It's the default mail mode, so it seems OK to use its features.
  (autoload 'message-bogus-recipient-p "message")
  (defvar message-send-mail-function)

I just added one more function and one more variable, and moved the
whole bunch, including comment, earlier in the file, because I used
those functions earlier in the file and thought it logical to place the
definitions before the uses.

Autoload of one function causes the entire file to be loaded, does it
not?  So my additions are more for documentation purposes than any
actual functional change.

...Peder...
-- 
I wish a new life awaited _me_ in some off-world colony.