diff options
| author | Mark Murray <markm@FreeBSD.org> | 1999-01-14 19:56:32 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 1999-01-14 19:56:32 +0000 |
| commit | 1631f00d8310f9e3ae19e4bb3186342af49a1418 (patch) | |
| tree | 5e0583e58a87eed628cb3a522ea2279729a7da59 /contrib/texinfo/info/funs.h | |
| parent | 1c3cb5788bdfd55d3e2e93d2db442618c43018c9 (diff) | |
Resove conflicts.
Notes
Notes:
svn path=/head/; revision=42664
Diffstat (limited to 'contrib/texinfo/info/funs.h')
| -rw-r--r-- | contrib/texinfo/info/funs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/texinfo/info/funs.h b/contrib/texinfo/info/funs.h index b91880c48086..32d80d51c037 100644 --- a/contrib/texinfo/info/funs.h +++ b/contrib/texinfo/info/funs.h @@ -29,7 +29,6 @@ extern void info_prev_node (); extern void info_up_node (); extern void info_last_node (); extern void info_first_node (); -extern void info_history_node (); extern void info_last_menu_item (); extern void info_menu_digit (); extern void info_menu_item (); @@ -40,6 +39,7 @@ extern void info_goto_node (); extern void info_man (); extern void info_top_node (); extern void info_dir_node (); +extern void info_history_node (); extern void info_kill_node (); extern void info_view_file (); extern void info_print_node (); @@ -58,7 +58,7 @@ extern void info_add_digit_to_numeric_arg (); extern void info_universal_argument (); extern void info_numeric_arg_digit_loop (); -/* Functions declared in "./echo_area.c". */ +/* Functions declared in "./echo-area.c". */ extern void ea_forward (); extern void ea_backward (); extern void ea_beg_of_line (); |