aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasil Zlatanov <vasil.zlatanov@gmail.com>2016-10-31 13:12:50 +0000
committerVasil Zlatanov <vasil.zlatanov@gmail.com>2016-10-31 13:12:50 +0000
commit066657e992c6358468a45810532e783b8249038e (patch)
treea55a11a78bd42b86f907d5bf4f2d8fe38ae666c1
parentbdc8d956ccca8a8febf456aa491dca13de2d39c3 (diff)
parentc2a33eb45e7bb4195212b9bcb31fa06b2633cbde (diff)
downloaddotfiles-066657e992c6358468a45810532e783b8249038e.tar.gz
dotfiles-066657e992c6358468a45810532e783b8249038e.tar.bz2
dotfiles-066657e992c6358468a45810532e783b8249038e.zip
Merge branch 'master' of github.com:Vaskozl/dotfiles
-rw-r--r--Browser/vimb/config.static2
m---------Editor/vim/bundle/syntastic0
m---------Editor/vim/bundle/ultisnips0
m---------Editor/vim/bundle/vim-snippets0
m---------Editor/vim/bundle/vim-surround0
-rwxr-xr-xWindow_Manager/ratpoison/wp2
6 files changed, 2 insertions, 2 deletions
diff --git a/Browser/vimb/config.static b/Browser/vimb/config.static
index dc5879e..0aed051 100644
--- a/Browser/vimb/config.static
+++ b/Browser/vimb/config.static
@@ -1,6 +1,6 @@
set useragent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/601.2.4 (KHTML, like Gecko) Version/9.0.1 Safari/601.2.4
-set scripts=true
+set scripts=false
set spacial-navigation=true
diff --git a/Editor/vim/bundle/syntastic b/Editor/vim/bundle/syntastic
-Subproject 8e672780e76c0a774b7fe834eed9652ccd684c2
+Subproject e84f80a68ae7a5b03995ad712f8fbdc8483f0fd
diff --git a/Editor/vim/bundle/ultisnips b/Editor/vim/bundle/ultisnips
-Subproject c3a0924b777dbba2f8612950bd8f8a00df18d1b
+Subproject 71c39721de9cb2d67478e8b8c1a543e006fb67d
diff --git a/Editor/vim/bundle/vim-snippets b/Editor/vim/bundle/vim-snippets
-Subproject 59cc3ecc795d1b48910f474df732b4218bdc20c
+Subproject 19a8f5386b65832b1705b0ffd02d20dea9400b8
diff --git a/Editor/vim/bundle/vim-surround b/Editor/vim/bundle/vim-surround
-Subproject 772ab9587b7d1e2c3bae75395c9123803059ba8
+Subproject e49d6c2459e0f5569ff2d533b4df995dd7f9831
diff --git a/Window_Manager/ratpoison/wp b/Window_Manager/ratpoison/wp
index 1f7a707..1f0ef63 100755
--- a/Window_Manager/ratpoison/wp
+++ b/Window_Manager/ratpoison/wp
@@ -142,7 +142,7 @@ function change {
dirname=$(dirname $background)
#:: Set the background
- feh --bg-fill $background
+ feh --bg-fill --xinerama-index 1 $background
#:: Record the current background
set_current $background