From: Juri Linkov <juri@linkov.net>
Date: Tue, 14 Jul 2020 00:12:06 +0000 (+0300)
Subject: Improve documentation of "C-u C-x ="
X-Git-Tag: emacs-28.0.90~7010
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7b0216fbc0a1051e6f3bee5bf6c2435b2b3a1ddf;p=emacs.git

Improve documentation of "C-u C-x ="

* doc/emacs/mule.texi (International Chars): Update the
composition information displayed by "C-u C-x =".  (Bug#42256)
---

diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 0f07d286cda..6eff0ca0d22 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -202,7 +202,7 @@ terminal, the code(s) sent to the terminal.
 @item
 If the character was composed on display with any following characters
 to form one or more grapheme clusters, the composition information:
-the font glyphs if the frame is on a graphical display, else the
+the font glyphs if the frame is on a graphical display, and the
 characters that were composed.
 
 @item
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 4de1a7b7005..6246f59d495 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -775,7 +775,7 @@ The character information includes:
                                     (setq glyph (lgstring-glyph gstring from)))
                           (insert (format "  %S\n" glyph))
                           (setq from (1+ from)))
-                        (insert "from these character(s):\n")
+                        (insert "from these characters:\n")
                         (dotimes (i (lgstring-char-len gstring))
                           (let ((char (lgstring-char gstring i)))
                             (insert (format "  %c (#x%x) %s\n"