From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Fri, 13 Feb 2015 13:08:38 +0000 (+0000)
Subject: emacs-lisp/package.el (describe-package-1): Fix "incompat" handling.
X-Git-Tag: emacs-25.0.90~2564^2~385
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a03ab7eaf532075d2948ece70b8f3c97cd26b577;p=emacs.git

emacs-lisp/package.el (describe-package-1): Fix "incompat" handling.
---

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.