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)

55 files changed, 55 insertions, 55 deletions

diff --git a/src/filters/blend-fns.h b/src/filters/blend-fns.h
index f08ed9dd1..94456e0dd 100644
--- a/src/filters/blend-fns.h
+++ b/src/filters/blend-fns.h
@@ -35,4 +35,4 @@ GType sp_feBlend_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index 5998d7be3..4c41184db 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -298,4 +298,4 @@ static void sp_feBlend_build_renderer(SPFilterPrimitive *primitive, Inkscape::Fi
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/blend.h b/src/filters/blend.h
index 9f3cab475..62c6faaee 100644
--- a/src/filters/blend.h
+++ b/src/filters/blend.h
@@ -46,4 +46,4 @@ GType sp_feBlend_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/colormatrix-fns.h b/src/filters/colormatrix-fns.h
index 3a4a8d35c..62f7a190d 100644
--- a/src/filters/colormatrix-fns.h
+++ b/src/filters/colormatrix-fns.h
@@ -35,4 +35,4 @@ GType sp_feColorMatrix_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/colormatrix.cpp b/src/filters/colormatrix.cpp
index 3f60ea05c..da1c91632 100644
--- a/src/filters/colormatrix.cpp
+++ b/src/filters/colormatrix.cpp
@@ -227,4 +227,4 @@ static void sp_feColorMatrix_build_renderer(SPFilterPrimitive *primitive, Inksca
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/colormatrix.h b/src/filters/colormatrix.h
index 69be96928..754607608 100644
--- a/src/filters/colormatrix.h
+++ b/src/filters/colormatrix.h
@@ -46,4 +46,4 @@ GType sp_feColorMatrix_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/componenttransfer-fns.h b/src/filters/componenttransfer-fns.h
index 49983770a..65120fefa 100644
--- a/src/filters/componenttransfer-fns.h
+++ b/src/filters/componenttransfer-fns.h
@@ -35,4 +35,4 @@ GType sp_feComponentTransfer_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/componenttransfer-funcnode.cpp b/src/filters/componenttransfer-funcnode.cpp
index 8edb9cf2d..2fad81797 100644
--- a/src/filters/componenttransfer-funcnode.cpp
+++ b/src/filters/componenttransfer-funcnode.cpp
@@ -342,4 +342,4 @@ TODO: I'm not sure what to do here...
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/componenttransfer-funcnode.h b/src/filters/componenttransfer-funcnode.h
index 52873f6d3..d81e50577 100644
--- a/src/filters/componenttransfer-funcnode.h
+++ b/src/filters/componenttransfer-funcnode.h
@@ -69,4 +69,4 @@ GType sp_fefuncA_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/componenttransfer.cpp b/src/filters/componenttransfer.cpp
index 27e63eaa6..f1d4a709b 100644
--- a/src/filters/componenttransfer.cpp
+++ b/src/filters/componenttransfer.cpp
@@ -259,4 +259,4 @@ static void sp_feComponentTransfer_build_renderer(SPFilterPrimitive *primitive,
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/componenttransfer.h b/src/filters/componenttransfer.h
index 8281d9aea..8a9c3c682 100644
--- a/src/filters/componenttransfer.h
+++ b/src/filters/componenttransfer.h
@@ -45,4 +45,4 @@ GType sp_feComponentTransfer_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/composite-fns.h b/src/filters/composite-fns.h
index c79cb17bb..04530b152 100644
--- a/src/filters/composite-fns.h
+++ b/src/filters/composite-fns.h
@@ -35,4 +35,4 @@ GType sp_feComposite_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/composite.cpp b/src/filters/composite.cpp
index 93c692f94..9398aeea7 100644
--- a/src/filters/composite.cpp
+++ b/src/filters/composite.cpp
@@ -344,4 +344,4 @@ static void sp_feComposite_build_renderer(SPFilterPrimitive *primitive, Inkscape
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/composite.h b/src/filters/composite.h
index 095d7616d..0fa1b5665 100644
--- a/src/filters/composite.h
+++ b/src/filters/composite.h
@@ -56,4 +56,4 @@ GType sp_feComposite_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/convolvematrix-fns.h b/src/filters/convolvematrix-fns.h
index 76baf7f41..f6a4c846a 100644
--- a/src/filters/convolvematrix-fns.h
+++ b/src/filters/convolvematrix-fns.h
@@ -35,4 +35,4 @@ GType sp_feConvolveMatrix_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/convolvematrix.cpp b/src/filters/convolvematrix.cpp
index 6440f340a..45c0a080e 100644
--- a/src/filters/convolvematrix.cpp
+++ b/src/filters/convolvematrix.cpp
@@ -343,4 +343,4 @@ static void sp_feConvolveMatrix_build_renderer(SPFilterPrimitive *primitive, Ink
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/convolvematrix.h b/src/filters/convolvematrix.h
index 1e8545040..1d085fd6c 100644
--- a/src/filters/convolvematrix.h
+++ b/src/filters/convolvematrix.h
@@ -57,4 +57,4 @@ GType sp_feConvolveMatrix_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/diffuselighting-fns.h b/src/filters/diffuselighting-fns.h
index b91ed80f6..27ea77358 100644
--- a/src/filters/diffuselighting-fns.h
+++ b/src/filters/diffuselighting-fns.h
@@ -35,4 +35,4 @@ GType sp_feDiffuseLighting_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/diffuselighting.cpp b/src/filters/diffuselighting.cpp
index bdc569083..ca7a8423c 100644
--- a/src/filters/diffuselighting.cpp
+++ b/src/filters/diffuselighting.cpp
@@ -380,4 +380,4 @@ static void sp_feDiffuseLighting_build_renderer(SPFilterPrimitive *primitive, In
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/diffuselighting.h b/src/filters/diffuselighting.h
index 3c6c0ae73..7f0d8bc7a 100644
--- a/src/filters/diffuselighting.h
+++ b/src/filters/diffuselighting.h
@@ -62,4 +62,4 @@ GType sp_feDiffuseLighting_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/displacementmap-fns.h b/src/filters/displacementmap-fns.h
index 6d92c6b78..2fc115bb8 100644
--- a/src/filters/displacementmap-fns.h
+++ b/src/filters/displacementmap-fns.h
@@ -35,4 +35,4 @@ GType sp_feDisplacementMap_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/displacementmap.cpp b/src/filters/displacementmap.cpp
index baa17d785..956719d10 100644
--- a/src/filters/displacementmap.cpp
+++ b/src/filters/displacementmap.cpp
@@ -310,4 +310,4 @@ static void sp_feDisplacementMap_build_renderer(SPFilterPrimitive *primitive, In
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/displacementmap.h b/src/filters/displacementmap.h
index 6a8ac9cd9..f3c596f11 100644
--- a/src/filters/displacementmap.h
+++ b/src/filters/displacementmap.h
@@ -53,4 +53,4 @@ GType sp_feDisplacementMap_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/distantlight.cpp b/src/filters/distantlight.cpp
index 41584c4a4..ee366a23d 100644
--- a/src/filters/distantlight.cpp
+++ b/src/filters/distantlight.cpp
@@ -231,4 +231,4 @@ sp_fedistantlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/distantlight.h b/src/filters/distantlight.h
index 21edbc56c..a68746334 100644
--- a/src/filters/distantlight.h
+++ b/src/filters/distantlight.h
@@ -56,4 +56,4 @@ sp_fedistantlight_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/flood-fns.h b/src/filters/flood-fns.h
index 8cc507274..55130a7ba 100644
--- a/src/filters/flood-fns.h
+++ b/src/filters/flood-fns.h
@@ -35,4 +35,4 @@ GType sp_feFlood_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/flood.cpp b/src/filters/flood.cpp
index 221b0daf2..cf7ce662f 100644
--- a/src/filters/flood.cpp
+++ b/src/filters/flood.cpp
@@ -241,4 +241,4 @@ static void sp_feFlood_build_renderer(SPFilterPrimitive *primitive, Inkscape::Fi
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/flood.h b/src/filters/flood.h
index f386e2cd4..66b5dd96a 100644
--- a/src/filters/flood.h
+++ b/src/filters/flood.h
@@ -48,4 +48,4 @@ GType sp_feFlood_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/image-fns.h b/src/filters/image-fns.h
index 0a8b453fe..d9de38342 100644
--- a/src/filters/image-fns.h
+++ b/src/filters/image-fns.h
@@ -35,4 +35,4 @@ GType sp_feImage_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/image.cpp b/src/filters/image.cpp
index eb6dfc22a..69a4b6018 100644
--- a/src/filters/image.cpp
+++ b/src/filters/image.cpp
@@ -274,4 +274,4 @@ static void sp_feImage_build_renderer(SPFilterPrimitive *primitive, Inkscape::Fi
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/image.h b/src/filters/image.h
index 78e719ac7..2445da5c6 100644
--- a/src/filters/image.h
+++ b/src/filters/image.h
@@ -53,4 +53,4 @@ GType sp_feImage_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/merge-fns.h b/src/filters/merge-fns.h
index 24bda1ae2..e3674a391 100644
--- a/src/filters/merge-fns.h
+++ b/src/filters/merge-fns.h
@@ -35,4 +35,4 @@ GType sp_feMerge_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/merge.cpp b/src/filters/merge.cpp
index 437cb4b55..4d6573564 100644
--- a/src/filters/merge.cpp
+++ b/src/filters/merge.cpp
@@ -197,4 +197,4 @@ static void sp_feMerge_build_renderer(SPFilterPrimitive *primitive, Inkscape::Fi
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/merge.h b/src/filters/merge.h
index 5d28faba9..93374d134 100644
--- a/src/filters/merge.h
+++ b/src/filters/merge.h
@@ -41,4 +41,4 @@ GType sp_feMerge_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/mergenode.cpp b/src/filters/mergenode.cpp
index 8a4e0dd0a..1f92df4d6 100644
--- a/src/filters/mergenode.cpp
+++ b/src/filters/mergenode.cpp
@@ -174,4 +174,4 @@ sp_feMergeNode_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::X
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/mergenode.h b/src/filters/mergenode.h
index 8ec00bdcd..8352632a6 100644
--- a/src/filters/mergenode.h
+++ b/src/filters/mergenode.h
@@ -46,4 +46,4 @@ GType sp_feMergeNode_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/morphology-fns.h b/src/filters/morphology-fns.h
index a0550405d..dd023b607 100644
--- a/src/filters/morphology-fns.h
+++ b/src/filters/morphology-fns.h
@@ -35,4 +35,4 @@ GType sp_feMorphology_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/morphology.cpp b/src/filters/morphology.cpp
index 1530dae8c..668f94c4c 100644
--- a/src/filters/morphology.cpp
+++ b/src/filters/morphology.cpp
@@ -222,4 +222,4 @@ static void sp_feMorphology_build_renderer(SPFilterPrimitive *primitive, Inkscap
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/morphology.h b/src/filters/morphology.h
index 20abf8a8d..4a493d16c 100644
--- a/src/filters/morphology.h
+++ b/src/filters/morphology.h
@@ -47,4 +47,4 @@ GType sp_feMorphology_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/offset-fns.h b/src/filters/offset-fns.h
index 38561c188..d9d2a2fc4 100644
--- a/src/filters/offset-fns.h
+++ b/src/filters/offset-fns.h
@@ -35,4 +35,4 @@ GType sp_feOffset_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/offset.cpp b/src/filters/offset.cpp
index 61ea45ff2..2db931650 100644
--- a/src/filters/offset.cpp
+++ b/src/filters/offset.cpp
@@ -206,4 +206,4 @@ static void sp_feOffset_build_renderer(SPFilterPrimitive *primitive, Inkscape::F
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/offset.h b/src/filters/offset.h
index 72d852514..49f8108ef 100644
--- a/src/filters/offset.h
+++ b/src/filters/offset.h
@@ -42,4 +42,4 @@ GType sp_feOffset_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/pointlight.cpp b/src/filters/pointlight.cpp
index ce58cf13e..a4939023e 100644
--- a/src/filters/pointlight.cpp
+++ b/src/filters/pointlight.cpp
@@ -256,4 +256,4 @@ sp_fepointlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/pointlight.h b/src/filters/pointlight.h
index 915d726af..c0b272021 100644
--- a/src/filters/pointlight.h
+++ b/src/filters/pointlight.h
@@ -61,4 +61,4 @@ sp_fepointlight_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/specularlighting-fns.h b/src/filters/specularlighting-fns.h
index bd48ba684..9fd5f46b3 100644
--- a/src/filters/specularlighting-fns.h
+++ b/src/filters/specularlighting-fns.h
@@ -35,4 +35,4 @@ GType sp_feSpecularLighting_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/specularlighting.cpp b/src/filters/specularlighting.cpp
index 03a0c7f96..6ed540892 100644
--- a/src/filters/specularlighting.cpp
+++ b/src/filters/specularlighting.cpp
@@ -404,4 +404,4 @@ static void sp_feSpecularLighting_build_renderer(SPFilterPrimitive *primitive, I
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/specularlighting.h b/src/filters/specularlighting.h
index cdca5f99f..692ec9bf9 100644
--- a/src/filters/specularlighting.h
+++ b/src/filters/specularlighting.h
@@ -65,4 +65,4 @@ GType sp_feSpecularLighting_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/spotlight.cpp b/src/filters/spotlight.cpp
index 3b518f0b4..6d1347975 100644
--- a/src/filters/spotlight.cpp
+++ b/src/filters/spotlight.cpp
@@ -369,4 +369,4 @@ sp_fespotlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::X
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/spotlight.h b/src/filters/spotlight.h
index d48cf6daa..6e2463c08 100644
--- a/src/filters/spotlight.h
+++ b/src/filters/spotlight.h
@@ -75,4 +75,4 @@ sp_fespotlight_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/tile-fns.h b/src/filters/tile-fns.h
index b7c4c5f27..5f8393a7b 100644
--- a/src/filters/tile-fns.h
+++ b/src/filters/tile-fns.h
@@ -35,4 +35,4 @@ GType sp_feTile_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/tile.cpp b/src/filters/tile.cpp
index 877f70b27..f37409b14 100644
--- a/src/filters/tile.cpp
+++ b/src/filters/tile.cpp
@@ -184,4 +184,4 @@ static void sp_feTile_build_renderer(SPFilterPrimitive *primitive, Inkscape::Fil
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/tile.h b/src/filters/tile.h
index 9e12ca7ee..747be7aa1 100644
--- a/src/filters/tile.h
+++ b/src/filters/tile.h
@@ -45,4 +45,4 @@ GType sp_feTile_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/turbulence-fns.h b/src/filters/turbulence-fns.h
index 43b4450a5..33946e3da 100644
--- a/src/filters/turbulence-fns.h
+++ b/src/filters/turbulence-fns.h
@@ -35,4 +35,4 @@ GType sp_feTurbulence_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/turbulence.cpp b/src/filters/turbulence.cpp
index eed056ecc..268eca643 100644
--- a/src/filters/turbulence.cpp
+++ b/src/filters/turbulence.cpp
@@ -279,4 +279,4 @@ static void sp_feTurbulence_build_renderer(SPFilterPrimitive *primitive, Inkscap
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/filters/turbulence.h b/src/filters/turbulence.h
index 792a6181a..a19b8df57 100644
--- a/src/filters/turbulence.h
+++ b/src/filters/turbulence.h
@@ -51,4 +51,4 @@ GType sp_feTurbulence_get_type();
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :