home *** CD-ROM | disk | FTP | other *** search
- To: vim-dev@vim.org
- Subject: Patch 6.1.404
- Fcc: outbox
- From: Bram Moolenaar <Bram@moolenaar.net>
- Mime-Version: 1.0
- Content-Type: text/plain; charset=ISO-8859-1
- Content-Transfer-Encoding: 8bit
- ------------
-
- 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
-
-
- *** ../vim61.403/Makefile Tue Jul 9 21:50:11 2002
- --- Makefile Mon Mar 10 20:04:17 2003
- ***************
- *** 367,373 ****
- SRC_DOS = \
- GvimExt \
- README_srcdos.txt \
- - src/INSTALLole.txt \
- src/INSTALLpc.txt \
- src/Make_bc3.mak \
- src/Make_bc5.mak \
- --- 367,372 ----
- ***************
- *** 500,513 ****
- SRC_VMS = \
- src/INSTALLvms.txt \
- src/Make_vms.mms \
- 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 \
-
- # source files for OS/2 (in the extra archive)
- SRC_OS2 = \
- --- 499,513 ----
- SRC_VMS = \
- src/INSTALLvms.txt \
- src/Make_vms.mms \
- + src/gui_gtk_vms.h \
- src/os_vms.c \
- 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,790 ****
- --- 784,792 ----
- 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.* \
- *** ../vim61.403/README.txt Fri Mar 22 21:18:35 2002
- --- README.txt Thu Sep 19 22:10:52 2002
- ***************
- *** 14,22 ****
- 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.
-
-
- DISTRIBUTION
- --- 14,22 ----
- 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/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,77 ****
-
- 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.
-
-
- COMPILING
- --- 45,57 ----
-
- 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 (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
- *** ../vim61.403/runtime/menu.vim Tue Nov 19 11:46:06 2002
- --- runtime/menu.vim Sun Dec 29 20:46:56 2002
- ***************
- *** 2,8 ****
- " 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
-
- " 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.
- --- 2,8 ----
- " You can also use this as a start for your own set of menus.
- "
- " Maintainer: Bram Moolenaar <Bram@vim.org>
- ! " 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,159 ****
- 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>+
- if has("virtualedit")
- vnoremenu <script> &Edit.&Paste<Tab>"+P "-c<Esc><SID>Paste
- inoremenu <script> &Edit.&Paste<Tab>"+P <Esc><SID>Pastegi
- --- 152,159 ----
- 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>"+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,413 ****
- 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>
- endif " has folding
-
- if has("diff")
- --- 400,413 ----
- 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\ 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,943 ****
- 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.195 &Syntax.-SEP1- <Nop>
- endif
-
- --- 937,943 ----
- if exists("do_syntax_sel_menu")
- runtime! synmenu.vim
- else
- ! 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
-
- *** ../vim61.403/runtime/vimrc_example.vim Tue May 28 17:03:25 2002
- --- runtime/vimrc_example.vim Thu Sep 19 10:16:52 2002
- ***************
- *** 1,7 ****
- " An example for a vimrc file.
- "
- " Maintainer: Bram Moolenaar <Bram@vim.org>
- ! " Last change: 2002 May 28
- "
- " To use it, copy it to
- " for Unix and OS/2: ~/.vimrc
- --- 1,7 ----
- " An example for a vimrc file.
- "
- " Maintainer: Bram Moolenaar <Bram@vim.org>
- ! " Last change: 2002 Sep 19
- "
- " To use it, copy it to
- " for Unix and OS/2: ~/.vimrc
- ***************
- *** 21,27 ****
- " 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
- --- 21,26 ----
- ***************
- *** 58,63 ****
- --- 57,66 ----
- " 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
-
- ***************
- *** 68,72 ****
- --- 71,81 ----
- \ if line("'\"") > 0 && line("'\"") <= line("$") |
- \ exe "normal g`\"" |
- \ endif
- +
- + augroup END
- +
- + else
- +
- + set autoindent " always set autoindenting on
-
- endif " has("autocmd")
- *** ../vim61.403/src/INSTALL Tue Sep 11 21:06:19 2001
- --- src/INSTALL Sun Nov 3 12:59:20 2002
- ***************
- *** 21,38 ****
- 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 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.
-
-
- 2. Unix
- --- 21,31 ----
- 1. Generic
- ==========
-
- ! If you compile Vim without specifying anything, you will get the default
- ! behaviour as is documented, which should be fine for most people.
-
- ! 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,63 ****
- 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
-
- ! [don't use a path for machine_name, just a directory name, Otherwise the links
- ! that "make shadow" creates won't work]
-
- 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
- --- 43,56 ----
- See the start of Makefile for more detailed instructions about how to compile
- Vim.
-
- ! 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.
-
- 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,87 ****
- --- 75,89 ----
- "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,119 ****
- --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".
- 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
- --- 113,121 ----
- --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, 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
- *** ../vim61.403/src/INSTALLole.txt Tue Jul 25 11:36:03 2000
- --- src/INSTALLole.txt Sat Mar 15 17:46:07 2003
- ***************
- *** 1,52 ****
- - 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
- --- 0 ----
- *** ../vim61.403/src/Make_bc5.mak Tue Jan 28 21:38:14 2003
- --- src/Make_bc5.mak Wed Jan 29 22:41:49 2003
- ***************
- *** 57,63 ****
- # 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.
- # 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)
- --- 57,63 ----
- # 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.
- # 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,835 ****
- # the preprocessor directive.
- auto\pathdef.c::
- @echo creating auto/pathdef.c
- ! @copy &&|
- /* pathdef.c */
- /*"*/#include "vim.h"/*"*/
-
- --- 829,835 ----
- # the preprocessor directive.
- auto\pathdef.c::
- @echo creating auto/pathdef.c
- ! @copy &&|
- /* pathdef.c */
- /*"*/#include "vim.h"/*"*/
-
- *** ../vim61.403/src/Make_cyg.mak Sun Feb 16 22:21:17 2003
- --- src/Make_cyg.mak Fri Mar 14 11:57:53 2003
- ***************
- *** 4,10 ****
- # 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
- #
- # 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)
- --- 4,10 ----
- # 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 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,272 ****
- $(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 ..
-
- vimrun.exe: vimrun.c
- $(CC) $(CFLAGS) -s -o vimrun.exe vimrun.c $(LIBS)
- --- 266,272 ----
- $(CC) $(CFLAGS) -s -o $(EXE) $(OBJ) $(LIBS) -luuid -lole32 $(EXTRA_LIBS)
-
- xxd/xxd.exe: xxd/xxd.c
- ! cd xxd ; $(MAKE) -f Make_cyg.mak USEDLL=$(USEDLL); cd ..
-
- vimrun.exe: vimrun.c
- $(CC) $(CFLAGS) -s -o vimrun.exe vimrun.c $(LIBS)
- ***************
- *** 296,301 ****
- --- 296,302 ----
- -$(DEL) dyn-ming.h
- -$(DEL) if_perl.c
- -$(DEL) pathdef.c
- + cd xxd ; $(MAKE) -f Make_cyg.mak clean; cd ..
-
- ###########################################################################
-
- *** ../vim61.403/src/Make_ming.mak Sun Feb 16 22:21:17 2003
- --- src/Make_ming.mak Tue Mar 11 20:21:40 2003
- ***************
- *** 324,329 ****
- --- 324,332 ----
- -$(DEL) xxd\*.exe
- endif
- -$(DEL) dyn-ming.h
- + ifdef PERL
- + -$(DEL) if_perl.c
- + endif
-
- ###########################################################################
- vimres.res: vim.rc
- *** ../vim61.403/src/Makefile Tue Mar 11 12:59:06 2003
- --- src/Makefile Sat Mar 15 15:41:32 2003
- ***************
- *** 37,42 ****
- --- 37,44 ----
- # --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,384 ****
- --- 381,390 ----
- # 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,842 ****
- TUTORSUBLOC = $(VIMRTLOC)$(TUTORSUBDIR)
- SCRIPTLOC = $(VIMRTLOC)
-
- ! ### Only set VIMRUNTIMEDIR when VIMRCLOC is set to a different location and
- ### the runtime directory is not below it.
- #VIMRUNTIMEDIR = $(VIMRTLOC)
-
- --- 842,848 ----
- TUTORSUBLOC = $(VIMRTLOC)$(TUTORSUBDIR)
- SCRIPTLOC = $(VIMRTLOC)
-
- ! ### Only set VIMRUNTIMEDIR when VIMRTLOC is set to a different location and
- ### the runtime directory is not below it.
- #VIMRUNTIMEDIR = $(VIMRTLOC)
-
- ***************
- *** 1553,1558 ****
- --- 1559,1566 ----
- @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)
- *** ../vim61.403/src/config.h.in Sat Mar 8 20:33:31 2003
- --- src/config.h.in Sun Feb 16 18:31:10 2003
- ***************
- *** 9,26 ****
- /* Define unless no X support found */
- #undef HAVE_X11
-
- - /* Define when curses library found */
- - #undef HAVE_LIBCURSES
- -
- - /* Define when termcap library found */
- - #undef HAVE_LIBTERMCAP
- -
- - /* Define when termlib library found */
- - #undef HAVE_LIBTERMLIB
- -
- - /* Define when ncurses library found */
- - #undef HAVE_LIBNCURSES
- -
- /* Define when terminfo support found */
- #undef TERMINFO
-
- --- 9,14 ----
- *** ../vim61.403/src/edit.c Sat Mar 8 20:33:31 2003
- --- src/edit.c Thu Feb 27 12:45:25 2003
- ***************
- *** 1528,1537 ****
- */
- void
- change_indent(type, amount, round, replaced)
- ! int type;
- ! int amount;
- ! int round;
- ! int replaced; /* replaced character, put on replace stack */
- {
- int vcol;
- int last_vcol;
- --- 1528,1537 ----
- */
- void
- change_indent(type, amount, round, replaced)
- ! int type;
- ! int amount;
- ! int round;
- ! int replaced; /* replaced character, put on replace stack */
- {
- int vcol;
- int last_vcol;
- ***************
- *** 2305,2311 ****
- /* Forget any previous 'special' messages if this is actually
- * a ^X mode key - bar ^R, in which case we wait to see what it gives us.
- */
- ! if (c != Ctrl_R && vim_is_ctrl_x_key(c))
- edit_submode_extra = NULL;
-
- /* Ignore end of Select mode mapping */
- --- 2305,2311 ----
- /* Forget any previous 'special' messages if this is actually
- * a ^X mode key - bar ^R, in which case we wait to see what it gives us.
- */
- ! if (c != Ctrl_R && vim_is_ctrl_x_key(c))
- edit_submode_extra = NULL;
-
- /* Ignore end of Select mode mapping */
- *** ../vim61.403/src/eval.c Sat Mar 15 16:49:34 2003
- --- src/eval.c Fri Mar 14 21:35:20 2003
- ***************
- *** 232,239 ****
- static void f_getcharmod __ARGS((VAR argvars, VAR retvar));
- static void f_getwinvar __ARGS((VAR argvars, VAR retvar));
- static void f_getcwd __ARGS((VAR argvars, VAR retvar));
- - static void f_getftime __ARGS((VAR argvars, VAR retvar));
- static void f_getfsize __ARGS((VAR argvars, VAR retvar));
- static void f_getline __ARGS((VAR argvars, VAR retvar));
- static void f_getwinposx __ARGS((VAR argvars, VAR retvar));
- static void f_getwinposy __ARGS((VAR argvars, VAR retvar));
- --- 232,239 ----
- static void f_getcharmod __ARGS((VAR argvars, VAR retvar));
- static void f_getwinvar __ARGS((VAR argvars, VAR retvar));
- static void f_getcwd __ARGS((VAR argvars, VAR retvar));
- static void f_getfsize __ARGS((VAR argvars, VAR retvar));
- + static void f_getftime __ARGS((VAR argvars, VAR retvar));
- static void f_getline __ARGS((VAR argvars, VAR retvar));
- static void f_getwinposx __ARGS((VAR argvars, VAR retvar));
- static void f_getwinposy __ARGS((VAR argvars, VAR retvar));
- ***************
- *** 3826,3831 ****
- --- 3826,3832 ----
- VAR argvars;
- VAR retvar;
- {
- + retvar->var_val.var_number = 0;
- #ifdef FEAT_GUI
- if (gui.in_use)
- gui_mch_set_foreground();
- ***************
- *** 3975,3984 ****
- }
-
- /*
- ! * "getftime({fname})" function
- */
- static void
- ! f_getftime(argvars, retvar)
- VAR argvars;
- VAR retvar;
- {
- --- 3976,3985 ----
- }
-
- /*
- ! * "getfsize({fname})" function
- */
- static void
- ! f_getfsize(argvars, retvar)
- VAR argvars;
- VAR retvar;
- {
- ***************
- *** 3987,4003 ****
-
- fname = get_var_string(&argvars[0]);
-
- if (mch_stat((char *)fname, &st) >= 0)
- ! retvar->var_val.var_number = (varnumber_T)st.st_mtime;
- else
- ! retvar->var_val.var_number = -1;
- }
-
- /*
- ! * "getfsize({fname})" function
- */
- static void
- ! f_getfsize(argvars, retvar)
- VAR argvars;
- VAR retvar;
- {
- --- 3988,4011 ----
-
- fname = get_var_string(&argvars[0]);
-
- + retvar->var_type = VAR_NUMBER;
- +
- if (mch_stat((char *)fname, &st) >= 0)
- ! {
- ! if (mch_isdir(fname))
- ! retvar->var_val.var_number = 0;
- ! else
- ! retvar->var_val.var_number = (varnumber_T)st.st_size;
- ! }
- else
- ! retvar->var_val.var_number = -1;
- }
-
- /*
- ! * "getftime({fname})" function
- */
- static void
- ! f_getftime(argvars, retvar)
- VAR argvars;
- VAR retvar;
- {
- ***************
- *** 4006,4022 ****
-
- fname = get_var_string(&argvars[0]);
-
- - retvar->var_type = VAR_NUMBER;
- -
- if (mch_stat((char *)fname, &st) >= 0)
- ! {
- ! if (mch_isdir(fname))
- ! retvar->var_val.var_number = 0;
- ! else
- ! retvar->var_val.var_number = (varnumber_T)st.st_size;
- ! }
- else
- ! retvar->var_val.var_number = -1;
- }
-
- /*
- --- 4014,4023 ----
-
- fname = get_var_string(&argvars[0]);
-
- if (mch_stat((char *)fname, &st) >= 0)
- ! retvar->var_val.var_number = (varnumber_T)st.st_mtime;
- else
- ! retvar->var_val.var_number = -1;
- }
-
- /*
- ***************
- *** 4728,4740 ****
- int idx;
-
- type = get_histtype(get_var_string(&argvars[0]));
- - retvar->var_type = VAR_STRING;
- if (argvars[1].var_type == VAR_UNKNOWN)
- idx = get_history_idx(type);
- else
- idx = (int)get_var_number(&argvars[1]);
- retvar->var_val.var_string = vim_strsave(get_history_entry(type, idx));
- #endif
- }
-
- /*
- --- 4729,4743 ----
- int idx;
-
- type = get_histtype(get_var_string(&argvars[0]));
- if (argvars[1].var_type == VAR_UNKNOWN)
- idx = get_history_idx(type);
- else
- idx = (int)get_var_number(&argvars[1]);
- retvar->var_val.var_string = vim_strsave(get_history_entry(type, idx));
- + #else
- + retvar->var_val.var_string = NULL;
- #endif
- + retvar->var_type = VAR_STRING;
- }
-
- /*
- *** ../vim61.403/src/ex_cmds2.c Sat Mar 15 16:54:47 2003
- --- src/ex_cmds2.c Wed Mar 12 20:11:24 2003
- ***************
- *** 969,974 ****
- --- 969,975 ----
- #define AL_ADD 2
- #define AL_DEL 3
-
- + #if defined(FEAT_GUI) || defined(FEAT_CLIENTSERVER) || defined(PROTO)
- /*
- * Redefine the argument list.
- */
- ***************
- *** 978,983 ****
- --- 979,985 ----
- {
- do_arglist(str, AL_SET, 0);
- }
- + #endif
-
- /*
- * "what" == AL_SET: Redefine the argument list to 'str'.
- *** ../vim61.403/src/ex_docmd.c Sat Mar 15 16:33:38 2003
- --- src/ex_docmd.c Wed Mar 12 20:11:37 2003
- ***************
- *** 5288,5294 ****
- * code is very similar to :args and hence needs access to a lot of the static
- * functions in this file.
- *
- ! * The list should be allocated using vim_alloc(), as should each item in the
- * list. This function takes over responsibility for freeing the list.
- *
- * XXX The list is made into the arggument list. This is freed using
- --- 5288,5294 ----
- * code is very similar to :args and hence needs access to a lot of the static
- * functions in this file.
- *
- ! * The list should be allocated using alloc(), as should each item in the
- * list. This function takes over responsibility for freeing the list.
- *
- * XXX The list is made into the arggument list. This is freed using
- ***************
- *** 7541,7548 ****
- {
- p = skipwhite(p);
- while (*p == ':')
- ! ++p;
- ! p = skipwhite(p);
- if (p[0] == 'w' && p[1] == 'h')
- return TRUE;
- return FALSE;
- --- 7541,7547 ----
- {
- p = skipwhite(p);
- while (*p == ':')
- ! p = skipwhite(p + 1);
- if (p[0] == 'w' && p[1] == 'h')
- return TRUE;
- return FALSE;
- *** ../vim61.403/src/ex_getln.c Wed Feb 26 21:12:31 2003
- --- src/ex_getln.c Sat Feb 22 12:36:16 2003
- ***************
- *** 354,360 ****
- xpc.xp_context = EXPAND_NOTHING;
- wim_index = 0;
- #ifdef FEAT_WILDMENU
- ! if (p_wmnu && wild_menu_showing)
- {
- int skt = KeyTyped;
-
- --- 354,360 ----
- xpc.xp_context = EXPAND_NOTHING;
- wim_index = 0;
- #ifdef FEAT_WILDMENU
- ! if (p_wmnu && wild_menu_showing != 0)
- {
- int skt = KeyTyped;
-
- ***************
- *** 3443,3449 ****
- #if defined(FEAT_CMDL_COMPL) || defined(FEAT_EVAL) || defined(PROTO)
- /*
- * Expand "file" for all comma-separated directories in "path".
- ! * Returns an allocated strings with all matches concatenated, separated by
- * newlines. Returns NULL for an error or no matches.
- */
- char_u *
- --- 3443,3449 ----
- #if defined(FEAT_CMDL_COMPL) || defined(FEAT_EVAL) || defined(PROTO)
- /*
- * Expand "file" for all comma-separated directories in "path".
- ! * Returns an allocated string with all matches concatenated, separated by
- * newlines. Returns NULL for an error or no matches.
- */
- char_u *
- ***************
- *** 4615,4620 ****
- vim_free(theline);
- }
-
- ! return ga.ga_data;
- }
- #endif /* SCRIPTS */
- --- 4615,4620 ----
- vim_free(theline);
- }
-
- ! return (char_u *)ga.ga_data;
- }
- #endif /* SCRIPTS */
- *** ../vim61.403/src/fileio.c Sat Mar 15 16:39:04 2003
- --- src/fileio.c Thu Mar 13 10:16:45 2003
- ***************
- *** 5520,5526 ****
- if (savebuf == NULL || saved == FAIL
- || move_lines(buf, savebuf) == FAIL)
- {
- ! EMSG2(_("E461: Could not prepare for reloading \"%s\""),
- buf->b_fname);
- saved = FAIL;
- }
- --- 5520,5526 ----
- if (savebuf == NULL || saved == FAIL
- || move_lines(buf, savebuf) == FAIL)
- {
- ! EMSG2(_("E462: Could not prepare for reloading \"%s\""),
- buf->b_fname);
- saved = FAIL;
- }
- *** ../vim61.403/src/getchar.c Sun Mar 9 14:01:01 2003
- --- src/getchar.c Thu Mar 6 22:02:48 2003
- ***************
- *** 1144,1150 ****
- may_sync_undo()
- {
- if ((!(State & (INSERT + CMDLINE)) || arrow_used)
- ! && scriptin[curscript] == NULL && !no_u_sync)
- u_sync();
- }
-
- --- 1144,1150 ----
- may_sync_undo()
- {
- if ((!(State & (INSERT + CMDLINE)) || arrow_used)
- ! && scriptin[curscript] == NULL && no_u_sync == 0)
- u_sync();
- }
-
- *** ../vim61.403/src/gui.c Tue Mar 11 12:59:06 2003
- --- src/gui.c Mon Mar 10 22:48:00 2003
- ***************
- *** 171,176 ****
- --- 171,177 ----
- if (gui.in_use)
- apply_autocmds(EVENT_GUIENTER, NULL, NULL, FALSE, curbuf);
- #endif
- +
- --recursive;
- }
-
- *** ../vim61.403/src/gui_gtk.c Tue Mar 11 12:59:06 2003
- --- src/gui_gtk.c Mon Mar 10 20:04:17 2003
- ***************
- *** 1467,1473 ****
- if (dialog_status != 1 && textfield != NULL)
- *textfield = NUL; /* dialog was cancelled */
-
- ! /* let the garbage collector know that we don't need it anylonger */
- gtk_accel_group_unref(accel_group);
-
- vim_free(button);
- --- 1467,1473 ----
- if (dialog_status != 1 && textfield != NULL)
- *textfield = NUL; /* dialog was cancelled */
-
- ! /* let the garbage collector know that we don't need it any longer */
- gtk_accel_group_unref(accel_group);
-
- vim_free(button);
- *** ../vim61.403/src/gui_photon.c Sun Oct 13 20:08:14 2002
- --- src/gui_photon.c Sun Oct 20 16:46:52 2002
- ***************
- *** 2512,2517 ****
- --- 2512,2518 ----
- if( menu->icon_builtin == FALSE )
- {
- if( menu->iconfile != NULL )
- + /* TODO: use gui_find_iconfile() */
- icon = gui_ph_toolbar_load_icon( menu->iconfile );
-
- /* TODO: Restrict loading to just .png? Search for any format? */
- *** ../vim61.403/src/if_cscope.c Mon Aug 27 17:24:29 2001
- --- src/if_cscope.c Tue Mar 4 20:51:40 2003
- ***************
- *** 124,130 ****
- {
- postponed_split = -1;
- do_cscope(eap);
- ! } /* do_scscope */
-
- /*
- * PUBLIC: do_cstag
- --- 124,130 ----
- {
- postponed_split = -1;
- do_cscope(eap);
- ! }
-
- /*
- * PUBLIC: do_cstag
- ***************
- *** 223,229 ****
- if ((p = cs_manage_matches(NULL, NULL, -1, Get)) == NULL)
- return TRUE;
-
- ! if (strlen(p) > size)
- {
- strncpy((char *)buf, p, size - 1);
- buf[size] = '\0';
- --- 223,229 ----
- if ((p = cs_manage_matches(NULL, NULL, -1, Get)) == NULL)
- return TRUE;
-
- ! if ((int)strlen(p) > size)
- {
- strncpy((char *)buf, p, size - 1);
- buf[size] = '\0';
- *** ../vim61.403/src/if_python.c Sun Oct 6 18:27:32 2002
- --- src/if_python.c Mon Feb 17 10:14:28 2003
- ***************
- *** 36,41 ****
- --- 36,45 ----
- # undef _DEBUG
- #endif
-
- + #ifdef HAVE_STDARG_H
- + # undef HAVE_STDARG_H /* Python's config.h defines it as well. */
- + #endif
- +
- #include <Python.h>
- #ifdef MACOS
- # include "macglue.h"
- *** ../vim61.403/src/keymap.h Mon Sep 16 22:00:32 2002
- --- src/keymap.h Sun Dec 29 12:58:24 2002
- ***************
- *** 30,42 ****
-
- /*
- * Positive characters are "normal" characters.
- - * Characters 0x0100 - 0x01ff are sometimes used for abbreviations.
- * Negative characters are special key codes. Only characters below -0x200
- * are used to so that the absolute value can't be mistaken for a single-byte
- * character.
- */
- #define IS_SPECIAL(c) ((c) < 0)
- ! #define IS_ABBR(c) ((c) >= 0x100 && (c) < 0x200)
- #define ABBR_OFF 0x100
-
- /*
- --- 30,45 ----
-
- /*
- * Positive characters are "normal" characters.
- * Negative characters are special key codes. Only characters below -0x200
- * are used to so that the absolute value can't be mistaken for a single-byte
- * character.
- */
- #define IS_SPECIAL(c) ((c) < 0)
- !
- ! /*
- ! * Characters 0x0100 - 0x01ff have a special meaning for abbreviations.
- ! * Multi-byte characters also have ABBR_OFF added, thus are above 0x0200.
- ! */
- #define ABBR_OFF 0x100
-
- /*
- *** ../vim61.403/src/mark.c Mon Jun 24 22:49:34 2002
- --- src/mark.c Mon Jun 24 22:02:38 2002
- ***************
- *** 297,309 ****
- startp = &curbuf->b_visual_start;
- endp = &curbuf->b_visual_end;
- if ((c == '<') == lt(*startp, *endp))
- - {
- posp = startp;
- - }
- else
- - {
- posp = endp;
- - }
- /*
- * For Visual line mode, set mark at begin or end of line
- */
- --- 297,305 ----
- *** ../vim61.403/src/mbyte.c Sun Feb 23 17:47:25 2003
- --- src/mbyte.c Sat Feb 22 15:01:32 2003
- ***************
- *** 2425,2430 ****
- --- 2425,2431 ----
-
- /*
- * Set the default value for 'encoding' (p_enc).
- + * This must be called only once.
- * Returns OK when successful, FAIL when not.
- */
- int
- *** ../vim61.403/src/message.c Thu Feb 20 21:19:02 2003
- --- src/message.c Sat Feb 15 23:04:27 2003
- ***************
- *** 824,830 ****
- /*
- * Avoid that the mouse-up event causes visual mode to start.
- */
- ! if (c == K_LEFTMOUSE || c == K_MIDDLEMOUSE || c == K_RIGHTMOUSE || c== K_X1MOUSE || c == K_X2MOUSE)
- (void)jump_to_mouse(MOUSE_SETPOS, NULL, 0);
- else
- #endif
- --- 824,831 ----
- /*
- * Avoid that the mouse-up event causes visual mode to start.
- */
- ! if (c == K_LEFTMOUSE || c == K_MIDDLEMOUSE || c == K_RIGHTMOUSE
- ! || c == K_X1MOUSE || c == K_X2MOUSE)
- (void)jump_to_mouse(MOUSE_SETPOS, NULL, 0);
- else
- #endif
- *** ../vim61.403/src/misc1.c Sun Mar 9 14:08:43 2003
- --- src/misc1.c Mon Mar 10 22:39:03 2003
- ***************
- *** 1917,1923 ****
- */
- was_alloced = ml_line_alloced(); /* check if oldp was allocated */
- #ifdef FEAT_NETBEANS_INTG
- ! if (was_alloced)
- netbeans_removed(curbuf, lnum, col, count);
- /* else is handled by ml_replace() */
- #endif
- --- 1917,1923 ----
- */
- was_alloced = ml_line_alloced(); /* check if oldp was allocated */
- #ifdef FEAT_NETBEANS_INTG
- ! if (was_alloced && usingNetbeans)
- netbeans_removed(curbuf, lnum, col, count);
- /* else is handled by ml_replace() */
- #endif
- ***************
- *** 7110,7116 ****
- if (buffer == NULL)
- goto done;
- #ifdef VMS
- ! len = i; /* why is this? */
- #endif
- if (i != len)
- {
- --- 7110,7116 ----
- if (buffer == NULL)
- goto done;
- #ifdef VMS
- ! len = i; /* VMS doesn't give us what we asked for... */
- #endif
- if (i != len)
- {
- *** ../vim61.403/src/misc2.c Sat Mar 8 20:33:32 2003
- --- src/misc2.c Mon Mar 3 12:33:55 2003
- ***************
- *** 91,97 ****
- #endif
-
- /*
- ! * Try to advance the Cursor to the specified column.
- * If virtual editing: fine tune the cursor position.
- * Note that all virtual positions off the end of a line should share
- * a curwin->w_cursor.col value (n.b. this is equal to STRLEN(line)),
- --- 91,97 ----
- #endif
-
- /*
- ! * Try to advance the Cursor to the specified screen column.
- * If virtual editing: fine tune the cursor position.
- * Note that all virtual positions off the end of a line should share
- * a curwin->w_cursor.col value (n.b. this is equal to STRLEN(line)),
- ***************
- *** 116,121 ****
- --- 116,125 ----
- return rc;
- }
-
- + /*
- + * Return in "pos" the position of the cursor advanced to screen column "wcol".
- + * return OK if desired column is reached, FAIL if not
- + */
- int
- getvpos(pos, wcol)
- pos_T *pos;
- ***************
- *** 1115,1127 ****
- }
-
- /*
- - * vim_strncpy()
- - *
- * This is here because strncpy() does not guarantee successful results when
- ! * the to and from strings overlap. It is only currently called from nextwild()
- ! * which copies part of the command line to another part of the command line.
- ! * This produced garbage when expanding files etc in the middle of the command
- ! * line (on my terminal, anyway) -- webb.
- */
- void
- vim_strncpy(to, from, len)
- --- 1119,1131 ----
- }
-
- /*
- * This is here because strncpy() does not guarantee successful results when
- ! * the to and from strings overlap. It is only currently called from
- ! * nextwild() which copies part of the command line to another part of the
- ! * command line. This produced garbage when expanding files etc in the middle
- ! * of the command line (on my terminal, anyway) -- webb.
- ! * Note: strncpy() pads the remainder of the buffer with NUL bytes,
- ! * vim_strncpy() doesn't do that.
- */
- void
- vim_strncpy(to, from, len)
- *** ../vim61.403/src/normal.c Sat Mar 8 20:33:32 2003
- --- src/normal.c Mon Mar 3 20:55:23 2003
- ***************
- *** 8008,8014 ****
- cmdarg_T *cap;
- {
- #ifdef FEAT_VISUAL
- ! int regname;
- void *reg1 = NULL, *reg2 = NULL;
- #endif
- int dir;
- --- 8008,8014 ----
- cmdarg_T *cap;
- {
- #ifdef FEAT_VISUAL
- ! int regname = 0;
- void *reg1 = NULL, *reg2 = NULL;
- #endif
- int dir;
- *** ../vim61.403/src/option.c Tue Mar 11 12:39:42 2003
- --- src/option.c Tue Mar 11 10:29:15 2003
- ***************
- *** 8760,8767 ****
- buf->b_start_ffc = *buf->b_p_ff;
- buf->b_start_eol = buf->b_p_eol;
- #ifdef FEAT_MBYTE
- ! vim_free(buf->b_start_fenc);
- ! buf->b_start_fenc = vim_strsave(buf->b_p_fenc);
- #endif
- }
-
- --- 8760,8772 ----
- buf->b_start_ffc = *buf->b_p_ff;
- buf->b_start_eol = buf->b_p_eol;
- #ifdef FEAT_MBYTE
- ! /* Only use free/alloc when necessary, they take time. */
- ! if (buf->b_start_fenc == NULL
- ! || STRCMP(buf->b_start_fenc, buf->b_p_fenc) != 0)
- ! {
- ! vim_free(buf->b_start_fenc);
- ! buf->b_start_fenc = vim_strsave(buf->b_p_fenc);
- ! }
- #endif
- }
-
- *** ../vim61.403/src/os_os2_cfg.h Tue May 22 20:25:35 2001
- --- src/os_os2_cfg.h Thu Apr 4 19:39:07 2002
- ***************
- *** 20,37 ****
- /* Define unless no X support found */
- #undef HAVE_X11
-
- - /* Define when curses library found */
- - #undef HAVE_LIBCURSES
- -
- - /* Define when termcap library found */
- - #define HAVE_LIBTERMCAP 1
- -
- - /* Define when termlib library found */
- - #undef HAVE_LIBTERMLIB
- -
- - /* Define when ncurses library found */
- - #undef HAVE_LIBNCURSES
- -
- /* Define when terminfo support found */
- #undef TERMINFO
-
- --- 20,25 ----
- *** ../vim61.403/src/os_win32.c Sun Feb 23 17:47:25 2003
- --- src/os_win32.c Sat Feb 22 15:10:01 2003
- ***************
- *** 2808,2813 ****
- --- 2808,2815 ----
- if (g_PlatformId != VER_PLATFORM_WIN32s)
- {
- #ifdef FEAT_GUI
- + int delay = 1;
- +
- /* Keep updating the window while waiting for the shell to finish. */
- for (;;)
- {
- ***************
- *** 2818,2825 ****
- TranslateMessage(&msg);
- DispatchMessage(&msg);
- }
- ! if (WaitForSingleObject(pi.hProcess, 100) != WAIT_TIMEOUT)
- break;
- }
- #else
- WaitForSingleObject(pi.hProcess, INFINITE);
- --- 2820,2833 ----
- TranslateMessage(&msg);
- DispatchMessage(&msg);
- }
- ! if (WaitForSingleObject(pi.hProcess, delay) != WAIT_TIMEOUT)
- break;
- +
- + /* We start waiting for a very short time and then increase it, so
- + * that we respond quickly when the process is quick, and don't
- + * consume too much overhead when it's slow. */
- + if (delay < 50)
- + delay += 10;
- }
- #else
- WaitForSingleObject(pi.hProcess, INFINITE);
- ***************
- *** 2851,2857 ****
- CloseHandle(pi.hProcess);
-
- /* Try to get input focus back. Doesn't always work though. */
- ! SetFocus(hwnd);
-
- return ret;
- }
- --- 2859,2865 ----
- CloseHandle(pi.hProcess);
-
- /* Try to get input focus back. Doesn't always work though. */
- ! PostMessage(hwnd, WM_SETFOCUS, 0, 0);
-
- return ret;
- }
- *** ../vim61.403/src/proto/getchar.pro Sun Jan 5 22:14:46 2003
- --- src/proto/getchar.pro Thu Mar 6 21:26:39 2003
- ***************
- *** 51,57 ****
- int ExpandMappings __ARGS((regmatch_T *regmatch, int *num_file, char_u ***file));
- int check_abbr __ARGS((int c, char_u *ptr, int col, int mincol));
- int makemap __ARGS((FILE *fd, buf_T *buf));
- ! int put_escstr __ARGS((FILE *fd, char_u *str, int what));
- void check_map_keycodes __ARGS((void));
- char_u *check_map __ARGS((char_u *keys, int mode, int exact));
- void init_mappings __ARGS((void));
- --- 51,57 ----
- int ExpandMappings __ARGS((regmatch_T *regmatch, int *num_file, char_u ***file));
- int check_abbr __ARGS((int c, char_u *ptr, int col, int mincol));
- int makemap __ARGS((FILE *fd, buf_T *buf));
- ! int put_escstr __ARGS((FILE *fd, char_u *strstart, int what));
- void check_map_keycodes __ARGS((void));
- char_u *check_map __ARGS((char_u *keys, int mode, int exact));
- void init_mappings __ARGS((void));
- *** ../vim61.403/src/proto/message.pro Fri Mar 22 21:41:15 2002
- --- src/proto/message.pro Thu Mar 6 21:26:43 2003
- ***************
- *** 25,31 ****
- char_u *msg_outtrans_one __ARGS((char_u *p, int attr));
- int msg_outtrans_len_attr __ARGS((char_u *str, int len, int attr));
- void msg_make __ARGS((char_u *arg));
- ! int msg_outtrans_special __ARGS((char_u *str, int from));
- char_u *str2special __ARGS((char_u **sp, int from));
- void str2specialbuf __ARGS((char_u *sp, char_u *buf, int len));
- void msg_prt_line __ARGS((char_u *s));
- --- 25,31 ----
- char_u *msg_outtrans_one __ARGS((char_u *p, int attr));
- int msg_outtrans_len_attr __ARGS((char_u *str, int len, int attr));
- void msg_make __ARGS((char_u *arg));
- ! int msg_outtrans_special __ARGS((char_u *strstart, int from));
- char_u *str2special __ARGS((char_u **sp, int from));
- void str2specialbuf __ARGS((char_u *sp, char_u *buf, int len));
- void msg_prt_line __ARGS((char_u *s));
- *** ../vim61.403/src/proto/regexp.pro Mon Apr 8 22:11:31 2002
- --- src/proto/regexp.pro Thu Mar 6 21:26:47 2003
- ***************
- *** 1,7 ****
- /* regexp.c */
- int re_multiline __ARGS((regprog_T *prog));
- char_u *skip_regexp __ARGS((char_u *startp, int dirc, int magic, char_u **newp));
- ! regprog_T *vim_regcomp __ARGS((char_u *expr, int magic));
- int vim_regcomp_had_eol __ARGS((void));
- int vim_regexec __ARGS((regmatch_T *rmp, char_u *line, colnr_T col));
- long vim_regexec_multi __ARGS((regmmatch_T *rmp, win_T *win, buf_T *buf, linenr_T lnum, colnr_T col));
- --- 1,7 ----
- /* regexp.c */
- int re_multiline __ARGS((regprog_T *prog));
- char_u *skip_regexp __ARGS((char_u *startp, int dirc, int magic, char_u **newp));
- ! regprog_T *vim_regcomp __ARGS((char_u *expr, int re_flags));
- int vim_regcomp_had_eol __ARGS((void));
- int vim_regexec __ARGS((regmatch_T *rmp, char_u *line, colnr_T col));
- long vim_regexec_multi __ARGS((regmmatch_T *rmp, win_T *win, buf_T *buf, linenr_T lnum, colnr_T col));
- *** ../vim61.403/src/screen.c Wed Mar 12 19:19:15 2003
- --- src/screen.c Wed Mar 12 17:58:30 2003
- ***************
- *** 562,580 ****
- int row;
- int j;
-
- ! #ifdef FEAT_FOLDING
- win_foldinfo.fi_level = 0;
- ! #endif
- updating_screen = TRUE;
-
- ! #ifdef FEAT_GUI
- /* Remove the cursor before starting to do anything, because scrolling may
- * make it difficult to redraw the text under it. */
- if (gui.in_use)
- gui_undraw_cursor();
- ! #endif
- if (buf != NULL && lnum > 0)
- ! { /* update/delete a specific mark */
- FOR_ALL_WINDOWS(wp)
- {
- if (wp->w_buffer == buf && lnum >= wp->w_topline
- --- 562,581 ----
- int row;
- int j;
-
- ! # ifdef FEAT_FOLDING
- win_foldinfo.fi_level = 0;
- ! # endif
- updating_screen = TRUE;
-
- ! # ifdef FEAT_GUI
- /* Remove the cursor before starting to do anything, because scrolling may
- * make it difficult to redraw the text under it. */
- if (gui.in_use)
- gui_undraw_cursor();
- ! # endif
- if (buf != NULL && lnum > 0)
- ! {
- ! /* update/delete a specific mark */
- FOR_ALL_WINDOWS(wp)
- {
- if (wp->w_buffer == buf && lnum >= wp->w_topline
- ***************
- *** 605,618 ****
- else
- {
- /* update all windows (signs deleted) */
- ! #ifdef FEAT_WINDOWS
- for (wp = firstwin; wp; wp = wp->w_next)
- win_update(wp);
- ! #else
- win_update(curwin);
- ! #endif
- }
- ! #ifdef FEAT_GUI
- /* Redraw the cursor and update the scrollbars when all screen updating is
- * done. */
- if (gui.in_use)
- --- 606,619 ----
- else
- {
- /* update all windows (signs deleted) */
- ! # ifdef FEAT_WINDOWS
- for (wp = firstwin; wp; wp = wp->w_next)
- win_update(wp);
- ! # else
- win_update(curwin);
- ! # endif
- }
- ! # ifdef FEAT_GUI
- /* Redraw the cursor and update the scrollbars when all screen updating is
- * done. */
- if (gui.in_use)
- ***************
- *** 621,632 ****
- gui_update_cursor(FALSE, FALSE);
- gui_update_scrollbars(FALSE);
- }
- ! #endif
-
- updating_screen = FALSE;
- ! #ifdef FEAT_GUI
- gui_may_resize_shell();
- ! #endif
- }
- #endif
-
- --- 622,633 ----
- gui_update_cursor(FALSE, FALSE);
- gui_update_scrollbars(FALSE);
- }
- ! # endif
-
- updating_screen = FALSE;
- ! # ifdef FEAT_GUI
- gui_may_resize_shell();
- ! # endif
- }
- #endif
-
- ***************
- *** 4715,4723 ****
- row = cmdline_row - 1;
- if (row >= 0)
- {
- ! if (!wild_menu_showing)
- {
- ! if (msg_scrolled && !wild_menu_showing)
- {
- /* Put the wildmenu just above the command line. If there is
- * no room, scroll the screen one line up. */
- --- 4716,4724 ----
- row = cmdline_row - 1;
- if (row >= 0)
- {
- ! if (wild_menu_showing == 0)
- {
- ! if (msg_scrolled > 0)
- {
- /* Put the wildmenu just above the command line. If there is
- * no room, scroll the screen one line up. */
- *** ../vim61.403/src/structs.h Tue Mar 11 12:59:06 2003
- --- src/structs.h Mon Mar 10 22:49:53 2003
- ***************
- *** 737,744 ****
- --- 737,746 ----
- int m_mode; /* valid mode */
- int m_noremap; /* if non-zero no re-mapping for m_str */
- char m_silent; /* <silent> used, don't echo commands */
- + #if 0 /* Not used yet */
- scid_T m_script_ID; /* ID of script where map was defined,
- used for s: variables and functions */
- + #endif
- };
-
- /*
- *** ../vim61.403/src/syntax.c Sat Mar 15 16:54:47 2003
- --- src/syntax.c Wed Mar 12 09:37:59 2003
- ***************
- *** 7850,7855 ****
- --- 7850,7856 ----
- syn_add_group(name)
- char_u *name;
- {
- + /* TODO: check that the name is ASCII letters, digits and underscore. */
- /*
- * First call for this growarray: init growing array.
- */
- *** ../vim61.403/src/term.c Tue Feb 25 21:50:44 2003
- --- src/term.c Mon Feb 17 11:51:49 2003
- ***************
- *** 1910,1916 ****
-
- #ifdef USE_TERM_CONSOLE
- /* DEFAULT_TERM indicates that it is the machine console. */
- ! if (STRCMP(term, DEFAULT_TERM))
- term_console = FALSE;
- else
- {
- --- 1910,1916 ----
-
- #ifdef USE_TERM_CONSOLE
- /* DEFAULT_TERM indicates that it is the machine console. */
- ! if (STRCMP(term, DEFAULT_TERM) != 0)
- term_console = FALSE;
- else
- {
- *** ../vim61.403/src/testdir/test15.in Tue Aug 14 21:06:22 2001
- --- src/testdir/test15.in Sat Aug 24 22:40:37 2002
- ***************
- *** 1,15 ****
- Tests for :right on text with embedded TAB.
- Also test formatting a paragraph.
-
- STARTTEST
- :so small.vim
- :set tw=65
-
- ! :/test for :left/,/test for :center/ left
- ! :/test for :center/,/test for :right/ center
- ! :/test for :right/,/^xxx/-1 right
- :set fo+=tcroql tw=72
- ! Ggq6kk
- :?test for :left?,$w! test.out
- :qa!
- ENDTEST
- --- 1,23 ----
- Tests for :right on text with embedded TAB.
- Also test formatting a paragraph.
- + Also test undo after ":%s" and formatting.
-
- STARTTEST
- :so small.vim
- :set tw=65
-
- ! :/^\s*test for :left/,/^\s*test for :center/ left
- ! :/^\s*test for :center/,/^\s*test for :right/ center
- ! :/^\s*test for :right/,/^xxx/-1 right
- :set fo+=tcroql tw=72
- ! /xxxxxxxx$
- ! 0gq6kk
- ! :set nocp
- ! :" undo/redo here to make the next undo only work on the following changes
- ! u
- ! :map gg :.,.+2s/^/x/<CR>kk:set tw=3<CR>gqq
- ! /^aa
- ! ggu
- :?test for :left?,$w! test.out
- :qa!
- ENDTEST
- ***************
- *** 122,124 ****
- --- 130,136 ----
-
- > xx xx, xxxx xxxx xxx xxxx xxx xxxxx xxx xxx xxxxxxx xxx xxxxx
- > xxxxxx xxxxxxx: xxxx xxxxxxx, xx xxxxxx xxxx xxxxxxxxxx
- +
- + aa aa aa aa
- + bb bb bb bb
- + cc cc cc cc
- *** ../vim61.403/src/testdir/test15.ok Tue Aug 14 21:04:09 2001
- --- src/testdir/test15.ok Sat Aug 24 21:52:49 2002
- ***************
- *** 105,107 ****
- --- 105,111 ----
-
- > xx xx, xxxx xxxx xxx xxxx xxx xxxxx xxx xxx xxxxxxx xxx xxxxx xxxxxx
- > xxxxxxx: xxxx xxxxxxx, xx xxxxxx xxxx xxxxxxxxxx
- +
- + aa aa aa aa
- + bb bb bb bb
- + cc cc cc cc
- *** ../vim61.403/src/vim.rc Thu Sep 20 18:18:18 2001
- --- src/vim.rc Sat Mar 15 17:15:59 2003
- ***************
- *** 91,97 ****
- VALUE "FileDescription", "Vi Improved - A Text Editor\0"
- VALUE "FileVersion", VIM_VERSION_MAJOR_STR ", " VIM_VERSION_MINOR_STR ", " VIM_VERSION_BUILD_STR ", " VIM_VERSION_PATCHLEVEL_STR "\0"
- VALUE "InternalName", "VIM\0"
- ! VALUE "LegalCopyright", "Copyright \251 1996-2001\0"
- VALUE "LegalTrademarks", "Vim\0"
- VALUE "OriginalFilename", "VIM.EXE\0"
- VALUE "ProductName", "Vim\0"
- --- 91,97 ----
- VALUE "FileDescription", "Vi Improved - A Text Editor\0"
- VALUE "FileVersion", VIM_VERSION_MAJOR_STR ", " VIM_VERSION_MINOR_STR ", " VIM_VERSION_BUILD_STR ", " VIM_VERSION_PATCHLEVEL_STR "\0"
- VALUE "InternalName", "VIM\0"
- ! VALUE "LegalCopyright", "Copyright \251 1996-2003\0"
- VALUE "LegalTrademarks", "Vim\0"
- VALUE "OriginalFilename", "VIM.EXE\0"
- VALUE "ProductName", "Vim\0"
- *** ../vim61.403/src/xxd/Make_cyg.mak Tue Jan 2 21:26:56 2001
- --- src/xxd/Make_cyg.mak Thu Mar 13 22:17:54 2003
- ***************
- *** 1,9 ****
- # The most simplistic Makefile, for Cygnus gcc on MS-DOS
-
- ! CFLAGS = -O2 -Wall
-
- ! xxd.exe: xxd.c
- ! gcc $(CFLAGS) -s -o xxd.exe xxd.c -lc
-
- clean:
- ! del xxd.exe
- --- 1,27 ----
- # The most simplistic Makefile, for Cygnus gcc on MS-DOS
-
- ! ifndef USEDLL
- ! USEDLL = no
- ! endif
-
- ! ifeq (no, $(USEDLL))
- ! DEFINES = -mno-cygwin
- ! LIBS =
- ! else
- ! DEFINES =
- ! LIBS = -lc
- ! endif
- !
- ! CFLAGS = -O2 -Wall $(DEFINES)
-
- + ifneq (sh.exe, $(SHELL))
- + DEL = rm
- + else
- + DEL = del
- + endif
- +
- + xxd.exe: xxd.c
- + gcc $(CFLAGS) -s -o xxd.exe xxd.c $(LIBS)
- +
- clean:
- ! -$(DEL) xxd.exe
- *** ../vim61.403/src/xxd/Makefile Sun Aug 1 14:01:12 1999
- --- src/xxd/Makefile Wed Jun 26 21:44:43 2002
- ***************
- *** 1,7 ****
- # The most simplistic Makefile
-
- xxd: xxd.c
- ! $(CC) $(CFLAGS) -DUNIX -o xxd xxd.c
-
- clean:
- rm -f xxd xxd.o
- --- 1,7 ----
- # The most simplistic Makefile
-
- xxd: xxd.c
- ! $(CC) $(CFLAGS) $(LDFLAGS) -DUNIX -o xxd xxd.c
-
- clean:
- rm -f xxd xxd.o
- *** ../vim61.403/src/version.c Sat Mar 15 16:54:47 2003
- --- src/version.c Sat Mar 15 17:18:16 2003
- ***************
- *** 613,614 ****
- --- 613,616 ----
- { /* Add new patch number below this line */
- + /**/
- + 404,
- /**/
-
- --
- From "know your smileys":
- O:-) Saint
-
- /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
- /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\
- \\\ Project leader for A-A-P -- http://www.A-A-P.org ///
- \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///
-