[Emacs-diffs] trunk r113191: (eww-bookmark-browse): Don't bug out if it's the only window.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113191
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2013-06-26 19:14:46 +0200
message:
  (eww-bookmark-browse): Don't bug out if it's the only window.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-26 16:59:21 +0000
+++ b/lisp/ChangeLog    2013-06-26 17:14:46 +0000
@@ -6,6 +6,7 @@
        (eww-add-bookmark): New command.
        (eww-bookmark-mode): New mode and commands.
        (eww-add-bookmark): Remove newlines from the title.
+       (eww-bookmark-browse): Don't bug out if it's the only window.
 
 2013-06-26  Glenn Morris  <address@hidden>
 

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-06-26 16:59:21 +0000
+++ b/lisp/net/eww.el   2013-06-26 17:14:46 +0000
@@ -1043,7 +1043,10 @@
   (let ((bookmark (get-text-property (line-beginning-position) 'eww-bookmark)))
     (unless bookmark
       (error "No bookmark on the current line"))
-    (delete-window)
+    ;; We wish to leave this window, but if it's the only window here,
+    ;; just let it remain.
+    (ignore-errors
+      (delete-window))
     (eww (plist-get bookmark :url))))
 
 (defun eww-next-bookmark ()