aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1995-07-02 02:36:32 +0000
committerRichard M. Stallman1995-07-02 02:36:32 +0000
commit6f20989276ec5126b5808e24b266224165d4e823 (patch)
treec2231bfb287cde8b43e1fb9e992ce72d49ea5fcd /src
parent7f07d5cafe82baf672d8a2e4450bbf93ee72744c (diff)
downloademacs-6f20989276ec5126b5808e24b266224165d4e823.tar.gz
emacs-6f20989276ec5126b5808e24b266224165d4e823.zip
(x_set_icon_type, x_set_icon_name): Don't ever remap the
frame window; changing the icon doesn't make it disappear.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 3e32e3c82f0..1f399f5a9c4 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1474,16 +1474,6 @@ x_set_icon_type (f, arg, oldval)
1474 error ("No icon window available"); 1474 error ("No icon window available");
1475 } 1475 }
1476 1476
1477 /* If the window was unmapped (and its icon was mapped),
1478 the new icon is not mapped, so map the window in its stead. */
1479 if (FRAME_VISIBLE_P (f))
1480 {
1481#ifdef USE_X_TOOLKIT
1482 XtPopup (f->display.x->widget, XtGrabNone);
1483#endif
1484 XMapWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
1485 }
1486
1487 XFlush (FRAME_X_DISPLAY (f)); 1477 XFlush (FRAME_X_DISPLAY (f));
1488 UNBLOCK_INPUT; 1478 UNBLOCK_INPUT;
1489} 1479}
@@ -1537,16 +1527,6 @@ x_set_icon_name (f, arg, oldval)
1537 error ("No icon window available"); 1527 error ("No icon window available");
1538 } 1528 }
1539 1529
1540 /* If the window was unmapped (and its icon was mapped),
1541 the new icon is not mapped, so map the window in its stead. */
1542 if (FRAME_VISIBLE_P (f))
1543 {
1544#ifdef USE_X_TOOLKIT
1545 XtPopup (f->display.x->widget, XtGrabNone);
1546#endif
1547 XMapWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
1548 }
1549
1550 XFlush (FRAME_X_DISPLAY (f)); 1530 XFlush (FRAME_X_DISPLAY (f));
1551 UNBLOCK_INPUT; 1531 UNBLOCK_INPUT;
1552} 1532}