[Emacs-diffs] master 821a084: Don't signal error from "C-x C-k l" about mouse events

[Eli Zaretskii]

branch: master
commit 821a0840b27861e7323c192848a21def2aeddca0
Author: Drew Adams <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Don't signal error from "C-x C-k l" about mouse events
    
    * lisp/edmacro.el (edmacro-fix-menu-commands): Ignore mouse
    events instead of signaling an error.  Display unsupported
    events in the error message.  (Bug#33930)
---
 lisp/edmacro.el | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 5502346..b480b23 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -623,12 +623,16 @@ This function assumes that the events can be stored in a 
string."
                 (push (vector 'menu-bar (car ev)) result))
                ;; It would be nice to do pop-up menus, too, but not enough
                ;; info is recorded in macros to make this possible.
-               (noerror
-                ;; Just ignore mouse events.
+               ((or (mouse-event-p ev) (mouse-movement-p ev)
+                    (memq (event-basic-type ev)
+                          (list mouse-wheel-down-event mouse-wheel-up-event
+                                mouse-wheel-right-event
+                                mouse-wheel-left-event)))
                 nil)
+               (noerror nil)
                (t
-                (error "Macros with mouse clicks are not %s"
-                       "supported by this command"))))
+                (error "`edmacro-fix-menu-commands': Unsupported event: %S"
+                       ev))))
        ;; Reverse them again and make them back into a vector.
        (vconcat (nreverse result)))
     macro))