Add ^K ^SPACE. Allow multi-line macro definitions.

joe/rc.c

@@ -1356,6 +1356,34 @@ int umode(BW *bw)
 	}
 }
 
+/* Parse a macro- allow it to cross lines */
+
+MACRO *multiparse(JFILE *fd, int *refline, unsigned char *buf, int *ofst, int *referr, unsigned char *name)
+{
+	MACRO *m;
+	int x = *ofst;
+	int err = *referr;
+	int line = *refline;
+	m = 0;
+	for (;;) {
+		m = mparse(m, buf + x, &x, 0);
+		if (x == -1) { /* Error */
+			err = -1;
+			logerror_2((char *)joe_gettext(_("%s %d: Unknown command in macro\n")), name, line);
+			break;
+		} else if (x == -2) { /* Get more input */
+			jfgets(buf, 1024, fd);
+			++line;
+			x = 0;
+		} else /* We're done */
+			break;
+	}
+	*referr = err;
+	*refline = line;
+	*ofst = x;
+	return m; 
+}
+
 /* Process rc file
  * Returns 0 if the rc file was succefully processed
  *        -1 if the rc file couldn't be opened
@@ -1368,6 +1396,7 @@ int procrc(CAP *cap, unsigned char *name)
 	KMAP *context = NULL;	/* Current context */
 	struct rc_menu *current_menu = NULL;
 	unsigned char buf[1024];	/* Input buffer */
+	unsigned char buf1[1024];	/* Input buffer */
 	JFILE *fd;		/* rc file */
 	int line = 0;		/* Line number */
 	int err = 0;		/* Set to 1 if there was a syntax error */
@@ -1462,13 +1491,14 @@ int procrc(CAP *cap, unsigned char *name)
 						for (y = x; !joe_isspace_eof(locale_map,buf[y]); ++y) ;
 						c = buf[y];
 						buf[y] = 0;
+						zlcpy(buf1, sizeof(buf1), buf + x);
 						if (y != x) {
-							int sta;
+							int sta = y + 1;
 							MACRO *m;
 
 							if (joe_isblank(locale_map,c)
-							    && (m = mparse(NULL, buf + y + 1, &sta, 0)))
-								addcmd(buf + x, m);
+							    && (m = multiparse(fd, &line, buf, &sta, &err, name)))
+								addcmd(buf1, m);
 							else {
 								err = 1;
 								logerror_2((char *)joe_gettext(_("%s %d: macro missing from :def\n")), name, line);
@@ -1585,18 +1615,10 @@ int procrc(CAP *cap, unsigned char *name)
 					break;
 				}
 
-				m = 0;
-			      macroloop:
-				m = mparse(m, buf, &x, 0);
-				if (x == -1) {
-					err = 1;
-					logerror_2((char *)joe_gettext(_("%s %d: Unknown command in macro\n")), name, line);
+				x = 0;
+				m = multiparse(fd, &line, buf, &x, &err, name);
+				if (x == -1)
 					break;
-				} else if (x == -2) {
-					jfgets(buf, 1024, fd);
-					++line;
-					goto macroloop;
-				}
 				if (!m)
 					break;