[packages/vim.git] / vim-relativenumber.patch

Index: runtime/doc/quickref.txt
===================================================================
*** runtime/doc/quickref.txt	(revision 1159)
--- runtime/doc/quickref.txt	(working copy)
***************
*** 817,822 ****
--- 817,823 ----
  'pumheight'	  'ph'	    maximum height of the popup menu
  'quoteescape'	  'qe'	    escape characters used in a string
  'readonly'	  'ro'	    disallow writing the buffer
+ 'relativenumber'  'rnu'	    print relative line number in front of each line
  'redrawtime'	  'rdt'     timeout for 'hlsearch' and |:match| highlighting
  'remap'			    allow mappings to work recursively
  'report'		    threshold for reporting nr. of lines changed
Index: runtime/doc/version7.txt
===================================================================
*** runtime/doc/version7.txt	(revision 1159)
--- runtime/doc/version7.txt	(working copy)
***************
*** 638,645 ****
  'maxmempattern'		maximum amount of memory to use for pattern matching
  'mkspellmem'		parameters for |:mkspell| memory use
  'mzquantum'		Time in msec to schedule MzScheme threads.
! 'numberwidth'		Minimal width of the space used for the 'number'
! 			option. (Emmanuel Renieris)
  'omnifunc'		The name of the function used for omni completion.
  'operatorfunc'		function to be called for |g@| operator
  'printmbcharset'	CJK character set to be used for :hardcopy
--- 638,645 ----
  'maxmempattern'		maximum amount of memory to use for pattern matching
  'mkspellmem'		parameters for |:mkspell| memory use
  'mzquantum'		Time in msec to schedule MzScheme threads.
! 'numberwidth'		Minimal width of the space used for the 'number' and
! 			'relativenumber' option. (Emmanuel Renieris)
  'omnifunc'		The name of the function used for omni completion.
  'operatorfunc'		function to be called for |g@| operator
  'printmbcharset'	CJK character set to be used for :hardcopy
Index: runtime/doc/options.txt
===================================================================
*** runtime/doc/options.txt	(revision 1159)
--- runtime/doc/options.txt	(working copy)
***************
*** 1874,1881 ****
  			parenthesis match.  When included "%" ignores
  			backslashes, which is Vi compatible.
  								*cpo-n*
! 		n	When included, the column used for 'number' will also
! 			be used for text of wrapped lines.
  								*cpo-o*
  		o	Line offset to search command is not remembered for
  			next search.
--- 1874,1882 ----
  			parenthesis match.  When included "%" ignores
  			backslashes, which is Vi compatible.
  								*cpo-n*
! 		n	When included, the column used for 'number' and
! 			'relativenumber' will also be used for text of wrapped
! 			lines.
  								*cpo-o*
  		o	Line offset to search command is not remembered for
  			next search.
***************
*** 3577,3583 ****
  	|hl-Search|	 l  last search pattern highlighting (see 'hlsearch')
  	|hl-MoreMsg|	 m  |more-prompt|
  	|hl-ModeMsg|	 M  Mode (e.g., "-- INSERT --")
! 	|hl-LineNr|	 n  line number for ":number" and ":#" commands
  	|hl-Question|	 r  |hit-enter| prompt and yes/no questions
  	|hl-StatusLine|	 s  status line of current window |status-line|
  	|hl-StatusLineNC| S  status lines of not-current windows
--- 3578,3585 ----
  	|hl-Search|	 l  last search pattern highlighting (see 'hlsearch')
  	|hl-MoreMsg|	 m  |more-prompt|
  	|hl-ModeMsg|	 M  Mode (e.g., "-- INSERT --")
! 	|hl-LineNr|	 n  line number for ":number" and ":#" commands, and
! 			    when 'number' or 'relativenumber' option is set.
  	|hl-Question|	 r  |hit-enter| prompt and yes/no questions
  	|hl-StatusLine|	 s  status line of current window |status-line|
  	|hl-StatusLineNC| S  status lines of not-current windows
***************
*** 4834,4839 ****
--- 4836,4842 ----
  	When a long, wrapped line doesn't start with the first character, '-'
  	characters are put before the number.
  	See |hl-LineNr| for the highlighting used for the number.
+ 	When setting this option, 'relativenumber' is being reset.
  
  						*'numberwidth'* *'nuw'*
  'numberwidth' 'nuw'	number	(Vim default: 4  Vi default: 8)
