From: Jonas Bernoulli <jonas@bernoul.li>
Date: Sat, 16 Feb 2013 02:50:44 +0000 (-0800)
Subject: * emacs-lisp/tabulated-list.el (tabulated-list-print-col):
X-Git-Tag: emacs-24.3.90~173^2~7^2~24
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b6d804b1e278b465ba778bbd10bb008dfe13b21;p=emacs.git

* 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 b932054261d..d9e6a3eb5b4 100644
--- 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 94b3c1553e5..da487e463e2 100644
--- 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.