aboutsummaryrefslogtreecommitdiffstats
path: root/src/emacs.c
diff options
context:
space:
mode:
authorKaroly Lorentey2004-03-29 12:05:03 +0000
committerKaroly Lorentey2004-03-29 12:05:03 +0000
commit2491d293f3e87e0925cd71e9e72ac2edaa94ecc6 (patch)
treefaa306341c1dd0ce8fdb1193ee71fb04f7b4306f /src/emacs.c
parenta38213dc5443326de07cd41575859361c64596b0 (diff)
downloademacs-2491d293f3e87e0925cd71e9e72ac2edaa94ecc6.tar.gz
emacs-2491d293f3e87e0925cd71e9e72ac2edaa94ecc6.zip
Fix initialization order at bootstrap (Dan Nicolaescu).
src/emacs.c (main): Call init_process before init_display to prevent losing the keyboard on stdin (reported by Dan Nicolaescu). git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-128
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 43d2f8541ee..1c7d595d3d3 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1578,6 +1578,7 @@ main (argc, argv
1578#endif /* end #ifdef HAVE_NTGUI */ 1578#endif /* end #ifdef HAVE_NTGUI */
1579 } 1579 }
1580 1580
1581 init_process (); /* init_display uses add_keyboard_wait_descriptor. */
1581#ifndef MAC_OS8 1582#ifndef MAC_OS8
1582 /* Called before init_window_once for Mac OS Classic. */ 1583 /* Called before init_window_once for Mac OS Classic. */
1583 init_keyboard (); /* This too must precede init_sys_modes. */ 1584 init_keyboard (); /* This too must precede init_sys_modes. */
@@ -1604,7 +1605,6 @@ main (argc, argv
1604#ifdef VMS 1605#ifdef VMS
1605 init_vmsfns (); 1606 init_vmsfns ();
1606#endif /* VMS */ 1607#endif /* VMS */
1607 init_process ();
1608#ifdef HAVE_SOUND 1608#ifdef HAVE_SOUND
1609 init_sound (); 1609 init_sound ();
1610#endif 1610#endif