update from vim-scripts mirror

This commit is contained in:
lilydjwg 2013-11-05 11:02:56 +08:00
parent 9c757c161d
commit dc5455d2f2
3 changed files with 10 additions and 5 deletions

View file

@ -27,6 +27,11 @@ def fcitxtalk(command=None):
sock.send(FCITX_OPEN) sock.send(FCITX_OPEN)
else: else:
raise ValueError('unknown fcitx command') raise ValueError('unknown fcitx command')
except struct.error:
# if there's a proxy of some kind, connect and send *will* succeed when
# fcitx isn't there.
vim.command('echohl WarningMsg | echo "fcitx.vim: socket error" | echohl NONE')
return
finally: finally:
sock.close() sock.close()

View file

@ -1,11 +1,13 @@
scriptencoding utf-8 scriptencoding utf-8
" fcitx.vim remember fcitx's input state for each buffer " fcitx.vim remember fcitx's input state for each buffer
" Author: lilydjwg " Author: lilydjwg
" Version: 1.2 " Version: 1.2.3
" URL: http://www.vim.org/scripts/script.php?script_id=3764 " URL: http://www.vim.org/scripts/script.php?script_id=3764
" --------------------------------------------------------------------- " ---------------------------------------------------------------------
" Load Once: " Load Once:
if &cp || exists("g:loaded_fcitx") || !exists('$DISPLAY') || exists('$SSH_TTY') || has('gui_macvim') if &cp || exists("g:loaded_fcitx") || (
\ (!exists('$DISPLAY') || exists('$SSH_TTY') || has('gui_macvim'))
\ && !exists('$FCITX_SOCKET'))
finish finish
endif endif
if has("python3") if has("python3")

View file

@ -1,7 +1,6 @@
" fcitx.vim 记住插入模式小企鹅输入法的状态 " fcitx.vim 记住插入模式小企鹅输入法的状态
" Author: lilydjwg " Author: lilydjwg
" Maintainer: lilydjwg " Maintainer: lilydjwg
" Last Change: 2010-11-18
" Note: 另有使用 Python3 接口的新版本 " Note: 另有使用 Python3 接口的新版本
" --------------------------------------------------------------------- " ---------------------------------------------------------------------
" Load Once: " Load Once:
@ -9,8 +8,7 @@ if (has("win32") || has("win95") || has("win64") || has("win16"))
" Windows 下不要载入 " Windows 下不要载入
finish finish
endif endif
if !exists('$DISPLAY') if !exists('$DISPLAY') || exists('$SSH_TTY') || has('gui_macvim')
" 没有 X不要载入
finish finish
endif endif
if &cp || exists("g:loaded_fcitx") || !executable("fcitx-remote") if &cp || exists("g:loaded_fcitx") || !executable("fcitx-remote")