diff --git a/doc/Makefile.am b/doc/Makefile.am index bd40592..ea2091e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,11 +1,7 @@ # build and install the .info pages +AUTOMAKE_OPTIONS = info-in-builddir info_TEXINFOS = freetalk.texi freetalk_TEXINFOS = authors.texi gpl.texi fdl.texi permissions.texi +CLEANFILES = *~ freetalk.info -man_MANS = freetalk.1 - -EXTRA_DIST = $(man_MANS) -CLEANFILES = *~ -DISTCLEANFILES = .deps/*.P *.info *vti - - +dist_man_MANS = freetalk.1 diff --git a/src/freetalk.c b/src/freetalk.c index bf476f5..44033f5 100644 --- a/src/freetalk.c +++ b/src/freetalk.c @@ -123,20 +123,19 @@ stdin_input_cb (GIOChannel *chan, GIOCondition *cond, gpointer conn) return TRUE; } -char * get_word_break_characters() { - - int i; +char *get_word_break_characters() +{ + int i = 0; if (rl_line_buffer[0] != '/') { for (i = rl_point; i >= 0; i--) { if (rl_line_buffer[i] == ':') - return rl_basic_word_break_characters; + return (char *)rl_basic_word_break_characters; } return "\t\n\"\\'`@$><=;|&{("; } - return rl_basic_word_break_characters; - + return (char *)rl_basic_word_break_characters; } void @@ -149,7 +148,7 @@ interface_init (void) rl_completion_word_break_hook = get_word_break_characters; rl_callback_handler_install (state.prompt, process_line); rl_attempted_completion_function = ft_auto_complete; - rl_completion_entry_function = complete_none; + rl_completion_entry_function = NULL; state.async_printf = 1; diff --git a/src/interpreter.h b/src/interpreter.h index 4e66ad6..f8f5dfa 100644 --- a/src/interpreter.h +++ b/src/interpreter.h @@ -29,12 +29,6 @@ void interpreter_init (void); int interpreter (char *line); - -static char *complete_none (const char *txt, int state) -{ - return NULL; -} - char ** ft_auto_complete (const char *txt, int start, int end); #endif /* __INTERPRETER_H__ */