From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 26 Feb 2013 13:14:07 +0000 (+0100)
Subject: updated for version 7.3.835
X-Git-Tag: v7.3.835
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53eb37e9f9dfba51092f72553d79d3bb677a336b;p=vim

updated for version 7.3.835
Problem:    "xxd -i" fails on an empty file.
Solution:   Do output the closing } for an empty file. (partly by Lawrence
            Woodman)
---

diff --git a/src/version.c b/src/version.c
index 309732afb..f1a090921 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    835,
 /**/
     834,
 /**/
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 85300dc9d..209ede43d 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -729,9 +729,10 @@ main(argc, argv)
       if (c == EOF && ferror(fp))
 	die(2);
 
-      if (p)
-	if (fputs("\n};\n" + 3 * (fp == stdin), fpo) == EOF)
-	  die(3);
+      if (p && fputs("\n", fpo) == EOF)
+	die(3);
+      if (fputs("};\n" + 3 * (fp == stdin), fpo) == EOF)
+	die(3);
 
       if (fp != stdin)
 	{