#include "lisp.h"
#include "buffer.h"
#include "charset.h"
+#include "category.h"
#include "indent.h"
#include "frame.h"
#include "window.h"
int to;
Lisp_Object window;
{
- Lisp_Object prop, position, end, overlay_limit, proplimit;
+ Lisp_Object prop, position, overlay_limit, proplimit;
Lisp_Object buffer;
+ int end;
XSETFASTINT (position, pos);
XSETBUFFER (buffer, current_buffer);
/* No matter what. don't go past next overlay change. */
if (XFASTINT (overlay_limit) < XFASTINT (proplimit))
proplimit = overlay_limit;
- end = Fnext_single_property_change (position, Qinvisible,
- buffer, proplimit);
+ end = XFASTINT (Fnext_single_property_change (position, Qinvisible,
+ buffer, proplimit));
/* Don't put the boundary in the middle of multibyte form if
there is no actual property change. */
if (end == pos + 100
&& end < ZV)
while (pos < end && !CHAR_HEAD_P (POS_ADDR (end)))
end--;
- *next_boundary_p = XFASTINT (end);
+ *next_boundary_p = end;
}
/* if the `invisible' property is set, we can skip to
the next property change */
/* Cancel any recorded value of the horizontal position. */
+void
invalidate_current_column ()
{
last_known_column_point = 0;
col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
else if (c >= 040 && c < 0177)
col++;
- else if (c == '\n')
- break;
- else if (c == '\r' && EQ (current_buffer->selective_display, Qt))
- break;
+ else if (c == '\n'
+ || (c == '\r' && EQ (current_buffer->selective_display, Qt)))
+ {
+ ptr++;
+ break;
+ }
else if (c == '\t')
{
if (tab_seen)
if (ptr == BEGV_ADDR)
current_column_bol_cache = BEGV;
else
- current_column_bol_cache = PTR_CHAR_POS ((ptr+1));
+ current_column_bol_cache = PTR_CHAR_POS (ptr);
last_known_column = col;
last_known_column_point = PT;
last_known_column_modified = MODIFF;
}
switch (*p++)
{
+ case 0240:
+ if (! NILP (current_buffer->enable_multibyte_characters))
+ return column;
case ' ':
column++;
break;
column += tab_width - column % tab_width;
break;
default:
- return column;
+ if (ASCII_BYTE_P (p[-1])
+ || NILP (current_buffer->enable_multibyte_characters))
+ return column;
+ {
+ int pos = PTR_CHAR_POS (p - 1);
+ int c = FETCH_MULTIBYTE_CHAR (pos);
+ if (CHAR_HAS_CATEGORY (c, ' '))
+ {
+ column++;
+ INC_POS (pos);
+ p = POS_ADDR (pos);
+ }
+ else
+ return column;
+ }
}
}
}
{
while (pos == next_boundary)
{
+ int newpos;
+
/* If the caller says that the screen position came from an earlier
call to compute_motion, then we've already accounted for the
overlay strings at point. This is only true the first time
(but not necessarily all that there are here),
and store in next_boundary the next position where
we need to call skip_invisible. */
- pos = skip_invisible (pos, &next_boundary, to, window);
+ newpos = skip_invisible (pos, &next_boundary, to, window);
+
+ if (newpos >= to)
+ goto after_loop;
+
+ pos = newpos;
}
/* Handle right margin. */
if (vpos > tovpos || vpos == tovpos && hpos >= tohpos)
{
if (contin_hpos && prev_hpos == 0
- && (contin_hpos == width || wide_column))
+ && ((hpos > tohpos && contin_hpos == width) || wide_column))
{ /* Line breaks because we can't put the character at the
previous line any more. It is not the multi-column
character continued in middle. Go back to previous
/* Is this character part of the current run? If so, extend
the run. */
if (pos - 1 == width_run_end
- && width_table[c] == width_run_width)
+ && XFASTINT (width_table[c]) == width_run_width)
width_run_end = pos;
/* The previous run is over, since this is a character at a
width_run_start, width_run_end);
/* Start recording a new width run. */
- width_run_width = width_table[c];
+ width_run_width = XFASTINT (width_table[c]);
width_run_start = pos - 1;
width_run_end = pos;
}
}
- if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
+ if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))
+ && ! (multibyte && BASE_LEADING_CODE_P (c)))
hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
else if (c >= 040 && c < 0177)
hpos++;
{
if (selective > 0 && indented_beyond_p (pos, selective))
{
- /* Skip any number of invisible lines all at once */
- do
- pos = find_before_next_newline (pos, to, 1) + 1;
- while (pos < to
- && indented_beyond_p (pos, selective));
- /* Allow for the " ..." that is displayed for them. */
- if (selective_rlen)
+ /* If (pos == to), we don't have to take care of
+ selective display. */
+ if (pos < to)
{
- hpos += selective_rlen;
- if (hpos >= width)
- hpos = width;
+ /* Skip any number of invisible lines all at once */
+ do
+ pos = find_before_next_newline (pos, to, 1) + 1;
+ while (pos < to
+ && indented_beyond_p (pos, selective));
+ /* Allow for the " ..." that is displayed for them. */
+ if (selective_rlen)
+ {
+ hpos += selective_rlen;
+ if (hpos >= width)
+ hpos = width;
+ }
+ --pos;
+ /* We have skipped the invis text, but not the
+ newline after. */
}
- --pos;
- /* We have skipped the invis text, but not the
- newline after. */
}
else
{
/* In selective display mode,
everything from a ^M to the end of the line is invisible.
Stop *before* the real newline. */
- pos = find_before_next_newline (pos, to, 1);
+ if (pos < to)
+ pos = find_before_next_newline (pos, to, 1);
/* If we just skipped next_boundary,
loop around in the main while
and handle it. */
{
/* Start of multi-byte form. */
unsigned char *ptr;
+ int len, actual_len;
pos--; /* rewind POS */
- ptr = POS_ADDR (pos);
- if (c == LEADING_CODE_COMPOSITION)
- {
- int cmpchar_id = str_cmpchar_id (ptr, next_boundary - pos);
+ ptr = (((pos) >= GPT ? GAP_SIZE : 0) + (pos) + BEG_ADDR - 1);
+ len = ((pos) >= GPT ? ZV : GPT) - (pos);
- if (cmpchar_id >= 0)
- {
- if (cmpchar_table[cmpchar_id]->width >= 2)
- wide_column = 1;
- hpos += cmpchar_table[cmpchar_id]->width;
- pos += cmpchar_table[cmpchar_id]->len;
- }
- else
- { /* invalid composite character */
- hpos += 4;
- pos ++;
- }
+ c = STRING_CHAR_AND_LENGTH (ptr, len, actual_len);
+
+ if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
+ hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
+ else if (actual_len == 1)
+ hpos += 4;
+ else if (COMPOSITE_CHAR_P (c))
+ {
+ int id = COMPOSITE_CHAR_ID (c);
+ int width = (id < n_cmpchars) ? cmpchar_table[id]->width : 0;
+ hpos += width;
+ if (width > 1)
+ wide_column = 1;
}
else
{
- /* Here, we check that the following bytes are valid
- constituents of multi-byte form. */
- int len = BYTES_BY_CHAR_HEAD (c), i;
-
- for (i = 1, ptr++; i < len; i++, ptr++)
- /* We don't need range checking for PTR because
- there are anchors ('\0') both at GPT and Z. */
- if (CHAR_HEAD_P (ptr)) break;
- if (i < len)
- hpos += 4, pos++;
- else
- hpos += WIDTH_BY_CHAR_HEAD (c), pos += i, wide_column = 1;
+ int width = WIDTH_BY_CHAR_HEAD (*ptr);
+ hpos += width;
+ if (width > 1)
+ wide_column = 1;
}
+
+ pos += actual_len;
}
else
hpos += (ctl_arrow && c < 0200) ? 2 : 4;
}
}
+ after_loop:
+
/* Remember any final width run in the cache. */
if (current_buffer->width_run_cache
&& width_run_width == 1