diff options
| author | Lars Magne Ingebrigtsen | 2011-09-03 23:59:25 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-09-03 23:59:25 +0200 |
| commit | fcb901a77a0a3eaf21f0126466ae84fdc18fce2c (patch) | |
| tree | ee4518e0949821d5d74c5e203fe6aaebd24e52da /src/emacs.c | |
| parent | 2784c43403c278a542a9f930a4da07a4a2ca284c (diff) | |
| download | emacs-fcb901a77a0a3eaf21f0126466ae84fdc18fce2c.tar.gz emacs-fcb901a77a0a3eaf21f0126466ae84fdc18fce2c.zip | |
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.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c index 7039f063dc2..f68c47ffed0 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -2097,6 +2097,10 @@ shut_down_emacs (int sig, int no_x, Lisp_Object stuff) | |||
| 2097 | #ifdef HAVE_NS | 2097 | #ifdef HAVE_NS |
| 2098 | ns_term_shutdown (sig); | 2098 | ns_term_shutdown (sig); |
| 2099 | #endif | 2099 | #endif |
| 2100 | |||
| 2101 | #ifdef HAVE_LIBXML2 | ||
| 2102 | xmlCleanupParser (); | ||
| 2103 | #endif | ||
| 2100 | } | 2104 | } |
| 2101 | 2105 | ||
| 2102 | 2106 | ||