Fix last change

* src/xwidget.c (Fmake_xwidget): Cast boolean value to gboolean.
(syms_of_xwidget): Fix coding style and improve doc string.

(cherry picked from commit 9a2c7d865ff8df960793e19c3f854db66b40e0fb)

diff --git a/src/xwidget.c b/src/xwidget.c
index 557b1e604092e586a2d3b33f0386bb22f14e2498..2260c0c2e0f76cb7b43544ab58086bef69b5984d 100644 (file)
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -378,7 +378,8 @@ fails.  */)
          /* Enable the developer extras.  */
          settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (xw->widget_osr));
          g_object_set (G_OBJECT (settings), "enable-developer-extras", TRUE, NULL);
-         g_object_set (G_OBJECT (settings), "enable-javascript", !xwidget_webkit_disable_javascript, NULL);
+         g_object_set (G_OBJECT (settings), "enable-javascript",
+                       (gboolean) (!xwidget_webkit_disable_javascript), NULL);
        }
 
       gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width,
@@ -3972,10 +3973,10 @@ syms_of_xwidget (void)
               doc: /* List of all xwidget views.  */);
   Vxwidget_view_list = Qnil;
 
-  DEFVAR_BOOL("xwidget-webkit-disable-javascript", xwidget_webkit_disable_javascript,
-             doc: /* If non-nil, disable execution of JavaScript in xwidget webkit sessions.
-You must kill all xwidget-webkit buffers for this setting to take effect
-after changing it.  */);
+  DEFVAR_BOOL ("xwidget-webkit-disable-javascript", xwidget_webkit_disable_javascript,
+    doc: /* If non-nil, disable execution of JavaScript in WebKit widgets.
+Modifications to this setting do not take effect in existing WebKit
+widgets.  */);
   xwidget_webkit_disable_javascript = false;
 
   Fprovide (intern ("xwidget-internal"), Qnil);