diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-10-02 01:31:59 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-10-02 01:31:59 -0400 |
| commit | c3eb6c0563cc95b2134af9fe0ee6f304ddbb0480 (patch) | |
| tree | c907fabe7faf8a9a77aa3bc34d2a3274c65f38fb /src/buffer.c | |
| parent | 1303f55161ae40cc98ccddc37755b58b68840798 (diff) | |
| parent | c55254dcccf53df3e619737bb6670f0a573f27a1 (diff) | |
Merge remote-tracking branch 'origin/feature/noverlay' into noverlay
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/buffer.c b/src/buffer.c index 8d02d705b55..f59fddcbdeb 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4898,15 +4898,15 @@ defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, const char *namestring, static Lisp_Object make_lispy_interval_node (const struct interval_node *node) { - return listn (CONSTYPE_HEAP, 12, + return listn (12, intern (":begin"), - make_number (node->begin), + make_fixnum (node->begin), intern (":end"), - make_number (node->end), + make_fixnum (node->end), intern (":limit"), - make_number (node->limit), + make_fixnum (node->limit), intern (":offset"), - make_number (node->offset), + make_fixnum (node->offset), intern (":rear-advance"), node->rear_advance ? Qt : Qnil, intern (":front-advance"), @@ -4917,7 +4917,7 @@ static Lisp_Object overlay_tree (const struct interval_tree *tree, const struct interval_node *node) { - if (node == &tree->nil) + if (node == ITREE_NULL) return Qnil; return list3 (make_lispy_interval_node (node), overlay_tree (tree, node->left), |