From eb0e94f71b1f44cebf7ae5c1bcff348264af6cef Mon Sep 17 00:00:00 2001
From: Jakob Schnitzer <mail@jakobschnitzer.de>
Date: Thu, 30 Mar 2017 22:03:52 +0200
Subject: api: {get,set}_option should {get,set} global value of local options
 (#6405)

- nvim_get_option should return the global default of a local option.
- nvim_set_option should set the global default of a local option.
---
 src/nvim/api/private/helpers.c | 2 +-
 src/nvim/api/vim.c             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index b245132ba7..fe15b28041 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -289,7 +289,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
     }
   }
 
-  int opt_flags = (type ? OPT_LOCAL : OPT_GLOBAL);
+  int opt_flags = (type == SREQ_GLOBAL) ? OPT_GLOBAL : OPT_LOCAL;
 
   if (flags & SOPT_BOOL) {
     if (value.type != kObjectTypeBoolean) {
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 975446057c..6926436d2f 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -440,7 +440,7 @@ Object nvim_get_vvar(String name, Error *err)
 ///
 /// @param name     Option name
 /// @param[out] err Error details, if any
-/// @return         Option value
+/// @return         Option value (global)
 Object nvim_get_option(String name, Error *err)
     FUNC_API_SINCE(1)
 {
-- 
cgit