diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-09-17 19:10:55 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-09-17 19:10:55 +0000 |
| commit | 5826661f18ae8c95b26951a042692e68b9bc093f (patch) | |
| tree | 534dee8bd5250e83e84a896ebd29f82be3370c07 /src/emacs.c | |
| parent | 567c887847144d9609ccfe550fd7ef178120297a (diff) | |
| parent | 5b51c03716d7c487d1c2336df2a76a6417a2343c (diff) | |
| download | emacs-5826661f18ae8c95b26951a042692e68b9bc093f.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 116-117, 544-550)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-544
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-545
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-546
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-547
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-548
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-549
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-550
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-116
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-117
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-421
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c index 8724cbf2928..71b17a064c4 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1628,14 +1628,12 @@ main (argc, argv #endif #endif /* HAVE_X_WINDOWS */ -#ifdef HAVE_MENUS #ifndef HAVE_NTGUI #ifndef MAC_OS /* Called before init_window_once for Mac OS Classic. */ syms_of_xmenu (); #endif #endif -#endif #ifdef HAVE_NTGUI syms_of_w32term (); |