(eww-convert-widgets): Fix last patch.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34703c8..d1ec5f2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,9 @@
 2013-06-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * eww.el (eww-tag-select): Don't render totally empty <select> forms.
+       (eww-convert-widgets): Don't bug out if the first widget starts at the
+       beginning of the buffer.
+       (eww-convert-widgets): Fix last patch.
 
        * shr.el (shr-insert-table): Respect border-collapse: collapse.
        (shr-tag-base): Protect against base specs that are degenerate.

diff --git a/lisp/eww.el b/lisp/eww.el
index 811aa57..fc6f591 100644 (file)
--- a/lisp/eww.el
+++ b/lisp/eww.el
@@ -308,7 +308,7 @@
                  :size (string-to-number
                         (or (cdr (assq :size cont))
                             "40"))
-                 :value value
+                 :value (or value "")
                  :secret (and (equal type "password") ?*)
                  :action 'eww-submit
                  :name (cdr (assq :name cont))
@@ -449,7 +449,9 @@
     ;; so we need to nix out the list of widgets and recreate them.
     (setq widget-field-list nil
          widget-field-new nil)
-    (while (setq start (next-single-property-change start 'eww-widget))
+    (while (setq start (if (get-text-property start 'eww-widget)
+                          start
+                        (next-single-property-change start 'eww-widget)))
       (setq widget (get-text-property start 'eww-widget))
       (goto-char start)
       (let ((end (next-single-property-change start 'eww-widget)))