[Emacs-diffs] Changes to emacs/lisp/emerge.el

[Juanma Barranquero]

Index: emacs/lisp/emerge.el
diff -c emacs/lisp/emerge.el:1.51 emacs/lisp/emerge.el:1.52
*** emacs/lisp/emerge.el:1.51   Thu Jan  8 05:42:13 2004
--- emacs/lisp/emerge.el        Mon May 16 11:33:46 2005
***************
*** 657,676 ****
       diff-buffer
       (goto-char (point-min))
       (while (re-search-forward emerge-match-diff-line nil t)
!        (let* ((a-begin (string-to-int (buffer-substring (match-beginning 1)
!                                                       (match-end 1))))
              (a-end  (let ((b (match-beginning 3))
                            (e (match-end 3)))
                        (if b
!                           (string-to-int (buffer-substring b e))
                          a-begin)))
              (diff-type (buffer-substring (match-beginning 4) (match-end 4)))
!             (b-begin (string-to-int (buffer-substring (match-beginning 5)
!                                                       (match-end 5))))
              (b-end (let ((b (match-beginning 7))
                           (e (match-end 7)))
                       (if b
!                          (string-to-int (buffer-substring b e))
                         b-begin))))
         ;; fix the beginning and end numbers, because diff is somewhat
         ;; strange about how it numbers lines
--- 657,676 ----
       diff-buffer
       (goto-char (point-min))
       (while (re-search-forward emerge-match-diff-line nil t)
!        (let* ((a-begin (string-to-number (buffer-substring (match-beginning 1)
!                                                            (match-end 1))))
              (a-end  (let ((b (match-beginning 3))
                            (e (match-end 3)))
                        (if b
!                           (string-to-number (buffer-substring b e))
                          a-begin)))
              (diff-type (buffer-substring (match-beginning 4) (match-end 4)))
!             (b-begin (string-to-number (buffer-substring (match-beginning 5)
!                                                            (match-end 5))))
              (b-end (let ((b (match-beginning 7))
                           (e (match-end 7)))
                       (if b
!                          (string-to-number (buffer-substring b e))
                         b-begin))))
         ;; fix the beginning and end numbers, because diff is somewhat
         ;; strange about how it numbers lines
***************
*** 862,877 ****
        ;; it is a "c" group
        (if (match-beginning 2)
            ;; it has two numbers
!           (list (string-to-int
                   (buffer-substring (match-beginning 1) (match-end 1)))
!                 (1+ (string-to-int
                       (buffer-substring (match-beginning 3) (match-end 3)))))
          ;; it has one number
!         (let ((x (string-to-int
                    (buffer-substring (match-beginning 1) (match-end 1)))))
            (list x (1+ x))))
        ;; it is an "a" group
!       (let ((x (1+ (string-to-int
                    (buffer-substring (match-beginning 1) (match-end 1))))))
        (list x x)))))
  
--- 862,877 ----
        ;; it is a "c" group
        (if (match-beginning 2)
            ;; it has two numbers
!           (list (string-to-number
                   (buffer-substring (match-beginning 1) (match-end 1)))
!                 (1+ (string-to-number
                       (buffer-substring (match-beginning 3) (match-end 3)))))
          ;; it has one number
!         (let ((x (string-to-number
                    (buffer-substring (match-beginning 1) (match-end 1)))))
            (list x (1+ x))))
        ;; it is an "a" group
!       (let ((x (1+ (string-to-number
                    (buffer-substring (match-beginning 1) (match-end 1))))))
        (list x x)))))