[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/noverlay c3eb6c0563 2/2: Merge remote-tracking branch 'origin/fe
From: |
Stefan Monnier |
Subject: |
feature/noverlay c3eb6c0563 2/2: Merge remote-tracking branch 'origin/feature/noverlay' into noverlay |
Date: |
Sun, 2 Oct 2022 01:32:19 -0400 (EDT) |
branch: feature/noverlay
commit c3eb6c0563cc95b2134af9fe0ee6f304ddbb0480
Merge: 1303f55161 c55254dccc
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
Merge remote-tracking branch 'origin/feature/noverlay' into noverlay
---
src/buffer.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/buffer.c b/src/buffer.c
index 8d02d705b5..f59fddcbde 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),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- feature/noverlay c3eb6c0563 2/2: Merge remote-tracking branch 'origin/feature/noverlay' into noverlay,
Stefan Monnier <=