diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-10-29 10:33:13 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-10-29 10:33:13 -0700 |
| commit | 8d0eb4c275581847990b85dbb350caa3df9e653f (patch) | |
| tree | c161f977d59ac3103b04dc0f4aea57c83436a456 /src/minibuf.c | |
| parent | 929bb973dd3faf1655f03ac758942d5b009354ad (diff) | |
| parent | 196e41e4aec1a44ec5b6e9bed485185ba872ae67 (diff) | |
| download | emacs-8d0eb4c275581847990b85dbb350caa3df9e653f.tar.gz emacs-8d0eb4c275581847990b85dbb350caa3df9e653f.tar.bz2 emacs-8d0eb4c275581847990b85dbb350caa3df9e653f.zip | |
Merge from trunk.
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 0d2bc7234eb..7dd189c325b 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -251,7 +251,7 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial, while ((c = getchar ()) != '\n') { - if (c < 0) + if (c == EOF) { if (errno != EINTR) break; @@ -269,7 +269,7 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial, } } - if (len) + if (len || c == '\n') { val = make_string (line, len); xfree (line); |