Merge from emacs--rel--22

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1bb48e3970945c57beba8104d009f3116a968925..5fac8b80a672bd88b869b539c5e9dd4d2899f1e7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * diff-mode.el (diff-hunk-header-re-unified): Allow elided line counts.
+       (diff-end-of-hunk, diff-unified->context, diff-fixup-modifs)
+       (diff-sanity-check-hunk): Adjust code accordingly.
+
 2008-04-26  Glenn Morris  <rgm@gnu.org>
 
        * abbrev.el (define-abbrev): Don't use `iff' in doc-strings.