aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/button.el
diff options
context:
space:
mode:
authorDmitry Gutov2015-01-04 03:24:53 +0300
committerDmitry Gutov2015-01-04 14:44:48 +0300
commitd7af65d24ade808b44d4c936bf4b6e2eaab708cc (patch)
treecd42c5369ed817d9c8f3c449237e7fe259c996b1 /lisp/button.el
parente13e3bd819fca99c86ea6386b3351f45ac50cccd (diff)
downloademacs-d7af65d24ade808b44d4c936bf4b6e2eaab708cc.tar.gz
emacs-d7af65d24ade808b44d4c936bf4b6e2eaab708cc.zip
Backport: Unbreak `mouse-action' property in text buttons
* lisp/button.el (push-button): Fix regression from 2012-12-06. (cherry picked from commit d94007484ab6b98054b043c1bedeaf7a58eb8606)
Diffstat (limited to 'lisp/button.el')
-rw-r--r--lisp/button.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/button.el b/lisp/button.el
index 2836b89020a..189a1c23a4d 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -449,7 +449,7 @@ return t."
449 (if (posn-string posn) 449 (if (posn-string posn)
450 ;; mode-line, header-line, or display string event. 450 ;; mode-line, header-line, or display string event.
451 (button-activate (posn-string posn) t) 451 (button-activate (posn-string posn) t)
452 (push-button (posn-point posn)) t))) 452 (push-button (posn-point posn) t))))
453 ;; POS is just normal position 453 ;; POS is just normal position
454 (let ((button (button-at (or pos (point))))) 454 (let ((button (button-at (or pos (point)))))
455 (when button 455 (when button