comparison src/edit.c @ 1698:f4f8014d516e v7.2c.000

updated for version 7.2c-000
author vimboss
date Wed, 06 Aug 2008 17:06:04 +0000
parents 149d8b46404c
children 12cecc379574
comparison
equal deleted inserted replaced
1697:2f9308b31181 1698:f4f8014d516e
3606 if (prev_col > 0 3606 if (prev_col > 0
3607 && ml_get_curline()[curwin->w_cursor.col] != NUL) 3607 && ml_get_curline()[curwin->w_cursor.col] != NUL)
3608 inc_cursor(); 3608 inc_cursor();
3609 } 3609 }
3610 3610
3611 auto_format(FALSE, TRUE);
3612
3613 /* If the popup menu is displayed pressing CTRL-Y means accepting 3611 /* If the popup menu is displayed pressing CTRL-Y means accepting
3614 * the selection without inserting anything. When 3612 * the selection without inserting anything. When
3615 * compl_enter_selects is set the Enter key does the same. */ 3613 * compl_enter_selects is set the Enter key does the same. */
3616 if ((c == Ctrl_Y || (compl_enter_selects 3614 if ((c == Ctrl_Y || (compl_enter_selects
3617 && (c == CAR || c == K_KENTER || c == NL))) 3615 && (c == CAR || c == K_KENTER || c == NL)))
3627 else if (compl_first_match != NULL) 3625 else if (compl_first_match != NULL)
3628 ins_bytes(compl_orig_text 3626 ins_bytes(compl_orig_text
3629 + curwin->w_cursor.col - compl_col); 3627 + curwin->w_cursor.col - compl_col);
3630 retval = TRUE; 3628 retval = TRUE;
3631 } 3629 }
3630
3631 auto_format(FALSE, TRUE);
3632 3632
3633 ins_compl_free(); 3633 ins_compl_free();
3634 compl_started = FALSE; 3634 compl_started = FALSE;
3635 compl_matches = 0; 3635 compl_matches = 0;
3636 msg_clr_cmdline(); /* necessary for "noshowmode" */ 3636 msg_clr_cmdline(); /* necessary for "noshowmode" */