[gnus git] branch master updated: =1= message: implement a better fix for reference in first generation

       via  2fcca7dbbfa88379ee30b074cf731868a2df6edf (commit)
      from  9adfe4a952f2b51c1080ab941930ef5e831cf1d9 (commit)


- Log -----------------------------------------------------------------
commit 2fcca7dbbfa88379ee30b074cf731868a2df6edf
Author: Julien Danjou <[email protected]>
Date:   Thu Feb 3 15:39:03 2011 +0100

    message: implement a better fix for reference in first generation
    
    Signed-off-by: Julien Danjou <[email protected]>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6e145c..feb0742 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-02-03  Julien Danjou  <[email protected]>
 
+	* message.el (message-setup-1): Always generate References first.
+
 	* gnus.el (gnus-summary-line-format): Add missing semi-colon for
 	user-date in docstring.
 
diff --git a/lisp/message.el b/lisp/message.el
index fc37662..bc92a6d 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -897,11 +897,7 @@ variable isn't used."
   ;; create a dependence to `gnus.el'.
   :type 'sexp)
 
-;; FIXME: This should be a temporary workaround until someone implements a
-;; proper solution.  If a crash happens while replying, the auto-save file
-;; will *not* have a `References:' header if `message-generate-headers-first'
-;; is nil.  See: http://article.gmane.org/gmane.emacs.gnus.general/51138
-(defcustom message-generate-headers-first '(references)
+(defcustom message-generate-headers-first nil
   "Which headers should be generated before starting to compose a message.
 If t, generate all required headers.  This can also be a list of headers to
 generate.  The variables `message-required-news-headers' and
@@ -913,7 +909,6 @@ will not have a visible effect for those headers."
   :group 'message-headers
   :link '(custom-manual "(message)Message Headers")
   :type '(choice (const :tag "None" nil)
-		 (const :tag "References" '(references))
 		 (const :tag "All" t)
 		 (repeat (sexp :tag "Header"))))
 
@@ -6451,22 +6446,25 @@ are not included."
     (or (bolp) (insert ?\n)))
   (insert mail-header-separator "\n")
   (forward-line -1)
+  ;; If a crash happens while replying, the auto-save file would *not* have a
+  ;; `References:' header if `message-generate-headers-first' was nil.
+  ;; Therefore, always generate it first.
+  (let ((message-generate-headers-first
+         (append message-generate-headers-first '(References))))
   (when (message-news-p)
     (when message-default-news-headers
       (insert message-default-news-headers)
       (or (bolp) (insert ?\n)))
-    (when message-generate-headers-first
       (message-generate-headers
        (message-headers-to-generate
 	(append message-required-news-headers
 		message-required-headers)
-	message-generate-headers-first
-	'(Lines Subject)))))
+        (append message-generate-headers-first '(References))
+        '(Lines Subject))))
   (when (message-mail-p)
     (when message-default-mail-headers
       (insert message-default-mail-headers)
       (or (bolp) (insert ?\n)))
-    (when message-generate-headers-first
       (message-generate-headers
        (message-headers-to-generate
 	(append message-required-mail-headers

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog  |    2 ++
 lisp/message.el |   46 ++++++++++++++++++++++------------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project