X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b14e3e21ec6702d27257a1400681fc36ee10282f..7e09ef09a479731d01b1ca46e94ddadd73ac98e3:/lisp/nxml/rng-cmpct.el diff --git a/lisp/nxml/rng-cmpct.el b/lisp/nxml/rng-cmpct.el index 09bd2b7503..5934031698 100644 --- a/lisp/nxml/rng-cmpct.el +++ b/lisp/nxml/rng-cmpct.el @@ -1,9 +1,9 @@ ;;; rng-cmpct.el --- parsing of RELAX NG Compact Syntax schemas -;; Copyright (C) 2003, 2007-2011 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc. ;; Author: James Clark -;; Keywords: XML, RelaxNG +;; Keywords: wp, hypermedia, languages, XML, RelaxNG ;; This file is part of GNU Emacs. @@ -45,13 +45,8 @@ Return a pattern." ;;; Error handling -(put 'rng-c-incorrect-schema - 'error-conditions - '(error rng-error nxml-file-parse-error rng-c-incorrect-schema)) - -(put 'rng-c-incorrect-schema - 'error-message - "Incorrect schema") +(define-error 'rng-c-incorrect-schema + "Incorrect schema" '(rng-error nxml-file-parse-error)) (defun rng-c-signal-incorrect-schema (filename pos message) (nxml-signal-file-parse-error filename @@ -368,7 +363,7 @@ OVERRIDE is either nil, require or t." "*"))) (defun rng-c-process-escapes () - ;; Check for any nuls, since we will use nul chars + ;; Check for any NULs, since we will use NUL chars ;; for internal purposes. (let ((pos (search-forward "\C-@" nil t))) (and pos @@ -937,4 +932,3 @@ Current token after parse is token following ]." (provide 'rng-cmpct) ;;; rng-cmpct.el -