SOURCES: 6.3.081 (NEW), 6.3.082 (NEW), 6.3.083 (NEW), 6.3.084 (NEW...

adamg adamg at pld-linux.org
Fri Jul 29 13:35:20 CEST 2005


Author: adamg                        Date: Fri Jul 29 11:35:20 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   6.3.081 (NONE -> 1.1)  (NEW), 6.3.082 (NONE -> 1.1)  (NEW), 6.3.083 (NONE -> 1.1)  (NEW), 6.3.084 (NONE -> 1.1)  (NEW), 6.3.085 (NONE -> 1.1)  (NEW), 6.3.086 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/6.3.081
diff -u /dev/null SOURCES/6.3.081:1.1
--- /dev/null	Fri Jul 29 13:35:20 2005
+++ SOURCES/6.3.081	Fri Jul 29 13:35:15 2005
@@ -0,0 +1,57 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.081
+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.3.081
+Problem:    Unix: glob() may execute a shell command when it's not wanted.
+	    (Georgi Guninski)
+Solution:   Verify the sandbox flag is not set.
+Files:	    src/os_unix.c
+
+
+*** ../vim-6.3.080/src/os_unix.c	Sat Jan 29 16:14:42 2005
+--- src/os_unix.c	Tue Jul 19 22:29:34 2005
+***************
+*** 4700,4706 ****
+      /*
+       * Don't allow the use of backticks in secure and restricted mode.
+       */
+!     if (secure || restricted)
+  	for (i = 0; i < num_pat; ++i)
+  	    if (vim_strchr(pat[i], '`') != NULL
+  		    && (check_restricted() || check_secure()))
+--- 4700,4710 ----
+      /*
+       * Don't allow the use of backticks in secure and restricted mode.
+       */
+!     if (secure || restricted
+! # ifdef HAVE_SANDBOX
+! 	    || sandbox != 0
+! # endif
+! 	    )
+  	for (i = 0; i < num_pat; ++i)
+  	    if (vim_strchr(pat[i], '`') != NULL
+  		    && (check_restricted() || check_secure()))
+*** ../vim-6.3.080/src/version.c	Mon Jul  4 12:19:01 2005
+--- src/version.c	Tue Jul 19 22:26:32 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     81,
+  /**/
+
+-- 
+    With sufficient thrust, pigs fly just fine.
+                   -- RFC 1925
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

================================================================
Index: SOURCES/6.3.082
diff -u /dev/null SOURCES/6.3.082:1.1
--- /dev/null	Fri Jul 29 13:35:20 2005
+++ SOURCES/6.3.082	Fri Jul 29 13:35:15 2005
@@ -0,0 +1,68 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.082
+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.3.082 (after 6.3.081)
+Problem:    Unix: expand() may execute a shell command when it's not wanted.
+            (Georgi Guninski)
+Solution:   A more generic solution than 6.3.081.
+Files:      src/os_unix.c
+    
+
+*** ../vim-6.3.081/src/os_unix.c	Tue Jul 19 22:31:54 2005
+--- src/os_unix.c	Wed Jul 20 10:54:12 2005
+***************
+*** 4697,4710 ****
+      if (!have_wildcard(num_pat, pat))
+  	return save_patterns(num_pat, pat, num_file, file);
+  
+      /*
+       * Don't allow the use of backticks in secure and restricted mode.
+       */
+!     if (secure || restricted
+! # ifdef HAVE_SANDBOX
+! 	    || sandbox != 0
+! # endif
+! 	    )
+  	for (i = 0; i < num_pat; ++i)
+  	    if (vim_strchr(pat[i], '`') != NULL
+  		    && (check_restricted() || check_secure()))
+--- 4697,4712 ----
+      if (!have_wildcard(num_pat, pat))
+  	return save_patterns(num_pat, pat, num_file, file);
+  
++ # ifdef HAVE_SANDBOX
++     /* Don't allow any shell command in the sandbox. */
++     if (sandbox != 0 && check_secure())
++ 	return FAIL;
++ # endif
++ 
+      /*
+       * Don't allow the use of backticks in secure and restricted mode.
+       */
+!     if (secure || restricted)
+  	for (i = 0; i < num_pat; ++i)
+  	    if (vim_strchr(pat[i], '`') != NULL
+  		    && (check_restricted() || check_secure()))
+*** ../vim-6.3.081/src/version.c	Tue Jul 19 22:31:54 2005
+--- src/version.c	Wed Jul 20 11:03:50 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     82,
+  /**/
+
+-- 
+No letters of the alphabet were harmed in the creation of this message.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

================================================================
Index: SOURCES/6.3.083
diff -u /dev/null SOURCES/6.3.083:1.1
--- /dev/null	Fri Jul 29 13:35:20 2005
+++ SOURCES/6.3.083	Fri Jul 29 13:35:15 2005
@@ -0,0 +1,106 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.083
+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.3.083
+Problem:    VMS: The vt320 termcap entry is incomplete.
+Solution:   Add missing function keys.  (Zoltan Arpadffy)
+Files:	    src/term.c
+
+
+*** ../vim-6.3.082/src/term.c	Sat Sep 18 20:28:07 2004
+--- src/term.c	Thu Jul 21 13:00:18 2005
+***************
+*** 812,827 ****
+      {(int)KS_CCO,	"8"},			/* allow 8 colors */
+      {(int)KS_ME,	IF_EB("\033[0m", ESC_STR "[0m")},
+      {(int)KS_MR,	IF_EB("\033[7m", ESC_STR "[7m")},
+!     {(int)KS_MD,        IF_EB("\033[1m", ESC_STR "[1m")},  /* bold mode */
+!     {(int)KS_SE,        IF_EB("\033[22m", ESC_STR "[22m")},/* normal mode */
+!     {(int)KS_UE,        IF_EB("\033[24m", ESC_STR "[24m")},/* exit underscore mode */
+!     {(int)KS_US,        IF_EB("\033[4m", ESC_STR "[4m")},  /* underscore mode */
+!     {(int)KS_CZH,       IF_EB("\033[34;43m", ESC_STR "[34;43m" )},  /* italic mode: blue text on yellow */
+!     {(int)KS_CZR,       IF_EB("\033[0m", ESC_STR "[0m")},           /* italic mode end */
+!     {(int)KS_CAB,       IF_EB("\033[4%dm", ESC_STR "[4%dm" )},      /* set background color (ANSI) */
+!     {(int)KS_CAF,       IF_EB("\033[3%dm", ESC_STR "[3%dm" )},      /* set foreground color (ANSI) */
+!     {(int)KS_CSB,       IF_EB("\033[102;%dm", ESC_STR "[102;%dm" )},    /* set screen background color */
+!     {(int)KS_CSF,       IF_EB("\033[101;%dm", ESC_STR "[101;%dm" )},    /* set screen foreground color */
+      {(int)KS_MS,	"y"},
+      {(int)KS_UT,	"y"},
+      {(int)KS_LE,	"\b"},
+--- 812,827 ----
+      {(int)KS_CCO,	"8"},			/* allow 8 colors */
+      {(int)KS_ME,	IF_EB("\033[0m", ESC_STR "[0m")},
+      {(int)KS_MR,	IF_EB("\033[7m", ESC_STR "[7m")},
+!     {(int)KS_MD,	IF_EB("\033[1m", ESC_STR "[1m")},  /* bold mode */
+!     {(int)KS_SE,	IF_EB("\033[22m", ESC_STR "[22m")},/* normal mode */
+!     {(int)KS_UE,	IF_EB("\033[24m", ESC_STR "[24m")},/* exit underscore mode */
+!     {(int)KS_US,	IF_EB("\033[4m", ESC_STR "[4m")},  /* underscore mode */
+!     {(int)KS_CZH,	IF_EB("\033[34;43m", ESC_STR "[34;43m")},  /* italic mode: blue text on yellow */
+!     {(int)KS_CZR,	IF_EB("\033[0m", ESC_STR "[0m")},	    /* italic mode end */
+!     {(int)KS_CAB,	IF_EB("\033[4%dm", ESC_STR "[4%dm")},	    /* set background color (ANSI) */
+!     {(int)KS_CAF,	IF_EB("\033[3%dm", ESC_STR "[3%dm")},	    /* set foreground color (ANSI) */
+!     {(int)KS_CSB,	IF_EB("\033[102;%dm", ESC_STR "[102;%dm")},	/* set screen background color */
+!     {(int)KS_CSF,	IF_EB("\033[101;%dm", ESC_STR "[101;%dm")},	/* set screen foreground color */
+      {(int)KS_MS,	"y"},
+      {(int)KS_UT,	"y"},
+      {(int)KS_LE,	"\b"},
+***************
+*** 840,852 ****
+      {K_DOWN,		IF_EB("\033[B", ESC_STR "[B")},
+      {K_RIGHT,		IF_EB("\033[C", ESC_STR "[C")},
+      {K_LEFT,		IF_EB("\033[D", ESC_STR "[D")},
+      {K_F6,		IF_EB("\033[17~", ESC_STR "[17~")},
+      {K_F7,		IF_EB("\033[18~", ESC_STR "[18~")},
+      {K_F8,		IF_EB("\033[19~", ESC_STR "[19~")},
+      {K_F9,		IF_EB("\033[20~", ESC_STR "[20~")},
+      {K_F10,		IF_EB("\033[21~", ESC_STR "[21~")},
+! /*  {K_F11,		IF_EB("\033[23~", ESC_STR "[23~")},
+! 			*  (ESC) should not define, sometimes does not work */
+      {K_F12,		IF_EB("\033[24~", ESC_STR "[24~")},
+      {K_F13,		IF_EB("\033[25~", ESC_STR "[25~")},
+      {K_F14,		IF_EB("\033[26~", ESC_STR "[26~")},
+--- 840,856 ----
+      {K_DOWN,		IF_EB("\033[B", ESC_STR "[B")},
+      {K_RIGHT,		IF_EB("\033[C", ESC_STR "[C")},
+      {K_LEFT,		IF_EB("\033[D", ESC_STR "[D")},
++     {K_F1,		IF_EB("\033[11~", ESC_STR "[11~")},
++     {K_F2,		IF_EB("\033[12~", ESC_STR "[12~")},
++     {K_F3,		IF_EB("\033[13~", ESC_STR "[13~")},
++     {K_F4,		IF_EB("\033[14~", ESC_STR "[14~")},
++     {K_F5,		IF_EB("\033[15~", ESC_STR "[15~")},
+      {K_F6,		IF_EB("\033[17~", ESC_STR "[17~")},
+      {K_F7,		IF_EB("\033[18~", ESC_STR "[18~")},
+      {K_F8,		IF_EB("\033[19~", ESC_STR "[19~")},
+      {K_F9,		IF_EB("\033[20~", ESC_STR "[20~")},
+      {K_F10,		IF_EB("\033[21~", ESC_STR "[21~")},
+!     {K_F11,		IF_EB("\033[23~", ESC_STR "[23~")},
+      {K_F12,		IF_EB("\033[24~", ESC_STR "[24~")},
+      {K_F13,		IF_EB("\033[25~", ESC_STR "[25~")},
+      {K_F14,		IF_EB("\033[26~", ESC_STR "[26~")},
+*** ../vim-6.3.082/src/version.c	Wed Jul 20 11:09:52 2005
+--- src/version.c	Thu Jul 21 13:01:35 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     83,
+  /**/
+
+-- 
+ARTHUR:   Ni!
+BEDEVERE: Nu!
+ARTHUR:   No.  Ni!  More like this. "Ni"!
+BEDEVERE: Ni, ni, ni!
+                 "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/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

================================================================
Index: SOURCES/6.3.084
diff -u /dev/null SOURCES/6.3.084:1.1
--- /dev/null	Fri Jul 29 13:35:20 2005
+++ SOURCES/6.3.084	Fri Jul 29 13:35:15 2005
@@ -0,0 +1,270 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.084 (extra)
+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.3.084 (extra)
+Problem:    Cygwin: compiling with DEBUG doesn't work.  Perl path was ignored.
+	    Failure when $(OUTDIR) already exists.  "po" makefile is missing.
+Solution:   Use changes tested in Vim 7. (Tony Mechelynck)
+Files:	    src/Make_cyg.mak, src/po/Make_cyg.mak
+
+
+*** ../vim-6.3.083/src/Make_cyg.mak	Wed Jun  9 14:56:27 2004
+--- src/Make_cyg.mak	Thu Jul 21 13:48:38 2005
+***************
+*** 1,6 ****
+  #
+  # Makefile for VIM on Win32, using Cygnus gcc
+! # Last updated by Dan Sharp.  Last Change: 2004 Apr 23
+  #
+  # This compiles Vim as a Windows application.  If you want Vim to run as a
+  # Cygwin application use the Makefile (just like on Unix).
+--- 1,7 ----
+  #
+  # Makefile for VIM on Win32, using Cygnus gcc
+! # Updated by Dan Sharp and Bram Moolenaar.
+! # Last Change: 2005 Jul 21
+  #
+  # This compiles Vim as a Windows application.  If you want Vim to run as a
+  # Cygwin application use the Makefile (just like on Unix).
+***************
+*** 298,304 ****
+  EXTRA_OBJS += $(OUTDIR)/netbeans.o $(OUTDIR)/gui_beval.o
+  EXTRA_LIBS += -lwsock32
+  
+! ifeq (yes, $(DEBUG))
+  DEFINES += -DNBDEBUG
+  NBDEBUG_DEP = nbdebug.h nbdebug.c
+  endif
+--- 299,305 ----
+  EXTRA_OBJS += $(OUTDIR)/netbeans.o $(OUTDIR)/gui_beval.o
+  EXTRA_LIBS += -lwsock32
+  
+! ifeq (yes, $(NBDEBUG))
+  DEFINES += -DNBDEBUG
+  NBDEBUG_DEP = nbdebug.h nbdebug.c
+  endif
+***************
+*** 336,344 ****
+--- 337,347 ----
+  ##############################
+  ifneq (sh.exe, $(SHELL))
+  DEL = rm
++ MKDIR = mkdir -p
+  DIRSLASH = /
+  else
+  DEL = del
++ MKDIR = mkdir
+  DIRSLASH = \\
+  endif
+  
+***************
+*** 421,427 ****
+  	$(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIBS)
+  
+  $(OUTDIR):
+! 	mkdir $(OUTDIR)
+  
+  tags:
+  	command /c ctags *.c $(INCL)
+--- 424,430 ----
+  	$(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIBS)
+  
+  $(OUTDIR):
+! 	$(MKDIR) $(OUTDIR)
+  
+  tags:
+  	command /c ctags *.c $(INCL)
+***************
+*** 429,435 ****
+  clean:
+  	-$(DEL) $(OUTDIR)$(DIRSLASH)*.o
+  	-rmdir $(OUTDIR)
+! 	-$(DEL) *.exe
+  ifdef PERL
+  	-$(DEL) if_perl.c
+  endif
+--- 432,438 ----
+  clean:
+  	-$(DEL) $(OUTDIR)$(DIRSLASH)*.o
+  	-rmdir $(OUTDIR)
+! 	-$(DEL) $(EXE) vimrun.exe install.exe uninstal.exe
+  ifdef PERL
+  	-$(DEL) if_perl.c
+  endif
+***************
+*** 455,462 ****
+  	$(CC) -c $(CFLAGS) -D__IID_DEFINED__ if_ole.cpp -o $(OUTDIR)/if_ole.o
+  
+  if_perl.c: if_perl.xs typemap
+! 	perl $(PERL)/lib/ExtUtils/xsubpp -prototypes -typemap \
+! 	     $(PERL)/lib/ExtUtils/typemap if_perl.xs > $@
+  
+  $(OUTDIR)/if_perl.o:	if_perl.c $(INCL)
+  ifeq (yes, $(USEDLL))
+--- 458,466 ----
+  	$(CC) -c $(CFLAGS) -D__IID_DEFINED__ if_ole.cpp -o $(OUTDIR)/if_ole.o
+  
+  if_perl.c: if_perl.xs typemap
+! 	$(PERL)/bin/perl `cygpath -d $(PERL)/lib/ExtUtils/xsubpp` \
+! 		-prototypes -typemap \
+! 		`cygpath -d $(PERL)/lib/ExtUtils/typemap` if_perl.xs > $@
+  
+  $(OUTDIR)/if_perl.o:	if_perl.c $(INCL)
+  ifeq (yes, $(USEDLL))
+*** ../vim-6.3.083/src/po/Make_cyg.mak	Thu Jul 21 13:47:58 2005
+--- src/po/Make_cyg.mak	Thu Jul 21 13:46:39 2005
+***************
+*** 0 ****
+--- 1,128 ----
++ # Makefile for the Vim message translations for Cygwin
++ # by Tony Mechelynck <antoine.mechelynck at skynet.be>
++ # after Make_ming.mak by
++ # Eduardo F. Amatria <eferna1 at platea.pntic.mec.es>
++ #
++ # Read the README_ming.txt file before using it.
++ #
++ # Use at your own risk but with care, it could even kill your canary.
++ #
++ 
++ ifndef VIMRUNTIME
++ VIMRUNTIME = ../../runtime
++ endif
++ 
++ LANGUAGES =	af \
++ 		ca \
++ 		cs \
++ 		cs.cp1250 \
++ 		de \
++ 		en_GB \
++ 		es \
++ 		fr \
++ 		it \
++ 		ja \
++ 		ja.sjis \
++ 		ko \
++ 		no \
++ 		pl \
++ 		pl.cp1250 \
++ 		ru \
++ 		ru.cp1251 \
++ 		sk \
++ 		sk.cp1250 \
++ 		sv \
++ 		uk \
++ 		zh_CN \
++ 		zh_CN.UTF-8 \
++ 		zh_CN.cp936 \
++ 		zh_TW \
++ 		zh_TW.UTF-8 \
++ 
++ MOFILES =	af.mo \
++ 		ca.mo \
++ 		cs.cp1250.mo \
++ 		cs.mo \
++ 		de.mo \
++ 		en_GB.mo \
++ 		es.mo \
++ 		fr.mo \
++ 		it.mo \
++ 		ja.mo \
++ 		ja.sjis.mo \
++ 		ko.mo \
++ 		no.mo \
++ 		pl.cp1250.mo \
++ 		pl.mo \
++ 		ru.cp1251.mo \
++ 		ru.mo \
++ 		sk.cp1250.mo \
++ 		sk.mo \
++ 		sv.mo \
++ 		uk.mo \
++ 		zh_CN.UTF-8.mo \
++ 		zh_CN.cp936.mo \
++ 		zh_CN.mo \
++ 		zh_TW.UTF-8.mo \
++ 		zh_TW.mo \
++ 
++ PACKAGE = vim
++ 
++ # Uncomment one of the lines below or modify it to put the path to your
++ # gettext binaries
++ ifndef GETTEXT_PATH
++ #GETTEXT_PATH = C:/gettext.win32/bin/
++ #GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/
++ GETTEXT_PATH = /bin/
++ endif
++ 
++ # The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext
++ # tools 0.10.37, which use a slightly different .po file format that is not
++ # compatible with Solaris (and old gettext implementations) unless these are
++ # set.  gettext 0.10.36 will not work!
++ MSGFMT = OLD_PO_FILE_INPUT=yes $(GETTEXT_PATH)msgfmt -v
++ XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)xgettext
++ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)msgmerge
++ 
++ # MV = move
++ # CP = copy
++ # RM = del
++ # MKD = mkdir
++ MV = mv -f
++ CP = cp -f
++ RM = rm -f
++ MKD = mkdir -p
++ 
++ .SUFFIXES:
++ .SUFFIXES: .po .mo .pot
++ .PHONY: first_time all install clean $(LANGUAGES)
++ 
++ .po.mo:
++ 	$(MSGFMT) -o $@ $<
++ 
++ all: $(MOFILES)
++ 
++ first_time:
++ 	$(XGETTEXT) --default-domain=$(LANGUAGE) \
++ 		--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
++ 
++ $(LANGUAGES):
++ 	$(XGETTEXT) --default-domain=$(PACKAGE) \
++ 		--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
++ 	$(MV) $(PACKAGE).po $(PACKAGE).pot
++ 	$(CP) $@.po $@.po.orig
++ 	$(MV) $@.po $@.po.old
++ 	$(MSGMERGE) $@.po.old $(PACKAGE).pot -o $@.po
++ 	$(RM) $@.po.old
++ 
++ install: $(MOFILES)
++ 	for TARGET in $(LANGUAGES); do \
++ 		$(MKD) $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES ; \
++ 		$(CP) $$TARGET.mo $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES/$(PACKAGE).mo ; \
++ 	done
++ 
++ clean:
++ 	$(RM) *.mo
++ 	$(RM) *.pot
++ 
++ 
+*** ../vim-6.3.083/src/version.c	Thu Jul 21 13:02:06 2005
+--- src/version.c	Thu Jul 21 13:47:15 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     84,
+  /**/
+
+-- 
+Michael: There is no such thing as a dump question.
+Bernard: Sure there is.  For example "what is a core dump?"
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

