[Emacs-diffs] Changes to emacs/lisp/diff-mode.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/diff-mode.el
diff -c emacs/lisp/diff-mode.el:1.51.6.3 emacs/lisp/diff-mode.el:1.51.6.4
*** emacs/lisp/diff-mode.el:1.51.6.3    Thu Sep  9 09:36:31 2004
--- emacs/lisp/diff-mode.el     Thu Sep 30 01:20:38 2004
***************
*** 301,307 ****
  ;;;;
  
  (defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ 
@@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ 
\\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")
! (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+\\|\\*\\*\\* 
.+\n---\\|[^-+!<>address@hidden ]\\).+\n" (substring diff-hunk-header-re 1)))
  (defvar diff-narrowed-to nil)
  
  (defun diff-end-of-hunk (&optional style)
--- 301,307 ----
  ;;;;
  
  (defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ 
@@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ 
\\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")
! (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* 
.+\n--- \\|[^-+!<>address@hidden ]\\).+\n" (substring diff-hunk-header-re 1)))
  (defvar diff-narrowed-to nil)
  
  (defun diff-end-of-hunk (&optional style)
***************
*** 798,806 ****
        (goto-char end) (diff-end-of-hunk)
        (let ((plus 0) (minus 0) (space 0) (bang 0))
        (while (and (= (forward-line -1) 0) (<= start (point)))
!         (if (not (looking-at "\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|[-*][-*][-*] 
.+ [-*][-*][-*][-*]\\)$"))
              (case (char-after)
!               (?\  (incf space))
                (?+ (incf plus))
                (?- (incf minus))
                (?! (incf bang))
--- 798,809 ----
        (goto-char end) (diff-end-of-hunk)
        (let ((plus 0) (minus 0) (space 0) (bang 0))
        (while (and (= (forward-line -1) 0) (<= start (point)))
!         (if (not (looking-at
!                   (concat "@@ -[0-9,]+ \\+[0-9,]+ @@"
!                           "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$"
!                           "\\|--- .+\n\\+\\+\\+ ")))
              (case (char-after)
!               (?\s (incf space))
                (?+ (incf plus))
                (?- (incf minus))
                (?! (incf bang))