extmark: rename ExtendedMark => Extmark

2 files changed, 6 insertions, 12 deletions

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 58011702ac..9ec96840d1 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -1027,9 +1027,7 @@ ArrayOf(Integer) nvim_buf_get_extmark_by_id(Buffer buffer, Integer ns_id,
     return rv;
   }
 
-  ExtendedMark *extmark = extmark_from_id(buf,
-                                          (uint64_t)ns_id,
-                                          (uint64_t)id);
+  Extmark *extmark = extmark_from_id(buf, (uint64_t)ns_id, (uint64_t)id);
   if (!extmark) {
     return rv;
   }
@@ -1129,7 +1127,7 @@ Array nvim_buf_get_extmarks(Buffer buffer, Integer ns_id,
 
   for (size_t i = 0; i < kv_size(marks); i++) {
     Array mark = ARRAY_DICT_INIT;
-    ExtendedMark *extmark = kv_A(marks, i);
+    Extmark *extmark = kv_A(marks, i);
     ADD(mark, INTEGER_OBJ((Integer)extmark->mark_id));
     ADD(mark, INTEGER_OBJ(extmark->line->lnum-1));
     ADD(mark, INTEGER_OBJ(extmark->col-1));
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 6b69350429..fbfdb27827 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -1512,11 +1512,8 @@ ArrayOf(Dictionary) keymap_array(String mode, buf_T *buf)
 // If throw == true then an error will be raised if nothing
 // was found
 // Returns NULL if something went wrong
-ExtendedMark *extmark_from_id_or_pos(Buffer buffer,
-                                     Integer namespace,
-                                     Object id,
-                                     Error *err,
-                                     bool throw)
+Extmark *extmark_from_id_or_pos(Buffer buffer, Integer namespace, Object id,
+                                Error *err, bool throw)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
 
@@ -1524,7 +1521,7 @@ ExtendedMark *extmark_from_id_or_pos(Buffer buffer,
     return NULL;
   }
 
-  ExtendedMark *extmark = NULL;
+  Extmark *extmark = NULL;
   if (id.type == kObjectTypeArray) {
     if (id.data.array.size != 2) {
       api_set_error(err, kErrorTypeValidation,
@@ -1603,8 +1600,7 @@ bool set_extmark_index_from_obj(buf_T *buf, Integer namespace,
       return false;
     }
 
-    ExtendedMark *extmark = extmark_from_id(buf, (uint64_t)namespace,
-                                            (uint64_t)id);
+    Extmark *extmark = extmark_from_id(buf, (uint64_t)namespace, (uint64_t)id);
     if (extmark) {
       *lnum = extmark->line->lnum;
       *colnr = extmark->col;