# 
# 
# patch "ChangeLog"
#  from [b3cabd374526fdbe7aee78068e984d1fe40960e3]
#    to [704cde96629adbf1a5bff2b43cae1a4e1dccdcf5]
# 
# patch "po/Makevars"
#  from [66c462e5b59d356a9f086c244cc6be3c4c1132dd]
#    to [658c8e7d7bc64b91caa440d65c1713c69f7b6002]
# 
============================================================
--- ChangeLog	b3cabd374526fdbe7aee78068e984d1fe40960e3
+++ ChangeLog	704cde96629adbf1a5bff2b43cae1a4e1dccdcf5
@@ -1,3 +1,8 @@
+2006-01-12  Nathaniel Smith  <address@hidden>
+
+	* po/Makevars (XGETTEXT_OPTIONS): More fiddling to make
+	intltool-update happy.
+
 2006-01-13  Bruce Stephans  <address@hidden>
 
 	* lua.cc (shared_trust_function_body): Index lua arrays
============================================================
--- po/Makevars	66c462e5b59d356a9f086c244cc6be3c4c1132dd
+++ po/Makevars	658c8e7d7bc64b91caa440d65c1713c69f7b6002
@@ -17,10 +17,10 @@
 # something -- but we cannot.  XGETTEXT_OPTIONS _must_ literally be
 # defined to contain the best set of xgettext options, because
 # intltool-update reads this file and scans for XGETTEXT_OPTIONS
-# directly.  So... be careful if touching this stuff.
-XGETTEXT_OPTIONS="--keyword=F --keyword=FP:1,2 --keyword=_ --keyword=N_ \
-                  --flag=F:1:c-format --flag=FP:1:c-format \
-                  --flag=FP:2:c-format"
+# directly.  Also, intltool-update doesn't seem to grok line
+# continuations, so XGETTEXT_OPTIONS needs to fit all one one line.
+# So... be careful if touching this stuff.
+XGETTEXT_OPTIONS="--keyword=F --keyword=FP:1,2 --keyword=_ --keyword=N_ --flag=F:1:c-format --flag=FP:1:c-format --flag=FP:2:c-format"
 XGETTEXT_OPTIONS_NO_FLAG="--keyword=F --keyword=FP:1,2 --keyword=_ --keyword=N_"
 
 # This is the copyright holder that gets inserted into the header of the