From mboxrd@z Thu Jan  1 00:00:00 1970
X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/12254
Path: main.gmane.org!not-for-mail
From: Matt Simmons <simmonmt@acm.org>
Newsgroups: gmane.emacs.gnus.general
Subject: [Patch] Message mode headers list
Date: 21 Sep 1997 14:32:13 -0500
Message-ID: <yfqyb4qa2f6.fsf@acm.org>
Reply-To: simmonmt@acm.org
NNTP-Posting-Host: coloc-standby.netfonds.no
Mime-Version: 1.0 (generated by tm-edit 7.108)
Content-Type: multipart/mixed;
 boundary="Multipart_Sun_Sep_21_14:32:12_1997-1"
Content-Transfer-Encoding: 7bit
X-Trace: main.gmane.org 1035151823 2776 80.91.224.250 (20 Oct 2002 22:10:23 GMT)
X-Complaints-To: usenet@main.gmane.org
NNTP-Posting-Date: Sun, 20 Oct 2002 22:10:23 +0000 (UTC)
Return-Path: <ding-request@ifi.uio.no>
Original-Received: from xemacs.org (xemacs.cs.uiuc.edu [128.174.252.16])
	by altair.xemacs.org (8.8.7/8.8.7) with ESMTP id NAA21220
	for <steve@altair.xemacs.org>; Sun, 21 Sep 1997 13:18:03 -0700
Original-Received: from ifi.uio.no (0@ifi.uio.no [129.240.64.2])
	by xemacs.org (8.8.5/8.8.5) with SMTP id PAA26444
	for <steve@xemacs.org>; Sun, 21 Sep 1997 15:14:03 -0500 (CDT)
Original-Received: from claymore.vcinet.com (claymore.vcinet.com [208.205.12.23]) by ifi.uio.no with SMTP (8.6.11/ifi2.4) 
	id <VAA22460@ifi.uio.no> for <ding@ifi.uio.no> ; Sun, 21 Sep 1997 21:32:12 +0200
Original-Received: (qmail 7750 invoked by uid 504); 21 Sep 1997 19:32:11 -0000
Original-Received: (qmail 7747 invoked from network); 21 Sep 1997 19:32:09 -0000
Original-Received: from chw-il5-36.ix.netcom.com (HELO belle.matt.cs.purdue.edu) (simmonmt@198.211.138.100)
  by claymore.vcinet.com with SMTP; 21 Sep 1997 19:32:08 -0000
Original-Received: (from simmonmt@localhost)
	by belle.matt.cs.purdue.edu (8.8.7/8.8.7) id OAA22273;
	Sun, 21 Sep 1997 14:32:13 -0500 (CDT)
