aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.0114

Browse Source
This commit is contained in:
Bram Moolenaar 2005-07-23 22:25:46 +00:00
parent b01585904a
commit 58d9823409
38 changed files with 582 additions and 3957 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
runtime/doc/todo.txt
View File

@ -1,4 +1,4 @@
*todo.txt* For Vim version 7.0aa. Last change: 2005 Jul 22 *todo.txt* For Vim version 7.0aa. Last change: 2005 Jul 23
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -30,20 +30,12 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
*known-bugs* *known-bugs*
-------------------- Known bugs and current work ----------------------- -------------------- Known bugs and current work -----------------------
Make a script to check message translations not to change the % items in
strings.
Fixed Netrw plugin problems:
- when 'autochdir' is set the current dir is wrong (Salman Halim)
- "cd -" doesn't work. (Suresh Govindachar)
Send to Charles Campbell
Mac unicode patch (Da Woon Jung): Mac unicode patch (Da Woon Jung):
- selecting proportional font breaks display - selecting proportional font breaks display
- UTF-8 text causes display problems. Font replacement causes this. - UTF-8 text causes display problems. Font replacement causes this.
Include new PHP indent script from John Wellesz? Win32: Use the free downloadable compiler 7.1. Figure out how to do debugging
http://www.vim.org/scripts/download_script.php?src_id=4330 (with Agide?) and describe it. (George Reilly)
autoload: autoload:
- Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
@ -56,29 +48,24 @@ autoload:
helpfile doc/myscript.txt helpfile doc/myscript.txt
For the "helpfile" item ":helptags" is run. For the "helpfile" item ":helptags" is run.
Patch to alternate fold highlighting. (Anthony Iano-Fletcher, 2005 May 12)
More levels?
Awaiting response: Awaiting response:
- Win32: tearoff menu window should have a scrollbar when it's taller than - Win32: tearoff menu window should have a scrollbar when it's taller than
the screen. the screen.
- mblen(NULL, 0) also in Vim 6.3?
mblen(NULL, 0) also in Vim 6.3?
Win32: Crash when pasting Simplified Chinese in utf-8. (rainux, 2005 June 20) Win32: Crash when pasting Simplified Chinese in utf-8. (rainux, 2005 June 20)
PLANNED FOR VERSION 7.0: PLANNED FOR VERSION 7.0:
- Support using "**" in filename for ":next", ":vimgrep", etc., so that a
directory tree can be searched.
- REFACTORING: The main() function is very long. Move parts to separate - REFACTORING: The main() function is very long. Move parts to separate
functions, especially loops. Ideas from Walter Briscoe (2003 Apr 3, 2004 functions, especially loops. Ideas from Walter Briscoe (2003 Apr 3, 2004
Feb 9). Feb 9).
Move the printing stuff to hardcopy.c. Improve the interface between the generic GUI code and the system-specific
- Improve the interface between the generic GUI code and the system-specific
code. Generic code handles text window with scrollbars, system-specific code. Generic code handles text window with scrollbars, system-specific
code menu, toolbar, etc. code menu, toolbar, etc.
- Support using "**" in filename for ":next", ":vimgrep", etc., so that a
directory tree can be searched.
- Store messages to allow SCROLLING BACK for all commands. And other "less" - Store messages to allow SCROLLING BACK for all commands. And other "less"
like commands. like commands.
- "INTELLISENSE". First cleanup the Insert-mode completion. - "INTELLISENSE". First cleanup the Insert-mode completion.

1
src/Make_bc3.mak
View File

@ -65,6 +65,7 @@ EXE_dependencies = \
fileio.obj \ fileio.obj \
fold.obj \ fold.obj \
getchar.obj \ getchar.obj \
hardcopy.obj \
hashtable.obj \ hashtable.obj \
main.obj \ main.obj \
mark.obj \ mark.obj \

1
src/Make_bc5.mak
View File

@ -546,6 +546,7 @@ vimobj = \
$(OBJDIR)\fileio.obj \ $(OBJDIR)\fileio.obj \
$(OBJDIR)\fold.obj \ $(OBJDIR)\fold.obj \
$(OBJDIR)\getchar.obj \ $(OBJDIR)\getchar.obj \
$(OBJDIR)\hardcopy.obj \
$(OBJDIR)\hashtable.obj \ $(OBJDIR)\hashtable.obj \
$(OBJDIR)\main.obj \ $(OBJDIR)\main.obj \
$(OBJDIR)\mark.obj \ $(OBJDIR)\mark.obj \

3
src/Make_cyg.mak
View File

@ -1,6 +1,6 @@
# #
# Makefile for VIM on Win32, using Cygnus gcc # Makefile for VIM on Win32, using Cygnus gcc
# Last updated by Dan Sharp. Last Change: 2005 Mar 21 # Last updated by Dan Sharp. Last Change: 2005 Jul 23
# #
# Also read INSTALLpc.txt! # Also read INSTALLpc.txt!
# #
@ -403,6 +403,7 @@ OBJ = \
$(OUTDIR)/fileio.o \ $(OUTDIR)/fileio.o \
$(OUTDIR)/fold.o \ $(OUTDIR)/fold.o \
$(OUTDIR)/getchar.o \ $(OUTDIR)/getchar.o \
$(OUTDIR)/hardcopy.o \
$(OUTDIR)/hashtable.o \ $(OUTDIR)/hashtable.o \
$(OUTDIR)/main.o \ $(OUTDIR)/main.o \
$(OUTDIR)/mark.o \ $(OUTDIR)/mark.o \

4
src/Make_dice.mak
View File

@ -40,6 +40,7 @@ SRC = \
fileio.c \ fileio.c \
fold.c \ fold.c \
getchar.c \ getchar.c \
hardcopy.c \
hashtable.c \ hashtable.c \
main.c \ main.c \
mark.c \ mark.c \
@ -82,6 +83,7 @@ OBJ = o/buffer.o \
o/fileio.o \ o/fileio.o \
o/fold.o \ o/fold.o \
o/getchar.o \ o/getchar.o \
o/hardcopy.o \
o/hashtable.o \ o/hashtable.o \
o/main.o \ o/main.o \
o/mark.o \ o/mark.o \
@ -157,6 +159,8 @@ o/fold.o: fold.c $(SYMS)
o/getchar.o: getchar.c $(SYMS) o/getchar.o: getchar.c $(SYMS)
o/hardcopy.o: hardcopy.c $(SYMS)
o/hashtable.o: hashtable.c $(SYMS) o/hashtable.o: hashtable.c $(SYMS)
o/main.o: main.c $(SYMS) o/main.o: main.c $(SYMS)

1
src/Make_djg.mak
View File

@ -33,6 +33,7 @@ OBJ = \
obj/fileio.o \ obj/fileio.o \
obj/fold.o \ obj/fold.o \
obj/getchar.o \ obj/getchar.o \
obj/hardcopy.o \
obj/hashtable.o \ obj/hashtable.o \
obj/main.o \ obj/main.o \
obj/mark.o \ obj/mark.o \

5
src/Make_ivc.mak
View File

@ -224,6 +224,7 @@ LINK32_OBJS= \
"$(INTDIR)/fileio.obj" \ "$(INTDIR)/fileio.obj" \
"$(INTDIR)/fold.obj" \ "$(INTDIR)/fold.obj" \
"$(INTDIR)/getchar.obj" \ "$(INTDIR)/getchar.obj" \
"$(INTDIR)/hardcopy.obj" \
"$(INTDIR)/hashtable.obj" \ "$(INTDIR)/hashtable.obj" \
"$(INTDIR)/main.obj" \ "$(INTDIR)/main.obj" \
"$(INTDIR)/mark.obj" \ "$(INTDIR)/mark.obj" \
@ -378,6 +379,10 @@ SOURCE=.\getchar.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hardcopy.c
# End Source File
# Begin Source File
SOURCE=.\hashtable.c SOURCE=.\hashtable.c
# End Source File # End Source File
# Begin Source File # Begin Source File

6
src/Make_manx.mak
View File

@ -48,6 +48,7 @@ SRC = buffer.c \
fileio.c \ fileio.c \
fold.c \ fold.c \
getchar.c \ getchar.c \
hardcopy.c \
hashtable.c \ hashtable.c \
main.c \ main.c \
mark.c \ mark.c \
@ -92,6 +93,7 @@ OBJ = obj/buffer.o \
obj/fileio.o \ obj/fileio.o \
obj/fold.o \ obj/fold.o \
obj/getchar.o \ obj/getchar.o \
obj/hardcopy.o \
obj/hashtable.o \ obj/hashtable.o \
obj/main.o \ obj/main.o \
obj/mark.o \ obj/mark.o \
@ -134,6 +136,7 @@ PRO = proto/buffer.pro \
proto/fileio.pro \ proto/fileio.pro \
proto/fold.pro \ proto/fold.pro \
proto/getchar.pro \ proto/getchar.pro \
proto/hardcopy.pro \
proto/hashtable.pro \ proto/hashtable.pro \
proto/main.pro \ proto/main.pro \
proto/mark.pro \ proto/mark.pro \
@ -249,6 +252,9 @@ obj/fold.o: fold.c
obj/getchar.o: getchar.c obj/getchar.o: getchar.c
$(CCSYM) $@ getchar.c $(CCSYM) $@ getchar.c
obj/hardcopy.o: hardcopy.c
$(CCSYM) $@ hardcopy.c
obj/hashtable.o: hashtable.c obj/hashtable.o: hashtable.c
$(CCSYM) $@ hashtable.c $(CCSYM) $@ hashtable.c

1
src/Make_ming.mak
View File

@ -371,6 +371,7 @@ OBJ = \
$(OUTDIR)/fileio.o \ $(OUTDIR)/fileio.o \
$(OUTDIR)/fold.o \ $(OUTDIR)/fold.o \
$(OUTDIR)/getchar.o \ $(OUTDIR)/getchar.o \
$(OUTDIR)/hardcopy.o \
$(OUTDIR)/hashtable.o \ $(OUTDIR)/hashtable.o \
$(OUTDIR)/main.o \ $(OUTDIR)/main.o \
$(OUTDIR)/mark.o \ $(OUTDIR)/mark.o \

