procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix earlier change in subr.el

Browse source 
* lisp/subr.el (event-start, event-end): Don't take the car of
EVENT if it's not an event with parameters.
This commit is contained in:
Po Lu 2023-08-17 07:27:14 +00:00
parent ab8bc93cd4
commit c1a45041d6
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/subr.el
View file

@ -1676,8 +1676,9 @@ nil or (STRING . POSITION)'.
For more information, see Info node `(elisp)Click Events'."
(declare (side-effect-free t))
(if (or (eq (car event) 'touchscreen-begin)
(eq (car event) 'touchscreen-end))
(if (and (consp event)
(or (eq (car event) 'touchscreen-begin)
(eq (car event) 'touchscreen-end)))
;; Touch screen begin and end events save their information in a
;; different format, where the mouse position list is the cdr of
;; (nth 1 event).
@ -1695,8 +1696,9 @@ EVENT should be a click, drag, touch screen, or key press event.
See `event-start' for a description of the value returned."
(declare (side-effect-free t))
(if (or (eq (car event) 'touchscreen-begin)
(eq (car event) 'touchscreen-end))
(if (and (consp event)
(or (eq (car event) 'touchscreen-begin)
(eq (car event) 'touchscreen-end)))
(cdadr event)
(or (and (consp event)
(not (eq (car event) 'touchscreen-update))