mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 22:41:06 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-26

Browse source 
90bea37 ; * etc/PROBLEMS: Fix fvwm version number in last commit
af82d1f * etc/PROBLEMS: Document stickyness problem with FVWM (Bug#31...
4a3aed2 Update Emacs Lisp Intro to match current behavior
21f2247 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
3257085 Fix previous commit
6d23525 Fix typos in several manuals (Bug#31610)
9188291 Add detailed documentation about lock files
e5471b2 Add commentary for subtle aspect of frame.el

Conflicts:
	doc/lispintro/emacs-lisp-intro.texi
This commit is contained in:
Glenn Morris 2018-06-02 10:29:37 -07:00
commit 02c7d45d49
12 changed files with 77 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

63
doc/lispintro/emacs-lisp-intro.texi
View file

@ -484,7 +484,7 @@ Narrowing and Widening
@code{car}, @code{cdr}, @code{cons}: Fundamental Functions
* Strange Names:: An historical aside: why the strange names?
* Strange Names:: A historical aside: why the strange names?
* car & cdr:: Functions for extracting part of a list.
* cons:: Constructing a list.
* nthcdr:: Calling @code{cdr} repeatedly.
@ -1818,10 +1818,12 @@ You will create a @file{*Backtrace*} buffer that says:
---------- Buffer: *Backtrace* ----------
Debugger entered--Lisp error: (void-function fill-column)
(fill-column)
eval((fill-column))
eval-last-sexp-1(nil)
eval((fill-column) 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
@ -1868,9 +1870,11 @@ says:
---------- Buffer: *Backtrace* ----------
Debugger entered--Lisp error: (void-variable +)
eval(+)
eval-last-sexp-1(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
@ -2137,10 +2141,12 @@ You will create and enter a @file{*Backtrace*} buffer that says:
Debugger entered--Lisp error:
(wrong-type-argument number-or-marker-p hello)
+(2 hello)
eval((+ 2 'hello))
eval-last-sexp-1(nil)
eval((+ 2 'hello) nil)
elisp--eval-last-sexp(t)
eval-last-sexp(nil)
call-interactively(eval-last-sexp)
funcall-interactively(eval-print-last-sexp nil)
call-interactively(eval-print-last-sexp nil nil)
command-execute(eval-print-last-sexp)
---------- Buffer: *Backtrace* ----------
@end group
@end smallexample
@ -6797,7 +6803,7 @@ will see @code{cons} as well as two variants on @code{cdr},
namely, @code{setcdr} and @code{nthcdr}. (@xref{copy-region-as-kill}.)
@menu
* Strange Names:: An historical aside: why the strange names?
* Strange Names:: A historical aside: why the strange names?
* car & cdr:: Functions for extracting part of a list.
* cons:: Constructing a list.
* nthcdr:: Calling @code{cdr} repeatedly.
@ -7678,7 +7684,7 @@ The first part of the code looks like this:
@end smallexample
@noindent
@code{char-table-p} is an hitherto unseen function. It determines
@code{char-table-p} is a hitherto unseen function. It determines
whether its argument is a character table. When it is, it sets the
character passed to @code{zap-to-char} to one of them, if that
character exists, or to the character itself. (This becomes important
@ -18104,10 +18110,11 @@ Debugger entered--Lisp error: (void-function 1=)
triangle-bugged(4)
@end group
@group
eval((triangle-bugged 4))
eval-last-sexp-1(nil)
eval-last-sexp(nil)
call-interactively(eval-last-sexp)
eval((triangle-bugged 4) nil)
eval-expression((triangle-bugged 4) nil nil 127)
funcall-interactively(eval-expression (triangle-bugged 4) nil nil 127)
call-interactively(eval-expression nil nil)
command-execute(eval-expression)
---------- Buffer: *Backtrace* ----------
@end group
@end smallexample
@ -18221,12 +18228,13 @@ function:
---------- Buffer: *Backtrace* ----------
Debugger entered--entering a function:
* triangle-bugged(5)
eval((triangle-bugged 5))
eval((triangle-bugged 5) nil)
@end group
@group
eval-last-sexp-1(nil)
eval-last-sexp(nil)
call-interactively(eval-last-sexp)
eval-expression((triangle-bugged 5) nil nil 127)
funcall-interactively(eval-expression (triangle-bugged 5) nil nil 127)
call-interactively(eval-expression nil nil)
command-execute(eval-expression)
---------- Buffer: *Backtrace* ----------
@end group
@end smallexample
@ -18245,9 +18253,11 @@ Debugger entered--beginning evaluation of function call form:
eval((triangle-bugged 5))
@end group
@group
eval-last-sexp-1(nil)
eval-last-sexp(nil)
call-interactively(eval-last-sexp)
eval((triangle-bugged 5) nil)
eval-expression((triangle-bugged 5) nil nil 127)
funcall-interactively(eval-expression (triangle-bugged 5) nil nil 127)
call-interactively(eval-expression nil nil)
command-execute(eval-expression)
---------- Buffer: *Backtrace* ----------
@end group
@end smallexample
@ -18272,12 +18282,13 @@ Debugger entered--beginning evaluation of function call form:
* (let ((total 0)) (while (> number 0) (setq total ...)
(setq number ...)) total)
* triangle-bugged(5)
eval((triangle-bugged 5))
eval((triangle-bugged 5) nil)
@group
@end group
eval-last-sexp-1(nil)
eval-last-sexp(nil)
call-interactively(eval-last-sexp)
eval-expression((triangle-bugged 5) nil nil 127)
funcall-interactively(eval-expression (triangle-bugged 5) nil nil 127)
call-interactively(eval-expression nil nil)
command-execute(eval-expression)
---------- Buffer: *Backtrace* ----------
@end group
@end smallexample