diff options
| author | Stefan Monnier | 2007-02-07 17:08:36 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-02-07 17:08:36 +0000 |
| commit | a3ee90d98c9ea11877df683a39d394af97e7dfae (patch) | |
| tree | bb70ee87ca7436e9634abe31d308da451c13dc5d /lisp/diff-mode.el | |
| parent | ed3e1544d4a66e6eb2d30a0c783bf1cc8b644630 (diff) | |
| download | emacs-a3ee90d98c9ea11877df683a39d394af97e7dfae.tar.gz emacs-a3ee90d98c9ea11877df683a39d394af97e7dfae.zip | |
*** empty log message ***
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index edf7317f2b4..8d61e0ba0fc 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -1115,7 +1115,7 @@ Only works for unified diffs." | |||
| 1115 | 1115 | ||
| 1116 | ;; A context diff. | 1116 | ;; A context diff. |
| 1117 | ((eq (char-after) ?*) | 1117 | ((eq (char-after) ?*) |
| 1118 | (if (not (looking-at "\\*\\{15\\}\n\\*\\*\\* \\([0-9]+\\),\\([0-9]+\\) \\*\\*\\*\\*$")) | 1118 | (if (not (looking-at "\\*\\{15\\}\n\\*\\*\\* \\([0-9]+\\),\\([0-9]+\\) \\*\\*\\*\\*")) |
| 1119 | (error "Unrecognized context diff first hunk header format") | 1119 | (error "Unrecognized context diff first hunk header format") |
| 1120 | (forward-line 2) | 1120 | (forward-line 2) |
| 1121 | (diff-sanity-check-context-hunk-half | 1121 | (diff-sanity-check-context-hunk-half |
| @@ -1131,7 +1131,7 @@ Only works for unified diffs." | |||
| 1131 | ;; A unified diff. | 1131 | ;; A unified diff. |
| 1132 | ((eq (char-after) ?@) | 1132 | ((eq (char-after) ?@) |
| 1133 | (if (not (looking-at | 1133 | (if (not (looking-at |
| 1134 | "@@ -[0-9]+,\\([0-9]+\\) \\+[0-9]+,\\([0-9]+\\) @@$")) | 1134 | "@@ -[0-9]+,\\([0-9]+\\) \\+[0-9]+,\\([0-9]+\\) @@")) |
| 1135 | (error "Unrecognized unified diff hunk header format") | 1135 | (error "Unrecognized unified diff hunk header format") |
| 1136 | (let ((before (string-to-number (match-string 1))) | 1136 | (let ((before (string-to-number (match-string 1))) |
| 1137 | (after (string-to-number (match-string 2)))) | 1137 | (after (string-to-number (match-string 2)))) |