Change: --html-to-org-with-pandoc uses unwind-protect to delete file

alphapapa · Feb 16, 2023 · dcae2a5 · dcae2a5
1 parent ef75f41
commit dcae2a5
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/org-web-tools.el b/org-web-tools.el
@@ -154,19 +154,20 @@ When SELECTOR is non-nil, the HTML is filtered using
   (with-temp-buffer
     (insert html)
     (let ((err-file (make-temp-file "org-web-tools-pandoc-err")))
-      (if (not (zerop (call-process-region (point-min) (point-max) "pandoc"
-                                           t (list t err-file) nil
-                                           "--verbose"
-                                           (org-web-tools--pandoc-no-wrap-option)
-                                           "-f" "html-raw_html-native_divs" "-t" "org")))
-          ;; TODO: Add error output, see org-protocol-capture-html
-          (progn (delete-region (point-min) (point-max))
-                 (goto-char (point-min))
-                 (insert-file-contents err-file)
-                 (error "Pandoc: %s" (buffer-string)))
-        (org-web-tools--clean-pandoc-output)
-        (delete-file err-file)
-        (buffer-string)))))
+      (unwind-protect
+          (if (not (zerop (call-process-region (point-min) (point-max) "pandoc"
+                                               t (list t err-file) nil
+                                               "--verbose"
+                                               (org-web-tools--pandoc-no-wrap-option)
+                                               "-f" "html-raw_html-native_divs" "-t" "org")))
+              ;; TODO: Add error output, see org-protocol-capture-html
+              (progn (delete-region (point-min) (point-max))
+                     (goto-char (point-min))
+                     (insert-file-contents err-file)
+                     (error "Pandoc: %s" (buffer-string)))
+            (org-web-tools--clean-pandoc-output)
+            (buffer-string))
+        (delete-file err-file)))))
 
 (defun org-web-tools--pandoc-no-wrap-option ()
   "Return option `org-web-tools--pandoc-no-wrap-option', setting if unset."