Skip to content

Commit cdee294

Browse files
koronkoron
committed
Merge to release as 8.0.0596-20170502
2 parents 7aeeae6 + d84b488 commit cdee294

File tree

16 files changed

+181
-20
lines changed

16 files changed

+181
-20
lines changed

‎VERSION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VIM_VER = 8.0.0134
2-
PATCHSET_VER = 20170101
1+
VIM_VER = 8.0.0596
2+
PATCHSET_VER = 20170502
33

44
VIM_VER_SHORT = 80
55

‎build/freebsd/Makefile

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
ROOT_DIR = ../..
2+
3+
include $(ROOT_DIR)/VERSION
4+
5+
VIM_SRCDIR = $(ROOT_DIR)/vim/src
6+
7+
VIM_CONFIG = --with-features=huge \
8+
--enable-gui=no \
9+
--enable-fail-if-missing
10+
11+
VIM_DIR = /usr/local/share/vim
12+
VIMRUNTIME_DIR = $(VIM_DIR)/vim$(VIM_VER_SHORT)
13+
14+
default: vim-build
15+
16+
install: vim-install kaoriya-install autofmt-install govim-install
17+
18+
vim-configure:
19+
cd $(VIM_SRCDIR) && ./configure $(VIM_CONFIG)
20+
21+
vim-build:
22+
cd $(VIM_SRCDIR) && make
23+
24+
vim-install:
25+
cd $(VIM_SRCDIR) && make install
26+
27+
vim-clean:
28+
cd $(VIM_SRCDIR) && make clean
29+
30+
vim-distclean:
31+
cd $(VIM_SRCDIR) && make distclean
32+
33+
vim-install-auto: vim-distclean vim-configure vim-build
34+
cd $(VIM_SRCDIR) && sudo $(MAKE) install
35+
36+
KAORIYA_SRCDIR = $(ROOT_DIR)/kaoriya
37+
KAORIYA_INSTDIR = $(VIM_DIR)
38+
39+
kaoriya-install:
40+
@cd $(KAORIYA_SRCDIR)/vim && \
41+
for d in `find . -type d -not -name '.*'`; do \
42+
echo mkdir: $$d ; \
43+
install -d -o root -g wheel -m 0755 $(KAORIYA_INSTDIR)/$$d || exit 1 ; \
44+
done ; \
45+
for f in `find . -type f -not -name '.*'`; do \
46+
echo install: $$f ; \
47+
install -o root -g wheel -m 0666 $$f $(KAORIYA_INSTDIR)/$$f || exit 1 ; \
48+
done
49+
50+
AUTOFMT_SRCDIR = $(ROOT_DIR)/contrib/autofmt
51+
AUTOFMT_INSTDIR = $(VIM_DIR)/plugins/autofmt
52+
53+
autofmt-install:
54+
@cd $(AUTOFMT_SRCDIR) && \
55+
for d in `find . -type d -not -name '.*'`; do \
56+
echo mkdir: $$d ; \
57+
install -d -o root -g wheel -m 0755 $(AUTOFMT_INSTDIR)/$$d || exit 1 ; \
58+
done ; \
59+
for f in `find . -type f -not -name '.*' `; do \
60+
echo install: $$f ; \
61+
install -o root -g wheel -m 0666 $$f $(AUTOFMT_INSTDIR)/$$f || exit 1 ; \
62+
done
63+
64+
GOVIM_SRCDIR = $(ROOT_DIR)/contrib/go-vim
65+
GOVIM_INSTDIR = $(VIM_DIR)/plugins/golang
66+
67+
govim-install:
68+
@cd $(GOVIM_SRCDIR) && \
69+
for d in `find . -type d -not -name '.*'`; do \
70+
echo mkdir: $$d ; \
71+
install -d -o root -g wheel -m 0755 $(GOVIM_INSTDIR)/$$d || exit 1 ; \
72+
done ; \
73+
for f in `find . -type f -not -name '.*' `; do \
74+
echo install: $$f ; \
75+
install -o root -g wheel -m 0666 $$f $(GOVIM_INSTDIR)/$$f || exit 1 ; \
76+
done

