aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoam Postavsky2018-07-11 20:13:25 -0400
committerNoam Postavsky2018-07-12 21:45:31 -0400
commit01dbf2a347944497fdcf2ec156f4605020d7ba2a (patch)
treef2fb4ec0adfe9c67bf3efcd3ba21c7ab2f2bf3e0
parent1222ff5275e61e797d388489b8a88f499247321d (diff)
downloademacs-01dbf2a347944497fdcf2ec156f4605020d7ba2a.tar.gz
emacs-01dbf2a347944497fdcf2ec156f4605020d7ba2a.zip
Speed up smerge-refine-regions by avoiding fsync
* lisp/vc/smerge-mode.el (smerge-refine-regions): Bind write-region-inhibit-fsync to t. This was reported in https://github.com/magit/magit/pull/2834 to give a noticable speedup.
-rw-r--r--lisp/vc/smerge-mode.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index cb51fbab8eb..ff41473435c 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -1075,9 +1075,10 @@ used to replace chars to try and eliminate some spurious differences."
1075 (if smerge-refine-weight-hack (make-hash-table :test #'equal)))) 1075 (if smerge-refine-weight-hack (make-hash-table :test #'equal))))
1076 (unless (markerp beg1) (setq beg1 (copy-marker beg1))) 1076 (unless (markerp beg1) (setq beg1 (copy-marker beg1)))
1077 (unless (markerp beg2) (setq beg2 (copy-marker beg2))) 1077 (unless (markerp beg2) (setq beg2 (copy-marker beg2)))
1078 ;; Chop up regions into smaller elements and save into files. 1078 (let ((write-region-inhibit-fsync t)) ; Don't fsync temp files (Bug#12747).
1079 (smerge--refine-chopup-region beg1 end1 file1 preproc) 1079 ;; Chop up regions into smaller elements and save into files.
1080 (smerge--refine-chopup-region beg2 end2 file2 preproc) 1080 (smerge--refine-chopup-region beg1 end1 file1 preproc)
1081 (smerge--refine-chopup-region beg2 end2 file2 preproc))
1081 1082
1082 ;; Call diff on those files. 1083 ;; Call diff on those files.
1083 (unwind-protect 1084 (unwind-protect