Skip to content

Commit 8323840

Browse files
committed
sync with vim73-kaoriya-win64-20111231
1 parent 6c1b10c commit 8323840

File tree

12 files changed

+60
-16
lines changed

12 files changed

+60
-16
lines changed

CHANGES_kaoriya.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
=== 20111231�̕ύX�_ ===
2+
3+
* �x�[�X�R�[�h��7.3.390�ɍX�V���܂���
4+
5+
=== 20111224�̕ύX�_ ===
6+
7+
* �x�[�X�R�[�h��7.3.386�ɍX�V���܂���
8+
9+
=== 20111216�̕ύX�_ ===
10+
* �x�[�X�R�[�h��7.3.382�ɍX�V���܂���
11+
* �|�󃁃b�Z�[�W��typo���C�����܂���
12+
13+
=== 20111215�̕ύX�_ ===
14+
* �x�[�X�R�[�h��7.3.381�ɍX�V���܂���
15+
16+
=== 20111209�̕ύX�_ ===
17+
* �x�[�X�R�[�h��7.3.372�ɍX�V���܂���
18+
* �Â��������[���A�h���X���X�V���܂���
19+
* UTF-8�ŗ��p���ɃC���X�g�[�������{��p�X�ɂł���悤�ɂ��܂���
20+
* MacOSX��scrnmode.vim���p���ɃG���[���������Ȃ��悤�ɏC�����܂���
21+
22+
=== 20111202�̕ύX�_ ===
23+
* �x�[�X�R�[�h��7.3.364�ɍX�V���܂���
24+
125
=== 20111027�̕ύX�_ ===
226
* �x�[�X�R�[�h��7.3.353�ɍX�V���܂���
327

plugins/kaoriya/encode_japan.vim

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"
33
" 日本語向けにエンコードを設定するサンプル - Vim7用
44
"
5-
" Last Change: 15-May-2011.
5+
" Last Change: 09-Dec-2011.
66
" Maintainer: MURAOKA Taro <[email protected]>
77

88
" 各エンコードを示す文字列のデフォルト値。s:CheckIconvCapabilityを()呼ぶことで
@@ -55,7 +55,27 @@ function! s:DetermineFileencodings()
5555
let &fileencodings = value
5656
endfunction
5757

58+
"===========================================================================
59+
" パスに日本語を含む際にencを変更した場合の処置.
5860

61+
let s:last_enc = &enc
62+
63+
function! s:OnEncodingChanged()
64+
" runtimepath(rtp)を変換する.
65+
if s:last_enc !=# &enc
66+
if has('iconv')
67+
let &rtp = iconv(&rtp, s:last_enc, &enc)
68+
endif
69+
let s:last_enc = &enc
70+
endif
71+
endfunction
72+
73+
augroup EncodeJapan
74+
autocmd!
75+
autocmd EncodingChanged * call <SID>OnEncodingChanged()
76+
augroup END
77+
78+
"===========================================================================
5979
" 本ファイルを読み込み(sourceした)時に、最適な設定を実行する。
6080
"
6181
if kaoriya#switch#enabled('utf-8')

plugins/kaoriya/keymap/azik_cp932.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" Vim Keymap file for Japanese (AZIK)
22
"
3-
" Maintainer: MURAOKA Taro <koron@tka.att.ne.jp>
3+
" Maintainer: MURAOKA Taro <koron[email protected]>
44
" Last Change: 06-Feb-2006.
55
"
66
" You can get more information about AZIK in here:

plugins/kaoriya/keymap/japanese_cp932.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
" Vim Keymap file for Japanese (ROMA)
2-
" Maintainer: MURAOKA Taro <koron@tka.att.ne.jp>
2+
" Maintainer: MURAOKA Taro <koron[email protected]>
33
" Last Change: 06-Feb-2006.
44

55
scriptencoding cp932

plugins/kaoriya/plugin/autodate.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"
33
" autodate.vim - A plugin to update time stamps automatically
44
"
5-
" Maintainer: MURAOKA Taro <koron@tka.att.ne.jp>
5+
" Maintainer: MURAOKA Taro <koron[email protected]>
66
" Last Change: 06-Feb-2006.
77

88
" Description:

plugins/kaoriya/plugin/cmdex.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"
33
" cmdex.vim - Extra coomands
44
"
5-
" Maintainer: Muraoka Taro <koron@tka.att.ne.jp>
5+
" Maintainer: Muraoka Taro <koron[email protected]>
66
" Last Change: 18-Dec-2010.
77
" Commands:
88
" :MenuLang {language}

plugins/kaoriya/plugin/dicwin.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"
33
" dicwin.vim - Dictionary window
44
"
5-
" Maintainer: MURAOKA Taro <koron@tka.att.ne.jp>
5+
" Maintainer: MURAOKA Taro <koron[email protected]>
66
" Last Change: 04-Aug-2007.
77
" Commands: <C-k><C-k> Search word under cursor.
88
" <C-k>/ Search prompted word.

plugins/kaoriya/plugin/hz_ja.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
" hz_ja.vim - Convert character between HANKAKU and ZENKAKU
44
"
55
" Last Change: 06-Feb-2006.
6-
" Written By: MURAOKA Taro <koron@tka.att.ne.jp>
6+
" Written By: MURAOKA Taro <koron[email protected]>
77
"
88
" Commands:
99
" :Hankaku Convert to HANKAKU.

plugins/kaoriya/plugin/scrnmode.vim

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"
33
" scrnmode.vim - Screen mode changer.
44
"
5-
" Maintainer: MURAOKA Taro <koron@tka.att.ne.jp>
6-
" Last Change: 06-Feb-2006.
5+
" Maintainer: MURAOKA Taro <koron[email protected]>
6+
" Last Change: 09-Dec-2011.
77
"
88
" Commands: :ScreenMode {n} Set screen mode {n} n:0-8
99
" :SM {n} Same as :ScreenMode
@@ -78,7 +78,7 @@ function! s:ScreenMode(modenum)
7878

7979
call s:SaveOptions()
8080
if a:modenum < 4
81-
simalt ~r
81+
if has('win32') | simalt ~r | endif
8282
endif
8383
call s:LoadOptions()
8484

@@ -119,14 +119,14 @@ function! s:ScreenMode(modenum)
119119
endif
120120
endif
121121
let &guioptions = new_guioptions
122-
simalt ~x
122+
if has('win32') | simalt ~x | endif
123123
return
124124
endif
125125
endfunction
126126

127127
function! s:FullScreen()
128128
let &guioptions = substitute(&guioptions, '[LRTlrm]', '', 'g')
129-
simalt ~x
129+
if has('win32') | simalt ~x | endif
130130
endfunction
131131

132132
"---------------------------------------------------------------------------

plugins/kaoriya/plugin/verifyenc.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
" verifyenc.vim
44
" Verify the file is truly in 'fileencoding' encoding.
55
"
6-
" Maintainer: MURAOKA Taro <koron@tka.att.ne.jp>
6+
" Maintainer: MURAOKA Taro <koron[email protected]>
77
" Last Change: 27-Jul-2003.
88
" Options: 'verifyenc_enable' When 0, checking become disable.
99
" 'verifyenc_maxlines' Maximum range to check (for speed).

0 commit comments

Comments
 (0)