emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master a9210e8efd6 1/2: Avoid prompting when creating a restricted-sexp


From: Eli Zaretskii
Subject: master a9210e8efd6 1/2: Avoid prompting when creating a restricted-sexp widget
Date: Sat, 22 Jul 2023 08:56:18 -0400 (EDT)

branch: master
commit a9210e8efd628a76084f50b6e67e009d35fac32b
Author: Mauro Aranda <maurooaranda@gmail.com>
Commit: Eli Zaretskii <eliz@gnu.org>

    Avoid prompting when creating a restricted-sexp widget
    
    * lisp/wid-edit.el (restricted-sexp): Turn value into a
    string before reading.
    (widget-field-value-create): Guard against value being nil,
    so the field can be created even if the widget has a bad
    default value.  (Bug#59937)
---
 lisp/wid-edit.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 606093fd293..b9291af2bd5 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -2127,7 +2127,8 @@ the earlier input."
        ;; `widget-setup' is called.
        (overlay (cons (make-marker) (make-marker))))
     (widget-put widget :field-overlay overlay)
-    (insert value)
+    (when value
+      (insert value))
     (and size
         (< (length value) size)
         (insert-char ?\s (- size (length value))))
@@ -3655,7 +3656,9 @@ match-alternatives: %S"
                            value
                            (widget-get widget :match)
                            (widget-get widget :match-alternatives))
-                          :warning))
+                          :warning)
+                         ;; Make sure we will `read' a string.
+                         (setq value (prin1-to-string value)))
                        (read value)))
 
 (defun widget-restricted-sexp-match (widget value)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]