Commit e393d4f4 authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/emacs-lisp/package.el (describe-package-1)

(package-status-external): Fix face references.  (Bug#23927)
parent 5e388870
...@@ -2255,13 +2255,13 @@ Otherwise no newline is inserted." ...@@ -2255,13 +2255,13 @@ Otherwise no newline is inserted."
(package--print-help-section "Status") (package--print-help-section "Status")
(cond (built-in (cond (built-in
(insert (propertize (capitalize status) (insert (propertize (capitalize status)
'font-lock-face 'package-status-builtin-face) 'font-lock-face 'package-status-built-in)
".")) "."))
(pkg-dir (pkg-dir
(insert (propertize (if (member status '("unsigned" "dependency")) (insert (propertize (if (member status '("unsigned" "dependency"))
"Installed" "Installed"
(capitalize status)) (capitalize status))
'font-lock-face 'package-status-builtin-face)) 'font-lock-face 'package-status-built-in))
(insert (substitute-command-keys " in `")) (insert (substitute-command-keys " in `"))
(let ((dir (abbreviate-file-name (let ((dir (abbreviate-file-name
(file-name-as-directory (file-name-as-directory
...@@ -2274,7 +2274,7 @@ Otherwise no newline is inserted." ...@@ -2274,7 +2274,7 @@ Otherwise no newline is inserted."
(insert (substitute-command-keys (insert (substitute-command-keys
"',\n shadowing a ") "',\n shadowing a ")
(propertize "built-in package" (propertize "built-in package"
'font-lock-face 'package-status-builtin-face)) 'font-lock-face 'package-status-built-in))
(insert (substitute-command-keys "'"))) (insert (substitute-command-keys "'")))
(if signed (if signed
(insert ".") (insert ".")
...@@ -2826,13 +2826,14 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])." ...@@ -2826,13 +2826,14 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
"Face used on package description summaries in the package menu." "Face used on package description summaries in the package menu."
:version "25.1") :version "25.1")
;; Shame this hyphenates "built-in", when "font-lock-builtin-face" doesn't.
(defface package-status-built-in (defface package-status-built-in
'((t :inherit font-lock-builtin-face)) '((t :inherit font-lock-builtin-face))
"Face used on the status and version of built-in packages." "Face used on the status and version of built-in packages."
:version "25.1") :version "25.1")
(defface package-status-external (defface package-status-external
'((t :inherit package-status-builtin-face)) '((t :inherit package-status-built-in))
"Face used on the status and version of external packages." "Face used on the status and version of external packages."
:version "25.1") :version "25.1")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment