From c2ea920ca016a8f19d464fd8a961ad45afcce8b3 Mon Sep 17 00:00:00 2001
From: Gregor Best <gbe@ring0.de>
Date: Sun, 11 Sep 2011 16:50:01 +0200
Subject: [PATCH] remove encoding=utf-8 from modelines

This option is no longer valid in modelines, so it has been removed from
all modelines using the following shellscript:

    #!/bin/ksh

    git ls-tree -r HEAD | cut -f2 | while read f; do
        egrep -e '^(//|--) vim: .*encoding=' $f >/dev/null || continue
        sed -E -e '/^(\/\/|--) vim:/s/:encoding=utf-8//' $f > /tmp/foo
        mv /tmp/foo $f
    done

Signed-off-by: Gregor Best <gbe@ring0.de>
Signed-off-by: Uli Schlachter <psychon@znc.in>
---
 CMakeLists.txt                        | 2 +-
 awesome.c                             | 2 +-
 awesome.h                             | 2 +-
 awesomeConfig.cmake                   | 2 +-
 banning.c                             | 2 +-
 banning.h                             | 2 +-
 color.c                               | 2 +-
 color.h                               | 2 +-
 common/array.h                        | 2 +-
 common/atoms.c                        | 2 +-
 common/atoms.h                        | 2 +-
 common/backtrace.c                    | 2 +-
 common/backtrace.h                    | 2 +-
 common/luaclass.c                     | 2 +-
 common/luaclass.h                     | 2 +-
 common/lualib.h                       | 2 +-
 common/luaobject.c                    | 2 +-
 common/luaobject.h                    | 2 +-
 common/signal.h                       | 2 +-
 common/util.c                         | 2 +-
 common/util.h                         | 2 +-
 common/version.c                      | 2 +-
 common/xcursor.c                      | 2 +-
 common/xcursor.h                      | 2 +-
 common/xembed.c                       | 2 +-
 common/xembed.h                       | 2 +-
 common/xutil.c                        | 2 +-
 common/xutil.h                        | 2 +-
 dbus.c                                | 2 +-
 dbus.h                                | 2 +-
 draw.c                                | 2 +-
 draw.h                                | 2 +-
 event.c                               | 2 +-
 event.h                               | 2 +-
 ewmh.c                                | 2 +-
 ewmh.h                                | 2 +-
 globalconf.h                          | 2 +-
 keygrabber.c                          | 2 +-
 keygrabber.h                          | 2 +-
 keyresolv.c                           | 2 +-
 keyresolv.h                           | 2 +-
 lib/awful/autofocus.lua.in            | 2 +-
 lib/awful/button.lua.in               | 2 +-
 lib/awful/client.lua.in               | 2 +-
 lib/awful/completion.lua.in           | 2 +-
 lib/awful/dbus.lua.in                 | 2 +-
 lib/awful/ewmh.lua.in                 | 2 +-
 lib/awful/icccm.lua.in                | 2 +-
 lib/awful/init.lua.in                 | 2 +-
 lib/awful/key.lua.in                  | 2 +-
 lib/awful/layout/init.lua.in          | 2 +-
 lib/awful/layout/suit/spiral.lua.in   | 2 +-
 lib/awful/menu.lua.in                 | 2 +-
 lib/awful/mouse/init.lua.in           | 2 +-
 lib/awful/placement.lua.in            | 2 +-
 lib/awful/prompt.lua.in               | 2 +-
 lib/awful/remote.lua.in               | 2 +-
 lib/awful/rules.lua.in                | 2 +-
 lib/awful/screen.lua.in               | 2 +-
 lib/awful/startup_notification.lua.in | 2 +-
 lib/awful/tag.lua.in                  | 2 +-
 lib/awful/util.lua.in                 | 2 +-
 lib/awful/wibox.lua.in                | 2 +-
 lib/awful/widget/button.lua.in        | 2 +-
 lib/awful/widget/common.lua.in        | 2 +-
 lib/awful/widget/graph.lua.in         | 2 +-
 lib/awful/widget/init.lua.in          | 2 +-
 lib/awful/widget/launcher.lua.in      | 2 +-
 lib/awful/widget/layoutbox.lua.in     | 2 +-
 lib/awful/widget/progressbar.lua.in   | 2 +-
 lib/awful/widget/prompt.lua.in        | 2 +-
 lib/awful/widget/taglist.lua.in       | 2 +-
 lib/awful/widget/tasklist.lua.in      | 2 +-
 lib/awful/widget/textclock.lua.in     | 2 +-
 lib/beautiful.lua.in                  | 2 +-
 lib/gears/color.lua.in                | 2 +-
 lib/gears/debug.lua.in                | 2 +-
 lib/gears/init.lua.in                 | 2 +-
 lib/gears/object.lua.in               | 2 +-
 lib/gears/sort.lua.in                 | 2 +-
 lib/naughty.lua.in                    | 2 +-
 lib/wibox/init.lua.in                 | 2 +-
 lib/wibox/layout/align.lua.in         | 2 +-
 lib/wibox/layout/base.lua.in          | 2 +-
 lib/wibox/layout/fixed.lua.in         | 2 +-
 lib/wibox/layout/flex.lua.in          | 2 +-
 lib/wibox/layout/init.lua.in          | 2 +-
 lib/wibox/layout/margin.lua.in        | 2 +-
 lib/wibox/layout/rotate.lua.in        | 2 +-
 lib/wibox/widget/background.lua.in    | 2 +-
 lib/wibox/widget/base.lua.in          | 2 +-
 lib/wibox/widget/imagebox.lua.in      | 2 +-
 lib/wibox/widget/init.lua.in          | 2 +-
 lib/wibox/widget/systray.lua.in       | 2 +-
 lib/wibox/widget/textbox.lua.in       | 2 +-
 luaa.c                                | 2 +-
 luaa.h                                | 2 +-
 mouse.c                               | 2 +-
 mouse.h                               | 2 +-
 mousegrabber.c                        | 2 +-
 mousegrabber.h                        | 2 +-
 objects/button.c                      | 2 +-
 objects/button.h                      | 2 +-
 objects/client.c                      | 2 +-
 objects/client.h                      | 2 +-
 objects/drawin.c                      | 2 +-
 objects/drawin.h                      | 2 +-
 objects/key.c                         | 2 +-
 objects/key.h                         | 2 +-
 objects/tag.c                         | 2 +-
 objects/tag.h                         | 2 +-
 objects/timer.c                       | 2 +-
 objects/timer.h                       | 2 +-
 objects/window.c                      | 2 +-
 objects/window.h                      | 2 +-
 property.c                            | 2 +-
 property.h                            | 2 +-
 root.c                                | 2 +-
 screen.c                              | 2 +-
 screen.h                              | 2 +-
 selection.c                           | 2 +-
 selection.h                           | 2 +-
 spawn.c                               | 2 +-
 spawn.h                               | 2 +-
 stack.c                               | 2 +-
 stack.h                               | 2 +-
 strut.c                               | 2 +-
 strut.h                               | 2 +-
 systray.c                             | 2 +-
 systray.h                             | 2 +-
 themes/default/theme.lua.in           | 2 +-
 themes/sky/theme.lua.in               | 2 +-
 xwindow.c                             | 2 +-
 xwindow.h                             | 2 +-
 134 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a06b42bb6..6b0705d88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -321,4 +321,4 @@ if(GENERATE_LUADOC)
 endif()
 # }}}
 
