Commits

Ken Takata  committed 3fa589a

update for 7.3.802+

Remove patches which are already merged.

  • Participants
  • Parent commits 8e66bca

Comments (0)

Files changed (3)

File fix-alignment.patch

-# HG changeset patch
-# Parent 4fd3a38a56aaf66ca40cbf1c5674cac269f2dc58
-
-diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
---- a/runtime/doc/diff.txt
-+++ b/runtime/doc/diff.txt
-@@ -220,7 +220,7 @@
- 				that parts in the middle that are still the
- 				same are highlighted anyway.  Only "iwhite" of
- 				'diffopt' is used here.
--|hl-DiffDelete| DiffDelete	Deleted lines.  Also called filler lines,
-+|hl-DiffDelete|	DiffDelete	Deleted lines.  Also called filler lines,
- 				because they don't really exist in this
- 				buffer.
- 
-diff --git a/runtime/doc/gui_w16.txt b/runtime/doc/gui_w16.txt
---- a/runtime/doc/gui_w16.txt
-+++ b/runtime/doc/gui_w16.txt
-@@ -16,7 +16,7 @@
- 
- Other relevant documentation:
- |gui.txt|	For generic items of the GUI.
--|os_msdos.txt|  For items common to DOS and Windows.
-+|os_msdos.txt|	For items common to DOS and Windows.
- |gui_w32.txt|	Some items here are also applicable to the Win16 version.
- 
- {Vi does not have a Windows GUI}
-diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt
---- a/runtime/doc/gui_w32.txt
-+++ b/runtime/doc/gui_w32.txt
-@@ -17,7 +17,7 @@
- 
- Other relevant documentation:
- |gui.txt|	For generic items of the GUI.
--|os_win32.txt|  For Win32 specific items.
-+|os_win32.txt| 	For Win32 specific items.
- 
- {Vi does not have a Windows GUI}
- 
-diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
---- a/runtime/doc/index.txt
-+++ b/runtime/doc/index.txt
-@@ -94,8 +94,8 @@
- |i_CTRL-Z|	CTRL-Z		when 'insertmode' set: suspend Vim
- |i_<Esc>|	<Esc>		end insert mode (unless 'insertmode' set)
- |i_CTRL-[|	CTRL-[		same as <Esc>
--|i_CTRL-\_CTRL-N| CTRL-\ CTRL-N	 go to Normal mode
--|i_CTRL-\_CTRL-G| CTRL-\ CTRL-G	 go to mode specified with 'insertmode'
-+|i_CTRL-\_CTRL-N| CTRL-\ CTRL-N	go to Normal mode
-+|i_CTRL-\_CTRL-G| CTRL-\ CTRL-G	go to mode specified with 'insertmode'
- 		CTRL-\ a - z	reserved for extensions
- 		CTRL-\ others	not used
- |i_CTRL-]|	CTRL-]		trigger abbreviation
-@@ -141,7 +141,7 @@
- |i_<ScrollWheelUp>|	<ScrollWheelUp>		move window three lines up
- |i_<S-ScrollWheelUp>|	<S-ScrollWheelUp>	move window one page up
- |i_<ScrollWheelLeft>|	<ScrollWheelLeft>	move window six columns left
--|i_<S-ScrollWheelLeft>| <S-ScrollWheelLeft>	move window one page left
-+|i_<S-ScrollWheelLeft>|	<S-ScrollWheelLeft>	move window one page left
- |i_<ScrollWheelRight>|	<ScrollWheelRight>	move window six columns right
- |i_<S-ScrollWheelRight>| <S-ScrollWheelRight>	move window one page right
- 
-@@ -212,8 +212,8 @@
- |CTRL-Y|	CTRL-Y		   scroll N lines downwards
- |CTRL-Z|	CTRL-Z		   suspend program (or start new shell)
- 		CTRL-[ <Esc>	   not used
--|CTRL-\_CTRL-N| CTRL-\ CTRL-N	   go to Normal mode (no-op)
--|CTRL-\_CTRL-G| CTRL-\ CTRL-G	   go to mode specified with 'insertmode'
-+|CTRL-\_CTRL-N|	CTRL-\ CTRL-N	   go to Normal mode (no-op)
-+|CTRL-\_CTRL-G|	CTRL-\ CTRL-G	   go to mode specified with 'insertmode'
- 		CTRL-\ a - z	   reserved for extensions
- 		CTRL-\ others      not used
- |CTRL-]|	CTRL-]		   :ta to ident under cursor
-@@ -431,7 +431,7 @@
- |<Insert>|	<Insert>	2  same as "i"
- |<Left>|	<Left>		1  same as "h"
- |<LeftMouse>|	<LeftMouse>	1  move cursor to the mouse click position
--|<MiddleMouse>| <MiddleMouse>	2  same as "gP" at the mouse click position
-+|<MiddleMouse>|	<MiddleMouse>	2  same as "gP" at the mouse click position
- |<PageDown>|	<PageDown>	   same as CTRL-F
- |<PageUp>|	<PageUp>	   same as CTRL-B
- |<Right>|	<Right>		1  same as "l"
-@@ -640,7 +640,7 @@
- |[s|		[s		1  move to the previous misspelled word
- |[z|		[z		1  move to start of open fold
- |[{|		[{		1  cursor N times back to unmatched '{'
--|[<MiddleMouse> [<MiddleMouse>	2  same as "[p"
-+|[<MiddleMouse>| [<MiddleMouse>	2  same as "[p"
- 
- |]_CTRL-D|	] CTRL-D	   jump to first #define found in current and
- 				   included files matching the word under the
-@@ -680,7 +680,7 @@
- |]s|		]s		1  move to next misspelled word
- |]z|		]z		1  move to end of open fold
- |]}|		]}		1  cursor N times forward to unmatched '}'
--|]<MiddleMouse> ]<MiddleMouse>	2  same as "]p"
-+|]<MiddleMouse>| ]<MiddleMouse>	2  same as "]p"
- 
- ==============================================================================
- 2.4 Commands starting with 'g'						*g*
-@@ -1011,8 +1011,8 @@
- 		CTRL-Z		not used (reserved for suspend)
- |c_<Esc>|	<Esc>		abandon command-line without executing it
- |c_<Esc>|	CTRL-[		same as <Esc>
--|c_CTRL-\_CTRL-N| CTRL-\ CTRL-N	 go to Normal mode, abandon command-line
--|c_CTRL-\_CTRL-G| CTRL-\ CTRL-G	 go to mode specified with 'insertmode',
-+|c_CTRL-\_CTRL-N| CTRL-\ CTRL-N	go to Normal mode, abandon command-line
-+|c_CTRL-\_CTRL-G| CTRL-\ CTRL-G	go to mode specified with 'insertmode',
- 				abandon command-line
- 		CTRL-\ a - d	reserved for extensions
- |c_CTRL-\_e|	CTRL-\ e {expr} replace the command line with the result of
-diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt
---- a/runtime/doc/usr_toc.txt
-+++ b/runtime/doc/usr_toc.txt
-@@ -248,7 +248,7 @@
- 		|28.7|	Folding by syntax
- 		|28.8|	Folding by expression
- 		|28.9|	Folding unchanged lines
--		|28.10| Which fold method to use?
-+		|28.10|	Which fold method to use?
- 
- |usr_29.txt|  Moving through programs
- 		|29.1|	Using tags

File fix-conceal-backtick.patch

-diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
---- a/runtime/syntax/help.vim
-+++ b/runtime/syntax/help.vim
-@@ -25,10 +25,12 @@
-   syn match helpHyperTextEntry	"\*[#-)!+-~]\+\*$" contains=helpStar
- endif
- if has("conceal")
--  syn match helpBar		contained "[|`]" conceal
-+  syn match helpBar		contained "|" conceal
-+  syn match helpBacktick	contained "`" conceal
-   syn match helpStar		contained "\*" conceal
- else
--  syn match helpBar		contained "[|`]"
-+  syn match helpBar		contained "|"
-+  syn match helpBacktick	contained "`"
-   syn match helpStar		contained "\*"
- endif
- syn match helpNormal		"|.*====*|"
-@@ -38,7 +40,7 @@
- syn match helpVim		"VIM REFERENCE.*"
- syn match helpOption		"'[a-z]\{2,\}'"
- syn match helpOption		"'t_..'"
--syn match helpCommand		"`[^` ]*`"hs=s+1,he=e-1 contains=helpBar
-+syn match helpCommand		"`[^` ]*`"hs=s+1,he=e-1 contains=helpBacktick
- syn match helpHeader		"\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore
- syn match helpGraphic		".* \ze`$" nextgroup=helpIgnore
- if has("conceal")
-@@ -150,6 +152,7 @@
- hi def link helpIgnore		Ignore
- hi def link helpHyperTextJump	Subtitle
- hi def link helpBar		Ignore
-+hi def link helpBacktick	Ignore
- hi def link helpStar		Ignore
- hi def link helpHyperTextEntry	String
- hi def link helpHeadline	Statement
 update-ja.po-2.patch
 update-menu_ja.patch
 backout-7.3.638.patch
-fix-alignment.patch
 fix-alignment-2.patch
 fix-alignment-3.patch
-fix-conceal-backtick.patch
 update-tutor.ja.patch
 vim_on_cygwin_using_win32_clipboard__simple__7.3.785.patch
 vim_on_cygwin_using_win32_clipboard__full__7.3.785.patch