From mboxrd@z Thu Jan  1 00:00:00 1970
X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/9283
Path: main.gmane.org!not-for-mail
From: visigoth@naiad.fac.cs.cmu.edu
Newsgroups: gmane.emacs.gnus.general
Subject: Patches for message.el message-{sendmail-f-is-evil,elide-elipsis}
Date: 07 Jan 1997 15:08:35 -0500
Sender: visigoth@naiad.fac.cs.cmu.edu
Message-ID: <vpdohf18czg.fsf@naiad.fac.cs.cmu.edu>
NNTP-Posting-Host: coloc-standby.netfonds.no
Mime-Version: 1.0 (generated by tm-edit 7.93)
Content-Type: text/plain; charset=US-ASCII
X-Trace: main.gmane.org 1035149329 17467 80.91.224.250 (20 Oct 2002 21:28:49 GMT)
X-Complaints-To: usenet@main.gmane.org
NNTP-Posting-Date: Sun, 20 Oct 2002 21:28:49 +0000 (UTC)
Return-Path: <ding-request@ifi.uio.no>
Original-Received: from ifi.uio.no (0@ifi.uio.no [129.240.64.2])
          by deanna.miranova.com (8.8.4/8.8.4) with SMTP
	  id MAA32726 for <steve@miranova.com>; Tue, 7 Jan 1997 12:32:02 -0800
Original-Received: from naiad.fac.cs.cmu.edu (NAIAD.FAC.CS.CMU.EDU [128.2.191.173]) by ifi.uio.no with SMTP (8.6.11/ifi2.4) 
	id <VAA05889@ifi.uio.no> for <ding@ifi.uio.no> ; Tue, 7 Jan 1997 21:08:53 +0100
Original-To: ding@ifi.uio.no
Original-Lines: 72
X-Mailer: Red Gnus v0.76/XEmacs 19.14
Source-Info: Sender is really visigoth@naiad.fac.cs.cmu.edu
Xref: main.gmane.org gmane.emacs.gnus.general:9283
X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:9283

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"))