Super duper mega (fun!) commit: replaced encoding=utf-8 with fileencoding=utf-8 in all 1074 Vim modelines.

The reason for this is that (a) setting the encoding isn't nice, and (b) Vim 7.3 (with modeline enabled) disallows it and pops up an error whenever you open any file with it ("invalid modeline").

Also corrected five deviant modestrings:
* src/ui/widget/dock.cpp and src/ui/widget/dock.h: missing colon at the end
* src/ui/dialog/tile.cpp: removed gratuitous second colon at the end
* src/helper/units-test.h: removed gratuitous space before a colon
* share/extensions/export_gimp_palette.py: missing textwidth=99

That's my geekiest commit yet.

(bzr r9900)

66 files changed, 66 insertions, 66 deletions

diff --git a/share/extensions/addnodes.py b/share/extensions/addnodes.py
index 3a8bebe66..d78ab55e7 100644
--- a/share/extensions/addnodes.py
+++ b/share/extensions/addnodes.py
@@ -113,4 +113,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/bezmisc.py b/share/extensions/bezmisc.py
index e663fa67f..0c7ad4957 100755
--- a/share/extensions/bezmisc.py
+++ b/share/extensions/bezmisc.py
@@ -271,4 +271,4 @@ if __name__ == '__main__':
         print beziertatlength(curve,0.5)
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/color_randomize.py b/share/extensions/color_randomize.py
index 9ac9fb553..e939b7b6d 100644
--- a/share/extensions/color_randomize.py
+++ b/share/extensions/color_randomize.py
@@ -36,4 +36,4 @@ c = C()
 c.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/convert2dashes.py b/share/extensions/convert2dashes.py
index b77961740..f88734baf 100644
--- a/share/extensions/convert2dashes.py
+++ b/share/extensions/convert2dashes.py
@@ -86,4 +86,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/cspsubdiv.py b/share/extensions/cspsubdiv.py
index 20817d8cf..f05068df9 100644
--- a/share/extensions/cspsubdiv.py
+++ b/share/extensions/cspsubdiv.py
@@ -38,4 +38,4 @@ def subdiv(sp,flat,i=1):
         subdiv(sp,flat,i)
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/cubicsuperpath.py b/share/extensions/cubicsuperpath.py
index af61acb3a..da46f8080 100755
--- a/share/extensions/cubicsuperpath.py
+++ b/share/extensions/cubicsuperpath.py
@@ -166,4 +166,4 @@ def formatPath(p):
     return simplepath.formatPath(unCubicSuperPath(p))
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/dimension.py b/share/extensions/dimension.py
index 1b84642ea..9156fdc2c 100644
--- a/share/extensions/dimension.py
+++ b/share/extensions/dimension.py
@@ -177,4 +177,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/dots.py b/share/extensions/dots.py
index c3d3671c4..7b88dd1b1 100755
--- a/share/extensions/dots.py
+++ b/share/extensions/dots.py
@@ -124,4 +124,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/dxf_input.py b/share/extensions/dxf_input.py
index a5de65418..b46477de1 100644
--- a/share/extensions/dxf_input.py
+++ b/share/extensions/dxf_input.py
@@ -460,4 +460,4 @@ while line[0] and line[1] != 'DICTIONARY':
 
 doc.write(inkex.sys.stdout)
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/dxf_outlines.py b/share/extensions/dxf_outlines.py
index 219ee1dda..b2f777ae6 100755
--- a/share/extensions/dxf_outlines.py
+++ b/share/extensions/dxf_outlines.py
@@ -236,4 +236,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/edge3d.py b/share/extensions/edge3d.py
index 2deff9b67..d2d8ead5c 100644
--- a/share/extensions/edge3d.py
+++ b/share/extensions/edge3d.py
@@ -146,4 +146,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/embedimage.py b/share/extensions/embedimage.py
index f73ceb358..882455cb0 100644
--- a/share/extensions/embedimage.py
+++ b/share/extensions/embedimage.py
@@ -106,4 +106,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/eqtexsvg.py b/share/extensions/eqtexsvg.py
index 8e2e70a10..bf2874ef9 100644
--- a/share/extensions/eqtexsvg.py
+++ b/share/extensions/eqtexsvg.py
@@ -156,4 +156,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/export_gimp_palette.py b/share/extensions/export_gimp_palette.py
index f1b4086c0..b9d6a1059 100644
--- a/share/extensions/export_gimp_palette.py
+++ b/share/extensions/export_gimp_palette.py
@@ -47,4 +47,4 @@ for k,v in sorted(colors.items()):
     print k+v
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/extractimage.py b/share/extensions/extractimage.py
index 4093b94a7..d5cf285c8 100644
--- a/share/extensions/extractimage.py
+++ b/share/extensions/extractimage.py
@@ -77,4 +77,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/ffgeom.py b/share/extensions/ffgeom.py
index 198358672..ef8799b97 100644
--- a/share/extensions/ffgeom.py
+++ b/share/extensions/ffgeom.py
@@ -138,4 +138,4 @@ def dot(s1, s2):
     return s1.delta_x() * s2.delta_x() + s1.delta_y() * s2.delta_y()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/fig2dev-ext.py b/share/extensions/fig2dev-ext.py
