diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-10-25 09:34:37 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-10-25 09:34:37 -0700 |
| commit | 33785495722f9f75cf50f7beabda8859399403d9 (patch) | |
| tree | 78d085ddc3f53009d40199a2cc8be50cdf8bb508 /doc/lispintro | |
| parent | 8d0f7e717b1491215917e8c46beae91d2849ada7 (diff) | |
| parent | a2c17e115eea1ac026e80bce023c1f8587228c90 (diff) | |
| download | emacs-33785495722f9f75cf50f7beabda8859399403d9.tar.gz | |
Merge from origin/emacs-28
a2c17e115e (origin/emacs-28) Merge branch 'emacs-28' of git.savannah....
fde56eeb76 Revert "Fix a typo in emacs-lisp-intro.texi"
4779d3ba19 * doc/lispref/functions.texi (Mapping Functions): Use #' w...
85ea3f7f47 Fix issue with interpreting ANSI codes in eshell
50f9436146 image-dired: Doc fix to better explain thumbnail generation
bb475e10b9 Clarify two image-dired docstrings
f5b4bb4a6f Fix flymake example backend conditions in the manual
0771d8939a * etc/PROBLEMS: Mention problems with regexp matcher. (Bu...
ee579033b9 * test/lisp/repeat-tests.el: New file.
7385a7667f * lisp/tab-bar.el (tab-bar-move-repeat-map): Fix alias bin...
56caf1c9b8 Use restrictive umask when creating image-dired data
3b5de7f991 ; lisp/transient.el: Revert some misguided stylistic fixes.
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 5ce46ea0f79..fba10944a1b 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -1177,7 +1177,7 @@ are different from the meaning the letters make as a word. For example, the word for the South American sloth, the @samp{ai}, is completely different from the two words, @samp{a}, and @samp{i}. -There are many kinds of atoms in nature but only a few in Lisp: for +There are many kinds of atom in nature but only a few in Lisp: for example, @dfn{numbers}, such as 37, 511, or 1729, and @dfn{symbols}, such as @samp{+}, @samp{foo}, or @samp{forward-line}. The words we have listed in the examples above are all symbols. In everyday Lisp |