aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2016-07-13 08:54:57 -0700
committerGlenn Morris2016-07-13 08:54:57 -0700
commite393d4f4ce64498408bd82f88eeab182c18457e4 (patch)
tree328ada23858f7964b3d71e3eac387dcf921c0aac
parent5e3888706a49f08acaf4e1754e762036493adb7a (diff)
downloademacs-e393d4f4ce64498408bd82f88eeab182c18457e4.tar.gz
emacs-e393d4f4ce64498408bd82f88eeab182c18457e4.zip
* lisp/emacs-lisp/package.el (describe-package-1)
(package-status-external): Fix face references. (Bug#23927)
-rw-r--r--lisp/emacs-lisp/package.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 14626e2f28f..e4bb561a87a 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2255,13 +2255,13 @@ Otherwise no newline is inserted."
2255 (package--print-help-section "Status") 2255 (package--print-help-section "Status")
2256 (cond (built-in 2256 (cond (built-in
2257 (insert (propertize (capitalize status) 2257 (insert (propertize (capitalize status)
2258 'font-lock-face 'package-status-builtin-face) 2258 'font-lock-face 'package-status-built-in)
2259 ".")) 2259 "."))
2260 (pkg-dir 2260 (pkg-dir
2261 (insert (propertize (if (member status '("unsigned" "dependency")) 2261 (insert (propertize (if (member status '("unsigned" "dependency"))
2262 "Installed" 2262 "Installed"
2263 (capitalize status)) 2263 (capitalize status))
2264 'font-lock-face 'package-status-builtin-face)) 2264 'font-lock-face 'package-status-built-in))
2265 (insert (substitute-command-keys " in `")) 2265 (insert (substitute-command-keys " in `"))
2266 (let ((dir (abbreviate-file-name 2266 (let ((dir (abbreviate-file-name
2267 (file-name-as-directory 2267 (file-name-as-directory
@@ -2274,7 +2274,7 @@ Otherwise no newline is inserted."
2274 (insert (substitute-command-keys 2274 (insert (substitute-command-keys
2275 "',\n shadowing a ") 2275 "',\n shadowing a ")
2276 (propertize "built-in package" 2276 (propertize "built-in package"
2277 'font-lock-face 'package-status-builtin-face)) 2277 'font-lock-face 'package-status-built-in))
2278 (insert (substitute-command-keys "'"))) 2278 (insert (substitute-command-keys "'")))
2279 (if signed 2279 (if signed
2280 (insert ".") 2280 (insert ".")
@@ -2826,13 +2826,14 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
2826 "Face used on package description summaries in the package menu." 2826 "Face used on package description summaries in the package menu."
2827 :version "25.1") 2827 :version "25.1")
2828 2828
2829;; Shame this hyphenates "built-in", when "font-lock-builtin-face" doesn't.
2829(defface package-status-built-in 2830(defface package-status-built-in
2830 '((t :inherit font-lock-builtin-face)) 2831 '((t :inherit font-lock-builtin-face))
2831 "Face used on the status and version of built-in packages." 2832 "Face used on the status and version of built-in packages."
2832 :version "25.1") 2833 :version "25.1")
2833 2834
2834(defface package-status-external 2835(defface package-status-external
2835 '((t :inherit package-status-builtin-face)) 2836 '((t :inherit package-status-built-in))
2836 "Face used on the status and version of external packages." 2837 "Face used on the status and version of external packages."
2837 :version "25.1") 2838 :version "25.1")
2838 2839