f672d022ca 
					 
					
						
						
							
							mapping confilct with AignPlugin  
						
						
						
						
					 
					
						2015-04-03 12:45:36 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bd0d9604cd 
					 
					
						
						
							
							Merge branch 'amix-master'  
						
						
						
						
					 
					
						2014-12-16 10:33:17 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c561bcc2af 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/amix/vimrc  into amix-master  
						
						... 
						
						
						
						Conflicts:
	.gitignore 
						
						
					 
					
						2014-12-16 10:32:49 +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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						976261a93f 
					 
					
						
						
							
							Merge pull request  #87  from iceliushuai/master  
						
						... 
						
						
						
						prevent auto restore last edit position for git commit msg. 
						
						
					 
					
						2014-10-10 18:47:01 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						010c2940ce 
					 
					
						
						
							
							Merge pull request  #89  from sota1235/master  
						
						... 
						
						
						
						fix zenroom2.vim | bug fix 
						
						
					 
					
						2014-10-10 18:46:42 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						55f4102619 
					 
					
						
						
							
							fix vimrc/basic.vim | デフォルトのタブを4に設定  
						
						
						
						
					 
					
						2014-10-09 10:49:17 +09:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						62af39fa19 
					 
					
						
						
							
							add indent file | markdownとcoffeeのタブを2に設定  
						
						
						
						
					 
					
						2014-10-09 10:47:57 +09:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						75747fb7fe 
					 
					
						
						
							
							fix zenroom2.vim | bug fix  
						
						
						
						
					 
					
						2014-10-07 11:12:14 +09:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						89c36a0d2c 
					 
					
						
						
							
							Updated plugins  
						
						
						
						
					 
					
						2014-09-27 16:32:18 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						89ce0dc5dd 
					 
					
						
						
							
							prevent auto restore last edit position for git commit msg.  
						
						
						
						
					 
					
						2014-09-16 10:34:35 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3278820a5d 
					 
					
						
						
							
							Added 'tablast' to toggle between tabs using <leader>tl.  
						
						
						
						
					 
					
						2014-08-15 13:28:09 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2a9908e4f0 
					 
					
						
						
							
							Updated plugins  
						
						
						
						
					 
					
						2014-08-03 23:02:51 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b92f0f2eb1 
					 
					
						
						
							
							Merge branch 'master' of github.com:amix/vimrc  
						
						
						
						
					 
					
						2014-07-02 12:18:27 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1dba960b75 
					 
					
						
						
							
							Updated plugins  
						
						
						
						
					 
					
						2014-07-02 12:18:18 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4ba28bb25b 
					 
					
						
						
							
							Update README.md  
						
						... 
						
						
						
						Added syntastic 
						
						
					 
					
						2014-07-01 16:11:47 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2a769e6cb0 
					 
					
						
						
							
							avoid the garbled characters in Chinese language windows OS  
						
						
						
						
					 
					
						2014-05-22 11:25:51 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6274ff0b10 
					 
					
						
						
							
							Merge pull request  #64  from xanderfomin/master  
						
						... 
						
						
						
						Make update_plugin.py script compatible with Python 3 
						
						
					 
					
						2014-05-15 11:10:24 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d3fd0cf632 
					 
					
						
						
							
							Make update_plugin.py script compatible with Python 3  
						
						
						
						
					 
					
						2014-05-15 13:46:51 +04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						505a6a8bef 
					 
					
						
						
							
							Update zenroom2.vim  
						
						... 
						
						
						
						VIM - Vi IMproved 7.4 under cygwin generates the following errors
