comparison src/editfns.c @ 23565:077655e1e014

(Fsubst_char_in_region): Fix previous change. (Ftranslate_region): Fix previous change.

23564:6eb3e346d1fd

	      replace_range (pos, pos + 1, string,
			     0, 0, 1);
	      pos_byte_next = CHAR_TO_BYTE (pos);
	      if (pos_byte_next > pos_byte)
		/* Before combining happened.  We should not increment
		   POS because now it points the next character.  */
		pos_byte = pos_byte_next;
	      else
		{
		  pos++;
		  INC_POS (pos_byte_next);
		}
		
	      if (! NILP (noundo))
		current_buffer->undo_list = tem;

	      UNGCPRO;

	  else
	    {
	      if (NILP (noundo))
		record_change (pos, 1);
	      for (i = 0; i < len; i++) *p++ = tostr[i];
	      pos_byte = pos_byte_next;
	      pos++;
	    }
	}
      else
	{
	  pos_byte = pos_byte_next;
	  pos++;
	}
    }

  if (changed)
    signal_after_change (XINT (start),
			 XINT (end) - XINT (start), XINT (end) - XINT (start));

		  replace_range (pos, pos + 1, string,
				 1, 0, 1);
		  pos_byte_next = CHAR_TO_BYTE (pos);
		  if (pos_byte_next > pos_byte)
		    /* Before combining happened.  We should not
		       increment POS because now it points the next
		       character.  */
		    pos_byte = pos_byte_next;
		  else
		    {
		      pos++;
		      INC_POS (pos_byte_next);
		    }
		}
	      else
		{
		  record_change (pos, 1);
		  *p = nc;
		  signal_after_change (pos, 1, 1);
		  pos_byte++;
		  pos++;
		}
	      ++cnt;
	    }
	  else
	    {
	      pos_byte++;
	      pos++;
	    }
	}
      else
	{
	  pos_byte += len;
	  pos++;
	}
    }

  return make_number (cnt);
}

23565:077655e1e014

	      replace_range (pos, pos + 1, string,
			     0, 0, 1);
	      pos_byte_next = CHAR_TO_BYTE (pos);
	      if (pos_byte_next > pos_byte)
		/* Before combining happened.  We should not increment
		   POS.  So, to cancel the later increment of POS,
		   decrease it now.  */
		pos--;
	      else
		INC_POS (pos_byte_next);
		
	      if (! NILP (noundo))
		current_buffer->undo_list = tem;

	      UNGCPRO;

	  else
	    {
	      if (NILP (noundo))
		record_change (pos, 1);
	      for (i = 0; i < len; i++) *p++ = tostr[i];
	    }
	}
      pos_byte = pos_byte_next;
      pos++;
    }

  if (changed)
    signal_after_change (XINT (start),
			 XINT (end) - XINT (start), XINT (end) - XINT (start));

		  replace_range (pos, pos + 1, string,
				 1, 0, 1);
		  pos_byte_next = CHAR_TO_BYTE (pos);
		  if (pos_byte_next > pos_byte)
		    /* Before combining happened.  We should not
		       increment POS.  So, to cancel the later
		       increment of POS, we decrease it now.  */
		    pos--;
		  else
		    INC_POS (pos_byte_next);
		}
	      else
		{
		  record_change (pos, 1);
		  *p = nc;
		  signal_after_change (pos, 1, 1);
		}
	      ++cnt;
	    }
	}
      pos_byte = pos_byte_next;
      pos++;
    }

  return make_number (cnt);
}