=== modified file 'vim/bundle/Insertlessly/.git/config' (properties changed: +x to -x) === modified file 'vim/bundle/Insertlessly/.git/hooks/pre-commit.sample' --- vim/bundle/Insertlessly/.git/hooks/pre-commit.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/Insertlessly/.git/hooks/pre-commit.sample 2014-02-24 23:42:31 +0000 @@ -16,7 +16,7 @@ fi # If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) +allownonascii=$(git config hooks.allownonascii) # Redirect output to stderr. exec 1>&2 === modified file 'vim/bundle/Insertlessly/.git/hooks/pre-push.sample' --- vim/bundle/Insertlessly/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/Insertlessly/.git/hooks/pre-push.sample 2014-02-24 23:42:31 +0000 @@ -45,7 +45,7 @@ commit=`git rev-list -n 1 --grep '^WIP' "$range"` if [ -n "$commit" ] then - echo >&2 "Found WIP commit in $local_ref, not pushing" + echo "Found WIP commit in $local_ref, not pushing" exit 1 fi fi === modified file 'vim/bundle/Insertlessly/.git/index' Binary files vim/bundle/Insertlessly/.git/index 2015-08-25 11:20:35 +0000 and vim/bundle/Insertlessly/.git/index 2014-02-24 23:42:31 +0000 differ === modified file 'vim/bundle/Insertlessly/.git/logs/HEAD' --- vim/bundle/Insertlessly/.git/logs/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/Insertlessly/.git/logs/HEAD 2014-02-24 23:42:31 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 6b04048da9bbbe53466ba9e8860a1911f1685d1d Jan Pobrislo 1440501494 +0200 clone: from https://github.com/dahu/Insertlessly +0000000000000000000000000000000000000000 e06ab71f38e72b71b5f6c8a8a60cd1099a0663c9 ccx 1393285207 +0100 clone: from https://github.com/dahu/Insertlessly === modified file 'vim/bundle/Insertlessly/.git/logs/refs/heads/master' --- vim/bundle/Insertlessly/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/Insertlessly/.git/logs/refs/heads/master 2014-02-24 23:42:31 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 6b04048da9bbbe53466ba9e8860a1911f1685d1d Jan Pobrislo 1440501494 +0200 clone: from https://github.com/dahu/Insertlessly +0000000000000000000000000000000000000000 e06ab71f38e72b71b5f6c8a8a60cd1099a0663c9 ccx 1393285207 +0100 clone: from https://github.com/dahu/Insertlessly === modified file 'vim/bundle/Insertlessly/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/Insertlessly/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/Insertlessly/.git/logs/refs/remotes/origin/HEAD 2014-02-24 23:42:31 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 6b04048da9bbbe53466ba9e8860a1911f1685d1d Jan Pobrislo 1440501494 +0200 clone: from https://github.com/dahu/Insertlessly +0000000000000000000000000000000000000000 e06ab71f38e72b71b5f6c8a8a60cd1099a0663c9 ccx 1393285207 +0100 clone: from https://github.com/dahu/Insertlessly === removed directory 'vim/bundle/Insertlessly/.git/objects/67' === removed file 'vim/bundle/Insertlessly/.git/objects/67/45a6234878c511489f4b9f8665ef421961a9f5' Binary files vim/bundle/Insertlessly/.git/objects/67/45a6234878c511489f4b9f8665ef421961a9f5 2015-08-25 11:20:35 +0000 and vim/bundle/Insertlessly/.git/objects/67/45a6234878c511489f4b9f8665ef421961a9f5 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/Insertlessly/.git/objects/6a' === added file 'vim/bundle/Insertlessly/.git/objects/6a/5fac1b904f0e5d9f027f9902bbe069f8a5e09f' Binary files vim/bundle/Insertlessly/.git/objects/6a/5fac1b904f0e5d9f027f9902bbe069f8a5e09f 1970-01-01 00:00:00 +0000 and vim/bundle/Insertlessly/.git/objects/6a/5fac1b904f0e5d9f027f9902bbe069f8a5e09f 2014-02-24 23:42:31 +0000 differ === removed file 'vim/bundle/Insertlessly/.git/objects/6b/04048da9bbbe53466ba9e8860a1911f1685d1d' Binary files vim/bundle/Insertlessly/.git/objects/6b/04048da9bbbe53466ba9e8860a1911f1685d1d 2015-08-25 11:20:35 +0000 and vim/bundle/Insertlessly/.git/objects/6b/04048da9bbbe53466ba9e8860a1911f1685d1d 1970-01-01 00:00:00 +0000 differ === added file 'vim/bundle/Insertlessly/.git/objects/6b/2b59f2e99804c00d6ed6b9cb7e4acd07404b0d' Binary files vim/bundle/Insertlessly/.git/objects/6b/2b59f2e99804c00d6ed6b9cb7e4acd07404b0d 1970-01-01 00:00:00 +0000 and vim/bundle/Insertlessly/.git/objects/6b/2b59f2e99804c00d6ed6b9cb7e4acd07404b0d 2014-02-24 23:42:31 +0000 differ === added directory 'vim/bundle/Insertlessly/.git/objects/82' === added file 'vim/bundle/Insertlessly/.git/objects/82/ac303afd86a06c25e061a1fdbe3278fe900332' Binary files vim/bundle/Insertlessly/.git/objects/82/ac303afd86a06c25e061a1fdbe3278fe900332 1970-01-01 00:00:00 +0000 and vim/bundle/Insertlessly/.git/objects/82/ac303afd86a06c25e061a1fdbe3278fe900332 2014-02-24 23:42:31 +0000 differ === removed directory 'vim/bundle/Insertlessly/.git/objects/be' === removed file 'vim/bundle/Insertlessly/.git/objects/be/a677c7d83f503ec546dbb2d0e90e3b727fe6cd' Binary files vim/bundle/Insertlessly/.git/objects/be/a677c7d83f503ec546dbb2d0e90e3b727fe6cd 2015-08-25 11:20:35 +0000 and vim/bundle/Insertlessly/.git/objects/be/a677c7d83f503ec546dbb2d0e90e3b727fe6cd 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/Insertlessly/.git/objects/d8' === removed file 'vim/bundle/Insertlessly/.git/objects/d8/4b8efe68d70c6b9f705f7fcfd4af4730feec06' Binary files vim/bundle/Insertlessly/.git/objects/d8/4b8efe68d70c6b9f705f7fcfd4af4730feec06 2015-08-25 11:20:35 +0000 and vim/bundle/Insertlessly/.git/objects/d8/4b8efe68d70c6b9f705f7fcfd4af4730feec06 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/Insertlessly/.git/objects/e0' === added file 'vim/bundle/Insertlessly/.git/objects/e0/6ab71f38e72b71b5f6c8a8a60cd1099a0663c9' --- vim/bundle/Insertlessly/.git/objects/e0/6ab71f38e72b71b5f6c8a8a60cd1099a0663c9 1970-01-01 00:00:00 +0000 +++ vim/bundle/Insertlessly/.git/objects/e0/6ab71f38e72b71b5f6c8a8a60cd1099a0663c9 2014-02-24 23:42:31 +0000 @@ -0,0 +1,1 @@ +xAn CH_U2 O4V}g;ZˀŬ/C&˖%F#:I9m:fo&0 clM5&HF2K>J[}EgoTʲs;v2;s 'EROi_\獮~4 T \ No newline at end of file === modified file 'vim/bundle/Insertlessly/.git/packed-refs' --- vim/bundle/Insertlessly/.git/packed-refs 2015-08-25 11:20:35 +0000 +++ vim/bundle/Insertlessly/.git/packed-refs 2014-02-24 23:42:31 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -6b04048da9bbbe53466ba9e8860a1911f1685d1d refs/remotes/origin/master +e06ab71f38e72b71b5f6c8a8a60cd1099a0663c9 refs/remotes/origin/master === modified file 'vim/bundle/Insertlessly/.git/refs/heads/master' --- vim/bundle/Insertlessly/.git/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/Insertlessly/.git/refs/heads/master 2014-02-24 23:42:31 +0000 @@ -1,1 +1,1 @@ -6b04048da9bbbe53466ba9e8860a1911f1685d1d +e06ab71f38e72b71b5f6c8a8a60cd1099a0663c9 === modified file 'vim/bundle/Insertlessly/.git/shallow' --- vim/bundle/Insertlessly/.git/shallow 2015-08-25 11:20:35 +0000 +++ vim/bundle/Insertlessly/.git/shallow 2014-02-24 23:42:31 +0000 @@ -1,1 +1,1 @@ -6b04048da9bbbe53466ba9e8860a1911f1685d1d +e06ab71f38e72b71b5f6c8a8a60cd1099a0663c9 === modified file 'vim/bundle/Insertlessly/plugin/insertlessly.vim' --- vim/bundle/Insertlessly/plugin/insertlessly.vim 2015-08-25 11:20:35 +0000 +++ vim/bundle/Insertlessly/plugin/insertlessly.vim 2014-02-24 23:42:31 +0000 @@ -105,19 +105,9 @@ endif endfunction -function! s:getcmdwintype() - if exists('*getcmdwintype') - return getcmdwintype() - elseif bufname('%') == '[Command Line]' - return 0 - else - return 1 - endif -endfunction - function! s:InsertNewline() " Special buffer types (help, quickfix, command window, etc.) have buftype set - if (&buftype == "") || (&buftype == 'nofile' && s:getcmdwintype() == '') + if &buftype == "" if (col('.') + 1) == col('$') exe "normal! " . v:count1 . "o" else === modified file 'vim/bundle/vim-commentary/.git/config' (properties changed: +x to -x) === modified file 'vim/bundle/vim-commentary/.git/hooks/pre-commit.sample' --- vim/bundle/vim-commentary/.git/hooks/pre-commit.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/.git/hooks/pre-commit.sample 2014-02-24 23:42:31 +0000 @@ -16,7 +16,7 @@ fi # If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) +allownonascii=$(git config hooks.allownonascii) # Redirect output to stderr. exec 1>&2 === modified file 'vim/bundle/vim-commentary/.git/hooks/pre-push.sample' --- vim/bundle/vim-commentary/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/.git/hooks/pre-push.sample 2014-02-24 23:42:31 +0000 @@ -45,7 +45,7 @@ commit=`git rev-list -n 1 --grep '^WIP' "$range"` if [ -n "$commit" ] then - echo >&2 "Found WIP commit in $local_ref, not pushing" + echo "Found WIP commit in $local_ref, not pushing" exit 1 fi fi === modified file 'vim/bundle/vim-commentary/.git/index' Binary files vim/bundle/vim-commentary/.git/index 2015-08-25 11:20:35 +0000 and vim/bundle/vim-commentary/.git/index 2014-02-24 23:42:31 +0000 differ === modified file 'vim/bundle/vim-commentary/.git/logs/HEAD' --- vim/bundle/vim-commentary/.git/logs/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/.git/logs/HEAD 2014-02-24 23:42:31 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 7fb632aab475b1d2560fe18a329742ba3b4725c6 Jan Pobrislo 1440501529 +0200 clone: from https://github.com/tpope/vim-commentary +0000000000000000000000000000000000000000 a3ae0df1d9e13941e9e8086637055841ce93f7bd ccx 1393285310 +0100 clone: from https://github.com/tpope/vim-commentary === modified file 'vim/bundle/vim-commentary/.git/logs/refs/heads/master' --- vim/bundle/vim-commentary/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/.git/logs/refs/heads/master 2014-02-24 23:42:31 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 7fb632aab475b1d2560fe18a329742ba3b4725c6 Jan Pobrislo 1440501529 +0200 clone: from https://github.com/tpope/vim-commentary +0000000000000000000000000000000000000000 a3ae0df1d9e13941e9e8086637055841ce93f7bd ccx 1393285310 +0100 clone: from https://github.com/tpope/vim-commentary === modified file 'vim/bundle/vim-commentary/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/vim-commentary/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/.git/logs/refs/remotes/origin/HEAD 2014-02-24 23:42:31 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 7fb632aab475b1d2560fe18a329742ba3b4725c6 Jan Pobrislo 1440501529 +0200 clone: from https://github.com/tpope/vim-commentary +0000000000000000000000000000000000000000 a3ae0df1d9e13941e9e8086637055841ce93f7bd ccx 1393285310 +0100 clone: from https://github.com/tpope/vim-commentary === added directory 'vim/bundle/vim-commentary/.git/objects/1a' === added file 'vim/bundle/vim-commentary/.git/objects/1a/69d40609ae37500047da03c2a48e97df09d5c0' Binary files vim/bundle/vim-commentary/.git/objects/1a/69d40609ae37500047da03c2a48e97df09d5c0 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/1a/69d40609ae37500047da03c2a48e97df09d5c0 2014-02-24 23:42:31 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/4d' === added file 'vim/bundle/vim-commentary/.git/objects/4d/b3ed9976571e1e150577cf3ea64dee1bec8c7f' Binary files vim/bundle/vim-commentary/.git/objects/4d/b3ed9976571e1e150577cf3ea64dee1bec8c7f 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/4d/b3ed9976571e1e150577cf3ea64dee1bec8c7f 2014-02-24 23:42:31 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/53' === removed file 'vim/bundle/vim-commentary/.git/objects/53/87ba6ebd6ec97471f69063326c40e8b083dba6' Binary files vim/bundle/vim-commentary/.git/objects/53/87ba6ebd6ec97471f69063326c40e8b083dba6 2015-08-25 11:20:35 +0000 and vim/bundle/vim-commentary/.git/objects/53/87ba6ebd6ec97471f69063326c40e8b083dba6 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/63' === added file 'vim/bundle/vim-commentary/.git/objects/63/dbe2671c51870b34c354c9cbca4872026f0e96' Binary files vim/bundle/vim-commentary/.git/objects/63/dbe2671c51870b34c354c9cbca4872026f0e96 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/63/dbe2671c51870b34c354c9cbca4872026f0e96 2014-02-24 23:42:31 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/7e' === removed file 'vim/bundle/vim-commentary/.git/objects/7e/74bfedeef17a11943f0e6c99f27c13ddb46406' Binary files vim/bundle/vim-commentary/.git/objects/7e/74bfedeef17a11943f0e6c99f27c13ddb46406 2015-08-25 11:20:35 +0000 and vim/bundle/vim-commentary/.git/objects/7e/74bfedeef17a11943f0e6c99f27c13ddb46406 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/7f' === removed file 'vim/bundle/vim-commentary/.git/objects/7f/b632aab475b1d2560fe18a329742ba3b4725c6' Binary files vim/bundle/vim-commentary/.git/objects/7f/b632aab475b1d2560fe18a329742ba3b4725c6 2015-08-25 11:20:35 +0000 and vim/bundle/vim-commentary/.git/objects/7f/b632aab475b1d2560fe18a329742ba3b4725c6 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/86' === added file 'vim/bundle/vim-commentary/.git/objects/86/7b887c554e5e704ebab1b24e20562079d227ac' Binary files vim/bundle/vim-commentary/.git/objects/86/7b887c554e5e704ebab1b24e20562079d227ac 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/86/7b887c554e5e704ebab1b24e20562079d227ac 2014-02-24 23:42:31 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/a1' === removed file 'vim/bundle/vim-commentary/.git/objects/a1/e993fd96e0d45a65a9df4df58cc18b5974e230' Binary files vim/bundle/vim-commentary/.git/objects/a1/e993fd96e0d45a65a9df4df58cc18b5974e230 2015-08-25 11:20:35 +0000 and vim/bundle/vim-commentary/.git/objects/a1/e993fd96e0d45a65a9df4df58cc18b5974e230 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/a3' === added file 'vim/bundle/vim-commentary/.git/objects/a3/ae0df1d9e13941e9e8086637055841ce93f7bd' --- vim/bundle/vim-commentary/.git/objects/a3/ae0df1d9e13941e9e8086637055841ce93f7bd 1970-01-01 00:00:00 +0000 +++ vim/bundle/vim-commentary/.git/objects/a3/ae0df1d9e13941e9e8086637055841ce93f7bd 2014-02-24 23:42:31 +0000 @@ -0,0 +1,1 @@ +xMj0F) #Rz@f<3jeJ_Sr,mm`)0b!) ┄г)kIRH`4Ύ=Em{&"%,y(~ƽpm \]slW`}881lS2_mz=G+Խ/pJ \ No newline at end of file === removed directory 'vim/bundle/vim-commentary/.git/objects/a9' === removed file 'vim/bundle/vim-commentary/.git/objects/a9/1cd712240d45bc891cc3b0ce6a7d239df92867' Binary files vim/bundle/vim-commentary/.git/objects/a9/1cd712240d45bc891cc3b0ce6a7d239df92867 2015-08-25 11:20:35 +0000 and vim/bundle/vim-commentary/.git/objects/a9/1cd712240d45bc891cc3b0ce6a7d239df92867 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/b3' === removed file 'vim/bundle/vim-commentary/.git/objects/b3/f00951c03730b25be86bf42543e69c5e5b46c3' Binary files vim/bundle/vim-commentary/.git/objects/b3/f00951c03730b25be86bf42543e69c5e5b46c3 2015-08-25 11:20:35 +0000 and vim/bundle/vim-commentary/.git/objects/b3/f00951c03730b25be86bf42543e69c5e5b46c3 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/cc' === added file 'vim/bundle/vim-commentary/.git/objects/cc/6f14b299bcdbae6f4e5664b5d1f53900b8157c' Binary files vim/bundle/vim-commentary/.git/objects/cc/6f14b299bcdbae6f4e5664b5d1f53900b8157c 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/cc/6f14b299bcdbae6f4e5664b5d1f53900b8157c 2014-02-24 23:42:31 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/cf' === added file 'vim/bundle/vim-commentary/.git/objects/cf/403469c4f93aa0e0486ba0875dccae9f00ed38' Binary files vim/bundle/vim-commentary/.git/objects/cf/403469c4f93aa0e0486ba0875dccae9f00ed38 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/cf/403469c4f93aa0e0486ba0875dccae9f00ed38 2014-02-24 23:42:31 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/d6' === removed file 'vim/bundle/vim-commentary/.git/objects/d6/deed05b2883cdecb878a6202640f2892ac6209' Binary files vim/bundle/vim-commentary/.git/objects/d6/deed05b2883cdecb878a6202640f2892ac6209 2015-08-25 11:20:35 +0000 and vim/bundle/vim-commentary/.git/objects/d6/deed05b2883cdecb878a6202640f2892ac6209 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/fc' === removed file 'vim/bundle/vim-commentary/.git/objects/fc/117ba479c8b0435234b39819a3561e314703a1' Binary files vim/bundle/vim-commentary/.git/objects/fc/117ba479c8b0435234b39819a3561e314703a1 2015-08-25 11:20:35 +0000 and vim/bundle/vim-commentary/.git/objects/fc/117ba479c8b0435234b39819a3561e314703a1 1970-01-01 00:00:00 +0000 differ === modified file 'vim/bundle/vim-commentary/.git/packed-refs' --- vim/bundle/vim-commentary/.git/packed-refs 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/.git/packed-refs 2014-02-24 23:42:31 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -7fb632aab475b1d2560fe18a329742ba3b4725c6 refs/remotes/origin/master +a3ae0df1d9e13941e9e8086637055841ce93f7bd refs/remotes/origin/master === modified file 'vim/bundle/vim-commentary/.git/refs/heads/master' --- vim/bundle/vim-commentary/.git/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/.git/refs/heads/master 2014-02-24 23:42:31 +0000 @@ -1,1 +1,1 @@ -7fb632aab475b1d2560fe18a329742ba3b4725c6 +a3ae0df1d9e13941e9e8086637055841ce93f7bd === modified file 'vim/bundle/vim-commentary/.git/shallow' --- vim/bundle/vim-commentary/.git/shallow 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/.git/shallow 2014-02-24 23:42:31 +0000 @@ -1,1 +1,1 @@ -7fb632aab475b1d2560fe18a329742ba3b4725c6 +a3ae0df1d9e13941e9e8086637055841ce93f7bd === removed file 'vim/bundle/vim-commentary/CONTRIBUTING.markdown' --- vim/bundle/vim-commentary/CONTRIBUTING.markdown 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/CONTRIBUTING.markdown 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -See the [contribution guidelines for pathogen.vim](https://github.com/tpope/vim-pathogen/blob/master/CONTRIBUTING.markdown). === modified file 'vim/bundle/vim-commentary/README.markdown' --- vim/bundle/vim-commentary/README.markdown 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/README.markdown 2014-02-24 23:42:31 +0000 @@ -1,11 +1,10 @@ -# commentary.vim +commentary.vim +============== Comment stuff out. Use `gcc` to comment out a line (takes a count), `gc` to comment out the target of a motion (for example, `gcap` to -comment out a paragraph), `gc` in visual mode to comment out the selection, -and `gc` in operator pending mode to target a comment. You can also use -it as a command, either with a range like `:7,17Commentary`, or as part of a -`:global` invocation like with `:g/TODO/Commentary`. That's it. +comment out a paragraph), and `gc` in visual mode to comment out the +selection. That's it. I wrote this because 5 years after Vim added support for mapping an operator, I still couldn't find a commenting plugin that leveraged that @@ -13,10 +12,13 @@ [tcomment.vim](https://github.com/tomtom/tcomment_vim)). Striving for minimalism, it weighs in at under 100 lines of code. -Oh, and it uncomments, too. The above maps actually toggle, and `gcgc` -uncomments a set of adjacent commented lines. +Oh, and it uncomments, too. The above maps actually toggle, and `gcu` +uncomments a set of adjacent commented lines. Install +[repeat.vim](https://github.com/tpope/vim-repeat) to enable +repeating `gcu` with `.` (the other maps are repeatable without it). -## Installation +Installation +------------ If you don't have a preferred installation method, I recommend installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and @@ -28,15 +30,23 @@ Once help tags have been generated, you can view the manual with `:help commentary`. -## FAQ +FAQ +--- > My favorite file type isn't supported! Relax! You just have to adjust `'commentstring'`: - autocmd FileType apache setlocal commentstring=#\ %s - -## Self-Promotion + autocmd FileType apache set commentstring=#\ %s + +Contributing +------------ + +See the contribution guidelines for +[pathogen.vim](https://github.com/tpope/vim-pathogen#readme). + +Self-Promotion +-------------- Like commentary.vim? Follow the repository on [GitHub](https://github.com/tpope/vim-commentary) and vote for it on @@ -45,7 +55,8 @@ [Twitter](http://twitter.com/tpope) and [GitHub](https://github.com/tpope). -## License +License +------- Copyright (c) Tim Pope. Distributed under the same terms as Vim itself. See `:help license`. === modified file 'vim/bundle/vim-commentary/doc/commentary.txt' --- vim/bundle/vim-commentary/doc/commentary.txt 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/doc/commentary.txt 2014-02-24 23:42:31 +0000 @@ -4,32 +4,25 @@ License: Same terms as Vim itself (see |license|) Comment stuff out. Then uncomment it later. Relies on 'commentstring' to be -correctly set, or uses b:commentary_format if it is set. +correctly set. The gc mappings are preferred, while the \\ mappings are provided for backwards compatibility. - *gc* + *gc* *\\* gc{motion} Comment or uncomment lines that {motion} moves over. +\\{motion} - *gcc* + *gcc* *\\\* gcc Comment or uncomment [count] lines. +\\\ - *v_gc* + *v_gc* *v_\\* {Visual}gc Comment or uncomment the highlighted lines. - - *o_gc* -gc Text object for a comment (operator pending mode - only.) - - *gcgc* *gcu* -gcgc Uncomment the current and adjacent commented lines. -gcu - - *:Commentary* -:[range]Commentary Comment or uncomment [range] lines - -The |User| CommentaryPost autocommand fires after a successful operation and -can be used for advanced customization. +{Visual}\\ + + *gcu* *\\u* +gcu Uncomment the current and adjacent commented lines. +\\u vim:tw=78:et:ft=help:norl: === modified file 'vim/bundle/vim-commentary/plugin/commentary.vim' --- vim/bundle/vim-commentary/plugin/commentary.vim 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-commentary/plugin/commentary.vim 2014-02-24 23:42:31 +0000 @@ -1,6 +1,6 @@ " commentary.vim - Comment stuff out " Maintainer: Tim Pope -" Version: 1.2 +" Version: 1.1 " GetLatestVimScripts: 3695 1 :AutoInstall: commentary.vim if exists("g:loaded_commentary") || &cp || v:version < 700 @@ -8,11 +8,6 @@ endif let g:loaded_commentary = 1 -function! s:surroundings() abort - return split(get(b:, 'commentary_format', substitute(substitute( - \ &commentstring, '\S\zs%s',' %s','') ,'%s\ze\S', '%s ', '')), '%s', 1) -endfunction - function! s:go(type,...) abort if a:0 let [lnum1, lnum2] = [a:type, a:1] @@ -20,7 +15,7 @@ let [lnum1, lnum2] = [line("'["), line("']")] endif - let [l, r] = s:surroundings() + let [l, r] = split(substitute(substitute(&commentstring,'\S\zs%s',' %s',''),'%s\ze\S','%s ',''),'%s',1) let uncomment = 2 for lnum in range(lnum1,lnum2) let line = matchstr(getline(lnum),'\S.*\s\@CommentaryUndo") endfunction xnoremap Commentary :call go(line("'<"),line("'>")) nnoremap Commentary :set opfunc=gog@ nnoremap CommentaryLine :set opfunc=goexe 'norm! 'v:count1.'g@_' -onoremap Commentary :call textobject(0) -nnoremap ChangeCommentary c:call textobject(1) -nmap CommentaryUndo CommentaryCommentary -command! -range -bar Commentary call s:go(,) +nnoremap CommentaryUndo :call undo() if !hasmapto('Commentary') || maparg('gc','n') ==# '' xmap gc Commentary nmap gc Commentary - omap gc Commentary nmap gcc CommentaryLine - nmap cgc ChangeCommentary - nmap gcu CommentaryCommentary + nmap gcu CommentaryUndo endif -if maparg('\\','n') ==# '' && maparg('\','n') ==# '' && get(g:, 'commentary_map_backslash', 1) - xmap \\ Commentary:echomsg '\\ is deprecated. Use gc' - nmap \\ :echomsg '\\ is deprecated. Use gc'Commentary - nmap \\\ CommentaryLine:echomsg '\\ is deprecated. Use gc' - nmap \\u CommentaryUndo:echomsg '\\ is deprecated. Use gc' +if maparg('\\','n') ==# '' && maparg('\','n') ==# '' + xmap \\ Commentary + nmap \\ Commentary + nmap \\\ CommentaryLine + nmap \\u CommentaryUndo endif " vim:set et sw=2: === modified file 'vim/bundle/vim-scriptease/.git/config' (properties changed: +x to -x) === modified file 'vim/bundle/vim-scriptease/.git/hooks/pre-commit.sample' --- vim/bundle/vim-scriptease/.git/hooks/pre-commit.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/.git/hooks/pre-commit.sample 2014-02-24 23:28:30 +0000 @@ -16,7 +16,7 @@ fi # If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) +allownonascii=$(git config hooks.allownonascii) # Redirect output to stderr. exec 1>&2 === modified file 'vim/bundle/vim-scriptease/.git/hooks/pre-push.sample' --- vim/bundle/vim-scriptease/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/.git/hooks/pre-push.sample 2014-02-24 23:28:30 +0000 @@ -45,7 +45,7 @@ commit=`git rev-list -n 1 --grep '^WIP' "$range"` if [ -n "$commit" ] then - echo >&2 "Found WIP commit in $local_ref, not pushing" + echo "Found WIP commit in $local_ref, not pushing" exit 1 fi fi === modified file 'vim/bundle/vim-scriptease/.git/index' Binary files vim/bundle/vim-scriptease/.git/index 2015-08-25 11:20:35 +0000 and vim/bundle/vim-scriptease/.git/index 2014-02-24 23:28:30 +0000 differ === modified file 'vim/bundle/vim-scriptease/.git/logs/HEAD' --- vim/bundle/vim-scriptease/.git/logs/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/.git/logs/HEAD 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 Jan Pobrislo 1440501533 +0200 clone: from https://github.com/tpope/vim-scriptease +0000000000000000000000000000000000000000 7f59ff3e0a4e1f2a8926a4f9070eca0611fe5c67 ccx 1393284416 +0100 clone: from https://github.com/tpope/vim-scriptease === modified file 'vim/bundle/vim-scriptease/.git/logs/refs/heads/master' --- vim/bundle/vim-scriptease/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/.git/logs/refs/heads/master 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 Jan Pobrislo 1440501533 +0200 clone: from https://github.com/tpope/vim-scriptease +0000000000000000000000000000000000000000 7f59ff3e0a4e1f2a8926a4f9070eca0611fe5c67 ccx 1393284416 +0100 clone: from https://github.com/tpope/vim-scriptease === modified file 'vim/bundle/vim-scriptease/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/vim-scriptease/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/.git/logs/refs/remotes/origin/HEAD 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 Jan Pobrislo 1440501533 +0200 clone: from https://github.com/tpope/vim-scriptease +0000000000000000000000000000000000000000 7f59ff3e0a4e1f2a8926a4f9070eca0611fe5c67 ccx 1393284416 +0100 clone: from https://github.com/tpope/vim-scriptease === removed directory 'vim/bundle/vim-scriptease/.git/objects/0b' === removed file 'vim/bundle/vim-scriptease/.git/objects/0b/1b7f92bc60a61e0fd6c2091228fbcba35e5ecd' Binary files vim/bundle/vim-scriptease/.git/objects/0b/1b7f92bc60a61e0fd6c2091228fbcba35e5ecd 2015-08-25 11:20:35 +0000 and vim/bundle/vim-scriptease/.git/objects/0b/1b7f92bc60a61e0fd6c2091228fbcba35e5ecd 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-scriptease/.git/objects/2f' === removed file 'vim/bundle/vim-scriptease/.git/objects/2f/c28883800dd9c5dd6d624c0391ade3ace5855d' Binary files vim/bundle/vim-scriptease/.git/objects/2f/c28883800dd9c5dd6d624c0391ade3ace5855d 2015-08-25 11:20:35 +0000 and vim/bundle/vim-scriptease/.git/objects/2f/c28883800dd9c5dd6d624c0391ade3ace5855d 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-scriptease/.git/objects/3f' === removed file 'vim/bundle/vim-scriptease/.git/objects/3f/a4aabaecc00a3ccec376d8e6e1af19465eefe2' --- vim/bundle/vim-scriptease/.git/objects/3f/a4aabaecc00a3ccec376d8e6e1af19465eefe2 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/.git/objects/3f/a4aabaecc00a3ccec376d8e6e1af19465eefe2 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -x1j1@:tY;rJ#,||o-K7@Ua#ƾ#2%ƱJJJn]Wi -,xLXf5Jn׾6Vl_ B$ -|+ko!wK6adңD4 \ No newline at end of file === added directory 'vim/bundle/vim-scriptease/.git/objects/70' === added file 'vim/bundle/vim-scriptease/.git/objects/70/128fa865fbfec1ad39d7d8ed9f49c259977130' Binary files vim/bundle/vim-scriptease/.git/objects/70/128fa865fbfec1ad39d7d8ed9f49c259977130 1970-01-01 00:00:00 +0000 and vim/bundle/vim-scriptease/.git/objects/70/128fa865fbfec1ad39d7d8ed9f49c259977130 2014-02-24 23:28:30 +0000 differ === removed directory 'vim/bundle/vim-scriptease/.git/objects/79' === removed file 'vim/bundle/vim-scriptease/.git/objects/79/f048122f80f378f028c9d97639f84d94373c66' Binary files vim/bundle/vim-scriptease/.git/objects/79/f048122f80f378f028c9d97639f84d94373c66 2015-08-25 11:20:35 +0000 and vim/bundle/vim-scriptease/.git/objects/79/f048122f80f378f028c9d97639f84d94373c66 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-scriptease/.git/objects/7e' === added file 'vim/bundle/vim-scriptease/.git/objects/7e/3a1c6edf9b580d1cae92e8e8e23a186b5dc383' Binary files vim/bundle/vim-scriptease/.git/objects/7e/3a1c6edf9b580d1cae92e8e8e23a186b5dc383 1970-01-01 00:00:00 +0000 and vim/bundle/vim-scriptease/.git/objects/7e/3a1c6edf9b580d1cae92e8e8e23a186b5dc383 2014-02-24 23:28:30 +0000 differ === added directory 'vim/bundle/vim-scriptease/.git/objects/7f' === added file 'vim/bundle/vim-scriptease/.git/objects/7f/59ff3e0a4e1f2a8926a4f9070eca0611fe5c67' --- vim/bundle/vim-scriptease/.git/objects/7f/59ff3e0a4e1f2a8926a4f9070eca0611fe5c67 1970-01-01 00:00:00 +0000 +++ vim/bundle/vim-scriptease/.git/objects/7f/59ff3e0a4e1f2a8926a4f9070eca0611fe5c67 2014-02-24 23:28:30 +0000 @@ -0,0 +1,1 @@ +x 0 aΙ 5AXrm6Q؀wy=\e\8MC,,Q)4*a1Gd Yh DKf,&,Q gHOu6QJ<=m<.'b.F \ No newline at end of file === added directory 'vim/bundle/vim-scriptease/.git/objects/80' === added file 'vim/bundle/vim-scriptease/.git/objects/80/81358472c1da06498315d31bb5447003a2a209' Binary files vim/bundle/vim-scriptease/.git/objects/80/81358472c1da06498315d31bb5447003a2a209 1970-01-01 00:00:00 +0000 and vim/bundle/vim-scriptease/.git/objects/80/81358472c1da06498315d31bb5447003a2a209 2014-02-24 23:28:30 +0000 differ === added directory 'vim/bundle/vim-scriptease/.git/objects/83' === added file 'vim/bundle/vim-scriptease/.git/objects/83/1dee5c58a85416e5231ef51009a84fbd07f372' Binary files vim/bundle/vim-scriptease/.git/objects/83/1dee5c58a85416e5231ef51009a84fbd07f372 1970-01-01 00:00:00 +0000 and vim/bundle/vim-scriptease/.git/objects/83/1dee5c58a85416e5231ef51009a84fbd07f372 2014-02-24 23:28:30 +0000 differ === removed directory 'vim/bundle/vim-scriptease/.git/objects/92' === removed file 'vim/bundle/vim-scriptease/.git/objects/92/fc2542b7b07218915285faa48ae2245dfc25f2' Binary files vim/bundle/vim-scriptease/.git/objects/92/fc2542b7b07218915285faa48ae2245dfc25f2 2015-08-25 11:20:35 +0000 and vim/bundle/vim-scriptease/.git/objects/92/fc2542b7b07218915285faa48ae2245dfc25f2 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-scriptease/.git/objects/ba' === added file 'vim/bundle/vim-scriptease/.git/objects/ba/7cd37c1463199408c9038ae7ce1d69834798ca' Binary files vim/bundle/vim-scriptease/.git/objects/ba/7cd37c1463199408c9038ae7ce1d69834798ca 1970-01-01 00:00:00 +0000 and vim/bundle/vim-scriptease/.git/objects/ba/7cd37c1463199408c9038ae7ce1d69834798ca 2014-02-24 23:28:30 +0000 differ === removed directory 'vim/bundle/vim-scriptease/.git/objects/e0' === removed file 'vim/bundle/vim-scriptease/.git/objects/e0/9de6c51f3e493eefc698274fcd2c09f32d819c' Binary files vim/bundle/vim-scriptease/.git/objects/e0/9de6c51f3e493eefc698274fcd2c09f32d819c 2015-08-25 11:20:35 +0000 and vim/bundle/vim-scriptease/.git/objects/e0/9de6c51f3e493eefc698274fcd2c09f32d819c 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-scriptease/.git/objects/e1' === added file 'vim/bundle/vim-scriptease/.git/objects/e1/459ce5fa52676484ffa16d16a31f3fff1a09a0' Binary files vim/bundle/vim-scriptease/.git/objects/e1/459ce5fa52676484ffa16d16a31f3fff1a09a0 1970-01-01 00:00:00 +0000 and vim/bundle/vim-scriptease/.git/objects/e1/459ce5fa52676484ffa16d16a31f3fff1a09a0 2014-02-24 23:28:30 +0000 differ === removed directory 'vim/bundle/vim-scriptease/.git/objects/ec' === removed file 'vim/bundle/vim-scriptease/.git/objects/ec/7a275af61c491a5df09d6469e0defbc3d5a8d4' Binary files vim/bundle/vim-scriptease/.git/objects/ec/7a275af61c491a5df09d6469e0defbc3d5a8d4 2015-08-25 11:20:35 +0000 and vim/bundle/vim-scriptease/.git/objects/ec/7a275af61c491a5df09d6469e0defbc3d5a8d4 1970-01-01 00:00:00 +0000 differ === modified file 'vim/bundle/vim-scriptease/.git/packed-refs' --- vim/bundle/vim-scriptease/.git/packed-refs 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/.git/packed-refs 2014-02-24 23:28:30 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 refs/remotes/origin/master +7f59ff3e0a4e1f2a8926a4f9070eca0611fe5c67 refs/remotes/origin/master === modified file 'vim/bundle/vim-scriptease/.git/refs/heads/master' --- vim/bundle/vim-scriptease/.git/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/.git/refs/heads/master 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 +7f59ff3e0a4e1f2a8926a4f9070eca0611fe5c67 === modified file 'vim/bundle/vim-scriptease/.git/shallow' --- vim/bundle/vim-scriptease/.git/shallow 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/.git/shallow 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 +7f59ff3e0a4e1f2a8926a4f9070eca0611fe5c67 === modified file 'vim/bundle/vim-scriptease/README.markdown' --- vim/bundle/vim-scriptease/README.markdown 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/README.markdown 2014-02-24 23:28:30 +0000 @@ -1,10 +1,10 @@ # scriptease.vim -I make so many Vim plugins I had to make a Vim plugin for making Vim plugins. +Enjoy this amalgamation of crap I use for editing runtime files. ## Features -* `:PP`: Pretty print. With no argument, acts as a REPL. +* `:PP`: Pretty print. * `:Runtime`: Reload runtime files. Like `:runtime!`, but it unlets any include guards first. * `:Disarm`: Remove a runtime file's maps, commands, and autocommands, @@ -23,8 +23,6 @@ * `g!`: Eval a motion or selection as VimL and replace it with the result. This is handy for doing math, even outside of VimL. It's so handy, in fact, that it probably deserves its own plugin. -* Projections for - [projectionist.vim](https://github.com/tpope/vim-projectionist). See the `:help` for details. === modified file 'vim/bundle/vim-scriptease/doc/scriptease.txt' --- vim/bundle/vim-scriptease/doc/scriptease.txt 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/doc/scriptease.txt 2014-02-24 23:28:30 +0000 @@ -52,11 +52,6 @@ :{range}PP[!] {expr} Pretty print the value of {expr} into the buffer after {range}. - -:PP With no {expr}, input, evaluate, and pretty print a - series of expressions. Quit on a blank line. This is - essentially a REPL. - *scriptease-:PPmsg* :PPmsg {expr} Pretty print the value of {expr} using |:echomsg|. @@ -66,9 +61,6 @@ :{count}PPmsg[!] {expr} Pretty print the value of {expr} using |:echomsg| if and only if the value of 'verbose' is greater than or equal to {count}. - -:PPmsg With no {expr}, |:echomsg| the current || and - ||. *scriptease-:Runtime* :Runtime {file} .. Invokes |:runtime|! on the given files, after |:unlet|ting any include guards found within them. @@ -91,7 +83,7 @@ :[count]Verbose {command} Like |:verbose|, but capture the results to a file with 'verbosefile' and load it in the preview window. - This is particularly useful for higher, noisier values + This is particularly useful for higher, noiser values of [count]. *scriptease-:Vedit* *scriptease-:Ve* === modified file 'vim/bundle/vim-scriptease/plugin/scriptease.vim' --- vim/bundle/vim-scriptease/plugin/scriptease.vim 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-scriptease/plugin/scriptease.vim 2014-02-24 23:28:30 +0000 @@ -10,7 +10,7 @@ " Utility {{{1 function! s:function(name) abort - return function(substitute(a:name,'^s:',matchstr(expand(''), '.*\zs\d\+_'),'')) + return function(substitute(a:name,'^s:',matchstr(expand(''), '\d\+_'),'')) endfunction function! s:sub(str,pat,rep) abort @@ -176,42 +176,10 @@ endif endfunction -command! -bang -range=999998 -nargs=? -complete=expression PP - \ if empty() | - \ let s:more = &more | - \ try | - \ set nomore | - \ while 1 | - \ let s:input = input('PP> ', '', 'expression') | - \ if empty(s:input) | - \ break | - \ endif | - \ echon "\n" | - \ let v:errmsg = '' | - \ try | - \ call s:dump(0, 999998, eval(s:input)) | - \ catch | - \ echohl ErrorMsg | - \ echo v:exception | - \ echo v:throwpoint | - \ echohl NONE | - \ endtry | - \ endwhile | - \ finally | - \ let &more = s:more | - \ endtry | - \ else | - \ let v:errmsg = '' | - \ call s:dump(0, , eval()) | - \ endif - -command! -bang -range=0 -nargs=? -complete=expression PPmsg - \ if !empty() | - \ let v:errmsg = '' | - \ call s:dumpmsg(0, , empty() ? expand('') : eval()) | - \ elseif &verbose >= && !empty(expand('')) | - \ echomsg expand('').', line '.expand('') | - \ endif +command! -bang -range=999998 -nargs=1 -complete=expression PP + \ :let v:errmsg = ''|call s:dump(0, , eval()) +command! -bang -range=0 -nargs=1 -complete=expression PPmsg + \ :let v:errmsg = ''|call s:dumpmsg(0, , eval()) " }}}1 " g! {{{1 @@ -282,7 +250,7 @@ \ 'finally|' . \ 'let &verbosefile = '.string(verbosefile).'|' . \ 'endtry|' . - \ 'pedit '.temp.'|wincmd P|nnoremap q :bd' + \ 'pedit '.temp.'|wincmd P|nnoremap q :bd' endfunction " }}}1 @@ -337,26 +305,23 @@ for file in a:files if filereadable(file) let lines = readfile(file) - if len(lines) - for i in range(len(lines)-1) - let unlet = matchstr(lines[i], '^if \+\%(( *\)\?exists *( *[''"]\%(\g:\)\=\zs\w\+\ze[''"]') - if unlet !=# '' && (lines[i+1] =~# '^ *finish\>' || lines[i] =~# '| *finish\>') - \ && index(guards, unlet) == -1 - call extend(guards, [unlet]) - endif - endfor - endif + for i in range(len(lines)-1) + let unlet = matchstr(lines[i], '^if exists([''"]\%(\g:\)\=\zs\w\+\ze[''"]') + if unlet !=# '' && lines[i+1] =~# '^ *finish\>' && index(guards, unlet) == -1 + call extend(guards, [unlet]) + endif + endfor endif endfor if empty(guards) return '' else - return 'unlet! '.join(map(guards, '"g:".v:val'), ' ') + return 'unlet! '.join(guards, ' ') endif endfunction function! s:lencompare(a, b) - return len(a:a) - len(a:b) + return len(a:b) - len(a:b) endfunction function! s:findinrtp(path) @@ -366,10 +331,10 @@ let candidates += filter(split(glob(glob), "\n"), 'path[0 : len(v:val)-1] ==# v:val && path[len(v:val)] =~# "[\\/]"') endfor if empty(candidates) - return ['', ''] + return '' endif let preferred = sort(candidates, s:function('s:lencompare'))[-1] - return [preferred, path[strlen(preferred)+1 : -1]] + return path[strlen(preferred)+1 : -1] endfunction function! s:runtime(bang, ...) abort @@ -380,12 +345,12 @@ if a:0 let files = a:000 elseif &filetype ==# 'vim' || expand('%:e') ==# 'vim' - let files = [s:findinrtp(expand('%:p'))[1]] + let files = [s:findinrtp(expand('%:p'))] if empty(files[0]) let files = ['%'] endif - if &modified && (&autowrite || &autowriteall) - let predo = 'silent wall|' + if &modified + let predo = 'silent write|' endif else for ft in split(&filetype, '\.') @@ -406,7 +371,7 @@ if request =~# '^\.\=[\\/]\|^\w:[\\/]\|^[%#~]\|^\d\+$' let request = scriptease#scriptname(request) let unlets += split(glob(request), "\n") - let do += map(copy(unlets), '"source ".escape(v:val, " \t|!")') + let do += ['source '.escape(request, " \t|!")] else if get(do, 0, [''])[0] !~# '^runtime!' let do += ['runtime!'] @@ -730,60 +695,22 @@ endif endfunction -function! s:build_path() abort - let old_path = substitute(&g:path, '\v^\.,/%(usr|emx)/include,,,?', '', '') - let new_path = escape(&runtimepath, ' ') - return !empty(old_path) ? old_path.','.new_path : new_path -endfunction - " }}}1 " Settings {{{1 function! s:setup() abort setlocal suffixesadd=.vim keywordprg=:help - let b:dispatch = ':Runtime' - command! -bar -bang -buffer Console Runtime|PP endfunction augroup scriptease autocmd! - autocmd FileType vim,help let &l:path = s:build_path() - autocmd FileType help command! -bar -bang -buffer Console PP + autocmd FileType vim,help let &l:path = escape(&runtimepath, ' ') autocmd FileType vim call s:setup() " Recent versions of vim.vim set iskeyword to include ":", which breaks among " other things tags. :( - autocmd FileType vim setlocal iskeyword-=: autocmd Syntax vim setlocal iskeyword-=: augroup END " }}}1 -" Projectionist {{{1 - -function! s:projectionist_detect() abort - let file = get(g:, 'projectionist_file', '') - let path = s:sub(s:findinrtp(file)[0], '[\/]after$', '') - if !empty(path) - let reload = ":Runtime ./{open}autoload,plugin{close}/**/*.vim" - call projectionist#append(path, { - \ "*": {"start": reload}, - \ "*.vim": {"start": reload}, - \ "plugin/*.vim": {"command": "plugin", "alternate": "autoload/{}.vim"}, - \ "autoload/*.vim": {"command": "autoload", "alternate": "plugin/{}.vim"}, - \ "compiler/*.vim": {"command": "compiler"}, - \ "ftdetect/*.vim": {"command": "ftdetect"}, - \ "syntax/*.vim": {"command": "syntax", "alternate": ["ftplugin/{}.vim", "indent/{}.vim"]}, - \ "ftplugin/*.vim": {"command": "ftplugin", "alternate": ["indent/{}.vim", "syntax/{}.vim"]}, - \ "indent/*.vim": {"command": "indent", "alternate": ["syntax/{}.vim", "ftplugin/{}.vim"]}, - \ "after/*.vim": {"command": "after"}, - \ "doc/*.txt": {"command": "doc", "start": reload}}) - endif -endfunction - -augroup scriptease_projectionist - autocmd! - autocmd User ProjectionistDetect call s:projectionist_detect() -augroup END - -" }}}1 " vim:set et sw=2: === modified file 'vim/bundle/vim-sensible/.git/config' (properties changed: +x to -x) === modified file 'vim/bundle/vim-sensible/.git/hooks/pre-commit.sample' --- vim/bundle/vim-sensible/.git/hooks/pre-commit.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sensible/.git/hooks/pre-commit.sample 2014-02-24 23:28:30 +0000 @@ -16,7 +16,7 @@ fi # If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) +allownonascii=$(git config hooks.allownonascii) # Redirect output to stderr. exec 1>&2 === modified file 'vim/bundle/vim-sensible/.git/hooks/pre-push.sample' --- vim/bundle/vim-sensible/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sensible/.git/hooks/pre-push.sample 2014-02-24 23:28:30 +0000 @@ -45,7 +45,7 @@ commit=`git rev-list -n 1 --grep '^WIP' "$range"` if [ -n "$commit" ] then - echo >&2 "Found WIP commit in $local_ref, not pushing" + echo "Found WIP commit in $local_ref, not pushing" exit 1 fi fi === modified file 'vim/bundle/vim-sensible/.git/index' Binary files vim/bundle/vim-sensible/.git/index 2015-08-25 11:20:35 +0000 and vim/bundle/vim-sensible/.git/index 2014-02-24 23:28:30 +0000 differ === modified file 'vim/bundle/vim-sensible/.git/logs/HEAD' --- vim/bundle/vim-sensible/.git/logs/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sensible/.git/logs/HEAD 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 d0beb8ab42627bea2c747564ca46ec663e3ba0ba Jan Pobrislo 1440501540 +0200 clone: from https://github.com/tpope/vim-sensible +0000000000000000000000000000000000000000 01854b14c7ad4aab9b574bbcb159b59502a10746 ccx 1393284417 +0100 clone: from https://github.com/tpope/vim-sensible === modified file 'vim/bundle/vim-sensible/.git/logs/refs/heads/master' --- vim/bundle/vim-sensible/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sensible/.git/logs/refs/heads/master 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 d0beb8ab42627bea2c747564ca46ec663e3ba0ba Jan Pobrislo 1440501540 +0200 clone: from https://github.com/tpope/vim-sensible +0000000000000000000000000000000000000000 01854b14c7ad4aab9b574bbcb159b59502a10746 ccx 1393284417 +0100 clone: from https://github.com/tpope/vim-sensible === modified file 'vim/bundle/vim-sensible/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/vim-sensible/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sensible/.git/logs/refs/remotes/origin/HEAD 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 d0beb8ab42627bea2c747564ca46ec663e3ba0ba Jan Pobrislo 1440501540 +0200 clone: from https://github.com/tpope/vim-sensible +0000000000000000000000000000000000000000 01854b14c7ad4aab9b574bbcb159b59502a10746 ccx 1393284417 +0100 clone: from https://github.com/tpope/vim-sensible === added directory 'vim/bundle/vim-sensible/.git/objects/01' === added file 'vim/bundle/vim-sensible/.git/objects/01/854b14c7ad4aab9b574bbcb159b59502a10746' Binary files vim/bundle/vim-sensible/.git/objects/01/854b14c7ad4aab9b574bbcb159b59502a10746 1970-01-01 00:00:00 +0000 and vim/bundle/vim-sensible/.git/objects/01/854b14c7ad4aab9b574bbcb159b59502a10746 2014-02-24 23:28:30 +0000 differ === removed directory 'vim/bundle/vim-sensible/.git/objects/10' === removed file 'vim/bundle/vim-sensible/.git/objects/10/48243978c4b5bf3f1bd94b9a5752ebf8932ce6' --- vim/bundle/vim-sensible/.git/objects/10/48243978c4b5bf3f1bd94b9a5752ebf8932ce6 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sensible/.git/objects/10/48243978c4b5bf3f1bd94b9a5752ebf8932ce6 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -x+)JMU01`040031Q(N+LI+e0bϑTcjo}N~*Sb \ No newline at end of file === added directory 'vim/bundle/vim-sensible/.git/objects/1b' === added file 'vim/bundle/vim-sensible/.git/objects/1b/1e9aa0c47ec42df6c4c3d13b6c1f29eec3df0a' Binary files vim/bundle/vim-sensible/.git/objects/1b/1e9aa0c47ec42df6c4c3d13b6c1f29eec3df0a 1970-01-01 00:00:00 +0000 and vim/bundle/vim-sensible/.git/objects/1b/1e9aa0c47ec42df6c4c3d13b6c1f29eec3df0a 2014-02-24 23:28:30 +0000 differ === removed directory 'vim/bundle/vim-sensible/.git/objects/32' === removed file 'vim/bundle/vim-sensible/.git/objects/32/063f6c1e292600f2eab0fb2f7fbe42234e2495' Binary files vim/bundle/vim-sensible/.git/objects/32/063f6c1e292600f2eab0fb2f7fbe42234e2495 2015-08-25 11:20:35 +0000 and vim/bundle/vim-sensible/.git/objects/32/063f6c1e292600f2eab0fb2f7fbe42234e2495 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-sensible/.git/objects/80' === removed file 'vim/bundle/vim-sensible/.git/objects/80/3f39cbdff2b9e17075b04e7c8a547a32a39299' Binary files vim/bundle/vim-sensible/.git/objects/80/3f39cbdff2b9e17075b04e7c8a547a32a39299 2015-08-25 11:20:35 +0000 and vim/bundle/vim-sensible/.git/objects/80/3f39cbdff2b9e17075b04e7c8a547a32a39299 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-sensible/.git/objects/92' === added file 'vim/bundle/vim-sensible/.git/objects/92/ebff18c9614bf29417b18e1cee8fd5be0ba24b' Binary files vim/bundle/vim-sensible/.git/objects/92/ebff18c9614bf29417b18e1cee8fd5be0ba24b 1970-01-01 00:00:00 +0000 and vim/bundle/vim-sensible/.git/objects/92/ebff18c9614bf29417b18e1cee8fd5be0ba24b 2014-02-24 23:28:30 +0000 differ === removed directory 'vim/bundle/vim-sensible/.git/objects/d0' === removed file 'vim/bundle/vim-sensible/.git/objects/d0/beb8ab42627bea2c747564ca46ec663e3ba0ba' Binary files vim/bundle/vim-sensible/.git/objects/d0/beb8ab42627bea2c747564ca46ec663e3ba0ba 2015-08-25 11:20:35 +0000 and vim/bundle/vim-sensible/.git/objects/d0/beb8ab42627bea2c747564ca46ec663e3ba0ba 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-sensible/.git/objects/ff' === added file 'vim/bundle/vim-sensible/.git/objects/ff/739955c84007f47851511fb6b22e54aa3bcfa7' Binary files vim/bundle/vim-sensible/.git/objects/ff/739955c84007f47851511fb6b22e54aa3bcfa7 1970-01-01 00:00:00 +0000 and vim/bundle/vim-sensible/.git/objects/ff/739955c84007f47851511fb6b22e54aa3bcfa7 2014-02-24 23:28:30 +0000 differ === modified file 'vim/bundle/vim-sensible/.git/packed-refs' --- vim/bundle/vim-sensible/.git/packed-refs 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sensible/.git/packed-refs 2014-02-24 23:28:30 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -d0beb8ab42627bea2c747564ca46ec663e3ba0ba refs/remotes/origin/master +01854b14c7ad4aab9b574bbcb159b59502a10746 refs/remotes/origin/master === modified file 'vim/bundle/vim-sensible/.git/refs/heads/master' --- vim/bundle/vim-sensible/.git/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sensible/.git/refs/heads/master 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -d0beb8ab42627bea2c747564ca46ec663e3ba0ba +01854b14c7ad4aab9b574bbcb159b59502a10746 === modified file 'vim/bundle/vim-sensible/.git/shallow' --- vim/bundle/vim-sensible/.git/shallow 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sensible/.git/shallow 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -d0beb8ab42627bea2c747564ca46ec663e3ba0ba +01854b14c7ad4aab9b574bbcb159b59502a10746 === modified file 'vim/bundle/vim-sensible/plugin/sensible.vim' --- vim/bundle/vim-sensible/plugin/sensible.vim 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sensible/plugin/sensible.vim 2014-02-24 23:28:30 +0000 @@ -1,6 +1,6 @@ " sensible.vim - Defaults everyone can agree on " Maintainer: Tim Pope -" Version: 1.1 +" Version: 1.0 if exists('g:loaded_sensible') || &compatible finish @@ -23,6 +23,7 @@ set smarttab set nrformats-=octal +set shiftround set ttimeout set ttimeoutlen=100 @@ -52,14 +53,9 @@ if &listchars ==# 'eol:$' set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+ -endif - -if v:version > 703 || v:version == 703 && has("patch541") - set formatoptions+=j " Delete comment character when joining commented lines -endif - -if has('path_extra') - setglobal tags-=./tags tags-=./tags; tags^=./tags; + if !has('win32') && (&termencoding ==# 'utf-8' || &encoding ==# 'utf-8') + let &listchars = "tab:\u21e5 ,trail:\u2423,extends:\u21c9,precedes:\u21c7,nbsp:\u00b7" + endif endif if &shell =~# 'fish$' @@ -78,7 +74,6 @@ if !empty(&viminfo) set viminfo^=! endif -set sessionoptions-=options " Allow color schemes to do bright colors without forcing bold. if &t_Co == 8 && $TERM !~# '^linux' === modified file 'vim/bundle/vim-sleuth/.git/config' (properties changed: +x to -x) === modified file 'vim/bundle/vim-sleuth/.git/hooks/pre-commit.sample' --- vim/bundle/vim-sleuth/.git/hooks/pre-commit.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sleuth/.git/hooks/pre-commit.sample 2014-02-24 23:28:30 +0000 @@ -16,7 +16,7 @@ fi # If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) +allownonascii=$(git config hooks.allownonascii) # Redirect output to stderr. exec 1>&2 === modified file 'vim/bundle/vim-sleuth/.git/hooks/pre-push.sample' --- vim/bundle/vim-sleuth/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sleuth/.git/hooks/pre-push.sample 2014-02-24 23:28:30 +0000 @@ -45,7 +45,7 @@ commit=`git rev-list -n 1 --grep '^WIP' "$range"` if [ -n "$commit" ] then - echo >&2 "Found WIP commit in $local_ref, not pushing" + echo "Found WIP commit in $local_ref, not pushing" exit 1 fi fi === modified file 'vim/bundle/vim-sleuth/.git/index' Binary files vim/bundle/vim-sleuth/.git/index 2015-08-25 11:20:35 +0000 and vim/bundle/vim-sleuth/.git/index 2014-02-24 23:28:30 +0000 differ === modified file 'vim/bundle/vim-sleuth/.git/logs/HEAD' --- vim/bundle/vim-sleuth/.git/logs/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sleuth/.git/logs/HEAD 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 a17462708aa40a7fc0afd4effa559087d8a2c908 Jan Pobrislo 1440501545 +0200 clone: from https://github.com/tpope/vim-sleuth +0000000000000000000000000000000000000000 6779f5ee5a6234458430cc07bb01bb47707e18e0 ccx 1393284419 +0100 clone: from https://github.com/tpope/vim-sleuth === modified file 'vim/bundle/vim-sleuth/.git/logs/refs/heads/master' --- vim/bundle/vim-sleuth/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sleuth/.git/logs/refs/heads/master 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 a17462708aa40a7fc0afd4effa559087d8a2c908 Jan Pobrislo 1440501545 +0200 clone: from https://github.com/tpope/vim-sleuth +0000000000000000000000000000000000000000 6779f5ee5a6234458430cc07bb01bb47707e18e0 ccx 1393284419 +0100 clone: from https://github.com/tpope/vim-sleuth === modified file 'vim/bundle/vim-sleuth/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/vim-sleuth/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sleuth/.git/logs/refs/remotes/origin/HEAD 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 a17462708aa40a7fc0afd4effa559087d8a2c908 Jan Pobrislo 1440501545 +0200 clone: from https://github.com/tpope/vim-sleuth +0000000000000000000000000000000000000000 6779f5ee5a6234458430cc07bb01bb47707e18e0 ccx 1393284419 +0100 clone: from https://github.com/tpope/vim-sleuth === added directory 'vim/bundle/vim-sleuth/.git/objects/00' === added file 'vim/bundle/vim-sleuth/.git/objects/00/690f5d7c90e24aa75b9384be568993ffe7d6e4' Binary files vim/bundle/vim-sleuth/.git/objects/00/690f5d7c90e24aa75b9384be568993ffe7d6e4 1970-01-01 00:00:00 +0000 and vim/bundle/vim-sleuth/.git/objects/00/690f5d7c90e24aa75b9384be568993ffe7d6e4 2014-02-24 23:28:30 +0000 differ === removed directory 'vim/bundle/vim-sleuth/.git/objects/56' === removed file 'vim/bundle/vim-sleuth/.git/objects/56/0135ea95fcc3fa12a18cdb66a694327a6d6151' --- vim/bundle/vim-sleuth/.git/objects/56/0135ea95fcc3fa12a18cdb66a694327a6d6151 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sleuth/.git/objects/56/0135ea95fcc3fa12a18cdb66a694327a6d6151 1970-01-01 00:00:00 +0000 @@ -1,9 +0,0 @@ -xWksFg~Ņ֖ 7iMqӦLԙ|A jWv8=wB`IrwܻgwYz$3QdtnKz-**,ےj%**J(DQI*3UR]b[QI(2Gc~H ަJK%zg4ZRyЊIW$#.AVDK{}o9NCJT&/U'C:4q ֵϐS(*3iƇV8$K=YF^@CZڡ,VN-F -JRY, -_uDk"oP-8\Jsxb"哿?':/<-'\y-WqptV㖮uf=2h616aѧF8 Uo#揅x= O|ǵ -3m)[C?BZxЏ ]CbmۮڸYZN\HQF]~{g=] W3v*wAlyJ%GQm}|8Fʣ9T; Bՙ\ 6}3od5pNk˜ϙk9VDD`p/s|ԵhBϮ^Mdxu Taڿ,cy:+_?.&VŶ7`ᮦuuPоyK|jmV7!s `rэrU|IO@^t97y~t n/UTۉuUԥ} #){DwwCze/mFo<WM.? \ No newline at end of file === added directory 'vim/bundle/vim-sleuth/.git/objects/58' === added file 'vim/bundle/vim-sleuth/.git/objects/58/7745df738c6e0770501d6f88ad9679d1036ccf' Binary files vim/bundle/vim-sleuth/.git/objects/58/7745df738c6e0770501d6f88ad9679d1036ccf 1970-01-01 00:00:00 +0000 and vim/bundle/vim-sleuth/.git/objects/58/7745df738c6e0770501d6f88ad9679d1036ccf 2014-02-24 23:28:30 +0000 differ === added directory 'vim/bundle/vim-sleuth/.git/objects/67' === added file 'vim/bundle/vim-sleuth/.git/objects/67/79f5ee5a6234458430cc07bb01bb47707e18e0' --- vim/bundle/vim-sleuth/.git/objects/67/79f5ee5a6234458430cc07bb01bb47707e18e0 1970-01-01 00:00:00 +0000 +++ vim/bundle/vim-sleuth/.git/objects/67/79f5ee5a6234458430cc07bb01bb47707e18e0 2014-02-24 23:28:30 +0000 @@ -0,0 +1,1 @@ +xKj1D)!rCrxF3YUx6O"QS1X17 ¢,锜bऍZ0fR:BRy )愲; mk/8y#~eN.hY:)ExnCΏ6wrٶ][i?_{O{ \ No newline at end of file === removed directory 'vim/bundle/vim-sleuth/.git/objects/72' === removed file 'vim/bundle/vim-sleuth/.git/objects/72/f85928c41f187002c8ff4e5ae1f08cd5872348' Binary files vim/bundle/vim-sleuth/.git/objects/72/f85928c41f187002c8ff4e5ae1f08cd5872348 2015-08-25 11:20:35 +0000 and vim/bundle/vim-sleuth/.git/objects/72/f85928c41f187002c8ff4e5ae1f08cd5872348 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-sleuth/.git/objects/a1' === removed file 'vim/bundle/vim-sleuth/.git/objects/a1/7462708aa40a7fc0afd4effa559087d8a2c908' --- vim/bundle/vim-sleuth/.git/objects/a1/7462708aa40a7fc0afd4effa559087d8a2c908 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sleuth/.git/objects/a1/7462708aa40a7fc0afd4effa559087d8a2c908 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -x5J0]).7M&M`Ys Imo-s8|X0g+:d}UMe2ʨmƠ_if)N3<@\tEB$-> v ^wpڏtuz2Qqi2{].&rL/ԇ$>@_#AqkL 6^oBo౵lP \ No newline at end of file === added directory 'vim/bundle/vim-sleuth/.git/objects/c8' === added file 'vim/bundle/vim-sleuth/.git/objects/c8/2e88b33afa8d66763bea471d3257b14e299556' Binary files vim/bundle/vim-sleuth/.git/objects/c8/2e88b33afa8d66763bea471d3257b14e299556 1970-01-01 00:00:00 +0000 and vim/bundle/vim-sleuth/.git/objects/c8/2e88b33afa8d66763bea471d3257b14e299556 2014-02-24 23:28:30 +0000 differ === removed directory 'vim/bundle/vim-sleuth/.git/objects/df' === removed file 'vim/bundle/vim-sleuth/.git/objects/df/97e8e62daa2ab83b6567a1beb3f01c48f0b344' Binary files vim/bundle/vim-sleuth/.git/objects/df/97e8e62daa2ab83b6567a1beb3f01c48f0b344 2015-08-25 11:20:35 +0000 and vim/bundle/vim-sleuth/.git/objects/df/97e8e62daa2ab83b6567a1beb3f01c48f0b344 1970-01-01 00:00:00 +0000 differ === modified file 'vim/bundle/vim-sleuth/.git/packed-refs' --- vim/bundle/vim-sleuth/.git/packed-refs 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sleuth/.git/packed-refs 2014-02-24 23:28:30 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -a17462708aa40a7fc0afd4effa559087d8a2c908 refs/remotes/origin/master +6779f5ee5a6234458430cc07bb01bb47707e18e0 refs/remotes/origin/master === modified file 'vim/bundle/vim-sleuth/.git/refs/heads/master' --- vim/bundle/vim-sleuth/.git/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sleuth/.git/refs/heads/master 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -a17462708aa40a7fc0afd4effa559087d8a2c908 +6779f5ee5a6234458430cc07bb01bb47707e18e0 === modified file 'vim/bundle/vim-sleuth/.git/shallow' --- vim/bundle/vim-sleuth/.git/shallow 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sleuth/.git/shallow 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -a17462708aa40a7fc0afd4effa559087d8a2c908 +6779f5ee5a6234458430cc07bb01bb47707e18e0 === modified file 'vim/bundle/vim-sleuth/plugin/sleuth.vim' --- vim/bundle/vim-sleuth/plugin/sleuth.vim 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-sleuth/plugin/sleuth.vim 2014-02-24 23:28:30 +0000 @@ -14,7 +14,6 @@ let ccomment = 0 let podcomment = 0 let triplequote = 0 - let backtick = 0 for line in a:lines @@ -42,6 +41,16 @@ continue endif + if line =~# '^=\w' + let podcomment = 1 + endif + if podcomment + if line =~# '^=\%(end\|cut\)\>' + let podcomment = 0 + endif + continue + endif + if triplequote if line =~# '^[^"]*"""[^"]*$' let triplequote = 0 @@ -51,15 +60,6 @@ let triplequote = 1 endif - if backtick - if line =~# '^[^`]*`[^`]*$' - let backtick = 0 - endif - continue - elseif line =~# '^[^`]*`[^`]*$' - let backtick = 1 - endif - let softtab = repeat(' ', 8) if line =~# '^\t' let heuristics.hard += 1 @@ -127,10 +127,6 @@ endfunction function! s:detect() abort - if &modifiable == 0 - return - endif - let options = s:guess(getline(1, 1024)) if s:apply_if_ready(options) return @@ -140,9 +136,9 @@ let dir = expand('%:p:h') while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') for pattern in patterns - for neighbor in split(glob(dir.'/'.pattern), "\n")[0:7] + for neighbor in split(glob(dir.'/'.pattern), "\n")[0:31] if neighbor !=# expand('%:p') && filereadable(neighbor) - call extend(options, s:guess(readfile(neighbor, '', 256)), 'keep') + call extend(options, s:guess(readfile(neighbor, '', 1024)), 'keep') endif if s:apply_if_ready(options) let b:sleuth_culprit = neighbor === modified file 'vim/bundle/vim-surround/.git/config' (properties changed: +x to -x) === modified file 'vim/bundle/vim-surround/.git/hooks/pre-commit.sample' --- vim/bundle/vim-surround/.git/hooks/pre-commit.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-surround/.git/hooks/pre-commit.sample 2014-02-24 23:28:30 +0000 @@ -16,7 +16,7 @@ fi # If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) +allownonascii=$(git config hooks.allownonascii) # Redirect output to stderr. exec 1>&2 === modified file 'vim/bundle/vim-surround/.git/hooks/pre-push.sample' --- vim/bundle/vim-surround/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-surround/.git/hooks/pre-push.sample 2014-02-24 23:28:30 +0000 @@ -45,7 +45,7 @@ commit=`git rev-list -n 1 --grep '^WIP' "$range"` if [ -n "$commit" ] then - echo >&2 "Found WIP commit in $local_ref, not pushing" + echo "Found WIP commit in $local_ref, not pushing" exit 1 fi fi === modified file 'vim/bundle/vim-surround/.git/index' Binary files vim/bundle/vim-surround/.git/index 2015-08-25 11:20:35 +0000 and vim/bundle/vim-surround/.git/index 2014-02-24 23:28:30 +0000 differ === modified file 'vim/bundle/vim-surround/.git/logs/HEAD' --- vim/bundle/vim-surround/.git/logs/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-surround/.git/logs/HEAD 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c Jan Pobrislo 1440501558 +0200 clone: from https://github.com/tpope/vim-surround +0000000000000000000000000000000000000000 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a ccx 1393284420 +0100 clone: from https://github.com/tpope/vim-surround === modified file 'vim/bundle/vim-surround/.git/logs/refs/heads/master' --- vim/bundle/vim-surround/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-surround/.git/logs/refs/heads/master 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c Jan Pobrislo 1440501558 +0200 clone: from https://github.com/tpope/vim-surround +0000000000000000000000000000000000000000 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a ccx 1393284420 +0100 clone: from https://github.com/tpope/vim-surround === modified file 'vim/bundle/vim-surround/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/vim-surround/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-surround/.git/logs/refs/remotes/origin/HEAD 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c Jan Pobrislo 1440501558 +0200 clone: from https://github.com/tpope/vim-surround +0000000000000000000000000000000000000000 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a ccx 1393284420 +0100 clone: from https://github.com/tpope/vim-surround === added directory 'vim/bundle/vim-surround/.git/objects/05' === added file 'vim/bundle/vim-surround/.git/objects/05/b1c5c389afa82eac48b64a859f7a39071d4246' Binary files vim/bundle/vim-surround/.git/objects/05/b1c5c389afa82eac48b64a859f7a39071d4246 1970-01-01 00:00:00 +0000 and vim/bundle/vim-surround/.git/objects/05/b1c5c389afa82eac48b64a859f7a39071d4246 2014-02-24 23:28:30 +0000 differ === removed directory 'vim/bundle/vim-surround/.git/objects/07' === removed file 'vim/bundle/vim-surround/.git/objects/07/dd41fe01533f073beb29f3947ab87e2e52857a' Binary files vim/bundle/vim-surround/.git/objects/07/dd41fe01533f073beb29f3947ab87e2e52857a 2015-08-25 11:20:35 +0000 and vim/bundle/vim-surround/.git/objects/07/dd41fe01533f073beb29f3947ab87e2e52857a 1970-01-01 00:00:00 +0000 differ === removed file 'vim/bundle/vim-surround/.git/objects/2d/05440ad23f97a7874ebd9b5de3a0e65d25d85c' Binary files vim/bundle/vim-surround/.git/objects/2d/05440ad23f97a7874ebd9b5de3a0e65d25d85c 2015-08-25 11:20:35 +0000 and vim/bundle/vim-surround/.git/objects/2d/05440ad23f97a7874ebd9b5de3a0e65d25d85c 1970-01-01 00:00:00 +0000 differ === added file 'vim/bundle/vim-surround/.git/objects/2d/cb4645c5a0c4b3f22af7a12fbff9f139a513b8' --- vim/bundle/vim-surround/.git/objects/2d/cb4645c5a0c4b3f22af7a12fbff9f139a513b8 1970-01-01 00:00:00 +0000 +++ vim/bundle/vim-surround/.git/objects/2d/cb4645c5a0c4b3f22af7a12fbff9f139a513b8 2014-02-24 23:28:30 +0000 @@ -0,0 +1,2 @@ +x+)JMU041a040031QK,L/Je +{'gſ+x֯<]OI(TU^nbQvJ~yÿoR]Ks1Pm~('3$?`8'< 3œ޿TlANizfÛYgfu>P?G \ No newline at end of file === added directory 'vim/bundle/vim-surround/.git/objects/30' === added file 'vim/bundle/vim-surround/.git/objects/30/a642ae9b315710fc625901a360cfe041d0b1e0' Binary files vim/bundle/vim-surround/.git/objects/30/a642ae9b315710fc625901a360cfe041d0b1e0 1970-01-01 00:00:00 +0000 and vim/bundle/vim-surround/.git/objects/30/a642ae9b315710fc625901a360cfe041d0b1e0 2014-02-24 23:28:30 +0000 differ === added directory 'vim/bundle/vim-surround/.git/objects/42' === added file 'vim/bundle/vim-surround/.git/objects/42/e9b46e7a20a2f394664874c7bbd9d6f6c39e8a' Binary files vim/bundle/vim-surround/.git/objects/42/e9b46e7a20a2f394664874c7bbd9d6f6c39e8a 1970-01-01 00:00:00 +0000 and vim/bundle/vim-surround/.git/objects/42/e9b46e7a20a2f394664874c7bbd9d6f6c39e8a 2014-02-24 23:28:30 +0000 differ === added directory 'vim/bundle/vim-surround/.git/objects/62' === added file 'vim/bundle/vim-surround/.git/objects/62/cfc03194f9009e1845b0985642efe8f7e0ca95' Binary files vim/bundle/vim-surround/.git/objects/62/cfc03194f9009e1845b0985642efe8f7e0ca95 1970-01-01 00:00:00 +0000 and vim/bundle/vim-surround/.git/objects/62/cfc03194f9009e1845b0985642efe8f7e0ca95 2014-02-24 23:28:30 +0000 differ === removed directory 'vim/bundle/vim-surround/.git/objects/67' === removed file 'vim/bundle/vim-surround/.git/objects/67/4b6a93b6b8370e68d7334dd19ce5338dc19a93' Binary files vim/bundle/vim-surround/.git/objects/67/4b6a93b6b8370e68d7334dd19ce5338dc19a93 2015-08-25 11:20:35 +0000 and vim/bundle/vim-surround/.git/objects/67/4b6a93b6b8370e68d7334dd19ce5338dc19a93 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-surround/.git/objects/6a' === removed file 'vim/bundle/vim-surround/.git/objects/6a/986e893f6af6ed630d94d04c6992883ffe2deb' Binary files vim/bundle/vim-surround/.git/objects/6a/986e893f6af6ed630d94d04c6992883ffe2deb 2015-08-25 11:20:35 +0000 and vim/bundle/vim-surround/.git/objects/6a/986e893f6af6ed630d94d04c6992883ffe2deb 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-surround/.git/objects/89' === removed file 'vim/bundle/vim-surround/.git/objects/89/0c61ff0eff8dd878aace7d89e9c1401405d566' Binary files vim/bundle/vim-surround/.git/objects/89/0c61ff0eff8dd878aace7d89e9c1401405d566 2015-08-25 11:20:35 +0000 and vim/bundle/vim-surround/.git/objects/89/0c61ff0eff8dd878aace7d89e9c1401405d566 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-surround/.git/objects/df' === removed file 'vim/bundle/vim-surround/.git/objects/df/b79623310ab76a96818cca19d687222e510bb8' Binary files vim/bundle/vim-surround/.git/objects/df/b79623310ab76a96818cca19d687222e510bb8 2015-08-25 11:20:35 +0000 and vim/bundle/vim-surround/.git/objects/df/b79623310ab76a96818cca19d687222e510bb8 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-surround/.git/objects/ec' === added file 'vim/bundle/vim-surround/.git/objects/ec/cb6a939b17c88b04d8f595e2578e42f8e22f2b' Binary files vim/bundle/vim-surround/.git/objects/ec/cb6a939b17c88b04d8f595e2578e42f8e22f2b 1970-01-01 00:00:00 +0000 and vim/bundle/vim-surround/.git/objects/ec/cb6a939b17c88b04d8f595e2578e42f8e22f2b 2014-02-24 23:28:30 +0000 differ === modified file 'vim/bundle/vim-surround/.git/packed-refs' --- vim/bundle/vim-surround/.git/packed-refs 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-surround/.git/packed-refs 2014-02-24 23:28:30 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -2d05440ad23f97a7874ebd9b5de3a0e65d25d85c refs/remotes/origin/master +42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a refs/remotes/origin/master === modified file 'vim/bundle/vim-surround/.git/refs/heads/master' --- vim/bundle/vim-surround/.git/refs/heads/master 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-surround/.git/refs/heads/master 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -2d05440ad23f97a7874ebd9b5de3a0e65d25d85c +42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a === modified file 'vim/bundle/vim-surround/.git/shallow' --- vim/bundle/vim-surround/.git/shallow 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-surround/.git/shallow 2014-02-24 23:28:30 +0000 @@ -1,1 +1,1 @@ -2d05440ad23f97a7874ebd9b5de3a0e65d25d85c +42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a === modified file 'vim/bundle/vim-surround/doc/surround.txt' --- vim/bundle/vim-surround/doc/surround.txt 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-surround/doc/surround.txt 2014-02-24 23:28:30 +0000 @@ -39,9 +39,8 @@
Yo!*
dst Yo! Change surroundings is *cs* . It takes two arguments, a target like with -|ds|, and a replacement. *cS* changes surroundings, placing the surrounded -text on its own line(s) like |yS|. Details about the second argument can be -found below in |surround-replacements|. Once again, examples are in order. +|ds|, and a replacement. Details about the second argument can be found +below in |surround-replacements|. Once again, examples are in order. Old text Command New text ~ "Hello *world!" cs"' 'Hello world!' @@ -130,10 +129,9 @@ lines separate from the content. If t or < is used, Vim prompts for an HTML/XML tag to insert. You may specify -attributes here and they will be stripped from the closing tag. If replacing a -tag, its attributes are kept in the new tag. End your input with > to discard -the those attributes. If is used, the tags will appear on lines by -themselves. +attributes here and they will be stripped from the closing tag. End your +input by pressing or >. If is used, the tags will appear on lines +by themselves. If s is used, a leading but not trailing space is added. This is useful for removing parentheses from a function call with csbs. === modified file 'vim/bundle/vim-surround/plugin/surround.vim' --- vim/bundle/vim-surround/plugin/surround.vim 2015-08-25 11:20:35 +0000 +++ vim/bundle/vim-surround/plugin/surround.vim 2014-02-24 23:28:30 +0000 @@ -1,6 +1,6 @@ " surround.vim - Surroundings " Author: Tim Pope -" Version: 2.1 +" Version: 2.0 " GetLatestVimScripts: 1697 1 :AutoInstall: surround.vim if exists("g:loaded_surround") || &cp || v:version < 700 @@ -124,12 +124,13 @@ return s endfunction -function! s:wrap(string,char,type,removed,special) +function! s:wrap(string,char,type,...) let keeper = a:string let newchar = a:char - let s:input = "" + let s:tag = "" let type = a:type let linemode = type ==# 'V' ? 1 : 0 + let special = a:0 ? a:1 : 0 let before = "" let after = "" if type ==# "V" @@ -164,13 +165,13 @@ elseif newchar ==# ':' let before = ':' let after = '' - elseif newchar =~# "[tT\<]" + elseif newchar =~# "[tT\<,]" let dounmapp = 0 let dounmapb = 0 if !maparg(">","c") let dounmapb = 1 " Hide from AsNeeded - exe "cn"."oremap > >" + exe "cn"."oremap > " endif let default = "" if newchar ==# "T" @@ -180,27 +181,21 @@ let default = matchstr(s:lastdel,'<\zs.\{-\}\ze>') endif let tag = input("<",default) + echo "<".substitute(tag,'>*$','>','') if dounmapb silent! cunmap > endif - let s:input = tag + let s:tag = tag if tag != "" - let keepAttributes = ( match(tag, ">$") == -1 ) let tag = substitute(tag,'>*$','','') - let attributes = "" - if keepAttributes - let attributes = matchstr(a:removed, '<[^ \t\n]\+\zs\_.\{-\}\ze>') - endif - let s:input = tag . '>' + let s:tag = tag . '>' + let before = '<'.tag.'>' if tag =~ '/$' - let tag = substitute(tag, '/$', '', '') - let before = '<'.tag.attributes.' />' let after = '' else - let before = '<'.tag.attributes.'>' let after = '' endif - if newchar == "\" + if newchar == "\" || newchar == "," if type ==# "v" || type ==# "V" let before .= "\n\t" endif @@ -212,18 +207,16 @@ elseif newchar ==# 'l' || newchar == '\' " LaTeX let env = input('\begin{') + let env = '{' . env + let env .= s:closematch(env) + echo '\begin'.env if env != "" - let s:input = env."\" - let env = '{' . env - let env .= s:closematch(env) - echo '\begin'.env let before = '\begin'.env let after = '\end'.matchstr(env,'[^}]*').'}' endif elseif newchar ==# 'f' || newchar ==# 'F' let fnc = input('function: ') if fnc != "" - let s:input = fnc."\" let before = substitute(fnc,'($','','').'(' let after = ')' if newchar ==# 'F' @@ -233,7 +226,6 @@ endif elseif newchar ==# "\" let fnc = input('function: ') - let s:input = fnc."\" let before = '('.fnc.' ' let after = ')' elseif idx >= 0 @@ -252,7 +244,7 @@ let after = '' endif let after = substitute(after ,'\n','\n'.initspaces,'g') - if type ==# 'V' || (a:special && type ==# "v") + if type ==# 'V' || (special && type ==# "v") let before = substitute(before,' \+$','','') let after = substitute(after ,'^ \+','','') if after !~ '^\n' @@ -265,7 +257,7 @@ endif if before !~ '\n\s*$' let before .= "\n" - if a:special + if special let before .= "\t" endif endif @@ -295,10 +287,11 @@ return keeper endfunction -function! s:wrapreg(reg,char,removed,special) +function! s:wrapreg(reg,char,...) let orig = getreg(a:reg) let type = substitute(getregtype(a:reg),'\d\+$','','') - let new = s:wrap(orig,a:char,type,a:removed,a:special) + let special = a:0 ? a:1 : 0 + let new = s:wrap(orig,a:char,type,special) call setreg(a:reg,new,type) endfunction " }}}1 @@ -319,7 +312,7 @@ set clipboard-=unnamed clipboard-=unnamedplus let reg_save = @@ call setreg('"',"\r",'v') - call s:wrapreg('"',char,"",linemode) + call s:wrapreg('"',char,linemode) " If line mode is used and the surrounding consists solely of a suffix, " remove the initial newline. This fits a use case of mine but is a " little inconsistent. Is there anyone that would prefer the simpler @@ -386,7 +379,7 @@ let strcount = (scount == 1 ? "" : scount) if char == '/' exe 'norm! '.strcount.'[/d'.strcount.']/' - elseif char =~# '[[:punct:][:space:]]' && char !~# '[][(){}<>"''`]' + elseif char =~# '[[:punct:]]' && char !~# '[][(){}<>"''`]' exe 'norm! T'.char if getline('.')[col('.')-1] == char exe 'norm! l' @@ -416,12 +409,12 @@ norm! "_x call setreg('"','/**/',"c") let keeper = substitute(substitute(keeper,'^/\*\s\=','',''),'\s\=\*$','','') - elseif char =~# '[[:punct:][:space:]]' && char !~# '[][(){}<>]' + elseif char =~# '[[:punct:]]' && char !~# '[][(){}<>]' exe 'norm! F'.char exe 'norm! df'.char else " One character backwards - call search('\m.', 'bW') + call search('.','bW') exe "norm! da".char endif let removed = getreg('"') @@ -446,8 +439,7 @@ endif call setreg('"',keeper,regtype) if newchar != "" - let special = a:0 > 2 ? a:3 : 0 - call s:wrapreg('"',newchar,removed,special) + call s:wrapreg('"',newchar) endif silent exe 'norm! ""'.pcmd.'`[' if removed =~ '\n' || okeeper =~ '\n' || getreg('"') =~ '\n' @@ -462,11 +454,11 @@ if newchar == "" silent! call repeat#set("\Dsurround".char,scount) else - silent! call repeat#set("\C".(a:0 > 2 && a:3 ? "S" : "s")."urround".char.newchar.s:input,scount) + silent! call repeat#set("\Csurround".char.newchar.s:tag,scount) endif endfunction " }}}1 -function! s:changesurround(...) " {{{1 +function! s:changesurround() " {{{1 let a = s:inputtarget() if a == "" return s:beep() @@ -475,7 +467,7 @@ if b == "" return s:beep() endif - call s:dosurround(a,b,a:0 && a:1) + call s:dosurround(a,b) endfunction " }}}1 function! s:opfunc(type,...) " {{{1 @@ -523,7 +515,7 @@ let keeper = substitute(keeper,'\_s\@Y".(a:0 && a:1 ? "S" : "s")."surround".char.s:input,a:type) + silent! call repeat#set("\Y".(a:0 && a:1 ? "S" : "s")."surround".char.s:tag,a:type) else - silent! call repeat#set("\SurroundRepeat".char.s:input) + silent! call repeat#set("\SurroundRepeat".char.s:tag) endif endfunction @@ -564,7 +556,6 @@ nnoremap SurroundRepeat . nnoremap Dsurround :call dosurround(inputtarget()) nnoremap Csurround :call changesurround() -nnoremap CSurround :call changesurround(1) nnoremap Yssurround :call opfunc(v:count1) nnoremap YSsurround :call opfunc2(v:count1) " discards the numerical argument but there's not much we can do with it @@ -578,7 +569,6 @@ if !exists("g:surround_no_mappings") || ! g:surround_no_mappings nmap ds Dsurround nmap cs Csurround - nmap cS CSurround nmap ys Ysurround nmap yS YSurround nmap yss Yssurround