From 0256f0290e5c79d124530b6b621d2a6fc5a19bf4 Mon Sep 17 00:00:00 2001 From: Christian Howe Date: Sun, 23 Apr 2017 18:29:53 -0400 Subject: Fix stupid mistake in rustfmt conditional --- rust-mode.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'rust-mode.el') diff --git a/rust-mode.el b/rust-mode.el index 3b4b665..a2b5fc5 100644 --- a/rust-mode.el +++ b/rust-mode.el @@ -1200,7 +1200,10 @@ This is written mainly to be used as `end-of-defun-function' for Rust." t `(t ,tmpf) nil))) (cond ((zerop ret) - (error "Rustfmt failed, see *rustfmt* buffer for details")) + (if (not (string= (buffer-string) + (with-current-buffer buf (buffer-string)))) + (copy-to-buffer buf (point-min) (point-max))) + (kill-buffer)) ((= ret 3) (if (not (string= (buffer-string) (with-current-buffer buf (buffer-string)))) @@ -1209,10 +1212,7 @@ This is written mainly to be used as `end-of-defun-function' for Rust." (insert-file-contents tmpf) (error "Rustfmt could not format some lines, see *rustfmt* buffer for details")) (t - (if (not (string= (buffer-string) - (with-current-buffer buf (buffer-string)))) - (copy-to-buffer buf (point-min) (point-max))) - (kill-buffer))))))) + (error "Rustfmt failed, see *rustfmt* buffer for details"))))))) (defconst rust--format-word "\\b\\(else\\|enum\\|fn\\|for\\|if\\|let\\|loop\\|match\\|struct\\|unsafe\\|while\\)\\b") (defconst rust--format-line "\\([\n]\\)") -- cgit v1.2.3