index 0e32a941d..ac51b00ef 100644
--- a/share/extensions/fig2dev-ext.py
+++ b/share/extensions/fig2dev-ext.py
@@ -27,4 +27,4 @@ from run_command import run
 run('fig2dev -L svg "%s" "%%s"' % sys.argv[1].replace("%","%%"), "fig2dev")
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/flatten.py b/share/extensions/flatten.py
index 48044936b..ce6915086 100755
--- a/share/extensions/flatten.py
+++ b/share/extensions/flatten.py
@@ -47,4 +47,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/foldablebox.py b/share/extensions/foldablebox.py
index 47f3ad59c..21de10565 100755
--- a/share/extensions/foldablebox.py
+++ b/share/extensions/foldablebox.py
@@ -262,4 +262,4 @@ if __name__ == '__main__':   #pragma: no cover
     e = FoldableBox()
     e.affect()
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/fractalize.py b/share/extensions/fractalize.py
index ec92064d1..901a8f761 100755
--- a/share/extensions/fractalize.py
+++ b/share/extensions/fractalize.py
@@ -94,4 +94,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/funcplot.py b/share/extensions/funcplot.py
index b94fda278..0beaf3946 100644
--- a/share/extensions/funcplot.py
+++ b/share/extensions/funcplot.py
@@ -289,4 +289,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/gears.py b/share/extensions/gears.py
index e4dbefc2e..8f4745423 100644
--- a/share/extensions/gears.py
+++ b/share/extensions/gears.py
@@ -163,4 +163,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/generate_voronoi.py b/share/extensions/generate_voronoi.py
index 6c317c348..54400a90a 100644
--- a/share/extensions/generate_voronoi.py
+++ b/share/extensions/generate_voronoi.py
@@ -190,4 +190,4 @@ if __name__ == '__main__':
     e = Pattern()
     e.affect()
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/grid_cartesian.py b/share/extensions/grid_cartesian.py
index 19adbbbe2..85716a6fd 100644
--- a/share/extensions/grid_cartesian.py
+++ b/share/extensions/grid_cartesian.py
@@ -261,4 +261,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/grid_polar.py b/share/extensions/grid_polar.py
index 4d7a3989c..3ae3fac34 100644
--- a/share/extensions/grid_polar.py
+++ b/share/extensions/grid_polar.py
@@ -195,4 +195,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/handles.py b/share/extensions/handles.py
index 256e3d422..0cbdef44c 100755
--- a/share/extensions/handles.py
+++ b/share/extensions/handles.py
@@ -55,4 +55,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/hpgl_output.py b/share/extensions/hpgl_output.py
index a556e6180..bd28e3717 100644
--- a/share/extensions/hpgl_output.py
+++ b/share/extensions/hpgl_output.py
@@ -110,4 +110,4 @@ if __name__ == '__main__':   #pragma: no cover
     e = MyEffect()
     e.affect()
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py
index fba7276fd..b2b59442b 100755
--- a/share/extensions/inkex.py
+++ b/share/extensions/inkex.py
@@ -244,4 +244,4 @@ class Effect:
         return retval
             
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/interp.py b/share/extensions/interp.py
index bb05d8d84..8ca7f6aeb 100755
--- a/share/extensions/interp.py
+++ b/share/extensions/interp.py
@@ -313,4 +313,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/launch_webbrowser.py b/share/extensions/launch_webbrowser.py
index 0deea3c8f..8de5611be 100644
--- a/share/extensions/launch_webbrowser.py
+++ b/share/extensions/launch_webbrowser.py
@@ -18,4 +18,4 @@ vwswli = VisitWebSiteWithoutLockingInkscape()
 vwswli.start()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/lindenmayer.py b/share/extensions/lindenmayer.py
