diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2015-01-04 03:24:53 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2015-01-04 14:44:48 +0300 |
| commit | d7af65d24ade808b44d4c936bf4b6e2eaab708cc (patch) | |
| tree | cd42c5369ed817d9c8f3c449237e7fe259c996b1 /lisp | |
| parent | e13e3bd819fca99c86ea6386b3351f45ac50cccd (diff) | |
| download | emacs-d7af65d24ade808b44d4c936bf4b6e2eaab708cc.tar.gz | |
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')
| -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 4dfe3e43d23..ddc0c9e6563 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-01 Eli Zaretskii <eliz@gnu.org> * tool-bar.el (tool-bar-local-item) 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 |