Merge pull request #593 from psychon/editorconfig

Vim modelines and editorconfig

.editorconfig

@@ -0,0 +1,26 @@
+# See http://editorconfig.org
+
+# Don't search for other .editconfig files
+root = true
+
+[*]
+
+# Unix-style newlines
+end_of_line = lf
+
+# There a newline at the end of the file
+insert_final_newline = true
+
+# Trailing whitespaces, no one needs them
+trim_trailing_whitespace = true
+
+# Why would anyone use anything else?
+charset = utf-8
+
+# This is just what we use, sorry if you disagree
+indent_style = space
+indent_size = 4
+
+# In a Makefile, the tab is significant and not "just" whitespace
+[Makefile]
+indent_style = tab

awesome-version-internal.h

@@ -5,3 +5,5 @@
 #define AWESOME_RELEASE             "@AWESOME_RELEASE@"
 
 #endif //_AWE_VERSION_INTERNAL_H_
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

build-tests/__builtin_clz.c

@@ -10,3 +10,5 @@ main(void)
 
 	return (__builtin_clz(42));
 }
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

build-utils/atoms-ext.sh

@@ -7,3 +7,5 @@ while read atom
 do
     echo extern xcb_atom_t $atom\;
 done < $1
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

build-utils/atoms-int.sh

@@ -18,3 +18,5 @@ do
 done < $1
 
 echo '};'
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

build-utils/dist.sh

@@ -11,3 +11,5 @@ cd dist
 echo -n $VERSION > awesome-$SVERSION/.version_stamp
 tar cjf awesome-$SVERSION.tar.bz2 awesome-$SVERSION
 tar cJf awesome-$SVERSION.tar.xz awesome-$SVERSION
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

build-utils/git-version-stamp.sh

@@ -29,3 +29,5 @@ then
     mv "$2.new" "$2"
     echo -n "$CURRENT" > "$1"
 fi
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

build-utils/lgi-check.sh

@@ -33,3 +33,5 @@ lua -e '_, _, major_minor, patch = string.find(require("lgi.version"), "^(%d%.%d
 
 # Check for the needed gi files
 lua -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo, l.GLib, l.Gio)' || die
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

build-utils/travis-apidoc.sh

@@ -107,3 +107,5 @@ if [ "$TRAVIS_PULL_REQUEST" != false ]; then
     -d "{\"body\": \"Documentation has been updated for this PR:\n$COMPARE_LINKS\"}" \
     https://api.github.com/repos/awesomeWM/awesome/issues/${TRAVIS_PULL_REQUEST}/comments
 fi
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

common/buffer.c

@@ -113,3 +113,5 @@ buffer_detach(buffer_t *buf)
     buffer_init(buf);
     return res;
 }
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

common/buffer.h

@@ -195,3 +195,5 @@ void buffer_addf(buffer_t *buf, const char *fmt, ...)
     __attribute__((format(printf, 2, 3)));
 
 #endif
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

common/lualib.c

@@ -61,3 +61,5 @@ void luaA_dumpstack(lua_State *L)
     }
     fprintf(stderr, "------- Lua stack dump end ------\n");
 }
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

common/version.h

@@ -27,3 +27,5 @@ const char *awesome_version_string(void);
 const char *awesome_release_string(void);
 
 #endif
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

config.h

@@ -10,3 +10,5 @@
 #cmakedefine HAS___BUILTIN_CLZ
 
 #endif //_CONFIG_H_
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

docs/config.ld

@@ -71,4 +71,4 @@ file = {
     }
 }
 
--- vim: filetype=lua
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

lib/awful/hotkeys_popup/init.lua

@@ -14,3 +14,5 @@ local hotkeys_popup = {
 }
 hotkeys_popup.show_help = hotkeys_popup.widget.show_help
 return hotkeys_popup
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

lib/awful/hotkeys_popup/keys/init.lua

@@ -12,3 +12,5 @@ local keys = {
   vim = require("awful.hotkeys_popup.keys.vim")
 }
 return keys
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

lib/awful/layout/suit/fair.lua

@@ -95,3 +95,5 @@ function fair.arrange(p)
 end
 
 return fair
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

lib/awful/layout/suit/floating.lua

@@ -100,3 +100,5 @@ end
 floating.name = "floating"
 
 return floating
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

lib/awful/layout/suit/init.lua

