mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-22 07:09:54 +00:00
Make rng-blank-p obsolete in favor of string-blank-p
* lisp/nxml/rng-util.el (rng-blank-p): Make obsolete in favor of string-blank-p. Update callers.
This commit is contained in:
parent
581fa3d958
commit
c47507ec56
@ -1154,7 +1154,7 @@ list may contain duplicates."
|
||||
(if (or (rng--ipattern-nullable
|
||||
(rng-data-deriv child value))
|
||||
(and (rng--ipattern-nullable child)
|
||||
(rng-blank-p value)))
|
||||
(string-blank-p value)))
|
||||
(rng--ipattern-after ipattern)
|
||||
rng-not-allowed-ipattern)))
|
||||
((eq type 'data)
|
||||
|
@ -62,7 +62,7 @@ be signaled in the same way as when it is not well-formed."
|
||||
(unless (rng-match-element-value (or text ""))
|
||||
(cons "Invalid data" (and text 'text))))
|
||||
((and text
|
||||
(not (rng-blank-p text))
|
||||
(not (string-blank-p text))
|
||||
(not (rng-match-mixed-text)))
|
||||
(cons "Text not allowed" 'text))
|
||||
((not start-tag)
|
||||
|
@ -36,8 +36,6 @@
|
||||
|
||||
(defconst rng-builtin-datatypes-uri (rng-make-datatypes-uri ""))
|
||||
|
||||
(defun rng-blank-p (str) (string-match "\\`[ \t\n\r]*\\'" str))
|
||||
|
||||
(defun rng-substq (new old list)
|
||||
"Replace first member of LIST (if any) that is `eq' to OLD by NEW.
|
||||
LIST is not modified."
|
||||
@ -84,13 +82,12 @@ LIST is not modified."
|
||||
|
||||
(define-error 'rng-error nil)
|
||||
|
||||
;; Obsolete.
|
||||
|
||||
(defun rng-uniquify-eq (list)
|
||||
(declare (obsolete seq-uniq "28.1"))
|
||||
(seq-uniq list #'eq))
|
||||
|
||||
(define-obsolete-function-alias 'rng-uniquify-equal #'seq-uniq "28.1")
|
||||
(define-obsolete-function-alias 'rng-blank-p #'string-blank-p "29.1")
|
||||
|
||||
(provide 'rng-util)
|
||||
|
||||
|
@ -1275,7 +1275,7 @@ Return nil at end of buffer, t otherwise."
|
||||
|
||||
(defun rng-segment-blank-p (segment)
|
||||
(if (car segment)
|
||||
(rng-blank-p (car segment))
|
||||
(string-blank-p (car segment))
|
||||
(apply #'rng-region-blank-p
|
||||
(cdr segment))))
|
||||
|
||||
@ -1303,7 +1303,7 @@ string between START and END."
|
||||
((not (or (and whitespace
|
||||
(or (eq whitespace t)
|
||||
(if value
|
||||
(rng-blank-p value)
|
||||
(string-blank-p value)
|
||||
(rng-region-blank-p start end))))
|
||||
(rng-match-mixed-text)))
|
||||
(rng-mark-invalid "Text not allowed" start (or end (point))))))
|
||||
|
Loading…
Reference in New Issue
Block a user