diff options
author | Jonas Bernoulli <jonas@bernoul.li> | 2013-02-15 18:50:44 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2013-02-15 18:50:44 -0800 |
commit | 6b6d804b1e278b465ba778bbd10bb008dfe13b21 (patch) | |
tree | 52400f36ce15940da038a5116bc268605c918cff /lisp/emacs-lisp | |
parent | fe2219e20272be72e5c4e8996d531af5489f1002 (diff) | |
download | emacs-6b6d804b1e278b465ba778bbd10bb008dfe13b21.tar.gz emacs-6b6d804b1e278b465ba778bbd10bb008dfe13b21.tar.bz2 emacs-6b6d804b1e278b465ba778bbd10bb008dfe13b21.zip |
* emacs-lisp/tabulated-list.el (tabulated-list-print-col):
If col-desc already has help-echo, use it.
Fixes: debbugs:13563
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/tabulated-list.el | 4 |
1 files changed, 3 insertions, 1 deletions
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. |