14 files changed, 92 insertions, 27 deletions
diff --git a/runtime/autoload/spellfile.vim b/runtime/autoload/spellfile.vim
index 6fedac190..b9e17f1f1 100644
--- a/runtime/autoload/spellfile.vim
+++ b/runtime/autoload/spellfile.vim
@@ -1,6 +1,6 @@
 " Vim script to download a missing spell file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2007 May 06
+" Last Change:	2007 May 08
 
 if !exists('g:spellfile_URL')
   let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
@@ -145,6 +145,12 @@ endfunc
 
 " Read "fname" from the server.
 function! spellfile#Nread(fname)
+  " We do our own error handling, don't want a window for it.
+  if exists("g:netrw_use_errorwindow")
+    let save_ew = g:netrw_use_errorwindow
+  endif
+  let g:netrw_use_errorwindow=0
+
   if g:spellfile_URL =~ '^ftp://'
     " for an ftp server use a default login and password to avoid a prompt
     let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
@@ -153,4 +159,10 @@ function! spellfile#Nread(fname)
   else
     exe 'Nread ' g:spellfile_URL . '/' . a:fname
   endif
+
+  if exists("save_ew")
+    let g:netrw_use_errorwindow = save_ew
+  else
+    unlet g:netrw_use_errorwindow
+  endif
 endfunc
diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt
index dd57c5c84..e68e3e89e 100644
--- a/runtime/doc/farsi.txt
+++ b/runtime/doc/farsi.txt
@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 7.1a.  Last change: 2005 Mar 29
+*farsi.txt*     For Vim version 7.1b.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 4b8bfafd1..ada9d5087 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.1a.  Last change: 2007 Mar 24
+*filetype.txt*  For Vim version 7.1b.  Last change: 2007 May 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -423,7 +423,8 @@ Global mappings:
 			same as the local <Leader>o described above.
 
 Variables:
-g:changelog_timeformat	The date (and time) format used in ChangeLog entries.
+g:changelog_timeformat  Deprecated; use g:changelog_dateformat instead.
+g:changelog_dateformat	The date (and time) format used in ChangeLog entries.
 			The format accepted is the same as for the
 			|strftime()| function.
 			The default is "%Y-%m-%d" which is the standard format
@@ -473,6 +474,14 @@ g:changelog_date_entry_search
 				|2003-01-14  Full Name  <user@host>
 <			and some similar formats.
 
+g:changelog_date_end_entry_search
+			The search pattern to use when searching for the end
+			of a date-entry.
+			The same tokens that can be used for
+			g:changelog_new_date_format can be used here as well.
+			The default is '^\s*$' which finds lines that contain
+			only whitespace or are completely empty.
+
 The Changelog entries are inserted where they add the least amount of text.
 After figuring out the current date and user, the file is searched for an
 entry beginning with the current date and user and if found adds another item
diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt
index 09d6cbdca..2e361b040 100644
--- a/runtime/doc/os_dos.txt
+++ b/runtime/doc/os_dos.txt
@@ -1,4 +1,4 @@
-*os_dos.txt*    For Vim version 7.1a.  Last change: 2006 Mar 30
+*os_dos.txt*    For Vim version 7.1b.  Last change: 2006 Mar 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
index bf66f9dfd..57018603a 100644
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 7.1a.  Last change: 2007 Apr 22
+*os_win32.txt*  For Vim version 7.1b.  Last change: 2007 Apr 22
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
diff --git a/runtime/doc/pi_spec.txt b/runtime/doc/pi_spec.txt
index b075873c4..ce6fb5cc4 100644
--- a/runtime/doc/pi_spec.txt
+++ b/runtime/doc/pi_spec.txt
@@ -1,4 +1,4 @@
-*pi_spec.txt*   For Vim version 7.1a.  Last change: 2006 Apr 24
+*pi_spec.txt*   For Vim version 7.1b.  Last change: 2006 Apr 24
 
 by Gustavo Niemeyer ~
 
diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt
index 2cf0bec73..da57596b1 100644
--- a/runtime/doc/scroll.txt
+++ b/runtime/doc/scroll.txt
@@ -1,4 +1,4 @@
-*scroll.txt*    For Vim version 7.1a.  Last change: 2006 Aug 27
+*scroll.txt*    For Vim version 7.1b.  Last change: 2006 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index a1c85f2fc..dcca05200 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.1a.  Last change: 2007 May 05
+*todo.txt*      For Vim version 7.1b.  Last change: 2007 May 10
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -35,6 +35,9 @@ Patch to make virtcol([123, '$']) do the right thing. (Michael Schaap)
 Insert mode completion: CTRL-N and CTRL-P work differently and they both don't
 work as expected. (Bernhard Walle, 2007 Feb 27)
 
