From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat, 29 Oct 2011 08:54:06 +0000 (+0200)
Subject: Fixes: debbugs:9903
X-Git-Tag: emacs-pretest-24.0.91~24
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21b7206797c252bb6e568e37d10a9fa2b2812747;p=emacs.git

Fixes: debbugs:9903

* src/minibuf.c (read_minibuf_noninteractive): Allow reading empty
line.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5ebd288710a..5a7d66ceb17 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* minibuf.c (read_minibuf_noninteractive): Allow reading empty
+	line.  (Bug#9903)
+
 2011-10-29  Glenn Morris  <rgm@gnu.org>
 
 	* 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,
 
   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);