diff options
Diffstat (limited to 'core/kbd/fix-keymap-loading-1.15.5.patch')
| -rw-r--r-- | core/kbd/fix-keymap-loading-1.15.5.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/core/kbd/fix-keymap-loading-1.15.5.patch b/core/kbd/fix-keymap-loading-1.15.5.patch new file mode 100644 index 000000000..ae179d887 --- /dev/null +++ b/core/kbd/fix-keymap-loading-1.15.5.patch @@ -0,0 +1,47 @@ +commit 7e06e56157e8431d02e1377cdc44230944203d88 +Author: Alexey Gladkov <gladkov.alexey@gmail.com> +Date: Tue Dec 11 14:24:44 2012 +0400 + + Fix regression in 16117ce6ab + + Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> + +diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l +index c18dcea..f817c78 100644 +--- a/src/loadkeys.analyze.l ++++ b/src/loadkeys.analyze.l +@@ -307,8 +307,10 @@ To to|To|TO + char *s = xstrndup(yytext+1, strlen(yytext)-2); + /* use static pathname to store *s ? */ + open_include(s); +- yy_pop_state(); +- state_ptr--; ++ while (state_ptr > 0) { ++ yy_pop_state(); ++ state_ptr--; ++ } + } + <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol} { + yyerror(_("expected filename between quotes")); +@@ -323,7 +325,7 @@ To to|To|TO + } + {Eol} { + line_nr++; +- if (state_ptr > 0) { ++ while (state_ptr > 0) { + yy_pop_state(); + state_ptr--; + } +@@ -428,8 +430,10 @@ To to|To|TO + } + <STR>\" { + *p = '\0'; +- yy_pop_state(); +- state_ptr--; ++ while (state_ptr > 0) { ++ yy_pop_state(); ++ state_ptr--; ++ } + return(STRLITERAL); + } + . { |