X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fparse.l;h=a7cd6c636b2d71b08cc901d798aab63541554278;hb=6e42b65bda1706887f3b2a7f9d79ba20f7611a06;hp=64896e07249d6806cb7f2d6678a5b3a417991b3e;hpb=5cf61ee02354c1c9f80c11f3796afc4b948055d6;p=chaz%2Fopenbox

diff --git a/openbox/parse.l b/openbox/parse.l
index 64896e07..a7cd6c63 100644
--- a/openbox/parse.l
+++ b/openbox/parse.l
@@ -10,7 +10,7 @@ extern int lineno;
 real [-0-9][0-9]*\.[0-9]+
 integer [-0-9][0-9]*
 string \"[^"\n]*\"
-identifier [a-zA-Z][-.a-zA-Z0-9]*
+identifier [a-zA-Z][-.a-zA-Z0-9_]*
 bool ([tT][rR][uU][eE]|[fF][aA][lL][sS][eE]|[yY][eE][sS]|[nN][oO]|[oO][nN]|[oO][fF][fF])
 
 %%
@@ -31,7 +31,7 @@ bool ([tT][rR][uU][eE]|[fF][aA][lL][sS][eE]|[yY][eE][sS]|[nN][oO]|[oO][nN]|[oO][
 {bool}       { yylval.bool = (!g_ascii_strcasecmp("true", yytext) ||
                               !g_ascii_strcasecmp("yes", yytext) ||
                               !g_ascii_strcasecmp("on", yytext));
-               return BOOL;
+               return BOOLEAN;
              }
 {identifier} { yylval.identifier = g_strdup(yytext); return IDENTIFIER; }
 [{}()\[\]=,] { yylval.character = *yytext; return *yytext; }