# 
# patch "ChangeLog"
#  from [4b197b628dc730956dcab0fbceba9fa1ccaee522]
#    to [7f08a9f8fef2124a0c05db32fd62d1483027bc51]
# 
# patch "HACKING"
#  from [fa38cc2e96dca42b05a7626d34fcf7e4d8153bcc]
#    to [7058afa41b4a62f2c04b67fd846b413de0ba182d]
# 
========================================================================
--- ChangeLog	4b197b628dc730956dcab0fbceba9fa1ccaee522
+++ ChangeLog	7f08a9f8fef2124a0c05db32fd62d1483027bc51
@@ -1,3 +1,8 @@
+2005-08-22  Matt Johnston  <address@hidden>
+
+	* HACKING: change the vim modeline to something that seems to work
+	better.
+
 2005-08-22  Nathaniel Smith  <address@hidden>
 
 	* mt_version.cc (print_full_version): Typo.
========================================================================
--- HACKING	fa38cc2e96dca42b05a7626d34fcf7e4d8153bcc
+++ HACKING	7058afa41b4a62f2c04b67fd846b413de0ba182d
@@ -18,7 +18,7 @@
 
 And something close (but not perfect) for VIM:
 
-vim: et:sw=2:sts=2:ts=2:cino={.5s,\:.5s,+.5s,t0,g0,^-2,e-2,n-2,p2s,(0,=.5s:
+vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
 
 monotone's source includes a number of third party libraries.  These have
 been imported from upstream, and should retain the original coding style of