/[emacs]/emacs/lisp/diff-mode.el
ViewVC logotype

Diff of /emacs/lisp/diff-mode.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.51.6.3 by miles, Thu Sep 9 09:36:31 2004 UTC revision 1.51.6.4 by miles, Thu Sep 30 01:20:38 2004 UTC
# Line 301  when editing big diffs)." Line 301  when editing big diffs)."
301  ;;;;  ;;;;
302    
303  (defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")  (defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")
304  (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+\\|\\*\\*\\* .+\n---\\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1)))  (defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1)))
305  (defvar diff-narrowed-to nil)  (defvar diff-narrowed-to nil)
306    
307  (defun diff-end-of-hunk (&optional style)  (defun diff-end-of-hunk (&optional style)
# Line 798  else cover the whole bufer." Line 798  else cover the whole bufer."
798        (goto-char end) (diff-end-of-hunk)        (goto-char end) (diff-end-of-hunk)
799        (let ((plus 0) (minus 0) (space 0) (bang 0))        (let ((plus 0) (minus 0) (space 0) (bang 0))
800          (while (and (= (forward-line -1) 0) (<= start (point)))          (while (and (= (forward-line -1) 0) (<= start (point)))
801            (if (not (looking-at "\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|[-*][-*][-*] .+ [-*][-*][-*][-*]\\)$"))            (if (not (looking-at
802                        (concat "@@ -[0-9,]+ \\+[0-9,]+ @@"
803                                "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$"
804                                "\\|--- .+\n\\+\\+\\+ ")))
805                (case (char-after)                (case (char-after)
806                  (?\  (incf space))                  (?\s (incf space))
807                  (?+ (incf plus))                  (?+ (incf plus))
808                  (?- (incf minus))                  (?- (incf minus))
809                  (?! (incf bang))                  (?! (incf bang))

Legend:
Removed from v.1.51.6.3  
changed lines
  Added in v.1.51.6.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26