From: Dmitry Gutov Date: Sun, 4 Jan 2015 00:24:53 +0000 (+0300) Subject: Backport: Unbreak `mouse-action' property in text buttons X-Git-Tag: emacs-24.4.90~71 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d7af65d;p=emacs.git Backport: Unbreak `mouse-action' property in text buttons * lisp/button.el (push-button): Fix regression from 2012-12-06. (cherry picked from commit d94007484ab6b98054b043c1bedeaf7a58eb8606) --- 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 + + Unbreak `mouse-action' property in text buttons. + + * button.el (push-button): Fix regression from 2012-12-06. + 2015-01-01 Eli Zaretskii * 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