procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-27

Browse source 
9b35b0c99c ; * lisp/man.el (Man-mode): Fix formatting.
abca75d2e9 ; Fix typos; change "Emacs-Lisp" to "Emacs Lisp"
This commit is contained in:
Glenn Morris 2020-09-09 07:51:14 -07:00
commit 5a9e237e15
8 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/lispref/debugging.texi
View file

@ -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}.

2
doc/lispref/streams.texi
View file

@ -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

2
lisp/calendar/holidays.el
View file

@ -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

4
lisp/gnus/gnus-start.el
View file

@ -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)))

4
lisp/man.el
View file

@ -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.

2
lisp/play/handwrite.el
View file

@ -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)
;;

2
lisp/ses.el
View file

@ -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).
;;

4
test/file-organization.org
View file

@ -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.