Merge branch 'master' into comment, update ChangeLogs

1 files changed, 2 insertions, 2 deletions

diff --git a/main.c b/main.c
index 3da0703e..41f10a17 100644
--- a/main.c
+++ b/main.c
@@ -1329,11 +1329,11 @@ arg_assign(char *arg, bool initing)
 
 	/* first check that the variable name has valid syntax */
 	badvar = false;
-	if (! isalpha((unsigned char) arg[0]) && arg[0] != '_')
+	if (! is_alpha((unsigned char) arg[0]) && arg[0] != '_')
 		badvar = true;
 	else
 		for (cp2 = arg+1; *cp2; cp2++)
-			if (! isalnum((unsigned char) *cp2) && *cp2 != '_') {
+			if (! is_identchar((unsigned char) *cp2)) {
 				badvar = true;
 				break;
 			}