Merge branch 'master' of https://github.com/emacs-mirror/emacs into pgtk

Author: Yuuki Harano

configure.ac

@@ -5964,6 +5964,21 @@ you can continue to support by using '$0 --with-pop'.])
   esac
 fi
 
+if test "${HAVE_XFT}" = yes; then
+  AC_MSG_WARN([This configuration uses libXft, which has a number of
+    font rendering issues, and is being considered for removal in the
+    next release of Emacs.  Please consider using Cairo graphics +
+    HarfBuzz text shaping instead (they are auto-detected if the
+    relevant development headers are installed).])
+fi
+
+if test "${HAVE_CAIRO}" = "yes" && test "${HAVE_HARFBUZZ}" = no; then
+  AC_MSG_WARN([This configuration uses the Cairo graphics library,
+    but not the HarfBuzz font shaping library.  We recommend the use
+    of HarfBuzz when using Cairo, please install HarfBuzz development
+    packages.])
+fi
+
 # Let plain 'make' work.
 test "$MAKE" = make || test -f makefile || cat >makefile <<EOF
 .POSIX:

doc/emacs/Makefile.in

@@ -246,7 +246,7 @@ install-ps: ps
 	  ${GZIP_PROG} -9n "$(DESTDIR)$(psdir)/$${file}"; \
 	done
 
-## Top-level Makefile installs the info pages.
+## Top-level Makefile installs the Info manuals.
 install-doc: install-dvi install-html install-pdf install-ps
 
 

doc/emacs/basic.texi

@@ -117,9 +117,9 @@ which is Unicode code-point U+2018 @sc{left single quotation mark},
 sometimes called a left single ``curved quote'' or ``curly quote''.
 Similarly, @kbd{C-x 8 ]}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} insert the
 curved quotes @t{’}, @t{“} and @t{”}, respectively.  Also, a working
