adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated for version 7.0027

Browse Source
This commit is contained in:
Bram Moolenaar
2004-12-31 21:01:02 +00:00
parent def9e829de
commit 567e4dec2c
4 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui_x11.c
View File

@ -1834,7 +1834,16 @@ gui_mch_init_font(font_name, do_fontset)
#ifdef FEAT_XFONTSET
XFontSet fontset = NULL;
#endif
#ifdef FEAT_GUI_MOTIF
/* A font name equal "*" is indicating, that we should activate the font
* selection dialogue to get a new font name. So let us do it here. */
if (font_name != NULL && STRCMP(font_name, "*") == 0)
font_name = gui_xm_select_font(hl_get_font_name());
#endif
#ifdef FEAT_XFONTSET
if (do_fontset)
{
/* If 'guifontset' is set, VIM treats all font specifications as if
@ -1936,6 +1945,10 @@ gui_mch_init_font(font_name, do_fontset)
}
}
#ifdef FEAT_GUI_MOTIF
gui_motif_synch_fonts();
#endif
return OK;
}
@ -1988,6 +2001,7 @@ gui_mch_get_font(name, giveErrorIfMissing)
return (GuiFont)font;
}
#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Return the name of font "font" in allocated memory.
* Don't know how to get the actual name, thus use the provided name.
@ -2002,6 +2016,7 @@ gui_mch_get_fontname(font, name)
return NULL;
return vim_strsave(name);
}
#endif
int
gui_mch_adjust_charsize()

2
src/main.c
View File

@ -3158,7 +3158,7 @@ build_drop_cmd(filec, filev, sendReply)
}
/* Bring the window to the foreground, goto Insert mode when 'im' set and
* clear command line. */
ga_concat(&ga, (char_u *)"cal foreground()|if &im|star|en|ec<CR>");
ga_concat(&ga, (char_u *)"cal foreground()|if &im|star|en|redr|f<CR>");
ga_append(&ga, NUL);
return ga.ga_data;
}