diff options
| author | Eli Zaretskii | 2014-04-16 16:27:28 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-04-16 16:27:28 +0300 |
| commit | bf6b4923f7eedea193dee2130bf7fa597a5932d4 (patch) | |
| tree | 62bd144e45df20c0fc1600eedb3f744dcfe959a2 /src/term.c | |
| parent | 3a31cae4677c7c5e501dcf7e5c520e49db16f75e (diff) | |
| download | emacs-bf6b4923f7eedea193dee2130bf7fa597a5932d4.tar.gz emacs-bf6b4923f7eedea193dee2130bf7fa597a5932d4.zip | |
Fix the MSDOS build.
src/unexcoff.c [MSDOS]: Include libc/atexit.h.
(copy_text_and_data): Zero out the atexit chain pointer before
dumping Emacs.
src/termhooks.h (encode_terminal_code): Update prototype.
src/term.c (encode_terminal_code) [DOS_NT]: Make it externally
visible for all DOS_NT ports, not just WINDOWSNT.
(syms_of_term) [!MSDOS]: Don't define 'tty-menu-*' symbols on MSDOS.
src/sysdep.c (emacs_sigaction_init, init_signals): Don't use SIGCHLD
unless it is defined.
(emacs_pipe) [MSDOS]: Redirect to 'pipe'.
src/process.c (close_on_exec, accept4, process_socket): Move into
the "ifdef subprocesses" part.
(catch_child_signal): Condition by "ifdef subprocesses".
(syms_of_process) <Qinternal_default_process_sentinel>
<Qinternal_default_process_filter>: Condition by "ifdef subprocesses".
src/msdos.h: Add prototypes for new functions.
(EINPROGRESS): Define.
(O_CLOEXEC): Define to zero.
src/msdos.c (check_window_system): Remove unnecessary an
incompatible duplicate function.
(sys_opendir, readlinkat, faccessat, fstatat, unsetenv): New
functions in support of new functionality.
src/menu.c (single_menu_item): Add visual indication of submenu
also for menus on MSDOS frames.
(Fx_popup_menu) [!MSDOS]: Do not call tty_menu_show on MSDOS.
src/lisp.h (CHECK_PROCESS) [!subprocesses]: Do not define
when async subprocesses aren't supported.
src/font.h (FONT_WIDTH) [MSDOS]: MSDOS-specific definition.
src/emacs.c (close_output_streams): Zero out errno before calling
close_stream.
src/dired.c [MSDOS]: Include msdos.h.
src/conf_post.h (opendir) [MSDOS]: Redirect to sys_opendir.
(DATA_START) [MSDOS]: Define.
(SYSTEM_PURESIZE_EXTRA) [MSDOS]: Enlarge by 25K.
src/callproc.c (block_child_signal, unblock_child_signal) [MSDOS]:
Ifdef away for MSDOS.
(record_kill_process) [MSDOS]: Ifdef away the entire body for MSDOS.
(call_process_cleanup) [MSDOS]: Ifdef away portions not relevant
for MSDOS.
(call_process) [MSDOS]: Fix call sequence of dostounix_filename.
Use temporary file template that is compatible with mkostemp.
Move vfork-related portions under #ifndef MSDOS.
(syms_of_callproc): Unify templates of MSDOS and WINDOWSNT.
lisp/term/pc-win.el (x-list-fonts, x-get-selection-value): Provide
doc strings, as required by snarf-documentation.
msdos/sedlisp.inp:
msdos/sedlibmk.inp:
msdos/sedleim.inp:
msdos/sed3v2.inp:
msdos/sed2v2.inp:
msdos/sed1v2.inp: Update Sed scripts for Emacs 24.4.
msdos/inttypes.h: Add PRIdMAX.
msdos/INSTALL: Update for Emacs 24.4.
msdos/sedadmin.inp: New file.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c index 773e85faabc..9e6cfe2f41d 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -500,7 +500,7 @@ static ptrdiff_t encode_terminal_dst_size; | |||
| 500 | Set CODING->produced to the byte-length of the resulting byte | 500 | Set CODING->produced to the byte-length of the resulting byte |
| 501 | sequence, and return a pointer to that byte sequence. */ | 501 | sequence, and return a pointer to that byte sequence. */ |
| 502 | 502 | ||
| 503 | #ifndef WINDOWSNT | 503 | #ifndef DOS_NT |
| 504 | static | 504 | static |
| 505 | #endif | 505 | #endif |
| 506 | unsigned char * | 506 | unsigned char * |
| @@ -4557,6 +4557,7 @@ bigger, or it may make it blink, or it may do nothing at all. */); | |||
| 4557 | encode_terminal_src = NULL; | 4557 | encode_terminal_src = NULL; |
| 4558 | encode_terminal_dst = NULL; | 4558 | encode_terminal_dst = NULL; |
| 4559 | 4559 | ||
| 4560 | #ifndef MSDOS | ||
| 4560 | DEFSYM (Qtty_menu_next_item, "tty-menu-next-item"); | 4561 | DEFSYM (Qtty_menu_next_item, "tty-menu-next-item"); |
| 4561 | DEFSYM (Qtty_menu_prev_item, "tty-menu-prev-item"); | 4562 | DEFSYM (Qtty_menu_prev_item, "tty-menu-prev-item"); |
| 4562 | DEFSYM (Qtty_menu_next_menu, "tty-menu-next-menu"); | 4563 | DEFSYM (Qtty_menu_next_menu, "tty-menu-next-menu"); |
| @@ -4566,4 +4567,5 @@ bigger, or it may make it blink, or it may do nothing at all. */); | |||
| 4566 | DEFSYM (Qtty_menu_exit, "tty-menu-exit"); | 4567 | DEFSYM (Qtty_menu_exit, "tty-menu-exit"); |
| 4567 | DEFSYM (Qtty_menu_mouse_movement, "tty-menu-mouse-movement"); | 4568 | DEFSYM (Qtty_menu_mouse_movement, "tty-menu-mouse-movement"); |
| 4568 | DEFSYM (Qtty_menu_navigation_map, "tty-menu-navigation-map"); | 4569 | DEFSYM (Qtty_menu_navigation_map, "tty-menu-navigation-map"); |
| 4570 | #endif | ||
| 4569 | } | 4571 | } |