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

[Po Lu]

branch: feature/android
commit fce2e2f264f62fcb121310f508a167d2cbf604ca
Merge: 57c19f477fd 74463909cbb
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 lisp/edmacro.el             | 3 +--
 lisp/emacs-lisp/macroexp.el | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index c995e2f89d7..8734f7cbebe 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -626,8 +626,7 @@ The string represents the same events; Meta is indicated by 
bit 7.
 This function assumes that the events can be stored in a string."
   (setq seq (copy-sequence seq))
   (cl-loop for i below (length seq) do
-           (when (/= (logand (aref seq i) 128) 0)
-             (setf (aref seq i) (logand (aref seq i) 127))))
+           (setf (aref seq i) (logand (aref seq i) 127)))
   seq)
 
 ;; These are needed in a --without-x build.
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index c909ffb6933..c57a27069d6 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -496,7 +496,7 @@ Assumes the caller has bound `macroexpand-all-environment'."
 ;; Record which arguments expect functions, so we can warn when those
 ;; are accidentally quoted with ' rather than with #'
 (dolist (f '( funcall apply mapcar mapatoms mapconcat mapc cl-mapcar maphash
-              map-char-table map-keymap map-keymap-internal))
+              mapcan map-char-table map-keymap map-keymap-internal))
   (put f 'funarg-positions '(1)))
 (dolist (f '( add-hook remove-hook advice-remove advice--remove-function
               defalias fset global-set-key run-after-idle-timeout