4 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 58abb9d0..dfede894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar  4 14:16:38 CET 2008 Daniel Veillard <daniel@veillard.com>
+
+	* xmlwriter.c: patch from Alex Khesin fixing CDATA output after
+	  a text node.
+	* parser.c: fixed the comment for xmlParserCleanup
+	* globals.c: fixed indentation
+
 Mon Feb 25 16:42:19 CET 2008 Daniel Veillard <daniel@veillard.com>
 
 	* testModule.c: patch from Florent Guiliani to fix build on
diff --git a/globals.c b/globals.c
index 636ff872..cbc66253 100644
--- a/globals.c
+++ b/globals.c
@@ -60,7 +60,7 @@ void xmlCleanupGlobals(void)
 	xmlFreeMutex(xmlThrDefMutex);
 	xmlThrDefMutex = NULL;
     }
-	__xmlGlobalInitMutexDestroy();
+    __xmlGlobalInitMutexDestroy();
 }
 
 /************************************************************************
diff --git a/parser.c b/parser.c
index f5d96659..0d27e87e 100644
--- a/parser.c
+++ b/parser.c
@@ -12956,7 +12956,7 @@ xmlInitParser(void) {
  * It doesn't deallocate any document related memory. Calling this
  * function should not prevent reusing the library but one should
  * call xmlCleanupParser() only when the process has
- * finished using the library or XML document built with it.
+ * finished using the library and all XML document built with it.
  */
 
 void
diff --git a/xmlwriter.c b/xmlwriter.c
index c6959b85..69d4b852 100644
--- a/xmlwriter.c
+++ b/xmlwriter.c
@@ -2614,6 +2614,7 @@ xmlTextWriterStartCDATA(xmlTextWriterPtr writer)
         if (p != 0) {
             switch (p->state) {
                 case XML_TEXTWRITER_NONE:
+		case XML_TEXTWRITER_TEXT:
                 case XML_TEXTWRITER_PI:
                 case XML_TEXTWRITER_PI_TEXT:
                     break;