X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fread-line.c;h=a87adfcf7ef8eacda1ce785abb6ccdf6ed57bb1e;hb=e9aa6e433b846849da90550f6800095d569fb549;hp=2a0bfd5e2be55ca584ef6c6c2f1088a5a90d22c7;hpb=9f1d9ea8ac4f5e35a773581cf3d5ebd9e219bff8;p=pspp-builds.git

diff --git a/src/ui/terminal/read-line.c b/src/ui/terminal/read-line.c
index 2a0bfd5e..a87adfcf 100644
--- a/src/ui/terminal/read-line.c
+++ b/src/ui/terminal/read-line.c
@@ -56,8 +56,9 @@ readln_initialize (void)
 {
   initialised = true;
 
-#if HAVE_READLINE 
-  rl_completion_entry_function = pspp_completion_function;
+#if HAVE_READLINE
+  rl_basic_word_break_characters = "\n";
+  rl_attempted_completion_function = pspp_attempted_completion_function;
 #ifdef unix
   if (history_file == NULL)
     {
@@ -132,14 +133,14 @@ readln_read (struct string *line, const char *prompt)
     {
       if (string[0])
         add_history (string);
-      ds_assign_c_str (line, string);
+      ds_assign_cstr (line, string);
       free (string);
       return true; 
     }
 #else
   fputs (prompt, stdout);
   fflush (stdout);
-  if (ds_gets (line, stdin)) 
+  if (ds_read_line (line, stdin)) 
     {
       ds_chomp (line, '\n');
       return true;