From 59f3685985af13a64a7e390c13962f2b074c36eb Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 21 May 2008 02:32:31 +0000 Subject: [PATCH] (insert-kbd-macro): Use prin1-char. --- lisp/ChangeLog | 4 ++++ lisp/macros.el | 38 +++----------------------------------- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 562877e2527..ea8bc7296c6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-05-21 Stefan Monnier + + * macros.el (insert-kbd-macro): Use prin1-char. + 2008-05-20 Stefan Monnier * minibuffer.el (completion-boundaries): New function. diff --git a/lisp/macros.el b/lisp/macros.el index 4f0194ea595..f8d0b5af92e 100644 --- a/lisp/macros.el +++ b/lisp/macros.el @@ -131,41 +131,9 @@ use this command, and then save the file." (insert (if (zerop i) ?\[ ?\s)) (setq char (aref definition i) i (1+ i)) - (cond ((not (numberp char)) - (prin1 char (current-buffer))) - (t - (insert "?") - (setq mods (event-modifiers char) - char (event-basic-type char)) - (while mods - (cond ((eq (car mods) 'control) - (insert "\\C-")) - ((eq (car mods) 'meta) - (insert "\\M-")) - ((eq (car mods) 'hyper) - (insert "\\H-")) - ((eq (car mods) 'super) - (insert "\\s-")) - ((eq (car mods) 'alt) - (insert "\\A-")) - ((and (eq (car mods) 'shift) - (>= char ?a) - (<= char ?z)) - (setq char (upcase char))) - ((eq (car mods) 'shift) - (insert "\\S-"))) - (setq mods (cdr mods))) - (cond ((= char ?\\) - (insert "\\\\")) - ((= char ?\") - (insert "\\\"")) - ((= char ?\;) - (insert "\\;")) - ((= char 127) - (insert "\\C-?")) - ((< char 127) - (insert char)) - (t (insert "\\" (format "%o" char))))))) + (if (not (numberp char)) + (prin1 char (current-buffer)) + (princ (prin1-char char) (current-buffer)))) (insert ?\])) (prin1 definition (current-buffer)))) (insert ")\n") -- 2.39.2