summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2005-06-08 16:48:52 +0000
committerMark Mitchell <mark@codesourcery.com>2005-06-08 16:48:52 +0000
commit0d6fab7b88a89c4411a66a1ef11ff560a64cd334 (patch)
treec4ace636b96ed0ca77ab1b54401efb57cddfd623
parentdaf8862a0f74dff18e82df21335d30ca1e5c1a98 (diff)
downloadgdb-0d6fab7b88a89c4411a66a1ef11ff560a64cd334.tar.gz
* readline/display.c (insert_some_chars): Likewise.
(delete_chars): Likewise.
-rw-r--r--ChangeLog.csl7
-rw-r--r--readline/display.c8
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl
index 5cf0f2fa600..0166a320ace 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,5 +1,12 @@
2005-06-08 Mark Mitchell <mark@codesourcery.com>
+ Revert:
+ 2005-03-28 Mark Mitchell <mark@codesourcery.com>
+ * readline/display.c (insert_some_chars): Likewise.
+ (delete_chars): Likewise.
+
+2005-06-08 Mark Mitchell <mark@codesourcery.com>
+
* readline/input.c (rL_getc): Use getch, not getche.
* readline/readline.c (bind_arrow_keys_internal): Translate
Windows keysequences into POSIX key sequences.
diff --git a/readline/display.c b/readline/display.c
index b9bb2d3e8ac..e7b75912c9e 100644
--- a/readline/display.c
+++ b/readline/display.c
@@ -1907,9 +1907,9 @@ insert_some_chars (string, count, col)
char *string;
int count, col;
{
-#if defined(__MSDOS__) || defined(__MINGW32__)
+#ifdef __MSDOS__
_rl_output_some_chars (string, count);
-#else /* !__MSDOS__ && !__MINGW32__ */
+#else /* !__MSDOS__ */
/* DEBUGGING */
if (MB_CUR_MAX == 1 || rl_byte_oriented)
if (count != col)
@@ -1959,7 +1959,7 @@ delete_chars (count)
if (count > _rl_screenwidth) /* XXX */
return;
-#if !defined(__MSDOS__) && !defined(__MINGW32__)
+#ifndef __MSDOS__
if (_rl_term_DC && *_rl_term_DC)
{
char *buffer;
@@ -1972,7 +1972,7 @@ delete_chars (count)
while (count--)
tputs (_rl_term_dc, 1, _rl_output_character_function);
}
-#endif /* !__MSDOS__ && !__MINGW32__ */
+#endif /* !__MSDOS__ */
}
void