*** ./doc/infofilter.orig	Sun Oct 30 02:39:17 1994
--- ./doc/infofilter	Sat Jul 15 09:24:06 1995
***************
*** 1,4 ****
! #! /usr/bin/sed -f
  
  
  # allow "%" as a comment char
--- 1,4 ----
! #! /bin/sed -f
  
  
  # allow "%" as a comment char
*** ./Makefile.orig	Thu Jul  6 19:12:14 1995
--- ./Makefile	Sat Jul 15 09:24:06 1995
***************
*** 36,46 ****
  
  ifdef DEBUG
    CFLAGS = -g -DDEBUG -Wall
!   LDFLAGS = -lcurses -L. -l$(TARGET)
  else
    CFLAGS = -O3 -fomit-frame-pointer
!   LDFLAGS = -lcurses -L. -l$(TARGET) -s
  endif
  
  ELFILE = t-mouse.el
  ELCFILE = $(ELFILE:.el=.elc)
--- 36,47 ----
  
  ifdef DEBUG
    CFLAGS = -g -DDEBUG -Wall
!   LDFLAGS = -L.
  else
    CFLAGS = -O3 -fomit-frame-pointer
!   LDFLAGS = -L. -s
  endif
+ LOADLIBES	= -lcurses -ltermcap
  
  ELFILE = t-mouse.el
  ELCFILE = $(ELFILE:.el=.elc)
***************
*** 83,98 ****
  	  exit 1; fi
  
  $(TARGET): $(TOBJS)
- 	$(CC) $(CFLAGS) -o $@ $^
  
  $(LIB): $(LOBJS)
  	$(AR) r $(LIB) $(LOBJS)
  	$(RANLIB) $(LIB)
- 
- # Without this silly rule it won't work :-(
- # $(LD) won't work, either.
- %: %.o
- 	$(CC) $*.o -o $@ $(LDFLAGS)
  
  $(CLIENTS): $(LIB)
  
