From: Mark Wooding <mdw@ncipher.com>
Date: Wed, 14 Jun 2006 11:26:03 +0000 (+0100)
Subject: dot-emacs: More w3m fiddling: restore previously-selected window.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/63fb20c112f2a32743ec9a71ff8f24d0d0115829?ds=sidebyside

dot-emacs: More w3m fiddling: restore previously-selected window.
---

diff --git a/dot-emacs.el b/dot-emacs.el
index ca053b4..4222f53 100644
--- a/dot-emacs.el
+++ b/dot-emacs.el
@@ -299,12 +299,16 @@ (defun mdw-w3m-browse-url (url &optional new-session-p)
 If NEW-SESSION-P, start a new session."
   (interactive "sURL: \nP")
   (save-excursion
-    (select-window (or (and (not new-session-p)
-			    (get-buffer-window "*w3m*"))
-		       (progn
-			 (if (one-window-p t) (split-window))
-			 (get-lru-window))))
-    (w3m-browse-url url new-session-p)))
+    (let ((window (selected-window)))
+      (unwind-protect
+	  (progn
+	    (select-window (or (and (not new-session-p)
+				    (get-buffer-window "*w3m*"))
+			       (progn
+				 (if (one-window-p t) (split-window))
+				 (get-lru-window))))
+	    (w3m-browse-url url new-session-p))
+	(select-window window)))))
 
 (defvar mdw-good-url-browsers
   '((w3m . mdw-w3m-browse-url)