sascha/vlfi
1
0
Fork 0
mirror of https://github.com/m00natic/vlfi.git synced 2025-01-18 20:10:47 +00:00
Code Issues Releases Wiki Activity

Make coding system conversion on write more idiomatic.

Browse Source
This commit is contained in:
Andrey Kotlarski 2013-04-14 18:19:49 +03:00
parent 3fb898e83a
commit fc689d5c88
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
vlfi.el
View File

@ -514,33 +514,25 @@ Save anyway? ")))
(vlfi-mode) (vlfi-mode)
t)) t))
(defun vlfi-prepare-write-buffer ()
"Optimize buffer for a lot of insert/erasure."
(setq delay-mode-hooks t)
(fundamental-mode)
(buffer-disable-undo))
(defun vlfi-file-shift-back (size-change) (defun vlfi-file-shift-back (size-change)
"Shift file contents SIZE-CHANGE bytes back." "Shift file contents SIZE-CHANGE bytes back."
(let ((coding-system buffer-file-coding-system)) (write-region nil nil buffer-file-name vlfi-start-pos t)
(write-region nil nil buffer-file-name vlfi-start-pos t) (buffer-disable-undo)
(setq buffer-file-coding-system nil) (let ((read-start-pos vlfi-end-pos)
(vlfi-prepare-write-buffer) (coding-system-for-write 'no-conversion)
(let ((read-start-pos vlfi-end-pos) (reporter (make-progress-reporter "Adjusting file content"
(reporter (make-progress-reporter "Adjusting file content" vlfi-end-pos
vlfi-end-pos vlfi-file-size)))
vlfi-file-size))) (while (vlfi-shift-batch read-start-pos (- read-start-pos
(while (vlfi-shift-batch read-start-pos (- read-start-pos size-change))
size-change)) (setq read-start-pos (+ read-start-pos vlfi-batch-size))
(setq read-start-pos (+ read-start-pos vlfi-batch-size)) (progress-reporter-update reporter read-start-pos))
(progress-reporter-update reporter read-start-pos)) ;; pad end with space
;; pad end with space (erase-buffer)
(erase-buffer) (insert-char 32 size-change)
(insert-char 32 size-change) (write-region nil nil buffer-file-name (- vlfi-file-size
(write-region nil nil buffer-file-name (- vlfi-file-size size-change) t)
size-change) t) (progress-reporter-done reporter)))
(progress-reporter-done reporter))
(setq buffer-file-coding-system coding-system)))
(defun vlfi-shift-batch (read-pos write-pos) (defun vlfi-shift-batch (read-pos write-pos)
"Read `vlfi-batch-size' bytes from READ-POS and write them \ "Read `vlfi-batch-size' bytes from READ-POS and write them \
@ -560,13 +552,13 @@ Done by saving content up front and then writing previous batch."
(let ((vlfi-buffer (current-buffer)) (let ((vlfi-buffer (current-buffer))
(temp-buffer (generate-new-buffer (concat " " (temp-buffer (generate-new-buffer (concat " "
(buffer-name)))) (buffer-name))))
(coding-system buffer-file-coding-system)) (coding-system-for-write 'no-conversion))
(let ((file buffer-file-name)) (let ((file buffer-file-name))
(set-buffer temp-buffer) (set-buffer temp-buffer)
(setq buffer-file-name file) (setq buffer-file-name file)
(vlfi-prepare-write-buffer)) (buffer-disable-undo))
(set-buffer vlfi-buffer) (set-buffer vlfi-buffer)
(vlfi-prepare-write-buffer) (buffer-disable-undo)
(let ((read-buffer temp-buffer) (let ((read-buffer temp-buffer)
(write-buffer vlfi-buffer) (write-buffer vlfi-buffer)
(size (+ vlfi-batch-size size-change)) (size (+ vlfi-batch-size size-change))
@ -586,8 +578,7 @@ Done by saving content up front and then writing previous batch."
(progress-reporter-update reporter write-pos)) (progress-reporter-update reporter write-pos))
(progress-reporter-done reporter)) (progress-reporter-done reporter))
(kill-buffer temp-buffer) (kill-buffer temp-buffer)
(set-buffer vlfi-buffer) (set-buffer vlfi-buffer)))
(setq buffer-file-coding-system coding-system)))
(defun vlfi-shift-batches (size read-buffer read-pos (defun vlfi-shift-batches (size read-buffer read-pos
write-buffer write-pos) write-buffer write-pos)
@ -600,7 +591,6 @@ Return nil if EOF is reached, t otherwise."
;; read ;; read
(set-buffer read-buffer) (set-buffer read-buffer)
(erase-buffer) (erase-buffer)
(setq buffer-file-coding-system nil)
(insert-file-contents-literally buffer-file-name nil read-pos (insert-file-contents-literally buffer-file-name nil read-pos
(min file-size (+ read-pos (min file-size (+ read-pos
size)))) size))))