master 5a9e237 3/5: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 5a9e237e154f2445e2c198cd4491b26a5a962dcf
Merge: fecdc1a 9b35b0c
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    
    9b35b0c99c ; * lisp/man.el (Man-mode): Fix formatting.
    abca75d2e9 ; Fix typos; change "Emacs-Lisp" to "Emacs Lisp"
---
 doc/lispref/debugging.texi | 2 +-
 doc/lispref/streams.texi   | 2 +-
 lisp/calendar/holidays.el  | 2 +-
 lisp/gnus/gnus-start.el    | 4 ++--
 lisp/man.el                | 4 ++--
 lisp/play/handwrite.el     | 2 +-
 lisp/ses.el                | 2 +-
 test/file-organization.org | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index 29a0ab7..3fea604 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -147,7 +147,7 @@ set @code{debug-ignored-errors} to @code{nil}.
 If this variable has a non-@code{nil} value (the default), running the
 command @code{eval-expression} causes @code{debug-on-error} to be
 temporarily bound to @code{t}.  @xref{Lisp Eval,, Evaluating
-Emacs-Lisp Expressions, emacs, The GNU Emacs Manual}.
+Emacs Lisp Expressions, emacs, The GNU Emacs Manual}.
 
 If @code{eval-expression-debug-on-error} is @code{nil}, then the value
 of @code{debug-on-error} is not changed during @code{eval-expression}.
diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi
index d40ec8d..2cd61ad 100644
--- a/doc/lispref/streams.texi
+++ b/doc/lispref/streams.texi
@@ -859,7 +859,7 @@ exceeding this limit is abbreviated with an ellipsis.  A 
value of
 These are the values for @code{print-length} and @code{print-level}
 used by @code{eval-expression}, and thus, indirectly, by many
 interactive evaluation commands (@pxref{Lisp Eval,, Evaluating
-Emacs-Lisp Expressions, emacs, The GNU Emacs Manual}).
+Emacs Lisp Expressions, emacs, The GNU Emacs Manual}).
 @end defopt
 
   These variables are used for detecting and reporting circular
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 182e99a..444a0e5 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -310,7 +310,7 @@ to the list.  To include the phases of the moon, add
 
      (lunar-phases)
 
-to the holiday list, where `lunar-phases' is an Emacs-Lisp function that
+to the holiday list, where `lunar-phases' is an Emacs Lisp function that
 you've written to return a (possibly empty) list of the relevant VISIBLE dates
 with descriptive strings such as
 
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index e4f05de..615f8df 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -72,7 +72,7 @@ uses considerably less memory."
                  (const :tag "Write directly to file" nil)))
 
 (defcustom gnus-init-file (nnheader-concat gnus-home-directory ".gnus")
-  "Your Gnus Emacs-Lisp startup file name.
+  "Your Gnus Emacs Lisp startup file name.
 If a file with the `.el' or `.elc' suffixes exists, it will be read instead."
   :group 'gnus-start
   :type 'file)
@@ -83,7 +83,7 @@ If a file with the `.el' or `.elc' suffixes exists, it will 
be read instead."
               (directory-file-name installation-directory))
              "site-lisp/gnus-init")
     (error nil))
-  "The site-wide Gnus Emacs-Lisp startup file name, or nil if none.
+  "The site-wide Gnus Emacs Lisp startup file name, or nil if none.
 If a file with the `.el' or `.elc' suffixes exists, it will be read instead."
   :group 'gnus-start
   :type '(choice file (const nil)))
diff --git a/lisp/man.el b/lisp/man.el
index 6427241..1a82b12 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1541,8 +1541,8 @@ The following man commands are available in the buffer.  
Try
 
 \\[man]       Prompt to retrieve a new manpage.
 \\[Man-follow-manual-reference]       Retrieve reference in SEE ALSO section.
-\\[Man-next-manpage]   Jump to next manpage in circular list.
-\\[Man-previous-manpage]   Jump to previous manpage in circular list.
+\\[Man-next-manpage]     Jump to next manpage in circular list.
+\\[Man-previous-manpage]     Jump to previous manpage in circular list.
 \\[Man-next-section]       Jump to next manpage section.
 \\[Man-previous-section]       Jump to previous manpage section.
 \\[Man-goto-section]       Go to a manpage section.
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index f69e062..7b4a59b 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -45,7 +45,7 @@
 ;;  Installation
 ;;
 ;; type at your prompt "emacs -l handwrite.el" or put this file on your
-;; Emacs-Lisp load path, add the following into your init file:
+;; Emacs Lisp load path, add the following into your init file:
 ;;
 ;;                (require 'handwrite)
 ;;
diff --git a/lisp/ses.el b/lisp/ses.el
index 5707067..a2e6033 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -378,7 +378,7 @@ area of a spreadsheet.")
 ;;  "Side-effect variables".  They are set in one function, altered in
 ;;  another as a side effect, then read back by the first, as a way of
 ;;  passing back more than one value.  These declarations are just to make
-;;  the compiler happy, and to conform to standard Emacs-Lisp practice (I
+;;  the compiler happy, and to conform to standard Emacs Lisp practice (I
 ;;  think the make-local-variable trick above is cleaner).
 ;;
 
diff --git a/test/file-organization.org b/test/file-organization.org
index 34bd0b9..64c0755 100644
--- a/test/file-organization.org
+++ b/test/file-organization.org
@@ -1,10 +1,10 @@
-#+TITLE: The Location of Emacs-Lisp Tests
+#+TITLE: The Location of Emacs Lisp Tests
 
 
 
 * The Main Emacs Repository
 
-The Emacs repository contains a very large number of Emacs-Lisp files, many of
+The Emacs repository contains a very large number of Emacs Lisp files, many of
 which pre-date both formal package support for Emacs and automated unit
 testing.