[Emacs-diffs] Changes to emacs/lisp/edmacro.el

[Richard M. Stallman]

Index: emacs/lisp/edmacro.el
diff -c emacs/lisp/edmacro.el:1.30 emacs/lisp/edmacro.el:1.31
*** emacs/lisp/edmacro.el:1.30  Tue Feb  4 06:15:22 2003
--- emacs/lisp/edmacro.el       Tue Aug  5 21:04:34 2003
***************
*** 418,424 ****
                         (while (memq (aref rest-mac i) (cdr mdigs))
                           (incf i))
                         (and (not (memq (aref rest-mac i) pkeys))
!                             (prog1 (concat "M-" (edmacro-subseq rest-mac 0 i) 
" ")
                                (callf edmacro-subseq rest-mac i)))))
                  (and (eq (aref rest-mac 0) ?\C-u)
                       (eq (key-binding [?\C-u]) 'universal-argument)
--- 418,424 ----
                         (while (memq (aref rest-mac i) (cdr mdigs))
                           (incf i))
                         (and (not (memq (aref rest-mac i) pkeys))
!                             (prog1 (vconcat "M-" (edmacro-subseq rest-mac 0 
i) " ")
                                (callf edmacro-subseq rest-mac i)))))
                  (and (eq (aref rest-mac 0) ?\C-u)
                       (eq (key-binding [?\C-u]) 'universal-argument)
***************
*** 437,443 ****
                                      '(?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))
                           (incf i))
                         (and (not (memq (aref rest-mac i) pkeys))
!                             (prog1 (concat "C-u " (edmacro-subseq rest-mac 1 
i) " ")
                                (callf edmacro-subseq rest-mac i)))))))
             (bind-len (apply 'max 1
                              (loop for map in maps
--- 437,443 ----
                                      '(?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))
                           (incf i))
                         (and (not (memq (aref rest-mac i) pkeys))
!                             (prog1 (vconcat "C-u " (edmacro-subseq rest-mac 1 
i) " ")
                                (callf edmacro-subseq rest-mac i)))))))
             (bind-len (apply 'max 1
                              (loop for map in maps
***************
*** 525,531 ****
                               (t
                                (error "Unrecognized item in macro: %s" ch)))))
                           (or fkey key) " "))))
!       (if prefix (setq desc (concat prefix desc)))
        (unless (string-match " " desc)
          (let ((times 1) (pos bind-len))
            (while (not (edmacro-mismatch rest-mac rest-mac
--- 525,532 ----
                               (t
                                (error "Unrecognized item in macro: %s" ch)))))
                           (or fkey key) " "))))
!       (if prefix
!           (setq desc (concat (edmacro-sanitize-for-string prefix) desc)))
        (unless (string-match " " desc)
          (let ((times 1) (pos bind-len))
            (while (not (edmacro-mismatch rest-mac rest-mac
***************
*** 607,612 ****
--- 608,623 ----
                 (aset res i (aref seq start))
                 (setq i (1+ i) start (1+ start)))
               res))))))
+ 
+ (defun edmacro-sanitize-for-string (seq)
+   "Convert a key sequence vector into a string.
+ 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))
+   (loop for i below (length seq) do
+         (when (< (aref seq i) 0)
+           (setf (aref seq i) (logand (aref seq i) 127))))
+   seq)
  
  (defun edmacro-fix-menu-commands (macro &optional noerror)
    (if (vectorp macro)