[Emacs-diffs] /srv/bzr/emacs/trunk r111799: * emacs-lisp/tabulated-list.el (tabulated-list-print-col):

[Glenn Morris]

------------------------------------------------------------
revno: 111799
fixes bug: http://debbugs.gnu.org/13563
author: Jonas Bernoulli <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-02-15 18:50:44 -0800
message:
  * emacs-lisp/tabulated-list.el (tabulated-list-print-col):
  If col-desc already has help-echo, use it.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/tabulated-list.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-16 01:58:20 +0000
+++ b/lisp/ChangeLog    2013-02-16 02:50:44 +0000
@@ -1,3 +1,8 @@
+2013-02-16  Jonas Bernoulli  <address@hidden>
+
+       * 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  <address@hidden>
 
        * image.el (image-current-frame): New variable.

=== modified file 'lisp/emacs-lisp/tabulated-list.el'
--- a/lisp/emacs-lisp/tabulated-list.el 2013-01-01 09:11:05 +0000
+++ b/lisp/emacs-lisp/tabulated-list.el 2013-02-16 02:50:44 +0000
@@ -379,7 +379,9 @@
         (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.