[Emacs-diffs] trunk r115734: eww bookmark window restoration

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 115734
revision-id: address@hidden
parent: address@hidden
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-24 19:07:55 +0100
message:
  eww bookmark window restoration
  
  * net/eww.el (eww-bookmark-browse): Use `quit-window' to restore
  the window configuration.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-24 17:23:56 +0000
+++ b/lisp/ChangeLog    2013-12-24 18:07:55 +0000
@@ -1,3 +1,8 @@
+2013-12-24  Lars Ingebrigtsen  <address@hidden>
+
+       * net/eww.el (eww-bookmark-browse): Use `quit-window' to restore
+       the window configuration.
+
 2013-12-24  Eli Zaretskii  <address@hidden>
 
        * net/eww.el (eww-open-file): Ensure 3 slashes after "file:" when

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-12-24 17:23:56 +0000
+++ b/lisp/net/eww.el   2013-12-24 18:07:55 +0000
@@ -1086,8 +1086,6 @@
 ;;; 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 @@
   (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 @@
     (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 ()