+When 'rightleft' is set the completion menu is positioned wrong. (Baha-Eddine
+MOKADEM)
+
 glob() doesn't work correctly with single quotes and 'shell' set to /bin/sh.
 (Adri Verhoef, Charles Campbell 2007 Mar 26)
 
@@ -94,6 +97,10 @@ See remarks from Adri, 2007 Feb 9.
 
 When opening quickfix window, disable spell checking?
 
+Windows 98: pasting from the clipboard with text from another application has
+a trailing NUL.  (Joachim Hofmann)  Perhaps the length specified for CF_TEXT
+isn't right?
+
 Win32: When 'encoding' is "latin1" 'ignorecase' doesn't work for characters
 with umlaut. (Joachim Hofmann)  toupper_tab[] and tolower_tab[] are not filled
 properly?
@@ -201,6 +208,8 @@ C++ indenting wrong with "=". (James Kanze, 2007 Jan 26)
 
 ":lockvar" should use copyID to avoid endless loop.
 
+Patch to use xterm mouse codes for screen. (Micah Cowan, 2007 May 8)
+
 Gvim: dialog for closing Vim should check if Vim is busy writing a file.  Then
 use a different dialog: "busy saving, really quit? yes / no".
 
@@ -365,9 +374,6 @@ GDK_WINDOW_STATE_MAXIMIZED) and set it again?
 Another resizing problem when setting 'columns' and 'lines' to a very large
 number. (Tony Mechelynck, 2007 Feb 6)
 
-Mutt files are not always recognized.  Change pattern to include
-non-alphanumeric characters. (Gary Johnson, 2006 Jul 25)
-
 Problem with using :redir in user command completion function? (Hari Krishna
 Dara, 2006 June 21)
 
@@ -1581,7 +1587,7 @@ Tab pages:
 8   :tabmove -N	 move tab page N pages backward
 7   :tabdup	 duplicate the tab with all its windows.
 7   Option to put tab line at the left or right?  Need an option to specify
-    its witdh.  It's like a separate window with ":tabs" output.
+    its width.  It's like a separate window with ":tabs" output.
 7   Add local variables for each tab page?
 8   Add local options for each tab page?  E.g., 'diffopt' could differ between
     tab pages.
diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt
index 29a9ec8e4..af50d2886 100644
--- a/runtime/doc/usr_04.txt
+++ b/runtime/doc/usr_04.txt
@@ -1,4 +1,4 @@
-*usr_04.txt*	For Vim version 7.1a.  Last change: 2006 Jun 21
+*usr_04.txt*	For Vim version 7.1b.  Last change: 2006 Jun 21
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index a9780c0d3..ee90eda97 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 7.1a.  Last change: 2006 Jul 10
+*usr_05.txt*	For Vim version 7.1b.  Last change: 2006 Jul 10
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt
index 919cd4fe5..944a21b51 100644
--- a/runtime/doc/usr_12.txt
+++ b/runtime/doc/usr_12.txt
@@ -1,4 +1,4 @@
-*usr_12.txt*	For Vim version 7.1a.  Last change: 2006 Nov 18
+*usr_12.txt*	For Vim version 7.1b.  Last change: 2006 Nov 18
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 682dcfaee..fe395dd95 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.1a.  Last change: 2007 May 05
+*version7.txt*  For Vim version 7.1b.  Last change: 2007 May 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1007,15 +1007,15 @@ MatchParen              matching parens |pi_paren.txt| |hl-MatchParen|
 
 New items in search patterns: ~
 |/\%d| \%d123		search for character with decimal number
-|/\]|  [\d123]		idem, in a colletion
+|/\]|  [\d123]		idem, in a collection
 |/\%o| \%o103		search for character with octal number
-|/\]|  [\o1o3]		idem, in a colletion
+|/\]|  [\o1o3]		idem, in a collection
 |/\%x| \%x1a		search for character with 2 pos. hex number
-|/\]|  [\x1a]		idem, in a colletion
+|/\]|  [\x1a]		idem, in a collection
 |/\%u| \%u12ab		search for character with 4 pos. hex number
