[Emacs-diffs] feature/gnus-select2 7df041f 10/32: Remove unnecessary check gnus-nnselect-group-p

[Andrew G Cohen]

branch: feature/gnus-select2
commit 7df041f6de54e2b86cde8e4f44ac6add947937c2
Author: Andrew G Cohen <address@hidden>
Commit: Andrew G Cohen <address@hidden>

    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.
---
 lisp/gnus/gnus-msg.el | 20 ++++++++++----------
 lisp/gnus/gnus-sum.el | 15 ++++++---------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 4b349d7..52e1a1b 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -431,18 +431,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 08d6775..5654d92 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1386,16 +1386,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)