[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a03ab7e 2/2: emacs-lisp/package.el (describe-packag
From: |
Artur Malabarba |
Subject: |
[Emacs-diffs] master a03ab7e 2/2: emacs-lisp/package.el (describe-package-1): Fix "incompat" handling. |
Date: |
Fri, 13 Feb 2015 13:09:05 +0000 |
branch: master
commit a03ab7eaf532075d2948ece70b8f3c97cd26b577
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
emacs-lisp/package.el (describe-package-1): Fix "incompat" handling.
---
lisp/ChangeLog | 1 +
lisp/emacs-lisp/package.el | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75adddb..030d572 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 <address@hidden>
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d9340e1..d8b4595 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.