Skip to content

allow map delete-from-dict&prev-page&choose-prev #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shougo merged 5 commits into from
May 8, 2026
Merged

allow map delete-from-dict&prev-page&choose-prev #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76ac181
allow map delete-from-dict&prev-page&choose-prev
kyouryuukunn May 6, 2026
9b11ed9
distinguish prev-page from choose-prev
kyouryuukunn May 7, 2026
e60957a
fix doc about option samples for Azik
kyouryuukunn May 7, 2026
9f7034d
fix doc
kyouryuukunn May 8, 2026
bd2de29
fix doc
kyouryuukunn May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions autoload/eskk.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,10 @@ function! s:asym_filter(stash) abort "{{{

let mappings = eskk#_get_eskk_mappings()
let sticky_char = get(mappings.sticky, 'lhs', '')
let delete_from_dict = get(mappings['phase:henkan-select:delete-from-dict'], 'lhs', '')
let delete_from_dict = eskk#util#key2char(delete_from_dict)
let choose_prev = get(mappings['phase:henkan-select:choose-prev'], 'lhs', '')
let choose_prev = eskk#util#key2char(choose_prev)
" Convert to real key
if sticky_char ==# '<Space>' && phase ==# g:eskk#preedit#PHASE_NORMAL
let sticky_char = "\<Space>"
Expand Down Expand Up @@ -448,10 +452,10 @@ function! s:asym_filter(stash) abort "{{{
if char ==# ' '
call preedit.choose_next_candidate(a:stash)
return
elseif char ==# 'x'
elseif char ==# choose_prev
call preedit.choose_prev_candidate(a:stash)
return
elseif char ==# 'X'
elseif char ==# delete_from_dict
let henkan_result = eskk#get_skk_dict().get_henkan_result()
if !empty(henkan_result)
let prev_preedit =
Expand Down Expand Up @@ -1237,6 +1241,10 @@ function! s:abbrev_filter(stash) abort "{{{
let buf_str = preedit.get_current_buf_str()
let phase = preedit.get_henkan_phase()

let mappings = eskk#_get_eskk_mappings()
let choose_prev = get(mappings['phase:henkan-select:choose-prev'], 'lhs', '')
let choose_prev = eskk#util#key2char(choose_prev)

" Handle special characters.
" These characters are handled regardless of current phase.
if char ==# "\<C-g>"
Expand Down Expand Up @@ -1269,7 +1277,7 @@ function! s:abbrev_filter(stash) abort "{{{
if char ==# ' '
call preedit.choose_next_candidate(a:stash)
return
elseif char ==# 'x'
elseif char ==# choose_prev
call preedit.choose_prev_candidate(a:stash)
return
else
Expand Down
6 changes: 5 additions & 1 deletion autoload/eskk/dictionary.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,10 @@ function! s:HenkanResult_select_candidate_prompt(skip_num, fallback) abort dict
let page_index = 0
let pages = []

let mappings = eskk#_get_eskk_mappings()
let prev_page = get(mappings['phase:henkan-select:prev-page'], 'lhs', '')
let prev_page = eskk#util#key2char(prev_page)

call eskk#util#assert(
\ len(words) > a:skip_num,
\ 'words has more than skip_num words.'
Expand Down Expand Up @@ -471,7 +475,7 @@ function! s:HenkanResult_select_candidate_prompt(skip_num, fallback) abort dict
\ okuri_buf_str.rom_pairs.get_filter()
\]
endif
elseif char ==# 'x'
elseif char ==# prev_page
if eskk#util#has_idx(pages, page_index - 1)
let page_index -= 1
else
Expand Down
3 changes: 3 additions & 0 deletions autoload/eskk/map.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,9 @@ function! eskk#map#_cmd_eskk_map(args) abort "{{{
\ rhs,
\)
endif
if index(g:eskk#mapped_keys, lhs) == -1
call add(g:eskk#mapped_keys, lhs)
endif
endfunction "}}}
function! eskk#map#_cmd_eskk_unmap(args) abort "{{{
let [options, type, args] = s:parse_options(a:args)
Expand Down
16 changes: 13 additions & 3 deletions doc/eskk.jax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,11 @@ g:eskk#use_azik *g:eskk#use_azik*

Xから始まる単語を変換出来るようになる。~
例1: 社会主義 Xakqxugi
Note: 一方、▼モードで誤った単語登録を削除することは出来なくなる。

Note: 一方、▼モードで誤った単語登録を削除することは出来なくなるため、
必要なら別のキーに設定する。
>
EskkMap -type=phase:henkan-select:delete-from-dict <C-d>
<
<S-;>から始まる送り仮名を変換出来るようになる。~
例2: くららが立った kuraragaTa<S-;>ta
Note: SKK辞書の仕様上、一般的なAZIKのアルファベットテーブルに加え、
Expand Down Expand Up @@ -783,7 +786,6 @@ https://github.com/hakehash/vimrc/blob/9823c5c91522eb5a1534bc81a6304c21d209545c/
EskkUnmap -type=mode:hankata:q-key q
EskkUnmap -type=mode:hankata:l-key l
EskkUnmap -type=sticky ;
EskkUnmap -type=phase:henkan-select:delete-from-dict X
if g:eskk#azik_keyboard_type=="jp106"
EskkMap -type=mode:hira:toggle-kata @
EskkMap -type=mode:hira:q-key @
Expand All @@ -799,6 +801,14 @@ https://github.com/hakehash/vimrc/blob/9823c5c91522eb5a1534bc81a6304c21d209545c/
EskkMap -type=mode:hankata:toggle-kata [
EskkMap -type=mode:hankata:q-key [
endif
" Xで始まる日本語を変換できるように削除キーを別のキーに設定する
EskkUnmap -type=phase:henkan-select:delete-from-dict X
EskkMap -type=phase:henkan-select:delete-from-dict <C-d>
" xで始まる日本語を入力できるように候補選択用のキーを別のキーに設定する
EskkUnmap -type=phase:henkan-select:choose-prev x
EskkUnmap -type=phase:henkan-select:prev-page x
EskkMap -type=phase:henkan-select:choose-prev <S-Space>
EskkMap -type=phase:henkan-select:prev-page <C-b>
endif
endfunction
}}}
Expand Down
Loading