Mercurial > emacs
comparison src/xmenu.c @ 83428:d0eee3282e6b
Merged from miles@gnu.org--gnu-2005 (patch 678-680)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-678
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-679
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-680
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-468
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 29 Dec 2005 04:41:02 +0000 |
parents | b64b7e867d0a 3c879987313f |
children | b98066f4aa10 |
comparison
equal
deleted
inserted
replaced
83427:2afc49c9f0c0 | 83428:d0eee3282e6b |
---|---|
3386 { | 3386 { |
3387 *error = "Can't create menu"; | 3387 *error = "Can't create menu"; |
3388 return Qnil; | 3388 return Qnil; |
3389 } | 3389 } |
3390 | 3390 |
3391 /* Don't GC while we prepare and show the menu, | |
3392 because we give the oldxmenu library pointers to the | |
3393 contents of strings. */ | |
3394 inhibit_garbage_collection (); | |
3395 | |
3391 #ifdef HAVE_X_WINDOWS | 3396 #ifdef HAVE_X_WINDOWS |
3392 /* Adjust coordinates to relative to the outer (window manager) window. */ | 3397 /* Adjust coordinates to relative to the outer (window manager) window. */ |
3393 x += FRAME_OUTER_TO_INNER_DIFF_X (f); | 3398 x += FRAME_OUTER_TO_INNER_DIFF_X (f); |
3394 y += FRAME_OUTER_TO_INNER_DIFF_Y (f); | 3399 y += FRAME_OUTER_TO_INNER_DIFF_Y (f); |
3395 #endif /* HAVE_X_WINDOWS */ | 3400 #endif /* HAVE_X_WINDOWS */ |