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/rng-uri.el | |
| parent | 699fce296b13d7db386b1cb5cecf2710e5196691 (diff) | |
| download | emacs-0b4e003766f15225dede9bdba4ead33e493856e2.tar.gz emacs-0b4e003766f15225dede9bdba4ead33e493856e2.tar.bz2 emacs-0b4e003766f15225dede9bdba4ead33e493856e2.zip | |
Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo"
This reverts commit 698ff554ac2699ec48fefc85a1307cbc4a183b0d.
Diffstat (limited to 'lisp/nxml/rng-uri.el')
| -rw-r--r-- | lisp/nxml/rng-uri.el | 9 |
1 files changed, 4 insertions, 5 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 |