# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1169424619 0
# Node ID f636c357cd5d0d46dd8f95b8749672a5f087d530
# Parent  a1962c941648fe28fa3a607328360f1c3ad925b9
*** empty log message ***

diff -r a1962c941648 -r f636c357cd5d lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jan 22 00:09:22 2007 +0000
+++ b/lisp/ChangeLog	Mon Jan 22 00:10:19 2007 +0000
@@ -1,3 +1,8 @@
+2007-01-21  Guanpeng Xu  <herberteuler@hotmail.com>
+
+	* add-log.el (add-log-current-defun): Use CC Mode functions to
+	find the beginning and end of a defun.
+
 2007-01-21  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-ui.el (gdb-var-create-regexp)
@@ -90,6 +95,7 @@
 
 	* progmodes/compile.el: Add handling for makepplog.
 
+>>>>>>> 1.10581
 2007-01-19  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* textmodes/ispell.el (ispell-change-dictionary): Ensure that
@@ -593,7 +599,7 @@
 	(image-type-from-buffer): Handle new format.  New arg INCLUDE-MAYBES.
 	(image-type-from-file-header): Pass t for INCLUDE-MAYBES.
 
-2006-12-26  Guanpeng Xu  <herberteuler@hotmail.com>  (tiny change)
+2006-12-26  Guanpeng Xu  <herberteuler@hotmail.com>
 
 	* add-log.el (add-log-current-defun): Call `forward-sexp'
 	multiple times to pick a member function name defined as