diff lisp/ChangeLog @ 94370:28e6262d77ad

Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1129
author Miles Bader <miles@gnu.org>
date Sat, 26 Apr 2008 05:40:19 +0000
parents e77a6227476d 912586de54c9
children f9bcef02655f
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Apr 26 04:29:42 2008 +0000
+++ b/lisp/ChangeLog	Sat Apr 26 05:40:19 2008 +0000
@@ -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.