Power-Programmierung

home *** CD-ROM | disk | FTP | other *** search

/ Power-Programmierung / CD2.mdf / c / library / os2 / beav / patches.2 < prev next >

Wrap

Text File | 1992-10-03 | 35.7 KB | 1,554 lines

diff -c2 -bBw orig/buffer.c new/buffer.c *** orig/buffer.c Tue Aug 11 09:38:12 1992 --- new/buffer.c Sat Oct 03 18:17:22 1992 *************** *** 8,18 **** bool killablebufs (); bool _yankbuffer (); ! char next_buf (); bool bclear (); bool addline (); ! char makelist (); bool popblist (); ! char listbuffers (); ! char _killbuffer (); bool _usebuffer (); --- 8,18 ---- bool killablebufs (); bool _yankbuffer (); ! bool next_buf (); bool bclear (); bool addline (); ! bool makelist (); bool popblist (); ! bool listbuffers (); ! bool _killbuffer (); bool _usebuffer (); *************** *** 52,56 **** * functions (like in file.c) */ ! char usebuffer () { --- 52,56 ---- * functions (like in file.c) */ ! bool usebuffer () { *************** *** 66,70 **** /* use buffer, split window first */ ! char use_buffer () { --- 66,70 ---- /* use buffer, split window first */ ! bool use_buffer () { *************** *** 159,163 **** * line and the buffer header. Bound to "C-X K". */ ! char killbuffer () { --- 159,163 ---- * line and the buffer header. Bound to "C-X K". */ ! bool killbuffer () { *************** *** 172,176 **** } ! char _killbuffer (bufn) char *bufn; --- 172,176 ---- } ! bool _killbuffer (bufn) char *bufn; *************** *** 262,266 **** * "C-X C-B". */ ! char listbuffers () { --- 262,266 ---- * "C-X C-B". */ ! bool listbuffers () { *************** *** 276,280 **** * Bound to "Meta C-W". */ ! char showsavebuf () { --- 276,280 ---- * Bound to "Meta C-W". */ ! bool showsavebuf () { *************** *** 363,367 **** * is an error (if there is no memory). */ ! char makelist () { --- 363,367 ---- * is an error (if there is no memory). */ ! bool makelist () { *************** *** 608,612 **** * (skips buffers saved by save-region) */ ! char next_buf () { --- 608,612 ---- * (skips buffers saved by save-region) */ ! bool next_buf () { *************** *** 632,636 **** * (does NOT skip buffers saved by save-region) */ ! char prev_buf () { --- 632,636 ---- * (does NOT skip buffers saved by save-region) */ ! bool prev_buf () { *************** *** 656,660 **** /* yank a buffer into current buffer */ ! char yank_buffer () { --- 656,660 ---- /* yank a buffer into current buffer */ ! bool yank_buffer () { *************** *** 855,859 **** * Toggle the buffer size lock bit. */ ! char bufsizlock () { --- 855,859 ---- * Toggle the buffer size lock bit. */ ! bool bufsizlock () { *************** *** 898,902 **** b_append_c (buf_p, ch) BUFFER *buf_p; ! D8 ch; { LINE *lp; --- 898,902 ---- b_append_c (buf_p, ch) BUFFER *buf_p; ! int ch; { LINE *lp; *************** *** 915,919 **** lp->l_file_offset = lp->l_bp->l_file_offset + lp->l_bp->l_used; } ! lp->l_text[lp->l_used++] = ch; return (TRUE); --- 915,919 ---- lp->l_file_offset = lp->l_bp->l_file_offset + lp->l_bp->l_used; } ! lp->l_text[lp->l_used++] = (D8) ch; return (TRUE); diff -c2 -bBw orig/def.h new/def.h *** orig/def.h Tue Aug 11 09:38:18 1992 --- new/def.h Sat Oct 03 20:53:14 1992 *************** *** 48,55 **** #define A32 ulong /* this is a 32 bit address into the buffer */ ! #define bool char /* used for boolean values */ ! #define bits char /* used for boolean bit flags */ ! /* this define is reserved for the byte location in the a LINE structure */ #define LPOS uint /* this is a 32 bit address into the buffer */ --- 45,52 ---- #define A32 ulong /* this is a 32 bit address into the buffer */ ! #define bool int /* used for boolean values */ ! #define bits int /* used for boolean bit flags */ ! /* this define is reserved for the byte location in a LINE structure */ #define LPOS uint /* this is a 32 bit address into the buffer */ diff -c2 -bBw orig/display.c new/display.c *** orig/display.c Tue Aug 11 09:38:12 1992 --- new/display.c Sat Oct 03 15:07:11 1992 *************** *** 1076,1083 **** register WINDOW *wp; { ! register char *cp, size, u_posn, *s; uchar mode; register char c; ! register int n; register BUFFER *bp; register A32 posn; --- 1082,1089 ---- register WINDOW *wp; { ! register char *cp, size, *s; uchar mode; register char c; ! register int n, u_posn; register BUFFER *bp; register A32 posn; diff -c2 -bBw orig/ebcdic.c new/ebcdic.c *** orig/ebcdic.c Tue Aug 11 09:38:12 1992 --- new/ebcdic.c Sat Oct 03 17:47:13 1992 *************** *** 48,52 **** to_ebcdic (ch) ! char ch; { int cnt; --- 48,52 ---- to_ebcdic (ch) ! int ch; { int cnt; diff -c2 -bBw orig/echo.c new/echo.c *** orig/echo.c Tue Aug 11 09:38:12 1992 --- new/echo.c Sat Oct 03 18:19:04 1992 *************** *** 9,14 **** void eerase (); ! char ereply (); ! char eread (); void eformat (); void eputi (); --- 9,14 ---- void eerase (); ! bool ereply (); ! bool eread (); void eformat (); void eputi (); *************** *** 41,45 **** * services are available. */ ! char eyesno (sp) char *sp; --- 41,45 ---- * services are available. */ ! bool eyesno (sp) char *sp; *************** *** 46,50 **** { ! register char s; char buf[NCOL]; --- 46,50 ---- { ! register bool s; char buf[NCOL]; *************** *** 76,80 **** */ /* VARARGS3 */ ! char ereply (fp, buf, nbuf, arg) char *fp; --- 76,80 ---- */ /* VARARGS3 */ ! bool ereply (fp, buf, nbuf, arg) char *fp; *************** *** 95,99 **** * the carriage return as CR). */ ! char eread (fp, buf, nbuf, flag, ap) char *fp; --- 95,99 ---- * the carriage return as CR). */ ! bool eread (fp, buf, nbuf, flag, ap) char *fp; diff -c2 -bBw orig/extend.c new/extend.c *** orig/extend.c Tue Aug 11 09:38:12 1992 --- new/extend.c Sat Oct 03 18:23:16 1992 *************** *** 96,100 **** * Print an error if there is anything wrong. */ ! char extend (f, n, k) int f, n, k; --- 96,100 ---- * Print an error if there is anything wrong. */ ! bool extend (f, n, k) int f, n, k; *************** *** 102,106 **** register SYMBOL *sp; ! register char s; char xname[NXNAME]; --- 102,106 ---- register SYMBOL *sp; ! register bool s; char xname[NXNAME]; *************** *** 205,209 **** * "ins-self" are only displayed if there is an argument. */ ! char wallchart (f, n, k) int f, n, k; --- 205,209 ---- * "ins-self" are only displayed if there is an argument. */ ! bool wallchart (f, n, k) int f, n, k; *************** *** 210,214 **** { ! register char s; register int key, i, j; register SYMBOL *sp; --- 210,214 ---- { ! register bool s; register int key, i, j; register SYMBOL *sp; *************** *** 507,511 **** * (uses above routine, obviously) */ ! char load_extend () { --- 507,511 ---- * (uses above routine, obviously) */ ! bool load_extend () { *************** *** 512,516 **** #ifdef CUSTOMIZE ! register char s; char fname[NFILEN]; --- 512,516 ---- #ifdef CUSTOMIZE ! register bool s; char fname[NFILEN]; diff -c2 -bBw orig/file.c new/file.c *** orig/file.c Tue Aug 11 09:38:12 1992 --- new/file.c Sat Oct 03 18:26:17 1992 *************** *** 7,12 **** #include "def.h" ! char load_file (); ! char readin (); void makename (); bool writeout (); --- 7,12 ---- #include "def.h" ! bool load_file (); ! bool readin (); void makename (); bool writeout (); *************** *** 46,53 **** * "read a file into the current buffer" code. */ ! char fileread () { ! register char s; char fname[NFILEN]; A32 start, end; --- 47,54 ---- * "read a file into the current buffer" code. */ ! bool fileread () { ! register bool s; char fname[NFILEN]; A32 start, end; *************** *** 65,72 **** /* insert file into current buffer - use readin, and yank */ ! char fileinsert () { ! register char s; char bname[NBUFN], fname[NFILEN]; A32 start, end; --- 66,73 ---- /* insert file into current buffer - use readin, and yank */ ! bool fileinsert () { ! register bool s; char bname[NBUFN], fname[NFILEN]; A32 start, end; *************** *** 124,128 **** * file-vist with auto window split, and readonly (view-file) (jam) */ ! char file_visit (f, n, k) int f, n, k; --- 125,129 ---- * file-vist with auto window split, and readonly (view-file) (jam) */ ! bool file_visit (f, n, k) int f, n, k; *************** *** 129,133 **** { char fname[NFILEN]; ! char s; A32 start, end; if ((s = ereply (MSG_visit, fname, NFILEN, NULL)) != TRUE) --- 130,134 ---- { char fname[NFILEN]; ! bool s; A32 start, end; if ((s = ereply (MSG_visit, fname, NFILEN, NULL)) != TRUE) *************** *** 142,150 **** /* like filevisit, only read only */ ! char viewfile () { char fname[NFILEN]; ! char s; A32 start, end; --- 143,151 ---- /* like filevisit, only read only */ ! bool viewfile () { char fname[NFILEN]; ! bool s; A32 start, end; *************** *** 162,170 **** } ! char filevisit () { char fname[NFILEN]; ! char s; A32 start, end; --- 163,171 ---- } ! bool filevisit () { char fname[NFILEN]; ! bool s; A32 start, end; *************** *** 177,181 **** } ! char load_file (fname, start, end) /* jam */ char *fname; --- 178,182 ---- } ! bool load_file (fname, start, end) /* jam */ char *fname; *************** *** 186,190 **** register LINE *lp; register int i; ! char s; char bname[NBUFN]; extern int initial_load; /* jam */ --- 187,191 ---- register LINE *lp; register int i; ! bool s; char bname[NBUFN]; extern int initial_load; /* jam */ *************** *** 303,307 **** * (lines read, error message) out as well. */ ! char readin (fname, start, end) char fname[]; --- 304,308 ---- * (lines read, error message) out as well. */ ! bool readin (fname, start, end) char fname[]; *************** *** 312,316 **** register WINDOW *wp; register BUFFER *bp; ! register char s, m; long byte_cnt; LPOS req_chars; --- 313,317 ---- register WINDOW *wp; register BUFFER *bp; ! register bool s, m; long byte_cnt; LPOS req_chars; *************** *** 492,500 **** * with ITS EMACS. */ ! char filewrite () { register WINDOW *wp; ! register char s; char fname[NFILEN]; A32 start, end; --- 493,501 ---- * with ITS EMACS. */ ! bool filewrite () { register WINDOW *wp; ! register bool s; char fname[NFILEN]; A32 start, end; *************** *** 532,540 **** * then a backup copy of the file is made. */ ! char filesave () { register WINDOW *wp; ! register char s; struct stat st; --- 533,541 ---- * then a backup copy of the file is made. */ ! bool filesave () { register WINDOW *wp; ! register bool s; struct stat st; *************** *** 597,601 **** char *fn; A32 start, end; ! ushort mode; { register int s, num_chars; --- 598,602 ---- char *fn; A32 start, end; ! int mode; { register int s, num_chars; *************** *** 696,704 **** * prompt if you wish. */ ! char filename () { register WINDOW *wp; ! register char s; char fname[NFILEN]; A32 start, end; --- 697,705 ---- * prompt if you wish. */ ! bool filename () { register WINDOW *wp; ! register bool s; char fname[NFILEN]; A32 start, end; diff -c2 -bBw orig/fileio.c new/fileio.c *** orig/fileio.c Tue Aug 11 09:38:12 1992 --- new/fileio.c Sat Oct 03 21:05:08 1992 *************** *** 133,137 **** * Should look at the status. */ ! char ffclose () { --- 131,135 ---- * Should look at the status. */ ! bool ffclose () { *************** *** 154,158 **** * Return the status. */ ! char ffputline (buf, nbuf) register char buf[]; --- 152,156 ---- * Return the status. */ ! bool ffputline (buf, nbuf) register char buf[]; *************** *** 189,193 **** * the first byte in the buffer is the length in bytes. */ ! char ffgetline (buf, nbuf, rbuf) register char *buf; --- 187,191 ---- * the first byte in the buffer is the length in bytes. */ ! bool ffgetline (buf, nbuf, rbuf) register char *buf; diff -c2 -bBw orig/line.c new/line.c *** orig/line.c Tue Aug 11 09:38:13 1992 --- new/line.c Sat Oct 03 18:07:04 1992 *************** *** 232,237 **** bool linsert (n, c) ! uchar c; ! int n; { register D8 *cp1; --- 232,236 ---- bool linsert (n, c) ! int n, c; { register D8 *cp1; *************** *** 261,265 **** return (FALSE); for (i = 0; i < n; ++i) /* Add the characters */ ! lp2->l_text[i] = c; lp2->l_used = n; curwp->w_dotp = lp2; --- 260,264 ---- return (FALSE); for (i = 0; i < n; ++i) /* Add the characters */ ! lp2->l_text[i] = (uchar) c; lp2->l_used = n; curwp->w_dotp = lp2; *************** *** 274,278 **** if ((lp2 = l_break_in_two (lp1, doto, (LPOS) n + NBLOCK)) == NULL) return (FALSE); ! lp1->l_text[doto] = c; lp1->l_used++; curwp->w_doto++; --- 273,277 ---- if ((lp2 = l_break_in_two (lp1, doto, (LPOS) n + NBLOCK)) == NULL) return (FALSE); ! lp1->l_text[doto] = (uchar) c; lp1->l_used++; curwp->w_doto++; *************** *** 295,299 **** *--cp2 = *--cp1; for (i = 0; i < n; ++i) /* Add the characters */ ! lp2->l_text[doto + i] = c; move_ptr (curwp, (A32) n, TRUE, TRUE, TRUE); } --- 294,298 ---- *--cp2 = *--cp1; for (i = 0; i < n; ++i) /* Add the characters */ ! lp2->l_text[doto + i] = (uchar) c; move_ptr (curwp, (A32) n, TRUE, TRUE, TRUE); } diff -c2 -bBw orig/main.c new/main.c *** orig/main.c Tue Aug 11 09:38:13 1992 --- new/main.c Sat Oct 03 20:45:14 1992 *************** *** 40,46 **** bool execute (); void edinit (); ! char flush_all (); ! char quit (); ! char ctrlg (); void _lowercase (); --- 40,46 ---- bool execute (); void edinit (); ! bool flush_all (); ! bool quit (); ! bool ctrlg (); void _lowercase (); *************** *** 218,222 **** * entry now). Also fiddle with the flags. */ ! char execute (c, f, n) int c, f, n; --- 244,248 ---- * entry now). Also fiddle with the flags. */ ! bool execute (c, f, n) int c, f, n; *************** *** 312,316 **** * associated with them. */ ! char flush_all () { --- 338,342 ---- * associated with them. */ ! bool flush_all () { *************** *** 351,355 **** * to "C-X C-C". */ ! char quit (f, n, k) int f, n, k; --- 377,381 ---- * to "C-X C-C". */ ! bool quit (f, n, k) int f, n, k; *************** *** 478,482 **** * stuff. */ ! char ctrlg (f, n, k) int f, n, k; --- 504,508 ---- * stuff. */ ! bool ctrlg (f, n, k) int f, n, k; *************** *** 497,501 **** * Don't call display if there is an argument. */ ! char showversion (f, n, k) int f, n, k; --- 523,527 ---- * Don't call display if there is an argument. */ ! bool showversion (f, n, k) int f, n, k; diff -c2 -bBw orig/random.c new/random.c *** orig/random.c Tue Aug 11 09:38:13 1992 --- new/random.c Sat Oct 03 18:29:02 1992 *************** *** 9,13 **** #include "def.h" ! char backdel (); bool fill_out (); void bad_key (); --- 9,13 ---- #include "def.h" ! bool backdel (); bool fill_out (); void bad_key (); *************** *** 70,74 **** extern BUFFER sav_buf; ! char dec_chr_ok (); ulong get_long (); void wind_on_dot_all (); --- 70,74 ---- extern BUFFER sav_buf; ! bool dec_chr_ok (); ulong get_long (); void wind_on_dot_all (); *************** *** 139,143 **** register LINE *dotp; register short doto; ! char b_per_u, f_buf[4], s_buf[4], i; dotp = curwp->w_dotp; --- 139,144 ---- register LINE *dotp; register short doto; ! char f_buf[4], s_buf[4]; ! int b_per_u, i; dotp = curwp->w_dotp; *************** *** 698,708 **** */ ! char dec_chr_ok (char_buf, max_str, chr, pos) ! ! char chr, pos, *char_buf, *max_str; ! { ! char i; if ((chr < '0') || (chr > '9')) --- 699,708 ---- */ ! bool dec_chr_ok (char_buf, max_str, chr, pos) ! char *char_buf, *max_str; ! int chr, pos; { ! bool i; if ((chr < '0') || (chr > '9')) *************** *** 970,978 **** * Normally bound to "C-D". */ ! char forwdel (f, n, k) int f, n, k; { ! char s; if (n < 0) --- 970,978 ---- * Normally bound to "C-D". */ ! bool forwdel (f, n, k) int f, n, k; { ! bool s; if (n < 0) *************** *** 1002,1006 **** * if presented with an argument. */ ! char backdel (f, n, k) int f, n, k; --- 1002,1006 ---- * if presented with an argument. */ ! bool backdel (f, n, k) int f, n, k; *************** *** 1008,1012 **** int u_off; ! char s; if (n < 0) --- 1008,1012 ---- int u_off; ! bool s; if (n < 0) diff -c2 -bBw orig/region.c new/region.c *** orig/region.c Tue Aug 11 09:38:13 1992 --- new/region.c Sat Oct 03 18:15:19 1992 *************** *** 23,27 **** * Move "." to the start, and kill the characters. */ ! char killregion (f, n, k) int f, n, k; --- 23,27 ---- * Move "." to the start, and kill the characters. */ ! bool killregion (f, n, k) int f, n, k; *************** *** 53,57 **** * by a yank. */ ! char copyregion (f, n, k) int f, n, k; --- 53,57 ---- * by a yank. */ ! bool copyregion (f, n, k) int f, n, k; *************** *** 151,155 **** * and doesn't do clever things at all with dot in destination buffer! */ ! char save_region (f, n, k) int f, n, k; --- 151,155 ---- * and doesn't do clever things at all with dot in destination buffer! */ ! bool save_region (f, n, k) int f, n, k; diff -c2 -bBw orig/search.c new/search.c *** orig/search.c Tue Aug 11 09:38:13 1992 --- new/search.c Sat Oct 03 20:53:09 1992 *************** *** 7,14 **** #include "def.h" ! char replaceit (); ! char forwsrch (); ! char backsrch (); ! char readpattern (); void next_pat (); --- 7,14 ---- #include "def.h" ! bool replaceit (); ! bool forwsrch (); ! bool backsrch (); ! bool readpattern (); void next_pat (); *************** *** 91,98 **** * If not found, it just prints a message. */ ! char forwsearch () { ! register char s; char buf[NCOL], buf1[NCOL]; --- 91,98 ---- * If not found, it just prints a message. */ ! bool forwsearch () { ! register bool s; char buf[NCOL], buf1[NCOL]; *************** *** 131,138 **** * was matched]. */ ! char backsearch () { ! register char s; char buf[NCOL], buf1[NCOL]; --- 131,138 ---- * was matched]. */ ! bool backsearch () { ! register bool s; char buf[NCOL], buf1[NCOL]; *************** *** 169,173 **** * to go. */ ! char searchagain () { --- 169,173 ---- * to go. */ ! bool searchagain () { *************** *** 230,234 **** * (note typical hack to add a function with minimal code) */ ! char queryrepl (f, n, k) int f, n, k; --- 230,234 ---- * (note typical hack to add a function with minimal code) */ ! bool queryrepl (f, n, k) int f, n, k; *************** *** 235,239 **** { ! register char s; srch_mode = FALSE; --- 235,239 ---- { ! register bool s; srch_mode = FALSE; *************** *** 249,253 **** } ! char replaceit () { --- 249,253 ---- } ! bool replaceit () { *************** *** 389,393 **** * string isn't found, FALSE is returned. */ ! char forwsrch () { --- 389,393 ---- * string isn't found, FALSE is returned. */ ! bool forwsrch () { *************** *** 460,464 **** * string isn't found, FALSE is returned. */ ! char backsrch () { --- 460,464 ---- * string isn't found, FALSE is returned. */ ! bool backsrch () { *************** *** 533,537 **** * bits in that unit and display all '?'s. */ ! char readpattern () { --- 533,537 ---- * bits in that unit and display all '?'s. */ ! bool readpattern () { diff -c2 -bBw orig/symbol.c new/symbol.c *** orig/symbol.c Tue Aug 11 09:38:13 1992 --- new/symbol.c Sat Oct 03 18:10:01 1992 *************** *** 115,127 **** * Defined by "main.c". */ ! extern char ctrlg (); /* Abort out of things */ ! extern char quit (); /* Quit */ ! extern char ctlxlp (); /* Begin macro */ ! extern char ctlxrp (); /* End macro */ ! extern char ctlxe (); /* Execute macro */ ! extern char showversion (); /* Show version numbers, etc. */ ! extern char flushnquit (); /* Flush buffers & exit (fitz) */ ! extern char flush_all (); /* Flush buffers (jam) */ ! extern char autosave (); /* autosave function (jam) */ /* --- 115,127 ---- * Defined by "main.c". */ ! extern bool ctrlg (); /* Abort out of things */ ! extern bool quit (); /* Quit */ ! extern bool ctlxlp (); /* Begin macro */ ! extern bool ctlxrp (); /* End macro */ ! extern bool ctlxe (); /* Execute macro */ ! extern bool showversion (); /* Show version numbers, etc. */ ! extern bool flushnquit (); /* Flush buffers & exit (fitz) */ ! extern bool flush_all (); /* Flush buffers (jam) */ ! extern bool autosave (); /* autosave function (jam) */ /* *************** *** 128,137 **** * Defined by "search.c". */ ! extern char forwsearch (); /* Search forward */ ! extern char backsearch (); /* Search backwards */ ! extern char searchagain (); /* Repeat last search command */ ! extern char queryrepl (); /* Query replace */ ! extern char compare (); /* Compare two windows */ ! extern char recall (); /* Recall last search string */ /* --- 128,137 ---- * Defined by "search.c". */ ! extern bool forwsearch (); /* Search forward */ ! extern bool backsearch (); /* Search backwards */ ! extern bool searchagain (); /* Repeat last search command */ ! extern bool queryrepl (); /* Query replace */ ! extern bool compare (); /* Compare two windows */ ! extern bool recall (); /* Recall last search string */ /* *************** *** 138,152 **** * Defined by "basic.c". */ ! extern char backchar (); /* Move backward by characters */ ! extern char forwchar (); /* Move forward by characters */ ! extern char gotobob (); /* Move to start of buffer */ ! extern char gotoeob (); /* Move to end of buffer */ ! extern char forwline (); /* Move forward by lines */ ! extern char backline (); /* Move backward by lines */ ! extern char forwpage (); /* Move forward by pages */ ! extern char backpage (); /* Move backward by pages */ ! extern char setmark (); /* Set mark */ ! extern char swapmark (); /* Swap "." and mark */ ! extern char gotoline (); /* Go to a specified line. */ /* --- 138,152 ---- * Defined by "basic.c". */ ! extern bool backchar (); /* Move backward by characters */ ! extern bool forwchar (); /* Move forward by characters */ ! extern bool gotobob (); /* Move to start of buffer */ ! extern bool gotoeob (); /* Move to end of buffer */ ! extern bool forwline (); /* Move forward by lines */ ! extern bool backline (); /* Move backward by lines */ ! extern bool forwpage (); /* Move forward by pages */ ! extern bool backpage (); /* Move backward by pages */ ! extern bool setmark (); /* Set mark */ ! extern bool swapmark (); /* Swap "." and mark */ ! extern bool gotoline (); /* Go to a specified line. */ /* *************** *** 153,166 **** * Defined by "buffer.c". */ ! extern char listbuffers (); /* Display list of buffers */ ! extern char showsavebuf (); /* Show the save buffer contents */ ! extern char usebuffer (); /* Switch a window to a buffer */ ! extern char use_buffer (); /* ditto, plus window split */ ! extern char killbuffer (); /* Make a buffer go away. */ ! extern char next_buf (); /* goto next buffer */ ! extern char prev_buf (); /* goto prev buffer */ ! extern char yank_buffer (); /* yank buffer by name */ ! extern char buffername (); /* change buffer name */ ! extern char bufsizlock (); /* lock buffer size */ /* --- 153,166 ---- * Defined by "buffer.c". */ ! extern bool listbuffers (); /* Display list of buffers */ ! extern bool showsavebuf (); /* Show the save buffer contents */ ! extern bool usebuffer (); /* Switch a window to a buffer */ ! extern bool use_buffer (); /* ditto, plus window split */ ! extern bool killbuffer (); /* Make a buffer go away. */ ! extern bool next_buf (); /* goto next buffer */ ! extern bool prev_buf (); /* goto prev buffer */ ! extern bool yank_buffer (); /* yank buffer by name */ ! extern bool buffername (); /* change buffer name */ ! extern bool bufsizlock (); /* lock buffer size */ /* *************** *** 167,178 **** * Defined by "file." */ ! extern char fileread (); /* Get a file, read only */ ! extern char filevisit (); /* Get a file, read write */ ! extern char file_visit (); /* ditto , plus window split */ ! extern char filewrite (); /* Write a file */ ! extern char filesave (); /* Save current file */ ! extern char filename (); /* Adjust file name */ ! extern char fileinsert (); /* insert file to cursor (jam ) */ ! extern char viewfile (); /* readonly file visit (jam) */ /* --- 167,178 ---- * Defined by "file." */ ! extern bool fileread (); /* Get a file, read only */ ! extern bool filevisit (); /* Get a file, read write */ ! extern bool file_visit (); /* ditto , plus window split */ ! extern bool filewrite (); /* Write a file */ ! extern bool filesave (); /* Save current file */ ! extern bool filename (); /* Adjust file name */ ! extern bool fileinsert (); /* insert file to cursor (jam ) */ ! extern bool viewfile (); /* readonly file visit (jam) */ /* *************** *** 180,209 **** */ ! extern char dispshift (); /* Increment display shift */ ! extern char selfinsert (); /* Insert character */ ! extern char insert_toggle (); /* toggle insert mode (jam) */ ! extern char insertunit (); /* insert unit (pvr) */ ! extern char showcpos (); /* Show the cursor position */ ! extern char twiddle (); /* Twiddle units */ ! extern char forwdel (); /* Forward delete */ ! extern char backdel (); /* Backward delete */ ! extern char quote (); /* Insert literal */ ! extern char asciimode (); /* display ASCII data */ ! extern char ebcdicmode (); /* display EBCDIC data */ ! extern char decimalmode (); /* display DECIMAL data */ #if FLOAT_DISP ! extern char floatmode (); /* display FLOATING POINT data */ #endif ! extern char hexmode (); /* display HEX data */ ! extern char octalmode (); /* display OCTAL data */ ! extern char binarymode (); /* display BINARY data */ ! extern char dispsize1 (); /* display in BYTE format */ ! extern char dispsize2 (); /* display in WORD format */ ! extern char dispsize4 (); /* display in DWORD format*/ ! extern char dispswapbyte (); /* Display swaped bytes pvr */ ! extern char yank (); /* Yank back from killbuffer. */ ! extern char linkwind (); /* Link all windows on one buffer. */ ! extern char n_way_split (); /* Split buffer into n buffers. */ ! extern char n_way_combine (); /* Combine n buffers into one. */ /* --- 180,209 ---- */ ! extern bool dispshift (); /* Increment display shift */ ! extern bool selfinsert (); /* Insert character */ ! extern bool insert_toggle (); /* toggle insert mode (jam) */ ! extern bool insertunit (); /* insert unit (pvr) */ ! extern bool showcpos (); /* Show the cursor position */ ! extern bool twiddle (); /* Twiddle units */ ! extern bool forwdel (); /* Forward delete */ ! extern bool backdel (); /* Backward delete */ ! extern bool quote (); /* Insert literal */ ! extern bool asciimode (); /* display ASCII data */ ! extern bool ebcdicmode (); /* display EBCDIC data */ ! extern bool decimalmode (); /* display DECIMAL data */ #if FLOAT_DISP ! extern bool floatmode (); /* display FLOATING POINT data */ #endif ! extern bool hexmode (); /* display HEX data */ ! extern bool octalmode (); /* display OCTAL data */ ! extern bool binarymode (); /* display BINARY data */ ! extern bool dispsize1 (); /* display in BYTE format */ ! extern bool dispsize2 (); /* display in WORD format */ ! extern bool dispsize4 (); /* display in DWORD format*/ ! extern bool dispswapbyte (); /* Display swaped bytes pvr */ ! extern bool yank (); /* Yank back from killbuffer. */ ! extern bool linkwind (); /* Link all windows on one buffer. */ ! extern bool n_way_split (); /* Split buffer into n buffers. */ ! extern bool n_way_combine (); /* Combine n buffers into one. */ /* *************** *** 210,216 **** * Defined by "region.c". */ ! extern char killregion (); /* Kill region. */ ! extern char copyregion (); /* Copy region to kill buffer. */ ! extern char save_region (); /* Save region in named buffer. */ /* --- 210,216 ---- * Defined by "region.c". */ ! extern bool killregion (); /* Kill region. */ ! extern bool copyregion (); /* Copy region to kill buffer. */ ! extern bool save_region (); /* Save region in named buffer. */ /* *************** *** 217,222 **** * Defined by "spawn.c". */ ! extern char spawncli (); /* Run CLI in a subjob. */ ! extern char clock (); /* display time in modeline */ /* --- 217,222 ---- * Defined by "spawn.c". */ ! extern bool spawncli (); /* Run CLI in a subjob. */ ! extern bool clock (); /* display time in modeline */ /* *************** *** 223,238 **** * Defined by "window.c". */ ! extern char reposition (); /* Reposition window */ ! extern char refresh (); /* Refresh the screen */ ! extern char nextwind (); /* Move to the next window */ ! extern char prevwind (); /* Move to the previous window */ ! extern char mvdnwind (); /* Move window down */ ! extern char mvupwind (); /* Move window up */ ! extern char onlywind (); /* Make current window only one */ ! extern char delwind (); /* Delete current window */ ! extern char splitwind (); /* Split current window */ ! extern char enlargewind (); /* Enlarge display window. */ ! extern char shrinkwind (); /* Shrink window. */ ! extern char screen_rows (); /* Set the screen size */ /* --- 223,238 ---- * Defined by "window.c". */ ! extern bool reposition (); /* Reposition window */ ! extern bool refresh (); /* Refresh the screen */ ! extern bool nextwind (); /* Move to the next window */ ! extern bool prevwind (); /* Move to the previous window */ ! extern bool mvdnwind (); /* Move window down */ ! extern bool mvupwind (); /* Move window up */ ! extern bool onlywind (); /* Make current window only one */ ! extern bool delwind (); /* Delete current window */ ! extern bool splitwind (); /* Split current window */ ! extern bool enlargewind (); /* Enlarge display window. */ ! extern bool shrinkwind (); /* Shrink window. */ ! extern bool screen_rows (); /* Set the screen size */ /* *************** *** 239,246 **** * Defined by "word.c". */ ! extern char backunit (); /* Backup by units */ ! extern char forwunit (); /* Advance by units */ ! extern char delfunit (); /* Delete forward unit. */ ! extern char delbunit (); /* Delete backward unit. */ /* --- 239,246 ---- * Defined by "word.c". */ ! extern bool backunit (); /* Backup by units */ ! extern bool forwunit (); /* Advance by units */ ! extern bool delfunit (); /* Delete forward unit. */ ! extern bool delbunit (); /* Delete backward unit. */ /* *************** *** 247,256 **** * Defined by "extend.c". */ ! extern char extend (); /* Extended commands. */ ! extern char help (); /* Help key. */ ! extern char bindtokey (); /* Modify key bindings. */ ! extern char wallchart (); /* Make wall chart. */ extern void check_extend (); /* load extended key file */ ! extern char load_extend (); /* load extended file by name */ /* --- 247,256 ---- * Defined by "extend.c". */ ! extern bool extend (); /* Extended commands. */ ! extern bool help (); /* Help key. */ ! extern bool bindtokey (); /* Modify key bindings. */ ! extern bool wallchart (); /* Make wall chart. */ extern void check_extend (); /* load extended key file */ ! extern bool load_extend (); /* load extended file by name */ /* *************** *** 257,261 **** * Defined by "display.c */ ! extern char print (); /* print window from mark to dot */ typedef struct --- 257,261 ---- * Defined by "display.c */ ! extern bool print (); /* print window from mark to dot */ typedef struct *************** *** 262,268 **** { short k_key; /* Key to bind. */ ! char (*k_funcp) (); /* Function. */ char *k_name; /* Function name string. */ ! char k_modify; /* modify bit */ } KEY; --- 262,268 ---- { short k_key; /* Key to bind. */ ! bool (*k_funcp) (); /* Function. */ char *k_name; /* Function name string. */ ! bool k_modify; /* modify bit */ } KEY; *************** *** 439,443 **** binding[i] = NULL; for (kp = &key[0]; kp < &key[NKEY]; ++kp) ! keyadd (kp->k_key, kp->k_funcp, kp->k_name, kp->k_modify); keydup (KCTLX | KCTRL | 'G', MSG_abort); keydup (KMETA | KCTRL | 'G', MSG_abort); --- 439,443 ---- binding[i] = NULL; for (kp = &key[0]; kp < &key[NKEY]; ++kp) ! keyadd (kp->k_key, (bool (*)()) kp->k_funcp, kp->k_name, kp->k_modify); keydup (KCTLX | KCTRL | 'G', MSG_abort); keydup (KMETA | KCTRL | 'G', MSG_abort); diff -c2 -bBw orig/word.c new/word.c *** orig/word.c Tue Aug 11 09:38:15 1992 --- new/word.c Sat Oct 03 18:24:13 1992 *************** *** 11,15 **** extern BUFFER sav_buf; ! char forwunit (); /* --- 11,15 ---- extern BUFFER sav_buf; ! bool forwunit (); /* *************** *** 20,24 **** * the buffers. */ ! char backunit (f, n, k) int f, n, k; --- 20,24 ---- * the buffers. */ ! bool backunit (f, n, k) int f, n, k; *************** *** 45,49 **** * try and move beyond the buffer's end. */ ! char forwunit (f, n, k) int f, n, k; --- 45,49 ---- * try and move beyond the buffer's end. */ ! bool forwunit (f, n, k) int f, n, k;