diff options
| author | Joakim Verona | 2012-12-19 20:51:15 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-19 20:51:15 +0100 |
| commit | fd82bea2c856ab00b35271ecdfd623f7743e27a1 (patch) | |
| tree | ee611262f049c200d3fb9b593983f168c5444d4c /lisp/vc/diff-mode.el | |
| parent | d9aeedb928273e78cb04ffd01e7760e0f39b580a (diff) | |
| parent | f4d79bd021831eb64e1bfc7f5c5b1ddb2138b37a (diff) | |
| download | emacs-fd82bea2c856ab00b35271ecdfd623f7743e27a1.tar.gz emacs-fd82bea2c856ab00b35271ecdfd623f7743e27a1.zip | |
auto upstream
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 0c023b0f7f4..edd209a7910 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el | |||
| @@ -1298,7 +1298,7 @@ See `after-change-functions' for the meaning of BEG, END and LEN." | |||
| 1298 | (re-search-forward diff-context-mid-hunk-header-re | 1298 | (re-search-forward diff-context-mid-hunk-header-re |
| 1299 | nil t))))) | 1299 | nil t))))) |
| 1300 | (when (and ;; Don't try to fixup changes in the hunk header. | 1300 | (when (and ;; Don't try to fixup changes in the hunk header. |
| 1301 | (> (car diff-unhandled-changes) start) | 1301 | (>= (car diff-unhandled-changes) start) |
| 1302 | ;; Don't try to fixup changes in the mid-hunk header either. | 1302 | ;; Don't try to fixup changes in the mid-hunk header either. |
| 1303 | (or (not mid) | 1303 | (or (not mid) |
| 1304 | (< (cdr diff-unhandled-changes) (match-beginning 0)) | 1304 | (< (cdr diff-unhandled-changes) (match-beginning 0)) |