master 8ea1765 2/3: Prefer https for other domains than gnu.org in package URL

[Stefan Kangas]

branch: master
commit 8ea1765fea35e68189ba5edca74d61660950ee8b
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Prefer https for other domains than gnu.org in package URL
    
    * lisp/emacs-lisp/package.el (describe-package-1): Prefer https for
    some other common domains in the package URL.
---
 lisp/emacs-lisp/package.el | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index a0bfcbb..94087d1 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2620,12 +2620,17 @@ Helper function for `describe-package'."
                                      (package-desc-name pkg))))
         (insert "\n")))
     (when homepage
-      ;; Prefer https for the homepage of packages on gnu.org.
-      (if (string-match-p "^http://\\(elpa\\|www\\)\\.gnu\\.org/" homepage)
-          (let ((gnu (cdr (assoc "gnu" package-archives))))
-            (and gnu (string-match-p "^https" gnu)
-                 (setq homepage
-                       (replace-regexp-in-string "^http" "https" homepage)))))
+      ;; Prefer https for the homepage of packages on common domains.
+      (when (string-match-p (rx bol "http://"; (or "elpa." "www." "git." "")
+                                (or "nongnu.org" "gnu.org" "sr.ht"
+                                    "emacswiki.org" "gitlab.com" "github.com")
+                                "/")
+                            homepage)
+        ;; But only if the user has "https" in `package-archives'.
+        (let ((gnu (cdr (assoc "gnu" package-archives))))
+          (and gnu (string-match-p "^https" gnu)
+               (setq homepage
+                     (replace-regexp-in-string "^http" "https" homepage)))))
       (package--print-help-section "Homepage")
       (help-insert-xref-button homepage 'help-url homepage)
       (insert "\n"))