From 4eefadad0670ad1c3da2505d734e528d54c76bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= Date: Mon, 20 Feb 2023 12:55:09 +0100 Subject: [PATCH 1/2] Repair mistake in a previous edmacro-sanitize-string change * lisp/edmacro.el (edmacro-sanitize-for-string): This condition should not have been 'repaired' but removed altogether. Do so now, fixing bug#61647. Reported by Eduardo Ochs. --- lisp/edmacro.el | 3 +-- 1 file changed, 1 insertion(+), 2 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. From 74463909cbb8d297da2d731f5cac15effb857f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= Date: Mon, 20 Feb 2023 12:58:48 +0100 Subject: [PATCH 2/2] * lisp/emacs-lisp/macroexp.el (mapcan): Set funarg-positions. --- lisp/emacs-lisp/macroexp.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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