Merge from origin/emacs-26

07f8f9b (origin/emacs-26) ; * lisp/ldefs-boot.el: Update.
5cec2b0 * etc/HISTORY: Update for Emacs 26.1 release.
7c474e1 * etc/AUTHORS: Update.
ddc7bea ; * ChangeLog.3: Update.
3557460 ; * admin/authors.el: Update.
2f44d2d Note caveat for backward regexp searching in docstring (Bug#3...
3145d08 Update backtrace in Emacs Lisp Intro
43a9c26 Move window-point in bibtex-search-entry
4bb2741 More fixes of Intro to Emacs Lisp
c57c226 ; * doc/emacs/misc.texi (FFAP): Fix a typo.  (Bug#31580)
0a51113 Add a footnote to Emacs Lisp Intro
5eabe4a ; * doc/emacs/msdos.texi (ls in Lisp): Fix a typo.  (Bug#31575)
d5e0ceb * lisp/help.el (with-help-window): Doc fix.  (Bug#31574)
e7952bd Fix some cross-references in emacs-lisp-intro.texi
a897959 Minor copyedits in Emacs manual in macos.texi

Conflicts:
	lisp/ldefs-boot.el

1 files changed, 42 insertions, 19 deletions

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 81f26728e0a..e5a20110125 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -1037,7 +1037,14 @@ putting them between parentheses.  The parentheses mark the boundaries
 of the list.  Sometimes a list is preceded by an apostrophe @samp{'},
 called a @dfn{single-quote} in Lisp.@footnote{A single-quote is an
 abbreviation for the special form @code{quote}; you need not think
-about special forms now.  @xref{Complications}.}  Lists are the basis
+about special forms now.
+@ifnottex
+@xref{Complications}.
+@end ifnottex
+@iftex
+@xref{Lisp Interpreter}.
+@end iftex
+}  Lists are the basis
 of Lisp.
 
 @menu
@@ -1295,11 +1302,13 @@ hand parenthesis of the following list and then type @kbd{C-x C-e}:
 
 @c use code for the number four, not samp.
 @noindent
-You will see the number @code{4} appear in the echo area.  (What
-you have just done is evaluate the list.  The echo area
-is the line at the bottom of the screen that displays or echoes
-text.)  Now try the same thing with a quoted list:  place the cursor
-right after the following list and type @kbd{C-x C-e}:
+You will see the number @code{4} appear in the echo area@footnote{
+Emacs shows integer values in decimal, in octal and in hex, and also
+as a character, but let's ignore this convenience feature for now.
+}.  (What you have just done is evaluate the list.  The echo area is
+the line at the bottom of the screen that displays or echoes text.)
+Now try the same thing with a quoted list: place the cursor right
+after the following list and type @kbd{C-x C-e}:
 
 @smallexample
 '(this is a quoted list)
@@ -1370,10 +1379,12 @@ following in it:
 ---------- Buffer: *Backtrace* ----------
 Debugger entered--Lisp error: (void-function this)
   (this is an unquoted list)
-  eval((this is an unquoted list))
-  eval-last-sexp-1(nil)
+  eval((this is an unquoted list) nil)
+  elisp--eval-last-sexp(nil)
   eval-last-sexp(nil)
-  call-interactively(eval-last-sexp)
+  funcall-interactively(eval-last-sexp nil)
+  call-interactively(eval-last-sexp nil nil)
+  command-execute(eval-last-sexp)
 ---------- Buffer: *Backtrace* ----------
 @end group
 @end smallexample
@@ -4617,16 +4628,25 @@ file, you can use the @code{xref-find-definitions} function to jump to
 it.  @code{xref-find-definitions} works with a wide variety of
 languages, not just Lisp, and C, and it works with non-programming
 text as well.  For example, @code{xref-find-definitions} will jump to
-the various nodes in the Texinfo source file of this document.
+the various nodes in the Texinfo source file of this document
+(provided that you've run the @command{etags} utility to record all
+the nodes in the manuals that come with Emacs; @pxref{Create tags
+Table,,, emacs, The GNU Emacs Manual}).
 
 To use the @code{xref-find-definitions} command, type @kbd{M-.}
 (i.e., press the period key while holding down the @key{META} key, or
 else type the @key{ESC} key and then type the period key), and then,
 at the prompt, type in the name of the function whose source code you
 want to see, such as @code{mark-whole-buffer}, and then type
-@key{RET}.  Emacs will switch buffers and display the source code for
-the function on your screen.  To switch back to your current buffer,
-type @kbd{C-x b @key{RET}}.  (On some keyboards, the @key{META} key is
+@key{RET}.  (If the command doesn't prompt, invoke it with an
+argument: @kbd{C-u M-.}; @pxref{Interactive Options}.)  Emacs will
+switch buffers and display the source code for the function on your
+screen@footnote{
+If instead of showing the source code for a Lisp function, Emacs asks
+you which tags table to visit, invoke @kbd{M-.} from a buffer whose
+major mode is Emacs Lisp or Lisp Interaction.
+}.  To switch back to your current buffer, type @kbd{M-,} or
+@kbd{C-x b @key{RET}}.  (On some keyboards, the @key{META} key is
 labeled @key{ALT}.)
 
 @cindex Library, as term for ``file''
@@ -5298,8 +5318,8 @@ in GNU Emacs 22
 
 The @code{append-to-buffer} function definition inserts text from the
 buffer in which you are currently to a named buffer.  It happens that
-@code{insert-buffer-substring} copies text from another buffer to the
-current buffer, just the reverse---that is why the
+@code{insert-buffer-substring} does just the reverse---it copies text
+from another buffer to the current buffer---that is why the
 @code{append-to-buffer} definition starts out with a @code{let} that
 binds the local symbol @code{oldbuf} to the value returned by
 @code{current-buffer}.
@@ -16401,9 +16421,9 @@ Install @code{graph-symbol}, @code{graph-blank},
 @iftex
 @ref{Readying a Graph, , Readying a Graph},
 @end iftex
-@ifinfo
+@ifnottex
 @ref{Columns of a graph},
-@end ifinfo
+@end ifnottex
 and @code{graph-body-print}.
 
 @need 800
@@ -19182,11 +19202,14 @@ Local variables can only be accessed
 within the @code{let} that defines them or the function that specifies
 them in an argument list (and within expressions called by them).
 
-@ignore
 @c texi2dvi fails when the name of the section is within ifnottex ...
+@ifnottex
 (@xref{Prevent confusion, , @code{let} Prevents Confusion}, and
+@end ifnottex
+@iftex
+(@xref{Permanent Installation, , @code{let} Prevents Confusion}, and
+@end iftex
 @ref{defun, , The @code{defun} Macro}.)
-@end ignore
 
 @node yank
 @appendixsec @code{yank}