summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-msg.el
diff options
context:
space:
mode:
authorAndrew Cohen <cohen@andy.bu.edu>2013-04-04 22:15:25 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2013-04-04 22:15:25 +0000
commit567d89caf1304c780e3cedc9db4c31a2ce57d588 (patch)
tree9b1e70a237ac4ca17242257f5b9b4202a1d2ec86 /lisp/gnus/gnus-msg.el
parent47d038b3af124e8244e5c8248a71dc169f5dfaac (diff)
downloademacs-567d89caf1304c780e3cedc9db4c31a2ce57d588.tar.gz
gnus-msg.el: Fix detection of nnir group
Diffstat (limited to 'lisp/gnus/gnus-msg.el')
-rw-r--r--lisp/gnus/gnus-msg.el19
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 7503afdab36..36135556c73 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -417,6 +417,7 @@ Thank you for your help in stamping out bugs.
(autoload 'nnir-article-number "nnir" nil nil 'macro)
(autoload 'nnir-article-group "nnir" nil nil 'macro)
+(autoload 'gnus-nnir-group-p "nnir")
(defvar gnus-article-reply nil)
@@ -430,17 +431,15 @@ Thank you for your help in stamping out bugs.
`(let ((,winconf (current-window-configuration))
(,winconf-name gnus-current-window-configuration)
(,buffer (buffer-name (current-buffer)))
- (,article (or (when (and
- (string-match "^nnir:" gnus-newsgroup-name)
- gnus-article-reply)
- (nnir-article-number gnus-article-reply))
- gnus-article-reply))
- (,yanked gnus-article-yanked-articles)
- (,group (or (when (and
- (string-match "^nnir:" gnus-newsgroup-name)
+ (,article (if (and (gnus-nnir-group-p gnus-newsgroup-name)
gnus-article-reply)
- (nnir-article-group gnus-article-reply))
- gnus-newsgroup-name))
+ (nnir-article-number gnus-article-reply)
+ gnus-article-reply))
+ (,yanked gnus-article-yanked-articles)
+ (,group (if (and (gnus-nnir-group-p gnus-newsgroup-name)
+ gnus-article-reply)
+ (nnir-article-group gnus-article-reply)
+ gnus-newsgroup-name))
(message-header-setup-hook
(copy-sequence message-header-setup-hook))
(mbl mml-buffer-list)