Commit 270aaa17 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents 95c8fb8d 830096fe

cmd-line-utils/libedit/el.h

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ struct editline { 


protected int	el_editmode(EditLine *, int, const char **);



#define el_isprint(x)  ((unsigned char) (x) < 0x80 ? isprint(x) : 1)



#ifdef DEBUG

#define	EL_ABORT(a)	do { \

				fprintf(el->el_errfile, "%s, %d: ", \

cmd-line-utils/libedit/key.c

+2 −2
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ key__decode_char(char *buf, int cnt, int ch) 
	} else if (ch == '\\') {

		buf[cnt++] = '\\';

		buf[cnt] = '\\';

	} else if (ch == ' ' || (isprint(ch) && !isspace(ch))) {

	} else if (ch == ' ' || (el_isprint(ch) && !isspace(ch))) {

		buf[cnt] = ch;

	} else {

		buf[cnt++] = '\\';
@@ -660,7 +660,7 @@ key__decode_str(const char *str, char *buf, const char *sep) 
		} else if (*p == '^' || *p == '\\') {

			*b++ = '\\';

			*b++ = *p;

		} else if (*p == ' ' || (isprint((unsigned char) *p) &&

		} else if (*p == ' ' || (el_isprint((unsigned char) *p) &&

			!isspace((unsigned char) *p))) {

			*b++ = *p;

		} else {

cmd-line-utils/libedit/map.c

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ map_init_nls(EditLine *el) 
	el_action_t *map = el->el_map.key;



	for (i = 0200; i <= 0377; i++)

		if (isprint(i))

		if (el_isprint(i))

			map[i] = ED_INSERT;

}

cmd-line-utils/libedit/read.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ el_gets(EditLine *el, int *nread) 
		    el->el_chared.c_redo.pos < el->el_chared.c_redo.lim) {

			if (cmdnum == VI_DELETE_PREV_CHAR &&

			    el->el_chared.c_redo.pos != el->el_chared.c_redo.buf

			    && isprint((unsigned char)el->el_chared.c_redo.pos[-1]))

			    && el_isprint((unsigned char)el->el_chared.c_redo.pos[-1]))

				el->el_chared.c_redo.pos--;

			else

				*el->el_chared.c_redo.pos++ = ch;

cmd-line-utils/libedit/refresh.c

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ private void 
re_addc(EditLine *el, int c)

{



	if (isprint(c)) {

	if (el_isprint(c)) {

		re_putc(el, c, 1);

		return;

	}
@@ -964,7 +964,7 @@ re_refresh_cursor(EditLine *el) 
					h = 1;

					v++;

				}

			} else if (!isprint((unsigned char) c)) {

			} else if (!el_isprint((unsigned char) c)) {

				h += 3;

				if (h > th) {	/* if overflow, compensate */

					h = h - th;
@@ -1057,7 +1057,7 @@ re_fastaddc(EditLine *el) 
		char mc = (c == '\177') ? '?' : (c | 0100);

		re_fastputc(el, '^');

		re_fastputc(el, mc);

	} else if (isprint((unsigned char) c)) {	/* normal char */

	} else if (el_isprint((unsigned char) c)) {	/* normal char */

		re_fastputc(el, c);

	} else {

		re_fastputc(el, '\\');