aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2015-01-04 03:24:53 +0300
committerDmitry Gutov2015-01-04 03:24:53 +0300
commitd94007484ab6b98054b043c1bedeaf7a58eb8606 (patch)
treecea3dd7a6bf0db35a80d36d36c73f8a5183e46a9
parent5395106b0e8a9ea0c9ad34da6a2231152617d73c (diff)
downloademacs-d94007484ab6b98054b043c1bedeaf7a58eb8606.tar.gz
emacs-d94007484ab6b98054b043c1bedeaf7a58eb8606.zip
Unbreak `mouse-action' property in text buttons
* lisp/button.el (push-button): Fix regression from 2012-12-06.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/button.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49640f89055..77a7ec3ac00 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12015-01-04 Dmitry Gutov <dgutov@yandex.ru>
2
3 Unbreak `mouse-action' property in text buttons.
4
5 * button.el (push-button): Fix regression from 2012-12-06.
6
12015-01-03 Dmitry Gutov <dgutov@yandex.ru> 72015-01-03 Dmitry Gutov <dgutov@yandex.ru>
2 8
3 * progmodes/xref.el (xref-marker-stack-empty-p): New function. 9 * progmodes/xref.el (xref-marker-stack-empty-p): New function.
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