emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 854855e: Clean up eww error buffer


From: Lars Ingebrigtsen
Subject: master 854855e: Clean up eww error buffer
Date: Sat, 12 Sep 2020 19:02:08 -0400 (EDT)

branch: master
commit 854855ec68c595edcce1b2dc768b20a65e41d0af
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Clean up eww error buffer
    
    * lisp/net/eww.el (eww-retrieve): Clean up error buffer after exiting.
---
 lisp/net/eww.el | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index bc23fb9..5fd4490 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -362,20 +362,26 @@ killed after rendering."
   (if (null eww-retrieve-command)
       (url-retrieve url #'eww-render
                     (list url nil (current-buffer)))
-    (let ((buffer (generate-new-buffer " *eww retrieve*")))
+    (let ((buffer (generate-new-buffer " *eww retrieve*"))
+          (error-buffer (generate-new-buffer " *eww error*")))
       (with-current-buffer buffer
         (set-buffer-multibyte nil)
         (make-process
          :name "*eww fetch*"
          :buffer (current-buffer)
-         :stderr (get-buffer-create " *eww error*")
+         :stderr error-buffer
          :command (append eww-retrieve-command (list url))
          :sentinel (lambda (process _)
                      (unless (process-live-p process)
-                       (with-current-buffer buffer
-                         (goto-char (point-min))
-                         (insert "Content-type: text/html; charset=utf-8\n\n")
-                         (apply #'funcall callback nil cbargs)))))))))
+                       (when (buffer-live-p error-buffer)
+                         (when (get-buffer-process error-buffer)
+                           (delete-process (get-buffer-process error-buffer) ))
+                         (kill-buffer error-buffer))
+                       (when (buffer-live-p buffer)
+                         (with-current-buffer buffer
+                           (goto-char (point-min))
+                           (insert "Content-type: text/html; 
charset=utf-8\n\n")
+                           (apply #'funcall callback nil cbargs))))))))))
 
 (function-put 'eww 'browse-url-browser-kind 'internal)
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]