comparison src/syntax.c @ 20766:92c662c4ab0e

(back_comment): Move the find_defun_start call out of the scan_sexps_forward call. No need to call find_defun_start if we found the defun start in the initial scan.

20765:2bdc3877262b

  int my_stringend = 0;
  int string_lossage = 0;
  int comment_end = from;
  int comment_end_byte = from_byte;
  int comstart_pos = 0;
  int comstart_parity = 0;
  int comstart_byte;
  int scanstart = from - 1;
  register enum syntaxcode code;
  int c;

  /* At beginning of range to scan, we're outside of strings;
     that determines quote parity to the comment-end.  */

      /* Assume a defun-start point is outside of strings.  */
      if (code == Sopen
	  && (from == stop
	      || (temp_byte = dec_bytepos (from_byte),
		  FETCH_CHAR (temp_byte) == '\n')))
	break;
    }

  if (comstart_pos == 0)
    {
      from = comment_end;

	 together.  Decode this going forwards.
	 Scan fwd from the previous comment ender
	 to the one in question; this records where we
	 last passed a comment starter.  */
      struct lisp_parse_state state;
      scan_sexps_forward (&state,
			  find_defun_start (comment_end, comment_end_byte),
			  find_start_value_byte,
			  comment_end - 1, -10000, 0, Qnil, 0);
      if (state.incomment)
	{
	  /* scan_sexps_forward changed the direction of search in
	     global variables, so we need to update it completely.  */

20766:92c662c4ab0e

  int my_stringend = 0;
  int string_lossage = 0;
  int comment_end = from;
  int comment_end_byte = from_byte;
  int comstart_pos = 0;
  int comstart_byte;
  /* Value that PARITY had, when we reached the position
     in COMSTART_POS.  */
  int comstart_parity = 0;
  int scanstart = from - 1;
  /* Place where the containing defun starts,
     or 0 if we didn't come across it yet.  */
  int defun_start = 0;
  int defun_start_byte = 0;
  register enum syntaxcode code;
  int c;

  /* At beginning of range to scan, we're outside of strings;
     that determines quote parity to the comment-end.  */

      /* Assume a defun-start point is outside of strings.  */
      if (code == Sopen
	  && (from == stop
	      || (temp_byte = dec_bytepos (from_byte),
		  FETCH_CHAR (temp_byte) == '\n')))
	{
	  defun_start = from;
	  defun_start_byte = from_byte;
	  break;
	}
    }

  if (comstart_pos == 0)
    {
      from = comment_end;

	 together.  Decode this going forwards.
	 Scan fwd from the previous comment ender
	 to the one in question; this records where we
	 last passed a comment starter.  */
      struct lisp_parse_state state;
      /* If we did not already find the defun start, find it now.  */
      if (defun_start == 0)
	{
	  defun_start = find_defun_start (comment_end, comment_end_byte);
	  defun_start_byte = find_start_value_byte;
	}
      scan_sexps_forward (&state,
			  defun_start, defun_start_byte,
			  comment_end - 1, -10000, 0, Qnil, 0);
      if (state.incomment)
	{
	  /* scan_sexps_forward changed the direction of search in
	     global variables, so we need to update it completely.  */