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)

18 files changed, 18 insertions, 18 deletions

diff --git a/src/debug/demangle.cpp b/src/debug/demangle.cpp
index 0da7cfd63..2b00fb8e9 100644
--- a/src/debug/demangle.cpp
+++ b/src/debug/demangle.cpp
@@ -77,4 +77,4 @@ Util::ptr_shared<char> demangle(char const *name) {
   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/debug/demangle.h b/src/debug/demangle.h
index 8c0dd6b4e..7505d9550 100644
--- a/src/debug/demangle.h
+++ b/src/debug/demangle.h
@@ -34,4 +34,4 @@ Util::ptr_shared<char> demangle(char const *name);
   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/debug/event-tracker.h b/src/debug/event-tracker.h
index 89180d8d4..fe2069a29 100644
--- a/src/debug/event-tracker.h
+++ b/src/debug/event-tracker.h
@@ -221,4 +221,4 @@ public:
   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/debug/event.h b/src/debug/event.h
index ad56751fc..1cdd4f7e2 100644
--- a/src/debug/event.h
+++ b/src/debug/event.h
@@ -77,4 +77,4 @@ public:
   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/debug/gc-heap.h b/src/debug/gc-heap.h
index 4d0343f12..957f2067a 100644
--- a/src/debug/gc-heap.h
+++ b/src/debug/gc-heap.h
@@ -49,4 +49,4 @@ public:
   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/debug/gdk-event-latency-tracker.cpp b/src/debug/gdk-event-latency-tracker.cpp
index a6baae8da..b21675f53 100644
--- a/src/debug/gdk-event-latency-tracker.cpp
+++ b/src/debug/gdk-event-latency-tracker.cpp
@@ -75,4 +75,4 @@ GdkEventLatencyTracker &GdkEventLatencyTracker::default_tracker() {
   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/debug/gdk-event-latency-tracker.h b/src/debug/gdk-event-latency-tracker.h
index 5a05baf48..12ebb6570 100644
--- a/src/debug/gdk-event-latency-tracker.h
+++ b/src/debug/gdk-event-latency-tracker.h
@@ -53,4 +53,4 @@ private:
   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/debug/heap.cpp b/src/debug/heap.cpp
index c0452f26b..8e7a920ba 100644
--- a/src/debug/heap.cpp
+++ b/src/debug/heap.cpp
@@ -62,4 +62,4 @@ void register_extra_heap(Heap &heap) {
   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/debug/heap.h b/src/debug/heap.h
index f3cc250a5..e1e01f022 100644
--- a/src/debug/heap.h
+++ b/src/debug/heap.h
@@ -60,4 +60,4 @@ void register_extra_heap(Heap &heap);
   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/debug/log-display-config.cpp b/src/debug/log-display-config.cpp
index 0aeb71cf9..d2821cc53 100644
--- a/src/debug/log-display-config.cpp
+++ b/src/debug/log-display-config.cpp
@@ -86,4 +86,4 @@ void log_display_config() {
   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/debug/log-display-config.h b/src/debug/log-display-config.h
index ae64b0836..6a598ac0f 100644
--- a/src/debug/log-display-config.h
+++ b/src/debug/log-display-config.h
@@ -34,4 +34,4 @@ void log_display_config();
   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/debug/logger.cpp b/src/debug/logger.cpp
index f28d2750b..bc761d67e 100644
--- a/src/debug/logger.cpp
+++ b/src/debug/logger.cpp
@@ -225,4 +225,4 @@ void Logger::shutdown() {
   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/debug/logger.h b/src/debug/logger.h
index 1513c0ac6..b5970e1ba 100644
--- a/src/debug/logger.h
+++ b/src/debug/logger.h
@@ -243,4 +243,4 @@ private:
   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/debug/simple-event.h b/src/debug/simple-event.h
index 74301a609..d09358224 100644
--- a/src/debug/simple-event.h
+++ b/src/debug/simple-event.h
@@ -96,4 +96,4 @@ private:
   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/debug/sysv-heap.cpp b/src/debug/sysv-heap.cpp
index 9ca6ea549..5cc06d619 100644
--- a/src/debug/sysv-heap.cpp
+++ b/src/debug/sysv-heap.cpp
@@ -76,4 +76,4 @@ Heap::Stats SysVHeap::stats() const {
   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/debug/sysv-heap.h b/src/debug/sysv-heap.h
index 82fe9b769..ba8f5db83 100644
--- a/src/debug/sysv-heap.h
+++ b/src/debug/sysv-heap.h
@@ -44,4 +44,4 @@ public:
   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/debug/timestamp.cpp b/src/debug/timestamp.cpp
index 8814f37ad..4c014e965 100644
--- a/src/debug/timestamp.cpp
+++ b/src/debug/timestamp.cpp
@@ -42,4 +42,4 @@ Util::ptr_shared<char> timestamp() {
   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/debug/timestamp.h b/src/debug/timestamp.h
index 31eac35fd..336ed5d0f 100644
--- a/src/debug/timestamp.h
+++ b/src/debug/timestamp.h
@@ -34,4 +34,4 @@ Util::ptr_shared<char> timestamp();
   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 :