# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1042325342 0
# Node ID 214790087d8f0748fb0dd0840d02c1bd8dbfa56f
# Parent  3db6e402ea2c184bed1b182d1890488940567adf
.

diff -r 3db6e402ea2c -r 214790087d8f lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 11 22:47:33 2003 +0000
+++ b/lisp/ChangeLog	Sat Jan 11 22:49:02 2003 +0000
@@ -1,3 +1,8 @@
+2003-01-11  Andreas Schwab  <schwab@suse.de>
+
+	* textmodes/sgml-mode.el (sgml-font-lock-keywords-2): Add flag to
+	merge with existing fontification.
+
 2003-01-11  Nick Roberts  <nick@nick.uklinux.net>
 
 	* gud.el (gud-kill-buffer-hook): Save gud-minor-mode type.