vim: src/option.c comparison

updated for version 7.3.861 Problem: ":setlocal number" clears global value of 'relativenumber'. Solution: Do it properly. (Markus Heidelberg)

comparison

equal deleted inserted replaced

-:a3d776a5719b
+:6fe728bf165e
 	    curbuf = save_curbuf;
 	}
 }
 #endif
-/* 'number', 'relativenumber' */
+/* If 'number' is set, reset 'relativenumber'. */
-else if ((int *)varp == &curwin->w_p_nu
+/* If 'relativenumber' is set, reset 'number'. */
-	  || (int *)varp == &curwin->w_p_rnu)
+else if ((int *)varp == &curwin->w_p_nu && curwin->w_p_nu)
 {
-	/* If 'number' is set, reset 'relativenumber'. */
+	curwin->w_p_rnu = FALSE;
-	/* If 'relativenumber' is set, reset 'number'. */
-	if ((int *)varp == &curwin->w_p_nu && curwin->w_p_nu)
+	/* Only reset the global value if the own value is set globally. */
-	{
+	if (((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0))
-	    curwin->w_p_rnu = FALSE;
 	    curwin->w_allbuf_opt.wo_rnu = FALSE;
-	}
+}
-	if ((int *)varp == &curwin->w_p_rnu && curwin->w_p_rnu)
+else if ((int *)varp == &curwin->w_p_rnu && curwin->w_p_rnu)
-	{
+{
-	    curwin->w_p_nu = FALSE;
+	curwin->w_p_nu = FALSE;
+	/* Only reset the global value if the own value is set globally. */
+	if (((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0))
 	    curwin->w_allbuf_opt.wo_nu = FALSE;
-	}
+}
+else if ((int *)varp == &curwin->w_allbuf_opt.wo_nu
+						&& curwin->w_allbuf_opt.wo_nu)
+{
+curwin->w_allbuf_opt.wo_rnu = FALSE;
+}
+else if ((int *)varp == &curwin->w_allbuf_opt.wo_rnu
+					       && curwin->w_allbuf_opt.wo_rnu)
+{
+curwin->w_allbuf_opt.wo_nu = FALSE;
 }
 else if ((int *)varp == &curbuf->b_p_ro)
 {
 	/* when 'readonly' is reset globally, also reset readonlymode */

Mercurial > vim