diff options
| author | Andreas Schwab | 2011-10-29 10:54:06 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2011-10-29 10:54:06 +0200 |
| commit | 21b7206797c252bb6e568e37d10a9fa2b2812747 (patch) | |
| tree | 797a65340b86965ea3806ea21f3d075f31a4a9ad /src | |
| parent | aa4de34102ce87590991e62680eeefe7efffcc79 (diff) | |
| download | emacs-21b7206797c252bb6e568e37d10a9fa2b2812747.tar.gz emacs-21b7206797c252bb6e568e37d10a9fa2b2812747.zip | |
Fixes: debbugs:9903
* src/minibuf.c (read_minibuf_noninteractive): Allow reading empty
line.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/minibuf.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5ebd288710a..5a7d66ceb17 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-10-29 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * minibuf.c (read_minibuf_noninteractive): Allow reading empty | ||
| 4 | line. (Bug#9903) | ||
| 5 | |||
| 1 | 2011-10-29 Glenn Morris <rgm@gnu.org> | 6 | 2011-10-29 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * process.c (wait_reading_process_output): Revert 2009-08-30 change. | 8 | * process.c (wait_reading_process_output): Revert 2009-08-30 change. |
diff --git a/src/minibuf.c b/src/minibuf.c index a44a6376472..7ece5764203 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -251,7 +251,7 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial, | |||
| 251 | 251 | ||
| 252 | while ((c = getchar ()) != '\n') | 252 | while ((c = getchar ()) != '\n') |
| 253 | { | 253 | { |
| 254 | if (c < 0) | 254 | if (c == EOF) |
| 255 | { | 255 | { |
| 256 | if (errno != EINTR) | 256 | if (errno != EINTR) |
| 257 | break; | 257 | break; |
| @@ -269,7 +269,7 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial, | |||
| 269 | } | 269 | } |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | if (len) | 272 | if (len || c == '\n') |
| 273 | { | 273 | { |
| 274 | val = make_string (line, len); | 274 | val = make_string (line, len); |
| 275 | xfree (line); | 275 | xfree (line); |