Index: gmap.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/gmap/gmap.module,v
retrieving revision 1.94
diff -u -u -p -r1.94 gmap.module
--- gmap.module	29 Dec 2008 18:59:41 -0000	1.94
+++ gmap.module	4 Jan 2009 21:42:15 -0000
@@ -863,11 +863,7 @@ function theme_gmap($element) {
   $element['#settings']['id'] = $mapid;
 
   $mapdefaults = gmap_defaults();
-  $map = array_merge($mapdefaults, $element['#settings']);
-  // Styles is a subarray.
-  if (isset($element['#settings']['styles'])) {
-    $map['styles'] = array_merge($mapdefaults['styles'], $element['#settings']['styles']);
-  }
+  $map = array_merge_recursive($mapdefaults, $element['#settings']);
   gmap_map_cleanup($map);
 
   switch (strtolower($map['align'])) {
Index: js/gmap.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/gmap/js/gmap.js,v
retrieving revision 1.8
diff -u -u -p -r1.8 gmap.js
--- js/gmap.js	19 Dec 2008 18:36:15 -0000	1.8
+++ js/gmap.js	4 Jan 2009 21:42:17 -0000
@@ -273,7 +273,7 @@ Drupal.gmap.addHandler('gmap',function(e
       map.enableDoubleClickZoom();
       map.enableContinuousZoom();
     }
-    if (!obj.vars.nomousezoom) {
+    if (!obj.vars.behavior.nomousezoom) {
       map.enableScrollWheelZoom();
     }