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

diff --git a/dot-emacs.el b/dot-emacs.el
index ca053b427d3239162cad7b9fe401c46518025805..4222f53ca807ccfba0fb0a5a0666d1db2e8fe180 100644 (file)
--- 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)