Only warn about unmapped characters in non-empty charmaps

Fixes #1058

Author: Rangi42

src/asm/charmap.c

@@ -249,9 +249,8 @@ size_t charmap_ConvertNext(char const **input, uint8_t **output)
 				if (output)
 					*output += codepointLen;
 
-				// Check if the character map is not the default "main" one, or if
-				// it has any mappings defined
-				if (strcmp(charmap->name, "main") || charmap->usedNodes > 1)
+				// Warn if this character is not mapped but any others are
+				if (charmap->usedNodes > 1)
 					warning(WARNING_UNMAPPED_CHAR,
 						"Unmapped character %s\n", printChar(firstChar));
 

test/asm/unmapped-char.asm

@@ -4,7 +4,9 @@ SECTION "test", ROM0
 
 	pushc
 	newcharmap custom
-	db "A" ; unmapped in non-default charmap
+	db "A" ; OK, unmapped in non-default empty charmap
+	charmap "C", $99
+	db "A" ; unmapped in non-empty charmap
 	popc
 
 	db "A" ; OK, default empty charmap again

test/asm/unmapped-char.err

@@ -1,4 +1,4 @@
-warning: unmapped-char.asm(7): [-Wunmapped-char]
+warning: unmapped-char.asm(9): [-Wunmapped-char]
     Unmapped character 'A'
-warning: unmapped-char.asm(13): [-Wunmapped-char]
+warning: unmapped-char.asm(15): [-Wunmapped-char]
     Unmapped character 'A'