eww bookmark window restoration

* net/eww.el (eww-bookmark-browse): Use `quit-window' to restore
the window configuration.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7caaf69358158d9b481b5a4abdc2beb7ba338d9..c3185a37a71a1b9d8183819093ce0700ba2609d4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * net/eww.el (eww-bookmark-browse): Use `quit-window' to restore
+       the window configuration.
+
 2013-12-24  Eli Zaretskii  <eliz@gnu.org>
 
        * net/eww.el (eww-open-file): Ensure 3 slashes after "file:" when

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index c5ac2f5c86c3778f0ea242fcf3b19a19cdaa5766..02c93a0c677764a9a7d55d8b75486de807042fcd 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1086,8 +1086,6 @@ Differences in #targets are ignored."
 ;;; Bookmarks code
 
 (defvar eww-bookmarks nil)
-(defvar eww-previous-window-configuration nil)
-(make-variable-buffer-local 'eww-previous-window-configuration)
 
 (defun eww-add-bookmark ()
   "Add the current page to the bookmarks."
@@ -1132,7 +1130,6 @@ Differences in #targets are ignored."
   (unless eww-bookmarks
     (user-error "No bookmarks are defined"))
   (set-buffer (get-buffer-create "*eww bookmarks*"))
-  (setq eww-previous-window-configuration (current-window-configuration))
   (eww-bookmark-mode)
   (let ((format "%-40s %s")
        (inhibit-read-only t)
@@ -1191,8 +1188,6 @@ Differences in #targets are ignored."
     (unless bookmark
       (user-error "No bookmark on the current line"))
     (quit-window)
-    (when eww-previous-window-configuration
-      (set-window-configuration eww-previous-window-configuration))
     (eww-browse-url (plist-get bookmark :url))))
 
 (defun eww-next-bookmark ()