comparison src/ops.c @ 613:53114ef7778f

updated for version 7.0174
author vimboss
date Mon, 19 Dec 2005 22:14:58 +0000
parents cd3689efd90a
children 9090f866cd57
comparison
equal deleted inserted replaced
612:b9370cfb091a 613:53114ef7778f
1842 if (gchar_cursor() != NUL) 1842 if (gchar_cursor() != NUL)
1843 curwin->w_cursor.coladd = 0; 1843 curwin->w_cursor.coladd = 0;
1844 } 1844 }
1845 #endif 1845 #endif
1846 (void)del_bytes((long)n, restart_edit == NUL && !virtual_op, 1846 (void)del_bytes((long)n, restart_edit == NUL && !virtual_op,
1847 oap->op_type == OP_DELETE && !oap->is_VIsual); 1847 oap->op_type == OP_DELETE
1848 #ifdef FEAT_VISUAL
1849 && !oap->is_VIsual
1850 #endif
1851 );
1848 } 1852 }
1849 else /* delete characters between lines */ 1853 else /* delete characters between lines */
1850 { 1854 {
1851 pos_T curpos; 1855 pos_T curpos;
1852 1856
1863 1867
1864 /* delete from start of line until op_end */ 1868 /* delete from start of line until op_end */
1865 curwin->w_cursor.col = 0; 1869 curwin->w_cursor.col = 0;
1866 (void)del_bytes((long)(oap->end.col + 1 - !oap->inclusive), 1870 (void)del_bytes((long)(oap->end.col + 1 - !oap->inclusive),
1867 restart_edit == NUL && !virtual_op, 1871 restart_edit == NUL && !virtual_op,
1868 oap->op_type == OP_DELETE && !oap->is_VIsual); 1872 oap->op_type == OP_DELETE
1873 #ifdef FEAT_VISUAL
1874 && !oap->is_VIsual
1875 #endif
1876 );
1869 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ 1877 curwin->w_cursor = curpos; /* restore curwin->w_cursor */
1870 1878
1871 (void)do_join(FALSE); 1879 (void)do_join(FALSE);
1872 } 1880 }
1873 } 1881 }