393 |
(ediff-with-current-buffer diff-buffer |
(ediff-with-current-buffer diff-buffer |
394 |
(goto-char (point-min)) |
(goto-char (point-min)) |
395 |
(while (re-search-forward ediff-match-diff-line nil t) |
(while (re-search-forward ediff-match-diff-line nil t) |
396 |
(let* ((a-begin (string-to-int (buffer-substring (match-beginning 1) |
(let* ((a-begin (string-to-number (buffer-substring (match-beginning 1) |
397 |
(match-end 1)))) |
(match-end 1)))) |
398 |
(a-end (let ((b (match-beginning 3)) |
(a-end (let ((b (match-beginning 3)) |
399 |
(e (match-end 3))) |
(e (match-end 3))) |
400 |
(if b |
(if b |
401 |
(string-to-int (buffer-substring b e)) |
(string-to-number (buffer-substring b e)) |
402 |
a-begin))) |
a-begin))) |
403 |
(diff-type (buffer-substring (match-beginning 4) (match-end 4))) |
(diff-type (buffer-substring (match-beginning 4) (match-end 4))) |
404 |
(b-begin (string-to-int (buffer-substring (match-beginning 5) |
(b-begin (string-to-number (buffer-substring (match-beginning 5) |
405 |
(match-end 5)))) |
(match-end 5)))) |
406 |
(b-end (let ((b (match-beginning 7)) |
(b-end (let ((b (match-beginning 7)) |
407 |
(e (match-end 7))) |
(e (match-end 7))) |
408 |
(if b |
(if b |
409 |
(string-to-int (buffer-substring b e)) |
(string-to-number (buffer-substring b e)) |
410 |
b-begin))) |
b-begin))) |
411 |
a-begin-pt a-end-pt b-begin-pt b-end-pt |
a-begin-pt a-end-pt b-begin-pt b-end-pt |
412 |
c-begin c-end c-begin-pt c-end-pt) |
c-begin c-end c-begin-pt c-end-pt) |
934 |
;; it is a "c" group |
;; it is a "c" group |
935 |
(if (match-beginning 2) |
(if (match-beginning 2) |
936 |
;; it has two numbers |
;; it has two numbers |
937 |
(list (string-to-int |
(list (string-to-number |
938 |
(buffer-substring (match-beginning 1) (match-end 1))) |
(buffer-substring (match-beginning 1) (match-end 1))) |
939 |
(1+ (string-to-int |
(1+ (string-to-number |
940 |
(buffer-substring (match-beginning 3) (match-end 3))))) |
(buffer-substring (match-beginning 3) (match-end 3))))) |
941 |
;; it has one number |
;; it has one number |
942 |
(let ((x (string-to-int |
(let ((x (string-to-number |
943 |
(buffer-substring (match-beginning 1) (match-end 1))))) |
(buffer-substring (match-beginning 1) (match-end 1))))) |
944 |
(list x (1+ x)))) |
(list x (1+ x)))) |
945 |
;; it is an "a" group |
;; it is an "a" group |
946 |
(let ((x (1+ (string-to-int |
(let ((x (1+ (string-to-number |
947 |
(buffer-substring (match-beginning 1) (match-end 1)))))) |
(buffer-substring (match-beginning 1) (match-end 1)))))) |
948 |
(list x x))))) |
(list x x))))) |
949 |
|
|