diff options
| author | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-02-13 13:08:38 +0000 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-02-13 13:08:38 +0000 |
| commit | a03ab7eaf532075d2948ece70b8f3c97cd26b577 (patch) | |
| tree | 8836c67f818fa67a298c4889b6d59ed7b5c34021 | |
| parent | 3b8b549ffff5b5e774266a9662f738a9335997f2 (diff) | |
| download | emacs-a03ab7eaf532075d2948ece70b8f3c97cd26b577.tar.gz | |
emacs-lisp/package.el (describe-package-1): Fix "incompat" handling.
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 75adddb038d..030d572d90f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -4,6 +4,7 @@ (package--add-to-compatibility-table): New function. (package-read-all-archive-contents): Populate compatibility table. (package--incompatible-p): Also look in dependencies. + (describe-package-1): Fix "incompat" handling. 2015-02-13 Lars Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index d9340e1494d..d8b4595b6e6 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1811,6 +1811,8 @@ the table." (installable (and archive (not built-in))) (status (if desc (package-desc-status desc) "orphan")) (signed (if desc (package-desc-signed desc)))) + (when (string= status "incompat") + (setq status "incompatible")) (prin1 name) (princ " is ") (princ (if (memq (aref status 0) '(?a ?e ?i ?o ?u)) "an " "a ")) @@ -1825,9 +1827,7 @@ the table." (pkg-dir (insert (propertize (if (member status '("unsigned" "dependency")) "Installed" - (if (equal status "incompat") - "Incompatible" - (capitalize status))) ;FIXME: Why comment-face? + (capitalize status)) ;FIXME: Why comment-face? 'font-lock-face 'font-lock-comment-face)) (insert " in `") ;; Todo: Add button for uninstalling. |