Patch 6.1.404 (extra)

Problem: Various small problems. Solution: Fix comments. Various small additions, changes in indent, removal of unused items and fixes. Files: Makefile, README.txt, runtime/menu.vim, runtime/vimrc_example.vim, src/INSTALL, src/INSTALLole.txt, src/Make_bc5.mak, src/Make_cyg.mak, src/Make_ming.mak, src/Makefile, src/config.h.in, src/edit.c, src/eval.c, src/ex_cmds2.c, src/ex_docmd.c, src/ex_getln.c, src/fileio.c, src/getchar.c, src/gui.c, src/gui_gtk.c, src/gui_photon.c, src/if_cscope.c, src/if_python.c, src/keymap.h, src/mark.c, src/mbyte.c, src/message.c, src/misc1.c, src/misc2.c, src/normal.c, src/option.c, src/os_os2_cfg.h, src/os_win32.c, src/proto/getchar.pro, src/proto/message.pro, src/proto/regexp.pro, src/screen.c, src/structs.h, src/syntax.c, src/term.c, src/testdir/test15.in, src/testdir/test15.ok, src/vim.rc, src/xxd/Make_cyg.mak, src/xxd/Makefile
vim · Mar 15, 2003 · 59d00c5 · 59d00c5
1 parent c132b72
commit 59d00c5
Show file tree

Hide file tree

Showing 46 changed files with 227 additions and 230 deletions.
diff --git a/Makefile b/Makefile
@@ -367,7 +367,6 @@ SRC_DOS_UNIX =	\
 SRC_DOS =	\
 		GvimExt \
 		README_srcdos.txt \
-		src/INSTALLole.txt \
 		src/INSTALLpc.txt \
 		src/Make_bc3.mak \
 		src/Make_bc5.mak \
@@ -500,14 +499,15 @@ SRC_MAC =	\
 SRC_VMS =	\
 		src/INSTALLvms.txt \
 		src/Make_vms.mms \
+		src/gui_gtk_vms.h \
 		src/os_vms.c \
-		src/os_vms.opt \
 		src/os_vms_conf.h \
 		src/os_vms_mms.c \
 		src/proto/os_vms.pro \
 		src/testdir/Make_vms.mms \
 		src/testdir/vms.vim \
 		src/xxd/Make_vms.mms \
+		vimtutor.com \
 
 # source files for OS/2 (in the extra archive)
 SRC_OS2 =	\
