summaryrefslogtreecommitdiff
path: root/lisp/nxml/rng-loc.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2016-01-15 10:29:20 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2016-01-15 10:29:20 -0500
commit930f8e8377e40ba161bd16ea4d612cb4c570ee1b (patch)
treefd3c9aa7fd154317758053492ad855df68658f15 /lisp/nxml/rng-loc.el
parenta600f4c69309bf37f67c02cbcc9a9e4ba1e69c76 (diff)
downloademacs-930f8e8377e40ba161bd16ea4d612cb4c570ee1b.tar.gz
Update nXML to use Emacs's Unicode support, and lexical-binding
* etc/nxml/*.el: Remove obsolete char-name files. * lisp/nxml/xsd-regexp.el (xsdre-range-list-difference): Remove unused var `next'. * lisp/nxml/rng-nxml.el (rng-set-state-after): Don't assume point-min==1. * lisp/nxml/rng-match.el (rng-update-match-state): Simplify. * lisp/nxml/nxml-outln.el (nxml-outline-state-transform-exceptions) (nxml-target-section-pos, nxml-depth-in-target-section) (nxml-outline-state-transform-alist) (nxml-outline-display-section-tag-function): Move decl before first use. * lisp/nxml/nxml-mode.el (nxml-char-name-ignore-case) (nxml-char-name-alist, nxml-char-name-table) (nxml-autoload-char-name-set-list, nxml-named-char-history): Remove vars. (nxml-enable-char-name-set, nxml-disable-char-name-set) (nxml-char-name-set-enabled-p, nxml-autoload-char-name-set) (nxml-define-char-name-set, nxml-get-char-name): Remove functions. (nxml-insert-named-char): Use read-char-by-name instead. (nxml-char-ref-display-extra): Use get-char-code-property. * lisp/nxml/nxml-maint.el (nxml-create-unicode-char-name-sets): Remove function. * lisp/nxml/nxml-glyph.el, lisp/nxml/nxml-uchnm.el: Remove files.
Diffstat (limited to 'lisp/nxml/rng-loc.el')
-rw-r--r--lisp/nxml/rng-loc.el15
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/nxml/rng-loc.el b/lisp/nxml/rng-loc.el
index 553d8ca359d..376e9169d37 100644
--- a/lisp/nxml/rng-loc.el
+++ b/lisp/nxml/rng-loc.el
@@ -1,4 +1,4 @@
-;;; rng-loc.el --- locate the schema to use for validation
+;;; rng-loc.el --- Locate the schema to use for validation -*- lexical-binding:t -*-
;; Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc.
@@ -31,10 +31,9 @@
(require 'rng-util)
(require 'xmltok)
-(defvar rng-current-schema-file-name nil
+(defvar-local rng-current-schema-file-name nil
"Filename of schema being used for current buffer.
It is nil if using a vacuous schema.")
-(make-variable-buffer-local 'rng-current-schema-file-name)
(defvar rng-schema-locating-files-default
(list "schemas.xml" (expand-file-name "schema/schemas.xml" data-directory))
@@ -233,11 +232,11 @@ or nil."
rules))))))))
best-so-far))
-(put 'documentElement 'rng-rule-matcher 'rng-match-document-element-rule)
-(put 'namespace 'rng-rule-matcher 'rng-match-namespace-rule)
-(put 'uri 'rng-rule-matcher 'rng-match-uri-rule)
-(put 'transformURI 'rng-rule-matcher 'rng-match-transform-uri-rule)
-(put 'default 'rng-rule-matcher 'rng-match-default-rule)
+(put 'documentElement 'rng-rule-matcher #'rng-match-document-element-rule)
+(put 'namespace 'rng-rule-matcher #'rng-match-namespace-rule)
+(put 'uri 'rng-rule-matcher #'rng-match-uri-rule)
+(put 'transformURI 'rng-rule-matcher #'rng-match-transform-uri-rule)
+(put 'default 'rng-rule-matcher #'rng-match-default-rule)
(defun rng-match-document-element-rule (props)
(let ((document-element (rng-document-element))