From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 6 Sep 2020 00:02:42 +0000 (+0200)
Subject: Fix eww-change-select defaults in a different way
X-Git-Tag: emacs-28.0.90~6228
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ccd5f0d0a99f93c5507c888b5a0c1a5af2d89106;p=emacs.git

Fix eww-change-select defaults in a different way

* lisp/net/eww.el (eww-change-select): Fix bug#43218 in a more
safe way than the previous version.
---

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index b800d1890fe..4b897fa34e6 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1450,14 +1450,13 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.")
 			       (cons (plist-get (cdr elem) :display)
 				     (plist-get (cdr elem) :value))))
 			input)))
-	 (display
-	  (completing-read "Change value: " options nil 'require-match
-                           nil nil (car (rassoc (plist-get input :value)
-                                                options))))
+	 (display (completing-read "Change value: " options nil 'require-match))
 	 (inhibit-read-only t))
-    (plist-put input :value (cdr (assoc-string display options t)))
-    (goto-char
-     (eww-update-field display))))
+    ;; If the user doesn't enter anything, don't change anything.
+    (when (> (length display) 0)
+      (plist-put input :value (cdr (assoc-string display options t)))
+      (goto-char
+       (eww-update-field display)))))
 
 (defun eww-update-field (string &optional offset)
   (unless offset