@@ -784,7 +784,9 @@ LANG_GEN = \
 		runtime/lang/menu_*.vim \
 		runtime/keymap/README.txt \
 		runtime/keymap/*.vim \
+		runtime/tutor/README.*.txt \
 		runtime/tutor/tutor.?? \
+		runtime/tutor/tutor.gr.* \
 		runtime/tutor/tutor.ja.* \
 		runtime/tutor/tutor.pl.* \
 		runtime/tutor/tutor.zh.* \

diff --git a/README.txt b/README.txt
@@ -14,9 +14,9 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 defined by the user, and the mouse can be used.
 
-Vim currently runs under Amiga DOS, MS-DOS, MS-Windows 95/98/NT, Atari MiNT,
-Macintosh, BeOS, VMS, RISC OS, OS/2 and almost all flavours of UNIX.
-Porting to other systems should not be very difficult.
+Vim currently runs under Amiga DOS, MS-DOS, MS-Windows 95/98/Me/NT/2000/XP,
+Atari MiNT, Macintosh, BeOS, VMS, RISC OS, OS/2 and almost all flavours of
+UNIX.  Porting to other systems should not be very difficult.
 
 
 DISTRIBUTION
@@ -45,33 +45,13 @@ COPYING
 
 Vim is Charityware.  You can use and copy it as much as you like, but you are
 encouraged to make a donation to orphans in Uganda.  Please read the file
-"runtime/doc/uganda.txt" for details.
-
-There are no restrictions on distributing an unmodified copy of Vim.  Parts of
-Vim may also be distributed, but this text must always be included.  You are
-allowed to include executables that you made from the unmodified Vim sources,
-your own usage examples and Vim scripts.
-
-If you distribute a modified version of Vim, you are encouraged to send the
-maintainer a copy, including the source code.  Or make it available to the
-maintainer through ftp; let him know where it can be found.  If the number of
-changes is small (e.g., a modified Makefile) e-mailing the diffs will do.
-When the maintainer asks for it (in any way) you must make your changes,
-including source code, available to him.
-
-The maintainer reserves the right to include any changes in the official
-version of Vim.  This is negotiable.  You are not allowed to distribute a
-modified version of Vim when you are not willing to make the source code
-available to the maintainer.
-
-The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this changes, it
-will be announced in appropriate places (most likely www.vim.org and
-comp.editors).  When it is completely impossible to contact the maintainer,
-the obligation to send him modified source code ceases.
-
-It is not allowed to remove these restrictions from the distribution of the
-Vim sources or parts of it.  These restrictions may also be used for previous
-Vim releases instead of the text that was included with it.
+"runtime/doc/uganda.txt" for details (do ":help uganda" inside Vim).
+
+Summary of the license: There are no restrictions on using or distributing an
+unmodified copy of Vim.  Parts of Vim may also be distributed, but the license
+text must always be included.  For modified versions a few restrictions apply.
+The license is GPL compatible, you may compile Vim with GPL libraries and
+distribute it.
 
 
 COMPILING

diff --git a/runtime/menu.vim b/runtime/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2002 Nov 17
+" Last Change:	2002 Dec 29
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -152,8 +152,8 @@ an 20.335 &Edit.-SEP1-				<Nop>
 vnoremenu 20.340 &Edit.Cu&t<Tab>"+x		"+x
 vnoremenu 20.350 &Edit.&Copy<Tab>"+y		"+y
 cnoremenu 20.350 &Edit.&Copy<Tab>"+y		<C-Y>
-nnoremenu 20.360 &Edit.&Paste<Tab>"+P		"+gP
-cnoremenu	 &Edit.&Paste<Tab>"+P		<C-R>+
+nnoremenu 20.360 &Edit.&Paste<Tab>"+gP		"+gP
+cnoremenu	 &Edit.&Paste<Tab>"+gP		<C-R>+
 if has("virtualedit")
   vnoremenu <script>	 &Edit.&Paste<Tab>"+P	"-c<Esc><SID>Paste
   inoremenu <script>	 &Edit.&Paste<Tab>"+P	<Esc><SID>Pastegi
@@ -400,14 +400,14 @@ if has("folding")
   an 40.340.240 &Tools.&Folding.Delete\ &All\ Folds<Tab>zD	zD
   " moving around in folds
   an 40.340.300 &Tools.&Folding.-SEP2-				<Nop>
-  an 40.340.310.10 &Tools.&Folding.Fold\ column\ &width.\ 0\ 	:set fdc=0<CR>
-  an 40.340.310.20 &Tools.&Folding.Fold\ column\ &width.\ 2\ 	:set fdc=2<CR>
-  an 40.340.310.30 &Tools.&Folding.Fold\ column\ &width.\ 3\ 	:set fdc=3<CR>
-  an 40.340.310.40 &Tools.&Folding.Fold\ column\ &width.\ 4\ 	:set fdc=4<CR>
-  an 40.340.310.50 &Tools.&Folding.Fold\ column\ &width.\ 5\ 	:set fdc=5<CR>
-  an 40.340.310.60 &Tools.&Folding.Fold\ column\ &width.\ 6\ 	:set fdc=6<CR>
-  an 40.340.310.70 &Tools.&Folding.Fold\ column\ &width.\ 7\ 	:set fdc=7<CR>
-  an 40.340.310.80 &Tools.&Folding.Fold\ column\ &width.\ 8\ 	:set fdc=8<CR>
+  an 40.340.310.10 &Tools.&Folding.Fold\ col&umn\ width.\ &0\ 	:set fdc=0<CR>
+  an 40.340.310.20 &Tools.&Folding.Fold\ col&umn\ width.\ &2\ 	:set fdc=2<CR>
+  an 40.340.310.30 &Tools.&Folding.Fold\ col&umn\ width.\ &3\ 	:set fdc=3<CR>
+  an 40.340.310.40 &Tools.&Folding.Fold\ col&umn\ width.\ &4\ 	:set fdc=4<CR>
+  an 40.340.310.50 &Tools.&Folding.Fold\ col&umn\ width.\ &5\ 	:set fdc=5<CR>
+  an 40.340.310.60 &Tools.&Folding.Fold\ col&umn\ width.\ &6\ 	:set fdc=6<CR>
+  an 40.340.310.70 &Tools.&Folding.Fold\ col&umn\ width.\ &7\ 	:set fdc=7<CR>
+  an 40.340.310.80 &Tools.&Folding.Fold\ col&umn\ width.\ &8\ 	:set fdc=8<CR>
 endif  " has folding
 
 if has("diff")
@@ -937,7 +937,7 @@ if (exists("did_load_filetypes") || exists("syntax_on"))
 if exists("do_syntax_sel_menu")
   runtime! synmenu.vim
 else
-  an 50.10 &Syntax.&Show\ individual\ choices	:let do_syntax_sel_menu = 1<Bar>runtime! synmenu.vim<Bar>aunmenu &Syntax.&Show\ individual\ choices<CR>
+  an 50.10 &Syntax.&Show\ filetypes\ in\ menu	:let do_syntax_sel_menu = 1<Bar>runtime! synmenu.vim<Bar>aunmenu &Syntax.&Show\ filetypes\ in\ menu<CR>
   an 50.195 &Syntax.-SEP1-		<Nop>
 endif
 

diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim
@@ -1,7 +1,7 @@
 " An example for a vimrc file.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2002 May 28
+" Last change:	2002 Sep 19
 "
 " To use it, copy it to
 "     for Unix and OS/2:  ~/.vimrc
@@ -21,7 +21,6 @@ set nocompatible
 " allow backspacing over everything in insert mode
 set backspace=indent,eol,start
 
-set autoindent		" always set autoindenting on
 if has("vms")
   set nobackup		" do not keep a backup file, use versions instead
 else
@@ -58,6 +57,10 @@ if has("autocmd")
   " Also load indent files, to automatically do language-dependent indenting.
   filetype plugin indent on
 
+  " Put these in an autocmd group, so that we can delete them easily.
+  augroup vimrcEx
+  au!
+
   " For all text files set 'textwidth' to 78 characters.
   autocmd FileType text setlocal textwidth=78
 
@@ -69,4 +72,10 @@ if has("autocmd")
     \   exe "normal g`\"" |
     \ endif
 
+  augroup END
+
+else
+
+  set autoindent		" always set autoindenting on
+
 endif " has("autocmd")
diff --git a/src/INSTALL b/src/INSTALL
@@ -21,18 +21,11 @@ For Macintosh see INSTALLmac.txt
 1. Generic
 ==========
 
-The file "feature.h" can be edited to match your preferences. You can skip
-this, then you will get the default behaviour as is documented, which should
-be fine for most people.
+If you compile Vim without specifying anything, you will get the default
+behaviour as is documented, which should be fine for most people.
 
-If you need extra compiler and/or linker arguments, set $CFLAGS and/or $LIBS
-before starting configure.  Example:
-
-	env  CFLAGS=-I/usr/local/include  LIBS=-lm  make
-
-This is only needed for things that configure doesn't offer a specific argument
-for or figures out by itself.  First try running configure without extra
-arguments.
+For features that you can't enable/disable in another way, you can edit the
+file "feature.h" to match your preferences.
 
 
 2. Unix
@@ -50,14 +43,14 @@ features will be disabled automatically.
 See the start of Makefile for more detailed instructions about how to compile
 Vim.
 
-If you are compiling Vim for several machines, for each machine:
-  a.    make shadow
-  b.    mv shadow machine_name
-  c.    cd machine_name
-  d.    points 1 and 2 above
+If you need extra compiler and/or linker arguments, set $CFLAGS and/or $LIBS
+before starting configure.  Example:
 
-[don't use a path for machine_name, just a directory name, Otherwise the links
-that "make shadow" creates won't work]
+	env  CFLAGS=-I/usr/local/include  LIBS=-lm  make
+
+This is only needed for things that configure doesn't offer a specific argument
+for or figures out by itself.  First try running configure without extra
+arguments.
 
 GNU Autoconf and a few other tools have been used to make Vim work on many
 different Unix systems.  The advantage of this is that Vim should compile
@@ -82,6 +75,15 @@ One thing to watch out for: If the configure script itself changes, running
 "make" will execute it again, but without your arguments.  Do "make clean" and
 run configure again.
 
+If you are compiling Vim for several machines, for each machine:
+  a.    make shadow
+  b.    mv shadow machine_name
+  c.    cd machine_name
+  d.    make; make install
+
+[don't use a path for machine_name, just a directory name, Otherwise the links
+that "make shadow" creates won't work]
+
 
 Unix: COMPILING WITH/WITHOUT GUI
 
@@ -111,9 +113,9 @@ you'd specify --enable-gui=motif.  Once you specify what you want, the
 --enable-{gtk,motif,athena}-check options are ignored.
 
 For compiling with the GTK+ GUI, you need a recent version of glib and gtk+.
-Configure checks for at least version 1.1.16.  An older versions is not
-selected automatically.  If you want to use it anyway, run configure with
-"--disable-gtktest".
+Configure checks for at least version 1.1.16, but below 2.0.  An older versions
+is not selected automatically.  If you want to use it anyway, run configure
+with "--disable-gtktest".  GTK 2.0 doesn't work yet.
 GTK requires an ANSI C compiler.  If you fail to compile Vim with GTK+ (it
 is the preferred choice), try selecting another one in the Makefile.
 If you are sure you have GTK installed, but for some reason configure says you

diff --git a/src/INSTALLole.txt b/src/INSTALLole.txt
@@ -1,52 +0,0 @@
-This is a complete implementation of OLE Automation support for GVim.
-
-
-1. Files
---------
-
-if_ole.cpp, if_ole.idl	source files
-proto/if_ole.pro	prototypes
-Makefile.ovc		makefile
-../doc/if_ole.txt	documentation
-
-
-2. Compiling from the command line
-----------------------------------
-
-Just one command should do it all:
-
-	nmake /f Makefile.ovc
-
-
-3. Updating the VC project manually
------------------------------------
-
-Start Visual Studio and load in the normal makefile Makefile.gvc.  Make
-sure it's in dos fileformat, not in Unix.  I'm using Visual C++ 5.  The
-instructions may not match exactly for VC 4 (in fact, it may not be possible
-to build with VC4 - I'm not sure. Should be, though...)
-
-Add if_ole.cpp and if_ole.idl to the project.
-
-Add FEAT_OLE to the list of defines for the build process (I suppose this
-could go in feature.h, but the other interface code - Python and Perl - don't
-go in there).  Also add FEAT_OLE to the list of defines for the resources.
-
-Add a custom build step for if_ole.idl (right click on the file, and select
-Settings...)
-
-	Description: Generating OLE Interface
-	Command: midl /tlb vim.tlb /iid iid_ole.c
-		      /proxy nul /header if_ole.h $(InputPath)
-	Output files: iid_ole.c, if_ole.h, vim.tlb
-
-(the command is all on one line).
-
-Add libraries ole32.lib, oleaut32.lib, uuid.lib to the project
-settings, Link tab, Object/library modules.
-
-That's it (I think).  Build.
-
-Let me know if there are any problems.
-
-Paul Moore, gustav@morpheus.demon.co.uk

diff --git a/src/Make_bc5.mak b/src/Make_bc5.mak
@@ -57,7 +57,7 @@
 # DEBUG		no or yes: set to yes if you wish a DEBUGging build (no)
 # CODEGUARD	no or yes: set to yes if you want to use CODEGUARD (no)
 # CPUNR		1 through 6: select -CPU argument to compile with (3)
-#               3 for 386, 4 for 486, 5 for pentium, 6 for pentium pro.
+#		3 for 386, 4 for 486, 5 for pentium, 6 for pentium pro.
 # USEDLL	no or yes: set to yes to use the Runtime library DLL (no)
 #		For USEDLL=yes the cc3250.dll is required to run Vim.
 # VIMDLL	no or yes: create vim32.dll, and stub (g)vim.exe (no)
@@ -829,7 +829,7 @@ $(OBJDIR)\pathdef.obj:	auto\pathdef.c
 # the preprocessor directive.
 auto\pathdef.c::
 	@echo creating auto/pathdef.c
-        @copy &&|
+	@copy &&|
 /* pathdef.c */
 /*"*/#include "vim.h"/*"*/
 

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
@@ -4,7 +4,7 @@
 # This compiles Vim as a Windows application.  If you want Vim to run as a
 # Cygwin application use the Makefile (just like on Unix).
 #
