summaryrefslogtreecommitdiff
path: root/src/edit.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-11-05 07:13:41 +0100
committerBram Moolenaar <Bram@vim.org>2013-11-05 07:13:41 +0100
commit6bcbcc59be58d0c3b3cd53ac105c6eb7d0b87f06 (patch)
tree3027528e1aeb2edb9e7efe94f67e1cb1821d185f /src/edit.c
parent0958e0fbe7307f0b46b8f692cbd097fbf93c90f6 (diff)
downloadvim-git-6bcbcc59be58d0c3b3cd53ac105c6eb7d0b87f06.tar.gz
updated for version 7.4.069v7.4.069
Problem: Cannot right shift lines starting with #. Solution: Allow the right shift when 'cino' contains #N with N > 0. (Christian Brabandt) Refactor parsing 'cino', store the values in the buffer.
Diffstat (limited to 'src/edit.c')
-rw-r--r--src/edit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/edit.c b/src/edit.c
index 02d822524..b4469e855 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8958,7 +8958,7 @@ ins_bs(c, mode, inserted_space_p)
*inserted_space_p = FALSE;
if (p_sta && in_indent)
- ts = (int)get_sw_value();
+ ts = (int)get_sw_value(curbuf);
else
ts = (int)get_sts_value();
/* Compute the virtual column where we want to be. Since
@@ -9647,7 +9647,7 @@ ins_tab()
* When nothing special, insert TAB like a normal character
*/
if (!curbuf->b_p_et
- && !(p_sta && ind && curbuf->b_p_ts != get_sw_value())
+ && !(p_sta && ind && curbuf->b_p_ts != get_sw_value(curbuf))
&& get_sts_value() == 0)
return TRUE;
@@ -9663,7 +9663,7 @@ ins_tab()
AppendToRedobuff((char_u *)"\t");
if (p_sta && ind) /* insert tab in indent, use 'shiftwidth' */
- temp = (int)get_sw_value();
+ temp = (int)get_sw_value(curbuf);
else if (curbuf->b_p_sts != 0) /* use 'softtabstop' when set */
temp = (int)get_sts_value();
else /* otherwise use 'tabstop' */