comparison src/macros.c @ 109126:aec1143e8d85

Convert (most) functions in src to standard C. * src/alloc.c: Convert function definitions to standard C. * src/atimer.c: * src/bidi.c: * src/bytecode.c: * src/callint.c: * src/callproc.c: * src/casefiddle.c: * src/casetab.c: * src/category.c: * src/ccl.c: * src/character.c: * src/charset.c: * src/chartab.c: * src/cmds.c: * src/coding.c: * src/composite.c: * src/data.c: * src/dbusbind.c: * src/dired.c: * src/dispnew.c: * src/doc.c: * src/doprnt.c: * src/ecrt0.c: * src/editfns.c: * src/fileio.c: * src/filelock.c: * src/filemode.c: * src/fns.c: * src/font.c: * src/fontset.c: * src/frame.c: * src/fringe.c: * src/ftfont.c: * src/ftxfont.c: * src/gtkutil.c: * src/indent.c: * src/insdel.c: * src/intervals.c: * src/keymap.c: * src/lread.c: * src/macros.c: * src/marker.c: * src/md5.c: * src/menu.c: * src/minibuf.c: * src/prefix-args.c: * src/print.c: * src/ralloc.c: * src/regex.c: * src/region-cache.c: * src/scroll.c: * src/search.c: * src/sound.c: * src/strftime.c: * src/syntax.c: * src/sysdep.c: * src/termcap.c: * src/terminal.c: * src/terminfo.c: * src/textprop.c: * src/tparam.c: * src/undo.c: * src/unexelf.c: * src/window.c: * src/xfaces.c: * src/xfns.c: * src/xfont.c: * src/xftfont.c: * src/xgselect.c: * src/xmenu.c: * src/xrdb.c: * src/xselect.c: * src/xsettings.c: * src/xsmfns.c: * src/xterm.c: Likewise.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sun, 04 Jul 2010 00:50:25 -0700
parents 1d1d5d9bd884
children 8cfee7d2955f
comparison
equal deleted inserted replaced
109125:12b02558bf51 109126:aec1143e8d85
51 51
52 Lisp_Object executing_kbd_macro; 52 Lisp_Object executing_kbd_macro;
53 53
54 extern Lisp_Object real_this_command; 54 extern Lisp_Object real_this_command;
55 55
56 Lisp_Object Fexecute_kbd_macro (); 56 Lisp_Object Fexecute_kbd_macro (Lisp_Object macro, Lisp_Object count, Lisp_Object loopfunc);
57 57
58 DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 2, "P", 58 DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 2, "P",
59 doc: /* Record subsequent keyboard input, defining a keyboard macro. 59 doc: /* Record subsequent keyboard input, defining a keyboard macro.
60 The commands are recorded even as they are executed. 60 The commands are recorded even as they are executed.
61 Use \\[end-kbd-macro] to finish recording and make the macro available. 61 Use \\[end-kbd-macro] to finish recording and make the macro available.
138 } 138 }
139 139
140 /* Finish defining the current keyboard macro. */ 140 /* Finish defining the current keyboard macro. */
141 141
142 void 142 void
143 end_kbd_macro () 143 end_kbd_macro (void)
144 { 144 {
145 current_kboard->defining_kbd_macro = Qnil; 145 current_kboard->defining_kbd_macro = Qnil;
146 update_mode_lines++; 146 update_mode_lines++;
147 current_kboard->Vlast_kbd_macro 147 current_kboard->Vlast_kbd_macro
148 = make_event_array ((current_kboard->kbd_macro_end 148 = make_event_array ((current_kboard->kbd_macro_end
192 } 192 }
193 193
194 /* Store character c into kbd macro being defined */ 194 /* Store character c into kbd macro being defined */
195 195
196 void 196 void
197 store_kbd_macro_char (c) 197 store_kbd_macro_char (Lisp_Object c)
198 Lisp_Object c;
199 { 198 {
200 struct kboard *kb = current_kboard; 199 struct kboard *kb = current_kboard;
201 200
202 if (!NILP (kb->defining_kbd_macro)) 201 if (!NILP (kb->defining_kbd_macro))
203 { 202 {
221 220
222 /* Declare that all chars stored so far in the kbd macro being defined 221 /* Declare that all chars stored so far in the kbd macro being defined
223 really belong to it. This is done in between editor commands. */ 222 really belong to it. This is done in between editor commands. */
224 223
225 void 224 void
226 finalize_kbd_macro_chars () 225 finalize_kbd_macro_chars (void)
227 { 226 {
228 current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr; 227 current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr;
229 } 228 }
230 229
231 DEFUN ("cancel-kbd-macro-events", Fcancel_kbd_macro_events, 230 DEFUN ("cancel-kbd-macro-events", Fcancel_kbd_macro_events,
284 283
285 /* Restore Vexecuting_kbd_macro and executing_kbd_macro_index. 284 /* Restore Vexecuting_kbd_macro and executing_kbd_macro_index.
286 Called when the unwind-protect in Fexecute_kbd_macro gets invoked. */ 285 Called when the unwind-protect in Fexecute_kbd_macro gets invoked. */
287 286
288 static Lisp_Object 287 static Lisp_Object
289 pop_kbd_macro (info) 288 pop_kbd_macro (Lisp_Object info)
290 Lisp_Object info;
291 { 289 {
292 Lisp_Object tem; 290 Lisp_Object tem;
293 Vexecuting_kbd_macro = XCAR (info); 291 Vexecuting_kbd_macro = XCAR (info);
294 tem = XCDR (info); 292 tem = XCDR (info);
295 executing_kbd_macro_index = XINT (XCAR (tem)); 293 executing_kbd_macro_index = XINT (XCAR (tem));
365 UNGCPRO; 363 UNGCPRO;
366 return unbind_to (pdlcount, Qnil); 364 return unbind_to (pdlcount, Qnil);
367 } 365 }
368 366
369 void 367 void
370 init_macros () 368 init_macros (void)
371 { 369 {
372 Vexecuting_kbd_macro = Qnil; 370 Vexecuting_kbd_macro = Qnil;
373 executing_kbd_macro = Qnil; 371 executing_kbd_macro = Qnil;
374 } 372 }
375 373
376 void 374 void
377 syms_of_macros () 375 syms_of_macros (void)
378 { 376 {
379 Qexecute_kbd_macro = intern_c_string ("execute-kbd-macro"); 377 Qexecute_kbd_macro = intern_c_string ("execute-kbd-macro");
380 staticpro (&Qexecute_kbd_macro); 378 staticpro (&Qexecute_kbd_macro);
381 Qkbd_macro_termination_hook = intern_c_string ("kbd-macro-termination-hook"); 379 Qkbd_macro_termination_hook = intern_c_string ("kbd-macro-termination-hook");
382 staticpro (&Qkbd_macro_termination_hook); 380 staticpro (&Qkbd_macro_termination_hook);