Skip to content

Commit 03ecd0c

Browse files
committed
Merge branch 'kaoriya'
2 parents d2a26df + 3ac0cac commit 03ecd0c

File tree

151 files changed

+1030
-366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+1030
-366
lines changed

.hgtags

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2729,3 +2729,25 @@ ba37e955913e85700677b89a720c6e5fc8d23cc3 v7-4b-016
27292729
059c8a4b103f6971276435127c7ad970a81b0b2c v7-4b-021
27302730
d5d6b78cff090e87d52924179e44131b5ba7436d v7-4b-022
27312731
359743c1f59af353454dd80a26d9f8c20ae6ee8e v7-4
2732+
3e9107b86b68d83bfa94e43afffbf17623afe55e v7-4-001
2733+
e29f11399ccec9215cc8cfab1f9307dea0567d70 v7-4-002
2734+
560a6a2329503d483db019a88cacc3307e5c30b7 v7-4-003
2735+
f6247eaf4e1d556f782321890d725663f74babe6 v7-4-004
2736+
3640cf4c0d4b6e5687bb7a31678fab70c88ed94b v7-4-005
2737+
2374a05efe20287d55bd824689a41becc7662505 v7-4-006
2738+
4fe1dfc7014e57b4beb5a01c9e94357265d19a92 v7-4-007
2739+
b04bdb2c5fce70a278d26c477debb65a388da0ca v7-4-008
2740+
8b5d80861c5e0403ea9f54ddddce2752a463c8a5 v7-4-009
2741+
bb358cc41d920983629ace62bcf26decbf06cab4 v7-4-010
2742+
54e66395831c1a58b4a9804e7884e505842157e8 v7-4-011
2743+
8e28c23e482c5b3c8296d8022271822886793456 v7-4-012
2744+
07737d3aa81725672796cbc9a010d63414ab6fea v7-4-013
2745+
9801d06e7b4ccdcd02cf40bee34eaaada0ca0409 v7-4-014
2746+
a7478f9f2551e95bff138cd658f7a86ced804ab1 v7-4-015
2747+
8d5cd0ec3e7183a289f9bac41d3981307cdc1fac v7-4-016
2748+
c47c8cd5fe5c014c141d9fb3fa8935b268436a4e v7-4-017
2749+
460d5be9395ef3e05f4b1397ea98a5b54d825fc5 v7-4-018
2750+
d5eb32dc231cd870c562e7b0be96fa994b505d9f v7-4-019
2751+
c1ae5baa41f47bbf96be81e0158707a88af48b34 v7-4-020
2752+
c514693882b9f1c7be2e76a0307926df799da3ea v7-4-021
2753+
965044860b7f4884657fcaa042853238c7b13e69 v7-4-022

