# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/bvk/Work/grub2/experimental/
# testament_sha1: 5d0b00b62abb39853d949389b9acd53a69ae1d9c
# timestamp: 2010-02-10 09:32:34 +0530
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'ChangeLog.lexer-rewrite'
--- ChangeLog.lexer-rewrite	2010-01-25 16:31:14 +0000
+++ ChangeLog.lexer-rewrite	2010-02-10 04:01:00 +0000
@@ -1,3 +1,8 @@
+2010-02-10  BVK Chaitanya  <address@hidden>
+
+	* script/lexer.c (grub_script_lexer_record_stop): Fix off-by-one
+	bug.
+
 2010-01-25  BVK Chaitanya  <address@hidden>
 
 	* script/yylex.l: Accept parenthesis as part of word.

=== modified file 'script/lexer.c'
--- script/lexer.c	2010-01-23 04:44:32 +0000
+++ script/lexer.c	2010-02-10 04:01:00 +0000
@@ -76,7 +76,7 @@
     while (*end && grub_isspace (*end)) end--;
     if (*end == '}') end--;
     while (*end && grub_isspace (*end)) end--;
-    *end = '\0';
+    end[1] = '\0';
 
     return start;
   }

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSyx9ecAAgtfgEAwUPP//1sM
lQ6////wUARNFtmE9ygtEgkoRMRtAjU8FPKaaYiMT9UNBozJNASijJo01P1JkmymhoD1GgAAAACS
IJpMJoaUemp+qeo2UPU0DQbU0MhmoOYACZMACYTBMIYAjAAklMgyp+qep6aaTJtTQ0ANB6gAABzl
8sJbIHFzPPkbNlldjnMVzdksqREX3NcXxtdUm+Lss7tg5Fhhj88g1RmWvownCDQZ4vdb1v7Tf9sl
28zl+9OI7+wwwI4sCrCvKW3o+vRcRY4A5giCxauXGD/E0bzI5oWhVq/RcyOdQ9l3q6EvbpA9WDg5
pLIFAqx8V5Mnq3BkSBnox6Q7e5CCdcTBsgDElElDm1I0DANcUOpg6co5RqEX8h/VmsSayj9NK0wD
JkkUDGgil5jqF05kjTTdRTUVolCzPpzsWTox3wVLAh3S6XHvxrzp6q5iYecqC4gNZFqkxOvbiW7G
nSvBiSqLlNI0lpBZLe+Q3RumujSykljZDXXiBODK5y/RE0lpmjArwrVzlJEW8NKeIVgMEyBXuaUc
IYT2Z9o4WqLtKRnqWKW3T17YEL1dMrXOrJWFZL71DWlaScjpGWhFhQszrVVqmYJi4iU2F5q2E/TL
VaX1ZpxZJhMKZaKb3wadG2brggxfinIAzOUrtFKnQMHjD3ycxQjwJyKYZk0RTIcGFM5krkZ5NBFZ
IGck/RtpjwPnfqqvsisJLZOehn0OpOE09GkqIqk3LYcE3VXktfuGIQc6fR2j8zimEWVDMMzWe/vc
rl4Rj4kY+PZzenEsutlddImZDW24dLwjvkScTGi85t0pJaqDqdpK9hGKSeeAHDWVaIQadrdSXxkV
uvWd3BU07vsw4GSYN5nDPPuExZGSHj3nQQjifqIi/CimbTBcpklVLimFNjn1my/njsBUFk2cBk9D
aOo4Fj13E+qRj9VvKUnUjjrYZ9JN5NsgqnHkNHE3nZI9o3U8YjPG++cuo/GOOm+tkURZTRuZb6NN
JykX3XAaFpSiq57U7Ww47dsZIBgBIh3SdZg2ohVZ32mG3AjW4yoXccDYdhtaNMI1Lv0MQxeyS7QX
t4qqxmQv4mkzMlO8oRkX4MwHFPf5IZDuVaSwFHATnmiWKu+iDYidcEPG7vec0G+nwLdIJnLtyI0p
LMEEQmCisDNQLcwwZouKMfBTE21LcA4IV7HwSWxWG6W2w20nFcVIiiolBEFda6hFmINOJzAMpjPm
UoH7EeAUoio0dFihvsMirWXOp3qFAL2JrYARtYYHJ8y5ANCjlewKxYlqVo8CtRuyCxMJyMG25wJX
2qBrfxGrMnRUn4qrwUlQGdpjEgT6t1tdMs5exE1oYrOLGKpqaVSOpsiTLPn3wg0YEOsJXJ524Btx
WbHXcWCuXrZRYLvlO+6cv0zxBUgbqtMpUsqIAu6octdMhVlZRgppmLy8CCiZ+IqAySUsoH+LuSKc
KEgWWPrzgA==