diff options
| author | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
| commit | 971de7fb158335fbda39525feb2d7776a26bc030 (patch) | |
| tree | 605333d85f16e35bb06baffcb66ac49f4ec0dce9 /src/macros.c | |
| parent | b8463cbfbe2c5183cf40772df2746e58b787ddeb (diff) | |
| download | emacs-971de7fb158335fbda39525feb2d7776a26bc030.tar.gz emacs-971de7fb158335fbda39525feb2d7776a26bc030.zip | |
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.
Diffstat (limited to 'src/macros.c')
| -rw-r--r-- | src/macros.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/macros.c b/src/macros.c index 62aeb0fa635..83180d090a8 100644 --- a/src/macros.c +++ b/src/macros.c | |||
| @@ -53,7 +53,7 @@ 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. |
| @@ -140,7 +140,7 @@ macro before appending to it. */) | |||
| 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++; |
| @@ -194,8 +194,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) | |||
| 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 | ||
| @@ -223,7 +222,7 @@ store_kbd_macro_char (c) | |||
| 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 | } |
| @@ -286,8 +285,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) | |||
| 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); |
| @@ -367,14 +365,14 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) | |||
| 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); |