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 4dfe3e43d23d674439df7ee8fe57dc89f027aa5d..ddc0c9e6563cd6e74275caef310f1f12489556d2 100644 (file)
--- 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 2836b89020a12a0ac565a767afa1ed67860af637..189a1c23a4dac362042da42f502f5b9ff2d32364 100644 (file)
--- 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