‎build/msvc/Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# Switches:
44
#
55
# DISABLE_IF=1 Disable all language interfaces
6-
# DISABLE_PERL=1 Disalbe Perl interfaces
7-
# DISABLE_PYTHON=1 Disalbe Python interfaces
8-
# DISABLE_LUA=1 Disalbe Lua interfaces
9-
# DISABLE_RUBY=1 Disalbe Ruby interfaces
6+
# DISABLE_PERL=1 Disable Perl interfaces
7+
# DISABLE_PYTHON=1 Disable Python interfaces
8+
# DISABLE_LUA=1 Disable Lua interfaces
9+
# DISABLE_RUBY=1 Disable Ruby interfaces
1010

1111
!include ..\..\VERSION
1212

@@ -294,6 +294,11 @@ vim-test: vim-build
294294
nmake /NOLOGO /F Make_dos.mak clean
295295
cd "$(BUILD_DIR)"
296296

297+
vim-test-clean:
298+
cd "$(VIM_DIR)\src\testdir"
299+
nmake /NOLOGO /F Make_dos.mak clean
300+
cd "$(BUILD_DIR)"
301+
297302
vim-clean:
298303
cd "$(VIM_DIR)\src"
299304
nmake /NOLOGO /F $(BUILD_DIR)\vim.mak clean

‎build/xubuntu/Makefile

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
ROOT_DIR = ../..
2+
3+
include $(ROOT_DIR)/VERSION
4+
5+
VIM_SRCDIR = $(ROOT_DIR)/vim/src
6+
7+
VIM_CONFIG = --with-features=huge \
8+
--enable-gui=gtk2 \
9+
--enable-luainterp=dynamic \
10+
--with-luajit \
11+
--enable-pythoninterp=dynamic \
12+
--enable-python3interp=dynamic \
13+
--enable-rubyinterp=dynamic \
14+
--enable-fail-if-missing
15+
16+
VIM_DIR = /usr/local/share/vim
17+
VIMRUNTIME_DIR = $(VIM_DIR)/vim$(VIM_VER_SHORT)
18+
19+
default: vim-build
20+
21+
install: kaoriya-install autofmt-install govim-install
22+
23+
vim-configure:
24+
cd $(VIM_SRCDIR) && ./configure $(VIM_CONFIG)
25+
26+
vim-build:
27+
cd $(VIM_SRCDIR) && make
28+
29+
vim-install:
30+
cd $(VIM_SRCDIR) && make install
31+
32+
vim-clean:
33+
cd $(VIM_SRCDIR) && make clean
34+
35+
vim-distclean:
36+
cd $(VIM_SRCDIR) && make distclean
37+
38+
vim-install-auto: vim-distclean vim-configure vim-build
39+
cd $(VIM_SRCDIR) && sudo $(MAKE) install
40+
41+
KAORIYA_SRCDIR = $(ROOT_DIR)/kaoriya
42+
KAORIYA_INSTDIR = $(VIM_DIR)
43+
44+
kaoriya-install:
45+
@cd $(KAORIYA_SRCDIR)/vim && \
46+
for f in `find . -type f -not -name '.*'`; do \
47+
echo install: $$f ; \
48+
install -o root -g root -m 0666 -D $$f $(KAORIYA_INSTDIR)/$$f || exit 1 ; \
49+
done
50+
51+
AUTOFMT_SRCDIR = $(ROOT_DIR)/contrib/autofmt
52+
AUTOFMT_INSTDIR = $(VIM_DIR)/plugins/autofmt
53+
54+
autofmt-install:
55+
@cd $(AUTOFMT_SRCDIR) && \
56+
for f in `find . -type f -not -name '.*' `; do \
57+
echo install: $$f ; \
58+
install -o root -g root -m 0666 -D $$f $(AUTOFMT_INSTDIR)/$$f || exit 1 ; \
59+
done
60+
61+
GOVIM_SRCDIR = $(ROOT_DIR)/contrib/go-vim
62+
GOVIM_INSTDIR = $(VIM_DIR)/plugins/golang
63+
64+
govim-install:
65+
@cd $(GOVIM_SRCDIR) && \
66+
for f in `find . -type f -not -name '.*' `; do \
67+
echo install: $$f ; \
68+
install -o root -g root -m 0666 -D $$f $(GOVIM_INSTDIR)/$$f || exit 1 ; \
69+
done

‎contrib/autofmt

‎contrib/lang-ja

‎contrib/luajit-2.0

Submodule luajit-2.0 updated from 8e5d7be to 8271c64

‎contrib/vimdoc-ja

