Skip to content

Commit 52576a5

Browse files
committed
Trim additional legacy documentation; formatting nits
1 parent 90ed166 commit 52576a5

35 files changed

+116
-1362
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,6 @@ bin/*
5959
# Patch
6060
*.rej
6161
*.orig
62+
63+
# Junk
64+
typescript

ChangeLog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ OpenVi 7.0.2 -> OpenVi 7.0.3 (Unreleased): Wed Jan 26 04:51:48 2022
33
+ General GNUmakefile, portability, and code readability improvements
44
+ Relicense new contributions under the same 3-clause BSD license
55
used by the overall project and update LICENSE file text
6-
+ Remove two unused wrapper headers from the source tree
6+
+ Remove unused headers and legacy documentation from the source tree
77
+ Add standalone "strip" target to GNUmakefile; strips uninstalled binary
88
+ Set visible tab character to '~' and expose option in GNUmakefile
99
+ Installed binaries are now prefixed with 'o' (e.g. 'ovi') by default
1010
+ Explicitly invoke the POSIX-compliant version of the awk utility
1111
+ Clarify (and simplify) GNUmakefile and build configuration
12-
+ Update ChangeLog for consistency, fix spelling and typos
12+
+ Update ChangeLog and docs for consistency, fix spelling and other typos
1313
+ Update LICENSE text
1414

1515
OpenVi 7.0.1 -> OpenVi 7.0.2: Tue Jan 25 13:44:48 2022

cl/cl_funcs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ cl_attr(SCR *sp, scr_attr_t attribute, int on)
9999
*
100100
* Note that the :command input is a true vi input mode, e.g., input
101101
* maps and abbreviations are being done. So, we need to be able to
102-
* switch back into the vi screen mode, without flashing the screen.
102+
* switch back into the vi screen mode, without flashing the screen.
103103
*
104104
* To make matters worse, the curses initscr() and endwin() calls will
105105
* do this automatically -- so, this attribute isn't as controlled by
@@ -293,7 +293,7 @@ cl_deleteln(SCR *sp)
293293
return (deleteln() == ERR);
294294
}
295295

296-
/*
296+
/*
297297
* cl_ex_adjust --
298298
* Adjust the screen for ex. This routine is purely for standalone
299299
* ex programs. All special purpose, all special case.
@@ -520,7 +520,7 @@ cl_suspend(SCR *sp, int *allowedp)
520520
*
521521
* Setting allowedp to 0 will cause the editor to reject the command.
522522
*/
523-
if (F_ISSET(sp, SC_EX)) {
523+
if (F_ISSET(sp, SC_EX)) {
524524
/* Save the terminal settings, and restore the original ones. */
525525
if (F_ISSET(clp, CL_STDIN_TTY)) {
526526
(void)tcgetattr(STDIN_FILENO, &t);
@@ -610,7 +610,7 @@ cl_suspend(SCR *sp, int *allowedp)
610610
/*
611611
* cl_usage --
612612
* Print out the curses usage messages.
613-
*
613+
*
614614
* PUBLIC: void cl_usage(void);
615615
*/
616616
void

cl/cl_read.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ err: if (errno == EINTR)
268268
return (rval);
269269
}
270270

271-
/*
271+
/*
272272
* cl_resize --
273273
* Reset the options for a resize event.
274274
*/

cl/engine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ print(struct match *m, char *caption, states st, int ch, FILE *d)
967967
(void)fprintf(d, "\n");
968968
}
969969

970-
/*
970+
/*
971971
- at - print current situation
972972
*/
973973
static void

cl/typescript

Lines changed: 0 additions & 128 deletions
This file was deleted.

common/exf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ file_init(SCR *sp, FREF *frp, char *rcv_name, int flags)
278278
* be read. This isn't useful for single files from a command
279279
* line, but it's quite useful for "vi *.c", since you can skip
280280
* past files that you can't read.
281-
*/
281+
*/
282282
open_err = 1;
283283
goto oerr;
284284
}

common/key.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,10 +568,10 @@ append: if (v_event_append(sp, argp))
568568
*/
569569
if (LF_ISSET(EC_INTERRUPT | EC_TIMEOUT))
570570
return (0);
571-
571+
572572
newmap: evp = &gp->i_event[gp->i_next];
573573

574-
/*
574+
/*
575575
* If the next event in the queue isn't a character event, return
576576
* it, we're done.
577577
*/

common/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ editor(GS *gp, int argc, char *argv[])
9595

9696
/* Set initial screen type and mode based on the program name. */
9797
readonly = 0;
98-
if (!strcmp(bsd_getprogname(), "ex") ||
98+
if (!strcmp(bsd_getprogname(), "ex") ||
9999
!strcmp(bsd_getprogname(), "nex") ||
100100
!strcmp(bsd_getprogname(), "oex") ||
101101
!strcmp(bsd_getprogname(), "obex") ||
@@ -422,7 +422,7 @@ editor(GS *gp, int argc, char *argv[])
422422
* we're not in raw mode. We can't switch to raw mode because the
423423
* vi initialization will switch to xterm's alternate screen, causing
424424
* us to lose the messages we're pausing to make sure the user read.
425-
* So, wait for a complete line.
425+
* So, wait for a complete line.
426426
*/
427427
if (F_ISSET(sp, SC_SCR_EX)) {
428428
p = msg_cmsg(sp, CMSG_CONT_R, &len);

common/options.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ opts_save(SCR *sp, FILE *fp)
960960
return (0);
961961
}
962962

963-
/*
963+
/*
964964
* opts_search --
965965
* Search for an option.
966966
*
@@ -1005,7 +1005,7 @@ opts_search(char *name)
10051005
return (found);
10061006
}
10071007

1008-
/*
1008+
/*
10091009
* opts_nomatch --
10101010
* Standard nomatch error message for options.
10111011
*

0 commit comments

Comments
 (0)