]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/emacs-lisp/package.el (describe-package-1)
authorGlenn Morris <rgm@gnu.org>
Wed, 13 Jul 2016 15:54:57 +0000 (08:54 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 13 Jul 2016 15:54:57 +0000 (08:54 -0700)
(package-status-external): Fix face references.  (Bug#23927)

lisp/emacs-lisp/package.el

index 14626e2f28f3187fbde2fbbe25c887902bc73c46..e4bb561a87a31e255f94484f8a69f868a6f67669 100644 (file)
@@ -2255,13 +2255,13 @@ Otherwise no newline is inserted."
     (package--print-help-section "Status")
     (cond (built-in
            (insert (propertize (capitalize status)
-                               'font-lock-face 'package-status-builtin-face)
+                               'font-lock-face 'package-status-built-in)
                    "."))
           (pkg-dir
            (insert (propertize (if (member status '("unsigned" "dependency"))
                                    "Installed"
                                  (capitalize status))
-                               'font-lock-face 'package-status-builtin-face))
+                               'font-lock-face 'package-status-built-in))
            (insert (substitute-command-keys " in `"))
            (let ((dir (abbreviate-file-name
                        (file-name-as-directory
@@ -2274,7 +2274,7 @@ Otherwise no newline is inserted."
                (insert (substitute-command-keys
                         "',\n             shadowing a ")
                        (propertize "built-in package"
-                                   'font-lock-face 'package-status-builtin-face))
+                                   'font-lock-face 'package-status-built-in))
              (insert (substitute-command-keys "'")))
            (if signed
                (insert ".")
@@ -2826,13 +2826,14 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
   "Face used on package description summaries in the package menu."
   :version "25.1")
 
+;; Shame this hyphenates "built-in", when "font-lock-builtin-face" doesn't.
 (defface package-status-built-in
   '((t :inherit font-lock-builtin-face))
   "Face used on the status and version of built-in packages."
   :version "25.1")
 
 (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."
   :version "25.1")