From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 28 Apr 2022 15:37:34 +0000 (+0300)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1931^2~236
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b3023de5431fc308e2a6db61ed4fdd18db785324;p=emacs.git

Merge from origin/emacs-28

# Conflicts:
#	lisp/progmodes/xref.el
---

b3023de5431fc308e2a6db61ed4fdd18db785324
diff --cc lisp/progmodes/xref.el
index fee2d0afcb9,c4b439f587c..8d0ad836ef5
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@@ -748,18 -703,15 +748,24 @@@ quit the *xref* buffer.
  This command interactively replaces FROM with TO in the names of the
  references displayed in the current *xref* buffer.
  
 +When called interactively, it uses '.*' as FROM, which means
 +replace the whole name.  Unless called with prefix argument, in
 +which case the user is prompted for both FROM and TO."
++
+ As each match is found, the user must type a character saying
+ what to do with it.  Type SPC or `y' to replace the match,
+ DEL or `n' to skip and go to the next match.  For more directions,
+ type \\[help-command] at that time.
+ "
    (interactive
 -   (let ((fr (read-regexp "Xref query-replace (regexp)" ".*")))
 -     (list fr
 -           (read-regexp (format "Xref query-replace (regexp) %s with: " fr)))))
 +   (let* ((fr
 +           (if current-prefix-arg
 +               (read-regexp "Query-replace (regexp)" ".*")
 +             ".*"))
 +          (prompt (if current-prefix-arg
 +                      (format "Query-replace (regexp) %s with: " fr)
 +                    "Query-replace all matches with: ")))
 +     (list fr (read-regexp prompt))))
    (let* (item xrefs iter)
      (save-excursion
        (while (setq item (xref--search-property 'xref-item))
diff --cc src/xfaces.c
index c41782f4f38,22bd5a81b5b..8ebb33c5abd
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@@ -1449,10 -1416,56 +1449,10 @@@ enum xlfd_fiel
    XLFD_LAST
  };
  
 -/* An enumerator for each possible slant value of a font.  Taken from
 -   the XLFD specification.  */
 -
 -enum xlfd_slant
 -{
 -  XLFD_SLANT_UNKNOWN,
 -  XLFD_SLANT_ROMAN,
 -  XLFD_SLANT_ITALIC,
 -  XLFD_SLANT_OBLIQUE,
 -  XLFD_SLANT_REVERSE_ITALIC,
 -  XLFD_SLANT_REVERSE_OBLIQUE,
 -  XLFD_SLANT_OTHER
 -};
 -
 -/* Relative font weight according to XLFD documentation.  */
 -
 -enum xlfd_weight
 -{
 -  XLFD_WEIGHT_UNKNOWN,
 -  XLFD_WEIGHT_ULTRA_LIGHT,	/* 10 */
 -  XLFD_WEIGHT_EXTRA_LIGHT,	/* 20 */
 -  XLFD_WEIGHT_LIGHT,		/* 30 */
 -  XLFD_WEIGHT_SEMI_LIGHT,	/* 40: SemiLight, Book, ...  */
 -  XLFD_WEIGHT_MEDIUM,		/* 50: Medium, Normal, Regular, ...  */
 -  XLFD_WEIGHT_SEMI_BOLD,	/* 60: SemiBold, DemiBold, ...  */
 -  XLFD_WEIGHT_BOLD,		/* 70: Bold, ... */
 -  XLFD_WEIGHT_EXTRA_BOLD,	/* 80: ExtraBold, Heavy, ...  */
 -  XLFD_WEIGHT_ULTRA_BOLD	/* 90: UltraBold, Black, ...  */
 -};
 -
 -/* Relative proportionate width.  */
 -
 -enum xlfd_swidth
 -{
 -  XLFD_SWIDTH_UNKNOWN,
 -  XLFD_SWIDTH_ULTRA_CONDENSED,	/* 10 */
 -  XLFD_SWIDTH_EXTRA_CONDENSED,	/* 20 */
 -  XLFD_SWIDTH_CONDENSED,	/* 30: Condensed, Narrow, Compressed, ... */
 -  XLFD_SWIDTH_SEMI_CONDENSED,	/* 40: semicondensed */
 -  XLFD_SWIDTH_MEDIUM,		/* 50: Medium, Normal, Regular, ... */
 -  XLFD_SWIDTH_SEMI_EXPANDED,	/* 60: SemiExpanded, DemiExpanded, ... */
 -  XLFD_SWIDTH_EXPANDED,		/* 70: Expanded... */
 -  XLFD_SWIDTH_EXTRA_EXPANDED,	/* 80: ExtraExpanded, Wide...  */
 -  XLFD_SWIDTH_ULTRA_EXPANDED	/* 90: UltraExpanded... */
 -};
 -
  /* Order by which font selection chooses fonts.  The default values
-    mean `first, find a best match for the font width, then for the
-    font height, then for weight, then for slant.'  This variable can be
-    set via set-face-font-sort-order.  */
+    mean "first, find a best match for the font width, then for the
+    font height, then for weight, then for slant."  This variable can be
+    set via 'internal-set-font-selection-order'.  */
  
  static int font_sort_order[4];