From 3956d3848a3e47d016401de8bdadc9814627cb7d Mon Sep 17 00:00:00 2001
From: Egor Kovetskiy <e.kovetskiy@office.ngs.ru>
Date: Thu, 1 Sep 2016 14:54:02 +0700
Subject: [PATCH] vimperator: upgrade settings

---
 .vimperator/{mappings.js => mappings.vim} |  2 --
 .vimperator/{settings.js => settings.vim} | 20 +++++++++++---------
 .vimperator/style.js                      |  6 ------
 .vimperator/style.vim                     |  5 +++++
 .vimperatorrc                             | 14 ++++----------
 .vimrc                                    |  4 ++++
 bin/vimperator-editor                     |  0
 deadfiles                                 |  2 +-
 8 files changed, 25 insertions(+), 28 deletions(-)
 rename .vimperator/{mappings.js => mappings.vim} (98%)
 rename .vimperator/{settings.js => settings.vim} (78%)
 delete mode 100644 .vimperator/style.js
 create mode 100644 .vimperator/style.vim
 mode change 100644 => 100755 bin/vimperator-editor

diff --git a/.vimperator/mappings.js b/.vimperator/mappings.vim
similarity index 98%
rename from .vimperator/mappings.js
rename to .vimperator/mappings.vim
index af81034b..85fe81b2 100644
--- a/.vimperator/mappings.js
+++ b/.vimperator/mappings.vim
@@ -32,5 +32,3 @@ nnoremap %   :source ~/.vimperatorrc<CR>
 
 inoremap <C-]> <Ins><C-a><Ins><C-I>
 inoremap <C-a> <Ins><C-a><Ins>
-
-" vim:ft=vim
diff --git a/.vimperator/settings.js b/.vimperator/settings.vim
similarity index 78%
rename from .vimperator/settings.js
rename to .vimperator/settings.vim
index 0d6ad9f0..0af7cceb 100644
--- a/.vimperator/settings.js
+++ b/.vimperator/settings.vim
@@ -1,11 +1,13 @@
-set! hintchars=qweasdiopjkl
-set! gui=none
+set complete=lS
 
-set! editor="vimperator-editor $0"
-set! cpt=l
-set! showstatuslinks=2
-set! hto=170
-set! focuscontent
+set hintchars=qweasdiopjkl
+set gui=none
+
+set editor=vimperator-editor
+set cpt=l
+set showstatuslinks=2
+set hto=170
+set focuscontent
 
 set! breakpad.reportURL=""
 set! browser.safebrowsing.appRepURL=""
@@ -26,7 +28,7 @@ set! browser.safebrowsing.updateURL=""
 set! browser.send_pings.require_same_host=true
 set! browser.send_pings=false
 set! javascript.options.jit.chrome=true
+set! javascript.options.jit.content=true
 set! signon.rememberSignons=false
 set! browser.tabs.closeWindowWithLastTab=false
-
-" vim:ft=vim
+set! gfx.font_rendering.fontconfig.fontlist.enabled=false
diff --git a/.vimperator/style.js b/.vimperator/style.js
deleted file mode 100644
index dc9cb7fd..00000000
--- a/.vimperator/style.js
+++ /dev/null
@@ -1,6 +0,0 @@
-hi CompResult -append font-family: Monaco; font-size: 12px;
-hi CompDesc -append font-family: Monaco; font-size: 12px;
-hi CmdLine>* font-family: Monaco; font-size: 12px;
-hi StatusLine -append font-family: Monaco; font-size: 12px;
-hi Hint font-size: 12px; font-weight: bold; text-transform: uppercase; color: white; background-color: red; border-color: ButtonShadow; border-width: 0px; border-style: solid; padding: 0px 1px 0px 1px; font-family: Monaco
-hi CmdLine fotn-size: 12px; font-weight: normal; font-family: Monaco;
diff --git a/.vimperator/style.vim b/.vimperator/style.vim
new file mode 100644
index 00000000..6a47ef88
--- /dev/null
+++ b/.vimperator/style.vim
@@ -0,0 +1,5 @@
+hi CompResult font-family: Monaco; font-size: 12px;
+hi CompDesc   font-family: Monaco; font-size: 12px;
+hi CmdLine>*  font-family: Monaco; font-size: 12px;
+hi StatusLine font-family: Monaco; font-size: 12px;
+hi Hint       font-family: Monaco; font-size: 12px; font-weight: bold; text-transform: uppercase; line-height: 12px; color: white; background-color: red; border: 0; padding: 0px 1px 0px 1px; font-family: "Monaco";
diff --git a/.vimperatorrc b/.vimperatorrc
index f742e23e..1b439281 100644
--- a/.vimperatorrc
+++ b/.vimperatorrc
@@ -1,11 +1,5 @@
-source ~/.vimperator/style.js
-source ~/.vimperator/settings.js
-source ~/.vimperator/mappings.js
+source ~/.vimperator/settings.vim
+source ~/.vimperator/style.vim
+source ~/.vimperator/mappings.vim
 
-source ~/.vimperator/bundle/auto_reload.js
-source ~/.vimperator/bundle/cookieManager.js
-
-command! -nargs=0 Wipe
-    \ js tabs.remove(tabs.getTab(0), tabs.count, 0, 0, false)
-
-" vim:ft=vim
+command! -nargs=0 Wipe js tabs.remove(tabs.getTab(0), tabs.count, 0, 0, false)
diff --git a/.vimrc b/.vimrc
index 2c0387fb..d6ef5f34 100644
--- a/.vimrc
+++ b/.vimrc
@@ -574,6 +574,8 @@ Plug 'kovetskiy/sxhkd-vim'
 
 Plug 'PotatoesMaster/i3-vim-syntax'
 
+Plug 'vimperator/vimperator.vim'
+
 augroup end
 call plug#end()
 
@@ -693,6 +695,8 @@ au operations BufRead *.noml set ft=noml.dracula
 
 au operations FileType html setlocal sw=2
 
+au operations BufRead */.vimperator/*.vim,.vimperatorrc set ft=vimperator
+
 map Q <nop>
 map K <nop>
 
diff --git a/bin/vimperator-editor b/bin/vimperator-editor
old mode 100644
new mode 100755
diff --git a/deadfiles b/deadfiles
index f2f26b02..24197d2c 160000
--- a/deadfiles
+++ b/deadfiles
@@ -1 +1 @@
-Subproject commit f2f26b026fc2a628f92d54ee9e543e0535f08e5d
+Subproject commit 24197d2c204b95b8bcacafa019483e8fcce7edde