(button-nop): Function removed.

(default-button): Use `ignore' as default button action.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20db64564a8865ad6474e0de6bd3ba7061d13393..1481d60afe2ac62d2bd108ba766b95e3f4a96fb3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,8 @@
        (forward-button): Implement wrapping, iterating, and skipping here
        instead.
        (button-activate): USE-MOUSE-ACTION is optional.
+       (button-nop): Function removed.
+       (default-button): Use `ignore' as default button action.
 
        * apropos.el (apropos-next-label-button): Update arguments to
        `next-button'.

diff --git a/lisp/button.el b/lisp/button.el
index 3345015f9b83121ef11ed3fba0c436a0923dc8ef..f18a4bfffc3d733bff5f90d1bfcd628bb5dc05d3 100644 (file)
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -75,7 +75,7 @@ Mode-specific keymaps may want to use this as their parent keymap.")
 (put 'default-button 'mouse-face 'highlight)
 (put 'default-button 'keymap button-map)
 (put 'default-button 'type 'button)
-(put 'default-button 'action 'button-nop)
+(put 'default-button 'action 'ignore)
 (put 'default-button 'help-echo "mouse-2, RET: Push this button")
 ;; Make overlay buttons go away if their underlying text is deleted.
 (put 'default-button 'evaporate t)
@@ -86,11 +86,6 @@ Mode-specific keymaps may want to use this as their parent keymap.")
 ;; they inherit this.
 (put 'default-button 'button t)
 
-;; This is the default button action.
-(defun button-nop (button)
-  "Do nothing to BUTTON."
-  nil)
-
 \f
 ;; Button types (which can be used to hold default properties for buttons)