From: Andreas Schwab <schwab@suse.de>
Date: Sat, 11 Jan 2003 22:49:02 +0000 (+0000)
Subject: .
X-Git-Tag: ttn-vms-21-2-B4~11738
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eaae32461d94f4c2f240112c8a1f07beda58f2d7;p=emacs.git

.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de7f6a722ce..dd62da0fed6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.