[Emacs-diffs] emacs-24 d7af65d: Backport: Unbreak `mouse-action' property in text buttons

[Dmitry Gutov]

branch: emacs-24
commit d7af65d24ade808b44d4c936bf4b6e2eaab708cc
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Backport: Unbreak `mouse-action' property in text buttons
    
    * lisp/button.el (push-button): Fix regression from 2012-12-06.
    
    (cherry picked from commit d94007484ab6b98054b043c1bedeaf7a58eb8606)
---
 lisp/ChangeLog |    6 ++++++
 lisp/button.el |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4dfe3e4..ddc0c9e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-04  Dmitry Gutov  <address@hidden>
+
+       Unbreak `mouse-action' property in text buttons.
+
+       * button.el (push-button): Fix regression from 2012-12-06.
+
 2015-01-01  Eli Zaretskii  <address@hidden>
 
        * tool-bar.el (tool-bar-local-item)
diff --git a/lisp/button.el b/lisp/button.el
index 2836b89..189a1c2 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