(get_keymap): Return the actual keymap symbol rather than t for autoloaded

keymaps when autoloading is not allowed (bug#4393).

diff --git a/src/ChangeLog b/src/ChangeLog
index 62a7afe4b3b089c7c94280b1be5638301f779db6..7a839986e2f7f415ae9c6942cb099b8d55010e4c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2009-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * 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

diff --git a/src/keymap.c b/src/keymap.c
index 7f539fd57b5d7d2f0e441302842904fcf07c8a94..561b345396716519b7390dbfba4e70f7209c48f7 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -292,7 +292,7 @@ get_keymap (object, error, autoload)
                  goto autoload_retry;
                }
              else
-               return Qt;
+               return object;
            }
        }
     }