diff options
| author | Clément Pit-Claudel <clement.pitclaudel@live.com> | 2020-04-26 12:41:42 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2020-05-09 10:42:30 +0300 |
| commit | 0bd6ae773a1ade1bdec2c233df4f260d028fd6c5 (patch) | |
| tree | 0db58a4db34a8eb9082df8ff35936d2f82431d26 /lisp/button.el | |
| parent | 1f149cb392ac4ed99dd1ce2da01178ff0490e746 (diff) | |
| download | emacs-0bd6ae773a1ade1bdec2c233df4f260d028fd6c5.tar.gz emacs-0bd6ae773a1ade1bdec2c233df4f260d028fd6c5.tar.bz2 emacs-0bd6ae773a1ade1bdec2c233df4f260d028fd6c5.zip | |
Only treat display strings as buttons if they have 'button' property
* lisp/button.el (push-button): Use 'posn-point' instead of
'posn-string' if the string doesn't have the 'button'
property (Bug#40859).
Diffstat (limited to 'lisp/button.el')
| -rw-r--r-- | lisp/button.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/button.el b/lisp/button.el index b3afc4eca25..3a6a6de774c 100644 --- a/lisp/button.el +++ b/lisp/button.el @@ -469,10 +469,12 @@ return t." ;; POS is a mouse event; switch to the proper window/buffer (let ((posn (event-start pos))) (with-current-buffer (window-buffer (posn-window posn)) - (if (posn-string posn) - ;; mode-line, header-line, or display string event. - (button-activate (posn-string posn) t) - (push-button (posn-point posn) t)))) + (let* ((str (posn-string posn)) + (str-button (and str (get-text-property (cdr str) 'button (car str))))) + (if str-button + ;; mode-line, header-line, or display string event. + (button-activate str t) + (push-button (posn-point posn) t))))) ;; POS is just normal position (let ((button (button-at (or pos (point))))) (when button |