Submodule vimdoc-ja updated 88 files

‎kaoriya/doc/CHANGES.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1+
## 2017/05/02 の変更点
2+
3+
* ベースコードを8.0.0187に更新しました
4+
* contrib 更新
5+
* autofmt (2017-02-13 99f2b50)
6+
* lang-ja (2017-02-16 92ba192)
7+
* LuaJIT (2017-05-01 8271c643c)
8+
* vimdoc-ja (2017-04-22 8d0c593d)
9+
* Python 2利用時に警告を出すための実験パッチを追加
10+
<https://github.com/vim-jp/issues/issues/1008>
11+
112
## 2017/01/01 の変更点
213

314
* ベースコードを8.0.0134に更新しました
4-
* contrib 追加
15+
* contrib 更新
516
* autofmt (2016-12-03 4bf8dbb)
617
* lang-ja (2016-12-08 4c3c613)
718
* LuaJIT (2016-12-30 8e5d7be)

‎kaoriya/vim/gvimrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ scriptencoding utf-8
44
" An example for a Japanese version gvimrc file.
55
" 日本語版のデフォルトGUI設定ファイル(gvimrc) - Vim 7.4
66
"
7-
" Last Change: 23-Mar-2016.
7+
" Last Change: 26-Mar-2017.
88
" Maintainer: MURAOKA Taro <[email protected]>
99
"
1010
" 解説:
@@ -46,7 +46,7 @@ endif
4646
" ユーザ優先設定($HOME/.gvimrc_first.vim)があれば読み込む。読み込んだ後に変
4747
" 数g:gvimrc_first_finishに非0な値が設定されていた場合には、それ以上の設定
4848
" ファイルの読込を中止する。
49-
if 0 && exists('$HOME') && filereadable($HOME . '/.gvimrc_first.vim')
49+
if 1 && exists('$HOME') && filereadable($HOME . '/.gvimrc_first.vim')
5050
unlet! g:gvimrc_first_finish
5151
source $HOME/.gvimrc_first.vim
5252
if exists('g:gvimrc_first_finish') && g:gvimrc_first_finish != 0

‎kaoriya/vim/plugins/kaoriya/autoload/kaoriya/switch.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
scriptencoding utf-8
22
" vim:set ts=8 sts=2 sw=2 tw=0 et:
33
"
4-
" Switches by existance of files in $VIM/switches/enabled directory.
4+
" Switches by existence of files in $VIM/switches/enabled directory.
55
"
66
" (ほぼ)起動時の$VIM/switches/enabledディレクトリ下のファイルの有無を調べるス
77
" イッチ.

‎kaoriya/vim/plugins/kaoriya/plugin/autodate.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ endfunction
364364

365365
"
366366
" Strftime2({format} [, {time}])
367-
" Enchanced version of strftime().
367+
" Enhanced version of strftime().
368368
"
369369
" strftime()のフォーマット拡張バージョン。フォーマット書式はほとんどオリジ
370370
" ナルと一緒。しかし月の英語名に置換わる特別な書式 %{n}m が使用可能。{n}に

‎kaoriya/vim/plugins/kaoriya/plugin/cmdex.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" vi:set ts=8 sts=2 sw=2 tw=0:
22
"
3-
" cmdex.vim - Extra coomands
3+
" cmdex.vim - Extra commands
44
"
55
" Maintainer: Muraoka Taro <[email protected]>
66
" Last Change: 19-Mar-2013.

‎kaoriya/vim/plugins/kaoriya/plugin/hz_ja.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
" Commands:
99
" :Hankaku Convert to HANKAKU.
1010
" :Zenkaku Convert to ZENKAKU.
11-
" :ToggleHZ Toggole convert between HANKAKU and ZENKAKU.
11+
" :ToggleHZ Toggle convert between HANKAKU and ZENKAKU.
1212
"
1313
" Functions:
1414
" ToHankaku(str) Convert given string to HANKAKU.
@@ -19,7 +19,7 @@
1919

2020
" Japanese Description:
2121
" コマンド:
22-
" :[raneg]Hankaku
22+
" :[range]Hankaku
2323
" :[range]Zenkaku
2424
" :[range]ToggleHZ
2525
" :[range]HzjaConvert {target}

‎patches

‎vim

Submodule vim updated 558 files

0 commit comments

Comments
 (0)