[Emacs-diffs] /srv/bzr/emacs/trunk r105649: Fix up xmlCleanupParser sequence.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105649
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-03 23:59:25 +0200
message:
  Fix up xmlCleanupParser sequence.
  
  * xml.c (parse_region): Don't call xmlCleanupParser after parsing,
  since this reportedly can destroy thread storage.
  
  * emacs.c (shut_down_emacs): Call xmlCleanupParser on shutdown.
modified:
  src/ChangeLog
  src/emacs.c
  src/xml.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-30 22:43:43 +0000
+++ b/src/ChangeLog     2011-09-03 21:59:25 +0000
@@ -1,3 +1,10 @@
+2011-09-03  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * emacs.c (shut_down_emacs): Call xmlCleanupParser on shutdown.
+
+       * xml.c (parse_region): Don't call xmlCleanupParser after parsing,
+       since this reportedly can destroy thread storage.
+
 2011-08-30  Chong Yidong  <address@hidden>
 
        * syntax.c (find_defun_start): Update all cache variables if

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2011-08-05 02:19:34 +0000
+++ b/src/emacs.c       2011-09-03 21:59:25 +0000
@@ -2097,6 +2097,10 @@
 #ifdef HAVE_NS
   ns_term_shutdown (sig);
 #endif
+
+#ifdef HAVE_LIBXML2
+  xmlCleanupParser ();
+#endif
 }
 
 

=== modified file 'src/xml.c'
--- a/src/xml.c 2011-07-24 14:01:58 +0000
+++ b/src/xml.c 2011-09-03 21:59:25 +0000
@@ -141,7 +141,6 @@
                        Fcons (Qnil, Fnreverse (Fcons (r, result))));
 
       xmlFreeDoc (doc);
-      xmlCleanupParser ();
     }
 
   return result;