073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.401
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.401 (after 7.4.399)
073263
Problem:    Can't build on MS-Windows.
073263
Solution:   Include the new files in all the Makefiles.
073263
Files:	    src/Make_bc3.mak, src/Make_bc5.mak, src/Make_cyg.mak,
073263
	    src/Make_dice.mak, src/Make_djg.mak, src/Make_ivc.mak,
073263
	    src/Make_manx.mak, src/Make_ming.mak, src/Make_morph.mak,
073263
	    src/Make_mvc.mak, src/Make_os2.mak, src/Make_sas.mak,
073263
	    Make_vms.mms
073263
073263
073263
*** ../vim-7.4.400/src/Make_bc3.mak	2010-05-18 20:27:58.000000000 +0200
073263
--- src/Make_bc3.mak	2014-08-10 16:20:20.068714153 +0200
073263
***************
073263
*** 54,59 ****
073263
--- 54,61 ----
073263
  	blowfish.obj \
073263
  	buffer.obj \
073263
  	charset.obj \
073263
+ 	crypt.obj \
073263
+ 	crypt_zip.obj \
073263
  	diff.obj \
073263
  	digraph.obj \
073263
  	edit.obj \
073263
*** ../vim-7.4.400/src/Make_bc5.mak	2014-01-10 18:16:00.000000000 +0100
073263
--- src/Make_bc5.mak	2014-08-10 16:20:39.684714012 +0200
073263
***************
073263
*** 580,585 ****
073263
--- 580,587 ----
073263
  	$(OBJDIR)\blowfish.obj \
073263
  	$(OBJDIR)\buffer.obj \
073263
  	$(OBJDIR)\charset.obj \
073263
+ 	$(OBJDIR)\crypt.obj \
073263
+ 	$(OBJDIR)\crypt_zip.obj \
073263
  	$(OBJDIR)\diff.obj \
073263
  	$(OBJDIR)\digraph.obj \
073263
  	$(OBJDIR)\edit.obj \
073263
*** ../vim-7.4.400/src/Make_cyg.mak	2014-08-06 14:52:05.039236174 +0200
073263
--- src/Make_cyg.mak	2014-08-10 16:30:48.656709635 +0200
073263
***************
073263
*** 1,6 ****
073263
  #
073263
  # Makefile for VIM on Win32, using Cygnus gcc
073263
! # Last updated by Dan Sharp.  Last Change: 2013 Dec 11
073263
  #
073263
  # Also read INSTALLpc.txt!
073263
  #
073263
--- 1,7 ----
073263
  #
073263
  # Makefile for VIM on Win32, using Cygnus gcc
073263
! # Updated by Dan Sharp.
073263
! # Last Change: 2014 Aug 10
073263
  #
073263
  # Also read INSTALLpc.txt!
073263
  #
073263
***************
073263
*** 546,551 ****
073263
--- 547,554 ----
073263
  	$(OUTDIR)/blowfish.o \
073263
  	$(OUTDIR)/buffer.o \
073263
  	$(OUTDIR)/charset.o \
073263
+ 	$(OUTDIR)/crypt.o \
073263
+ 	$(OUTDIR)/crypt_zip.o \
073263
  	$(OUTDIR)/diff.o \
073263
  	$(OUTDIR)/digraph.o \
073263
  	$(OUTDIR)/edit.o \
073263
*** ../vim-7.4.400/src/Make_dice.mak	2010-05-18 20:29:00.000000000 +0200
073263
--- src/Make_dice.mak	2014-08-10 16:21:53.740713479 +0200
073263
***************
073263
*** 29,34 ****
073263
--- 29,36 ----
073263
  	blowfish.c \
073263
  	buffer.c \
073263
  	charset.c \
073263
+ 	crypt.c \
073263
+ 	crypt_zip.c \
073263
  	diff.c \
073263
  	digraph.c \
073263
  	edit.c \
073263
***************
073263
*** 75,80 ****
073263
--- 77,84 ----
073263
  OBJ =	o/blowfish.o \
073263
  	o/buffer.o \
073263
  	o/charset.o \
073263
+ 	o/crypt.o \
073263
+ 	o/crypt_zip.o \
073263
  	o/diff.o \
073263
  	o/digraph.o \
073263
  	o/edit.o \
073263
***************
073263
*** 143,148 ****
073263
--- 147,156 ----
073263
  
073263
  o/charset.o:	charset.c  $(SYMS)
073263
  
073263
+ o/crypt.o:	crypt.c  $(SYMS)
073263
+ 
073263
+ o/crypt_zip.o:	crypt_zip.c  $(SYMS)
073263
+ 
073263
  o/diff.o:	diff.c	$(SYMS)
073263
  
073263
  o/digraph.o:	digraph.c  $(SYMS)
073263
*** ../vim-7.4.400/src/Make_djg.mak	2010-05-18 20:29:18.000000000 +0200
073263
--- src/Make_djg.mak	2014-08-10 16:22:13.084713340 +0200
073263
***************
073263
*** 22,27 ****
073263
--- 22,29 ----
073263
  	obj/blowfish.o \