@@ -16,3 +16,5 @@ return
     magnifier = require("awful.layout.suit.magnifier");
     spiral = require("awful.layout.suit.spiral");
 }
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

lib/awful/layout/suit/magnifier.lua

@@ -141,3 +141,5 @@ end
 magnifier.name = "magnifier"
 
 return magnifier
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

lib/awful/layout/suit/max.lua

@@ -49,3 +49,5 @@ function max.fullscreen.arrange(p)
 end
 
 return max
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

lib/awful/layout/suit/tile.lua

@@ -321,3 +321,5 @@ tile.mouse_resize_handler = tile.right.mouse_resize_handler
 tile.name = tile.right.name
 
 return tile
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

lib/awful/mouse/finder.lua

@@ -167,4 +167,4 @@ end
 
 return setmetatable(finder, finder.mt)
 
--- vim: ft=lua:et:sw=4:ts=4:sts=4:tw=78
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

lib/awful/tooltip.lua

@@ -284,4 +284,4 @@ end
 
 return setmetatable(tooltip, tooltip.mt)
 
--- vim: ft=lua:et:sw=4:ts=4:sts=4:tw=78
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

spec/preload.lua

@@ -2,3 +2,5 @@
 -- won't be cleared and reloaded by Busted. This is needed for lgi because lgi
 -- is not safe to reload and yet Busted manages to do this.
 require("lgi")
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

tests/_runner.lua

@@ -85,3 +85,5 @@ runner.run_steps = function(steps)
 end
 
 return runner
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

tests/_wibox_helper.lua

@@ -30,3 +30,5 @@ return { create_wibox = function()
 
     return wb, textclock, img, left_layout, right_layout, layout
 end }
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

tests/run.sh

@@ -184,3 +184,5 @@ if ! [ $errors = 0 ]; then
     exit 1
 fi
 exit 0
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

tests/test-benchmark.lua

@@ -73,3 +73,5 @@ benchmark(redraw_textclock, "redraw textclock")
 benchmark(e2e_tag_switch, "tag switch")
 
 require("_runner").run_steps({ function() return true end })
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

tests/test-focus.lua

@@ -46,3 +46,5 @@ local steps = {
 }
 
 require("_runner").run_steps(steps)
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

tests/test-leaks.lua

@@ -80,3 +80,5 @@ prepare_for_collect = emit_refresh
 collectable(create_wibox())
 
 require("_runner").run_steps({ function() return true end })
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

tests/test-spawn-snid.lua

@@ -40,3 +40,5 @@ local steps = {
 }
 
 require("_runner").run_steps(steps)
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

tests/test-spawn.lua

@@ -64,3 +64,5 @@ local steps = {
 }
 
 require("_runner").run_steps(steps)
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

tests/test-urgent.lua

@@ -107,3 +107,5 @@ local steps = {
 }
 
 require("_runner").run_steps(steps)
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

themes/default/theme.lua

@@ -103,4 +103,5 @@ theme.awesome_icon = "@AWESOME_ICON_PATH@/awesome16.png"
 theme.icon_theme = nil
 
 return theme
+
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

themes/sky/theme.lua

@@ -82,4 +82,5 @@ 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:textwidth=80

themes/xresources/theme.lua

@@ -96,4 +96,5 @@ theme.wallpaper = theme_assets.wallpaper(
 )
 
 return theme
+
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

themes/zenburn/theme.lua

@@ -129,3 +129,5 @@ theme.titlebar_maximized_button_normal_inactive = "@AWESOME_THEMES_PATH@/zenburn
 -- }}}
 
 return theme
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

utils/awesome-client

@@ -62,3 +62,5 @@ then
 else
     a_dbus_send "$(cat)"
 fi
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

xkb.c

@@ -315,3 +315,5 @@ xkb_free(void)
                           0);
     xkb_free_keymap();
 }
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

xkb.h

@@ -33,5 +33,6 @@ int luaA_xkb_set_layout_group(lua_State *L);
 int luaA_xkb_get_layout_group(lua_State *L);
 int luaA_xkb_get_group_names(lua_State *L);
 
-
 #endif
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

xrdb.c

@@ -74,3 +74,5 @@ int luaA_xrdb_get_value(lua_State *L) {
     return 0;
   }
 }
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

xrdb.h

@@ -26,5 +26,6 @@
 
 int luaA_xrdb_get_value(lua_State *L);
 
-
 #endif
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80