aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2013-12-24 19:07:55 +0100
committerLars Ingebrigtsen2013-12-24 19:07:55 +0100
commiteeef121a18b0317cbe739e104c0b024289e4b851 (patch)
tree000aef20b1d9ddefc28ce1ebbf6cbdf3d8608f22
parenta50fa60572354314a3d2c1574f782b7819b4ef0d (diff)
downloademacs-eeef121a18b0317cbe739e104c0b024289e4b851.tar.gz
emacs-eeef121a18b0317cbe739e104c0b024289e4b851.zip
eww bookmark window restoration
* net/eww.el (eww-bookmark-browse): Use `quit-window' to restore the window configuration.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/eww.el5
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7caaf69358..c3185a37a71 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-12-24 Lars Ingebrigtsen <larsi@gnus.org>
2
3 * net/eww.el (eww-bookmark-browse): Use `quit-window' to restore
4 the window configuration.
5
12013-12-24 Eli Zaretskii <eliz@gnu.org> 62013-12-24 Eli Zaretskii <eliz@gnu.org>
2 7
3 * net/eww.el (eww-open-file): Ensure 3 slashes after "file:" when 8 * 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 c5ac2f5c86c..02c93a0c677 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1086,8 +1086,6 @@ Differences in #targets are ignored."
1086;;; Bookmarks code 1086;;; Bookmarks code
1087 1087
1088(defvar eww-bookmarks nil) 1088(defvar eww-bookmarks nil)
1089(defvar eww-previous-window-configuration nil)
1090(make-variable-buffer-local 'eww-previous-window-configuration)
1091 1089
1092(defun eww-add-bookmark () 1090(defun eww-add-bookmark ()
1093 "Add the current page to the bookmarks." 1091 "Add the current page to the bookmarks."
@@ -1132,7 +1130,6 @@ Differences in #targets are ignored."
1132 (unless eww-bookmarks 1130 (unless eww-bookmarks
1133 (user-error "No bookmarks are defined")) 1131 (user-error "No bookmarks are defined"))
1134 (set-buffer (get-buffer-create "*eww bookmarks*")) 1132 (set-buffer (get-buffer-create "*eww bookmarks*"))
1135 (setq eww-previous-window-configuration (current-window-configuration))
1136 (eww-bookmark-mode) 1133 (eww-bookmark-mode)
1137 (let ((format "%-40s %s") 1134 (let ((format "%-40s %s")
1138 (inhibit-read-only t) 1135 (inhibit-read-only t)
@@ -1191,8 +1188,6 @@ Differences in #targets are ignored."
1191 (unless bookmark 1188 (unless bookmark
1192 (user-error "No bookmark on the current line")) 1189 (user-error "No bookmark on the current line"))
1193 (quit-window) 1190 (quit-window)
1194 (when eww-previous-window-configuration
1195 (set-window-configuration eww-previous-window-configuration))
1196 (eww-browse-url (plist-get bookmark :url)))) 1191 (eww-browse-url (plist-get bookmark :url))))
1197 1192
1198(defun eww-next-bookmark () 1193(defun eww-next-bookmark ()