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

[Miles Bader]

Index: emacs/src/editfns.c
diff -c emacs/src/editfns.c:1.330.2.15 emacs/src/editfns.c:1.330.2.16
*** emacs/src/editfns.c:1.330.2.15      Mon Oct 25 04:22:26 2004
--- emacs/src/editfns.c Fri Oct 29 02:05:10 2004
***************
*** 2775,2781 ****
  
    pos = XINT (start);
    pos_byte = CHAR_TO_BYTE (pos);
!   end_pos = XINT (end); 
    modify_region (current_buffer, pos, XINT (end));
  
    cnt = 0;
--- 2775,2781 ----
  
    pos = XINT (start);
    pos_byte = CHAR_TO_BYTE (pos);
!   end_pos = XINT (end);
    modify_region (current_buffer, pos, XINT (end));
  
    cnt = 0;
***************
*** 3049,3059 ****
  
  DEFUN ("message", Fmessage, Smessage, 1, MANY, 0,
         doc: /* Print a one-line message at the bottom of the screen.
  The first argument is a format control string, and the rest are data
  to be formatted under control of the string.  See `format' for details.
  
! If the first argument is nil, clear any existing message; let the
! minibuffer contents show.
  
  usage: (message STRING &rest ARGS)  */)
       (nargs, args)
--- 3049,3062 ----
  
  DEFUN ("message", Fmessage, Smessage, 1, MANY, 0,
         doc: /* Print a one-line message at the bottom of the screen.
+ The message also goes into the `*Messages*' buffer.
+ \(In keyboard macros, that's all it does.)
+ 
  The first argument is a format control string, and the rest are data
  to be formatted under control of the string.  See `format' for details.
  
! If the first argument is nil, the function clears any existing message;
! this lets the minibuffer contents show.  See also `current-message'.
  
  usage: (message STRING &rest ARGS)  */)
       (nargs, args)
***************
*** 3268,3274 ****
    /* discarded[I] is 1 if byte I of the format
       string was not copied into the output.
       It is 2 if byte I was not the first byte of its character.  */
!   char *discarded;
  
    /* Each element records, for one argument,
       the start and end bytepos in the output string,
--- 3271,3277 ----
    /* discarded[I] is 1 if byte I of the format
       string was not copied into the output.
       It is 2 if byte I was not the first byte of its character.  */
!   char *discarded = 0;
  
    /* Each element records, for one argument,
       the start and end bytepos in the output string,
***************
*** 3319,3329 ****
    {
      int nbytes = (nargs+1) * sizeof *info;
      int i;
!     info = (struct info *) alloca (nbytes);
      bzero (info, nbytes);
      for (i = 0; i <= nargs; i++)
        info[i].start = -1;
!     discarded = (char *) alloca (SBYTES (args[0]));
      bzero (discarded, SBYTES (args[0]));
    }
  
--- 3322,3334 ----
    {
      int nbytes = (nargs+1) * sizeof *info;
      int i;
!     if (!info)
!       info = (struct info *) alloca (nbytes);
      bzero (info, nbytes);
      for (i = 0; i <= nargs; i++)
        info[i].start = -1;
!     if (!discarded)
!       SAFE_ALLOCA (discarded, char *, SBYTES (args[0]));
      bzero (discarded, SBYTES (args[0]));
    }
  
***************
*** 3684,3690 ****
    val = make_specified_string (buf, nchars, p - buf, multibyte);
  
    /* If we allocated BUF with malloc, free it too.  */
!   SAFE_FREE (total);
  
    /* If the format string has text properties, or any of the string
       arguments has text properties, set up text properties of the
--- 3689,3695 ----
    val = make_specified_string (buf, nchars, p - buf, multibyte);
  
    /* If we allocated BUF with malloc, free it too.  */
!   SAFE_FREE ();
  
    /* If the format string has text properties, or any of the string
       arguments has text properties, set up text properties of the
***************
*** 4056,4062 ****
            bcopy (start2_addr, temp, len2_byte);
            bcopy (start1_addr, start1_addr + len2_byte, len1_byte);
            bcopy (temp, start1_addr, len2_byte);
!         SAFE_FREE (len2_byte);
          }
        else
        /* First region not smaller than second.  */
--- 4061,4067 ----
            bcopy (start2_addr, temp, len2_byte);
            bcopy (start1_addr, start1_addr + len2_byte, len1_byte);
            bcopy (temp, start1_addr, len2_byte);
!         SAFE_FREE ();
          }
        else
        /* First region not smaller than second.  */
***************
*** 4069,4075 ****
            bcopy (start1_addr, temp, len1_byte);
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (temp, start1_addr + len2_byte, len1_byte);
!         SAFE_FREE (len1_byte);
          }
        graft_intervals_into_buffer (tmp_interval1, start1 + len2,
                                     len1, current_buffer, 0);
--- 4074,4080 ----
            bcopy (start1_addr, temp, len1_byte);
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (temp, start1_addr + len2_byte, len1_byte);
!         SAFE_FREE ();
          }
        graft_intervals_into_buffer (tmp_interval1, start1 + len2,
                                     len1, current_buffer, 0);
***************
*** 4105,4111 ****
            bcopy (start1_addr, temp, len1_byte);
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (temp, start2_addr, len1_byte);
!         SAFE_FREE (len1_byte);
  
            graft_intervals_into_buffer (tmp_interval1, start2,
                                         len1, current_buffer, 0);
--- 4110,4116 ----
            bcopy (start1_addr, temp, len1_byte);
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (temp, start2_addr, len1_byte);
!         SAFE_FREE ();
  
            graft_intervals_into_buffer (tmp_interval1, start2,
                                         len1, current_buffer, 0);
***************
*** 4134,4140 ****
            bcopy (start1_addr, start1_addr + len_mid + len2_byte, len1_byte);
            safe_bcopy (start1_addr + len1_byte, start1_addr + len2_byte, 
len_mid);
            bcopy (temp, start1_addr, len2_byte);
!         SAFE_FREE (len2_byte);
  
            graft_intervals_into_buffer (tmp_interval1, end2 - len1,
                                         len1, current_buffer, 0);
--- 4139,4145 ----
            bcopy (start1_addr, start1_addr + len_mid + len2_byte, len1_byte);
            safe_bcopy (start1_addr + len1_byte, start1_addr + len2_byte, 
len_mid);
            bcopy (temp, start1_addr, len2_byte);
!         SAFE_FREE ();
  
            graft_intervals_into_buffer (tmp_interval1, end2 - len1,
                                         len1, current_buffer, 0);
***************
*** 4165,4171 ****
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (start1_addr + len1_byte, start1_addr + len2_byte, len_mid);
            bcopy (temp, start1_addr + len2_byte + len_mid, len1_byte);
!         SAFE_FREE (len1_byte);
  
            graft_intervals_into_buffer (tmp_interval1, end2 - len1,
                                         len1, current_buffer, 0);
--- 4170,4176 ----
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (start1_addr + len1_byte, start1_addr + len2_byte, len_mid);
            bcopy (temp, start1_addr + len2_byte + len_mid, len1_byte);
!         SAFE_FREE ();
  
            graft_intervals_into_buffer (tmp_interval1, end2 - len1,
                                         len1, current_buffer, 0);