/* Indentation functions.
- Copyright (C) 1985,86,87,88,93,94,95 Free Software Foundation, Inc.
+ Copyright (C) 1985,86,87,88,93,94,95,98 Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include "lisp.h"
#include "buffer.h"
#include "charset.h"
+#include "category.h"
#include "indent.h"
#include "frame.h"
#include "window.h"
int last_known_column_modified;
static int current_column_1 ();
+static int position_indentation ();
/* Cache of beginning of line found by the last call of
current_column. */
proplimit = overlay_limit;
end = XFASTINT (Fnext_single_property_change (position, Qinvisible,
buffer, proplimit));
+#if 0
/* 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--;
+#endif
*next_boundary_p = end;
}
/* if the `invisible' property is set, we can skip to
return pos;
}
\f
+/* Set variables WIDTH and BYTES for a multibyte sequence starting at P.
+
+ C is *P which should satisfy `BASE_LEADING_CODE_P (c)'.
+
+ DP is a display table or NULL.
+
+ This macro is used in current_column_1, Fmove_to_column, and
+ compute_motion. */
+
+#define MULTIBYTE_BYTES_WIDTH(p, c, dp) \
+ do { \
+ unsigned char *pend = p + 1; \
+ \
+ wide_column = 0; \
+ while (! CHAR_HEAD_P (*pend)) pend++; \
+ \
+ if (c == LEADING_CODE_COMPOSITION) \
+ { \
+ int id = str_cmpchar_id (p, pend - p); \
+ int ch = MAKE_COMPOSITE_CHAR (id); \
+ \
+ if (id >= 0) \
+ { \
+ bytes = cmpchar_table[id]->len; \
+ if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, ch))) \
+ width = XVECTOR (DISP_CHAR_VECTOR (dp, ch))->size; \
+ else \
+ width = cmpchar_table[id]->width; \
+ if (width > 1) \
+ wide_column = width; \
+ } \
+ else \
+ { \
+ bytes = 1; \
+ width = 4; \
+ } \
+ } \
+ else \
+ { \
+ bytes = BYTES_BY_CHAR_HEAD (c); \
+ if (bytes >= 2 && bytes <= pend - p) \
+ { \
+ int ch = STRING_CHAR (p, bytes); \
+ \
+ if (CHAR_VALID_P (ch, 0)) \
+ { \
+ if (dp && VECTORP (DISP_CHAR_VECTOR (dp, ch))) \
+ width = XVECTOR (DISP_CHAR_VECTOR (dp, ch))->size; \
+ else \
+ width = WIDTH_BY_CHAR_HEAD (c); \
+ } \
+ else \
+ width = bytes * 4; \
+ if (width > 1) \
+ wide_column = width; \
+ } \
+ else \
+ { \
+ bytes = 1; \
+ width = 4; \
+ } \
+ } \
+ if (p + bytes < pend) \
+ { \
+ width += 4 * (pend - (p + bytes)); \
+ bytes = pend - p; \
+ } \
+ } while (0)
+
DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0,
"Return the horizontal position of point. Beginning of line is column 0.\n\
This is calculated by adding together the widths of all the displayed\n\
/* Cancel any recorded value of the horizontal position. */
+void
invalidate_current_column ()
{
last_known_column_point = 0;
&& MODIFF == last_known_column_modified)
return last_known_column;
- /* If the buffer has overlays, text properties, or multibyte,
- use a more general algorithm. */
+ /* If the buffer has overlays, text properties,
+ or multibyte characters, use a more general algorithm. */
if (BUF_INTERVALS (current_buffer)
|| !NILP (current_buffer->overlays_before)
|| !NILP (current_buffer->overlays_after)
- || !NILP (current_buffer->enable_multibyte_characters))
- return current_column_1 (PT);
+ || Z != Z_BYTE)
+ return current_column_1 ();
/* Scan backwards from point to the previous newline,
counting width. Tab characters are the only complicated case. */
/* Make a pointer for decrementing through the chars before point. */
- ptr = POS_ADDR (PT - 1) + 1;
+ ptr = BYTE_POS_ADDR (PT_BYTE - 1) + 1;
/* Make a pointer to where consecutive chars leave off,
going backwards from point. */
if (PT == BEGV)
if (ptr == BEGV_ADDR)
current_column_bol_cache = BEGV;
else
- current_column_bol_cache = PTR_CHAR_POS (ptr);
+ current_column_bol_cache = BYTE_TO_CHAR (PTR_BYTE_POS (ptr));
+
last_known_column = col;
last_known_column_point = PT;
last_known_column_modified = MODIFF;
due to text properties or overlays. */
static int
-current_column_1 (pos)
- int pos;
+current_column_1 ()
{
register int tab_width = XINT (current_buffer->tab_width);
register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
register struct Lisp_Char_Table *dp = buffer_display_table ();
+ int multibyte = !NILP (current_buffer->enable_multibyte_characters);
/* Start the scan at the beginning of this line with column number 0. */
register int col = 0;
- int scan = current_column_bol_cache = find_next_newline (pos, -1);
- int next_boundary = scan;
- int multibyte = !NILP (current_buffer->enable_multibyte_characters);
+ int scan, scan_byte;
+ int next_boundary, next_boundary_byte;
+ int opoint = PT, opoint_byte = PT_BYTE;
+
+ scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
+ current_column_bol_cache = PT;
+ scan = PT, scan_byte = PT_BYTE;
+ SET_PT_BOTH (opoint, opoint_byte);
+ next_boundary = scan;
+ next_boundary_byte = scan_byte;
if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
/* Scan forward to the target position. */
- while (scan < pos)
+ while (scan < opoint)
{
int c;
/* Occasionally we may need to skip invisible text. */
while (scan == next_boundary)
{
+ int old_scan = scan;
/* This updates NEXT_BOUNDARY to the next place
where we might need to skip more invisible text. */
- scan = skip_invisible (scan, &next_boundary, pos, Qnil);
- if (scan >= pos)
+ scan = skip_invisible (scan, &next_boundary, opoint, Qnil);
+ if (scan >= opoint)
goto endloop;
+ if (scan != old_scan)
+ scan_byte = CHAR_TO_BYTE (scan);
+ next_boundary_byte = CHAR_TO_BYTE (next_boundary);
}
- c = FETCH_BYTE (scan);
- if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
+ c = FETCH_BYTE (scan_byte);
+ if (dp != 0
+ && ! (multibyte && BASE_LEADING_CODE_P (c))
+ && VECTORP (DISP_CHAR_VECTOR (dp, c)))
{
col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
scan++;
+ scan_byte++;
continue;
}
if (c == '\n')
if (c == '\r' && EQ (current_buffer->selective_display, Qt))
break;
scan++;
+ scan_byte++;
if (c == '\t')
{
int prev_col = col;
}
else if (multibyte && BASE_LEADING_CODE_P (c))
{
- scan--;
- /* Start of multi-byte form. */
- if (c == LEADING_CODE_COMPOSITION)
- {
- unsigned char *ptr = POS_ADDR (scan);
+ unsigned char *ptr;
+ int bytes, width, wide_column;
- int cmpchar_id = str_cmpchar_id (ptr, next_boundary - scan);
- if (cmpchar_id >= 0)
- {
- scan += cmpchar_table[cmpchar_id]->len,
- col += cmpchar_table[cmpchar_id]->width;
- }
- else
- { /* invalid composite character */
- scan++;
- col += 4;
- }
- }
- 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, scan++; i < len; i++, scan++)
- /* We don't need range checking for PTR because there
- are anchors (`\0') at GAP and Z. */
- if (CHAR_HEAD_P (POS_ADDR (scan))) break;
- if (i < len)
- col += 4, scan -= i - 1;
- else
- col += WIDTH_BY_CHAR_HEAD (c);
- }
+ scan_byte--;
+ ptr = BYTE_POS_ADDR (scan_byte);
+ MULTIBYTE_BYTES_WIDTH (ptr, c, dp);
+ scan_byte += bytes;
+ col += width;
}
else if (ctl_arrow && (c < 040 || c == 0177))
col += 2;
}
\f
+static int position_indentation P_ ((int));
+
DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
0, 0, 0,
"Return the indentation of the current line.\n\
()
{
Lisp_Object val;
+ int opoint = PT, opoint_byte = PT_BYTE;
+
+ scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
- XSETFASTINT (val, position_indentation (find_next_newline (PT, -1)));
+ XSETFASTINT (val, position_indentation (PT_BYTE));
+ SET_PT_BOTH (opoint, opoint_byte);
return val;
}
-position_indentation (pos)
- register int pos;
+static int
+position_indentation (pos_byte)
+ register int pos_byte;
{
register int column = 0;
register int tab_width = XINT (current_buffer->tab_width);
register unsigned char *p;
register unsigned char *stop;
unsigned char *start;
- int next_boundary = pos;
- int ceiling = pos;
+ int next_boundary_byte = pos_byte;
+ int ceiling = next_boundary_byte;
if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
- p = POS_ADDR (pos);
+ p = BYTE_POS_ADDR (pos_byte);
/* STOP records the value of P at which we will need
to think about the gap, or about invisible text,
or about the end of the buffer. */
{
while (p == stop)
{
- int stop_pos;
+ int stop_pos_byte;
- /* If we have updated P, set POS to match.
- The first time we enter the loop, POS is already right. */
+ /* If we have updated P, set POS_BYTE to match.
+ The first time we enter the loop, POS_BYTE is already right. */
if (p != start)
- pos = PTR_CHAR_POS (p);
+ pos_byte = PTR_BYTE_POS (p);
/* Consider the various reasons STOP might have been set here. */
- if (pos == ZV)
+ if (pos_byte == ZV_BYTE)
return column;
- if (pos == next_boundary)
- pos = skip_invisible (pos, &next_boundary, ZV, Qnil);
- if (pos >= ceiling)
- ceiling = BUFFER_CEILING_OF (pos) + 1;
+ if (pos_byte == next_boundary_byte)
+ {
+ int next_boundary;
+ int pos = BYTE_TO_CHAR (pos_byte);
+ pos = skip_invisible (pos, &next_boundary, ZV, Qnil);
+ pos_byte = CHAR_TO_BYTE (pos);
+ next_boundary_byte = CHAR_TO_BYTE (next_boundary);
+ }
+ if (pos_byte >= ceiling)
+ ceiling = BUFFER_CEILING_OF (pos_byte) + 1;
/* Compute the next place we need to stop and think,
and set STOP accordingly. */
- stop_pos = min (ceiling, next_boundary);
+ stop_pos_byte = min (ceiling, next_boundary_byte);
/* The -1 and +1 arrange to point at the first byte of gap
- (if STOP_POS is the position of the gap)
+ (if STOP_POS_BYTE is the position of the gap)
rather than at the data after the gap. */
- stop = POS_ADDR (stop_pos - 1) + 1;
- p = POS_ADDR (pos);
+ stop = BYTE_POS_ADDR (stop_pos_byte - 1) + 1;
+ p = BYTE_POS_ADDR (pos_byte);
}
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 c;
+ pos_byte = PTR_BYTE_POS (p - 1);
+ c = FETCH_MULTIBYTE_CHAR (pos_byte);
+ if (CHAR_HAS_CATEGORY (c, ' '))
+ {
+ column++;
+ INC_POS (pos_byte);
+ p = BYTE_POS_ADDR (pos_byte);
+ }
+ else
+ return column;
+ }
}
}
}
/* Test whether the line beginning at POS is indented beyond COLUMN.
Blank lines are treated as if they had the same indentation as the
preceding line. */
+
int
-indented_beyond_p (pos, column)
- int pos, column;
+indented_beyond_p (pos, pos_byte, column)
+ int pos, pos_byte, column;
{
- while (pos > BEGV && FETCH_BYTE (pos) == '\n')
- pos = find_next_newline_no_quit (pos - 1, -1);
- return (position_indentation (pos) >= column);
+ int val;
+ int opoint = PT, opoint_byte = PT_BYTE;
+
+ SET_PT_BOTH (pos, pos_byte);
+ while (PT > BEGV && FETCH_BYTE (PT_BYTE) == '\n')
+ scan_newline (PT - 1, PT_BYTE - 1, BEGV, BEGV_BYTE, -1, 0);
+
+ val = position_indentation (PT_BYTE);
+ SET_PT_BOTH (opoint, opoint_byte);
+ return val >= column;
}
\f
DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p",
Lisp_Object val;
int prev_col;
int c;
-
int next_boundary;
+ int pos_byte, end_byte, next_boundary_byte;
+
if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
CHECK_NATNUM (column, 0);
goal = XINT (column);
pos = PT;
+ pos_byte = PT_BYTE;
end = ZV;
+ end_byte = ZV_BYTE;
next_boundary = pos;
+ next_boundary_byte = PT_BYTE;
/* If we're starting past the desired column,
back up to beginning of line and scan from there. */
{
end = pos;
pos = current_column_bol_cache;
+ pos_byte = CHAR_TO_BYTE (pos);
col = 0;
}
{
while (pos == next_boundary)
{
+ int prev = pos;
pos = skip_invisible (pos, &next_boundary, end, Qnil);
+ if (pos != prev)
+ pos_byte = CHAR_TO_BYTE (pos);
+ next_boundary_byte = CHAR_TO_BYTE (next_boundary);
if (pos >= end)
goto endloop;
}
if (col >= goal)
break;
- c = FETCH_BYTE (pos);
- if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
+ c = FETCH_BYTE (pos_byte);
+ if (dp != 0
+ && ! (multibyte && BASE_LEADING_CODE_P (c))
+ && VECTORP (DISP_CHAR_VECTOR (dp, c)))
{
col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
+ pos_byte++;
pos++;
continue;
}
if (c == '\r' && EQ (current_buffer->selective_display, Qt))
break;
pos++;
+ pos_byte++;
if (c == '\t')
{
prev_col = col;
{
/* Start of multi-byte form. */
unsigned char *ptr;
+ int bytes, width, wide_column;
- pos--; /* rewind to the character head */
- ptr = POS_ADDR (pos);
- if (c == LEADING_CODE_COMPOSITION)
- {
- int cmpchar_id = str_cmpchar_id (ptr, end - pos);
-
- if (cmpchar_id >= 0)
- {
- col += cmpchar_table[cmpchar_id]->width;
- pos += cmpchar_table[cmpchar_id]->len;
- }
- else
- { /* invalid composite character */
- col += 4;
- pos++;
- }
- }
- 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)
- col += 4, pos++;
- else
- col += WIDTH_BY_CHAR_HEAD (c), pos += i;
- }
+ pos_byte--;
+ ptr = BYTE_POS_ADDR (pos_byte);
+ MULTIBYTE_BYTES_WIDTH (ptr, c, dp);
+ pos_byte += bytes;
+ col += width;
}
else
col += 4;
}
endloop:
- SET_PT (pos);
+ SET_PT_BOTH (pos, pos_byte);
/* If a tab char made us overshoot, change it to spaces
and scan through it again. */
if (!NILP (force) && col > goal && c == '\t' && prev_col < goal)
{
- int old_point;
+ int old_point, old_point_byte;
del_range (PT - 1, PT);
Findent_to (make_number (goal), Qnil);
old_point = PT;
+ old_point_byte = PT_BYTE;
Findent_to (make_number (col), Qnil);
- SET_PT (old_point);
+ SET_PT_BOTH (old_point, old_point_byte);
/* Set the last_known... vars consistently. */
col = goal;
}
register int vpos = fromvpos;
register int pos;
+ int pos_byte;
register int c;
register int tab_width = XFASTINT (current_buffer->tab_width);
register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
Lisp_Object window;
int multibyte = !NILP (current_buffer->enable_multibyte_characters);
- int wide_column = 0; /* Set to 1 when a previous character
- is wide-colomn. */
+ /* If previous char scanned was a wide character,
+ this is the column where it ended. Otherwise, this is 0. */
+ int wide_column_end_hpos = 0;
int prev_pos; /* Previous buffer position. */
+ int prev_pos_byte; /* Previous buffer position. */
int contin_hpos; /* HPOS of last column of continued line. */
int prev_tab_offset; /* Previous tab offset. */
if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
pos = prev_pos = from;
+ pos_byte = prev_pos_byte = CHAR_TO_BYTE (from);
contin_hpos = 0;
prev_tab_offset = tab_offset;
while (1)
{
while (pos == next_boundary)
{
+ int pos_here = pos;
int newpos;
+ /* Don't skip invisible if we are already at the margin. */
+ if (vpos > tovpos || vpos == tovpos && hpos >= tohpos)
+ {
+ if (contin_hpos && prev_hpos == 0
+ && hpos > tohpos
+ && (contin_hpos == width || wide_column_end_hpos > width))
+ { /* 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
+ buffer position, screen position, and set tab offset
+ to previous value. It's the beginning of the
+ line. */
+ pos = prev_pos;
+ pos_byte = prev_pos_byte;
+ hpos = prev_hpos;
+ tab_offset = prev_tab_offset;
+ }
+ break;
+ }
+
/* 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
{
unsigned char *ovstr;
int ovlen = overlay_strings (pos, win, &ovstr);
- hpos += (multibyte ? strwidth (ovstr, ovlen) : ovlen);
+ hpos += ((multibyte && ovlen > 0)
+ ? strwidth (ovstr, ovlen) : ovlen);
}
did_motion = 0;
newpos = skip_invisible (pos, &next_boundary, to, window);
if (newpos >= to)
- goto after_loop;
+ {
+ pos = min (to, newpos);
+ goto after_loop;
+ }
- pos = newpos;
+ if (newpos != pos_here)
+ {
+ pos = newpos;
+ pos_byte = CHAR_TO_BYTE (pos);
+ }
}
/* Handle right margin. */
&& width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win))))
|| !NILP (current_buffer->truncate_lines))
{
- /* Truncating: skip to newline. */
- if (pos <= to) /* This IF is needed because we may past TO */
- pos = find_before_next_newline (pos, to, 1);
- hpos = width;
- /* If we just skipped next_boundary,
- loop around in the main while
- and handle it. */
- if (pos >= next_boundary)
- next_boundary = pos + 1;
- prev_hpos = width;
- prev_tab_offset = tab_offset;
+ /* Truncating: skip to newline, unless we are already past
+ TO (we need to go back below). */
+ if (pos <= to)
+ {
+ pos = find_before_next_newline (pos, to, 1);
+ pos_byte = CHAR_TO_BYTE (pos);
+ hpos = width;
+ /* If we just skipped next_boundary,
+ loop around in the main while
+ and handle it. */
+ if (pos >= next_boundary)
+ next_boundary = pos + 1;
+ prev_hpos = width;
+ prev_tab_offset = tab_offset;
+ }
}
else
{
/* Remember the previous value. */
prev_tab_offset = tab_offset;
- if (wide_column)
+ if (wide_column_end_hpos > width)
{
hpos -= prev_hpos;
tab_offset += prev_hpos;
{
/* Go back to the previous position. */
pos = prev_pos;
+ pos_byte = prev_pos_byte;
hpos = prev_hpos;
tab_offset = prev_tab_offset;
*/
if (contin_hpos && prev_hpos == 0
- && contin_hpos < width && !wide_column)
+ && contin_hpos < width && !wide_column_end_hpos)
{
/* Line breaking occurs in the middle of multi-column
character. Go back to previous line. */
if (vpos > tovpos || vpos == tovpos && hpos >= tohpos)
{
if (contin_hpos && prev_hpos == 0
- && ((hpos > tohpos && contin_hpos == width) || wide_column))
+ && hpos > tohpos
+ && (contin_hpos == width || wide_column_end_hpos > width))
{ /* 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
to previous value. It's the beginning of the
line. */
pos = prev_pos;
+ pos_byte = prev_pos_byte;
hpos = prev_hpos;
tab_offset = prev_tab_offset;
}
prev_hpos = hpos;
prev_pos = pos;
- wide_column = 0;
+ prev_pos_byte = pos_byte;
+ wide_column_end_hpos = 0;
/* Consult the width run cache to see if we can avoid inspecting
the text character-by-character. */
hpos = run_end_hpos;
if (run_end > pos)
prev_hpos = hpos - common_width;
- pos = run_end;
+ if (pos != run_end)
+ {
+ pos = run_end;
+ pos_byte = CHAR_TO_BYTE (pos);
+ }
}
next_width_run = run_end + 1;
/* We have to scan the text character-by-character. */
else
{
- c = FETCH_BYTE (pos);
- pos++;
+ c = FETCH_BYTE (pos_byte);
+ pos++, pos_byte++;
/* Perhaps add some info to the width_run_cache. */
if (current_buffer->width_run_cache)
}
}
- if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
+ if (dp != 0
+ && ! (multibyte && BASE_LEADING_CODE_P (c))
+ && VECTORP (DISP_CHAR_VECTOR (dp, c)))
hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
else if (c >= 040 && c < 0177)
hpos++;
}
else if (c == '\n')
{
- if (selective > 0 && indented_beyond_p (pos, selective))
+ if (selective > 0
+ && indented_beyond_p (pos, pos_byte, selective))
{
/* If (pos == to), we don't have to take care of
selective display. */
{
/* Skip any number of invisible lines all at once */
do
- pos = find_before_next_newline (pos, to, 1) + 1;
+ {
+ pos = find_before_next_newline (pos, to, 1);
+ if (pos < to)
+ pos++;
+ pos_byte = CHAR_TO_BYTE (pos);
+ }
while (pos < to
- && indented_beyond_p (pos, selective));
+ && indented_beyond_p (pos, pos_byte, selective));
/* Allow for the " ..." that is displayed for them. */
if (selective_rlen)
{
if (hpos >= width)
hpos = width;
}
- --pos;
+ DEC_BOTH (pos, pos_byte);
/* We have skipped the invis text, but not the
newline after. */
}
everything from a ^M to the end of the line is invisible.
Stop *before* the real newline. */
if (pos < to)
- pos = find_before_next_newline (pos, to, 1);
+ {
+ pos = find_before_next_newline (pos, to, 1);
+ pos_byte = CHAR_TO_BYTE (pos);
+ }
/* 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) >= GPT ? GAP_SIZE : 0) + (pos) + BEG_ADDR - 1);
- len = ((pos) >= GPT ? ZV : GPT) - (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
- {
- int width = WIDTH_BY_CHAR_HEAD (*ptr);
- hpos += width;
- if (width > 1)
- wide_column = 1;
- }
+ int bytes, width, wide_column;
- pos += actual_len;
+ pos_byte--; /* rewind POS_BYTE */
+ ptr = BYTE_POS_ADDR (pos_byte);
+ MULTIBYTE_BYTES_WIDTH (ptr, c, dp);
+ pos_byte += bytes;
+ if (wide_column)
+ wide_column_end_hpos = hpos + wide_column;
+ hpos += width;
}
else
hpos += (ctl_arrow && c < 0200) ? 2 : 4;
width_run_start, width_run_end);
val_compute_motion.bufpos = pos;
+ val_compute_motion.bytepos = pos_byte;
val_compute_motion.hpos = hpos;
val_compute_motion.vpos = vpos;
- val_compute_motion.prevhpos = prev_hpos;
+ if (contin_hpos && prev_hpos == 0)
+ val_compute_motion.prevhpos = contin_hpos;
+ else
+ val_compute_motion.prevhpos = prev_hpos;
/* We alalways handle all of them here; none of them remain to do. */
val_compute_motion.ovstring_chars_done = 0;
else
CHECK_LIVE_WINDOW (window, 0);
+ if (XINT (from) < BEGV || XINT (from) > ZV)
+ args_out_of_range_3 (from, make_number (BEGV), make_number (ZV));
+ if (XINT (to) < BEGV || XINT (to) > ZV)
+ args_out_of_range_3 (to, make_number (BEGV), make_number (ZV));
+
pos = compute_motion (XINT (from), XINT (XCONS (frompos)->cdr),
XINT (XCONS (frompos)->car), 0,
XINT (to), XINT (XCONS (topos)->cdr),
}
\f
-/* Return the column of position POS in window W's buffer.
- The result is rounded down to a multiple of the internal width of W.
- This is the amount of indentation of position POS
- that is not visible in its horizontal position in the window. */
-
-int
-pos_tab_offset (w, pos)
- struct window *w;
- register int pos;
-{
- int opoint = PT;
- int col;
- int width = window_internal_width (w) - 1;
-
- if (pos == BEGV)
- return MINI_WINDOW_P (w) ? -minibuf_prompt_width : 0;
- if (FETCH_BYTE (pos - 1) == '\n')
- return 0;
- TEMP_SET_PT (pos);
- col = current_column ();
- TEMP_SET_PT (opoint);
- /* Modulo is no longer valid, as a line may get shorter than WIDTH
- columns by continuation of a wide-column character. Just return
- COL here. */
-#if 0
- /* In the continuation of the first line in a minibuffer we must
- take the width of the prompt into account. */
- if (MINI_WINDOW_P (w) && col >= width - minibuf_prompt_width
- && find_next_newline_no_quit (pos, -1) == BEGV)
- return col - (col + minibuf_prompt_width) % width;
- return col - (col % width);
-#endif
- return col;
-}
-
-\f
/* Fvertical_motion and vmotion */
struct position val_vmotion;
register int vpos = 0;
Lisp_Object prevline;
register int first;
+ int from_byte;
int lmargin = hscroll > 0 ? 1 - hscroll : 0;
int selective
= (INTEGERP (current_buffer->selective_display)
Lisp_Object window;
int start_hpos = 0;
int did_motion;
+ /* This is the object we use for fetching character properties. */
+ Lisp_Object text_prop_object;
XSETWINDOW (window, w);
start_hpos = minibuf_prompt_width;
}
+ /* If the window contains this buffer, use it for getting text properties.
+ Otherwise use the current buffer as arg for doing that. */
+ if (EQ (w->buffer, Fcurrent_buffer ()))
+ text_prop_object = window;
+ else
+ text_prop_object = Fcurrent_buffer ();
+
if (vpos >= vtarget)
{
/* To move upward, go a line at a time until
- we have gone at least far enough */
+ we have gone at least far enough. */
first = 1;
XSETFASTINT (prevline, find_next_newline_no_quit (from - 1, -1));
while (XFASTINT (prevline) > BEGV
&& ((selective > 0
- && indented_beyond_p (XFASTINT (prevline), selective))
+ && indented_beyond_p (XFASTINT (prevline),
+ CHAR_TO_BYTE (XFASTINT (prevline)),
+ selective))
#ifdef USE_TEXT_PROPERTIES
/* watch out for newlines with `invisible' property */
|| (propval = Fget_char_property (prevline,
Qinvisible,
- window),
+ text_prop_object),
TEXT_PROP_MEANS_INVISIBLE (propval))
#endif
))
if (vpos >= vtarget)
{
val_vmotion.bufpos = from;
+ val_vmotion.bytepos = CHAR_TO_BYTE (from);
val_vmotion.vpos = vpos;
val_vmotion.hpos = lmargin;
val_vmotion.contin = 0;
}
/* Moving downward is simple, but must calculate from beg of line
to determine hpos of starting point */
- if (from > BEGV && FETCH_BYTE (from - 1) != '\n')
+ from_byte = CHAR_TO_BYTE (from);
+ if (from > BEGV && FETCH_BYTE (from_byte - 1) != '\n')
{
Lisp_Object propval;
XSETFASTINT (prevline, find_next_newline_no_quit (from, -1));
while (XFASTINT (prevline) > BEGV
&& ((selective > 0
- && indented_beyond_p (XFASTINT (prevline), selective))
+ && indented_beyond_p (XFASTINT (prevline),
+ CHAR_TO_BYTE (XFASTINT (prevline)),
+ selective))
#ifdef USE_TEXT_PROPERTIES
/* watch out for newlines with `invisible' property */
|| (propval = Fget_char_property (prevline, Qinvisible,
- window),
+ text_prop_object),
TEXT_PROP_MEANS_INVISIBLE (propval))
#endif
))
\f
/* file's initialization. */
+void
syms_of_indent ()
{
DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode,
HCoop / bpt / emacs.git / blobdiff