2 files changed, 9 insertions, 11 deletions
diff --git a/src/api/vim.c b/src/api/vim.c
index 9b84cd30b1..3d449678f4 100644
--- a/src/api/vim.c
+++ b/src/api/vim.c
@@ -136,15 +136,14 @@ void vim_change_directory(String dir, Error *err)
   try_end(err);
 }
 
-String vim_get_current_line(void)
+String vim_get_current_line(Error *err)
 {
-  Error stub;
-  return buffer_get_line(curbuf->b_fnum, curwin->w_cursor.lnum - 1, &stub);
+  return buffer_get_line(curbuf->b_fnum, curwin->w_cursor.lnum - 1, err);
 }
 
-void vim_set_current_line(String line)
+void vim_set_current_line(Object line, Error *err)
 {
-  abort();
+  buffer_set_line(curbuf->b_fnum, curwin->w_cursor.lnum - 1, line, err);
 }
 
 Object vim_get_var(bool special, String name, Error *err)
diff --git a/src/api/vim.h b/src/api/vim.h
index 8cc7650410..8335081de7 100644
--- a/src/api/vim.h
+++ b/src/api/vim.h
@@ -18,10 +18,7 @@ void vim_push_keys(String str);
 void vim_command(String str, Error *err);
 
 /// Evaluates the expression str using the vim internal expression
-/// evaluator (see |expression|).  Returns the expression result as:
-/// - a string if the Vim expression evaluates to a string or number
-/// - a list if the Vim expression evaluates to a Vim list
-/// - a dictionary if the Vim expression evaluates to a Vim dictionary
+/// evaluator (see |expression|).
 /// Dictionaries and lists are recursively expanded.
 ///
 /// @param str The expression str
@@ -49,13 +46,15 @@ void vim_change_directory(String dir, Error *err);
 
 /// Return the current line
 ///
+/// @param[out] err Details of an error that may have occurred
 /// @return The current line string
-String vim_get_current_line(void);
+String vim_get_current_line(Error *err);
 
 /// Sets the current line
 ///
 /// @param line The line contents
-void vim_set_current_line(String line);
+/// @param[out] err Details of an error that may have occurred
+void vim_set_current_line(Object line, Error *err);
 
 /// Gets a global or special variable
 ///