-Alt key acts like @kbd{C-x 8}; e.g., @kbd{A-[} acts like @kbd{C-x 8 [}
-and inserts @t{‘}.  To see which characters have @kbd{C-x 8}
-shorthands, type @kbd{C-x 8 C-h}.
+@key{Alt} key acts like @kbd{C-x 8} (unless followed by @key{RET});
+e.g., @kbd{A-[} acts like @kbd{C-x 8 [} and inserts @t{‘}.  To see
+which characters have @kbd{C-x 8} shorthands, type @kbd{C-x 8 C-h}.
 
   Alternatively, you can use the command @kbd{C-x 8 @key{RET}}
 (@code{insert-char}).  This prompts for the Unicode name or code-point

doc/emacs/custom.texi

@@ -1930,10 +1930,12 @@ commonly used, Emacs supports three other modifier keys.  These are
 called @key{Super}, @key{Hyper}, and @key{Alt}.  Few terminals provide
 ways to use these modifiers; the key labeled @key{Alt} on most
 keyboards usually issues the @key{Meta} modifier, not @key{Alt}.  The
-standard key bindings in Emacs do not include any characters with
-these modifiers.  However, you can customize Emacs to assign meanings
-to them.  The modifier bits are labeled as @samp{s-}, @samp{H-} and
-@samp{A-} respectively.
+standard key bindings in Emacs do not include any characters with the
+@key{Super} and @key{Hyper} modifiers, and only a small number of
+standard key bindings use @key{Alt}.  However, you can customize Emacs
+to assign meanings to key bindings that use these modifiers.  The
+modifier bits are labeled as @samp{s-}, @samp{H-} and @samp{A-}
+respectively.
 
   Even if your keyboard lacks these additional modifier keys, you can
 enter it using @kbd{C-x @@}: @kbd{C-x @@ h} adds the Hyper flag to

doc/emacs/files.texi

@@ -1079,6 +1079,7 @@ want to make permanent.  Instead, auto-saving is done in a different
 file called the @dfn{auto-save file}, and the visited file is changed
 only when you request saving explicitly (such as with @kbd{C-x C-s}).
 
+@cindex @file{#}, in auto-save file names
   Normally, the auto-save file name is made by appending @samp{#} to the
 front and rear of the visited file name.  Thus, a buffer visiting file
 @file{foo.c} is auto-saved in a file @file{#foo.c#}.  Most buffers that

doc/lispintro/Makefile.in

@@ -145,7 +145,7 @@ install-ps: ps
 	  ${GZIP_PROG} -9n "$(DESTDIR)$(psdir)/$${file}"; \
 	done
 
-## Top-level Makefile installs the info pages.
+## Top-level Makefile installs the Info manuals.
 install-doc: install-dvi install-html install-pdf install-ps
 
 

doc/lispref/Makefile.in

@@ -206,7 +206,7 @@ install-ps: ps
 	  ${GZIP_PROG} -9n "$(DESTDIR)$(psdir)/$${file}"; \
 	done
 
-## Top-level Makefile installs the info pages.
+## Top-level Makefile installs the Info manuals.
 install-doc: install-dvi install-html install-pdf install-ps
 
 

doc/misc/Makefile.in

@@ -267,7 +267,7 @@ install-ps: ps
 	  ${GZIP_PROG} -9n "$(DESTDIR)$(psdir)/$${file}"; \
 	done
 
-## Top-level Makefile installs the info pages.
+## Top-level Makefile installs the Info manuals.
 install-doc: install-dvi install-html install-pdf install-ps
 
 

doc/misc/tramp.texi

@@ -1254,18 +1254,17 @@ directory have the same @code{display-name}, such a situation must be avoided.
 
 Media devices, like cell phones, tablets, cameras, can be accessed via
 the @option{media} method.  Just the device name is needed in order to
-specify the remote part of file name.  However, the device must
-already be connected via USB, before accessing it.
+specify the host in the file name.  However, the device must already
+be connected via USB, before accessing it.  Possible device names are
+visible via host name completion, @ref{File name completion}.
 
 Depending on the device type, the access could be read-only.  Some
 devices are accessible under different names in parallel, offering
 different parts of their file system.
 
-@c @value{tramp} does not require a device name as part of the remote
-@c file name when a single media device is connected.  @value{tramp}
-@c instead uses @file{@trampfn{media,,}} as the default name.
-@c @c @command{adb devices}, run in a shell outside Emacs, shows available
-@c @c host names.
+@value{tramp} does not require a host name as part of the remote file
+name when a single media device is connected.  @value{tramp} instead
+uses @file{@trampfn{media,,}} as the default name.
 
 @item @option{nextcloud}
 @cindex method @option{nextcloud}

etc/NEWS

@@ -24,22 +24,35 @@ applies, and please also update docstrings as needed.
 
 * Installation Changes in Emacs 28.1
 
-** Cairo is now used by default if found.
+** Cairo graphics library is now used by default if found.
 '--with-cairo' is now the default, if the appropriate development files
 are found by 'configure'.  Note that building with Cairo means using
 Pango instead of libXFT for font support.  Since Pango 1.44 has
 removed support for bitmapped fonts, this may require you to adjust
 your font settings.
 
-Note also that 'FontBackend' settings in ".Xdefaults" or ".Xresources",
-or 'font-backend' frame parameter settings in your init files, may need
-to be adjusted, as 'xft' is no longer a valid backend when using
-Cairo.  Use 'ftcrhb' if your Emacs was built with HarfBuzz 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 still a
-valid backend.
+Note also that 'FontBackend' settings in ".Xdefaults" or
+".Xresources", or 'font-backend' frame parameter settings in your init
+files, may need to be adjusted, as 'xft' is no longer a valid backend
+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
+still a valid backend.
+
+---
+** 'configure' now warns about building with libXft support.
+libXft is unmaintained, and causes a number of problems with modern
+fonts including but not limited to crashes; support for it may be
+removed in a future version of Emacs.  Please consider using
+Cairo + HarfBuzz instead.
+
+---
+** 'configure' now warns about not using HarfBuzz if using Cairo.
+We want to encourage people to use the most modern font features
+available, and this is the Cairo graphics library + HarfBuzz for font
+shaping, so 'configure' now recommends that combination.
 
 ---
 ** The ftx font backend driver has been removed.
@@ -110,6 +123,10 @@ Formerly it made an exception for integer components of SOA records,
 because SOA serial numbers can exceed fixnum ranges on 32-bit platforms.
 Emacs now supports bignums so this old glitch is no longer needed.
 
+** The Lisp variables 'previous-system-messages-locale' and
+'previous-system-time-locale' have been removed, as they were created
+by mistake and were not useful to Lisp code.
+
 
 * Lisp Changes in Emacs 28.1