Loads of NetBSD tweaks here.

src/libeinfo/libeinfo.c

@@ -177,6 +177,7 @@ static const char *const color_terms[] = {
 	"screen-w",
 	"screen.linux",
 	"vt100",
+	"vt220",
 	"xterm",
 	"xterm-256color",
 	"xterm-color",

src/librc/librc-misc.c

@@ -151,11 +151,14 @@ char **rc_config_list (const char *file)
 		/* Get entry - we do not want comments */
 		token = strsep (&p, "#");
 		if (token && (strlen (token) > 1)) {
-			/* Stip the newline if present */
-			if (token[strlen (token) - 1] == '\n')
-				token[strlen (token) - 1] = 0;
+			/* If not variable assignment then skip */
+			if (strchr (token, '=')) {
+				/* Stip the newline if present */
+				if (token[strlen (token) - 1] == '\n')
+					token[strlen (token) - 1] = 0;
 
-			rc_strlist_add (&list, token);
+				rc_strlist_add (&list, token);
+			}
 		}
 		free (buffer);
 	}