Merge remote-tracking branch 'origin/master' into feature/android

diff --cc etc/NEWS
Simple merge

diff --cc lisp/subr.el
index b5c59023f8e489f51d609af11b96b88fd2dc1932,cef631a69c39dc07ab10e8d18afb1aec836aa6fc..69f58a8c827bdf1c0277f782ba76fb37407db785
--- 1/lisp/subr.el
--- 2/lisp/subr.el
+++ b/lisp/subr.el
@@@ -1663,13 -1674,8 +1674,14 @@@ nil or (STRING . POSITION)'
  `posn-timestamp': The time the event occurred, in milliseconds.
  
  For more information, see Info node `(elisp)Click Events'."
 -  (or (and (consp event) (nth 1 event))
+   (declare (side-effect-free t))
 +  (or (and (consp event)
 +           ;; Ignore touchscreen events.  They store the posn in a
 +           ;; different format, and can have multiple posns.
 +           (not (memq (car event) '(touchscreen-begin
 +                                    touchscreen-update
 +                                    touchscreen-end)))
 +           (nth 1 event))
        (event--posn-at-point)))
  
  (defun event-end (event)
@@@ -1677,11 -1683,8 +1689,12 @@@
  EVENT should be a click, drag, or key press event.
  
  See `event-start' for a description of the value returned."
 -  (or (and (consp event) (nth (if (consp (nth 2 event)) 2 1) event))
+   (declare (side-effect-free t))
 +  (or (and (consp event)
 +           (not (memq (car event) '(touchscreen-begin
 +                                    touchscreen-update
 +                                    touchscreen-end)))
 +           (nth (if (consp (nth 2 event)) 2 1) event))
        (event--posn-at-point)))
  
  (defsubst event-click-count (event)