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 /lisp/term | |
| 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 'lisp/term')
| -rw-r--r-- | lisp/term/pc-win.el | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index 00b860f8dcc..f24a54fbe28 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el | |||
| @@ -165,6 +165,27 @@ created." | |||
| 165 | 165 | ||
| 166 | ;; From src/xfns.c | 166 | ;; From src/xfns.c |
| 167 | (defun x-list-fonts (_pattern &optional _face _frame _maximum width) | 167 | (defun x-list-fonts (_pattern &optional _face _frame _maximum width) |
| 168 | "Return a list of the names of available fonts matching PATTERN. | ||
| 169 | If optional arguments FACE and FRAME are specified, return only fonts | ||
| 170 | the same size as FACE on FRAME. | ||
| 171 | |||
| 172 | PATTERN should be a string containing a font name in the XLFD, | ||
| 173 | Fontconfig, or GTK format. A font name given in the XLFD format may | ||
| 174 | contain wildcard characters: | ||
| 175 | the * character matches any substring, and | ||
| 176 | the ? character matches any single character. | ||
| 177 | PATTERN is case-insensitive. | ||
| 178 | |||
| 179 | The return value is a list of strings, suitable as arguments to | ||
| 180 | \`set-face-font'. | ||
| 181 | |||
| 182 | Fonts Emacs can't use may or may not be excluded | ||
| 183 | even if they match PATTERN and FACE. | ||
| 184 | The optional fourth argument MAXIMUM sets a limit on how many | ||
| 185 | fonts to match. The first MAXIMUM fonts are reported. | ||
| 186 | The optional fifth argument WIDTH, if specified, is a number of columns | ||
| 187 | occupied by a character of a font. In that case, return only fonts | ||
| 188 | the WIDTH times as wide as FACE on FRAME." | ||
| 168 | (if (or (null width) (and (numberp width) (= width 1))) | 189 | (if (or (null width) (and (numberp width) (= width 1))) |
| 169 | (list "ms-dos") | 190 | (list "ms-dos") |
| 170 | (list "no-such-font"))) | 191 | (list "no-such-font"))) |
| @@ -232,9 +253,9 @@ is not used)." | |||
| 232 | (w16-set-clipboard-data text)) | 253 | (w16-set-clipboard-data text)) |
| 233 | (setq x-last-selected-text text)) | 254 | (setq x-last-selected-text text)) |
| 234 | 255 | ||
| 235 | ;;; Return the value of the current selection. | ||
| 236 | ;;; Consult the selection. Treat empty strings as if they were unset. | ||
| 237 | (defun x-get-selection-value () | 256 | (defun x-get-selection-value () |
| 257 | "Return the value of the current selection. | ||
| 258 | Consult the selection. Treat empty strings as if they were unset." | ||
| 238 | (if x-select-enable-clipboard | 259 | (if x-select-enable-clipboard |
| 239 | (let (text) | 260 | (let (text) |
| 240 | ;; Don't die if x-get-selection signals an error. | 261 | ;; Don't die if x-get-selection signals an error. |