diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-02-23 14:53:34 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-02-23 14:53:34 +0100 |
commit | 48e330aff911be1c798c88a973af6437a8141fce (patch) | |
tree | 4945b46753c6220ae5e8cd406d139e5640bd39c4 | |
parent | 4e221c99e85ed40c98892068a01270b9e7492d98 (diff) |
patch 7.4.1399v7.4.1399
Problem: The MS-DOS code does not build.
Solution: Remove the old MS-DOS code.
45 files changed, 163 insertions, 4308 deletions
@@ -291,11 +291,9 @@ SRC_DOS = \ src/GvimExt/uninst.bat \ README_srcdos.txt \ src/INSTALLpc.txt \ - src/Make_bc3.mak \ src/Make_bc5.mak \ src/Make_cyg.mak \ src/Make_cyg_ming.mak \ - src/Make_djg.mak \ src/Make_ivc.mak \ src/Make_dvc.mak \ src/Make_ming.mak \ @@ -321,8 +319,6 @@ SRC_DOS = \ src/if_perl_msvc/stdbool.h \ src/iid_ole.c \ src/os_dos.h \ - src/os_msdos.c \ - src/os_msdos.h \ src/os_w32dll.c \ src/os_w32exe.c \ src/os_win32.c \ @@ -330,7 +326,6 @@ SRC_DOS = \ src/os_win32.h \ src/proto/gui_w32.pro \ src/proto/if_ole.pro \ - src/proto/os_msdos.pro \ src/proto/os_win32.pro \ src/proto/os_mswin.pro \ src/testdir/Make_dos.mak \ @@ -345,9 +340,7 @@ SRC_DOS = \ src/vimtbar.h \ src/xpm_w32.c \ src/xpm_w32.h \ - src/xxd/Make_bc3.mak \ src/xxd/Make_bc5.mak \ - src/xxd/Make_djg.mak \ src/xxd/Make_ming.mak \ src/xxd/Make_mvc.mak \ nsis/gvim.nsi \ diff --git a/src/Make_bc3.mak b/src/Make_bc3.mak deleted file mode 100644 index 0de7847663..0000000000 --- a/src/Make_bc3.mak +++ /dev/null @@ -1,184 +0,0 @@ -# Makefile for Borland C++ 3.1 or 4.0 to compile a 16 bit version of Vim. -# -# NOTE: THIS IS OLD AND PROBABLY NO LONGER WORKS. -# -# There are compilation options at the end of this file. -# -# Command line variables: -# BOR path to root of Borland C (E:\BORLANDC) -# DEBUG set to "yes" for debugging (no) -# SPAWNO path to the spawno library directory, empty if you do not have -# it; use 8.3 filenames! (C:\CC\SPAWN) - -.AUTODEPEND - -!ifndef BOR -BOR = E:\BORLANDC -!endif - -!if ("$(DEBUG)" == "yes") -DEBUG_FLAG = -v -!else -DEBUG_FLAG = -!endif - -CC = $(BOR)\bin\bcc.exe +VIM.CFG -TLINK = $(BOR)\bin\tlink.exe - -!ifndef SPAWNO -SPAWNO = C:\CC\SPAWN -!endif - -!if ("$(SPAWNO)" == "") -LIBPATH = $(BOR)\LIB -INCLUDEPATH = $(BOR)\INCLUDE -SPAWND = -SPAWNL = -!else -LIBPATH = $(BOR)\LIB;$(SPAWNO) -INCLUDEPATH = $(BOR)\INCLUDE;$(SPAWNO) -SPAWND = ;SPAWNO -SPAWNL = spawnl.lib -!endif - - -# *Implicit Rules* -# -# use -v for debugging -# -.c.obj: - $(CC) -c $(DEBUG_FLAG) {$< } - -# *List Macros* - - -EXE_dependencies = \ - blowfish.obj \ - buffer.obj \ - charset.obj \ - crypt.obj \ - crypt_zip.obj \ - diff.obj \ - digraph.obj \ - edit.obj \ - eval.obj \ - ex_cmds.obj \ - ex_cmds2.obj \ - ex_docmd.obj \ - ex_eval.obj \ - ex_getln.obj \ - fileio.obj \ - fold.obj \ - getchar.obj \ - hardcopy.obj \ - hashtab.obj \ - json.obj \ - main.obj \ - mark.obj \ - memfile.obj \ - memline.obj \ - menu.obj \ - message.obj \ - misc1.obj \ - misc2.obj \ - move.obj \ - os_msdos.obj \ - normal.obj \ - ops.obj \ - option.obj \ - popupmnu.obj \ - quickfix.obj \ - regexp.obj \ - screen.obj \ - search.obj \ - sha256.obj \ - spell.obj \ - syntax.obj \ - tag.obj \ - term.obj \ - ui.obj \ - undo.obj \ - window.obj - -all: vim.exe install.exe uninstal.exe xxd/xxd.exe - -# *Explicit Rules* - -vim.exe: vim.cfg $(EXE_dependencies) version.c - $(CC) $(DEBUG_FLAG) -c version.c - $(TLINK) /x/c/L$(LIBPATH) $(DEBUG_FLAG) @&&| -c0l.obj $(EXE_dependencies) version.obj -vim - # no map file -$(SPAWNL) cl.lib -| - -install.exe: dosinst.c - $(CC) -einstall $(DEBUG_FLAG) dosinst.c - -uninstal.exe: uninstal.c - $(CC) $(DEBUG_FLAG) uninstal.c - -# This may fail for older make versions, building xxd will fail anyway then. -xxd/xxd.exe: xxd/xxd.c - cd xxd - $(MAKE) -f Make_bc3.mak BOR=$(BOR) DEBUG=$(DEBUG) - cd .. - -# cleaning up: Delete all generated files -clean: - -del *.obj - -del vim.exe - -del vim.sym - -del install.exe - -del uninstal.exe - -del xxd\*.obj - -del xxd\xxd.exe - -del vim.cfg - -del testdir\*.out - -# Individual File Dependencies (incomplete) -ex_docmd.obj: ex_docmd.c ex_cmds.h - -ex_eval.obj: ex_eval.c ex_cmds.h - -main.obj: main.c globals.h option.h - -term.obj: term.c term.h - -version.obj: version.c version.h - - -# Compiler Configuration File -# -# The following compile options can be changed for better machines. -# replace -1- with -2 to produce code for a 80286 or higher -# replace -1- with -3 to produce code for a 80386 or higher -# add -v for source debugging -vim.cfg: Make_bc3.mak - copy &&| --ml --1- --f- --C --N --O --Z --k- --d --h --vi- --H=VIM.SYM --w-par --weas --wpre --Iproto --I$(INCLUDEPATH) --L$(LIBPATH) --DMSDOS;FEAT_TINY$(SPAWND) -| vim.cfg - -test: - cd testdir - $(MAKE) -f Make_dos.mak small - cd .. diff --git a/src/Make_bc5.mak b/src/Make_bc5.mak index cb48ce05a3..012866be1c 100644 --- a/src/Make_bc5.mak +++ b/src/Make_bc5.mak @@ -7,6 +7,7 @@ # # Contributed by Ben Singer. # Updated 4/1997 by Ron Aaron +# 2016: removed support for 16 bit DOS # 6/1997 - added support for 16 bit DOS # Note: this has been tested, and works, for BC5. Your mileage may vary. # Has been reported NOT to work with BC 4.52. Maybe it can be fixed? @@ -34,8 +35,7 @@ # name value (default) # # BOR path to root of Borland C install (c:\bc5) -# LINK name of the linker ($(BOR)\bin\ilink if OSTYPE is DOS16, -# $(BOR)\bin\ilink32 otherwise) +# LINK name of the linker ($(BOR)\bin\ilink32) # GUI no or yes: set to yes if you want the GUI version (yes) # LUA define to path to Lua dir to get Lua support (not defined) # LUA_VER define to version of Lua being used (51) @@ -70,7 +70,6 @@ # GETTEXT no or yes: set to yes for multi-language support (yes) # ICONV no or yes: set to yes for dynamic iconv support (yes) # OLE no or yes: set to yes to make OLE gvim (no) -# OSTYPE DOS16 or WIN32 (WIN32) # 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) @@ -78,12 +77,11 @@ # 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) -# ALIGN 1, 2 or 4: Alignment to use (4 for Win32, 2 for DOS16) +# ALIGN 1, 2 or 4: Alignment to use (4 for Win32) # FASTCALL no or yes: set to yes to use register-based function protocol (yes) # OPTIMIZE SPACE, SPEED, or MAXSPEED: type of optimization (MAXSPEED) # POSTSCRIPT no or yes: set to yes for PostScript printing -# FEATURES TINY, SMALL, NORMAL, BIG or HUGE -# (BIG for WIN32, SMALL for DOS16) +# FEATURES TINY, SMALL, NORMAL, BIG or HUGE (BIG for WIN32) # WINVER 0x0400 or 0x0500: minimum Win32 version to support (0x0400) # CSCOPE no or yes: include support for Cscope interface (yes) # NETBEANS no or yes: include support for Netbeans interface; also @@ -99,8 +97,7 @@ BOR = c:\bc5 !endif -### LINK: Name of the linker: tlink or ilink32 (this is below, depends on -# $(OSTYPE) +### LINK: Name of the linker: ilink32 (this is below) ### GUI: yes for GUI version, no for console version !if ("$(GUI)"=="") @@ -166,12 +163,6 @@ CHANNEL = yes ### OLE: no for normal gvim, yes for OLE-capable gvim (only works with GUI) #OLE = yes -### OSTYPE: DOS16 for Windows 3.1 version, WIN32 for Windows 95/98/NT/2000 -# version -!if ("$(OSTYPE)"=="") -OSTYPE = WIN32 -!endif - ### DEBUG: Uncomment to make an executable for debugging # DEBUG = yes !if ("$(DEBUG)"=="yes") @@ -208,14 +199,10 @@ USEDLL = no ### VIMDLL: yes for a DLL version of VIM (NOT RECOMMENDED), no otherwise #VIMDLL = yes -### ALIGN: alignment you desire: (1,2 or 4: s/b 4 for Win32, 2 for DOS) +### ALIGN: alignment you desire: (1,2 or 4: s/b 4 for Win32) !if ("$(ALIGN)"=="") -!if ($(OSTYPE)==DOS16) -ALIGN = 2 -!else ALIGN = 4 !endif -!endif ### FASTCALL: yes to use FASTCALL calling convention (RECOMMENDED!), no otherwise # Incompatible when calling external functions (like MSVC-compiled DLLs), so @@ -239,13 +226,9 @@ FASTCALL = yes OPTIMIZE = MAXSPEED !endif -### FEATURES: TINY, SMALL, NORMAL, BIG or HUGE (BIG for WIN32, SMALL for DOS16) +### FEATURES: TINY, SMALL, NORMAL, BIG or HUGE (BIG for WIN32) !if ("$(FEATURES)"=="") -! if ($(OSTYPE)==DOS16) -FEATURES = SMALL -! else FEATURES = BIG -! endif !endif ### POSTSCRIPT: uncomment this line if you want PostScript printing @@ -266,24 +249,7 @@ WINVER = 0x0400 # Sanity checks for the above options: # -!if ($(OSTYPE)==DOS16) -!if (($(CPUNR)+0)>4) -!error CPUNR Must be less than or equal to 4 for DOS16 -!endif - -!if (($(ALIGN)+0)>2) -!error ALIGN Must be less than or equal to 2 for DOS16 -!endif - -!else # not DOS16 -!if (($(CPUNR)+0)<3) -!error CPUNR Must be greater or equal to 3 for WIN32 -!endif -!endif - -!if ($(OSTYPE)!=WIN32) && ($(OSTYPE)!=DOS16) -!error Check the OSTYPE variable again: $(OSTYPE) is not supported! -!endif +OSTYPE = WIN32 # # Optimizations: change as desired (RECOMMENDATION: Don't change!): @@ -305,11 +271,6 @@ OPT = $(OPT) -pr OPT = $(OPT) -vi- !endif !endif -!if ($(OSTYPE)==DOS16) -!undef GUI -!undef VIMDLL -!undef USEDLL -!endif # shouldn't have to change: LIB = $(BOR)\lib INCLUDE = $(BOR)\include;.;proto @@ -483,16 +444,9 @@ TARGET = vimd.exe # for now, anyway: VIMDLL is only for the GUI version TARGET = vim.exe !endif -!if ($(OSTYPE)==DOS16) -DEFINES= -DFEAT_$(FEATURES) -DMSDOS -EXETYPE=-ml -STARTUPOBJ = c0l.obj -LINK2 = -!else EXETYPE=-WC STARTUPOBJ = c0x32.obj LINK2 = -ap -OS -o -P -!endif RESFILE = vim.res !endif @@ -545,16 +499,6 @@ DEFINES = $(DEFINES) -DMSWINPS ##### BASE COMPILER/TOOLS RULES ##### MAKE = $(BOR)\bin\make CFLAGS = -w-aus -w-par -w-pch -w-ngu -w-csu -I$(INCLUDE) -!if ($(OSTYPE)==DOS16) -BRC = -!if ("$(LINK)"=="") -LINK = $(BOR)\BIN\TLink -!endif -CC = $(BOR)\BIN\Bcc -LFLAGS = -Tde -c -m -L$(LIB) $(DEBUG_FLAG) $(LINK2) -LFLAGSDLL = -CFLAGS = $(CFLAGS) -H- $(HEADERS) -!else BRC = $(BOR)\BIN\brc32 !if ("$(LINK)"=="") LINK = $(BOR)\BIN\ILink32 @@ -563,7 +507,6 @@ CC = $(BOR)\BIN\Bcc32 LFLAGS = -OS -Tpe -c -m -L$(LIB) $(DEBUG_FLAG) $(LINK2) LFLAGSDLL = -Tpd -c -m -L$(LIB) $(DEBUG_FLAG) $(LINK2) CFLAGS = $(CFLAGS) -d -RT- -k- -Oi $(HEADERS) -f- -!endif CC1 = -c CC2 = -o @@ -583,8 +526,6 @@ CCARG = +$(OBJDIR)\bcc.cfg .cpp.obj: $(CC) $(CCARG) $(CC1) $(CC2)$@ $*.cpp -!if ($(OSTYPE)==DOS16) -!else # win32: vimmain = \ $(OBJDIR)\os_w32exe.obj !if ("$(VIMDLL)"=="yes") @@ -594,7 +535,6 @@ vimwinmain = \ vimwinmain = \ $(OBJDIR)\os_w32exe.obj !endif -!endif vimobj = \ $(OBJDIR)\blowfish.obj \ @@ -720,13 +660,8 @@ vimobj = $(vimobj) \ $(OBJDIR)\gui_w32.obj !endif -!if ($(OSTYPE)==WIN32) vimobj = $(vimobj) \ $(OBJDIR)\os_win32.obj $(OBJDIR)\os_mswin.obj $(OBJDIR)\winclip.obj -!elif ($(OSTYPE)==DOS16) -vimobj = $(vimobj) \ - $(OBJDIR)\os_msdos.obj -!endif # Blab what we are going to do: MSG = Compiling $(OSTYPE) $(TARGET) $(OLETARGET), with: !if ("$(GUI)"=="yes") @@ -818,14 +753,10 @@ MSG = $(MSG) Align=$(ALIGNARG) !message $(MSG) -!if ($(OSTYPE)==DOS16) -TARGETS = $(TARGET) -!else !if ("$(VIMDLL)"=="yes") TARGETS = $(DLLTARGET) !endif TARGETS = $(TARGETS) $(TARGET) -!endif # Targets: all: vim vimrun.exe install.exe xxd uninstal.exe GvimExt/gvimext.dll @@ -851,18 +782,10 @@ GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h cd .. install.exe: dosinst.c $(OBJDIR)\bcc.cfg -!if ($(OSTYPE)==WIN32) $(CC) $(CCARG) -WC -DWIN32 -einstall dosinst.c -!else - $(CC) $(CCARG) -WC -einstall dosinst.c -!endif uninstal.exe: uninstal.c $(OBJDIR)\bcc.cfg -!if ($(OSTYPE)==WIN32) $(CC) $(CCARG) -WC -DWIN32 -O2 -euninstal uninstal.c -!else - $(CC) $(CCARG) -WC -O2 -euninstal uninstal.c -!endif clean: !if "$(OS)" == "Windows_NT" @@ -923,10 +846,7 @@ $(DLLTARGET): $(OBJDIR) $(vimdllobj) cg32.lib+ !endif # $(OSTYPE)==WIN32 causes os_mswin.c compilation. FEAT_SHORTCUT in it needs OLE -!if ("$(OLE)"=="yes" || $(OSTYPE)==WIN32) ole2w32.lib + -!endif -!if ($(OSTYPE)==WIN32) import32.lib+ !ifdef LUA $(LUA_LIB_FLAG)lua.lib+ @@ -955,9 +875,6 @@ $(DLLTARGET): $(OBJDIR) $(vimdllobj) cw32.lib !endif vim.def -!else - cl.lib -!endif | !if ("$(VIMDLL)"=="yes") @@ -974,14 +891,11 @@ $(TARGET): $(OBJDIR) $(vimobj) $(OBJDIR)\$(RESFILE) $(vimobj) !endif $<,$* -!if ($(OSTYPE)==WIN32) !if ("$(CODEGUARD)"=="yes") cg32.lib+ !endif # $(OSTYPE)==WIN32 causes os_mswin.c compilation. FEAT_SHORTCUT in it needs OLE -!if ("$(OLE)"=="yes" || $(OSTYPE)==WIN32) ole2w32.lib + -!endif import32.lib+ !ifdef LUA $(LUA_LIB_FLAG)lua.lib+ @@ -1011,9 +925,6 @@ $(TARGET): $(OBJDIR) $(vimobj) $(OBJDIR)\$(RESFILE) !endif $(OBJDIR)\$(RESFILE) -!else - emu.lib + cl.lib -!endif | test: diff --git a/src/Make_djg.mak b/src/Make_djg.mak deleted file mode 100644 index 5b77b5c16f..0000000000 --- a/src/Make_djg.mak +++ /dev/null @@ -1,112 +0,0 @@ -# -# Makefile for VIM on MSDOS, using DJGPP 2.0 -# -# NOTE: THIS IS OLD AND PROBABLY NO LONGER WORKS. -# - -#>>>>> choose options: - -### See feature.h for a list of optionals. -### Any other defines can be included here. - -DEFINES = - -#>>>>> name of the compiler and linker, name of lib directory -CC = gcc - -#>>>>> end of choices -########################################################################### - -INCL = vim.h globals.h option.h keymap.h macros.h ascii.h term.h os_msdos.h structs.h -CFLAGS = -O2 -DMSDOS -Iproto $(DEFINES) -Wall -Dinterrupt= -Dfar= -DMAXMEM=512 -D_NAIVE_DOS_REGS - -OBJ = \ - obj/blowfish.o \ - obj/buffer.o \ - obj/charset.o \ - obj/crypt.o \ - obj/crypt_zip.o \ - obj/diff.o \ - obj/digraph.o \ - obj/edit.o \ - obj/eval.o \ - obj/ex_cmds.o \ - obj/ex_cmds2.o \ - obj/ex_docmd.o \ - obj/ex_eval.o \ - obj/ex_getln.o \ - obj/fileio.o \ - obj/fold.o \ - obj/getchar.o \ - obj/hardcopy.o \ - obj/hashtab.o \ - obj/main.o \ - obj/mark.o \ - obj/memfile.o \ - obj/memline.o \ - obj/menu.o \ - obj/message.o \ - obj/misc1.o \ - obj/misc2.o \ - obj/move.o \ - obj/mbyte.o \ - obj/normal.o \ - obj/ops.o \ - obj/option.o \ - obj/os_msdos.o \ - obj/popupmnu.o \ - obj/quickfix.o \ - obj/regexp.o \ - obj/screen.o \ - obj/search.o \ - obj/sha256.o \ - obj/spell.o \ - obj/syntax.o \ - obj/tag.o \ - obj/term.o \ - obj/ui.o \ - obj/undo.o \ - obj/window.o \ - $(TERMLIB) - -all: vim.exe install.exe uninstal.exe xxd/xxd.exe - -# version.c is compiled each time, so that it sets the build time. -vim.exe: obj $(OBJ) version.c version.h - $(CC) $(CFLAGS) -s -o vim.exe version.c $(OBJ) -lpc - -install.exe: dosinst.c - $(CC) $(CFLAGS) -s -o install.exe dosinst.c -lpc - -uninstal.exe: uninstal.c - $(CC) $(CFLAGS) -s -o uninstal.exe uninstal.c -lpc - -# This requires GNU make. -xxd/xxd.exe: xxd/xxd.c - $(MAKE) --directory=xxd -f Make_djg.mak - -obj: - mkdir obj - -tags: - command /c ctags *.c $(INCL) ex_cmds.h - -clean: - -del obj\*.o - -rmdir obj - -del vim.exe - -del install.exe - -del xxd\xxd.exe - -del testdir\*.out - -# This requires GNU make. -test: - $(MAKE) --directory=testdir -f Make_dos.mak - -########################################################################### - -obj/%.o: %.c obj $(INCL) - $(CC) -c $(CFLAGS) -o $@ $< - -# Extra dependency (there are actually many more...) -obj/ex_docmd.o: ex_cmds.h diff --git a/src/Makefile b/src/Makefile index 13c7bc6041..1326cf06ef 100644 --- a/src/Makefile +++ b/src/Makefile @@ -908,7 +908,7 @@ SANITIZER_LIBS = $(SANITIZER_CFLAGS) ### after changing this, you need to do "make reconfig". #CONF_TERM_LIB = --with-tlib=ncurses -### For GCC on MSDOS, the ".exe" suffix will be added. +### For GCC on MS-Windows, the ".exe" suffix will be added. #EXEEXT = .exe #LNKEXT = .exe @@ -1715,7 +1715,7 @@ PRO_AUTO = \ # Resources used for the Mac are in one directory. RSRC_DIR = os_mac_rsrc -PRO_MANUAL = os_amiga.pro os_msdos.pro os_win32.pro \ +PRO_MANUAL = os_amiga.pro os_win32.pro \ os_mswin.pro winclip.pro os_beos.pro os_vms.pro $(PERL_PRO) # Default target is making the executable and tools @@ -1836,7 +1836,7 @@ update-po: # Generate function prototypes. This is not needed to compile vim, but if # you want to use it, cproto is out there on the net somewhere -- Webb # -# When generating os_amiga.pro, os_msdos.pro and os_win32.pro there will be a +# When generating os_amiga.pro and os_win32.pro there will be a # few include files that can not be found, that's OK. proto: $(PRO_AUTO) $(PRO_MANUAL) @@ -1864,10 +1864,6 @@ os_amiga.pro: os_amiga.c $(CPROTO) -DAMIGA -UHAVE_CONFIG_H -DBPTR=char* $< > proto/$@ echo "/* vim: set ft=c : */" >> proto/$@ -os_msdos.pro: os_msdos.c - $(CPROTO) -DMSDOS -UHAVE_CONFIG_H $< > proto/$@ - echo "/* vim: set ft=c : */" >> proto/$@ - os_win32.pro: os_win32.c $(CPROTO) -DWIN32 -UHAVE_CONFIG_H $< > proto/$@ echo "/* vim: set ft=c : */" >> proto/$@ diff --git a/src/blowfish.c b/src/blowfish.c index d24aa2c745..37d5a554c1 100644 --- a/src/blowfish.c +++ b/src/blowfish.c @@ -34,7 +34,7 @@ typedef union { char_u uc[8]; } block8; -#if defined(WIN3264) || defined(DOS32) +#if defined(WIN3264) /* MS-Windows is always little endian */ #else # ifdef HAVE_CONFIG_H diff --git a/src/buffer.c b/src/buffer.c index 9f61eefd1c..89dedc58f9 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -541,9 +541,7 @@ buf_clear_file(buf_T *buf) { buf->b_ml.ml_line_count = 1; unchanged(buf, TRUE); -#ifndef SHORT_FNAME buf->b_shortname = FALSE; -#endif buf->b_p_eol = TRUE; buf->b_start_eol = TRUE; #ifdef FEAT_MBYTE @@ -2911,9 +2909,7 @@ setfname( } #endif -#ifndef SHORT_FNAME buf->b_shortname = FALSE; -#endif buf_name_changed(buf); return OK; @@ -4480,7 +4476,7 @@ fix_fname(char_u *fname) # ifdef BACKSLASH_IN_FILENAME || strstr((char *)fname, "\\\\") != NULL # endif -# if defined(MSWIN) || defined(DJGPP) +# if defined(MSWIN) || vim_strchr(fname, '~') != NULL # endif ) diff --git a/src/diff.c b/src/diff.c index db1d066f96..be7e38ccbe 100644 --- a/src/diff.c +++ b/src/diff.c @@ -29,7 +29,7 @@ static int diff_flags = DIFF_FILLER; static int diff_a_works = MAYBE; /* TRUE when "diff -a" works, FALSE when it doesn't work, MAYBE when not checked yet */ -#if defined(MSWIN) || defined(MSDOS) +#if defined(MSWIN) static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE when it doesn't work, MAYBE when not checked yet */ @@ -733,7 +733,7 @@ ex_diffupdate( break; #endif -#if defined(MSWIN) || defined(MSDOS) +#if defined(MSWIN) /* If the "-a" argument works, also check if "--binary" works. */ if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE) { @@ -764,7 +764,7 @@ ex_diffupdate( EMSG(_("E810: Cannot read or write temp files")); EMSG(_("E97: Cannot create diffs")); diff_a_works = MAYBE; -#if defined(MSWIN) || defined(MSDOS) +#if defined(MSWIN) diff_bin_works = MAYBE; #endif goto theend; @@ -845,7 +845,7 @@ diff_file( * non-zero when differences have been found. */ vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s", diff_a_works == FALSE ? "" : "-a ", -#if defined(MSWIN) || defined(MSDOS) +#if defined(MSWIN) diff_bin_works == TRUE ? "--binary " : "", #else "", diff --git a/src/digraph.c b/src/digraph.c index 2195d644a4..5dab51b20f 100644 --- a/src/digraph.c +++ b/src/digraph.c @@ -39,74 +39,7 @@ static garray_T user_digraphs = {0, 0, (int)sizeof(digr_T), 10, NULL}; * compilers cannot handle them (Amiga SAS/C is the most picky one). */ static digr_T digraphdefault[] = -#if defined(MSDOS) - /* - * MSDOS digraphs. - */ - {{'C', ',', 128}, /* ~@ XX */ - {'u', '"', 129}, /* */ - {'e', '\'', 130}, /* */ - {'a', '^', 131}, /* */ - {'a', '"', 132}, /* */ - {'a', '`', 133}, /* */ - {'a', '@', 134}, /* */ - {'c', ',', 135}, /* ~G XX */ - {'e', '^', 136}, /* ~H XX */ - {'e', '"', 137}, /* */ - {'e', '`', 138}, /* */ - {'i', '"', 139}, /* */ - {'i', '^', 140}, /* */ - {'i', '`', 141}, /* */ - {'A', '"', 142}, /* ~N XX */ - {'A', '@', 143}, /* */ - {'E', '\'', 144}, /* */ - {'a', 'e', 145}, /* */ - {'A', 'E', 146}, /* */ - {'o', '^', 147}, /* */ - {'o', '"', 148}, /* */ - {'o', '`', 149}, /* */ - {'u', '^', 150}, /* */ - {'u', '`', 151}, /* */ - {'y', '"', 152}, /* */ - {'O', '"', 153}, /* */ - {'U', '"', 154}, /* */ - {'c', '|', 155}, /* */ - {'$', '$', 156}, /* */ - {'Y', '-', 157}, /* ~] XX */ - {'P', 't', 158}, /* */ - {'f', 'f', 159}, /* */ - {'a', '\'', 160}, /* */ - {'i', '\'', 161}, /* */ - {'o', '\'', 162}, /* */ - {'u', '\'', 163}, /* x XX */ - {'n', '~', 164}, /* */ - {'N', '~', 165}, /* */ - {'a', 'a', 166}, /* */ - {'o', 'o', 167}, /* */ - {'~', '?', 168}, /* */ - {'-', 'a', 169}, /* */ - {'a', '-', 170}, /* */ - {'1', '2', 171}, /* */ - {'1', '4', 172}, /* */ - {'~', '!', 173}, /* */ - {'<', '<', 174}, /* */ - {'>', '>', 175}, /* */ - - {'s', 's', 225}, /* */ - {'j', 'u', 230}, /* */ - {'o', '/', 237}, /* */ - {'+', '-', 241}, /* */ - {'>', '=', 242}, /* */ - {'<', '=', 243}, /* */ - {':', '-', 246}, /* */ - {'~', '~', 247}, /* */ - {'~', 'o', 248}, /* */ - {'2', '2', 253}, /* */ - {NUL, NUL, NUL} - }; - -#else /* !MSDOS */ -# ifdef __MINT__ +#ifdef __MINT__ /* * ATARI digraphs @@ -171,8 +104,8 @@ static digr_T digraphdefault[] = {NUL, NUL, NUL} }; -# else /* !__MINT__ */ -# ifdef HPUX_DIGRAPHS +#else /* !__MINT__ */ +# ifdef HPUX_DIGRAPHS /* * different HPUX digraphs @@ -275,9 +208,9 @@ static digr_T digraphdefault[] = {NUL, NUL, NUL} }; -# else /* !HPUX_DIGRAPHS */ +# else /* !HPUX_DIGRAPHS */ -# ifdef EBCDIC +# ifdef EBCDIC /* * EBCDIC - ISO digraphs @@ -387,8 +320,8 @@ static digr_T digraphdefault[] = |