073263
  	obj/buffer.o \
073263
  	obj/charset.o \
073263
+ 	obj/crypt.o \
073263
+ 	obj/crypt_zip.o \
073263
  	obj/diff.o \
073263
  	obj/digraph.o \
073263
  	obj/edit.o \
073263
*** ../vim-7.4.400/src/Make_ivc.mak	2013-02-26 14:18:19.000000000 +0100
073263
--- src/Make_ivc.mak	2014-08-10 16:22:46.268713102 +0200
073263
***************
073263
*** 213,218 ****
073263
--- 213,220 ----
073263
  	"$(INTDIR)/blowfish.obj" \
073263
  	"$(INTDIR)/buffer.obj" \
073263
  	"$(INTDIR)/charset.obj" \
073263
+ 	"$(INTDIR)/crypt.obj" \
073263
+ 	"$(INTDIR)/crypt_zip.obj" \
073263
  	"$(INTDIR)/diff.obj" \
073263
  	"$(INTDIR)/digraph.obj" \
073263
  	"$(INTDIR)/edit.obj" \
073263
***************
073263
*** 339,344 ****
073263
--- 341,354 ----
073263
  # End Source File
073263
  # Begin Source File
073263
  
073263
+ SOURCE=.\crypt.c
073263
+ # End Source File
073263
+ # Begin Source File
073263
+ 
073263
+ SOURCE=.\crypt_zip.c
073263
+ # End Source File
073263
+ # Begin Source File
073263
+ 
073263
  SOURCE=.\diff.c
073263
  # End Source File
073263
  # Begin Source File
073263
*** ../vim-7.4.400/src/Make_manx.mak	2010-05-18 20:30:54.000000000 +0200
073263
--- src/Make_manx.mak	2014-08-10 16:23:43.648712689 +0200
073263
***************
073263
*** 37,42 ****
073263
--- 37,44 ----
073263
  SRC =	blowfish.c \
073263
  	buffer.c \
073263
  	charset.c \
073263
+ 	crypt.c \
073263
+ 	crypt_zip.c \
073263
  	diff.c \
073263
  	digraph.c \
073263
  	edit.c \
073263
***************
073263
*** 85,90 ****
073263
--- 87,94 ----
073263
  OBJ =	obj/blowfish.o \
073263
  	obj/buffer.o \
073263
  	obj/charset.o \
073263
+ 	obj/crypt.o \
073263
+ 	obj/crypt_zip.o \
073263
  	obj/diff.o \
073263
  	obj/digraph.o \
073263
  	obj/edit.o \
073263
***************
073263
*** 131,136 ****
073263
--- 135,142 ----
073263
  PRO =	proto/blowfish.pro \
073263
  	proto/buffer.pro \
073263
  	proto/charset.pro \
073263
+ 	proto/crypt.pro \
073263
+ 	proto/crypt_zip.pro \
073263
  	proto/diff.pro \
073263
  	proto/digraph.pro \
073263
  	proto/edit.pro \
073263
***************
073263
*** 227,232 ****
073263
--- 233,244 ----
073263
  obj/charset.o:	charset.c
073263
  	$(CCSYM) $@ charset.c
073263
  
073263
+ obj/crypt.o:	crypt.c
073263
+ 	$(CCSYM) $@ crypt.c
073263
+ 
073263
+ obj/crypt_zip.o: crypt_zip.c
073263
+ 	$(CCSYM) $@ crypt_zip.c
073263
+ 
073263
  obj/diff.o:	diff.c
073263
  	$(CCSYM) $@ diff.c
073263
  
073263
*** ../vim-7.4.400/src/Make_ming.mak	2014-08-06 14:52:05.039236174 +0200
073263
--- src/Make_ming.mak	2014-08-10 16:24:07.064712521 +0200
073263
***************
073263
*** 517,522 ****
073263
--- 517,524 ----
073263
  	$(OUTDIR)/blowfish.o \
073263
  	$(OUTDIR)/buffer.o \
073263
  	$(OUTDIR)/charset.o \
073263
+ 	$(OUTDIR)/crypt.o \
073263
+ 	$(OUTDIR)/crypt_zip.o \
073263
  	$(OUTDIR)/diff.o \
073263
  	$(OUTDIR)/digraph.o \
073263
  	$(OUTDIR)/edit.o \
073263
*** ../vim-7.4.400/src/Make_morph.mak	2010-05-18 20:31:26.000000000 +0200
073263
--- src/Make_morph.mak	2014-08-10 16:24:39.900712285 +0200
073263
***************
073263
*** 27,32 ****
073263
--- 27,34 ----
073263
  SRC =	blowfish.c						\
073263
  	buffer.c						\
073263
  	charset.c						\
073263
+ 	crypt.c							\
073263
+ 	crypt_zip.c						\
073263
  	diff.c							\
073263
  	digraph.c						\
073263
  	edit.c							\
073263
*** ../vim-7.4.400/src/Make_mvc.mak	2014-08-06 14:52:05.039236174 +0200
073263
--- src/Make_mvc.mak	2014-08-10 16:25:19.752711999 +0200
073263
***************
073263
*** 547,552 ****
073263
--- 547,554 ----
073263
  	$(OUTDIR)\blowfish.obj \
