guile/guile-core/guile-readline readline.c

[Marius Vollmer]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Marius Vollmer <address@hidden> 01/06/14 10:42:20

Modified files:
        guile-core/guile-readline: readline.c 

Log message:
        * configure.in: Check for rl_filename_completion_function.
        * readline.c (s_scm_filename_completion_function): Use
        rl_filename_completion_function instead of
        filename_completion_function, if we have it.
        (scm_init_readline): Use rl_compentry_func_t instead if Function
        when _RL_FUNCTION_TYPEDEF is defined.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/guile-readline/readline.c.diff?cvsroot=OldCVS&tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: guile/guile-core/guile-readline/readline.c
diff -u guile/guile-core/guile-readline/readline.c:1.35 
guile/guile-core/guile-readline/readline.c:1.36
--- guile/guile-core/guile-readline/readline.c:1.35     Thu Jun  7 14:12:19 2001
+++ guile/guile-core/guile-readline/readline.c  Thu Jun 14 10:42:20 2001
@@ -380,7 +380,11 @@
   SCM ans;
   SCM_VALIDATE_STRING (1,text);
   SCM_STRING_COERCE_0TERMINATION_X (text);
+#ifdef HAVE_RL_FILENAME_COMPLETION_FUNCTION
+  s = rl_filename_completion_function (SCM_STRING_CHARS (text), SCM_NFALSEP 
(continuep));
+#else
   s = filename_completion_function (SCM_STRING_CHARS (text), SCM_NFALSEP 
(continuep));
+#endif
   ans = scm_makfrom0str (s);
   free (s);
   return ans;
@@ -545,7 +549,11 @@
     = scm_c_define ("*readline-completion-function*", SCM_BOOL_F);
   rl_getc_function = current_input_getc;
   rl_redisplay_function = redisplay;
+#if defined (_RL_FUNCTION_TYPEDEF)
+  rl_completion_entry_function = (rl_compentry_func_t*) completion_function;
+#else  
   rl_completion_entry_function = (Function*) completion_function;
+#endif
   rl_basic_word_break_characters = "\t\n\"'`;()";
   rl_readline_name = "Guile";
 #if defined (HAVE_RL_PRE_INPUT_HOOK) && defined 
(GUILE_SIGWINCH_SA_RESTART_CLEARED)