Merge from trunk

(bzr r9508.1.70)

42 files changed, 42 insertions, 42 deletions

diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index 795cbff20..870a50537 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -299,4 +299,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 4fd763166..e7fc410e7 100644
--- a/src/filters/blend.h
+++ b/src/filters/blend.h
@@ -47,4 +47,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.cpp b/src/filters/colormatrix.cpp
index 07567cce6..a2d7aefb4 100644
--- a/src/filters/colormatrix.cpp
+++ b/src/filters/colormatrix.cpp
@@ -228,4 +228,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 71c19db4d..8eb750ac1 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-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 4853ab8cd..4d9541203 100644
--- a/src/filters/componenttransfer.cpp
+++ b/src/filters/componenttransfer.cpp
@@ -260,4 +260,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 be66d5a82..2df64009f 100644
--- a/src/filters/componenttransfer.h
+++ b/src/filters/componenttransfer.h
@@ -48,4 +48,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.cpp b/src/filters/composite.cpp
index 0c534e01d..2d0ebeda5 100644
--- a/src/filters/composite.cpp
+++ b/src/filters/composite.cpp
@@ -346,4 +346,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 126d8e71b..3eb62716f 100644
--- a/src/filters/composite.h
+++ b/src/filters/composite.h
@@ -57,4 +57,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.cpp b/src/filters/convolvematrix.cpp
index 4444b82ce..319fe1654 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 11120698d..4c5261e05 100644
--- a/src/filters/convolvematrix.h
+++ b/src/filters/convolvematrix.h
@@ -58,4 +58,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.cpp b/src/filters/diffuselighting.cpp
index 59b00d183..76179d560 100644
--- a/src/filters/diffuselighting.cpp
+++ b/src/filters/diffuselighting.cpp
@@ -384,4 +384,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 0cb62c5a7..a23346622 100644
--- a/src/filters/diffuselighting.h
+++ b/src/filters/diffuselighting.h
@@ -61,4 +61,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.cpp b/src/filters/displacementmap.cpp
index cfa8e427e..1c874a8c3 100644
--- a/src/filters/displacementmap.cpp
+++ b/src/filters/displacementmap.cpp
@@ -312,4 +312,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 414b3e663..6232f0937 100644
--- a/src/filters/displacementmap.h
+++ b/src/filters/displacementmap.h
@@ -54,4 +54,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 de33d967e..d4b59074d 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.cpp b/src/filters/flood.cpp
index 8b7d4c5cd..ff60e34ee 100644
--- a/src/filters/flood.cpp
+++ b/src/filters/flood.cpp
@@ -244,4 +244,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 220faca83..0083def70 100644
--- a/src/filters/flood.h
+++ b/src/filters/flood.h
@@ -47,4 +47,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/gaussian-blur.cpp b/src/filters/gaussian-blur.cpp
index 3f7cea0c9..28e3bb6a3 100644
--- a/src/filters/gaussian-blur.cpp
+++ b/src/filters/gaussian-blur.cpp
@@ -209,4 +209,4 @@ static void sp_gaussianBlur_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/gaussian-blur.h b/src/filters/gaussian-blur.h
index 5607080fe..417f8a6f4 100644
--- a/src/filters/gaussian-blur.h
+++ b/src/filters/gaussian-blur.h
@@ -48,4 +48,4 @@ void  sp_gaussianBlur_setDeviation(SPGaussianBlur *blur, float num, float optnum
   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 a8fb65d6a..a66e6c4c5 100644
--- a/src/filters/image.h
+++ b/src/filters/image.h
@@ -54,4 +54,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.cpp b/src/filters/merge.cpp
index 798b7dfcc..dacfb7e91 100644
--- a/src/filters/merge.cpp
+++ b/src/filters/merge.cpp
@@ -198,4 +198,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 c28eaa1f6..3243073ca 100644
--- a/src/filters/merge.h
+++ b/src/filters/merge.h
@@ -42,4 +42,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 4ff569364..b532d961c 100644
--- a/src/filters/mergenode.cpp
+++ b/src/filters/mergenode.cpp
@@ -175,4 +175,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.cpp b/src/filters/morphology.cpp
index f6f9dc609..3d791daa8 100644
--- a/src/filters/morphology.cpp
+++ b/src/filters/morphology.cpp
@@ -223,4 +223,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 01eb2f59b..b7005a3d9 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.cpp b/src/filters/offset.cpp
index b436fd0fb..58dd249a5 100644
--- a/src/filters/offset.cpp
+++ b/src/filters/offset.cpp
@@ -207,4 +207,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 5319ff84e..dba7ed8ef 100644
--- a/src/filters/offset.h
+++ b/src/filters/offset.h
@@ -44,4 +44,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 5bb662c0f..b9625b33e 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.cpp b/src/filters/specularlighting.cpp
index 2c38d6bda..77e90cd43 100644
--- a/src/filters/specularlighting.cpp
+++ b/src/filters/specularlighting.cpp
@@ -408,4 +408,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 8d26b8cfe..90d1f9f62 100644
--- a/src/filters/specularlighting.h
+++ b/src/filters/specularlighting.h
@@ -63,4 +63,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 10815cfb1..51685c330 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.cpp b/src/filters/tile.cpp
index c87d78554..d4e4ac890 100644
--- a/src/filters/tile.cpp
+++ b/src/filters/tile.cpp
@@ -185,4 +185,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 45c43213d..a376a6e10 100644
--- a/src/filters/tile.h
+++ b/src/filters/tile.h
@@ -44,4 +44,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.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 e9403a164..cbc4fb082 100644
--- a/src/filters/turbulence.h
+++ b/src/filters/turbulence.h
@@ -55,4 +55,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 :