[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/keyboard.c [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/keyboard.c [lexbind] |
Date: |
Fri, 23 Jul 2004 00:52:05 -0400 |
Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.681.2.16 emacs/src/keyboard.c:1.681.2.17
*** emacs/src/keyboard.c:1.681.2.16 Sat Jul 17 02:51:57 2004
--- emacs/src/keyboard.c Fri Jul 23 04:42:22 2004
***************
*** 607,613 ****
/* We are unable to use interrupts if FIONREAD is not available,
so flush SIGIO so we won't try. */
! #ifndef FIONREAD
#ifdef SIGIO
#undef SIGIO
#endif
--- 607,613 ----
/* We are unable to use interrupts if FIONREAD is not available,
so flush SIGIO so we won't try. */
! #if !defined (FIONREAD) || defined(HAVE_CARBON)
#ifdef SIGIO
#undef SIGIO
#endif
***************
*** 1089,1094 ****
--- 1089,1107 ----
#endif
}
+ /* If we're in single_kboard state for kboard KBOARD,
+ get out of it. */
+
+ void
+ not_single_kboard_state (kboard)
+ KBOARD *kboard;
+ {
+ #ifdef MULTI_KBOARD
+ if (kboard == current_kboard)
+ single_kboard = 0;
+ #endif
+ }
+
/* Maintain a stack of kboards, so other parts of Emacs
can switch temporarily to the kboard of a given frame
and then revert to the previous status. */
***************
*** 10175,10183 ****
stuff_buffered_input (stuffstring)
Lisp_Object stuffstring;
{
! /* stuff_char works only in BSD, versions 4.2 and up. */
! #ifdef BSD_SYSTEM
! #ifndef BSD4_1
register unsigned char *p;
if (STRINGP (stuffstring))
--- 10188,10194 ----
stuff_buffered_input (stuffstring)
Lisp_Object stuffstring;
{
! #ifdef SIGTSTP /* stuff_char is defined if SIGTSTP. */
register unsigned char *p;
if (STRINGP (stuffstring))
***************
*** 10193,10199 ****
/* Anything we have read ahead, put back for the shell to read. */
/* ?? What should this do when we have multiple keyboards??
! Should we ignore anything that was typed in at the "wrong" kboard? */
for (; kbd_fetch_ptr != kbd_store_ptr; kbd_fetch_ptr++)
{
--- 10204,10213 ----
/* Anything we have read ahead, put back for the shell to read. */
/* ?? What should this do when we have multiple keyboards??
! Should we ignore anything that was typed in at the "wrong" kboard?
!
! rms: we should stuff everything back into the kboard
! it came from. */
for (; kbd_fetch_ptr != kbd_store_ptr; kbd_fetch_ptr++)
{
***************
*** 10206,10213 ****
}
input_pending = 0;
! #endif
! #endif /* BSD_SYSTEM and not BSD4_1 */
}
void
--- 10220,10226 ----
}
input_pending = 0;
! #endif /* SIGTSTP */
}
void
- [Emacs-diffs] Changes to emacs/src/keyboard.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/keyboard.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/keyboard.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/keyboard.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/keyboard.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/keyboard.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/keyboard.c [lexbind], Miles Bader, 2004/07/08
- [Emacs-diffs] Changes to emacs/src/keyboard.c [lexbind], Miles Bader, 2004/07/16
- [Emacs-diffs] Changes to emacs/src/keyboard.c [lexbind],
Miles Bader <=