basic.c

@@ -1,16 +1,19 @@
 /* basic.c -- implements basic.h */
+
 #include "basic.h"
 
-/* The routines in this file move the cursor around on the screen.  They
-   compute a new value for the cursor, then adjust ".".  The display code
-   always updates the cursor location, so only moves between lines, or
-   functions that adjust the top line in the window and invalidate the
-   framing, are hard.
-
-   modified by Petri Kutvonen
+/*	basic.c
+ *
+ * The routines in this file move the cursor around on the screen. They
+ * compute a new value for the cursor, then adjust ".". The display code
+ * always updates the cursor location, so only moves between lines, or
+ * functions that adjust the top line in the window and invalidate the
+ * framing, are hard.
+ *
+ *	modified by Petri Kutvonen
  */
 
-#include <assert.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 #include "input.h"
@@ -19,20 +22,26 @@
 #include "terminal.h"
 #include "window.h"
 
+
 #define CVMVAS  1  /* arguments to page forward/back in pages      */
 
-int overlap = 0 ;   /* $overlap: line overlap in forw/back page */
-int curgoal ;       /* $target:  column goal for C-P, C-N */
+
+int overlap = DEFAULT_OVERLAP ;		/* line overlap in forw/back page	*/
+int curgoal ;						/* Goal for C-P, C-N			*/
 
 
-/* This routine, given a pointer to a struct line, and the current cursor
-   goal column, return the best choice for the offset.  The offset is
-   returned.  Used by "C-N" and "C-P".
+/*
+ * This routine, given a pointer to a struct line, and the current cursor goal
+ * column, return the best choice for the offset. The offset is returned.
+ * Used by "C-N" and "C-P".
  */
 static unsigned getgoal( line_p dlp) {
-    int col = 0 ;
+	int col ;
+	unsigned idx ;
 	const unsigned len = llength( dlp) ;
-    unsigned idx = 0 ;
+
+	col = 0 ;
+	idx = 0 ;
 	while( idx < len) {
 		unicode_t c ;
 		unsigned width = utf8_to_unicode( dlp->l_text, idx, len, &c) ;
@@ -40,160 +49,183 @@ static unsigned getgoal( line_p dlp) {
 		/* Take tabs, ^X and \xx hex characters into account */
 		if( c == '\t')
 			col += tabwidth - col % tabwidth ;
-        else if( c < 0x20 || c == 0x7F)     /* ^x */
+		else if( c < 0x20 || c == 0x7F)
 			col += 2 ;
-        else if( c >= 0x80 && c <= 0xA0)    /* \xx */
+		else if( c >= 0x80 && c <= 0xA0)
 			col += 3 ;
-        else {
-            int w = utf8_width( c) ;        /* work around */
-            col += (w < 0) ? 2 : w ;        /* unknown unicode width as \u */
-        }
+		else
+			col += 1 ;
 
 		if( col > curgoal)
 			break ;
-        else
+
 		idx += width ;
 	}
 
 	return idx ;
 }
 
-
-/* Move the cursor to the beginning of the current line of active window. */
-TBINDABLE( gotobol) {
+/*
+ * Move the cursor to the beginning of the current line of active window.
+ */
+boolean gotobol( int f, int n) {
 	curwp->w_doto = 0 ;
 	return TRUE ;
 }
 
-
-/* Move the cursor to the end of the current line of active window. */
-TBINDABLE( gotoeol) {
+/*
+ * Move the cursor to the end of the current line of active window.
+ */
+boolean gotoeol( int f, int n) {
 	curwp->w_doto = llength( curwp->w_dotp) ;
 	return TRUE ;
 }
 
-
-/* Goto the beginning of the buffer.  Massive adjustment of dot.  This is
-   considered to be hard motion; it really isn't if the original value of
-   dot is the same as the new value of dot.  Normally bound to "M-<".
+/*
+ * Goto the beginning of the buffer. Massive adjustment of dot. This is
+ * considered to be hard motion; it really isn't if the original value of dot
+ * is the same as the new value of dot. Normally bound to "M-<".
  */
-TBINDABLE( gotobob) {
+boolean gotobob( int f, int n) {
 	curwp->w_dotp = lforw( curbp->b_linep) ;
 	curwp->w_doto = 0 ;
 	curwp->w_flag |= WFHARD ;
 	return TRUE ;
 }
 
-
-/* Move to the end of the buffer.  Dot is always put at the end of the file
-   (ZJ).  The standard screen code does most of the hard parts of update.
-   Bound to "M->".
+/*
+ * Move to the end of the buffer. Dot is always put at the end of the file
+ * (ZJ). The standard screen code does most of the hard parts of update.
+ * Bound to "M->".
  */
-TBINDABLE( gotoeob) {
+boolean gotoeob( int f, int n) {
 	curwp->w_dotp = curbp->b_linep ;
 	curwp->w_doto = 0 ;
 	curwp->w_flag |= WFHARD ;
 	return TRUE ;
 }
 
-
-/* Move forward by full lines.  If the number of lines to move is less than
-   zero, call the backward line function to actually do it.  The last
-   command controls how the goal column is set.  Bound to "C-N".  No errors
-   are possible.
+/*
+ * Move forward by full lines. If the number of lines to move is less than
+ * zero, call the backward line function to actually do it. The last command
+ * controls how the goal column is set. Bound to "C-N". No errors are
+ * possible.
  */
-BBINDABLE( forwline) {
-    assert( f == TRUE || n == 1) ;
+boolean forwline( int f, int n) {
+	line_p dlp ;
 
-/* if the last command was not a line move, reset the goal column */
-    if( (lastflag & CFCPCN) == 0)
-        curgoal = getccol( FALSE) ;
+	if (n < 0)
+		return backline(f, -n);
 
-/* flag this command as a line move */
-    thisflag |= CFCPCN ;
+	/* if we are on the last line as we start....fail the command */
+	if (curwp->w_dotp == curbp->b_linep)
+		return FALSE;
 
-/* and move the point down */
-    if( n) {
-        line_p dlp = curwp->w_dotp ;
-        if( n > 0)
+	/* if the last command was not a line move, reset the goal column */
+	if ((lastflag & CFCPCN) == 0)
+		curgoal = getccol(FALSE);
+
+	/* flag this command as a line move */
+	thisflag |= CFCPCN;
+
+	/* and move the point down */
+	dlp = curwp->w_dotp;
 	while( n && dlp != curbp->b_linep) {
 		dlp = lforw( dlp) ;
 		n -= 1 ;
 	}
-        else {
-            while( n && lback( dlp) != curbp->b_linep) {
-                dlp = lback( dlp) ;
-                n += 1 ;
-            }
-        }
-
-    /* resetting the current position */
-        curwp->w_dotp = dlp ;
-        curwp->w_doto = getgoal( dlp) ;
-        curwp->w_flag |= WFMOVE ;
-    }
 
+	/* reseting the current position */
+	curwp->w_dotp = dlp;
+	curwp->w_doto = getgoal(dlp);
+	curwp->w_flag |= WFMOVE;
 	return (n == 0) ? TRUE : FALSE ;
 }
 
-
-/* This function is like "forwline", but goes backwards.  The scheme is
-   exactly the same.  Check for arguments that are less than zero and call
-   your alternate.  Figure out the new line and call "movedot" to perform
-   the motion.  No errors are possible.  Bound to "C-P".
+/*
+ * This function is like "forwline", but goes backwards. The scheme is exactly
+ * the same. Check for arguments that are less than zero and call your
+ * alternate. Figure out the new line and call "movedot" to perform the
+ * motion. No errors are possible. Bound to "C-P".
  */
-BBINDABLE( backline) {
-    assert( f == TRUE || n == 1) ;
+boolean backline( int f, int n) {
+	line_p dlp ;
 
-    return forwline( TRUE, -n) ;
+	if (n < 0)
+		return forwline(f, -n);
+
+	/* if we are on the first line as we start....fail the command */
+	if (lback(curwp->w_dotp) == curbp->b_linep)
+		return FALSE;
+
+	/* if the last command was not a line move, reset the goal column */
+	if ((lastflag & CFCPCN) == 0)
+		curgoal = getccol(FALSE);
+
+	/* flag this command as a line move */
+	thisflag |= CFCPCN;
+
+	/* and move the point up */
+	dlp = curwp->w_dotp;
+	while( n && lback( dlp) != curbp->b_linep) {
+		dlp = lback( dlp) ;
+		n -= 1 ;
+	}
+
+	/* reseting the current position */
+	curwp->w_dotp = dlp;
+	curwp->w_doto = getgoal(dlp);
+	curwp->w_flag |= WFMOVE;
+	return (n == 0) ? TRUE : FALSE ;
 }
 
-
-/* Move to a particular line.
+/*
+ * Move to a particular line.
  *
  * @n: The specified line position at the current buffer.
  */
-BINDABLE( gotoline) {
-/* Get an argument if one doesn't exist. */
+int gotoline( int f, int n) {
+	/* Get an argument if one doesnt exist. */
 	if( f == FALSE) {
+		int status ;
 		char *arg ;	/* Buffer to hold argument. */
 
-        int status = newmlarg( &arg, "goto-line: ", 0) ;
-        if( status != TRUE)
+		status = newmlarg( &arg, "Line to GOTO: ", 0) ;
+		if( status != TRUE) {
+			mloutstr( "(Aborted)") ;
 			return status ;
+		}
 
 		n = atoi( arg) ;
 		free( arg) ;
-        f = TRUE ;
 	}
 
-/* Handle the case where the user may be passed something like this:
- *  ue filename +
+	/* Handle the case where the user may be passed something like this:
+	 * em filename +
 	 * In this case we just go to the end of the buffer.
 	 */
-    if( n == 0)
-        return gotoeob( f, n) ;
+	if (n == 0)
+		return gotoeob(f, n);
 
-/* If a bogus argument was passed, then returns false. */
-    if( n < 0)
-        return FALSE ;
+	/* If a bogus argument was passed, then returns false. */
+	if (n < 0)
+		return FALSE;
 
-/* First, we go to the begin of the buffer. */
-    gotobob( f, n) ;
-    return (n == 1) ? TRUE : forwline( TRUE, n - 1) ;
+	/* First, we go to the begin of the buffer. */
+	gotobob(f, n);
+	return (n == 1) ? TRUE : forwline( f, n - 1) ;
 }
 
-
-/* Scroll forward by a specified number of lines, or by a full page if no
-   argument.  Bound to "C-V".  The "2" in the arithmetic on the window size
-   is the overlap; this value is the default overlap value in ITS EMACS.
-   Because this zaps the top line in the display window, we have to do a
-   hard update.
+/*
+ * Scroll forward by a specified number of lines, or by a full page if no
+ * argument. Bound to "C-V". The "2" in the arithmetic on the window size is
+ * the overlap; this value is the default overlap value in ITS EMACS. Because
+ * this zaps the top line in the display window, we have to do a hard update.
  */
-TBINDABLE( forwpage) {
+boolean forwpage( int f, int n) {
 	line_p lp ;
 
-    if( f == FALSE) {
+	if (f == FALSE) {
 #if SCROLLCODE
 		if (term.t_scroll != NULL)	/* $scroll == FALSE */
 			if (overlap == 0)		/* $overlap == 0 */
@@ -206,41 +238,43 @@ TBINDABLE( forwpage) {
 
 		if (n <= 0)	/* Forget the overlap. */
 			n = 1;	/* If tiny window. */
-    } else if( n < 0)
-        return backpage( f, -n) ;
+	} else if (n < 0)
+		return backpage(f, -n);
 #if     CVMVAS
 	else			/* Convert from pages. */
 		n *= curwp->w_ntrows;	/* To lines. */
 #endif
 
+/*	lp = curwp->w_linep; */
 	lp = curwp->w_dotp ;
 	while( n && lp != curbp->b_linep) {
 		lp = lforw( lp) ;
 		n -= 1 ;
 	}
 
-    curwp->w_dotp = lp ;
-    curwp->w_doto = 0 ;
-    reposition( TRUE, 0) ;  /* center at dot, always succeed */
+/*	curwp->w_linep = lp; */
+	curwp->w_dotp = lp;
+	curwp->w_doto = 0;
+	reposition( TRUE, 0) ;
 
 #if SCROLLCODE
 	curwp->w_flag |= WFHARD | WFKILLS;
 #else
 	curwp->w_flag |= WFHARD;
 #endif
-    return TRUE ;
+	return TRUE;
 }
 
-
-/* This command is like "forwpage", but it goes backwards.  The "2", like
-   above, is the overlap between the two windows.  The value is from the
-   ITS EMACS manual.  Bound to "M-V".  We do a hard update for exactly the
-   same reason.
+/*
+ * This command is like "forwpage", but it goes backwards. The "2", like
+ * above, is the overlap between the two windows. The value is from the ITS
+ * EMACS manual. Bound to "M-V". We do a hard update for exactly the same
+ * reason.
  */
-TBINDABLE( backpage) {
+boolean backpage( int f, int n) {
 	line_p lp ;
 
-    if( f == FALSE) {   /* interactive, default n = 1 supplied */
+	if (f == FALSE) {	/* interactive, default n = 1 supplied */
 	/* in interactive mode, first move dot to top of window */
 		if( curwp->w_dotp != curwp->w_linep) {
 			curwp->w_dotp = curwp->w_linep ;
@@ -288,33 +322,40 @@ TBINDABLE( backpage) {
 	return TRUE;
 }
 
-
-/* Set the mark in the current window to the value of "." in the window.
-   No errors are possible.  Bound to M-. set-mark.
+/*
+ * Set the mark in the current window to the value of "." in the window. No
+ * errors are possible. Bound to "M-.".
  */
-TBINDABLE( setmark) {
-    curwp->w_markp = curwp->w_dotp ;
-    curwp->w_marko = curwp->w_doto ;
+boolean setmark( int f, int n) {
+	curwp->w_markp = curwp->w_dotp;
+	curwp->w_marko = curwp->w_doto;
 	mloutstr( "(Mark set)") ;
 	return TRUE ;
 }
 
-
-/* Swap the values of "." and "mark" in the current window.  If no mark as
-   been previously set, set it.  Bound to C-X C-X exchange-point-and-mark.
+/*
+ * Swap the values of "." and "mark" in the current window. This is pretty
+ * easy, because all of the hard work gets done by the standard routine
+ * that moves the mark about. The only possible error is "no mark". Bound to
+ * "C-X C-X".
  */
-TBINDABLE( swapmark) {
-    line_p odotp = curwp->w_dotp ;
-    int odoto = curwp->w_doto ;
-    if( curwp->w_markp) {
-        curwp->w_dotp = curwp->w_markp ;
-        curwp->w_doto = curwp->w_marko ;
-        curwp->w_flag |= WFMOVE ;
+boolean swapmark( int f, int n) {
+	line_p odotp ;
+	int odoto;
+
+	if( curwp->w_markp == NULL) {
+		mloutstr( "No mark in this window") ;
+		return FALSE ;
 	}
 
-    curwp->w_markp = odotp ;
-    curwp->w_marko = odoto ;
-    return TRUE ;
+	odotp = curwp->w_dotp;
+	odoto = curwp->w_doto;
+	curwp->w_dotp = curwp->w_markp;
+	curwp->w_doto = curwp->w_marko;
+	curwp->w_markp = odotp;
+	curwp->w_marko = odoto;
+	curwp->w_flag |= WFMOVE;
+	return TRUE;
 }
 
 /* end of basic.c */

basic.h

@@ -1,32 +1,35 @@
 /* basic.h -- basic commands for cursor movement in active window */
+
 #ifndef _BASIC_H_
-# define _BASIC_H_
+#define _BASIC_H_
 
-# include "names.h"
+#include "retcode.h"
 
-/* $overlap is the size of the line overlap when kbd calls page forw/back
-   if 0, page will move by 2/3 of the window size (1/3 page overlap)
-   default to 0
- */
-extern int overlap ;    /* $overlap: line overlap in forw/back page */
+/*
+** $overlap is the size of the line overlap when kbd calls page forw/back
+** if 0, page will move by 2/3 of the window size (1/3 page overlap)
+** default to 0
+*/
+#define DEFAULT_OVERLAP	0
+extern int overlap ;		/* line overlap in forw/back page	*/
 
 
 /* $target (== curgoal) is the column target when doing line move */
-extern int curgoal ;    /* $target: Goal for C-P previous-line, C-N next-line */
+extern int curgoal ;		/* Goal for C-P previous-line, C-N next-line */
 
 
-/* Bindable functions */
-BBINDABLE( backline) ;
-TBINDABLE( backpage) ;
-BBINDABLE( forwline) ;
-TBINDABLE( forwpage) ;
-TBINDABLE( gotobob) ;
-TBINDABLE( gotobol) ;
-TBINDABLE( gotoeob) ;
-TBINDABLE( gotoeol) ;
- BINDABLE( gotoline) ;
-TBINDABLE( setmark) ;
-TBINDABLE( swapmark) ;
+boolean gotobol( int f, int n) ;
+boolean gotoeol( int f, int n) ;
+int gotoline( int f, int n) ;
+boolean gotobob( int f, int n) ;
+boolean gotoeob( int f, int n) ;
+boolean forwline( int f, int n) ;
+boolean backline( int f, int n) ;
+boolean forwpage( int f, int n) ;
+boolean backpage( int f, int n) ;
+boolean setmark( int f, int n) ;
+boolean swapmark( int f, int n) ;
 
 #endif
+
 /* end of basic.h */

bind.c

@@ -9,22 +9,24 @@
  */
 
 #include <assert.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "estruct.h"
 #include "bindable.h"
 #include "buffer.h"
-#include "display.h"    /* upmode(), ostring() */
+#include "display.h"
 #include "exec.h"
 #include "file.h"
 #include "flook.h"
 #include "input.h"
 #include "line.h"
-#include "mlout.h"
 #include "names.h"
 #include "util.h"
 #include "window.h"
 
+
 static int buildlist( char *mstring) ;
 static char *cmdstr( unsigned c, char *seq) ;
 static unsigned int getckey( int mflag) ;
@@ -32,10 +34,14 @@ static unsigned int stock( char *keyname) ;
 static const char *getfname( unsigned keycode, const char *failmsg) ;
 
 
-/* give me some help!!!! bring up a fake buffer and read the help file into
-   it with view mode
- */
+static boolean cmdfail( const char *msg) {
+	mlwrite( "%s", msg) ;
+	return FALSE ;
+}
+
 BINDABLE( help) {
+/* give me some help!!!!
+   bring up a fake buffer and read the help file into it with view mode */
     char *fname = NULL; /* ptr to file returned by flook() */
 
 /* first check if we are already here */
@@ -46,7 +52,7 @@ BINDABLE( help) {
     if( bp == NULL) {
         fname = flook( hlpfname, FALSE) ;
         if( fname == NULL)
-            return mloutfail( "(Help file is not online)") ;
+			return cmdfail( "(Help file is not online)") ;
     }
 
 /* split the current window to make room for the help stuff */
@@ -54,10 +60,10 @@ BINDABLE( help) {
 	&&  splitwind( FALSE, 1) == FALSE)	/* Split it */
         return FALSE ;
 
-    if( bp == NULL) {
+    if (bp == NULL) {
         /* and read the stuff in */
-        if( getfile( fname, FALSE) == FALSE)
-            return FALSE ;
+        if (getfile(fname, FALSE) == FALSE)
+            return FALSE;
     } else
 		swbuffer( bp) ;
 
@@ -65,22 +71,20 @@ BINDABLE( help) {
     curwp->w_bufp->b_mode |= MDVIEW;
     curwp->w_bufp->b_flag |= BFINVS;
     upmode() ;
-    return TRUE ;
+    return TRUE;
 }
 
-
 static boolean invalidkey( void) {
-    return mloutfail( "(Invalid key sequence)") ;
+	return cmdfail( "(Invalid key sequence)") ;
 }
 
-
 /* describe the command for a certain key */
 BINDABLE( deskey) {
 	const char cmdname[] = "describe-key" ;
-    char outseq[ 8] ;   /* output buffer for keystroke sequence */
+    char outseq[ NSTRING] ;	/* output buffer for command sequence */
 
 /* prompt the user to type a key to describe */
-    mloutfmt( "%s: ", cmdname) ;
+    mlwrite( "%s: ", cmdname) ;
 
 /* get the command sequence to describe
  * change it to something we can print as well */
@@ -89,23 +93,23 @@ BINDABLE( deskey) {
 		return invalidkey() ;
 
 /* output the command sequence */
-    mloutfmt( "%s %s: 0x%x, %s", cmdname, cmdstr( keycode, outseq), keycode,
+    mlwrite( "%s %s: 0x%x, %s", cmdname, cmdstr( keycode, outseq), keycode,
                                             getfname( keycode, "Not Bound")) ;
     return TRUE ;
 }
 
-
-/* bindtokey:
+/*
+ * bindtokey:
  *  add a new key to the key binding table
  *
  * int f, n;        command arguments [IGNORED]
  */
 BINDABLE( bindtokey) {
     kbind_p ktp ;		/* pointer into the command table */
-    char outseq[ 8] ;   /* output buffer for keystroke sequence */
+    char outseq[ 80] ;  /* output buffer for keystroke sequence */
 
 /* prompt the user to type in a key to bind */
-    mloutstr( "bind-to-key: ") ;
+    mlwrite("bind-to-key: ");
 
 /* get the function name to bind it to */
 	nbind_p nbp = getname() ;
@@ -114,13 +118,13 @@ BINDABLE( bindtokey) {
 
     fnp_t kfunc = nbp->n_func ;
     if( kfunc == NULL)
-        return mloutfail( "(No such function)") ;
+		return cmdfail( "(No such function)") ;
 
-    mloutfmt( "bind-to-key %s: ", bind_name( nbp)) ;
+	mlwrite( "bind-to-key %s: ", bind_name( nbp)) ;
 
 /* get the command sequence to bind */
-    boolean prefix_f = (kfunc == (fnp_t) metafn) || (kfunc == (fnp_t) cex) ||
-                        (kfunc == (fnp_t) unarg) || (kfunc == (fnp_t) ctrlg) ;
+	boolean prefix_f = (kfunc == metafn) || (kfunc == cex) ||
+            							(kfunc == unarg) || (kfunc == ctrlg) ;
     int c = getckey( prefix_f) ;
 	if( c == ~0)
 		return invalidkey() ;
@@ -131,13 +135,13 @@ BINDABLE( bindtokey) {
 
 /* key sequence can't be an active prefix key */
 	if( c == metac || c == ctlxc || c == reptc || c == abortc) {
-        if( (c == metac  && kfunc == (fnp_t) metafn)
-        ||  (c == ctlxc  && kfunc == (fnp_t) cex)
-        ||  (c == reptc  && kfunc == (fnp_t) unarg)
-        ||  (c == abortc && kfunc == (fnp_t) ctrlg))
-            return TRUE ;   /* be silent if keep current */
+		if( (c == metac  && kfunc == metafn)
+		||  (c == ctlxc  && kfunc == cex)
+		||  (c == reptc  && kfunc == unarg)
+		||  (c == abortc && kfunc == ctrlg))
+			return TRUE ;
 
-        return mloutfail( "(Can't bind to active prefix)") ;
+		return cmdfail( "(Can't bind to active prefix)") ;
 	}
 
 /* if the function is a prefix key */
@@ -150,34 +154,34 @@ BINDABLE( bindtokey) {
 			}
 
     /* set the appropriate global prefix variable */
-        if( kfunc == (fnp_t) metafn)
+        if( kfunc == metafn)
             metac = c ;
-        else if( kfunc == (fnp_t) cex)
+        else if( kfunc == cex)
             ctlxc = c ;
-        if( kfunc == (fnp_t) unarg)
+        if( kfunc == unarg)
             reptc = c ;
-        if( kfunc == (fnp_t) ctrlg)
+        if( kfunc == ctrlg)
             abortc = c ;
     }
 
 	ktp = setkeybinding( c, nbp) ;
 	if( ktp->k_code == 0)
-        return mloutfail( "Binding table FULL!") ;
+		return cmdfail( "Binding table FULL!") ;
 
 	return TRUE ;
 }
 
-
-/* unbindkey:
+/*
+ * unbindkey:
  *  delete a key from the key binding table
  *
  * int f, n;        command arguments [IGNORED]
  */
 BINDABLE( unbindkey) {
-    char outseq[ 8] ;   /* output buffer for keystroke sequence */
+    char outseq[ 80] ;	/* output buffer for keystroke sequence */
 
 /* prompt the user to type in a key to unbind */
-    mloutstr( "unbind-key: ") ;
+    mlwrite( "unbind-key: ") ;
 
 /* get the command sequence to unbind */
     int c = getckey( FALSE) ;	/* get a command sequence */
@@ -190,17 +194,19 @@ BINDABLE( unbindkey) {
 
 /* prefix key sequence can't be undound, just redefined */
 	if( c == reptc || c == abortc)
-        return mloutfail( "(Can't unbind prefix)") ;
+		return cmdfail( "(Can't unbind prefix)") ;
 
 /* if it isn't bound, bitch */
-    if( delkeybinding( c) == FALSE)
-        return mloutfail( "(Key not bound)") ;
+    if( delkeybinding( c) == FALSE) {
+        mlwrite( "(Key not bound)") ;
+        return FALSE ;
+    }
 	
 	return TRUE ;
 }
 
-
-/* does source include sub?
+/*
+ * does source include sub?
  *
  * char *source;    string to search in
  * char *sub;       substring to look for
@@ -226,7 +232,6 @@ static boolean strinc( const char *source, const char *sub) {
     return FALSE ;
 }
 
-
 /* describe bindings
  * bring up a fake buffer and list the key bindings
  * into it with view mode
@@ -235,7 +240,6 @@ BINDABLE( desbind) {
     return buildlist( "") ;
 }
 
-
 /* Apropos (List functions that match a substring) */
 BINDABLE( apro) {
 	char *mstring ;	/* string to match cmd names to */
@@ -250,51 +254,54 @@ BINDABLE( apro) {
     return status ;
 }
 
-
-/* build a binding list (limited or full)
+/*
+ * build a binding list (limited or full)
  *
  * char *mstring;   match string if a partial list, "" matches all
  */
 static int buildlist( char *mstring) {
-#define PADDING 28
-    char outseq[ PADDING + 8] ;  /* output buffer for command + keystroke */
+    struct window *wp;         /* scanning pointer to windows */
+    kbind_p ktp;  /* pointer into the command table */
+    nbind_p nptr;/* pointer into the name binding table */
+    struct buffer *bp;    /* buffer to put binding list into */
+    char outseq[80];      /* output buffer for keystroke sequence */
 
-/* split the current window to make room for the binding list */
+    /* split the current window to make room for the binding list */
 	if( wheadp->w_wndp == NULL			/* One window */
 	&&  splitwind( FALSE, 1) == FALSE)	/* Split it */
-        return FALSE ;
+        return FALSE;
 
-/* and get a buffer for it */
-    buffer_p bp = bfind( "*Binding list*", TRUE, 0) ;
+    /* and get a buffer for it */
+    bp = bfind("*Binding list*", TRUE, 0);
     if( bp == NULL || bclear( bp) == FALSE)
-        return mloutfail( "Can't display binding list") ;
+		return cmdfail( "Can't display binding list") ;
 
-/* let us know this is in progress */
-    mloutstr( "(Building binding list)") ;
+    /* let us know this is in progress */
+    mlwrite("(Building binding list)");
 
-/* disconnect the current buffer */
-    if( --curbp->b_nwnd == 0) { /* Last use.            */
-        curbp->b_dotp = curwp->w_dotp ;
-        curbp->b_doto = curwp->w_doto ;
-        curbp->b_markp = curwp->w_markp ;
-        curbp->b_marko = curwp->w_marko ;
+    /* disconnect the current buffer */
+    if (--curbp->b_nwnd == 0) { /* Last use.            */
+        curbp->b_dotp = curwp->w_dotp;
+        curbp->b_doto = curwp->w_doto;
+        curbp->b_markp = curwp->w_markp;
+        curbp->b_marko = curwp->w_marko;
     }
 
-/* connect the current window to this buffer */
-    curbp = bp ;    /* make this buffer current in current window */
-    bp->b_mode = 0 ;    /* no modes active in binding list */
-    bp->b_nwnd++ ;      /* mark us as more in use */
-    window_p wp = curwp ;
-    wp->w_bufp = bp ;
-    wp->w_linep = bp->b_linep ;
-    wp->w_flag = WFHARD | WFFORCE ;
-    wp->w_dotp = bp->b_dotp ;
-    wp->w_doto = bp->b_doto ;
-    wp->w_markp = NULL ;
-    wp->w_marko = 0 ;
+    /* connect the current window to this buffer */
+    curbp = bp;     /* make this buffer current in current window */
+    bp->b_mode = 0;     /* no modes active in binding list */
+    bp->b_nwnd++;       /* mark us as more in use */
+    wp = curwp;
+    wp->w_bufp = bp;
+    wp->w_linep = bp->b_linep;
+    wp->w_flag = WFHARD | WFFORCE;
+    wp->w_dotp = bp->b_dotp;
+    wp->w_doto = bp->b_doto;
+    wp->w_markp = NULL;
+    wp->w_marko = 0;
 
-/* build the contents of this window, inserting it line by line */
-    for( nbind_p nptr = names ; nptr->n_func != NULL ; nptr++) {
+    /* build the contents of this window, inserting it line by line */
+    for( nptr = names ; nptr->n_func != NULL ; nptr++) {
 	    int cpos ;	/* current position to use in outseq */
 
         /* if we are executing an apropos command..... */
@@ -304,47 +311,47 @@ static int buildlist( char *mstring) {
 
         /* add in the command name */
         mystrscpy( outseq, bind_name( nptr), sizeof outseq) ;
-        cpos = strlen( outseq) ;
+        cpos = strlen(outseq);
 
         /* search down any keys bound to this */
-        for( kbind_p ktp = keytab ; ktp->k_code != 0 ; ktp++) {
+        for( ktp = keytab ; ktp->k_code != 0 ; ktp++) {
             if( ktp->k_nbp == nptr) {
                 /* padd out some spaces */
-                while( cpos < PADDING)
-                    outseq[ cpos++] = ' ' ;
+                while (cpos < 28)
+                    outseq[cpos++] = ' ';
 
                 /* add in the command sequence */
-                cmdstr( ktp->k_code, &outseq[ cpos]) ;
-                strcat( outseq, "\n") ;
+                cmdstr(ktp->k_code, &outseq[cpos]);
+                strcat(outseq, "\n");
 
                 /* and add it as a line into the buffer */
-                if( linstr( outseq) != TRUE)
-                    return FALSE ;
+                if (linstr(outseq) != TRUE)
+                    return FALSE;
 
-                cpos = 0 ;  /* and clear the line */
+                cpos = 0;   /* and clear the line */
             }
         }
 
         /* if no key was bound, we need to dump it anyway */
-        if( cpos > 0) {
-            outseq[ cpos++] = '\n';
-            outseq[ cpos] = 0;
-            if( linstr( outseq) != TRUE)
-                return FALSE ;
+        if (cpos > 0) {
+            outseq[cpos++] = '\n';
+            outseq[cpos] = 0;
+            if (linstr(outseq) != TRUE)
+                return FALSE;
         }
     }
 
-    bp->b_mode |= MDVIEW ;              /* put this buffer view mode */
-    bp->b_flag &= ~BFCHG ;              /* don't flag this as a change */
-    wp->w_dotp = lforw( bp->b_linep) ;  /* back to the beginning */
-    wp->w_doto = 0 ;
+    bp->b_mode |= MDVIEW;    /* put this buffer view mode */
+    bp->b_flag &= ~BFCHG;    /* don't flag this as a change */
+    wp->w_dotp = lforw(bp->b_linep);    /* back to the beginning */
+    wp->w_doto = 0;
     upmode() ;			/* and update ALL mode lines */
-    mloutstr( "") ;                     /* clear the mode line */
-    return TRUE ;
+    mlwrite("");        /* clear the mode line */
+    return TRUE;
 }
 
-
-/* get a command key sequence from the keyboard
+/*
+ * get a command key sequence from the keyboard
  *
  * int mflag;       going for a meta sequence?
  * returns ~0 on failure
@@ -371,8 +378,8 @@ static unsigned int getckey( int mflag) {
 	return c ;
 }
 
-
-/* execute the startup file
+/*
+ * execute the startup file
  *
  * char *fname;    name of startup file (null if default)
  */
@@ -387,8 +394,8 @@ int startup( const char *fname) {
 	return dofile( fname) ;			/* otherwise, execute the sucker */
 }
 
-
-/* change a key command to a string we can print out
+/*
+ * change a key command to a string we can print out
  *
  * int c;       sequence to translate
  * char *seq;       destination string for sequence
@@ -404,14 +411,14 @@ static char *cmdstr( unsigned c, char *seq) {
 
 /* apply ^X sequence if needed */
     if( c & CTLX) {
-        if( ctlxc & CTL_)
+		if( ctlxc & CTRL)
 	        *ptr++ = '^' ;
 
         *ptr++ = ctlxc & ~PRFXMASK ;
     }
 
 /* apply control sequence if needed */
-    if( c & CTL_)
+    if( c & CTRL)
         *ptr++ = '^' ;
 
 /* apply SPEC sequence if needed */
@@ -426,7 +433,6 @@ static char *cmdstr( unsigned c, char *seq) {
 	return seq ;
 }
 
-
 static const char *getfname( unsigned keycode, const char *failmsg) {
 /* takes a key code and gets the name of the function bound to it */
 	kbind_p kbp = getkeybinding( keycode) ;
@@ -438,7 +444,6 @@ static const char *getfname( unsigned keycode, const char *failmsg) {
 	return found ;
 }
 
-
 /* stock:
  *  String key name TO Command Key
  *
@@ -461,7 +466,7 @@ static unsigned int stock( char *keyname) {
 
 /* a control char? */
     if( *keyname == '^' && keyname[ 1] != 0) {
-        c |= CTL_ ;
+        c |= CTRL ;
         ++keyname ;
     }
 
@@ -477,7 +482,7 @@ static unsigned int stock( char *keyname) {
 
 /* only way to redefine ^X is by quoting binary value */
     if( *keyname < 32 || *keyname == 0x7F) {
-        c |= CTL_ ;
+        c |= CTRL ;
         *keyname ^= 0x40 ;
     } else	if( c && !(c & SPEC)
 			&&	*keyname >= 'a' && *keyname <= 'z')
@@ -489,8 +494,8 @@ static unsigned int stock( char *keyname) {
     return c ;
 }
 
-
-/* string key name to binding name....
+/*
+ * string key name to binding name....
  *
  * char *skey;      name of key to get binding for
  */

bind.h

@@ -1,5 +1,3 @@
-/* bind.h -- bindable functions dealing with name and key bindings */
-
 #ifndef _BIND_H_
 #define _BIND_H_
 
@@ -19,5 +17,3 @@ int startup( const char *fname) ;
 const char *transbind( char *skey) ;	/* by string representation of key */
 
 #endif
-
-/* end of bind.h */

bindable.c

@@ -3,124 +3,143 @@
 
 #include <stdlib.h>
 
+
 #include "defines.h"
 #include "buffer.h"
-#include "display.h"    /* vttidy() */
+#include "display.h"
+#include "estruct.h"
 #include "file.h"
 #include "input.h"
 #include "lock.h"
 #include "mlout.h"
 #include "terminal.h"
 
-
-/* Fancy quit command, as implemented by Norm.  If any buffer has changed
-   do a write on that buffer and exit emacs, otherwise simply exit.
+/*
+ * Fancy quit command, as implemented by Norm. If the any buffer has
+ * changed do a write on that buffer and exit emacs, otherwise simply exit.
  */
-BINDABLE( quickexit) {
-    buffer_p oldcb = curbp ;    /* save in case we fail */
-    for( buffer_p bp = bheadp ; bp != NULL ; bp = bp->b_bufp) {
-        if( (bp->b_flag & (BFCHG | BFTRUNC | BFINVS)) == BFCHG) {
-        /* Changed, Not truncated and real buffer */
-            curbp = bp ;    /* make that buffer cur */
-            mloutfmt( "(Saving %s)", bp->b_fname) ;
-            int status = filesave( f, n) ;
-            if( status != TRUE) {
-                curbp = oldcb ; /* restore curbp */
-                return status ;
-            }
-        }
-    }
+int quickexit(int f, int n)
+{
+	struct buffer *bp;	/* scanning pointer to buffers */
+	struct buffer *oldcb;	/* original current buffer */
+	int status;
 
-    return quit( f, n) ;    /* conditionally quit   */
+	oldcb = curbp;		/* save in case we fail */
+
+	bp = bheadp;
+	while (bp != NULL) {
+		if ((bp->b_flag & BFCHG) != 0	/* Changed.             */
+		    && (bp->b_flag & BFTRUNC) == 0	/* Not truncated P.K.   */
+		    && (bp->b_flag & BFINVS) == 0) {	/* Real.                */
+			curbp = bp;	/* make that buffer cur */
+			mloutfmt( "(Saving %s)", bp->b_fname) ;
+#if	PKCODE
+#else
+			mloutstr( "\n") ;
+#endif
+			if ((status = filesave(f, n)) != TRUE) {
+				curbp = oldcb;	/* restore curbp */
+				return status;
+			}
+		}
+		bp = bp->b_bufp;	/* on to the next buffer */
+	}
+	quit(f, n);		/* conditionally quit   */
+	return TRUE;
 }
 
-
-/* Quit command. If an argument, always quit. Otherwise confirm if a buffer
+/*
+ * Quit command. If an argument, always quit. Otherwise confirm if a buffer
  * has been changed and not written out. Normally bound to "C-X C-C".
  */
-BINDABLE( quit) {
-    int s ; /* status of user query */
+int quit(int f, int n)
+{
+	int s;
 
-    if( f != FALSE      /* Argument forces it.  */
+	if (f != FALSE		/* Argument forces it.  */
 	    || anycb() == FALSE	/* All buffers clean.   */
 	    /* User says it's OK.   */
-    || (s = mlyesno( "Modified buffers exist. Leave anyway")) == TRUE) {
+	    || (s =
+		mlyesno("Modified buffers exist. Leave anyway")) == TRUE) {
 #if	(FILOCK && BSD) || SVR4
-        if( lockrel() != TRUE) {
-            TTputc('\n') ;
-            TTputc('\r') ;
-            TTclose() ;
-            TTkclose() ;
+		if (lockrel() != TRUE) {
+			TTputc('\n');
+			TTputc('\r');
+			TTclose();
+			TTkclose();
 			exit( EXIT_FAILURE) ;
 		}
 #endif
-        vttidy() ;
-        if( f)
-            exit( n) ;
+		vttidy();
+		if (f)
+			exit(n);
 		else
 			exit( EXIT_SUCCESS) ;
 	}
-
 	mloutstr( "") ;
-    return s ;
+	return s;
 }
 
-
-/* Begin a keyboard macro.
+/*
+ * Begin a keyboard macro.
  * Error if not at the top level in keyboard processing. Set up variables and
  * return.
  */
-BBINDABLE( ctlxlp) {
-    if( kbdmode != STOP)
-        return mloutfail( "%Macro already active") ;
-
+int ctlxlp(int f, int n)
+{
+	if (kbdmode != STOP) {
+		mloutstr( "%Macro already active") ;
+		return FALSE;
+	}
 	mloutstr( "(Start macro)") ;
-    kbdptr = kbdm ;
-    kbdend = kbdptr ;
-    kbdmode = RECORD ;
-    return TRUE ;
+	kbdptr = &kbdm[0];
+	kbdend = kbdptr;
+	kbdmode = RECORD;
+	return TRUE;
 }
 
-
-/* End keyboard macro. Check for the same limit conditions as the above
+/*
+ * End keyboard macro. Check for the same limit conditions as the above
  * routine. Set up the variables and return to the caller.
  */
-BBINDABLE( ctlxrp) {
-    if( kbdmode == STOP)
-        return mloutfail( "%Macro not active") ;
-
+int ctlxrp(int f, int n)
+{
+	if (kbdmode == STOP) {
+		mloutstr( "%Macro not active") ;
+		return FALSE;
+	}
 	if (kbdmode == RECORD) {
 		mloutstr( "(End macro)") ;
 		kbdmode = STOP;
 	}
-
-    return TRUE ;
+	return TRUE;
 }
 
-
-/* Execute a macro.
+/*
+ * Execute a macro.
  * The command argument is the number of times to loop. Quit as soon as a
  * command gets an error. Return TRUE if all ok, else FALSE.
  */
-BBINDABLE( ctlxe) {
-    if( kbdmode != STOP)
-        return mloutfail( "%Macro already active") ;
-
-    if( n <= 0)
-        return TRUE ;
-
-    kbdrep = n ;        /* remember how many times to execute */
-    kbdmode = PLAY ;    /* start us in play mode */
-    kbdptr = kbdm ;     /*    at the beginning */
-    return TRUE ;
+int ctlxe(int f, int n)
+{
+	if (kbdmode != STOP) {
+		mloutstr( "%Macro already active") ;
+		return FALSE;
+	}
+	if (n <= 0)
+		return TRUE;
+	kbdrep = n;		/* remember how many times to execute */
+	kbdmode = PLAY;		/* start us in play mode */
+	kbdptr = &kbdm[0];	/*    at the beginning */
+	return TRUE;
 }
 
-
-/* abort:
+/*
+ * abort:
  *  Beep the beeper. Kill off any keyboard macro, etc., that is in progress.
  *  Sometimes called as a routine, to do general aborting of stuff.
  */
-BINDABLE( ctrlg) {
+int ctrlg( int f, int n) {
 	kbdmode = STOP ;
 	mloutfmt( "%B(Aborted)") ;
 	return ABORT ;

bindable.h

@@ -1,16 +1,9 @@
-/* bindable.h -- misc bindable functions */
-#ifndef _BINDABLE_H_
-#define _BINDABLE_H_
-
 #include "names.h"
 
 /* functions that can be bound to keys or procedure names */
-BBINDABLE( ctlxe) ;
-BBINDABLE( ctlxlp) ;
-BBINDABLE( ctlxrp) ;
- BINDABLE( ctrlg) ;		/* ABORT */
- BINDABLE( quickexit) ;
- BINDABLE( quit) ;
-
-#endif
-/* end of bindable.h */
+BINDABLE( quickexit) ;
+BINDABLE( quit) ;
+BINDABLE( ctlxlp) ;
+BINDABLE( ctlxrp) ;
+BINDABLE( ctlxe) ;
+BINDABLE( ctrlg) ;

buffer.c

@@ -1,12 +1,18 @@
 /* buffer.c -- implements buffer.h */
 #include "buffer.h"
 
-/*  Buffer management.  Some of the functions are internal, and some are actually attached to
-    user keys.  Like everyone else, they set hints for the display system.
-
-    modified by Petri Kutvonen
+/*	buffer.c
+ *
+ *	Buffer management.
+ *	Some of the functions are internal,
+ *	and some are actually attached to user
+ *	keys. Like everyone else, they set hints
+ *	for the display system
+ *
+ *	modified by Petri Kutvonen
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -20,11 +26,11 @@
 #include "window.h"
 
 
-buffer_p curbp ;        /* Current buffer               */
-buffer_p bheadp ;       /* Head of list of buffers      */
-buffer_p blistp ;       /* Buffer for C-X C-B           */
+struct buffer *curbp ;		/* Current buffer               */
+struct buffer *bheadp ;		/* Head of list of buffers      */
+struct buffer *blistp ;		/* Buffer for C-X C-B           */
 
-const char *modename[ NUMMODES] = { /* name of modes */
+const char *modename[] = {	/* name of modes                */
 	"Wrap", "Cmode", "Exact", "View", "Over",
 	"Magic",
 	"Asave", "Utf-8", "Dos"
@@ -37,20 +43,24 @@ static int addline( char *text) ;
 static void l_to_a( char *buf, int width, long num) ;
 
 
-/* Attach a buffer to a window.  The values of dot and mark come from the
-   buffer if the use count is 0.  Otherwise, they come from some other
-   window.
+/*
+ * Attach a buffer to a window. The
+ * values of dot and mark come from the buffer
+ * if the use count is 0. Otherwise, they come
+ * from some other window.
  */
-BINDABLE( usebuffer) {
+int usebuffer( int f, int n) {
+	struct buffer *bp ;
+	int status ;
 	char *bufn ;
 
 /* Get buffer name */
-    int status = newmlarg( &bufn, "select-buffer: ", sizeof( bname_t)) ;
+	status = newmlarg( &bufn, "Use buffer: ", sizeof( bname_t)) ;
 	if( status != TRUE)
 		return status ;
 
 /* Find buffer in list */
-    buffer_p bp = bfind( bufn, TRUE, 0) ;
+	bp = bfind( bufn, TRUE, 0) ;
 	free( bufn) ;
 	if( bp == NULL)
 		return FALSE ;
@@ -59,49 +69,52 @@ BINDABLE( usebuffer) {
 	return swbuffer( bp) ;
 }
 
-
-/* switch to the next buffer in the buffer list
+/*
+ * switch to the next buffer in the buffer list
  *
  * int f, n;		default flag, numeric argument
  */
-BINDABLE( nextbuffer) {
-    buffer_p bp = NULL ;    /* eligible buffer to switch to */
+int nextbuffer(int f, int n)
+{
+	struct buffer *bp = NULL;  /* eligable buffer to switch to */
+	struct buffer *bbp;        /* eligable buffer to switch to */
 
 	/* make sure the arg is legit */
-    if( f == FALSE)
-        n = 1 ;
+	if (f == FALSE)
+		n = 1;
+	if (n < 1)
+		return FALSE;
 
-    if( n < 1)
-        return FALSE ;
-
-    buffer_p bbp = curbp ;  /* eligible buffer to switch to */
-    while( n-- > 0) {
+	bbp = curbp;
+	while (n-- > 0) {
 		/* advance to the next buffer */
-        bp = bbp->b_bufp ;
+		bp = bbp->b_bufp;
 
-        /* cycle through the buffers to find an eligible one */
-        while( bp == NULL || bp->b_flag & BFINVS) {
+		/* cycle through the buffers to find an eligable one */
+		while (bp == NULL || bp->b_flag & BFINVS) {
 			if (bp == NULL)
-                bp = bheadp ;
+				bp = bheadp;
 			else
-                bp = bp->b_bufp ;
+				bp = bp->b_bufp;
 
 			/* don't get caught in an infinite loop! */
-            if( bp == bbp)
-                return FALSE ;
+			if (bp == bbp)
+				return FALSE;
+
 		}
 
-        bbp = bp ;
+		bbp = bp;
 	}
 
-    return swbuffer( bp) ;
+	return swbuffer(bp);
 }
 
-
-/* make buffer BP current
+/*
+ * make buffer BP current
  */
-int swbuffer( buffer_p bp) {
-    window_p wp ;
+int swbuffer(struct buffer *bp)
+{
+	struct window *wp;
 
 	if (--curbp->b_nwnd == 0) {	/* Last use.            */
 		curbp->b_dotp = curwp->w_dotp;
@@ -144,19 +157,21 @@ int swbuffer( buffer_p bp) {
 	return TRUE;
 }
 
-
-/* Dispose of a buffer, by name.  Ask for the name.  Look it up (don't get
-   too upset if it isn't there at all!).  Get quite upset if the buffer is
-   being displayed.  Clear the buffer (ask if the buffer has been changed).
-   Then free the header line and the buffer header.  Bound to "C-X K".
+/*
+ * Dispose of a buffer, by name.
+ * Ask for the name. Look it up (don't get too
+ * upset if it isn't there at all!). Get quite upset
+ * if the buffer is being displayed. Clear the buffer (ask
+ * if the buffer has been changed). Then free the header
+ * line and the buffer header. Bound to "C-X K".
  */
-BINDABLE( killbuffer) {
-    buffer_p bp ;
+int killbuffer( int f, int n) {
+	struct buffer *bp ;
 	int status ;
 	char *bufn ;
 
 /* Get buffer name */
-    status = newmlarg( &bufn, "delete-buffer: ", sizeof( bname_t)) ;
+	status = newmlarg( &bufn, "Kill buffer: ", sizeof( bname_t)) ;
 	if( status != TRUE)
 		return status ;
 
@@ -172,60 +187,66 @@ BINDABLE( killbuffer) {
 	return zotbuf( bp) ;
 }
 
-
-/* kill the buffer pointed to by bp
+/*
+ * kill the buffer pointed to by bp
  */
-int zotbuf( buffer_p bp) {
-    if( bp->b_nwnd != 0)	/* Error if on screen.  */
-        return mloutfail( "Buffer is being displayed") ;
+int zotbuf(struct buffer *bp)
+{
+	struct buffer *bp1;
+	struct buffer *bp2;
+	int s;
 
-    int s = bclear( bp) ;	/* Blow text away.      */
-    if( s != TRUE)
-        return s ;
-
-    free( bp->b_linep) ;	/* Release header line. */
-
-/* unlink buffer from buffer chain */
-	if( bheadp == bp)
-		bheadp = bp->b_bufp ;
-	else for( buffer_p prev = bheadp ; prev != NULL ; prev = prev->b_bufp)
-		if( prev->b_bufp == bp) {
-			prev->b_bufp = bp->b_bufp ;
-			break ;
+	if (bp->b_nwnd != 0) {	/* Error if on screen.  */
+		mloutstr("Buffer is being displayed");
+		return FALSE;
 	}
-
-    free( bp) ;				/* Release buffer block */
-    return TRUE ;
+	if ((s = bclear(bp)) != TRUE)	/* Blow text away.      */
+		return s;
+	free((char *) bp->b_linep);	/* Release header line. */
+	bp1 = NULL;		/* Find the header.     */
+	bp2 = bheadp;
+	while (bp2 != bp) {
+		bp1 = bp2;
+		bp2 = bp2->b_bufp;
+	}
+	bp2 = bp2->b_bufp;	/* Next one in chain.   */
+	if (bp1 == NULL)	/* Unlink it.           */
+		bheadp = bp2;
+	else
+		bp1->b_bufp = bp2;
+	free((char *) bp);	/* Release buffer block */
+	return TRUE;
 }
 
-
-/* Rename the current buffer
+/*
+ * Rename the current buffer
  *
  * int f, n;		default Flag & Numeric arg
  */
-BINDABLE( namebuffer) {
-    char *bufn ;        /* buffer to hold buffer name */
+int namebuffer( int f, int n) {
+	struct buffer *bp ;	/* pointer to scan through all buffers */
 	int status ;
+	char *bufn ;		/* buffer to hold buffer name */
 
-/* iterate until it gets a unique new buffer name */
-    do {
-    /* prompt for it */
-        status = newmlarg( &bufn, "name-buffer: ", sizeof( bname_t)) ;
+/* prompt for and get the new buffer name */
+ask:
+    status = newmlarg( &bufn, "Change buffer name to: ", sizeof( bname_t)) ;
     if( status != TRUE)
 		return status ;
 
-    /* and check for duplicates */
-        for( buffer_p bp = bheadp ; bp != NULL ; bp = bp->b_bufp) {
-            if( bp != curbp) {  /* it's ok to rename buffer to same, so skip */
+/* and check for duplicates */
+	bp = bheadp ;
+	while( bp != NULL) {
+		if( bp != curbp) {
 		/* retry if the names are the same */
 			if( strcmp( bufn, bp->b_bname) == 0) {
 				free( bufn) ;
-                    status = FALSE ;    /* try again */
-                    break ;
+				goto ask ;	/* try again */
 			}
 		}
+
+		bp = bp->b_bufp ;	/* onward */
 	}
-    } while( !status) ;
 
 /* copy buffer name to structure */
 	mystrscpy( curbp->b_bname, bufn, sizeof( bname_t)) ;
@@ -236,61 +257,63 @@ BINDABLE( namebuffer) {
 	return TRUE ;
 }
 
-
-/* List all of the active buffers.  First update the special buffer that
-   holds the list.  Next make sure at least 1 window is displaying the
-   buffer list, splitting the screen if this is what it takes.  Lastly,
-   repaint all of the windows that are displaying the list.  Bound to "C-X
-   C-B".
-   
-   A numeric argument forces it to list invisible buffers as well.
+/*
+ * List all of the active buffers.  First update the special
+ * buffer that holds the list.  Next make sure at least 1
+ * window is displaying the buffer list, splitting the screen
+ * if this is what it takes.  Lastly, repaint all of the
+ * windows that are displaying the list.  Bound to "C-X C-B". 
+ *
+ * A numeric argument forces it to list invisible buffers as
+ * well.
  */
-BINDABLE( listbuffers) {
-    window_p wp ;
+int listbuffers(int f, int n)
+{
+	struct window *wp;
+	int s;
 
-    int s = makelist( f) ;
-    if( s != TRUE)
-        return s ;
+	if ((s = makelist(f)) != TRUE)
+		return s;
+	if (blistp->b_nwnd == 0) {	/* Not on screen yet.   */
+		struct buffer *bp ;
 
-    if( blistp->b_nwnd == 0) {  /* Not on screen yet.   */
-        buffer_p bp ;
-
-        if( (wp = wpopup()) == NULL)
-            return FALSE ;
-
-        bp = wp->w_bufp ;
-        if( --bp->b_nwnd == 0) {
-            bp->b_dotp = wp->w_dotp ;
-            bp->b_doto = wp->w_doto ;
-            bp->b_markp = wp->w_markp ;
-            bp->b_marko = wp->w_marko ;
+		if ((wp = wpopup()) == NULL)
+			return FALSE;
+		bp = wp->w_bufp;
+		if (--bp->b_nwnd == 0) {
+			bp->b_dotp = wp->w_dotp;
+			bp->b_doto = wp->w_doto;
+			bp->b_markp = wp->w_markp;
+			bp->b_marko = wp->w_marko;
 		}
-        
-        wp->w_bufp = blistp ;
-        ++blistp->b_nwnd ;
+		wp->w_bufp = blistp;
+		++blistp->b_nwnd;
 	}
-    
-    for( wp = wheadp ; wp != NULL ; wp = wp->w_wndp) {
-        if( wp->w_bufp == blistp) {
-            wp->w_linep = lforw( blistp->b_linep) ;
-            wp->w_dotp = lforw( blistp->b_linep) ;
-            wp->w_doto = 0 ;
-            wp->w_markp = NULL ;
-            wp->w_marko = 0 ;
-            wp->w_flag |= WFMODE | WFHARD ;
+	wp = wheadp;
+	while (wp != NULL) {
+		if (wp->w_bufp == blistp) {
+			wp->w_linep = lforw(blistp->b_linep);
+			wp->w_dotp = lforw(blistp->b_linep);
+			wp->w_doto = 0;
+			wp->w_markp = NULL;
+			wp->w_marko = 0;
+			wp->w_flag |= WFMODE | WFHARD;
 		}
+		wp = wp->w_wndp;
 	}
-    
-    return TRUE ;
+	return TRUE;
 }
 
-
-/* This routine rebuilds the text in the special secret buffer that holds
-   the buffer list.  It is called by the list buffers command.  Return TRUE
-   if everything works.  Return FALSE if there is an error (if there is no
-   memory).  Iflag indicates wether to list hidden buffers.
-
-   int iflag;       list hidden buffer flag
+/*
+ * This routine rebuilds the
+ * text in the special secret buffer
+ * that holds the buffer list. It is called
+ * by the list buffers command. Return TRUE
+ * if everything works. Return FALSE if there
+ * is an error (if there is no memory). Iflag
+ * indicates wether to list hidden buffers.
+ *
+ * int iflag;		list hidden buffer flag
  */
 /* Layout: "ACT MODES          Size Buffer          File"
             AAA MMMMMMMMMSSSSSSSSSS BBBBBBBBBBBBBBB FFF...
@@ -310,7 +333,6 @@ static void do_layout( char *line, int mode) {
 			line[ 4 + i] = '.' ;
 }
 
-
 static unsigned int utf8_disp_len( const char *s) {
 	unsigned int len = 0 ;
 
@@ -324,9 +346,9 @@ static unsigned int utf8_disp_len( const char *s) {
 	return len ;
 }
 
-
-static int makelist( int iflag) {
-    buffer_p bp;
+static int makelist( int iflag)
+{
+	struct buffer *bp;
 	int s;
 	char line[ FNAMSTART + sizeof( fname_t)] ;
 
@@ -338,7 +360,7 @@ static int makelist( int iflag) {
 
 	if(		addline("ACT MODES          Size Buffer          File") == FALSE
 	    ||	addline("‾‾‾ ‾‾‾‾‾          ‾‾‾‾ ‾‾‾‾‾‾          ‾‾‾‾") == FALSE)
-        return FALSE ;
+		return FALSE;
 
 /* report global mode settings */
 	do_layout( line, gmode) ;
@@ -349,7 +371,7 @@ static int makelist( int iflag) {
 	for( bp = bheadp ; bp != NULL ; bp = bp->b_bufp) {	/* For all buffers */
 		char *cp1, *cp2 ;
 		int c ;
-        line_p lp ;
+		struct line *lp ;
 		long nbytes ;		/* # of bytes in current buffer */
 		long nlines ;		/* # of lines in current buffer */
 
@@ -408,8 +430,8 @@ static int makelist( int iflag) {
 	return TRUE ;		/* All done             */
 }
 
-
-static void l_to_a(char *buf, int width, long num) {
+static void l_to_a(char *buf, int width, long num)
+{
 	buf[ --width] = 0 ;		/* End of string.       */
 	while (num >= 10) {	/* Conditional digits.  */
 		buf[--width] = (int) (num % 10L) + '0';
@@ -420,82 +442,87 @@ static void l_to_a(char *buf, int width, long num) {
 		buf[--width] = ' ';
 }
 
-
-/* The argument "text" points to a string.  Append this line to the buffer
-   list buffer.  Handcraft the EOL on the end.  Return TRUE if it worked
-   and FALSE if you ran out of room.
+/*
+ * The argument "text" points to
+ * a string. Append this line to the
+ * buffer list buffer. Handcraft the EOL
+ * on the end. Return TRUE if it worked and
+ * FALSE if you ran out of room.
  */
-static int addline( char *text) {
-    int ntext = strlen( text) ;
-    line_p lp = lalloc( ntext) ;
-    if( lp == NULL)
-        return FALSE ;
+static int addline( char *text)
+{
+	struct line *lp;
+	int i;
+	int ntext;
 
-    for( int i = 0 ; i < ntext ; ++i)
-        lputc( lp, i, text[ i]) ;
-
-    blistp->b_linep->l_bp->l_fp = lp ;      /* Hook onto the end    */
-    lp->l_bp = blistp->b_linep->l_bp ;
-    blistp->b_linep->l_bp = lp ;
-    lp->l_fp = blistp->b_linep ;
-    if( blistp->b_dotp == blistp->b_linep)  /* If "." is at the end */
-        blistp->b_dotp = lp ;               /* move it to new line  */
-
-    return TRUE ;
+	ntext = strlen(text);
+	if ((lp = lalloc(ntext)) == NULL)
+		return FALSE;
+	for (i = 0; i < ntext; ++i)
+		lputc(lp, i, text[i]);
+	blistp->b_linep->l_bp->l_fp = lp;	/* Hook onto the end    */
+	lp->l_bp = blistp->b_linep->l_bp;
+	blistp->b_linep->l_bp = lp;
+	lp->l_fp = blistp->b_linep;
+	if (blistp->b_dotp == blistp->b_linep)	/* If "." is at the end */
+		blistp->b_dotp = lp;	/* move it to new line  */
+	return TRUE;
 }
 
-
-/* Look through the list of buffers.  Return TRUE if there are any changed
-   buffers.  Buffers that hold magic internal stuff are not considered; who
-   cares if the list of buffer names is hacked.  Return FALSE if no buffers
-   have been changed.
+/*
+ * Look through the list of
+ * buffers. Return TRUE if there
+ * are any changed buffers. Buffers
+ * that hold magic internal stuff are
+ * not considered; who cares if the
+ * list of buffer names is hacked.
+ * Return FALSE if no buffers
+ * have been changed.
  */
-boolean anycb( void) {
-    for( buffer_p bp = bheadp ; bp != NULL ; bp = bp->b_bufp) {
-        if( (bp->b_flag & (BFINVS | BFCHG)) == BFCHG)
-            return TRUE ;
+int anycb(void)
+{
+	struct buffer *bp;
+
+	bp = bheadp;
+	while (bp != NULL) {
+		if ((bp->b_flag & BFINVS) == 0
+		    && (bp->b_flag & BFCHG) != 0)
+			return TRUE;
+		bp = bp->b_bufp;
 	}
-
-    return FALSE ;
+	return FALSE;
 }
 
-
-/* Find a buffer, by name.  Return a pointer to the buffer structure
-   associated with it.  If the buffer is not found and the "create_f" is
-   TRUE, create it.  The "flags" is the settings for the buffer flags.
+/*
+ * Find a buffer, by name. Return a pointer
+ * to the buffer structure associated with it.
+ * If the buffer is not found
+ * and the "cflag" is TRUE, create it. The "bflag" is
+ * the settings for the flags in in buffer.
  */
-buffer_p bfind( const char *bname, boolean create_f, int flags) {
-    buffer_p bp ;
+struct buffer *bfind( const char *bname, int cflag, int bflag)
+{
+	struct buffer *bp;
+	struct line *lp;
 
 	for( bp = bheadp ; bp != NULL ; bp = bp->b_bufp)
 		if( strcmp( bname, bp->b_bname) == 0)
 			return bp ;
 
-    if( create_f != FALSE) {
-    /* allocate empty buffer */
-        bp = malloc( sizeof *bp) ;
-        if( bp == NULL)
-            return NULL ;
-
-        line_p lp = lalloc( 0) ;
-        if( lp == NULL) {
-            free( bp) ;
-            return NULL ;
+	if (cflag != FALSE) {
+		if ((bp = (struct buffer *)malloc(sizeof(struct buffer))) == NULL)
+			return NULL;
+		if ((lp = lalloc(0)) == NULL) {
+			free((char *) bp);
+			return NULL;
 		}
-
-        lp->l_fp = lp ;
-        lp->l_bp = lp ;
-        bp->b_linep = lp ;
-        bp->b_dotp = lp ;
-        bp->b_doto = 0 ;
-
 		/* find the place in the list to insert this buffer */
-        if( bheadp == NULL || strcmp( bheadp->b_bname, bname) > 0) {
+		if (bheadp == NULL || strcmp(bheadp->b_bname, bname) > 0) {
 			/* insert at the beginning */
-            bp->b_bufp = bheadp ;
-            bheadp = bp ;
+			bp->b_bufp = bheadp;
+			bheadp = bp;
 		} else {
-            buffer_p sb ;   /* buffer to insert after */
+			struct buffer *sb;	/* buffer to insert after */
 
 			for( sb = bheadp ; sb->b_bufp != NULL ; sb = sb->b_bufp)
 				if( strcmp( sb->b_bufp->b_bname, bname) > 0)
@@ -507,54 +534,60 @@ buffer_p bfind( const char *bname, boolean create_f, int flags) {
 		}
 
 		/* and set up the other buffer fields */
-        bp->b_active = TRUE ;
-        bp->b_markp = NULL ;
-        bp->b_marko = 0 ;
-        bp->b_flag = flags ;
-        bp->b_mode = gmode ;
-        bp->b_nwnd = 0 ;
+		bp->b_active = TRUE;
+		bp->b_dotp = lp;
+		bp->b_doto = 0;
+		bp->b_markp = NULL;
+		bp->b_marko = 0;
+		bp->b_flag = bflag;
+		bp->b_mode = gmode;
+		bp->b_nwnd = 0;
+		bp->b_linep = lp;
 		bp->b_fname[ 0] = '\0' ;
 		mystrscpy( bp->b_bname, bname, sizeof( bname_t)) ;
+		lp->l_fp = lp;
+		lp->l_bp = lp;
 	}
-
-    return bp ;
+	return bp;
 }
 
-
-/* This routine blows away all of the text in a buffer.  If the buffer is
-   marked as changed then we ask if it is ok to blow it away; this is to
-   save the user the grief of losing text.  The window chain is nearly
-   always wrong if this gets called; the caller must arrange for the
-   updates that are required.  Return TRUE if everything looks good.
+/*
+ * This routine blows away all of the text
+ * in a buffer. If the buffer is marked as changed
+ * then we ask if it is ok to blow it away; this is
+ * to save the user the grief of losing text. The
+ * window chain is nearly always wrong if this gets
+ * called; the caller must arrange for the updates
+ * that are required. Return TRUE if everything
+ * looks good.
  */
-int bclear( buffer_p bp) {
-    line_p lp ;
-    int s ;
+int bclear(struct buffer *bp)
+{
+	struct line *lp;
+	int s;
 
-    if( (bp->b_flag & (BFINVS | BFCHG)) == BFCHG    /* regular and changed */
-    &&  (s = mlyesno( "Discard changes")) != TRUE)
-        return s ;
-
-    bp->b_flag &= ~BFCHG ;      /* Not changed          */
-    while( (lp = lforw( bp->b_linep)) != bp->b_linep)
-        lfree( lp) ;
-
-    bp->b_dotp = bp->b_linep ;  /* Fix "."              */
-    bp->b_doto = 0 ;
-    bp->b_markp = NULL ;        /* Invalidate "mark"    */
-    bp->b_marko = 0 ;
-    return TRUE ;
+	if ((bp->b_flag & BFINVS) == 0	/* Not scratch buffer.  */
+	    && (bp->b_flag & BFCHG) != 0	/* Something changed    */
+	    && (s = mlyesno("Discard changes")) != TRUE)
+		return s;
+	bp->b_flag &= ~BFCHG;	/* Not changed          */
+	while ((lp = lforw(bp->b_linep)) != bp->b_linep)
+		lfree(lp);
+	bp->b_dotp = bp->b_linep;	/* Fix "."              */
+	bp->b_doto = 0;
+	bp->b_markp = NULL;	/* Invalidate "mark"    */
+	bp->b_marko = 0;
+	return TRUE;
 }
 
-
-/* unmark the current buffers change flag
+/*
+ * unmark the current buffers change flag
  *
  * int f, n;		unused command arguments
  */
-BINDABLE( unmark) {
-    curbp->b_flag &= ~BFCHG ;
-    curwp->w_flag |= WFMODE ;
-    return TRUE ;
+int unmark(int f, int n)
+{
+	curbp->b_flag &= ~BFCHG;
+	curwp->w_flag |= WFMODE;
+	return TRUE;
 }
-
-/* end of buffer.c */

buffer.h

@@ -1,36 +1,33 @@
-/* buffer.h -- buffer type and functions */
 #ifndef _BUFFER_H_
-# define _BUFFER_H_
+#define _BUFFER_H_
 
 #include "line.h"
-#include "names.h"
-
-/* Text is kept in buffers.  A buffer header, described below, exists for
-   every buffer in the system.  The buffers are kept in a big list, so that
-   commands that search for a buffer by name can find the buffer header.
-   There is a safe store for the dot and mark in the header, but this is
-   only valid if the buffer is not being displayed (that is, if "b_nwnd" is
-   0).  The text for the buffer is kept in a circularly linked list of
-   lines, with a pointer to the header line in "b_linep".
-
-   Buffers may be "Inactive" which means the files associated with them
-   have not been read in yet.  These get read in at "use buffer" time.
- */
 
 typedef char fname_t[ 256] ;	/* file name type */
 typedef char bname_t[ 16] ;		/* buffer name type */
 
+/*
+ * Text is kept in buffers. A buffer header, described below, exists for every
+ * buffer in the system. The buffers are kept in a big list, so that commands
+ * that search for a buffer by name can find the buffer header. There is a
+ * safe store for the dot and mark in the header, but this is only valid if
+ * the buffer is not being displayed (that is, if "b_nwnd" is 0). The text for
+ * the buffer is kept in a circularly linked list of lines, with a pointer to
+ * the header line in "b_linep".
+ * 	Buffers may be "Inactive" which means the files associated with them
+ * have not been read in yet. These get read in at "use buffer" time.
+ */
 typedef struct buffer {
-    struct buffer *b_bufp ; /* Link to next struct buffer           */
+    struct buffer *b_bufp;	/* Link to next struct buffer   */
 	line_p b_dotp ;		/* Link to "." struct line structure   */
 	line_p b_markp ;	/* The same as the above two,   */
 	line_p b_linep ;	/* Link to the header struct line      */
-    int b_doto ;            /* Offset of "." in above struct line   */
-    int b_marko ;           /* but for the "mark"           */
-    int b_mode ;            /* editor mode of this buffer   */
-    char b_active ;         /* window activated flag        */
-    char b_nwnd ;           /* Count of windows on buffer   */
-    char b_flag ;           /* Flags                        */
+	int b_doto;		/* Offset of "." in above struct line  */
+	int b_marko;		/* but for the "mark"           */
+	int b_mode;		/* editor mode of this buffer   */
+	char b_active;		/* window activated flag        */
+	char b_nwnd;		/* Count of windows on buffer   */
+	char b_flag;		/* Flags                        */
 	fname_t b_fname ;	/* File name                    */
 	bname_t b_bname ;	/* Buffer name                  */
 } *buffer_p ;
@@ -56,27 +53,22 @@ extern buffer_p blistp ;    /* Buffer for C-X C-B           */
 #define MDUTF8	0x0080		/* utf8 mode                    */
 #define MDDOS	0x0100		/* CRLF eol mode                */
 
-extern const char *modename[ NUMMODES] ;    /* text names of modes */
+
+extern const char *modename[] ;	/* text names of modes          */
 extern int gmode ;		/* global editor mode           */
 
 
-/* Bindable functions */
-BINDABLE( killbuffer) ;
-BINDABLE( listbuffers) ;
-BINDABLE( namebuffer) ;
-BINDABLE( nextbuffer) ;
-BINDABLE( unmark) ;
-BINDABLE( usebuffer) ;
-
-boolean anycb( void) ;          /* Any changed buffer? */
-int bclear( buffer_p bp) ;      /* empty buffer */
-int swbuffer( buffer_p bp) ;    /* switch to buffer, make it current */
-int zotbuf( buffer_p bp) ;      /* remove buffer */
-
-/* Lookup a buffer by name.  If not found and create_f is TRUE then create
-   it with flags set.
-*/
-buffer_p bfind( const char *bname, boolean create_f, int flags) ;
+int usebuffer( int f, int n) ;
+int nextbuffer( int f, int n) ;
+int swbuffer( buffer_p bp) ;
+int killbuffer( int f, int n) ;
+int zotbuf( buffer_p bp) ;
+int namebuffer( int f, int n) ;
+int listbuffers( int f, int n) ;
+int anycb( void) ;
+int bclear( buffer_p bp) ;
+int unmark( int f, int n) ;
+/* Lookup a buffer by name. */
+buffer_p bfind( const char *bname, int cflag, int bflag) ;
 
 #endif
-/* end of buffer.h */

display.c

@@ -1,14 +1,17 @@
 /* display.c -- implements display.h */
+
 #include "display.h"
 
 #define	REVSTA	1  /* Status line appears in reverse video         */
 
-/* The functions in this file handle redisplay.  There are two halves, the
-   ones that update the virtual display screen, and the ones that make the
-   physical display screen the same as the virtual display screen.  These
-   functions use hints that are left in the windows by the commands.
-
-   Modified by Petri Kutvonen
+/*	display.c
+ *
+ *      The functions in this file handle redisplay. There are two halves, the
+ *      ones that update the virtual display screen, and the ones that make the
+ *      physical display screen the same as the virtual display screen. These
+ *      functions use hints that are left in the windows by the commands.
+ *
+ *	Modified by Petri Kutvonen
  */
 
 #include <errno.h>
@@ -248,37 +251,40 @@ static void vteeol( void) {
 		vcp[ vtcol++] = ' ' ;
 }
 
-/* upscreen:
+/*
+ * upscreen:
  *	user routine to force a screen update
  *	always finishes complete update
  */
-BINDABLE( upscreen) {
-	update( TRUE) ;
-	return TRUE ;
+int upscreen(int f, int n)
+{
+	update(TRUE);
+	return TRUE;
 }
 
 #if SCROLLCODE
 static int scrflags;
 #endif
 
-
-/* Make sure that the display is right.  This is a three part process.
-   First, scan through all of the windows looking for dirty ones.  Check
-   the framing, and refresh the screen.  Second, make sure that "currow"
-   and "curcol" are correct for the current window.  Third, make the
-   virtual and physical screens the same.
-
-   boolean force_f ;		force update past type ahead?
+/*
+ * Make sure that the display is right. This is a three part process. First,
+ * scan through all of the windows looking for dirty ones. Check the framing,
+ * and refresh the screen. Second, make sure that "currow" and "curcol" are
+ * correct for the current window. Third, make the virtual and physical
+ * screens the same.
+ *
+ * int force;		force update past type ahead?
  */
-int update( boolean force_f) {
+int update(int force)
+{
 	struct window *wp;
 
 #if	TYPEAH && ! PKCODE
-	if( force_f == FALSE && typahead())
+	if (force == FALSE && typahead())
 		return TRUE;
 #endif
 #if	VISMAC == 0
-	if( force_f == FALSE && kbdmode == PLAY)
+	if (force == FALSE && kbdmode == PLAY)
 		return TRUE;
 #endif
 
@@ -353,7 +359,7 @@ int update( boolean force_f) {
 		updgar();
 
 	/* update the virtual screen to the physical screen */
-	updupd( force_f) ;
+	updupd(force);
 
 	/* update the cursor and flush the buffers */
 	movecursor(currow, curcol - lbound);

display.h

@@ -1,12 +1,10 @@
-/* display.h -- display functionality */
 #ifndef _DISPLAY_H_
-# define _DISPLAY_H_
+#define _DISPLAY_H_
 
-# include <stdarg.h>
+#include <stdarg.h>
 
-# include "estruct.h"
-# include "names.h"		/* BINDABLE() */
-# include "utf8.h"		/* unicode_t */
+#include "estruct.h"
+#include "utf8.h"
 
 extern int mpresf ;		/* Stuff in message line */
 extern int scrollcount ;	/* number of lines to scroll */
@@ -15,13 +13,11 @@ extern int disinp ;		/* display input characters (echo)	*/
 extern int gfcolor ;		/* global forgrnd color (white) */
 extern int gbcolor ;		/* global backgrnd color (black) */
 
-/* Bindable functions */
-BINDABLE( upscreen) ;
-
 void vtinit( void) ;
 void vtfree( void) ;
 void vttidy( void) ;
-int update( boolean force_f) ;
+int upscreen( int f, int n) ;
+int update( int force) ;
 void updpos( void) ;
 void upddex( void) ;
 void updgar( void) ;
@@ -37,13 +33,13 @@ void echos( const char *s) ;
 void rubout( void) ;
 void getscreensize( int *widthp, int *heightp) ;
 
-# if UNIX
-#  include <signal.h>
-#  ifdef SIGWINCH
+#if UNIX
+#include <signal.h>
+#ifdef SIGWINCH
 extern int chg_width, chg_height ;
 
 void sizesignal( int signr) ;
-#  endif
-# endif
 #endif
-/* end of display.h */
+#endif
+
+#endif

eval.c

@@ -1,7 +1,9 @@
 /* eval.c -- implements eval.h */
 #include "eval.h"
 
-/*	Expression evaluation functions
+/*	eval.c
+ *
+ *	Expression evaluation functions
  *
  *	written 1986 by Daniel Lawrence
  *	modified by Petri Kutvonen
@@ -208,7 +210,7 @@ static struct {
 	{ "and", UFAND		| DYNAMIC },	/* logical and */
 	{ "asc", UFASCII	| MONAMIC },	/* char to integer conversion */
 	{ "ban", UFBAND		| DYNAMIC },	/* bitwise and   9-10-87  jwm */
-	{ "bin", UFBIND		| MONAMIC },	/* look up function name bound to key */
+	{ "bin", UFBIND		| MONAMIC },	/* loopup what function name is bound to a key */
 	{ "bno", UFBNOT		| MONAMIC },	/* bitwise not */
 	{ "bor", UFBOR		| DYNAMIC },	/* bitwise or    9-10-87  jwm */
 	{ "bxo", UFBXOR		| DYNAMIC },	/* bitwise xor   9-10-87  jwm */
@@ -795,13 +797,14 @@ static char *gtenv( char *vname) {
 	return errorm ;
 }
 
-
-/* set a variable
+/*
+ * set a variable
  *
  * int f;		default flag
  * int n;		numeric arg (can overide prompted value)
  */
-BINDABLE( setvar) {
+int setvar(int f, int n)
+{
 	int status;	/* status return */
 	struct variable_description vd;		/* variable num/type */
 	char var[NVSIZE + 2];	/* name of variable to fetch %1234567890\0 */
@@ -1463,25 +1466,28 @@ static void mlforce( char *s) {
 	discmd = oldcmd;	/* and restore the original setting */
 }
 
-
-/* This function simply clears the message line, mainly for macro usage
+/*
+ * This function simply clears the message line,
+ * mainly for macro usage
  *
  * int f, n;		arguments ignored
  */
-TBINDABLE( clrmes) {
+int clrmes( int f, int n) {
 	mlforce( "") ;
 	return TRUE ;
 }
 
-
-/* This function writes a string on the message line mainly for macro usage
+/*
+ * This function writes a string on the message line
+ * mainly for macro usage
  *
  * int f, n;		arguments ignored
  */
-BINDABLE( writemsg) {
+int writemsg( int f, int n) {
+	int status ;
 	char *buf ;		/* buffer to receive message into */
 
-	int status = newmlarg( &buf, "write-message: ", 0) ;
+	status = newmlarg( &buf, "Message to write: ", 0) ;
 	if( status == TRUE) {
 	/* write the message out */
 		mlforce( buf) ;

eval.h

@@ -1,14 +1,13 @@
-/* eval.h -- variables and operands evaluation */
 #ifndef _EVAL_H_
-# define _EVAL_H_
+#define _EVAL_H_
 
-#include "names.h"
 
 #define DEBUGM	1		/* $debug triggers macro debugging	*/
 
-# if    DEBUGM
+#if	DEBUGM
 int mdbugout( char *fmt, ...) ;
-# endif
+#endif
+
 
 extern int macbug ;		/* macro debuging flag          */
 extern int cmdstatus ;		/* last command status          */
@@ -19,15 +18,12 @@ int readfirst_f( void) ;
 int is_it_cmd( char *token) ;
 
 void varinit( void) ;
+int setvar( int f, int n) ;
 const char *getval( char *token) ;
 int stol( char *val) ;
 char *mklower( char *str) ;
 
-/* Bindable functions */
-TBINDABLE( clrmes) ;
-BINDABLE( setvar) ;
-BINDABLE( writemsg) ;
+int clrmes( int f, int n) ;
+int writemsg( int f, int n) ;
 
 #endif
-
-/* end of eval.h */

exec.h

@@ -1,65 +1,69 @@
-/* exec.h -- bindable functions to execute functions, macros and procedures */
 #ifndef _EXEC_H_
-# define _EXEC_H_
+#define _EXEC_H_
+
+#include "retcode.h"
+
+
+#define	PROC	1	/* named procedures  */
+
+#if PROC
+int storeproc( int f, int n) ;
+int execproc( int f, int n) ;
+#endif
 
-#include "names.h"
 
 extern boolean clexec ;	/* command line execution flag  */
 
-int dofile( const char *fname) ;
+
+int namedcmd( int f, int n) ;
+int execcmd( int f, int n) ;
 void gettoken( char *tok, int maxtoksize) ;
 boolean gettokval( char *tok, int maxtoksize) ;
 char *getnewtokval( void) ;
+int storemac( int f, int n) ;
+int execbuf( int f, int n) ;
+int execfile( int f, int n) ;
+int dofile( const char *fname) ;
 
-/* Bindable functions */
-BINDABLE( execbuf) ;
-BINDABLE( execcmd) ;
-BINDABLE( execfile) ;
-BINDABLE( execproc) ;
-BINDABLE( namedcmd) ;
-BINDABLE( storemac) ;
-BINDABLE( storeproc) ;
-BINDABLE( cbuf1) ;
-BINDABLE( cbuf2) ;
-BINDABLE( cbuf3) ;
-BINDABLE( cbuf4) ;
-BINDABLE( cbuf5) ;
-BINDABLE( cbuf6) ;
-BINDABLE( cbuf7) ;
-BINDABLE( cbuf8) ;
-BINDABLE( cbuf9) ;
-BINDABLE( cbuf10) ;
-BINDABLE( cbuf11) ;
-BINDABLE( cbuf12) ;
-BINDABLE( cbuf13) ;
-BINDABLE( cbuf14) ;
-BINDABLE( cbuf15) ;
-BINDABLE( cbuf16) ;
-BINDABLE( cbuf17) ;
-BINDABLE( cbuf18) ;
-BINDABLE( cbuf19) ;
-BINDABLE( cbuf20) ;
-BINDABLE( cbuf21) ;
-BINDABLE( cbuf22) ;
-BINDABLE( cbuf23) ;
-BINDABLE( cbuf24) ;
-BINDABLE( cbuf25) ;
-BINDABLE( cbuf26) ;
-BINDABLE( cbuf27) ;
-BINDABLE( cbuf28) ;
-BINDABLE( cbuf29) ;
-BINDABLE( cbuf30) ;
-BINDABLE( cbuf31) ;
-BINDABLE( cbuf32) ;
-BINDABLE( cbuf33) ;
-BINDABLE( cbuf34) ;
-BINDABLE( cbuf35) ;
-BINDABLE( cbuf36) ;
-BINDABLE( cbuf37) ;
-BINDABLE( cbuf38) ;
-BINDABLE( cbuf39) ;
-BINDABLE( cbuf40) ;
+int cbuf1( int f, int n) ;
+int cbuf2( int f, int n) ;
+int cbuf3( int f, int n) ;
+int cbuf4( int f, int n) ;
+int cbuf5( int f, int n) ;
+int cbuf6( int f, int n) ;
+int cbuf7( int f, int n) ;
+int cbuf8( int f, int n) ;
+int cbuf9( int f, int n) ;
+int cbuf10( int f, int n) ;
+int cbuf11( int f, int n) ;
+int cbuf12( int f, int n) ;
+int cbuf13( int f, int n) ;
+int cbuf14( int f, int n) ;
+int cbuf15( int f, int n) ;
+int cbuf16( int f, int n) ;
+int cbuf17( int f, int n) ;
+int cbuf18( int f, int n) ;
+int cbuf19( int f, int n) ;
+int cbuf20( int f, int n) ;
+int cbuf21( int f, int n) ;
+int cbuf22( int f, int n) ;
+int cbuf23( int f, int n) ;
+int cbuf24( int f, int n) ;
+int cbuf25( int f, int n) ;
+int cbuf26( int f, int n) ;
+int cbuf27( int f, int n) ;
+int cbuf28( int f, int n) ;
+int cbuf29( int f, int n) ;
+int cbuf30( int f, int n) ;
+int cbuf31( int f, int n) ;
+int cbuf32( int f, int n) ;
+int cbuf33( int f, int n) ;
+int cbuf34( int f, int n) ;
+int cbuf35( int f, int n) ;
+int cbuf36( int f, int n) ;
+int cbuf37( int f, int n) ;
+int cbuf38( int f, int n) ;
+int cbuf39( int f, int n) ;
+int cbuf40( int f, int n) ;
 
 #endif
-
-/* end of exec.h */

file.c

@@ -1,11 +1,13 @@
 /* file.c -- implements file.h */
 #include "file.h"
 
-/* The routines in this file handle the reading, writing and lookup of disk
-   files.  All of details about the reading and writing of the disk are in
-   "fileio.c".
-
-   modified by Petri Kutvonen
+/*	file.c
+ *
+ *	The routines in this file handle the reading, writing
+ *	and lookup of disk files.  All of details about the
+ *	reading and writing of the disk are in "fileio.c".
+ *
+ *	modified by Petri Kutvonen
  */
 
 #include <assert.h>
@@ -231,8 +233,8 @@ int getfile( const char *fname, boolean lockfl) {
 	return s;
 }
 
-
-/* Read file "fname" into the current buffer, blowing away any text
+/*
+ * Read file "fname" into the current buffer, blowing away any text
  * found there.  Called by both the read and find commands.  Return
  * the final status of the read.  Also called by the mainline, to
  * read in a file specified on the command line as an argument.
@@ -282,10 +284,10 @@ int readin(const char *fname, boolean lockfl)
 
 	/* read the file in */
 		mloutstr( "(Reading file)") ;
-		while( (s = ffgetline()) == FIOSUC) {
+		while ((s = ffgetline()) == FIOSUC) {
 			line_p	lp ;
 
-			if( nline >= 10000000 /* Maximum # of lines from one file */
+			if( nline >= 10000000 /* MAXNLINE Maximum # of lines from one file */
 			||	(lp = lalloc( fpayload)) == NULL) {
 				s = FIOMEM ;	/* Keep message on the	*/
 				break ; 		/* display. 			*/
@@ -325,11 +327,12 @@ int readin(const char *fname, boolean lockfl)
 		if( fcode == FCODE_UTF_8)
 			curbp->b_mode |= MDUTF8 ;
 
-		if( s == FIOERR
-		||	s == FIOMEM) {
-			errmsg = (s == FIOERR) ? "I/O ERROR, " : "OUT OF MEMORY, " ;
+		if( s == FIOERR) {
+			errmsg = "I/O ERROR, " ;
+			curbp->b_flag |= BFTRUNC ;
+		} else if( s == FIOMEM) {
+			errmsg = "OUT OF MEMORY, " ;
 			curbp->b_flag |= BFTRUNC ;
-			curbp->b_mode |= MDVIEW ;	/* force view mode as lost data */
 		} else
 			errmsg = "" ;
 
@@ -461,8 +464,10 @@ BINDABLE( filesave) {
 
 	/* complain about truncated files */
 	if( (curbp->b_flag & BFTRUNC) != 0
-	&&	mlyesno( "Truncated file ... write it out") == FALSE)
-		return mloutfail( "(Aborted)") ;
+	&&	mlyesno("Truncated file ... write it out") == FALSE) {
+		mloutfmt( "%B(Aborted)") ;
+		return FALSE ;
+	}
 
 	return writeout( curbp->b_fname) ;
 }

input.c

@@ -15,10 +15,9 @@
 #include "bind.h"
 #include "estruct.h"
 #include "bindable.h"
-#include "display.h"	/* rubout(), echos(), echoc(), update() */
+#include "display.h"
 #include "exec.h"
 #include "isa.h"
-#include "mlout.h"
 #include "names.h"
 #include "terminal.h"
 #include "utf8.h"
@@ -39,12 +38,12 @@ kbdstate kbdmode = STOP ;   /* current keyboard macro mode  */
 int lastkey = 0 ;       /* last keystoke                */
 int kbdrep = 0 ;        /* number of repetitions        */
 
-int metac = CTL_ | '[' ;		/* current meta character 	 */
-int ctlxc = CTL_ | 'X' ;		/* current control X prefix char */
-int reptc = CTL_ | 'U' ;		/* current universal repeat char */
-int abortc = CTL_ | 'G' ;		/* current abort command char	 */
+int metac = CTRL | '[' ;		/* current meta character 	 */
+int ctlxc = CTRL | 'X' ;		/* current control X prefix char */
+int reptc = CTRL | 'U' ;		/* current universal repeat char */
+int abortc = CTRL | 'G' ;		/* current abort command char	 */
 
-const int nlc = CTL_ | 'J' ;		/* end of input char */
+const int nlc = CTRL | 'J' ;		/* end of input char */
 
 
 void ue_system( const char *cmd) {
@@ -67,7 +66,7 @@ int mlyesno( const char *prompt)
 
     for (;;) {
         /* prompt the user */
-		mloutfmt( "%s (y/n)? ", prompt) ;
+		mlwrite( "%s (y/n)? ", prompt) ;
 
         /* get the response */
         c = get1key() ;
@@ -143,11 +142,11 @@ int newmlargt( char **outbufref, const char *prompt, int size) {
 /*
  * ectoc:
  *  expanded character to character
- *  collapse the CTL_ and SPEC flags back into an ascii code
+ *  collapse the CTRL and SPEC flags back into an ascii code
  */
 int ectoc( int c) {
-	if( c & CTL_)
-		c ^= CTL_ | 0x40 ;
+	if( c & CTRL)
+		c ^= CTRL | 0x40 ;
 
 	if( c & SPEC)
 		c &= 255 ;
@@ -190,10 +189,10 @@ nbind_p getname( void) {
             /* and match it off */
             return fncmatch( buf) ;
 
-        } else if( c == ectoc(abortc)) {    /* Bell, abort */
-            ctrlg( FALSE, 1) ;
-            TTflush() ;
-            return NULL ;
+        } else if (c == ectoc(abortc)) {    /* Bell, abort */
+            ctrlg(FALSE, 0);
+            TTflush();
+            return NULL;
 
         } else if (c == 0x7F || c == 0x08) {    /* rubout/erase */
             if (cpos != 0) {
@@ -323,7 +322,7 @@ int tgetc(void)
 }
 
 /*  GET1KEY: Get one keystroke. The only prefixes legal here are the SPEC
-    and CTL_ prefixes. */
+    and CTRL prefixes. */
 static int get1unicode( int *up) {
 /* Accept UTF-8 sequence */
 	int bytes ;
@@ -344,7 +343,7 @@ static int get1unicode( int *up) {
 		bytes = utf8_to_unicode( utf, 0, sizeof utf, (unicode_t *) up) ;
 	} else {
 	    if( (c >= 0x00 && c <= 0x1F) || c == 0x7F)	/* C0 control -> C- */
-			c ^= CTL_ | 0x40 ;
+			c ^= CTRL | 0x40 ;
 
 		*up = c ;
 		bytes = 1 ;
@@ -384,7 +383,7 @@ int getcmd( void) {
 		c = *(kptr++) = get1key() ;
 		if( c == 0x9B)
 			goto foundCSI ;
-		else if( c == (CTL_ | '[')) {
+		else if( c == (CTRL | '[')) {
 		/* fetch terminal sequence */
 			c = *(kptr++) = get1key() ;
 			if( c == 'O') {	/* F1 .. F4 */
@@ -408,7 +407,7 @@ int getcmd( void) {
 								mask = META ;
 
 							if( (v - 1) & 4)
-								mask |= CTL_ ;
+								mask |= CTRL ;
 
 							v = v1 ;
 						}
@@ -514,7 +513,7 @@ int getstring( const char *prompt, char *buf, int nbuf, int eolchar)
     quote_f = FALSE;
 
     /* prompt the user for the input string */
-    mloutstr( prompt);
+    mlwrite( "%s", prompt);
 
     for (;;) {
 #if COMPLC
@@ -539,22 +538,23 @@ int getstring( const char *prompt, char *buf, int nbuf, int eolchar)
 		}
 
 	/* If it is a <ret>, change it to a <NL> */
-        if( c == (CTL_ | 'M'))
-            c = CTL_ | 0x40 | '\n' ;
+        if( c == (CTRL | 'M'))
+            c = CTRL | 0x40 | '\n' ;
 
         if( c == eolchar) {
 		/* if they hit the line terminator, wrap it up */
             buf[ cpos] = 0 ;
 
 		/* clear the message line */
-            mloutstr( "") ;
+            mlwrite("");
 
 		/* if we default the buffer, return FALSE */
 			retval = cpos != 0 ;
 			break ;
         } else if( c == abortc) {
 		/* Abort the input? */
-            retval = ctrlg( FALSE, 1) ;
+            ctrlg( FALSE, 0) ;
+			retval = ABORT ;
 			break ;
 		}
 
@@ -574,7 +574,7 @@ int getstring( const char *prompt, char *buf, int nbuf, int eolchar)
             }
         } else if( c == 0x15) {
         /* C-U, kill */
-			mloutstr( prompt) ;
+			mlwrite( "%s", prompt) ;
 			cpos = 0 ;
 #if COMPLC
         } else if( (c == 0x09 || c == ' ') && file_f) {
@@ -588,7 +588,7 @@ int getstring( const char *prompt, char *buf, int nbuf, int eolchar)
 
             didtry = 1;
             ocpos = cpos;
-			mloutstr( prompt) ;
+			mlwrite( "%s", prompt) ;
 			while( cpos != 0) {
 				c = buf[ --cpos] ;
                 if( c == '*' || c == '?') {

isearch.c

@@ -1,7 +1,8 @@
-/* isearch.c -- implements isearch.h */
 #include "isearch.h"
 
-/* The functions in this file implement commands that perform incremental
+/*	isearch.c
+ *
+ * The functions in this file implement commands that perform incremental
  * searches in the forward and backward directions.  This "ISearch" command
  * is intended to emulate the same command from the original EMACS
  * implementation (ITS).  Contains references to routines internal to
@@ -23,6 +24,7 @@
  *	Modified by Petri Kutvonen
  */
 
+#include <stdio.h>
 #include <string.h>
 
 #include "basic.h"
@@ -40,6 +42,8 @@
 /*
  * Incremental search defines.
  */
+#if	ISRCH
+
 #define	CMDBUFLEN	256	/* Length of our command buffer */
 
 #define	IS_ABORT	0x07	/* Abort the isearch */
@@ -56,7 +60,10 @@
 
 /* IS_QUIT is no longer used, the variable metac is used instead */
 
-static BINDABLE( isearch) ;	/* internal use, not to be bound */
+#endif
+
+
+static int isearch( int f, int n) ;
 static int checknext( char chr, char *patrn, int dir) ;
 static int scanmore( char *patrn, int dir) ;
 static int match_pat( char *patrn) ;
@@ -66,6 +73,8 @@ static int uneat( void) ;
 static void reeat( int c) ;
 
 
+#if	ISRCH
+
 static int echo_char(int c, int col);
 
 /* A couple of "own" variables for re-eat */
@@ -80,10 +89,12 @@ static int cmd_offset;			/* Current offset into command buff */
 static int cmd_reexecute = -1;		/* > 0 if re-executing command */
 
 
-/* Subroutine to do incremental reverse search.  It actually uses the
+/*
+ * Subroutine to do incremental reverse search.  It actually uses the
  * same code as the normal incremental search, as both can go both ways.
  */
-BINDABLE( risearch) {
+int risearch(int f, int n)
+{
 	struct line *curline;		/* Current line on entry              */
 	int curoff;		/* Current offset on entry            */
 
@@ -113,10 +124,11 @@ BINDABLE( risearch) {
 	return TRUE;
 }
 
-
-/* Again, but for the forward direction
+/*
+ * Again, but for the forward direction
  */
-BINDABLE( fisearch) {
+int fisearch(int f, int n)
+{
 	struct line *curline;		/* Current line on entry              */
 	int curoff;		/* Current offset on entry            */
 
@@ -144,8 +156,8 @@ BINDABLE( fisearch) {
 	return TRUE;
 }
 
-
-/* Subroutine to do an incremental search.  In general, this works similarly
+/*
+ * Subroutine to do an incremental search.  In general, this works similarly
  * to the older micro-emacs search function, except that the search happens
  * as each character is typed, with the screen and cursor updated with each
  * new search character.
@@ -170,7 +182,8 @@ BINDABLE( fisearch) {
  * exists (or until the search is aborted).
  */
 
-static BINDABLE( isearch) {
+static int isearch(int f, int n)
+{
 	int status;		/* Search status */
 	int col;		/* prompt column */
 	unsigned cpos ;	/* character number in search string  */
@@ -528,6 +541,8 @@ static void reeat(int c)
 	saved_get_char = term.t_getchar;	/* Save the char get routine          */
 	term.t_getchar = uneat;	/* Replace it with ours               */
 }
-
-
-/* end of isearch.c */
+#else
+int isearch(int f, int n)
+{
+}
+#endif

isearch.h

@@ -1,11 +1,11 @@
-/* isearch.h -- incremental search */
 #ifndef __ISEARCH_H__
 #define __ISEARCH_H__
 
-# include "names.h"	/* BINDABLE */
+#define	ISRCH	1	/* Incremental searches like ITS EMACS */
 
-BINDABLE( risearch) ;
-BINDABLE( fisearch) ;
+#if ISRCH
+int risearch( int f, int n) ;
+int fisearch( int f, int n) ;
+#endif
 
 #endif
-/* end of isearch */

line.c

@@ -249,11 +249,12 @@ void lchange(int flag)
  *
  * int f, n;		default flag and numeric argument
  */
-BINDABLE( insspace) {
+int insspace(int f, int n)
+{
 	assert( !(curbp->b_mode & MDVIEW)) ;
-	linsert( n, ' ') ;
-	backchar( f, n) ;
-	return TRUE ;
+	linsert(n, ' ');
+	backchar(f, n);
+	return TRUE;
 }
 
 /*
@@ -820,7 +821,8 @@ BINDABLE( yank) {
  * VIEW (read-only) mode
  */
 boolean rdonly( void) {
-	return mloutfail( "(Key illegal in VIEW mode)") ;
+	mloutfmt( "%B(Key illegal in VIEW mode)") ;
+	return FALSE ;
 }
 
 /* end of line.c */

mlout.c

@@ -12,9 +12,4 @@ void mloutstr( const char *str) {
 	mloutfmt( (*str) ? "%s" : "", str) ;
 }
 
-boolean mloutfail( const char *msg) {
-	mloutfmt( "%B%s", msg) ;
-	return FALSE ;
-}
-
 /* end of mlout.c */

mlout.h

@@ -3,12 +3,9 @@
 #ifndef __MLOUT_H__
 #define __MLOUT_H__
 
-#include "retcode.h"
-
 extern void (*mloutfmt)( const char *, ...) ;
 
 void mloutstr( const char *str) ;
-boolean mloutfail( const char *msg) ;	/* output with BELL and return FALSE */
 
 #endif /* __MLOUT_H__ */
 

names.c

@@ -33,51 +33,51 @@
 
 
 const name_bind names[] = {
-	{" abort-command", ctrlg,	 					CTL_ | 'G'} ,
+	{" abort-command", ctrlg,	 					CTRL | 'G'} ,
 	{" add-global-mode", setgmode,					META | 'M'} ,
 	{" add-mode", setemode,							CTLX | 'M'} ,
 	{" apropos", apro,								META | 'A'} ,
-	{" backward-character", (fnp_t) backchar,		CTL_ | 'B'} ,
-	{" begin-macro", (fnp_t) ctlxlp,				CTLX | '('} ,
+	{" backward-character", (fnp_t) backchar,		CTRL | 'B'} ,
+	{" begin-macro", ctlxlp,						CTLX | '('} ,
 	{" beginning-of-file", (fnp_t) gotobob,			META | '<'} ,
-	{" beginning-of-line", (fnp_t) gotobol,			CTL_ | 'A'} ,
+	{" beginning-of-line", (fnp_t) gotobol,			CTRL | 'A'} ,
 	{" bind-to-key", bindtokey,						META | 'K'} ,
 	{" buffer-position", showcpos,					CTLX | '='} ,
-	{"!case-region-lower", lowerregion,				CTLX | CTL_ | 'L'} ,
-	{"!case-region-upper", upperregion,				CTLX | CTL_ | 'U'} ,
+	{"!case-region-lower", lowerregion,				CTLX | CTRL | 'L'} ,
+	{"!case-region-upper", upperregion,				CTLX | CTRL | 'U'} ,
 	{"!case-word-capitalize", capword,				META | 'C'} ,
 	{"!case-word-lower", lowerword,					META | 'L'} ,
 	{"!case-word-upper", upperword,					META | 'U'} ,
 	{" change-file-name", filename,					CTLX | 'N'} ,
-	{" change-screen-size", newsize,				META | CTL_ | 'D'} , /* M^S */
-	{" change-screen-width", newwidth,				META | CTL_ | 'T'} ,
-	{" clear-and-redraw", (fnp_t) redraw,			CTL_ | 'L'} ,
-	{" clear-message-line", (fnp_t) clrmes, 		0} ,
+	{" change-screen-size", newsize,				META | CTRL | 'D'} , /* M^S */
+	{" change-screen-width", newwidth,				META | CTRL | 'T'} ,
+	{" clear-and-redraw", redraw, 					CTRL | 'L'} ,
+	{" clear-message-line", clrmes, 0} ,
 	{" copy-region", copyregion,					META | 'W'} ,
-	{" count-words", wordcount,						META | CTL_ | 'C'} ,
-	{" ctlx-prefix", (fnp_t) cex,					CTL_ | 'X'} ,
-	{"!delete-blank-lines", deblank,				CTLX | CTL_ | 'O'} ,
+	{" count-words", wordcount,						META | CTRL | 'C'} ,
+	{" ctlx-prefix", cex, 							CTRL | 'X'} ,
+	{"!delete-blank-lines", deblank,				CTLX | CTRL | 'O'} ,
 	{" delete-buffer", killbuffer,					CTLX | 'K'} ,
-	{" delete-global-mode", delgmode,				META | CTL_ | 'M'} ,
-	{" delete-mode", delmode,						CTLX | CTL_ | 'M'} ,
-	{"!delete-next-character", forwdel,				CTL_ | 'D'} ,
+	{" delete-global-mode", delgmode,				META | CTRL | 'M'} ,
+	{" delete-mode", delmode,						CTLX | CTRL | 'M'} ,
+	{"!delete-next-character", forwdel,				CTRL | 'D'} ,
 	{"!delete-next-word", delfword,					META | 'D'} ,
 	{" delete-other-windows", onlywind,				CTLX | '1'} ,
-	{"!delete-previous-character", backdel,			CTL_ | 'H'} , /* ^? */
-	{"!delete-previous-word", delbword,				META | CTL_ | 'H'} , /* M^? */
+	{"!delete-previous-character", backdel,			CTRL | 'H'} , /* ^? */
+	{"!delete-previous-word", delbword,				META | CTRL | 'H'} , /* M^? */
 	{" delete-window", delwind,						CTLX | '0'} ,
 	{" describe-bindings", desbind, 0} ,
 	{" describe-key", deskey,						CTLX | '?'} ,
-	{"!detab-line", detab, 							CTLX | CTL_ | 'D'} , /* X^A */
-	{" end-macro", (fnp_t) ctlxrp,					CTLX | ')'} ,
+	{"!detab-line", detab, 							CTLX | CTRL | 'D'} , /* X^A */
+	{" end-macro", ctlxrp,							CTLX | ')'} ,
 	{" end-of-file", (fnp_t) gotoeob,				META | '>'} ,
-	{" end-of-line", (fnp_t) gotoeol,				CTL_ | 'E'} ,
-	{"!entab-line", entab, 							CTLX | CTL_ | 'E'} ,
-	{" exchange-point-and-mark", (fnp_t) swapmark,	CTLX | CTL_ | 'X'} ,
+	{" end-of-line", (fnp_t) gotoeol,				CTRL | 'E'} ,
+	{"!entab-line", entab, 							CTLX | CTRL | 'E'} ,
+	{" exchange-point-and-mark", (fnp_t) swapmark,	CTLX | CTRL | 'X'} ,
 	{" execute-buffer", execbuf, 0} ,
 	{" execute-command-line", execcmd, 0} ,
 	{" execute-file", execfile, 0} ,
-	{" execute-macro", (fnp_t) ctlxe,				CTLX | 'E'} ,
+	{" execute-macro", ctlxe,						CTLX | 'E'} ,
 	{" execute-macro-1", cbuf1, 0} ,
 	{" execute-macro-10", cbuf10, 0} ,
 	{" execute-macro-11", cbuf11, 0} ,
@@ -119,106 +119,116 @@ const name_bind names[] = {
 	{" execute-macro-8", cbuf8, 0} ,
 	{" execute-macro-9", cbuf9, 0} ,
 	{" execute-named-command", namedcmd,		META | 'X'} ,
-	{" execute-procedure", execproc,			META | CTL_ | 'E'} ,
+#if	PROC
+	{" execute-procedure", execproc,			META | CTRL | 'E'} ,
+#endif
 	{" execute-program", execprg,				CTLX | '$'} ,
-	{" exit-emacs", quit, 						CTLX | CTL_ | 'C'} ,
+	{" exit-emacs", quit, 						CTLX | CTRL | 'C'} ,
 	{"!fill-paragraph", fillpara,				META | 'Q'} ,
 	{"!filter-buffer", filter_buffer,			CTLX | '#'} ,
-	{" find-file", filefind, 					CTLX | CTL_ | 'F'} ,
-	{" forward-character", (fnp_t) forwchar,	CTL_ | 'F'} ,
+	{" find-file", filefind, 					CTLX | CTRL | 'F'} ,
+	{" forward-character", (fnp_t) forwchar,	CTRL | 'F'} ,
 	{" goto-line", gotoline,					META | 'G'} ,
 #if	CFENCE
-	{" goto-matching-fence", getfence,			META | CTL_ | 'F'} ,
+	{" goto-matching-fence", getfence,			META | CTRL | 'F'} ,
 #endif
 	{" grow-window", enlargewind,				CTLX | 'Z'} , /* X^ */
-	{"!handle-tab", insert_tab,					CTL_ | 'I'} ,
+	{"!handle-tab", insert_tab,					CTRL | 'I'} ,
 	{" help", help,								META | '?'} ,
 	{" hunt-backward", backhunt, 0} ,
 	{" hunt-forward", forwhunt,					META | 'S'} ,
 	{" i-shell", spawncli,						CTLX | 'C'} ,
+#if	ISRCH
 	{" incremental-search", fisearch,			CTLX | 'S'} ,
-	{"!insert-file", insfile,					CTLX | CTL_ | 'I'} ,
-	{"!insert-space", insspace,					CTL_ | 'C'} ,
+#endif
+	{"!insert-file", insfile,					CTLX | CTRL | 'I'} ,
+	{"!insert-space", insspace,					CTRL | 'C'} ,
 	{"!insert-string", istring, 0} ,
 #if	PKCODE
 	{"!justify-paragraph", justpara,			META | 'J'} ,
 #endif
-	{"!kill-paragraph", killpara,				META | CTL_ | 'W'} ,
-	{"!kill-region", killregion, 				CTL_ | 'W'} ,
-	{"!kill-to-end-of-line", killtext, 			CTL_ | 'K'} ,
-	{" list-buffers", listbuffers, 				CTLX | CTL_ | 'B'} ,
-	{" meta-prefix", (fnp_t) metafn,			CTL_ | '['} ,
-	{" move-window-down", mvdnwind,				CTLX | CTL_ | 'N'} ,
-	{" move-window-up", mvupwind,				CTLX | CTL_ | 'P'} ,
-	{" name-buffer", namebuffer,				META | CTL_ | 'N'} ,
-	{"!newline", insert_newline, 				CTL_ | 'M'} ,
-	{"!newline-and-indent", indent, 			CTL_ | 'J'} ,
+	{"!kill-paragraph", killpara,				META | CTRL | 'W'} ,
+	{"!kill-region", killregion, 				CTRL | 'W'} ,
+	{"!kill-to-end-of-line", killtext, 			CTRL | 'K'} ,
+	{" list-buffers", listbuffers, 				CTLX | CTRL | 'B'} ,
+	{" meta-prefix", metafn, 					CTRL | '['} ,
+	{" move-window-down", mvdnwind,				CTLX | CTRL | 'N'} ,
+	{" move-window-up", mvupwind,				CTLX | CTRL | 'P'} ,
+	{" name-buffer", namebuffer,				META | CTRL | 'N'} ,
+	{"!newline", insert_newline, 				CTRL | 'M'} ,
+	{"!newline-and-indent", indent, 			CTRL | 'J'} ,
 	{" next-buffer", nextbuffer,				CTLX | 'X'} ,
-	{" next-line", (fnp_t) forwline, 			CTL_ | 'N'} ,
-	{" next-page", (fnp_t) forwpage,			CTL_ | 'V'} ,
+	{" next-line", (fnp_t) forwline, 			CTRL | 'N'} ,
+	{" next-page", (fnp_t) forwpage,			CTRL | 'V'} ,
 	{" next-paragraph", gotoeop,				META | 'N'} ,
 	{" next-window", nextwind,					CTLX | 'O'} ,
 	{" next-word", forwword,					META | 'F'} ,
-	{" nop", (fnp_t) nullproc,					META | SPEC | 'C'}, /* hook */
-	{"!open-line", openline,					CTL_ | 'O'} ,
+	{" nop", nullproc,							SPEC | META | 'C'}, /* hook */
+	{"!open-line", openline,					CTRL | 'O'} ,
 	{"!overwrite-string", ovstring, 0} ,
 	{" pipe-command", pipecmd,					CTLX | '@'} ,
-	{" previous-line", (fnp_t) backline, 		CTL_ | 'P'} ,
-	{" previous-page", (fnp_t) backpage,		CTL_ | 'Z'} , /* MV */
+	{" previous-line", (fnp_t) backline, 		CTRL | 'P'} ,
+	{" previous-page", (fnp_t) backpage,		CTRL | 'Z'} , /* MV */
 	{" previous-paragraph", gotobop,			META | 'P'} ,
 	{" previous-window", prevwind,				CTLX | 'P'} ,
 	{" previous-word", backword,				META | 'B'} ,
-	{"!query-replace-string", qreplace,			META | CTL_ | 'R'} ,
+	{"!query-replace-string", qreplace,			META | CTRL | 'R'} ,
 	{" quick-exit", quickexit,					META | 'Z'} ,
-	{"!quote-character", quote, 				CTL_ | 'Q'} ,
-	{"!read-file", fileread,					CTLX | CTL_ | 'R'} ,
-	{" redraw-display", (fnp_t) reposition,		META | CTL_ | 'L'} ,
+	{"!quote-character", quote, 				CTRL | 'Q'} , /* also XQ */
+	{"!read-file", fileread,					CTLX | CTRL | 'R'} ,
+	{" redraw-display", reposition,				META | CTRL | 'L'} , /* M! */
 	{"!replace-string", sreplace,				META | 'R'} ,
 	{" resize-window", resize,					CTLX | 'W'} ,
 	{" restore-window", restwnd, 0} ,
+#if	ISRCH
 	{" reverse-incremental-search", risearch,	CTLX | 'R'} ,
-	{" run", execproc, 0} ,	/* alias of execute-procedure */
-	{"!save-file", filesave,					CTLX | CTL_ | 'S'} , /* also X^D */
+#endif
+#if	PROC
+	{" run", execproc, 0} ,	// alias of execute-procedure
+#endif
+	{"!save-file", filesave,					CTLX | CTRL | 'S'} , /* also X^D */
 	{" save-window", savewnd, 0} ,
-	{" scroll-next-down", scrnextdw,			META | CTL_ | 'V'} ,
-	{" scroll-next-up", scrnextup,				META | CTL_ | 'Z'} ,
-	{" search-forward", forwsearch, 			CTL_ | 'S'} ,
-	{" search-reverse", backsearch, 			CTL_ | 'R'} ,
+	{" scroll-next-down", scrnextdw,			META | CTRL | 'V'} ,
+	{" scroll-next-up", scrnextup,				META | CTRL | 'Z'} ,
+	{" search-forward", forwsearch, 			CTRL | 'S'} ,
+	{" search-reverse", backsearch, 			CTRL | 'R'} ,
 	{" select-buffer", usebuffer,				CTLX | 'B'} ,
 	{" set", setvar,							CTLX | 'A'} ,
 	{" set-fill-column", setfillcol,			CTLX | 'F'} ,
 	{" set-mark", (fnp_t) setmark,				META | ' '} , /* M. */
 	{" shell-command", spawn,					CTLX | '!'} ,
-	{" shrink-window", shrinkwind,				CTLX | CTL_ | 'Z'} ,
+	{" shrink-window", shrinkwind,				CTLX | CTRL | 'Z'} ,
 	{" split-current-window", splitwind,		CTLX | '2'} ,
 	{" store-macro", storemac, 0} ,
+#if	PROC
 	{" store-procedure", storeproc, 0} ,
+#endif
 #if	BSD | SVR4
 	{" suspend-emacs", bktoshell,				CTLX | 'D'} , /* BSD MS */
 #endif
-	{"!transpose-characters", (fnp_t) twiddle,	CTL_ | 'T'} ,
-	{"!trim-line", trim,						CTLX | CTL_ | 'T'} ,
-	{" unbind-key", unbindkey,					META | CTL_ | 'K'} ,
-	{" universal-argument", (fnp_t) unarg,		CTL_ | 'U'} ,
+	{"!transpose-characters", (fnp_t) twiddle,	CTRL | 'T'} ,
+	{"!trim-line", trim,						CTLX | CTRL | 'T'} ,
+	{" unbind-key", unbindkey,					META | CTRL | 'K'} ,
+	{" universal-argument", unarg, 				CTRL | 'U'} ,
 	{" unmark-buffer", unmark,					META | '~'} ,
 	{" update-screen", upscreen, 0} ,
-	{" view-file", viewfile, 					CTLX | CTL_ | 'V'} ,
-	{"!wrap-word", wrapword,					META | SPEC | 'W'} , /* hook */
-	{" write-file", filewrite,					CTLX | CTL_ | 'W'} ,
+	{" view-file", viewfile, 					CTLX | CTRL | 'V'} ,
+	{"!wrap-word", wrapword,					SPEC | META | 'W'} , /* hook */
+	{" write-file", filewrite,					CTLX | CTRL | 'W'} ,
 	{" write-message", writemsg, 0} ,
-	{"!yank", yank,								CTL_ | 'Y'} ,
+	{"!yank", yank,								CTRL | 'Y'} ,
 
 	{" ", NULL, 0},
 /* extra key mapping */
-//	{ NULL, newsize,							META | CTL_ | 'S'},
-	{ NULL, backdel,							CTL_ | '?'},
-	{ NULL, delbword,							META | CTL_ | '?'},
-	{ NULL, detab,								CTLX | CTL_ | 'A'},
+//	{ NULL, newsize,							META | CTRL | 'S'},
+	{ NULL, backdel,							CTRL | '?'},
+	{ NULL, delbword,							META | CTRL | '?'},
+	{ NULL, detab,								CTLX | CTRL | 'A'},
 	{ NULL, enlargewind,						CTLX | '^'},
 	{ NULL, (fnp_t) backpage,					META | 'V'},
 	{ NULL, quote,				 				CTLX | 'Q'},
-	{ NULL, (fnp_t) reposition,					META | '!'},
-//detab { NULL, filesave,						CTLX | CTL_ | 'D'},
+	{ NULL, reposition,							META | '!'},
+//detab { NULL, filesave,						CTLX | CTRL | 'D'},
 	{ NULL, (fnp_t) setmark,					META | '.'},
 //	{ NULL, bktoshell,							META | 'S'},
 
@@ -236,15 +246,15 @@ const name_bind names[] = {
     { NULL, help,								SPEC | 'P'}, /* F1 */
 
 /* hooks */
-	{ NULL, (fnp_t) nullproc,					META | SPEC | 'R'}, /* hook */
-	{ NULL, (fnp_t) nullproc,					META | SPEC | 'X'}, /* hook */
+	{ NULL, nullproc,							SPEC | META | 'R'}, /* hook */
+	{ NULL, nullproc,							SPEC | META | 'X'}, /* hook */
 
 	{ NULL, NULL, 0}
 } ;
 
-
 static int lastnmidx = 0 ;	/* index of last name entry */
 
+
 kbind_p keytab ;
 static int ktsize = 140 ;	/* last check: need at least 133 + 1 */
 
@@ -272,9 +282,6 @@ boolean init_bindings( void) {
 	/* Add key definition */
 		if( nbp->n_keycode) {
 			kbind_p ktp = setkeybinding( nbp->n_keycode, nbp) ;
-			if( ktp->k_code == 0)	/* Table full, no memory left */
-				return FALSE ;
-
 		/* check it was indeed an insertion at end of table not a
 		 * key code re-definition */
 			assert( (++ktp)->k_code == 0) ;
@@ -286,20 +293,14 @@ boolean init_bindings( void) {
 
 /* Process extra key bindings if any */
 	for( nbp++ ; nbp->n_func != NULL ; nbp++) {
-	/* Check entry: a keycode and no name */
+	/* Check entry */
 		assert( nbp->n_keycode && (nbp->n_name == NULL)) ;
 
 	/* Look for corresponding function and add extra key binding */
 		nbind_p fnbp ;
 		for( fnbp = names ; fnbp->n_func != NULL ; fnbp++)
 			if( fnbp->n_func == nbp->n_func) {
-				kbind_p ktp = setkeybinding( nbp->n_keycode, fnbp) ;
-				if( ktp->k_code == 0)	/* Table full, no memory left */
-					return FALSE ;
-
-				/* check it was indeed an insertion at end of table not a
-				 * key code re-definition */
-				assert( (++ktp)->k_code == 0) ;
+				setkeybinding( nbp->n_keycode, fnbp) ;
 				break ;
 			}
 
@@ -369,8 +370,8 @@ boolean delkeybinding( unsigned key) {
 	return FALSE ;
 }
 
-
-/* This function looks a key binding up in the binding table
+/*
+ * This function looks a key binding up in the binding table
  *
  * int c;       key to find what is bound to it
  */
@@ -415,26 +416,23 @@ nbind_p fncmatch( char *name) {
 }
 
 
-/* user function that does NOTHING (bound to hooks) */
-TBINDABLE( nullproc) {
+/* user function that does NOTHING */
+BINDABLE( nullproc) {
 	return TRUE ;
 }
 
-
 /* dummy function for binding to meta prefix */
-TBINDABLE( metafn) {
+BINDABLE( metafn) {
 	return TRUE ;
 }
 
-
 /* dummy function for binding to control-x prefix */
-TBINDABLE( cex) {
+BINDABLE( cex) {
 	return TRUE ;
 }
 
-
 /* dummy function for binding to universal-argument */
-TBINDABLE( unarg) {
+BINDABLE( unarg) {
 	return TRUE ;
 }
 

names.h

@@ -1,10 +1,12 @@
 /* names.h -- mapping of functions to names and keys */
+
 #ifndef _NAMES_H_
-# define _NAMES_H_
+#define _NAMES_H_
 
 #include "retcode.h"
 
-#define CTL_    	0x01000000  /* Control flag, or'ed in       */
+
+#define CTRL    	0x01000000  /* Control flag, or'ed in       */
 #define META    	0x02000000  /* Meta flag, or'ed in          */
 #define CTLX    	0x04000000  /* ^X flag, or'ed in            */
 #define SPEC    	0x08000000  /* special key (function keys)  */
@@ -12,9 +14,7 @@
 
 
 /* Bindable uEMACS function pointer type and definition template */
-#define  BINDABLE( fname)    int fname( boolean f, int n)
-#define BBINDABLE( fname)    boolean fname( boolean f, int n)
-#define TBINDABLE	BBINDABLE
+#define BINDABLE( fname)    int fname( int f, int n)
 
 typedef BINDABLE( (*fnp_t)) ;
 
@@ -53,10 +53,11 @@ nbind_p fncmatch( char *name) ;     /* look up by name */
 
 
 /* bindable functions mapped to prefix keys and hooks */
-TBINDABLE( nullproc) ;
-TBINDABLE( metafn) ;
-TBINDABLE( cex) ;
-TBINDABLE( unarg) ;
+BINDABLE( nullproc) ;
+BINDABLE( metafn) ;
+BINDABLE( cex) ;
+BINDABLE( unarg) ;
 
 #endif
+
 /* end of names.h */

random.c

@@ -144,13 +144,15 @@ int getcline(void)
 	return numlines + 1;
 }
 
-/* Return current column.  Stop at first non-blank given TRUE argument.
+/*
+ * Return current column.  Stop at first non-blank given TRUE argument.
  */
-int getccol( int bflg) {
-	int i, col ;
+int getccol(int bflg)
+{
+	int i, col;
 	line_p dlp = curwp->w_dotp ;
-	int byte_offset = curwp->w_doto ;
-	int len = llength( dlp) ;
+	int byte_offset = curwp->w_doto;
+	int len = llength(dlp);
 
 	col = i = 0;
 	while (i < byte_offset) {
@@ -158,20 +160,17 @@ int getccol( int bflg) {
 
 		i += utf8_to_unicode(dlp->l_text, i, len, &c);
 		if( bflg && c != ' ' && c != '\t')	/* Request Stop at first non-blank */
-			break ;
+			break;
 		if (c == '\t')
 			col += tabwidth - col % tabwidth ;
 		else if (c < 0x20 || c == 0x7F)		/* displayed as ^c */
 			col += 2 ;
 		else if (c >= 0x80 && c <= 0xa0)	/* displayed as \xx */
 			col += 3 ;
-		else {
-			int w = utf8_width( c) ;		/* incomplete wc_width */
-			col += (w < 0) ? 2 : w ; 
+		else
+			col += 1 ;
 	}
-	}
-
-	return col ;
+	return col;
 }
 
 /*
@@ -715,40 +714,60 @@ BINDABLE( killtext) {
 	return ldelete(chunk, TRUE);
 }
 
-
-/* prompt and set an editor mode
+/*
+ * prompt and set an editor mode
  *
  * int f, n;		default and argument
  */
-BINDABLE( setemode) {
-	return adjustmode( TRUE, FALSE) ;
+int setemode(int f, int n)
+{
+#if 	PKCODE
+	return adjustmode(TRUE, FALSE);
+#else
+	adjustmode(TRUE, FALSE);
+#endif
 }
 
-
-/* prompt and delete an editor mode
+/*
+ * prompt and delete an editor mode
  *
  * int f, n;		default and argument
  */
-BINDABLE( delmode) {
-	return adjustmode( FALSE, FALSE) ;
+int delmode(int f, int n)
+{
+#if	PKCODE
+	return adjustmode(FALSE, FALSE);
+#else
+	adjustmode(FALSE, FALSE);
+#endif
 }
 
-
-/* prompt and set a global editor mode
+/*
+ * prompt and set a global editor mode
  *
  * int f, n;		default and argument
  */
-BINDABLE( setgmode) {
-	return adjustmode( TRUE, TRUE) ;
+int setgmode(int f, int n)
+{
+#if	PKCODE
+	return adjustmode(TRUE, TRUE);
+#else
+	adjustmode(TRUE, TRUE);
+#endif
 }
 
-
-/* prompt and delete a global editor mode
+/*
+ * prompt and delete a global editor mode
  *
  * int f, n;		default and argument
  */
-BINDABLE( delgmode) {
-	return adjustmode( FALSE, TRUE) ;
+int delgmode(int f, int n)
+{
+#if	PKCODE
+	return adjustmode(FALSE, TRUE);
+#else
+	adjustmode(FALSE, TRUE);
+#endif
 }
 
 /*
@@ -839,10 +858,11 @@ static int adjustmode( int kind, int global) {
 
 
 static int iovstring( int f, int n, const char *prompt, int (*fun)( char *)) {
+	int status ;	/* status return code */
 	char *tstring ;	/* string to add */
 
-/* ask for string to insert */
- 	int status = newmlargt( &tstring, prompt, 0) ;
+	/* ask for string to insert */
+	status = newmlargt( &tstring, prompt, 0) ; /* grab as big a token as screen allow */
 	if( tstring == NULL)
 		return status ;
 

region.c

@@ -9,7 +9,7 @@
  */
 
 #include <assert.h>
-#include <stddef.h>
+#include <stdio.h>
 
 #include "buffer.h"
 #include "estruct.h"
@@ -139,9 +139,10 @@ int getregion( region_p rp) {
 	line_p flp, blp ;
 	long fsize, bsize ;
 
-	if (curwp->w_markp == NULL)
-		return mloutfail( "No mark set in this window") ;
-
+	if (curwp->w_markp == NULL) {
+		mloutstr( "No mark set in this window") ;
+		return FALSE;
+	}
 	if (curwp->w_dotp == curwp->w_markp) {
 		rp->r_linep = curwp->w_dotp;
 		if (curwp->w_doto < curwp->w_marko) {
@@ -181,8 +182,8 @@ int getregion( region_p rp) {
 			}
 		}
 	}
-
-	return mloutfail( "Bug: lost mark") ;
+	mloutstr( "Bug: lost mark") ;
+	return FALSE;
 }
 
 /* end of region.c */

search.c

@@ -1,7 +1,9 @@
 /* search.c -- implements search.h */
 #include "search.h"
 
-/* The functions in this file implement commands that search in the forward
+/*	search.c
+ *
+ * The functions in this file implement commands that search in the forward
  * and backward directions.  There are no special characters in the search
  * strings.  Probably should have a regular expression search, or something
  * like that.
@@ -175,14 +177,15 @@ static int biteq(int bc, char *cclmap);
 static char *clearbits(void);
 static void setbit(int bc, char *cclmap);
 
-
-/* forwsearch -- Search forward.  Get a search string from the user, and
+/*
+ * forwsearch -- Search forward.  Get a search string from the user, and
  *	search for the string.  If found, reset the "." to be just after
  *	the match string, and (perhaps) repaint the display.
  *
  * int f, n;			default flag / numeric argument
  */
-BINDABLE( forwsearch) {
+int forwsearch(int f, int n)
+{
 	int status = TRUE;
 
 	/* If n is negative, search backwards.
@@ -220,14 +223,15 @@ BINDABLE( forwsearch) {
 	return status;
 }
 
-
-/* forwhunt -- Search forward for a previously acquired search string.
+/*
+ * forwhunt -- Search forward for a previously acquired search string.
  *	If found, reset the "." to be just after the match string,
  *	and (perhaps) repaint the display.
  *
  * int f, n;		default flag / numeric argument
  */
-BINDABLE( forwhunt) {
+int forwhunt(int f, int n)
+{
 	int status = TRUE;
 
 	if (n < 0)		/* search backwards */
@@ -272,15 +276,16 @@ BINDABLE( forwhunt) {
 	return status;
 }
 
-
-/* backsearch -- Reverse search.  Get a search string from the user, and
+/*
+ * backsearch -- Reverse search.  Get a search string from the user, and
  *	search, starting at "." and proceeding toward the front of the buffer.
  *	If found "." is left pointing at the first character of the pattern
  *	(the last character that was matched).
  *
  * int f, n;		default flag / numeric argument
  */
-BINDABLE( backsearch) {
+int backsearch(int f, int n)
+{
 	int status = TRUE;
 
 	/* If n is negative, search forwards.
@@ -319,15 +324,16 @@ BINDABLE( backsearch) {
 	return status;
 }
 
-
-/* backhunt -- Reverse search for a previously acquired search string,
+/*
+ * backhunt -- Reverse search for a previously acquired search string,
  *	starting at "." and proceeding toward the front of the buffer.
  *	If found "." is left pointing at the first character of the pattern
  *	(the last character that was matched).
  *
  * int f, n;		default flag / numeric argument
  */
-BINDABLE( backhunt) {
+int backhunt(int f, int n)
+{
 	int status = TRUE;
 
 	if (n < 0)
@@ -782,24 +788,26 @@ void rvstrcpy(char *rvstr, char *str)
 	*rvstr = '\0';
 }
 
-
-/* sreplace -- Search and replace.
+/*
+ * sreplace -- Search and replace.
  *
  * int f;		default flag
  * int n;		# of repetitions wanted
  */
-BINDABLE( sreplace) {
-	return replaces( FALSE, f, n) ;
+int sreplace(int f, int n)
+{
+	return replaces(FALSE, f, n);
 }
 
-
-/* qreplace -- search and replace with query.
+/*
+ * qreplace -- search and replace with query.
  *
  * int f;		default flag
  * int n;		# of repetitions wanted
  */
-BINDABLE( qreplace) {
-	return replaces( TRUE, f, n) ;
+int qreplace(int f, int n)
+{
+	return replaces(TRUE, f, n);
 }
 
 /*

spawn.c

@@ -1,7 +1,9 @@
 /* spawn.c -- implements spawn.h */
 #include "spawn.h"
 
-/*	Various operating system access commands.
+/*	spawn.c
+ *
+ *	Various operating system access commands.
  *
  *	Modified by Petri Kutvonen
  */
@@ -32,11 +34,13 @@
 #endif
 
 
-/* Create a subjob with a copy of the command intrepreter in it. When the
+/*
+ * Create a subjob with a copy of the command intrepreter in it. When the
  * command interpreter exits, mark the screen as garbage so that you do a full
  * repaint. Bound to "^X C".
  */
-BINDABLE( spawncli) {
+int spawncli(int f, int n)
+{
 #if	USG | BSD
 	char *cp;
 #endif
@@ -77,8 +81,9 @@ BINDABLE( spawncli) {
 }
 
 #if	BSD | SVR4
-/* suspend MicroEMACS and wait to wake up */
-BINDABLE( bktoshell) {
+
+int bktoshell(int f, int n)
+{				/* suspend MicroEMACS and wait to wake up */
 	vttidy();
 /******************************
 	int pid;
@@ -98,12 +103,12 @@ void rtfrmshell(void)
 }
 #endif
 
-
-/* Run a one-liner in a subjob. When the command returns, wait for a single
+/*
+ * Run a one-liner in a subjob. When the command returns, wait for a single
  * character to be typed, then mark the screen as garbage so a full repaint is
  * done. Bound to "C-X !".
  */
-BINDABLE( spawn) {
+int spawn( int f, int n) {
 	int s ;
 	char *line ;
 
@@ -136,13 +141,13 @@ BINDABLE( spawn) {
 #endif
 }
 
-
-/* Run an external program with arguments. When it returns, wait for a single
+/*
+ * Run an external program with arguments. When it returns, wait for a single
  * character to be typed, then mark the screen as garbage so a full repaint is
  * done. Bound to "C-X $".
  */
 
-BINDABLE( execprg) {
+int execprg( int f, int n) {
 	int s ;
 	char *line ;
 
@@ -171,11 +176,11 @@ BINDABLE( execprg) {
 #endif
 }
 
-
-/* Pipe a one line command into a window
+/*
+ * Pipe a one line command into a window
  * Bound to ^X @
  */
-BINDABLE( pipecmd) {
+int pipecmd( int f, int n) {
 	int s ;		/* return status from CLI */
 	struct window *wp ;	/* pointer to new window */
 	buffer_p bp ;		/* pointer to buffer to zot */
@@ -266,11 +271,11 @@ BINDABLE( pipecmd) {
 	return TRUE;
 }
 
-
-/* filter a buffer through an external DOS program
+/*
+ * filter a buffer through an external DOS program
  * Bound to ^X #
  */
-BINDABLE( filter_buffer) {
+int filter_buffer( int f, int n) {
 	int s ;				/* return status from CLI */
 	buffer_p bp ;		/* pointer to buffer to zot */
 	char *mlarg ;

util.c

@@ -1,20 +1,17 @@
-/* util.c -- implements util.h */
 #include "util.h"
 
 /* Safe zeroing, no complaining about overlap */
-void mystrscpy( char *dst, const char *src, int size) {
-	if( size <= 0)
-		return ;
-
-	while( --size) {
-		char c = *src++ ;
-		if( !c)
-			break ;
-
-		*dst++ = c ;
+void mystrscpy(char *dst, const char *src, int size)
+{
+	if (!size)
+		return;
+	while (--size) {
+		char c = *src++;
+		if (!c)
+			break;
+		*dst++ = c;
 	}
-
-	*dst = 0 ;
+	*dst = 0;
 }
 
-/* end of util.c */
+

util.h

@@ -1,9 +1,7 @@
-/* util.h -- utility functions */
 #ifndef UTIL_H_
-# define UTIL_H_
+#define UTIL_H_
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-void mystrscpy( char *dst, const char *src, int size) ;
+void mystrscpy(char *dst, const char *src, int size);
 
 #endif  /* UTIL_H_ */
-/* end of util.h */

window.c

@@ -1,65 +1,77 @@
 /* window.c -- inplements window.h */
+
 #include "window.h"
 
-/* Window management.  Some of the functions are internal, and some are
-   attached to keys that the user actually types.
+/*	window.c
+ *
+ *      Window management. Some of the functions are internal, and some are
+ *      attached to keys that the user actually types.
+ *
  */
 
 #include <assert.h>
+#include <stdio.h>
 
 #include "basic.h"
 #include "buffer.h"
-#include "display.h"	/* upmode() */
+#include "display.h"
 #include "estruct.h"
 #include "execute.h"
 #include "line.h"
-#include "mlout.h"
 #include "terminal.h"
 #include "wrapper.h"
 
-window_p curwp ;		/* Current window               */
-window_p wheadp ;		/* Head of list of windows      */
 
-static window_p savwindow = NULL ;	/* saved window pointer */
+struct window *curwp ;		/* Current window               */
+struct window *wheadp ;		/* Head of list of windows      */
+
+static struct window *swindow = NULL ;	/* saved window pointer */
 
 
-/* Reposition dot in the current window to line "n".  If the argument is
-   positive, it is that line.  If it is negative it is that line from the
-   bottom.  If it is 0 the window is centered (this is what the standard
-   redisplay code does).  With no argument it defaults to 0.  Bound to M-!.
+/*
+ * Reposition dot in the current window to line "n". If the argument is
+ * positive, it is that line. If it is negative it is that line from the
+ * bottom. If it is 0 the window is centered (this is what the standard
+ * redisplay code does). With no argument it defaults to 0. Bound to M-!.
  */
-TBINDABLE( reposition) {
-	curwp->w_force = (f == FALSE) ? 0 : n ;	/* default to 0 to center screen */
-	curwp->w_flag |= WFFORCE ;
-	return TRUE ;
+int reposition(int f, int n)
+{
+	if (f == FALSE)		/* default to 0 to center screen */
+		n = 0;
+	curwp->w_force = n;
+	curwp->w_flag |= WFFORCE;
+	return TRUE;
 }
 
-
-/* Refresh the screen.  With no argument, it just does the refresh.  With
-   an argument it recenters "." in the current window.  Bound to "C-L".
+/*
+ * Refresh the screen. With no argument, it just does the refresh. With an
+ * argument it recenters "." in the current window. Bound to "C-L".
  */
-TBINDABLE( redraw) {
-	if( f == FALSE)
-		sgarbf = TRUE ;
+int redraw(int f, int n)
+{
+	if (f == FALSE)
+		sgarbf = TRUE;
 	else {
-		curwp->w_force = 0 ;	/* Center dot. */
-		curwp->w_flag |= WFFORCE ;
+		curwp->w_force = 0;	/* Center dot. */
+		curwp->w_flag |= WFFORCE;
 	}
 
-	return TRUE ;
+	return TRUE;
 }
 
-
-/* The command make the next window (next => down the screen) the current
-   window.  There are no real errors, although the command does nothing if
-   there is only 1 window on the screen.  Bound to "C-X C-N".
-
-   with an argument this command finds the <n>th window from the top
- 
-   int f, n;		default flag and numeric argument
+/*
+ * The command make the next window (next => down the screen) the current
+ * window. There are no real errors, although the command does nothing if
+ * there is only 1 window on the screen. Bound to "C-X C-N".
+ *
+ * with an argument this command finds the <n>th window from the top
+ *
+ * int f, n;		default flag and numeric argument
+ *
  */
-BINDABLE( nextwind) {
-	window_p wp;
+int nextwind(int f, int n)
+{
+	struct window *wp;
 	int nwindows;	/* total number of windows */
 
 	if (f) {
@@ -82,8 +94,10 @@ BINDABLE( nextwind) {
 			wp = wheadp;
 			while (--n)
 				wp = wp->w_wndp;
-		} else
-			return mloutfail( "Window number out of range") ;
+		} else {
+			mlwrite("Window number out of range");
+			return FALSE;
+		}
 	} else if ((wp = curwp->w_wndp) == NULL)
 		wp = wheadp;
 	curwp = wp;
@@ -93,14 +107,15 @@ BINDABLE( nextwind) {
 	return TRUE;
 }
 
-
-/* This command makes the previous window (previous => up the screen) the
-   current window.  There arn't any errors, although the command does not
-   do a lot if there is 1 window.
+/*
+ * This command makes the previous window (previous => up the screen) the
+ * current window. There arn't any errors, although the command does not do a
+ * lot if there is 1 window.
  */
-BINDABLE( prevwind) {
-	window_p wp1;
-	window_p wp2;
+int prevwind(int f, int n)
+{
+	struct window *wp1;
+	struct window *wp2;
 
 	/* if we have an argument, we mean the nth window from the bottom */
 	if (f)
@@ -122,26 +137,28 @@ BINDABLE( prevwind) {
 	return TRUE;
 }
 
-
-/* This command moves the current window down by "arg" lines. Recompute the
+/*
+ * This command moves the current window down by "arg" lines. Recompute the
  * top line in the window. The move up and move down code is almost completely
  * the same; most of the work has to do with reframing the window, and picking
  * a new dot. We share the code by having "move down" just be an interface to
  * "move up". Magic. Bound to "C-X C-N".
  */
-BINDABLE( mvdnwind) {
-	return mvupwind( f, -n) ;
+int mvdnwind(int f, int n)
+{
+	return mvupwind(f, -n);
 }
 
-
-/* Move the current window up by "arg" lines. Recompute the new top line of
+/*
+ * Move the current window up by "arg" lines. Recompute the new top line of
  * the window. Look to see if "." is still on the screen. If it is, you win.
  * If it isn't, then move "." to center it in the new framing of the window
  * (this command does not really move "."; it moves the frame). Bound to
  * "C-X C-P".
  */
-BINDABLE( mvupwind) {
-	line_p lp;
+int mvupwind(int f, int n)
+{
+	struct line *lp;
 	int i;
 
 	lp = curwp->w_linep;
@@ -176,16 +193,17 @@ BINDABLE( mvupwind) {
 	return TRUE;
 }
 
-
-/* This command makes the current window the only window on the screen. Bound
+/*
+ * This command makes the current window the only window on the screen. Bound
  * to "C-X 1". Try to set the framing so that "." does not have to move on the
  * display. Some care has to be taken to keep the values of dot and mark in
  * the buffer structures right if the distruction of a window makes a buffer
  * become undisplayed.
  */
-BINDABLE( onlywind) {
-	window_p wp;
-	line_p lp;
+int onlywind(int f, int n)
+{
+	struct window *wp;
+	struct line *lp;
 	int i;
 
 	while (wheadp != curwp) {
@@ -223,20 +241,23 @@ BINDABLE( onlywind) {
 	return TRUE;
 }
 
-
-/* Delete the current window, placing its space in the window above,
+/*
+ * Delete the current window, placing its space in the window above,
  * or, if it is the top window, the window below. Bound to C-X 0.
  *
  * int f, n;	arguments are ignored for this command
  */
-BINDABLE( delwind) {
-	window_p wp;	/* window to recieve deleted space */
-	window_p lwp;	/* ptr window before curwp */
+int delwind(int f, int n)
+{
+	struct window *wp;	/* window to recieve deleted space */
+	struct window *lwp;	/* ptr window before curwp */
 	int target;	/* target line to search for */
 
 	/* if there is only one window, don't delete it */
-	if( wheadp->w_wndp == NULL)
-		return mloutfail( "Can not delete this window") ;
+	if (wheadp->w_wndp == NULL) {
+		mlwrite("Can not delete this window");
+		return FALSE;
+	}
 
 	/* find window before curwp in linked list */
 	wp = wheadp;
@@ -295,8 +316,8 @@ BINDABLE( delwind) {
 	return TRUE;
 }
 
-
-/* Split the current window.  A window smaller than 3 lines cannot be
+/*
+ * Split the current window.  A window smaller than 3 lines cannot be
  * split.  An argument of 1 forces the cursor into the upper window, an
  * argument of two forces the cursor to the lower window.  The only
  * other error that is possible is a "malloc" failure allocating the
@@ -304,21 +325,21 @@ BINDABLE( delwind) {
  *
  * int f, n;	default flag and numeric argument
  */
-BINDABLE( splitwind) {
-	window_p wp;
-	line_p lp;
+int splitwind(int f, int n)
+{
+	struct window *wp;
+	struct line *lp;
 	int ntru;
 	int ntrl;
 	int ntrd;
-	window_p wp1;
-	window_p wp2;
+	struct window *wp1;
+	struct window *wp2;
 
-	if( curwp->w_ntrows < 3) {
-		mloutfmt( "Cannot split a %d line window", curwp->w_ntrows) ;
-		return FALSE ;
+	if (curwp->w_ntrows < 3) {
+		mlwrite("Cannot split a %d line window", curwp->w_ntrows);
+		return FALSE;
 	}
-
-	wp = xmalloc( sizeof *wp) ;
+	wp = xmalloc(sizeof(struct window));
 	++curbp->b_nwnd;	/* Displayed twice.     */
 	wp->w_bufp = curbp;
 	wp->w_dotp = curwp->w_dotp;
@@ -377,30 +398,33 @@ BINDABLE( splitwind) {
 	return TRUE;
 }
 
-
-/* Enlarge the current window. Find the window that loses space. Make sure it
+/*
+ * Enlarge the current window. Find the window that loses space. Make sure it
  * is big enough. If so, hack the window descriptions, and ask redisplay to do
  * all the hard work. You don't just set "force reframe" because dot would
  * move. Bound to "C-X Z".
  */
-BINDABLE( enlargewind) {
-	window_p adjwp;
-	line_p lp;
+int enlargewind(int f, int n)
+{
+	struct window *adjwp;
+	struct line *lp;
 	int i;
 
 	if (n < 0)
 		return shrinkwind(f, -n);
-	if( wheadp->w_wndp == NULL)
-		return mloutfail( "Only one window") ;
-
+	if (wheadp->w_wndp == NULL) {
+		mlwrite("Only one window");
+		return FALSE;
+	}
 	if ((adjwp = curwp->w_wndp) == NULL) {
 		adjwp = wheadp;
 		while (adjwp->w_wndp != curwp)
 			adjwp = adjwp->w_wndp;
 	}
-	if( adjwp->w_ntrows <= n)
-		return mloutfail( "Impossible change") ;
-
+	if (adjwp->w_ntrows <= n) {
+		mlwrite("Impossible change");
+		return FALSE;
+	}
 	if (curwp->w_wndp == adjwp) {	/* Shrink below.        */
 		lp = adjwp->w_linep;
 		for (i = 0; i < n && lp != adjwp->w_bufp->b_linep; ++i)
@@ -426,29 +450,32 @@ BINDABLE( enlargewind) {
 	return TRUE;
 }
 
-
-/* Shrink the current window. Find the window that gains space. Hack at the
+/*
+ * Shrink the current window. Find the window that gains space. Hack at the
  * window descriptions. Ask the redisplay to do all the hard work. Bound to
  * "C-X C-Z".
  */
-BINDABLE( shrinkwind) {
-	window_p adjwp;
-	line_p lp;
+int shrinkwind(int f, int n)
+{
+	struct window *adjwp;
+	struct line *lp;
 	int i;
 
 	if (n < 0)
 		return enlargewind(f, -n);
-	if( wheadp->w_wndp == NULL)
-		return mloutfail( "Only one window") ;
-
+	if (wheadp->w_wndp == NULL) {
+		mlwrite("Only one window");
+		return FALSE;
+	}
 	if ((adjwp = curwp->w_wndp) == NULL) {
 		adjwp = wheadp;
 		while (adjwp->w_wndp != curwp)
 			adjwp = adjwp->w_wndp;
 	}
-	if( curwp->w_ntrows <= n)
-		return mloutfail( "Impossible change") ;
-
+	if (curwp->w_ntrows <= n) {
+		mlwrite("Impossible change");
+		return FALSE;
+	}
 	if (curwp->w_wndp == adjwp) {	/* Grow below.          */
 		lp = adjwp->w_linep;
 		for (i = 0; i < n && lback(lp) != adjwp->w_bufp->b_linep;
@@ -475,12 +502,13 @@ BINDABLE( shrinkwind) {
 	return TRUE;
 }
 
-
-/* Resize the current window to the requested size
+/*
+ * Resize the current window to the requested size
  *
  * int f, n;		default flag and numeric argument
  */
-BINDABLE( resize) {
+int resize(int f, int n)
+{
 	int clines;		/* current # of lines in window */
 
 	/* must have a non-default argument, else ignore call */
@@ -497,14 +525,14 @@ BINDABLE( resize) {
 	return enlargewind(TRUE, n - clines);
 }
 
-
-/* Pick a window for a pop-up. Split the screen if there is only one window.
+/*
+ * Pick a window for a pop-up. Split the screen if there is only one window.
  * Pick the uppermost window that isn't the current window. An LRU algorithm
  * might be better. Return a pointer, or NULL on error.
  */
-window_p wpopup(void)
+struct window *wpopup(void)
 {
-	window_p wp;
+	struct window *wp;
 
 	if (wheadp->w_wndp == NULL	/* Only 1 window        */
 	    && splitwind(FALSE, 0) == FALSE)	/* and it won't split   */
@@ -515,57 +543,59 @@ window_p wpopup(void)
 	return wp;
 }
 
-
-/* scroll the next window up (back) a page */
-BINDABLE( scrnextup) {
+int scrnextup(int f, int n)
+{				/* scroll the next window up (back) a page */
 	nextwind(FALSE, 1);
 	backpage(f, n);
 	prevwind(FALSE, 1);
 	return TRUE;
 }
 
-
-/* scroll the next window down (forward) a page */
-BINDABLE( scrnextdw) {
+int scrnextdw(int f, int n)
+{				/* scroll the next window down (forward) a page */
 	nextwind(FALSE, 1);
 	forwpage(f, n);
 	prevwind(FALSE, 1);
 	return TRUE;
 }
 
-
-/* save ptr to current window */
-BINDABLE( savewnd) {
-	savwindow = curwp ;
-	return TRUE ;
+int savewnd(int f, int n)
+{				/* save ptr to current window */
+	swindow = curwp;
+	return TRUE;
 }
 
+int restwnd(int f, int n)
+{				/* restore the saved screen */
+	struct window *wp;
 
-/* restore the saved screen */
-BINDABLE( restwnd) {
-/* check the saved window still exists */
-	for( window_p wp = wheadp ; wp != NULL ; wp = wp->w_wndp) {
-		if( wp == savwindow) {
-			curwp = wp ;
-			curbp = wp->w_bufp ;
-			upmode() ;
-			return TRUE ;
+	/* find the window */
+	wp = wheadp;
+	while (wp != NULL) {
+		if (wp == swindow) {
+			curwp = wp;
+			curbp = wp->w_bufp;
+			upmode();
+			return TRUE;
 		}
+		wp = wp->w_wndp;
 	}
 
-	return mloutfail( "(No such window exists)") ;
+	mlwrite("(No such window exists)");
+	return FALSE;
 }
 
-
-/* resize the screen, re-writing the screen
+/*
+ * resize the screen, re-writing the screen
  *
  * int f;	default flag
  * int n;	numeric argument
  */
-BINDABLE( newsize) {
-	window_p wp;		/* current window being examined */
-	window_p nextwp;	/* next window to scan */
-	window_p lastwp;	/* last window scanned */
+int newsize(int f, int n)
+{
+	struct window *wp;		/* current window being examined */
+	struct window *nextwp;	/* next window to scan */
+	struct window *lastwp;	/* last window scanned */
 	int lastline;		/* screen line of last line of current window */
 
 	/* if the command defaults, assume the largest */
@@ -573,8 +603,10 @@ BINDABLE( newsize) {
 		n = term.t_mrow ;
 
 	/* make sure it's in range */
-	if( n < 3 || n > term.t_mrow)
-		return mloutfail( "%%Screen size out of range") ;
+	if (n < 3 || n > term.t_mrow) {
+		mlwrite("%%Screen size out of range");
+		return FALSE;
+	}
 
 	if (term.t_nrow == n - 1)
 		return TRUE;
@@ -642,22 +674,25 @@ BINDABLE( newsize) {
 	return TRUE;
 }
 
-
-/* resize the screen, re-writing the screen
+/*
+ * resize the screen, re-writing the screen
  *
  * int f;		default flag
  * int n;		numeric argument
  */
-BINDABLE( newwidth) {
-	window_p wp;
+int newwidth(int f, int n)
+{
+	struct window *wp;
 
 	/* if the command defaults, assume the largest */
 	if (f == FALSE)
 		n = term.t_mcol;
 
 	/* make sure it's in range */
-	if (n < 10 || n > term.t_mcol)
-		return mloutfail( "%%Screen width out of range") ;
+	if (n < 10 || n > term.t_mcol) {
+		mlwrite("%%Screen width out of range");
+		return FALSE;
+	}
 
 	/* otherwise, just re-width it (no big deal) */
 	term.t_ncol = n;
@@ -678,7 +713,7 @@ BINDABLE( newwidth) {
 int getwpos(void)
 {				/* get screen offset of current line in current window */
 	int sline;	/* screen line from top of window */
-	line_p lp;	/* scannile line pointer */
+	struct line *lp;	/* scannile line pointer */
 
 	/* search down the line we want */
 	lp = curwp->w_linep;
@@ -696,5 +731,3 @@ void cknewwindow(void)
 {
 	execute(META | SPEC | 'X', FALSE, 1);
 }
-
-/* end of window.c */

window.h

@@ -1,35 +1,34 @@
-/* window.h -- window functionality */
 #ifndef _WINDOW_H_
 #define _WINDOW_H_
 
 #include "defines.h"	/* COLOR, SCROLLCODE */
-#include "buffer.h"		/* buffer_p, line_p */
-#include "names.h"		/* BINDABLE() */
+#include "buffer.h"		/* buffer, line */
 
-/* There is a window structure allocated for every active display window.
-   The windows are kept in a big list, in top to bottom screen order, with
-   the listhead at "wheadp".  Each window contains its own values of dot
-   and mark.  The flag field contains some bits that are set by commands to
-   guide redisplay.  Although this is a bit of a compromise in terms of
-   decoupling, the full blown redisplay is just too expensive to run for
-   every input character.
+/*
+ * There is a window structure allocated for every active display window. The
+ * windows are kept in a big list, in top to bottom screen order, with the
+ * listhead at "wheadp". Each window contains its own values of dot and mark.
+ * The flag field contains some bits that are set by commands to guide
+ * redisplay. Although this is a bit of a compromise in terms of decoupling,
+ * the full blown redisplay is just too expensive to run for every input
+ * character.
  */
 typedef struct window {
 	struct window *w_wndp;	/* Next window                  */
-	buffer_p w_bufp ;		/* Buffer displayed in window   */
+	struct buffer *w_bufp;	/* Buffer displayed in window   */
 	line_p	w_linep ;		/* Top line in the window       */
 	line_p	w_dotp ;		/* Line containing "."          */
 	line_p	w_markp ;		/* Line containing "mark"       */
 	int w_doto ;			/* Byte offset for "."          */
-	int w_marko ;			/* Byte offset for "mark"       */
+	int w_marko;		/* Byte offset for "mark"       */
 	int w_toprow ;		/* Origin 0 top row of window   */
 	int w_ntrows ;		/* # of rows of text in window  */
-	char w_force ;			/* If NZ, forcing row.          */
-	char w_flag ;			/* Flags.                       */
-# if COLOR
-	char w_fcolor ;			/* current forground color      */
-	char w_bcolor ;			/* current background color     */
-# endif
+	char w_force;		/* If NZ, forcing row.          */
+	char w_flag;		/* Flags.                       */
+#if	COLOR
+	char w_fcolor;		/* current forground color      */
+	char w_bcolor;		/* current background color     */
+#endif
 } *window_p ;
 
 extern window_p curwp ;		/* Current window               */
@@ -45,34 +44,31 @@ extern window_p wheadp ;	/* Head of list of windows      */
 #define WFMODE  0x10		/* Update mode line.            */
 #define	WFCOLR	0x20		/* Needs a color change         */
 
-# if SCROLLCODE
-# define WFKILLS 0x40		/* something was deleted        */
-# define WFINS   0x80		/* something was inserted       */
-# endif
-
-/* Bindable functions */
- BINDABLE( delwind) ;
- BINDABLE( enlargewind) ;
- BINDABLE( mvdnwind) ;
- BINDABLE( mvupwind) ;
- BINDABLE( newsize) ;
- BINDABLE( newwidth) ;
- BINDABLE( nextwind) ;
- BINDABLE( onlywind) ;
- BINDABLE( prevwind) ;
-TBINDABLE( redraw) ;
-TBINDABLE( reposition) ;
- BINDABLE( resize) ;
- BINDABLE( restwnd) ;
- BINDABLE( savewnd) ;
- BINDABLE( scrnextdw) ;
- BINDABLE( scrnextup) ;
- BINDABLE( shrinkwind) ;
- BINDABLE( splitwind) ;
+#if SCROLLCODE
+#define WFKILLS 0x40		/* something was deleted        */
+#define WFINS   0x80		/* something was inserted       */
+#endif
 
+int reposition( int f, int n);
+int redraw( int f, int n) ;
+int nextwind( int f, int n) ;
+int prevwind( int f, int n) ;
+int mvdnwind( int f, int n) ;
+int mvupwind( int f, int n) ;
+int onlywind( int f, int n) ;
+int delwind( int f, int n) ;
+int splitwind( int f, int n) ;
+int enlargewind( int f, int n) ;
+int shrinkwind( int f, int n) ;
+int resize( int f, int n) ;
+int scrnextup( int f, int n) ;
+int scrnextdw( int f, int n) ;
+int savewnd( int f, int n) ;
+int restwnd( int f, int n) ;
+int newsize( int f, int n) ;
+int newwidth( int f, int n) ;
 int getwpos( void) ;
 void cknewwindow( void) ;
 window_p wpopup( void) ;  /* Pop up window creation. */
 
 #endif
-/* end of window.h */

word.c

@@ -1,11 +1,13 @@
 /* word.c -- implements word.h */
 #include "word.h"
 
-/* The routines in this file implement commands that work word or a
-   paragraph at a time.  There are all sorts of word mode commands.  If I
-   do any sentence mode commands, they are likely to be put in this file.
-
-   Modified by Petri Kutvonen
+/*	word.c
+ *
+ *      The routines in this file implement commands that work word or a
+ *      paragraph at a time.  There are all sorts of word mode commands.  If I
+ *      do any sentence mode commands, they are likely to be put in this file.
+ *
+ *	Modified by Petri Kutvonen
  */
 
 #include <assert.h>
@@ -29,18 +31,18 @@ static int justflag = FALSE ;		/* justify, don't fill */
 
 static int inword( void) ;
 
-/* Word wrap on n-spaces.  Back-over whatever precedes the point on the
-   current line and stop on the first word-break or the beginning of the
-   line.  If we reach the beginning of the line, jump back to the end of
-   the word and start a new line.  Otherwise, break the line at the
-   word-break, eat it, and jump back to the end of the word.
-
-   Returns TRUE on success, FALSE on errors.
- 
-   @f: default flag.
-   @n: numeric argument.
+/* Word wrap on n-spaces. Back-over whatever precedes the point on the current
+ * line and stop on the first word-break or the beginning of the line. If we
+ * reach the beginning of the line, jump back to the end of the word and start
+ * a new line.	Otherwise, break the line at the word-break, eat it, and jump
+ * back to the end of the word.
+ * Returns TRUE on success, FALSE on errors.
+ *
+ * @f: default flag.
+ * @n: numeric argument.
  */
-BINDABLE( wrapword) {
+int wrapword(int f, int n)
+{
 	int cnt;	/* size of word wrapped to next line */
 	int c;		/* charector temporary */
 
@@ -79,12 +81,11 @@ BINDABLE( wrapword) {
 	return TRUE;
 }
 
-
 /* Move the cursor backward by "n" words. All of the details of motion are
-   performed by the "backchar" and "forwchar" routines.  Error if you try
-   to move beyond the buffers.
+ * performed by the "backchar" and "forwchar" routines. Error if you try to
+ * move beyond the buffers.
  */
-BINDABLE( backword) {
+int backword( int f, int n) {
 	if( n < 0)
 		return forwword( f, -n) ;
 
@@ -105,12 +106,10 @@ BINDABLE( backword) {
 	return forwchar( FALSE, 1) ;
 }
 
-
-/* Move the cursor forward by the specified number of words.  All of the
-   motion is done by "forwchar".  Error if you try and move beyond the
-   buffer's end.
+/* Move the cursor forward by the specified number of words. All of the motion
+ * is done by "forwchar". Error if you try and move beyond the buffer's end.
  */
-BINDABLE( forwword) {
+int forwword( int f, int n) {
 	if( n < 0)
 		return backword( f, -n) ;
 
@@ -173,41 +172,40 @@ static boolean capcapword( int n, boolean first_f, boolean rest_f) {
 	return TRUE ;
 }
 
-
 /* Move the cursor forward by the specified number of words. As you move,
-   convert any characters to upper case.  Error if you try and move beyond
-   the end of the buffer.  Bound to "M-U".
+ * convert any characters to upper case. Error if you try and move beyond the
+ * end of the buffer. Bound to "M-U".
  */
-BINDABLE( upperword) {
+int upperword( int f, int n) {
 	return capcapword( n, TRUE, TRUE) ;
 }
 
 
 /* Move the cursor forward by the specified number of words. As you move
-   convert characters to lower case.  Error if you try and move over the
-   end of the buffer.  Bound to "M-L".
+ * convert characters to lower case. Error if you try and move over the end of
+ * the buffer. Bound to "M-L".
  */
-BINDABLE( lowerword) {
+int lowerword( int f, int n) {
 	return capcapword( n, FALSE, FALSE) ;
 }
 
-
 /* Move the cursor forward by the specified number of words. As you move
-   convert the first character of the word to upper case, and subsequent
-   characters to lower case.  Error if you try and move past the end of the
-   buffer.  Bound to "M-C".
+ * convert the first character of the word to upper case, and subsequent
+ * characters to lower case. Error if you try and move past the end of the
+ * buffer. Bound to "M-C".
  */
-BINDABLE( capword) {
+int capword( int f, int n) {
 	return capcapword( n, TRUE, FALSE) ;
 }
 
-
-/* Kill forward by "n" words.  Remember the location of dot.  Move forward
-   by the right number of words.  Put dot back where it was and issue the
-   kill command for the right number of characters.  With a zero argument,
-   just kill one word and no whitespace.  Bound to "M-D".
+/*
+ * Kill forward by "n" words. Remember the location of dot. Move forward by
+ * the right number of words. Put dot back where it was and issue the kill
+ * command for the right number of characters. With a zero argument, just
+ * kill one word and no whitespace. Bound to "M-D".
  */
-BINDABLE( delfword) {
+int delfword(int f, int n)
+{
 	line_p dotp;	/* original cursor line */
 	int doto;	/*      and row */
 	int c;		/* temp char */
@@ -287,13 +285,13 @@ BINDABLE( delfword) {
 	return ldelete(size, TRUE);
 }
 
-
-/* Kill backwards by "n" words.  Move backwards by the desired number of
-   words, counting the characters.  When dot is finally moved to its
-   resting place, fire off the kill command.  Bound to "M-Rubout" and to
-   "M-Backspace".
+/*
+ * Kill backwards by "n" words. Move backwards by the desired number of words,
+ * counting the characters. When dot is finally moved to its resting place,
+ * fire off the kill command. Bound to "M-Rubout" and to "M-Backspace".
  */
-BINDABLE( delbword) {
+int delbword(int f, int n)
+{
 	assert( !(curbp->b_mode & MDVIEW)) ;
 
 	/* ignore the command if there is a nonpositive argument */
@@ -354,13 +352,17 @@ static int parafillnjustify( int f, int n, int justify_f) {
 
 	assert( !(curbp->b_mode & MDVIEW)) ;
 
-	if( fillcol == 0)	/* no fill column set */
-		return mloutfail( "No fill column set") ;
+	if (fillcol == 0) {	/* no fill column set */
+		mloutstr( "No fill column set") ;
+		return FALSE;
+	}
 
 	if( justify_f) {
 		leftmarg = getccol( FALSE) ;
-		if( leftmarg + 10 > fillcol)
-			return mloutfail( "Column too narrow") ;
+		if (leftmarg + 10 > fillcol) {
+			mloutstr( "Column too narrow") ;
+			return FALSE;
+		}
 
 		justflag = justify_f ;
 	}
@@ -470,33 +472,33 @@ static int parafillnjustify( int f, int n, int justify_f) {
 	return TRUE;
 }
 
-
-/* Fill the current paragraph according to the current
+/*
+ * Fill the current paragraph according to the current
  * fill column
  *
  * f and n - deFault flag and Numeric argument
  */
-BINDABLE( fillpara) {
+int fillpara( int f, int n) {
 	return parafillnjustify( f, n, FALSE) ;
 }
 
-
 /* Fill the current paragraph according to the current
  * fill column and cursor position
  *
  * int f, n;		deFault flag and Numeric argument
  */
-BINDABLE( justpara) {
+int justpara( int f, int n) {
 	return parafillnjustify( f, n, TRUE) ;
 }
 
-
-/* delete n paragraphs starting with the current one
+/*
+ * delete n paragraphs starting with the current one
  *
  * int f	default flag
  * int n	# of paras to delete
  */
-BINDABLE( killpara) {
+int killpara(int f, int n)
+{
 	while (n--) {		/* for each paragraph to delete */
 
 		/* mark out the end and beginning of the para to delete */
@@ -523,13 +525,15 @@ BINDABLE( killpara) {
 }
 
 
-/*	wordcount:	count the # of words in the marked region,
+/*
+ *	wordcount:	count the # of words in the marked region,
  *			along with average word sizes, # of chars, etc,
  *			and report on them.
  *
  * int f, n;		ignored numeric arguments
  */
-BINDABLE( wordcount) {
+int wordcount(int f, int n)
+{
 	line_p lp;	/* current line to scan */
 	int offset;	/* current char to scan */
 	long size;		/* size of region left to count */
@@ -587,14 +591,15 @@ BINDABLE( wordcount) {
 	return TRUE;
 }
 
-
-/* go back to the beginning of the current paragraph
+/*
+ * go back to the beginning of the current paragraph
  * here we look for a <NL><NL> or <NL><TAB> or <NL><SPACE>
  * combination to delimit the beginning of a paragraph
  *
  * int f, n;		default Flag & Numeric argument
  */
-BINDABLE( gotobop) {
+int gotobop(int f, int n)
+{
 	if (n < 0) /* the other way... */
 		return gotoeop(f, -n);
 
@@ -624,14 +629,15 @@ BINDABLE( gotobop) {
 	return TRUE;
 }
 
-
-/* Go forward to the end of the current paragraph here we look for a
-   <NL><NL> or <NL><TAB> or <NL><SPACE> combination to delimit the
-   beginning of a paragraph
-
-   int f, n;		default Flag & Numeric argument
+/*
+ * Go forward to the end of the current paragraph
+ * here we look for a <NL><NL> or <NL><TAB> or <NL><SPACE>
+ * combination to delimit the beginning of a paragraph
+ *
+ * int f, n;		default Flag & Numeric argument
  */
-BINDABLE( gotoeop) {
+int gotoeop(int f, int n)
+{
 	if (n < 0)  /* the other way... */
 		return gotobop(f, -n);