Make `G' in eww record history

Fixes: debbugs:19253
* net/eww.el (eww-browse-url): Use generate-new-buffer (was:
iterating over possible buffer names.)

* net/eww.el (eww): Moved history recording here...
(eww-browse-url): ... from here.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ee822a6d261538543d49ae34ae2664c1a1ad5b0..1769c486372e09866e503b72ad797e1460f7c7a3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-07  Ivan Shmakov  <ivan@siamics.net>
+
+       * net/eww.el (eww): Moved history recording here...
+       (eww-browse-url): ... from here (bug#19253).
+
+       * net/eww.el (eww-browse-url): Use generate-new-buffer (was:
+       iterating over possible buffer names.)
+
 2014-12-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * net/eww.el (eww-reload): Take a prefix to work locally (bug#19086).

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 1e63cafd5ea2c14aa8809af1ee42504633c1d7a9..8b7839701eca26d6f65fe4728ce14b501cfad559 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -253,7 +253,10 @@ word(s) will be searched for via `eww-search-prefix'."
                  (setq url (concat url "/"))))
            (setq url (concat eww-search-prefix
                              (replace-regexp-in-string " " "+" url))))))
-  (unless (eq major-mode 'eww-mode)
+  (if (eq major-mode 'eww-mode)
+      (when (or (plist-get eww-data :url)
+               (plist-get eww-data :dom))
+       (eww-save-history))
     (eww-setup-buffer)
     (plist-put eww-data :url url)
     (eww-update-header-line-format)
@@ -680,16 +683,8 @@ the like."
 ;;;###autoload
 (defun eww-browse-url (url &optional new-window)
   (cond (new-window
-         (let ((new-buffer "*eww*")
-               (num 0))
-           (while (get-buffer new-buffer)
-             (setq num (1+ num)
-                   new-buffer (format "*eww*<%d>" num)))
-           (switch-to-buffer new-buffer))
-         (eww-mode))
-        ((and (equal major-mode 'eww-mode)
-              (plist-get eww-data :url))
-         (eww-save-history)))
+        (switch-to-buffer (generate-new-buffer "*eww*"))
+         (eww-mode)))
   (eww url))
 
 (defun eww-back-url ()