Mercurial > emacs
comparison lisp/xml.el @ 107617:c5f9e4613394
Merge from mainline.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 16 Jan 2010 06:57:09 -0500 |
| parents | 1d1d5d9bd884 |
| children | e24d55cee016 |
comparison
equal
deleted
inserted
replaced
| 107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
|---|---|
| 1 ;;; xml.el --- XML parser | 1 ;;; xml.el --- XML parser |
| 2 | 2 |
| 3 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, | 3 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, |
| 4 ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 5 | 5 |
| 6 ;; Author: Emmanuel Briot <briot@gnat.com> | 6 ;; Author: Emmanuel Briot <briot@gnat.com> |
| 7 ;; Maintainer: Mark A. Hershberger <mah@everybody.org> | 7 ;; Maintainer: Mark A. Hershberger <mah@everybody.org> |
| 8 ;; Keywords: xml, data | 8 ;; Keywords: xml, data |
| 9 | 9 |