Commit a3ee90d9 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

*** empty log message ***

parent ed3e1544
2007-02-07 Per Cederqvist <ceder@lysator.liu.se> (tiny change)
* diff-mode.el (diff-sanity-check-hunk): Don't reject the hunk
just because the diff was produced using "-p" (--show-c-function).
2007-02-07 Juanma Barranquero <lekktu@gmail.com> 2007-02-07 Juanma Barranquero <lekktu@gmail.com>
   
* faces.el (frame-set-background-mode): Use `color-values' and * faces.el (frame-set-background-mode): Use `color-values' and
...@@ -1115,7 +1115,7 @@ Only works for unified diffs." ...@@ -1115,7 +1115,7 @@ Only works for unified diffs."
;; A context diff. ;; A context diff.
((eq (char-after) ?*) ((eq (char-after) ?*)
(if (not (looking-at "\\*\\{15\\}\n\\*\\*\\* \\([0-9]+\\),\\([0-9]+\\) \\*\\*\\*\\*$")) (if (not (looking-at "\\*\\{15\\}\n\\*\\*\\* \\([0-9]+\\),\\([0-9]+\\) \\*\\*\\*\\*"))
(error "Unrecognized context diff first hunk header format") (error "Unrecognized context diff first hunk header format")
(forward-line 2) (forward-line 2)
(diff-sanity-check-context-hunk-half (diff-sanity-check-context-hunk-half
...@@ -1131,7 +1131,7 @@ Only works for unified diffs." ...@@ -1131,7 +1131,7 @@ Only works for unified diffs."
;; A unified diff. ;; A unified diff.
((eq (char-after) ?@) ((eq (char-after) ?@)
(if (not (looking-at (if (not (looking-at
"@@ -[0-9]+,\\([0-9]+\\) \\+[0-9]+,\\([0-9]+\\) @@$")) "@@ -[0-9]+,\\([0-9]+\\) \\+[0-9]+,\\([0-9]+\\) @@"))
(error "Unrecognized unified diff hunk header format") (error "Unrecognized unified diff hunk header format")
(let ((before (string-to-number (match-string 1))) (let ((before (string-to-number (match-string 1)))
(after (string-to-number (match-string 2)))) (after (string-to-number (match-string 2))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment