[Emacs-diffs] /srv/bzr/emacs/trunk r102035: message.el (message-setup-1): Allow message-default-headers to be a function.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102035
author: Gnus developers
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-10-21 22:12:01 +0000
message:
  message.el (message-setup-1): Allow message-default-headers to be a function.
  message.el (message-mode-map): Don't bind M-; to comment region, to allow the 
global comment-dwim to work.
modified:
  doc/misc/ChangeLog
  doc/misc/message.texi
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-10-21 02:31:33 +0000
+++ b/doc/misc/ChangeLog        2010-10-21 22:12:01 +0000
@@ -1,3 +1,8 @@
+2010-10-21  Julien Danjou  <address@hidden>
+
+       * message.texi (Message Headers): Allow message-default-headers to be a
+       function.
+
 2010-10-21  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus-news.texi: Mention new archive defaults.

=== modified file 'doc/misc/message.texi'
--- a/doc/misc/message.texi     2010-10-06 12:38:45 +0000
+++ b/doc/misc/message.texi     2010-10-21 22:12:01 +0000
@@ -1451,7 +1451,7 @@
 @item message-default-headers
 @vindex message-default-headers
 This string is inserted at the end of the headers in all message
-buffers.
+buffers.  If set to a function, the returned results is inserted.
 
 @item message-subject-re-regexp
 @vindex message-subject-re-regexp

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-21 05:36:36 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-21 22:12:01 +0000
@@ -1,3 +1,13 @@
+2010-10-21  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * message.el (message-mode-map): Don't bind M-; to comment region, to
+       allow the global comment-dwim to work.
+
+2010-10-21  Julien Danjou  <address@hidden>
+
+       * message.el (message-setup-1): Allow message-default-headers to be a
+       function.
+
 2010-10-21  Katsumi Yamaoka  <address@hidden>
 
        * shr.el (shr-tag-table): Simplify.

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-10-21 01:49:12 +0000
+++ b/lisp/gnus/message.el      2010-10-21 22:12:01 +0000
@@ -1139,9 +1139,10 @@
   :error "All header lines must be newline terminated")
 
 (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."
+  "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.  If set to a function, it is called and its
+result is inserted."
   :version "23.2"
   :group 'message-headers
   :link '(custom-manual "(message)Message Headers")
@@ -2639,7 +2640,6 @@
 
   (define-key message-mode-map "\C-a" 'message-beginning-of-line)
   (define-key message-mode-map "\t" 'message-tab)
-  (define-key message-mode-map "\M-;" 'comment-region)
 
   (define-key message-mode-map "\M-n" 'message-display-abbrev))
 
@@ -6363,7 +6363,10 @@
    headers)
   (delete-region (point) (progn (forward-line -1) (point)))
   (when message-default-headers
-    (insert message-default-headers)
+    (insert
+     (if (functionp message-default-headers)
+         (funcall message-default-headers)
+       message-default-headers))
     (or (bolp) (insert ?\n)))
   (insert mail-header-separator "\n")
   (forward-line -1)