vim-tips-and-tricks — revision history

rev 10 | foxhop | 1312492051000 | JSON

rev 9 | foxhop | 1312492043000 | JSON

	rev 8			rev 9
	18	set expandtab		18	set expandtab
	19			19
t			t	20	how to set replace all tabs with a space
				21	-----------------------------------------
				22
				23	.. code-block:: vim
				24
				25	:%s/\t/ /g
	20	vimdiff or hg merge		26	vimdiff or hg merge
	21	-----------------------		27	-----------------------

rev 8 | foxhop | 1311431251000 | JSON

	rev 7			rev 8
	10	-----------------------------------------		10	-----------------------------------------
	11			11
n			n	12	Add the following into your .vimrc file:
				13
	12	.. code-block:: vim		14	.. code-block:: vim
	13			15
t	14	set ts=4	t	16	set tabstop=4
				17	set shiftwidth=4
				18	set expandtab
	15			19
	16	vimdiff or hg merge		20	vimdiff or hg merge

rev 7 | foxhop | 1311431024000 | JSON

	rev 6			rev 7
	6	As I learn more about vim, I plan to document the tips and tricks I learn here.		6	As I learn more about vim, I plan to document the tips and tricks I learn here.
	7			7
t			t	8
				9	how to set tab to 4 spaces in vim
				10	-----------------------------------------
				11
				12	.. code-block:: vim
				13
				14	set ts=4
	8			15
	9	vimdiff or hg merge		16	vimdiff or hg merge

rev 6 | foxhop | 1308868776000 | JSON

	rev 5			rev 6
	15	switch windows		15	switch windows
	16			16
n			n	17	\|
				18
	17	do		19	do
	18	diff obtain, take the other window's differences. Pull the change.		20	diff obtain, take the other window's differences. Pull the change.
n			n	21
				22	\|
	19			23
	20	dp		24	dp
	21	diff put, give the other window our differences. Push the change.		25	diff put, give the other window our differences. Push the change.
	22			26
n			n	27	\|
				28
	23	[c		29	[c
	24	move focus to previous difference.		30	move focus to previous difference.
n			n	31
				32	\|
	25			33
	26	]c		34	]c
	27	move focus to next difference.		35	move focus to next difference.
	28			36
n			n	37	\|
				38
	29	:diffupdate		39	:diffupdate
	30	diff update		40	diff update
n			n	41
				42	\|
	31			43
	32	:diffget <window number>		44	:diffget <window number>
	33	get changes from specified window number and place them into current window.		45	get changes from specified window number and place them into current window.
	34			46
n			n	47	\|
				48
	35	:diffput <window number>		49	:diffput <window number>
	36	put changes from current window into specified window number.		50	put changes from current window into specified window number.
n			n	51
				52	\|
	37			53
	38	zo		54	zo
	39	open folded text		55	open folded text
	40			56
n			n	57	\|
				58
	41	zc		59	zc
	42	close folded text		60	close folded text
t			t	61
				62	\|

rev 5 | foxhop | 1308868697000 | JSON

	rev 4			rev 5
	10	-----------------------		10	-----------------------
	11			11
n	12	Some common commands:	n	12	This is a list of some common commands when using vimdiff:
	13			13
n	14	.. code-block:: none	n
	15
	16	ctrl w (twice)		14	ctrl w (twice)
	17
	18	switch windows		15	switch windows
	19			16
n	20	do	n	17	do
				18	diff obtain, take the other window's differences. Pull the change.
	21			19
n			n	20	dp
	22	diff obtain, take the other window's differences. Pull the change.		21	diff put, give the other window our differences. Push the change.
	23			22
n	24	dp	n	23	[c
				24	move focus to previous difference.
	25			25
n	26	diff put, give the other window our differences. Push the change.	n	26	]c
				27	move focus to next difference.
	27			28
n	28	[c	n	29	:diffupdate
	29			30	diff update
	30	move focus to previous difference.
	31			31
n	32	]c	n	32	:diffget <window number>
	33			33	get changes from specified window number and place them into current window.
	34	move focus to next difference.
	35			34
n	36	:diffupdate	n	35	:diffput <window number>
	37			36	put changes from current window into specified window number.
	38	diff update
	39			37
n			n	38	zo
				39	open folded text
	40			40
