mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-21 20:13:29 -08:00
Code Issues Projects Releases Wiki Activity

(Fmove_to_column): Use EMACS_INT for buffer positions.

Browse source
This commit is contained in:
Stefan Monnier 2007-09-27 18:27:48 +00:00
parent d567be222c
commit bdf5f8ef91
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2007-09-27 Stefan Monnier <monnier@iro.umontreal.ca>
* indent.c (Fmove_to_column): Use EMACS_INT for buffer positions.
2007-09-25 Jason Rumney <jasonr@gnu.org>
* frame.c (make_terminal_frame): Remove special case for WINDOWSNT.

16
src/indent.c
View file

@ -932,19 +932,19 @@ The return value is the current column. */)
(column, force)
Lisp_Object column, force;
{
register int pos;
register int col = current_column ();
register int goal;
register int end;
register EMACS_INT pos;
register EMACS_INT col = current_column ();
register EMACS_INT goal;
register EMACS_INT end;
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 ();
register int multibyte = !NILP (current_buffer->enable_multibyte_characters);
Lisp_Object val;
int prev_col = 0;
EMACS_INT prev_col = 0;
int c = 0;
int next_boundary, pos_byte;
EMACS_INT next_boundary, pos_byte;
if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
CHECK_NATNUM (column);
@ -970,7 +970,7 @@ The return value is the current column. */)
{
while (pos == next_boundary)
{
int prev = pos;
EMACS_INT prev = pos;
pos = skip_invisible (pos, &next_boundary, end, Qnil);
if (pos != prev)
pos_byte = CHAR_TO_BYTE (pos);
@ -1090,7 +1090,7 @@ The return value is the current column. */)
and scan through it again. */
if (!NILP (force) && col > goal && c == '\t' && prev_col < goal)
{
int goal_pt, goal_pt_byte;
EMACS_INT goal_pt, goal_pt_byte;
/* Insert spaces in front of the tab to reach GOAL. Do this
first so that a marker at the end of the tab gets