Permalink
Browse files

Fix previous commit that broke 6 number hunk ranges due to bad (subse…

…q) call

* egg.el (egg-get-hunk-range): Use the correct arguments to SUBSEQ,
  3rd argument is end of range and not number of elements
  • Loading branch information...
Max Mikhanosha
Max Mikhanosha committed May 11, 2012
1 parent 8e243ff commit a2577187eb9af3d837484b91b856f96e2eb4d3ba
Showing with 2 additions and 2 deletions.
  1. +2 −2 egg.el
View
4 egg.el
@@ -2694,7 +2694,7 @@ the section.
((= 4 len) range)
;; 3 way diff when merging, never seen >6
((= 6 len) (append (subseq range 0 2)
- (subseq range 4 2)))
+ (subseq range 4 6)))
;; Adding sub-modules
((= 2 len) (append range range))
;; Adding symbolic links
@@ -2709,7 +2709,7 @@ the section.
(t (warn "Weird hunk header %S" hunk-header)
;; treat as 6 line one
(append (subseq range 0 2)
- (subseq range 4 2)))))))
+ (subseq range 4 6)))))))
(defun egg-ensure-hunk-ranges-cache ()
"Returns `egg-hunk-ranges-cache' re-creating it if its NIL."

0 comments on commit a257718

Please sign in to comment.