Mercurial > vim

comparison src/edit.c @ 819:23f82b5d2814 v7.0c10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0c10
author vimboss
date Wed, 05 Apr 2006 20:41:53 +0000
parents 1f929f3ca806
children 6675076019ae
comparison
equal deleted inserted replaced
818:1f929f3ca806 819:23f82b5d2814
38 #define CTRL_X_MSG(i) ctrl_x_msgs[(i) & ~CTRL_X_WANT_IDENT] 38 #define CTRL_X_MSG(i) ctrl_x_msgs[(i) & ~CTRL_X_WANT_IDENT]
39 39
40 static char *ctrl_x_msgs[] = 40 static char *ctrl_x_msgs[] =
41 { 41 {
42 N_(" Keyword completion (^N^P)"), /* ctrl_x_mode == 0, ^P/^N compl. */ 42 N_(" Keyword completion (^N^P)"), /* ctrl_x_mode == 0, ^P/^N compl. */
43 N_(" ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"), 43 N_(" ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"),
44 NULL, 44 NULL,
45 N_(" Whole line completion (^L^N^P)"), 45 N_(" Whole line completion (^L^N^P)"),
46 N_(" File name completion (^F^N^P)"), 46 N_(" File name completion (^F^N^P)"),
47 N_(" Tag completion (^]^N^P)"), 47 N_(" Tag completion (^]^N^P)"),
48 N_(" Path pattern completion (^N^P)"), 48 N_(" Path pattern completion (^N^P)"),
51 N_(" Dictionary completion (^K^N^P)"), 51 N_(" Dictionary completion (^K^N^P)"),
52 N_(" Thesaurus completion (^T^N^P)"), 52 N_(" Thesaurus completion (^T^N^P)"),
53 N_(" Command-line completion (^V^N^P)"), 53 N_(" Command-line completion (^V^N^P)"),
54 N_(" User defined completion (^U^N^P)"), 54 N_(" User defined completion (^U^N^P)"),
55 N_(" Omni completion (^O^N^P)"), 55 N_(" Omni completion (^O^N^P)"),
56 N_(" Spelling suggestion (^S^N^P)"), 56 N_(" Spelling suggestion (s^N^P)"),
57 N_(" Keyword Local completion (^N^P)"), 57 N_(" Keyword Local completion (^N^P)"),
58 }; 58 };
59 59
60 static char_u e_hitend[] = N_("Hit end of paragraph"); 60 static char_u e_hitend[] = N_("Hit end of paragraph");
61 61
3137 #endif 3137 #endif
3138 case 's': 3138 case 's':
3139 case Ctrl_S: 3139 case Ctrl_S:
3140 ctrl_x_mode = CTRL_X_SPELL; 3140 ctrl_x_mode = CTRL_X_SPELL;
3141 #ifdef FEAT_SPELL 3141 #ifdef FEAT_SPELL
3142 ++emsg_off; /* Avoid getting the E756 error twice. */
3142 spell_back_to_badword(); 3143 spell_back_to_badword();
3144 --emsg_off;
3143 #endif 3145 #endif
3144 break; 3146 break;
3145 case Ctrl_RSB: 3147 case Ctrl_RSB:
3146 ctrl_x_mode = CTRL_X_TAGS; 3148 ctrl_x_mode = CTRL_X_TAGS;
3147 break; 3149 break;
3284 { 3286 {
3285 ins_compl_delete(); 3287 ins_compl_delete();
3286 if (compl_leader != NULL) 3288 if (compl_leader != NULL)
3287 ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); 3289 ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
3288 else if (compl_first_match != NULL) 3290 else if (compl_first_match != NULL)
3289 ins_bytes(compl_first_match->cp_str 3291 ins_bytes(compl_orig_text
3290 + curwin->w_cursor.col - compl_col); 3292 + curwin->w_cursor.col - compl_col);
3291 retval = TRUE; 3293 retval = TRUE;
3292 } 3294 }
3293 3295
3294 ins_compl_free(); 3296 ins_compl_free();