Remove multiple entries about re-generating configure.

[bpt/emacs.git] / lisp / edmacro.el

diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 5ef9e25..2d9d3c2 100644 (file)
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -1,7 +1,7 @@
 ;;; edmacro.el --- keyboard macro editor
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Maintainer: Dave Gillespie <daveg@synaptics.com>
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -430,10 +430,7 @@ doubt, use whitespace."
 
 (defun edmacro-format-keys (macro &optional verbose)
   (setq macro (edmacro-fix-menu-commands macro))
-  (let* ((maps (append (current-minor-mode-maps)
-                      (if (current-local-map)
-                          (list (current-local-map)))
-                      (list (current-global-map))))
+  (let* ((maps (current-active-maps))
         (pkeys '(end-macro ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9 ?- ?\C-u
                  ?\M-- ?\M-0 ?\M-1 ?\M-2 ?\M-3 ?\M-4 ?\M-5 ?\M-6
                  ?\M-7 ?\M-8 ?\M-9))
@@ -771,7 +768,7 @@ This function assumes that the events can be stored in a string."
       (setq res (edmacro-subseq res 2 -2)))
     (if (and (not need-vector)
             (loop for ch across res
-                  always (and (char-valid-p ch)
+                  always (and (characterp ch)
                               (let ((ch2 (logand ch (lognot ?\M-\^@))))
                                 (and (>= ch2 0) (<= ch2 127))))))
        (concat (loop for ch across res