Mercurial > emacs
changeset 109380:1a678cf6a4cd
Fix the MS-DOS build; remove more "#ifdef subprocesses".
process.c <inhibit_sentinels>: Move to the common part.
(Fwaiting_for_user_input_p): Move to the common part; return nil
if async subprocesses aren't supported.
sysdep.c (wait_for_termination) [!MSDOS]: Don't compile on
MS-DOS. Remove "#ifdef subprocesses".
(sys_subshell, sys_select): Remove "#ifdef subprocesses".
(gettimeofday): Remove "#ifdef subprocesses".
(wait_without_blocking): Remove function.
(flush_pending_output, child_setup_tty): Don't compile on MS-DOS.
Remove "#ifdef subprocesses".
(child_setup_tty): Use WINDOWSNT instead of DOS_NT, since not
compiled on MS-DOS.
callproc.c (Fcall_process) [!MSDOS]: Don't call
wait_for_termination on MS-DOS.
emacs.c (shut_down_emacs): Remove "#ifndef subprocesses" from
initialization of inhibit_sentinels.
keyboard.c (record_asynch_buffer_change): Remove "#ifdef
subprocesses" conditional.
callproc.c (Fcall_process) [!subprocesses]: Don't call
wait_for_termination, since `buffer' cannot be an integer when
async subprocesses are not supported
xdisp.c (decode_mode_spec): Use `MSDOS' instead of `subprocesses'
for ifdefing away the call to Fprocess_status.
process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef
away the entire body of the function.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Tue, 13 Jul 2010 14:03:42 +0300 |
| parents | 863ed9bd7c0e (diff) 4e99d7aa7526 (current diff) |
| children | c196ca51171c |
| files | |
| diffstat | 3 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jul 13 13:57:00 2010 +0300 +++ b/lisp/ChangeLog Tue Jul 13 14:03:42 2010 +0300 @@ -1,3 +1,13 @@ +2010-07-13 Adrian Robert <Adrian.B.Robert@gmail.com> + + * term/ns-win.el: Bind M-~ to 'ns-prev-frame (due to Matthew + Dempsky; bug#5084). Remove incorrect binding for S-tab. + (ns-alternatives-map): Change S-tab binding to backtab + (bug#6616). + + * simple.el (normal-erase-is-backspace-setup-frame): Set mode on + under ns. + 2010-07-12 Andreas Schwab <schwab@linux-m68k.org> * language/tai-viet.el ("TaiViet"): Try to fix re-encoding
--- a/lisp/simple.el Tue Jul 13 13:57:00 2010 +0300 +++ b/lisp/simple.el Tue Jul 13 14:03:42 2010 +0300 @@ -6522,6 +6522,7 @@ (if (if (eq normal-erase-is-backspace 'maybe) (and (not noninteractive) (or (memq system-type '(ms-dos windows-nt)) + (memq window-system '(ns)) (and (memq window-system '(x)) (fboundp 'x-backspace-delete-keys-p) (x-backspace-delete-keys-p))
--- a/lisp/term/ns-win.el Tue Jul 13 13:57:00 2010 +0300 +++ b/lisp/term/ns-win.el Tue Jul 13 14:03:42 2010 +0300 @@ -186,14 +186,11 @@ ;;;; Keyboard mapping. -;; These tell read-char how to convert these special chars to ASCII. -(put 'S-tab 'ascii-character (logior 16 ?\t)) - (defvar ns-alternatives-map (let ((map (make-sparse-keymap))) ;; Map certain keypad keys into ASCII characters ;; that people usually expect. - (define-key map [S-tab] [25]) + (define-key map [S-tab] [backtab]) (define-key map [M-backspace] [?\M-\d]) (define-key map [M-delete] [?\M-\d]) (define-key map [M-tab] [?\M-\t]) @@ -208,6 +205,7 @@ (define-key global-map [?\s-,] 'customize) (define-key global-map [?\s-'] 'next-multiframe-window) (define-key global-map [?\s-`] 'other-frame) +(define-key global-map [?\s-~] 'ns-prev-frame) (define-key global-map [?\s--] 'center-line) (define-key global-map [?\s-:] 'ispell) (define-key global-map [?\s-\;] 'ispell-next)