summaryrefslogtreecommitdiff
path: root/lisp/edmacro.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/edmacro.el')
-rw-r--r--lisp/edmacro.el14
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index c3d9bc5a980..b480b2330a8 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -1,6 +1,6 @@
;;; edmacro.el --- keyboard macro editor
-;; Copyright (C) 1993-1994, 2001-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Maintainer: Dave Gillespie <daveg@synaptics.com>
@@ -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))