mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 13:10:57 -08:00
Code Issues Projects Releases Wiki Activity

(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.

Browse source 
(x_make_frame_visible, x_iconify_frame):
Call x_bitmap_icon if frame wants a bitmap icon.
This commit is contained in:
Richard M. Stallman 1994-10-11 09:27:47 +00:00
parent 00a78037a8
commit bdcd49ba41
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/xterm.c
View file

@ -4924,6 +4924,9 @@ x_make_frame_visible (f)
BLOCK_INPUT;
if (x_icon_type (f))
x_bitmap_icon (f);
if (! FRAME_VISIBLE_P (f))
{
#ifndef USE_X_TOOLKIT
@ -5092,9 +5095,13 @@ x_iconify_frame (f)
if (f->async_iconified)
return;
#ifdef USE_X_TOOLKIT
BLOCK_INPUT;
if (x_icon_type (f))
x_bitmap_icon (f);
#ifdef USE_X_TOOLKIT
if (! FRAME_VISIBLE_P (f))
{
if (! EQ (Vx_no_window_manager, Qt))
@ -5120,8 +5127,6 @@ x_iconify_frame (f)
UNBLOCK_INPUT;
#else /* not USE_X_TOOLKIT */
BLOCK_INPUT;
/* Make sure the X server knows where the window should be positioned,
in case the user deiconifies with the window manager. */
if (! FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P (f))
@ -5439,6 +5444,10 @@ x_term_init (display_name, xrm_option, resource_name)
x_focus_frame = x_highlight_frame = 0;
#ifdef USE_X_TOOLKIT
#ifdef HAVE_X11R5
XtSetLanguageProc (NULL, NULL, NULL);
#endif
argv = (char **) XtMalloc (7 * sizeof (char *));
argv[0] = "";
argv[1] = "-display";
@ -5460,6 +5469,9 @@ x_term_init (display_name, xrm_option, resource_name)
x_current_display = XtDisplay (Xt_app_shell);
#else /* not USE_X_TOOLKIT */
#ifdef HAVE_X11R5
XSetLocaleModifiers ("");
#endif
x_current_display = XOpenDisplay (display_name);
#endif /* not USE_X_TOOLKIT */
if (x_current_display == 0)