index daa002b89..f9abce3ec 100755
--- a/share/extensions/lindenmayer.py
+++ b/share/extensions/lindenmayer.py
@@ -116,4 +116,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/markers_strokepaint.py b/share/extensions/markers_strokepaint.py
index 265b4d433..5f85d69db 100644
--- a/share/extensions/markers_strokepaint.py
+++ b/share/extensions/markers_strokepaint.py
@@ -78,4 +78,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/measure.py b/share/extensions/measure.py
index 0335f3fe9..147027fb6 100644
--- a/share/extensions/measure.py
+++ b/share/extensions/measure.py
@@ -198,4 +198,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/motion.py b/share/extensions/motion.py
index 5e0e73731..9bf31e008 100755
--- a/share/extensions/motion.py
+++ b/share/extensions/motion.py
@@ -110,4 +110,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/param_curves.py b/share/extensions/param_curves.py
index 7a8f384aa..d8f880d0c 100644
--- a/share/extensions/param_curves.py
+++ b/share/extensions/param_curves.py
@@ -249,4 +249,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/pathalongpath.py b/share/extensions/pathalongpath.py
index b39f29c3a..7a2fa09ea 100644
--- a/share/extensions/pathalongpath.py
+++ b/share/extensions/pathalongpath.py
@@ -284,4 +284,4 @@ if __name__ == '__main__':
     e.affect()
 
                     
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/pathmodifier.py b/share/extensions/pathmodifier.py
index 128c1b754..ceb0994e6 100644
--- a/share/extensions/pathmodifier.py
+++ b/share/extensions/pathmodifier.py
@@ -307,4 +307,4 @@ class Diffeo(PathModifier):
 #e.affect()
 
     
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/pathscatter.py b/share/extensions/pathscatter.py
index b8b8e31bc..6ed3cc8ac 100644
--- a/share/extensions/pathscatter.py
+++ b/share/extensions/pathscatter.py
@@ -289,4 +289,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/perfectboundcover.py b/share/extensions/perfectboundcover.py
index 694040434..6cdab7eab 100644
--- a/share/extensions/perfectboundcover.py
+++ b/share/extensions/perfectboundcover.py
@@ -169,4 +169,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/perspective.py b/share/extensions/perspective.py
index ae47cacfb..4caaa68a1 100755
--- a/share/extensions/perspective.py
+++ b/share/extensions/perspective.py
@@ -158,4 +158,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/plt_output.py b/share/extensions/plt_output.py
index 86a674f23..49ac1f604 100644
--- a/share/extensions/plt_output.py
+++ b/share/extensions/plt_output.py
@@ -27,4 +27,4 @@ from uniconv_output import run, get_command
 cmd = get_command()
 run((cmd + ' "%s" ') % sys.argv[1], "UniConvertor", ".plt")
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
\ No newline at end of file
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
\ No newline at end of file
diff --git a/share/extensions/polyhedron_3d.py b/share/extensions/polyhedron_3d.py
index b64cf413e..1efce876f 100644
--- a/share/extensions/polyhedron_3d.py
+++ b/share/extensions/polyhedron_3d.py
@@ -520,4 +520,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/ps2pdf-ext.py b/share/extensions/ps2pdf-ext.py
index 3d137e9b4..3c699c8ff 100644
--- a/share/extensions/ps2pdf-ext.py
+++ b/share/extensions/ps2pdf-ext.py
@@ -29,4 +29,4 @@ if (sys.argv[1] == "--dEPSCrop=true"): cmd += ' -dEPSCrop '
 
 run((cmd+' "%s" "%%s"') % sys.argv[-1].replace("%","%%"), "ps2pdf")
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/pturtle.py b/share/extensions/pturtle.py
index 8c67d3bc9..b2740a4bc 100755
--- a/share/extensions/pturtle.py
+++ b/share/extensions/pturtle.py
@@ -80,4 +80,4 @@ class pTurtle:
     pd = pendown
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/radiusrand.py b/share/extensions/radiusrand.py
index 1a36d5cba..e272a50c4 100755
--- a/share/extensions/radiusrand.py
+++ b/share/extensions/radiusrand.py
@@ -82,4 +82,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/render_alphabetsoup_config.py b/share/extensions/render_alphabetsoup_config.py
index 204991123..63f3fe5c1 100644
--- a/share/extensions/render_alphabetsoup_config.py
+++ b/share/extensions/render_alphabetsoup_config.py
@@ -581,4 +581,4 @@ units = 36                                        # pixels per unit box in font
 font = "alphabet_soup/"                           # location of font images
     
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/render_barcode_datamatrix.py b/share/extensions/render_barcode_datamatrix.py
index e5365546e..785d7de56 100644
--- a/share/extensions/render_barcode_datamatrix.py
+++ b/share/extensions/render_barcode_datamatrix.py
@@ -651,4 +651,4 @@ if __name__ == '__main__':
     e = DataMatrix()
     e.affect()
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/render_barcode_qrcode.py b/share/extensions/render_barcode_qrcode.py
index a8727aea0..129b96c13 100644
--- a/share/extensions/render_barcode_qrcode.py
+++ b/share/extensions/render_barcode_qrcode.py
@@ -1065,4 +1065,4 @@ if __name__ == '__main__':
     e = QRCodeInkscape()

     e.affect()

 