-# Last updated by Dan Sharp.  Last Change: 2003 Jan 19
+# Last updated by Dan Sharp.  Last Change: 2003 Mar 14
 #
 # GUI		no or yes: set to yes if you want the GUI version (yes)
 # PERL		define to path to Perl dir to get Perl support (not defined)
@@ -266,7 +266,7 @@ $(EXE): $(OUTDIR) $(OBJ)
 	$(CC) $(CFLAGS) -s -o $(EXE) $(OBJ) $(LIBS) -luuid -lole32 $(EXTRA_LIBS)
 
 xxd/xxd.exe: xxd/xxd.c
-	cd xxd ; $(MAKE) -f Make_cyg.mak ; cd ..
+	cd xxd ; $(MAKE) -f Make_cyg.mak USEDLL=$(USEDLL); cd ..
 
 vimrun.exe: vimrun.c
 	$(CC) $(CFLAGS) -s -o vimrun.exe vimrun.c  $(LIBS)
@@ -296,6 +296,7 @@ endif
 	-$(DEL) dyn-ming.h
 	-$(DEL) if_perl.c
 	-$(DEL) pathdef.c
+	cd xxd ; $(MAKE) -f Make_cyg.mak clean; cd ..
 
 ###########################################################################
 

diff --git a/src/Make_ming.mak b/src/Make_ming.mak
@@ -324,6 +324,9 @@ else
 	-$(DEL) xxd\*.exe
 endif
 	-$(DEL) dyn-ming.h