***************
*** 4842,4854 ****
  			{only available when compiled with the |+linebreak|
  			feature}
  	Minimal number of columns to use for the line number.  Only relevant
! 	when the 'number' option is set or printing lines with a line number.
! 	Since one space is always between the number and the text, there is
! 	one less character for the number itself.
  	The value is the minimum width.  A bigger width is used when needed to
! 	fit the highest line number in the buffer.  Thus with the Vim default
! 	of 4 there is room for a line number up to 999.  When the buffer has
! 	1000 lines five columns will be used.
  	The minimum value is 1, the maximum value is 10.
  	NOTE: 'numberwidth' is reset to 8 when 'compatible' is set.
  
--- 4845,4858 ----
  			{only available when compiled with the |+linebreak|
  			feature}
  	Minimal number of columns to use for the line number.  Only relevant
! 	when the 'number' or 'relativenumber' option is set or printing lines
! 	with a line number. Since one space is always between the number and
! 	the text, there is one less character for the number itself.
  	The value is the minimum width.  A bigger width is used when needed to
! 	fit the highest line number in the buffer respectively the number of
! 	rows in the window, depending on whether 'number' or 'relativenumber'
! 	is set. Thus with the Vim default of 4 there is room for a line number
! 	up to 999. When the buffer has 1000 lines five columns will be used.
  	The minimum value is 1, the maximum value is 10.
  	NOTE: 'numberwidth' is reset to 8 when 'compatible' is set.
  
***************
*** 5222,5227 ****
--- 5226,5250 ----
  	matches will be highlighted.  This is used to avoid that Vim hangs
  	when using a very complicated pattern.
  
