diff options
| author | Gnus developers <ding@gnus.org> | 2011-07-02 13:26:49 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-07-02 13:26:49 +0000 |
| commit | 67aa99ff0699ce18b97c4a72cdb000c030dbbebe (patch) | |
| tree | 07e65ea1a1c93cbd28a74c1100b336791c3066a8 /lisp/gnus/gnus-msg.el | |
| parent | 6e560c713408d95269e14c879ad3b0b59b536df9 (diff) | |
| download | emacs-67aa99ff0699ce18b97c4a72cdb000c030dbbebe.tar.gz emacs-67aa99ff0699ce18b97c4a72cdb000c030dbbebe.tar.bz2 emacs-67aa99ff0699ce18b97c4a72cdb000c030dbbebe.zip | |
Merge changes made in Gnus trunk.
nnir.el (nnir-run-imap): Allow halting a search when an article is found by setting `shortcut' in 'query.
(nnir-request-article): Use `shortcut' setting when requesting article by Message-ID.
gnus-msg.el (gnus-bug): Give the Version and Package headers to debbugs with the X-Debbugs-Package and X-Debbugs-Version headers. Bring the pseudo-headers back too.
Diffstat (limited to 'lisp/gnus/gnus-msg.el')
| -rw-r--r-- | lisp/gnus/gnus-msg.el | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index 8e382e02cc3..9fdd3bba909 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -1455,7 +1455,12 @@ If YANK is non-nil, include the original article." (goto-char (point-min))) (message-pop-to-buffer "*Gnus Bug*")) (let ((message-this-is-mail t)) - (message-setup `((To . ,gnus-maintainer) (Subject . "")))) + (message-setup `((To . ,gnus-maintainer) + (Subject . "") + (X-Debbugs-Package + . ,(format "%s" gnus-bug-package)) + (X-Debbugs-Version + . ,(format "%s" (gnus-continuum-version)))))) (when gnus-bug-create-help-buffer (push `(gnus-bug-kill-buffer) message-send-actions)) (goto-char (point-min)) @@ -1463,6 +1468,7 @@ If YANK is non-nil, include the original article." (forward-line 1) (insert (format "Package: %s\n" gnus-bug-package)) (insert (format "Version: %s\n" (gnus-continuum-version))) + (insert "\n") (insert (gnus-version) "\n" (emacs-version) "\n") (when (and (boundp 'nntp-server-type) @@ -1474,7 +1480,10 @@ If YANK is non-nil, include the original article." (erase-buffer) (gnus-debug) (setq text (buffer-string))) - (insert "<#part type=application/emacs-lisp disposition=inline description=\"User settings\">\n" text "\n<#/part>")) + (insert (concat "<#part type=application/emacs-lisp" + "disposition=inline description=\"User settings\">\n" + text + "\n<#/part>"))) (goto-char (point-min)) (search-forward "Subject: " nil t) (message ""))) |