Mercurial > emacs

diff lisp/ChangeLog @ 72257:93223615e952

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(gdb-script-font-lock-syntactic-keywords): Correctly mark the end-of-docstring char.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 03 Aug 2006 18:30:13 +0000
parents 42b0c9d6a376
children 7fcd41d936c5
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Aug 03 18:27:50 2006 +0000
+++ b/lisp/ChangeLog	Thu Aug 03 18:30:13 2006 +0000
@@ -1,3 +1,8 @@
+2006-08-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/gud.el (gdb-script-font-lock-syntactic-keywords):
+	Correctly mark the end-of-docstring char.
+
 2006-08-03  Chong Yidong  <cyd@stupidchicken.com>
 
 	* simple.el (line-move-to-column): Constrain move-to-column to
@@ -180,8 +185,13 @@
 
 	* tumme.el (tumme-backward-image): Add prefix argument.  Add error
 	when at first image.
+<<<<<<< ChangeLog
+	(tumme-forward-image): Add prefix argument.
+	Add error when at last image.
+=======
 	(tumme-forward-image): Add prefix argument.  Add error when at last
 	image.
+>>>>>>> 1.9899
 
 2006-07-25  Stefan Monnier  <monnier@iro.umontreal.ca>