# vile 9.5d - patch 2005/11/29 - Thomas Dickey <dickey@invisible-island.net>
# ------------------------------------------------------------------------------
# CHANGES | 13 +++++++-
# MANIFEST | 5 ---
# README.PC | 26 +++++-----------
# borland.c | 5 +--
# buglist | 15 ---------
# display.c | 79 +++++++--------------------------------------------
# edef.h | 6 +--
# estruct.h | 17 ++--------
# filters/lex-filt.l | 9 ++++-
# main.c | 8 ++---
# makefile.djg | 23 +-------------
# makefile.icc | 4 +-
# makefile.in | 11 +------
# makefile.wnt | 4 +-
# patchlev.h | 2 -
# proto.h | 12 -------
# revlist | 47 ++++++++++++++----------------
# spawn.c | 20 ------------
# termio.c | 14 ---------
# version.c | 4 +-
# vile-9.5.spec | 14 +++++++--
# vl_ctype.h | 10 ++++--
# 22 files changed, 110 insertions(+), 238 deletions(-)
# ------------------------------------------------------------------------------
# Please remove the following files before applying this patch.
# (You can feed this patch to 'sh' to do so.)
rm -f config.emx
rm -f makefile.tbc
rm -f makefile.wat
exit
Index: CHANGES
--- vile-9.5c+/CHANGES 2005-11-24 01:33:01.000000000 +0000
+++ vile-9.5d/CHANGES 2005-11-30 01:25:56.000000000 +0000
@@ -1,5 +1,16 @@
Changes for vile 9.6 (released ??? ??? ?? ????)
+ 20051129 (d)
+ > Tom Dickey:
+ + fix vl_ctype.h to avoid redefinition of UCHAR (reports by Clark
+ Morgan, Mark Robinson).
+ + fix lex-filt.l to build with lex (report by Dave Rolfe).
+ + fix include-path in makefile.wnt, makefile.djg makefile.icc to work
+ with split-out headers for regexp.c
+ + remove code for DISP_IBMPC
+ + remove makefile.emx and config.emx (obsolete).
+ + remove makefile.wat and makefile.tbc, since they used ibmpc.c
+
20051123 (c)
> Clark Morgan:
+ remove an obsolete comment in macros.doc regarding underscore in
@@ -20,7 +31,7 @@
+ split xterm-specific code out of tcap.c as xterm.c, to share with
curses.c
+ indent'd borland.c
- + remove ibmpc.c
+ + remove ibmpc.c (obsolete)
+ check if stdout is not a tty on startup, print error message and
exit (request by Paul Fox).
+ add mode xterm-fkeys, to allow termcap driver to generate
Index: MANIFEST
--- vile-9.5c+/MANIFEST 2005-11-24 01:48:22.000000000 +0000
+++ vile-9.5d/MANIFEST 2005-11-30 02:20:03.000000000 +0000
@@ -1,4 +1,4 @@
-MANIFEST for vile, version v9_5c
+MANIFEST for vile, version v9_5d
--------------------------------------------------------------------------------
MANIFEST this file
CHANGES Change-log for VILE
@@ -27,7 +27,6 @@
builtflt.c interface from vile to built-in filters
chgdfunc.h prototypes for mode-functions with side-effects
cmdtbl used by 'mktbls' to generate VILE's command-tables
-config.emx configure-ifdefs for EMX (OS/2)
config.guess guess configuration
config.sub substitute configuration
config_h.in template for config.h
@@ -68,8 +67,6 @@
makefile.emx makefile for EMX (OS/2) with gcc and gmake
makefile.icc makefile for C Set++ 2.x (OS/2)
makefile.in used by 'configure' to generate a makefile
-makefile.tbc makefile for TurboC (MS-DOS)
-makefile.wat makefile for Watcom (MS-DOS) with wmake
makefile.wnt makefile for Win32 with Microsoft Visual C++
map.c map and map! commands
menu.c menu-support for xvile
Index: README.PC
Prereq: 1.32
--- vile-9.5c+/README.PC 2005-03-15 20:08:15.000000000 +0000
+++ vile-9.5d/README.PC 2005-11-30 01:32:30.000000000 +0000
@@ -94,23 +94,15 @@
libraries emulate the borland screen i/o routines, so this
screen driver is used there as well.
- ibmpc.c (need #define IBMPC in estruct.h or makefile): goes
- straight to the video controller and the screen, should
- support most popular video modes on CGA/EGA/VGA cards.
- this is fine under regular DOS, but starts causing problems
- in a Windows DOS-box, due to its direct video accesses.
-
ansi.c (need #define ANSI in estruct.h or makefile): uses ANSI.SYS.
- this may be more portable than ibmpc.c, since it relies on
- the ansi driver for its cursor/scrolling/color services.
- if you can change the resolution of your screen (to 43 or
- 50 line mode) with your ansi driver, just use the
- "screen-rows" and/or "screen-columns" vile commands to make
- its idea of the size match your physical screen, and
- you'll be all set. (i've only tested it with a free/public
- replacement program called NNANSI. i got my copy from a
- simtel mirror. i can probably find you a copy if you need
- it.)
+ it relies on the ansi driver for its cursor/scrolling/color
+ services. if you can change the resolution of your screen (to
+ 43 or 50 line mode) with your ansi driver, just use the
+ "screen-rows" and/or "screen-columns" vile commands to make its
+ idea of the size match your physical screen, and you'll be all
+ set. (i've only tested it with a free/public replacement
+ program called NNANSI. i got my copy from a simtel mirror. i
+ can probably find you a copy if you need it.)
OS/2 information
@@ -264,5 +256,5 @@
paul fox, pgf@foxharp.boston.ma.us (home)
------------------------
-$Header: /usr/build/vile/vile/RCS/README.PC,v 1.32 2005/03/15 20:08:15 tom Exp $
+$Header: /usr/build/vile/vile/RCS/README.PC,v 1.33 2005/11/30 01:32:30 tom Exp $
------------------------
Index: borland.c
Prereq: 1.33
--- vile-9.5c+/borland.c 2005-11-23 12:23:49.000000000 +0000
+++ vile-9.5d/borland.c 2005-11-30 01:25:29.000000000 +0000
@@ -9,7 +9,7 @@
* Note: Visual flashes are not yet supported.
*
*
- * $Header: /usr/build/vile/vile/RCS/borland.c,v 1.33 2005/11/23 12:23:49 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/borland.c,v 1.34 2005/11/30 01:25:29 tom Exp $
*
*/
@@ -23,9 +23,8 @@
#undef OPT_COLOR
#endif /* SYS_OS2 */
-#if !DISP_BORLAND || DISP_IBMPC
+#if !DISP_BORLAND
#error misconfigured: DISP_BORLAND should be defined if using borland.c
-#error (and DISP_IBMPC should not be defined)
#endif
#define NROW 50 /* Max Screen size. */
Index: buglist
Prereq: 1.402
--- vile-9.5c+/buglist 2005-07-17 18:21:56.000000000 +0000
+++ vile-9.5d/buglist 2005-11-30 01:18:33.000000000 +0000
@@ -1,7 +1,7 @@
------------------------
vile bug/enhancement/wish list (mostly wishes ;-)
------------------------
-$Header: /usr/build/vile/vile/RCS/buglist,v 1.402 2005/07/17 18:21:56 tom Exp $
+$Header: /usr/build/vile/vile/RCS/buglist,v 1.403 2005/11/30 01:18:33 tom Exp $
----------------------
(E means enhancement, L,M,H are low, medium, high priority)
@@ -272,19 +272,6 @@
where the longest line may not extend to the furthest column, due to
tabs in other lines.
-
--------------------------
-
-I'm using the DOS version and I prefer to use 80x28 or even higher res like
-80x50 by setting set sres=80x50 in vile.rc. The problem is that when a
-command is executed with :!<shell-command> the mode switches back to 80x25.
-It switches back to 80x25 permanently. I think it's acceptable that it
-switches to 80x25 when it's in shell command execution. However, technically
-it should switch back to the preferred mode when it's done.
-
-[ can anyone confirm or deny this is still true? ]
-[ I don't see it happening with ibmpc.c - dickey ]
-
---------------------------
the borland console driver won't display the cursor on blank lines until
Index: display.c
Prereq: 1.409
--- vile-9.5c+/display.c 2005-11-16 01:20:27.000000000 +0000
+++ vile-9.5d/display.c 2005-11-30 01:34:50.000000000 +0000
@@ -5,7 +5,7 @@
* functions use hints that are left in the windows by the commands.
*
*
- * $Header: /usr/build/vile/vile/RCS/display.c,v 1.409 2005/11/16 01:20:27 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/display.c,v 1.410 2005/11/30 01:34:50 tom Exp $
*
*/
@@ -35,20 +35,9 @@
VIDEO **vscreen; /* Virtual screen. */
VIDEO **pscreen; /* Physical screen. */
-#if FRAMEBUF
-#define PSCREEN vscreen
-#else
-#define PSCREEN pscreen
-#endif
static int *lmap;
-#if DISP_IBMPC
-#define PScreen(n) scread((VIDEO *)0,n)
-#else
-#define PScreen(n) pscreen[n]
-#endif
-
-#if OPT_SCROLLCODE && (DISP_IBMPC || !FRAMEBUF)
+#if OPT_SCROLLCODE
#define CAN_SCROLL 1
#else
#define CAN_SCROLL 0
@@ -417,16 +406,12 @@
if (term.maxrows > vrows) {
GROW(vscreen, VIDEO *, vrows, term.maxrows);
-#if ! FRAMEBUF
GROW(pscreen, VIDEO *, vrows, term.maxrows);
-#endif
GROW(lmap, int, vrows, term.maxrows);
} else {
for (i = term.maxrows; i < vrows; i++) {
freeVIDEO(vscreen[i]);
-#if ! FRAMEBUF
freeVIDEO(pscreen[i]);
-#endif
}
}
@@ -435,10 +420,8 @@
for (i = first; i < term.maxrows; ++i) {
if (!video_alloc(&vscreen[i]))
return FALSE;
-#if ! FRAMEBUF
if (!video_alloc(&pscreen[i]))
return FALSE;
-#endif /* !FRAMEBUF */
}
vcols = term.maxcols;
vrows = term.maxrows;
@@ -460,7 +443,6 @@
free((char *) vscreen);
vscreen = 0;
}
-#if ! FRAMEBUF
if (pscreen) {
for (i = 0; i < term.maxrows; ++i) {
freeVIDEO(pscreen[i]);
@@ -468,7 +450,6 @@
free((char *) pscreen);
pscreen = 0;
}
-#endif
FreeIfNeeded(lmap);
}
#endif
@@ -1018,41 +999,6 @@
* colto - col to go to
*/
-#if FRAMEBUF
-/*
- * UPDATELINE specific code for the IBM-PC and other compatibles
- */
-static void
-update_line(int row, int colfrom, int colto)
-{
- struct VIDEO *vp1 = vscreen[row]; /* virtual screen image */
- int req = (vp1->v_flag & VFREQ) == VFREQ;
-
-#if OPT_COLOR
- CurFcolor(vp1) = ReqFcolor(vp1);
- CurBcolor(vp1) = ReqBcolor(vp1);
-#endif
-#if OPT_VIDEO_ATTRS
- scwrite(row, colfrom, colto - colfrom,
- VideoText(vp1),
- VideoAttr(vp1),
- ReqFcolor(vp1),
- ReqBcolor(vp1));
-#else /* highlighting, anyway */
- scwrite(row, colfrom, colto - colfrom,
- VideoText(vp1),
- (VIDEO_ATTR *) 0,
- req ? ReqBcolor(vp1) : ReqFcolor(vp1),
- req ? ReqFcolor(vp1) : ReqBcolor(vp1));
-#endif
- vp1->v_flag &= ~(VFCHG | VFCOL); /* flag this line as updated */
- if (req)
- vp1->v_flag |= VFREV;
- else
- vp1->v_flag &= ~VFREV;
-}
-
-#else /* !FRAMEBUF */
#if OPT_PSCREEN
/*
* Update a single row on the physical screen.
@@ -1103,7 +1049,7 @@
update_line(int row, int colfrom, int colto)
{
struct VIDEO *vp1 = vscreen[row]; /* virtual screen image */
- struct VIDEO *vp2 = PSCREEN[row]; /* physical screen image */
+ struct VIDEO *vp2 = pscreen[row]; /* physical screen image */
int xl = colfrom;
int xr = colto;
int xx;
@@ -1290,12 +1236,11 @@
return;
}
#endif /* OPT_PSCREEN(update_line) */
-#endif /* FRAMEBUF(update_line) */
void
kbd_openup(void)
{
-#if !FRAMEBUF && !OPT_PSCREEN
+#if !OPT_PSCREEN
int i;
size_t alen = sizeof(VIDEO_ATTR) * term.cols;
#endif
@@ -1304,7 +1249,7 @@
term.putch('\n');
term.putch('\r');
term.flush();
-#if !FRAMEBUF && !OPT_PSCREEN
+#if !OPT_PSCREEN
if (pscreen != 0) {
for (i = 0; i < term.rows - 1; ++i) {
(void) memcpy(pscreen[i]->v_text,
@@ -2004,7 +1949,7 @@
static void
update_garbaged_screen(void)
{
-#if !FRAMEBUF && !OPT_PSCREEN
+#if !OPT_PSCREEN
int j;
#endif
int i;
@@ -2018,7 +1963,7 @@
CurFcolor(vscreen[i]) = -1;
CurBcolor(vscreen[i]) = -1;
#endif
-#if ! FRAMEBUF && ! OPT_PSCREEN
+#if !OPT_PSCREEN
for (j = 0; j < term.cols; ++j) {
CELL_TEXT(i, j) = ' ';
#if OPT_VIDEO_ATTRS
@@ -2197,7 +2142,7 @@
texttest(int vrow, int prow)
{
struct VIDEO *vpv = vscreen[vrow]; /* virtual screen image */
- struct VIDEO *vpp = PScreen(prow); /* physical screen image */
+ struct VIDEO *vpp = pscreen[prow]; /* physical screen image */
return (!memcmp(vpv->v_text, vpp->v_text, (size_t) term.cols));
}
@@ -2264,7 +2209,7 @@
return FALSE; /* there isn't one */
vpv = vscreen[first];
- vpp = PScreen(first);
+ vpp = pscreen[first];
if (inserts) {
/* determine types of potential scrolls */
@@ -2363,11 +2308,11 @@
scroll_screen(from, to, count);
#if !OPT_PSCREEN
for (i = 0; i < count; i++) {
- vpp = PScreen(to + i);
+ vpp = pscreen[to + i];
vpv = vscreen[to + i];
(void) memcpy(vpp->v_text, vpv->v_text, (size_t) cols);
}
-#if OPT_VIDEO_ATTRS && !FRAMEBUF
+#if OPT_VIDEO_ATTRS
#define SWAP_ATTR_PTR(a, b) do { VIDEO_ATTR *temp = pscreen[a]->v_attrs; \
pscreen[a]->v_attrs = pscreen[b]->v_attrs; \
pscreen[b]->v_attrs = temp; } one_time
@@ -2398,7 +2343,7 @@
}
for (i = from; i < to; i++) {
char *txt;
- txt = PScreen(i)->v_text;
+ txt = pscreen[i]->v_text;
for (j = 0; j < term.cols; ++j)
txt[j] = ' ';
vscreen[i]->v_flag |= VFCHG;
Index: edef.h
Prereq: 1.320
--- vile-9.5c+/edef.h 2005-03-10 19:54:57.000000000 +0000
+++ vile-9.5d/edef.h 2005-11-30 02:18:33.000000000 +0000
@@ -6,7 +6,7 @@
*/
/*
- * $Header: /usr/build/vile/vile/RCS/edef.h,v 1.320 2005/03/10 19:54:57 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/edef.h,v 1.322 2005/11/30 02:18:33 tom Exp $
*/
#ifndef VILE_EDEF_H
@@ -466,9 +466,9 @@
decl_init(int utf8_locale, FALSE);
-#if DISP_IBMPC || DISP_BORLAND || DISP_VIO
+#if DISP_BORLAND || DISP_VIO
decl_init( char *current_res_name, "default");
-#endif /* IBMPC */
+#endif /* resolution */
#ifdef __cplusplus
}
Index: estruct.h
Prereq: 1.589
--- vile-9.5c+/estruct.h 2005-11-23 13:46:16.000000000 +0000
+++ vile-9.5d/estruct.h 2005-11-30 02:18:18.000000000 +0000
@@ -12,7 +12,7 @@
*/
/*
- * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.589 2005/11/23 13:46:16 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.591 2005/11/30 02:18:18 tom Exp $
*/
#ifndef _estruct_h
@@ -367,7 +367,6 @@
#define DISP_ANSI 0 /* ansi escape sequences */
#define DISP_VMSVT SYS_VMS /* various VMS terminal entries */
#define DISP_BORLAND 0 /* Borland console I/O routines */
-#define DISP_IBMPC (SYS_MSDOS && !DISP_BORLAND && !DISP_ANSI)
#define DISP_X11 0 /* X Window System */
#define DISP_NTCONS 0 /* Windows/NT console */
#define DISP_NTWIN 0 /* Windows/NT screen/windows */
@@ -389,10 +388,6 @@
#define DISP_CURSES 0
#endif
-#ifndef DISP_IBMPC
-#define DISP_IBMPC 0
-#endif
-
#ifndef DISP_NTCONS
#define DISP_NTCONS 0
#endif
@@ -520,8 +515,7 @@
#define OPT_SCROLLCODE 1 /* code in display.c for scrolling the screen.
Only useful if your display can scroll
regions, or at least insert/delete lines.
- ANSI, TERMCAP, IBMPC, VMSVT and AT386 can
- do this */
+ ANSI, TERMCAP/CURSES and VMSVT can do this */
#define OPT_CVMVAS 1 /* arguments to forward/back page and half page
are in pages instead of rows (in vi,
they're rows, and the argument is "sticky",
@@ -614,7 +608,7 @@
#define OPT_EVAL !SMALLER /* expression-evaluation */
#define OPT_FILEBACK (!SMALLER && !SYS_VMS) /* file backup style */
#define OPT_FINDERR !SMALLER /* finderr support. */
-#define OPT_FLASH (!SMALLER || DISP_IBMPC)/* visible-bell */
+#define OPT_FLASH !SMALLER /* visible-bell */
#define OPT_FORMAT !SMALLER /* region formatting support. */
#define OPT_HILITEMATCH !SMALLER /* highlight all matches of a search */
#define OPT_HISTORY !SMALLER /* command-history */
@@ -625,7 +619,6 @@
#define OPT_MAJORMODE !SMALLER /* majormode support */
#define OPT_MACRO_ARGS (!SMALLER && OPT_EVAL) /* macro argument parsing */
#define OPT_MLFORMAT !SMALLER /* modeline-format */
-#define OPT_MS_MOUSE (!SMALLER && DISP_IBMPC)/* MsDos-mouse */
#define OPT_NAMEBST !SMALLER /* name's stored in a bst */
#define OPT_ONLINEHELP !SMALLER /* short per-command help */
#define OPT_POPUPCHOICE !SMALLER /* popup-choices mode */
@@ -678,7 +671,7 @@
#define OPT_SEL_YANK ((DISP_X11 && XTOOLKIT) || SYS_WINNT || SYS_OS2)
/* any mouse capability */
-#define OPT_MOUSE (OPT_SEL_YANK || OPT_XTERM || OPT_MS_MOUSE)
+#define OPT_MOUSE (OPT_SEL_YANK || OPT_XTERM)
/* menus */
#define OPT_MENUS (!SMALLER && DISP_X11 && (MOTIF_WIDGETS||ATHENA_WIDGETS))
@@ -966,8 +959,6 @@
#endif
/* only the raw pc screen driver has a memory-mapped "frame buffer" */
-#define FRAMEBUF DISP_IBMPC
-
#if SYS_OS2
/*
* The OS/2 toolkit defines identical typedefs for UCHAR, etc.;
Index: filters/lex-filt.l
Prereq: 1.41
--- vile-9.5c+/filters/lex-filt.l 2005-10-01 00:29:52.000000000 +0000
+++ vile-9.5d/filters/lex-filt.l 2005-11-29 22:51:01.000000000 +0000
@@ -1,8 +1,13 @@
%s RULES RULE1 RULEX RULER STATES ACTIONS ACTION1 ACTION2 ACTION3 CODE COMMENT
+%a 20000
+%n 10000
+%o 30000
+%p 25000
+
%{
/*
- * $Header: /usr/build/vile/vile/filters/RCS/lex-filt.l,v 1.41 2005/10/01 00:29:52 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/lex-filt.l,v 1.43 2005/11/29 22:51:01 tom Exp $
*
* Filter to add vile "attribution" sequences to selected bits of LEX program.
*/
@@ -63,7 +68,7 @@
RANGE1 ([^\n\r\]]|{CCLASS}|{ESCAPED})
RANGE ("["{RANGE0}?{RANGE1}*"]")
-LIMITED ([[:digit:]]+(,[[:digit:]]+)*)
+LIMITED ([[:digit:]]+([,][[:digit:]]+)*)
BRACED ("{"({IDENT}|{LIMITED}+)"}")
PATTERN0 ({ESCAPED}|{BRACED}|{QUOTED}|{RANGE}|{UNQUOTED0})
Index: main.c
Prereq: 1.545
--- vile-9.5c+/main.c 2005-11-23 23:03:36.000000000 +0000
+++ vile-9.5d/main.c 2005-11-30 01:24:33.000000000 +0000
@@ -22,7 +22,7 @@
*/
/*
- * $Header: /usr/build/vile/vile/RCS/main.c,v 1.545 2005/11/23 23:03:36 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/main.c,v 1.546 2005/11/30 01:24:33 tom Exp $
*/
#define realdef /* Make global definitions not external */
@@ -295,11 +295,11 @@
/* evaluate switches */
if (*param == '-') {
++param;
-#if DISP_IBMPC || DISP_BORLAND || SYS_VMS
+#if DISP_BORLAND || SYS_VMS
/* if it's a digit, it's probably a screen
resolution */
if (isDigit(*param)) {
-#if DISP_IBMPC || DISP_BORLAND
+#if DISP_BORLAND
current_res_name = param;
#else
if (strcmp(param, "132") == 0)
@@ -311,7 +311,7 @@
#endif
continue;
} else
-#endif /* DISP_IBMPC */
+#endif /* screen resolution stuff */
switch (*param) {
#if DISP_NTCONS
case 'c':
Index: makefile.djg
Prereq: 1.32
--- vile-9.5c+/makefile.djg 2003-09-17 00:14:01.000000000 +0000
+++ vile-9.5d/makefile.djg 2005-11-30 01:17:49.000000000 +0000
@@ -3,7 +3,7 @@
#
# T.DANG (dang@cogit.ign.fr)
#
-# $Header: /usr/build/vile/vile/RCS/makefile.djg,v 1.32 2003/09/17 00:14:01 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/makefile.djg,v 1.34 2005/11/30 01:17:49 tom Exp $
#
#
@@ -16,15 +16,11 @@
#DEBUG =
OPTIM = -O2
-# Use these two lines for the IBM/PC display (not DPMI compatible).
-#CFLAGS= -Wall $(DEBUG) $(OPTIM) -DDISP_IBMPC -Dscrn_chosen
-#DISP_SRC = ibmpc.c
-
# DEBUG += -DOPT_TRACE
# TRACE_C = trace.c
# Use these two lines for the Borland/CONIO display (DPMI compatible).
-CFLAGS= -Wall $(DEBUG) $(OPTIM) -DDISP_BORLAND -Dscrn_chosen
+CFLAGS= -Wall -I. $(DEBUG) $(OPTIM) -DDISP_BORLAND -Dscrn_chosen
DISP_SRC = borland.c gppconio.c
# these are normal editable headers
@@ -64,21 +60,6 @@
cd ..
zip pcvile.zip \\djgpp\\bin\\go32-v2.exe
-# for my poor slow omnibook, i do incremental linking when working on
-# just a couple of modules...
-NOBJ = $(OBJ)
-NOBJ := $(filter-out ibmpc.o, $(NOBJ))
-NOBJ := $(filter-out filec.o, $(NOBJ))
-NOBJ := $(filter-out glob.o, $(NOBJ))
-XOBJ = ibmpc.o filec.o glob.o
-
-rvile.o: $(NOBJ)
- ld -r -o rvile.o $(NOBJ) -L/djgpp/lib -lpc -lc -lgcc
-
-ivile: $(XOBJ) rvile.o
- ld -o vile /djgpp/lib/crt0.o rvile.o $(XOBJ) -L/djgpp/lib -lpc -lc -lgcc
- coff2exe vile
-
nebind.h \
nefunc.h \
nename.h : cmdtbl mktbls.exe
Index: makefile.icc
Prereq: 1.14
--- vile-9.5c+/makefile.icc 2005-10-02 23:26:34.000000000 +0000
+++ vile-9.5d/makefile.icc 2005-11-29 20:28:16.000000000 +0000
@@ -1,6 +1,6 @@
#
# 'vile' and 'mktbls' makefile for IBM C Set ++ 2.x (OS/2)
-# $Header: /usr/build/vile/vile/RCS/makefile.icc,v 1.14 2005/10/02 23:26:34 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/makefile.icc,v 1.15 2005/11/29 20:28:16 tom Exp $
#
#
@@ -16,7 +16,7 @@
PROD_FLAGS = /O+
#
-CFLAGS = /Q /Wpro $(DEBUG_FLAGS) /Dscrn_chosen /DDISP_VIO=1
+CFLAGS = /Q /I . /Wpro $(DEBUG_FLAGS) /Dscrn_chosen /DDISP_VIO=1
# File extension for object files:
O = .obj
Index: makefile.in
Prereq: 1.196
--- vile-9.5c+/makefile.in 2005-11-23 12:28:27.000000000 +0000
+++ vile-9.5d/makefile.in 2005-11-30 01:17:59.000000000 +0000
@@ -20,7 +20,7 @@
#
# gnu autoconf support by kevin buettner, 5/94
#
-# $Header: /usr/build/vile/vile/RCS/makefile.in,v 1.196 2005/11/23 12:28:27 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/makefile.in,v 1.198 2005/11/30 01:17:59 tom Exp $
SHELL = /bin/sh
@@ -102,27 +102,21 @@
# All of the makefiles which should be preserved and distributed
UNIXMAKIN = makefile.in # for use with configure
VMSMAK = descrip.mms vmsbuild.com # on VMS
-TURBOMAK = makefile.tbc # on DOS or OS/2, TURBO C or Borland C
-WATMAK = makefile.wat # on DOS, using Watcom C/386
MSCMAK = # still waiting for this one # on DOS, using Microsoft C
DJGPPMAK = makefile.djg # on DOS, DJGCC v1.09
NTMAK = makefile.wnt # on Windows/NT
BCCNTMAK = makefile.blc # Borland C on Windows/NT
OS2MAK = makefile.icc # OS/2, (IBM C Set ++ 2.x)
-EMXMAK = makefile.emx config.emx # OS/2, (EMX with gcc)
MAKFILES = \
$(UNIXMAKIN) \
$(VMSMAK) \
- $(TURBOMAK) \
- $(WATMAK) \
$(DJGPPMAK) \
$(MSCMAK) \
$(BORMAK) \
$(NTMAK) \
$(BCCNTMAK) \
- $(OS2MAK) \
- $(EMXMAK)
+ $(OS2MAK)
ALLTOOLS = $(MAKFILES) mktbls.c cmdtbl modetbl \
configure config_h.in \
@@ -146,7 +140,6 @@
SCREENS = \
ansi.c \
borland.c \
- ibmpc.c \
ntconio.c \
ntwinio.c \
os2vio.c \
Index: makefile.wnt
Prereq: 1.85
--- vile-9.5c+/makefile.wnt 2005-03-11 00:53:06.000000000 +0000
+++ vile-9.5d/makefile.wnt 2005-11-24 18:50:25.000000000 +0000
@@ -1,7 +1,7 @@
#
# makefile for vile on WIN32 using Microsoft Visual C++
#
-# $Header: /usr/build/vile/vile/RCS/makefile.wnt,v 1.85 2005/03/11 00:53:06 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/makefile.wnt,v 1.86 2005/11/24 18:50:25 tom Exp $
#
#
!include <ntwin32.mak>
@@ -96,7 +96,7 @@
!endif
# options common to all configurations
-MY_CCOPT = $(MY_CCOPT) -DOPT_LOCALE
+MY_CCOPT = $(MY_CCOPT) -DOPT_LOCALE -I.
!IF "$(CFG)" == "vile" || "$(CFG)" == "vile-with-perl"
DISP_DEF = -DDISP_NTCONS
Index: patchlev.h
--- vile-9.5c+/patchlev.h 2005-11-15 21:41:13.000000000 +0000
+++ vile-9.5d/patchlev.h 2005-11-24 22:51:11.000000000 +0000
@@ -1,3 +1,3 @@
#define VILE_VERSION "9.5"
/* set to "" for no patches */
-#define VILE_PATCHLEVEL "c"
+#define VILE_PATCHLEVEL "d"
Index: proto.h
Prereq: 1.559
--- vile-9.5c+/proto.h 2005-11-23 13:18:25.000000000 +0000
+++ vile-9.5d/proto.h 2005-11-30 02:17:38.000000000 +0000
@@ -4,7 +4,7 @@
*
* Created: Thu May 14 15:44:40 1992
*
- * $Header: /usr/build/vile/vile/RCS/proto.h,v 1.559 2005/11/23 13:18:25 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/proto.h,v 1.561 2005/11/30 02:17:38 tom Exp $
*
*/
@@ -560,12 +560,6 @@
#define hst_reset()
#endif
-/* ibmpc.c */
-#if SYS_MSDOS || SYS_OS2 || SYS_WINNT
-extern VIDEO * scread (VIDEO *vp, int row);
-extern void scwrite (int row, int col, int nchar, const char *outstr, VIDEO_ATTR *attrstr, int forg, int bacg);
-#endif
-
/* input.c */
extern char *add_backslashes2(char *text, char *find);
extern char *add_backslashes(char *text);
@@ -963,10 +957,6 @@
# else
extern void dos_crit_handler (void);
# endif
-# if OPT_MS_MOUSE
- extern int ms_exists (void);
- extern void ms_processing (void);
-# endif
#endif
/* regexp.c */
Index: revlist
--- vile-9.5c+/revlist 2005-11-24 01:47:20.000000000 +0000
+++ vile-9.5d/revlist 2005-11-30 02:19:32.000000000 +0000
@@ -1,6 +1,6 @@
-revlist for vile, version v9_5c
+revlist for vile, version v9_5d
--------------------------------------------------------------------------------
-CHANGES 1.877
+CHANGES 1.883
CHANGES.R3 1.1
CHANGES.R4 1.1
CHANGES.R5 1.1
@@ -11,7 +11,7 @@
INSTALL 1.6
MANIFEST none
README 1.93
-README.PC 1.32
+README.PC 1.33
README.VMS 1.5
aclocal.m4 1.158
ansi.c 1.46
@@ -19,15 +19,14 @@
api.h 1.13
basic.c 1.123
bind.c 1.290
-borland.c 1.33
+borland.c 1.34
btree.c 1.21
btree.h 1.4
buffer.c 1.296
-buglist 1.402
+buglist 1.403
builtflt.c 1.47
chgdfunc.h 1.18
cmdtbl 1.238
-config.emx 1.2
config.guess 1.2
config.sub 1.2
config_h.in 1.2
@@ -37,11 +36,11 @@
curses.c 1.25
descrip.mms 1.46
dirstuff.h 1.30
-display.c 1.409
+display.c 1.410
djhandl.c 1.6
dumbterm.c 1.19
-edef.h 1.320
-estruct.h 1.589
+edef.h 1.322
+estruct.h 1.591
eval.c 1.348
exec.c 1.281
externs.c 1.10
@@ -61,15 +60,13 @@
itbuff.c 1.25
lckfiles.c 1.11
line.c 1.170
-main.c 1.545
+main.c 1.546
makefile.blc 1.18
-makefile.djg 1.32
+makefile.djg 1.34
makefile.emx 1.5
-makefile.icc 1.14
-makefile.in 1.196
-makefile.tbc 1.24
-makefile.wat 1.26
-makefile.wnt 1.85
+makefile.icc 1.15
+makefile.in 1.198
+makefile.wnt 1.86
map.c 1.108
menu.c 1.48
mkdirs.sh 1.6
@@ -86,39 +83,39 @@
os2keys.h 1.2
os2pipe.c 1.5
os2vio.c 1.33
-patchlev.h 1.339
+patchlev.h 1.340
path.c 1.150
perl.xs 1.104
plugin.c 1.1
plugin.h 1.1
-proto.h 1.559
+proto.h 1.561
pscreen.h 1.2
ptypemap 1.7
random.c 1.287
regexp.c 1.116
region.c 1.132
-revlist v9_5c
+revlist v9_5d
search.c 1.137
select.c 1.158
sinstall.sh 1.1
-spawn.c 1.187
+spawn.c 1.188
statevar.c 1.94
tags.c 1.128
tbuff.c 1.63
tcap.c 1.168
tcap.h 1.10
-termio.c 1.201
+termio.c 1.203
trace.c 1.53
trace.h 1.24
ucrypt.c 1.15
undo.c 1.88
-version.c 1.57
-vile-9.5.spec 1.3
+version.c 1.58
+vile-9.5.spec 1.5
vile.1 1.30
vile.hlp 1.603
vile.wmconfig 1.1
vl_alloc.h 1.1
-vl_ctype.h 1.2
+vl_ctype.h 1.4
vl_regex.h 1.3
vms2unix.c 1.42
vmsbuild.com 1.44
@@ -227,7 +224,7 @@
filters/key-filt.c 1.19
filters/latex.key 1.2
filters/latexflt.l 1.41
-filters/lex-filt.l 1.41
+filters/lex-filt.l 1.43
filters/lex.key 1.8
filters/lisp.key 1.2
filters/lispfilt.l 1.11
Index: spawn.c
Prereq: 1.187
--- vile-9.5c+/spawn.c 2005-11-23 17:15:24.000000000 +0000
+++ vile-9.5d/spawn.c 2005-11-30 01:24:52.000000000 +0000
@@ -1,7 +1,7 @@
/* Spawn: various DOS access commands
* for MicroEMACS
*
- * $Header: /usr/build/vile/vile/RCS/spawn.c,v 1.187 2005/11/23 17:15:24 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/spawn.c,v 1.188 2005/11/30 01:24:52 tom Exp $
*
*/
@@ -370,9 +370,6 @@
static int
spawn1(int rerun, int pressret)
{
-#if DISP_IBMPC
- int closed;
-#endif
#if COMMON_SH_PROMPT
int s;
char line[NLINE]; /* command line send to shell */
@@ -425,14 +422,6 @@
kbd_erase_to_end(0);
kbd_flush();
term.kclose();
-#if DISP_IBMPC
- /* If we don't reset to 80x25, parts of the shell-output will go
- * astray.
- */
- closed = term.cols != 80 || term.rows != 25;
- if (closed)
- term.close();
-#endif
#if SYS_WINNT
# if DISP_NTWIN
w32_system_winvile(line, &pressret);
@@ -450,13 +439,6 @@
pressreturn();
}
#endif
-#if DISP_IBMPC
- /* Reopen the display _after_ the prompt, to keep the shell-output
- * in the same type of screen as the prompt.
- */
- if (closed)
- term.open();
-#endif
#if DISP_NTCONS
ntcons_reopen();
#endif
Index: termio.c
Prereq: 1.201
--- vile-9.5c+/termio.c 2005-11-23 12:13:03.000000000 +0000
+++ vile-9.5d/termio.c 2005-11-30 01:29:42.000000000 +0000
@@ -3,7 +3,7 @@
* characters, and write characters in a barely buffered fashion on the display.
* All operating systems.
*
- * $Header: /usr/build/vile/vile/RCS/termio.c,v 1.201 2005/11/23 12:13:03 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/termio.c,v 1.203 2005/11/30 01:29:42 tom Exp $
*
*/
@@ -1149,9 +1149,6 @@
OUTC_RET putch(c);
#endif
#if SYS_MSDOS
-# if DISP_IBMPC
- /* unneeded currently -- output is memory-mapped */
-# endif
# if DISP_ANSI
OUTC_RET putchar(c);
# endif
@@ -1232,15 +1229,6 @@
* If we've got a mouse, poll waiting for mouse movement and mouse
* clicks until we've got a character to return.
*/
-# if OPT_MS_MOUSE
- if (ms_exists()) {
- for_ever {
- if (tttypahead())
- break;
- ms_processing();
- }
- }
-# endif /* OPT_MS_MOUSE */
#if CC_MSC || CC_TURBO || SYS_OS2
return getch();
#endif
Index: version.c
Prereq: 1.57
--- vile-9.5c+/version.c 2005-03-10 23:58:52.000000000 +0000
+++ vile-9.5d/version.c 2005-11-30 01:25:16.000000000 +0000
@@ -1,7 +1,7 @@
/*
* version & usage-messages for vile
*
- * $Header: /usr/build/vile/vile/RCS/version.c,v 1.57 2005/03/10 23:58:52 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/version.c,v 1.58 2005/11/30 01:25:16 tom Exp $
*
*/
@@ -60,7 +60,7 @@
"-leftbar Put scrollbar(s) on left",
"-rightbar Put scrollbar(s) on right (default)",
#endif
-#if DISP_IBMPC || DISP_BORLAND
+#if DISP_BORLAND
"-2 25-line mode",
"-4 43-line mode",
"-5 50-line mode",
Index: vile-9.5.spec
Prereq: 1.3
--- vile-9.5c+/vile-9.5.spec 2005-09-22 22:09:45.000000000 +0000
+++ vile-9.5d/vile-9.5.spec 2005-11-24 22:52:46.000000000 +0000
@@ -1,7 +1,7 @@
Summary: VILE VI Like Emacs editor
-# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.3 2005/09/22 22:09:45 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.5 2005/11/24 22:52:46 tom Exp $
Name: vile
-Version: 9.5b
+Version: 9.5d
# each patch should update the version
Release: 1
Copyright: GPL
@@ -10,6 +10,8 @@
Source0: vile-9.5.tgz
Patch1: vile-9.5a.patch.gz
Patch2: vile-9.5b.patch.gz
+Patch3: vile-9.5c.patch.gz
+Patch4: vile-9.5d.patch.gz
# each patch should add itself to this list
Packager: Thomas Dickey <dickey@invisible-island.net>
BuildRoot: %{_tmppath}/%{name}-root
@@ -24,6 +26,8 @@
%setup -q -n vile-9.5
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
# each patch should add itself to this list
%build
@@ -76,6 +80,12 @@
%changelog
# each patch should add its ChangeLog entries here
+* Thu Nov 24 2005 Thomas Dickey
+- added patch for 9.5d
+
+* Thu Nov 24 2005 Thomas Dickey
+- added patch for 9.5c
+
* Thu Sep 22 2005 Thomas Dickey
- added patch for 9.5b
Index: vl_ctype.h
Prereq: 1.2
--- vile-9.5c+/vl_ctype.h 2005-11-20 19:57:02.000000000 +0000
+++ vile-9.5d/vl_ctype.h 2005-11-30 00:31:04.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * $Header: /usr/build/vile/vile/RCS/vl_ctype.h,v 1.2 2005/11/20 19:57:02 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/vl_ctype.h,v 1.4 2005/11/30 00:31:04 tom Exp $
*
* Character-type tests, like <ctype.h> for vile (vi-like-emacs).
*
@@ -42,10 +42,14 @@
#endif
#ifndef OPT_WIDE_CTYPES
-#define OPT_WIDE_CTYPES !SMALLER /* extra char-types tests */
+#define OPT_WIDE_CTYPES !SMALLER /* extra char-types tests */
#endif
-#define UCHAR unsigned char
+#if defined(__OS2__)
+# include <os2def.h>
+#elif !defined(WIN32)
+# define UCHAR unsigned char
+#endif
#define N_chars 256 /* must be a power-of-2 */
