rpms/vim/devel 6.4.004, NONE, 1.1 vim-6.4-fstabsyntax.patch, NONE, 1.1 README.patches, 1.37, 1.38 vim.spec, 1.90, 1.91

Thu Dec 8 14:41:09 UTC 2005

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23981

Modified Files:
	README.patches vim.spec 
Added Files:
	6.4.004 vim-6.4-fstabsyntax.patch 
Log Message:
- fix fstab syntax file (#174735)
- patchlevel 4

--- NEW FILE 6.4.004 ---
To: vim-dev at vim.org
Subject: Patch 6.4.004
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.4.004
Problem:    "go" does not work correctly in combination with 'virtualedit'.
	    (Alojz Motesicky)
Solution:   Reset the "coladd" field.
Files:	    src/memline.c


*** ../vim-6.4.003/src/memline.c	Thu Feb 17 11:02:53 2005
--- src/memline.c	Thu Dec  1 16:07:04 2005
***************
*** 4368,4373 ****
--- 4368,4376 ----
      {
  	curwin->w_cursor.lnum = lnum;
  	curwin->w_cursor.col = (colnr_T)boff;
+ # ifdef FEAT_VIRTUALEDIT
+ 	curwin->w_cursor.coladd = 0;
+ # endif
  	curwin->w_set_curswant = TRUE;
      }
      check_cursor();
*** ../vim-6.4.003/src/version.c	Wed Nov 30 12:38:32 2005
--- src/version.c	Thu Dec  1 16:07:55 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     4,
  /**/

-- 
       Bravely bold Sir Robin, rode forth from Camelot,
       He was not afraid to die, Oh Brave Sir Robin,
       He was not at all afraid to be killed in nasty ways
       Brave, brave, brave, brave Sir Robin.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://www.ICCF.nl         ///

vim-6.4-fstabsyntax.patch:
 fstab.vim |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE vim-6.4-fstabsyntax.patch ---
--- vim64/runtime/syntax/fstab.vim.rh1	2005-12-08 15:24:37.000000000 +0100
+++ vim64/runtime/syntax/fstab.vim	2005-12-08 15:27:55.000000000 +0100
@@ -32,7 +32,7 @@
 " Type
 syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeError
 syn match fsTypeError /\s\+\zs\w\+/ contained
-syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union vfat xfs
+syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysfs sysv swap tmpfs udf ufs umap umsdos union vfat xfs
 
 " Options
 " -------
@@ -44,7 +44,7 @@
 syn keyword fsOptionsYesNo yes no
 syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
 syn keyword fsOptionsSize 512 1024 2048
-syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount users loop
+syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab managed noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner pamconsole ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount users loop
 syn match fsOptionsGeneral /_netdev/
 
 " Options: adfs


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- README.patches	30 Nov 2005 14:28:01 -0000	1.37
+++ README.patches	8 Dec 2005 14:41:06 -0000	1.38
@@ -28,3 +28,4 @@
   1705  6.4.001  (extra) Win32: can't compile the global IME code
   7802  6.4.002  Unix: may change owner of wrong file in rare cases
   1463  6.4.003  (after 6.4.002) build problem on non-Unix system
+  1581  6.4.004  "go" doesn't work correctly when 'virtualedit' is set


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- vim.spec	30 Nov 2005 14:28:01 -0000	1.90
+++ vim.spec	8 Dec 2005 14:41:06 -0000	1.91
@@ -20,7 +20,7 @@
 
 %define baseversion 6.4
 %define vimdir vim64
-%define patchlevel 003
+%define patchlevel 004
 
 Summary: The VIM editor.
 Name: vim
@@ -55,6 +55,7 @@
 #Patch001: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.001
 Patch002: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.002
 Patch003: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.003
+Patch004: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.004
 
 Patch3000: vim-6.1-syntax.patch
 Patch3001: vim-6.2-rh1.patch
@@ -66,6 +67,7 @@
 Patch3007: vim-6.3-dnssyntax.patch
 Patch3008: vim-6.4-cvim.patch
 Patch3009: vim-6.4-checkhl.patch
+Patch3010: vim-6.4-fstabsyntax.patch
 
 Patch3100: vim-selinux.patch
 
@@ -181,6 +183,7 @@
 #%patch001 -p0
 %patch002 -p0
 %patch003 -p0
+%patch004 -p0
 
 
 %patch3000 -p1
@@ -193,6 +196,7 @@
 %patch3007 -p1
 
 %patch3009 -p1
+%patch3010 -p1
 
 %if %{WITH_SELINUX}
 %patch3100 -p1
@@ -479,6 +483,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Dec 08 2005 Karsten Hopp <karsten at redhat.de> 6.4.004-1
+- fix fstab syntax file (#174735)
+- patchlevel 4
+
 * Wed Nov 30 2005 Karsten Hopp <karsten at redhat.de> 6.4.003-1
 - patchlevel 3
 - remove withgui switch as we include vim-X11 in all our distributions now 


