[PATCH] gnulib-tool.py: Don't print extra newlines.

[Collin Funk]

This patch removes a few newlines in the diff between gnulib-tool.sh
and gnulib-tool.py.

Here is the current diff of Emacs merge-gnulib script with all the
gnulib-tool.py updates. Far better than a month ago. :)

# Add gnulib changes not in Emacs yet.
$ env GNULIB_TOOL_IMPL="sh" ./admin/merge-gnulib
$ git add .
$ env GNULIB_TOOL_IMPL="py" ./admin/merge-gnulib
$ git diff .
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 6df7f6d9b00..1df51f98805 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -2644,6 +2644,12 @@ EXTRA_libgnu_a_SOURCES += malloc.c
 endif
 ## end   gnulib module malloc-posix
 
+## begin gnulib module manywarnings
+ifeq (,$(OMIT_GNULIB_MODULE_manywarnings))
+
+endif
+## end   gnulib module manywarnings
+
 ## begin gnulib module memmem-simple
 ifeq (,$(OMIT_GNULIB_MODULE_memmem-simple))
 
@@ -3296,7 +3302,9 @@ ifneq (,$(GL_COND_OBJ_STDIO_WRITE_CONDITION))
 libgnu_a_SOURCES += stdio-write.c
 endif
 
-EXTRA_DIST += stdio.in.h
+EXTRA_DIST += stdio-read.c stdio.in.h
+
+EXTRA_libgnu_a_SOURCES += stdio-read.c
 
 endif
 ## end   gnulib module stdio
@@ -4278,6 +4286,12 @@ EXTRA_DIST += vla.h
 endif
 ## end   gnulib module vla
 
+## begin gnulib module warnings
+ifeq (,$(OMIT_GNULIB_MODULE_warnings))
+
+endif
+## end   gnulib module warnings
+
 ## begin gnulib module xalloc-oversized
 ifeq (,$(OMIT_GNULIB_MODULE_xalloc-oversized))

Collin
From c640f330a235515ca785e7ae3ab538dcfce16b64 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Sun, 17 Mar 2024 11:53:11 -0700
Subject: [PATCH] gnulib-tool.py: Don't print extra newlines.

* pygnulib/GLEmiter.py (GLEmiter.initmacro_end): Don't print extra
newline that are not printed by gnulib-tool.sh.
---
 ChangeLog            | 6 ++++++
 pygnulib/GLEmiter.py | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4463c454d6..b1f7a3d1d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-17  Collin Funk  <collin.fu...@gmail.com>
+
+	gnulib-tool.py: Don't print extra newlines.
+	* pygnulib/GLEmiter.py (GLEmiter.initmacro_end): Don't print extra
+	newline that are not printed by gnulib-tool.sh.
+
 2024-03-17  Collin Funk  <collin.fu...@gmail.com>
 
 	gnulib-tool.py: Follow gnulib-tool changes, part 62.
diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py
index bd678fc4af..a988f9f51f 100644
--- a/pygnulib/GLEmiter.py
+++ b/pygnulib/GLEmiter.py
@@ -620,8 +620,7 @@ USE_MSGCTXT = no\n"""
             libobjdeps = f'{macro_prefix_arg}_libobjdeps="${macro_prefix_arg}_libobjdeps {subdir}$i_dir/\\$(DEPDIR)/$i_base.Plo"'
         else:
             libobjdeps = f'{macro_prefix_arg}_libobjdeps="${macro_prefix_arg}_libobjdeps {subdir}$i_dir/\\$(DEPDIR)/$i_base.Po"'
-        emit += fr'''
-  m4_ifval({macro_prefix_arg}_LIBSOURCES_LIST, [
+        emit += fr'''  m4_ifval({macro_prefix_arg}_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([{macro_prefix_arg}_LIBSOURCES_DIR])[ ||
       for gl_file in ]{macro_prefix_arg}_LIBSOURCES_LIST[ ; do
         if test ! -r ]m4_defn([{macro_prefix_arg}_LIBSOURCES_DIR])[/$gl_file ; then
-- 
2.44.0