commit f942b457a594f277cbff2488dd8c2bc1b1fba5ce
author gwenn <gtreguier@gmail.com> Sun Sep 02 11:27:40 2018 +0200
committer gwenn <gtreguier@gmail.com> Sun Sep 02 11:34:19 2018 +0200
tree b5fdc88f70d325b4869855efc3b77038fac39d85
parent 276dbcf7a0afb2a0bbef9f7da38f74a155a4ce72

Misc

(cherry picked from commit ecf4d1413f0a099bd8afe4bda5ea8dbd8b363f9f)

src/tty/windows.rs

diff --git a/src/tty/windows.rs b/src/tty/windows.rs
index f6ea8ab..1127d3f 100644
--- a/src/tty/windows.rs
+++ b/src/tty/windows.rs
@@ -126,7 +126,7 @@
             if rec.EventType == wincon::WINDOW_BUFFER_SIZE_EVENT {
                 SIGWINCH.store(true, atomic::Ordering::SeqCst);
                 debug!(target: "rustyline", "SIGWINCH");
-                return Err(error::ReadlineError::WindowResize);
+                return Err(error::ReadlineError::WindowResize); // sigwinch + err => err ignored
             } else if rec.EventType != wincon::KEY_EVENT {
                 continue;
             }
@@ -503,10 +503,10 @@
             | wincon::ENABLE_ECHO_INPUT
             | wincon::ENABLE_PROCESSED_INPUT);
         // Enable these modes
-        let raw = raw | wincon::ENABLE_EXTENDED_FLAGS;
-        let raw = raw | wincon::ENABLE_INSERT_MODE;
-        let raw = raw | wincon::ENABLE_QUICK_EDIT_MODE;
-        let raw = raw | wincon::ENABLE_WINDOW_INPUT;
+        raw |= wincon::ENABLE_EXTENDED_FLAGS;
+        raw |= wincon::ENABLE_INSERT_MODE;
+        raw |= wincon::ENABLE_QUICK_EDIT_MODE;
+        raw |= wincon::ENABLE_WINDOW_INPUT;
         check!(consoleapi::SetConsoleMode(self.stdin_handle, raw));
 
         let original_stdout_mode = if self.stdout_isatty {