diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:03:48 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:03:48 -0400 |
| commit | 698ff554ac2699ec48fefc85a1307cbc4a183b0d (patch) | |
| tree | a7b7592f7973f81cad4410366d313e790616907e /lisp/nxml | |
| parent | 9233865b7005831e63755eb84ae7da060f878a55 (diff) | |
| download | emacs-698ff554ac2699ec48fefc85a1307cbc4a183b0d.tar.gz | |
* lisp/calc/calc-ext.el (math-scalarp): Fix typo
Diffstat (limited to 'lisp/nxml')
| -rw-r--r-- | lisp/nxml/rng-uri.el | 9 | ||||
| -rw-r--r-- | lisp/nxml/xmltok.el | 10 |
2 files changed, 12 insertions, 7 deletions
diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el index 798475bbc3d..e2bb8adfef5 100644 --- a/lisp/nxml/rng-uri.el +++ b/lisp/nxml/rng-uri.el @@ -83,10 +83,11 @@ Signal an error if URI is not a valid file URL." (cond ((not scheme) (unless pattern (rng-uri-error "URI `%s' does not have a scheme" uri))) - ((not (string= (downcase scheme) "file")) - (rng-uri-error "URI `%s' does not use the `file:' scheme" uri))) - (when (not (member authority - (cons (system-name) '(nil "" "localhost")))) + ((not (member (downcase scheme) '("file" "http"))) + (rng-uri-error "URI `%s' does not use the `file:' or `http:' scheme" uri))) + (when (and (equal (downcase scheme) "file") + (not (member authority + (cons (system-name) '(nil "" "localhost"))))) (rng-uri-error "URI `%s' does not start with `file:///' or `file://localhost/'" uri)) (when query diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el index afa33e064f3..c0bf29a3988 100644 --- a/lisp/nxml/xmltok.el +++ b/lisp/nxml/xmltok.el @@ -439,7 +439,8 @@ and VALUE-END, otherwise a STRING giving the value." (comment (xmltok+ (xmltok-g markup-declaration "!") (xmltok-g comment-first-dash "-" - (xmltok-g comment-open "-") opt) opt)) + (xmltok-g comment-open "-") opt) + opt)) (cdata-section (xmltok+ "!" (xmltok-g marked-section-open "\\[") @@ -540,7 +541,9 @@ and VALUE-END, otherwise a STRING giving the value." "%" (xmltok-g param-entity-ref ncname (xmltok-g param-entity-ref-close - ";") opt) opt)) + ";") + opt) + opt)) (starts-with-nmtoken-not-name (xmltok-g nmtoken (xmltok-p name-continue-not-start-char or ":") @@ -571,7 +574,8 @@ and VALUE-END, otherwise a STRING giving the value." "!" (xmltok-p (xmltok-g comment-first-dash "-" (xmltok-g comment-open "-") opt) or (xmltok-g named-markup-declaration - ncname)) opt)) + ncname)) + opt)) (after-lt (xmltok+ markup-declaration or (xmltok-g processing-instruction-question |