aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov2011-11-18 11:50:16 -0500
committerStefan Monnier2011-11-18 11:50:16 -0500
commit2071918ec9a1562d5f0aa6218d98f80318a33466 (patch)
tree1446ba8ae489c652b73adf73ec0862018ccc0e72 /src
parent2ad52c605cfbf8254a9d14e7e4c64f6486414734 (diff)
downloademacs-2071918ec9a1562d5f0aa6218d98f80318a33466.tar.gz
emacs-2071918ec9a1562d5f0aa6218d98f80318a33466.zip
* src/keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keymap.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 199f20817ea..1bb4a6a5993 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-11-18 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.
4
12011-11-18 Stefan Monnier <monnier@iro.umontreal.ca> 52011-11-18 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * intervals.c: Fix grafting over the whole buffer (bug#10071). 7 * intervals.c: Fix grafting over the whole buffer (bug#10071).
diff --git a/src/keymap.c b/src/keymap.c
index 6f9cf288f6d..b429ca968d7 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2624,11 +2624,11 @@ remapped command in the returned list. */)
2624 /* We have a list of advertised bindings. */ 2624 /* We have a list of advertised bindings. */
2625 while (CONSP (tem)) 2625 while (CONSP (tem))
2626 if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition)) 2626 if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition))
2627 return XCAR (tem); 2627 RETURN_UNGCPRO (XCAR (tem));
2628 else 2628 else
2629 tem = XCDR (tem); 2629 tem = XCDR (tem);
2630 if (EQ (shadow_lookup (keymaps, tem, Qnil, 0), definition)) 2630 if (EQ (shadow_lookup (keymaps, tem, Qnil, 0), definition))
2631 return tem; 2631 RETURN_UNGCPRO (tem);
2632 } 2632 }
2633 2633
2634 sequences = Freverse (where_is_internal (definition, keymaps, 2634 sequences = Freverse (where_is_internal (definition, keymaps,