* fix encoding of todo states set by the Todo plugin (thanks to Danie…

…l Carl

	for pointing out this issue)
* add target installvba to locally install orgmode.vba
* cleanup Makefile

Makefile

@@ -3,30 +3,34 @@ PLUGIN = orgmode
 PREFIX = /usr/local
 VIMDIR = $(PREFIX)/share/vim
 
+VIMPLUGINDIR = $(HOME)/.vim/bundle/orgmode
+
 all: build
 
 build:
 
-install:
+install: doc indent ftdetect ftplugin syntax
 	for i in doc indent ftdetect ftplugin syntax; do \
 		find $$i -type f -name \*.txt -o -name \*.py -o -type f -name \*.vim | while read f; do \
 			install -m 0755 -d $(DESTDIR)$(VIMDIR)/$$(dirname "$$f"); \
 			install -m 0644 $$f $(DESTDIR)$(VIMDIR)/$$f; \
 		done; \
 	done
 
+test: check
+
 check: test/run_tests.py
 	cd test && python run_tests.py
 
 clean: documentation
 	@rm -rf ${PLUGIN}.vba ${PLUGIN}.vba.gz tmp
 	cd $^ && $(MAKE) $@
 
-${PLUGIN}.vba: check
+${PLUGIN}.vba: check build_vba.vim
 	$(MAKE) DESTDIR=$(PWD)/tmp VIMDIR= install
 	find tmp -type f  | sed -e 's/^tmp\///' > files
-	cp build_vim tmp
-	cd tmp && vim --cmd 'let g:plugin_name="${PLUGIN}"' -s build_vim
+	cp build_vba.vim tmp
+	cd tmp && vim --cmd 'let g:plugin_name="${PLUGIN}"' -s build_vba.vim
 	mv tmp/$@ .
 
 ${PLUGIN}.vba.gz: ${PLUGIN}.vba
@@ -40,4 +44,8 @@ vba.gz: ${PLUGIN}.vba.gz
 docs: documentation
 	cd $^ && $(MAKE)
 
-.PHONY: all build check install clean vba docs
+installvba: ${PLUGIN}.vba install_vba.vim
+	rm -rf ${VIMPLUGINDIR}
+	vim --cmd "let g:installdir='${VIMPLUGINDIR}'" -s install_vba.vim $^
+
+.PHONY: all build test check install clean vba vba.gz docs installvba

debian/changelog

@@ -1,3 +1,12 @@
+vim-orgmode (0.2.0-3) unstable; urgency=low
+
+  * fix encoding of todo states set by the Todo plugin (thanks to Daniel Carl
+  	for pointing out this issue)
+  * add target installvba to locally install orgmode.vba
+  * cleanup Makefile
+
+ -- Jan Christoph Ebersbach <jceb@e-jc.de>  Sun, 26 Jun 2011 13:15:34 +0200
+
 vim-orgmode (0.2.0-2) unstable; urgency=low
 
   * add hint for updateing vim-orgmode from a previous version

ftplugin/orgmode/plugins/Todo.py

@@ -146,6 +146,6 @@ def register(self):
 			u':silent! py ORGMODE.plugins[u"Todo"].toggle_todo_state(False)<CR>')))
 		submenu + ActionEntry(u'&Previous keyword', self.keybindings[-1])
 
-		settings.set(u'org_todo_keywords', [u'TODO', u'|', u'DONE'])
+		settings.set(u'org_todo_keywords', [u'TODO'.encode(u'utf-8'), u'|'.encode(u'utf-8'), u'DONE'.encode(u'utf-8')])
 
 # vim: set noexpandtab:

install_vba.vim

@@ -0,0 +1,4 @@
+:exec 'set rtp='.g:installdir
+:e orgmode.vba
+:so %
+:q!