* emacs-lisp/tabulated-list.el (tabulated-list-print-col):

If col-desc already has help-echo, use it.

Fixes: debbugs:13563

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b932054261d728353edb51ef2bc322155559bfea..d9e6a3eb5b417578c01ccd66c6cce4c7d1117148 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-16  Jonas Bernoulli  <jonas@bernoul.li>
+
+       * emacs-lisp/tabulated-list.el (tabulated-list-print-col):
+       If col-desc already has help-echo, use it.  (Bug#13563)
+
 2013-02-16  Glenn Morris  <rgm@gnu.org>
 
        * image.el (image-current-frame): New variable.

diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index 94b3c1553e52d38af7421343b9f3164ef8844cbc..da487e463e2af7bd4df689437141a2167e264c32 100644 (file)
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -379,7 +379,9 @@ Return the column number after insertion."
         (setq width (- width shift))
         (setq x (+ x shift))))
     (if (stringp col-desc)
-       (insert (propertize label 'help-echo help-echo))
+       (insert (if (get-text-property 0 'help-echo label)
+                   label
+                 (propertize label 'help-echo help-echo)))
       (apply 'insert-text-button label (cdr col-desc)))
     (let ((next-x (+ x pad-right width)))
       ;; No need to append any spaces if this is the last column.