fix: unneeded option set at cmdline

vim-skk · Jun 6, 2024 · dad24e6 · dad24e6
1 parent 953807b
commit dad24e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/autoload/skkeleton.vim b/autoload/skkeleton.vim
@@ -212,10 +212,6 @@ endfunction
 function! skkeleton#disable()
   if g:skkeleton#enabled
     doautocmd <nomodeline> User skkeleton-disable-pre
-    " cmdline関係ないオプションだけなので辞書登録時はスキップ
-    if mode() !=# 'c'
-      call skkeleton#internal#option#restore()
-    endif
     call skkeleton#internal#map#restore()
     let g:skkeleton#mode = ''
     doautocmd <nomodeline> User skkeleton-mode-changed

diff --git a/autoload/skkeleton/internal/option.vim b/autoload/skkeleton/internal/option.vim
@@ -6,6 +6,10 @@ function s:ensure(dict, key, value)
 endfunction
 
 function skkeleton#internal#option#save_and_set()
+  " cmdline関係ないオプションだけなので辞書登録時はスキップ
+  if mode() !=# 'c'
+    call skkeleton#internal#option#restore()
+  endif
   call s:ensure(s:textwidth, bufnr(), &l:textwidth)
   call s:ensure(s:virtualedit, win_getid(), &l:virtualedit)
   " 不意に改行が発生してバッファが壊れるため 'textwidth' を無効化