CHANGES_kaoriya.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
=== 20130901�̕ύX�_ ===
2+
3+
* �x�[�X�R�[�h��7.4.016�ɍX�V���܂���
4+
* vimdoc-ja��(2013-09-01 ef3f78b)�ɍX�V���܂���
5+
* vimproc��(2013-08-31 9c65977)�ɍX�V���܂���
6+
* LuaJIT��(2013-08-22 b33e96f)�ɍX�V���܂���
7+
18
=== 20130811�̕ύX�_ ===
29

310
* �x�[�X�R�[�h��7.4�ɍX�V���܂���
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
" Copyright 2011 The Go Authors. All rights reserved.
2+
" Use of this source code is governed by a BSD-style
3+
" license that can be found in the LICENSE file.
4+
"
5+
" godoc.vim: Vim command to see godoc.
6+
7+
if exists("g:loaded_godoc")
8+
finish
9+
endif
10+
let g:loaded_godoc = 1
11+
12+
let s:buf_nr = -1
13+
let s:last_word = ''
14+
15+
function! s:GodocView()
16+
if !bufexists(s:buf_nr)
17+
leftabove new
18+
file `="[Godoc]"`
19+
let s:buf_nr = bufnr('%')
20+
elseif bufwinnr(s:buf_nr) == -1
21+
leftabove split
22+
execute s:buf_nr . 'buffer'
23+
delete _
24+
elseif bufwinnr(s:buf_nr) != bufwinnr('%')
25+
execute bufwinnr(s:buf_nr) . 'wincmd w'
26+
endif
27+
28+
setlocal filetype=godoc
29+
setlocal bufhidden=delete
30+
setlocal buftype=nofile
31+
setlocal noswapfile
32+
setlocal nobuflisted
33+
setlocal modifiable
34+
setlocal nocursorline
35+
setlocal nocursorcolumn
36+
setlocal iskeyword+=:
37+
setlocal iskeyword-=-
38+
39+
nnoremap <buffer> <silent> K :Godoc<cr>
40+
41+
au BufHidden <buffer> call let <SID>buf_nr = -1
42+
endfunction
43+
44+
function! s:GodocWord(word)
45+
let word = a:word
46+
silent! let content = system('godoc ' . word)
47+
if v:shell_error || !len(content)
48+
if len(s:last_word)
49+
silent! let content = system('godoc ' . s:last_word.'/'.word)
50+
if v:shell_error || !len(content)
51+
echo 'No documentation found for "' . word . '".'
52+
return
53+
endif
54+
let word = s:last_word.'/'.word
55+
else
56+
echo 'No documentation found for "' . word . '".'
57+
return
58+
endif
59+
endif
60+
let s:last_word = word
61+
silent! call s:GodocView()
62+
setlocal modifiable
63+
silent! %d _
64+
silent! put! =content
65+
silent! normal gg
66+
setlocal nomodifiable
67+
setfiletype godoc
68+
endfunction
69+
70+
function! s:Godoc(...)
71+
let word = join(a:000, ' ')
72+
if !len(word)
73+
let oldiskeyword = &iskeyword
74+
setlocal iskeyword+=.
75+
let word = expand('<cword>')
76+
let &iskeyword = oldiskeyword
77+
endif
78+
let word = substitute(word, '[^a-zA-Z0-9\\/._~-]', '', 'g')
79+
let words = split(word, '\.')
80+
if !len(words)
81+
return
82+
endif
83+
call s:GodocWord(words[0])
84+
if len(words) > 1
85+
if search('^\%(const\|var\|type\|\s\+\) ' . words[1] . '\s\+=\s')
86+
return
87+
endif
88+
if search('^func ' . words[1] . '(')
89+
return
90+
endif
91+
echo 'No documentation found for "' . word . '".'
92+
endif
93+
endfunction
94+
95+
command! -nargs=* -range -complete=customlist,go#complete#Package Godoc :call s:Godoc(<q-args>)
96+
nnoremap <silent> <Plug>(godoc-keyword) :<C-u>call <SID>Godoc('')<CR>
97+
98+
" vim:ts=4:sw=4:et

plugins/vimdoc-ja/README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,7 @@ Vimの付属ドキュメントを日本語に翻訳するためのプロジェ
44

55
間違いを見つけたらメーリングリストかissueトラッカーでお知らせください。
66

7-
Gitリポジトリ
8-
https://github.com/vim-jp/vimdoc-ja
9-
10-
Web版
11-
http://vim-jp.org/vimdoc-ja/
12-
13-
issueトラッカー
14-
https://github.com/vim-jp/vimdoc-ja/issues
15-
16-
メーリングリスト
17-
http://groups.google.com/group/vimdoc-ja
7+
- Gitリポジトリ https://github.com/vim-jp/vimdoc-ja
8+
- Web版 http://vim-jp.org/vimdoc-ja/
9+
- issueトラッカー https://github.com/vim-jp/vimdoc-ja/issues
10+
- メーリングリスト http://groups.google.com/group/vimdoc-ja

plugins/vimdoc-ja/doc/arabic.jax

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*arabic.txt* For Vim バージョン 7.3. Last change: 2010 Nov 13
1+
*arabic.txt* For Vim バージョン 7.4. Last change: 2010 Nov 13
22

33

44
VIMリファレンスマニュアル by Nadim Shaikli

plugins/vimdoc-ja/doc/autocmd.jax

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim バージョン 7.3. Last change: 2013 May 19
1+
*autocmd.txt* For Vim バージョン 7.4. Last change: 2013 May 19
22

33

44
VIMリファレンスマニュアル by Bram Moolenaar

plugins/vimdoc-ja/doc/change.jax

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim バージョン 7.3. Last change: 2013 Mar 19
1+
*change.txt* For Vim バージョン 7.4. Last change: 2013 Mar 19
22

33

44
VIMリファレンスマニュアル by Bram Moolenaar
@@ -500,7 +500,7 @@ Cのプログラムを整形する "indent" (ただし、フィルタ機能を
500500
われる。Unixでは 'shellredir' がオフのとき、可能ならば
501501
パイプが使われる。
502502
'cpoptions' に 'R' フラグが含まれるとき、フィルタ処理
503-
された行のマークは削除される。|:keepmarksa| コマンドを
503+
された行のマークは削除される。|:keepmarks| コマンドを
504504
使うと削除されない。例: >
505505
:keepmarks '<,'>!sort
506506
< フィルタ処理のあと行数が少なくなっていた場合、すでにな

plugins/vimdoc-ja/doc/cmdline.jax

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*cmdline.txt* For Vim バージョン 7.3. Last change: 2013 Mar 16
1+
*cmdline.txt* For Vim バージョン 7.4. Last change: 2013 Mar 16
22

33

44
VIMリファレンスマニュアル by Bram Moolenaar

plugins/vimdoc-ja/doc/debug.jax

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*debug.txt* For Vim バージョン 7.3. Last change: 2012 Feb 11
1+
*debug.txt* For Vim バージョン 7.4. Last change: 2012 Feb 11
22

33

44
VIMリファレンスマニュアル by Bram Moolenaar

plugins/vimdoc-ja/doc/debugger.jax

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*debugger.txt* For Vim バージョン 7.3. Last change: 2005 Mar 29
1+
*debugger.txt* For Vim バージョン 7.4. Last change: 2005 Mar 29
22

33

44
VIMリファレンスマニュアル by Gordon Prieur

0 commit comments

Comments
 (0)