cython mode, smerge mode, updates

[emacs-init.git] / emacsstuff

diff --git a/emacsstuff b/emacsstuff
index 9aa8fc2..0f2d15f 160000 (submodule)
--- a/emacsstuff
+++ b/emacsstuff
@@ -1 +1 @@
-Subproject commit 9aa8fc2a3fb4b9562618d0e2f81edc92fe8afd33
+Subproject commit 0f2d15f66459e62102f6f2aac1e3c83641563c51