diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 94087d172c9..62f5fc73417 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1118,7 +1118,7 @@ is wrapped around any parts requiring it." (declare-function lm-header "lisp-mnt" (header)) (declare-function lm-header-multiline "lisp-mnt" (header)) -(declare-function lm-homepage "lisp-mnt" (&optional file)) +(declare-function lm-website "lisp-mnt" (&optional file)) (declare-function lm-keywords-list "lisp-mnt" (&optional file)) (declare-function lm-maintainers "lisp-mnt" (&optional file)) (declare-function lm-authors "lisp-mnt" (&optional file)) @@ -1153,7 +1153,7 @@ boundaries." (or (lm-header "package-version") (lm-header "version"))) (pkg-version (package-strip-rcs-id version-info)) (keywords (lm-keywords-list)) - (homepage (lm-homepage))) + (website (lm-website))) (unless pkg-version (if version-info (error "Unrecognized package version: %s" version-info) @@ -1164,7 +1164,7 @@ boundaries." (package--prepare-dependencies (package-read-from-string (mapconcat #'identity require-lines " ")))) :kind 'single - :url homepage + :url website :keywords keywords :maintainer ;; For backward compatibility, use a single string if there's only @@ -2170,7 +2170,7 @@ Otherwise return nil." ;; to make sure we use a "canonical name"! (if l (package-version-join l))))) -(declare-function lm-homepage "lisp-mnt" (&optional file)) +(declare-function lm-website "lisp-mnt" (&optional file)) ;;;###autoload (defun package-install-from-buffer () @@ -2506,7 +2506,7 @@ Helper function for `describe-package'." (version (if desc (package-desc-version desc))) (archive (if desc (package-desc-archive desc))) (extras (and desc (package-desc-extras desc))) - (homepage (cdr (assoc :url extras))) + (website (cdr (assoc :url extras))) (commit (cdr (assoc :commit extras))) (keywords (if desc (package-desc--keywords desc))) (built-in (eq pkg-dir 'builtin)) @@ -2619,20 +2619,20 @@ Helper function for `describe-package'." (help-insert-xref-button text 'help-package (package-desc-name pkg)))) (insert "\n"))) - (when homepage - ;; Prefer https for the homepage of packages on common domains. + (when website + ;; Prefer https for the website 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) + website) ;; 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) + (setq website + (replace-regexp-in-string "^http" "https" website))))) + (package--print-help-section "Website") + (help-insert-xref-button website 'help-url website) (insert "\n")) (when keywords (package--print-help-section "Keywords") |