Mercurial > emacs
annotate src/indent.c @ 25249:ff6be2c1916f
(vmotion): Don't add in mini-buffer prompt width
if prompts are inserted into mini-buffer.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 12 Aug 1999 20:49:57 +0000 |
| parents | 0cac51b5af77 |
| children | c7247eabc834 |
| rev | line source |
|---|---|
| 165 | 1 /* Indentation functions. |
| 20706 | 2 Copyright (C) 1985,86,87,88,93,94,95,98 Free Software Foundation, Inc. |
| 165 | 3 |
| 4 This file is part of GNU Emacs. | |
| 5 | |
| 6 GNU Emacs is free software; you can redistribute it and/or modify | |
| 7 it under the terms of the GNU General Public License as published by | |
| 12244 | 8 the Free Software Foundation; either version 2, or (at your option) |
| 165 | 9 any later version. |
| 10 | |
| 11 GNU Emacs is distributed in the hope that it will be useful, | |
| 12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 GNU General Public License for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 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 | 20 |
| 21 | |
|
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4385
diff
changeset
|
22 #include <config.h> |
| 165 | 23 #include "lisp.h" |
| 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" |
|
20256
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
26 #include "category.h" |
| 165 | 27 #include "indent.h" |
| 764 | 28 #include "frame.h" |
| 165 | 29 #include "window.h" |
| 30 #include "termchar.h" | |
| 31 #include "termopts.h" | |
| 32 #include "disptab.h" | |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
33 #include "intervals.h" |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
34 #include "region-cache.h" |
| 165 | 35 |
| 36 /* Indentation can insert tabs if this is non-zero; | |
| 37 otherwise always uses spaces */ | |
| 38 int indent_tabs_mode; | |
| 39 | |
| 40 #define min(a, b) ((a) < (b) ? (a) : (b)) | |
| 41 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
| 42 | |
| 43 #define CR 015 | |
| 44 | |
| 45 /* These three values memoize the current column to avoid recalculation */ | |
| 46 /* Some things in set last_known_column_point to -1 | |
| 47 to mark the memoized value as invalid */ | |
| 48 /* Last value returned by current_column */ | |
| 49 int last_known_column; | |
| 50 /* Value of point when current_column was called */ | |
| 51 int last_known_column_point; | |
| 52 /* Value of MODIFF when current_column was called */ | |
| 53 int last_known_column_modified; | |
| 54 | |
|
15494
a544bb3eea53
(current_column_1): Add declaration.
Richard M. Stallman <rms@gnu.org>
parents:
15493
diff
changeset
|
55 static int current_column_1 (); |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
56 static int position_indentation (); |
|
15494
a544bb3eea53
(current_column_1): Add declaration.
Richard M. Stallman <rms@gnu.org>
parents:
15493
diff
changeset
|
57 |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
58 /* 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
|
59 current_column. */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
60 int current_column_bol_cache; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
61 |
| 165 | 62 /* Get the display table to use for the current buffer. */ |
| 63 | |
|
13185
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
64 struct Lisp_Char_Table * |
| 165 | 65 buffer_display_table () |
| 66 { | |
| 67 Lisp_Object thisbuf; | |
| 68 | |
| 69 thisbuf = current_buffer->display_table; | |
|
13185
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
70 if (DISP_TABLE_P (thisbuf)) |
|
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
71 return XCHAR_TABLE (thisbuf); |
|
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
72 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
|
73 return XCHAR_TABLE (Vstandard_display_table); |
| 165 | 74 return 0; |
| 75 } | |
| 76 | |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
77 /* Width run cache considerations. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
78 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
79 /* 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
|
80 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
81 static int |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
82 character_width (c, dp) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
83 int c; |
|
13185
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
84 struct Lisp_Char_Table *dp; |
|
9407
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 Lisp_Object elt; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
87 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
88 /* 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
|
89 in display_text_line. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
90 |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
91 /* 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
|
92 present and the element is right. */ |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
93 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
|
94 return XVECTOR (elt)->size; |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
95 |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
96 /* Some characters are special. */ |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
97 if (c == '\n' || c == '\t' || c == '\015') |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
98 return 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
99 |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
100 /* Printing characters have width 1. */ |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
101 else if (c >= 040 && c < 0177) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
102 return 1; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
103 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
104 /* Everybody else (control characters, metacharacters) has other |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
105 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
|
106 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
|
107 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
|
108 widths. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
109 else |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
110 return 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
111 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
112 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
113 /* 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
|
114 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
|
115 invalidate the buffer's width_run_cache. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
116 int |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
117 disptab_matches_widthtab (disptab, widthtab) |
|
13185
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
118 struct Lisp_Char_Table *disptab; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
119 struct Lisp_Vector *widthtab; |
|
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 int i; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
122 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
123 if (widthtab->size != 256) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
124 abort (); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
125 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
126 for (i = 0; i < 256; i++) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
127 if (character_width (i, disptab) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
128 != XFASTINT (widthtab->contents[i])) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
129 return 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
130 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
131 return 1; |
|
10538
48c620ae0853
(compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents:
10011
diff
changeset
|
132 } |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
133 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
134 /* 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
|
135 void |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
136 recompute_width_table (buf, disptab) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
137 struct buffer *buf; |
|
13185
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
138 struct Lisp_Char_Table *disptab; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
139 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
140 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
|
141 struct Lisp_Vector *widthtab; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
142 |
|
10011
f4f2563057b8
(recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents:
9407
diff
changeset
|
143 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
|
144 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
|
145 widthtab = XVECTOR (buf->width_table); |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
146 if (widthtab->size != 256) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
147 abort (); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
148 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
149 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
|
150 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
|
151 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
152 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
153 /* 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
|
154 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
|
155 static void |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
156 width_run_cache_on_off () |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
157 { |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
158 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
|
159 /* 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
|
160 characters. */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
161 || !NILP (current_buffer->enable_multibyte_characters)) |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
162 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
163 /* It should be off. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
164 if (current_buffer->width_run_cache) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
165 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
166 free_region_cache (current_buffer->width_run_cache); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
167 current_buffer->width_run_cache = 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
168 current_buffer->width_table = Qnil; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
169 } |
|
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 else |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
172 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
173 /* It should be on. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
174 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
|
175 { |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
176 current_buffer->width_run_cache = new_region_cache (); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
177 recompute_width_table (current_buffer, buffer_display_table ()); |
|
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 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
181 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
182 |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
183 /* 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
|
184 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
|
185 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
|
186 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
187 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
|
188 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
|
189 Otherwise return POS itself. |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
190 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
191 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
|
192 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
|
193 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
194 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
|
195 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
|
196 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
197 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
|
198 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
|
199 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
200 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
|
201 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
|
202 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
|
203 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
|
204 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
|
205 |
|
25028
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
206 int |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
207 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
|
208 int pos; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
209 int *next_boundary_p; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
210 int to; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
211 Lisp_Object window; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
212 { |
|
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18109
diff
changeset
|
213 Lisp_Object prop, position, overlay_limit, proplimit; |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
214 Lisp_Object buffer; |
|
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18109
diff
changeset
|
215 int end; |
|
15493
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 XSETFASTINT (position, pos); |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
218 XSETBUFFER (buffer, current_buffer); |
|
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 /* 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
|
221 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
|
222 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
223 /* 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
|
224 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
|
225 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
|
226 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
|
227 /* 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
|
228 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
|
229 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
|
230 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
|
231 proplimit = overlay_limit; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
232 /* 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
|
233 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
|
234 use that lower bound. */ |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
235 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
|
236 *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
|
237 /* 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
|
238 else |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
239 { |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
240 /* 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
|
241 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
|
242 /* 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
|
243 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
|
244 proplimit = overlay_limit; |
|
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18109
diff
changeset
|
245 end = XFASTINT (Fnext_single_property_change (position, Qinvisible, |
|
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18109
diff
changeset
|
246 buffer, proplimit)); |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
247 #if 0 |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
248 /* 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
|
249 there is no actual property change. */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
250 if (end == pos + 100 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
251 && !NILP (current_buffer->enable_multibyte_characters) |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
252 && end < ZV) |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
253 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
|
254 end--; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
255 #endif |
|
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18109
diff
changeset
|
256 *next_boundary_p = end; |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
257 } |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
258 /* 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
|
259 the next property change */ |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
260 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
|
261 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
|
262 else |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
263 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
|
264 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
|
265 return *next_boundary_p; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
266 return pos; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
267 } |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
268 |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
269 /* Set variables WIDTH and BYTES for a multibyte sequence starting at P. |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
270 |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
271 C is *P which should satisfy `BASE_LEADING_CODE_P (c)'. |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
272 |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
273 DP is a display table or NULL. |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
274 |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
275 This macro is used in current_column_1, Fmove_to_column, and |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
276 compute_motion. */ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
277 |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
278 #define MULTIBYTE_BYTES_WIDTH(p, c, dp) \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
279 do { \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
280 unsigned char *pend = p + 1; \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
281 \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
282 wide_column = 0; \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
283 while (! CHAR_HEAD_P (*pend)) pend++; \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
284 \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
285 if (c == LEADING_CODE_COMPOSITION) \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
286 { \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
287 int id = str_cmpchar_id (p, pend - p); \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
288 int ch = MAKE_COMPOSITE_CHAR (id); \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
289 \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
290 if (id >= 0) \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
291 { \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
292 bytes = cmpchar_table[id]->len; \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
293 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, ch))) \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
294 width = XVECTOR (DISP_CHAR_VECTOR (dp, ch))->size; \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
295 else \ |
|
21275
66f5ac2310fd
(MULTIBYTE_BYTES_WIDTH): Set wide_column only when we
Kenichi Handa <handa@m17n.org>
parents:
20985
diff
changeset
|
296 width = cmpchar_table[id]->width; \ |
|
66f5ac2310fd
(MULTIBYTE_BYTES_WIDTH): Set wide_column only when we
Kenichi Handa <handa@m17n.org>
parents:
20985
diff
changeset
|
297 if (width > 1) \ |
|
66f5ac2310fd
(MULTIBYTE_BYTES_WIDTH): Set wide_column only when we
Kenichi Handa <handa@m17n.org>
parents:
20985
diff
changeset
|
298 wide_column = width; \ |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
299 } \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
300 else \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
301 { \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
302 bytes = 1; \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
303 width = 4; \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
304 } \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
305 } \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
306 else \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
307 { \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
308 bytes = BYTES_BY_CHAR_HEAD (c); \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
309 if (bytes >= 2 && bytes <= pend - p) \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
310 { \ |
|
23651
dcd6688d67be
(MULTIBYTE_BYTES_WIDTH): Check validity of a multibyte character.
Kenichi Handa <handa@m17n.org>
parents:
23039
diff
changeset
|
311 int ch = STRING_CHAR (p, bytes); \ |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
312 \ |
|
23651
dcd6688d67be
(MULTIBYTE_BYTES_WIDTH): Check validity of a multibyte character.
Kenichi Handa <handa@m17n.org>
parents:
23039
diff
changeset
|
313 if (CHAR_VALID_P (ch, 0)) \ |
|
dcd6688d67be
(MULTIBYTE_BYTES_WIDTH): Check validity of a multibyte character.
Kenichi Handa <handa@m17n.org>
parents:
23039
diff
changeset
|
314 { \ |
|
dcd6688d67be
(MULTIBYTE_BYTES_WIDTH): Check validity of a multibyte character.
Kenichi Handa <handa@m17n.org>
parents:
23039
diff
changeset
|
315 if (dp && VECTORP (DISP_CHAR_VECTOR (dp, ch))) \ |
|
dcd6688d67be
(MULTIBYTE_BYTES_WIDTH): Check validity of a multibyte character.
Kenichi Handa <handa@m17n.org>
parents:
23039
diff
changeset
|
316 width = XVECTOR (DISP_CHAR_VECTOR (dp, ch))->size; \ |
|
dcd6688d67be
(MULTIBYTE_BYTES_WIDTH): Check validity of a multibyte character.
Kenichi Handa <handa@m17n.org>
parents:
23039
diff
changeset
|
317 else \ |
|
dcd6688d67be
(MULTIBYTE_BYTES_WIDTH): Check validity of a multibyte character.
Kenichi Handa <handa@m17n.org>
parents:
23039
diff
changeset
|
318 width = WIDTH_BY_CHAR_HEAD (c); \ |
|
dcd6688d67be
(MULTIBYTE_BYTES_WIDTH): Check validity of a multibyte character.
Kenichi Handa <handa@m17n.org>
parents:
23039
diff
changeset
|
319 } \ |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
320 else \ |
|
23651
dcd6688d67be
(MULTIBYTE_BYTES_WIDTH): Check validity of a multibyte character.
Kenichi Handa <handa@m17n.org>
parents:
23039
diff
changeset
|
321 width = bytes * 4; \ |
|
21275
66f5ac2310fd
(MULTIBYTE_BYTES_WIDTH): Set wide_column only when we
Kenichi Handa <handa@m17n.org>
parents:
20985
diff
changeset
|
322 if (width > 1) \ |
|
66f5ac2310fd
(MULTIBYTE_BYTES_WIDTH): Set wide_column only when we
Kenichi Handa <handa@m17n.org>
parents:
20985
diff
changeset
|
323 wide_column = width; \ |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
324 } \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
325 else \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
326 { \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
327 bytes = 1; \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
328 width = 4; \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
329 } \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
330 } \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
331 if (p + bytes < pend) \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
332 { \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
333 width += 4 * (pend - (p + bytes)); \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
334 bytes = pend - p; \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
335 } \ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
336 } while (0) |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
337 |
| 165 | 338 DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0, |
| 339 "Return the horizontal position of point. Beginning of line is column 0.\n\ | |
| 340 This is calculated by adding together the widths of all the displayed\n\ | |
| 341 representations of the character between the start of the previous line\n\ | |
| 342 and point. (eg control characters will have a width of 2 or 4, tabs\n\ | |
| 343 will have a variable width)\n\ | |
| 764 | 344 Ignores finite width of frame, which means that this function may return\n\ |
| 345 values greater than (frame-width).\n\ | |
| 165 | 346 Whether the line is visible (if `selective-display' is t) has no effect;\n\ |
| 347 however, ^M is treated as end of line when `selective-display' is t.") | |
| 348 () | |
| 349 { | |
| 350 Lisp_Object temp; | |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
351 XSETFASTINT (temp, current_column ()); |
| 165 | 352 return temp; |
| 353 } | |
| 354 | |
| 327 | 355 /* Cancel any recorded value of the horizontal position. */ |
| 356 | |
|
20371
976eed15d6b5
(invalidate_current_column): Declare it as void.
Kenichi Handa <handa@m17n.org>
parents:
20256
diff
changeset
|
357 void |
| 327 | 358 invalidate_current_column () |
| 359 { | |
| 360 last_known_column_point = 0; | |
| 361 } | |
| 362 | |
| 165 | 363 int |
| 364 current_column () | |
| 365 { | |
| 366 register int col; | |
| 367 register unsigned char *ptr, *stop; | |
| 368 register int tab_seen; | |
| 369 int post_tab; | |
| 370 register int c; | |
| 371 register int tab_width = XINT (current_buffer->tab_width); | |
| 488 | 372 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
|
373 register struct Lisp_Char_Table *dp = buffer_display_table (); |
| 165 | 374 int stopchar; |
| 375 | |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15659
diff
changeset
|
376 if (PT == last_known_column_point |
| 165 | 377 && MODIFF == last_known_column_modified) |
| 378 return last_known_column; | |
| 379 | |
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20571
diff
changeset
|
380 /* If the buffer has overlays, text properties, |
|
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20571
diff
changeset
|
381 or multibyte characters, use a more general algorithm. */ |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
382 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
|
383 || !NILP (current_buffer->overlays_before) |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
384 || !NILP (current_buffer->overlays_after) |
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20571
diff
changeset
|
385 || Z != Z_BYTE) |
|
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20571
diff
changeset
|
386 return current_column_1 (); |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
387 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
388 /* 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
|
389 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
|
390 |
| 165 | 391 /* Make a pointer for decrementing through the chars before point. */ |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
392 ptr = BYTE_POS_ADDR (PT_BYTE - 1) + 1; |
| 165 | 393 /* Make a pointer to where consecutive chars leave off, |
| 394 going backwards from point. */ | |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15659
diff
changeset
|
395 if (PT == BEGV) |
| 165 | 396 stop = ptr; |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15659
diff
changeset
|
397 else if (PT <= GPT || BEGV > GPT) |
| 165 | 398 stop = BEGV_ADDR; |
| 399 else | |
| 400 stop = GAP_END_ADDR; | |
| 401 | |
|
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
402 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
| 165 | 403 |
| 404 col = 0, tab_seen = 0, post_tab = 0; | |
| 405 | |
| 406 while (1) | |
| 407 { | |
| 408 if (ptr == stop) | |
| 409 { | |
| 410 /* We stopped either for the beginning of the buffer | |
| 411 or for the gap. */ | |
| 412 if (ptr == BEGV_ADDR) | |
| 413 break; | |
| 414 /* It was the gap. Jump back over it. */ | |
| 415 stop = BEGV_ADDR; | |
| 416 ptr = GPT_ADDR; | |
| 417 /* Check whether that brings us to beginning of buffer. */ | |
| 418 if (BEGV >= GPT) break; | |
| 419 } | |
| 420 | |
| 421 c = *--ptr; | |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
422 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
|
423 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
|
424 else if (c >= 040 && c < 0177) |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
425 col++; |
|
19208
1d24f0a03f75
(current_column): Update ptr differently at newline
Richard M. Stallman <rms@gnu.org>
parents:
19080
diff
changeset
|
426 else if (c == '\n' |
|
1d24f0a03f75
(current_column): Update ptr differently at newline
Richard M. Stallman <rms@gnu.org>
parents:
19080
diff
changeset
|
427 || (c == '\r' && EQ (current_buffer->selective_display, Qt))) |
|
1d24f0a03f75
(current_column): Update ptr differently at newline
Richard M. Stallman <rms@gnu.org>
parents:
19080
diff
changeset
|
428 { |
|
1d24f0a03f75
(current_column): Update ptr differently at newline
Richard M. Stallman <rms@gnu.org>
parents:
19080
diff
changeset
|
429 ptr++; |
|
1d24f0a03f75
(current_column): Update ptr differently at newline
Richard M. Stallman <rms@gnu.org>
parents:
19080
diff
changeset
|
430 break; |
|
1d24f0a03f75
(current_column): Update ptr differently at newline
Richard M. Stallman <rms@gnu.org>
parents:
19080
diff
changeset
|
431 } |
| 165 | 432 else if (c == '\t') |
| 433 { | |
| 434 if (tab_seen) | |
| 435 col = ((col + tab_width) / tab_width) * tab_width; | |
| 436 | |
| 437 post_tab += col; | |
| 438 col = 0; | |
| 439 tab_seen = 1; | |
| 440 } | |
| 441 else | |
| 442 col += (ctl_arrow && c < 0200) ? 2 : 4; | |
| 443 } | |
| 444 | |
| 445 if (tab_seen) | |
| 446 { | |
| 447 col = ((col + tab_width) / tab_width) * tab_width; | |
| 448 col += post_tab; | |
| 449 } | |
| 450 | |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
451 if (ptr == BEGV_ADDR) |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
452 current_column_bol_cache = BEGV; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
453 else |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
454 current_column_bol_cache = BYTE_TO_CHAR (PTR_BYTE_POS (ptr)); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
455 |
| 165 | 456 last_known_column = col; |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15659
diff
changeset
|
457 last_known_column_point = PT; |
| 165 | 458 last_known_column_modified = MODIFF; |
| 459 | |
| 460 return col; | |
| 461 } | |
| 462 | |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
463 /* 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
|
464 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
|
465 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
|
466 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
|
467 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
468 static int |
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20571
diff
changeset
|
469 current_column_1 () |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
470 { |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
471 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
|
472 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
|
473 register struct Lisp_Char_Table *dp = buffer_display_table (); |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
474 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
|
475 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
476 /* 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
|
477 register int col = 0; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
478 int scan, scan_byte; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
479 int next_boundary, next_boundary_byte; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
480 int opoint = PT, opoint_byte = PT_BYTE; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
481 |
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20571
diff
changeset
|
482 scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1); |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
483 current_column_bol_cache = PT; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
484 scan = PT, scan_byte = PT_BYTE; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
485 SET_PT_BOTH (opoint, opoint_byte); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
486 next_boundary = scan; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
487 next_boundary_byte = scan_byte; |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
488 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
489 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
|
490 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
491 /* Scan forward to the target position. */ |
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20571
diff
changeset
|
492 while (scan < opoint) |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
493 { |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
494 int c; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
495 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
496 /* 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
|
497 while (scan == next_boundary) |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
498 { |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
499 int old_scan = scan; |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
500 /* 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
|
501 where we might need to skip more invisible text. */ |
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20571
diff
changeset
|
502 scan = skip_invisible (scan, &next_boundary, opoint, Qnil); |
|
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20571
diff
changeset
|
503 if (scan >= opoint) |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
504 goto endloop; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
505 if (scan != old_scan) |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
506 scan_byte = CHAR_TO_BYTE (scan); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
507 next_boundary_byte = CHAR_TO_BYTE (next_boundary); |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
508 } |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
509 |
|
20694
83a65a1efdaa
(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
Richard M. Stallman <rms@gnu.org>
parents:
20571
diff
changeset
|
510 c = FETCH_BYTE (scan_byte); |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
511 if (dp != 0 |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
512 && ! (multibyte && BASE_LEADING_CODE_P (c)) |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
513 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
514 { |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
515 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
|
516 scan++; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
517 scan_byte++; |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
518 continue; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
519 } |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
520 if (c == '\n') |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
521 break; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
522 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
|
523 break; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
524 scan++; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
525 scan_byte++; |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
526 if (c == '\t') |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
527 { |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
528 int prev_col = col; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
529 col += tab_width; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
530 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
|
531 } |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
532 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
|
533 { |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
534 unsigned char *ptr; |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
535 int bytes, width, wide_column; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
536 |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
537 scan_byte--; |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
538 ptr = BYTE_POS_ADDR (scan_byte); |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
539 MULTIBYTE_BYTES_WIDTH (ptr, c, dp); |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
540 scan_byte += bytes; |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
541 col += width; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
542 } |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
543 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
|
544 col += 2; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
545 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
|
546 col += 4; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
547 else |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
548 col++; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
549 } |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
550 endloop: |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
551 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
552 last_known_column = col; |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15659
diff
changeset
|
553 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
|
554 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
|
555 |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
556 return col; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
557 } |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
558 |
|
11300
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
559 /* 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
|
560 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
|
561 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
|
562 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
563 static int |
|
11704
6c9716b7a23d
(string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents:
11312
diff
changeset
|
564 string_display_width (string, beg, end) |
|
11300
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
565 Lisp_Object string, beg, end; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
566 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
567 register int col; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
568 register unsigned char *ptr, *stop; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
569 register int tab_seen; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
570 int post_tab; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
571 register int c; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
572 register int tab_width = XINT (current_buffer->tab_width); |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
573 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
|
574 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
|
575 int b, e; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
576 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
577 if (NILP (end)) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
578 e = XSTRING (string)->size; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
579 else |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
580 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
581 CHECK_NUMBER (end, 0); |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
582 e = XINT (end); |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
583 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
584 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
585 if (NILP (beg)) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
586 b = 0; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
587 else |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
588 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
589 CHECK_NUMBER (beg, 0); |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
590 b = XINT (beg); |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
591 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
592 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
593 /* 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
|
594 ptr = XSTRING (string)->data + e; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
595 /* Make a pointer to where consecutive chars leave off, |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
596 going backwards from point. */ |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
597 stop = XSTRING (string)->data + b; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
598 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
599 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
|
600 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
601 col = 0, tab_seen = 0, post_tab = 0; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
602 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
603 while (1) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
604 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
605 if (ptr == stop) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
606 break; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
607 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
608 c = *--ptr; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
609 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
610 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
611 else if (c >= 040 && c < 0177) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
612 col++; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
613 else if (c == '\n') |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
614 break; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
615 else if (c == '\t') |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
616 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
617 if (tab_seen) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
618 col = ((col + tab_width) / tab_width) * tab_width; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
619 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
620 post_tab += col; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
621 col = 0; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
622 tab_seen = 1; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
623 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
624 else |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
625 col += (ctl_arrow && c < 0200) ? 2 : 4; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
626 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
627 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
628 if (tab_seen) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
629 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
630 col = ((col + tab_width) / tab_width) * tab_width; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
631 col += post_tab; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
632 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
633 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
634 return col; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
635 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
636 |
| 165 | 637 DEFUN ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ", |
| 638 "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
|
639 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
|
640 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
|
641 (column, minimum) |
|
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
642 Lisp_Object column, minimum; |
| 165 | 643 { |
| 644 int mincol; | |
| 645 register int fromcol; | |
| 646 register int tab_width = XINT (current_buffer->tab_width); | |
| 647 | |
|
14078
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
648 CHECK_NUMBER (column, 0); |
| 488 | 649 if (NILP (minimum)) |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
650 XSETFASTINT (minimum, 0); |
| 165 | 651 CHECK_NUMBER (minimum, 1); |
| 652 | |
| 653 fromcol = current_column (); | |
| 654 mincol = fromcol + XINT (minimum); | |
|
14078
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
655 if (mincol < XINT (column)) mincol = XINT (column); |
| 165 | 656 |
| 657 if (fromcol == mincol) | |
| 658 return make_number (mincol); | |
| 659 | |
|
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
660 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
| 165 | 661 |
| 662 if (indent_tabs_mode) | |
| 663 { | |
| 664 Lisp_Object n; | |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
665 XSETFASTINT (n, mincol / tab_width - fromcol / tab_width); |
| 165 | 666 if (XFASTINT (n) != 0) |
| 667 { | |
|
8648
f047d8c6db79
(Findent_to): Pass new arg to Finsert_char.
Richard M. Stallman <rms@gnu.org>
parents:
8601
diff
changeset
|
668 Finsert_char (make_number ('\t'), n, Qt); |
| 165 | 669 |
| 670 fromcol = (mincol / tab_width) * tab_width; | |
| 671 } | |
| 672 } | |
| 673 | |
|
14078
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
674 XSETFASTINT (column, mincol - fromcol); |
|
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
675 Finsert_char (make_number (' '), column, Qt); |
| 165 | 676 |
| 677 last_known_column = mincol; | |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15659
diff
changeset
|
678 last_known_column_point = PT; |
| 165 | 679 last_known_column_modified = MODIFF; |
| 680 | |
|
14078
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
681 XSETINT (column, mincol); |
|
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
682 return column; |
| 165 | 683 } |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
684 |
| 165 | 685 |
| 21514 | 686 static int position_indentation P_ ((int)); |
| 687 | |
| 165 | 688 DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation, |
| 689 0, 0, 0, | |
| 690 "Return the indentation of the current line.\n\ | |
| 691 This is the horizontal position of the character\n\ | |
| 692 following any initial whitespace.") | |
| 693 () | |
| 694 { | |
| 695 Lisp_Object val; | |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
696 int opoint = PT, opoint_byte = PT_BYTE; |
| 165 | 697 |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
698 scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
699 |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
700 XSETFASTINT (val, position_indentation (PT_BYTE)); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
701 SET_PT_BOTH (opoint, opoint_byte); |
| 165 | 702 return val; |
| 703 } | |
| 704 | |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
705 static int |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
706 position_indentation (pos_byte) |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
707 register int pos_byte; |
| 165 | 708 { |
| 709 register int column = 0; | |
| 710 register int tab_width = XINT (current_buffer->tab_width); | |
| 711 register unsigned char *p; | |
| 712 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
|
713 unsigned char *start; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
714 int next_boundary_byte = pos_byte; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
715 int ceiling = next_boundary_byte; |
|
10538
48c620ae0853
(compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents:
10011
diff
changeset
|
716 |
|
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
717 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
|
718 |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
719 p = BYTE_POS_ADDR (pos_byte); |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
720 /* 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
|
721 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
|
722 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
|
723 stop = p; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
724 /* 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
|
725 start = p; |
| 165 | 726 while (1) |
| 727 { | |
| 728 while (p == stop) | |
| 729 { | |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
730 int stop_pos_byte; |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
731 |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
732 /* If we have updated P, set POS_BYTE to match. |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
733 The first time we enter the loop, POS_BYTE is already right. */ |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
734 if (p != start) |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
735 pos_byte = PTR_BYTE_POS (p); |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
736 /* Consider the various reasons STOP might have been set here. */ |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
737 if (pos_byte == ZV_BYTE) |
| 165 | 738 return column; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
739 if (pos_byte == next_boundary_byte) |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
740 { |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
741 int next_boundary; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
742 int pos = BYTE_TO_CHAR (pos_byte); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
743 pos = skip_invisible (pos, &next_boundary, ZV, Qnil); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
744 pos_byte = CHAR_TO_BYTE (pos); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
745 next_boundary_byte = CHAR_TO_BYTE (next_boundary); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
746 } |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
747 if (pos_byte >= ceiling) |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
748 ceiling = BUFFER_CEILING_OF (pos_byte) + 1; |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
749 /* 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
|
750 and set STOP accordingly. */ |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
751 stop_pos_byte = min (ceiling, next_boundary_byte); |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
752 /* The -1 and +1 arrange to point at the first byte of gap |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
753 (if STOP_POS_BYTE is the position of the gap) |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
754 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
|
755 |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
756 stop = BYTE_POS_ADDR (stop_pos_byte - 1) + 1; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
757 p = BYTE_POS_ADDR (pos_byte); |
| 165 | 758 } |
| 759 switch (*p++) | |
| 760 { | |
|
20256
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
761 case 0240: |
|
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
762 if (! NILP (current_buffer->enable_multibyte_characters)) |
|
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
763 return column; |
| 165 | 764 case ' ': |
| 765 column++; | |
| 766 break; | |
| 767 case '\t': | |
| 768 column += tab_width - column % tab_width; | |
| 769 break; | |
| 770 default: | |
|
20256
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
771 if (ASCII_BYTE_P (p[-1]) |
|
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
772 || NILP (current_buffer->enable_multibyte_characters)) |
|
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
773 return column; |
|
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
774 { |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
775 int c; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
776 pos_byte = PTR_BYTE_POS (p - 1); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
777 c = FETCH_MULTIBYTE_CHAR (pos_byte); |
|
20256
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
778 if (CHAR_HAS_CATEGORY (c, ' ')) |
|
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
779 { |
|
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
780 column++; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
781 INC_POS (pos_byte); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
782 p = BYTE_POS_ADDR (pos_byte); |
|
20256
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
783 } |
|
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
784 else |
|
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
785 return column; |
|
f75208097eb5
(position_indentation): Detect non-breaking space,
Karl Heuer <kwzh@gnu.org>
parents:
19938
diff
changeset
|
786 } |
| 165 | 787 } |
| 788 } | |
| 789 } | |
|
5943
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
790 |
|
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
791 /* 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
|
792 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
|
793 preceding line. */ |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
794 |
|
5943
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
795 int |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
796 indented_beyond_p (pos, pos_byte, column) |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
797 int pos, pos_byte, column; |
|
5943
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
798 { |
|
21525
0ed9ea6eeef3
(indented_beyond_p): Fix mixing of Lisp_Object and int.
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
799 int val; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
800 int opoint = PT, opoint_byte = PT_BYTE; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
801 |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
802 SET_PT_BOTH (pos, pos_byte); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
803 while (PT > BEGV && FETCH_BYTE (PT_BYTE) == '\n') |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
804 scan_newline (PT - 1, PT_BYTE - 1, BEGV, BEGV_BYTE, -1, 0); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
805 |
|
21525
0ed9ea6eeef3
(indented_beyond_p): Fix mixing of Lisp_Object and int.
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
806 val = position_indentation (PT_BYTE); |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
807 SET_PT_BOTH (opoint, opoint_byte); |
|
22560
ce6e85fd8036
(indented_beyond_p): Return the right kind of value.
Richard M. Stallman <rms@gnu.org>
parents:
22245
diff
changeset
|
808 return val >= column; |
|
5943
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
809 } |
| 165 | 810 |
|
13124
e44b06fc718d
(Fmove_to_column): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
811 DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p", |
| 165 | 812 "Move point to column COLUMN in the current line.\n\ |
| 813 The column of a character is calculated by adding together the widths\n\ | |
| 814 as displayed of the previous characters in the line.\n\ | |
| 815 This function ignores line-continuation;\n\ | |
| 816 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
|
817 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
|
818 \n\ |
| 165 | 819 If specified column is within a character, point goes after that character.\n\ |
| 820 If it's past end of line, point goes to end of line.\n\n\ | |
|
25073
0cac51b5af77
(Fmove_to_column): Extend end of line only if FORCE is t.
Karl Heuer <kwzh@gnu.org>
parents:
25028
diff
changeset
|
821 A non-nil second (optional) argument FORCE means,\n\ |
|
0cac51b5af77
(Fmove_to_column): Extend end of line only if FORCE is t.
Karl Heuer <kwzh@gnu.org>
parents:
25028
diff
changeset
|
822 if COLUMN is in the middle of a tab character, change it to spaces.\n\ |
|
0cac51b5af77
(Fmove_to_column): Extend end of line only if FORCE is t.
Karl Heuer <kwzh@gnu.org>
parents:
25028
diff
changeset
|
823 In addition, if FORCE is t, and the line is too short\n\ |
|
0cac51b5af77
(Fmove_to_column): Extend end of line only if FORCE is t.
Karl Heuer <kwzh@gnu.org>
parents:
25028
diff
changeset
|
824 to reach column COLUMN, add spaces/tabs to get there.\n\ |
|
13453
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
825 \n\ |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
826 The return value is the current column.") |
| 165 | 827 (column, force) |
| 828 Lisp_Object column, force; | |
| 829 { | |
| 830 register int pos; | |
| 831 register int col = current_column (); | |
| 832 register int goal; | |
| 833 register int end; | |
| 834 register int tab_width = XINT (current_buffer->tab_width); | |
| 488 | 835 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
|
836 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
|
837 register int multibyte = !NILP (current_buffer->enable_multibyte_characters); |
| 165 | 838 |
| 839 Lisp_Object val; | |
| 840 int prev_col; | |
| 841 int c; | |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
842 int next_boundary; |
| 165 | 843 |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
844 int pos_byte, end_byte, next_boundary_byte; |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
845 |
|
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
846 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
| 165 | 847 CHECK_NATNUM (column, 0); |
| 848 goal = XINT (column); | |
| 849 | |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15659
diff
changeset
|
850 pos = PT; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
851 pos_byte = PT_BYTE; |
| 165 | 852 end = ZV; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
853 end_byte = ZV_BYTE; |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
854 next_boundary = pos; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
855 next_boundary_byte = PT_BYTE; |
| 165 | 856 |
| 857 /* If we're starting past the desired column, | |
| 858 back up to beginning of line and scan from there. */ | |
| 859 if (col > goal) | |
| 860 { | |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
861 end = pos; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
862 pos = current_column_bol_cache; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
863 pos_byte = CHAR_TO_BYTE (pos); |
| 165 | 864 col = 0; |
| 865 } | |
| 866 | |
|
15554
103a6af424a8
(Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents:
15494
diff
changeset
|
867 while (pos < end) |
| 165 | 868 { |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
869 while (pos == next_boundary) |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
870 { |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
871 int prev = pos; |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
872 pos = skip_invisible (pos, &next_boundary, end, Qnil); |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
873 if (pos != prev) |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
874 pos_byte = CHAR_TO_BYTE (pos); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
875 next_boundary_byte = CHAR_TO_BYTE (next_boundary); |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
876 if (pos >= end) |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
877 goto endloop; |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
878 } |
|
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
879 |
|
15554
103a6af424a8
(Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents:
15494
diff
changeset
|
880 /* 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
|
881 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
|
882 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
|
883 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
|
884 break; |
|
103a6af424a8
(Fmove_to_column): Go after invis chars at the goal column.
Richard M. Stallman <rms@gnu.org>
parents:
15494
diff
changeset
|
885 |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
886 c = FETCH_BYTE (pos_byte); |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
887 if (dp != 0 |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
888 && ! (multibyte && BASE_LEADING_CODE_P (c)) |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
889 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
890 { |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
891 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
892 pos_byte++; |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
893 pos++; |
|
11312
f48922d85166
(Fmove_to_column): Fix minor bug in prev change.
Richard M. Stallman <rms@gnu.org>
parents:
11300
diff
changeset
|
894 continue; |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
895 } |
| 165 | 896 if (c == '\n') |
| 897 break; | |
| 898 if (c == '\r' && EQ (current_buffer->selective_display, Qt)) | |
| 899 break; | |
| 900 pos++; | |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
901 pos_byte++; |
| 165 | 902 if (c == '\t') |
| 903 { | |
| 904 prev_col = col; | |
| 905 col += tab_width; | |
| 906 col = col / tab_width * tab_width; | |
| 907 } | |
| 908 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
|
909 col += 2; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
910 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
|
911 col += 4; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
912 else if (c < 0177) |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
913 col++; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
914 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
|
915 { |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
916 /* Start of multi-byte form. */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
917 unsigned char *ptr; |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
918 int bytes, width, wide_column; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
919 |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
920 pos_byte--; |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
921 ptr = BYTE_POS_ADDR (pos_byte); |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
922 MULTIBYTE_BYTES_WIDTH (ptr, c, dp); |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
923 pos_byte += bytes; |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
924 col += width; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
925 } |
| 165 | 926 else |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
927 col += 4; |
| 165 | 928 } |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
929 endloop: |
| 165 | 930 |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
931 SET_PT_BOTH (pos, pos_byte); |
| 165 | 932 |
| 933 /* If a tab char made us overshoot, change it to spaces | |
| 934 and scan through it again. */ | |
| 488 | 935 if (!NILP (force) && col > goal && c == '\t' && prev_col < goal) |
| 165 | 936 { |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
937 int old_point, old_point_byte; |
| 573 | 938 |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15659
diff
changeset
|
939 del_range (PT - 1, PT); |
| 573 | 940 Findent_to (make_number (goal), Qnil); |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15659
diff
changeset
|
941 old_point = PT; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
942 old_point_byte = PT_BYTE; |
| 573 | 943 Findent_to (make_number (col), Qnil); |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
944 SET_PT_BOTH (old_point, old_point_byte); |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
945 /* Set the last_known... vars consistently. */ |
|
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
946 col = goal; |
| 165 | 947 } |
| 948 | |
| 949 /* If line ends prematurely, add space to the end. */ | |
|
25073
0cac51b5af77
(Fmove_to_column): Extend end of line only if FORCE is t.
Karl Heuer <kwzh@gnu.org>
parents:
25028
diff
changeset
|
950 if (col < goal && EQ (force, Qt)) |
|
1208
fa662930e654
* indent.c (Fmove_to_column): Pass the right number of arguments
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
951 Findent_to (make_number (col = goal), Qnil); |
| 165 | 952 |
| 953 last_known_column = col; | |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15659
diff
changeset
|
954 last_known_column_point = PT; |
| 165 | 955 last_known_column_modified = MODIFF; |
| 956 | |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
957 XSETFASTINT (val, col); |
| 165 | 958 return val; |
| 959 } | |
| 960 | |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
961 /* 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
|
962 |
| 165 | 963 struct position val_compute_motion; |
| 964 | |
| 965 /* Scan the current buffer forward from offset FROM, pretending that | |
| 966 this is at line FROMVPOS, column FROMHPOS, until reaching buffer | |
| 967 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
|
968 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
|
969 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
|
970 multi-column character), overshoot. |
| 165 | 971 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
972 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
|
973 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
|
974 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
|
975 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
|
976 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
|
977 |
| 165 | 978 WIDTH is the number of columns available to display text; |
| 979 compute_motion uses this to handle continuation lines and such. | |
| 980 HSCROLL is the number of columns not being displayed at the left | |
| 981 margin; this is usually taken from a window's hscroll member. | |
| 543 | 982 TAB_OFFSET is the number of columns of the first tab that aren't |
| 983 being displayed, perhaps because of a continuation line or | |
| 984 something. | |
| 165 | 985 |
| 986 compute_motion returns a pointer to a struct position. The bufpos | |
| 987 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
|
988 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
|
989 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
|
990 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
|
991 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
992 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
|
993 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
|
994 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
|
995 -HSCROLL + (HSCROLL > 0). |
| 165 | 996 |
| 997 For example, to find the buffer position of column COL of line LINE | |
| 998 of a certain window, pass the window's starting location as FROM | |
| 999 and the window's upper-left coordinates as FROMVPOS and FROMHPOS. | |
| 1000 Pass the buffer's ZV as TO, to limit the scan to the end of the | |
| 1001 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
|
1002 TOHPOS. |
| 165 | 1003 |
| 1004 When displaying in window w, a typical formula for WIDTH is: | |
| 1005 | |
| 1006 window_width - 1 | |
|
1994
73ce9dd21093
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1777
diff
changeset
|
1007 - (has_vertical_scroll_bars |
| 8946 | 1008 ? 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
|
1009 : (window_width + window_left != frame_width)) |
| 165 | 1010 |
| 1011 where | |
| 1012 window_width is XFASTINT (w->width), | |
| 1013 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
|
1014 has_vertical_scroll_bars is |
|
73ce9dd21093
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1777
diff
changeset
|
1015 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
|
1016 and frame_width = FRAME_WIDTH (XFRAME (window->frame)) |
| 165 | 1017 |
| 6400 | 1018 Or you can let window_internal_width do this all for you, and write: |
| 1019 window_internal_width (w) - 1 | |
|
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1208
diff
changeset
|
1020 |
|
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1208
diff
changeset
|
1021 The `-1' accounts for the continuation-line backslashes; the rest |
| 5941 | 1022 accounts for window borders if the window is split horizontally, and |
| 6400 | 1023 the scroll bars if they are turned on. */ |
| 165 | 1024 |
| 1025 struct position * | |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1026 compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, hscroll, tab_offset, win) |
| 165 | 1027 int from, fromvpos, fromhpos, to, tovpos, tohpos; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1028 int did_motion; |
| 165 | 1029 register int width; |
| 1030 int hscroll, tab_offset; | |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1031 struct window *win; |
| 165 | 1032 { |
| 526 | 1033 register int hpos = fromhpos; |
| 1034 register int vpos = fromvpos; | |
| 165 | 1035 |
| 1036 register int pos; | |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1037 int pos_byte; |
| 165 | 1038 register int c; |
| 1039 register int tab_width = XFASTINT (current_buffer->tab_width); | |
| 488 | 1040 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
|
1041 register struct Lisp_Char_Table *dp = window_display_table (win); |
| 165 | 1042 int selective |
|
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
1043 = (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
|
1044 ? 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
|
1045 : !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
|
1046 int prev_hpos = 0; |
| 165 | 1047 int selective_rlen |
|
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
1048 = (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
|
1049 ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0); |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1050 /* 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
|
1051 overlay starts or ends. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1052 int next_boundary = from; |
| 165 | 1053 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1054 /* For computing runs of characters with similar widths. |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1055 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
|
1056 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
|
1057 width_run_width. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1058 int width_run_start = from; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1059 int width_run_end = from; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1060 int width_run_width = 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1061 Lisp_Object *width_table; |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1062 Lisp_Object buffer; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1063 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1064 /* 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
|
1065 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
|
1066 Lisp_Object window; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1067 |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1068 int multibyte = !NILP (current_buffer->enable_multibyte_characters); |
| 21996 | 1069 /* If previous char scanned was a wide character, |
| 1070 this is the column where it ended. Otherwise, this is 0. */ | |
| 1071 int wide_column_end_hpos = 0; | |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1072 int prev_pos; /* Previous buffer position. */ |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1073 int prev_pos_byte; /* Previous buffer position. */ |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1074 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
|
1075 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
|
1076 |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1077 XSETBUFFER (buffer, current_buffer); |
|
15059
3b7454f2d662
(compute_motion): Pass window to Fget_char_property.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
1078 XSETWINDOW (window, win); |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1079 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1080 width_run_cache_on_off (); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1081 if (dp == buffer_display_table ()) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1082 width_table = (VECTORP (current_buffer->width_table) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1083 ? XVECTOR (current_buffer->width_table)->contents |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1084 : 0); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1085 else |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1086 /* 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
|
1087 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
|
1088 width_table = 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1089 |
|
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
1090 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
| 526 | 1091 |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1092 pos = prev_pos = from; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1093 pos_byte = prev_pos_byte = CHAR_TO_BYTE (from); |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1094 contin_hpos = 0; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1095 prev_tab_offset = tab_offset; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1096 while (1) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1097 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1098 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
|
1099 { |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1100 int pos_here = pos; |
|
17966
aaa25a87ae3d
(compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents:
17136
diff
changeset
|
1101 int newpos; |
|
aaa25a87ae3d
(compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents:
17136
diff
changeset
|
1102 |
|
22245
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1103 /* Don't skip invisible if we are already at the margin. */ |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1104 if (vpos > tovpos || vpos == tovpos && hpos >= tohpos) |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1105 { |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1106 if (contin_hpos && prev_hpos == 0 |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1107 && hpos > tohpos |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1108 && (contin_hpos == width || wide_column_end_hpos > width)) |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1109 { /* Line breaks because we can't put the character at the |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1110 previous line any more. It is not the multi-column |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1111 character continued in middle. Go back to previous |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1112 buffer position, screen position, and set tab offset |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1113 to previous value. It's the beginning of the |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1114 line. */ |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1115 pos = prev_pos; |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1116 pos_byte = prev_pos_byte; |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1117 hpos = prev_hpos; |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1118 tab_offset = prev_tab_offset; |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1119 } |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1120 break; |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1121 } |
|
94da16d936b6
(compute_motion): Check for past vpos/hpos target
Richard M. Stallman <rms@gnu.org>
parents:
22000
diff
changeset
|
1122 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1123 /* 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
|
1124 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
|
1125 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
|
1126 through, so clear the flag after testing it. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1127 if (!did_motion) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1128 /* 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
|
1129 strings must not contain TAB; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1130 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
|
1131 to be changed here. */ |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1132 { |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1133 unsigned char *ovstr; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1134 int ovlen = overlay_strings (pos, win, &ovstr); |
|
21283
c431691cbff1
(compute_motion): Call strwidth only when necessary.
Kenichi Handa <handa@m17n.org>
parents:
21275
diff
changeset
|
1135 hpos += ((multibyte && ovlen > 0) |
|
c431691cbff1
(compute_motion): Call strwidth only when necessary.
Kenichi Handa <handa@m17n.org>
parents:
21275
diff
changeset
|
1136 ? strwidth (ovstr, ovlen) : ovlen); |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1137 } |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1138 did_motion = 0; |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1139 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1140 if (pos >= to) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1141 break; |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1142 |
|
15493
32fe67f92ee1
Make current-column, move-to-column and current-indentation
Richard M. Stallman <rms@gnu.org>
parents:
15278
diff
changeset
|
1143 /* 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
|
1144 (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
|
1145 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
|
1146 we need to call skip_invisible. */ |
|
17966
aaa25a87ae3d
(compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents:
17136
diff
changeset
|
1147 newpos = skip_invisible (pos, &next_boundary, to, window); |
|
aaa25a87ae3d
(compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents:
17136
diff
changeset
|
1148 |
|
aaa25a87ae3d
(compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents:
17136
diff
changeset
|
1149 if (newpos >= to) |
|
21919
0c3d6e2c4176
(compute_motion): When invisible text cross TO,
Richard M. Stallman <rms@gnu.org>
parents:
21525
diff
changeset
|
1150 { |
|
0c3d6e2c4176
(compute_motion): When invisible text cross TO,
Richard M. Stallman <rms@gnu.org>
parents:
21525
diff
changeset
|
1151 pos = min (to, newpos); |
|
0c3d6e2c4176
(compute_motion): When invisible text cross TO,
Richard M. Stallman <rms@gnu.org>
parents:
21525
diff
changeset
|
1152 goto after_loop; |
|
0c3d6e2c4176
(compute_motion): When invisible text cross TO,
Richard M. Stallman <rms@gnu.org>
parents:
21525
diff
changeset
|
1153 } |
|
17966
aaa25a87ae3d
(compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents:
17136
diff
changeset
|
1154 |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1155 if (newpos != pos_here) |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1156 { |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1157 pos = newpos; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1158 pos_byte = CHAR_TO_BYTE (pos); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1159 } |
|
5085
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1160 } |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1161 |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1162 /* Handle right margin. */ |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1163 /* Note on a wide-column character. |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1164 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1165 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
|
1166 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
|
1167 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1168 (1) single-column character: ex. `a' |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1169 (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
|
1170 (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
|
1171 (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
|
1172 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1173 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
|
1174 but wide-column characters cannot. |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1175 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1176 NOTE: |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1177 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1178 (*) 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
|
1179 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1180 ---------- |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1181 abcdefghi\ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1182 j ^---- next after the point |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1183 ^--- next char. after the point. |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1184 ---------- |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1185 In case of sigle-column character |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1186 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1187 ---------- |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1188 abcdefgh\\ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1189 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
|
1190 ---------- |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1191 In case of multi-column character |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1192 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1193 ---------- |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1194 abcdefgh\\ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1195 W_ ^---- next after the point |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1196 ^---- next char. after the point. |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1197 ---------- |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1198 In case of wide-column character |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1199 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1200 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
|
1201 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
|
1202 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
|
1203 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1204 */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1205 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1206 if (hpos > width) |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1207 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1208 if (hscroll |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1209 || (truncate_partial_width_windows |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1210 && width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win)))) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1211 || !NILP (current_buffer->truncate_lines)) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1212 { |
|
20876
c80b908e5af5
(compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents:
20706
diff
changeset
|
1213 /* Truncating: skip to newline, unless we are already past |
|
c80b908e5af5
(compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents:
20706
diff
changeset
|
1214 TO (we need to go back below). */ |
|
c80b908e5af5
(compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents:
20706
diff
changeset
|
1215 if (pos <= to) |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1216 { |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1217 pos = find_before_next_newline (pos, to, 1); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1218 pos_byte = CHAR_TO_BYTE (pos); |
|
20876
c80b908e5af5
(compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents:
20706
diff
changeset
|
1219 hpos = width; |
|
c80b908e5af5
(compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents:
20706
diff
changeset
|
1220 /* If we just skipped next_boundary, |
|
c80b908e5af5
(compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents:
20706
diff
changeset
|
1221 loop around in the main while |
|
c80b908e5af5
(compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents:
20706
diff
changeset
|
1222 and handle it. */ |
|
c80b908e5af5
(compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents:
20706
diff
changeset
|
1223 if (pos >= next_boundary) |
|
c80b908e5af5
(compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents:
20706
diff
changeset
|
1224 next_boundary = pos + 1; |
|
c80b908e5af5
(compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents:
20706
diff
changeset
|
1225 prev_hpos = width; |
|
c80b908e5af5
(compute_motion): If right margin is reached and we are
Andreas Schwab <schwab@suse.de>
parents:
20706
diff
changeset
|
1226 prev_tab_offset = tab_offset; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1227 } |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1228 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1229 else |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1230 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1231 /* Continuing. */ |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1232 /* Remember the previous value. */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1233 prev_tab_offset = tab_offset; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1234 |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1235 if (wide_column_end_hpos > width) |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1236 { |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1237 hpos -= prev_hpos; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1238 tab_offset += prev_hpos; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1239 } |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1240 else |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1241 { |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1242 tab_offset += width; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1243 hpos -= width; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1244 } |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1245 vpos++; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1246 contin_hpos = prev_hpos; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1247 prev_hpos = 0; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1248 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1249 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1250 |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1251 /* Stop if past the target buffer position or screen position. */ |
|
21994
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1252 if (pos > to) |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1253 { |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1254 /* Go back to the previous position. */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1255 pos = prev_pos; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1256 pos_byte = prev_pos_byte; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1257 hpos = prev_hpos; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1258 tab_offset = prev_tab_offset; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1259 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1260 /* 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
|
1261 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1262 ---------- |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1263 abcdefgh\\ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1264 W_ ^---- contin_hpos |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1265 | ^----- hpos |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1266 \---- prev_hpos |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1267 ---------- |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1268 */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1269 |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1270 if (contin_hpos && prev_hpos == 0 |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1271 && contin_hpos < width && !wide_column_end_hpos) |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1272 { |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1273 /* 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
|
1274 character. Go back to previous line. */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1275 hpos = contin_hpos; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1276 vpos = vpos - 1; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1277 } |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1278 else if (c == '\n') |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1279 /* If previous character is NEWLINE, |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1280 set VPOS back to previous line */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1281 vpos = vpos - 1; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1282 break; |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1283 } |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1284 |
|
21994
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1285 if (vpos > tovpos || vpos == tovpos && hpos >= tohpos) |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1286 { |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1287 if (contin_hpos && prev_hpos == 0 |
| 22000 | 1288 && hpos > tohpos |
| 1289 && (contin_hpos == width || wide_column_end_hpos > width)) | |
|
21994
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1290 { /* Line breaks because we can't put the character at the |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1291 previous line any more. It is not the multi-column |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1292 character continued in middle. Go back to previous |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1293 buffer position, screen position, and set tab offset |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1294 to previous value. It's the beginning of the |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1295 line. */ |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1296 pos = prev_pos; |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1297 pos_byte = prev_pos_byte; |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1298 hpos = prev_hpos; |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1299 tab_offset = prev_tab_offset; |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1300 } |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1301 break; |
|
e244c4d9b0ca
(compute_motion): Undo both May 7 changes.
Richard M. Stallman <rms@gnu.org>
parents:
21991
diff
changeset
|
1302 } |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1303 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
|
1304 break; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1305 |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1306 prev_hpos = hpos; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1307 prev_pos = pos; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1308 prev_pos_byte = pos_byte; |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1309 wide_column_end_hpos = 0; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1310 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1311 /* 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
|
1312 the text character-by-character. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1313 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
|
1314 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1315 int run_end; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1316 int common_width |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1317 = region_cache_forward (current_buffer, |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1318 current_buffer->width_run_cache, |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1319 pos, &run_end); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1320 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1321 /* 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
|
1322 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
|
1323 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
|
1324 if (common_width != 0) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1325 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1326 int run_end_hpos; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1327 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1328 /* 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
|
1329 requested. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1330 if (run_end > to) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1331 run_end = to; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1332 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1333 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
|
1334 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1335 /* 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
|
1336 requested. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1337 if (vpos == tovpos && run_end_hpos > tohpos) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1338 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1339 run_end = pos + (tohpos - hpos) / common_width; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1340 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
|
1341 } |
|
10538
48c620ae0853
(compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents:
10011
diff
changeset
|
1342 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1343 /* Don't go past the margin. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1344 if (run_end_hpos >= width) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1345 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1346 run_end = pos + (width - hpos) / common_width; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1347 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
|
1348 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1349 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1350 hpos = run_end_hpos; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1351 if (run_end > pos) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1352 prev_hpos = hpos - common_width; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1353 if (pos != run_end) |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1354 { |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1355 pos = run_end; |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1356 pos_byte = CHAR_TO_BYTE (pos); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1357 } |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1358 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1359 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1360 next_width_run = run_end + 1; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1361 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1362 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1363 /* We have to scan the text character-by-character. */ |
| 165 | 1364 else |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1365 { |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1366 c = FETCH_BYTE (pos_byte); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1367 pos++, pos_byte++; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1368 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1369 /* Perhaps add some info to the width_run_cache. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1370 if (current_buffer->width_run_cache) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1371 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1372 /* 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
|
1373 the run. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1374 if (pos - 1 == width_run_end |
|
18109
b8c70b5f5aba
(compute_motion): Use XFASTINT on width_table elts.
Richard M. Stallman <rms@gnu.org>
parents:
17966
diff
changeset
|
1375 && XFASTINT (width_table[c]) == width_run_width) |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1376 width_run_end = pos; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1377 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1378 /* 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
|
1379 different position, or a different width. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1380 else |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1381 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1382 /* 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
|
1383 (Currently, we only cache runs of width == 1). */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1384 if (width_run_start < width_run_end |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1385 && width_run_width == 1) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1386 know_region_cache (current_buffer, |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1387 current_buffer->width_run_cache, |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1388 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
|
1389 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1390 /* Start recording a new width run. */ |
|
18109
b8c70b5f5aba
(compute_motion): Use XFASTINT on width_table elts.
Richard M. Stallman <rms@gnu.org>
parents:
17966
diff
changeset
|
1391 width_run_width = XFASTINT (width_table[c]); |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1392 width_run_start = pos - 1; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1393 width_run_end = pos; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1394 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1395 } |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1396 |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1397 if (dp != 0 |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1398 && ! (multibyte && BASE_LEADING_CODE_P (c)) |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1399 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1400 hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1401 else if (c >= 040 && c < 0177) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1402 hpos++; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1403 else if (c == '\t') |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1404 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1405 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
|
1406 if (tem < 0) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1407 tem += tab_width; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1408 hpos += tab_width - tem; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1409 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1410 else if (c == '\n') |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1411 { |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1412 if (selective > 0 |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1413 && indented_beyond_p (pos, pos_byte, selective)) |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1414 { |
|
17136
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1415 /* 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
|
1416 selective display. */ |
|
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1417 if (pos < to) |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1418 { |
|
17136
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1419 /* 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
|
1420 do |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1421 { |
|
24828
a3ddcd017066
(compute_motion): Fix boundary case.
Karl Heuer <kwzh@gnu.org>
parents:
23651
diff
changeset
|
1422 pos = find_before_next_newline (pos, to, 1); |
|
a3ddcd017066
(compute_motion): Fix boundary case.
Karl Heuer <kwzh@gnu.org>
parents:
23651
diff
changeset
|
1423 if (pos < to) |
|
a3ddcd017066
(compute_motion): Fix boundary case.
Karl Heuer <kwzh@gnu.org>
parents:
23651
diff
changeset
|
1424 pos++; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1425 pos_byte = CHAR_TO_BYTE (pos); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1426 } |
|
17136
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1427 while (pos < to |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1428 && indented_beyond_p (pos, pos_byte, selective)); |
|
17136
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1429 /* 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
|
1430 if (selective_rlen) |
|
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1431 { |
|
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1432 hpos += selective_rlen; |
|
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1433 if (hpos >= width) |
|
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1434 hpos = width; |
|
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1435 } |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1436 DEC_BOTH (pos, pos_byte); |
|
17136
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1437 /* 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
|
1438 newline after. */ |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1439 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1440 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1441 else |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1442 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1443 /* A visible line. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1444 vpos++; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1445 hpos = 0; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1446 hpos -= hscroll; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1447 /* Count the truncation glyph on column 0 */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1448 if (hscroll > 0) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1449 hpos++; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1450 tab_offset = 0; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1451 } |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1452 contin_hpos = 0; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1453 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1454 else if (c == CR && selective < 0) |
| 165 | 1455 { |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1456 /* In selective display mode, |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1457 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
|
1458 Stop *before* the real newline. */ |
|
17136
424932eba3e8
(compute_motion): When POS >= TO, don't call
Kenichi Handa <handa@m17n.org>
parents:
17016
diff
changeset
|
1459 if (pos < to) |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1460 { |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1461 pos = find_before_next_newline (pos, to, 1); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1462 pos_byte = CHAR_TO_BYTE (pos); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1463 } |
|
13453
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1464 /* If we just skipped next_boundary, |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1465 loop around in the main while |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1466 and handle it. */ |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1467 if (pos > next_boundary) |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
1468 next_boundary = pos; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1469 /* Allow for the " ..." that is displayed for them. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1470 if (selective_rlen) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1471 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1472 hpos += selective_rlen; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1473 if (hpos >= width) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1474 hpos = width; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1475 } |
| 165 | 1476 } |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1477 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
|
1478 { |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1479 /* Start of multi-byte form. */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1480 unsigned char *ptr; |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1481 int bytes, width, wide_column; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1482 |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1483 pos_byte--; /* rewind POS_BYTE */ |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1484 ptr = BYTE_POS_ADDR (pos_byte); |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1485 MULTIBYTE_BYTES_WIDTH (ptr, c, dp); |
|
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1486 pos_byte += bytes; |
|
21283
c431691cbff1
(compute_motion): Call strwidth only when necessary.
Kenichi Handa <handa@m17n.org>
parents:
21275
diff
changeset
|
1487 if (wide_column) |
|
c431691cbff1
(compute_motion): Call strwidth only when necessary.
Kenichi Handa <handa@m17n.org>
parents:
21275
diff
changeset
|
1488 wide_column_end_hpos = hpos + wide_column; |
|
20938
12e635300b44
(MULTIBYTE_BYTES_WIDTH): New macro.
Kenichi Handa <handa@m17n.org>
parents:
20876
diff
changeset
|
1489 hpos += width; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1490 } |
| 165 | 1491 else |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1492 hpos += (ctl_arrow && c < 0200) ? 2 : 4; |
| 165 | 1493 } |
| 1494 } | |
| 1495 | |
|
17966
aaa25a87ae3d
(compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents:
17136
diff
changeset
|
1496 after_loop: |
|
aaa25a87ae3d
(compute_motion): Return correctly if skip_invisible
Richard M. Stallman <rms@gnu.org>
parents:
17136
diff
changeset
|
1497 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1498 /* Remember any final width run in the cache. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1499 if (current_buffer->width_run_cache |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1500 && width_run_width == 1 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1501 && width_run_start < width_run_end) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1502 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
|
1503 width_run_start, width_run_end); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1504 |
| 165 | 1505 val_compute_motion.bufpos = pos; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1506 val_compute_motion.bytepos = pos_byte; |
| 526 | 1507 val_compute_motion.hpos = hpos; |
| 1508 val_compute_motion.vpos = vpos; | |
|
20985
020b0eade8c5
(compute_motion): If we just moved over a continuation
Andreas Schwab <schwab@suse.de>
parents:
20938
diff
changeset
|
1509 if (contin_hpos && prev_hpos == 0) |
|
020b0eade8c5
(compute_motion): If we just moved over a continuation
Andreas Schwab <schwab@suse.de>
parents:
20938
diff
changeset
|
1510 val_compute_motion.prevhpos = contin_hpos; |
|
020b0eade8c5
(compute_motion): If we just moved over a continuation
Andreas Schwab <schwab@suse.de>
parents:
20938
diff
changeset
|
1511 else |
|
020b0eade8c5
(compute_motion): If we just moved over a continuation
Andreas Schwab <schwab@suse.de>
parents:
20938
diff
changeset
|
1512 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
|
1513 /* 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
|
1514 val_compute_motion.ovstring_chars_done = 0; |
| 165 | 1515 |
| 1516 /* 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
|
1517 val_compute_motion.contin = (contin_hpos && prev_hpos == 0); |
| 165 | 1518 |
| 1519 return &val_compute_motion; | |
| 1520 } | |
| 1521 | |
|
25028
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1522 |
| 6587 | 1523 #if 0 /* The doc string is too long for some compilers, |
| 1524 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
|
1525 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
|
1526 "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
|
1527 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
|
1528 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
|
1529 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
|
1530 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
|
1531 \n\ |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1532 There are three additional arguments:\n\ |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1533 \n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1534 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
|
1535 this affects handling of continuation lines.\n\ |
| 6587 | 1536 This is usually the value returned by `window-width', less one (to allow\n\ |
| 1537 for the continuation glyph).\n\ | |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1538 \n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1539 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
|
1540 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
|
1541 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
|
1542 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
|
1543 being displayed, perhaps because the line was continued within it.\n\ |
| 6585 | 1544 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
|
1545 \n\ |
|
15278
dc5e711a109e
(compute_motion): When calling Fget_char_property,
Karl Heuer <kwzh@gnu.org>
parents:
15059
diff
changeset
|
1546 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
|
1547 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
|
1548 deciding which overlay properties apply.\n\ |
|
dc5e711a109e
(compute_motion): When calling Fget_char_property,
Karl Heuer <kwzh@gnu.org>
parents:
15059
diff
changeset
|
1549 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
|
1550 \n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1551 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
|
1552 (POS HPOS VPOS PREVHPOS CONTIN)\n\ |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1553 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
|
1554 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
|
1555 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
|
1556 \n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1557 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
|
1558 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
|
1559 \n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1560 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
|
1561 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
|
1562 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
|
1563 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
|
1564 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
|
1565 (from, frompos, to, topos, width, offsets, window) |
| 6587 | 1566 #endif |
| 1567 | |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1568 DEFUN ("compute-motion", Fcompute_motion, Scompute_motion, 7, 7, 0, |
| 6587 | 1569 0) |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1570 (from, frompos, to, topos, width, offsets, window) |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1571 Lisp_Object from, frompos, to, topos; |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1572 Lisp_Object width, offsets, window; |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1573 { |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1574 Lisp_Object bufpos, hpos, vpos, prevhpos, contin; |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1575 struct position *pos; |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1576 int hscroll, tab_offset; |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1577 |
|
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1578 CHECK_NUMBER_COERCE_MARKER (from, 0); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1579 CHECK_CONS (frompos, 0); |
|
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1580 CHECK_NUMBER (XCONS (frompos)->car, 0); |
|
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1581 CHECK_NUMBER (XCONS (frompos)->cdr, 0); |
|
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1582 CHECK_NUMBER_COERCE_MARKER (to, 0); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1583 CHECK_CONS (topos, 0); |
|
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1584 CHECK_NUMBER (XCONS (topos)->car, 0); |
|
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1585 CHECK_NUMBER (XCONS (topos)->cdr, 0); |
|
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1586 CHECK_NUMBER (width, 0); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1587 if (!NILP (offsets)) |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1588 { |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1589 CHECK_CONS (offsets, 0); |
|
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1590 CHECK_NUMBER (XCONS (offsets)->car, 0); |
|
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1591 CHECK_NUMBER (XCONS (offsets)->cdr, 0); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1592 hscroll = XINT (XCONS (offsets)->car); |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1593 tab_offset = XINT (XCONS (offsets)->cdr); |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1594 } |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1595 else |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1596 hscroll = tab_offset = 0; |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1597 |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1598 if (NILP (window)) |
|
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1599 window = Fselected_window (); |
|
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1600 else |
|
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1601 CHECK_LIVE_WINDOW (window, 0); |
|
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1602 |
|
21496
6ec5e85328a9
(Fcompute_motion): Check that TO and FROM are in range.
Karl Heuer <kwzh@gnu.org>
parents:
21283
diff
changeset
|
1603 if (XINT (from) < BEGV || XINT (from) > ZV) |
|
6ec5e85328a9
(Fcompute_motion): Check that TO and FROM are in range.
Karl Heuer <kwzh@gnu.org>
parents:
21283
diff
changeset
|
1604 args_out_of_range_3 (from, make_number (BEGV), make_number (ZV)); |
|
6ec5e85328a9
(Fcompute_motion): Check that TO and FROM are in range.
Karl Heuer <kwzh@gnu.org>
parents:
21283
diff
changeset
|
1605 if (XINT (to) < BEGV || XINT (to) > ZV) |
|
6ec5e85328a9
(Fcompute_motion): Check that TO and FROM are in range.
Karl Heuer <kwzh@gnu.org>
parents:
21283
diff
changeset
|
1606 args_out_of_range_3 (to, make_number (BEGV), make_number (ZV)); |
|
6ec5e85328a9
(Fcompute_motion): Check that TO and FROM are in range.
Karl Heuer <kwzh@gnu.org>
parents:
21283
diff
changeset
|
1607 |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1608 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
|
1609 XINT (XCONS (frompos)->car), 0, |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1610 XINT (to), XINT (XCONS (topos)->cdr), |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1611 XINT (XCONS (topos)->car), |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1612 XINT (width), hscroll, tab_offset, |
|
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1613 XWINDOW (window)); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1614 |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
1615 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
|
1616 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
|
1617 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
|
1618 XSETINT (prevhpos, pos->prevhpos); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1619 |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1620 return Fcons (bufpos, |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1621 Fcons (hpos, |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1622 Fcons (vpos, |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1623 Fcons (prevhpos, |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1624 Fcons (pos->contin ? Qt : Qnil, Qnil))))); |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1625 |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1626 } |
| 165 | 1627 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1628 /* Fvertical_motion and vmotion */ |
| 165 | 1629 struct position val_vmotion; |
| 1630 | |
| 1631 struct position * | |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1632 vmotion (from, vtarget, w) |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1633 register int from, vtarget; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1634 struct window *w; |
| 165 | 1635 { |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1636 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
|
1637 int hscroll = XINT (w->hscroll); |
| 165 | 1638 struct position pos; |
| 1639 /* vpos is cumulative vertical position, changed as from is changed */ | |
| 1640 register int vpos = 0; | |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1641 Lisp_Object prevline; |
| 165 | 1642 register int first; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1643 int from_byte; |
| 165 | 1644 int lmargin = hscroll > 0 ? 1 - hscroll : 0; |
| 1645 int selective | |
|
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
1646 = (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
|
1647 ? 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
|
1648 : !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
|
1649 Lisp_Object window; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1650 int start_hpos = 0; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1651 int did_motion; |
|
23039
f4262c9a21dd
(vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents:
22560
diff
changeset
|
1652 /* This is the object we use for fetching character properties. */ |
|
f4262c9a21dd
(vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents:
22560
diff
changeset
|
1653 Lisp_Object text_prop_object; |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1654 |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1655 XSETWINDOW (window, w); |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1656 |
|
25249
ff6be2c1916f
(vmotion): Don't add in mini-buffer prompt width
Gerd Moellmann <gerd@gnu.org>
parents:
25073
diff
changeset
|
1657 #if NO_PROMPT_IN_BUFFER |
|
6811
d84152a9b7e5
(vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents:
6763
diff
changeset
|
1658 /* 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
|
1659 && marker_position (w->start) == BEG |
|
6811
d84152a9b7e5
(vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents:
6763
diff
changeset
|
1660 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
|
1661 position even if the minibuffer window has scrolled. */ |
|
11300
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
1662 if (EQ (window, minibuf_window)) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
1663 { |
|
11813
5b7a7c92323d
(vmotion): handle the case where `minibuf_prompt' is nil.
Karl Heuer <kwzh@gnu.org>
parents:
11811
diff
changeset
|
1664 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
|
1665 minibuf_prompt_width |
|
6c9716b7a23d
(string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents:
11312
diff
changeset
|
1666 = string_display_width (minibuf_prompt, Qnil, Qnil); |
|
11300
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
1667 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
1668 start_hpos = minibuf_prompt_width; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
1669 } |
|
25249
ff6be2c1916f
(vmotion): Don't add in mini-buffer prompt width
Gerd Moellmann <gerd@gnu.org>
parents:
25073
diff
changeset
|
1670 #endif /* NO_PROMPT_IN_BUFFER */ |
| 165 | 1671 |
|
23039
f4262c9a21dd
(vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents:
22560
diff
changeset
|
1672 /* If the window contains this buffer, use it for getting text properties. |
|
f4262c9a21dd
(vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents:
22560
diff
changeset
|
1673 Otherwise use the current buffer as arg for doing that. */ |
|
f4262c9a21dd
(vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents:
22560
diff
changeset
|
1674 if (EQ (w->buffer, Fcurrent_buffer ())) |
|
f4262c9a21dd
(vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents:
22560
diff
changeset
|
1675 text_prop_object = window; |
|
f4262c9a21dd
(vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents:
22560
diff
changeset
|
1676 else |
|
f4262c9a21dd
(vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents:
22560
diff
changeset
|
1677 text_prop_object = Fcurrent_buffer (); |
|
f4262c9a21dd
(vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents:
22560
diff
changeset
|
1678 |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1679 if (vpos >= vtarget) |
| 165 | 1680 { |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1681 /* To move upward, go a line at a time until |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1682 we have gone at least far enough. */ |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1683 |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1684 first = 1; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1685 |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1686 while ((vpos > vtarget || first) && from > BEGV) |
| 165 | 1687 { |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1688 Lisp_Object propval; |
|
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1689 |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1690 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
|
1691 while (XFASTINT (prevline) > BEGV |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1692 && ((selective > 0 |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1693 && indented_beyond_p (XFASTINT (prevline), |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1694 CHAR_TO_BYTE (XFASTINT (prevline)), |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1695 selective)) |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1696 #ifdef USE_TEXT_PROPERTIES |
|
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1697 /* 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
|
1698 || (propval = Fget_char_property (prevline, |
|
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1699 Qinvisible, |
|
23039
f4262c9a21dd
(vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents:
22560
diff
changeset
|
1700 text_prop_object), |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1701 TEXT_PROP_MEANS_INVISIBLE (propval)) |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1702 #endif |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1703 )) |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
1704 XSETFASTINT (prevline, |
|
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
1705 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
|
1706 -1)); |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1707 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
|
1708 lmargin + (XFASTINT (prevline) == BEG |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1709 ? start_hpos : 0), |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1710 0, |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1711 from, |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1712 /* Don't care for VPOS... */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1713 1 << (BITS_PER_SHORT - 1), |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1714 /* ... nor HPOS. */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1715 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
|
1716 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
|
1717 /* 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
|
1718 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
|
1719 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
|
1720 (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
|
1721 ? -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
|
1722 w); |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1723 vpos -= pos.vpos; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1724 first = 0; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1725 from = XFASTINT (prevline); |
| 165 | 1726 } |
| 1727 | |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1728 /* 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
|
1729 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
|
1730 return point found */ |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1731 if (vpos >= vtarget) |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1732 { |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1733 val_vmotion.bufpos = from; |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1734 val_vmotion.bytepos = CHAR_TO_BYTE (from); |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1735 val_vmotion.vpos = vpos; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1736 val_vmotion.hpos = lmargin; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1737 val_vmotion.contin = 0; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1738 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
|
1739 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
|
1740 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
|
1741 return &val_vmotion; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1742 } |
| 165 | 1743 |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1744 /* 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
|
1745 } |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1746 /* 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
|
1747 to determine hpos of starting point */ |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1748 from_byte = CHAR_TO_BYTE (from); |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1749 if (from > BEGV && FETCH_BYTE (from_byte - 1) != '\n') |
| 165 | 1750 { |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1751 Lisp_Object propval; |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1752 |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1753 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
|
1754 while (XFASTINT (prevline) > BEGV |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1755 && ((selective > 0 |
|
20571
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1756 && indented_beyond_p (XFASTINT (prevline), |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1757 CHAR_TO_BYTE (XFASTINT (prevline)), |
|
3e0e568163f5
(current_column_1, Fmove_to_column):
Richard M. Stallman <rms@gnu.org>
parents:
20371
diff
changeset
|
1758 selective)) |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1759 #ifdef USE_TEXT_PROPERTIES |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1760 /* 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
|
1761 || (propval = Fget_char_property (prevline, Qinvisible, |
|
23039
f4262c9a21dd
(vmotion): Don't use WINDOW for Fget_char_property
Richard M. Stallman <rms@gnu.org>
parents:
22560
diff
changeset
|
1762 text_prop_object), |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1763 TEXT_PROP_MEANS_INVISIBLE (propval)) |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1764 #endif |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1765 )) |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1766 XSETFASTINT (prevline, |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1767 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
|
1768 -1)); |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1769 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
|
1770 lmargin + (XFASTINT (prevline) == BEG |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1771 ? start_hpos : 0), |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1772 0, |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1773 from, |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1774 /* Don't care for VPOS... */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1775 1 << (BITS_PER_SHORT - 1), |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1776 /* ... nor HPOS. */ |
|
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1777 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
|
1778 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
|
1779 (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
|
1780 w); |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1781 did_motion = 1; |
| 165 | 1782 } |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1783 else |
| 165 | 1784 { |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1785 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
|
1786 pos.vpos = 0; |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1787 pos.tab_offset = 0; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1788 did_motion = 0; |
| 165 | 1789 } |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1790 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
|
1791 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
|
1792 width, hscroll, |
|
17016
ded89d7e1575
(current_column_bol_cache): New variable. This makes
Karl Heuer <kwzh@gnu.org>
parents:
16926
diff
changeset
|
1793 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
|
1794 w); |
| 165 | 1795 } |
| 1796 | |
|
6327
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
1797 DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0, |
| 15659 | 1798 "Move point to start of the screen line LINES lines down.\n\ |
| 1799 If LINES is negative, this means moving up.\n\ | |
| 1800 \n\ | |
| 1801 This function is an ordinary cursor motion function\n\ | |
| 1802 which calculates the new position based on how text would be displayed.\n\ | |
| 1803 The new position may be the start of a line,\n\ | |
| 1804 or just the start of a continuation line.\n\ | |
| 1805 The function returns number of screen lines moved over;\n\ | |
| 1806 that usually equals LINES, but may be closer to zero\n\ | |
| 1807 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
|
1808 \n\ |
|
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
1809 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
|
1810 parameters such as width, horizontal scrolling, and so on.\n\ |
| 15659 | 1811 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
|
1812 \n\ |
| 15659 | 1813 `vertical-motion' always uses the current buffer,\n\ |
| 1814 regardless of which buffer is displayed in WINDOW.\n\ | |
| 1815 This is consistent with other cursor motion functions\n\ | |
| 1816 and makes it possible to use `vertical-motion' in any buffer,\n\ | |
| 1817 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
|
1818 (lines, window) |
|
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
1819 Lisp_Object lines, window; |
| 165 | 1820 { |
|
25028
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1821 struct it it; |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1822 struct text_pos pt; |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1823 struct buffer *old, *b; |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1824 struct window *w; |
| 165 | 1825 |
| 1826 CHECK_NUMBER (lines, 0); | |
|
6327
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
1827 if (! NILP (window)) |
|
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
1828 CHECK_WINDOW (window, 0); |
|
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
1829 else |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1830 window = selected_window; |
| 165 | 1831 |
|
25028
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1832 w = XWINDOW (window); |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1833 b = XBUFFER (w->buffer); |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1834 if (b != current_buffer) |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1835 { |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1836 old = current_buffer; |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1837 set_buffer_internal_1 (b); |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1838 } |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1839 else |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1840 old = NULL; |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1841 |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1842 SET_TEXT_POS (pt, PT, PT_BYTE); |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1843 start_display (&it, w, pt); |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1844 move_it_by_lines (&it, XINT (lines), 0); |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1845 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); |
| 165 | 1846 |
|
25028
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1847 if (old) |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1848 set_buffer_internal_1 (old); |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1849 |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1850 return make_number (it.vpos); |
| 165 | 1851 } |
|
25028
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1852 |
|
ab513f624bc6
(Fvertical_motion): Rewritten.
Gerd Moellmann <gerd@gnu.org>
parents:
24828
diff
changeset
|
1853 |
| 165 | 1854 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1855 /* file's initialization. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1856 |
| 21514 | 1857 void |
| 165 | 1858 syms_of_indent () |
| 1859 { | |
| 1860 DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode, | |
| 1861 "*Indentation can insert tabs if this is non-nil.\n\ | |
| 1862 Setting this variable automatically makes it local to the current buffer."); | |
| 1863 indent_tabs_mode = 1; | |
| 1864 | |
| 1865 defsubr (&Scurrent_indentation); | |
| 1866 defsubr (&Sindent_to); | |
| 1867 defsubr (&Scurrent_column); | |
| 1868 defsubr (&Smove_to_column); | |
| 1869 defsubr (&Svertical_motion); | |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1870 defsubr (&Scompute_motion); |
| 165 | 1871 } |
