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