diff options
| author | Stefan Monnier | 2007-11-23 04:17:56 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-11-23 04:17:56 +0000 |
| commit | f7cf8b2009b0bc2526d50c3455f737a543122dd4 (patch) | |
| tree | 19424fc66975cf01deb2319eb8de9d56671239b1 /src | |
| parent | dc2f6c05101218ed05ecb40a831dfbdb91d80858 (diff) | |
| download | emacs-f7cf8b2009b0bc2526d50c3455f737a543122dd4.tar.gz emacs-f7cf8b2009b0bc2526d50c3455f737a543122dd4.zip | |
(main): Call init_editfns before init_process, since
init_process sets Vprocess_connection_type depending on OS release
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/emacs.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 49c9e8e9974..7b3fc9bb833 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-11-23 Markus Triska <markus.triska@gmx.at> | ||
| 2 | |||
| 3 | * emacs.c (main): Call init_editfns before init_process, since | ||
| 4 | init_process sets Vprocess_connection_type depending on OS release | ||
| 5 | |||
| 1 | 2007-11-22 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2007-11-22 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * data.c (do_symval_forwarding): Use same code as in find_symbol_value. | 8 | * data.c (do_symval_forwarding): Use same code as in find_symbol_value. |
diff --git a/src/emacs.c b/src/emacs.c index 8a51b8cb8e4..af6a7b71423 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -1666,6 +1666,7 @@ main (argc, argv | |||
| 1666 | #endif /* HAVE_NTGUI */ | 1666 | #endif /* HAVE_NTGUI */ |
| 1667 | } | 1667 | } |
| 1668 | 1668 | ||
| 1669 | init_editfns (); /* init_process uses Voperating_system_release. */ | ||
| 1669 | init_process (); /* init_display uses add_keyboard_wait_descriptor. */ | 1670 | init_process (); /* init_display uses add_keyboard_wait_descriptor. */ |
| 1670 | #ifndef MAC_OS8 | 1671 | #ifndef MAC_OS8 |
| 1671 | /* Called before init_window_once for Mac OS Classic. */ | 1672 | /* Called before init_window_once for Mac OS Classic. */ |
| @@ -1688,7 +1689,6 @@ main (argc, argv | |||
| 1688 | init_image (); | 1689 | init_image (); |
| 1689 | #endif /* HAVE_WINDOW_SYSTEM */ | 1690 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 1690 | init_macros (); | 1691 | init_macros (); |
| 1691 | init_editfns (); | ||
| 1692 | init_floatfns (); | 1692 | init_floatfns (); |
| 1693 | #ifdef VMS | 1693 | #ifdef VMS |
| 1694 | init_vmsfns (); | 1694 | init_vmsfns (); |