[Emacs-diffs] emacs/src ChangeLog keymap.c

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/12/26 14:43:24

Modified files:
        src            : ChangeLog keymap.c 

Log message:
        (map_keymap_char_table_item): Make a copy of KEY if it is a
        cons.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7228&r2=1.7229
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keymap.c?cvsroot=emacs&r1=1.377&r2=1.378

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7228
retrieving revision 1.7229
diff -u -b -r1.7228 -r1.7229
--- ChangeLog   26 Dec 2008 09:39:49 -0000      1.7228
+++ ChangeLog   26 Dec 2008 14:43:21 -0000      1.7229
@@ -1,3 +1,8 @@
+2008-12-26  Andreas Schwab  <address@hidden>
+
+       * keymap.c (map_keymap_char_table_item): Make a copy of KEY if it is a
+       cons.
+
 2008-12-26  Martin Rudalics  <address@hidden>
 
        * textprop.c (Qminibuffer_prompt): New variable.

Index: keymap.c
===================================================================
RCS file: /sources/emacs/emacs/src/keymap.c,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -b -r1.377 -r1.378
--- keymap.c    27 Nov 2008 08:02:02 -0000      1.377
+++ keymap.c    26 Dec 2008 14:43:23 -0000      1.378
@@ -650,6 +650,10 @@
     {
       map_keymap_function_t fun = XSAVE_VALUE (XCAR (args))->pointer;
       args = XCDR (args);
+      /* If the key is a range, make a copy since map_char_table modifies
+        it in place.  */
+      if (CONSP (key))
+       key = Fcons (XCAR (key), XCDR (key));
       map_keymap_item (fun, XCDR (args), key, val,
                       XSAVE_VALUE (XCAR (args))->pointer);
     }