Skip to content

Commit 1eeae57

Browse files
committed
apply :replace and :insert like :create and :delete
1 parent be0c74d commit 1eeae57

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

diff.lisp

+3-5
Original file line numberDiff line numberDiff line change
@@ -336,19 +336,17 @@ of context; the default of three should be good enough for most situations.")
336336
(ind) (back line) (back (nth (ind) result)))
337337
(incf index))
338338
lines))
339-
(:delete
339+
((:replace :delete)
340340
(setf result
341341
(append (subseq result 0 (ind))
342342
(subseq result (+ (ind) (length lines)))))
343343
(incf index (length lines))
344344
(decf offset (length lines)))
345-
(:create
345+
((:insert :create)
346346
(setf result (append (subseq result 0 (ind))
347347
lines
348348
(subseq result (ind))))
349-
(incf offset (length lines)))
350-
((:insert :replace)
351-
(error "unimplemented chunk-kind ~a" (chunk-kind chunk)))))
349+
(incf offset (length lines)))))
352350
(values (mapcar #'back result) offset)))))
353351

354352
(defun apply-seq-diff (original-seq diff)

0 commit comments

Comments
 (0)