diff options
| author | Paul Eggert | 2011-05-15 18:07:08 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-15 18:07:08 -0700 |
| commit | d3cdcd1446538e4608b0d2dc31e6c8bd97bd9c5c (patch) | |
| tree | a9c65d8e780d899e6d35b1a64919386be4b5d37d | |
| parent | 1fc5f2049201f018084913e79e86ec8c040d157f (diff) | |
| download | emacs-d3cdcd1446538e4608b0d2dc31e6c8bd97bd9c5c.tar.gz emacs-d3cdcd1446538e4608b0d2dc31e6c8bd97bd9c5c.zip | |
* vc/diff-mode.el (diff-fixup-modifs): Remove stray ')' (Bug#8672).
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2e0e7f99e56..48be120982b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-05-16 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * vc/diff-mode.el (diff-fixup-modifs): Remove stray ')' (Bug#8672). | ||
| 4 | |||
| 1 | 2011-05-15 Chong Yidong <cyd@stupidchicken.com> | 5 | 2011-05-15 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * vc/diff-mode.el (diff-fixup-modifs): Locate correct position for | 7 | * vc/diff-mode.el (diff-fixup-modifs): Locate correct position for |
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 318163f39ca..7db34dfd11b 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el | |||
| @@ -1158,7 +1158,7 @@ else cover the whole buffer." | |||
| 1158 | (concat "%0" (number-to-string (length old)) "d") | 1158 | (concat "%0" (number-to-string (length old)) "d") |
| 1159 | (+ space bang minus -1 (string-to-number old))))) | 1159 | (+ space bang minus -1 (string-to-number old))))) |
| 1160 | (unless (string= new old) (replace-match new t t nil 2)))))) | 1160 | (unless (string= new old) (replace-match new t t nil 2)))))) |
| 1161 | (setq space 0 plus 0 minus 0 bang 0))))))) | 1161 | (setq space 0 plus 0 minus 0 bang 0)))))) |
| 1162 | 1162 | ||
| 1163 | ;;;; | 1163 | ;;;; |
| 1164 | ;;;; Hooks | 1164 | ;;;; Hooks |