diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-08-09 22:41:53 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-08-09 22:44:21 +0200 |
| commit | 0e824bd683b2ba2ed7dc50a71efcdba38b70dd62 (patch) | |
| tree | 052cbddfc0b899e48b2e7deb08c9ccbb17f32b99 /lisp/nxml/rng-loc.el | |
| parent | 32d8fc999c070a4fa1539ebba6a6310bca58c5ef (diff) | |
| download | emacs-0e824bd683b2ba2ed7dc50a71efcdba38b70dd62.tar.gz emacs-0e824bd683b2ba2ed7dc50a71efcdba38b70dd62.tar.bz2 emacs-0e824bd683b2ba2ed7dc50a71efcdba38b70dd62.zip | |
Make rng-collapse-space obsolete
* lisp/nxml/rng-util.el (rng-collapse-space): Make obsolete in favor
of 'string-clean-whitespace'. Update callers.
Suggested by Lars Ingebrigtsen <larsi@gnus.org>.
Diffstat (limited to 'lisp/nxml/rng-loc.el')
| -rw-r--r-- | lisp/nxml/rng-loc.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/nxml/rng-loc.el b/lisp/nxml/rng-loc.el index 302aa05176f..40332aacd50 100644 --- a/lisp/nxml/rng-loc.el +++ b/lisp/nxml/rng-loc.el @@ -354,7 +354,7 @@ NS is t if the document has a non-nil, but not otherwise known namespace." (or (cdr (assq 'uri props)) (let ((type-id (cdr (assq 'typeId props)))) (and type-id - (cons (rng-collapse-space type-id) nil))))) + (cons (string-clean-whitespace type-id) nil))))) (defun rng-possible-type-ids-using (file type-ids) (let ((rules (rng-get-parsed-schema-locating-file file)) @@ -366,7 +366,7 @@ NS is t if the document has a non-nil, but not otherwise known namespace." (let ((id (cdr (assq 'id (cdr rule))))) (when id (setq type-ids - (cons (rng-collapse-space id) + (cons (string-clean-whitespace id) type-ids))))) ((eq (car rule) 'include) (let ((uri (cdr (assq 'rules (cdr rule))))) @@ -390,7 +390,7 @@ or nil." (cond ((and (eq (car rule) 'typeId) (let ((id (assq 'id (cdr rule)))) (and id - (string= (rng-collapse-space (cdr id)) type-id)))) + (string= (string-clean-whitespace (cdr id)) type-id)))) (setq schema (rng-match-default-rule (cdr rule)))) ((eq (car rule) 'include) (let ((uri (cdr (assq 'rules (cdr rule))))) |