updated for version 7.0105

This commit is contained in:
Bram Moolenaar
2005-07-08 22:17:29 +00:00
parent 8e735a17f8
commit 97409f1261
7 changed files with 34 additions and 29 deletions

View File

@ -7043,7 +7043,7 @@ ex_tearoff(eap)
ex_popup(eap)
exarg_T *eap;
{
gui_make_popup(eap->arg);
gui_make_popup(eap->arg, eap->forceit);
}
#endif

View File

@ -612,8 +612,9 @@ gui_mch_show_popupmenu(vimmenu_T *menu)//{{{
menu->widget->popup(QCursor::pos());
}//}}}
/* TODO: use mouse_pos */
void
gui_make_popup (char_u *pathname)//{{{
gui_make_popup (char_u *pathname, int mouse_pos)//{{{
{
vimmenu_T *menu = gui_find_menu(pathname);

View File

@ -66,7 +66,7 @@ void gui_mch_draw_string __ARGS((int row, int col, char_u *text, int len, int fl
void gui_mch_flush __ARGS((void));
void gui_mch_add_menu __ARGS((vimmenu_T *menu, int pos));
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
void gui_make_popup __ARGS((char_u *path_name));
void gui_make_popup __ARGS((char_u *path_name, int mouse_pos));
void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));

View File

@ -72,7 +72,7 @@ void gui_mch_draw_string __ARGS((int row, int col, char_u *text, int len, int fl
void gui_mch_flush __ARGS((void));
void gui_mch_add_menu __ARGS((vimmenu_T *menu, int pos));
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
void gui_make_popup __ARGS((char_u *path_name));
void gui_make_popup __ARGS((char_u *path_name, int mouse_pos));
void gui_make_tearoff __ARGS((char_u *path_name));
void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));

View File

@ -6143,7 +6143,7 @@ spell_suggest()
if (curbuf->b_cap_prog != NULL)
{
endcol = 0;
if (skipwhite(line) - line == curwin->w_cursor.col)
if ((int)(skipwhite(line) - line) == (int)curwin->w_cursor.col)
{
/* At start of line, check if previous line is empty or sentence
* ends there. */
@ -9622,10 +9622,10 @@ spell_edit_score(badword, goodword)
* int array for easy access. */
for (p = badword, badlen = 0; *p != NUL; )
wbadword[badlen++] = mb_ptr2char_adv(&p);
++badlen;
wbadword[badlen++] = 0;
for (p = goodword, goodlen = 0; *p != NUL; )
wgoodword[goodlen++] = mb_ptr2char_adv(&p);
++goodlen;
wgoodword[goodlen++] = 0;
}
else
#endif