1
src/Make_morph.mak
View File

@ -38,6 +38,7 @@ SRC = buffer.c \
fileio.c \ fileio.c \
fold.c \ fold.c \
getchar.c \ getchar.c \
hardcopy.c \
hashtable.c \ hashtable.c \
main.c \ main.c \
mark.c \ mark.c \

132
src/Make_mpw.mak
View File

@ -32,6 +32,7 @@ SrcFiles =
:src:fileio.c ś :src:fileio.c ś
:src:fold.c ś :src:fold.c ś
:src:getchar.c ś :src:getchar.c ś
:src:hardcopy.c ś
:src:hashtable.c ś :src:hashtable.c ś
:src:gui.c ś :src:gui.c ś
:src:gui_mac.c ś :src:gui_mac.c ś
@ -84,6 +85,7 @@ ObjFiles-PPC =
"{ObjDir}fileio.c.x" ś "{ObjDir}fileio.c.x" ś
"{ObjDir}fold.c.x" ś "{ObjDir}fold.c.x" ś
"{ObjDir}getchar.c.x" ś "{ObjDir}getchar.c.x" ś
"{ObjDir}hardcopy.c.x" ś
"{ObjDir}hashtable.c.x" ś "{ObjDir}hashtable.c.x" ś
"{ObjDir}gui.c.x" ś "{ObjDir}gui.c.x" ś
"{ObjDir}gui_mac.c.x" ś "{ObjDir}gui_mac.c.x" ś
@ -167,6 +169,7 @@ VIm
"{ObjDir}fileio.c.x" Ä :src:fileio.c "{ObjDir}fileio.c.x" Ä :src:fileio.c
"{ObjDir}fold.c.x" Ä :src:fold.c "{ObjDir}fold.c.x" Ä :src:fold.c
"{ObjDir}getchar.c.x" Ä :src:getchar.c "{ObjDir}getchar.c.x" Ä :src:getchar.c
"{ObjDir}hardcopy.c.x" Ä :src:hardcopy.c
"{ObjDir}hashtable.c.x" Ä :src:hashtable.c "{ObjDir}hashtable.c.x" Ä :src:hashtable.c
"{ObjDir}gui.c.x" Ä :src:gui.c "{ObjDir}gui.c.x" Ä :src:gui.c
"{ObjDir}gui_mac.c.x" Ä :src:gui_mac.c "{ObjDir}gui_mac.c.x" Ä :src:gui_mac.c
@ -257,6 +260,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -339,6 +343,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -421,6 +426,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -503,6 +509,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -585,6 +592,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -668,6 +676,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -750,6 +759,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -832,6 +842,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -914,6 +925,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -996,6 +1008,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -1078,6 +1091,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -1160,6 +1174,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -1242,6 +1257,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -1366,6 +1382,89 @@ Dependencies
:src:proto:if_perl.pro ś :src:proto:if_perl.pro ś
:src:proto:if_perlsfio.pro :src:proto:if_perlsfio.pro
:obj:hardcopy.c.x Ä ś
:src:hardcopy.c ś
:src:vim.h ś
:src:auto:config.h ś
:src:feature.h ś
:src:os_unix.h ś
:src:os_mac.h ś
:src:workshop.h ś
:src:ascii.h ś
:src:keymap.h ś
:src:term.h ś
:src:macros.h ś
:src:structs.h ś
:src:globals.h ś
:src:option.h ś
:src:ex_cmds.h ś
:src:proto.h ś
:src:integration.h ś
:src:wsdebug.h ś
:src:regexp.h ś
:src:gui.h ś
:src:farsi.h ś
:src:proto:os_unix.pro ś
:src:proto:os_mac.pro ś
:src:proto:buffer.pro ś
:src:proto:charset.pro ś
:src:proto:if_cscope.pro ś
:src:proto:diff.pro ś
:src:proto:digraph.pro ś
:src:proto:edit.pro ś
:src:proto:eval.pro ś
:src:proto:ex_cmds.pro ś
:src:proto:ex_cmds2.pro ś
:src:proto:ex_docmd.pro ś
:src:proto:ex_eval.pro ś
:src:proto:ex_getln.pro ś
:src:proto:fileio.pro ś
:src:proto:fold.pro ś
:src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś
:src:proto:main.pro ś
:src:proto:mark.pro ś
:src:proto:memfile.pro ś
:src:proto:memline.pro ś
:src:proto:menu.pro ś
:src:proto:message.pro ś
:src:proto:misc1.pro ś
:src:proto:misc2.pro ś
:src:proto:move.pro ś
:src:proto:multibyte.pro ś
:src:proto:normal.pro ś
:src:proto:ops.pro ś
:src:proto:option.pro ś
:src:proto:quickfix.pro ś
:src:proto:regexp.pro ś
:src:proto:screen.pro ś
:src:proto:search.pro ś
:src:proto:spell.pro ś
:src:proto:syntax.pro ś
:src:proto:tag.pro ś
:src:proto:term.pro ś
:src:proto:termlib.pro ś
:src:proto:ui.pro ś
:src:proto:undo.pro ś
:src:proto:version.pro ś
:src:proto:window.pro ś
:src:proto:if_python.pro ś
:src:proto:if_tcl.pro ś
:src:proto:if_ruby.pro ś
:src:proto:gui.pro ś
:src:proto:pty.pro ś
:src:proto:gui_gtk.pro ś
:src:proto:gui_gtk_x11.pro ś
:src:proto:gui_motif.pro ś
:src:proto:gui_athena.pro ś
:src:proto:gui_mac.pro ś
:src:proto:gui_x11.pro ś
:src:proto:workshop.pro ś
:src:proto:if_perl.pro ś
:src:proto:if_perlsfio.pro
:obj:hashtable.c.x Ä ś :obj:hashtable.c.x Ä ś
:src:hashtable.c ś :src:hashtable.c ś
:src:vim.h ś :src:vim.h ś
@ -1405,6 +1504,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -1487,6 +1587,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -1569,6 +1670,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -1677,6 +1779,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -1760,6 +1863,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -1842,6 +1946,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -1924,6 +2029,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2006,6 +2112,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2088,6 +2195,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2170,6 +2278,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2253,6 +2362,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2335,6 +2445,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2417,6 +2528,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2499,6 +2611,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2581,6 +2694,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2663,6 +2777,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2745,6 +2860,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2827,6 +2943,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2909,6 +3026,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -2991,6 +3109,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3073,6 +3192,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3155,6 +3275,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3237,6 +3358,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3319,6 +3441,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3401,6 +3524,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3483,6 +3607,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3565,6 +3690,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3648,6 +3774,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3729,6 +3856,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3811,6 +3939,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3894,6 +4023,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -3976,6 +4106,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś
@ -4058,6 +4189,7 @@ Dependencies
:src:proto:fileio.pro ś :src:proto:fileio.pro ś
:src:proto:fold.pro ś :src:proto:fold.pro ś
:src:proto:getchar.pro ś :src:proto:getchar.pro ś
:src:proto:hardcopy.pro ś
:src:proto:hashtable.pro ś :src:proto:hashtable.pro ś
:src:proto:hangulin.pro ś :src:proto:hangulin.pro ś
:src:proto:main.pro ś :src:proto:main.pro ś

4
src/Make_mvc.mak
View File

@ -384,6 +384,7 @@ OBJ = \
$(OUTDIR)\fileio.obj \ $(OUTDIR)\fileio.obj \
$(OUTDIR)\fold.obj \ $(OUTDIR)\fold.obj \
$(OUTDIR)\getchar.obj \ $(OUTDIR)\getchar.obj \
$(OUTDIR)\hardcopy.obj \
$(OUTDIR)\hashtable.obj \ $(OUTDIR)\hashtable.obj \
$(OUTDIR)\main.obj \ $(OUTDIR)\main.obj \
$(OUTDIR)\mark.obj \ $(OUTDIR)\mark.obj \
@ -817,6 +818,8 @@ $(OUTDIR)/fold.obj: $(OUTDIR) fold.c $(INCL)
$(OUTDIR)/getchar.obj: $(OUTDIR) getchar.c $(INCL) $(OUTDIR)/getchar.obj: $(OUTDIR) getchar.c $(INCL)
$(OUTDIR)/hardcopy.obj: $(OUTDIR) hardcopy.c $(INCL)
$(OUTDIR)/hashtable.obj: $(OUTDIR) hashtable.c $(INCL) $(OUTDIR)/hashtable.obj: $(OUTDIR) hashtable.c $(INCL)
$(OUTDIR)/gui.obj: $(OUTDIR) gui.c $(INCL) $(GUI_INCL) $(OUTDIR)/gui.obj: $(OUTDIR) gui.c $(INCL) $(GUI_INCL)
@ -965,6 +968,7 @@ proto.h: \
proto/ex_getln.pro \ proto/ex_getln.pro \
proto/fileio.pro \ proto/fileio.pro \
proto/getchar.pro \ proto/getchar.pro \
proto/hardcopy.pro \
proto/hashtable.pro \ proto/hashtable.pro \
proto/main.pro \ proto/main.pro \
proto/mark.pro \ proto/mark.pro \

2
src/Make_os2.mak
View File

@ -53,6 +53,7 @@ OBJ = \
fileio.o \ fileio.o \
fold.o \ fold.o \
getchar.o \ getchar.o \
hardcopy.o \
hashtable.o \ hashtable.o \
main.o \ main.o \
mark.o \ mark.o \
@ -124,6 +125,7 @@ ex_getln.o: ex_getln.c $(INCL)
fileio.o: fileio.c $(INCL) fileio.o: fileio.c $(INCL)
fold.o: fold.c $(INCL) fold.o: fold.c $(INCL)
getchar.o: getchar.c $(INCL) getchar.o: getchar.c $(INCL)
hardcopy.o: hardcopy.c $(INCL)
hashtable.o: hashtable.c $(INCL) hashtable.o: hashtable.c $(INCL)
main.o: main.c $(INCL) main.o: main.c $(INCL)
mark.o: mark.c $(INCL) mark.o: mark.c $(INCL)

