master 502a00b 1/8: Merge from origin/emacs-28

[Glenn Morris]

branch: master
commit 502a00b8b91d68ee6cbd0dfec40ac409ec08e67a
Merge: 288e8bb 7e2b973
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-28
    
    7e2b973d60 * lisp/textmodes/text-mode.el (text-mode-context-menu): Re...
    da6d889e90 ; * etc/NEWS: Use active voice for 'repeat-mode', etc.
    e3171e7e86 Allow automatic use of color fonts for emoji on macOS
    
    # Conflicts:
    #   etc/NEWS
---
 etc/NEWS.28                 | 22 ++++++++++++----------
 lisp/textmodes/text-mode.el |  4 ++--
 src/macfont.m               |  8 ++++++--
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/etc/NEWS.28 b/etc/NEWS.28
index 96104ad..a2b7baf 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -50,7 +50,7 @@ when using Cairo.  Use 'ftcrhb' if your Emacs was built with 
HarfBuzz
 text shaping support, and 'ftcr' otherwise.  You can determine this by
 checking 'system-configuration-features'.  The 'ftcr' backend will
 still be available when HarfBuzz is supported, but will not be used by
-default.  We strongly recommend building with HarBuzz support.  'x' is
+default.  We strongly recommend building with HarfBuzz support.  'x' is
 still a valid backend.
 
 ---
@@ -222,12 +222,13 @@ groups.
 
 +++
 ** New minor mode 'context-menu-mode' for context menus popped by 'mouse-3'.
-When this mode is enabled, clicking 'down-mouse-3' anywhere in the buffer
-pops up a menu whose contents depends on surrounding context near the
-mouse click.  You can change the order of the default sub-menus in the
-context menu by customizing the user option 'context-menu-functions'.
-You can also invoke the context menu by pressing 'S-<F10>' or,
-on macOS, by clicking 'C-down-mouse-1'.
+When this mode is enabled, clicking 'down-mouse-3' (usually, the
+right mouse button) anywhere in the buffer pops up a menu whose
+contents depends on surrounding context near the mouse click.
+You can change the order of the default sub-menus in the context menu
+by customizing the user option 'context-menu-functions'.  You can also
+invoke the context menu by pressing 'S-<F10>' or, on macOS, by
+clicking 'C-down-mouse-1'.
 
 +++
 ** A new keymap for buffer actions has been added.
@@ -438,7 +439,8 @@ nor t.
 *** New user option 'read-minibuffer-restore-windows'.
 When customized to nil, it uses 'minibuffer-restore-windows' in
 'minibuffer-exit-hook' to remove only the window showing the
-"*Completions*" buffer.
+"*Completions*" buffer, but keeps all other windows created
+while the minibuffer was active.
 
 ---
 *** New variable 'redisplay-adhoc-scroll-in-resize-mini-windows'.
@@ -470,7 +472,7 @@ both modes are on).
 +++
 *** The prefix key 'C-x t t' can be used to display a buffer in a new tab.
 Typing 'C-x t t' before a command will cause the buffer shown by that
-command to be displayed in a new tab.  'C-x t t" is bound to the
+command to be displayed in a new tab.  'C-x t t' is bound to the
 command 'other-tab-prefix'.
 
 +++
@@ -3238,7 +3240,7 @@ instead of 'C-x o C-x o' to switch windows, 'C-x { { } } 
^ ^ v v' to
 resize the selected window interactively, 'M-g n n p p' to navigate
 next-error matches.  Any other key exits this temporarily enabled
 transient mode that supports shorter keys, and then after exiting from
-this mode the default key binding is used for the last typed key.
+this mode, the last typed key uses the default key binding.
 
 The user option 'repeat-exit-key' defines an additional key usable to
 exit the mode like 'isearch-exit' ('RET').
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 3243bd3..478cf62 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -95,7 +95,7 @@ inherit all the commands defined in this map.")
      :style toggle
      :selected (memq 'turn-on-auto-fill text-mode-hook)]))
 
-(defun text-mode-menu (menu click)
+(defun text-mode-context-menu (menu click)
   "Populate MENU with text selection commands at CLICK."
 
   (when (thing-at-mouse click 'word)
@@ -127,7 +127,7 @@ You can thus get the full benefit of adaptive filling
 Turning on Text mode runs the normal hook `text-mode-hook'."
   (setq-local text-mode-variant t)
   (setq-local require-final-newline mode-require-final-newline)
-  (add-hook 'context-menu-functions 'text-mode-menu 10 t))
+  (add-hook 'context-menu-functions 'text-mode-context-menu 10 t))
 
 (define-derived-mode paragraph-indent-text-mode text-mode "Parindent"
   "Major mode for editing text, with leading spaces starting a paragraph.
diff --git a/src/macfont.m b/src/macfont.m
index d86f09f..78ed5d5 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -2415,8 +2415,12 @@ macfont_list (struct frame *f, Lisp_Object spec)
             continue;
 
           /* Don't use a color bitmap font unless its family is
-             explicitly specified.  */
-          if ((sym_traits & kCTFontTraitColorGlyphs) && NILP (family))
+             explicitly specified or we're looking for a font for
+             emoji.  */
+          if ((sym_traits & kCTFontTraitColorGlyphs)
+              && NILP (family)
+              && !EQ (CDR_SAFE (assq_no_quit (QCscript, AREF (spec, 
FONT_EXTRA_INDEX))),
+                      Qemoji))
             continue;
 
           if (j > 0