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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/11 05:10:17

Modified files:
        src            : ChangeLog keymap.c 

Log message:
        (where_is_internal): Don't erroneously return nil right after
        filling the cache.
        (where_is_internal_1): Fix up typo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7739&r2=1.7740
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keymap.c?cvsroot=emacs&r1=1.385&r2=1.386

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7739
retrieving revision 1.7740
diff -u -b -r1.7739 -r1.7740
--- ChangeLog   11 Sep 2009 03:34:14 -0000      1.7739
+++ ChangeLog   11 Sep 2009 05:10:15 -0000      1.7740
@@ -1,3 +1,9 @@
+2009-09-11  Stefan Monnier  <address@hidden>
+
+       * keymap.c (where_is_internal): Don't erroneously return nil right after
+       filling the cache.
+       (where_is_internal_1): Fix up typo.
+
 2009-09-11  Glenn Morris  <address@hidden>
 
        * frame.c (Fx_parse_geometry): Unify the X and NS versions so that they

Index: keymap.c
===================================================================
RCS file: /sources/emacs/emacs/src/keymap.c,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -b -r1.385 -r1.386
--- keymap.c    11 Sep 2009 02:14:07 -0000      1.385
+++ keymap.c    11 Sep 2009 05:10:16 -0000      1.386
@@ -2765,11 +2765,15 @@
     }
 
   if (nomenus && !noindirect)
-    /* Remember for which keymaps this cache was built.
+    { /* Remember for which keymaps this cache was built.
        We do it here (late) because we want to keep where_is_cache_keymaps
        set to t while the cache isn't fully filled.  */
     where_is_cache_keymaps = keymaps;
-
+      /* During cache-filling, data.sequences is not filled by
+        where_is_internal_1.  */
+      return Fgethash (definition, where_is_cache, Qnil);
+    }
+  else
   return data.sequences;
 }
 
@@ -2973,7 +2977,7 @@
   Lisp_Object sequence;
 
   /* Search through indirections unless that's not wanted.  */
-  if (noindirect)
+  if (!noindirect)
     binding = get_keyelt (binding, 0);
 
   /* End this iteration if this element does not match