diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2015-01-04 03:24:53 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2015-01-04 03:24:53 +0300 |
| commit | d94007484ab6b98054b043c1bedeaf7a58eb8606 (patch) | |
| tree | cea3dd7a6bf0db35a80d36d36c73f8a5183e46a9 | |
| parent | 5395106b0e8a9ea0c9ad34da6a2231152617d73c (diff) | |
| download | emacs-d94007484ab6b98054b043c1bedeaf7a58eb8606.tar.gz | |
Unbreak `mouse-action' property in text buttons
* lisp/button.el (push-button): Fix regression from 2012-12-06.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/button.el | 2 |
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 @@ +2015-01-04 Dmitry Gutov <dgutov@yandex.ru> + + Unbreak `mouse-action' property in text buttons. + + * button.el (push-button): Fix regression from 2012-12-06. + 2015-01-03 Dmitry Gutov <dgutov@yandex.ru> * 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." (if (posn-string posn) ;; mode-line, header-line, or display string event. (button-activate (posn-string posn) t) - (push-button (posn-point posn)) t))) + (push-button (posn-point posn) t)))) ;; POS is just normal position (let ((button (button-at (or pos (point))))) (when button |