Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

26 files changed, 98 insertions, 76 deletions

diff --git a/lisp/allout.el b/lisp/allout.el
index 9f790871eed..3ba440f4886 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -6490,8 +6490,9 @@ not its value."
         got)
     (dolist (sym configvar-value)
       (if (not (boundp sym))
-          (if (yes-or-no-p (format "%s entry `%s' is unbound -- remove it? "
-                                   configvar-name sym))
+          (if (yes-or-no-p (format-message
+                            "%s entry `%s' is unbound -- remove it? "
+                            configvar-name sym))
               (delq sym (symbol-value configvar-name)))
         (push (symbol-value sym) got)))
     (reverse got)))
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 38b583c9706..73f86df11e4 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -727,11 +727,10 @@ the output includes key-bindings of commands."
                  (let ((alias (get symbol 'face-alias)))
                    (if alias
                        (if (facep alias)
-                           (format "%slias for the face `%s'."
-                                   (if (get symbol 'obsolete-face)
-                                       "Obsolete a"
-                                     "A")
-                                   alias)
+                           (format-message
+                            "%slias for the face `%s'."
+                            (if (get symbol 'obsolete-face) "Obsolete a" "A")
+                            alias)
                          ;; Never happens in practice because fails
                          ;; (facep symbol) test.
                          "(alias for undefined face)")
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 2b5ada19974..70308334183 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1599,7 +1599,7 @@ This button will have a menu with all three reset operations."
 
 (defcustom custom-raised-buttons (not (equal (face-valid-attribute-values :box)
                                              '(("unspecified" . unspecified))))
-  "If non-nil, indicate active buttons in a `raised-button' style.
+  "If non-nil, indicate active buttons in a raised-button style.
 Otherwise use brackets."
   :type 'boolean
   :version "21.1"
@@ -1748,7 +1748,7 @@ Operate on all settings in this buffer:\n"))
 on a button to invoke its action.
 Invoke [+] to expand a group, and [-] to collapse an expanded group.\n"
                          (if custom-raised-buttons
-                             "`Raised' text indicates"
+                             "Raised text indicates"
                            "Square brackets indicate")))
 
 
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 825ab80f211..237cc00a36f 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -799,7 +799,8 @@ relevant to POS."
                   (insert "\n  " (car elt) ":"
                           (propertize " " 'display '(space :align-to 4))
                           (or (cdr elt) "-- not encodable --"))))
-              (insert "\nSee the variable `reference-point-alist' for "
+              (insert (substitute-command-keys
+                       "\nSee the variable `reference-point-alist' for ")
                       "the meaning of the rule.\n")))
 
           (unless eight-bit-p
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 63ee75f1ff0..a67b11fb6a6 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -686,9 +686,11 @@ can be produced by `dired-get-marked-files', for example."
     (if (cond ((not (or on-each no-subst))
                (error "You can not combine `*' and `?' substitution marks"))
               ((and star on-each)
-               (y-or-n-p "Confirm--do you mean to use `*' as a wildcard? "))
+               (y-or-n-p (format-message
+                          "Confirm--do you mean to use `*' as a wildcard? ")))
               ((and qmark no-subst)
-               (y-or-n-p "Confirm--do you mean to use `?' as a wildcard? "))
+               (y-or-n-p (format-message
+                          "Confirm--do you mean to use `?' as a wildcard? ")))
               (t))
         (if on-each
             (dired-bunch-files
@@ -1497,7 +1499,7 @@ or with the current marker character if MARKER-CHAR is t."
           (let* ((overwrite (file-exists-p to))
                  (dired-overwrite-confirmed ; for dired-handle-overwrite
                   (and overwrite
-                       (let ((help-form '(format "\
+                       (let ((help-form '(format-message "\
 Type SPC or `y' to overwrite file `%s',
 DEL or `n' to skip to next,
 ESC or `q' to not overwrite any of the remaining files,
@@ -1878,11 +1880,11 @@ of `dired-dwim-target', which see."
   ;; Optional arg MARKER-CHAR as in dired-create-files.
   (let* ((fn-list (dired-get-marked-files nil arg))
          (operation-prompt (concat operation " `%s' to `%s'?"))
-         (rename-regexp-help-form (format "\
+         (rename-regexp-help-form (format-message "\
 Type SPC or `y' to %s one match, DEL or `n' to skip to next,
 `!' to %s all remaining matches with no more questions."
-                                          (downcase operation)
-                                          (downcase operation)))
+                                                  (downcase operation)
+                                                  (downcase operation)))
          (regexp-name-constructor
           ;; Function to construct new filename using REGEXP and NEWNAME:
           (if whole-name                ; easy (but rare) case
@@ -2003,11 +2005,11 @@ See function `dired-do-rename-regexp' for more info."
         (let ((to (concat (file-name-directory from)
                           (funcall basename-constructor
                                    (file-name-nondirectory from)))))
-          (and (let ((help-form (format "\
+          (and (let ((help-form (format-message "\
 Type SPC or `y' to %s one file, DEL or `n' to skip to next,
 `!' to %s all remaining matches with no more questions."
-                                        (downcase operation)
-                                        (downcase operation))))
+                                                (downcase operation)
+                                                (downcase operation))))
                  (dired-query 'rename-non-directory-query
                               (concat operation " `%s' to `%s'")
                               (dired-make-relative from)
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 4e5da0dd1b5..4903b152fac 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1353,12 +1353,12 @@ otherwise."
   (interactive)
   (let ((file (dired-get-filename t)))
     (if dired-bind-vm
-        (if (y-or-n-p (concat "Visit `" file
-                              "' as a mail folder with VM?"))
+        (if (y-or-n-p (format-message
+                       "Visit ‘%s’ as a mail folder with VM?" file))
             (dired-vm))
       ;; Read mail folder using rmail.
-      (if (y-or-n-p (concat "Visit `" file
-                            "' as a mailbox with RMAIL?"))
+      (if (y-or-n-p (format-message
+                     "Visit ‘%s’ as a mailbox with RMAIL?" file))
           (dired-rmail)))))
 
 
diff --git a/lisp/dired.el b/lisp/dired.el
index 215906a32d4..6192b0a870e 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3558,7 +3558,7 @@ Thus, use \\[backward-page] to find the beginning of a group of errors."
       (let ((inhibit-read-only t))
         (cond ((stringp log)
                (insert (if args
-                           (apply (function format) log args)
+                           (apply #'format-message log args)
                          log)))
               ((bufferp log)
                (insert-buffer-substring log))
@@ -3811,7 +3811,8 @@ Ask means pop up a menu for the user to select one of copy, move or link."
             ((memq action '(copy private move link))
              (let ((overwrite (and (file-exists-p to)
                                    (y-or-n-p
-                                    (format "Overwrite existing file `%s'? " to))))
+                                    (format-message
+                                     "Overwrite existing file `%s'? " to))))
                    ;; Binding dired-overwrite-confirmed to nil makes
                    ;; dired-handle-overwrite a no-op.  We instead use
                    ;; y-or-n-p, which pops a graphical menu.
@@ -3824,7 +3825,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
                                 (car (find-backup-file-name to)))
                           (or (eq dired-backup-overwrite 'always)
                               (y-or-n-p
-                               (format
+                               (format-message
                                 "Make backup for existing file `%s'? " to))))
                  (rename-file to backup-file 0)
                  (dired-relist-entry backup-file))
diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el
index d1c46dd8550..ab7e34cb7eb 100644
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@@ -218,7 +218,7 @@ the mode if ARG is omitted or nil."
   (when dirtrack-debug-mode
     (with-current-buffer (get-buffer-create dirtrack-debug-buffer)
       (goto-char (point-max))
-      (insert msg1 msg2 "\n"))))
+      (insert (substitute-command-keys msg1) msg2 "\n"))))
 
 (declare-function shell-prefixed-directory-name "shell" (dir))
 (declare-function shell-process-cd "shell" (arg))
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 84f9c89237b..62ed10218e4 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -281,7 +281,8 @@ in `.emacs'."
                (set-terminal-coding-system nil))))
 
     (display-warning 'i18n
-                     "`standard-display-european' is semi-obsolete; see its doc string for details"
+                     (format-message
+                      "`standard-display-european' is semi-obsolete; see its doc string for details")
                      :warning)
 
     ;; Switch to Latin-1 language environment
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index c5b88281888..b53c1da2a80 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -151,7 +151,8 @@ use in place of \"-ls\" as the final argument."
     (let ((find (get-buffer-process (current-buffer))))
       (when find
         (if (or (not (eq (process-status find) 'run))
-                (yes-or-no-p "A `find' process is running; kill it? "))
+                (yes-or-no-p
+                 (format-message "A `find' process is running; kill it? ")))
             (condition-case nil
                 (progn
                   (interrupt-process find)
diff --git a/lisp/forms.el b/lisp/forms.el
index bccb4a05756..e7e399fd436 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -692,10 +692,12 @@ Commands:                        Equivalent keys in read-only mode:
         (insert
          "GNU Emacs Forms Mode\n\n"
          (if (file-exists-p forms-file)
-             (concat "No records available in file `" forms-file "'\n\n")
-           (format "Creating new file `%s'\nwith %d field%s per record\n\n"
-                   forms-file forms-number-of-fields
-                   (if (= 1 forms-number-of-fields) "" "s")))
+             (format-message
+              "No records available in file `%s'\n\n" forms-file)
+           (format-message
+            "Creating new file `%s'\nwith %d field%s per record\n\n"
+            forms-file forms-number-of-fields
+            (if (= 1 forms-number-of-fields) "" "s")))
          "Use " (substitute-command-keys "\\[forms-insert-record]")
          " to create new records.\n")
         (setq forms--current-record 1)
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 27d46592698..3e0ea410620 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -940,8 +940,9 @@ and their encoded form is inserted byte by byte."
                      ch internal-hex))
                    (setq encoded internal)
                  (error
-                  "Can't encode `0x%x' with this buffer's coding system; try \\[hexl-insert-hex-string]"
-                  ch)))
+                  "Can't encode `0x%x' with this buffer's coding system; %s"
+                  ch
+                  (substitute-command-keys "try \\[hexl-insert-hex-string]"))))
              (while (> num 0)
                (mapc
                 (function (lambda (c) (hexl-insert-char c 1))) encoded)
diff --git a/lisp/ido.el b/lisp/ido.el
index ab461bdb007..95be6566ea6 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2275,7 +2275,8 @@ If cursor is not at the end of the user input, move to end of input."
 
        ((and (eq ido-create-new-buffer 'prompt)
              (null require-match)
-             (not (y-or-n-p (format "No buffer matching `%s', create one? " buf))))
+             (not (y-or-n-p (format-message
+                             "No buffer matching `%s', create one? " buf))))
         nil)
 
        ;; buffer doesn't exist
@@ -2285,7 +2286,8 @@ If cursor is not at the end of the user input, move to end of input."
 
        ((and (eq ido-create-new-buffer 'prompt)
              (null require-match)
-             (not (y-or-n-p (format "No buffer matching `%s', create one? " buf))))
+             (not (y-or-n-p (format-message
+                             "No buffer matching `%s', create one? " buf))))
         nil)
 
        ;; create a new buffer
diff --git a/lisp/info.el b/lisp/info.el
index 0e0e91d61fa..21dbca9ee58 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3381,11 +3381,11 @@ Give an empty topic name to go to the Index node itself."
            (car (car Info-index-alternatives))
            (nth 2 (car Info-index-alternatives))
            (if (cdr Info-index-alternatives)
-               (format "(%s total; use `%s' for next)"
-                       (length Info-index-alternatives)
-                       (key-description (where-is-internal
-                                         'Info-index-next overriding-local-map
-                                         t)))
+               (format-message
+                "(%s total; use `%s' for next)"
+                (length Info-index-alternatives)
+                (key-description (where-is-internal
+                                  'Info-index-next overriding-local-map t)))
              "(Only match)")))
 
 (defun Info-find-index-name (name)
diff --git a/lisp/outline.el b/lisp/outline.el
index 059ca626586..d9142c5a604 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -449,8 +449,8 @@ Otherwise, it will be one level below."
           ;; Why bother checking that it is indeed higher/lower level ?
           new-head
         ;; Didn't work, so ask what to do.
-        (read-string (format "%s heading for `%s': "
-                             (if up "Parent" "Demoted") head)
+        (read-string (format-message "%s heading for `%s': "
+                                     (if up "Parent" "Demoted") head)
                      head nil nil t)))))
 
 (defun outline-promote (&optional which)
diff --git a/lisp/printing.el b/lisp/printing.el
index 86d569a6ac6..8ad56f413e2 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -5542,8 +5542,8 @@ If menu binding was not done, calls `pr-menu-bind'."
                  ((file-exists-p res)
                   (ding)
                   (setq prompt "exists")
-                  (not (y-or-n-p (format "File `%s' exists; overwrite? "
-                                         res))))
+                  (not (y-or-n-p (format-message
+                                  "File `%s' exists; overwrite? " res))))
                  (t nil))
       (setq res (read-file-name
                  (format "File %s; PostScript file: " prompt)
@@ -6540,8 +6540,8 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order."
         ((or (not (file-exists-p pr-i-out-file))
              pr-i-answer-yes
              (setq pr-i-answer-yes
-                   (y-or-n-p (format "File `%s' exists; overwrite? "
-                                     pr-i-out-file))))
+                   (y-or-n-p (format-message "File `%s' exists; overwrite? "
+                                             pr-i-out-file))))
          pr-i-out-file)
         (t
          (error "File already exists"))))
diff --git a/lisp/proced.el b/lisp/proced.el
index 922e016a765..5c65edfe818 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -1924,8 +1924,8 @@ and \f (formfeed) at the end."
                (unless (bolp)
                  (insert "\n"))
                (insert (current-time-string)
-                       "\tBuffer `" (buffer-name obuf) "', "
-                       (format "signal `%s'\n" (car args)))
+                       (format-message "\tBuffer ‘%s’, signal ‘%s’\n"
+                                       (buffer-name obuf) (car args)))
                (goto-char (point-max))
                (insert "\f\n")))))))
 
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 0ba470be68c..faafe9ce87f 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -4604,8 +4604,8 @@ page-height == ((floor print-height ((th + ls) * zh)) * ((th + ls) * zh)) - th
                        (setq prompt "File is unwritable"))
                       ((file-exists-p res)
                        (setq prompt "File exists")
-                       (not (y-or-n-p (format "File `%s' exists; overwrite? "
-                                              res))))
+                       (not (y-or-n-p (format-message
+                                       "File `%s' exists; overwrite? " res))))
                       (t nil))
            (setq res (read-file-name
                       (format "%s; save PostScript to file: " prompt)
@@ -5711,7 +5711,7 @@ XSTART YSTART are the relative position for the first page in a sheet.")
          (error "Invalid %s `%S'%s"
                 mess size
                 (if arg
-                    (format " for `%S'" arg)
+                    (format-message " for `%S'" arg)
                   "")))
     siz))
 
diff --git a/lisp/recentf.el b/lisp/recentf.el
index da263fc0b41..a599383c09e 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1224,7 +1224,7 @@ use for the dialog.  It defaults to \"*`recentf-menu-title'*\"."
                        ", or type the corresponding digit key,"
                      "")
                    " to open it.\n"
