/[emacs]/emacs/src/editfns.c
ViewVC logotype

Diff of /emacs/src/editfns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.380 by handa, Fri Oct 22 13:09:39 2004 UTC revision 1.381 by kfstorm, Tue Oct 26 22:37:34 2004 UTC
# Line 2775  It returns the number of characters chan Line 2775  It returns the number of characters chan
2775    
2776    pos = XINT (start);    pos = XINT (start);
2777    pos_byte = CHAR_TO_BYTE (pos);    pos_byte = CHAR_TO_BYTE (pos);
2778    end_pos = XINT (end);    end_pos = XINT (end);
2779    modify_region (current_buffer, pos, XINT (end));    modify_region (current_buffer, pos, XINT (end));
2780    
2781    cnt = 0;    cnt = 0;
# Line 3268  usage: (format STRING &rest OBJECTS)  */ Line 3268  usage: (format STRING &rest OBJECTS)  */
3268    /* discarded[I] is 1 if byte I of the format    /* discarded[I] is 1 if byte I of the format
3269       string was not copied into the output.       string was not copied into the output.
3270       It is 2 if byte I was not the first byte of its character.  */       It is 2 if byte I was not the first byte of its character.  */
3271    char *discarded;    char *discarded = 0;
3272    
3273    /* Each element records, for one argument,    /* Each element records, for one argument,
3274       the start and end bytepos in the output string,       the start and end bytepos in the output string,
# Line 3319  usage: (format STRING &rest OBJECTS)  */ Line 3319  usage: (format STRING &rest OBJECTS)  */
3319    {    {
3320      int nbytes = (nargs+1) * sizeof *info;      int nbytes = (nargs+1) * sizeof *info;
3321      int i;      int i;
3322      info = (struct info *) alloca (nbytes);      if (!info)
3323          info = (struct info *) alloca (nbytes);
3324      bzero (info, nbytes);      bzero (info, nbytes);
3325      for (i = 0; i <= nargs; i++)      for (i = 0; i <= nargs; i++)
3326        info[i].start = -1;        info[i].start = -1;
3327      discarded = (char *) alloca (SBYTES (args[0]));      if (!discarded)
3328          SAFE_ALLOCA (discarded, char *, SBYTES (args[0]));
3329      bzero (discarded, SBYTES (args[0]));      bzero (discarded, SBYTES (args[0]));
3330    }    }
3331    
# Line 3684  usage: (format STRING &rest OBJECTS)  */ Line 3686  usage: (format STRING &rest OBJECTS)  */
3686    val = make_specified_string (buf, nchars, p - buf, multibyte);    val = make_specified_string (buf, nchars, p - buf, multibyte);
3687    
3688    /* If we allocated BUF with malloc, free it too.  */    /* If we allocated BUF with malloc, free it too.  */
3689    SAFE_FREE (total);    SAFE_FREE ();
3690    
3691    /* If the format string has text properties, or any of the string    /* If the format string has text properties, or any of the string
3692       arguments has text properties, set up text properties of the       arguments has text properties, set up text properties of the
# Line 4056  Transposing beyond buffer boundaries is Line 4058  Transposing beyond buffer boundaries is
4058            bcopy (start2_addr, temp, len2_byte);            bcopy (start2_addr, temp, len2_byte);
4059            bcopy (start1_addr, start1_addr + len2_byte, len1_byte);            bcopy (start1_addr, start1_addr + len2_byte, len1_byte);
4060            bcopy (temp, start1_addr, len2_byte);            bcopy (temp, start1_addr, len2_byte);
4061            SAFE_FREE (len2_byte);            SAFE_FREE ();
4062          }          }
4063        else        else
4064          /* First region not smaller than second.  */          /* First region not smaller than second.  */
# Line 4069  Transposing beyond buffer boundaries is Line 4071  Transposing beyond buffer boundaries is
4071            bcopy (start1_addr, temp, len1_byte);            bcopy (start1_addr, temp, len1_byte);
4072            bcopy (start2_addr, start1_addr, len2_byte);            bcopy (start2_addr, start1_addr, len2_byte);
4073            bcopy (temp, start1_addr + len2_byte, len1_byte);            bcopy (temp, start1_addr + len2_byte, len1_byte);
4074            SAFE_FREE (len1_byte);            SAFE_FREE ();
4075          }          }
4076        graft_intervals_into_buffer (tmp_interval1, start1 + len2,        graft_intervals_into_buffer (tmp_interval1, start1 + len2,
4077                                     len1, current_buffer, 0);                                     len1, current_buffer, 0);
# Line 4105  Transposing beyond buffer boundaries is Line 4107  Transposing beyond buffer boundaries is
4107            bcopy (start1_addr, temp, len1_byte);            bcopy (start1_addr, temp, len1_byte);
4108            bcopy (start2_addr, start1_addr, len2_byte);            bcopy (start2_addr, start1_addr, len2_byte);
4109            bcopy (temp, start2_addr, len1_byte);            bcopy (temp, start2_addr, len1_byte);
4110            SAFE_FREE (len1_byte);            SAFE_FREE ();
4111    
4112            graft_intervals_into_buffer (tmp_interval1, start2,            graft_intervals_into_buffer (tmp_interval1, start2,
4113                                         len1, current_buffer, 0);                                         len1, current_buffer, 0);
# Line 4134  Transposing beyond buffer boundaries is Line 4136  Transposing beyond buffer boundaries is
4136            bcopy (start1_addr, start1_addr + len_mid + len2_byte, len1_byte);            bcopy (start1_addr, start1_addr + len_mid + len2_byte, len1_byte);
4137            safe_bcopy (start1_addr + len1_byte, start1_addr + len2_byte, len_mid);            safe_bcopy (start1_addr + len1_byte, start1_addr + len2_byte, len_mid);
4138            bcopy (temp, start1_addr, len2_byte);            bcopy (temp, start1_addr, len2_byte);
4139            SAFE_FREE (len2_byte);            SAFE_FREE ();
4140    
4141            graft_intervals_into_buffer (tmp_interval1, end2 - len1,            graft_intervals_into_buffer (tmp_interval1, end2 - len1,
4142                                         len1, current_buffer, 0);                                         len1, current_buffer, 0);
# Line 4165  Transposing beyond buffer boundaries is Line 4167  Transposing beyond buffer boundaries is
4167            bcopy (start2_addr, start1_addr, len2_byte);            bcopy (start2_addr, start1_addr, len2_byte);
4168            bcopy (start1_addr + len1_byte, start1_addr + len2_byte, len_mid);            bcopy (start1_addr + len1_byte, start1_addr + len2_byte, len_mid);
4169            bcopy (temp, start1_addr + len2_byte + len_mid, len1_byte);            bcopy (temp, start1_addr + len2_byte + len_mid, len1_byte);
4170            SAFE_FREE (len1_byte);            SAFE_FREE ();
4171    
4172            graft_intervals_into_buffer (tmp_interval1, end2 - len1,            graft_intervals_into_buffer (tmp_interval1, end2 - len1,
4173                                         len1, current_buffer, 0);                                         len1, current_buffer, 0);

Legend:
Removed from v.1.380  
changed lines
  Added in v.1.381

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26