Merge commit '3f49d2b3934e69d11410d08f1be8e0011237c11c' from diff-hl

[gnu-emacs-elpa] / packages / vlf / vlf-write.el

diff --git a/packages/vlf/vlf-write.el b/packages/vlf/vlf-write.el
index 9e45b9c3266dd1e4c9933faaeee57730c6de131c..1c5db49db64dc4fc7f47c7d10edf1eb8f437d036 100644 (file)
--- a/packages/vlf/vlf-write.el
+++ b/packages/vlf/vlf-write.el
@@ -27,40 +27,48 @@
 
 ;;; Code:
 
+(require 'vlf-base)
+
 (defun vlf-write ()
   "Write current chunk to file.  Always return true to disable save.
 If changing size of chunk, shift remaining file content."
   (interactive)
-  (and (buffer-modified-p)
-       (or (verify-visited-file-modtime (current-buffer))
-           (y-or-n-p "File has changed since visited or saved.  \
-Save anyway? "))
-       (if (zerop vlf-file-size)           ;new file
-           (progn
-             (write-region nil nil buffer-file-name vlf-start-pos t)
-             (setq vlf-file-size (vlf-get-file-size
-                                  buffer-file-truename)
-                   vlf-end-pos vlf-file-size)
-             (vlf-update-buffer-name))
-         (let* ((region-length (length (encode-coding-region
-                                        (point-min) (point-max)
-                                        buffer-file-coding-system t)))
-                (size-change (- vlf-end-pos vlf-start-pos
-                                region-length)))
-           (if (zerop size-change)
-               (write-region nil nil buffer-file-name vlf-start-pos t)
-             (let ((pos (point)))
-               (if (< 0 size-change)
-                   (vlf-file-shift-back size-change)
-                 (vlf-file-shift-forward (- size-change))
-                 (vlf-verify-size))
-               (vlf-move-to-chunk-2 vlf-start-pos
-                                    (if (< (- vlf-end-pos vlf-start-pos)
-                                           vlf-batch-size)
-                                        (+ vlf-start-pos vlf-batch-size)
-                                      vlf-end-pos))
-               (vlf-update-buffer-name)
-               (goto-char pos))))))
+  (when (and (buffer-modified-p)
+             (or (verify-visited-file-modtime (current-buffer))
+                 (y-or-n-p "File has changed since visited or saved.\
+  Save anyway? ")))
+    (run-hook-with-args 'vlf-before-batch-functions 'write)
+    (if (zerop vlf-file-size)           ;new file
+        (progn (write-region nil nil buffer-file-name vlf-start-pos t)
+               (setq vlf-file-size (vlf-get-file-size
+                                    buffer-file-truename)
+                     vlf-end-pos vlf-file-size)
+               (vlf-update-buffer-name))
+      (widen)
+      (let* ((region-length (length (encode-coding-region
+                                     (point-min) (point-max)
+                                     buffer-file-coding-system t)))
+             (size-change (- vlf-end-pos vlf-start-pos
+                             region-length)))
+        (if (zerop size-change)
+            (write-region nil nil buffer-file-name vlf-start-pos t)
+          (let ((tramp-verbose (if (boundp 'tramp-verbose)
+                                   (min tramp-verbose 2)))
+                (pos (point))
+                (font-lock font-lock-mode))
+            (font-lock-mode 0)
+            (if (< 0 size-change)
+                (vlf-file-shift-back size-change)
+              (vlf-file-shift-forward (- size-change)))
+            (if font-lock (font-lock-mode 1))
+            (vlf-move-to-chunk-2 vlf-start-pos
+                                 (if (< (- vlf-end-pos vlf-start-pos)
+                                        vlf-batch-size)
+                                     (+ vlf-start-pos vlf-batch-size)
+                                   vlf-end-pos))
+            (vlf-update-buffer-name)
+            (goto-char pos)))))
+    (run-hook-with-args 'vlf-after-batch-functions 'write))
   t)
 
 (defun vlf-file-shift-back (size-change)
@@ -78,7 +86,7 @@ Save anyway? "))
        (progress-reporter-update reporter read-start-pos))
      ;; pad end with space
      (erase-buffer)
-     (vlf-verify-size)
+     (vlf-verify-size t)
      (insert-char 32 size-change))
     (write-region nil nil buffer-file-name (- vlf-file-size
                                               size-change) t)
@@ -88,7 +96,7 @@ Save anyway? "))
   "Read `vlf-batch-size' bytes from READ-POS and write them \
 back at WRITE-POS.  Return nil if EOF is reached, t otherwise."
   (erase-buffer)
-  (vlf-verify-size)
+  (vlf-verify-size t)
   (let ((read-end (+ read-pos vlf-batch-size)))
     (insert-file-contents-literally buffer-file-name nil
                                     read-pos
@@ -122,7 +130,7 @@ Done by saving content up front and then writing previous batch."
 Then write initial buffer content to file at WRITE-POS.
 If HIDE-READ is non nil, temporarily hide literal read content.
 Return nil if EOF is reached, t otherwise."
-  (vlf-verify-size)
+  (vlf-verify-size t)
   (let ((read-more (< read-pos vlf-file-size))
         (start-write-pos (point-min))
         (end-write-pos (point-max)))