mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-19 01:10:57 -08:00
Code Issues Projects Releases Wiki Activity

(tool_bar_items): Use map_keymap.

Browse source 
(process_tool_bar_item): Add dummy args to fit the required interface.
This commit is contained in:
Stefan Monnier 2006-03-29 08:00:23 +00:00
parent bdba217b30
commit 293bd73323
2 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/ChangeLog
View file

@ -1,3 +1,8 @@
2006-03-29 Stefan Monnier <monnier@iro.umontreal.ca>
* keyboard.c (tool_bar_items): Use map_keymap.
(process_tool_bar_item): Add dummy args to fit the required interface.
2006-03-25 Eli Zaretskii <eliz@gnu.org>
* .gdbinit (pr, pp, pp1, pv, pv1): Force print_output_debug_flag
@ -13,8 +18,7 @@
(Fdecode_time, Fencode_time): Use TM_YEAR_BASE instead of 1900.
(Fdecode_time): Cast tm_year to EMACS_INT.
(Fcurrent_time_string): Report an invalid time specification if
the argument is invalid. Also, check for out-of-range time
stamps.
the argument is invalid. Also, check for out-of-range time stamps.
2006-03-24 Kim F. Storm <storm@cua.dk>
@ -54,8 +58,8 @@
2006-03-21 Ken Raeburn <raeburn@raeburn.org>
* xdisp.c (store_next_glyph): Renamed from append_glyph.
(generate_stretch_glyph): Renamed from produce_stretch_glyph.
* xdisp.c (store_next_glyph): Rename from append_glyph.
(generate_stretch_glyph): Rename from produce_stretch_glyph.
All callers changed accordingly.
2006-03-21 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
@ -896,8 +900,8 @@
* editfns.c (Fconstrain_to_field): Fix behaviour on field boundaries.
(find_field): Set before_field to after_field when pos is at BEGV.
(Fline_beginning_position, Fline_end_position): Clarify
confusing doc string.
(Fline_beginning_position, Fline_end_position):
Clarify confusing doc string.
* cmds.c (Fbeginning_of_line, Fend_of_line): Clarify confusing doc
string.

19
src/keyboard.c
View file

@ -7581,7 +7581,7 @@ Lisp_Object QCimage;
/* Function prototypes. */
static void init_tool_bar_items P_ ((Lisp_Object));
static void process_tool_bar_item P_ ((Lisp_Object, Lisp_Object));
static void process_tool_bar_item P_ ((Lisp_Object, Lisp_Object, void*, Lisp_Object));
static int parse_tool_bar_item P_ ((Lisp_Object, Lisp_Object));
static void append_tool_bar_item P_ ((void));
@ -7659,17 +7659,7 @@ tool_bar_items (reuse, nitems)
keymap = get_keymap (access_keymap (maps[i], Qtool_bar, 1, 0, 1), 0, 1);
if (CONSP (keymap))
{
Lisp_Object tail;
/* KEYMAP is a list `(keymap (KEY . BINDING) ...)'. */
for (tail = keymap; CONSP (tail); tail = XCDR (tail))
{
Lisp_Object keydef = XCAR (tail);
if (CONSP (keydef))
process_tool_bar_item (XCAR (keydef), XCDR (keydef));
}
}
map_keymap (keymap, process_tool_bar_item, Qnil, NULL, 1);
}
Vinhibit_quit = oquit;
@ -7681,8 +7671,9 @@ tool_bar_items (reuse, nitems)
/* Process the definition of KEY which is DEF. */
static void
process_tool_bar_item (key, def)
Lisp_Object key, def;
process_tool_bar_item (key, def, args, data)
Lisp_Object key, def, data;
void *args;
{
int i;
extern Lisp_Object Qundefined;