Applied a bunch of patches:

[gnus] / lisp / message.el

diff --git a/lisp/message.el b/lisp/message.el
index 20f430c..a17617d 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -384,10 +384,9 @@ always query the user whether to use the value.  If it is the symbol
                 (const use)
                 (const ask)))
 
-;; stuff relating to broken sendmail in MMDF
 (defcustom message-sendmail-f-is-evil nil
-  "*Non-nil means that \"-f username\" should not be added to the sendmail
-command line, because it is even more evil than leaving it out."
+  "*Non-nil means that \"-f username\" should not be added to the sendmail command line.
+Doing so would be even more evil than leaving it out."
   :group 'message-sending
   :type 'boolean)
 
@@ -2215,11 +2214,7 @@ the user from the mailer."
                     ;; But some systems are more broken with -f, so
                     ;; we'll let users override this.
                     (if (null message-sendmail-f-is-evil)
-                        (list "-f"
-                              (if (null user-mail-address)
-                                  (user-login-name)
-                                (user-mail-address))
-                              ))
+                        (list "-f" (message-make-address)))
                     ;; These mean "report errors by mail"
                     ;; and "deliver in background".
                     (if (null message-interactive) '("-oem" "-odb"))
@@ -3205,8 +3200,8 @@ Headers already prepared in the buffer are not modified."
 
 (defun message-shorten-1 (list cut surplus)
   ;; Cut SURPLUS elements out of LIST, beginning with CUTth one.
-  (setcdr (nthcdr (- cut 2) refs)
-         (nthcdr (+ (- cut 2) surplus 1) refs)))
+  (setcdr (nthcdr (- cut 2) list)
+         (nthcdr (+ (- cut 2) surplus 1) list)))
 
 (defun message-shorten-references (header references)
   "Trim REFERENCES to be less than 31 Message-ID long, and fold them.