From e58ed09121969febde5bfc2206c14f4a7806c323 Mon Sep 17 00:00:00 2001 From: Robert Cochran Date: Mon, 22 Aug 2016 11:21:01 -0700 Subject: [PATCH] Kill the webkit browser buffer if an error occurs * lisp/xwidget.el (xwidget-webkit-new-session): kill webkit buffer on error --- lisp/xwidget.el | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lisp/xwidget.el b/lisp/xwidget.el index 7a0ca8b..e925c9a 100644 --- a/lisp/xwidget.el +++ b/lisp/xwidget.el @@ -427,11 +427,16 @@ xwidget-webkit-new-session xw) (setq xwidget-webkit-last-session-buffer (switch-to-buffer (get-buffer-create bufname))) - (insert " 'a' adjusts the xwidget size.") - (setq xw (xwidget-insert 1 'webkit bufname 1000 1000)) - (xwidget-put xw 'callback 'xwidget-webkit-callback) - (xwidget-webkit-mode) - (xwidget-webkit-goto-uri (xwidget-webkit-last-session) url))) + (condition-case err + (progn + (insert " 'a' adjusts the xwidget size.") + (setq xw (xwidget-insert 1 'webkit bufname 1000 1000)) + (xwidget-put xw 'callback 'xwidget-webkit-callback) + (xwidget-webkit-mode) + (xwidget-webkit-goto-uri (xwidget-webkit-last-session) url)) + ;; On error, remove webkit buffer and resignal + (error (kill-buffer bufname) + (signal (car err) (cdr err)))))) (defun xwidget-webkit-goto-url (url) -- 2.7.4