-# vim: filetype=cmake:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+# vim: filetype=cmake:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/awesome.c b/awesome.c
index 292e3a6a2..2689586f0 100644
--- a/awesome.c
+++ b/awesome.c
@@ -590,4 +590,4 @@ main(int argc, char **argv)
     return EXIT_SUCCESS;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/awesome.h b/awesome.h
index bba659156..dbc1cc562 100644
--- a/awesome.h
+++ b/awesome.h
@@ -28,4 +28,4 @@ void awesome_restart(void);
 void awesome_atexit(bool restart);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
index ff23df94f..484eb2244 100644
--- a/awesomeConfig.cmake
+++ b/awesomeConfig.cmake
@@ -306,4 +306,4 @@ foreach(file ${AWESOME_CONFIGURE_FILES})
 endforeach()
 #}}}
 
-# vim: filetype=cmake:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+# vim: filetype=cmake:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/banning.c b/banning.c
index 8dec623d8..c20758639 100644
--- a/banning.c
+++ b/banning.c
@@ -68,4 +68,4 @@ banning_refresh(void)
     client_restore_enterleave_events();
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/banning.h b/banning.h
index 30bb138c6..b05e336f0 100644
--- a/banning.h
+++ b/banning.h
@@ -28,4 +28,4 @@ void banning_need_update(void);
 void banning_refresh(void);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/color.c b/color.c
index 952c9b7ac..ceee8d43b 100644
--- a/color.c
+++ b/color.c
@@ -147,4 +147,4 @@ luaA_pushcolor(lua_State *L, const color_t c)
     return 1;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/color.h b/color.h
