[elpa] externals/compat 53f9d3e5e0 01/12: Rename

[ELPA Syncer]

branch: externals/compat
commit 53f9d3e5e0e758a88e6483d6078430af73fc2e6b
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Rename
---
 compat-24.el    |  58 +++++++++++++++----------------
 compat-25.el    |  18 +++++-----
 compat-26.el    | 104 ++++++++++++++++++++++++++++----------------------------
 compat-27.el    |  84 ++++++++++++++++++++++-----------------------
 compat-28.el    |  80 +++++++++++++++++++++----------------------
 compat-29.el    |  62 ++++++++++++++++-----------------
 compat-macs.el  |   4 +--
 compat-tests.el |   2 +-
 compat.texi     |   2 +-
 9 files changed, 207 insertions(+), 207 deletions(-)

diff --git a/compat-24.el b/compat-24.el
index 6c2cf3cd90..1c969f0b8a 100644
--- a/compat-24.el
+++ b/compat-24.el
@@ -27,7 +27,7 @@
 
 ;;;; Defined in data.c
 
-(compat-defun = (number-or-marker &rest numbers-or-markers) ;; UNTESTED
+(compat-defun = (number-or-marker &rest numbers-or-markers) ;; <UNTESTED>
   "Handle multiple arguments."
   :explicit t
   (catch 'fail
@@ -37,7 +37,7 @@
       (setq number-or-marker (pop numbers-or-markers)))
     t))
 
-(compat-defun < (number-or-marker &rest numbers-or-markers) ;; UNTESTED
+(compat-defun < (number-or-marker &rest numbers-or-markers) ;; <UNTESTED>
   "Handle multiple arguments."
   :explicit t
   (catch 'fail
@@ -47,7 +47,7 @@
       (setq number-or-marker (pop numbers-or-markers)))
     t))
 
-(compat-defun > (number-or-marker &rest numbers-or-markers) ;; UNTESTED
+(compat-defun > (number-or-marker &rest numbers-or-markers) ;; <UNTESTED>
   "Handle multiple arguments."
   :explicit t
   (catch 'fail
@@ -57,7 +57,7 @@
       (setq number-or-marker (pop numbers-or-markers)))
     t))
 
-(compat-defun <= (number-or-marker &rest numbers-or-markers) ;; UNTESTED
+(compat-defun <= (number-or-marker &rest numbers-or-markers) ;; <UNTESTED>
   "Handle multiple arguments."
   :explicit t
   (catch 'fail
@@ -67,7 +67,7 @@
       (setq number-or-marker (pop numbers-or-markers)))
     t))
 
-(compat-defun >= (number-or-marker &rest numbers-or-markers) ;; UNTESTED
+(compat-defun >= (number-or-marker &rest numbers-or-markers) ;; <UNTESTED>
   "Handle multiple arguments."
   :explicit t
   (catch 'fail
@@ -76,7 +76,7 @@
         (throw 'fail nil)))
     t))
 
-(compat-defun bool-vector-exclusive-or (a b &optional c) ;; UNTESTED
+(compat-defun bool-vector-exclusive-or (a b &optional c) ;; <UNTESTED>
   "Return A ^ B, bitwise exclusive or.
 If optional third argument C is given, store result into C.
 A, B, and C must be bool vectors of the same length.
@@ -99,7 +99,7 @@ Return the destination vector if it changed or nil otherwise."
         (aset dest i val)))
     (if c (and changed c) dest)))
 
-(compat-defun bool-vector-union (a b &optional c) ;; UNTESTED
+(compat-defun bool-vector-union (a b &optional c) ;; <UNTESTED>
   "Return A | B, bitwise or.
 If optional third argument C is given, store result into C.
 A, B, and C must be bool vectors of the same length.
@@ -122,7 +122,7 @@ Return the destination vector if it changed or nil 
otherwise."
         (aset dest i val)))
     (if c (and changed c) dest)))
 
-(compat-defun bool-vector-intersection (a b &optional c) ;; UNTESTED
+(compat-defun bool-vector-intersection (a b &optional c) ;; <UNTESTED>
   "Return A & B, bitwise and.
 If optional third argument C is given, store result into C.
 A, B, and C must be bool vectors of the same length.
@@ -145,7 +145,7 @@ Return the destination vector if it changed or nil 
otherwise."
         (aset dest i val)))
     (if c (and changed c) dest)))
 
-(compat-defun bool-vector-set-difference (a b &optional c) ;; UNTESTED
+(compat-defun bool-vector-set-difference (a b &optional c) ;; <UNTESTED>
   "Return A &~ B, set difference.
 If optional third argument C is given, store result into C.
 A, B, and C must be bool vectors of the same length.
@@ -168,7 +168,7 @@ Return the destination vector if it changed or nil 
otherwise."
         (aset dest i val)))
     (if c (and changed c) dest)))
 
-(compat-defun bool-vector-not (a &optional b) ;; UNTESTED
+(compat-defun bool-vector-not (a &optional b) ;; <UNTESTED>
   "Compute ~A, set complement.
 If optional second argument B is given, store result into B.
 A and B must be bool vectors of the same length.
@@ -184,7 +184,7 @@ Return the destination vector."
       (aset dest i (not (aref a i))))
     dest))
 
