- Add common GNU Diff format options to diff and refresH commands:

  -u, -U num, -c, -C num. REname old -c option (combine patches)
  of diff command to --combine.
- Extend the function that splits comments froM patches and
  syntax coloring to handLe combined diff format.
- Honor the LAnG environment variable again; this goT broken at
  some point.
- Set TEXTDOMAINDIR to where the translations are put so that
  Messages are found even when not installing into /usr.

1 files changed, 13 insertions, 9 deletions

diff --git a/scripts/patchfns.in b/scripts/patchfns.in
index 3acb92b..15a5248 100644
--- a/scripts/patchfns.in
+++ b/scripts/patchfns.in
@@ -7,9 +7,14 @@
 #
 #  See the COPYING and AUTHORS files for more details.
 
+export TEXTDOMAIN=quilt
+export TEXTDOMAINDIR=@LOCALEDIR@
+
+: ${LC_CTYPE:=$LANG}
+: ${LC_MESSAGES:=$LANG}
 ORIGINAL_LANG=$LANG
 export LANG=POSIX
-export TEXTDOMAIN=quilt
+
 export QUILT_PATCHES QUILT_PC SUBDIR SERIES DB
 DB_VERSION=2
 
@@ -534,7 +539,7 @@ diff_file()
 					-r "$new_file")
 	fi
 
-	@DIFF@ -Nu $QUILT_DIFF_OPTS $old_file $new_file \
+	@DIFF@ -N $QUILT_DIFF_OPTS $old_file $new_file \
 	       --label "$old_hdr$old_date" --label "$new_hdr$new_date" \
 	| if read line
 	then
@@ -591,13 +596,12 @@ patch_description()
 	if [ -e "$patch_file" -o -z "$patch_file" ]
 	then
 		@AWK@ '
-		$1 == "---"	{ exit }
-               /^Index:[ \t]|^diff[ \t]|^==*$/ \
-				{ eat = eat $0
-				  next }
-		eat		{ print eat
-				  eat="" }
-				{ print }
+		$1 == "***" || $1 == "---"	{ exit }
+		/^Index:[ \t]|^diff[ \t]|^==*$/ \
+			{ eat = eat $0 "\n"
+			  next }
+			{ print eat $0
+			  eat="" }
 		' $patch_file
 	fi
 }