update from vim-scripts mirror

plugin/fcitx.py

@@ -27,6 +27,11 @@ def fcitxtalk(command=None):
       sock.send(FCITX_OPEN)
     else:
       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:
     sock.close()
 

plugin/fcitx.vim

@@ -1,11 +1,13 @@
 scriptencoding utf-8
 " fcitx.vim	remember fcitx's input state for each buffer
 " Author:       lilydjwg
-" Version:	1.2
+" Version:	1.2.3
 " URL:		http://www.vim.org/scripts/script.php?script_id=3764
 " ---------------------------------------------------------------------
 " 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
 endif
 if has("python3")