-                   "Click on Cancel or type `q' to cancel.\n")
+                   (format-message "Click on Cancel or type ‘q’ to cancel.\n"))
     ;; Use a L&F that looks like the recentf menu.
     (tree-widget-set-theme "folder")
     (apply 'widget-create
@@ -1281,7 +1281,8 @@ Write data into the file specified by `recentf-save-file'."
       (with-temp-buffer
         (erase-buffer)
         (set-buffer-file-coding-system recentf-save-file-coding-system)
-        (insert (format recentf-save-file-header (current-time-string)))
+        (insert (format-message recentf-save-file-header
+                                (current-time-string)))
         (recentf-dump-variable 'recentf-list recentf-max-saved-items)
         (recentf-dump-variable 'recentf-filter-changer-current)
         (insert "\n\n;; Local Variables:\n"
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 692ee2e586f..607138ca31a 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -270,8 +270,12 @@ If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
   (interactive)
   (with-temp-buffer
     (insert
-     (format ";; -*- mode: emacs-lisp; coding: %s -*-\n" savehist-coding-system)
-     ";; Minibuffer history file, automatically generated by `savehist'.\n\n")
+     (format-message
+      (concat
+       ";; -*- mode: emacs-lisp; coding: %s -*-\n"
+       ";; Minibuffer history file, automatically generated by `savehist'.\n"
+       "\n")
+      savehist-coding-system))
     (run-hooks 'savehist-save-hook)
     (let ((print-length nil)
           (print-string-length nil)
diff --git a/lisp/server.el b/lisp/server.el
index 5a8afb42984..57c16af0cd5 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -533,7 +533,8 @@ Creates the directory if necessary and makes sure:
                   ((and w32 (zerop uid))          ; on FAT32?
                    (display-warning
                     'server
-                    (format "Using `%s' to store Emacs-server authentication files.
+                    (format-message "\
+Using `%s' to store Emacs-server authentication files.
 Directories on FAT32 filesystems are NOT secure against tampering.
 See variable `server-auth-dir' for details."
                             (file-name-as-directory dir))
diff --git a/lisp/ses.el b/lisp/ses.el
index e625e4ed593..0bc43ec8b58 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -3360,8 +3360,10 @@ highlighted range in the spreadsheet."
          (ses-is-cell-sym-p new-name)
          (error "Already a cell name"))
    (and (boundp new-name)
-        (null (yes-or-no-p (format "`%S' is already bound outside this buffer, continue? "
-                                   new-name)))
+        (null (yes-or-no-p
+               (format-message
+                "`%S' is already bound outside this buffer, continue? "
+                new-name)))
         (error "Already a bound cell name")))
   (let* (curcell
          (sym (if (ses-cell-p cell)
diff --git a/lisp/simple.el b/lisp/simple.el
index 87d944482ab..6f76d755292 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3565,8 +3565,9 @@ Also, delete any process that is exited or signaled."
                   (buf-label (if (buffer-live-p buf)
                                  `(,(buffer-name buf)
                                    face link
-                                   help-echo ,(concat "Visit buffer `"
-                                                      (buffer-name buf) "'")
+                                   help-echo ,(format-message
+                                               "Visit buffer ‘%s’"
+                                               (buffer-name buf))
                                    follow-link t
                                    process-buffer ,buf
                                    action process-menu-visit-buffer)
diff --git a/lisp/startup.el b/lisp/startup.el
index 2d1bcc9f424..0da2e14199e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1115,8 +1115,9 @@ please check its value")
                               "~/.emacs")
                              ((directory-files "~" nil "^_emacs\\(\\.elc?\\)?$")
                               ;; Also support _emacs for compatibility, but warn about it.
-                              (push '(initialization
-                                      "`_emacs' init file is deprecated, please use `.emacs'")
+                              (push `(initialization
+                                      ,(format-message
+                                        "`_emacs' init file is deprecated, please use `.emacs'"))
                                     delayed-warnings-list)
                               "~/_emacs")
                              (t ;; But default to .emacs if _emacs does not exist.
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 2363d333d37..a4f4a14af32 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -423,8 +423,9 @@ or for window START-WINDOW if that is specified."
   (interactive)
   (let ((command (cdar strokes-global-map)))
     (if (y-or-n-p
-         (format "Really delete last stroke definition, defined to `%s'? "
-                 command))
+         (format-message
+          "Really delete last stroke definition, defined to `%s'? "
+          command))
         (progn
           (setq strokes-global-map (cdr strokes-global-map))
           (message "That stroke has been deleted"))
@@ -868,8 +869,8 @@ If no stroke matches, nothing is done and return value is nil."
           ((null strokes-global-map)
            (if (file-exists-p strokes-file)
                (and (y-or-n-p
-                     (format "No strokes loaded.  Load `%s'? "
-                             strokes-file))
+                     (format-message "No strokes loaded.  Load `%s'? "
+                                     strokes-file))
                     (strokes-load-user-strokes))
              (error "No strokes defined; use `strokes-global-set-stroke'")))
           (t
diff --git a/lisp/wdired.el b/lisp/wdired.el
index c72e134b401..0c113b346be 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -494,8 +494,8 @@ non-nil means return old filename."
                                        overwrite))
                 (error
                  (setq errors (1+ errors))
-                 (dired-log (concat "Rename `" file-ori "' to `"
-                                    file-new "' failed:\n%s\n")
+                 (dired-log "Rename ‘%s’ to ‘%s’ failed:\n%s\n"
+                            file-ori file-new
                             err)))))))))
     errors))
 
