aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2015-05-06 10:50:48 -0400
committerStefan Monnier2015-05-06 10:50:48 -0400
commit1340aefd96c13e4e18e1c6b7f5b6fae4611f5265 (patch)
tree7d04b26f8f7820ed2bc872b8851bc1d03f18b04b /src
parent1f052a5f26250d726618570a816ddb6fd0cc11a0 (diff)
downloademacs-1340aefd96c13e4e18e1c6b7f5b6fae4611f5265.tar.gz
emacs-1340aefd96c13e4e18e1c6b7f5b6fae4611f5265.zip
* lisp/emacs-lisp/testcover.el: Don't use edebug--read (bug#20487)
* lisp/emacs-lisp/testcover.el: Use lexical-binding. (testcover--read): Rename from testcover-read. Change calling convention. Use edebug-read-and-maybe-wrap-form now that edebug-read is gone. (testcover-start): Use add-function. Move edebug-all-defs binding to testcover--read. (testcover-this-defun): Tighten scope of edebug-all-defs binding. (testcover-mark): Remove unused var `item'. * src/lread.c (syms_of_lread): Default load-read-function to `read'.
Diffstat (limited to 'src')
-rw-r--r--src/alloc.c2
-rw-r--r--src/lread.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 688363d06e3..030c6e06ba8 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5762,7 +5762,7 @@ garbage_collect_1 (void *end)
5762 after GC. It's important to scan finalizers at this stage so 5762 after GC. It's important to scan finalizers at this stage so
5763 that we can be sure that unmarked finalizers are really 5763 that we can be sure that unmarked finalizers are really
5764 unreachable except for references from their associated functions 5764 unreachable except for references from their associated functions
5765 and from other finalizers. */ 5765 and from other finalizers. */
5766 5766
5767 queue_doomed_finalizers (&doomed_finalizers, &finalizers); 5767 queue_doomed_finalizers (&doomed_finalizers, &finalizers);
5768 mark_finalizer_list (&doomed_finalizers); 5768 mark_finalizer_list (&doomed_finalizers);
diff --git a/src/lread.c b/src/lread.c
index a84450a4364..26c19d8338b 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4592,8 +4592,10 @@ of the file, regardless of whether or not it has the `.elc' extension. */);
4592 4592
4593 DEFVAR_LISP ("load-read-function", Vload_read_function, 4593 DEFVAR_LISP ("load-read-function", Vload_read_function,
4594 doc: /* Function used by `load' and `eval-region' for reading expressions. 4594 doc: /* Function used by `load' and `eval-region' for reading expressions.
4595The default is nil, which means use the function `read'. */); 4595Called with a single argument (the stream from which to read).
4596 Vload_read_function = Qnil; 4596The default is to use the function `read'. */);
4597 DEFSYM (Qread, "read");
4598 Vload_read_function = Qread;
4597 4599
4598 DEFVAR_LISP ("load-source-file-function", Vload_source_file_function, 4600 DEFVAR_LISP ("load-source-file-function", Vload_source_file_function,
4599 doc: /* Function called in `load' to load an Emacs Lisp source file. 4601 doc: /* Function called in `load' to load an Emacs Lisp source file.