5
src/Make_ro.mak
View File

@ -12,7 +12,8 @@ TERMFLAG = -DUP_BC_PC_EXTERN
ASMFLAGS = -throwback -objasm -gcc ASMFLAGS = -throwback -objasm -gcc
OBJS = o.buffer o.charset o.diff o.digraph o.edit o.eval o.ex_cmds o.ex_cmds2 \ OBJS = o.buffer o.charset o.diff o.digraph o.edit o.eval o.ex_cmds o.ex_cmds2 \
o.ex_docmd o.ex_eval o.ex_getln o.fileio o.fold o.getchar o.hashtable o.main o.mark o.mbyte \ o.ex_docmd o.ex_eval o.ex_getln o.fileio o.fold o.getchar \
o.hardcopy o.hashtable o.main o.mark o.mbyte \
o.memfile o.memline o.menu o.message o.misc1 o.misc2 o.move \ o.memfile o.memline o.menu o.message o.misc1 o.misc2 o.move \
o.normal o.ops o.option o.quickfix o.regexp o.screen o.search \ o.normal o.ops o.option o.quickfix o.regexp o.screen o.search \
o.spell o.syntax o.tag o.term o.termlib o.ui o.undo o.version \ o.spell o.syntax o.tag o.term o.termlib o.ui o.undo o.version \
@ -65,6 +66,8 @@ o.fold: c.fold
o.getchar: c.getchar o.getchar: c.getchar
o.hardcopy: c.hardcopy
o.hashtable: c.hashtable o.hashtable: c.hashtable
o.gui: c.gui o.gui: c.gui

5
src/Make_sas.mak
View File

@ -103,6 +103,7 @@ SRC = \
fileio.c \ fileio.c \
fold.c \ fold.c \
getchar.c \ getchar.c \
hardcopy.c \
hashtable.c \ hashtable.c \
main.c \ main.c \
mark.c \ mark.c \
@ -146,6 +147,7 @@ OBJ = \
fileio.o \ fileio.o \
fold.o \ fold.o \
getchar.o \ getchar.o \
hardcopy.o \
hashtable.o \ hashtable.o \
main.o \ main.o \
mark.o \ mark.o \
@ -189,6 +191,7 @@ PRO = \
proto/fileio.pro \ proto/fileio.pro \
proto/fold.pro \ proto/fold.pro \
proto/getchar.pro \ proto/getchar.pro \
proto/hardcopy.pro \
proto/hashtable.pro \ proto/hashtable.pro \
proto/main.pro \ proto/main.pro \
proto/mark.pro \ proto/mark.pro \
@ -300,6 +303,8 @@ fold.o: fold.c
proto/fold.pro: fold.c proto/fold.pro: fold.c
getchar.o: getchar.c getchar.o: getchar.c
proto/getchar.pro: getchar.c proto/getchar.pro: getchar.c
hardcopy.o: hardcopy.c
proto/hardcopy.pro: hardcopy.c
hashtable.o: hashtable.c hashtable.o: hashtable.c
proto/hashtable.pro: hashtable.c proto/hashtable.pro: hashtable.c
main.o: main.c main.o: main.c

10
src/Make_vms.mms
View File

@ -2,7 +2,7 @@
# Makefile for Vim on OpenVMS # Makefile for Vim on OpenVMS
# #
# Maintainer: Zoltan Arpadffy <arpadffy@polarhome.com> # Maintainer: Zoltan Arpadffy <arpadffy@polarhome.com>
# Last change: 2005 Jul 12 # Last change: 2005 Jul 23
# #
# This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64 # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
# with MMS and MMK # with MMS and MMK
@ -287,7 +287,7 @@ ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) \
SRC = buffer.c charset.c diff.c digraph.c edit.c eval.c ex_cmds.c ex_cmds2.c \ SRC = buffer.c charset.c diff.c digraph.c edit.c eval.c ex_cmds.c ex_cmds2.c \
ex_docmd.c ex_eval.c ex_getln.c if_xcmdsrv.c fileio.c fold.c getchar.c \ ex_docmd.c ex_eval.c ex_getln.c if_xcmdsrv.c fileio.c fold.c getchar.c \
hashtable.c, main.c mark.c menu.c mbyte.c memfile.c memline.c message.c misc1.c \ hardcopy.c hashtable.c main.c mark.c menu.c mbyte.c memfile.c memline.c message.c misc1.c \
misc2.c move.c normal.c ops.c option.c quickfix.c regexp.c search.c \ misc2.c move.c normal.c ops.c option.c quickfix.c regexp.c search.c \
spell.c syntax.c tag.c term.c termlib.c ui.c undo.c version.c screen.c \ spell.c syntax.c tag.c term.c termlib.c ui.c undo.c version.c screen.c \
window.c os_unix.c os_vms.c pathdef.c \ window.c os_unix.c os_vms.c pathdef.c \
@ -296,7 +296,7 @@ SRC = buffer.c charset.c diff.c digraph.c edit.c eval.c ex_cmds.c ex_cmds2.c \
OBJ = buffer.obj charset.obj diff.obj digraph.obj edit.obj eval.obj \ OBJ = buffer.obj charset.obj diff.obj digraph.obj edit.obj eval.obj \
ex_cmds.obj ex_cmds2.obj ex_docmd.obj ex_eval.obj ex_getln.obj \ ex_cmds.obj ex_cmds2.obj ex_docmd.obj ex_eval.obj ex_getln.obj \
if_xcmdsrv.obj fileio.obj fold.obj getchar.obj hashtable.obj main.obj mark.obj \ if_xcmdsrv.obj fileio.obj fold.obj getchar.obj hardcopy.obj hashtable.obj main.obj mark.obj \
menu.obj memfile.obj memline.obj message.obj misc1.obj misc2.obj \ menu.obj memfile.obj memline.obj message.obj misc1.obj misc2.obj \
move.obj mbyte.obj normal.obj ops.obj option.obj quickfix.obj \ move.obj mbyte.obj normal.obj ops.obj option.obj quickfix.obj \
regexp.obj search.obj spell.obj syntax.obj tag.obj term.obj termlib.obj \ regexp.obj search.obj spell.obj syntax.obj tag.obj term.obj termlib.obj \
@ -527,6 +527,10 @@ getchar.obj : getchar.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
globals.h farsi.h arabic.h globals.h farsi.h arabic.h
hardcopy.obj : hardcopy.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
globals.h farsi.h arabic.h
hashtable.obj : hashtable.c vim.h [.auto]config.h feature.h os_unix.h \ hashtable.obj : hashtable.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \

1
src/Make_w16.mak
View File

@ -87,6 +87,7 @@ ObjFiles = \
$(INTDIR)\fileio.obj\ $(INTDIR)\fileio.obj\
$(INTDIR)\fold.obj\ $(INTDIR)\fold.obj\
$(INTDIR)\getchar.obj\ $(INTDIR)\getchar.obj\
$(INTDIR)\hardcopy.obj\
$(INTDIR)\hashtable.obj\ $(INTDIR)\hashtable.obj\
$(INTDIR)\gui.obj\ $(INTDIR)\gui.obj\
$(INTDIR)\gui_w16.obj\ $(INTDIR)\gui_w16.obj\

14
src/Makefile
View File

@ -1343,6 +1343,7 @@ BASIC_SRC = \
fileio.c \ fileio.c \
fold.c \ fold.c \
getchar.c \ getchar.c \
hardcopy.c \
hashtable.c \ hashtable.c \
if_cscope.c \ if_cscope.c \
if_xcmdsrv.c \ if_xcmdsrv.c \
@ -1411,6 +1412,7 @@ OBJ = \
objects/fileio.o \ objects/fileio.o \
objects/fold.o \ objects/fold.o \
objects/getchar.o \ objects/getchar.o \
objects/hardcopy.o \
objects/hashtable.o \ objects/hashtable.o \
$(HANGULIN_OBJ) \ $(HANGULIN_OBJ) \
objects/if_cscope.o \ objects/if_cscope.o \
@ -1468,6 +1470,7 @@ PRO_AUTO = \
fileio.pro \ fileio.pro \
fold.pro \ fold.pro \
getchar.pro \ getchar.pro \
hardcopy.pro \
hashtable.pro \ hashtable.pro \
hangulin.pro \ hangulin.pro \
if_cscope.pro \ if_cscope.pro \
@ -1599,7 +1602,9 @@ xxd/xxd$(EXEEXT): xxd/xxd.c
# Generate the converted .mo files separately, it's no problem if this fails. # Generate the converted .mo files separately, it's no problem if this fails.
languages: languages:
@if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \ @if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
cd $(PODIR); CC="$(CC)" $(MAKE) prefix=$(DESTDIR)$(prefix); \ cd $(PODIR); \
CC="$(CC)" $(MAKE) check; \
CC="$(CC)" $(MAKE) prefix=$(DESTDIR)$(prefix); \
fi fi
-@if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \ -@if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
cd $(PODIR); CC="$(CC)" $(MAKE) prefix=$(DESTDIR)$(prefix) converted; \ cd $(PODIR); CC="$(CC)" $(MAKE) prefix=$(DESTDIR)$(prefix) converted; \
@ -2285,6 +2290,9 @@ objects/fold.o: fold.c
objects/getchar.o: getchar.c objects/getchar.o: getchar.c
$(CCC) -o $@ getchar.c $(CCC) -o $@ getchar.c
objects/hardcopy.o: hardcopy.c
$(CCC) -o $@ hardcopy.c
objects/hashtable.o: hashtable.c objects/hashtable.o: hashtable.c
$(CCC) -o $@ hashtable.c $(CCC) -o $@ hashtable.c
@ -2637,6 +2645,10 @@ objects/getchar.o: getchar.c vim.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \ gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
globals.h farsi.h arabic.h globals.h farsi.h arabic.h
objects/hardcopy.o: hardcopy.c vim.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
globals.h farsi.h arabic.h
objects/hashtable.o: hashtable.c vim.h auto/config.h feature.h os_unix.h \ objects/hashtable.o: hashtable.c vim.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \ gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \

3522
src/ex_cmds2.c
View File