+ifdef PERL
+	-$(DEL) if_perl.c
+endif
 
 ###########################################################################
 vimres.res: vim.rc

diff --git a/src/Makefile b/src/Makefile
@@ -37,6 +37,8 @@
 #		--enable-cscope		for Cscope interface
 #	- Uncomment one of the lines with --with-features= to enable a set of
 #	  features (but not the interfaces just mentioned).
+#	- Uncomment the line with --disable-acl to disable ACL support even
+#	  though your system supports it.
 #	- Uncomment the line with --disable-gpm to disable gpm support
 #	  even though you have gpm libraries and includes
 #	- Uncomment one of the lines with CFLAGS and/or CC if you have
@@ -379,6 +381,10 @@ CClink = $(CC)
 # Uncomment this when you want to output a multibyte language.
 #CONF_OPT_OUTPUT = --enable-fontset
 
+# ACL - Uncomment this when you do not want to include ACL support, even
+# though your system does support it.  E.g., when it's buggy.
+#CONF_OPT_ACL = --disable-acl
+
 # gpm - For mouse support on Linux console via gpm
 # Uncomment this when you do not want to include gpm support, even
 # though you have gpm libraries and includes
@@ -836,7 +842,7 @@ TOOLSSUBLOC	= $(VIMRTLOC)$(TOOLSSUBDIR)
 TUTORSUBLOC	= $(VIMRTLOC)$(TUTORSUBDIR)
 SCRIPTLOC	= $(VIMRTLOC)
 
-### Only set VIMRUNTIMEDIR when VIMRCLOC is set to a different location and
+### Only set VIMRUNTIMEDIR when VIMRTLOC is set to a different location and
 ### the runtime directory is not below it.
 #VIMRUNTIMEDIR = $(VIMRTLOC)
 
@@ -1553,6 +1559,8 @@ installruntime: $(HELPSOURCE)/vim.1 $(DEST_MAN) $(DEST_VIM) $(DEST_RT) \
 	@sed -e s+/usr/local/lib/vim+$(SCRIPTLOC)+ \
 		$(HELPSOURCE)/evim.1 > $(DEST_MAN)/$(EVIMNAME).1
 	chmod $(MANMOD) $(DEST_MAN)/$(EVIMNAME).1
+	@echo generating help tags
+	-@cd $(HELPSOURCE); make tags
 	cd $(HELPSOURCE); $(INSTALL_DATA) *.txt tags $(DEST_HELP)
 	cd $(DEST_HELP); chmod $(HELPMOD) *.txt tags
 	$(INSTALL_DATA)  $(HELPSOURCE)/*.pl $(DEST_HELP)