>Se ha detectado un error al procesar /home/alberto.paz/.vim_runtime/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim:
>línea   65
>E128: Function name must start with a capital or "s:": g:zenroom_goyo_before()
>línea   67
>E133: ":return" no está dentro de una función
>línea   74
>E193: ¡":endfunction" no está dentro de una función!
>línea   76
>E128: Function name must start with a capital or "s:": g:zenroom_goyo_after()
>línea   78
>E133: ":return" no está dentro de una función
>línea   88
>E193: ¡":endfunction" no está dentro de una función!
>línea   90
>E700: Función desconocida: g:zenroom_goyo_before
>E700: Función desconocida: g:zenroom_goyo_after 
						
						
					 
					
						2014-04-28 17:03:32 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6a16a9393c 
					 
					
						
						
							
							Updated plugins  
						
						
						
						
					 
					
						2014-04-18 13:58:02 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ac3ef260c8 
					 
					
						
						
							
							Removed PeepOpen (CTRLp is much better)  
						
						
						
						
					 
					
						2014-04-18 13:52:50 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cdea5a5ee3 
					 
					
						
						
							
							New snippets  
						
						
						
						
					 
					
						2014-03-11 21:59:33 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8f0740e307 
					 
					
						
						
							
							Updated plugins. Added vim-golang as a mode  
						
						
						
						
					 
					
						2014-03-11 21:10:50 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2b82c75631 
					 
					
						
						
							
							Removed duplicated taglist plugin  
						
						
						
						
					 
					
						2014-03-02 14:41:02 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c7e2e3bebf 
					 
					
						
						
							
							Merge pull request  #50  from carrieje/snippet-fix  
						
						... 
						
						
						
						Fixed issue #48  regarding snippet expansion break 
						
						
					 
					
						2014-03-02 14:39:16 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0d8e7370bd 
					 
					
						
						
							
							Added vim-commentary and updarted the plugins.  
						
						... 
						
						
						
						commentary:
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), and `gc` in visual mode to comment out the
selection.  That's it. 
						
						
					 
					
						2014-03-02 14:35:00 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e64e0f1618 
					 
					
						
						
							
							Fixed issue  #48  regarding snippet expansion brake  
						
						... 
						
						
						
						The glob pattern of pathogen is {} and not *
The syntax introduced in commit f2d6402 
						
						
					 
					
						2014-02-27 20:43:16 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8c9210dca4 
					 
					
						
						
							
							Updated plugins  
						
						
						
						
					 
					
						2014-02-16 17:46:49 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						31b9fa01a5 
					 
					
						
						
							
							Updated pathogen  
						
						
						
						
					 
					
						2014-02-08 10:14:01 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						22a446333a 
					 
					
						
						
							
							Merge pull request  #43  from karlcoelho/pathogen-fix  
						
						... 
						
						
						
						Fixed the pathogen error 
						
						
					 
					
						2014-02-08 10:07:33 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						497b5aa4fb 
					 
					
						
						
							
							Use syntastic instead of pyflakes (supports a ton of more languages)  
						
						
						
						
					 
					
						2014-02-08 10:05:16 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8265dca5d5 
					 
					
						
						
							
							Updated plugins. Switched to Ack as standard search tool (much better than grep/vimgrep)  
						
						
						
						
					 
					
						2014-02-07 10:41:15 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f2d64022f5 
					 
					
						
						
							
							Fixed the pathogen error  
						
						
						
						
					 
					
						2014-02-06 13:36:37 +04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e62adb8084 
					 
					
						
						
							
							Merge branch 'master' of github.com:amix/vimrc  
						
						
						
						
					 
					
						2014-01-07 00:25:50 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b03dc8e510 
					 
					
						
						
							
							Updated plugins  
						
						
						
						
					 
					
						2014-01-07 00:25:41 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						11be898ba5 
					 
					
						
						
							
							Merge pull request  #39  from gnowxilef/master  
						
						... 
						
						
						
						remove .svn and updated zencoding link 
						
						
					 
					
						2013-12-30 16:03:33 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2a0e2ddc13 
					 
					
						
						
							
							Updated zenroom  
						
						
						
						
					 
					
						2013-12-29 14:15:49 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						86bf52e98f 
					 
					
						
						
							
							Updated gitignore  
						
						
						
						
					 
					
						2013-12-29 14:13:35 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b4846b6373 
					 
					
						
						
							
							Updated headings  
						
						
						
						
					 
					
						2013-12-29 13:25:09 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						16b4c050e7 
					 
					
						
						
							
							Update README.md  
						
						... 
						
						
						
						Added an extra screenshot. 
						
						
					 
					
						2013-12-29 13:20:35 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9e06b48f98 
					 
					
						
						
							
							Readded goyo grr  
						
						
						
						
					 
					
						2013-12-29 11:38:57 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ab44fd0780 
					 
					
						
						
							
							.  
						
						
						
						
					 
					
						2013-12-29 11:37:12 +00:00