aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTanguy Pruvot <tanguy.pruvot@gmail.com>2014-07-24 02:18:19 +0200
committerTanguy Pruvot <tanguy.pruvot@gmail.com>2014-07-24 03:08:07 +0200
commit4a5005497e4263eb11f05094454383c867ba987e (patch)
tree803a5217b118760403600beeb473c5a22d8a50cb
parent1d086c2bb277802fd264e9139d7ed3925d3478f2 (diff)
downloadandroid_external_vim-4a5005497e4263eb11f05094454383c867ba987e.tar.gz
android_external_vim-4a5005497e4263eb11f05094454383c867ba987e.tar.bz2
android_external_vim-4a5005497e4263eb11f05094454383c867ba987e.zip
vim: add a medium CM build variant
CM profile is between SMALL and NORMAL (780K) with syntax (colors) and utf8 (mbyte) support. also set a swap directory compatible with CM, to be able to load big files from stdin : zcat /etc/NOTICE.html.gz | vim - Change-Id: I8f1ce1956b4c204e6ecdc19525c78bae07a24aaa
-rw-r--r--runtime/syntax/xml.vim7
-rw-r--r--src/Android.mk18
-rw-r--r--vimrc.android3
3 files changed, 22 insertions, 6 deletions
diff --git a/runtime/syntax/xml.vim b/runtime/syntax/xml.vim
index 7b503abf4..4086a847b 100644
--- a/runtime/syntax/xml.vim
+++ b/runtime/syntax/xml.vim
@@ -286,9 +286,10 @@ endif
syn keyword xmlDocTypeKeyword contained DOCTYPE PUBLIC SYSTEM
syn region xmlInlineDTD contained matchgroup=xmlDocTypeDecl start="\[" end="]" contains=@xmlDTD
-syn include @xmlDTD <sfile>:p:h/dtd.vim
-unlet b:current_syntax
-
+if exists('g:xml_syntax_folding')
+ syn include @xmlDTD <sfile>:p:h/dtd.vim
+ unlet b:current_syntax
+endif
" synchronizing
" TODO !!! to be improved !!!
diff --git a/src/Android.mk b/src/Android.mk
index bb6e46514..b582d33d8 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -5,12 +5,15 @@ LOCAL_PATH := $(call my-dir)
# ========================================================
include $(CLEAR_VARS)
-# vim variants: TINY SMALL NORMAL BIG HUGE
+# vim variants: TINY SMALL CM NORMAL BIG HUGE
#
# NORMAL, BIG and HUGE are almost the same (1.1M)
-# TINY and SMALL are similar to busybox vi (450K)
+# TINY and SMALL are similar to busybox vi (460K)
#
-vim_variant := BIG
+# CM profile is between SMALL and NORMAL (780K)
+# with syntax and utf8 (mbyte) support
+#
+vim_variant := CM
LOCAL_SRC_FILES := \
blowfish.c \
@@ -62,6 +65,15 @@ LOCAL_SRC_FILES := \
version.c \
window.c
+# to reduce vim size, manually define wanted features
+ifeq ($(vim_variant),CM)
+ LOCAL_SRC_FILES := $(filter-out blowfish.c sha256.c, $(LOCAL_SRC_FILES))
+ LOCAL_CFLAGS += -DFEAT_SMALL=1 -DFEAT_MBYTE=1 \
+ -DFEAT_SYN_HL=1 -DFEAT_CINDENT=1 -DFEAT_COMMENTS=1 -DFEAT_EVAL=1 -DFEAT_AUTOCMD=1 \
+ -DFEAT_USR_CMDS=1 -DFEAT_EX_EXTRA=1 -DFEAT_CMDL_COMPL=1 \
+ -DFEAT_LISTCMDS=1 -DFEAT_CMDL_INFO=1 -DFEAT_SEARCH_EXTRA=1
+endif
+
# Unused in our config
#LOCAL_SRC_FILES += \
# netbeans.c pty.c
diff --git a/vimrc.android b/vimrc.android
index 7363874f6..0e60ad3d2 100644
--- a/vimrc.android
+++ b/vimrc.android
@@ -15,6 +15,9 @@ set nocompatible
" allow backspacing over everything in insert mode
set backspace=indent,eol,start
+" swap directories
+set directory=.,/data/local/tmp,/tmp
+
if has("vms")
set nobackup " do not keep a backup file, use versions instead
else