[Emacs-diffs] emacs/lisp ChangeLog subr.el

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/12/26 16:49:33

Modified files:
        lisp           : ChangeLog subr.el 

Log message:
        (keymap-canonicalize): Properly preserve keymap prompt.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14992&r2=1.14993
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/subr.el?cvsroot=emacs&r1=1.625&r2=1.626

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14992
retrieving revision 1.14993
diff -u -b -r1.14992 -r1.14993
--- ChangeLog   26 Dec 2008 16:38:00 -0000      1.14992
+++ ChangeLog   26 Dec 2008 16:49:30 -0000      1.14993
@@ -1,5 +1,7 @@
 2008-12-26  Andreas Schwab  <address@hidden>
 
+       * subr.el (keymap-canonicalize): Properly preserve keymap prompt.
+
        * tar-mode.el (tar-swap-data): New function.
        (tar-change-major-mode-hook): Use it instead of buffer-swap-text.
        (tar-mode-revert): Likewise.

Index: subr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/subr.el,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -b -r1.625 -r1.626
--- subr.el     24 Dec 2008 18:27:35 -0000      1.625
+++ subr.el     26 Dec 2008 16:49:33 -0000      1.626
@@ -558,7 +558,8 @@
 (defun keymap-canonicalize (map)
   "Return an equivalent keymap, without inheritance."
   (let ((bindings ())
-        (ranges ()))
+        (ranges ())
+       (prompt (keymap-prompt map)))
     (while (keymapp map)
       (setq map (map-keymap-internal
                  (lambda (key item)
@@ -567,8 +568,7 @@
                        (push (cons key item) ranges)
                      (push (cons key item) bindings)))
                  map)))
-    (setq map (funcall (if ranges 'make-keymap 'make-sparse-keymap)
-                       (keymap-prompt map)))
+    (setq map (funcall (if ranges 'make-keymap 'make-sparse-keymap) prompt))
     (dolist (binding ranges)
       ;; Treat char-ranges specially.
       (define-key map (vector (car binding)) (cdr binding)))