emacs: Remove temp files in the event of an error

ocaml-ppx · Mar 2, 2022 · 61ffb3d · 61ffb3d
1 parent 7022aee
commit 61ffb3d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,8 @@
 
 #### Bug fixes
 
+  + emacs: Remove temp files in the event of an error (#2003, @gpetiot)
+
 #### Changes
 
 #### New features

diff --git a/emacs/ocamlformat.el b/emacs/ocamlformat.el
@@ -290,10 +290,10 @@ is nil."
                     (erase-buffer))
                   (ocamlformat--process-errors
                    (buffer-file-name) bufferfile errorfile errbuf)))
-            (message "Could not apply ocamlformat on %s" buffer-file-name))))
-    (delete-file errorfile)
-    (delete-file bufferfile)
-    (delete-file outputfile)))
+            (message "Could not apply ocamlformat on %s" buffer-file-name)))
+      (delete-file errorfile)
+      (delete-file bufferfile)
+      (delete-file outputfile))))
 
 (defun ocamlformat-args (name start-line end-line)
   (let*
@@ -356,13 +356,14 @@ is nil."
                      (buffer-file-name) bufferfile errorfile errbuf)))
                 (message "Could not apply ocamlformat")))))
        (indents (mapcar 'string-to-number (split-string indents-str))))
-    (save-excursion
-      (goto-char start)
-      (mapcar
-       #'(lambda (indent) (indent-line-to indent) (forward-line))
-       indents))
-    (delete-file errorfile)
-    (delete-file bufferfile)))
+    (unwind-protect
+      (save-excursion
+        (goto-char start)
+        (mapcar
+         #'(lambda (indent) (indent-line-to indent) (forward-line))
+         indents))
+      (delete-file errorfile)
+      (delete-file bufferfile))))
 
 (defun ocamlformat-line ()
   (interactive nil)