-(compat-defun bool-vector-subsetp (a b) ;; UNTESTED
+(compat-defun bool-vector-subsetp (a b) ;; <UNTESTED>
   "Return t if every t value in A is also t in B, nil otherwise.
 A and B must be bool vectors of the same length."
   (unless (bool-vector-p a)
@@ -199,7 +199,7 @@ A and B must be bool vectors of the same length."
         (throw 'not-subset nil)))
     t))
 
-(compat-defun bool-vector-count-consecutive (a b i) ;; UNTESTED
+(compat-defun bool-vector-count-consecutive (a b i) ;; <UNTESTED>
   "Count how many consecutive elements in A equal B starting at I.
 A is a bool vector, B is t or nil, and I is an index into A."
   (unless (bool-vector-p a)
@@ -212,7 +212,7 @@ A is a bool vector, B is t or nil, and I is an index into 
A."
       (setq i (1+ i)))
     (- i n)))
 
-(compat-defun bool-vector-count-population (a) ;; UNTESTED
+(compat-defun bool-vector-count-population (a) ;; <UNTESTED>
   "Count how many elements in A are t.
 A is a bool vector.  To count A's nil elements, subtract the
 return value from A's length."
@@ -236,7 +236,7 @@ for more details about the different forms of FILE and 
their semantics."
   ;; `eval-after-load' is used to preserve compatibility with 24.3.
   `(eval-after-load ,file `(funcall ',,`(lambda () ,@body))))
 
-(compat-defun special-form-p (object) ;; UNTESTED
+(compat-defun special-form-p (object) ;; <UNTESTED>
   "Non-nil if and only if OBJECT is a special form."
   (if (and (symbolp object) (fboundp object))
       (setq object (condition-case nil
@@ -244,7 +244,7 @@ for more details about the different forms of FILE and 
their semantics."
                      (void-function nil))))
   (and (subrp object) (eq (cdr (subr-arity object)) 'unevalled)))
 
-(compat-defun macrop (object) ;; UNTESTED
+(compat-defun macrop (object) ;; <UNTESTED>
   "Non-nil if and only if OBJECT is a macro."
   (let ((def (condition-case nil
                  (indirect-function object)
@@ -253,7 +253,7 @@ for more details about the different forms of FILE and 
their semantics."
       (or (eq 'macro (car def))
           (and (autoloadp def) (memq (nth 4 def) '(macro t)))))))
 
-(compat-defun string-suffix-p (suffix string  &optional ignore-case) ;; 
UNTESTED
+(compat-defun string-suffix-p (suffix string  &optional ignore-case) ;; 
<UNTESTED>
   "Return non-nil if SUFFIX is a suffix of STRING.
 If IGNORE-CASE is non-nil, the comparison is done without paying
 attention to case differences."
@@ -262,7 +262,7 @@ attention to case differences."
          (eq t (compare-strings suffix nil nil
                                 string start-pos nil ignore-case)))))
 
-(compat-defun split-string (string &optional separators omit-nulls trim) ;; 
UNTESTED
+(compat-defun split-string (string &optional separators omit-nulls trim) ;; 
<UNTESTED>
   "Extend `split-string' by a TRIM argument.
 The remaining arguments STRING, SEPARATORS and OMIT-NULLS are
 handled just as with `split-string'."
@@ -280,7 +280,7 @@ handled just as with `split-string'."
                     token)))
     (if omit-nulls (delete "" trimmed) trimmed)))
 
-(compat-defun delete-consecutive-dups (list &optional circular) ;; UNTESTED
+(compat-defun delete-consecutive-dups (list &optional circular) ;; <UNTESTED>
   "Destructively remove `equal' consecutive duplicates from LIST.
 First and last elements are considered consecutive if CIRCULAR is
 non-nil."
@@ -296,7 +296,7 @@ non-nil."
         (setcdr last nil)))
   list)
 
-(compat-defun define-error (name message &optional parent) ;; UNTESTED
+(compat-defun define-error (name message &optional parent) ;; <UNTESTED>
   "Define NAME as a new error signal.
 MESSAGE is a string that will be output to the echo area if such an error
 is signaled without being caught by a `condition-case'.
@@ -318,7 +318,7 @@ Defaults to `error'."
 
 ;;;; Defined in minibuffer.el
 
-(compat-defun completion-table-with-cache (fun &optional ignore-case) ;; 
UNTESTED
+(compat-defun completion-table-with-cache (fun &optional ignore-case) ;; 
<UNTESTED>
   "Create dynamic completion table from function FUN, with cache.
 This is a wrapper for `completion-table-dynamic' that saves the last
 argument-result pair from FUN, so that several lookups with the
@@ -337,7 +337,7 @@ When IGNORE-CASE is non-nil, FUN is expected to be 
case-insensitive."
                 (setq last-arg arg))))))
     (completion-table-dynamic new-fun)))
 
-(compat-defun completion-table-merge (&rest tables) ;; UNTESTED
+(compat-defun completion-table-merge (&rest tables) ;; <UNTESTED>
   "Create a completion table that collects completions from all TABLES."
   (lambda (string pred action)
     (cond
@@ -363,7 +363,7 @@ When IGNORE-CASE is non-nil, FUN is expected to be 
case-insensitive."
 
 ;;;; Defined in subr-x.el
 
-(compat-defun hash-table-keys (hash-table) ;; UNTESTED
+(compat-defun hash-table-keys (hash-table) ;; <UNTESTED>
   "Return a list of keys in HASH-TABLE."
   (let (values)
     (maphash
@@ -371,7 +371,7 @@ When IGNORE-CASE is non-nil, FUN is expected to be 
case-insensitive."
      hash-table)
     values))
 
-(compat-defun hash-table-values (hash-table) ;; UNTESTED
+(compat-defun hash-table-values (hash-table) ;; <UNTESTED>
   "Return a list of values in HASH-TABLE."
   (let (values)
     (maphash
@@ -379,29 +379,29 @@ When IGNORE-CASE is non-nil, FUN is expected to be 
case-insensitive."
      hash-table)
     values))
 
-(compat-defun string-empty-p (string) ;; UNTESTED
+(compat-defun string-empty-p (string) ;; <UNTESTED>
   "Check whether STRING is empty."
   (string= string ""))
 
-(compat-defun string-join (strings &optional separator) ;; UNTESTED
+(compat-defun string-join (strings &optional separator) ;; <UNTESTED>
   "Join all STRINGS using SEPARATOR.
 Optional argument SEPARATOR must be a string, a vector, or a list of
 characters; nil stands for the empty string."
   (mapconcat #'identity strings separator))
 
-(compat-defun string-blank-p (string) ;; UNTESTED
+(compat-defun string-blank-p (string) ;; <UNTESTED>
   "Check whether STRING is either empty or only whitespace.
 The following characters count as whitespace here: space, tab, newline and
 carriage return."
   (string-match-p "\\`[ \t\n\r]*\\'" string))
 
-(compat-defun string-remove-prefix (prefix string) ;; UNTESTED
+(compat-defun string-remove-prefix (prefix string) ;; <UNTESTED>
   "Remove PREFIX from STRING if present."
   (if (string-prefix-p prefix string)
       (substring string (length prefix))
     string))
 
-(compat-defun string-remove-suffix (suffix string) ;; UNTESTED
+(compat-defun string-remove-suffix (suffix string) ;; <UNTESTED>
   "Remove SUFFIX from STRING if present."
   (if (string-suffix-p suffix string)
       (substring string 0 (- (length string) (length suffix)))
@@ -409,7 +409,7 @@ carriage return."
 
 ;;;; Defined in faces.el
 
-(compat-defun face-spec-set (face spec &optional spec-type) ;; UNTESTED
+(compat-defun face-spec-set (face spec &optional spec-type) ;; <UNTESTED>
   "Set the FACE's spec SPEC, define FACE, and recalculate its attributes.
 See `defface' for the format of SPEC.
 
diff --git a/compat-25.el b/compat-25.el
index 7733c48234..c995ecd082 100644
--- a/compat-25.el
+++ b/compat-25.el
@@ -28,7 +28,7 @@
 
 ;;;; Defined in alloc.c
 
-(compat-defun bool-vector (&rest objects) ;; UNTESTED
+(compat-defun bool-vector (&rest objects) ;; <UNTESTED>
   "Return a new bool-vector with specified arguments as elements.
 Allows any number of arguments, including zero.
 usage: (bool-vector &rest OBJECTS)"
@@ -43,7 +43,7 @@ usage: (bool-vector &rest OBJECTS)"
 
 ;;;; Defined in fns.c
 
-(compat-defun sort (seq predicate) ;; UNTESTED
+(compat-defun sort (seq predicate) ;; <UNTESTED>
   "Extend `sort' to sort SEQ as a vector."
   :explicit t
   (cond
@@ -58,7 +58,7 @@ usage: (bool-vector &rest OBJECTS)"
 
 ;;;; Defined in editfns.c
 
-(compat-defun format-message (string &rest objects) ;; UNTESTED
+(compat-defun format-message (string &rest objects) ;; <UNTESTED>
   "Format a string out of a format-string and arguments.
 The first argument is a format control string.
 The other arguments are substituted into it to make the result, a string.
@@ -72,7 +72,7 @@ This implementation is equivalent to `format'."
 
 ;;;; Defined in fileio.c
 
-(compat-defun directory-name-p (name) ;; UNTESTED
+(compat-defun directory-name-p (name) ;; <UNTESTED>
   "Return non-nil if NAME ends with a directory separator character."
   (eq (eval-when-compile
         (if (memq system-type '(cygwin windows-nt ms-dos))
@@ -81,7 +81,7 @@ This implementation is equivalent to `format'."
 
 ;;;; Defined in subr.el
 
-(compat-defun string-greaterp (string1 string2) ;; UNTESTED
+(compat-defun string-greaterp (string1 string2) ;; <UNTESTED>
   "Return non-nil if STRING1 is greater than STRING2 in lexicographic order.
 Case is significant.
 Symbols are also allowed; their print names are used instead."
@@ -99,7 +99,7 @@ MODES is as for `set-default-file-modes'."
              ,@body)
          (set-default-file-modes ,umask)))))
 
-(compat-defun alist-get (key alist &optional default remove testfn) ;; UNTESTED
+(compat-defun alist-get (key alist &optional default remove testfn) ;; 
<UNTESTED>
   "Find the first element of ALIST whose `car' equals KEY and return its `cdr'.
 If KEY is not found in ALIST, return DEFAULT.
 Equality with KEY is tested by TESTFN, defaulting to `eq'."
@@ -228,7 +228,7 @@ threading."
 ;;;; Defined in macroexp.el
 
 (declare-function macrop nil (object))
-(compat-defun macroexpand-1 (form &optional environment) ;; UNTESTED
+(compat-defun macroexpand-1 (form &optional environment) ;; <UNTESTED>
   "Perform (at most) one step of macro expansion."
   :feature macroexp
   (cond
@@ -255,7 +255,7 @@ threading."
 
 ;;;; Defined in byte-run.el
 
-(compat-defun function-put (func prop value) ;; UNTESTED
+(compat-defun function-put (func prop value) ;; <UNTESTED>
   "Set FUNCTION's property PROP to VALUE.
 The namespace for PROP is shared with symbols.
 So far, FUNCTION can only be a symbol, not a lambda expression."
@@ -264,7 +264,7 @@ So far, FUNCTION can only be a symbol, not a lambda 
expression."
 
 ;;;; Defined in files.el
 
-(compat-defun directory-files-recursively ;; UNTESTED
+(compat-defun directory-files-recursively ;; <UNTESTED>
     (dir regexp &optional include-directories predicate follow-symlinks)
   "Return list of all files under directory DIR whose names match REGEXP.
 This function works recursively.  Files are returned in \"depth
diff --git a/compat-26.el b/compat-26.el
index 9bc01420bf..182b5723af 100644
--- a/compat-26.el
+++ b/compat-26.el
@@ -28,7 +28,7 @@
 
 ;;;; Defined in eval.c
 
-(compat-defun func-arity (func) ;; UNTESTED
+(compat-defun func-arity (func) ;; <UNTESTED>
   "Return minimum and maximum number of args allowed for FUNC.
 FUNC must be a function of some kind.
 The returned value is a cons cell (MIN . MAX).  MIN is the minimum number
@@ -100,7 +100,7 @@ function with `&rest' args, or `unevalled' for a special 
form."
 
 ;;;; Defined in fns.c
 
-(compat-defun assoc (key alist &optional testfn) ;; UNTESTED
+(compat-defun assoc (key alist &optional testfn) ;; <UNTESTED>
   "Handle the optional argument TESTFN.
 Equality is defined by the function TESTFN, defaulting to
 `equal'.  TESTFN is called with 2 arguments: a car of an alist
@@ -115,13 +115,13 @@ just like `assoc'."
             (throw 'found ent))))
     (assoc key alist)))
 
-(compat-defun mapcan (func sequence) ;; UNTESTED
+(compat-defun mapcan (func sequence) ;; <UNTESTED>
   "Apply FUNC to each element of SEQUENCE.
 Concatenate the results by altering them (using `nconc').
 SEQUENCE may be a list, a vector, a boolean vector, or a string."
   (apply #'nconc (mapcar func sequence)))
 
-(compat-defun line-number-at-pos (&optional position absolute) ;; UNTESTED
+(compat-defun line-number-at-pos (&optional position absolute) ;; <UNTESTED>
   "Handle optional argument ABSOLUTE:
 
 If the buffer is narrowed, the return value by default counts the lines
@@ -138,7 +138,7 @@ from the absolute start of the buffer, disregarding the 
narrowing."
 ;;;; Defined in subr.el
 
 (declare-function alist-get nil (key alist &optional default remove))
-(compat-defun alist-get (key alist &optional default remove testfn) ;; UNTESTED
+(compat-defun alist-get (key alist &optional default remove testfn) ;; 
<UNTESTED>
   "Handle TESTFN manually."
   :explicit t
   (if testfn
@@ -174,7 +174,7 @@ from the absolute start of the buffer, disregarding the 
narrowing."
                                                `(delq ,p ,getter))))))
                             ,v))))))))))
 
-(compat-defun string-trim-left (string &optional regexp) ;; UNTESTED
+(compat-defun string-trim-left (string &optional regexp) ;; <UNTESTED>
   "Trim STRING of leading string matching REGEXP.
 
 REGEXP defaults to \"[ \\t\\n\\r]+\"."
@@ -184,7 +184,7 @@ REGEXP defaults to \"[ \\t\\n\\r]+\"."
       (substring string (match-end 0))
     string))
 
-(compat-defun string-trim-right (string &optional regexp) ;; UNTESTED
+(compat-defun string-trim-right (string &optional regexp) ;; <UNTESTED>
   "Trim STRING of trailing string matching REGEXP.
 
 REGEXP defaults to  \"[ \\t\\n\\r]+\"."
@@ -195,7 +195,7 @@ REGEXP defaults to  \"[ \\t\\n\\r]+\"."
             string)))
     (if i (substring string 0 i) string)))
 
-(compat-defun string-trim (string &optional trim-left trim-right) ;; UNTESTED
+(compat-defun string-trim (string &optional trim-left trim-right) ;; <UNTESTED>
   "Trim STRING of leading with and trailing matching TRIM-LEFT and TRIM-RIGHT.
 
 TRIM-LEFT and TRIM-RIGHT default to \"[ \\t\\n\\r]+\"."
@@ -209,122 +209,122 @@ TRIM-LEFT and TRIM-RIGHT default to \"[ \\t\\n\\r]+\"."
     trim-right)
    trim-left))
 
-(compat-defun caaar (x) ;; UNTESTED
+(compat-defun caaar (x) ;; <UNTESTED>
   "Return the `car' of the `car' of the `car' of X."
   (declare (pure t))
   (car (car (car x))))
 
-(compat-defun caadr (x) ;; UNTESTED
+(compat-defun caadr (x) ;; <UNTESTED>
   "Return the `car' of the `car' of the `cdr' of X."
   (declare (pure t))
   (car (car (cdr x))))
 
-(compat-defun cadar (x) ;; UNTESTED
+(compat-defun cadar (x) ;; <UNTESTED>
   "Return the `car' of the `cdr' of the `car' of X."
   (declare (pure t))
   (car (cdr (car x))))
 
-(compat-defun caddr (x) ;; UNTESTED
+(compat-defun caddr (x) ;; <UNTESTED>
   "Return the `car' of the `cdr' of the `cdr' of X."
   (declare (pure t))
   (car (cdr (cdr x))))
 
-(compat-defun cdaar (x) ;; UNTESTED
+(compat-defun cdaar (x) ;; <UNTESTED>
   "Return the `cdr' of the `car' of the `car' of X."
   (declare (pure t))
   (cdr (car (car x))))
 
-(compat-defun cdadr (x) ;; UNTESTED
+(compat-defun cdadr (x) ;; <UNTESTED>
   "Return the `cdr' of the `car' of the `cdr' of X."
   (declare (pure t))
   (cdr (car (cdr x))))
 
-(compat-defun cddar (x) ;; UNTESTED
+(compat-defun cddar (x) ;; <UNTESTED>
   "Return the `cdr' of the `cdr' of the `car' of X."
   (declare (pure t))
   (cdr (cdr (car x))))
 
-(compat-defun cdddr (x) ;; UNTESTED
+(compat-defun cdddr (x) ;; <UNTESTED>
   "Return the `cdr' of the `cdr' of the `cdr' of X."
   (declare (pure t))
   (cdr (cdr (cdr x))))
 
-(compat-defun caaaar (x) ;; UNTESTED
+(compat-defun caaaar (x) ;; <UNTESTED>
   "Return the `car' of the `car' of the `car' of the `car' of X."
   (declare (pure t))
   (car (car (car (car x)))))
 
-(compat-defun caaadr (x) ;; UNTESTED
+(compat-defun caaadr (x) ;; <UNTESTED>
   "Return the `car' of the `car' of the `car' of the `cdr' of X."
   (declare (pure t))
   (car (car (car (cdr x)))))
 
-(compat-defun caadar (x) ;; UNTESTED
+(compat-defun caadar (x) ;; <UNTESTED>
   "Return the `car' of the `car' of the `cdr' of the `car' of X."
   (declare (pure t))
   (car (car (cdr (car x)))))
 
-(compat-defun caaddr (x) ;; UNTESTED
+(compat-defun caaddr (x) ;; <UNTESTED>
   "Return the `car' of the `car' of the `cdr' of the `cdr' of X."
   (declare (pure t))
   (car (car (cdr (cdr x)))))
 
-(compat-defun cadaar (x) ;; UNTESTED
+(compat-defun cadaar (x) ;; <UNTESTED>
   "Return the `car' of the `cdr' of the `car' of the `car' of X."
   (declare (pure t))
   (car (cdr (car (car x)))))
 
-(compat-defun cadadr (x) ;; UNTESTED
+(compat-defun cadadr (x) ;; <UNTESTED>
   "Return the `car' of the `cdr' of the `car' of the `cdr' of X."
   (declare (pure t))
   (car (cdr (car (cdr x)))))
 
-(compat-defun caddar (x) ;; UNTESTED
+(compat-defun caddar (x) ;; <UNTESTED>
   "Return the `car' of the `cdr' of the `cdr' of the `car' of X."
   (declare (pure t))
   (car (cdr (cdr (car x)))))
 
-(compat-defun cadddr (x) ;; UNTESTED
+(compat-defun cadddr (x) ;; <UNTESTED>
   "Return the `car' of the `cdr' of the `cdr' of the `cdr' of X."
   (declare (pure t))
   (car (cdr (cdr (cdr x)))))
 
-(compat-defun cdaaar (x) ;; UNTESTED
+(compat-defun cdaaar (x) ;; <UNTESTED>
   "Return the `cdr' of the `car' of the `car' of the `car' of X."
   (declare (pure t))
   (cdr (car (car (car x)))))
 
-(compat-defun cdaadr (x) ;; UNTESTED
+(compat-defun cdaadr (x) ;; <UNTESTED>
   "Return the `cdr' of the `car' of the `car' of the `cdr' of X."
   (declare (pure t))
   (cdr (car (car (cdr x)))))
 
-(compat-defun cdadar (x) ;; UNTESTED
+(compat-defun cdadar (x) ;; <UNTESTED>
   "Return the `cdr' of the `car' of the `cdr' of the `car' of X."
   (declare (pure t))
   (cdr (car (cdr (car x)))))
 
-(compat-defun cdaddr (x) ;; UNTESTED
+(compat-defun cdaddr (x) ;; <UNTESTED>
   "Return the `cdr' of the `car' of the `cdr' of the `cdr' of X."
   (declare (pure t))
   (cdr (car (cdr (cdr x)))))
 
-(compat-defun cddaar (x) ;; UNTESTED
+(compat-defun cddaar (x) ;; <UNTESTED>
   "Return the `cdr' of the `cdr' of the `car' of the `car' of X."
   (declare (pure t))
   (cdr (cdr (car (car x)))))
 
-(compat-defun cddadr (x) ;; UNTESTED
+(compat-defun cddadr (x) ;; <UNTESTED>
   "Return the `cdr' of the `cdr' of the `car' of the `cdr' of X."
   (declare (pure t))
   (cdr (cdr (car (cdr x)))))
 
-(compat-defun cdddar (x) ;; UNTESTED
+(compat-defun cdddar (x) ;; <UNTESTED>
   "Return the `cdr' of the `cdr' of the `cdr' of the `car' of X."
   (declare (pure t))
   (cdr (cdr (cdr (car x)))))
 
-(compat-defun cddddr (x) ;; UNTESTED
+(compat-defun cddddr (x) ;; <UNTESTED>
   "Return the `cdr' of the `cdr' of the `cdr' of the `cdr' of X."
   (declare (pure t))
   (cdr (cdr (cdr (cdr x)))))
@@ -332,7 +332,7 @@ TRIM-LEFT and TRIM-RIGHT default to \"[ \\t\\n\\r]+\"."
 (compat-defvar gensym-counter 0
   "Number used to construct the name of the next symbol created by `gensym'.")
 
-(compat-defun gensym (&optional prefix) ;; UNTESTED
+(compat-defun gensym (&optional prefix) ;; <UNTESTED>
   "Return a new uninterned symbol.
 The name is made by appending `gensym-counter' to PREFIX.
 PREFIX is a string, and defaults to \"g\"."
@@ -399,7 +399,7 @@ are non-nil, then the result is non-nil."
 
 (declare-function temporary-file-directory nil)
 
-(compat-defun make-nearby-temp-file (prefix &optional dir-flag suffix) ;; 
UNTESTED
+(compat-defun make-nearby-temp-file (prefix &optional dir-flag suffix) ;; 
<UNTESTED>
   "Create a temporary file as close as possible to `default-directory'.
 If PREFIX is a relative file name, and `default-directory' is a
 remote file name or located on a mounted file systems, the
@@ -422,7 +422,7 @@ same meaning as in `make-temp-file'."
          "^" (regexp-opt '("/afs/" "/media/" "/mnt" "/net/" "/tmp_mnt/")))))
   "File systems that ought to be mounted.")
 
-(compat-defun file-local-name (file) ;; UNTESTED
+(compat-defun file-local-name (file) ;; <UNTESTED>
   "Return the local name component of FILE.
 This function removes from FILE the specification of the remote host
 and the method of accessing the host, leaving only the part that
@@ -431,14 +431,14 @@ The returned file name can be used directly as argument of
 `process-file', `start-file-process', or `shell-command'."
   (or (file-remote-p file 'localname) file))
 
-(compat-defun file-name-quoted-p (name &optional top) ;; UNTESTED
+(compat-defun file-name-quoted-p (name &optional top) ;; <UNTESTED>
   "Whether NAME is quoted with prefix \"/:\".
 If NAME is a remote file name and TOP is nil, check the local part of NAME."
   :explicit t
   (let ((file-name-handler-alist (unless top file-name-handler-alist)))
     (string-prefix-p "/:" (file-local-name name))))
 
-(compat-defun file-name-quote (name &optional top) ;; UNTESTED
+(compat-defun file-name-quote (name &optional top) ;; <UNTESTED>
   "Add the quotation prefix \"/:\" to file NAME.
 If NAME is a remote file name and TOP is nil, the local part of
 NAME is quoted.  If NAME is already a quoted file name, NAME is
@@ -449,7 +449,7 @@ returned unchanged."
         name
       (concat (file-remote-p name) "/:" (file-local-name name)))))
 
-(compat-defun temporary-file-directory () ;; UNTESTED
+(compat-defun temporary-file-directory () ;; <UNTESTED>
   "The directory for writing temporary files.
 In case of a remote `default-directory', this is a directory for
 temporary files on that remote host.  If such a directory does
@@ -466,68 +466,68 @@ the variable `temporary-file-directory' is returned."
           default-directory
         temporary-file-directory))))
 
-(compat-defun file-attribute-type (attributes) ;; UNTESTED
+(compat-defun file-attribute-type (attributes) ;; <UNTESTED>
   "The type field in ATTRIBUTES returned by `file-attributes'.
 The value is either t for directory, string (name linked to) for
 symbolic link, or nil."
   (nth 0 attributes))
 
-(compat-defun file-attribute-link-number (attributes) ;; UNTESTED
+(compat-defun file-attribute-link-number (attributes) ;; <UNTESTED>
   "Return the number of links in ATTRIBUTES returned by `file-attributes'."
   (nth 1 attributes))
 
-(compat-defun file-attribute-user-id (attributes) ;; UNTESTED
+(compat-defun file-attribute-user-id (attributes) ;; <UNTESTED>
   "The UID field in ATTRIBUTES returned by `file-attributes'.
 This is either a string or a number.  If a string value cannot be
 looked up, a numeric value, either an integer or a float, is
 returned."
   (nth 2 attributes))
 
-(compat-defun file-attribute-group-id (attributes) ;; UNTESTED
+(compat-defun file-attribute-group-id (attributes) ;; <UNTESTED>
   "The GID field in ATTRIBUTES returned by `file-attributes'.
 This is either a string or a number.  If a string value cannot be
 looked up, a numeric value, either an integer or a float, is
 returned."
   (nth 3 attributes))
 
-(compat-defun file-attribute-access-time (attributes) ;; UNTESTED
+(compat-defun file-attribute-access-time (attributes) ;; <UNTESTED>
   "The last access time in ATTRIBUTES returned by `file-attributes'.
 This a Lisp timestamp in the style of `current-time'."
   (nth 4 attributes))
 
-(compat-defun file-attribute-modification-time (attributes) ;; UNTESTED
+(compat-defun file-attribute-modification-time (attributes) ;; <UNTESTED>
   "The modification time in ATTRIBUTES returned by `file-attributes'.
 This is the time of the last change to the file's contents, and
 is a Lisp timestamp in the style of `current-time'."
   (nth 5 attributes))
 
-(compat-defun file-attribute-status-change-time (attributes) ;; UNTESTED
+(compat-defun file-attribute-status-change-time (attributes) ;; <UNTESTED>
   "The status modification time in ATTRIBUTES returned by `file-attributes'.
 This is the time of last change to the file's attributes: owner
 and group, access mode bits, etc., and is a Lisp timestamp in the
 style of `current-time'."
   (nth 6 attributes))
 
-(compat-defun file-attribute-size (attributes) ;; UNTESTED
+(compat-defun file-attribute-size (attributes) ;; <UNTESTED>
   "The integer size (in bytes) in ATTRIBUTES returned by `file-attributes'."
   (nth 7 attributes))
 
-(compat-defun file-attribute-modes (attributes) ;; UNTESTED
+(compat-defun file-attribute-modes (attributes) ;; <UNTESTED>
   "The file modes in ATTRIBUTES returned by `file-attributes'.
 This is a string of ten letters or dashes as in ls -l."
   (nth 8 attributes))
 
-(compat-defun file-attribute-inode-number (attributes) ;; UNTESTED
+(compat-defun file-attribute-inode-number (attributes) ;; <UNTESTED>
   "The inode number in ATTRIBUTES returned by `file-attributes'.
 It is a nonnegative integer."
   (nth 10 attributes))
 
-(compat-defun file-attribute-device-number (attributes) ;; UNTESTED
+(compat-defun file-attribute-device-number (attributes) ;; <UNTESTED>
   "The file system device number in ATTRIBUTES returned by `file-attributes'.
 It is an integer."
   (nth 11 attributes))
 
-(compat-defun file-attribute-collect (attributes &rest attr-names) ;; UNTESTED
+(compat-defun file-attribute-collect (attributes &rest attr-names) ;; 
<UNTESTED>
   "Return a sublist of ATTRIBUTES returned by `file-attributes'.
 ATTR-NAMES are symbols with the selected attribute names.
 
@@ -557,7 +557,7 @@ inode-number and device-number."
 
 ;;;; Defined in image.el
 
-(compat-defun image-property (image property) ;; UNTESTED
+(compat-defun image-property (image property) ;; <UNTESTED>
   "Return the value of PROPERTY in IMAGE.
 Properties can be set with
 
@@ -594,7 +594,7 @@ If VALUE is nil, PROPERTY is removed from IMAGE."
 
 ;;;; Defined in rmc.el
 
-(compat-defun read-multiple-choice ;; UNTESTED
+(compat-defun read-multiple-choice ;; <UNTESTED>
     (prompt choices &optional _help-string _show-help long-form)
   "Ask user to select an entry from CHOICES, promting with PROMPT.
 This function allows to ask the user a multiple-choice question.
diff --git a/compat-27.el b/compat-27.el
index 7ff80d81dc..17d2d97834 100644
--- a/compat-27.el
+++ b/compat-27.el
@@ -28,7 +28,7 @@
 
 ;;;; Defined in fns.c
 
-(compat-defun proper-list-p (object) ;; UNTESTED
+(compat-defun proper-list-p (object) ;; <UNTESTED>
   "Return OBJECT's length if it is a proper list, nil otherwise.
 A proper list is neither circular nor dotted (i.e., its last cdr
 is nil)."
@@ -39,7 +39,7 @@ is nil)."
     (wrong-type-argument nil)
     (circular-list nil)))
 
-(compat-defun proper-list-p (object) ;; UNTESTED
+(compat-defun proper-list-p (object) ;; <UNTESTED>
   "Return OBJECT's length if it is a proper list, nil otherwise.
 A proper list is neither circular nor dotted (i.e., its last cdr
 is nil)."
@@ -60,7 +60,7 @@ is nil)."
             (throw 'cycle nil)))
         (and (null hare) (length object))))))
 
-(compat-defun string-distance (string1 string2 &optional bytecompare) ;; 
UNTESTED
+(compat-defun string-distance (string1 string2 &optional bytecompare) ;; 
<UNTESTED>
   "Return Levenshtein distance between STRING1 and STRING2.
 The distance is the number of deletions, insertions, and substitutions
 required to transform STRING1 into STRING2.
@@ -94,7 +94,7 @@ Letter-case is significant, but text properties are ignored."
 
 ;;;; Defined in window.c
 
-(compat-defun recenter (&optional arg redisplay) ;; UNTESTED
+(compat-defun recenter (&optional arg redisplay) ;; <UNTESTED>
   "Handle optional argument REDISPLAY."
   :explicit t
   (recenter arg)
@@ -103,7 +103,7 @@ Letter-case is significant, but text properties are 
ignored."
 
 ;;;; Defined in keymap.c
 
-(compat-defun lookup-key (keymap key &optional accept-default) ;; UNTESTED
+(compat-defun lookup-key (keymap key &optional accept-default) ;; <UNTESTED>
   "Allow for KEYMAP to be a list of keymaps."
   :explicit t
   (cond
@@ -131,7 +131,7 @@ Letter-case is significant, but text properties are 
ignored."
 ;; The function is declared to satisfy the byte compiler while testing
 ;; if native JSON parsing is available.;
 (declare-function json-serialize nil (object &rest args))
-(compat-defun json-serialize (object &rest args) ;; UNTESTED
+(compat-defun json-serialize (object &rest args) ;; <UNTESTED>
   "Return the JSON representation of OBJECT as a string.
 
 OBJECT must be t, a number, string, vector, hashtable, alist, plist,
@@ -212,7 +212,7 @@ any JSON false values."
            (json-null (or (plist-get args :null-object) :null)))
     (json-encode (funcall fix object))))
 
-(compat-defun json-insert (object &rest args) ;; UNTESTED
+(compat-defun json-insert (object &rest args) ;; <UNTESTED>
   "Insert the JSON representation of OBJECT before point.
 This is the same as (insert (json-serialize OBJECT)), but potentially
 faster.  See the function `json-serialize' for allowed values of
@@ -224,7 +224,7 @@ OBJECT."
                (json-unavailable nil)))
   (insert (apply #'json-serialize object args)))
 
-(compat-defun json-parse-string (string &rest args) ;; UNTESTED
+(compat-defun json-parse-string (string &rest args) ;; <UNTESTED>
   "Parse the JSON STRING into a Lisp object.
 This is essentially the reverse operation of `json-serialize', which
 see.  The returned object will be the JSON null value, the JSON false
@@ -265,7 +265,7 @@ represent a JSON false value.  It defaults to `:false'."
         (json-read-from-string string))
     (json-error (signal 'json-parse-error err))))
 
-(compat-defun json-parse-buffer (&rest args) ;; UNTESTED
+(compat-defun json-parse-buffer (&rest args) ;; <UNTESTED>
   "Read JSON object from current buffer starting at point.
 Move point after the end of the object if parsing was successful.
 On error, don't move point.
@@ -312,7 +312,7 @@ represent a JSON false value.  It defaults to `:false'."
 
 ;;;; Defined in timefns.c
 
-(compat-defun time-equal-p (t1 t2) ;; UNTESTED
+(compat-defun time-equal-p (t1 t2) ;; <UNTESTED>
   "Return non-nil if time value T1 is equal to time value T2.
 A nil value for either argument stands for the current time.
 
@@ -331,7 +331,7 @@ NOTE: This function is not as accurate as the actual 
`time-equal-p'."
 
 ;;;; Defined in fileio.c
 
-(compat-defun file-name-absolute-p (filename) ;; UNTESTED
+(compat-defun file-name-absolute-p (filename) ;; <UNTESTED>
   "Return t if FILENAME is an absolute file name.
 On Unix, absolute file names start with `/'.  In Emacs, an absolute
 file name can also start with an initial `~' or `~USER' component,
@@ -380,7 +380,7 @@ where USER is a valid login name."
               body)))
     (cons 'progn (nreverse body))))
 
-(compat-defun provided-mode-derived-p (mode &rest modes) ;; UNTESTED
+(compat-defun provided-mode-derived-p (mode &rest modes) ;; <UNTESTED>
   "Non-nil if MODE is derived from one of MODES.
 Uses the `derived-mode-parent' property of the symbol to trace backwards.
 If you just want to check `major-mode', use `derived-mode-p'."
@@ -396,7 +396,7 @@ If you just want to check `major-mode', use 
`derived-mode-p'."
          (setq mode (if (and parentfn (symbolp parentfn)) parentfn parent)))))
   mode)
 
-(compat-defun derived-mode-p (&rest modes) ;; UNTESTED
+(compat-defun derived-mode-p (&rest modes) ;; <UNTESTED>
   "Non-nil if the current major mode is derived from one of MODES.
 Uses the `derived-mode-parent' property of the symbol to trace backwards."
   (apply #'provided-mode-derived-p major-mode modes))
@@ -437,7 +437,7 @@ print the reporter message followed by the word \"done\".
        (progress-reporter-done ,prep)
        (or ,@(cdr (cdr spec)) nil))))
 
-(compat-defun flatten-tree (tree) ;; UNTESTED
+(compat-defun flatten-tree (tree) ;; <UNTESTED>
   "Return a \"flattened\" copy of TREE.
 In other words, return a list of the non-nil terminal nodes, or
 leaves, of the tree of cons cells rooted at TREE.  Leaves in the
@@ -455,7 +455,7 @@ returned list are in the same order as in TREE.
     (if tree (push tree elems))
     (nreverse elems)))
 
-(compat-defun xor (cond1 cond2) ;; UNTESTED
+(compat-defun xor (cond1 cond2) ;; <UNTESTED>
   "Return the boolean exclusive-or of COND1 and COND2.
 If only one of the arguments is non-nil, return it; otherwise
 return nil."
@@ -467,7 +467,7 @@ return nil."
   "Standard regexp guaranteed not to match any string at all."
   :constant t)
 
-(compat-defun assoc-delete-all (key alist &optional test) ;; UNTESTED
+(compat-defun assoc-delete-all (key alist &optional test) ;; <UNTESTED>
   "Delete from ALIST all elements whose car is KEY.
 Compare keys with TEST.  Defaults to `equal'.
 Return the modified alist.
@@ -487,48 +487,48 @@ Elements of ALIST that are not conses are ignored."
 
 ;;;; Defined in simple.el
 
-(compat-defun decoded-time-second (time) ;; UNTESTED
+(compat-defun decoded-time-second (time) ;; <UNTESTED>
   "The seconds in TIME, which is a value returned by `decode-time'.
 This is an integer between 0 and 60 (inclusive).  (60 is a leap
 second, which only some operating systems support.)"
   (nth 0 time))
 
-(compat-defun decoded-time-minute (time) ;; UNTESTED
+(compat-defun decoded-time-minute (time) ;; <UNTESTED>
   "The minutes in TIME, which is a value returned by `decode-time'.
 This is an integer between 0 and 59 (inclusive)."
   (nth 1 time))
 
-(compat-defun decoded-time-hour (time) ;; UNTESTED
+(compat-defun decoded-time-hour (time) ;; <UNTESTED>
   "The hours in TIME, which is a value returned by `decode-time'.
 This is an integer between 0 and 23 (inclusive)."
   (nth 2 time))
 
-(compat-defun decoded-time-day (time) ;; UNTESTED
+(compat-defun decoded-time-day (time) ;; <UNTESTED>
   "The day-of-the-month in TIME, which is a value returned by `decode-time'.
 This is an integer between 1 and 31 (inclusive)."
   (nth 3 time))
 
-(compat-defun decoded-time-month (time) ;; UNTESTED
+(compat-defun decoded-time-month (time) ;; <UNTESTED>
   "The month in TIME, which is a value returned by `decode-time'.
 This is an integer between 1 and 12 (inclusive).  January is 1."
   (nth 4 time))
 
-(compat-defun decoded-time-year (time) ;; UNTESTED
+(compat-defun decoded-time-year (time) ;; <UNTESTED>
   "The year in TIME, which is a value returned by `decode-time'.
 This is a four digit integer."
   (nth 5 time))
 
-(compat-defun decoded-time-weekday (time) ;; UNTESTED
+(compat-defun decoded-time-weekday (time) ;; <UNTESTED>
   "The day-of-the-week in TIME, which is a value returned by `decode-time'.
 This is a number between 0 and 6, and 0 is Sunday."
   (nth 6 time))
 
-(compat-defun decoded-time-dst (time) ;; UNTESTED
+(compat-defun decoded-time-dst (time) ;; <UNTESTED>
   "The daylight saving time in TIME, which is a value returned by 
`decode-time'.
 This is t if daylight saving time is in effect, and nil if not."
   (nth 7 time))
 
-(compat-defun decoded-time-zone (time) ;; UNTESTED
+(compat-defun decoded-time-zone (time) ;; <UNTESTED>
   "The time zone in TIME, which is a value returned by `decode-time'.
 This is an integer indicating the UTC offset in seconds, i.e.,
 the number of seconds east of Greenwich."
@@ -538,7 +538,7 @@ the number of seconds east of Greenwich."
 
 ;;;; Defined in files.el
 
-(compat-defun file-size-human-readable (file-size &optional flavor space unit) 
;; UNTESTED
+(compat-defun file-size-human-readable (file-size &optional flavor space unit) 
;; <UNTESTED>
   "Handle the optional third and forth argument:
 
 Optional third argument SPACE is a string put between the number and unit.
@@ -572,7 +572,7 @@ in all cases, since that is the standard symbol for byte."
               (if (string= prefixed-unit "") "" (or space ""))
               prefixed-unit))))
 
-(compat-defun exec-path () ;; UNTESTED
+(compat-defun exec-path () ;; <UNTESTED>
   "Return list of directories to search programs to run in remote subprocesses.
 The remote host is identified by `default-directory'.  For remote
 hosts that do not support subprocesses, this returns nil.
@@ -604,7 +604,7 @@ the value of the variable `exec-path'."
           (nreverse path)))))
    (exec-path)))
 
-(compat-defun executable-find (command &optional remote) ;; UNTESTED
+(compat-defun executable-find (command &optional remote) ;; <UNTESTED>
   "Search for COMMAND in `exec-path' and return the absolute file name.
 Return nil if COMMAND is not found anywhere in `exec-path'.  If
 REMOTE is non-nil, search on the remote host indicated by
@@ -621,7 +621,7 @@ REMOTE is non-nil, search on the remote host indicated by
         (when (stringp res) (file-local-name res)))
     (executable-find command)))
 
-(compat-defun make-empty-file (filename &optional parents) ;; UNTESTED
+(compat-defun make-empty-file (filename &optional parents) ;; <UNTESTED>
   "Create an empty file FILENAME.
 Optional arg PARENTS, if non-nil then creates parent dirs as needed."
   (when (and (file-exists-p filename) (null parents))
@@ -633,7 +633,7 @@ Optional arg PARENTS, if non-nil then creates parent dirs 
as needed."
 
 ;;;; Defined in regexp-opt.el
 
-(compat-defun regexp-opt (strings &optional paren) ;; UNTESTED
+(compat-defun regexp-opt (strings &optional paren) ;; <UNTESTED>
   "Handle an empty list of strings."
   :explicit t
   (if (null strings)
@@ -653,7 +653,7 @@ Optional arg PARENTS, if non-nil then creates parent dirs 
as needed."
 
 (declare-function lm-header "lisp-mnt")
 
-(compat-defun package-get-version () ;; UNTESTED
+(compat-defun package-get-version () ;; <UNTESTED>
   "Return the version number of the package in which this is used.
 Assumes it is used from an Elisp file placed inside the top-level directory
 of an installed ELPA package.
@@ -695,7 +695,7 @@ The return value is a string (or nil in case we can’t find 
it)."
  dired-get-marked-files "dired.el"
  (&optional localp arg filter distinguish-one-marked error))
 
-(compat-defun dired-get-marked-files ;; UNTESTED
+(compat-defun dired-get-marked-files ;; <UNTESTED>
     (&optional localp arg filter distinguish-one-marked error)
   "Return the marked files’ names as list of strings."
   :feature dired
@@ -707,7 +707,7 @@ The return value is a string (or nil in case we can’t find 
it)."
 
 ;;;; Defined in time-date.el
 
-(compat-defun date-days-in-month (year month) ;; UNTESTED
+(compat-defun date-days-in-month (year month) ;; <UNTESTED>
   "The number of days in MONTH in YEAR."
   :feature time-date
   (unless (and (numberp month)
@@ -724,7 +724,7 @@ The return value is a string (or nil in case we can’t find 
it)."
 
 ;;;; Defined in text-property-search.el
 
-(compat-defun make-prop-match (&rest attr) ;; UNTESTED
+(compat-defun make-prop-match (&rest attr) ;; <UNTESTED>
   "Constructor for objects of type ‘prop-match’."
   :max-version "26.1"
   :feature text-property-search
@@ -734,7 +734,7 @@ The return value is a string (or nil in case we can’t find 
it)."
    (plist-get attr :end)
    (plist-get attr :value)))
 
-(compat-defun make-prop-match (&rest attr) ;; UNTESTED
+(compat-defun make-prop-match (&rest attr) ;; <UNTESTED>
   "Constructor for objects of type ‘prop-match’."
   :min-version "26.1"
   :feature text-property-search
@@ -744,34 +744,34 @@ The return value is a string (or nil in case we can’t 
find it)."
    (plist-get attr :end)
    (plist-get attr :value)))
 
-(compat-defun prop-match-p (match) ;; UNTESTED
+(compat-defun prop-match-p (match) ;; <UNTESTED>
   "Return non-nil if MATCH is a `prop-match' object."
   :max-version "26.1"
   :feature text-property-search
   (and (vectorp match) (eq (aref match 0) 'prop-match))) ;; Vector
 
-(compat-defun prop-match-p (match) ;; UNTESTED
+(compat-defun prop-match-p (match) ;; <UNTESTED>
   "Return non-nil if MATCH is a `prop-match' object."
   :min-version "26.1"
   :feature text-property-search
   (eq (type-of match) 'prop-match)) ;; Record
 
-(compat-defun prop-match-beginning (match) ;; UNTESTED
+(compat-defun prop-match-beginning (match) ;; <UNTESTED>
   "Retrieve the position where MATCH begins."
   :feature text-property-search
   (aref match 1))
 
-(compat-defun prop-match-end (match) ;; UNTESTED
+(compat-defun prop-match-end (match) ;; <UNTESTED>
   "Retrieve the position where MATCH ends."
   :feature text-property-search
   (aref match 2))
 
-(compat-defun prop-match-value (match) ;; UNTESTED
+(compat-defun prop-match-value (match) ;; <UNTESTED>
   "Retrieve the value that MATCH holds."
   :feature text-property-search
   (aref match 3))
 
-(compat-defun text-property-search-forward ;; UNTESTED
+(compat-defun text-property-search-forward ;; <UNTESTED>
     (property &optional value predicate not-current)
   "Search for the next region of text where PREDICATE is true.
 PREDICATE is used to decide whether a value of PROPERTY should be
@@ -876,7 +876,7 @@ the buffer positions that limit the region, and
         (and (not (eq ended t))
              ended))))))
 
-(compat-defun text-property-search-backward ;; UNTESTED
+(compat-defun text-property-search-backward ;; <UNTESTED>
     (property &optional value predicate not-current)
   "Search for the previous region of text whose PROPERTY matches VALUE.
 
diff --git a/compat-28.el b/compat-28.el
index 77b4c43740..44f2209428 100644
--- a/compat-28.el
+++ b/compat-28.el
@@ -29,7 +29,7 @@
 ;;;; Defined in fns.c
 
 ;;* INCOMPLETE FEATURE: Should handle multibyte regular expressions
-(compat-defun string-search (needle haystack &optional start-pos) ;; UNTESTED
+(compat-defun string-search (needle haystack &optional start-pos) ;; <UNTESTED>
   "Search for the string NEEDLE in the strign HAYSTACK.
 
 The return value is the position of the first occurrence of
@@ -52,7 +52,7 @@ issues are inherited."
     (let ((case-fold-search nil))
       (string-match (regexp-quote needle) haystack start-pos))))
 
-(compat-defun length= (sequence length) ;; UNTESTED
+(compat-defun length= (sequence length) ;; <UNTESTED>
   "Returns non-nil if SEQUENCE has a length equal to LENGTH."
   (cond
    ((null sequence) (zerop length))
@@ -64,7 +64,7 @@ issues are inherited."
     (= (length sequence) length))
    ((signal 'wrong-type-argument sequence))))
 
-(compat-defun length< (sequence length) ;; UNTESTED
+(compat-defun length< (sequence length) ;; <UNTESTED>
   "Returns non-nil if SEQUENCE is shorter than LENGTH."
   (cond
    ((null sequence) (not (zerop length)))
@@ -74,7 +74,7 @@ issues are inherited."
     (< (length sequence) length))
    ((signal 'wrong-type-argument sequence))))
 
-(compat-defun length> (sequence length) ;; UNTESTED
+(compat-defun length> (sequence length) ;; <UNTESTED>
   "Returns non-nil if SEQUENCE is longer than LENGTH."
   (cond
    ((listp sequence)
@@ -85,7 +85,7 @@ issues are inherited."
 
 ;;;; Defined in fileio.c
 
-(compat-defun file-name-concat (directory &rest components) ;; UNTESTED
+(compat-defun file-name-concat (directory &rest components) ;; <UNTESTED>
   "Append COMPONENTS to DIRECTORY and return the resulting string.
 Elements in COMPONENTS must be a string or nil.
 DIRECTORY or the non-final elements in COMPONENTS may or may not end
@@ -105,7 +105,7 @@ inserted before contatenating."
 
 ;;;; Defined in alloc.c
 
-(compat-defun garbage-collect-maybe (_factor) ;; UNTESTED
+(compat-defun garbage-collect-maybe (_factor) ;; <UNTESTED>
   "Call ‘garbage-collect’ if enough allocation happened.
 FACTOR determines what \"enough\" means here: If FACTOR is a
 positive number N, it means to run GC if more than 1/Nth of the
@@ -119,7 +119,7 @@ NOTE: For releases of Emacs before version 28, this 
function will do nothing."
 
 ;;;; Defined in filelock.c
 
-(compat-defun unlock-buffer () ;; UNTESTED
+(compat-defun unlock-buffer () ;; <UNTESTED>
   "Handle `file-error' conditions:
 
 Handles file system errors by calling ‘display-warning’ and
@@ -135,7 +135,7 @@ continuing as if the error did not occur."
 
 ;;;; Defined in characters.c
 
-(compat-defun string-width (string &optional from to) ;; UNTESTED
+(compat-defun string-width (string &optional from to) ;; <UNTESTED>
   "Handle optional arguments FROM and TO:
 
 Optional arguments FROM and TO specify the substring of STRING to
@@ -150,7 +150,7 @@ consider, and are interpreted as in `substring'."
 
 ;;;; Defined in dired.c
 
-(compat-defun directory-files (directory &optional full match nosort count) ;; 
UNTESTED
+(compat-defun directory-files (directory &optional full match nosort count) ;; 
<UNTESTED>
   "Handle additional optional argument COUNT:
 
 If COUNT is non-nil and a natural number, the function will
@@ -168,7 +168,7 @@ If COUNT is non-nil and a natural number, the function will
 (declare-function json-parse-string nil (string &rest args))
 (declare-function json-parse-buffer nil (&rest args))
 
-(compat-defun json-serialize (object &rest args) ;; UNTESTED
+(compat-defun json-serialize (object &rest args) ;; <UNTESTED>
   "Handle top-level JSON values."
   :explicit t
   :min-version "27"
@@ -176,7 +176,7 @@ If COUNT is non-nil and a natural number, the function will
       (apply #'json-serialize object args)
     (substring (json-serialize (list object)) 1 -1)))
 
-(compat-defun json-insert (object &rest args) ;; UNTESTED
+(compat-defun json-insert (object &rest args) ;; <UNTESTED>
   "Handle top-level JSON values."
   :explicit t
   :min-version "27"
@@ -189,7 +189,7 @@ If COUNT is non-nil and a natural number, the function will
     ;; been defined.
     (insert (apply 'compat-json-serialize object args))))
 
-(compat-defun json-parse-string (string &rest args) ;; UNTESTED
+(compat-defun json-parse-string (string &rest args) ;; <UNTESTED>
   "Handle top-level JSON values."
   :explicit t
   :min-version "27"
@@ -200,7 +200,7 @@ If COUNT is non-nil and a natural number, the function will
     ;; is we can access the first element.
     (elt (apply #'json-parse-string (concat "[" string "]") args) 0)))
 
-(compat-defun json-parse-buffer (&rest args) ;; UNTESTED
+(compat-defun json-parse-buffer (&rest args) ;; <UNTESTED>
   "Handle top-level JSON values."
   :explicit t
   :min-version "27"
@@ -222,7 +222,7 @@ If COUNT is non-nil and a natural number, the function will
 
 ;;;; xfaces.c
 
-(compat-defun color-values-from-color-spec (spec) ;; UNTESTED
+(compat-defun color-values-from-color-spec (spec) ;; <UNTESTED>
   "Parse color SPEC as a numeric color and return (RED GREEN BLUE).
 This function recognises the following formats for SPEC:
 
@@ -299,7 +299,7 @@ and BLUE, is normalized to have its value in [0,65535]."
 ;;;; Defined in subr.el
 
 ;;* INCOMPLETE FEATURE: Should handle multibyte regular expressions
-(compat-defun string-replace (fromstring tostring instring) ;; UNTESTED
+(compat-defun string-replace (fromstring tostring instring) ;; <UNTESTED>
   "Replace FROMSTRING with TOSTRING in INSTRING each time it occurs."
   (when (equal fromstring "")
     (signal 'wrong-length-argument '(0)))
@@ -309,13 +309,13 @@ and BLUE, is normalized to have its value in [0,65535]."
      tostring instring
      t t)))
 
-(compat-defun always (&rest _arguments) ;; UNTESTED
+(compat-defun always (&rest _arguments) ;; <UNTESTED>
   "Do nothing and return t.
 This function accepts any number of ARGUMENTS, but ignores them.
 Also see `ignore'."
   t)
 
-(compat-defun insert-into-buffer (buffer &optional start end) ;; UNTESTED
+(compat-defun insert-into-buffer (buffer &optional start end) ;; <UNTESTED>
   "Insert the contents of the current buffer into BUFFER.
 If START/END, only insert that region from the current buffer.
 Point in BUFFER will be placed after the inserted text."
@@ -323,7 +323,7 @@ Point in BUFFER will be placed after the inserted text."
     (with-current-buffer buffer
       (insert-buffer-substring current start end))))
 
-(compat-defun replace-string-in-region (string replacement &optional start 
end) ;; UNTESTED
+(compat-defun replace-string-in-region (string replacement &optional start 
end) ;; <UNTESTED>
   "Replace STRING with REPLACEMENT in the region from START to END.
 The number of replaced occurrences are returned, or nil if STRING
 doesn't exist in the region.
@@ -350,7 +350,7 @@ Comparisons and replacements are done with fixed case."
       (and (not (zerop matches))
            matches))))
 
-(compat-defun replace-regexp-in-region (regexp replacement &optional start 
end) ;; UNTESTED
+(compat-defun replace-regexp-in-region (regexp replacement &optional start 
end) ;; <UNTESTED>
   "Replace REGEXP with REPLACEMENT in the region from START to END.
 The number of replaced occurrences are returned, or nil if REGEXP
 doesn't exist in the region.
@@ -384,7 +384,7 @@ REPLACEMENT can use the following special elements:
       (and (not (zerop matches))
            matches))))
 
-(compat-defun buffer-local-boundp (symbol buffer) ;; UNTESTED
+(compat-defun buffer-local-boundp (symbol buffer) ;; <UNTESTED>
   "Return non-nil if SYMBOL is bound in BUFFER.
 Also see `local-variable-p'."
   (catch 'fail
@@ -419,7 +419,7 @@ If `default-directory' is already an existing directory, 
it's not changed."
                binders)
      (let ,binders ,@body)))
 
-(compat-defun ensure-list (object) ;; UNTESTED
+(compat-defun ensure-list (object) ;; <UNTESTED>
   "Return OBJECT as a list.
 If OBJECT is already a list, return OBJECT itself.  If it's
 not a list, return a one-element list containing OBJECT."
@@ -427,13 +427,13 @@ not a list, return a one-element list containing OBJECT."
       object
     (list object)))
 
-(compat-defun subr-primitive-p (object) ;; UNTESTED
+(compat-defun subr-primitive-p (object) ;; <UNTESTED>
   "Return t if OBJECT is a built-in primitive function."
   (subrp object))
 
 ;;;; Defined in subr-x.el
 
-(compat-defun string-clean-whitespace (string) ;; UNTESTED
+(compat-defun string-clean-whitespace (string) ;; <UNTESTED>
   "Clean up whitespace in STRING.
 All sequences of whitespaces in STRING are collapsed into a
 single space character, and leading/trailing whitespace is
@@ -445,7 +445,7 @@ removed."
      (replace-regexp-in-string
       blank " " string))))
 
-(compat-defun string-fill (string length) ;; UNTESTED
+(compat-defun string-fill (string length) ;; <UNTESTED>
   "Clean up whitespace in STRING.
 All sequences of whitespaces in STRING are collapsed into a
 single space character, and leading/trailing whitespace is
@@ -458,12 +458,12 @@ removed."
       (fill-region (point-min) (point-max)))
     (buffer-string)))
 
-(compat-defun string-lines (string &optional omit-nulls) ;; UNTESTED
+(compat-defun string-lines (string &optional omit-nulls) ;; <UNTESTED>
   "Split STRING into a list of lines.
 If OMIT-NULLS, empty lines will be removed from the results."
   (split-string string "\n" omit-nulls))
 
-(compat-defun string-pad (string length &optional padding start) ;; UNTESTED
+(compat-defun string-pad (string length &optional padding start) ;; <UNTESTED>
   "Pad STRING to LENGTH using PADDING.
 If PADDING is nil, the space character is used.  If not nil, it
 should be a character.
@@ -485,7 +485,7 @@ the string."
               (and (not start)
                    (make-string pad-length (or padding ?\s)))))))
 
-(compat-defun string-chop-newline (string) ;; UNTESTED
+(compat-defun string-chop-newline (string) ;; <UNTESTED>
   "Remove the final newline (if any) from STRING."
   (if (and (>= (length string) 1) (= (aref string (1- (length string))) ?\n))
       (substring string 0 -1)
@@ -580,7 +580,7 @@ as the new values of the bound variables in the recursive 
invocation."
 
 ;;;; Defined in files.el
 
-(compat-defun file-name-with-extension (filename extension) ;; UNTESTED
+(compat-defun file-name-with-extension (filename extension) ;; <UNTESTED>
   "Set the EXTENSION of a FILENAME.
 The extension (in a file name) is the part that begins with the last \".\".
 
@@ -604,7 +604,7 @@ See also `file-name-sans-extension'."
      (t
       (concat (file-name-sans-extension filename) "." extn)))))
 
-(compat-defun directory-empty-p (dir) ;; UNTESTED
+(compat-defun directory-empty-p (dir) ;; <UNTESTED>
   "Return t if DIR names an existing directory containing no other files.
 Return nil if DIR does not name a directory, or if there was
 trouble determining whether DIR is a directory or empty.
@@ -614,7 +614,7 @@ See `file-symlink-p' to distinguish symlinks."
   (and (file-directory-p dir)
        (null (directory-files dir nil directory-files-no-dot-files-regexp t))))
 
-(compat-defun file-modes-number-to-symbolic (mode &optional filetype) ;; 
UNTESTED
+(compat-defun file-modes-number-to-symbolic (mode &optional filetype) ;; 
<UNTESTED>
   "Return a string describing a file's MODE.
 For instance, if MODE is #o700, then it produces `-rwx------'.
 FILETYPE if provided should be a character denoting the type of file,
@@ -652,7 +652,7 @@ the leading `-' char."
        (if (zerop (logand   1 mode)) ?- ?x)
      (if (zerop (logand   1 mode)) ?T ?t))))
 
-(compat-defun file-backup-file-names (filename) ;; UNTESTED
+(compat-defun file-backup-file-names (filename) ;; <UNTESTED>
   "Return a list of backup files for FILENAME.
 The list will be sorted by modification time so that the most
 recent files are first."
@@ -671,7 +671,7 @@ recent files are first."
           (push candidate files))))
     (sort files #'file-newer-than-file-p)))
 
-(compat-defun make-lock-file-name (filename) ;; UNTESTED
+(compat-defun make-lock-file-name (filename) ;; <UNTESTED>
   "Make a lock file name for FILENAME.
 This prepends \".#\" to the non-directory part of FILENAME, and
 doesn't respect `lock-file-name-transforms', as Emacs 28.1 and
@@ -685,7 +685,7 @@ onwards does."
 
 (declare-function tramp-tramp-file-p "tramp" (name))
 
-(compat-defun null-device () ;; UNTESTED
+(compat-defun null-device () ;; <UNTESTED>
   "Return the best guess for the null device."
   (require 'tramp)
   (if (tramp-tramp-file-p default-directory)
@@ -694,7 +694,7 @@ onwards does."
 
 ;;;; Defined in minibuffer.el
 
-(compat-defun format-prompt (prompt default &rest format-args) ;; UNTESTED
+(compat-defun format-prompt (prompt default &rest format-args) ;; <UNTESTED>
   "Format PROMPT with DEFAULT.
 If FORMAT-ARGS is nil, PROMPT is used as a plain string.  If
 FORMAT-ARGS is non-nil, PROMPT is used as a format control
@@ -721,7 +721,7 @@ is included in the return value."
 
 ;;;; Defined in windows.el
 
-(compat-defun count-windows (&optional minibuf all-frames) ;; UNTESTED
+(compat-defun count-windows (&optional minibuf all-frames) ;; <UNTESTED>
   "Handle optional argument ALL-FRAMES:
 
 If ALL-FRAMES is non-nil, count the windows in all frames instead
@@ -739,7 +739,7 @@ just the selected frame."
 
 (declare-function mouse-set-point "mouse" (event &optional promote-to-region))
 
-(compat-defun thing-at-mouse (event thing &optional no-properties) ;; UNTESTED
+(compat-defun thing-at-mouse (event thing &optional no-properties) ;; 
<UNTESTED>
   "Return the THING at mouse click.
 Like `thing-at-point', but tries to use the event
 where the mouse button is clicked to find a thing nearby."
@@ -750,7 +750,7 @@ where the mouse button is clicked to find a thing nearby."
 
 ;;;; Defined in macroexp.el
 
-(compat-defun macroexp-file-name () ;; UNTESTED
+(compat-defun macroexp-file-name () ;; <UNTESTED>
   "Return the name of the file from which the code comes.
 Returns nil when we do not know.
 A non-nil result is expected to be reliable when called from a macro in order
@@ -782,7 +782,7 @@ The previous values will be be restored upon exit."
 
 ;;;; Defined in button.el
 
-(compat-defun button-buttonize (string callback &optional data) ;; UNTESTED
+(compat-defun button-buttonize (string callback &optional data) ;; <UNTESTED>
   "Make STRING into a button and return it.
 When clicked, CALLBACK will be called with the DATA as the
 function argument.  If DATA isn't present (or is nil), the button
@@ -801,7 +801,7 @@ itself will be used instead as the function argument."
 
 (defvar generated-autoload-file)
 
-(compat-defun make-directory-autoloads (dir output-file) ;; UNTESTED
+(compat-defun make-directory-autoloads (dir output-file) ;; <UNTESTED>
   "Update autoload definitions for Lisp files in the directories DIRS.
 DIR can be either a single directory or a list of
 directories.  (The latter usage is discouraged.)
@@ -822,7 +822,7 @@ directory or directories specified."
 
 ;;;; Defined in time-data.el
 
-(compat-defun decoded-time-period (time) ;; UNTESTED
+(compat-defun decoded-time-period (time) ;; <UNTESTED>
   "Interpret DECODED as a period and return its length in seconds.
 For computational purposes, years are 365 days long and months
 are 30 days long."
diff --git a/compat-29.el b/compat-29.el
index a5f0ca61bf..e143a43df0 100644
--- a/compat-29.el
+++ b/compat-29.el
@@ -28,7 +28,7 @@
 
 ;;;; Defined in xdisp.c
 
-(compat-defun get-display-property (position prop &optional object properties) 
;; UNTESTED
+(compat-defun get-display-property (position prop &optional object properties) 
;; <UNTESTED>
   "Get the value of the `display' property PROP at POSITION.
 If OBJECT, this should be a buffer or string where the property is
 fetched from.  If omitted, OBJECT defaults to the current buffer.
@@ -55,7 +55,7 @@ the properties at POSITION."
          (eq (car properties) prop))
     (cadr properties))))
 
-(compat-defun buffer-text-pixel-size ;; UNTESTED
+(compat-defun buffer-text-pixel-size ;; <UNTESTED>
     (&optional buffer-or-name window x-limit y-limit)
   "Return size of whole text of BUFFER-OR-NAME in WINDOW.
 BUFFER-OR-NAME must specify a live buffer or the name of a live buffer
@@ -79,7 +79,7 @@ WINDOW."
 
 ;;;; Defined in fns.c
 
-(compat-defun ntake (n list) ;; UNTESTED
+(compat-defun ntake (n list) ;; <UNTESTED>
   "Modify LIST to keep only the first N elements.
 If N is zero or negative, return nil.
 If N is greater or equal to the length of LIST, return LIST unmodified.
@@ -88,7 +88,7 @@ Otherwise, return LIST after truncating it."
                  (when cons (setcdr cons nil))
                  list)))
 
-(compat-defun take (n list) ;; UNTESTED
+(compat-defun take (n list) ;; <UNTESTED>
   "Return the first N elements of LIST.
 If N is zero or negative, return nil.
 If N is greater or equal to the length of LIST, return LIST (or a copy)."
@@ -99,14 +99,14 @@ If N is greater or equal to the length of LIST, return LIST 
(or a copy)."
       (setq n (1- n)))
     (nreverse copy)))
 
-(compat-defun string-equal-ignore-case (string1 string2) ;; UNTESTED
+(compat-defun string-equal-ignore-case (string1 string2) ;; <UNTESTED>
   "Like `string-equal', but case-insensitive.
 Upper-case and lower-case letters are treated as equal.
 Unibyte strings are converted to multibyte for comparison."
   (declare (pure t) (side-effect-free t))
   (eq t (compare-strings string1 0 nil string2 0 nil t)))
 
-(compat-defun plist-get (plist prop &optional predicate) ;; UNTESTED
+(compat-defun plist-get (plist prop &optional predicate) ;; <UNTESTED>
   "Extract a value from a property list.
 PLIST is a property list, which is a list of the form
 \(PROP1 VALUE1 PROP2 VALUE2...).
@@ -125,7 +125,7 @@ This function doesn't signal an error if PLIST is invalid."
           (throw 'found (cadr plist)))
         (setq plist (cddr plist))))))
 
-(compat-defun plist-put (plist prop val &optional predicate) ;; UNTESTED
+(compat-defun plist-put (plist prop val &optional predicate) ;; <UNTESTED>
   "Change value in PLIST of PROP to VAL.
 PLIST is a property list, which is a list of the form
 \(PROP1 VALUE1 PROP2 VALUE2 ...).
@@ -148,7 +148,7 @@ The PLIST is modified by side effects."
           (setq tail (cddr tail))))
       (nconc plist (list prop val)))))
 
-(compat-defun plist-member (plist prop &optional predicate) ;; UNTESTED
+(compat-defun plist-member (plist prop &optional predicate) ;; <UNTESTED>
   "Return non-nil if PLIST has the property PROP.
 PLIST is a property list, which is a list of the form
 \(PROP1 VALUE1 PROP2 VALUE2 ...).
@@ -170,7 +170,7 @@ The value is actually the tail of PLIST whose car is PROP."
 
 ;;;; Defined in keymap.c
 
-(compat-defun define-key (keymap key def &optional remove) ;; UNTESTED
+(compat-defun define-key (keymap key def &optional remove) ;; <UNTESTED>
   "In KEYMAP, define key sequence KEY as DEF.
 This is a legacy function; see `keymap-set' for the recommended
 function to use instead.
@@ -233,7 +233,7 @@ binding KEY to DEF is added at the front of KEYMAP."
 
 ;;;; Defined in subr.el
 
-(compat-defun function-alias-p (func &optional noerror) ;; UNTESTED
+(compat-defun function-alias-p (func &optional noerror) ;; <UNTESTED>
   "Return nil if FUNC is not a function alias.
 If FUNC is a function alias, return the function alias chain.
 
@@ -255,7 +255,7 @@ signalled.  If NOERROR, the non-loop parts of the chain is 
returned."
          (push func chain))
        chain))))
 
-(compat-defun buffer-match-p (condition buffer-or-name &optional arg) ;; 
UNTESTED
+(compat-defun buffer-match-p (condition buffer-or-name &optional arg) ;; 
<UNTESTED>
   "Return non-nil if BUFFER-OR-NAME matches CONDITION.
 CONDITION is either:
 - the symbol t, to always match,
@@ -310,7 +310,7 @@ CONDITION is either:
                 (throw 'match t)))))))
     (funcall match (list condition))))
 
-(compat-defun match-buffers (condition &optional buffers arg) ;; UNTESTED
+(compat-defun match-buffers (condition &optional buffers arg) ;; <UNTESTED>
   "Return a list of buffers that match CONDITION.
 See `buffer-match' for details on CONDITION.  By default all
 buffers are checked, this can be restricted by passing an
@@ -325,7 +325,7 @@ CONDITION."
 
 ;;;; Defined in subr-x.el
 
-(compat-defun string-limit (string length &optional end coding-system) ;; 
UNTESTED
+(compat-defun string-limit (string length &optional end coding-system) ;; 
<UNTESTED>
   "Return a substring of STRING that is (up to) LENGTH characters long.
 If STRING is shorter than or equal to LENGTH characters, return the
 entire string unchanged.
@@ -369,7 +369,7 @@ than this function."
      (end (substring string (- (length string) length)))
      (t (substring string 0 length)))))
 
-(compat-defun string-pixel-width (string) ;; UNTESTED
+(compat-defun string-pixel-width (string) ;; <UNTESTED>
   "Return the width of STRING in pixels."
   (if (zerop (length string))
       0
@@ -417,7 +417,7 @@ be marked unmodified, effectively ignoring those changes."
                         (equal ,hash (buffer-hash)))
                (restore-buffer-modified-p nil))))))))
 
-(compat-defun add-display-text-property (start end prop value ;; UNTESTED
+(compat-defun add-display-text-property (start end prop value ;; <UNTESTED>
                                                &optional object)
   "Add display property PROP with VALUE to the text from START to END.
 If any text in the region has a non-nil `display' property, those
@@ -479,7 +479,7 @@ The variable list SPEC is the same as in `if-let'."
 
 ;;;; Defined in files.el
 
-(compat-defun file-parent-directory (filename) ;; UNTESTED
+(compat-defun file-parent-directory (filename) ;; <UNTESTED>
   "Return the directory name of the parent directory of FILENAME.
 If FILENAME is at the root of the filesystem, return nil.
 If FILENAME is relative, it is interpreted to be relative
@@ -500,7 +500,7 @@ to `default-directory', and the result will also be 
relative."
 (defvar compat--file-has-changed-hash-table (make-hash-table :test #'equal)
   "Internal variable used by `file-has-changed-p'.")
 
-(compat-defun file-has-changed-p (file &optional tag) ;; UNTESTED
+(compat-defun file-has-changed-p (file &optional tag) ;; <UNTESTED>
   "Return non-nil if FILE has changed.
 The size and modification time of FILE are compared to the size
 and modification time of the same FILE during a previous
@@ -522,7 +522,7 @@ the symbol of the calling function, for example."
 
 ;;;; Defined in keymap.el
 
-(compat-defun key-valid-p (keys) ;; UNTESTED
+(compat-defun key-valid-p (keys) ;; <UNTESTED>
   "Say whether KEYS is a valid key.
 A key is a string consisting of one or more key strokes.
 The key strokes are separated by single space characters.
@@ -586,7 +586,7 @@ which is
                (throw 'exit nil)))
            t))))))
 
-(compat-defun key-parse (keys) ;; UNTESTED
+(compat-defun key-parse (keys) ;; <UNTESTED>
   "Convert KEYS to the internal Emacs key representation.
 See `kbd' for a descripion of KEYS."
   (declare (pure t) (side-effect-free t))
@@ -678,7 +678,7 @@ See `kbd' for a descripion of KEYS."
               (setq res (vconcat res key))))))
       res)))
 
-(compat-defun keymap-set (keymap key definition) ;; UNTESTED
+(compat-defun keymap-set (keymap key definition) ;; <UNTESTED>
   "Set KEY to DEFINITION in KEYMAP.
 KEY is a string that satisfies `key-valid-p'.
 
@@ -707,7 +707,7 @@ DEFINITION is anything that can be a key's definition:
     (setq definition (key-parse definition)))
   (define-key keymap (key-parse key) definition))
 
-(compat-defun keymap-unset (keymap key &optional remove) ;; UNTESTED
+(compat-defun keymap-unset (keymap key &optional remove) ;; <UNTESTED>
   "Remove key sequence KEY from KEYMAP.
 KEY is a string that satisfies `key-valid-p'.
 
@@ -720,7 +720,7 @@ parent keymap to be used."
     (error "%S is not a valid key definition; see `key-valid-p'" key))
   (compat--define-key-with-remove keymap (key-parse key) nil remove))
 
-(compat-defun keymap-global-set (key command) ;; UNTESTED
+(compat-defun keymap-global-set (key command) ;; <UNTESTED>
   "Give KEY a global binding as COMMAND.
 COMMAND is the command definition to use; usually it is
 a symbol naming an interactively-callable function.
@@ -734,7 +734,7 @@ that you make with this function.
 NOTE: The compatibility version is not a command."
   (keymap-set (current-global-map) key command))
 
-(compat-defun keymap-local-set (key command) ;; UNTESTED
+(compat-defun keymap-local-set (key command) ;; <UNTESTED>
   "Give KEY a local binding as COMMAND.
 COMMAND is the command definition to use; usually it is
 a symbol naming an interactively-callable function.
@@ -750,7 +750,7 @@ NOTE: The compatibility version is not a command."
       (use-local-map (setq map (make-sparse-keymap))))
     (keymap-set map key command)))
 
-(compat-defun keymap-global-unset (key &optional remove) ;; UNTESTED
+(compat-defun keymap-global-unset (key &optional remove) ;; <UNTESTED>
   "Remove global binding of KEY (if any).
 KEY is a string that satisfies `key-valid-p'.
 
@@ -760,7 +760,7 @@ instead of unsetting it.  See `keymap-unset' for details.
 NOTE: The compatibility version is not a command."
   (keymap-unset (current-global-map) key remove))
 
-(compat-defun keymap-local-unset (key &optional remove) ;; UNTESTED
+(compat-defun keymap-local-unset (key &optional remove) ;; <UNTESTED>
   "Remove local binding of KEY (if any).
 KEY is a string that satisfies `key-valid-p'.
 
@@ -771,7 +771,7 @@ NOTE: The compatibility version is not a command."
   (when (current-local-map)
     (keymap-unset (current-local-map) key remove)))
 
-(compat-defun keymap-substitute (keymap olddef newdef &optional oldmap prefix) 
;; UNTESTED
+(compat-defun keymap-substitute (keymap olddef newdef &optional oldmap prefix) 
;; <UNTESTED>
   "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.
 In other words, OLDDEF is replaced with NEWDEF wherever it appears.
 Alternatively, if optional fourth argument OLDMAP is specified, we redefine
@@ -802,7 +802,7 @@ in a cleaner way with command remapping, like this:
        (substitute-key-definition-key defn olddef newdef prefix1 keymap))
      scan)))
 
-(compat-defun keymap-set-after (keymap key definition &optional after) ;; 
UNTESTED
+(compat-defun keymap-set-after (keymap key definition &optional after) ;; 
<UNTESTED>
   "Add binding in KEYMAP for KEY => DEFINITION, right after AFTER's binding.
 This is like `keymap-set' except that the binding for KEY is placed
 just after the binding for the event AFTER, instead of at the beginning
@@ -824,7 +824,7 @@ a menu, so this function is not useful for non-menu 
keymaps."
   (define-key-after keymap (key-parse key) definition
     (and after (key-parse after))))
 
-(compat-defun keymap-lookup ;; UNTESTED
+(compat-defun keymap-lookup ;; <UNTESTED>
     (keymap key &optional accept-default no-remap position)
   "Return the binding for command KEY.
 KEY is a string that satisfies `key-valid-p'.
@@ -869,7 +869,7 @@ specified buffer position instead of point are used."
           value))
     (key-binding (kbd key) accept-default no-remap position)))
 
-(compat-defun keymap-local-lookup (keys &optional accept-default) ;; UNTESTED
+(compat-defun keymap-local-lookup (keys &optional accept-default) ;; <UNTESTED>
   "Return the binding for command KEYS in current local keymap only.
 KEY is a string that satisfies `key-valid-p'.
 
@@ -882,7 +882,7 @@ about this."
     (when map
       (keymap-lookup map keys accept-default))))
 
-(compat-defun keymap-global-lookup (keys &optional accept-default _message) ;; 
UNTESTED
+(compat-defun keymap-global-lookup (keys &optional accept-default _message) ;; 
<UNTESTED>
   "Return the binding for command KEYS in current global keymap only.
 KEY is a string that satisfies `key-valid-p'.
 
@@ -897,7 +897,7 @@ about this.
 NOTE: The compatibility version is not a command."
   (keymap-lookup (current-global-map) keys accept-default))
 
-(compat-defun define-keymap (&rest definitions) ;; UNTESTED
+(compat-defun define-keymap (&rest definitions) ;; <UNTESTED>
   "Create a new keymap and define KEY/DEFINITION pairs as key bindings.
 The new keymap is returned.
 
diff --git a/compat-macs.el b/compat-macs.el
index 590cc3b177..56b2457ca2 100644
--- a/compat-macs.el
+++ b/compat-macs.el
@@ -207,7 +207,7 @@ If this is not documented on yourself system, you can check 
\
        `(not (fboundp ',name)))
      rest)))
 
-(defmacro compat-defun (name arglist docstring &rest rest) ;; UNTESTED
+(defmacro compat-defun (name arglist docstring &rest rest) ;; <UNTESTED>
   "Define NAME with arguments ARGLIST as a compatibility function.
 The function must be documented in DOCSTRING.  REST may begin
 with a plist, that is interpreted by the macro but not passed on
@@ -234,7 +234,7 @@ listing of attributes.
 The definition will only be installed, if the version this
 function was defined in, as indicated by the `:version'
 attribute, is greater than the current Emacs version."
-  (declare (debug compat-defun) (doc-string 3) (indent 2)) ;; UNTESTED
+  (declare (debug compat-defun) (doc-string 3) (indent 2)) ;; <UNTESTED>
   (compat--define-function 'macro name arglist docstring rest))
 
 (defmacro compat-defvar (name initval docstring &rest attr)
diff --git a/compat-tests.el b/compat-tests.el
index afb0b969ba..454819d5d5 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -20,7 +20,7 @@
 ;; Tests for compatibility functions from compat.el.
 ;;
 ;; Note that not all functions have tests yet.  Grep the Compat code for
-;; UNTESTED labels.  If you intend to use a function, which doesn't have
+;; <UNTESTED> labels.  If you intend to use a function, which doesn't have
 ;; tests yet, please contribute tests here.  NO GUARANTEES ARE MADE FOR
 ;; FUNCTIONS WITHOUT TESTS.
 
diff --git a/compat.texi b/compat.texi
index 1a88ccc235..827b7e25b8 100644
--- a/compat.texi
+++ b/compat.texi
@@ -146,7 +146,7 @@ call these definitions ``Explicit Definitions''. In 
contrast,
 If you intend to use a compatibility function in your code it is
 strongly recommended that you check the tests in
 @file{compat-tests.el}.  Alternatively grep the Compat code for
-UNTESTED labels.  There you will find the supported calling convention,
+<UNTESTED> labels.  There you will find the supported calling convention,
 which is guaranteed to work on the supported Emacs versions. We ensure
 this using continuous integration.  If a function is not tested yet in
 @file{compat-tests.el} NO GUARANTEES CAN BE MADE.  You are invited to