Merge PR #853

1 files changed, 14 insertions, 14 deletions

diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 2b81afdb0c..548d8171a5 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -19,7 +19,7 @@
 /// @return The buffer handle
 Buffer window_get_buffer(Window window, Error *err)
 {
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (!win) {
     return 0;
@@ -36,7 +36,7 @@ Buffer window_get_buffer(Window window, Error *err)
 Position window_get_cursor(Window window, Error *err)
 {
   Position rv = {.row = 0, .col = 0};
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (win) {
     rv.row = win->w_cursor.lnum;
@@ -53,7 +53,7 @@ Position window_get_cursor(Window window, Error *err)
 /// @param[out] err Details of an error that may have occurred
 void window_set_cursor(Window window, Position pos, Error *err)
 {
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (!win) {
     return;
@@ -89,7 +89,7 @@ void window_set_cursor(Window window, Position pos, Error *err)
 /// @return the height in rows
 Integer window_get_height(Window window, Error *err)
 {
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (!win) {
     return 0;
@@ -106,7 +106,7 @@ Integer window_get_height(Window window, Error *err)
 /// @param[out] err Details of an error that may have occurred
 void window_set_height(Window window, Integer height, Error *err)
 {
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (!win) {
     return;
@@ -132,7 +132,7 @@ void window_set_height(Window window, Integer height, Error *err)
 /// @return the width in columns
 Integer window_get_width(Window window, Error *err)
 {
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (!win) {
     return 0;
@@ -149,7 +149,7 @@ Integer window_get_width(Window window, Error *err)
 /// @param[out] err Details of an error that may have occurred
 void window_set_width(Window window, Integer width, Error *err)
 {
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (!win) {
     return;
@@ -176,7 +176,7 @@ void window_set_width(Window window, Integer width, Error *err)
 /// @return The variable value
 Object window_get_var(Window window, String name, Error *err)
 {
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (!win) {
     return (Object) OBJECT_INIT;
@@ -194,7 +194,7 @@ Object window_get_var(Window window, String name, Error *err)
 /// @return The old value
 Object window_set_var(Window window, String name, Object value, Error *err)
 {
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (!win) {
     return (Object) OBJECT_INIT;
@@ -211,7 +211,7 @@ Object window_set_var(Window window, String name, Object value, Error *err)
 /// @return The option value
 Object window_get_option(Window window, String name, Error *err)
 {
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (!win) {
     return (Object) OBJECT_INIT;
@@ -229,7 +229,7 @@ Object window_get_option(Window window, String name, Error *err)
 /// @param[out] err Details of an error that may have occurred
 void window_set_option(Window window, String name, Object value, Error *err)
 {
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (!win) {
     return;
@@ -246,7 +246,7 @@ void window_set_option(Window window, String name, Object value, Error *err)
 Position window_get_position(Window window, Error *err)
 {
   Position rv;
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (win) {
     rv.col = win->w_wincol;
@@ -264,7 +264,7 @@ Position window_get_position(Window window, Error *err)
 Tabpage window_get_tabpage(Window window, Error *err)
 {
   Tabpage rv = 0;
-  win_T *win = find_window(window, err);
+  win_T *win = find_window_by_handle(window, err);
 
   if (win) {
     rv = win_find_tabpage(win)->handle;
@@ -280,6 +280,6 @@ Tabpage window_get_tabpage(Window window, Error *err)
 Boolean window_is_valid(Window window)
 {
   Error stub = {.set = false};
-  return find_window(window, &stub) != NULL;
+  return find_window_by_handle(window, &stub) != NULL;
 }