-|/\]|  [\u12ab]		idem, in a colletion
+|/\]|  [\u12ab]		idem, in a collection
 |/\%U| \%U1234abcd	search for character with 8 pos. hex number
-|/\]|  [\U1234abcd]	idem, in a colletion
+|/\]|  [\U1234abcd]	idem, in a collection
 			    (The above partly by Ciaran McCreesh)
 
 |/[[=| [[=a=]]		an equivalence class (only for latin1 characters)
@@ -2795,7 +2795,7 @@ move the cursor left.
 
 Prevent that using CTRL-R = in Insert mode can start Visual mode.
 
-Fixed a crash that occured when in Insert mode with completion active and a
+Fixed a crash that occurred when in Insert mode with completion active and a
 mapping caused edit() to be called recursively.
 
 When using CTRL-O in Insert mode just after the last character while
@@ -2989,21 +2989,29 @@ Added setting 'mouse' in vimrc_example.vim.
 When building with MZscheme also look for include files in the "plt"
 subdirectory.  That's where they are for FreeBSD.
 
+The Ruby interface module is now called "Vim" instead of "VIM".  But "VIM" is
+an alias, so it's backwards compatible. (Tim Pope)
+
 
 Added							*added-7.1*
 -----
 
 New syntax files:
+	/var/log/messages (Yakov Lerner)
 	AutoIt v3 (Jared Breland)
 	Bazaar commit file "bzr". (Dmitry Vasiliev)
+	Cdrdao TOC (Nikolai Weibull)
 	Cmusrc (Nikolai Weibull)
 	FreeBasic (Mark Manning)
 	Hamster (David Fishburn)
 	IBasic (Mark Manning)
-	initng (Elan Ruusamae)
-	/var/log/messages (Yakov Lerner)
 	Privoxy actions file (Doug Kearns)
 	Streaming Descriptors "sd" (Puria Nafisi Azizi)
+	initng (Elan Ruusamae)
+	Autohotkey (Nikolai Weibull)
+	Framescript (Nikolai Weibull)
+	Ldapconf (Nikolai Weibull)
+	Litestep (Nikolai Weibull)
 
 New tutor files:
 	Hungarian (Arpad Horvath)
@@ -4556,4 +4564,34 @@ Solution:   Embed the linker manifest file into the resources of GvimExt.dll.
 Files:	    src/GvimExt/Makefile
 
 
+Fixes after Vim 7.1a BETA:
+
+The extra archive had CVS directories included below "farsi" and
+"runtime/icons".  CVS was missing the farsi icon files.
+
+Fix compiling with Gnome 2.18, undefine bind_textdomain_codeset. (Daniel
+Drake)
+
+Mac: "make install" didn't copy rgb.txt.
+
+When editing a compressed file while there are folds caused "ml_get" errors
+and some lines could be missing.  When decompressing failed option values were
+not restored.
+
+
+Patch 7.1a.001
+Problem:    Crash when downloading a spell file.  (Szabolcs Horvat)
+Solution:   Avoid that did_set_spelllang() is used recursively when a new
+	    window is opened for the download.
+	    Also avoid wiping out the wrong buffer.
+Files:	    runtime/autoload/spellfile.vim, src/buffer.c, src/ex_cmds.c,
+            src/spell.c
+
+Patch 7.1a.002 (extra)
+Problem:    Compilation error with MingW.
+Solution:   Check for LPTOOLTIPTEXT to be defined.
+Files:	    src/gui_w32.c
+
+
+
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/workshop.txt b/runtime/doc/workshop.txt
index a0502cc5b..b7ecf7c0e 100644
--- a/runtime/doc/workshop.txt
+++ b/runtime/doc/workshop.txt
@@ -1,4 +1,4 @@
-*workshop.txt*  For Vim version 7.1a.  Last change: 2006 Apr 24
+*workshop.txt*  For Vim version 7.1b.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
diff --git a/runtime/spell/pt/pt_BR.diff b/runtime/spell/pt/pt_BR.diff
index dc7825bf4..4dc7f1b98 100644
--- a/runtime/spell/pt/pt_BR.diff
+++ b/runtime/spell/pt/pt_BR.diff
@@ -8,5 +8,5 @@
 + LOW  ��������������������������������
 + UPP  ��������������������������������
 + 
-+ MIDWORD	'
++ MIDWORD	'-.