--- 84,93 ----
*** ./gpm-root.y.orig	Tue Jul 11 11:26:56 1995
--- ./gpm-root.y	Sat Jul 15 09:24:06 1995
***************
*** 566,572 ****
  int f_mktty(int mode, DrawItem *self, int uid)
  {
  int fd, pid;
! long vc;
  char name[10];
    switch (mode)
      {
--- 566,572 ----
  int f_mktty(int mode, DrawItem *self, int uid)
  {
  int fd, pid;
! int vc;
  char name[10];
    switch (mode)
      {
***************
*** 584,598 ****
  
  	case 0:
  	  /* child: exec getty */
! 	  sprintf(name,"tty%i",(int)vc);
  	  execl("/sbin/agetty","agetty","38400",name,(char *)NULL);
  	  exit(1); /* shouldn't happen */
  
          default:
  	  /* father: jump to the tty */
! 	  PDEBUG((stderr,"Registering child %i on console %i\n",pid,(int)vc));
  	  consolepids[vc]=pid;
! 	  sprintf(self->arg,"%i",(int)vc);
  	  return f_jptty(mode,self,uid);
  	}
      default:
--- 584,602 ----
  
  	case 0:
  	  /* child: exec getty */
! 	  sprintf(name,"tty%i",vc);
! #ifdef __alpha__
! 	  execl("/daemons/getty","getty","38400",name,(char *)NULL);
! #else
  	  execl("/sbin/agetty","agetty","38400",name,(char *)NULL);
+ #endif __alpha__
  	  exit(1); /* shouldn't happen */
  
          default:
  	  /* father: jump to the tty */
! 	  PDEBUG((stderr,"Registering child %i on console %i\n",pid,vc));
  	  consolepids[vc]=pid;
! 	  sprintf(self->arg,"%i",vc);
  	  return f_jptty(mode,self,uid);
  	}
      default:
***************
*** 641,646 ****
--- 645,652 ----
  FILE *f;
  double l1,l2,l3;
  
+   l1=l2=l3=0.0;
+ 
    switch (mode)
      {
      case F_CREATE: /* modify name, just to fake its length */
***************
*** 669,674 ****
--- 675,682 ----
  FILE *f;
  long l1,l2;
  char s[80];
+ 
+   l1=l2=0;
    switch (mode)
      {
      case F_CREATE: /* modify name, just to fake its length */
***************
*** 676,682 ****
        self->name=realloc(self->name,strlen(self->name)+30);
        strcpy(self->clientdata,self->name);
        strcat(self->clientdata," %5.2fM mem + %5.2fM swap");
!       sprintf(self->name,self->clientdata,l1,l2);
        break;
  
      case F_POST:
--- 684,690 ----
        self->name=realloc(self->name,strlen(self->name)+30);
        strcpy(self->clientdata,self->name);
        strcat(self->clientdata," %5.2fM mem + %5.2fM swap");
!       sprintf(self->name,self->clientdata,(double)l1,(double)l2);
        break;
  
      case F_POST:
*** ./gpm.c.orig	Thu Jul  6 19:11:52 1995
--- ./gpm.c	Sat Jul 15 09:24:06 1995
***************
*** 101,107 ****
  static inline int wait_text(int *fdptr)
  {
  int fd;
! long kd_mode;
  
    close(*fdptr);
    do
--- 101,107 ----
  static inline int wait_text(int *fdptr)
  {
  int fd;
! int kd_mode;
  
    close(*fdptr);
    do
***************
*** 318,324 ****
  
  /*-------------------------------------------------------------------*/
  static inline int processMouse(int fd, Gpm_Event *event, Gpm_Type *type,
! 			       long kd_mode)
  {
  char *data;
  static int fine_dx, fine_dy;
--- 318,324 ----
  
  /*-------------------------------------------------------------------*/
  static inline int processMouse(int fd, Gpm_Event *event, Gpm_Type *type,
! 			       int kd_mode)
  {
  char *data;
  static int fine_dx, fine_dy;
*** ./gpm.h.orig	Wed Apr 12 15:21:16 1995
--- ./gpm.h	Sat Jul 15 09:24:06 1995
***************
*** 152,164 ****
  #define    Gpm_Getchar() Gpm_Getc(stdin)
  extern int Gpm_Repeat(int millisec);
  extern int Gpm_FitValuesM(int *x, int *y, int margin);
! #define    Gpm_FitValues(x,y) Gpm_FitValuesM((int *)(x),(int *)(y),-1);
  #define    Gpm_FitEvent(ePtr) \
!                         ((ePtr)->margin \
!                          ? Gpm_FitValuesM((int *)(&((ePtr)->x)), \
! 					  (int *)(&((ePtr)->y)), \
!                                 (ePtr)->margin) \
!                          : 0)
  
  /* the following is a (progn ...) form */
  
--- 152,171 ----
  #define    Gpm_Getchar() Gpm_Getc(stdin)
  extern int Gpm_Repeat(int millisec);
  extern int Gpm_FitValuesM(int *x, int *y, int margin);
! #define    Gpm_FitValues(x,y) Gpm_FitValuesM((x),(y),-1);
  #define    Gpm_FitEvent(ePtr) 	\
! ({				\
!     int _x, _y, _retval = 0; 	\
!     if ((ePtr)->margin)		\
!       {				\
! 	  _x = (ePtr)->x;	\
! 	  _y = (ePtr)->y;	\
! 	  _retval = Gpm_FitValuesM(&_x, &_y, (ePtr)->margin);	\
! 	  (ePtr)->x = _x;	\
! 	  (ePtr)->y = _y;	\
!       }				\
!     _retval;			\
! })
  
  /* the following is a (progn ...) form */
  
*** ./gpn.c.orig	Tue Apr 11 21:56:57 1995
--- ./gpn.c	Sat Jul 15 09:24:06 1995
***************
*** 123,129 ****
  {
    int i, c, fd;
    unsigned char this, next;
!   static unsigned long long_array[9]={
      0x05050505, /* ugly, but preserves alignment */
      0x00000000, /* control chars     */
      0x00000000, /* digits            */
--- 123,129 ----
  {
    int i, c, fd;
    unsigned char this, next;
!   static __u32 long_array[9]={
      0x05050505, /* ugly, but preserves alignment */
      0x00000000, /* control chars     */
      0x00000000, /* digits            */
*** ./t-mouse.el.orig	Sun May 28 22:03:36 1995
--- ./t-mouse.el	Sat Jul 15 09:24:07 1995
***************
*** 24,29 ****
--- 24,31 ----
  
  ;; Tested only under emacs-19.25
  
+ (require 'mouse)
+ 
  ;;; Code:
  
  (defvar t-mouse-process nil 
*** ./gpmCfg.h.orig	Fri Jun 30 09:46:49 1995
--- ./gpmCfg.h	Wed Jul  5 10:42:18 1995
***************
*** 19,25 ****
   ********/
  
  #define GPM_NAME    "gpm-Linux"
! #define GPM_RELEASE "0.98.3"
  #define GPM_DATE    "June 1995"
  
  /* You can define DEBUG, or undefine it. */
--- 19,25 ----
   ********/
  
  #define GPM_NAME    "gpm-Linux"
! #define GPM_RELEASE "0.99"
  #define GPM_DATE    "June 1995"
  
  /* You can define DEBUG, or undefine it. */
