master 91f4ea2fa4: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 91f4ea2fa455ad2458e727217d83a177f333c637
Merge: 08a74ab05a 7ffcba4213
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    7ffcba4213 * etc/PROBLEMS: Problems with Alacritty and Emoji.  (Bug#5...
    df95118e83 Link from (emacs)Init Syntax to (elisp)Introduction
    7793cf0c3d Don't mention removed XEmacs support in reftex manual
    3d1cf1b47a Don't mention removed XEmacs support in idlwave manual
    7ff60c62a9 ; * admin/make-tarball.txt: Fix last change.
    2fd5590d0c ; * lisp/play/fortune.el (fortune-ask-file): Doc fix.
---
 admin/make-tarball.txt |  7 ++++---
 doc/emacs/custom.texi  |  3 +++
 doc/misc/idlwave.texi  | 31 +++++--------------------------
 doc/misc/reftex.texi   |  8 ++------
 etc/PROBLEMS           | 17 ++++++++++++++++-
 lisp/play/fortune.el   |  2 +-
 6 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index f5b9d56c4d..a60fead267 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -185,10 +185,11 @@ General steps (for each step, check for possible errors):
 
      ./admin/diff-tar-files emacs-OLD.tar emacs-NEW.tar
 
-    Alternatively:
+    Alternatively, if you want to use the compressed tarballs (which
+    diff-tar-files doesn't understand):
 
-     tar tf emacs-OLD.tar | sed -e 's,^[^/]*,,' | sort > old_tmp
-     tar tf emacs-NEW.tar | sed -e 's,^[^/]*,,' | sort > new_tmp
+     tar tJf emacs-OLD.tar.xz | sed -e 's,^[^/]*,,' | sort > old_tmp
+     tar tJf emacs-NEW.tar.xz | sed -e 's,^[^/]*,,' | sort > new_tmp
      diff -u old_tmp new_tmp
 
     If this is the first pretest of a major release, just comparing
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 6ed43bcb79..efaf0dfd38 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -2452,6 +2452,9 @@ keys which send non-@acronym{ASCII} characters.
 Write a single-quote (@code{'}) followed by the Lisp object you want.
 @end table
 
+  For more information on the Emacs Lisp syntax, @pxref{Introduction,,,
+elisp, The Emacs Lisp Reference Manual}.
+
 @node Init Examples
 @subsection Init File Examples
 
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index a1e6535bd8..6aaa4309a1 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -392,7 +392,7 @@ that IDLWAVE has many more capabilities than covered here, 
which can
 be discovered by reading the entire manual, or hovering over the
 shoulder of your nearest IDLWAVE guru for a few days.
 
-It is assumed that you have access to Emacs or XEmacs with the full
+It is assumed that you have access to Emacs with the full
 IDLWAVE package including online help.  We also assume that you are
 familiar with Emacs and can read the nomenclature of key presses in
 Emacs (in particular, @kbd{C} stands for @key{CONTROL} and @kbd{M} for
@@ -1011,9 +1011,9 @@ Non-@code{nil} means use last match on line for
 @cindex Font lock
 
 Highlighting of keywords, comments, strings etc.@: can be accomplished
-with @code{font-lock}.  If you are using @code{global-font-lock-mode}
-(in Emacs), or have @code{font-lock} turned on in any other buffer in
-XEmacs, it should also automatically work in IDLWAVE buffers.  If you'd
+with @code{font-lock}.  If you are using @code{global-font-lock-mode},
+or have @code{font-lock-mode} turned on in any other buffer,
+it should also automatically work in IDLWAVE buffers.  If you'd
 prefer invoking font-lock individually by mode, you can enforce it in
 @code{idlwave-mode} with the following line in your @file{.emacs}:
 
@@ -4021,7 +4021,7 @@ user is King!
 
 IDLWAVE was developed on a UNIX system.  However, thanks to the
 portability of Emacs, much of IDLWAVE does also work under different
-operating systems like Windows (with NTEmacs or NTXEmacs).
+operating systems like Windows (with NTEmacs).
 
 The only real problem is that there is no command-line version of IDL
 for Windows with which IDLWAVE can interact.  As a
@@ -4116,13 +4116,6 @@ configuration files (e.g., @file{.cshrc}), but from the 
file
 @file{~/.MacOSX/environment.plist}.  Either include your path settings
 there, or start Emacs and IDLWAVE from the shell.
 
-@item @strong{I get errors like @samp{Symbol's function is void:
-overlayp}}
-
-You don't have the @samp{fsf-compat} package installed, which IDLWAVE
-needs to run under XEmacs.  Install it, or find an XEmacs distribution
-which includes it by default.
-
 @item @strong{I'm getting errors like @samp{Symbol's value as variable is void:
 cl-builtin-gethash} on completion or routine info.}
 
@@ -4261,20 +4254,6 @@ is updated).
 Starting with IDL 6.2, the HTML help and its catalog are
 distributed with IDL, and so should never be inconsistent.
 
-@item @strong{I get errors such as @samp{void-variable
-browse-url-browser-function} or similar when attempting to load IDLWAVE
-under XEmacs.}
-
-You don't have the @samp{browse-url} (or other required) XEmacs package.
-Unlike Emacs, XEmacs distributes many packages separately from the
-main program.  IDLWAVE is actually among these, but is not always the
-most up to date.  When installing IDLWAVE as an XEmacs package, it
-should prompt you for required additional packages.  When installing it
-from source, it won't and you'll get this error.  The easiest solution
-is to install all the packages when you install XEmacs (the so-called
-@samp{sumo} bundle).  The minimum set of XEmacs packages required by
-IDLWAVE is @samp{fsf-compat, xemacs-base, mail-lib}.
-
 @end enumerate
 
 @node GNU Free Documentation License
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index c3b7b0b0f6..0c95b388cb 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -38,7 +38,6 @@ Con@TeX{}t
 @set SUPPORTADDRESS @AUCTeX{} user mailing list (@email{auctex@@gnu.org})
 @set DEVELADDRESS @AUCTeX{} developer mailing list 
(@email{auctex-devel@@gnu.org})
 @set BUGADDRESS @AUCTeX{} bug mailing list (@email{bug-auctex@@gnu.org})
-@set XEMACSFTP @uref{ftp://ftp.xemacs.org/pub/xemacs/packages/,XEmacs FTP site}
 @c %**end of header
 
 @copying
@@ -249,10 +248,7 @@ reports or suggestions.
 @cindex Installation
 
 @RefTeX{} has been bundled and pre-installed with Emacs since
-version 20.2.  It has also been bundled and pre-installed with XEmacs
-19.16--20.x.  XEmacs 21.x users want to install the corresponding
-plug-in package which is available from the @value{XEMACSFTP}.  See the
-XEmacs 21.x documentation on package installation for details.
+version 20.2.
 
 @findex turn-on-reftex
 @findex reftex-mode
@@ -3584,7 +3580,7 @@ the @value{BUGADDRESS}.
 
 There are also several Usenet groups which have competent readers who
 might be able to help: @code{comp.emacs}, @code{gnu.emacs.help},
-@code{comp.emacs.xemacs}, and @code{comp.text.tex}.
+and @code{comp.text.tex}.
 
 Thanks to the people on the Net who have used @RefTeX{} and helped
 developing it with their reports.  In particular thanks to @i{Ralf
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index c72322811b..98c8d0c302 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2329,8 +2329,23 @@ terminals display them as 1-column glyphs.  Again, this 
causes cursor
 addressing to get out of sync and eventually messes up the display.
 
 One possible workaround for problems caused by character composition
-is to turn off 'auto-composition-mode' on Kitty terminals.
+is to turn off 'auto-composition-mode' on Kitty terminals, e.g. by
+customizing the 'auto-composition-mode' variable to have as value a
+string that the 'tty-type' function returns on those terminals.
 
+*** Display artifacts on the Alacritty text terminal
+
+This terminal is known to cause problems with Emoji sequences: when
+displaying them, the Emacs text-mode frame could show gaps and other
+visual artifacts.
+
+The solution is to disable 'auto-composition-mode' on these
+terminals, for example, like this:
+
+  (setq auto-composition-mode "alacritty")
+
+This disables 'auto-composition-mode' on frames that display on
+terminals of this type.
 
 * Runtime problems specific to individual Unix variants
 
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index d6360e5022..0973f2bc5f 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -176,7 +176,7 @@ If INTERACTIVE is non-nil, don't compile the fortune file 
afterwards."
          (fortune-compile file)))))
 
 (defun fortune-ask-file ()
-  "Asks the user for a file name."
+  "Ask the user for the file name of the fortune file."
   (expand-file-name
    (read-file-name
     "Fortune file to use: "