t	41	:diffget <window number>	t
	42
	43	get changes from specified window number and place them into current window.
	44
	45
	46	:diffput <window number>
	47
	48	put changes from current window into specified window number.
	49
	50
	51	zo
	52
	53	open folded text
	54
	55	zc		41	zc
	56
	57	close folded text		42	close folded text

rev 4 | foxhop | 1301224658000 | JSON

	rev 3			rev 4
	12	Some common commands:		12	Some common commands:
	13			13
n	14	.. code-block:: python	n	14	.. code-block:: none
	15			15
n	16	ctrl w	n	16	ctrl w (twice)
	17			17
	18	switch windows		18	switch windows
	38	diff update		38	diff update
	39			39
n			n	40
	40	:diffget <window number>		41	:diffget <window number>
	41			42
	42	get changes from specified window number and place them into current window.		43	get changes from specified window number and place them into current window.
	43			44
n			n	45
	44	:diffput <window number>		46	:diffput <window number>
	45			47
	46	put changes from current window into specified window number.		48	put changes from current window into specified window number.
t			t	49
	47			50
	48	zo		51	zo

rev 3 | foxhop | 1301224512000 | JSON

	rev 2			rev 3
	12	Some common commands:		12	Some common commands:
	13			13
n	14	ctrl w	n	14	.. code-block:: python
				15
				16	ctrl w
	15			17
	16	switch windows		18	switch windows
	17			19
n	18	do	n	20	do
	19			21
	20	diff obtain, take the other window's differences. Pull the change.		22	diff obtain, take the other window's differences. Pull the change.
	21			23
n	22	dp	n	24	dp
	23			25
	24	diff put, give the other window our differences. Push the change.		26	diff put, give the other window our differences. Push the change.
	25			27
n	26	[c	n	28	[c
	27			29
	28	move focus to previous difference.		30	move focus to previous difference.
	29			31
n	30	]c	n	32	]c
	31			33
	32	move focus to next difference.		34	move focus to next difference.
	33			35
n	34	:diffupdate	n	36	:diffupdate
	35			37
	36	diff update		38	diff update
	37			39
n	38	:diffget <window number>	n	40	:diffget <window number>
	39			41
	40	get changes from specified window number and place them into current window.		42	get changes from specified window number and place them into current window.
	41			43
n	42	diffput <window number>	n	44	:diffput <window number>
	43			45
	44	put changes from current window into specified window number.		46	put changes from current window into specified window number.
	45			47
n	46	zo	n	48	zo
	47			49
	48	open folded text		50	open folded text
	49			51
t	50	zc	t	52	zc
	51			53
	52	close folded text		54	close folded text

rev 2 | foxhop | 1301224327000 | JSON

	rev 1			rev 2
	12	Some common commands:		12	Some common commands:
	13			13
n	14	ctrl w	n	14	ctrl w
				15
	15	switch windows		16	switch windows
	16			17
	17	do		18	do
n			n	19
	18	diff obtain, take the other window's differences. Pull the change.		20	diff obtain, take the other window's differences. Pull the change.
	19			21
	20	dp		22	dp
n			n	23
	21	diff put, give the other window our differences. Push the change.		24	diff put, give the other window our differences. Push the change.
	22			25
n	23	[c	n	26	[c
				27
	24	move focus to previous difference.		28	move focus to previous difference.
	25			29
n	26	]c	n	30	]c
				31
	27	move focus to next difference.		32	move focus to next difference.
	28			33
n	29	:diffupdate	n	34	:diffupdate
				35
	30	diff update		36	diff update
	31			37
n			n	38	:diffget <window number>
				39
				40	get changes from specified window number and place them into current window.
				41
				42	diffput <window number>
				43
				44	put changes from current window into specified window number.
				45
	32	zo		46	zo
n			n	47
	33	open folded text		48	open folded text
	34			49
	35	zc		50	zc
t			t	51
	36	close folded text		52	close folded text

rev 1 | foxhop | 1301223342000 | JSON

+Vim Tips and Tricks
+========================
+.. contents::
+As I learn more about vim, I plan to document the tips and tricks I learn here.
+vimdiff or hg merge
+-----------------------
+Some common commands:
+**ctrl w**
+    switch windows
+**do**
+    diff obtain, take the other window's differences. Pull the change.
+**dp**
+    diff put, give the other window our differences. Push the change.
+**[c**
+    move focus to previous difference.
+**]c**
+    move focus to next difference.
+**:diffupdate**
+    diff update
+**zo**
+    open folded text
+**zc**
+    close folded text