073263
  	$(OUTDIR)\buffer.obj \
073263
  	$(OUTDIR)\charset.obj \
073263
+ 	$(OUTDIR)\crypt.obj \
073263
+ 	$(OUTDIR)\crypt_zip.obj \
073263
  	$(OUTDIR)\diff.obj \
073263
  	$(OUTDIR)\digraph.obj \
073263
  	$(OUTDIR)\edit.obj \
073263
***************
073263
*** 1092,1097 ****
073263
--- 1094,1103 ----
073263
  
073263
  $(OUTDIR)/charset.obj:	$(OUTDIR) charset.c  $(INCL)
073263
  
073263
+ $(OUTDIR)/crypt.obj:	$(OUTDIR) crypt.c  $(INCL)
073263
+ 
073263
+ $(OUTDIR)/crypt_zip.obj: $(OUTDIR) crypt_zip.c  $(INCL)
073263
+ 
073263
  $(OUTDIR)/diff.obj:	$(OUTDIR) diff.c  $(INCL)
073263
  
073263
  $(OUTDIR)/digraph.obj:	$(OUTDIR) digraph.c  $(INCL)
073263
***************
073263
*** 1278,1283 ****
073263
--- 1284,1291 ----
073263
  	proto/blowfish.pro \
073263
  	proto/buffer.pro \
073263
  	proto/charset.pro \
073263
+ 	proto/crypt.pro \
073263
+ 	proto/crypt_zip.pro \
073263
  	proto/diff.pro \
073263
  	proto/digraph.pro \
073263
  	proto/edit.pro \
073263
*** ../vim-7.4.400/src/Make_os2.mak	2010-05-18 20:32:32.000000000 +0200
073263
--- src/Make_os2.mak	2014-08-10 16:25:47.928711796 +0200
073263
***************
073263
*** 42,47 ****
073263
--- 42,49 ----
073263
  	blowfish.o \
073263
  	buffer.o \
073263
  	charset.o \
073263
+ 	crypt.o \
073263
+ 	crypt_zip.o \
073263
  	diff.o \
073263
  	digraph.o \
073263
  	edit.o \
073263
***************
073263
*** 117,122 ****
073263
--- 119,126 ----
073263
  blowfish.o:	blowfish.c  $(INCL)
073263
  buffer.o:	buffer.c  $(INCL)
073263
  charset.o:	charset.c  $(INCL)
073263
+ crypt.o:	crypt.c  $(INCL)
073263
+ crypt_zip.o:	crypt_zip.c  $(INCL)
073263
  diff.o:		diff.c  $(INCL)
073263
  digraph.o:	digraph.c  $(INCL)
073263
  edit.o:		edit.c  $(INCL)
073263
*** ../vim-7.4.400/src/Make_sas.mak	2013-05-06 04:06:04.000000000 +0200
073263
--- src/Make_sas.mak	2014-08-10 16:26:41.536711411 +0200
073263
***************
073263
*** 92,97 ****
073263
--- 92,99 ----
073263
  	blowfish.c \
073263
  	buffer.c \
073263
  	charset.c \
073263
+ 	crypt.c \
073263
+ 	crypt_zip.c \
073263
  	diff.c \
073263
  	digraph.c \
073263
  	edit.c \
073263
***************
073263
*** 139,144 ****
073263
--- 141,148 ----
073263
  	blowfish.o \
073263
  	buffer.o \
073263
  	charset.o \
073263
+ 	crypt.o \
073263
+ 	crypt_zip.o \
073263
  	diff.o \
073263
  	digraph.o \
073263
  	edit.o \
073263
***************
073263
*** 186,191 ****
073263
--- 190,197 ----
073263
  	proto/blowfish.pro \
073263
  	proto/buffer.pro \
073263
  	proto/charset.pro \
073263
+ 	proto/crypt.pro \
073263
+ 	proto/crypt_zip.pro \
073263
  	proto/diff.pro \
073263
  	proto/digraph.pro \
073263
  	proto/edit.pro \
073263
***************
073263
*** 290,295 ****
073263
--- 296,305 ----
073263
  proto/buffer.pro:	buffer.c
073263
  charset.o:		charset.c
073263
  proto/charset.pro:	charset.c
073263
+ crypt.o:		crypt.c
073263
+ proto/crypt.pro:	crypt.c
073263
+ crypt_zip.o:		crypt_zip.c
073263
+ proto/crypt_zip.pro:	crypt_zip.c
073263
  diff.o:			diff.c
073263
  proto/diff.pro:		diff.c
073263
  digraph.o:		digraph.c
073263
*** ../vim-7.4.400/src/version.c	2014-08-10 13:46:30.424780490 +0200
073263
--- src/version.c	2014-08-10 16:27:26.380711088 +0200
073263
***************
073263
*** 743,744 ****
073263
--- 743,746 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     401,
073263
  /**/
073263
073263
-- 
073263
When a fly lands on the ceiling, does it do a half roll or
073263
a half loop?
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///