From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 14 Mar 2024 09:32:00 +0000 (+0200)
Subject: ; Fix last change (bug#68604)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fb2dd1801db0fbffddd38ef28f3f81727307850a;p=emacs.git

; Fix last change (bug#68604)

* lisp/xwidget.el (xwidget-webkit-disable-javascript): Move from
here...
* lisp/cus-start.el (standard): ...to here.

* src/xwidget.c (syms_of_xwidget)
<xwidget-webkit-disable-javascript>: Doc fix.

* doc/emacs/misc.texi (Embedded WebKit Widgets): Fix wording.

(cherry picked from commit a60804ab954e0de73a80a217f677142176678465)
---

diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index bfc86e3c9d4..8f9ee317080 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -3011,10 +3011,11 @@ It is bound to @kbd{H}.
 
 @vindex xwidget-webkit-disable-javascript
 @cindex disabling javascript in webkit buffers
-  JavaScript is enabled by default inside WebKit buffers, this can be
-undesirable as websites often use it to track your online activity.  It
-can be disabled by setting the variable @code{xwidget-webkit-disable-javascript} to @code{t}.
-You must kill all WebKit buffers for this setting to take effect after
+  JavaScript is enabled by default inside WebKit buffers, which could be
+undesirable, as Web sites often use it to track your online activity.
+You can disable JavaScript in WebKit buffers by customizing the variable
+@code{xwidget-webkit-disable-javascript} to a non-@code{nil} value.
+You must kill all WebKit buffers for this setting to take effect, after
 it is changed.
 
 @node Browse-URL
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index be24f1232b8..b5fb5f009bd 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -843,6 +843,8 @@ since it could result in memory overflow and make Emacs crash."
 	     (x-select-enable-clipboard-manager killing boolean "24.1")
 	     ;; xsettings.c
 	     (font-use-system-font font-selection boolean "23.2")
+             ;; xwidget.c
+             (xwidget-webkit-disable-javascript xwidget boolean "30.1")
              ;; haikuterm.c
              (haiku-debug-on-fatal-error debug boolean "29.1")
              ;; haikufns.c
@@ -903,6 +905,8 @@ since it could result in memory overflow and make Emacs crash."
 			      (symbol-name symbol))
 		       ;; Any function from fontset.c will do.
 		       (fboundp 'new-fontset))
+                      ((string-match "xwidget-" (symbol-name symbol))
+                       (boundp 'xwidget-internal))
 		      (t t))))
     (if (not (boundp symbol))
 	;; If variables are removed from C code, give an error here!
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 2fb79bb7b1d..cca01c8cb3a 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -116,13 +116,6 @@ buffers for this setting to take effect after setting it to nil."
   :type '(choice (const :tag "Do not store cookies" nil) file)
   :version "29.1")
 
-(defcustom xwidget-webkit-disable-javascript nil
-  "If non-nil, disables the execution of JavaScript in xwidget webkit sessions.
-You must kill all xwidget-webkit buffers for this setting to take
-effect after changing it."
-  :type '(boolean)
-  :version "30.0")
-
 ;;;###autoload
 (defun xwidget-webkit-browse-url (url &optional new-session)
   "Ask xwidget-webkit to browse URL.
diff --git a/src/xwidget.c b/src/xwidget.c
index 5b82ef6e840..557b1e60409 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -3973,9 +3973,9 @@ syms_of_xwidget (void)
   Vxwidget_view_list = Qnil;
 
   DEFVAR_BOOL("xwidget-webkit-disable-javascript", xwidget_webkit_disable_javascript,
-	      doc: /* If non-nil, disables the execution of JavaScript in xwidget webkit sessions.
-You must kill all xwidget-webkit buffers for this setting to take
-effect after changing it.  */);
+	      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.  */);
   xwidget_webkit_disable_javascript = false;
 
   Fprovide (intern ("xwidget-internal"), Qnil);