From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 11 Sep 2009 02:14:05 +0000 (+0000)
Subject: (get_keymap): Return the actual keymap symbol rather than t for autoloaded
X-Git-Tag: emacs-pretest-23.1.90~1408
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66d77eda77b4a92e0e1f9782e895ab0d98ba59bc;p=emacs.git

(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 62a7afe4b3b..7a839986e2f 100644
--- 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 7f539fd57b5..561b3453967 100644
--- 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;
 	    }
 	}
     }