touched all sources to ease import of readline-5.1

[deliverable/binutils-gdb.git] / readline / util.c

diff --git a/readline/util.c b/readline/util.c
index e44ef64349d4037239d56c5758688602e689b686..c7bd360e43cd3940922d163265ed8c0795d2a166 100644 (file)
--- a/readline/util.c
+++ b/readline/util.c
@@ -1,6 +1,6 @@
 /* util.c -- readline utility functions */
 
-/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
+/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
 
    This file is part of the GNU Readline Library, a library for
    reading lines of text with interactive input and history editing.
@@ -44,7 +44,6 @@
 
 /* System-specific feature definitions and include files. */
 #include "rldefs.h"
-#include "rlmbutil.h"
 
 #if defined (TIOCSTAT_IN_SYS_IOCTL)
 #  include <sys/ioctl.h>
@@ -79,29 +78,13 @@ rl_alphabetic (c)
            strchr (pathname_alphabetic_chars, c) != NULL);
 }
 
-#if defined (HANDLE_MULTIBYTE)
-int
-_rl_walphabetic (wc)
-     wchar_t wc;
-{
-  int c;
-
-  if (iswalnum (wc))
-    return (1);     
-
-  c = wc & 0177;
-  return (_rl_allow_pathname_alphabetic_chars &&
-           strchr (pathname_alphabetic_chars, c) != NULL);
-}
-#endif
-
 /* How to abort things. */
 int
 _rl_abort_internal ()
 {
   rl_ding ();
   rl_clear_message ();
-  _rl_reset_argument ();
+  _rl_init_argument ();
   rl_clear_pending_input ();
 
   RL_UNSETSTATE (RL_STATE_MACRODEF);
@@ -267,7 +250,7 @@ _rl_strpbrk (string1, string2)
        {
          v = _rl_get_char_len (string1, &ps);
          if (v > 1)
-           string1 += v - 1;   /* -1 to account for auto-increment in loop */
+           string += v - 1;    /* -1 to account for auto-increment in loop */
        }
 #endif
     }