From: Teodor Zlatanov <tzz@lifelogs.com>
Date: Tue, 28 Jun 2011 22:18:09 +0000 (+0000)
Subject: Merge changes made in Gnus trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~346
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b7fba43dd3fcfb7fb4798794b20f6197dd8f829;p=emacs.git

Merge changes made in Gnus trunk.

gnus-msg.el (gnus-bug): Add Package and Version pseudo-headers to bug reports.
gnus.el (gnus-bug-package): Use "gnus."
 (gnus-maintainer): Direct bug reports to submit@debbugs.gnu.org.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 839bd519d49..ec7cca9fdff 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-28  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus-msg.el (gnus-bug): Add Package and Version pseudo-headers to bug
+	reports.
+
+	* gnus.el (gnus-bug-package): Use "gnus."
+	(gnus-maintainer): Direct bug reports to submit@debbugs.gnu.org.
+
 2011-06-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-art.el (gnus-article-stop-animations): New function to stop any
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index e256446c016..8e382e02cc3 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1461,6 +1461,8 @@ If YANK is non-nil, include the original article."
     (goto-char (point-min))
     (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))
     (forward-line 1)
+    (insert (format "Package: %s\n" gnus-bug-package))
+    (insert (format "Version: %s\n" (gnus-continuum-version)))
     (insert (gnus-version) "\n"
 	    (emacs-version) "\n")
     (when (and (boundp 'nntp-server-type)
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 20986d25942..9204fcf66b7 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2655,9 +2655,13 @@ such as a mark that says whether an article is stored in the cache
 (defvar gnus-have-read-active-file nil)
 
 (defconst gnus-maintainer
-  "bugs@gnus.org (The Gnus Bugfixing Girls + Boys)"
+  "submit@debbugs.gnu.org (The Gnus Bugfixing Girls + Boys)"
   "The mail address of the Gnus maintainers.")
 
+(defconst gnus-bug-package
+  "gnus"
+  "The package to use in the bug submission.")
+
 (defvar gnus-info-nodes
   '((gnus-group-mode "(gnus)Group Buffer")
     (gnus-summary-mode "(gnus)Summary Buffer")