-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99

+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99

diff --git a/share/extensions/restack.py b/share/extensions/restack.py
index 139f783b2..518c1b10e 100644
--- a/share/extensions/restack.py
+++ b/share/extensions/restack.py
@@ -143,4 +143,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/rtree.py b/share/extensions/rtree.py
index ddd0078d0..3231d284e 100755
--- a/share/extensions/rtree.py
+++ b/share/extensions/rtree.py
@@ -62,4 +62,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/rubberstretch.py b/share/extensions/rubberstretch.py
index 5426ea3c9..95d1cffb5 100644
--- a/share/extensions/rubberstretch.py
+++ b/share/extensions/rubberstretch.py
@@ -78,4 +78,4 @@ if __name__ == '__main__':
     e.affect()
 
     
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/run_command.py b/share/extensions/run_command.py
index 89d42338a..7012c4274 100644
--- a/share/extensions/run_command.py
+++ b/share/extensions/run_command.py
@@ -93,4 +93,4 @@ def run(command_format, prog_name):
         sys.exit(0)
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/simplepath.py b/share/extensions/simplepath.py
index f62b1b4b3..94ab09242 100755
--- a/share/extensions/simplepath.py
+++ b/share/extensions/simplepath.py
@@ -209,4 +209,4 @@ def rotatePath(p, a, cx = 0, cy = 0):
                     params[i + 1] = (r * math.sin(theta)) + cy
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/simplestyle.py b/share/extensions/simplestyle.py
index e312d3cef..feb0b0bcd 100755
--- a/share/extensions/simplestyle.py
+++ b/share/extensions/simplestyle.py
@@ -231,4 +231,4 @@ def formatColor3f(r,g,b):
     return '#%02x%02x%02x' % (int(round(r*255)),int(round(g*255)),int(round(b*255)))
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/simpletransform.py b/share/extensions/simpletransform.py
index 08aa4c55f..8f8a811dc 100644
--- a/share/extensions/simpletransform.py
+++ b/share/extensions/simpletransform.py
@@ -230,4 +230,4 @@ def computeBBox(aList,mat=[[1,0,0],[0,1,0]]):
     return bbox
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/sk1_output.py b/share/extensions/sk1_output.py
index fd85f7740..5ad2eaccc 100644
--- a/share/extensions/sk1_output.py
+++ b/share/extensions/sk1_output.py
@@ -27,4 +27,4 @@ from uniconv_output import run, get_command
 cmd = get_command()
 run((cmd + ' "%s" ') % sys.argv[1], "UniConvertor", ".sk1")
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
\ No newline at end of file
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
\ No newline at end of file
diff --git a/share/extensions/spirograph.py b/share/extensions/spirograph.py
index 9dbf0dcea..21249831f 100644
--- a/share/extensions/spirograph.py
+++ b/share/extensions/spirograph.py
@@ -113,4 +113,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/straightseg.py b/share/extensions/straightseg.py
index 16db996fc..f18658012 100755
--- a/share/extensions/straightseg.py
+++ b/share/extensions/straightseg.py
@@ -70,4 +70,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/summersnight.py b/share/extensions/summersnight.py
index f14b400cd..7f4ffb1b0 100755
--- a/share/extensions/summersnight.py
+++ b/share/extensions/summersnight.py
@@ -121,4 +121,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/svg_and_media_zip_output.py b/share/extensions/svg_and_media_zip_output.py
index dc5ca5f26..640c9ede4 100644
--- a/share/extensions/svg_and_media_zip_output.py
+++ b/share/extensions/svg_and_media_zip_output.py
@@ -136,4 +136,4 @@ if __name__ == '__main__':   #pragma: no cover
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/triangle.py b/share/extensions/triangle.py
index 965de243e..81945f370 100644
--- a/share/extensions/triangle.py
+++ b/share/extensions/triangle.py
@@ -194,4 +194,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/uniconv-ext.py b/share/extensions/uniconv-ext.py
index a7608bc56..246340e89 100644
--- a/share/extensions/uniconv-ext.py
+++ b/share/extensions/uniconv-ext.py
@@ -61,4 +61,4 @@ if cmd == None:
 
 run((cmd+' "%s" "%%s"') % sys.argv[1].replace("%","%%"), "UniConvertor")
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/uniconv_output.py b/share/extensions/uniconv_output.py
index 720666103..30d1c2fe0 100644
--- a/share/extensions/uniconv_output.py
+++ b/share/extensions/uniconv_output.py
@@ -127,4 +127,4 @@ def get_command():
 
     return cmd
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/whirl.py b/share/extensions/whirl.py
index 4c5db2262..cea9da8df 100644
--- a/share/extensions/whirl.py
+++ b/share/extensions/whirl.py
@@ -58,4 +58,4 @@ if __name__ == '__main__':
     e.affect()
 
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/wireframe_sphere.py b/share/extensions/wireframe_sphere.py
index 5391af3e6..467aa609e 100644
--- a/share/extensions/wireframe_sphere.py
+++ b/share/extensions/wireframe_sphere.py
@@ -218,4 +218,4 @@ if __name__ == '__main__':
     e = Wireframe_Sphere()
     e.affect()
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
diff --git a/share/extensions/wmf_output.py b/share/extensions/wmf_output.py
index 3ea4c0acf..8d92b0518 100644
--- a/share/extensions/wmf_output.py
+++ b/share/extensions/wmf_output.py
@@ -27,4 +27,4 @@ from uniconv_output import run, get_command
 cmd = get_command()
 run((cmd + ' "%s" ') % sys.argv[1], "UniConvertor", ".wmf")
 
-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
\ No newline at end of file
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
\ No newline at end of file