Remove unnecessary check gnus-nnselect-group-p

* lisp/gnus/gnus-msg.el (gnus-setup-message):
* lisp/gnus/gnus-sum.el (gnus-summary-line-format-alist): No need to
check that we are coming from an nnselect group now that we use
gnus-newsgroup-selection.

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index d7bb440ff54a4894115eef634996f9e798ff31df..cd0bb1423e5d90491c6ba11724b1f1e0c7f7e7b1 100644 (file)
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -430,18 +430,18 @@ 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 (if (and (gnus-nnselect-group-p gnus-newsgroup-name)
-                             gnus-article-reply)
-                        (nnselect-article-number
-                         (or (car-safe gnus-article-reply) gnus-article-reply))
-                      gnus-article-reply))
+          (,article   (when gnus-article-reply
+                        (or (nnselect-article-number
+                             (or (car-safe gnus-article-reply)
+                                 gnus-article-reply))
+                            gnus-article-reply)))
           (,oarticle gnus-article-reply)
           (,yanked gnus-article-yanked-articles)
-          (,group (if (and (gnus-nnselect-group-p gnus-newsgroup-name)
-                           gnus-article-reply)
-                      (nnselect-article-group
-                       (or (car-safe gnus-article-reply) gnus-article-reply))
-                    gnus-newsgroup-name))
+          (,group (when gnus-article-reply
+                    (or (nnselect-article-group
+                         (or (car-safe gnus-article-reply)
+                             gnus-article-reply))
+                        gnus-newsgroup-name)))
           (message-header-setup-hook
            (copy-sequence message-header-setup-hook))
           (mbl mml-buffer-list)

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 1072fe21dde3c66dab015a0f76f798807230d774..29949cd70714b8cd5f1251a8533df14ca8855060 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1388,16 +1388,13 @@ the normal Gnus MIME machinery."
     (?c (or (mail-header-chars gnus-tmp-header) 0) ?d)
     (?k (gnus-summary-line-message-size gnus-tmp-header) ?s)
     (?L gnus-tmp-lines ?s)
-    (?Z (if (gnus-nnselect-group-p gnus-newsgroup-name)
-           (or (nnselect-article-rsv (mail-header-number gnus-tmp-header))
-           0) 0) ?d)
-    (?G (if (gnus-nnselect-group-p gnus-newsgroup-name)
-           (or (nnselect-article-group (mail-header-number gnus-tmp-header))
-           "") "") ?s)
-    (?g (if (gnus-nnselect-group-p gnus-newsgroup-name)
-           (or (gnus-group-short-name
+    (?Z (or (nnselect-article-rsv (mail-header-number gnus-tmp-header))
+           0) ?d)
+    (?G (or (nnselect-article-group (mail-header-number gnus-tmp-header))
+           "") ?s)
+    (?g (or (gnus-group-short-name
             (nnselect-article-group (mail-header-number gnus-tmp-header)))
-           "") "") ?s)
+           "") ?s)
     (?O gnus-tmp-downloaded ?c)
     (?I gnus-tmp-indentation ?s)
     (?T (if (= gnus-tmp-level 0) "" (make-string (frame-width) ? )) ?s)