Original-To: ding@gnus.org
X-URL: http://www.netcom.com/~simmonmt
X-Face: (aoaCkX|WOga191DJ0^|`Ts@Mjbxfi.@8&005AV$(HKiy\>F'^Pfu{1R(iz{T!F}Qge
        w@)|"Q2c6gdiKhi+|wH5:f9r~2HHTI(}lX-_L+=NwLNW+R?ldynHjE_Do-*@;6K[z9|
        KS#Y)<DntUB$tcp)w=RGHZzQ"Z,lVo:/+Wj
Original-Lines: 194
X-Mailer: Quassia Gnus v0.8/XEmacs 20.3(beta23) - "Sarajevo"
Xref: main.gmane.org gmane.emacs.gnus.general:12254
X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:12254

--Multipart_Sun_Sep_21_14:32:12_1997-1
Content-Type: text/plain; charset=US-ASCII

I changed message.el such that message-default-mail-headers,
message-default-news-headers, and message-default-headers can be a bit 
more flexible.  Specifically, they can be:

    1) A string - the string will be inserted as before
    2) A function - the function will be evaluated, and the string it
                    returns will be used as the headers to be inserted
    3) A list - the list can contain strings and/or functions.  They
                will be evaluated one at a time as in 1 and 2.  The
                results of the evaluation will be concatenated and
                used as headers.

I also took a crack at modifying the customization stuff for the three 
variables, but I don't know how successful I was.

The motivation for this change?  I need some way to insert the output
from a random X-Face function I wrote (see my web page) along with the 
other default headers I set up.

Matt

-- 
     Matt Simmons  -  simmonmt@acm.org  -  http://www.netcom.com/~simmonmt
     Television:  A medium.  So called because it is neither rare nor well
			     done.  --Ernie Kovacs

--Multipart_Sun_Sep_21_14:32:12_1997-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="message.patch"
Content-Transfer-Encoding: 7bit

*** /tmp/T0a005Rx	Sun Sep 21 14:31:37 1997
--- message.el	Sun Sep 21 14:30:04 1997
***************
*** 538,561 ****
    "A list of actions to be performed after postponing a message.")
  
  (defcustom message-default-headers ""
!   "*A string containing header lines to be inserted in outgoing messages.
  It is inserted before you edit the message, so you can edit or delete
! these lines."
    :group 'message-headers
!   :type 'string)
  
  (defcustom message-default-mail-headers ""
!   "*A string of header lines to be inserted in outgoing mails."
    :group 'message-headers
    :group 'message-mail
!   :type 'string)
  
  (defcustom message-default-news-headers ""
!   "*A string of header lines to be inserted in outgoing news
! articles."
    :group 'message-headers
    :group 'message-news
!   :type 'string)
  
  ;; Note: could use /usr/ucb/mail instead of sendmail;
  ;; options -t, and -v if not interactive.
--- 538,580 ----
    "A list of actions to be performed after postponing a message.")
  
  (defcustom message-default-headers ""
!   "*Header lines to be inserted in outgoing messages.
  It is inserted before you edit the message, so you can edit or delete
! these lines.  It can be one of three things:
!      1) A string to be inserted as-is
!      2) A function that, when evaluated, will return a string
!   or 3) A list of one or more of the above."
    :group 'message-headers
!   :type '(choice string
! 		 (function fun)
! 		 (list (choice string
! 			       (function fun)))))
  
  (defcustom message-default-mail-headers ""
!   "*Header lines to be inserted in outgoing mails.
! This can be one of three things:
!      1) A string to be inserted as-is
!      2) A function that, when evaluated, will return a string
!   or 3) A list of one or more of the above."
    :group 'message-headers
    :group 'message-mail
!   :type '(choice string
! 		 (function fun)
! 		 (list (choice string
! 			       (function fun)))))
  
  (defcustom message-default-news-headers ""
!   "*Header lines to be inserted in outgoing news.
! This can be one of three things:
!      1) A string to be inserted as-is
!      2) A function that, when evaluated, will return a string
!   or 3) A list of one or more of the above."
    :group 'message-headers
    :group 'message-news
!   :type '(choice string
! 		 (function fun)
! 		 (list (choice string
! 			       (function fun)))))
  
  ;; Note: could use /usr/ucb/mail instead of sendmail;
  ;; options -t, and -v if not interactive.
***************
*** 2696,2701 ****
--- 2715,2746 ----
    (or mail-host-address
        (message-make-fqdn)))
  
+ (defun message-make-default-headers (hlist)
+   "Return default mail headers.
+ Build string consisting of headers indicated by hlist.  (See documentation
+ for `message-default-headers', `message-default-mail-headers' and
+ `message-default-news-headers')"
+   (let ((retstr nil)
+ 	thishdr)
+     (if (not (listp hlist))
+ 	(setq hlist (list hlist)))
+     (while hlist
+       (setq thishdr (pop hlist))
+       (setq retstr
+ 	    (concat retstr
+ 		    (cond ((stringp thishdr)
+ 			   thishdr)
+ 			  ((functionp thishdr)
+ 			   (funcall thishdr))
+ 			  ((listp thishdr)
+ 			   ;; anybody who needs this code has issues
+ 			   (setq hlist (append thishdr hlist))
+ 			   nil)
+ 			  (t (error "Unknown header element %S" thishdr))))))
+     retstr))
+ 	     
+     
+ 
  (defun message-generate-headers (headers)
    "Prepare article HEADERS.
  Headers already prepared in the buffer are not modified."
***************
*** 2997,3003 ****
     headers)
    (delete-region (point) (progn (forward-line -1) (point)))
    (when message-default-headers
!     (insert message-default-headers))
    (put-text-property
     (point)
     (progn
--- 3042,3048 ----
     headers)
    (delete-region (point) (progn (forward-line -1) (point)))
    (when message-default-headers
!     (insert (message-make-default-headers message-default-headers)))
    (put-text-property
     (point)
     (progn
***************
*** 3007,3013 ****
    (forward-line -1)
    (when (message-news-p)
      (when message-default-news-headers
!       (insert message-default-news-headers))
      (when message-generate-headers-first
        (message-generate-headers
         (delq 'Lines
--- 3052,3058 ----
    (forward-line -1)
    (when (message-news-p)
      (when message-default-news-headers
!       (insert (message-make-default-headers message-default-news-headers)))
      (when message-generate-headers-first
        (message-generate-headers
         (delq 'Lines
***************
*** 3015,3021 ****
  		   (copy-sequence message-required-news-headers))))))
    (when (message-mail-p)
      (when message-default-mail-headers
!       (insert message-default-mail-headers))
      (when message-generate-headers-first
        (message-generate-headers
         (delq 'Lines
--- 3060,3066 ----
  		   (copy-sequence message-required-news-headers))))))
    (when (message-mail-p)
      (when message-default-mail-headers
!       (insert (message-make-default-headers message-default-mail-headers)))
      (when message-generate-headers-first
        (message-generate-headers
         (delq 'Lines

--Multipart_Sun_Sep_21_14:32:12_1997-1--