[vim/f18: 85/86] Merge commit 'c8d55a4ffc9503371b9738188e056eba33134f47' into f18

[Karsten Hopp]

commit 77fc86d85a5e3ef4e33631706028258319976e65
Merge: dfd24f3 c8d55a4
Author: Karsten Hopp <karsten at redhat.com>
Date:   Tue Aug 28 15:41:34 2012 +0200

    Merge commit 'c8d55a4ffc9503371b9738188e056eba33134f47' into f18
    
    Conflicts:
    	README.patches
    	vim.spec

 7.3.623                                  |   92 +++++
 7.3.624                                  |   52 +++
 7.3.625                                  |  140 ++++++++
 7.3.626                                  |   49 +++
 7.3.627                                  |  102 ++++++
 7.3.628                                  |   54 +++
 7.3.629                                  |  437 ++++++++++++++++++++++++
 7.3.630                                  |   48 +++
 7.3.631                                  |  322 ++++++++++++++++++
 7.3.632                                  |  537 ++++++++++++++++++++++++++++++
 7.3.633                                  |   81 +++++
 7.3.634                                  |   57 ++++
 7.3.635                                  |   50 +++
 7.3.636                                  |  148 ++++++++
 7.3.637                                  |   94 ++++++
 7.3.638                                  |   55 +++
 README.patches                           |   19 +
 vim-7.3-manpage-typo-668894-675480.patch |   21 ++
 vim.spec                                 |   65 +++-
 vimrc                                    |    2 +-
 20 files changed, 2414 insertions(+), 11 deletions(-)
---
diff --cc README.patches
index 63d94e6,dfe8b80..a559c7e
--- a/README.patches
+++ b/README.patches
@@@ -653,3 -653,19 +653,22 @@@ Individual patches for Vim 7.3
    4897  7.3.620  building with recent Ruby on Win32 doesn't work
    2259  7.3.621  compiler warnings on 64 bit windows
    1867  7.3.622  XPM library for Win32 can't be found
++<<<<<<< HEAD
++=======
+   2426  7.3.623  Perl 5.14 commands crash Vim on MS-Windows
+   1800  7.3.624  when cancelling input() it returns the third argument
+   4327  7.3.625  "gn" does not handle zero-width matches correctly
+   1500  7.3.626  Python interface doesn't build with Python 2.4 or older
+   2803  7.3.627  expression not evaluated when using "n" flag with ":s"
+   1802  7.3.628  ":open!" results in a confusing error message
+  12019  7.3.629  there is no way to make 'shiftwidth' follow 'tabstop'
+   1487  7.3.630  "|" does not behave correctly when 'virtualedit' is set
+  10100  7.3.631  cannot complete user names
+  14770  7.3.632  cannot select beyond 222 columns with the mouse in xterm
+   2238  7.3.633  selection remains highlighted after selecting another text
+   1884  7.3.634  Month/Day format for undo is confusing
+   1586  7.3.635  system call during startup sets 'lines' to a wrong value
+   4539  7.3.636  (after 7.3.625) "gn" fails for some zero-width matches
+   3117  7.3.637  cannot catch error caused by a foldopen when there is no fold
+   1783  7.3.638  unecessary redraw of the previous character
++>>>>>>> c8d55a4ffc9503371b9738188e056eba33134f47
diff --cc vim.spec
index 6d569b2,779849f..ea4ed68
--- a/vim.spec
+++ b/vim.spec
@@@ -1901,36 -1938,14 +1938,44 @@@ rm -rf $RPM_BUILD_ROO
  %{_datadir}/icons/hicolor/*/apps/*
  
  %changelog
+ * Tue Aug 28 2012 Karsten Hopp <karsten at redhat.com> 7.3.638-2
+ - fix some man page typos (#668894, #675480)
+ - own usr/share/vim/vimfiles/doc/tags (#845564)
+ - add path to csope database (#844843)
+ 
+ * Tue Aug 28 2012 Karsten Hopp <karsten at redhat.com> 7.3.638-1
+ - patchlevel 638
+ 
 +* Mon Aug 06 2012 Karsten Hopp <karsten at redhat.com> 2:7.3.622-2
 +- add epoch to spec.vim and automatic changelog entries
 +
 +* Mon Aug 06 2012 Karsten Hopp <karsten at redhat.com> 7.3.622-1
 +- patchlevel 622
 +
 +* Mon Aug 06 2012 Karsten Hopp <karsten at redhat.com> 7.3.604-1
 +- drop vim-6.1-rh3.patch, (bz #754801)
 +
 +* Wed Jul 18 2012 Karsten Hopp <karsten at redhat.com> 7.3.604-1
 +- patchlevel 604
 +
 +* Wed Jul 11 2012 Petr Pisar <ppisar at redhat.com> - 2:7.3.594-2
 +- Perl 5.16 rebuild
 +
 +* Tue Jul 10 2012 Karsten Hopp <karsten at redhat.com> 7.3.594-1
 +- patchlevel 594
 +
 +* Tue Jul 10 2012 Karsten Hopp <karsten at redhat.com> 7.3.592-1
 +- patchlevel 592
 +
 +* Mon Jul 09 2012 Petr Pisar <ppisar at redhat.com> - 2:7.3.584-2
 +- Perl 5.16 rebuild
 +
 +* Mon Jul 02 2012 Karsten Hopp <karsten at redhat.com> 7.3.584-1
 +- patchlevel 584
 +
 +* Thu Jun 28 2012 Petr Pisar <ppisar at redhat.com> - 2:7.3.556-2
 +- Perl 5.16 rebuild
 +
  * Mon Jun 18 2012 Karsten Hopp <karsten at redhat.com> 7.3.556-1
  - patchlevel 556