Subversion Repositories planix.SVN

Compare Revisions

Ignore whitespace Rev 115 → Rev 116

/ports/trunk/editors/rvi/Makefile
36,6 → 36,7
#OPTIONS += -DISO
LDFLAGS=
TERMLIB = -ltermcap
#-ltermcap
 
# That's it.
 
/ports/trunk/editors/rvi/ex.h
78,6 → 78,21
 
extern int errno;
 
 
 
/* defined in ex_put.c */
void flush(void);
void noonl(void);
void putNFL(void);
 
 
 
 
 
 
 
 
 
#ifdef NCURSES
/*
* Some of the symbols collide.
87,7 → 102,7
#define filter fil_ter
#define getch get_ch
#define longname long_name
#define ttytype tty_type
//#define ttytype tty_type
#define winch win_ch
#endif
 
312,7 → 327,7
var char altfile[FNSIZE]; /* Alternate file name */
extern char direct[ONMSZ]; /* Temp file goes here */
extern char shell[ONMSZ]; /* Copied to be settable */
extern char ttytype[ONMSZ]; /* A long and pretty name */
extern char ex_ttytype[ONMSZ]; /* A long and pretty name */
var char uxb[UXBSIZE + 2]; /* Last !command for !! */
 
/*
447,3 → 462,7
# define ignore(a) a
# define ignorf(a) a
#endif
 
 
 
 
/ports/trunk/editors/rvi/ex_addr.c
120,7 → 120,6
*/
setnoaddr()
{
 
if (addr2 != 0)
error("No address allowed@on this command");
}
/ports/trunk/editors/rvi/ex_data.c
38,7 → 38,7
't', 'a', 'g', 's', ' ',
'/', 'u', 's', 'r', '/', 'l', 'i', 'b', '/', 't', 'a', 'g', 's'
};
char ttytype[ONMSZ] =
char ex_ttytype[ONMSZ] =
{ 'd', 'u', 'm', 'b' };
 
short COLUMNS = 80;
78,10 → 78,10
"tabstop", "ts", NUMERIC, TABS, TABS, 0,
"taglength", "tl", NUMERIC, 0, 0, 0,
"tags", "tag", STRING, 0, 0, tags,
"term", 0, OTERM, 0, 0, ttytype,
"term", 0, OTERM, 0, 0, ex_ttytype,
"terse", 0, ONOFF, 0, 0, 0,
"timeout", "to", ONOFF, 1, 1, 0,
"ttytype", "tty", OTERM, 0, 0, ttytype,
"ttytype", "tty", OTERM, 0, 0, ex_ttytype,
"warn", 0, ONOFF, 1, 1, 0,
"window", "wi", NUMERIC, 23, 23, 0,
"wrapscan", "ws", ONOFF, 1, 1, 0,
/ports/trunk/editors/rvi/ex_put.c
232,7 → 232,8
}
}
 
flush()
void
flush(void)
{
 
flush1();
862,9 → 863,9
/*
* Newline + flush.
*/
putNFL()
void
putNFL(void)
{
 
putnl();
flush();
}
1177,8 → 1178,7
/*
* Print newline, or blank if in open/visual
*/
noonl()
void noonl(void)
{
 
putchar(Outchar != termchar ? ' ' : '\n');
}
/ports/trunk/editors/rvi/ex_set.c
4,10 → 4,9
* specifies the terms and conditions for redistribution.
*/
 
#if !defined(lint) && defined(DOSCCS)
static char *sccsid = "@(#)ex_set.c 7.4 (Berkeley) 6/7/85";
#endif
#include <stdio.h>
 
 
#include "ex.h"
#include "ex_temp.h"
#include "ex_tty.h"
17,6 → 16,11
*/
char optname[ONMSZ];
 
static void prall(void);
static void propt(struct option * op);
static void propts(void);
 
 
set()
{
register char *cp;
41,6 → 45,7
*cp = 0;
cp = optname;
if (eq("all", cp)) {
 
if (inopen)
pofix();
prall();
157,11 → 162,11
 
setend()
{
 
return (iswhite(peekchar()) || endcmd(peekchar()));
}
 
prall()
static void
prall(void)
{
register int incr = (NOPTS + 2) / 3;
register int rows = incr;
179,7 → 184,8
}
}
 
propts()
static void
propts(void)
{
register struct option *op;
 
189,7 → 195,8
#else
if (op == &options[TTYTYPE])
#endif
continue;
continue;
switch (op->otype) {
 
case ONOFF:
210,11 → 217,11
flush();
}
 
propt(op)
register struct option *op;
static void
propt(struct option * op)
{
register char *name;
 
name = op->oname;
 
switch (op->otype) {
/ports/trunk/editors/rvi/ex_tty.c
69,9 → 69,9
type = "xx";
unknown = 0;
putpad(TE);
#ifdef NCURSES
//#ifdef NCURSES
snprintf(ltcbuf, TCBUFSIZE, "%s:", type);
#endif
//#endif
if (tgetent(ltcbuf, type) != 1) {
unknown++;
CP(ltcbuf, "xx|dumb:");
140,7 → 140,7
costRP = cost(tgoto(RIGHT_PARM, 10, 10));
PC = xPC ? xPC[0] : 0;
aoftspace = tspace;
CP(ttytype, longname(ltcbuf, type));
CP(ex_ttytype, longname(ltcbuf, type));
/* proper strings to change tty type */
termreset();
gettmode();