aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/emacs-lisp/package.el6
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 @@
4 (package--add-to-compatibility-table): New function. 4 (package--add-to-compatibility-table): New function.
5 (package-read-all-archive-contents): Populate compatibility table. 5 (package-read-all-archive-contents): Populate compatibility table.
6 (package--incompatible-p): Also look in dependencies. 6 (package--incompatible-p): Also look in dependencies.
7 (describe-package-1): Fix "incompat" handling.
7 8
82015-02-13 Lars Ingebrigtsen <larsi@gnus.org> 92015-02-13 Lars Ingebrigtsen <larsi@gnus.org>
9 10
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."
1811 (installable (and archive (not built-in))) 1811 (installable (and archive (not built-in)))
1812 (status (if desc (package-desc-status desc) "orphan")) 1812 (status (if desc (package-desc-status desc) "orphan"))
1813 (signed (if desc (package-desc-signed desc)))) 1813 (signed (if desc (package-desc-signed desc))))
1814 (when (string= status "incompat")
1815 (setq status "incompatible"))
1814 (prin1 name) 1816 (prin1 name)
1815 (princ " is ") 1817 (princ " is ")
1816 (princ (if (memq (aref status 0) '(?a ?e ?i ?o ?u)) "an " "a ")) 1818 (princ (if (memq (aref status 0) '(?a ?e ?i ?o ?u)) "an " "a "))
@@ -1825,9 +1827,7 @@ the table."
1825 (pkg-dir 1827 (pkg-dir
1826 (insert (propertize (if (member status '("unsigned" "dependency")) 1828 (insert (propertize (if (member status '("unsigned" "dependency"))
1827 "Installed" 1829 "Installed"
1828 (if (equal status "incompat") 1830 (capitalize status)) ;FIXME: Why comment-face?
1829 "Incompatible"
1830 (capitalize status))) ;FIXME: Why comment-face?
1831 'font-lock-face 'font-lock-comment-face)) 1831 'font-lock-face 'font-lock-comment-face))
1832 (insert " in `") 1832 (insert " in `")
1833 ;; Todo: Add button for uninstalling. 1833 ;; Todo: Add button for uninstalling.