From 5836a818eccb180d75c92ce4c861abb6fe8dec23 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Sat, 25 Jul 2015 15:41:05 -0400 Subject: Revert "Sync readline/ to version 7.0 alpha" This reverts commit b558ff043d41ba8d17a82f5f9ae5f9dade66160e. This reverts commit 4a11f2065906976675808364ddbd1c0f77eea41f. The initial import commit failed to retain local changes made to readline's configure.in (and the commit message erroneously stated that there were no local changes that needed to be reapplied). Also the import caused a couple of build errors and a scattering of testsuite regressions throughout many arches. It's probably better to start over with this import, hopefully more carefully next time. --- readline/rlmbutil.h | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'readline/rlmbutil.h') diff --git a/readline/rlmbutil.h b/readline/rlmbutil.h index f0ecfb4..7716a70 100644 --- a/readline/rlmbutil.h +++ b/readline/rlmbutil.h @@ -123,55 +123,6 @@ extern int _rl_walphabetic PARAMS((wchar_t)); #define MB_INVALIDCH(x) ((x) == (size_t)-1 || (x) == (size_t)-2) #define MB_NULLWCH(x) ((x) == 0) -/* Try and shortcut the printable ascii characters to cut down the number of - calls to a libc wcwidth() */ -static inline int -_rl_wcwidth (wc) - wchar_t wc; -{ - switch (wc) - { - case ' ': case '!': case '"': case '#': case '%': - case '&': case '\'': case '(': case ')': case '*': - case '+': case ',': case '-': case '.': case '/': - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - case ':': case ';': case '<': case '=': case '>': - case '?': - case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'G': case 'H': case 'I': case 'J': - case 'K': case 'L': case 'M': case 'N': case 'O': - case 'P': case 'Q': case 'R': case 'S': case 'T': - case 'U': case 'V': case 'W': case 'X': case 'Y': - case 'Z': - case '[': case '\\': case ']': case '^': case '_': - case 'a': case 'b': case 'c': case 'd': case 'e': - case 'f': case 'g': case 'h': case 'i': case 'j': - case 'k': case 'l': case 'm': case 'n': case 'o': - case 'p': case 'q': case 'r': case 's': case 't': - case 'u': case 'v': case 'w': case 'x': case 'y': - case 'z': case '{': case '|': case '}': case '~': - return 1; - default: - return wcwidth (wc); - } -} - -/* Unicode combining characters range from U+0300 to U+036F */ -#define UNICODE_COMBINING_CHAR(x) ((x) >= 768 && (x) <= 879) - -#if defined (WCWIDTH_BROKEN) -# define WCWIDTH(wc) ((_rl_utf8locale && UNICODE_COMBINING_CHAR(wc)) ? 0 : _rl_wcwidth(wc)) -#else -# define WCWIDTH(wc) _rl_wcwidth(wc) -#endif - -#if defined (WCWIDTH_BROKEN) -# define IS_COMBINING_CHAR(x) (WCWIDTH(x) == 0 && iswcntrl(x) == 0) -#else -# define IS_COMBINING_CHAR(x) (WCWIDTH(x) == 0) -#endif - #else /* !HANDLE_MULTIBYTE */ #undef MB_LEN_MAX -- cgit v1.1