From 499d37ab61a28084904a88a02b068826bccc4bf8 Mon Sep 17 00:00:00 2001
From: Egry Gabor <gaboregry@t-online.hu>
Date: Sat, 3 Sep 2005 15:55:14 -0700
Subject: [PATCH] --- yaml --- r: 6886 b: refs/heads/master c:
 964267e627966ffa018fc4a3e19e6bad337a9125 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/scripts/kconfig/kxgettext.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6fef52fac83b..e6021cc10d24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c196eff3060270f155343b63ef3d06f31ccfcd2e
+refs/heads/master: 964267e627966ffa018fc4a3e19e6bad337a9125
diff --git a/trunk/scripts/kconfig/kxgettext.c b/trunk/scripts/kconfig/kxgettext.c
index ad1cb9451a24..abee55ca6174 100644
--- a/trunk/scripts/kconfig/kxgettext.c
+++ b/trunk/scripts/kconfig/kxgettext.c
@@ -14,6 +14,11 @@ static char *escape(const char* text, char *bf, int len)
 {
 	char *bfp = bf;
 	int multiline = strchr(text, '\n') != NULL;
+	int eol = 0;
+	int textlen = strlen(text);
+
+	if ((textlen > 0) && (text[textlen-1] == '\n'))
+		eol = 1;
 
 	*bfp++ = '"';
 	--len;
@@ -43,7 +48,7 @@ static char *escape(const char* text, char *bf, int len)
 		--len;
 	}
 
-	if (multiline)
+	if (multiline && eol)
 		bfp -= 3;
 
 	*bfp++ = '"';