[elpa] 11/13: Fix thinko in last change

[Leo Liu]

leoliu pushed a commit to branch master
in repository elpa.

commit d61e8f43c1c0882c0c0e13a3b6ef7f05471b5a27
Author: Leo Liu <address@hidden>
Date:   Sun Apr 13 10:30:12 2014 +0800

    Fix thinko in last change
    
    Note only the describe-PROP can be a function object.
---
 easy-kill.el |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/easy-kill.el b/easy-kill.el
index 002c094..c91bd4c 100644
--- a/easy-kill.el
+++ b/easy-kill.el
@@ -257,9 +257,10 @@ Otherwise, it is the value of the overlay's candidate 
property."
                          ;; Allow describe-PROP to provide customised
                          ;; description.
                          for dk = (intern-soft (format "describe-%s" k))
-                         for v = (or (plist-get all dk) (plist-get all k))
-                         when v collect (format "%s:\t%s" k
-                                                (if (functionp v) (funcall v) 
v))))
+                         for dv = (and dk (plist-get all dk))
+                         for v = (or (if (functionp dv) (funcall dv) dv)
+                                     (plist-get all k))
+                         when v collect (format "%s:\t%s" k v)))
          (txt (mapconcat #'identity props "\n")))
     (format "cmd:\t%s\n%s" (if easy-kill-mark "easy-mark" "easy-kill") txt)))