[Emacs-diffs] Changes to emacs/src/keyboard.c

[Richard M . Stallman]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.783 emacs/src/keyboard.c:1.784
*** emacs/src/keyboard.c:1.783  Wed Jul 14 22:42:44 2004
--- emacs/src/keyboard.c        Sat Jul 17 14:50:58 2004
***************
*** 1089,1094 ****
--- 1089,1105 ----
  #endif
  }
  
+ /* If we're in single_kboard state for kboard KBOARD,
+    get out of it.  */
+ 
+ void
+ not_single_kboard_state (kboard)
+      KBOARD *kboard;
+ {
+   if (kboard == current_kboard)
+     single_kboard = 0;
+ }
+ 
  /* 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))
--- 10186,10192 ----
  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++)
      {
  
--- 10202,10211 ----
  
    /* 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
--- 10218,10224 ----
      }
  
    input_pending = 0;
! #endif /* SIGTSTP */
  }
  
  void