aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keymap.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8b4029bd7b3..e2f66eec15b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-07-03 Paul Eggert <eggert@cs.ucla.edu>
2
3 * keymap.c (access_keymap_1): Now static.
4
12011-07-02 Chong Yidong <cyd@stupidchicken.com> 52011-07-02 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * keyboard.c (command_loop_1): If a down-mouse event is unbound, 7 * keyboard.c (command_loop_1): If a down-mouse event is unbound,
diff --git a/src/keymap.c b/src/keymap.c
index 062fb5d0d5f..be31f72eec6 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -388,7 +388,7 @@ Return PARENT. PARENT should be nil or another keymap. */)
388 Returns Qunbound if no binding was found (and returns Qnil if a nil 388 Returns Qunbound if no binding was found (and returns Qnil if a nil
389 binding was found). */ 389 binding was found). */
390 390
391Lisp_Object 391static Lisp_Object
392access_keymap_1 (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, int autoload) 392access_keymap_1 (Lisp_Object map, Lisp_Object idx, int t_ok, int noinherit, int autoload)
393{ 393{
394 /* If idx is a list (some sort of mouse click, perhaps?), 394 /* If idx is a list (some sort of mouse click, perhaps?),