================================================================
Index: SOURCES/6.3.085
diff -u /dev/null SOURCES/6.3.085:1.1
--- /dev/null	Fri Jul 29 13:35:20 2005
+++ SOURCES/6.3.085	Fri Jul 29 13:35:15 2005
@@ -0,0 +1,126 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.085
+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.3.085
+Problem:    Crash in syntax highlighting code. (Marc Espie)
+Solution:   Prevent current_col going past the end of the line.
+Files:	    src/syntax.c
+
+
+*** ../vim-6.3.084/src/syntax.c	Fri Jul  1 11:20:39 2005
+--- src/syntax.c	Sun Jul 24 19:39:04 2005
+***************
+*** 659,664 ****
+--- 659,665 ----
+      linenr_T	found_current_lnum = 0;
+      int		found_current_col= 0;
+      lpos_T	found_m_endpos;
++     colnr_T	prev_current_col;
+  
+      /*
+       * Clear any current state that might be hanging around.
+***************
+*** 829,838 ****
+  			    ++current_col;
+  
+  			/* syn_current_attr() will have skipped the check for
+! 			 * an item that ends here, need to do that now. */
+! 			++current_col;
+  			check_state_ends();
+! 			--current_col;
+  		    }
+  		    else
+  			break;
+--- 830,842 ----
+  			    ++current_col;
+  
+  			/* syn_current_attr() will have skipped the check for
+! 			 * an item that ends here, need to do that now.  Be
+! 			 * careful not to go past the NUL. */
+! 			prev_current_col = current_col;
+! 			if (syn_getcurline()[current_col] != NUL)
+! 			    ++current_col;
+  			check_state_ends();
+! 			current_col = prev_current_col;
+  		    }
+  		    else
+  			break;
+***************
+*** 1635,1640 ****
+--- 1639,1645 ----
+      int	    syncing;		/* called for syncing */
+  {
+      stateitem_T	*cur_si;
++     colnr_T	prev_current_col;
+  
+      if (!current_finished)
+      {
+***************
+*** 1656,1665 ****
+  		    return TRUE;
<<Diff was trimmed, longer than 597 lines>>



More information about the pld-cvs-commit mailing list