aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters2002-09-07 21:30:37 +0000
committerColin Walters2002-09-07 21:30:37 +0000
commit5840a0d4d385ce0376a356dd51dee5125440b696 (patch)
treecb8a204b4bba1a5731a59a798fa417ea4b925945
parent0f7b0f883729b00e764f9730b07f94fa8543efeb (diff)
downloademacs-5840a0d4d385ce0376a356dd51dee5125440b696.tar.gz
emacs-5840a0d4d385ce0376a356dd51dee5125440b696.zip
(diff-buffer-with-file): Call diff synchronously, so we don't delete
the temporary file before diff has a chance to read it.
-rw-r--r--lisp/files.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/files.el b/lisp/files.el
index ac25232bafe..ac61bbbd017 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3008,7 +3008,7 @@ This requires the external program \"diff\" to be in your `exec-path'."
3008 (save-restriction 3008 (save-restriction
3009 (widen) 3009 (widen)
3010 (write-region (point-min) (point-max) tempfile nil 'nomessage))) 3010 (write-region (point-min) (point-max) tempfile nil 'nomessage)))
3011 (diff buf-filename tempfile)) 3011 (diff buf-filename tempfile nil t))
3012 (when (file-exists-p tempfile) 3012 (when (file-exists-p tempfile)
3013 (delete-file tempfile))) 3013 (delete-file tempfile)))
3014 nil))) 3014 nil)))