diff options
| author | Eli Zaretskii | 2018-06-01 17:11:36 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2018-06-01 17:11:36 +0300 |
| commit | 4a3aed2507a3e347fc0488c21cbc0a898efef6b7 (patch) | |
| tree | bd59ef591aa6d182875b1a1d2c96629d45f65797 /doc | |
| parent | 21f2247cf49d2332dd3f6d696318c9c65fd26c83 (diff) | |
| download | emacs-4a3aed2507a3e347fc0488c21cbc0a898efef6b7.tar.gz emacs-4a3aed2507a3e347fc0488c21cbc0a898efef6b7.zip | |
Update Emacs Lisp Intro to match current behavior
* doc/lispintro/emacs-lisp-intro.texi (Wrong Type of Argument)
(debug, debug-on-entry, Void Function, Void Variable): Update the
*Backtrace* buffer display to current Emacs. (Bug#31654)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 57 |
1 files changed, 34 insertions, 23 deletions
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index a256873ab1d..aad572623a3 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi | |||
| @@ -1818,10 +1818,12 @@ You will create a @file{*Backtrace*} buffer that says: | |||
| 1818 | ---------- Buffer: *Backtrace* ---------- | 1818 | ---------- Buffer: *Backtrace* ---------- |
| 1819 | Debugger entered--Lisp error: (void-function fill-column) | 1819 | Debugger entered--Lisp error: (void-function fill-column) |
| 1820 | (fill-column) | 1820 | (fill-column) |
| 1821 | eval((fill-column)) | 1821 | eval((fill-column) nil) |
| 1822 | eval-last-sexp-1(nil) | 1822 | elisp--eval-last-sexp(nil) |
| 1823 | eval-last-sexp(nil) | 1823 | eval-last-sexp(nil) |
| 1824 | call-interactively(eval-last-sexp) | 1824 | funcall-interactively(eval-last-sexp nil) |
| 1825 | call-interactively(eval-last-sexp nil nil) | ||
| 1826 | command-execute(eval-last-sexp) | ||
| 1825 | ---------- Buffer: *Backtrace* ---------- | 1827 | ---------- Buffer: *Backtrace* ---------- |
| 1826 | @end group | 1828 | @end group |
| 1827 | @end smallexample | 1829 | @end smallexample |
| @@ -1868,9 +1870,11 @@ says: | |||
| 1868 | ---------- Buffer: *Backtrace* ---------- | 1870 | ---------- Buffer: *Backtrace* ---------- |
| 1869 | Debugger entered--Lisp error: (void-variable +) | 1871 | Debugger entered--Lisp error: (void-variable +) |
| 1870 | eval(+) | 1872 | eval(+) |
| 1871 | eval-last-sexp-1(nil) | 1873 | elisp--eval-last-sexp(nil) |
| 1872 | eval-last-sexp(nil) | 1874 | eval-last-sexp(nil) |
| 1873 | call-interactively(eval-last-sexp) | 1875 | funcall-interactively(eval-last-sexp nil) |
| 1876 | call-interactively(eval-last-sexp nil nil) | ||
| 1877 | command-execute(eval-last-sexp) | ||
| 1874 | ---------- Buffer: *Backtrace* ---------- | 1878 | ---------- Buffer: *Backtrace* ---------- |
| 1875 | @end group | 1879 | @end group |
| 1876 | @end smallexample | 1880 | @end smallexample |
| @@ -2137,10 +2141,12 @@ You will create and enter a @file{*Backtrace*} buffer that says: | |||
| 2137 | Debugger entered--Lisp error: | 2141 | Debugger entered--Lisp error: |
| 2138 | (wrong-type-argument number-or-marker-p hello) | 2142 | (wrong-type-argument number-or-marker-p hello) |
| 2139 | +(2 hello) | 2143 | +(2 hello) |
| 2140 | eval((+ 2 (quote hello))) | 2144 | eval((+ 2 'hello) nil) |
| 2141 | eval-last-sexp-1(nil) | 2145 | elisp--eval-last-sexp(t) |
| 2142 | eval-last-sexp(nil) | 2146 | eval-last-sexp(nil) |
| 2143 | call-interactively(eval-last-sexp) | 2147 | funcall-interactively(eval-print-last-sexp nil) |
| 2148 | call-interactively(eval-print-last-sexp nil nil) | ||
| 2149 | command-execute(eval-print-last-sexp) | ||
| 2144 | ---------- Buffer: *Backtrace* ---------- | 2150 | ---------- Buffer: *Backtrace* ---------- |
| 2145 | @end group | 2151 | @end group |
| 2146 | @end smallexample | 2152 | @end smallexample |
| @@ -18103,10 +18109,11 @@ Debugger entered--Lisp error: (void-function 1=) | |||
| 18103 | triangle-bugged(4) | 18109 | triangle-bugged(4) |
| 18104 | @end group | 18110 | @end group |
| 18105 | @group | 18111 | @group |
| 18106 | eval((triangle-bugged 4)) | 18112 | eval((triangle-bugged 4) nil) |
| 18107 | eval-last-sexp-1(nil) | 18113 | eval-expression((triangle-bugged 4) nil nil 127) |
| 18108 | eval-last-sexp(nil) | 18114 | funcall-interactively(eval-expression (triangle-bugged 4) nil nil 127) |
| 18109 | call-interactively(eval-last-sexp) | 18115 | call-interactively(eval-expression nil nil) |
| 18116 | command-execute(eval-expression) | ||
| 18110 | ---------- Buffer: *Backtrace* ---------- | 18117 | ---------- Buffer: *Backtrace* ---------- |
| 18111 | @end group | 18118 | @end group |
| 18112 | @end smallexample | 18119 | @end smallexample |
| @@ -18220,12 +18227,13 @@ function: | |||
| 18220 | ---------- Buffer: *Backtrace* ---------- | 18227 | ---------- Buffer: *Backtrace* ---------- |
| 18221 | Debugger entered--entering a function: | 18228 | Debugger entered--entering a function: |
| 18222 | * triangle-bugged(5) | 18229 | * triangle-bugged(5) |
| 18223 | eval((triangle-bugged 5)) | 18230 | eval((triangle-bugged 5) nil) |
| 18224 | @end group | 18231 | @end group |
| 18225 | @group | 18232 | @group |
| 18226 | eval-last-sexp-1(nil) | 18233 | eval-expression((triangle-bugged 5) nil nil 127) |
| 18227 | eval-last-sexp(nil) | 18234 | funcall-interactively(eval-expression (triangle-bugged 5) nil nil 127) |
| 18228 | call-interactively(eval-last-sexp) | 18235 | call-interactively(eval-expression nil nil) |
| 18236 | command-execute(eval-expression) | ||
| 18229 | ---------- Buffer: *Backtrace* ---------- | 18237 | ---------- Buffer: *Backtrace* ---------- |
| 18230 | @end group | 18238 | @end group |
| 18231 | @end smallexample | 18239 | @end smallexample |
| @@ -18244,9 +18252,11 @@ Debugger entered--beginning evaluation of function call form: | |||
| 18244 | eval((triangle-bugged 5)) | 18252 | eval((triangle-bugged 5)) |
| 18245 | @end group | 18253 | @end group |
| 18246 | @group | 18254 | @group |
| 18247 | eval-last-sexp-1(nil) | 18255 | eval((triangle-bugged 5) nil) |
| 18248 | eval-last-sexp(nil) | 18256 | eval-expression((triangle-bugged 5) nil nil 127) |
| 18249 | call-interactively(eval-last-sexp) | 18257 | funcall-interactively(eval-expression (triangle-bugged 5) nil nil 127) |
| 18258 | call-interactively(eval-expression nil nil) | ||
| 18259 | command-execute(eval-expression) | ||
| 18250 | ---------- Buffer: *Backtrace* ---------- | 18260 | ---------- Buffer: *Backtrace* ---------- |
| 18251 | @end group | 18261 | @end group |
| 18252 | @end smallexample | 18262 | @end smallexample |
| @@ -18271,12 +18281,13 @@ Debugger entered--beginning evaluation of function call form: | |||
| 18271 | * (let ((total 0)) (while (> number 0) (setq total ...) | 18281 | * (let ((total 0)) (while (> number 0) (setq total ...) |
| 18272 | (setq number ...)) total) | 18282 | (setq number ...)) total) |
| 18273 | * triangle-bugged(5) | 18283 | * triangle-bugged(5) |
| 18274 | eval((triangle-bugged 5)) | 18284 | eval((triangle-bugged 5) nil) |
| 18275 | @group | 18285 | @group |
| 18276 | @end group | 18286 | @end group |
| 18277 | eval-last-sexp-1(nil) | 18287 | eval-expression((triangle-bugged 5) nil nil 127) |
| 18278 | eval-last-sexp(nil) | 18288 | funcall-interactively(eval-expression (triangle-bugged 5) nil nil 127) |
| 18279 | call-interactively(eval-last-sexp) | 18289 | call-interactively(eval-expression nil nil) |
| 18290 | command-execute(eval-expression) | ||
| 18280 | ---------- Buffer: *Backtrace* ---------- | 18291 | ---------- Buffer: *Backtrace* ---------- |
| 18281 | @end group | 18292 | @end group |
| 18282 | @end smallexample | 18293 | @end smallexample |