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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/11 02:14:07

Modified files:
        src            : ChangeLog keymap.c 

Log message:
        (get_keymap): Return the actual keymap symbol rather than t for 
autoloaded
        keymaps when autoloading is not allowed (bug#4393).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7737&r2=1.7738
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keymap.c?cvsroot=emacs&r1=1.384&r2=1.385

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7737
retrieving revision 1.7738
diff -u -b -r1.7737 -r1.7738
--- ChangeLog   11 Sep 2009 01:11:37 -0000      1.7737
+++ ChangeLog   11 Sep 2009 02:14:05 -0000      1.7738
@@ -1,5 +1,8 @@
 2009-09-11  Stefan Monnier  <address@hidden>
 
+       * keymap.c (get_keymap): Return the actual keymap symbol rather than
+       t for autoloaded keymaps when autoloading is not allowed (bug#4393).
+
        * keymap.c (QCadvertised_binding): New constant.
        (syms_of_keymap): Initialize it.
        (Fwhere_is_internal): Try and use bindings from :advertised-binding

Index: keymap.c
===================================================================
RCS file: /sources/emacs/emacs/src/keymap.c,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -b -r1.384 -r1.385
--- keymap.c    11 Sep 2009 00:59:05 -0000      1.384
+++ keymap.c    11 Sep 2009 02:14:07 -0000      1.385
@@ -292,7 +292,7 @@
                  goto autoload_retry;
                }
              else
-               return Qt;
+               return object;
            }
        }
     }