X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c1bb5ba7e161411850f704e5a2fcdc39d098948b..8833692b29ba11c34413d6793cf6d222ccdd930b:/src/xml.c

diff --git a/src/xml.c b/src/xml.c
index a3f9239579..03e9053f29 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1,12 +1,12 @@
 /* Interface to libxml2.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,7 +25,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <libxml/HTMLparser.h>
 
 #include "lisp.h"
-#include "character.h"
 #include "buffer.h"
 
 
@@ -46,7 +45,7 @@ DEF_DLL_FN (void, xmlCheckVersion, (int));
 static bool
 libxml2_loaded_p (void)
 {
-  Lisp_Object found = Fassq (Qlibxml2_dll, Vlibrary_cache);
+  Lisp_Object found = Fassq (Qlibxml2, Vlibrary_cache);
 
   return CONSP (found) && EQ (XCDR (found), Qt);
 }
@@ -97,7 +96,7 @@ init_libxml2_functions (void)
     {
       HMODULE library;
 
-      if (!(library = w32_delayed_load (Qlibxml2_dll)))
+      if (!(library = w32_delayed_load (Qlibxml2)))
 	{
 	  message1 ("libxml2 library not found");
 	  return false;
@@ -106,12 +105,12 @@ init_libxml2_functions (void)
       if (! load_dll_functions (library))
 	goto bad_library;
 
-      Vlibrary_cache = Fcons (Fcons (Qlibxml2_dll, Qt), Vlibrary_cache);
+      Vlibrary_cache = Fcons (Fcons (Qlibxml2, Qt), Vlibrary_cache);
       return true;
     }
 
  bad_library:
-  Vlibrary_cache = Fcons (Fcons (Qlibxml2_dll, Qnil), Vlibrary_cache);
+  Vlibrary_cache = Fcons (Fcons (Qlibxml2, Qnil), Vlibrary_cache);
 
   return false;
 #else  /* !WINDOWSNT */
@@ -287,8 +286,6 @@ syms_of_xml (void)
 {
   defsubr (&Slibxml_parse_html_region);
   defsubr (&Slibxml_parse_xml_region);
-
-  DEFSYM (Qlibxml2_dll, "libxml2");
 }
 
 #endif /* HAVE_LIBXML2 */