master 146389f873e: Always display the "Archive" column in the package list

[Philip Kaludercic]

branch: master
commit 146389f873e4e41940127c1ccb5df3f9cf357060
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    Always display the "Archive" column in the package list
    
    * lisp/emacs-lisp/package.el (package-menu-mode): Always display
    column.
    (package-menu--print-info-simple): Always provide column information.
    
    Since NonGNU ELPA has been added to the default value of
    'package-archives', this condition is practically never satisfied,
    meaning the code can be simplified.
---
 lisp/emacs-lisp/package.el | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index a0bb5e75393..0258ed52bee 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -3083,8 +3083,7 @@ The most useful commands here are:
         `[("Package" ,package-name-column-width package-menu--name-predicate)
           ("Version" ,package-version-column-width 
package-menu--version-predicate)
           ("Status"  ,package-status-column-width  
package-menu--status-predicate)
-          ,@(if (cdr package-archives)
-                `(("Archive" ,package-archive-column-width 
package-menu--archive-predicate)))
+          ("Archive" ,package-archive-column-width 
package-menu--archive-predicate)
           ("Description" 0 package-menu--description-predicate)])
   (setq tabulated-list-padding 2)
   (setq tabulated-list-sort-key (cons "Status" nil))
@@ -3512,9 +3511,8 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
                  (package-desc-version pkg)))
               'font-lock-face face)
             ,(propertize status 'font-lock-face face)
-            ,@(if (cdr package-archives)
-                  (list (propertize (or (package-desc-archive pkg) "")
-                                    'font-lock-face face)))
+            ,(propertize (or (package-desc-archive pkg) "")
+                                    'font-lock-face face)
             ,(propertize (package-desc-summary pkg)
                          'font-lock-face 'package-description)])))