[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 45cdc89: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master 45cdc89: Merge from origin/emacs-27 |
Date: |
Fri, 16 Jul 2021 11:03:24 -0400 (EDT) |
branch: master
commit 45cdc89986bb4ee60d7b64ee6ba0f717869aae5a
Merge: d8d9504 7ac411a
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-27
7ac411ae2c (origin/emacs-27) ; * src/data.c (Fcar, Fcdr): Doc fix.
0d9e1826f7 One more minor update of the Emacs manual for 19th printing
92616d30e0 ; Fix let-alist Texinfo markup
c13acf8e34 ; * doc/emacs/mule.texi (International Chars): Mention 'de...
---
doc/emacs/back.texi | 37 ++++++++++++++++++-------------------
doc/emacs/book-spine.texi | 2 +-
doc/emacs/emacs.texi | 2 +-
doc/emacs/mule.texi | 6 ++++--
doc/lispref/lists.texi | 4 ++--
src/data.c | 8 ++++----
6 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/doc/emacs/back.texi b/doc/emacs/back.texi
index 549e0e9..ae0121e 100644
--- a/doc/emacs/back.texi
+++ b/doc/emacs/back.texi
@@ -15,8 +15,8 @@
@sp 1
@quotation
-GNU Emacs is much @strong{more than a text editor}; over the years, it
-has expanded to become @strong{an entire workflow environment},
+GNU Emacs is much @strong{more than a text editor;} over the years, it
+has expanded to become @strong{an entire workflow environment,}
impressing programmers with its integrated debugging and
project-management features. It is also a multi-lingual word
processor, can handle all your email and Usenet news needs, display
@@ -26,7 +26,7 @@ Features include:
@itemize @bullet
@item
-Special editing modes for @strong{27 programming languages}, including C,
+Special editing modes for @strong{27 programming languages,} including C,
C@t{++}, Fortran, Java, JavaScript, Lisp, Objective C, Pascal, Perl,
and Scheme.
@@ -36,7 +36,7 @@ and creating Makefiles for GNU/Linux, UNIX, Windows/DOS, and
VMS
systems.
@item
-Support for typing and displaying in @strong{60 non-English languages},
+Support for typing and displaying in @strong{60 non-English languages,}
including Arabic, Chinese, Czech, Hebrew, Hindi, Japanese, Korean,
Russian, Vietnamese, and all Western European languages.
@@ -52,7 +52,7 @@ editing modes for @LaTeX{} and @TeX{} are included).
@strong{Compile} and @strong{debug} from inside Emacs.
@item
-Maintain program @strong{ChangeLogs}.
+Maintain program @strong{ChangeLogs.}
@item
Flag, move, and delete files and sub-directories recursively
@@ -74,26 +74,25 @@ And much more!
@end itemize
@end itemize
-And when you tire of all the work you can accomplish with it, Emacs
-contains games to play.
-
Emacs comes with an introductory online tutorial available in many
-languages, and this manual picks up where that tutorial ends. It
-explains the full range of the power of Emacs, now up to @strong{version
-27.2}, and contains reference material useful to expert users. It
-also includes appendices with specific material about X and GTK
-resources, and with details for users of macOS and Microsoft Windows.
+languages, and this nineteenth edition of the manual picks up where
+that tutorial ends. It explains the full range of the power of Emacs,
+now up to @strong[version 27.2,} and contains reference material
+useful to expert users. It also includes appendices with specific
+material about X and GTK resources, and with details for users of
+macOS and Microsoft Windows.
-Appendices are included, with specific material about X and GTK
-resources, and with details for users of Macintosh and Microsoft OS.
+And when you tire of all the work you can accomplish with it, Emacs
+contains games to play.
-@strong{About the original and principal Author:}
+@strong{About the original and principal author:}
-Richard M.@: Stallman developed the first Emacs in 1975 and wrote GNU
+Richard M.@: Stallman developed the first Emacs in 1976 and wrote GNU
Emacs in 1984/85. He has received the ACM Grace Hopper Award, a
MacArthur Foundation fellowship, the Electronic Frontier Foundation's
-Pioneer award, and the Takeda Award for Social/Economic Betterment, as
-well as several honorary doctorates.
+Pioneer award, the Takeda Award for Social/Economic Betterment, and
+the ACM Software and System Award, as well as several doctorates
+honoris causa.
@end quotation
@hfil
diff --git a/doc/emacs/book-spine.texi b/doc/emacs/book-spine.texi
index 17fccee..20e23ca 100644
--- a/doc/emacs/book-spine.texi
+++ b/doc/emacs/book-spine.texi
@@ -13,7 +13,7 @@
@center @titlefont{GNU Emacs Manual}
@sp 5
-@center @value{EDITION} Edition, for Emacs Version @value{EMACSVER}
+@center @value{EDITION} edition, for Emacs Version @value{EMACSVER}
@sp 5
@center by Richard M.@: Stallman et al.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index c895b01..d2011eb 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -95,7 +95,7 @@ Boston, MA 02110-1301 USA @*
ISBN 978-0-9831592-8-5
@sp 2
-Cover art by Etienne Suvasa; cover design by Matt Lee.
+Cover art by Etienne Suvasa; cover design by FSF staff.
@end titlepage
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 922eec7..22b3677 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -174,8 +174,10 @@ characters in the range @code{#x0080..#x00FF}.
@cindex font of character at point
@cindex text properties at point
@cindex face at point
- With a prefix argument (@kbd{C-u C-x =}), this command displays a
-detailed description of the character in a window:
+@findex describe-char
+ With a prefix argument (@kbd{C-u C-x =}), this command additionally
+calls the command @code{describe-char}, which displays a detailed
+description of the character:
@itemize @bullet
@item
diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi
index 2805b1f..ac99835 100644
--- a/doc/lispref/lists.texi
+++ b/doc/lispref/lists.texi
@@ -1804,7 +1804,7 @@ through a simple example:
(let-alist colors
(if (eq .rose 'red)
.lily))
-=> white
+ @result{} white
@end lisp
The @var{body} is inspected at compilation time, and only the symbols
@@ -1820,7 +1820,7 @@ Nested association lists is supported:
(let-alist colors
(if (eq .rose 'red)
.lily.belladonna))
-=> yellow
+ @result{} yellow
@end lisp
Nesting @code{let-alist} inside each other is allowed, but the code in
diff --git a/src/data.c b/src/data.c
index 059f31e..9adfafa 100644
--- a/src/data.c
+++ b/src/data.c
@@ -581,8 +581,8 @@ DEFUN ("condition-variable-p", Fcondition_variable_p,
Scondition_variable_p,
/* Extract and set components of lists. */
DEFUN ("car", Fcar, Scar, 1, 1, 0,
- doc: /* Return the car of LIST. If arg is nil, return nil.
-Error if arg is not nil and not a cons cell. See also `car-safe'.
+ doc: /* Return the car of LIST. If LIST is nil, return nil.
+Error if LIST is not nil and not a cons cell. See also `car-safe'.
See Info node `(elisp)Cons Cells' for a discussion of related basic
Lisp concepts such as car, cdr, cons cell and list. */)
@@ -599,8 +599,8 @@ DEFUN ("car-safe", Fcar_safe, Scar_safe, 1, 1, 0,
}
DEFUN ("cdr", Fcdr, Scdr, 1, 1, 0,
- doc: /* Return the cdr of LIST. If arg is nil, return nil.
-Error if arg is not nil and not a cons cell. See also `cdr-safe'.
+ doc: /* Return the cdr of LIST. If LIST is nil, return nil.
+Error if LIST is not nil and not a cons cell. See also `cdr-safe'.
See Info node `(elisp)Cons Cells' for a discussion of related basic
Lisp concepts such as cdr, car, cons cell and list. */)