Keyboard.c: fix wrong "rlmvo" keyword

variable names and manpage were correct, but the code was not, it
expected "rlmvo" instead of "rmlvo".

Support the old (wrong) variant, too (but do not document it), since
there might be users out there whose setup would break.

1 files changed, 4 insertions, 3 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 49f26252a..0d6dfb416 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -581,12 +581,13 @@ XkbError:
             The original nxagent only supports model/layout values
             here. It uses these values together with the default rules
             and empty variant and options. We use a more or less
-            compatible hack here: The special keyword rlmvo for model
+            compatible hack here: The special keyword rmlvo for model
             means that the layout part of the string will contain a
             full RMLVO config, separated by #, e.g.
-            rlmvo/base#pc105#de,us#nodeadkeys#lv3:rwin_switch
+            rmlvo/base#pc105#de,us#nodeadkeys#lv3:rwin_switch
           */
-          if (strncmp(nxagentKeyboard, "rlmvo/", 6) == 0)
+          /* support "rlmvo" (spelled wrong) which was being used for some time */
+          if ((strncmp(nxagentKeyboard, "rmlvo/", 6) == 0) || (strncmp(nxagentKeyboard, "rlmvo/", 6) == 0))
           {
             const char * sep = "#";
             char * rmlvo = strdup(&nxagentKeyboard[i+1]);