2 files changed, 9 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5735930c967..a1f51e3818b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-13  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * fileio.c (a_write): Remove redundant semi-colons.
+        (e_write): Return -1 if failed to write all the data.
+        This fixes the changes made at 1999-12-15.
+
 2000-04-12  Dave Love  <fx@gnu.org>
 
         * fns.c (mapcar1): Test for null vals to support mapc.
diff --git a/src/fileio.c b/src/fileio.c
index 3af7816fd5c..545061ba0d1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4925,7 +4925,7 @@ a_write (desc, string, pos, nchars, annot, coding)
       /* Output buffer text up to the next annotation's position.  */
       if (nextpos > pos)
         {
-          if (0 > e_write (desc, string, pos, nextpos, coding));
+          if (0 > e_write (desc, string, pos, nextpos, coding))
             return -1;
           pos = nextpos;
         }
@@ -4933,7 +4933,7 @@ a_write (desc, string, pos, nchars, annot, coding)
       tem = Fcdr (Fcar (*annot));
       if (STRINGP (tem))
         {
-          if (0 > e_write (desc, tem, 0, XSTRING (tem)->size, coding));
+          if (0 > e_write (desc, tem, 0, XSTRING (tem)->size, coding))
             return -1;
         }
       *annot = Fcdr (*annot);
@@ -5020,7 +5020,7 @@ e_write (desc, string, start, end, coding)
       if (coding->cmp_data)
         coding_adjust_composition_offset (coding, start);
     }
-  return 0;
+  return return_val;
 }
 
 DEFUN ("verify-visited-file-modtime", Fverify_visited_file_modtime,