Patches for message.el message-{sendmail-f-is-evil,elide-elipsis}

[visigoth@naiad.fac.cs.cmu.edu]

Our local setup uses MMDF, and MMDF's sendmail has an irritating habit
of completely destroying the From: line in a message when the -f
switch is present on the sendmail command line.

I also noticed the message-elide-region function new, and since I do
that a lot in my own messages, but use a different style for the
ellipsis, added a variable.

Use this as you see fit--I'd really appreciate the "-f" patch to be
available in some form, however, since (ahem) I've been trying to
convince more of my friends to use Gnus and they've noticed the
problem.

John.

--- message.el.old	Mon Jan  6 05:35:25 1997
+++ message.el	Tue Jan  7 15:01:34 1997
@@ -219,6 +219,9 @@
   :type 'regexp
   :group 'message-various)
 
+(defcustom message-elide-elipsis "\n[...]\n\n"
+  "*The string which is inserted for elided text.")
+
 (defcustom message-interactive nil 
   "Non-nil means when sending a message wait for and display errors.
 nil means let mailer mail back a message to report errors."
@@ -360,6 +363,13 @@
 		 (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."
+  :group 'message-sending
+  :type 'boolean)
+
 ;; qmail-related stuff
 (defcustom message-qmail-inject-program "/var/qmail/bin/qmail-inject"
   "Location of the qmail-inject program."
@@ -1234,14 +1244,13 @@
       (or (bolp) (insert "\n")))))
 
 (defun message-elide-region (b e)
-  "Elide the text between point and mark.
-An ellipsis (\"[...]\") will be inserted where the text was 
-killed."
+  "Elide the text between point and mark.  An ellipsis (from
+message-elide-elipsis) will be inserted where the text was killed."
   (interactive "r")
   (kill-region b e)
   (unless (bolp)
     (insert "\n"))
-  (insert "\n[...]\n\n"))
+  (insert message-elide-elipsis))
 
 (defvar message-caesar-translation-table nil)
 
@@ -1661,7 +1670,10 @@
 			   nil errbuf nil "-oi")
 		     ;; Always specify who from,
 		     ;; since some systems have broken sendmails.
-		     (list "-f" (user-login-name))
+		     ;; But some systems are more broken with -f, so
+		     ;; we'll let users override this.
+		     (if (null message-sendmail-f-is-evil)
+			 (list "-f" (user-login-name)))
 		     ;; These mean "report errors by mail"
 		     ;; and "deliver in background".
 		     (if (null message-interactive) '("-oem" "-odb"))