From: Dario Gjorgjevski <dario.gjorgjevski@gmail.com>
Date: Thu, 26 Nov 2020 10:59:23 +0000 (+0100)
Subject: Fix modification check when custom-form is `lisp'
X-Git-Tag: emacs-28.0.90~5015
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e3d8f4b98f19f4e8d194f1ae9a91065b80e01a0f;p=emacs.git

Fix modification check when custom-form is `lisp'

* lisp/cus-edit.el (custom-variable-modified-p): Quote the value when
custom form is 'lisp (or 'mismatch) prior to comparing in order to
accommodate `custom-variable-value-create' (bug#44852).
---

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index cb68bae3c9b..a00cb17e298 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -2900,14 +2900,20 @@ Modified means that the widget that holds the value has been edited by the user
 in a customize buffer.
 To check for other states, call `custom-variable-state'."
   (catch 'get-error
-    (let* ((symbol (widget-get widget :value))
+    (let* ((form (widget-get widget :custom-form))
+           (symbol (widget-get widget :value))
            (get (or (get symbol 'custom-get) 'default-value))
            (value (if (default-boundp symbol)
                       (condition-case nil
                           (funcall get symbol)
                         (error (throw 'get-error t)))
-                    (symbol-value symbol))))
-      (not (equal value (widget-value (car (widget-get widget :children))))))))
+                    (symbol-value symbol)))
+           (orig-value (widget-value (car (widget-get widget :children)))))
+      (not (equal (if (memq form '(lisp mismatch))
+                      ;; Mimic `custom-variable-value-create'.
+                      (custom-quote value)
+                    value)
+                  orig-value)))))
 
 (defun custom-variable-state-set (widget &optional state)
   "Set the state of WIDGET to STATE.