File diff suppressed because it is too large Load Diff

30
src/globals.h
View File

@ -1080,6 +1080,9 @@ extern cursorentry_T shape_table[SHAPE_IDX_COUNT];
#endif #endif
#ifdef FEAT_PRINTER #ifdef FEAT_PRINTER
/*
* Printer stuff shared between hardcopy.c and machine-specific printing code.
*/
# define OPT_PRINT_TOP 0 # define OPT_PRINT_TOP 0
# define OPT_PRINT_BOT 1 # define OPT_PRINT_BOT 1
# define OPT_PRINT_LEFT 2 # define OPT_PRINT_LEFT 2
@ -1126,34 +1129,11 @@ EXTERN option_table_T printer_opts[OPT_PRINT_NUM_OPTIONS]
# define PRT_UNIT_MM 2 # define PRT_UNIT_MM 2
# define PRT_UNIT_POINT 3 # define PRT_UNIT_POINT 3
# define PRT_UNIT_NAMES {"pc", "in", "mm", "pt"} # define PRT_UNIT_NAMES {"pc", "in", "mm", "pt"}
# ifdef FEAT_MBYTE
# define OPT_MBFONT_USECOURIER 0
# define OPT_MBFONT_ASCII 1
# define OPT_MBFONT_REGULAR 2
# define OPT_MBFONT_BOLD 3
# define OPT_MBFONT_OBLIQUE 4
# define OPT_MBFONT_BOLDOBLIQUE 5
# define OPT_MBFONT_NUM_OPTIONS 6
#
EXTERN option_table_T mbfont_opts[OPT_MBFONT_NUM_OPTIONS]
# ifdef DO_INIT
=
{
{"c", FALSE, 0, NULL, 0, FALSE},
{"a", FALSE, 0, NULL, 0, FALSE},
{"r", FALSE, 0, NULL, 0, FALSE},
{"b", FALSE, 0, NULL, 0, FALSE},
{"i", FALSE, 0, NULL, 0, FALSE},
{"o", FALSE, 0, NULL, 0, FALSE},
}
# endif
;
# endif
#endif #endif
#ifdef FEAT_XCLIPBOARD #ifdef FEAT_XCLIPBOARD
EXTERN char *xterm_display INIT(= NULL); /* xterm display name */ EXTERN char *xterm_display INIT(= NULL); /* xterm display name; points
into argv[] */
EXTERN Display *xterm_dpy INIT(= NULL); /* xterm display pointer */ EXTERN Display *xterm_dpy INIT(= NULL); /* xterm display pointer */
#endif #endif
#if defined(FEAT_XCLIPBOARD) || defined(FEAT_GUI_X11) #if defined(FEAT_XCLIPBOARD) || defined(FEAT_GUI_X11)

556
src/main.c
View File

