1
0
mirror of https://github.com/amix/vimrc synced 2025-07-12 14:15:00 +08:00
Commit Graph

165 Commits

Author SHA1 Message Date
14dab531d3 comment filetype incident:python 2 incident 2015-12-25 11:22:39 +08:00
0e2abf1262 jedi 2015-08-18 15:21:35 +08:00
3bf7cc5629 indent guide 2015-07-29 16:31:44 +08:00
d931023720 jedi for python 2015-07-24 19:34:08 +08:00
2a8d620b8a clean 2015-07-15 14:49:27 +08:00
3c580c2a81 clean for pull request 2015-07-15 14:42:21 +08:00
0910c47b0d update upstream 2015-07-15 14:30:27 +08:00
d14ec554fa Merge remote-tracking branch 'upstream/master' 2015-07-15 14:28:16 +08:00
b1ffcf08ba By default disable the git gutter (and toggle it via <leader>d) 2015-07-13 11:42:13 +01:00
be8e101b68 By default dont show the hidden files in NerdTree 2015-07-13 11:38:38 +01:00
75bb26dc78 Merge branch 'master' of https://github.com/amix/vimrc 2015-07-13 11:22:49 +01:00
d7752b59ae Updated vimrc 2015-07-13 11:22:46 +01:00
9a2843c2a5 Smaller changes to the core vimrcs
Default to Ag (instead of Ack)... Much faster.
Performance improvements due to smaller history.
Don't remember the position in file (this slows Vim down considerably.
2015-07-13 11:21:10 +01:00
4cf1fa37e6 Merge pull request #115 from LumenTeun/patch-1
en => endif
2015-05-22 20:28:10 -07:00
14babd4799 Merge branch 'bric3-gruvbox-submodule' 2015-05-22 20:26:19 -07:00
bb14f055e3 Merge branch 'gruvbox-submodule' of git://github.com/bric3/vimrc into bric3-gruvbox-submodule 2015-05-22 20:26:02 -07:00
3ad577d57c Merge pull request #117 from bric3/vim-gitgutter-submodule
Adds plugin vim-gitgutter
2015-05-22 20:23:43 -07:00
77dfcbd9a5 Adds plugin vim-gitgutter 2015-05-22 16:28:04 +02:00
5fcf13724a Adds gruvbox as a submodule 2015-05-22 16:22:43 +02:00
5af76b8958 en => endif
I assume that this was an error?
2015-05-22 00:55:12 +00:00
1e5a9d98de molokai 2015-04-28 11:20:17 +08:00
66bf7a505a fix molokai 2015-04-02 11:37:58 +08:00
70205da410 molokai 2015-04-02 11:28:52 +08:00
e5557a47c9 Merge remote-tracking branch 'upstream/master'
Conflicts:
	sources_non_forked/syntastic/README.markdown
	sources_non_forked/syntastic/autoload/syntastic/log.vim
	sources_non_forked/syntastic/autoload/syntastic/util.vim
	sources_non_forked/syntastic/doc/syntastic.txt
	sources_non_forked/syntastic/plugin/syntastic.vim
	sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
	sources_non_forked/syntastic/plugin/syntastic/balloons.vim
	sources_non_forked/syntastic/plugin/syntastic/checker.vim
	sources_non_forked/syntastic/plugin/syntastic/cursor.vim
	sources_non_forked/syntastic/plugin/syntastic/loclist.vim
	sources_non_forked/syntastic/plugin/syntastic/modemap.vim
	sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
	sources_non_forked/syntastic/plugin/syntastic/registry.vim
	sources_non_forked/syntastic/plugin/syntastic/signs.vim
	sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
	sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
	sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim
	sources_non_forked/vim-airline/README.md
	sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
	sources_non_forked/vim-snippets/UltiSnips/html.snippets
2015-04-01 20:48:40 +08:00
8c895a3aa1 Merge branch 'master' of git://github.com/vsooda/vimrc
Conflicts:
	my_configs.vim
2015-04-01 20:06:52 +08:00
2277ec0c97 xxxx 2015-04-01 20:03:18 +08:00
ef6f4d762f my 2015-04-01 19:48:29 +08:00
095230d65d Update README.md 2015-03-24 16:53:58 +00:00
2cb073a57d Updated plugins 2015-03-14 20:02:10 +00:00
d195ccb777 Updated vim plugins 2015-02-24 10:45:22 +00:00
8fa0bd4574 Merge branch 'master' of https://github.com/amix/vimrc 2015-02-13 00:19:34 +00:00
00f043f0de Updated vim plugins. Nerd tree is on the right by default 2015-02-13 00:19:27 +00:00
a4b4587019 Updated plugins 2015-02-04 10:43:54 +00:00
616159088e Merge pull request #97 from sagarjauhari/patch-1
Added links to goyo and vim-zenroom plugins
2015-01-26 12:21:37 +00:00
efa472f074 Merge pull request #100 from Druiced/master
Note to install ctags
2015-01-26 12:21:24 +00:00
e7a01094b6 Updated plugins 2015-01-18 12:58:28 +00:00
0f694fac46 Note to install ctags 2015-01-16 01:43:18 -08:00
8f6720f6bc Added links to goyo and vim-zenroom plugins 2015-01-01 03:11:57 -05:00
c2ae99ad8b molokai 2014-11-08 13:32:59 +08:00
c3ba0f3c06 Merge branch 'master' of https://github.com/amix/vimrc 2014-10-31 21:50:23 +00:00
a304deea56 Updated plugins 2014-10-31 21:30:24 +00:00
f57d81bb1d Merge pull request #91 from thehodapp/master
Add support for mouse if it is available
2014-10-19 00:25:16 +01:00
013a91d8d2 for tab switch 2014-10-18 12:23:43 +08:00
96beee5eda change gitignore 2014-10-17 11:36:32 +08:00
be37691443 add my_configs and taglist merge to nerdtree 2014-10-17 11:32:26 +08:00
fe77d23852 Updated plugins. Removed the tabstop merge that 010c2940ce introduced 2014-10-14 14:30:33 +01:00
7267320d1d Add support for mouse if it is available 2014-10-12 21:03:28 -05:00
d283422444 Merge pull request #66 from shenchsh/master
avoid the garbled characters in Chinese language windows OS
2014-10-10 18:48:28 +01:00
f24b49b6a2 Merge pull request #60 from japaz/master
Update zenroom2.vim
2014-10-10 18:47:29 +01:00
6ad7ca8fa1 Merge pull request #82 from lyager/tablast
Added 'tablast' to toggle between tabs using <leader>tl.
2014-10-10 18:47:21 +01:00