diff options
author | Daniel Jacobowitz <dan@debian.org> | 2006-04-24 22:00:27 +0000 |
---|---|---|
committer | Daniel Jacobowitz <dan@debian.org> | 2006-04-24 22:00:27 +0000 |
commit | edc469a5506b2f0858aa4366d84f5c04e4eeeebe (patch) | |
tree | cf5d1c0b957710b8b9976bff1e8484b7c4a839b4 /readline/util.c | |
parent | 7be84cf3293f63b314237035e7df76caa8022769 (diff) | |
download | gdb-cvs/readline_5_1-import-branch.tar.gz |
Import readline 5.1 on the branch.readline_5_1-import-branchcvs/readline_5_1-import-branch
Diffstat (limited to 'readline/util.c')
-rw-r--r-- | readline/util.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/readline/util.c b/readline/util.c index c7bd360e43c..e44ef64349d 100644 --- a/readline/util.c +++ b/readline/util.c @@ -1,6 +1,6 @@ /* util.c -- readline utility functions */ -/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1987-2005 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,6 +44,7 @@ /* System-specific feature definitions and include files. */ #include "rldefs.h" +#include "rlmbutil.h" #if defined (TIOCSTAT_IN_SYS_IOCTL) # include <sys/ioctl.h> @@ -78,13 +79,29 @@ 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_init_argument (); + _rl_reset_argument (); rl_clear_pending_input (); RL_UNSETSTATE (RL_STATE_MACRODEF); @@ -250,7 +267,7 @@ _rl_strpbrk (string1, string2) { v = _rl_get_char_len (string1, &ps); if (v > 1) - string += v - 1; /* -1 to account for auto-increment in loop */ + string1 += v - 1; /* -1 to account for auto-increment in loop */ } #endif } |