aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-07-11 12:56:58 +0300
committerEli Zaretskii2014-07-11 12:56:58 +0300
commit8f4fc468ca50120c2218f74555301d68004d8217 (patch)
tree38d5e92d1f93c1e296382369c23ff8c26d74d706 /src
parent0e02d309ef9b52327c49908f747cf20b80e4f1e5 (diff)
downloademacs-8f4fc468ca50120c2218f74555301d68004d8217.tar.gz
emacs-8f4fc468ca50120c2218f74555301d68004d8217.zip
Temporary fix for the MS-Windows build broken by last commit.
src/minibuf.c (read_minibuf_noninteractive) [WINDOWSNT]: Don't reference termios structure members. Fixes: debbugs:17839
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/minibuf.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e2a7bb8a0f0..1e0a3a92f5d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-07-11 Eli Zaretskii <eliz@gnu.org>
2
3 * minibuf.c (read_minibuf_noninteractive) [WINDOWSNT]: Don't
4 reference termios structure members.
5
12014-07-11 Michael Albinus <michael.albinus@gmx.de> 62014-07-11 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * sysdep.c (emacs_get_tty, emacs_set_tty): Make them externally visible. 8 * sysdep.c (emacs_get_tty, emacs_set_tty): Make them externally visible.
diff --git a/src/minibuf.c b/src/minibuf.c
index 122f77fff96..6c6ab7f5865 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -240,8 +240,10 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
240 { 240 {
241 emacs_get_tty (fileno (stdin), &old); 241 emacs_get_tty (fileno (stdin), &old);
242 new = old; 242 new = old;
243#ifndef WINDOWSNT
243 new.main.c_lflag &= ~ICANON; /* Disable buffering */ 244 new.main.c_lflag &= ~ICANON; /* Disable buffering */
244 new.main.c_lflag &= ~ECHO; /* Disable echoing */ 245 new.main.c_lflag &= ~ECHO; /* Disable echoing */
246#endif
245 emacs_set_tty (fileno (stdin), &new, 0); 247 emacs_set_tty (fileno (stdin), &new, 0);
246 } 248 }
247 249