X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconsole.c;h=0840f8a4177ee045fb821e73eb4366c7c076b868;hb=cd2292bbfe34d2aba639cf019094dcb85802508c;hp=5b8e670fababaca98074cfc66aee3c647307af97;hpb=3062d425fac0473eb5aa2efc0bb002f6ce0cb028;p=chise%2Fxemacs-chise.git.1 diff --git a/src/console.c b/src/console.c index 5b8e670..0840f8a 100644 --- a/src/console.c +++ b/src/console.c @@ -882,7 +882,7 @@ void stuff_buffered_input (Lisp_Object stuffstring) { /* stuff_char works only in BSD, versions 4.2 and up. */ -#if defined (BSD) +#if defined (BSD) && defined(HAVE_TTY) if (!CONSOLEP (Vcontrolling_terminal) || !CONSOLE_LIVE_P (XCONSOLE (Vcontrolling_terminal))) return; @@ -908,7 +908,7 @@ stuff_buffered_input (Lisp_Object stuffstring) stuff_char (XCONSOLE (Vcontrolling_terminal), *kbd_fetch_ptr++); } # endif -#endif /* BSD */ +#endif /* BSD && HAVE_TTY */ } DEFUN ("suspend-console", Fsuspend_console, 0, 1, "", /* @@ -1391,7 +1391,7 @@ The `read-key-sequence' function replaces any subsequence bound by keymaps have no binding for the current key sequence but `function-key-map' binds a suffix of the sequence to a vector or string, `read-key-sequence' replaces the matching suffix with its binding, and -continues with the new sequence. +continues with the new sequence. See `key-binding'. The events that come from bindings in `function-key-map' are not themselves looked up in `function-key-map'. @@ -1465,7 +1465,7 @@ buffer's local map, and the minor mode keymaps and text property keymaps. if ((XINT (console_local_flags.slot) != -2 && \ XINT (console_local_flags.slot) != -3) \ != !(NILP (XCONSOLE (Vconsole_local_symbols)->slot))) \ - abort () + ABORT () #include "conslots.h" #undef MARKED_SLOT }