190.42190.53190.42

1 files changed, 15 insertions, 0 deletions

diff --git a/XF86Config-parser/Merge.c b/XF86Config-parser/Merge.c
index 26521ee..e302e5e 100644
--- a/XF86Config-parser/Merge.c
+++ b/XF86Config-parser/Merge.c
@@ -691,6 +691,21 @@ static int xconfigMergeLayout(XConfigPtr dstConfig, XConfigPtr srcConfig)
         srcAdj = srcAdj->next;
     }
 
+    /* Merge the options */
+    
+    if (srcLayout->options) {
+        XConfigOptionPtr srcOption;
+
+        srcOption = srcLayout->options;
+        while (srcOption) {
+            xconfigMergeOption(&(dstLayout->options),
+                               &(srcLayout->options),
+                               xconfigOptionName(srcOption),
+                               &(dstLayout->comment));
+            srcOption = srcOption->next;
+        }
+    }
+
     return 1;
 
 } /* xconfigMergeLayout() */