+ 		*'relativenumber'* *'rnu'* *'norelativenumber'* *'nornu'*
+ 'relativenumber' 'rnu'	boolean	(default off)
+ 			local to window
+ 			{not in Vi}
+ 	Print the line number relative to the line with the cursor in front of
+ 	each line. Relative line numbers help you using the |count| you can
+ 	precede some vertival motion commands (e.g. j k + -) with, without
+ 	having to calculate it by yourself. Especially useful in combination
+ 	with other commands (e.g. y d c < > gq gw =).
+ 	When the 'n' option is excluded from 'cpoptions' a wrapped
+ 	line will not use the column of line numbers (this is the default when
+ 	'compatible' isn't set).
+ 	The 'numberwidth' option can be used to set the room used for the line
+ 	number.
+ 	When a long, wrapped line doesn't start with the first character, '-'
+ 	characters are put before the number.
+ 	See |hl-LineNr| for the highlighting used for the number.
+ 	When setting this option, 'number' is being reset.
+ 
  						*'remap'* *'noremap'*
  'remap'			boolean	(default on)
  			global
Index: runtime/doc/syntax.txt
===================================================================
*** runtime/doc/syntax.txt	(revision 1159)
--- runtime/doc/syntax.txt	(working copy)
***************
*** 4154,4160 ****
  		":s///c"
  							*hl-LineNr*
  LineNr		Line number for ":number" and ":#" commands, and when 'number'
! 		option is set.
  							*hl-MatchParen*
  MatchParen	The character under the cursor or just before it, if it
  		is a paired bracket, and its match. |pi_paren.txt|
--- 4154,4160 ----
  		":s///c"
  							*hl-LineNr*
  LineNr		Line number for ":number" and ":#" commands, and when 'number'
! 		or 'relativenumber' option is set.
  							*hl-MatchParen*
  MatchParen	The character under the cursor or just before it, if it
  		is a paired bracket, and its match. |pi_paren.txt|
Index: runtime/doc/tags
===================================================================
*** runtime/doc/tags	(revision 1159)
--- runtime/doc/tags	(working copy)
***************
*** 557,562 ****
--- 557,563 ----
  'noprompt'	options.txt	/*'noprompt'*
  'nopvw'	options.txt	/*'nopvw'*
  'noreadonly'	options.txt	/*'noreadonly'*
+ 'norelativenumber'	options.txt	/*'norelativenumber'*
  'noremap'	options.txt	/*'noremap'*
  'norestorescreen'	options.txt	/*'norestorescreen'*
  'norevins'	options.txt	/*'norevins'*
***************
*** 565,570 ****
--- 566,572 ----
  'norightleftcmd'	options.txt	/*'norightleftcmd'*
  'norl'	options.txt	/*'norl'*
  'norlc'	options.txt	/*'norlc'*
+ 'nornu'	options.txt	/*'nornu'*
  'noro'	options.txt	/*'noro'*
  'nors'	options.txt	/*'nors'*
  'noru'	options.txt	/*'noru'*
***************
*** 706,711 ****
--- 708,714 ----
  'readonly'	options.txt	/*'readonly'*
  'redraw'	vi_diff.txt	/*'redraw'*
  'redrawtime'	options.txt	/*'redrawtime'*
+ 'relativenumber'	options.txt	/*'relativenumber'*
  'remap'	options.txt	/*'remap'*
  'report'	options.txt	/*'report'*
  'restorescreen'	options.txt	/*'restorescreen'*
***************
*** 715,720 ****
--- 718,724 ----
  'rightleftcmd'	options.txt	/*'rightleftcmd'*
  'rl'	options.txt	/*'rl'*
  'rlc'	options.txt	/*'rlc'*
+ 'rnu'	options.txt	/*'rnu'*
  'ro'	options.txt	/*'ro'*
  'rs'	options.txt	/*'rs'*
  'rtp'	options.txt	/*'rtp'*
Index: runtime/lang/menu_de_de.latin1.vim
===================================================================
*** runtime/lang/menu_de_de.latin1.vim	(revision 1159)
--- runtime/lang/menu_de_de.latin1.vim	(working copy)
***************
*** 84,96 ****
  menutrans F&ile\ Settings				&Datei-Einstellungen
  
  " Boolean options
! menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	Anzeige\ der\ Zeilen&nummer\ ein-\ und\ ausschalten<Tab>:set\ nu!
! menutrans Toggle\ &List\ Mode<Tab>:set\ list!		&List-Modus\ ein-\ und\ ausschalten<Tab>:set\ list!
! menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		&Zeilenumbruch\ ein-\ und\ ausschalten<Tab>:set\ wrap!
! menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	Umbruch\ an\ &Wortgrenzen\ ein-\ und\ ausschalten<Tab>:set\ lbr!
! menutrans Toggle\ &expand-tab<Tab>:set\ et!		&Erweiterung\ von\ Tabulatoren\ ein-\ und\ ausschalten<Tab>:set\ et!
Commit	Line	Data
7972acac AG	1	Index: runtime/doc/quickref.txt
	2	===================================================================
	3	*** runtime/doc/quickref.txt (revision 1159)
	4	--- runtime/doc/quickref.txt (working copy)
	5	***************
	6	* 817,822 **
	7	--- 817,823 ----
	8	'pumheight' 'ph' maximum height of the popup menu
	9	'quoteescape' 'qe' escape characters used in a string
	10	'readonly' 'ro' disallow writing the buffer
	11	+ 'relativenumber' 'rnu' print relative line number in front of each line
	12	'redrawtime' 'rdt' timeout for 'hlsearch' and \|:match\| highlighting
	13	'remap' allow mappings to work recursively
	14	'report' threshold for reporting nr. of lines changed
	15	Index: runtime/doc/version7.txt
	16	===================================================================
	17	*** runtime/doc/version7.txt (revision 1159)
	18	--- runtime/doc/version7.txt (working copy)
	19	***************
	20	* 638,645 **
	21	'maxmempattern' maximum amount of memory to use for pattern matching
	22	'mkspellmem' parameters for \|:mkspell\| memory use
	23	'mzquantum' Time in msec to schedule MzScheme threads.
	24	! 'numberwidth' Minimal width of the space used for the 'number'
	25	! option. (Emmanuel Renieris)
	26	'omnifunc' The name of the function used for omni completion.
	27	'operatorfunc' function to be called for \|g@\| operator
	28	'printmbcharset' CJK character set to be used for :hardcopy
	29	--- 638,645 ----
	30	'maxmempattern' maximum amount of memory to use for pattern matching
	31	'mkspellmem' parameters for \|:mkspell\| memory use
	32	'mzquantum' Time in msec to schedule MzScheme threads.
	33	! 'numberwidth' Minimal width of the space used for the 'number' and
	34	! 'relativenumber' option. (Emmanuel Renieris)
	35	'omnifunc' The name of the function used for omni completion.
	36	'operatorfunc' function to be called for \|g@\| operator
	37	'printmbcharset' CJK character set to be used for :hardcopy
	38	Index: runtime/doc/options.txt
	39	===================================================================
	40	*** runtime/doc/options.txt (revision 1159)
	41	--- runtime/doc/options.txt (working copy)
	42	***************
	43	* 1874,1881 **
	44	parenthesis match. When included "%" ignores
	45	backslashes, which is Vi compatible.
	46	cpo-n
	47	! n When included, the column used for 'number' will also
	48	! be used for text of wrapped lines.
	49	cpo-o
	50	o Line offset to search command is not remembered for
	51	next search.
	52	--- 1874,1882 ----
	53	parenthesis match. When included "%" ignores
	54	backslashes, which is Vi compatible.
	55	cpo-n
	56	! n When included, the column used for 'number' and
	57	! 'relativenumber' will also be used for text of wrapped
	58	! lines.
	59	cpo-o
	60	o Line offset to search command is not remembered for
	61	next search.
	62	***************
	63	* 3577,3583 **
	64	\|hl-Search\| l last search pattern highlighting (see 'hlsearch')
65	\|hl-MoreMsg\| m \|more-prompt\|
66	\|hl-ModeMsg\| M Mode (e.g., "-- INSERT --")
67	! \|hl-LineNr\| n line number for ":number" and ":#" commands
68	\|hl-Question\| r \|hit-enter\| prompt and yes/no questions
69	\|hl-StatusLine\| s status line of current window \|status-line\|
70	\|hl-StatusLineNC\| S status lines of not-current windows
71	--- 3578,3585 ----
72	\|hl-Search\| l last search pattern highlighting (see 'hlsearch')
73	\|hl-MoreMsg\| m \|more-prompt\|
74	\|hl-ModeMsg\| M Mode (e.g., "-- INSERT --")
75	! \|hl-LineNr\| n line number for ":number" and ":#" commands, and
76	! when 'number' or 'relativenumber' option is set.
77	\|hl-Question\| r \|hit-enter\| prompt and yes/no questions
78	\|hl-StatusLine\| s status line of current window \|status-line\|
79	\|hl-StatusLineNC\| S status lines of not-current windows
80	***************
81	* 4834,4839 **
82	--- 4836,4842 ----
83	When a long, wrapped line doesn't start with the first character, '-'
84	characters are put before the number.
85	See \|hl-LineNr\| for the highlighting used for the number.
86	+ When setting this option, 'relativenumber' is being reset.
87
88	'numberwidth' 'nuw'
89	'numberwidth' 'nuw' number (Vim default: 4 Vi default: 8)
90	***************
91	* 4842,4854 **
92	{only available when compiled with the \|+linebreak\|
93	feature}
94	Minimal number of columns to use for the line number. Only relevant
95	! when the 'number' option is set or printing lines with a line number.
96	! Since one space is always between the number and the text, there is
97	! one less character for the number itself.
98	The value is the minimum width. A bigger width is used when needed to
99	! fit the highest line number in the buffer. Thus with the Vim default
100	! of 4 there is room for a line number up to 999. When the buffer has
101	! 1000 lines five columns will be used.
102	The minimum value is 1, the maximum value is 10.
103	NOTE: 'numberwidth' is reset to 8 when 'compatible' is set.
104
105	--- 4845,4858 ----
106	{only available when compiled with the \|+linebreak\|
107	feature}
108	Minimal number of columns to use for the line number. Only relevant
109	! when the 'number' or 'relativenumber' option is set or printing lines
110	! with a line number. Since one space is always between the number and
111	! the text, there is one less character for the number itself.
112	The value is the minimum width. A bigger width is used when needed to
113	! fit the highest line number in the buffer respectively the number of
114	! rows in the window, depending on whether 'number' or 'relativenumber'
115	! is set. Thus with the Vim default of 4 there is room for a line number
116	! up to 999. When the buffer has 1000 lines five columns will be used.
117	The minimum value is 1, the maximum value is 10.
118	NOTE: 'numberwidth' is reset to 8 when 'compatible' is set.
119
120	***************
121	* 5222,5227 **
122	--- 5226,5250 ----
123	matches will be highlighted. This is used to avoid that Vim hangs
124	when using a very complicated pattern.
125
126	+ 'relativenumber' 'rnu' 'norelativenumber' 'nornu'
127	+ 'relativenumber' 'rnu' boolean (default off)
128	+ local to window
129	+ {not in Vi}
130	+ Print the line number relative to the line with the cursor in front of
131	+ each line. Relative line numbers help you using the \|count\| you can
132	+ precede some vertival motion commands (e.g. j k + -) with, without
133	+ having to calculate it by yourself. Especially useful in combination
134	+ with other commands (e.g. y d c < > gq gw =).
135	+ When the 'n' option is excluded from 'cpoptions' a wrapped
136	+ line will not use the column of line numbers (this is the default when
137	+ 'compatible' isn't set).
138	+ The 'numberwidth' option can be used to set the room used for the line
139	+ number.
140	+ When a long, wrapped line doesn't start with the first character, '-'
141	+ characters are put before the number.
142	+ See \|hl-LineNr\| for the highlighting used for the number.
143	+ When setting this option, 'number' is being reset.
144	+
145	'remap' 'noremap'
146	'remap' boolean (default on)
147	global
148	Index: runtime/doc/syntax.txt
149	===================================================================
150	*** runtime/doc/syntax.txt (revision 1159)
151	--- runtime/doc/syntax.txt (working copy)
152	***************
153	* 4154,4160 **
154	":s///c"
155	hl-LineNr
156	LineNr Line number for ":number" and ":#" commands, and when 'number'
157	! option is set.
158	hl-MatchParen
159	MatchParen The character under the cursor or just before it, if it
160	is a paired bracket, and its match. \|pi_paren.txt\|
161	--- 4154,4160 ----
162	":s///c"
163	hl-LineNr
164	LineNr Line number for ":number" and ":#" commands, and when 'number'
165	! or 'relativenumber' option is set.
166	hl-MatchParen
167	MatchParen The character under the cursor or just before it, if it
168	is a paired bracket, and its match. \|pi_paren.txt\|
169	Index: runtime/doc/tags
170	===================================================================
171	*** runtime/doc/tags (revision 1159)
172	--- runtime/doc/tags (working copy)
173	***************
174	* 557,562 **
175	--- 557,563 ----
176	'noprompt' options.txt /'noprompt'
177	'nopvw' options.txt /'nopvw'
178	'noreadonly' options.txt /'noreadonly'
179	+ 'norelativenumber' options.txt /'norelativenumber'
180	'noremap' options.txt /'noremap'
181	'norestorescreen' options.txt /'norestorescreen'
182	'norevins' options.txt /'norevins'
183	***************
184	* 565,570 **
185	--- 566,572 ----
186	'norightleftcmd' options.txt /'norightleftcmd'
187	'norl' options.txt /'norl'
188	'norlc' options.txt /'norlc'
189	+ 'nornu' options.txt /'nornu'
190	'noro' options.txt /'noro'
191	'nors' options.txt /'nors'
192	'noru' options.txt /'noru'
193	***************
194	* 706,711 **
195	--- 708,714 ----
196	'readonly' options.txt /'readonly'
197	'redraw' vi_diff.txt /'redraw'
198	'redrawtime' options.txt /'redrawtime'
199	+ 'relativenumber' options.txt /'relativenumber'
200	'remap' options.txt /'remap'
201	'report' options.txt /'report'
202	'restorescreen' options.txt /'restorescreen'
203	***************
204	* 715,720 **
205	--- 718,724 ----
206	'rightleftcmd' options.txt /'rightleftcmd'
207	'rl' options.txt /'rl'
208	'rlc' options.txt /'rlc'
209	+ 'rnu' options.txt /'rnu'
210	'ro' options.txt /'ro'
211	'rs' options.txt /'rs'
212	'rtp' options.txt /'rtp'
213	Index: runtime/lang/menu_de_de.latin1.vim
214	===================================================================
215	*** runtime/lang/menu_de_de.latin1.vim (revision 1159)
216	--- runtime/lang/menu_de_de.latin1.vim (working copy)
217	***************
218	* 84,96 **
219	menutrans F&ile\ Settings &Datei-Einstellungen
220
221	" Boolean options
222	! menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! Anzeige\ der\ Zeilen&nummer\ ein-\ und\ ausschalten<Tab>:set\ nu!
223	! menutrans Toggle\ &List\ Mode<Tab>:set\ list! &List-Modus\ ein-\ und\ ausschalten<Tab>:set\ list!
224	! menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap! &Zeilenumbruch\ ein-\ und\ ausschalten<Tab>:set\ wrap!
225	! menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr! Umbruch\ an\ &Wortgrenzen\ ein-\ und\ ausschalten<Tab>:set\ lbr!
226	! menutrans Toggle\ &expand-tab<Tab>:set\ et! &Erweiterung\ von\ Tabulatoren\ ein-\ und\ ausschalten<Tab>:set\ et!
227