@ -29,6 +29,15 @@
# include <limits.h> # include <limits.h>
#endif #endif
/* Struct for various parameters passed between main() and other functions. */
typedef struct
{
int serverArg; /* TRUE when argument for a server */
char_u *serverName_arg; /* cmdline arg for server name */
int evim_mode; /* started as "evim" */
char_u *use_vimrc; /* vimrc from -u option */
} mparm_T;
#if defined(UNIX) || defined(VMS) #if defined(UNIX) || defined(VMS)
static int file_owned __ARGS((char *fname)); static int file_owned __ARGS((char *fname));
#endif #endif
@ -36,6 +45,9 @@ static void mainerr __ARGS((int, char_u *));
static void main_msg __ARGS((char *s)); static void main_msg __ARGS((char *s));
static void usage __ARGS((void)); static void usage __ARGS((void));
static int get_number_arg __ARGS((char_u *p, int *idx, int def)); static int get_number_arg __ARGS((char_u *p, int *idx, int def));
static void early_arg_scan __ARGS((int argc, char **argv, mparm_T *parmp));
static void exe_pre_commands __ARGS((char_u **cmds, int cnt));
static void source_startup_scripts __ARGS((mparm_T *parmp));
static void main_start_gui __ARGS((void)); static void main_start_gui __ARGS((void));
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
static void check_swap_exists_action __ARGS((void)); static void check_swap_exists_action __ARGS((void));
@ -50,8 +62,6 @@ static char_u *serverMakeName __ARGS((char_u *arg, char *cmd));
static FILE *time_fd = NULL; static FILE *time_fd = NULL;
#endif #endif
#define FEAT_PRECOMMANDS
/* /*
* Different types of error messages. * Different types of error messages.
*/ */
@ -95,7 +105,6 @@ main
char_u *term = NULL; /* specified terminal name */ char_u *term = NULL; /* specified terminal name */
char_u *fname = NULL; /* file name from command line */ char_u *fname = NULL; /* file name from command line */
char_u *tagname = NULL; /* tag from -t option */ char_u *tagname = NULL; /* tag from -t option */
char_u *use_vimrc = NULL; /* vimrc from -u option */
#ifdef FEAT_QUICKFIX #ifdef FEAT_QUICKFIX
char_u *use_ef = NULL; /* 'errorfile' from -q option */ char_u *use_ef = NULL; /* 'errorfile' from -q option */
#endif #endif
@ -105,10 +114,8 @@ main
int n_commands = 0; /* no. of commands from + or -c */ int n_commands = 0; /* no. of commands from + or -c */
char_u *commands[MAX_ARG_CMDS]; /* commands from + or -c option */ char_u *commands[MAX_ARG_CMDS]; /* commands from + or -c option */
char_u cmds_tofree[MAX_ARG_CMDS]; /* commands that need free() */ char_u cmds_tofree[MAX_ARG_CMDS]; /* commands that need free() */
#ifdef FEAT_PRECOMMANDS int n_pre_commands = 0; /* no. of commands from --cmd */
int p_commands = 0; /* no. of commands from --cmd */
char_u *pre_commands[MAX_ARG_CMDS]; /* commands from --cmd option */ char_u *pre_commands[MAX_ARG_CMDS]; /* commands from --cmd option */
#endif
int no_swap_file = FALSE; /* "-n" option used */ int no_swap_file = FALSE; /* "-n" option used */
int c; int c;
int i; int i;
@ -135,7 +142,6 @@ main
#ifdef FEAT_DIFF #ifdef FEAT_DIFF
int diff_mode = FALSE; /* start with 'diff' set */ int diff_mode = FALSE; /* start with 'diff' set */
#endif #endif
int evim_mode = FALSE; /* started as "evim" */
int stdout_isatty; /* is stdout a terminal? */ int stdout_isatty; /* is stdout a terminal? */
int input_isatty; /* is active input a terminal? */ int input_isatty; /* is active input a terminal? */
#ifdef MSWIN #ifdef MSWIN
@ -144,13 +150,13 @@ main
#ifdef FEAT_CLIENTSERVER #ifdef FEAT_CLIENTSERVER
char_u *serverStr = NULL; /* remote server command */ char_u *serverStr = NULL; /* remote server command */
char_u *serverStrEnc = NULL; /* encoding of serverStr */ char_u *serverStrEnc = NULL; /* encoding of serverStr */
char_u *serverName_arg = NULL; /* cmdline arg for server name */
int serverArg = FALSE; /* TRUE when argument for a server */
char_u *servername = NULL; /* allocated name for our server */ char_u *servername = NULL; /* allocated name for our server */
#endif #endif
#if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE) #if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE)
int literal = FALSE; /* don't expand file names */ int literal = FALSE; /* don't expand file names */
#endif #endif
mparm_T params; /* various parameters passed between
* main() and other functions. */
/* /*
* Do any system-specific initialisations. These can NOT use IObuff or * Do any system-specific initialisations. These can NOT use IObuff or
@ -158,6 +164,8 @@ main
*/ */
mch_early_init(); mch_early_init();
vim_memset(&params, 0, sizeof(params));
#ifdef FEAT_TCL #ifdef FEAT_TCL
vim_tcl_init(argv[0]); vim_tcl_init(argv[0]);
#endif #endif
@ -198,7 +206,7 @@ main
init_normal_cmds(); init_normal_cmds();
#if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC) #if defined(HAVE_DATE_TIME) && defined(VMS) && defined(VAXC)
make_version(); make_version(); /* Construct the long version string. */
#endif #endif
/* /*
@ -255,75 +263,13 @@ main
gui.dofork = TRUE; /* default is to use fork() */ gui.dofork = TRUE; /* default is to use fork() */
#endif #endif
#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER)
/* /*
* Get the name of the display, before gui_prepare() removes it from * Do a first scan of the arguments in "argv[]":
* argv[]. Used for the xterm-clipboard display. * -display
* * --server...
* Also find the --server... arguments * --socketid
*/ */
for (i = 1; i < argc; i++) early_arg_scan(argc, argv, &params);
{
if (STRCMP(argv[i], "--") == 0)
break;
# ifdef FEAT_XCLIPBOARD
else if (STRICMP(argv[i], "-display") == 0
# if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE)
|| STRICMP(argv[i], "--display") == 0
# endif
)
{
if (i == argc - 1)
mainerr_arg_missing((char_u *)argv[i]);
xterm_display = argv[++i];
}
# endif
# ifdef FEAT_CLIENTSERVER
else if (STRICMP(argv[i], "--servername") == 0)
{
if (i == argc - 1)
mainerr_arg_missing((char_u *)argv[i]);
serverName_arg = (char_u *)argv[++i];
}
else if (STRICMP(argv[i], "--serverlist") == 0
|| STRICMP(argv[i], "--remote-send") == 0
|| STRICMP(argv[i], "--remote-expr") == 0
|| STRICMP(argv[i], "--remote") == 0
|| STRICMP(argv[i], "--remote-silent") == 0)
serverArg = TRUE;
else if (STRICMP(argv[i], "--remote-wait") == 0
|| STRICMP(argv[i], "--remote-wait-silent") == 0)
{
serverArg = TRUE;
#ifdef FEAT_GUI
/* don't fork() when starting the GUI to edit the files ourself */
gui.dofork = FALSE;
#endif
}
# endif
# ifdef FEAT_GUI_GTK
else if (STRICMP(argv[i], "--socketid") == 0)
{
unsigned int socket_id;
int count;
if (i == argc - 1)
mainerr_arg_missing((char_u *)argv[i]);
if (STRNICMP(argv[i+1], "0x", 2) == 0)
count = sscanf(&(argv[i + 1][2]), "%x", &socket_id);
else
count = sscanf(argv[i+1], "%u", &socket_id);
if (count != 1)
mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
else
gtk_socket_id = socket_id;
i++;
}
else if (STRICMP(argv[i], "--echo-wid") == 0)
echo_wid_arg = TRUE;
# endif
}
#endif
#ifdef FEAT_SUN_WORKSHOP #ifdef FEAT_SUN_WORKSHOP
findYourself(argv[0]); findYourself(argv[0]);
@ -376,7 +322,7 @@ main
/* /*
* Do the client-server stuff, unless "--servername ''" was used. * Do the client-server stuff, unless "--servername ''" was used.
*/ */
if (serverName_arg == NULL || *serverName_arg != NUL) if (params.serverName_arg == NULL || *params.serverName_arg != NUL)
{ {
# ifdef WIN32 # ifdef WIN32
/* Initialise the client/server messaging infrastructure. */ /* Initialise the client/server messaging infrastructure. */
@ -388,9 +334,9 @@ main
* exit Vim when it was successful. Otherwise it's executed further * exit Vim when it was successful. Otherwise it's executed further
* on. Remember the encoding used here in "serverStrEnc". * on. Remember the encoding used here in "serverStrEnc".
*/ */
if (serverArg) if (params.serverArg)
{ {
cmdsrv_main(&argc, argv, serverName_arg, &serverStr); cmdsrv_main(&argc, argv, params.serverName_arg, &serverStr);
# ifdef FEAT_MBYTE # ifdef FEAT_MBYTE
serverStrEnc = vim_strsave(p_enc); serverStrEnc = vim_strsave(p_enc);
# endif # endif
@ -399,7 +345,7 @@ main
/* If we're still running, get the name to register ourselves. /* If we're still running, get the name to register ourselves.
* On Win32 can register right now, for X11 need to setup the * On Win32 can register right now, for X11 need to setup the
* clipboard first, it's further down. */ * clipboard first, it's further down. */
servername = serverMakeName(serverName_arg, argv[0]); servername = serverMakeName(params.serverName_arg, argv[0]);
# ifdef WIN32 # ifdef WIN32
if (servername != NULL) if (servername != NULL)
{ {
@ -453,7 +399,7 @@ main
#ifdef FEAT_GUI #ifdef FEAT_GUI
gui.starting = TRUE; gui.starting = TRUE;
#endif #endif
evim_mode = TRUE; params.evim_mode = TRUE;
++initstr; ++initstr;
} }
@ -588,13 +534,11 @@ main
} }
else if (STRNICMP(argv[0] + argv_idx, "noplugin", 8) == 0) else if (STRNICMP(argv[0] + argv_idx, "noplugin", 8) == 0)
p_lpl = FALSE; p_lpl = FALSE;
#ifdef FEAT_PRECOMMANDS
else if (STRNICMP(argv[0] + argv_idx, "cmd", 3) == 0) else if (STRNICMP(argv[0] + argv_idx, "cmd", 3) == 0)
{ {
want_argument = TRUE; want_argument = TRUE;
argv_idx += 3; argv_idx += 3;
} }
#endif
#ifdef FEAT_CLIENTSERVER #ifdef FEAT_CLIENTSERVER
else if (STRNICMP(argv[0] + argv_idx, "serverlist", 10) == 0) else if (STRNICMP(argv[0] + argv_idx, "serverlist", 10) == 0)
; /* already processed -- no arg */ ; /* already processed -- no arg */
@ -724,7 +668,7 @@ main
#ifdef FEAT_GUI #ifdef FEAT_GUI
gui.starting = TRUE; /* start GUI a bit later */ gui.starting = TRUE; /* start GUI a bit later */
#endif #endif
evim_mode = TRUE; params.evim_mode = TRUE;
break; break;
case 'N': /* "-N" Nocompatible */ case 'N': /* "-N" Nocompatible */
@ -940,13 +884,11 @@ main
commands[n_commands++] = (char_u *)argv[0]; commands[n_commands++] = (char_u *)argv[0];
break; break;
#ifdef FEAT_PRECOMMANDS
case '-': /* "--cmd {command}" execute command */ case '-': /* "--cmd {command}" execute command */
if (p_commands >= MAX_ARG_CMDS) if (n_pre_commands >= MAX_ARG_CMDS)
mainerr(ME_EXTRA_CMD, NULL); mainerr(ME_EXTRA_CMD, NULL);
pre_commands[p_commands++] = (char_u *)argv[0]; pre_commands[n_pre_commands++] = (char_u *)argv[0];
break; break;
#endif
/* case 'd': -d {device} is handled in mch_check_win() for the /* case 'd': -d {device} is handled in mch_check_win() for the
* Amiga */ * Amiga */
@ -1002,7 +944,7 @@ scripterror:
break; break;
case 'u': /* "-u {vimrc}" vim inits file */ case 'u': /* "-u {vimrc}" vim inits file */
use_vimrc = (char_u *)argv[0]; params.use_vimrc = (char_u *)argv[0];
break; break;
case 'U': /* "-U {gvimrc}" gvim inits file */ case 'U': /* "-U {gvimrc}" gvim inits file */
@ -1151,7 +1093,7 @@ scripterror:
/* When running "evim" or "gvim -y" we need the menus, exit if we /* When running "evim" or "gvim -y" we need the menus, exit if we
* don't have them. */ * don't have them. */
if (evim_mode) if (params.evim_mode)
mch_exit(1); mch_exit(1);
} }
# endif # endif
@ -1365,176 +1307,17 @@ scripterror:
init_highlight(TRUE, FALSE); /* set the default highlight groups */ init_highlight(TRUE, FALSE); /* set the default highlight groups */
TIME_MSG("init highlight"); TIME_MSG("init highlight");
#ifdef CURSOR_SHAPE
parse_shape_opt(SHAPE_CURSOR); /* set cursor shapes from 'guicursor' */
#endif
#ifdef FEAT_MOUSESHAPE
parse_shape_opt(SHAPE_MOUSE); /* set mouse shapes from 'mouseshape' */
#endif
#ifdef FEAT_PRINTER
parse_list_options(p_popt, printer_opts, OPT_PRINT_NUM_OPTIONS);
#endif
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
/* Set the break level after the terminal is initialized. */ /* Set the break level after the terminal is initialized. */
debug_break_level = use_debug_break_level; debug_break_level = use_debug_break_level;
#endif #endif
#ifdef FEAT_PRECOMMANDS /* Execute --cmd arguments. */
if (p_commands > 0) exe_pre_commands(pre_commands, n_pre_commands);
{
curwin->w_cursor.lnum = 0; /* just in case.. */
sourcing_name = (char_u *)_("pre-vimrc command line");
# ifdef FEAT_EVAL
current_SID = SID_CMDARG;
# endif
for (i = 0; i < p_commands; ++i)
do_cmdline_cmd(pre_commands[i]);
sourcing_name = NULL;
# ifdef FEAT_EVAL
current_SID = 0;
# endif
}
#endif
/* /* Source startup scripts. */
* For "evim" source evim.vim first of all, so that the user can overrule source_startup_scripts(&params);
* any things he doesn't like.
*/
if (evim_mode)
{
(void)do_source((char_u *)EVIM_FILE, FALSE, FALSE);
TIME_MSG("source evim file");
}
/*
* If -u option given, use only the initializations from that file and
* nothing else.
*/
if (use_vimrc != NULL)
{
if (STRCMP(use_vimrc, "NONE") == 0 || STRCMP(use_vimrc, "NORC") == 0)
{
#ifdef FEAT_GUI
if (use_gvimrc == NULL) /* don't load gvimrc either */
use_gvimrc = use_vimrc;
#endif
if (use_vimrc[2] == 'N')
p_lpl = FALSE; /* don't load plugins either */
}
else
{
if (do_source(use_vimrc, FALSE, FALSE) != OK)
EMSG2(_("E282: Cannot read from \"%s\""), use_vimrc);
}
}
else if (!silent_mode)
{
#ifdef AMIGA
struct Process *proc = (struct Process *)FindTask(0L);
APTR save_winptr = proc->pr_WindowPtr;
/* Avoid a requester here for a volume that doesn't exist. */
proc->pr_WindowPtr = (APTR)-1L;
#endif
/*
* Get system wide defaults, if the file name is defined.
*/
#ifdef SYS_VIMRC_FILE
(void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, FALSE);
#endif
/*
* Try to read initialization commands from the following places:
* - environment variable VIMINIT
* - user vimrc file (s:.vimrc for Amiga, ~/.vimrc otherwise)
* - second user vimrc file ($VIM/.vimrc for Dos)
* - environment variable EXINIT
* - user exrc file (s:.exrc for Amiga, ~/.exrc otherwise)
* - second user exrc file ($VIM/.exrc for Dos)
* The first that exists is used, the rest is ignored.
*/
if (process_env((char_u *)"VIMINIT", TRUE) != OK)
{
if (do_source((char_u *)USR_VIMRC_FILE, TRUE, TRUE) == FAIL
#ifdef USR_VIMRC_FILE2
&& do_source((char_u *)USR_VIMRC_FILE2, TRUE, TRUE) == FAIL
#endif
#ifdef USR_VIMRC_FILE3
&& do_source((char_u *)USR_VIMRC_FILE3, TRUE, TRUE) == FAIL
#endif
&& process_env((char_u *)"EXINIT", FALSE) == FAIL
&& do_source((char_u *)USR_EXRC_FILE, FALSE, FALSE) == FAIL)
{
#ifdef USR_EXRC_FILE2
(void)do_source((char_u *)USR_EXRC_FILE2, FALSE, FALSE);
#endif
}
}
/*
* Read initialization commands from ".vimrc" or ".exrc" in current
* directory. This is only done if the 'exrc' option is set.
* Because of security reasons we disallow shell and write commands
* now, except for unix if the file is owned by the user or 'secure'
* option has been reset in environment of global ".exrc" or ".vimrc".
* Only do this if VIMRC_FILE is not the same as USR_VIMRC_FILE or
* SYS_VIMRC_FILE.
*/
if (p_exrc)
{
#if defined(UNIX) || defined(VMS)
/* If ".vimrc" file is not owned by user, set 'secure' mode. */
if (!file_owned(VIMRC_FILE))
#endif
secure = p_secure;
i = FAIL;
if (fullpathcmp((char_u *)USR_VIMRC_FILE,
(char_u *)VIMRC_FILE, FALSE) != FPC_SAME
#ifdef USR_VIMRC_FILE2
&& fullpathcmp((char_u *)USR_VIMRC_FILE2,
(char_u *)VIMRC_FILE, FALSE) != FPC_SAME
#endif
#ifdef USR_VIMRC_FILE3
&& fullpathcmp((char_u *)USR_VIMRC_FILE3,
(char_u *)VIMRC_FILE, FALSE) != FPC_SAME
#endif
#ifdef SYS_VIMRC_FILE
&& fullpathcmp((char_u *)SYS_VIMRC_FILE,
(char_u *)VIMRC_FILE, FALSE) != FPC_SAME
#endif
)
i = do_source((char_u *)VIMRC_FILE, TRUE, TRUE);
if (i == FAIL)
{
#if defined(UNIX) || defined(VMS)
/* if ".exrc" is not owned by user set 'secure' mode */
if (!file_owned(EXRC_FILE))
secure = p_secure;
else
secure = 0;
#endif
if ( fullpathcmp((char_u *)USR_EXRC_FILE,
(char_u *)EXRC_FILE, FALSE) != FPC_SAME
#ifdef USR_EXRC_FILE2
&& fullpathcmp((char_u *)USR_EXRC_FILE2,
(char_u *)EXRC_FILE, FALSE) != FPC_SAME
#endif
)
(void)do_source((char_u *)EXRC_FILE, FALSE, FALSE);
}
}
if (secure == 2)
need_wait_return = TRUE;
secure = 0;
#ifdef AMIGA
proc->pr_WindowPtr = save_winptr;
#endif
}
TIME_MSG("sourcing vimrc file(s)");
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
/* /*
@ -1599,7 +1382,7 @@ scripterror:
/* When running "evim" or "gvim -y" we need the menus, exit if we /* When running "evim" or "gvim -y" we need the menus, exit if we
* don't have them. */ * don't have them. */
if (!gui.in_use && evim_mode) if (!gui.in_use && params.evim_mode)
mch_exit(1); mch_exit(1);
} }
#endif #endif
@ -1690,7 +1473,7 @@ scripterror:
# ifdef FEAT_GUI # ifdef FEAT_GUI
gui.in_use || gui.in_use ||
# endif # endif
serverName_arg != NULL)) params.serverName_arg != NULL))
{ {
(void)serverRegisterName(X_DISPLAY, servername); (void)serverRegisterName(X_DISPLAY, servername);
vim_free(servername); vim_free(servername);
@ -1778,8 +1561,7 @@ scripterror:
#endif #endif
if (scroll_region) if (scroll_region)
scroll_region_reset(); /* In case Rows changed */ scroll_region_reset(); /* In case Rows changed */
scroll_start(); /* may scroll the screen to the right position */
scroll_start();
/* /*
* Don't clear the screen when starting in Ex mode, unless using the GUI. * Don't clear the screen when starting in Ex mode, unless using the GUI.
@ -2438,6 +2220,262 @@ get_number_arg(p, idx, def)
return def; return def;
} }
/*
* Get the name of the display, before gui_prepare() removes it from
* argv[]. Used for the xterm-clipboard display.
*
* Also find the --server... arguments and --socketid
*/
/*ARGSUSED*/
static void
early_arg_scan(argc, argv, parmp)
int argc;
char **argv;
mparm_T *parmp;
{
#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER)
int i;
for (i = 1; i < argc; i++)
{
if (STRCMP(argv[i], "--") == 0)
break;
# ifdef FEAT_XCLIPBOARD
else if (STRICMP(argv[i], "-display") == 0
# if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE)
|| STRICMP(argv[i], "--display") == 0
# endif
)
{
if (i == argc - 1)
mainerr_arg_missing((char_u *)argv[i]);
xterm_display = argv[++i];
}
# endif
# ifdef FEAT_CLIENTSERVER
else if (STRICMP(argv[i], "--servername") == 0)
{
if (i == argc - 1)
mainerr_arg_missing((char_u *)argv[i]);
parmp->serverName_arg = (char_u *)argv[++i];
}
else if (STRICMP(argv[i], "--serverlist") == 0
|| STRICMP(argv[i], "--remote-send") == 0
|| STRICMP(argv[i], "--remote-expr") == 0
|| STRICMP(argv[i], "--remote") == 0
|| STRICMP(argv[i], "--remote-silent") == 0)
parmp->serverArg = TRUE;
else if (STRICMP(argv[i], "--remote-wait") == 0
|| STRICMP(argv[i], "--remote-wait-silent") == 0)
{
parmp->serverArg = TRUE;
#ifdef FEAT_GUI
/* don't fork() when starting the GUI to edit the files ourself */
gui.dofork = FALSE;
#endif
}
# endif
# ifdef FEAT_GUI_GTK
else if (STRICMP(argv[i], "--socketid") == 0)
{
unsigned int socket_id;
int count;
if (i == argc - 1)
mainerr_arg_missing((char_u *)argv[i]);
if (STRNICMP(argv[i+1], "0x", 2) == 0)
count = sscanf(&(argv[i + 1][2]), "%x", &socket_id);
else
count = sscanf(argv[i+1], "%u", &socket_id);
if (count != 1)
mainerr(ME_INVALID_ARG, (char_u *)argv[i]);
else
gtk_socket_id = socket_id;
i++;
}
else if (STRICMP(argv[i], "--echo-wid") == 0)
echo_wid_arg = TRUE;
# endif
}
#endif
}
/*
* Execute the commands from --cmd arguments "cmds[cnt]".
*/
static void
exe_pre_commands(cmds, cnt)
char_u **cmds;
int cnt;
{
int i;
if (cnt > 0)
{
curwin->w_cursor.lnum = 0; /* just in case.. */
sourcing_name = (char_u *)_("pre-vimrc command line");
# ifdef FEAT_EVAL
current_SID = SID_CMDARG;
# endif
for (i = 0; i < cnt; ++i)
do_cmdline_cmd(cmds[i]);
sourcing_name = NULL;
# ifdef FEAT_EVAL
current_SID = 0;
# endif
TIME_MSG("--cmd commands");
}
}
/*
* Source startup scripts.
*/
static void
source_startup_scripts(parmp)
mparm_T *parmp;
{
int i;
/*
* For "evim" source evim.vim first of all, so that the user can overrule
* any things he doesn't like.
*/
if (parmp->evim_mode)
{
(void)do_source((char_u *)EVIM_FILE, FALSE, FALSE);
TIME_MSG("source evim file");
}
/*
* If -u option given, use only the initializations from that file and
* nothing else.
*/
if (parmp->use_vimrc != NULL)
{
if (STRCMP(parmp->use_vimrc, "NONE") == 0 || STRCMP(parmp->use_vimrc, "NORC") == 0)
{
#ifdef FEAT_GUI
if (use_gvimrc == NULL) /* don't load gvimrc either */
use_gvimrc = parmp->use_vimrc;
#endif
if (parmp->use_vimrc[2] == 'N')
p_lpl = FALSE; /* don't load plugins either */
}
else
{
if (do_source(parmp->use_vimrc, FALSE, FALSE) != OK)
EMSG2(_("E282: Cannot read from \"%s\""), parmp->use_vimrc);
}
}
else if (!silent_mode)
{
#ifdef AMIGA
struct Process *proc = (struct Process *)FindTask(0L);
APTR save_winptr = proc->pr_WindowPtr;
/* Avoid a requester here for a volume that doesn't exist. */
proc->pr_WindowPtr = (APTR)-1L;
#endif
/*
* Get system wide defaults, if the file name is defined.
*/
#ifdef SYS_VIMRC_FILE
(void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, FALSE);
#endif
/*
* Try to read initialization commands from the following places:
* - environment variable VIMINIT
* - user vimrc file (s:.vimrc for Amiga, ~/.vimrc otherwise)
* - second user vimrc file ($VIM/.vimrc for Dos)
* - environment variable EXINIT
* - user exrc file (s:.exrc for Amiga, ~/.exrc otherwise)
* - second user exrc file ($VIM/.exrc for Dos)
* The first that exists is used, the rest is ignored.
*/
if (process_env((char_u *)"VIMINIT", TRUE) != OK)
{
if (do_source((char_u *)USR_VIMRC_FILE, TRUE, TRUE) == FAIL
#ifdef USR_VIMRC_FILE2
&& do_source((char_u *)USR_VIMRC_FILE2, TRUE, TRUE) == FAIL
#endif
#ifdef USR_VIMRC_FILE3
&& do_source((char_u *)USR_VIMRC_FILE3, TRUE, TRUE) == FAIL
#endif
&& process_env((char_u *)"EXINIT", FALSE) == FAIL
&& do_source((char_u *)USR_EXRC_FILE, FALSE, FALSE) == FAIL)
{
#ifdef USR_EXRC_FILE2
(void)do_source((char_u *)USR_EXRC_FILE2, FALSE, FALSE);
#endif
}
}
/*
* Read initialization commands from ".vimrc" or ".exrc" in current
* directory. This is only done if the 'exrc' option is set.
* Because of security reasons we disallow shell and write commands
* now, except for unix if the file is owned by the user or 'secure'
* option has been reset in environment of global ".exrc" or ".vimrc".
* Only do this if VIMRC_FILE is not the same as USR_VIMRC_FILE or
* SYS_VIMRC_FILE.
*/
if (p_exrc)
{
#if defined(UNIX) || defined(VMS)
/* If ".vimrc" file is not owned by user, set 'secure' mode. */
if (!file_owned(VIMRC_FILE))
#endif
secure = p_secure;
i = FAIL;
if (fullpathcmp((char_u *)USR_VIMRC_FILE,
(char_u *)VIMRC_FILE, FALSE) != FPC_SAME
#ifdef USR_VIMRC_FILE2
&& fullpathcmp((char_u *)USR_VIMRC_FILE2,
(char_u *)VIMRC_FILE, FALSE) != FPC_SAME
#endif
#ifdef USR_VIMRC_FILE3
&& fullpathcmp((char_u *)USR_VIMRC_FILE3,
(char_u *)VIMRC_FILE, FALSE) != FPC_SAME
#endif
#ifdef SYS_VIMRC_FILE
&& fullpathcmp((char_u *)SYS_VIMRC_FILE,
(char_u *)VIMRC_FILE, FALSE) != FPC_SAME
#endif
)
i = do_source((char_u *)VIMRC_FILE, TRUE, TRUE);
if (i == FAIL)
{
#if defined(UNIX) || defined(VMS)
/* if ".exrc" is not owned by user set 'secure' mode */
if (!file_owned(EXRC_FILE))
secure = p_secure;
else
secure = 0;
#endif
if ( fullpathcmp((char_u *)USR_EXRC_FILE,
(char_u *)EXRC_FILE, FALSE) != FPC_SAME
#ifdef USR_EXRC_FILE2
&& fullpathcmp((char_u *)USR_EXRC_FILE2,
(char_u *)EXRC_FILE, FALSE) != FPC_SAME
#endif
)
(void)do_source((char_u *)EXRC_FILE, FALSE, FALSE);
}
}
if (secure == 2)
need_wait_return = TRUE;
secure = 0;
#ifdef AMIGA
proc->pr_WindowPtr = save_winptr;
#endif
}
TIME_MSG("sourcing vimrc file(s)");
}
/* /*
* Setup to start using the GUI. Exit with an error when not available. * Setup to start using the GUI. Exit with an error when not available.
*/ */
@ -2656,9 +2694,7 @@ usage()
main_msg(_("-O[N]\t\tLike -o but split vertically")); main_msg(_("-O[N]\t\tLike -o but split vertically"));
main_msg(_("+\t\t\tStart at end of file")); main_msg(_("+\t\t\tStart at end of file"));
main_msg(_("+<lnum>\t\tStart at line <lnum>")); main_msg(_("+<lnum>\t\tStart at line <lnum>"));
#ifdef FEAT_PRECOMMANDS
main_msg(_("--cmd <command>\tExecute <command> before loading any vimrc file")); main_msg(_("--cmd <command>\tExecute <command> before loading any vimrc file"));
#endif
main_msg(_("-c <command>\t\tExecute <command> after loading the first file")); main_msg(_("-c <command>\t\tExecute <command> after loading the first file"));
main_msg(_("-S <session>\t\tSource file <session> after loading the first file")); main_msg(_("-S <session>\t\tSource file <session> after loading the first file"));
main_msg(_("-s <scriptin>\tRead Normal mode commands from file <scriptin>")); main_msg(_("-s <scriptin>\tRead Normal mode commands from file <scriptin>"));

74
src/misc2.c
View File

@ -5557,80 +5557,6 @@ pathcmp(p, q, maxlen)
} }
#endif #endif
#if defined(FEAT_PRINTER) || defined(PROTO)
/*
* Parse a list of options in the form
* option:value,option:value,option:value
*
* "value" can start with a number which is parsed out, e.g.
* margin:12mm
*
* Returns error message for an illegal option, NULL otherwise.
* Only used for the printer at the moment...
*/
char_u *
parse_list_options(option_str, table, table_size)
char_u *option_str;
option_table_T *table;
int table_size;
{
char_u *stringp;
char_u *colonp;
char_u *commap;
char_u *p;
int idx = 0; /* init for GCC */
int len;
for (idx = 0; idx < table_size; ++idx)
table[idx].present = FALSE;
/*
* Repeat for all comma separated parts.
*/
stringp = option_str;
while (*stringp)
{
colonp = vim_strchr(stringp, ':');
if (colonp == NULL)
return (char_u *)N_("E550: Missing colon");
commap = vim_strchr(stringp, ',');
if (commap == NULL)
commap = option_str + STRLEN(option_str);
len = (int)(colonp - stringp);
for (idx = 0; idx < table_size; ++idx)
if (STRNICMP(stringp, table[idx].name, len) == 0)
break;
if (idx == table_size)
return (char_u *)N_("E551: Illegal component");
p = colonp + 1;
table[idx].present = TRUE;
if (table[idx].hasnum)
{
if (!VIM_ISDIGIT(*p))
return (char_u *)N_("E552: digit expected");
table[idx].number = getdigits(&p); /*advances p*/
}
table[idx].string = p;
table[idx].strlen = (int)(commap - p);
stringp = commap;
if (*stringp == ',')
++stringp;
}
return NULL;
}
#endif /*FEAT_PRINTER*/
/* /*
* The putenv() implementation below comes from the "screen" program. * The putenv() implementation below comes from the "screen" program.
* Included with permission from Juergen Weigert. * Included with permission from Juergen Weigert.

17
src/option.c
View File

@ -3269,6 +3269,16 @@ set_init_2()
} }
} }
#endif #endif
#ifdef CURSOR_SHAPE
parse_shape_opt(SHAPE_CURSOR); /* set cursor shapes from 'guicursor' */
#endif
#ifdef FEAT_MOUSESHAPE
parse_shape_opt(SHAPE_MOUSE); /* set mouse shapes from 'mouseshape' */
#endif
#ifdef FEAT_PRINTER
(void)parse_printoptions(); /* parse 'printoptions' default value */
#endif
} }
/* /*
@ -5598,13 +5608,10 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
#ifdef FEAT_PRINTER #ifdef FEAT_PRINTER
else if (varp == &p_popt) else if (varp == &p_popt)
errmsg = parse_list_options(p_popt, printer_opts, errmsg = parse_printoptions();
OPT_PRINT_NUM_OPTIONS);
# if defined(FEAT_MBYTE) && defined(FEAT_POSTSCRIPT) # if defined(FEAT_MBYTE) && defined(FEAT_POSTSCRIPT)
else if (varp == &p_pmfn) else if (varp == &p_pmfn)
errmsg = parse_list_options(p_pmfn, mbfont_opts, errmsg = parse_printmbfont();
OPT_MBFONT_NUM_OPTIONS);
# endif # endif
#endif #endif

2
src/os_mswin.c
View File

@ -2357,6 +2357,8 @@ mch_print_set_fg(unsigned long fgcol)
#endif /*FEAT_PRINTER && !FEAT_POSTSCRIPT*/ #endif /*FEAT_PRINTER && !FEAT_POSTSCRIPT*/
#if defined(FEAT_SHORTCUT) || defined(PROTO) #if defined(FEAT_SHORTCUT) || defined(PROTO)
# include <shlobj.h> # include <shlobj.h>