@@ -651,8 +651,8 @@ If OLD, return the old target.  If MOVE, move point before it."
                (substitute-in-file-name link-to-new) link-from))
           (error
            (setq errors (1+ errors))
-           (dired-log (concat "Link `" link-from "' to `"
-                              link-to-new "' failed:\n%s\n")
+           (dired-log "Link ‘%s’ to ‘%s’ failed:\n%s\n"
+                      link-from link-to-new
                       err)))))
     (cons changes errors)))
 
@@ -837,11 +837,11 @@ Like original function but it skips read-only words."
               (unless (equal 0 (process-file dired-chmod-program
                                              nil nil nil perm-tmp filename))
                 (setq errors (1+ errors))
-                (dired-log (concat dired-chmod-program " " perm-tmp
-                                   " `" filename "' failed\n\n"))))
+                (dired-log "%s %s ‘%s’ failed\n\n"
+                           dired-chmod-program perm-tmp filename)))
           (setq errors (1+ errors))
-          (dired-log (concat "Cannot parse permission `" perms-new
-                             "' for file `" filename "'\n\n"))))
+          (dired-log "Cannot parse permission ‘%s’ for file ‘%s’\n\n"
+                     perms-new filename)))
       (goto-char (next-single-property-change (1+ (point)) prop-wanted
                                               nil (point-max))))
     (cons changes errors)))