CRLF from non-last line wrote result over command.

diff --git a/Display.cpp b/Display.cpp
index d76ac1f745c294cdead81b485c36f101a734aeb2..cafdc57443e1b53cfa12238cf2f8f295f521279b 100644 (file)
--- a/Display.cpp
+++ b/Display.cpp
@@ -28,6 +28,8 @@
 #include <readline/readline.h>
 #endif
 
+#if RL_READLINE_VERSION >= 0x0600
+
 #include <sys/ioctl.h>
 
 #include "Highlight.hpp"
@@ -36,6 +38,10 @@
 
 typedef std::complex<int> CYCursor;
 
+extern "C" int _rl_vis_botlin;
+extern "C" int _rl_last_c_pos;
+extern "C" int _rl_last_v_pos;
+
 CYCursor current_;
 int width_;
 size_t point_;
@@ -137,6 +143,14 @@ void CYDisplayUpdate() {
     CYDisplayOutput(putchar, width, prompt);
     CYCursor target(CYDisplayOutput(putchar, width, stream.str().c_str(), rl_point));
 
+    _rl_vis_botlin = current_.real();
+    _rl_last_c_pos = current_.imag();
+    _rl_last_v_pos = target.real();
+
+    // XXX: readline crashes trying to avoid an empty line if this is left at 0 :(
+    if (_rl_last_c_pos == 0)
+        _rl_last_c_pos = 1;
+
     if (current_.imag() == 0)
         CYDisplayOutput(putchar, width, " ");
     putp(clr_eos);
@@ -151,3 +165,5 @@ void CYDisplayUpdate() {
 void CYDisplayFinish() {
     rl_deprep_terminal();
 }
+
+#endif