1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-31 20:02:42 +00:00

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

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

Fixes: debbugs:13563
This commit is contained in:
Jonas Bernoulli 2013-02-15 18:50:44 -08:00 committed by Glenn Morris
parent fe2219e202
commit 6b6d804b1e
2 changed files with 8 additions and 1 deletions

View File

@ -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.

View File

@ -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.