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

[Miles Bader]

Index: emacs/src/cm.c
diff -c emacs/src/cm.c:1.16 emacs/src/cm.c:1.17
*** emacs/src/cm.c:1.16 Thu Nov 14 09:13:12 2002
--- emacs/src/cm.c      Tue Feb  4 09:03:12 2003
***************
*** 224,230 ****
      if (doit)
        while (--deltay >= 0)
            tputs (p, 1, cmputc);
! x: 
      if ((deltax = dstx - srcx) == 0)
        goto done;
      if (deltax < 0) {
--- 224,230 ----
      if (doit)
        while (--deltay >= 0)
            tputs (p, 1, cmputc);
! x:
      if ((deltax = dstx - srcx) == 0)
        goto done;
      if (deltax < 0) {
***************
*** 235,241 ****
      if (Wcm.cc_tab >= BIG || !Wcm.cm_usetabs)
        goto olddelta;          /* forget it! */
  
!     /* 
       * ntabs is # tabs towards but not past dstx; n2tabs is one more
       * (ie past dstx), but this is only valid if that is not past the
       * right edge of the screen.  We can check that at the same time
--- 235,241 ----
      if (Wcm.cc_tab >= BIG || !Wcm.cm_usetabs)
        goto olddelta;          /* forget it! */
  
!     /*
       * ntabs is # tabs towards but not past dstx; n2tabs is one more
       * (ie past dstx), but this is only valid if that is not past the
       * right edge of the screen.  We can check that at the same time
***************
*** 251,257 ****
      if (tab2x >= Wcm.cm_cols) /* too far (past edge) */
        n2tabs = 0;
  
!     /* 
       * Now set tabcost to the cost for using ntabs, and c to the cost
       * for using n2tabs, then pick the minimum.
       */
--- 251,257 ----
      if (tab2x >= Wcm.cm_cols) /* too far (past edge) */
        n2tabs = 0;
  
!     /*
       * Now set tabcost to the cost for using ntabs, and c to the cost
       * for using n2tabs, then pick the minimum.
       */
***************
*** 270,276 ****
      if (tabcost >= BIG)               /* caint use tabs */
        goto newdelta;
  
!     /* 
       * See if tabcost is less than just moving right
       */
  
--- 270,276 ----
      if (tabcost >= BIG)               /* caint use tabs */
        goto newdelta;
  
!     /*
       * See if tabcost is less than just moving right
       */
  
***************
*** 282,301 ****
        srcx = tabx;
      }
  
!     /* 
       * Now might as well just recompute the delta.
       */
  
! newdelta: 
      if ((deltax = dstx - srcx) == 0)
        goto done;
! olddelta: 
      if (deltax > 0)
        p = Wcm.cm_right, c = Wcm.cc_right;
      else
        p = Wcm.cm_left, c = Wcm.cc_left, deltax = -deltax;
  
! dodelta: 
      if (c == BIG) {           /* caint get thar from here */
  fail:
        if (doit)
--- 282,301 ----
        srcx = tabx;
      }
  
!     /*
       * Now might as well just recompute the delta.
       */
  
! newdelta:
      if ((deltax = dstx - srcx) == 0)
        goto done;
! olddelta:
      if (deltax > 0)
        p = Wcm.cm_right, c = Wcm.cc_right;
      else
        p = Wcm.cm_left, c = Wcm.cc_left, deltax = -deltax;
  
! dodelta:
      if (c == BIG) {           /* caint get thar from here */
  fail:
        if (doit)
***************
*** 306,312 ****
      if (doit)
        while (--deltax >= 0)
            tputs (p, 1, cmputc);
! done: 
      return totalcost;
  }
  
--- 306,312 ----
      if (doit)
        while (--deltax >= 0)
            tputs (p, 1, cmputc);
! done:
      return totalcost;
  }
  
***************
*** 379,385 ****
        dcm = Wcm.cm_abs;
      }
  
!   /* 
     * In the following comparison, the = in <= is because when the costs
     * are the same, it looks nicer (I think) to move directly there.
     */
--- 379,385 ----
        dcm = Wcm.cm_abs;
      }
  
!   /*
     * In the following comparison, the = in <= is because when the costs
     * are the same, it looks nicer (I think) to move directly there.
     */
***************
*** 400,416 ****
  
    switch (use)
      {
!     case USEHOME: 
        tputs (Wcm.cm_home, 1, cmputc);
        curY = 0, curX = 0;
        break;
  
!     case USELL: 
        tputs (Wcm.cm_ll, 1, cmputc);
        curY = Wcm.cm_rows - 1, curX = 0;
        break;
  
!     case USECR: 
        tputs (Wcm.cm_cr, 1, cmputc);
        if (Wcm.cm_autolf)
        curY++;
--- 400,416 ----
  
    switch (use)
      {
!     case USEHOME:
        tputs (Wcm.cm_home, 1, cmputc);
        curY = 0, curX = 0;
        break;
  
!     case USELL:
        tputs (Wcm.cm_ll, 1, cmputc);
        curY = Wcm.cm_rows - 1, curX = 0;
        break;
  
!     case USECR:
        tputs (Wcm.cm_cr, 1, cmputc);
        if (Wcm.cm_autolf)
        curY++;