Mercurial > emacs

diff lisp/ChangeLog @ 108411:8af8a20eebf0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sat, 06 Feb 2010 13:36:05 +0000
parents 17f07853dd4d
children 3b143add1364
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Feb 06 04:13:19 2010 +0000
+++ b/lisp/ChangeLog	Sat Feb 06 13:36:05 2010 +0000
@@ -1,3 +1,12 @@
+2010-02-06  Chong Yidong  <cyd@stupidchicken.com>
+
+	* progmodes/cc-mode.el (c-common-init): Bind temporary variables
+	beg and end before calling c-get-state-before-change-functions.
+
+2010-02-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.
+
 2010-02-05  Juri Linkov  <juri@jurta.org>
 
 	* doc-view.el (doc-view-mode):