index 940bbaba2..895934482 100644
--- a/color.h
+++ b/color.h
@@ -51,4 +51,4 @@ int luaA_pushcolor(lua_State *, const color_t);
 
 #endif
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/array.h b/common/array.h
index 239877a85..8d3a4e110 100644
--- a/common/array.h
+++ b/common/array.h
@@ -142,4 +142,4 @@
     BARRAY_FUNCS(type_t, pfx, dtor, cmp)
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/atoms.c b/common/atoms.c
index fd7f612f2..942dbd83f 100644
--- a/common/atoms.c
+++ b/common/atoms.c
@@ -57,4 +57,4 @@ atoms_init(xcb_connection_t *conn)
     }
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/atoms.h b/common/atoms.h
index be9ecd434..d0830b44f 100644
--- a/common/atoms.h
+++ b/common/atoms.h
@@ -29,4 +29,4 @@
 void atoms_init(xcb_connection_t *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/backtrace.c b/common/backtrace.c
index e09879126..815d07a26 100644
--- a/common/backtrace.c
+++ b/common/backtrace.c
@@ -59,4 +59,4 @@ backtrace_get(buffer_t *buf)
         buffer_addsl(buf, "Cannot get backtrace symbols.");
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/backtrace.h b/common/backtrace.h
index 25a3e1e95..8a63a3e48 100644
--- a/common/backtrace.h
+++ b/common/backtrace.h
@@ -28,4 +28,4 @@ void backtrace_get(buffer_t *);
 
 #endif
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/luaclass.c b/common/luaclass.c
index 53f6e85e3..1ffe3980c 100644
--- a/common/luaclass.c
+++ b/common/luaclass.c
@@ -456,4 +456,4 @@ luaA_class_new(lua_State *L, lua_class_t *lua_class)
     return 1;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/luaclass.h b/common/luaclass.h
index 3186416e9..b3ad71c2b 100644
--- a/common/luaclass.h
+++ b/common/luaclass.h
@@ -157,4 +157,4 @@ luaA_checkudataornil(lua_State *L, int udx, lua_class_t *class)
 
 #endif
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/lualib.h b/common/lualib.h
index 291d4b124..7226bac29 100644
--- a/common/lualib.h
+++ b/common/lualib.h
@@ -123,4 +123,4 @@ luaA_dofunction(lua_State *L, int nargs, int nret)
 
 #endif
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/luaobject.c b/common/luaobject.c
index af3d185df..44f99ffab 100644
--- a/common/luaobject.c
+++ b/common/luaobject.c
@@ -337,4 +337,4 @@ luaA_object_tostring(lua_State *L)
     return 1;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/luaobject.h b/common/luaobject.h
index 3761e12b0..6580065f6 100644
--- a/common/luaobject.h
+++ b/common/luaobject.h
@@ -210,4 +210,4 @@ int luaA_object_tostring(lua_State *);
 
 #endif
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/signal.h b/common/signal.h
index dbff6b696..25fe43821 100644
--- a/common/signal.h
+++ b/common/signal.h
@@ -114,4 +114,4 @@ signal_disconnect(signal_array_t *arr, const char *name, const void *ref)
 
 #endif
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/util.c b/common/util.c
index 55978a20f..3c581639e 100644
--- a/common/util.c
+++ b/common/util.c
@@ -123,4 +123,4 @@ a_exec(const char *cmd)
     execl(shell, shell, "-c", cmd, NULL);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/util.h b/common/util.h
index cf549a7a9..8310ed5b9 100644
--- a/common/util.h
+++ b/common/util.h
@@ -325,4 +325,4 @@ void _warn(int, const char *, const char *, ...)
 void a_exec(const char *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/version.c b/common/version.c
index 15ab41b37..dc7f9b8e9 100644
--- a/common/version.c
+++ b/common/version.c
@@ -55,4 +55,4 @@ eprint_version(void)
     exit(EXIT_SUCCESS);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/xcursor.c b/common/xcursor.c
index d122d3dbf..2f8824e85 100644
--- a/common/xcursor.c
+++ b/common/xcursor.c
@@ -162,4 +162,4 @@ xcursor_new(xcb_connection_t *conn, uint16_t cursor_font)
 }
 
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/xcursor.h b/common/xcursor.h
index 2119997bb..4536c7218 100644
--- a/common/xcursor.h
+++ b/common/xcursor.h
@@ -30,4 +30,4 @@ const char * xcursor_font_tostr(uint16_t);
 xcb_cursor_t xcursor_new(xcb_connection_t *, uint16_t);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/xembed.c b/common/xembed.c
index 1649b4433..d05ed4a1e 100644
--- a/common/xembed.c
+++ b/common/xembed.c
@@ -145,4 +145,4 @@ xembed_property_update(xcb_connection_t *connection, xembed_window_t *emwin,
     }
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/xembed.h b/common/xembed.h
index 3e9d4260c..fe3322220 100644
--- a/common/xembed.h
+++ b/common/xembed.h
@@ -166,4 +166,4 @@ xembed_focus_out(xcb_connection_t *c, xcb_window_t client)
 
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/xutil.c b/common/xutil.c
index 8b62da767..a34e48864 100644
--- a/common/xutil.c
+++ b/common/xutil.c
@@ -136,4 +136,4 @@ xutil_key_mask_tostr(uint16_t mask, const char **name, size_t *len)
     }
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/xutil.h b/common/xutil.h
index b87412c58..d223ab2ff 100644
--- a/common/xutil.h
+++ b/common/xutil.h
@@ -61,4 +61,4 @@ uint16_t xutil_key_mask_fromstr(const char *);
 void xutil_key_mask_tostr(uint16_t, const char **, size_t *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/dbus.c b/dbus.c
index 12ec31317..9380165a9 100644
--- a/dbus.c
+++ b/dbus.c
@@ -815,4 +815,4 @@ a_dbus_cleanup(void)
 }
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/dbus.h b/dbus.h
index 228ee9ddc..9c8947cd0 100644
--- a/dbus.h
+++ b/dbus.h
@@ -26,4 +26,4 @@ void a_dbus_init(void);
 void a_dbus_cleanup(void);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/draw.c b/draw.c
index f48c4cd03..580aecc5c 100644
--- a/draw.c
+++ b/draw.c
@@ -160,4 +160,4 @@ draw_dup_image_surface(cairo_surface_t *surface)
     return res;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/draw.h b/draw.h
index bc39b74b8..d8a4c1cbb 100644
--- a/draw.h
+++ b/draw.h
@@ -69,4 +69,4 @@ int luaA_surface_from_data(lua_State *L, int width, int height, uint32_t *data);
 cairo_surface_t *draw_dup_image_surface(cairo_surface_t *surface);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/event.c b/event.c
index 3028e32d6..db18807ca 100644
--- a/event.c
+++ b/event.c
@@ -792,4 +792,4 @@ void event_handle(xcb_generic_event_t *event)
         event_handle_randr_screen_change_notify((void *) event);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/event.h b/event.h
index 517f3bca5..9c7e54e8a 100644
--- a/event.h
+++ b/event.h
@@ -40,4 +40,4 @@ awesome_refresh(void)
 void event_handle(xcb_generic_event_t *event);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/ewmh.c b/ewmh.c
index be31aceda..d0bd0ce60 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -671,4 +671,4 @@ ewmh_window_icon_get_reply(xcb_get_property_cookie_t cookie)
     return ret;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/ewmh.h b/ewmh.h
index b56afd99d..d7f27d0e4 100644
--- a/ewmh.h
+++ b/ewmh.h
@@ -40,4 +40,4 @@ xcb_get_property_cookie_t ewmh_window_icon_get_unchecked(xcb_window_t);
 int ewmh_window_icon_get_reply(xcb_get_property_cookie_t);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/globalconf.h b/globalconf.h
