Merge from origin/emacs-24

[gnu-emacs] / lisp / nxml / nxml-parse.el

diff --git a/lisp/nxml/nxml-parse.el b/lisp/nxml/nxml-parse.el
index 94f11fbf5d968561270e75af8458401a74990c74..c0a8497970c2deb40cc7b593c8f77751a5ce6ba9 100644 (file)
--- a/lisp/nxml/nxml-parse.el
+++ b/lisp/nxml/nxml-parse.el
@@ -1,9 +1,9 @@
 ;;; nxml-parse.el --- XML parser, sharing infrastructure with nxml-mode
 
-;; Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: XML
+;; Keywords: wp, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
@@ -315,5 +315,4 @@ same way as well-formedness error."
 
 (provide 'nxml-parse)
 
-;; arch-tag: fc19639b-1bff-4673-9992-f539da89ba1e
 ;;; nxml-parse.el ends here