[Emacs-diffs] /srv/bzr/emacs/trunk r104777: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 104777
author: Teodor Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-06-28 22:18:09 +0000
message:
  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 address@hidden
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-msg.el
  lisp/gnus/gnus.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-06-26 22:21:48 +0000
+++ b/lisp/gnus/ChangeLog       2011-06-28 22:18:09 +0000
@@ -1,3 +1,11 @@
+2011-06-28  Teodor Zlatanov  <address@hidden>
+
+       * 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 address@hidden
+
 2011-06-26  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus-art.el (gnus-article-stop-animations): New function to stop any

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2011-06-26 12:41:14 +0000
+++ b/lisp/gnus/gnus-msg.el     2011-06-28 22:18:09 +0000
@@ -1461,6 +1461,8 @@
     (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)

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2011-05-23 17:57:17 +0000
+++ b/lisp/gnus/gnus.el 2011-06-28 22:18:09 +0000
@@ -2655,9 +2655,13 @@
 (defvar gnus-have-read-active-file nil)
 
 (defconst gnus-maintainer
-  "address@hidden (The Gnus Bugfixing Girls + Boys)"
+  "address@hidden (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")