Mercurial > vim

comparison src/normal.c @ 15422:b55b89692fd2 v8.1.0719

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0719: too many #ifdefs commit https://github.com/vim/vim/commit/870ba5f6dce974b6c1c47bf9d3b20db805d10b36 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 11 14:37:20 2019 +0100 patch 8.1.0719: too many #ifdefs Problem: Too many #ifdefs. Solution: Always build with the +visualextra feature.
author Bram Moolenaar <Bram@vim.org>
date Fri, 11 Jan 2019 14:45:06 +0100
parents 15e6f35b4223
children 29f3d59bb6f0
comparison
equal deleted inserted replaced
15421:9402f350ff35 15422:b55b89692fd2
1996 break; 1996 break;
1997 1997
1998 case OP_INSERT: 1998 case OP_INSERT:
1999 case OP_APPEND: 1999 case OP_APPEND:
2000 VIsual_reselect = FALSE; /* don't reselect now */ 2000 VIsual_reselect = FALSE; /* don't reselect now */
2001 #ifdef FEAT_VISUALEXTRA
2002 if (empty_region_error) 2001 if (empty_region_error)
2003 { 2002 {
2004 vim_beep(BO_OPER); 2003 vim_beep(BO_OPER);
2005 CancelRedo(); 2004 CancelRedo();
2006 } 2005 }
2033 if (restart_edit == 0) 2032 if (restart_edit == 0)
2034 restart_edit = restart_edit_save; 2033 restart_edit = restart_edit_save;
2035 else 2034 else
2036 cap->retval |= CA_COMMAND_BUSY; 2035 cap->retval |= CA_COMMAND_BUSY;
2037 } 2036 }
2038 #else
2039 vim_beep(BO_OPER);
2040 #endif
2041 break; 2037 break;
2042 2038
2043 case OP_REPLACE: 2039 case OP_REPLACE:
2044 VIsual_reselect = FALSE; /* don't reselect now */ 2040 VIsual_reselect = FALSE; /* don't reselect now */
2045 #ifdef FEAT_VISUALEXTRA
2046 if (empty_region_error) 2041 if (empty_region_error)
2047 #endif
2048 { 2042 {
2049 vim_beep(BO_OPER); 2043 vim_beep(BO_OPER);
2050 CancelRedo(); 2044 CancelRedo();
2051 } 2045 }
2052 #ifdef FEAT_VISUALEXTRA
2053 else 2046 else
2054 { 2047 {
2055 # ifdef FEAT_LINEBREAK 2048 #ifdef FEAT_LINEBREAK
2056 /* Restore linebreak, so that when the user edits it looks as 2049 /* Restore linebreak, so that when the user edits it looks as
2057 * before. */ 2050 * before. */
2058 if (curwin->w_p_lbr != lbr_saved) 2051 if (curwin->w_p_lbr != lbr_saved)
2059 { 2052 {
2060 curwin->w_p_lbr = lbr_saved; 2053 curwin->w_p_lbr = lbr_saved;
2061 get_op_vcol(oap, redo_VIsual_mode, FALSE); 2054 get_op_vcol(oap, redo_VIsual_mode, FALSE);
2062 } 2055 }
2063 # endif 2056 #endif
2064 op_replace(oap, cap->nchar); 2057 op_replace(oap, cap->nchar);
2065 } 2058 }
2066 #endif
2067 break; 2059 break;
2068 2060
2069 #ifdef FEAT_FOLDING 2061 #ifdef FEAT_FOLDING
2070 case OP_FOLD: 2062 case OP_FOLD:
2071 VIsual_reselect = FALSE; /* don't reselect now */ 2063 VIsual_reselect = FALSE; /* don't reselect now */