Mercurial > vim

diff src/ops.c @ 5438:878ed73c7070 v7.4.069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.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.
author Bram Moolenaar <bram@vim.org>
date Tue, 05 Nov 2013 07:13:41 +0100
parents d06223965468
children 70c3289803b3
line wrap: on
line diff
--- a/src/ops.c
+++ b/src/ops.c
@@ -336,7 +336,7 @@ shift_line(left, round, amount, call_cha
 {
     int		count;
     int		i, j;
-    int		p_sw = (int)get_sw_value();
+    int		p_sw = (int)get_sw_value(curbuf);
 
     count = get_indent();	/* get current indent */
 
@@ -392,7 +392,7 @@ shift_block(oap, amount)
     int			total;
     char_u		*newp, *oldp;
     int			oldcol = curwin->w_cursor.col;
-    int			p_sw = (int)get_sw_value();
+    int			p_sw = (int)get_sw_value(curbuf);
     int			p_ts = (int)curbuf->b_p_ts;
     struct block_def	bd;
     int			incr;
@@ -4046,7 +4046,8 @@ preprocs_left()
 #  endif
 # endif
 # ifdef FEAT_CINDENT
-	(curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE))
+	(curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE)
+					   && curbuf->b_ind_hash_comment == 0)
 # endif
 	;
 }