From 84d9703786f91970273fc165fe96eb2372c0c9c0 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Mon, 2 Jun 2003 18:14:57 +0000
Subject: [PATCH] Fix spacing after addresses in double quotes. Optimize match
 for leading numeric date.

---
 maint/trim_changelog | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/maint/trim_changelog b/maint/trim_changelog
index e9d4a6050..b162514f2 100755
--- a/maint/trim_changelog
+++ b/maint/trim_changelog
@@ -30,12 +30,10 @@ while (<CHANGELOG>) {
 	s/\s*$//;
 
 	# Make sure there are exactly 2 spaces before the e-mail.
-	s/(^\w.*\w)\s+</$1  </;
+	s/(^\w.*[^\s])\s+</$1  </;
 
 	# Make sure there are exactly 2 spaces after numeric dates.
-	if (/[0-9]+-[0-9]+-[0-9]+\w/) {
-		s/(^[0-9-]+)\s+/$1  /;
-	}
+	s/(^[0-9]+-[0-9-]+)\s+/$1  /;
 
 	# Up to 7 spaces and tab or up to 8 spaces -> tab.
 	if (/^( {1,7}\t| {1,8})(.*)/) {