diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:24:59 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:24:59 -0400 |
| commit | 0b4e003766f15225dede9bdba4ead33e493856e2 (patch) | |
| tree | 99de57fe8feeca540f398acb232b75e9c802418c /lisp/nxml | |
| parent | 699fce296b13d7db386b1cb5cecf2710e5196691 (diff) | |
| download | emacs-0b4e003766f15225dede9bdba4ead33e493856e2.tar.gz | |
Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo"
This reverts commit 698ff554ac2699ec48fefc85a1307cbc4a183b0d.
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, 7 insertions, 12 deletions
diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el index e2bb8adfef5..798475bbc3d 100644 --- a/lisp/nxml/rng-uri.el +++ b/lisp/nxml/rng-uri.el @@ -83,11 +83,10 @@ 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 (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"))))) + ((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")))) (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 c0bf29a3988..afa33e064f3 100644 --- a/lisp/nxml/xmltok.el +++ b/lisp/nxml/xmltok.el @@ -439,8 +439,7 @@ 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 "\\[") @@ -541,9 +540,7 @@ 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 ":") @@ -574,8 +571,7 @@ 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 |