=== modified file 'Makefile'
--- Makefile	2014-07-02 11:50:54 +0000
+++ Makefile	2014-03-20 12:53:39 +0000
@@ -16,7 +16,7 @@
 	mv parents.new parents
 
 raw/.bzr/checkout/dirstate: .bzr/branch/last-revision
-	if test -d raw; then cd raw && bzr revert && bzr pull --overwrite ..; else bzr co --lightweight . raw; fi; bzr up
+	if test -d raw; then cd raw && bzr pull --overwrite ..; else bzr co --lightweight . raw; fi
 
 files: .bzr/branch/last-revision
 	bzr ls --recursive --versioned >files.new

=== modified file 'render_files'
--- render_files	2014-07-02 11:50:54 +0000
+++ render_files	2014-06-03 13:43:14 +0000
@@ -3,7 +3,7 @@
     mkdir -p head/${1%/*} || exit $?
     if test raw/"$1" -nt head.old/"$1".html; then
 	escaped="head/$(sed 's/[#%|\\]/\\&/' <<<"$1").html"
-	vim </dev/null >/dev/null 2>&1 raw/"$1" +'set modeline' +'e!' +'set nornu number fdm=manual' +TOhtml '+w! '"$escaped" '+qa!'
+	vim </dev/null >/dev/null 2>&1 raw/"$1" +'set modeline' +'e!' +'set nornu number fdm=' +TOhtml '+w! '"$escaped" '+qa!'
 	touch -r raw/"$1" head/"$1".html
     else
 	mv head.old/"$1".html head/"$1".html