merge from trunk

[gnu-emacs] / lisp / nxml / rng-match.el

diff --git a/lisp/nxml/rng-match.el b/lisp/nxml/rng-match.el
index 006fdf537c15247b980d0242294632c28cdd39e9..36bd23b3768204f15737ef2b55ffcb92cab1e40b 100644 (file)
--- a/lisp/nxml/rng-match.el
+++ b/lisp/nxml/rng-match.el
@@ -1,6 +1,6 @@
 ;;; rng-match.el --- matching of RELAX NG patterns against XML events
 
-;; Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML, RelaxNG
@@ -1541,14 +1541,7 @@ nullable and y1 isn't, return a choice
   (signal 'rng-compile-error
          (list (apply 'format args))))
 
-(put 'rng-compile-error
-     'error-conditions
-     '(error rng-error rng-compile-error))
-
-(put 'rng-compile-error
-     'error-message
-     "Incorrect schema")
-
+(define-error 'rng-compile-error "Incorrect schema" 'rng-error)
 
 ;;; External API
 
@@ -1736,5 +1729,4 @@ be exhaustive."
 
 (provide 'rng-match)
 
-;; arch-tag: c8c50733-edcf-49fb-85e2-0aac8749b7f8
 ;;; rng-match.el ends here