68
src/po/Makefile
View File

@ -52,8 +52,49 @@ MOFILES = \
zh_TW.UTF-8.mo \ zh_TW.UTF-8.mo \
zh_TW.mo \ zh_TW.mo \
CONVERTED = \
cs.cp1250.mo \
ja.sjis.mo \
pl.cp1250.mo \
ru.cp1251.mo \
sk.cp1250.mo \
uk.cp1251.mo \
zh_CN.cp936.mo \
CHECKFILES = \
af.ck \
ca.ck \
cs.ck \
de.ck \
en_GB.ck \
es.ck \
fr.ck \
ga.ck \
it.ck \
ja.ck \
ko.ck \
no.ck \
pl.ck \
ru.ck \
sk.ck \
sv.ck \
uk.ck \
vi.ck \
zh_CN.UTF-8.ck \
zh_CN.ck \
zh_TW.UTF-8.ck \
zh_TW.ck \
cs.cp1250.ck \
ja.sjis.ck \
pl.cp1250.ck \
ru.cp1251.ck \
sk.cp1250.ck \
uk.cp1251.ck \
zh_CN.cp936.ck \
PACKAGE = vim PACKAGE = vim
SHELL = /bin/sh SHELL = /bin/sh
VIM = ../vim
# The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext # 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 # tools 0.10.37, which use a slightly different .po file format that is not
@ -64,16 +105,22 @@ XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes xgettext
MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .po .mo .pot .SUFFIXES: .po .mo .pot .ck
.PHONY: all install uninstall check clean distclean $(LANGUAGES) .PHONY: all install uninstall prefixcheck check clean distclean $(LANGUAGES)
.po.mo: .po.mo:
$(MSGFMT) -o $@ $< $(MSGFMT) -o $@ $<
.po.ck:
$(VIM) -u NONE -e -S check.vim -c "if error == 0 | q | endif" -c cq $<
touch $@
all: $(MOFILES) all: $(MOFILES)
check: $(CHECKFILES)
install: $(MOFILES) install: $(MOFILES)
@$(MAKE) check @$(MAKE) prefixcheck
for lang in $(LANGUAGES); do \ for lang in $(LANGUAGES); do \
dir=$(LOCALEDIR)/$$lang/; \ dir=$(LOCALEDIR)/$$lang/; \
if test ! -x "$$dir"; then \ if test ! -x "$$dir"; then \
@ -90,21 +137,14 @@ install: $(MOFILES)
done done
uninstall: uninstall:
@$(MAKE) check @$(MAKE) prefixcheck
for cat in $(MOFILES); do \ for cat in $(MOFILES); do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
rm -f $(LOCALEDIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ rm -f $(LOCALEDIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
done done
converted: \ converted: $(CONVERTED)
cs.cp1250.mo \
ja.sjis.mo \
pl.cp1250.mo \
ru.cp1251.mo \
sk.cp1250.mo \
uk.cp1251.mo \
zh_CN.cp936.mo \
# Convert ja.po to create ja.sjis.po. Requires doubling backslashes in the # Convert ja.po to create ja.sjis.po. Requires doubling backslashes in the
# second byte. Don't depend on sjiscorr, it should only be compiled when # second byte. Don't depend on sjiscorr, it should only be compiled when
@ -154,7 +194,7 @@ uk.cp1251.po: uk.po
iconv -f koi8-u -t cp1251 uk.po | \ iconv -f koi8-u -t cp1251 uk.po | \
sed -e 's/charset=koi8-u/charset=cp1251/' -e 's/# Original translations/# Generated from uk.po, DO NOT EDIT/' > uk.cp1251.po sed -e 's/charset=koi8-u/charset=cp1251/' -e 's/# Original translations/# Generated from uk.po, DO NOT EDIT/' > uk.cp1251.po
check: prefixcheck:
@if test "x" = "x$(prefix)"; then \ @if test "x" = "x$(prefix)"; then \
echo "******************************************"; \ echo "******************************************"; \
echo " please use make from the src directory "; \ echo " please use make from the src directory "; \
@ -163,7 +203,7 @@ check:
fi fi
clean: clean:
rm -f core core.* *.old.po *.mo *.pot sjiscorr rm -f core core.* *.old.po *.mo *.ck *.pot sjiscorr
distclean: clean distclean: clean

1
src/po/README.txt
View File

@ -99,6 +99,7 @@ language.
(4) Check: (4) Check:
vim -S check.vim xx.po
make xx.mo make xx.mo
Look out for syntax errors and fix them. Look out for syntax errors and fix them.

1
src/po/README_mingw.txt
View File

@ -74,6 +74,7 @@ the same as in the Unix case, only the commands change):
(4) Check: (4) Check:
vim -S check.vim xx.po
make -f Make_ming.mak xx.mo make -f Make_ming.mak xx.mo
Look out for syntax errors and fix them. Look out for syntax errors and fix them.

4
src/po/cs.cp1250.po
View File

@ -2351,12 +2351,12 @@ msgstr "um
#: if_python.c:1824 #: if_python.c:1824
#, c-format #, c-format
msgid "<window object (deleted) at %.8lX>" msgid "<window object (deleted) at %.8lX>"
msgstr "<objekt okna (smazán) na %8lX>" msgstr "<objekt okna (smazán) na %.8lX>"
#: if_python.c:1836 #: if_python.c:1836
#, c-format #, c-format
msgid "<window object (unknown) at %.8lX>" msgid "<window object (unknown) at %.8lX>"
msgstr "<objekt okna (neznámý) na %8lX>" msgstr "<objekt okna (neznámý) na %.8lX>"
#: if_python.c:1838 #: if_python.c:1838
#, c-format #, c-format

4
src/po/cs.po
View File

@ -2351,12 +2351,12 @@ msgstr "um
#: if_python.c:1824 #: if_python.c:1824
#, c-format #, c-format
msgid "<window object (deleted) at %.8lX>" msgid "<window object (deleted) at %.8lX>"
msgstr "<objekt okna (smazán) na %8lX>" msgstr "<objekt okna (smazán) na %.8lX>"
#: if_python.c:1836 #: if_python.c:1836
#, c-format #, c-format
msgid "<window object (unknown) at %.8lX>" msgid "<window object (unknown) at %.8lX>"
msgstr "<objekt okna (neznámý) na %8lX>" msgstr "<objekt okna (neznámý) na %.8lX>"
#: if_python.c:1838 #: if_python.c:1838
#, c-format #, c-format

4
src/po/uk.cp1251.po
View File

@ -729,7 +729,7 @@ msgstr "ͳ
#: ex_cmds2.c:2913 #: ex_cmds2.c:2913
msgid "Printing page %d (%d%%)" msgid "Printing page %d (%d%%)"
msgstr "Друкується сторінка %d (%d)" msgstr "Друкується сторінка %d (%d%%)"
#: ex_cmds2.c:2922 #: ex_cmds2.c:2922
#, c-format #, c-format
@ -894,7 +894,7 @@ msgstr "E140:
#: ex_cmds.c:2244 #: ex_cmds.c:2244
#, c-format #, c-format
msgid "Overwrite existing file \"%.*s\"?" msgid "Overwrite existing file \"%.*s\"?"
msgstr "Перезаписати існуючий файл \"%*.s\"?" msgstr "Перезаписати існуючий файл \"%.*s\"?"
#: ex_cmds.c:2315 #: ex_cmds.c:2315
#, c-format #, c-format

4
src/po/uk.po
View File

@ -729,7 +729,7 @@ msgstr "
#: ex_cmds2.c:2913 #: ex_cmds2.c:2913
msgid "Printing page %d (%d%%)" msgid "Printing page %d (%d%%)"
msgstr "馜梖掑婥衭 衲玾缶佹 %d (%d)" msgstr "馜梖掑婥衭 衲玾缶佹 %d (%d%%)"
#: ex_cmds2.c:2922 #: ex_cmds2.c:2922
#, c-format #, c-format
@ -894,7 +894,7 @@ msgstr "E140:
#: ex_cmds.c:2244 #: ex_cmds.c:2244
#, c-format #, c-format
msgid "Overwrite existing file \"%.*s\"?" msgid "Overwrite existing file \"%.*s\"?"
msgstr "蟔疻睋倅蚆埩 而挍濯圴 亅帎 \"%*.s\"?" msgstr "蟔疻睋倅蚆埩 而挍濯圴 亅帎 \"%.*s\"?"
#: ex_cmds.c:2315 #: ex_cmds.c:2315
#, c-format #, c-format

2
src/po/zh_CN.UTF-8.po
View File

@ -2118,7 +2118,7 @@ msgstr "E256: Hangul automata 错误"
#: if_cscope.c:26 #: if_cscope.c:26
#, c-format #, c-format
msgid "Usage: cs[cope] %s" msgid "Usage: cs[cope] %s"
msgstr "" msgstr "Usage: cs[cope] %s"
#: if_cscope.c:67 #: if_cscope.c:67
msgid "Add a new database" msgid "Add a new database"

2
src/po/zh_CN.cp936.po
View File

@ -2118,7 +2118,7 @@ msgstr "E256: Hangul automata
#: if_cscope.c:26 #: if_cscope.c:26
#, c-format #, c-format
msgid "Usage: cs[cope] %s" msgid "Usage: cs[cope] %s"
msgstr "" msgstr "Usage: cs[cope] %s"
#: if_cscope.c:67 #: if_cscope.c:67
msgid "Add a new database" msgid "Add a new database"

2
src/po/zh_CN.po
View File

@ -2118,7 +2118,7 @@ msgstr "E256: Hangul automata
#: if_cscope.c:26 #: if_cscope.c:26
#, c-format #, c-format
msgid "Usage: cs[cope] %s" msgid "Usage: cs[cope] %s"
msgstr "" msgstr "Usage: cs[cope] %s"
#: if_cscope.c:67 #: if_cscope.c:67
msgid "Add a new database" msgid "Add a new database"

1
src/proto.h
View File

@ -92,6 +92,7 @@ extern int _stricoll __ARGS((char *a, char *b));
# ifdef FEAT_HANGULIN # ifdef FEAT_HANGULIN
# include "hangulin.pro" # include "hangulin.pro"
# endif # endif
# include "hardcopy.pro"
# include "hashtable.pro" # include "hashtable.pro"
# include "main.pro" # include "main.pro"
# include "mark.pro" # include "mark.pro"

17
src/proto/ex_cmds2.pro
View File

@ -75,23 +75,6 @@ void ex_finish __ARGS((exarg_T *eap));
void do_finish __ARGS((exarg_T *eap, int reanimate)); void do_finish __ARGS((exarg_T *eap, int reanimate));
int source_finished __ARGS((char_u *(*getline)(int, void *, int), void *cookie)); int source_finished __ARGS((char_u *(*getline)(int, void *, int), void *cookie));
void ex_checktime __ARGS((exarg_T *eap)); void ex_checktime __ARGS((exarg_T *eap));
int get_printer_page_num __ARGS((void));
int prt_header_height __ARGS((void));
int prt_use_number __ARGS((void));
int prt_get_unit __ARGS((int idx));
void ex_hardcopy __ARGS((exarg_T *eap));
void mch_print_cleanup __ARGS((void));
int mch_print_init __ARGS((prt_settings_T *psettings, char_u *jobname, int forceit));
int mch_print_begin __ARGS((prt_settings_T *psettings));
void mch_print_end __ARGS((prt_settings_T *psettings));
int mch_print_end_page __ARGS((void));
int mch_print_begin_page __ARGS((char_u *str));
int mch_print_blank_page __ARGS((void));
void mch_print_start_line __ARGS((int margin, int page_line));
int mch_print_text_out __ARGS((char_u *p, int len));
void mch_print_set_font __ARGS((int iBold, int iItalic, int iUnderline));
void mch_print_set_bg __ARGS((long_u bgcol));
void mch_print_set_fg __ARGS((long_u fgcol));
char_u *get_mess_lang __ARGS((void)); char_u *get_mess_lang __ARGS((void));
void set_lang_var __ARGS((void)); void set_lang_var __ARGS((void));
void ex_language __ARGS((exarg_T *eap)); void ex_language __ARGS((exarg_T *eap));

1
src/proto/misc2.pro
View File

@ -93,7 +93,6 @@ int vim_chdir __ARGS((char_u *new_dir));
int get_user_name __ARGS((char_u *buf, int len)); int get_user_name __ARGS((char_u *buf, int len));
void sort_strings __ARGS((char_u **files, int count)); void sort_strings __ARGS((char_u **files, int count));
int pathcmp __ARGS((const char *p, const char *q, int maxlen)); int pathcmp __ARGS((const char *p, const char *q, int maxlen));
char_u *parse_list_options __ARGS((char_u *option_str, option_table_T *table, int table_size));
int filewritable __ARGS((char_u *fname)); int filewritable __ARGS((char_u *fname));
int emsg3 __ARGS((char_u *s, char_u *a1, char_u *a2)); int emsg3 __ARGS((char_u *s, char_u *a1, char_u *a2));
int emsgn __ARGS((char_u *s, long n)); int emsgn __ARGS((char_u *s, long n));

4
src/version.h
View File

@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA" #define VIM_VERSION_MEDIUM "7.0aa ALPHA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 22)" #define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 23)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 22, compiled " #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 23, compiled "