comparison src/xdisp.c @ 107584:e0df0337f248

Retrospective commit from 2009-08-15. Start of work on bidi Emacs 23/24. bidi.c (bidi_initialize): Fix initialization of bidi_type_table. xdisp.c (set_iterator_to_next): Fix position setting after call to bidi_get_next_char_visually. bidi.c: Include stdio.h unconditionally. Fix and elaborate commentary. Add Copyright blurb.

107583:f35e7896a0fe

  it->dp = window_display_table (w);

  /* Are multibyte characters enabled in current_buffer?  */
  it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);

  /* Do we need multibyte processing?  */
  it->bidi_p = !NILP (current_buffer->enable_bidi_display);

  /* Non-zero if we should highlight the region.  */
  highlight_region_p
    = (!NILP (Vtransient_mark_mode)
       && !NILP (current_buffer->mark_active)

  it->string_from_display_prop_p = 0;
  it->face_before_selective_p = 0;

  if (it->bidi_p)
    {
      bidi_init_it (pos.charpos - 1, L2R, &it->bidi_it);
      bidi_get_next_char_visually (&it->bidi_it);

      pos.charpos = it->bidi_it.charpos;
      pos.bytepos = it->bidi_it.bytepos;

	      IT_CHARPOS (*it) += 1;
	    }
	  else
	    {
	      bidi_get_next_char_visually (&it->bidi_it);
	      IT_BYTEPOS (*it) = it->bidi_it.charpos;
	      IT_CHARPOS (*it) = it->bidi_it.bytepos;
	    }
	  xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it)));
	}
      break;

107584:e0df0337f248

  it->dp = window_display_table (w);

  /* Are multibyte characters enabled in current_buffer?  */
  it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);

  /* Do we need to reorded bidirectional text?  */
  it->bidi_p = !NILP (current_buffer->bidi_display_reordering);

  /* Non-zero if we should highlight the region.  */
  highlight_region_p
    = (!NILP (Vtransient_mark_mode)
       && !NILP (current_buffer->mark_active)

  it->string_from_display_prop_p = 0;
  it->face_before_selective_p = 0;

  if (it->bidi_p)
    {
      /* FIXME: L2R below is just for easyness of testing, as we
	 currently support only left-to-right paragraphs.  The value
	 should be user-definable and/or come from some ``higher
	 protocol''. In the absence of any other guidance, the default
	 for this initialization should be NEUTRAL_DIR.  */
      bidi_init_it (pos.charpos - 1, L2R, &it->bidi_it);
      bidi_get_next_char_visually (&it->bidi_it);

      pos.charpos = it->bidi_it.charpos;
      pos.bytepos = it->bidi_it.bytepos;

	      IT_CHARPOS (*it) += 1;
	    }
	  else
	    {
	      bidi_get_next_char_visually (&it->bidi_it);
	      IT_BYTEPOS (*it) = it->bidi_it.bytepos;
	      IT_CHARPOS (*it) = it->bidi_it.charpos;
	    }
	  xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it)));
	}
      break;