index 27ba51041..b231accfb 100644
--- a/globalconf.h
+++ b/globalconf.h
@@ -122,4 +122,4 @@ typedef struct
 extern awesome_t globalconf;
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/keygrabber.c b/keygrabber.c
index 64146f0a4..85c20a93c 100644
--- a/keygrabber.c
+++ b/keygrabber.c
@@ -137,4 +137,4 @@ const struct luaL_reg awesome_keygrabber_lib[] =
     { NULL, NULL }
 };
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/keygrabber.h b/keygrabber.h
index 07a242266..3893cb588 100644
--- a/keygrabber.h
+++ b/keygrabber.h
@@ -29,4 +29,4 @@ int luaA_keygrabber_stop(lua_State *);
 bool keygrabber_handlekpress(lua_State *, xcb_key_press_event_t *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/keyresolv.c b/keyresolv.c
index 80b1ebf58..946c61c34 100644
--- a/keyresolv.c
+++ b/keyresolv.c
@@ -965,4 +965,4 @@ keyresolv_get_keysym(xcb_keycode_t detail, uint16_t state)
     return XCB_NO_SYMBOL;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/keyresolv.h b/keyresolv.h
index a37e446d0..9fb229956 100644
--- a/keyresolv.h
+++ b/keyresolv.h
@@ -29,4 +29,4 @@ bool keyresolv_keysym_to_string(xcb_keysym_t, char *, ssize_t);
 
 #endif
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/autofocus.lua.in b/lib/awful/autofocus.lua.in
index 0a2be0468..e551a633a 100644
--- a/lib/awful/autofocus.lua.in
+++ b/lib/awful/autofocus.lua.in
@@ -41,4 +41,4 @@ client.connect_signal("untagged", check_focus)
 client.connect_signal("property::hidden", check_focus)
 client.connect_signal("property::minimized", check_focus)
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/button.lua.in b/lib/awful/button.lua.in
index 78228f6aa..049d38c00 100644
--- a/lib/awful/button.lua.in
+++ b/lib/awful/button.lua.in
@@ -49,4 +49,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/client.lua.in b/lib/awful/client.lua.in
index 497a8d301..8dd5fff75 100644
--- a/lib/awful/client.lua.in
+++ b/lib/awful/client.lua.in
@@ -876,4 +876,4 @@ capi.client.connect_signal("unmanage", urgent.delete)
 
 capi.client.connect_signal("unmanage", floating.delete)
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/completion.lua.in b/lib/awful/completion.lua.in
index e964b53c5..6877f9115 100644
--- a/lib/awful/completion.lua.in
+++ b/lib/awful/completion.lua.in
@@ -188,4 +188,4 @@ function generic(text, cur_pos, ncomp, keywords)
     return matches[ncomp], #matches[ncomp] + 1, matches
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/dbus.lua.in b/lib/awful/dbus.lua.in
index 6af460130..a5ea06ca3 100644
--- a/lib/awful/dbus.lua.in
+++ b/lib/awful/dbus.lua.in
@@ -16,4 +16,4 @@ if dbus then
     dbus.request_name("session", "org.naquadah.awesome.awful")
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/ewmh.lua.in b/lib/awful/ewmh.lua.in
index eb226e4f5..f0262e3ba 100644
--- a/lib/awful/ewmh.lua.in
+++ b/lib/awful/ewmh.lua.in
@@ -107,4 +107,4 @@ client.connect_signal("request::maximized_vertical", maximized_vertical)
 client.connect_signal("request::fullscreen", fullscreen)
 client.connect_signal("property::screen", screen_change)
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/icccm.lua.in b/lib/awful/icccm.lua.in
index 1d1998fdf..eebda171a 100644
--- a/lib/awful/icccm.lua.in
+++ b/lib/awful/icccm.lua.in
@@ -120,4 +120,4 @@ end
 client.connect_signal("property::width", apply_size_hints)
 client.connect_signal("property::height", apply_size_hints)
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/init.lua.in b/lib/awful/init.lua.in
index c16a02e97..2311447e4 100644
--- a/lib/awful/init.lua.in
+++ b/lib/awful/init.lua.in
@@ -27,4 +27,4 @@ require("awful.icccm")
 --- AWesome Functions very UsefuL
 module("awful")
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/key.lua.in b/lib/awful/key.lua.in
index 07429d0fc..b88cd2953 100644
--- a/lib/awful/key.lua.in
+++ b/lib/awful/key.lua.in
@@ -75,4 +75,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/layout/init.lua.in b/lib/awful/layout/init.lua.in
index 4e5fce0b3..1bbb42b47 100644
--- a/lib/awful/layout/init.lua.in
+++ b/lib/awful/layout/init.lua.in
@@ -152,4 +152,4 @@ capi.client.connect_signal("list", function()
                                    end
                                end)
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/layout/suit/spiral.lua.in b/lib/awful/layout/suit/spiral.lua.in
index 6695b4a1d..011b5aaf3 100644
--- a/lib/awful/layout/suit/spiral.lua.in
+++ b/lib/awful/layout/suit/spiral.lua.in
@@ -61,4 +61,4 @@ function arrange(p)
     return spiral(p, true)
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/menu.lua.in b/lib/awful/menu.lua.in
index 35335b2a9..8f1ef4b3b 100644
--- a/lib/awful/menu.lua.in
+++ b/lib/awful/menu.lua.in
@@ -701,4 +701,4 @@ end
 
 setmetatable(_M, { __call = function (_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/mouse/init.lua.in b/lib/awful/mouse/init.lua.in
index 5e7f4c692..4496b9c0a 100644
--- a/lib/awful/mouse/init.lua.in
+++ b/lib/awful/mouse/init.lua.in
@@ -588,4 +588,4 @@ end
 -- Set the cursor at startup
 capi.root.cursor("left_ptr")
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/placement.lua.in b/lib/awful/placement.lua.in
index c30327fb5..fa3d37bd1 100644
--- a/lib/awful/placement.lua.in
+++ b/lib/awful/placement.lua.in
@@ -235,4 +235,4 @@ function center_vertical(c, p)
 end
 
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/prompt.lua.in b/lib/awful/prompt.lua.in
index 67af4909a..64ab8392e 100644
--- a/lib/awful/prompt.lua.in
+++ b/lib/awful/prompt.lua.in
@@ -380,4 +380,4 @@ function run(args, textbox, exe_callback, completion_callback, history_path, his
     end)
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/remote.lua.in b/lib/awful/remote.lua.in
index ab8a5304d..7b3ed8a22 100644
--- a/lib/awful/remote.lua.in
+++ b/lib/awful/remote.lua.in
@@ -45,4 +45,4 @@ if dbus then
     end)
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/rules.lua.in b/lib/awful/rules.lua.in
index 625c52251..2fbde5753 100644
--- a/lib/awful/rules.lua.in
+++ b/lib/awful/rules.lua.in
@@ -205,4 +205,4 @@ end
 client.connect_signal("manage", apply)
 client.disconnect_signal("manage", atag.withcurrent)
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/screen.lua.in b/lib/awful/screen.lua.in
index c7fdc777a..d15d51668 100644
--- a/lib/awful/screen.lua.in
+++ b/lib/awful/screen.lua.in
@@ -54,4 +54,4 @@ for s = 1, capi.screen.count() do
     capi.screen[s]:add_signal("padding")
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/startup_notification.lua.in b/lib/awful/startup_notification.lua.in
index bfd62e650..be5420ba8 100644
--- a/lib/awful/startup_notification.lua.in
+++ b/lib/awful/startup_notification.lua.in
@@ -51,4 +51,4 @@ capi.awesome.connect_signal("spawn::canceled", unregister_hook)
 capi.awesome.connect_signal("spawn::completed", unregister_hook)
 capi.awesome.connect_signal("spawn::timeout", unregister_hook)
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/tag.lua.in b/lib/awful/tag.lua.in
index e918de085..bf5c33421 100644
--- a/lib/awful/tag.lua.in
+++ b/lib/awful/tag.lua.in
@@ -533,4 +533,4 @@ end
 
 setmetatable(_M, { __call = function (_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in
index 82a1551f1..9aa1069d0 100644
--- a/lib/awful/util.lua.in
+++ b/lib/awful/util.lua.in
@@ -348,4 +348,4 @@ function table.clone(t)
     return c
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/wibox.lua.in b/lib/awful/wibox.lua.in
index 6a511de55..dd312f586 100644
--- a/lib/awful/wibox.lua.in
+++ b/lib/awful/wibox.lua.in
@@ -277,4 +277,4 @@ capi.client.connect_signal("unmanage", update_wiboxes_on_struts)
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/widget/button.lua.in b/lib/awful/widget/button.lua.in
index 4f84baff3..39fc2f31f 100644
--- a/lib/awful/widget/button.lua.in
+++ b/lib/awful/widget/button.lua.in
@@ -40,4 +40,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/widget/common.lua.in b/lib/awful/widget/common.lua.in
index e85a95e71..21e08938a 100644
--- a/lib/awful/widget/common.lua.in
+++ b/lib/awful/widget/common.lua.in
@@ -99,4 +99,4 @@ end
 
 return common
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/widget/graph.lua.in b/lib/awful/widget/graph.lua.in
index 00e619c4c..bb2e5d075 100644
--- a/lib/awful/widget/graph.lua.in
+++ b/lib/awful/widget/graph.lua.in
@@ -276,4 +276,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/widget/init.lua.in b/lib/awful/widget/init.lua.in
index bcd531176..e22153ea4 100644
--- a/lib/awful/widget/init.lua.in
+++ b/lib/awful/widget/init.lua.in
@@ -17,4 +17,4 @@ require("awful.widget.textclock")
 --- Widget module for awful
 module("awful.widget")
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/widget/launcher.lua.in b/lib/awful/widget/launcher.lua.in
index 80a5715aa..5d4bcfa43 100644
--- a/lib/awful/widget/launcher.lua.in
+++ b/lib/awful/widget/launcher.lua.in
@@ -32,4 +32,4 @@ end
 
 setmetatable(_M, { __call = function (_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/widget/layoutbox.lua.in b/lib/awful/widget/layoutbox.lua.in
index d5b2c438e..1723ee55e 100644
--- a/lib/awful/widget/layoutbox.lua.in
+++ b/lib/awful/widget/layoutbox.lua.in
@@ -42,4 +42,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/widget/progressbar.lua.in b/lib/awful/widget/progressbar.lua.in
index b1bbbb791..a0e97dc46 100644
--- a/lib/awful/widget/progressbar.lua.in
+++ b/lib/awful/widget/progressbar.lua.in
@@ -224,4 +224,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/widget/prompt.lua.in b/lib/awful/widget/prompt.lua.in
index 1702ca236..e903f0d56 100644
--- a/lib/awful/widget/prompt.lua.in
+++ b/lib/awful/widget/prompt.lua.in
@@ -47,4 +47,4 @@ end
 
 setmetatable(_M, { __call = function (_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/widget/taglist.lua.in b/lib/awful/widget/taglist.lua.in
index e155e8306..3d7fcdd59 100644
--- a/lib/awful/widget/taglist.lua.in
+++ b/lib/awful/widget/taglist.lua.in
@@ -183,4 +183,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/widget/tasklist.lua.in b/lib/awful/widget/tasklist.lua.in
index 1bd3cab11..19f9fa9db 100644
--- a/lib/awful/widget/tasklist.lua.in
+++ b/lib/awful/widget/tasklist.lua.in
@@ -203,4 +203,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/awful/widget/textclock.lua.in b/lib/awful/widget/textclock.lua.in
index 89baf9376..efcfde672 100644
--- a/lib/awful/widget/textclock.lua.in
+++ b/lib/awful/widget/textclock.lua.in
@@ -30,4 +30,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/beautiful.lua.in b/lib/beautiful.lua.in
index 566612aeb..d67dcd373 100644
--- a/lib/beautiful.lua.in
+++ b/lib/beautiful.lua.in
@@ -121,4 +121,4 @@ set_font("sans 8")
 
 setmetatable(_M, { __index = function(t, k) return theme[k] end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/gears/color.lua.in b/lib/gears/color.lua.in
index 2cc5ceeb8..d04c05e70 100644
--- a/lib/gears/color.lua.in
+++ b/lib/gears/color.lua.in
@@ -150,4 +150,4 @@ end
 
 setmetatable(_M, { __call = function (_, ...) return create_pattern(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/gears/debug.lua.in b/lib/gears/debug.lua.in
index 2f14d9b68..634faa0ef 100644
--- a/lib/gears/debug.lua.in
+++ b/lib/gears/debug.lua.in
@@ -20,4 +20,4 @@ function assert(cond, message)
     end
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/gears/init.lua.in b/lib/gears/init.lua.in
index 4b7c5a3b4..dcc4c27bc 100644
--- a/lib/gears/init.lua.in
+++ b/lib/gears/init.lua.in
@@ -11,4 +11,4 @@ require("gears.sort")
 
 module("gears")
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/gears/object.lua.in b/lib/gears/object.lua.in
index 33b1166f2..9da249b16 100644
--- a/lib/gears/object.lua.in
+++ b/lib/gears/object.lua.in
@@ -91,4 +91,4 @@ end
 
 setmetatable(_M, { __call = function (_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/gears/sort.lua.in b/lib/gears/sort.lua.in
index 38e2b4d80..da7f078ab 100644
--- a/lib/gears/sort.lua.in
+++ b/lib/gears/sort.lua.in
@@ -80,4 +80,4 @@ end
 
 setmetatable(_M, { __call = function (_, ...) return sort(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/naughty.lua.in b/lib/naughty.lua.in
index 6762d0710..b8fe294aa 100644
--- a/lib/naughty.lua.in
+++ b/lib/naughty.lua.in
@@ -638,4 +638,4 @@ if capi.dbus then
     capi.dbus.request_name("session", "org.freedesktop.Notifications")
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/init.lua.in b/lib/wibox/init.lua.in
index 3d806e964..b34df0aef 100644
--- a/lib/wibox/init.lua.in
+++ b/lib/wibox/init.lua.in
@@ -323,4 +323,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/layout/align.lua.in b/lib/wibox/layout/align.lua.in
index 5b05d24a0..d3a3d397e 100644
--- a/lib/wibox/layout/align.lua.in
+++ b/lib/wibox/layout/align.lua.in
@@ -147,4 +147,4 @@ function vertical()
     return ret
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/layout/base.lua.in b/lib/wibox/layout/base.lua.in
index 00fb77856..c3449d5bd 100644
--- a/lib/wibox/layout/base.lua.in
+++ b/lib/wibox/layout/base.lua.in
@@ -63,4 +63,4 @@ function draw_widget(wibox, cr, widget, x, y, width, height)
     cr:restore()
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/layout/fixed.lua.in b/lib/wibox/layout/fixed.lua.in
index bc956f0aa..0d6d793de 100644
--- a/lib/wibox/layout/fixed.lua.in
+++ b/lib/wibox/layout/fixed.lua.in
@@ -154,4 +154,4 @@ function vertical()
     return get_layout("y")
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/layout/flex.lua.in b/lib/wibox/layout/flex.lua.in
index a8ef0f640..7f59aa124 100644
--- a/lib/wibox/layout/flex.lua.in
+++ b/lib/wibox/layout/flex.lua.in
@@ -105,4 +105,4 @@ function vertical()
     return get_layout("y")
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/layout/init.lua.in b/lib/wibox/layout/init.lua.in
index 26cbd6f4d..15b47bb5c 100644
--- a/lib/wibox/layout/init.lua.in
+++ b/lib/wibox/layout/init.lua.in
@@ -13,4 +13,4 @@ require("wibox.layout.margin")
 
 module("wibox.layout")
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/layout/margin.lua.in b/lib/wibox/layout/margin.lua.in
index c0655eae0..d6a52bb7e 100644
--- a/lib/wibox/layout/margin.lua.in
+++ b/lib/wibox/layout/margin.lua.in
@@ -130,4 +130,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/layout/rotate.lua.in b/lib/wibox/layout/rotate.lua.in
index 599473e00..9c6d84805 100644
--- a/lib/wibox/layout/rotate.lua.in
+++ b/lib/wibox/layout/rotate.lua.in
@@ -120,4 +120,4 @@ end
 
 setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/widget/background.lua.in b/lib/wibox/widget/background.lua.in
index ad95e8b0d..aaef50cdf 100644
--- a/lib/wibox/widget/background.lua.in
+++ b/lib/wibox/widget/background.lua.in
@@ -116,4 +116,4 @@ end
 
 setmetatable(_M, { __call = function (_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/widget/base.lua.in b/lib/wibox/widget/base.lua.in
index 16daf215b..0ed5bd24a 100644
--- a/lib/wibox/widget/base.lua.in
+++ b/lib/wibox/widget/base.lua.in
@@ -116,4 +116,4 @@ function check_widget(widget)
     debug.assert(type(height) == "number")
 end
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/widget/imagebox.lua.in b/lib/wibox/widget/imagebox.lua.in
index 4a8dcfcd7..a908aa630 100644
--- a/lib/wibox/widget/imagebox.lua.in
+++ b/lib/wibox/widget/imagebox.lua.in
@@ -119,4 +119,4 @@ end
 
 setmetatable(_M, { __call = function (_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/widget/init.lua.in b/lib/wibox/widget/init.lua.in
index 282930ade..900a7566c 100644
--- a/lib/wibox/widget/init.lua.in
+++ b/lib/wibox/widget/init.lua.in
@@ -12,4 +12,4 @@ require("wibox.widget.systray")
 
 module("wibox.widget")
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/widget/systray.lua.in b/lib/wibox/widget/systray.lua.in
index a28ea5b36..a7e504260 100644
--- a/lib/wibox/widget/systray.lua.in
+++ b/lib/wibox/widget/systray.lua.in
@@ -74,4 +74,4 @@ end
 
 setmetatable(_M, { __call = function (_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/lib/wibox/widget/textbox.lua.in b/lib/wibox/widget/textbox.lua.in
index d7e42953e..39b9dd5ea 100644
--- a/lib/wibox/widget/textbox.lua.in
+++ b/lib/wibox/widget/textbox.lua.in
@@ -173,4 +173,4 @@ end
 
 setmetatable(_M, { __call = function (_, ...) return new(...) end })
 
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/luaa.c b/luaa.c
index c6dfa3143..28c0cfed2 100644
--- a/luaa.c
+++ b/luaa.c
@@ -726,4 +726,4 @@ luaA_emit_refresh()
     signal_object_emit(globalconf.L, &global_signals, "refresh", 0);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/luaa.h b/luaa.h
index fcfdcc60b..151b2eb7f 100644
--- a/luaa.h
+++ b/luaa.h
@@ -200,4 +200,4 @@ int luaA_class_newindex_miss_property(lua_State *, lua_object_t *);
 void luaA_systray_invalidate(void);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/mouse.c b/mouse.c
index 6c6856448..9833d776c 100644
--- a/mouse.c
+++ b/mouse.c
@@ -251,4 +251,4 @@ const struct luaL_reg awesome_mouse_meta[] =
     { NULL, NULL }
 };
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/mouse.h b/mouse.h
index 2a310a700..99501b7c3 100644
--- a/mouse.h
+++ b/mouse.h
@@ -29,4 +29,4 @@
 int luaA_mouse_pushstatus(lua_State *, int, int);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/mousegrabber.c b/mousegrabber.c
index 5cac8e918..61f1c00cd 100644
--- a/mousegrabber.c
+++ b/mousegrabber.c
@@ -117,4 +117,4 @@ const struct luaL_reg awesome_mousegrabber_lib[] =
     { NULL, NULL }
 };
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/mousegrabber.h b/mousegrabber.h
index 04eee3140..988d267a7 100644
--- a/mousegrabber.h
+++ b/mousegrabber.h
@@ -28,4 +28,4 @@
 int luaA_mousegrabber_stop(lua_State *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/button.c b/objects/button.c
index 31c8cd204..152b75caf 100644
--- a/objects/button.c
+++ b/objects/button.c
@@ -132,4 +132,4 @@ button_class_setup(lua_State *L)
     signal_add(&button_class.signals, "release");
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/button.h b/objects/button.h
index 809d20018..44ba63f0a 100644
--- a/objects/button.h
+++ b/objects/button.h
@@ -44,4 +44,4 @@ void button_class_setup(lua_State *);
 
 #endif
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/client.c b/objects/client.c
index f0a9b6d9b..c024bb9ea 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -1789,4 +1789,4 @@ client_class_setup(lua_State *L)
     signal_add(&client_class.signals, "untagged");
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/client.h b/objects/client.h
index 333def3de..0f06af4ba 100644
--- a/objects/client.h
+++ b/objects/client.h
@@ -209,4 +209,4 @@ client_isvisible(client_t *c)
 }
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/drawin.c b/objects/drawin.c
index 61f54b282..0cfaa065a 100644
--- a/objects/drawin.c
+++ b/objects/drawin.c
@@ -656,4 +656,4 @@ drawin_class_setup(lua_State *L)
     signal_add(&drawin_class.signals, "property::y");
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/drawin.h b/objects/drawin.h
index e59eff36c..d7c4d5943 100644
--- a/objects/drawin.h
+++ b/objects/drawin.h
@@ -60,4 +60,4 @@ void drawin_class_setup(lua_State *);
 lua_class_t drawin_class;
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/key.c b/objects/key.c
index 5f61ae7ce..861275c81 100644
--- a/objects/key.c
+++ b/objects/key.c
@@ -240,4 +240,4 @@ key_class_setup(lua_State *L)
     signal_add(&key_class.signals, "release");
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/key.h b/objects/key.h
index 506c0d2bb..f54273679 100644
--- a/objects/key.h
+++ b/objects/key.h
@@ -49,4 +49,4 @@ uint16_t luaA_tomodifiers(lua_State *L, int ud);
 
 #endif
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/tag.c b/objects/tag.c
index cd0be646c..b63dcd560 100644
--- a/objects/tag.c
+++ b/objects/tag.c
@@ -447,4 +447,4 @@ tag_class_setup(lua_State *L)
     signal_add(&tag_class.signals, "untagged");
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/tag.h b/objects/tag.h
index 1a823688e..d6f2bbb36 100644
--- a/objects/tag.h
+++ b/objects/tag.h
@@ -41,4 +41,4 @@ bool tag_get_selected(tag_t *);
 char *tag_get_name(tag_t *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/timer.c b/objects/timer.c
index 6c91cf6bf..64384f231 100644
--- a/objects/timer.c
+++ b/objects/timer.c
@@ -155,4 +155,4 @@ timer_class_setup(lua_State *L)
     signal_add(&timer_class.signals, "timeout");
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/timer.h b/objects/timer.h
index 4efdf1358..89014295b 100644
--- a/objects/timer.h
+++ b/objects/timer.h
@@ -28,4 +28,4 @@ void timer_class_setup(lua_State *);
 
 #endif
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/window.c b/objects/window.c
index ac5fdd2c4..0b9c6e699 100644
--- a/objects/window.c
+++ b/objects/window.c
@@ -395,4 +395,4 @@ window_class_setup(lua_State *L)
     signal_add(&window_class.signals, "mouse::move");
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/objects/window.h b/objects/window.h
index efe86f09c..8b9d6d097 100644
--- a/objects/window.h
+++ b/objects/window.h
@@ -85,4 +85,4 @@ int luaA_window_set_type(lua_State *, window_t *);
 uint32_t window_translate_type(window_type_t type);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/property.c b/property.c
index 989bb7d03..d5b030f62 100644
--- a/property.c
+++ b/property.c
@@ -413,4 +413,4 @@ property_handle_propertynotify(xcb_property_notify_event_t *ev)
     (*handler)(ev->state, ev->window);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/property.h b/property.h
index 138cb53c2..32eba3e71 100644
--- a/property.h
+++ b/property.h
@@ -48,4 +48,4 @@ PROPERTY(net_wm_icon);
 void property_handle_propertynotify(xcb_property_notify_event_t *ev);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/root.c b/root.c
index 9a699f1de..47ded9f6b 100644
--- a/root.c
+++ b/root.c
@@ -232,4 +232,4 @@ const struct luaL_reg awesome_root_lib[] =
     { NULL, NULL }
 };
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/screen.c b/screen.c
index 3dec01297..fd0d87b12 100644
--- a/screen.c
+++ b/screen.c
@@ -641,4 +641,4 @@ const struct luaL_reg awesome_screen_meta[] =
     { NULL, NULL }
 };
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/screen.h b/screen.h
index 56ceb5dec..c00371fdc 100644
--- a/screen.h
+++ b/screen.h
@@ -49,4 +49,4 @@ area_t display_area_get(void);
 void screen_client_moveto(client_t *, screen_t *, bool);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/selection.c b/selection.c
index 59a04e7ec..979d3d5a6 100644
--- a/selection.c
+++ b/selection.c
@@ -116,4 +116,4 @@ luaA_selection_get(lua_State *L)
     return 0;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/selection.h b/selection.h
index 2ef686afa..07b8cbbd8 100644
--- a/selection.h
+++ b/selection.h
@@ -27,4 +27,4 @@
 int luaA_selection_get(lua_State *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/spawn.c b/spawn.c
index 51d506a6a..468977a02 100644
--- a/spawn.c
+++ b/spawn.c
@@ -360,4 +360,4 @@ luaA_spawn(lua_State *L)
     return 1;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/spawn.h b/spawn.h
index 46d3009d5..f1312983f 100644
--- a/spawn.h
+++ b/spawn.h
@@ -29,4 +29,4 @@ void spawn_start_notify(client_t *, const char *);
 int luaA_spawn(lua_State *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/stack.c b/stack.c
index 75d8cb0df..42f25abdf 100644
--- a/stack.c
+++ b/stack.c
@@ -200,4 +200,4 @@ stack_refresh()
 }
 
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/stack.h b/stack.h
index c45288bff..f19725cd6 100644
--- a/stack.h
+++ b/stack.h
@@ -31,4 +31,4 @@ void stack_windows(void);
 void stack_refresh(void);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/strut.c b/strut.c
index 6d678efd0..482dc04c6 100644
--- a/strut.c
+++ b/strut.c
@@ -57,4 +57,4 @@ luaA_tostrut(lua_State *L, int idx, strut_t *strut)
     strut->bottom = luaA_getopt_number(L, idx, "bottom", strut->bottom);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/strut.h b/strut.h
index 8be531543..3320f187a 100644
--- a/strut.h
+++ b/strut.h
@@ -61,4 +61,4 @@ int luaA_pushstrut(lua_State *, strut_t);
 void luaA_tostrut(lua_State *, int, strut_t *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/systray.c b/systray.c
index 280a72768..22a98c9e7 100644
--- a/systray.c
+++ b/systray.c
@@ -372,4 +372,4 @@ luaA_systray(lua_State *L)
     return 2;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/systray.h b/systray.h
index 77be12e88..2b037ca53 100644
--- a/systray.h
+++ b/systray.h
@@ -35,4 +35,4 @@ int xembed_process_client_message(xcb_client_message_event_t *);
 int luaA_systray(lua_State *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/themes/default/theme.lua.in b/themes/default/theme.lua.in
index b1da6a020..a4f2ed0b9 100644
--- a/themes/default/theme.lua.in
+++ b/themes/default/theme.lua.in
@@ -92,4 +92,4 @@ theme.layout_dwindle = "@AWESOME_THEMES_PATH@/default/layouts/dwindlew.png"
 theme.awesome_icon = "@AWESOME_ICON_PATH@/awesome16.png"
 
 return theme
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/themes/sky/theme.lua.in b/themes/sky/theme.lua.in
index f0054403d..3d339df09 100644
--- a/themes/sky/theme.lua.in
+++ b/themes/sky/theme.lua.in
@@ -75,4 +75,4 @@ theme.titlebar_maximized_button_normal_active = "@AWESOME_THEMES_PATH@/default/t
 theme.titlebar_maximized_button_focus_active = "@AWESOME_THEMES_PATH@/default/titlebar/maximized_focus_active.png"
 
 return theme
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/xwindow.c b/xwindow.c
index 22b505efc..9821c7576 100644
--- a/xwindow.c
+++ b/xwindow.c
@@ -256,4 +256,4 @@ xwindow_set_border_color(xcb_window_t w, color_t *color)
         xcb_change_window_attributes(globalconf.connection, w, XCB_CW_BORDER_PIXEL, &color->pixel);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/xwindow.h b/xwindow.h
index 7999effa4..8faf69508 100644
--- a/xwindow.h
+++ b/xwindow.h
@@ -40,4 +40,4 @@ void xwindow_set_cursor(xcb_window_t, xcb_cursor_t);
 void xwindow_set_border_color(xcb_window_t, color_t *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80