summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Holder <thomas@thomas-holder.de>2018-10-15 06:32:48 +0000
committerThomas Holder <thomas@thomas-holder.de>2018-10-15 06:33:03 +0000
commit6102e245b15fdb2f9df9d2674ff2c9efbcd6648c (patch)
tree4e07edbcaf9351f1cfa7e92602ae6bd00a1cbea6
parentremove sp-text.cpp.orig (diff)
downloadinkscape-6102e245b15fdb2f9df9d2674ff2c9efbcd6648c.tar.gz
inkscape-6102e245b15fdb2f9df9d2674ff2c9efbcd6648c.zip
fix vi modelines: encoding -> fileencoding
-rw-r--r--src/file.h2
-rw-r--r--src/helper/geom-pathstroke.cpp2
-rw-r--r--src/helper/geom-pathvectorsatellites.cpp4
-rw-r--r--src/helper/geom-pathvectorsatellites.h4
-rw-r--r--src/helper/geom-satellite.cpp4
-rw-r--r--src/helper/geom-satellite.h4
-rw-r--r--src/io/dir-util.cpp2
-rw-r--r--src/ui/dialog/lpe-fillet-chamfer-properties.h4
-rw-r--r--src/xml/rebase-hrefs.cpp2
-rw-r--r--src/xml/rebase-hrefs.h2
10 files changed, 10 insertions, 20 deletions
diff --git a/src/file.h b/src/file.h
index c24ecdf6f..21c412f5f 100644
--- a/src/file.h
+++ b/src/file.h
@@ -221,4 +221,4 @@ extern int sp_file_convert_dpi_method_commandline;
fill-column:99
End:
*/
-// vi: set autoindent shiftwidth=4 tabstop=8 filetype=cpp expandtab softtabstop=4 encoding=utf-8 textwidth=99 :
+// vi: set autoindent shiftwidth=4 tabstop=8 filetype=cpp expandtab softtabstop=4 fileencoding=utf-8 textwidth=99 :
diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp
index 23d133e08..1736f9b16 100644
--- a/src/helper/geom-pathstroke.cpp
+++ b/src/helper/geom-pathstroke.cpp
@@ -1201,4 +1201,4 @@ void outline_join(Geom::Path &res, Geom::Path const& temp, Geom::Point in_tang,
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8 :
diff --git a/src/helper/geom-pathvectorsatellites.cpp b/src/helper/geom-pathvectorsatellites.cpp
index 85192bd75..861af0e04 100644
--- a/src/helper/geom-pathvectorsatellites.cpp
+++ b/src/helper/geom-pathvectorsatellites.cpp
@@ -253,6 +253,4 @@ void PathVectorSatellites::recalculateForNewPathVector(Geom::PathVector const pa
fill-column:99
End:
*/
-// vim:
-// filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99
-// :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/helper/geom-pathvectorsatellites.h b/src/helper/geom-pathvectorsatellites.h
index d86e6cb25..e95458a91 100644
--- a/src/helper/geom-pathvectorsatellites.h
+++ b/src/helper/geom-pathvectorsatellites.h
@@ -53,6 +53,4 @@ private:
fill-column:99
End:
*/
-// vim:
-// filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99
-// :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/helper/geom-satellite.cpp b/src/helper/geom-satellite.cpp
index 04df199d3..9cd6a3889 100644
--- a/src/helper/geom-satellite.cpp
+++ b/src/helper/geom-satellite.cpp
@@ -240,6 +240,4 @@ gchar const *Satellite::getSatelliteTypeGchar() const
fill-column:99
End:
*/
-// vim:
-// filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99
-// :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/helper/geom-satellite.h b/src/helper/geom-satellite.h
index 198a95c9f..c9cf84308 100644
--- a/src/helper/geom-satellite.h
+++ b/src/helper/geom-satellite.h
@@ -105,6 +105,4 @@ double arcLengthAt(double const A, Geom::Curve const &curve_in);
fill-column:99
End:
*/
-// vim:
-// filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99
-// :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/io/dir-util.cpp b/src/io/dir-util.cpp
index 1a215fa29..44c9a58d8 100644
--- a/src/io/dir-util.cpp
+++ b/src/io/dir-util.cpp
@@ -251,4 +251,4 @@ char *prepend_current_dir_if_relative(gchar const *uri)
fill-column:99
End:
*/
-// vi: set autoindent shiftwidth=4 tabstop=8 filetype=cpp expandtab softtabstop=4 encoding=utf-8 textwidth=99 :
+// vi: set autoindent shiftwidth=4 tabstop=8 filetype=cpp expandtab softtabstop=4 fileencoding=utf-8 textwidth=99 :
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.h b/src/ui/dialog/lpe-fillet-chamfer-properties.h
index 542a22bf6..0d9d7da0d 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.h
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.h
@@ -110,6 +110,4 @@ private:
fill-column:99
End:
*/
-// vim:
-// filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99
-// :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp
index c4b5a4117..9717a64a0 100644
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
@@ -308,4 +308,4 @@ void Inkscape::XML::rebase_hrefs(SPDocument *const doc, gchar const *const new_b
fill-column:99
End:
*/
-// vi: set autoindent shiftwidth=4 tabstop=8 filetype=cpp expandtab softtabstop=4 encoding=utf-8 textwidth=99 :
+// vi: set autoindent shiftwidth=4 tabstop=8 filetype=cpp expandtab softtabstop=4 fileencoding=utf-8 textwidth=99 :
diff --git a/src/xml/rebase-hrefs.h b/src/xml/rebase-hrefs.h
index 34afe6076..79778d537 100644
--- a/src/xml/rebase-hrefs.h
+++ b/src/xml/rebase-hrefs.h
@@ -51,4 +51,4 @@ Inkscape::Util::List<AttributeRecord const> rebase_href_attrs(
fill-column:99
End:
*/
-// vi: set autoindent shiftwidth=4 tabstop=8 filetype=cpp expandtab softtabstop=4 encoding=utf-8 textwidth=99 :
+// vi: set autoindent shiftwidth=4 tabstop=8 filetype=cpp expandtab softtabstop=4 fileencoding=utf-8 textwidth=99 :