eww point positioning tweak

(eww-display-html): Don't leave point inside forms.

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec62f4df58b..77652d7d6bb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
 2014-11-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * net/eww.el (eww-score-readability): Parse SVC images correctly.
+        (eww-display-html): Don't leave point inside forms.
 
         * net/shr.el: Ditto.
 
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 0f074696404..1eb00d302d5 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -300,7 +300,12 @@ word(s) will be searched for via `eww-search-prefix'."
           (when point
             (goto-char point))))
        (t
-        (goto-char (point-min)))))
+        (goto-char (point-min))
+        ;; Don't leave point inside forms, because the normal eww
+        ;; commands aren't available there.
+        (while (and (not (eobp))
+                    (get-text-property (point) 'eww-form))
+          (forward-line 1)))))
     (setq eww-current-url url
           eww-history-position 0)
     (eww-update-header-line-format)))