annotate src/indent.c @ 17499:77604d2454dc libc-970418 libc-970419 libc-970420 libc-970421 libc-970422 libc-970423 libc-970424 libc-970425 libc-970426 libc-970427 libc-970428 libc-970429 libc-970430 libc-970501 libc-970502 libc-970503 libc-970504 libc-970505

Fixes for MIPS OpenBSD systems (from Per Fogelstrom <pefo@openbsd.org>)
author Ian Lance Taylor <ian@cygnus.com>
date Thu, 17 Apr 1997 18:00:12 +0000
parents 424932eba3e8
children aaa25a87ae3d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Indentation functions.
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
2 Copyright (C) 1985,86,87,88,93,94,95 Free Software Foundation, Inc.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4 This file is part of GNU Emacs.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6 GNU Emacs is free software; you can redistribute it and/or modify
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 it under the terms of the GNU General Public License as published by
12244
ac7375e60931 Update GPL to version 2.
Karl Heuer <kwzh@gnu.org>
parents: 12090
diff changeset
8 the Free Software Foundation; either version 2, or (at your option)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9 any later version.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11 GNU Emacs is distributed in the hope that it will be useful,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 GNU General Public License for more details.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 along with GNU Emacs; see the file COPYING. If not, write to
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14078
diff changeset
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14078
diff changeset
19 Boston, MA 02111-1307, USA. */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4385
diff changeset
22 #include <config.h>
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23 #include "lisp.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #include "buffer.h"
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
25 #include "charset.h"
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26 #include "indent.h"
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
27 #include "frame.h"
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28 #include "window.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
29 #include "termchar.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30 #include "termopts.h"
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 #include "disptab.h"
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
32 #include "intervals.h"
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
33 #include "region-cache.h"
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35 /* Indentation can insert tabs if this is non-zero;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
36 otherwise always uses spaces */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
37 int indent_tabs_mode;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
38
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
39 #define min(a, b) ((a) < (b) ? (a) : (b))
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
40 #define max(a, b) ((a) > (b) ? (a) : (b))
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
41
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42 #define CR 015
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44 /* These three values memoize the current column to avoid recalculation */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
45 /* Some things in set last_known_column_point to -1
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
46 to mark the memoized value as invalid */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
47 /* Last value returned by current_column */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
48 int last_known_column;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
49 /* Value of point when current_column was called */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
50 int last_known_column_point;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
51 /* Value of MODIFF when current_column was called */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
52 int last_known_column_modified;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
53
15494
a544bb3eea53 (current_column_1): Add declaration.
Richard M. Stallman <rms@gnu.org>
parents: 15493
diff changeset
54 static int current_column_1 ();
a544bb3eea53 (current_column_1): Add declaration.
Richard M. Stallman <rms@gnu.org>
parents: 15493
diff changeset
55
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
56 /* Cache of beginning of line found by the last call of
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
57 current_column. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
58 int current_column_bol_cache;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
59
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
60 /* Get the display table to use for the current buffer. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
61
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
62 struct Lisp_Char_Table *
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
63 buffer_display_table ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
64 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
65 Lisp_Object thisbuf;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
66
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
67 thisbuf = current_buffer->display_table;
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
68 if (DISP_TABLE_P (thisbuf))
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
69 return XCHAR_TABLE (thisbuf);
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
70 if (DISP_TABLE_P (Vstandard_display_table))
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
71 return XCHAR_TABLE (Vstandard_display_table);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
72 return 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
73 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
74
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
75 /* Width run cache considerations. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
76
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
77 /* Return the width of character C under display table DP. */
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
78
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
79 static int
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
80 character_width (c, dp)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
81 int c;
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
82 struct Lisp_Char_Table *dp;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
83 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
84 Lisp_Object elt;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
85
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
86 /* These width computations were determined by examining the cases
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
87 in display_text_line. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
88
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
89 /* Everything can be handled by the display table, if it's
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
90 present and the element is right. */
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
91 if (dp && (elt = DISP_CHAR_VECTOR (dp, c), VECTORP (elt)))
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
92 return XVECTOR (elt)->size;
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
93
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
94 /* Some characters are special. */
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
95 if (c == '\n' || c == '\t' || c == '\015')
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
96 return 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
97
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
98 /* Printing characters have width 1. */
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
99 else if (c >= 040 && c < 0177)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
100 return 1;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
101
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
102 /* Everybody else (control characters, metacharacters) has other
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
103 widths. We could return their actual widths here, but they
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
104 depend on things like ctl_arrow and crud like that, and they're
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
105 not very common at all. So we'll just claim we don't know their
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
106 widths. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
107 else
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
108 return 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
109 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
110
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
111 /* Return true iff the display table DISPTAB specifies the same widths
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
112 for characters as WIDTHTAB. We use this to decide when to
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
113 invalidate the buffer's width_run_cache. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
114 int
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
115 disptab_matches_widthtab (disptab, widthtab)
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
116 struct Lisp_Char_Table *disptab;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
117 struct Lisp_Vector *widthtab;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
118 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
119 int i;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
120
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
121 if (widthtab->size != 256)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
122 abort ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
123
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
124 for (i = 0; i < 256; i++)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
125 if (character_width (i, disptab)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
126 != XFASTINT (widthtab->contents[i]))
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
127 return 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
128
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
129 return 1;
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
130 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
131
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
132 /* Recompute BUF's width table, using the display table DISPTAB. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
133 void
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
134 recompute_width_table (buf, disptab)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
135 struct buffer *buf;
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
136 struct Lisp_Char_Table *disptab;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
137 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
138 int i;
10011
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
139 struct Lisp_Vector *widthtab;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
140
10011
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
141 if (!VECTORP (buf->width_table))
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
142 buf->width_table = Fmake_vector (make_number (256), make_number (0));
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
143 widthtab = XVECTOR (buf->width_table);
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
144 if (widthtab->size != 256)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
145 abort ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
146
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
147 for (i = 0; i < 256; i++)
10011
f4f2563057b8 (recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents: 9407
diff changeset
148 XSETFASTINT (widthtab->contents[i], character_width (i, disptab));
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
149 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
150
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
151 /* Allocate or free the width run cache, as requested by the current
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
152 state of current_buffer's cache_long_line_scans variable. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
153 static void
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
154 width_run_cache_on_off ()
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
155 {
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
156 if (NILP (current_buffer->cache_long_line_scans)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
157 /* And, for the moment, this feature doesn't work on multibyte
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
158 characters. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
159 || !NILP (current_buffer->enable_multibyte_characters))
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
160 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
161 /* It should be off. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
162 if (current_buffer->width_run_cache)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
163 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
164 free_region_cache (current_buffer->width_run_cache);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
165 current_buffer->width_run_cache = 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
166 current_buffer->width_table = Qnil;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
167 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
168 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
169 else
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
170 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
171 /* It should be on. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
172 if (current_buffer->width_run_cache == 0)
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
173 {
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
174 current_buffer->width_run_cache = new_region_cache ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
175 recompute_width_table (current_buffer, buffer_display_table ());
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
176 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
177 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
178 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
179
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
180
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
181 /* Skip some invisible characters starting from POS.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
182 This includes characters invisible because of text properties
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
183 and characters invisible because of overlays.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
184
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
185 If position POS is followed by invisible characters,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
186 skip some of them and return the position after them.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
187 Otherwise return POS itself.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
188
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
189 Set *NEXT_BOUNDARY_P to the next position at which
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
190 it will be necessary to call this function again.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
191
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
192 Don't scan past TO, and don't set *NEXT_BOUNDARY_P
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
193 to a value greater than TO.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
194
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
195 If WINDOW is non-nil, and this buffer is displayed in WINDOW,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
196 take account of overlays that apply only in WINDOW.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
197
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
198 We don't necessarily skip all the invisible characters after POS
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
199 because that could take a long time. We skip a reasonable number
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
200 which can be skipped quickly. If there might be more invisible
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
201 characters immediately following, then *NEXT_BOUNDARY_P
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
202 will equal the return value. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
203
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
204 static int
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
205 skip_invisible (pos, next_boundary_p, to, window)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
206 int pos;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
207 int *next_boundary_p;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
208 int to;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
209 Lisp_Object window;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
210 {
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
211 Lisp_Object prop, position, end, overlay_limit, proplimit;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
212 Lisp_Object buffer;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
213
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
214 XSETFASTINT (position, pos);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
215 XSETBUFFER (buffer, current_buffer);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
216
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
217 /* Give faster response for overlay lookup near POS. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
218 recenter_overlay_lists (current_buffer, pos);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
219
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
220 /* We must not advance farther than the next overlay change.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
221 The overlay change might change the invisible property;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
222 or there might be overlay strings to be displayed there. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
223 overlay_limit = Fnext_overlay_change (position);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
224 /* As for text properties, this gives a lower bound
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
225 for where the invisible text property could change. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
226 proplimit = Fnext_property_change (position, buffer, Qt);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
227 if (XFASTINT (overlay_limit) < XFASTINT (proplimit))
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
228 proplimit = overlay_limit;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
229 /* PROPLIMIT is now a lower bound for the next change
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
230 in invisible status. If that is plenty far away,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
231 use that lower bound. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
232 if (XFASTINT (proplimit) > pos + 100 || XFASTINT (proplimit) >= to)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
233 *next_boundary_p = XFASTINT (proplimit);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
234 /* Otherwise, scan for the next `invisible' property change. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
235 else
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
236 {
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
237 /* Don't scan terribly far. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
238 XSETFASTINT (proplimit, min (pos + 100, to));
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
239 /* No matter what. don't go past next overlay change. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
240 if (XFASTINT (overlay_limit) < XFASTINT (proplimit))
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
241 proplimit = overlay_limit;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
242 end = Fnext_single_property_change (position, Qinvisible,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
243 buffer, proplimit);
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
244 /* Don't put the boundary in the middle of multibyte form if
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
245 there is no actual property change. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
246 if (end == pos + 100
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
247 && !NILP (current_buffer->enable_multibyte_characters)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
248 && end < ZV)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
249 while (pos < end && !CHAR_HEAD_P (POS_ADDR (end)))
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
250 end--;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
251 *next_boundary_p = XFASTINT (end);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
252 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
253 /* if the `invisible' property is set, we can skip to
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
254 the next property change */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
255 if (!NILP (window) && EQ (XWINDOW (window)->buffer, buffer))
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
256 prop = Fget_char_property (position, Qinvisible, window);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
257 else
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
258 prop = Fget_char_property (position, Qinvisible, buffer);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
259 if (TEXT_PROP_MEANS_INVISIBLE (prop))
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
260 return *next_boundary_p;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
261 return pos;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
262 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
263
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
264 DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
265 "Return the horizontal position of point. Beginning of line is column 0.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
266 This is calculated by adding together the widths of all the displayed\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
267 representations of the character between the start of the previous line\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
268 and point. (eg control characters will have a width of 2 or 4, tabs\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
269 will have a variable width)\n\
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
270 Ignores finite width of frame, which means that this function may return\n\
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
271 values greater than (frame-width).\n\
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272 Whether the line is visible (if `selective-display' is t) has no effect;\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
273 however, ^M is treated as end of line when `selective-display' is t.")
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
274 ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
275 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
276 Lisp_Object temp;
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
277 XSETFASTINT (temp, current_column ());
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
278 return temp;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
279 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
280
327
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
281 /* Cancel any recorded value of the horizontal position. */
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
282
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
283 invalidate_current_column ()
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
284 {
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
285 last_known_column_point = 0;
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
286 }
554b1810e969 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 165
diff changeset
287
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
288 int
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
289 current_column ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
290 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
291 register int col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
292 register unsigned char *ptr, *stop;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
293 register int tab_seen;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
294 int post_tab;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
295 register int c;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
296 register int tab_width = XINT (current_buffer->tab_width);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
297 int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
298 register struct Lisp_Char_Table *dp = buffer_display_table ();
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
299 int stopchar;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
300
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
301 if (PT == last_known_column_point
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
302 && MODIFF == last_known_column_modified)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
303 return last_known_column;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
304
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
305 /* If the buffer has overlays, text properties, or multibyte,
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
306 use a more general algorithm. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
307 if (BUF_INTERVALS (current_buffer)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
308 || !NILP (current_buffer->overlays_before)
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
309 || !NILP (current_buffer->overlays_after)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
310 || !NILP (current_buffer->enable_multibyte_characters))
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
311 return current_column_1 (PT);
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
312
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
313 /* Scan backwards from point to the previous newline,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
314 counting width. Tab characters are the only complicated case. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
315
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
316 /* Make a pointer for decrementing through the chars before point. */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
317 ptr = POS_ADDR (PT - 1) + 1;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
318 /* Make a pointer to where consecutive chars leave off,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
319 going backwards from point. */
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
320 if (PT == BEGV)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
321 stop = ptr;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
322 else if (PT <= GPT || BEGV > GPT)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
323 stop = BEGV_ADDR;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
324 else
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
325 stop = GAP_END_ADDR;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
326
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
327 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
328
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
329 col = 0, tab_seen = 0, post_tab = 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
330
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
331 while (1)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
332 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
333 if (ptr == stop)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
334 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
335 /* We stopped either for the beginning of the buffer
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
336 or for the gap. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
337 if (ptr == BEGV_ADDR)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
338 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
339 /* It was the gap. Jump back over it. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
340 stop = BEGV_ADDR;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
341 ptr = GPT_ADDR;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
342 /* Check whether that brings us to beginning of buffer. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
343 if (BEGV >= GPT) break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
344 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
345
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
346 c = *--ptr;
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
347 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
348 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
349 else if (c >= 040 && c < 0177)
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
350 col++;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
351 else if (c == '\n')
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
352 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
353 else if (c == '\r' && EQ (current_buffer->selective_display, Qt))
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
354 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
355 else if (c == '\t')
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357 if (tab_seen)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
358 col = ((col + tab_width) / tab_width) * tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
359
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
360 post_tab += col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
361 col = 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
362 tab_seen = 1;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
363 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
364 else
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
365 col += (ctl_arrow && c < 0200) ? 2 : 4;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
366 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
367
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
368 if (tab_seen)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
369 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
370 col = ((col + tab_width) / tab_width) * tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
371 col += post_tab;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
372 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
373
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
374 if (ptr == BEGV_ADDR)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
375 current_column_bol_cache = BEGV;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
376 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
377 current_column_bol_cache = PTR_CHAR_POS ((ptr+1));
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
378 last_known_column = col;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
379 last_known_column_point = PT;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
380 last_known_column_modified = MODIFF;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
381
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
382 return col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
383 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
384
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
385 /* Return the column number of position POS
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
386 by scanning forward from the beginning of the line.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
387 This function handles characters that are invisible
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
388 due to text properties or overlays. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
389
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
390 static int
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
391 current_column_1 (pos)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
392 int pos;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
393 {
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
394 register int tab_width = XINT (current_buffer->tab_width);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
395 register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
396 register struct Lisp_Char_Table *dp = buffer_display_table ();
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
397
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
398 /* Start the scan at the beginning of this line with column number 0. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
399 register int col = 0;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
400 int scan = current_column_bol_cache = find_next_newline (pos, -1);
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
401 int next_boundary = scan;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
402 int multibyte = !NILP (current_buffer->enable_multibyte_characters);
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
403
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
404 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
405
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
406 /* Scan forward to the target position. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
407 while (scan < pos)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
408 {
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
409 int c;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
410
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
411 /* Occasionally we may need to skip invisible text. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
412 while (scan == next_boundary)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
413 {
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
414 /* This updates NEXT_BOUNDARY to the next place
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
415 where we might need to skip more invisible text. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
416 scan = skip_invisible (scan, &next_boundary, pos, Qnil);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
417 if (scan >= pos)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
418 goto endloop;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
419 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
420
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
421 c = FETCH_BYTE (scan);
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
422 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
423 {
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
424 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
425 scan++;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
426 continue;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
427 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
428 if (c == '\n')
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
429 break;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
430 if (c == '\r' && EQ (current_buffer->selective_display, Qt))
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
431 break;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
432 scan++;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
433 if (c == '\t')
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
434 {
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
435 int prev_col = col;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
436 col += tab_width;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
437 col = col / tab_width * tab_width;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
438 }
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
439 else if (multibyte && BASE_LEADING_CODE_P (c))
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
440 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
441 scan--;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
442 /* Start of multi-byte form. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
443 if (c == LEADING_CODE_COMPOSITION)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
444 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
445 unsigned char *ptr = POS_ADDR (scan);
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
446
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
447 int cmpchar_id = str_cmpchar_id (ptr, next_boundary - scan);
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
448 if (cmpchar_id >= 0)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
449 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
450 scan += cmpchar_table[cmpchar_id]->len,
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
451 col += cmpchar_table[cmpchar_id]->width;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
452 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
453 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
454 { /* invalid composite character */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
455 scan++;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
456 col += 4;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
457 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
458 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
459 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
460 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
461 /* Here, we check that the following bytes are valid
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
462 constituents of multi-byte form. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
463 int len = BYTES_BY_CHAR_HEAD (c), i;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
464
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
465 for (i = 1, scan++; i < len; i++, scan++)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
466 /* We don't need range checking for PTR because there
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
467 are anchors (`\0') at GAP and Z. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
468 if (CHAR_HEAD_P (POS_ADDR (scan))) break;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
469 if (i < len)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
470 col += 4, scan -= i - 1;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
471 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
472 col += WIDTH_BY_CHAR_HEAD (c);
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
473 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
474 }
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
475 else if (ctl_arrow && (c < 040 || c == 0177))
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
476 col += 2;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
477 else if (c < 040 || c >= 0177)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
478 col += 4;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
479 else
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
480 col++;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
481 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
482 endloop:
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
483
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
484 last_known_column = col;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
485 last_known_column_point = PT;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
486 last_known_column_modified = MODIFF;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
487
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
488 return col;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
489 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
490
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
491 /* Return the width in columns of the part of STRING from BEG to END.
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
492 If BEG is nil, that stands for the beginning of STRING.
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
493 If END is nil, that stands for the end of STRING. */
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
494
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
495 static int
11704
6c9716b7a23d (string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents: 11312
diff changeset
496 string_display_width (string, beg, end)
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
497 Lisp_Object string, beg, end;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
498 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
499 register int col;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
500 register unsigned char *ptr, *stop;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
501 register int tab_seen;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
502 int post_tab;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
503 register int c;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
504 register int tab_width = XINT (current_buffer->tab_width);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
505 int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
506 register struct Lisp_Char_Table *dp = buffer_display_table ();
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
507 int b, e;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
508
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
509 if (NILP (end))
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
510 e = XSTRING (string)->size;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
511 else
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
512 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
513 CHECK_NUMBER (end, 0);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
514 e = XINT (end);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
515 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
516
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
517 if (NILP (beg))
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
518 b = 0;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
519 else
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
520 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
521 CHECK_NUMBER (beg, 0);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
522 b = XINT (beg);
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
523 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
524
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
525 /* Make a pointer for decrementing through the chars before point. */
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
526 ptr = XSTRING (string)->data + e;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
527 /* Make a pointer to where consecutive chars leave off,
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
528 going backwards from point. */
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
529 stop = XSTRING (string)->data + b;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
530
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
531 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
532
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
533 col = 0, tab_seen = 0, post_tab = 0;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
534
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
535 while (1)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
536 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
537 if (ptr == stop)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
538 break;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
539
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
540 c = *--ptr;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
541 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
542 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
543 else if (c >= 040 && c < 0177)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
544 col++;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
545 else if (c == '\n')
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
546 break;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
547 else if (c == '\t')
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
548 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
549 if (tab_seen)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
550 col = ((col + tab_width) / tab_width) * tab_width;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
551
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
552 post_tab += col;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
553 col = 0;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
554 tab_seen = 1;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
555 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
556 else
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
557 col += (ctl_arrow && c < 0200) ? 2 : 4;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
558 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
559
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
560 if (tab_seen)
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
561 {
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
562 col = ((col + tab_width) / tab_width) * tab_width;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
563 col += post_tab;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
564 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
565
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
566 return col;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
567 }
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
568
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
569 DEFUN ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ",
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
570 "Indent from point with tabs and spaces until COLUMN is reached.\n\
14078
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
571 Optional second argument MININUM says always do at least MININUM spaces\n\
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
572 even if that goes past COLUMN; by default, MININUM is zero.")
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
573 (column, minimum)
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
574 Lisp_Object column, minimum;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
575 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
576 int mincol;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
577 register int fromcol;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
578 register int tab_width = XINT (current_buffer->tab_width);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
579
14078
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
580 CHECK_NUMBER (column, 0);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
581 if (NILP (minimum))
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
582 XSETFASTINT (minimum, 0);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
583 CHECK_NUMBER (minimum, 1);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
584
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
585 fromcol = current_column ();
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
586 mincol = fromcol + XINT (minimum);
14078
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
587 if (mincol < XINT (column)) mincol = XINT (column);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
588
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
589 if (fromcol == mincol)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
590 return make_number (mincol);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
591
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
592 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
593
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
594 if (indent_tabs_mode)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
595 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
596 Lisp_Object n;
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
597 XSETFASTINT (n, mincol / tab_width - fromcol / tab_width);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
598 if (XFASTINT (n) != 0)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
599 {
8648
f047d8c6db79 (Findent_to): Pass new arg to Finsert_char.
Richard M. Stallman <rms@gnu.org>
parents: 8601
diff changeset
600 Finsert_char (make_number ('\t'), n, Qt);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
601
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
602 fromcol = (mincol / tab_width) * tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
603 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
604 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
605
14078
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
606 XSETFASTINT (column, mincol - fromcol);
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
607 Finsert_char (make_number (' '), column, Qt);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
608
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
609 last_known_column = mincol;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
610 last_known_column_point = PT;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
611 last_known_column_modified = MODIFF;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
612
14078
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
613 XSETINT (column, mincol);
a46002ac278b (Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents: 13453
diff changeset
614 return column;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
615 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
616
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
617
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
618 DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
619 0, 0, 0,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
620 "Return the indentation of the current line.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
621 This is the horizontal position of the character\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
622 following any initial whitespace.")
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
623 ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
624 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
625 Lisp_Object val;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
626
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
627 XSETFASTINT (val, position_indentation (find_next_newline (PT, -1)));
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
628 return val;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
629 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
630
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
631 position_indentation (pos)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
632 register int pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
633 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
634 register int column = 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
635 register int tab_width = XINT (current_buffer->tab_width);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
636 register unsigned char *p;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
637 register unsigned char *stop;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
638 unsigned char *start;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
639 int next_boundary = pos;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
640 int ceiling = pos;
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
641
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
642 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
643
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
644 p = POS_ADDR (pos);
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
645 /* STOP records the value of P at which we will need
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
646 to think about the gap, or about invisible text,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
647 or about the end of the buffer. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
648 stop = p;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
649 /* START records the starting value of P. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
650 start = p;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
651 while (1)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
652 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
653 while (p == stop)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
654 {
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
655 int stop_pos;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
656
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
657 /* If we have updated P, set POS to match.
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
658 The first time we enter the loop, POS is already right. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
659 if (p != start)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
660 pos = PTR_CHAR_POS (p);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
661 /* Consider the various reasons STOP might have been set here. */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
662 if (pos == ZV)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
663 return column;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
664 if (pos == next_boundary)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
665 pos = skip_invisible (pos, &next_boundary, ZV, Qnil);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
666 if (pos >= ceiling)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
667 ceiling = BUFFER_CEILING_OF (pos) + 1;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
668 /* Compute the next place we need to stop and think,
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
669 and set STOP accordingly. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
670 stop_pos = min (ceiling, next_boundary);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
671 /* The -1 and +1 arrange to point at the first byte of gap
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
672 (if STOP_POS is the position of the gap)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
673 rather than at the data after the gap. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
674
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
675 stop = POS_ADDR (stop_pos - 1) + 1;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
676 p = POS_ADDR (pos);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
677 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
678 switch (*p++)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
679 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
680 case ' ':
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
681 column++;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
682 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
683 case '\t':
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
684 column += tab_width - column % tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
685 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
686 default:
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
687 return column;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
688 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
689 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
690 }
5943
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
691
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
692 /* Test whether the line beginning at POS is indented beyond COLUMN.
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
693 Blank lines are treated as if they had the same indentation as the
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
694 preceding line. */
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
695 int
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
696 indented_beyond_p (pos, column)
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
697 int pos, column;
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
698 {
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
699 while (pos > BEGV && FETCH_BYTE (pos) == '\n')
7892
cabad721720f (vmotion): Use find_next_newline_no_quit.
Richard M. Stallman <rms@gnu.org>
parents: 7566
diff changeset
700 pos = find_next_newline_no_quit (pos - 1, -1);
5943
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
701 return (position_indentation (pos) >= column);
35526ee8b790 (indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 5941
diff changeset
702 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
703
13124
e44b06fc718d (Fmove_to_column): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 12244
diff changeset
704 DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p",
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
705 "Move point to column COLUMN in the current line.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
706 The column of a character is calculated by adding together the widths\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
707 as displayed of the previous characters in the line.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
708 This function ignores line-continuation;\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
709 there is no upper limit on the column number a character can have\n\
1208
fa662930e654 * indent.c (Fmove_to_column): Pass the right number of arguments
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
710 and horizontal scrolling has no effect.\n\
fa662930e654 * indent.c (Fmove_to_column): Pass the right number of arguments
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
711 \n\
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
712 If specified column is within a character, point goes after that character.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
713 If it's past end of line, point goes to end of line.\n\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
714 A non-nil second (optional) argument FORCE means, if the line\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
715 is too short to reach column COLUMN then add spaces/tabs to get there,\n\
13453
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
716 and if COLUMN is in the middle of a tab character, change it to spaces.\n\
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
717 \n\
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
718 The return value is the current column.")
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
719 (column, force)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
720 Lisp_Object column, force;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
721 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
722 register int pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
723 register int col = current_column ();
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
724 register int goal;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
725 register int end;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
726 register int tab_width = XINT (current_buffer->tab_width);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
727 register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
728 register struct Lisp_Char_Table *dp = buffer_display_table ();
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
729 register int multibyte = !NILP (current_buffer->enable_multibyte_characters);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
730
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
731 Lisp_Object val;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
732 int prev_col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
733 int c;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
734
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
735 int next_boundary;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
736
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
737 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
738 CHECK_NATNUM (column, 0);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
739 goal = XINT (column);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
740
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
741 pos = PT;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
742 end = ZV;
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
743 next_boundary = pos;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
744
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
745 /* If we're starting past the desired column,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
746 back up to beginning of line and scan from there. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
747 if (col > goal)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
748 {
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
749 end = pos;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
750 pos = current_column_bol_cache;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
751 col = 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
752 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
753
15554
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
754 while (pos < end)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
755 {
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
756 while (pos == next_boundary)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
757 {
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
758 pos = skip_invisible (pos, &next_boundary, end, Qnil);
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
759 if (pos >= end)
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
760 goto endloop;
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
761 }
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
762
15554
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
763 /* Test reaching the goal column. We do this after skipping
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
764 invisible characters, so that we put point before the
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
765 character on which the cursor will appear. */
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
766 if (col >= goal)
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
767 break;
103a6af424a8 (Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents: 15494
diff changeset
768
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
769 c = FETCH_BYTE (pos);
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
770 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
771 {
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
772 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
773 pos++;
11312
f48922d85166 (Fmove_to_column): Fix minor bug in prev change.
Richard M. Stallman <rms@gnu.org>
parents: 11300
diff changeset
774 continue;
11037
802a774b44b7 (compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents: 10964
diff changeset
775 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
776 if (c == '\n')
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
777 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
778 if (c == '\r' && EQ (current_buffer->selective_display, Qt))
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
779 break;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
780 pos++;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
781 if (c == '\t')
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
782 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
783 prev_col = col;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
784 col += tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
785 col = col / tab_width * tab_width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
786 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
787 else if (ctl_arrow && (c < 040 || c == 0177))
5162
9672138155c1 (Fmove_to_column): Increments for control characters
Richard M. Stallman <rms@gnu.org>
parents: 5085
diff changeset
788 col += 2;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
789 else if (c < 040 || c == 0177)
5162
9672138155c1 (Fmove_to_column): Increments for control characters
Richard M. Stallman <rms@gnu.org>
parents: 5085
diff changeset
790 col += 4;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
791 else if (c < 0177)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
792 col++;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
793 else if (multibyte && BASE_LEADING_CODE_P (c))
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
794 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
795 /* Start of multi-byte form. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
796 unsigned char *ptr;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
797
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
798 pos--; /* rewind to the character head */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
799 ptr = POS_ADDR (pos);
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
800 if (c == LEADING_CODE_COMPOSITION)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
801 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
802 int cmpchar_id = str_cmpchar_id (ptr, end - pos);
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
803
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
804 if (cmpchar_id >= 0)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
805 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
806 col += cmpchar_table[cmpchar_id]->width;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
807 pos += cmpchar_table[cmpchar_id]->len;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
808 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
809 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
810 { /* invalid composite character */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
811 col += 4;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
812 pos++;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
813 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
814 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
815 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
816 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
817 /* Here, we check that the following bytes are valid
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
818 constituents of multi-byte form. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
819 int len = BYTES_BY_CHAR_HEAD (c), i;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
820
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
821 for (i = 1, ptr++; i < len; i++, ptr++)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
822 /* We don't need range checking for PTR because there
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
823 are anchors (`\0') both at GPT and Z. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
824 if (CHAR_HEAD_P (ptr)) break;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
825 if (i < len)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
826 col += 4, pos++;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
827 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
828 col += WIDTH_BY_CHAR_HEAD (c), pos += i;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
829 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
830 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
831 else
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
832 col += 4;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
833 }
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
834 endloop:
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
835
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
836 SET_PT (pos);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
837
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
838 /* If a tab char made us overshoot, change it to spaces
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
839 and scan through it again. */
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
840 if (!NILP (force) && col > goal && c == '\t' && prev_col < goal)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
841 {
573
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
842 int old_point;
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
843
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
844 del_range (PT - 1, PT);
573
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
845 Findent_to (make_number (goal), Qnil);
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
846 old_point = PT;
573
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
847 Findent_to (make_number (col), Qnil);
f0ffd1764382 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
848 SET_PT (old_point);
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
849 /* Set the last_known... vars consistently. */
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
850 col = goal;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
851 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
852
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
853 /* If line ends prematurely, add space to the end. */
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
854 if (col < goal && !NILP (force))
1208
fa662930e654 * indent.c (Fmove_to_column): Pass the right number of arguments
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
855 Findent_to (make_number (col = goal), Qnil);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
856
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
857 last_known_column = col;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
858 last_known_column_point = PT;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
859 last_known_column_modified = MODIFF;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
860
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
861 XSETFASTINT (val, col);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
862 return val;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
863 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
864
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
865 /* compute_motion: compute buffer posn given screen posn and vice versa */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
866
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
867 struct position val_compute_motion;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
868
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
869 /* Scan the current buffer forward from offset FROM, pretending that
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
870 this is at line FROMVPOS, column FROMHPOS, until reaching buffer
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
871 offset TO or line TOVPOS, column TOHPOS (whichever comes first),
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
872 and return the ending buffer position and screen location. If we
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
873 can't hit the requested column exactly (because of a tab or other
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
874 multi-column character), overshoot.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
875
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
876 DID_MOTION is 1 if FROMHPOS has already accounted for overlay strings
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
877 at FROM. This is the case if FROMVPOS and FROMVPOS came from an
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
878 earlier call to compute_motion. The other common case is that FROMHPOS
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
879 is zero and FROM is a position that "belongs" at column zero, but might
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
880 be shifted by overlay strings; in this case DID_MOTION should be 0.
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
881
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
882 WIDTH is the number of columns available to display text;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
883 compute_motion uses this to handle continuation lines and such.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
884 HSCROLL is the number of columns not being displayed at the left
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
885 margin; this is usually taken from a window's hscroll member.
543
937bccff8155 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 526
diff changeset
886 TAB_OFFSET is the number of columns of the first tab that aren't
937bccff8155 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 526
diff changeset
887 being displayed, perhaps because of a continuation line or
937bccff8155 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 526
diff changeset
888 something.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
889
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
890 compute_motion returns a pointer to a struct position. The bufpos
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
891 member gives the buffer position at the end of the scan, and hpos
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
892 and vpos give its cartesian location. prevhpos is the column at
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
893 which the character before bufpos started, and contin is non-zero
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
894 if we reached the current line by continuing the previous.
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
895
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
896 Note that FROMHPOS and TOHPOS should be expressed in real screen
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
897 columns, taking HSCROLL and the truncation glyph at the left margin
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
898 into account. That is, beginning-of-line moves you to the hpos
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
899 -HSCROLL + (HSCROLL > 0).
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
900
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
901 For example, to find the buffer position of column COL of line LINE
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
902 of a certain window, pass the window's starting location as FROM
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
903 and the window's upper-left coordinates as FROMVPOS and FROMHPOS.
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
904 Pass the buffer's ZV as TO, to limit the scan to the end of the
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
905 visible section of the buffer, and pass LINE and COL as TOVPOS and
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
906 TOHPOS.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
907
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
908 When displaying in window w, a typical formula for WIDTH is:
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
909
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
910 window_width - 1
1994
73ce9dd21093 Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents: 1777
diff changeset
911 - (has_vertical_scroll_bars
8946
f2249e034d50 (compute_motion): Fix comment.
Karl Heuer <kwzh@gnu.org>
parents: 8905
diff changeset
912 ? FRAME_SCROLL_BAR_COLS (XFRAME (window->frame))
1777
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
913 : (window_width + window_left != frame_width))
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
914
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
915 where
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
916 window_width is XFASTINT (w->width),
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
917 window_left is XFASTINT (w->left),
1994
73ce9dd21093 Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents: 1777
diff changeset
918 has_vertical_scroll_bars is
73ce9dd21093 Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents: 1777
diff changeset
919 FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (WINDOW_FRAME (window)))
1777
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
920 and frame_width = FRAME_WIDTH (XFRAME (window->frame))
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
921
6400
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
922 Or you can let window_internal_width do this all for you, and write:
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
923 window_internal_width (w) - 1
1777
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
924
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
925 The `-1' accounts for the continuation-line backslashes; the rest
5941
c4cceb65fc5a Fix comments.
Karl Heuer <kwzh@gnu.org>
parents: 5845
diff changeset
926 accounts for window borders if the window is split horizontally, and
6400
5ef02598a0ad (compute_motion): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents: 6327
diff changeset
927 the scroll bars if they are turned on. */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
928
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
929 struct position *
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
930 compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, hscroll, tab_offset, win)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
931 int from, fromvpos, fromhpos, to, tovpos, tohpos;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
932 int did_motion;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
933 register int width;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
934 int hscroll, tab_offset;
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
935 struct window *win;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
936 {
526
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
937 register int hpos = fromhpos;
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
938 register int vpos = fromvpos;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
939
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
940 register int pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
941 register int c;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
942 register int tab_width = XFASTINT (current_buffer->tab_width);
488
4fddd0f0fc33 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 327
diff changeset
943 register int ctl_arrow = !NILP (current_buffer->ctl_arrow);
13185
5b1671bd3cc1 (buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents: 13124
diff changeset
944 register struct Lisp_Char_Table *dp = window_display_table (win);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
945 int selective
9126
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
946 = (INTEGERP (current_buffer->selective_display)
6846
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
947 ? XINT (current_buffer->selective_display)
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
948 : !NILP (current_buffer->selective_display) ? -1 : 0);
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
949 int prev_hpos = 0;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
950 int selective_rlen
9126
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
951 = (selective && dp && VECTORP (DISP_INVIS_VECTOR (dp))
2017
ffa43acb7de7 (current_column, Fmove_to_column, compute_motion):
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
952 ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
953 /* The next location where the `invisible' property changes, or an
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
954 overlay starts or ends. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
955 int next_boundary = from;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
956
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
957 /* For computing runs of characters with similar widths.
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
958 Invariant: width_run_width is zero, or all the characters
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
959 from width_run_start to width_run_end have a fixed width of
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
960 width_run_width. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
961 int width_run_start = from;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
962 int width_run_end = from;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
963 int width_run_width = 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
964 Lisp_Object *width_table;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
965 Lisp_Object buffer;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
966
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
967 /* The next buffer pos where we should consult the width run cache. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
968 int next_width_run = from;
15059
3b7454f2d662 (compute_motion): Pass window to Fget_char_property.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
969 Lisp_Object window;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
970
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
971 int multibyte = !NILP (current_buffer->enable_multibyte_characters);
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
972 int wide_column = 0; /* Set to 1 when a previous character
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
973 is wide-colomn. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
974 int prev_pos; /* Previous buffer position. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
975 int contin_hpos; /* HPOS of last column of continued line. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
976 int prev_tab_offset; /* Previous tab offset. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
977
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
978 XSETBUFFER (buffer, current_buffer);
15059
3b7454f2d662 (compute_motion): Pass window to Fget_char_property.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
979 XSETWINDOW (window, win);
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
980
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
981 width_run_cache_on_off ();
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
982 if (dp == buffer_display_table ())
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
983 width_table = (VECTORP (current_buffer->width_table)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
984 ? XVECTOR (current_buffer->width_table)->contents
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
985 : 0);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
986 else
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
987 /* If the window has its own display table, we can't use the width
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
988 run cache, because that's based on the buffer's display table. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
989 width_table = 0;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
990
2325
7b5299f3a8fc (current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents: 2017
diff changeset
991 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
526
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
992
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
993 pos = prev_pos = from;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
994 contin_hpos = 0;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
995 prev_tab_offset = tab_offset;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
996 while (1)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
997 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
998 while (pos == next_boundary)
5085
82bcf2c36929 (compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
999 {
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1000 /* If the caller says that the screen position came from an earlier
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1001 call to compute_motion, then we've already accounted for the
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1002 overlay strings at point. This is only true the first time
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1003 through, so clear the flag after testing it. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1004 if (!did_motion)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1005 /* We need to skip past the overlay strings. Currently those
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1006 strings must not contain TAB;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1007 if we want to relax that restriction, something will have
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1008 to be changed here. */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1009 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1010 unsigned char *ovstr;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1011 int ovlen = overlay_strings (pos, win, &ovstr);
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1012 hpos += (multibyte ? strwidth (ovstr, ovlen) : ovlen);
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1013 }
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1014 did_motion = 0;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1015
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1016 if (pos >= to)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1017 break;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1018
15493
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
1019 /* Advance POS past invisible characters
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
1020 (but not necessarily all that there are here),
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
1021 and store in next_boundary the next position where
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
1022 we need to call skip_invisible. */
32fe67f92ee1 Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents: 15278
diff changeset
1023 pos = skip_invisible (pos, &next_boundary, to, window);
5085
82bcf2c36929 (compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
1024 }
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1025
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1026 /* Handle right margin. */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1027 /* Note on a wide-column character.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1028
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1029 Characters are classified into the following three categories
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1030 according to the width (columns occupied on screen).
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1031
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1032 (1) single-column character: ex. `a'
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1033 (2) multi-column character: ex. `^A', TAB, `\033'
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1034 (3) wide-column character: ex. Japanese character, Chinese character
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1035 (In the following example, `W_' stands for them.)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1036
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1037 Multi-column characters can be divided around the right margin,
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1038 but wide-column characters cannot.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1039
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1040 NOTE:
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1041
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1042 (*) The cursor is placed on the next character after the point.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1043
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1044 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1045 abcdefghi\
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1046 j ^---- next after the point
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1047 ^--- next char. after the point.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1048 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1049 In case of sigle-column character
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1050
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1051 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1052 abcdefgh\\
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1053 033 ^---- next after the point, next char. after the point.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1054 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1055 In case of multi-column character
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1056
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1057 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1058 abcdefgh\\
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1059 W_ ^---- next after the point
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1060 ^---- next char. after the point.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1061 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1062 In case of wide-column character
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1063
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1064 The problem here is continuation at a wide-column character.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1065 In this case, the line may shorter less than WIDTH.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1066 And we find the continuation AFTER it occurs.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1067
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1068 */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1069
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1070 if (hpos > width)
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1071 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1072 if (hscroll
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1073 || (truncate_partial_width_windows
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1074 && width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win))))
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1075 || !NILP (current_buffer->truncate_lines))
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1076 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1077 /* Truncating: skip to newline. */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1078 if (pos <= to) /* This IF is needed because we may past TO */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1079 pos = find_before_next_newline (pos, to, 1);
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1080 hpos = width;
13453
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
1081 /* If we just skipped next_boundary,
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
1082 loop around in the main while
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
1083 and handle it. */
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
1084 if (pos >= next_boundary)
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
1085 next_boundary = pos + 1;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1086 prev_hpos = width;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1087 prev_tab_offset = tab_offset;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1088 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1089 else
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1090 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1091 /* Continuing. */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1092 /* Remember the previous value. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1093 prev_tab_offset = tab_offset;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1094
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1095 if (wide_column)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1096 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1097 hpos -= prev_hpos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1098 tab_offset += prev_hpos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1099 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1100 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1101 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1102 tab_offset += width;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1103 hpos -= width;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1104 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1105 vpos++;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1106 contin_hpos = prev_hpos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1107 prev_hpos = 0;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1108 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1109 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1110
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1111 /* Stop if past the target buffer position or screen position. */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1112 if (pos > to)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1113 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1114 /* Go back to the previous position. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1115 pos = prev_pos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1116 hpos = prev_hpos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1117 tab_offset = prev_tab_offset;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1118
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1119 /* NOTE on contin_hpos, hpos, and prev_hpos.
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1120
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1121 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1122 abcdefgh\\
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1123 W_ ^---- contin_hpos
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1124 | ^----- hpos
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1125 \---- prev_hpos
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1126 ----------
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1127 */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1128
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1129 if (contin_hpos && prev_hpos == 0
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1130 && contin_hpos < width && !wide_column)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1131 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1132 /* Line breaking occurs in the middle of multi-column
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1133 character. Go back to previous line. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1134 hpos = contin_hpos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1135 vpos = vpos - 1;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1136 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1137 else if (c == '\n')
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1138 /* If previous character is NEWLINE,
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1139 set VPOS back to previous line */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1140 vpos = vpos - 1;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1141 break;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1142 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1143
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1144 if (vpos > tovpos || vpos == tovpos && hpos >= tohpos)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1145 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1146 if (contin_hpos && prev_hpos == 0
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1147 && (contin_hpos == width || wide_column))
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1148 { /* Line breaks because we can't put the character at the
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1149 previous line any more. It is not the multi-column
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1150 character continued in middle. Go back to previous
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1151 buffer position, screen position, and set tab offset
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1152 to previous value. It's the beginning of the
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1153 line. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1154 pos = prev_pos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1155 hpos = prev_hpos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1156 tab_offset = prev_tab_offset;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1157 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1158 break;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1159 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1160 if (pos == ZV) /* We cannot go beyond ZV. Stop here. */
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1161 break;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1162
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1163 prev_hpos = hpos;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1164 prev_pos = pos;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1165 wide_column = 0;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1166
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1167 /* Consult the width run cache to see if we can avoid inspecting
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1168 the text character-by-character. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1169 if (current_buffer->width_run_cache && pos >= next_width_run)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1170 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1171 int run_end;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1172 int common_width
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1173 = region_cache_forward (current_buffer,
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1174 current_buffer->width_run_cache,
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1175 pos, &run_end);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1176
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1177 /* A width of zero means the character's width varies (like
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1178 a tab), is meaningless (like a newline), or we just don't
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1179 want to skip over it for some other reason. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1180 if (common_width != 0)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1181 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1182 int run_end_hpos;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1183
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1184 /* Don't go past the final buffer posn the user
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1185 requested. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1186 if (run_end > to)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1187 run_end = to;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1188
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1189 run_end_hpos = hpos + (run_end - pos) * common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1190
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1191 /* Don't go past the final horizontal position the user
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1192 requested. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1193 if (vpos == tovpos && run_end_hpos > tohpos)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1194 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1195 run_end = pos + (tohpos - hpos) / common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1196 run_end_hpos = hpos + (run_end - pos) * common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1197 }
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
1198
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1199 /* Don't go past the margin. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1200 if (run_end_hpos >= width)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1201 {
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1202 run_end = pos + (width - hpos) / common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1203 run_end_hpos = hpos + (run_end - pos) * common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1204 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1205
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1206 hpos = run_end_hpos;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1207 if (run_end > pos)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1208 prev_hpos = hpos - common_width;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1209 pos = run_end;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1210 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1211
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1212 next_width_run = run_end + 1;
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1213 }
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1214
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1215 /* We have to scan the text character-by-character. */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1216 else
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1217 {
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1218 c = FETCH_BYTE (pos);
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1219 pos++;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1220
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1221 /* Perhaps add some info to the width_run_cache. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1222 if (current_buffer->width_run_cache)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1223 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1224 /* Is this character part of the current run? If so, extend
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1225 the run. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1226 if (pos - 1 == width_run_end
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1227 && width_table[c] == width_run_width)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1228 width_run_end = pos;
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1229
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1230 /* The previous run is over, since this is a character at a
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1231 different position, or a different width. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1232 else
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1233 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1234 /* Have we accumulated a run to put in the cache?
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1235 (Currently, we only cache runs of width == 1). */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1236 if (width_run_start < width_run_end
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1237 && width_run_width == 1)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1238 know_region_cache (current_buffer,
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1239 current_buffer->width_run_cache,
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1240 width_run_start, width_run_end);
10538
48c620ae0853 (compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents: 10011
diff changeset
1241
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1242 /* Start recording a new width run. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1243 width_run_width = width_table[c];
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1244 width_run_start = pos - 1;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1245 width_run_end = pos;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1246 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1247 }
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1248
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1249 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1250 hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1251 else if (c >= 040 && c < 0177)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1252 hpos++;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1253 else if (c == '\t')
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1254 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1255 int tem = (hpos + tab_offset + hscroll - (hscroll > 0)) % tab_width;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1256 if (tem < 0)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1257 tem += tab_width;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1258 hpos += tab_width - tem;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1259 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1260 else if (c == '\n')
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1261 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1262 if (selective > 0 && indented_beyond_p (pos, selective))
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1263 {
17136
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1264 /* If (pos == to), we don't have to take care of
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1265 selective display. */
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1266 if (pos < to)
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1267 {
17136
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1268 /* Skip any number of invisible lines all at once */
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1269 do
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1270 pos = find_before_next_newline (pos, to, 1) + 1;
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1271 while (pos < to
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1272 && indented_beyond_p (pos, selective));
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1273 /* Allow for the " ..." that is displayed for them. */
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1274 if (selective_rlen)
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1275 {
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1276 hpos += selective_rlen;
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1277 if (hpos >= width)
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1278 hpos = width;
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1279 }
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1280 --pos;
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1281 /* We have skipped the invis text, but not the
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1282 newline after. */
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1283 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1284 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1285 else
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1286 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1287 /* A visible line. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1288 vpos++;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1289 hpos = 0;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1290 hpos -= hscroll;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1291 /* Count the truncation glyph on column 0 */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1292 if (hscroll > 0)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1293 hpos++;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1294 tab_offset = 0;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1295 }
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1296 contin_hpos = 0;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1297 }
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1298 else if (c == CR && selective < 0)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1299 {
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1300 /* In selective display mode,
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1301 everything from a ^M to the end of the line is invisible.
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1302 Stop *before* the real newline. */
17136
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1303 if (pos < to)
424932eba3e8 (compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents: 17016
diff changeset
1304 pos = find_before_next_newline (pos, to, 1);
13453
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
1305 /* If we just skipped next_boundary,
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
1306 loop around in the main while
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
1307 and handle it. */
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
1308 if (pos > next_boundary)
ea373c55ed95 (Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
1309 next_boundary = pos;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1310 /* Allow for the " ..." that is displayed for them. */
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1311 if (selective_rlen)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1312 {
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1313 hpos += selective_rlen;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1314 if (hpos >= width)
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1315 hpos = width;
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1316 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1317 }
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1318 else if (multibyte && BASE_LEADING_CODE_P (c))
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1319 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1320 /* Start of multi-byte form. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1321 unsigned char *ptr;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1322
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1323 pos--; /* rewind POS */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1324 ptr = POS_ADDR (pos);
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1325
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1326 if (c == LEADING_CODE_COMPOSITION)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1327 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1328 int cmpchar_id = str_cmpchar_id (ptr, next_boundary - pos);
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1329
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1330 if (cmpchar_id >= 0)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1331 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1332 if (cmpchar_table[cmpchar_id]->width >= 2)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1333 wide_column = 1;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1334 hpos += cmpchar_table[cmpchar_id]->width;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1335 pos += cmpchar_table[cmpchar_id]->len;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1336 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1337 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1338 { /* invalid composite character */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1339 hpos += 4;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1340 pos ++;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1341 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1342 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1343 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1344 {
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1345 /* Here, we check that the following bytes are valid
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1346 constituents of multi-byte form. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1347 int len = BYTES_BY_CHAR_HEAD (c), i;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1348
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1349 for (i = 1, ptr++; i < len; i++, ptr++)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1350 /* We don't need range checking for PTR because
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1351 there are anchors ('\0') both at GPT and Z. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1352 if (CHAR_HEAD_P (ptr)) break;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1353 if (i < len)
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1354 hpos += 4, pos++;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1355 else
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1356 hpos += WIDTH_BY_CHAR_HEAD (c), pos += i, wide_column = 1;
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1357 }
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1358 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1359 else
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1360 hpos += (ctl_arrow && c < 0200) ? 2 : 4;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1361 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1362 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1363
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1364 /* Remember any final width run in the cache. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1365 if (current_buffer->width_run_cache
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1366 && width_run_width == 1
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1367 && width_run_start < width_run_end)
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1368 know_region_cache (current_buffer, current_buffer->width_run_cache,
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1369 width_run_start, width_run_end);
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1370
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1371 val_compute_motion.bufpos = pos;
526
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
1372 val_compute_motion.hpos = hpos;
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
1373 val_compute_motion.vpos = vpos;
a41500eed1c5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 488
diff changeset
1374 val_compute_motion.prevhpos = prev_hpos;
16395
c6b901f809da (vmotion, compute_motion): Fill in ovstring_chars_done in the return value.
Richard M. Stallman <rms@gnu.org>
parents: 16257
diff changeset
1375 /* We alalways handle all of them here; none of them remain to do. */
c6b901f809da (vmotion, compute_motion): Fill in ovstring_chars_done in the return value.
Richard M. Stallman <rms@gnu.org>
parents: 16257
diff changeset
1376 val_compute_motion.ovstring_chars_done = 0;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1377
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1378 /* Nonzero if have just continued a line */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1379 val_compute_motion.contin = (contin_hpos && prev_hpos == 0);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1380
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1381 return &val_compute_motion;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1382 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1383
6587
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
1384 #if 0 /* The doc string is too long for some compilers,
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
1385 but make-docfile can find it in this comment. */
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1386 DEFUN ("compute-motion", Ffoo, Sfoo, 7, 7, 0,
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1387 "Scan through the current buffer, calculating screen position.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1388 Scan the current buffer forward from offset FROM,\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1389 assuming it is at position FROMPOS--a cons of the form (HPOS . VPOS)--\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1390 to position TO or position TOPOS--another cons of the form (HPOS . VPOS)--\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1391 and return the ending buffer position and screen location.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1392 \n\
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1393 There are three additional arguments:\n\
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1394 \n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1395 WIDTH is the number of columns available to display text;\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1396 this affects handling of continuation lines.\n\
6587
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
1397 This is usually the value returned by `window-width', less one (to allow\n\
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
1398 for the continuation glyph).\n\
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1399 \n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1400 OFFSETS is either nil or a cons cell (HSCROLL . TAB-OFFSET).\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1401 HSCROLL is the number of columns not being displayed at the left\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1402 margin; this is usually taken from a window's hscroll member.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1403 TAB-OFFSET is the number of columns of the first tab that aren't\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1404 being displayed, perhaps because the line was continued within it.\n\
6585
0e26a2431fa2 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6573
diff changeset
1405 If OFFSETS is nil, HSCROLL and TAB-OFFSET are assumed to be zero.\n\
6846
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1406 \n\
15278
dc5e711a109e (compute_motion): When calling Fget_char_property,
Karl Heuer <kwzh@gnu.org>
parents: 15059
diff changeset
1407 WINDOW is the window to operate on. It is used to choose the display table;\n\
dc5e711a109e (compute_motion): When calling Fget_char_property,
Karl Heuer <kwzh@gnu.org>
parents: 15059
diff changeset
1408 if it is showing the current buffer, it is used also for\n\
dc5e711a109e (compute_motion): When calling Fget_char_property,
Karl Heuer <kwzh@gnu.org>
parents: 15059
diff changeset
1409 deciding which overlay properties apply.\n\
dc5e711a109e (compute_motion): When calling Fget_char_property,
Karl Heuer <kwzh@gnu.org>
parents: 15059
diff changeset
1410 Note that `compute-motion' always operates on the current buffer.\n\
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1411 \n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1412 The value is a list of five elements:\n\
6586
de99006a8b38 (Fcompute_motion): Don't use XFASTINT on possibly-negative coords.
Karl Heuer <kwzh@gnu.org>
parents: 6585
diff changeset
1413 (POS HPOS VPOS PREVHPOS CONTIN)\n\
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1414 POS is the buffer position where the scan stopped.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1415 VPOS is the vertical position where the scan stopped.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1416 HPOS is the horizontal position where the scan stopped.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1417 \n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1418 PREVHPOS is the horizontal position one character back from POS.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1419 CONTIN is t if a line was continued after (or within) the previous character.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1420 \n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1421 For example, to find the buffer position of column COL of line LINE\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1422 of a certain window, pass the window's starting location as FROM\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1423 and the window's upper-left coordinates as FROMPOS.\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1424 Pass the buffer's (point-max) as TO, to limit the scan to the end of the\n\
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1425 visible section of the buffer, and pass LINE and COL as TOPOS.")
7566
8a0a7fb9f7d4 Add "args" to dummy definition of compute-motion.
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
1426 (from, frompos, to, topos, width, offsets, window)
6587
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
1427 #endif
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
1428
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1429 DEFUN ("compute-motion", Fcompute_motion, Scompute_motion, 7, 7, 0,
6587
168667ab5085 (Fcompute_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6586
diff changeset
1430 0)
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1431 (from, frompos, to, topos, width, offsets, window)
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1432 Lisp_Object from, frompos, to, topos;
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1433 Lisp_Object width, offsets, window;
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1434 {
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1435 Lisp_Object bufpos, hpos, vpos, prevhpos, contin;
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1436 struct position *pos;
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1437 int hscroll, tab_offset;
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1438
6573
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1439 CHECK_NUMBER_COERCE_MARKER (from, 0);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1440 CHECK_CONS (frompos, 0);
6573
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1441 CHECK_NUMBER (XCONS (frompos)->car, 0);
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1442 CHECK_NUMBER (XCONS (frompos)->cdr, 0);
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1443 CHECK_NUMBER_COERCE_MARKER (to, 0);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1444 CHECK_CONS (topos, 0);
6573
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1445 CHECK_NUMBER (XCONS (topos)->car, 0);
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1446 CHECK_NUMBER (XCONS (topos)->cdr, 0);
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1447 CHECK_NUMBER (width, 0);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1448 if (!NILP (offsets))
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1449 {
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1450 CHECK_CONS (offsets, 0);
6573
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1451 CHECK_NUMBER (XCONS (offsets)->car, 0);
33ae9314b443 Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents: 6572
diff changeset
1452 CHECK_NUMBER (XCONS (offsets)->cdr, 0);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1453 hscroll = XINT (XCONS (offsets)->car);
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1454 tab_offset = XINT (XCONS (offsets)->cdr);
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1455 }
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1456 else
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1457 hscroll = tab_offset = 0;
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1458
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1459 if (NILP (window))
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1460 window = Fselected_window ();
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1461 else
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1462 CHECK_LIVE_WINDOW (window, 0);
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1463
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1464 pos = compute_motion (XINT (from), XINT (XCONS (frompos)->cdr),
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1465 XINT (XCONS (frompos)->car), 0,
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1466 XINT (to), XINT (XCONS (topos)->cdr),
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1467 XINT (XCONS (topos)->car),
6691
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1468 XINT (width), hscroll, tab_offset,
3b56d4742266 (compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents: 6588
diff changeset
1469 XWINDOW (window));
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1470
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
1471 XSETFASTINT (bufpos, pos->bufpos);
9269
0f29bb3f784f (Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents: 9126
diff changeset
1472 XSETINT (hpos, pos->hpos);
0f29bb3f784f (Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents: 9126
diff changeset
1473 XSETINT (vpos, pos->vpos);
0f29bb3f784f (Fcompute_motion): Use new accessor macros instead of calling XSET directly.
Karl Heuer <kwzh@gnu.org>
parents: 9126
diff changeset
1474 XSETINT (prevhpos, pos->prevhpos);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1475
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1476 return Fcons (bufpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1477 Fcons (hpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1478 Fcons (vpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1479 Fcons (prevhpos,
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1480 Fcons (pos->contin ? Qt : Qnil, Qnil)))));
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1481
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1482 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1483
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1484 /* Return the column of position POS in window W's buffer.
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1485 The result is rounded down to a multiple of the internal width of W.
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1486 This is the amount of indentation of position POS
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1487 that is not visible in its horizontal position in the window. */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1488
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1489 int
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1490 pos_tab_offset (w, pos)
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1491 struct window *w;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1492 register int pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1493 {
8601
c67a4530319e (pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents: 8543
diff changeset
1494 int opoint = PT;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1495 int col;
1777
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1208
diff changeset
1496 int width = window_internal_width (w) - 1;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1497
16926
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1498 if (pos == BEGV)
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1499 return MINI_WINDOW_P (w) ? -minibuf_prompt_width : 0;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1500 if (FETCH_BYTE (pos - 1) == '\n')
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1501 return 0;
8601
c67a4530319e (pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents: 8543
diff changeset
1502 TEMP_SET_PT (pos);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1503 col = current_column ();
8601
c67a4530319e (pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents: 8543
diff changeset
1504 TEMP_SET_PT (opoint);
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1505 /* Modulo is no longer valid, as a line may get shorter than WIDTH
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1506 columns by continuation of a wide-column character. Just return
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1507 COL here. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1508 #if 0
16926
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1509 /* In the continuation of the first line in a minibuffer we must
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1510 take the width of the prompt into account. */
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1511 if (MINI_WINDOW_P (w) && col >= width - minibuf_prompt_width
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1512 && find_next_newline_no_quit (pos, -1) == BEGV)
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1513 return col - (col + minibuf_prompt_width) % width;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1514 return col - (col % width);
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1515 #endif
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1516 return col;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1517 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1518
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1519
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1520 /* Fvertical_motion and vmotion */
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1521 struct position val_vmotion;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1522
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1523 struct position *
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1524 vmotion (from, vtarget, w)
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1525 register int from, vtarget;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1526 struct window *w;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1527 {
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1528 int width = window_internal_width (w) - 1;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1529 int hscroll = XINT (w->hscroll);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1530 struct position pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1531 /* vpos is cumulative vertical position, changed as from is changed */
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1532 register int vpos = 0;
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1533 Lisp_Object prevline;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1534 register int first;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1535 int lmargin = hscroll > 0 ? 1 - hscroll : 0;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1536 int selective
9126
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
1537 = (INTEGERP (current_buffer->selective_display)
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
1538 ? XINT (current_buffer->selective_display)
e475f8108156 (buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents: 8946
diff changeset
1539 : !NILP (current_buffer->selective_display) ? -1 : 0);
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1540 Lisp_Object window;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1541 int start_hpos = 0;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1542 int did_motion;
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1543
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1544 XSETWINDOW (window, w);
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1545
6811
d84152a9b7e5 (vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents: 6763
diff changeset
1546 /* The omission of the clause
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1547 && marker_position (w->start) == BEG
6811
d84152a9b7e5 (vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents: 6763
diff changeset
1548 here is deliberate; I think we want to measure from the prompt
d84152a9b7e5 (vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents: 6763
diff changeset
1549 position even if the minibuffer window has scrolled. */
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
1550 if (EQ (window, minibuf_window))
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
1551 {
11813
5b7a7c92323d (vmotion): handle the case where `minibuf_prompt' is nil.
Karl Heuer <kwzh@gnu.org>
parents: 11811
diff changeset
1552 if (minibuf_prompt_width == 0 && STRINGP (minibuf_prompt))
11704
6c9716b7a23d (string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents: 11312
diff changeset
1553 minibuf_prompt_width
6c9716b7a23d (string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents: 11312
diff changeset
1554 = string_display_width (minibuf_prompt, Qnil, Qnil);
11300
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
1555
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
1556 start_hpos = minibuf_prompt_width;
474b17d364db (string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11037
diff changeset
1557 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1558
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1559 if (vpos >= vtarget)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1560 {
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1561 /* To move upward, go a line at a time until
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1562 we have gone at least far enough */
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1563
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1564 first = 1;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1565
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1566 while ((vpos > vtarget || first) && from > BEGV)
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1567 {
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1568 Lisp_Object propval;
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1569
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1570 XSETFASTINT (prevline, find_next_newline_no_quit (from - 1, -1));
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1571 while (XFASTINT (prevline) > BEGV
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1572 && ((selective > 0
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1573 && indented_beyond_p (XFASTINT (prevline), selective))
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1574 #ifdef USE_TEXT_PROPERTIES
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1575 /* watch out for newlines with `invisible' property */
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1576 || (propval = Fget_char_property (prevline,
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1577 Qinvisible,
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1578 window),
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1579 TEXT_PROP_MEANS_INVISIBLE (propval))
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1580 #endif
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1581 ))
9310
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
1582 XSETFASTINT (prevline,
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
1583 find_next_newline_no_quit (XFASTINT (prevline) - 1,
1dfd9def3467 (Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents: 9269
diff changeset
1584 -1));
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1585 pos = *compute_motion (XFASTINT (prevline), 0,
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1586 lmargin + (XFASTINT (prevline) == BEG
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1587 ? start_hpos : 0),
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1588 0,
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1589 from,
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1590 /* Don't care for VPOS... */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1591 1 << (BITS_PER_SHORT - 1),
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1592 /* ... nor HPOS. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1593 1 << (BITS_PER_SHORT - 1),
16926
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1594 width, hscroll,
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1595 /* This compensates for start_hpos
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1596 so that a tab as first character
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1597 still occupies 8 columns. */
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1598 (XFASTINT (prevline) == BEG
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1599 ? -start_hpos : 0),
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1600 w);
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1601 vpos -= pos.vpos;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1602 first = 0;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1603 from = XFASTINT (prevline);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1604 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1605
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1606 /* If we made exactly the desired vertical distance,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1607 or if we hit beginning of buffer,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1608 return point found */
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1609 if (vpos >= vtarget)
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1610 {
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1611 val_vmotion.bufpos = from;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1612 val_vmotion.vpos = vpos;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1613 val_vmotion.hpos = lmargin;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1614 val_vmotion.contin = 0;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1615 val_vmotion.prevhpos = 0;
16395
c6b901f809da (vmotion, compute_motion): Fill in ovstring_chars_done in the return value.
Richard M. Stallman <rms@gnu.org>
parents: 16257
diff changeset
1616 val_vmotion.ovstring_chars_done = 0;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1617 val_vmotion.tab_offset = 0; /* For accumulating tab offset. */
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1618 return &val_vmotion;
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1619 }
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1620
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1621 /* Otherwise find the correct spot by moving down */
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1622 }
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1623 /* Moving downward is simple, but must calculate from beg of line
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1624 to determine hpos of starting point */
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1625 if (from > BEGV && FETCH_BYTE (from - 1) != '\n')
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1626 {
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1627 Lisp_Object propval;
10964
474b6b03a71f (compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents: 10538
diff changeset
1628
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1629 XSETFASTINT (prevline, find_next_newline_no_quit (from, -1));
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1630 while (XFASTINT (prevline) > BEGV
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1631 && ((selective > 0
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1632 && indented_beyond_p (XFASTINT (prevline), selective))
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1633 #ifdef USE_TEXT_PROPERTIES
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1634 /* watch out for newlines with `invisible' property */
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1635 || (propval = Fget_char_property (prevline, Qinvisible,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1636 window),
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1637 TEXT_PROP_MEANS_INVISIBLE (propval))
4385
edffa4f0c5d9 (compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents: 2961
diff changeset
1638 #endif
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1639 ))
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1640 XSETFASTINT (prevline,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1641 find_next_newline_no_quit (XFASTINT (prevline) - 1,
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1642 -1));
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1643 pos = *compute_motion (XFASTINT (prevline), 0,
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1644 lmargin + (XFASTINT (prevline) == BEG
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1645 ? start_hpos : 0),
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1646 0,
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1647 from,
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1648 /* Don't care for VPOS... */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1649 1 << (BITS_PER_SHORT - 1),
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1650 /* ... nor HPOS. */
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1651 1 << (BITS_PER_SHORT - 1),
16926
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1652 width, hscroll,
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1653 (XFASTINT (prevline) == BEG ? -start_hpos : 0),
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1654 w);
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1655 did_motion = 1;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1656 }
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1657 else
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1658 {
11811
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1659 pos.hpos = lmargin + (from == BEG ? start_hpos : 0);
a0db528dfa1c (vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents: 11704
diff changeset
1660 pos.vpos = 0;
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1661 pos.tab_offset = 0;
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1662 did_motion = 0;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1663 }
11853
6578a356c540 (compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents: 11813
diff changeset
1664 return compute_motion (from, vpos, pos.hpos, did_motion,
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1665 ZV, vtarget, - (1 << (BITS_PER_SHORT - 1)),
16926
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1666 width, hscroll,
17016
ded89d7e1575 (current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents: 16926
diff changeset
1667 pos.tab_offset - (from == BEG ? start_hpos : 0),
16926
3baea3418dec (pos_tab_offset): Take the width of the minibuffer prompt into account.
Richard M. Stallman <rms@gnu.org>
parents: 16395
diff changeset
1668 w);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1669 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1670
6327
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1671 DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,
15659
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1672 "Move point to start of the screen line LINES lines down.\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1673 If LINES is negative, this means moving up.\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1674 \n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1675 This function is an ordinary cursor motion function\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1676 which calculates the new position based on how text would be displayed.\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1677 The new position may be the start of a line,\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1678 or just the start of a continuation line.\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1679 The function returns number of screen lines moved over;\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1680 that usually equals LINES, but may be closer to zero\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1681 if beginning or end of buffer was reached.\n\
6846
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1682 \n\
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1683 The optional second argument WINDOW specifies the window to use for\n\
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1684 parameters such as width, horizontal scrolling, and so on.\n\
15659
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1685 The default is to use the selected window's parameters.\n\
6846
a6803ff29cca (compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents: 6811
diff changeset
1686 \n\
15659
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1687 `vertical-motion' always uses the current buffer,\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1688 regardless of which buffer is displayed in WINDOW.\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1689 This is consistent with other cursor motion functions\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1690 and makes it possible to use `vertical-motion' in any buffer,\n\
6e4665e4f807 (Fvertical_motion): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15609
diff changeset
1691 whether or not it is currently displayed in some window.")
6327
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1692 (lines, window)
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1693 Lisp_Object lines, window;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1694 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1695 struct position pos;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1696
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1697 CHECK_NUMBER (lines, 0);
6327
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1698 if (! NILP (window))
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1699 CHECK_WINDOW (window, 0);
d93a087868cb (Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents: 6296
diff changeset
1700 else
8905
2ef3da79aabb (vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8648
diff changeset
1701 window = selected_window;
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1702
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15659
diff changeset
1703 pos = *vmotion (PT, (int) XINT (lines), XWINDOW (window));
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1704
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1705 SET_PT (pos.bufpos);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1706 return make_number (pos.vpos);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1707 }
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1708
9407
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1709 /* file's initialization. */
4dcc0221b449 * indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents: 9310
diff changeset
1710
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1711 syms_of_indent ()
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1712 {
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1713 DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode,
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1714 "*Indentation can insert tabs if this is non-nil.\n\
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1715 Setting this variable automatically makes it local to the current buffer.");
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1716 indent_tabs_mode = 1;
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1717
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1718 defsubr (&Scurrent_indentation);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1719 defsubr (&Sindent_to);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1720 defsubr (&Scurrent_column);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1721 defsubr (&Smove_to_column);
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1722 defsubr (&Svertical_motion);
6296
a1b438e4754b (compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents: 6092
diff changeset
1723 defsubr (&Scompute_motion);
165
ee44492a4419 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1724 }