Merge pull request #735 from techee/vim

vimode: A Vim Mode for Geany

MAINTAINERS

@@ -299,6 +299,13 @@ M: Frank Lanitz <[email protected]>
 W: http://plugins.geany.org/updatechecker.html
 S: Maintained
 
+vimode
+P: Jiří Techet <[email protected]>
+g: @techee
+M: Jiří Techet <[email protected]>
+W: http://plugins.geany.org/vimode.html
+S: Maintained
+
 webhelper
 P: Colomban Wendling <[email protected]>
 g: @b4n

Makefile.am

@@ -172,6 +172,10 @@ if ENABLE_UPDATECHECKER
 SUBDIRS += updatechecker
 endif
 
+if ENABLE_VIMODE
+SUBDIRS += vimode
+endif
+
 if ENABLE_WEBHELPER
 SUBDIRS += webhelper
 endif

build/geany-plugins.nsi

@@ -197,6 +197,7 @@ Section Uninstall
 	Delete "$INSTDIR\lib\geany\tableconvert.dll"
 	Delete "$INSTDIR\lib\geany\treebrowser.dll"
 	Delete "$INSTDIR\lib\geany\updatechecker.dll"
+	Delete "$INSTDIR\lib\geany\vimode.dll"
 	Delete "$INSTDIR\lib\geany\webhelper.dll"
 	Delete "$INSTDIR\lib\geany\workbench.dll"
 	Delete "$INSTDIR\lib\geany\xmlsnippets.dll"

build/vimode.m4

@@ -0,0 +1,9 @@
+AC_DEFUN([GP_CHECK_VIMODE],
+[
+    GP_ARG_DISABLE([Vimode], [auto])
+    GP_COMMIT_PLUGIN_STATUS([Vimode])
+    AC_CONFIG_FILES([
+        vimode/Makefile
+        vimode/src/Makefile
+    ])
+])

configure.ac

@@ -70,6 +70,7 @@ GP_CHECK_SPELLCHECK
 GP_CHECK_TREEBROWSER
 GP_CHECK_TABLECONVERT
 GP_CHECK_UPDATECHECKER
+GP_CHECK_VIMODE
 GP_CHECK_WEBHELPER
 GP_CHECK_WORKBENCH
 GP_CHECK_XMLSNIPPETS

po/POTFILES.in

@@ -304,6 +304,9 @@ treebrowser/src/treebrowser.c
 # UpdateChecker
 updatechecker/src/updatechecker.c
 
+# ViMode
+vimode/src/backends/backend-geany.c
+
 # WebHelper
 webhelper/src/gwh-enum-types.c
 webhelper/src/gwh-keybindings.c

vimode/AUTHORS

@@ -0,0 +1 @@
+Jiří Techet <[email protected]>

vimode/Makefile.am

@@ -0,0 +1,4 @@
+include $(top_srcdir)/build/vars.auxfiles.mk
+
+SUBDIRS = src
+plugin = vimode

vimode/THANKS

@@ -0,0 +1,8 @@
+Various parts of the plugin code were taken from other Geany plugins, from Geany
+code or Scintilla. Thanks to all the authors of the corresponding code.
+
+Thanks to Frank Lanitz for the name of the plugin.
+
+Thanks to Bill Joy and Bram Moolenaar for creating vi and vim, respectively, so
+every bloody editor on the planet has to create a compatibility mode with this
+crazy editor to make users happy.

vimode/src/Makefile.am

@@ -0,0 +1,58 @@
+include $(top_srcdir)/build/vars.build.mk
+plugin = vimode
+
+geanyplugins_LTLIBRARIES = vimode.la
+
+noinst_PROGRAMS = viw
+
+vi_srcs = \
+	vi.h \
+	vi.c \
+	keypress.h \
+	keypress.c \
+	utils.h \
+	utils.c \
+	sci.h \
+	sci.c \
+	context.h \
+	cmd-params.h \
+	cmd-params.c \
+	cmd-runner.h \
+	cmd-runner.c \
+	excmd-params.h \
+	excmd-runner.h \
+	excmd-runner.c \
+	excmd-prompt.h \
+	excmd-prompt.c \
+	cmds/motion.h \
+	cmds/motion.c \
+	cmds/txtobjs.h \
+	cmds/txtobjs.c \
+	cmds/changemode.h \
+	cmds/changemode.c \
+	cmds/special.h \
+	cmds/special.c \
+	cmds/edit.h \
+	cmds/edit.c \
+	excmds/excmds.h \
+	excmds/excmds.c
+
+vimode_la_SOURCES = \
+	backends/backend-geany.c \
+	$(vi_srcs)
+
+viw_SOURCES = \
+	backends/backend-viw.c \
+	$(vi_srcs)
+
+vimode_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"Vimode\"
+vimode_la_CFLAGS = $(AM_CFLAGS)
+vimode_la_LIBADD = $(COMMONLIBS)
+
+viw_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"Vimode\"
+viw_CFLAGS = $(AM_CFLAGS)
+viw_LDADD = $(COMMONLIBS)
+
+include $(top_srcdir)/build/cppcheck.mk