aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2011-05-15 10:22:31 -0400
committerChong Yidong2011-05-15 10:22:31 -0400
commit7affc353121049970fe7d49796f7a84e0c434061 (patch)
treed8f52a499a03440adb5dea5010b0c0a3483b0d11 /lisp/ChangeLog
parentae742cb584f21e9df2db4cd34f7bf6658c8d775f (diff)
parent2d11b7b37c33bae14369d57bf8a2b3b45e13b1e3 (diff)
downloademacs-7affc353121049970fe7d49796f7a84e0c434061.tar.gz
emacs-7affc353121049970fe7d49796f7a84e0c434061.zip
Backport fix for Bug#8672 from trunk
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1c7fd1f082..f56b1c04b18 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-05-15 Chong Yidong <cyd@stupidchicken.com>
2
3 * vc/diff-mode.el (diff-fixup-modifs): Locate correct position for
4 hunk-end tags (Bug#8672).
5
12011-05-13 Juanma Barranquero <lekktu@gmail.com> 62011-05-13 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * progmodes/python.el (python-font-lock-keywords): 8 * progmodes/python.el (python-font-lock-keywords):