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

[Richard M. Stallman]

Index: emacs/src/termcap.c
diff -c emacs/src/termcap.c:1.20 emacs/src/termcap.c:1.21
*** emacs/src/termcap.c:1.20    Mon May 28 07:58:27 2001
--- emacs/src/termcap.c Sun Mar  3 15:11:20 2002
***************
*** 289,300 ****
  
  /* Outputting a string with padding.  */
  
  /* If OSPEED is 0, we use this as the actual baud rate.  */
  int tputs_baud_rate;
  char PC;
  
! #if 0 /* Doesn't seem to be used anymore.  */
! 
  /* Actual baud rate if positive;
     - baud rate / 100 if negative.  */
  
--- 289,302 ----
  
  /* Outputting a string with padding.  */
  
+ #ifndef emacs
+ short ospeed;
  /* If OSPEED is 0, we use this as the actual baud rate.  */
  int tputs_baud_rate;
+ #endif
  char PC;
  
! #ifndef emacs
  /* Actual baud rate if positive;
     - baud rate / 100 if negative.  */
  
***************
*** 309,315 ****
  #endif /* not VMS */
    };
  
! #endif /* 0  */
  
  void
  tputs (str, nlines, outfun)
--- 311,317 ----
  #endif /* not VMS */
    };
  
! #endif /* not emacs */
  
  void
  tputs (str, nlines, outfun)
***************
*** 320,331 ****
--- 322,340 ----
    register int padcount = 0;
    register int speed;
  
+ #ifdef emacs
    extern int baud_rate;
    speed = baud_rate;
    /* For quite high speeds, convert to the smaller
       units to avoid overflow.  */
    if (speed > 10000)
      speed = - speed / 100;
+ #else
+   if (ospeed == 0)
+     speed = tputs_baud_rate;
+   else
+     speed = speeds[ospeed];
+ #endif
  
    if (!str)
      return;