From 072f0f3256758fc237e745ce85f9d55b905bc0dd Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Sun, 20 Jul 2008 04:56:51 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1119 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 runtime/filetype.vim | 22 +++++++++++++++++-----
 src/screen.c         |  2 +-
 src/search.c         |  2 +-
 src/tag.c            |  2 ++
 src/version.c        |  8 ++++++++
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 2ba2bfe6..17f7a80c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2008 Jul 08
+" Last Change:	2008 Jul 17
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -92,9 +92,9 @@ au BufNewFile,BufRead *.wrm			setf acedb
 " Ada (83, 9X, 95)
 au BufNewFile,BufRead *.adb,*.ads,*.ada		setf ada
 if has("vms")
-  au BufNewFile,BufRead *.gpr,*.ada_m,*.adc 	setf ada
+  au BufNewFile,BufRead *.gpr,*.ada_m,*.adc	setf ada
 else
-  au BufNewFile,BufRead *.gpr 			setf ada
+  au BufNewFile,BufRead *.gpr			setf ada
 endif
 
 " AHDL
@@ -291,6 +291,9 @@ endfunc
 " Blank
 au BufNewFile,BufRead *.bl			setf blank
 
+" Blkid cache file
+au BufNewFile,BufRead /etc/blkid.tab,/etc/blkid.tab.old   setf xml
+
 " C or lpc
 au BufNewFile,BufRead *.c			call s:FTlpc()
 
@@ -739,7 +742,7 @@ au BufNewFile,BufRead *.groovy			setf groovy
 au BufNewFile,BufRead *.gsp			setf gsp
 
 " Group file
-au BufNewFile,BufRead /etc/group,/etc/group-,/etc/group.edit,/etc/gshadow,/etc/gshadow-,/etc/gshadow.edit,/var/backups/group.bak,/var/backups/gshadow.bak		setf group
+au BufNewFile,BufRead /etc/group,/etc/group-,/etc/group.edit,/etc/gshadow,/etc/gshadow-,/etc/gshadow.edit,/var/backups/group.bak,/var/backups/gshadow.bak  setf group
 
 " GTK RC
 au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
@@ -800,6 +803,9 @@ au BufNewFile,BufRead *.tmpl			setf htmlcheetah
 " Host config
 au BufNewFile,BufRead /etc/host.conf		setf hostconf
 
+" Hosts access
+au BufNewFile,BufRead /etc/hosts.allow,/etc/hosts.deny  setf hostsaccess
+
 " Hyper Builder
 au BufNewFile,BufRead *.hb			setf hb
 
@@ -850,7 +856,7 @@ endfunc
 
 
 " Indent RC
-au BufNewFile,BufRead indentrc			setf indentrc
+au BufNewFile,BufRead indentrc			setf indent
 
 " Inform
 au BufNewFile,BufRead *.inf,*.INF		setf inform
@@ -1463,6 +1469,9 @@ au BufNewFile,BufRead *.pyx,*.pxd		setf pyrex
 " Python
 au BufNewFile,BufRead *.py,*.pyw		setf python
 
+" Quixote (Python-based web framework)
+au BufNewFile,BufRead *.ptl			setf python
+
 " Radiance
 au BufNewFile,BufRead *.rad,*.mat		setf radiance
 
@@ -1561,6 +1570,9 @@ au BufNewFile,BufRead *.rst			setf rst
 " RTF
 au BufNewFile,BufRead *.rtf			setf rtf
 
+" Interactive Ruby shell
+au BufNewFile,BufRead .irbrc,irbrc		setf ruby
+
 " Ruby
 au BufNewFile,BufRead *.rb,*.rbw,*.gem,*.gemspec	setf ruby
 
diff --git a/src/screen.c b/src/screen.c
index 66d50a54..95a89144 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7140,7 +7140,7 @@ screen_fill(start_row, end_row, start_col, end_col, c1, c2, attr)
 	     * terminal. */
 	    if (mb_fix_col(start_col, row) != start_col)
 		screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0);
-	    if (mb_fix_col(end_col, row) != end_col)
+	    if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col)
 		screen_puts_len((char_u *)" ", 1, row, end_col, 0);
 	}
 #endif
diff --git a/src/search.c b/src/search.c
index 8a00757f..5586bddb 100644
--- a/src/search.c
+++ b/src/search.c
@@ -5375,7 +5375,7 @@ write_viminfo_search_pattern(fp)
 	    (no_hlsearch || find_viminfo_parameter('h') != NULL) ? 'h' : 'H');
 #endif
 	wvsp_one(fp, RE_SEARCH, "", '/');
-	wvsp_one(fp, RE_SUBST, "Substitute ", '&');
+	wvsp_one(fp, RE_SUBST, _("Substitute "), '&');
     }
 }
 
diff --git a/src/tag.c b/src/tag.c
index 7d79e809..1352f204 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -3854,6 +3854,8 @@ get_tags(list, pat)
 			    /* Skip field without colon. */
 			    while (*p != NUL && *p >= ' ')
 				++p;
+			if (*p == NUL)
+			    break;
 		    }
 		}
 	    }
diff --git a/src/version.c b/src/version.c
index 95d6d54f..d51c8777 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,14 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    9,
+/**/
+    8,
+/**/
+    7,
+/**/
+    6,
+/**/
     5,
 /**/
     4,
-- 
2.11.4.GIT