Mercurial > emacs
annotate src/indent.c @ 14659:7669c19beda8
Comment change.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 24 Feb 1996 04:43:05 +0000 |
| parents | ee40177f6c68 |
| children | 3b7454f2d662 |
| rev | line source |
|---|---|
| 165 | 1 /* Indentation functions. |
|
10538
48c620ae0853
(compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents:
10011
diff
changeset
|
2 Copyright (C) 1985,86,87,88,93,94,95 Free Software Foundation, Inc. |
| 165 | 3 |
| 4 This file is part of GNU Emacs. | |
| 5 | |
| 6 GNU Emacs is free software; you can redistribute it and/or modify | |
| 7 it under the terms of the GNU General Public License as published by | |
| 12244 | 8 the Free Software Foundation; either version 2, or (at your option) |
| 165 | 9 any later version. |
| 10 | |
| 11 GNU Emacs is distributed in the hope that it will be useful, | |
| 12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 GNU General Public License for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with GNU Emacs; see the file COPYING. If not, write to | |
|
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14078
diff
changeset
|
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14078
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
| 165 | 20 |
| 21 | |
|
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4385
diff
changeset
|
22 #include <config.h> |
| 165 | 23 #include "lisp.h" |
| 24 #include "buffer.h" | |
| 25 #include "indent.h" | |
| 764 | 26 #include "frame.h" |
| 165 | 27 #include "window.h" |
| 28 #include "termchar.h" | |
| 29 #include "termopts.h" | |
| 30 #include "disptab.h" | |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
31 #include "intervals.h" |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
32 #include "region-cache.h" |
| 165 | 33 |
| 34 /* Indentation can insert tabs if this is non-zero; | |
| 35 otherwise always uses spaces */ | |
| 36 int indent_tabs_mode; | |
| 37 | |
| 38 #define min(a, b) ((a) < (b) ? (a) : (b)) | |
| 39 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
| 40 | |
| 41 #define CR 015 | |
| 42 | |
| 43 /* These three values memoize the current column to avoid recalculation */ | |
| 44 /* Some things in set last_known_column_point to -1 | |
| 45 to mark the memoized value as invalid */ | |
| 46 /* Last value returned by current_column */ | |
| 47 int last_known_column; | |
| 48 /* Value of point when current_column was called */ | |
| 49 int last_known_column_point; | |
| 50 /* Value of MODIFF when current_column was called */ | |
| 51 int last_known_column_modified; | |
| 52 | |
| 53 /* Get the display table to use for the current buffer. */ | |
| 54 | |
|
13185
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
55 struct Lisp_Char_Table * |
| 165 | 56 buffer_display_table () |
| 57 { | |
| 58 Lisp_Object thisbuf; | |
| 59 | |
| 60 thisbuf = current_buffer->display_table; | |
|
13185
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
61 if (DISP_TABLE_P (thisbuf)) |
|
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
62 return XCHAR_TABLE (thisbuf); |
|
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
63 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
|
64 return XCHAR_TABLE (Vstandard_display_table); |
| 165 | 65 return 0; |
| 66 } | |
| 67 | |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
68 /* Width run cache considerations. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
69 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
70 /* 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
|
71 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
72 static int |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
73 character_width (c, dp) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
74 int c; |
|
13185
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
75 struct Lisp_Char_Table *dp; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
76 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
77 Lisp_Object elt; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
78 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
79 /* 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
|
80 in display_text_line. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
81 |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
82 /* 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
|
83 present and the element is right. */ |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
84 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
|
85 return XVECTOR (elt)->size; |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
86 |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
87 /* Some characters are special. */ |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
88 if (c == '\n' || c == '\t' || c == '\015') |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
89 return 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
90 |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
91 /* Printing characters have width 1. */ |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
92 else if (c >= 040 && c < 0177) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
93 return 1; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
94 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
95 /* Everybody else (control characters, metacharacters) has other |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
96 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
|
97 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
|
98 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
|
99 widths. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
100 else |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
101 return 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
102 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
103 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
104 /* 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
|
105 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
|
106 invalidate the buffer's width_run_cache. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
107 int |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
108 disptab_matches_widthtab (disptab, widthtab) |
|
13185
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
109 struct Lisp_Char_Table *disptab; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
110 struct Lisp_Vector *widthtab; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
111 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
112 int i; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
113 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
114 if (widthtab->size != 256) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
115 abort (); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
116 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
117 for (i = 0; i < 256; i++) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
118 if (character_width (i, disptab) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
119 != XFASTINT (widthtab->contents[i])) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
120 return 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
121 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
122 return 1; |
|
10538
48c620ae0853
(compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents:
10011
diff
changeset
|
123 } |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
124 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
125 /* Recompute BUF's width table, using the display table DISPTAB. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
126 void |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
127 recompute_width_table (buf, disptab) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
128 struct buffer *buf; |
|
13185
5b1671bd3cc1
(buffer_display_table): Use DISP_TABLE_P.
Richard M. Stallman <rms@gnu.org>
parents:
13124
diff
changeset
|
129 struct Lisp_Char_Table *disptab; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
130 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
131 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
|
132 struct Lisp_Vector *widthtab; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
133 |
|
10011
f4f2563057b8
(recompute_width_table): Do the right thing if no previous table existed.
Karl Heuer <kwzh@gnu.org>
parents:
9407
diff
changeset
|
134 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
|
135 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
|
136 widthtab = XVECTOR (buf->width_table); |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
137 if (widthtab->size != 256) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
138 abort (); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
139 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
140 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
|
141 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
|
142 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
143 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
144 /* 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
|
145 state of current_buffer's cache_long_line_scans variable. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
146 static void |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
147 width_run_cache_on_off () |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
148 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
149 if (NILP (current_buffer->cache_long_line_scans)) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
150 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
151 /* It should be off. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
152 if (current_buffer->width_run_cache) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
153 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
154 free_region_cache (current_buffer->width_run_cache); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
155 current_buffer->width_run_cache = 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
156 current_buffer->width_table = Qnil; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
157 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
158 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
159 else |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
160 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
161 /* It should be on. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
162 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
|
163 { |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
164 current_buffer->width_run_cache = new_region_cache (); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
165 recompute_width_table (current_buffer, buffer_display_table ()); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
166 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
167 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
168 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
169 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
170 |
| 165 | 171 DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 0, 0, |
| 172 "Return the horizontal position of point. Beginning of line is column 0.\n\ | |
| 173 This is calculated by adding together the widths of all the displayed\n\ | |
| 174 representations of the character between the start of the previous line\n\ | |
| 175 and point. (eg control characters will have a width of 2 or 4, tabs\n\ | |
| 176 will have a variable width)\n\ | |
| 764 | 177 Ignores finite width of frame, which means that this function may return\n\ |
| 178 values greater than (frame-width).\n\ | |
| 165 | 179 Whether the line is visible (if `selective-display' is t) has no effect;\n\ |
| 180 however, ^M is treated as end of line when `selective-display' is t.") | |
| 181 () | |
| 182 { | |
| 183 Lisp_Object temp; | |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
184 XSETFASTINT (temp, current_column ()); |
| 165 | 185 return temp; |
| 186 } | |
| 187 | |
| 327 | 188 /* Cancel any recorded value of the horizontal position. */ |
| 189 | |
| 190 invalidate_current_column () | |
| 191 { | |
| 192 last_known_column_point = 0; | |
| 193 } | |
| 194 | |
| 165 | 195 int |
| 196 current_column () | |
| 197 { | |
| 198 register int col; | |
| 199 register unsigned char *ptr, *stop; | |
| 200 register int tab_seen; | |
| 201 int post_tab; | |
| 202 register int c; | |
| 203 register int tab_width = XINT (current_buffer->tab_width); | |
| 488 | 204 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
|
205 register struct Lisp_Char_Table *dp = buffer_display_table (); |
| 165 | 206 int stopchar; |
| 207 | |
| 208 if (point == last_known_column_point | |
| 209 && MODIFF == last_known_column_modified) | |
| 210 return last_known_column; | |
| 211 | |
| 212 /* Make a pointer for decrementing through the chars before point. */ | |
| 213 ptr = &FETCH_CHAR (point - 1) + 1; | |
| 214 /* Make a pointer to where consecutive chars leave off, | |
| 215 going backwards from point. */ | |
| 216 if (point == BEGV) | |
| 217 stop = ptr; | |
| 218 else if (point <= GPT || BEGV > GPT) | |
| 219 stop = BEGV_ADDR; | |
| 220 else | |
| 221 stop = GAP_END_ADDR; | |
| 222 | |
|
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
223 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
| 165 | 224 |
| 225 col = 0, tab_seen = 0, post_tab = 0; | |
| 226 | |
| 227 while (1) | |
| 228 { | |
| 229 if (ptr == stop) | |
| 230 { | |
| 231 /* We stopped either for the beginning of the buffer | |
| 232 or for the gap. */ | |
| 233 if (ptr == BEGV_ADDR) | |
| 234 break; | |
| 235 /* It was the gap. Jump back over it. */ | |
| 236 stop = BEGV_ADDR; | |
| 237 ptr = GPT_ADDR; | |
| 238 /* Check whether that brings us to beginning of buffer. */ | |
| 239 if (BEGV >= GPT) break; | |
| 240 } | |
| 241 | |
| 242 c = *--ptr; | |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
243 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
244 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
245 else if (c >= 040 && c < 0177) |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
246 col++; |
| 165 | 247 else if (c == '\n') |
| 248 break; | |
| 249 else if (c == '\r' && EQ (current_buffer->selective_display, Qt)) | |
| 250 break; | |
| 251 else if (c == '\t') | |
| 252 { | |
| 253 if (tab_seen) | |
| 254 col = ((col + tab_width) / tab_width) * tab_width; | |
| 255 | |
| 256 post_tab += col; | |
| 257 col = 0; | |
| 258 tab_seen = 1; | |
| 259 } | |
| 260 else | |
| 261 col += (ctl_arrow && c < 0200) ? 2 : 4; | |
| 262 } | |
| 263 | |
| 264 if (tab_seen) | |
| 265 { | |
| 266 col = ((col + tab_width) / tab_width) * tab_width; | |
| 267 col += post_tab; | |
| 268 } | |
| 269 | |
| 270 last_known_column = col; | |
| 271 last_known_column_point = point; | |
| 272 last_known_column_modified = MODIFF; | |
| 273 | |
| 274 return col; | |
| 275 } | |
| 276 | |
|
11300
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
277 /* 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
|
278 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
|
279 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
|
280 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
281 static int |
|
11704
6c9716b7a23d
(string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents:
11312
diff
changeset
|
282 string_display_width (string, beg, end) |
|
11300
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
283 Lisp_Object string, beg, end; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
284 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
285 register int col; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
286 register unsigned char *ptr, *stop; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
287 register int tab_seen; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
288 int post_tab; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
289 register int c; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
290 register int tab_width = XINT (current_buffer->tab_width); |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
291 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
|
292 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
|
293 int b, e; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
294 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
295 if (NILP (end)) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
296 e = XSTRING (string)->size; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
297 else |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
298 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
299 CHECK_NUMBER (end, 0); |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
300 e = XINT (end); |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
301 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
302 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
303 if (NILP (beg)) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
304 b = 0; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
305 else |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
306 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
307 CHECK_NUMBER (beg, 0); |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
308 b = XINT (beg); |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
309 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
310 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
311 /* Make a pointer for decrementing through the chars before point. */ |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
312 ptr = XSTRING (string)->data + e; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
313 /* Make a pointer to where consecutive chars leave off, |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
314 going backwards from point. */ |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
315 stop = XSTRING (string)->data + b; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
316 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
317 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
|
318 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
319 col = 0, tab_seen = 0, post_tab = 0; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
320 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
321 while (1) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
322 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
323 if (ptr == stop) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
324 break; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
325 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
326 c = *--ptr; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
327 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
328 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
329 else if (c >= 040 && c < 0177) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
330 col++; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
331 else if (c == '\n') |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
332 break; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
333 else if (c == '\t') |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
334 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
335 if (tab_seen) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
336 col = ((col + tab_width) / tab_width) * tab_width; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
337 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
338 post_tab += col; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
339 col = 0; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
340 tab_seen = 1; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
341 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
342 else |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
343 col += (ctl_arrow && c < 0200) ? 2 : 4; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
344 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
345 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
346 if (tab_seen) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
347 { |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
348 col = ((col + tab_width) / tab_width) * tab_width; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
349 col += post_tab; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
350 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
351 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
352 return col; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
353 } |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
354 |
| 165 | 355 DEFUN ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ", |
| 356 "Indent from point with tabs and spaces until COLUMN is reached.\n\ | |
|
14078
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
357 Optional second argument MININUM says always do at least MININUM spaces\n\ |
|
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
358 even if that goes past COLUMN; by default, MININUM is zero.") |
|
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
359 (column, minimum) |
|
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
360 Lisp_Object column, minimum; |
| 165 | 361 { |
| 362 int mincol; | |
| 363 register int fromcol; | |
| 364 register int tab_width = XINT (current_buffer->tab_width); | |
| 365 | |
|
14078
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
366 CHECK_NUMBER (column, 0); |
| 488 | 367 if (NILP (minimum)) |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
368 XSETFASTINT (minimum, 0); |
| 165 | 369 CHECK_NUMBER (minimum, 1); |
| 370 | |
| 371 fromcol = current_column (); | |
| 372 mincol = fromcol + XINT (minimum); | |
|
14078
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
373 if (mincol < XINT (column)) mincol = XINT (column); |
| 165 | 374 |
| 375 if (fromcol == mincol) | |
| 376 return make_number (mincol); | |
| 377 | |
|
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
378 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
| 165 | 379 |
| 380 if (indent_tabs_mode) | |
| 381 { | |
| 382 Lisp_Object n; | |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
383 XSETFASTINT (n, mincol / tab_width - fromcol / tab_width); |
| 165 | 384 if (XFASTINT (n) != 0) |
| 385 { | |
|
8648
f047d8c6db79
(Findent_to): Pass new arg to Finsert_char.
Richard M. Stallman <rms@gnu.org>
parents:
8601
diff
changeset
|
386 Finsert_char (make_number ('\t'), n, Qt); |
| 165 | 387 |
| 388 fromcol = (mincol / tab_width) * tab_width; | |
| 389 } | |
| 390 } | |
| 391 | |
|
14078
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
392 XSETFASTINT (column, mincol - fromcol); |
|
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
393 Finsert_char (make_number (' '), column, Qt); |
| 165 | 394 |
| 395 last_known_column = mincol; | |
| 396 last_known_column_point = point; | |
| 397 last_known_column_modified = MODIFF; | |
| 398 | |
|
14078
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
399 XSETINT (column, mincol); |
|
a46002ac278b
(Findent_to): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13453
diff
changeset
|
400 return column; |
| 165 | 401 } |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
402 |
| 165 | 403 |
| 404 DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation, | |
| 405 0, 0, 0, | |
| 406 "Return the indentation of the current line.\n\ | |
| 407 This is the horizontal position of the character\n\ | |
| 408 following any initial whitespace.") | |
| 409 () | |
| 410 { | |
| 411 Lisp_Object val; | |
| 412 | |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
413 XSETFASTINT (val, position_indentation (find_next_newline (point, -1))); |
| 165 | 414 return val; |
| 415 } | |
| 416 | |
| 417 position_indentation (pos) | |
| 418 register int pos; | |
| 419 { | |
| 420 register int column = 0; | |
| 421 register int tab_width = XINT (current_buffer->tab_width); | |
| 422 register unsigned char *p; | |
| 423 register unsigned char *stop; | |
|
10538
48c620ae0853
(compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents:
10011
diff
changeset
|
424 |
|
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
425 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
|
426 |
| 165 | 427 stop = &FETCH_CHAR (BUFFER_CEILING_OF (pos)) + 1; |
| 428 p = &FETCH_CHAR (pos); | |
| 429 while (1) | |
| 430 { | |
| 431 while (p == stop) | |
| 432 { | |
| 433 if (pos == ZV) | |
| 434 return column; | |
| 435 pos += p - &FETCH_CHAR (pos); | |
| 436 p = &FETCH_CHAR (pos); | |
| 437 stop = &FETCH_CHAR (BUFFER_CEILING_OF (pos)) + 1; | |
| 438 } | |
| 439 switch (*p++) | |
| 440 { | |
| 441 case ' ': | |
| 442 column++; | |
| 443 break; | |
| 444 case '\t': | |
| 445 column += tab_width - column % tab_width; | |
| 446 break; | |
| 447 default: | |
| 448 return column; | |
| 449 } | |
| 450 } | |
| 451 } | |
|
5943
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
452 |
|
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
453 /* 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
|
454 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
|
455 preceding line. */ |
|
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
456 int |
|
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
457 indented_beyond_p (pos, column) |
|
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
458 int pos, column; |
|
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
459 { |
|
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
460 while (pos > BEGV && FETCH_CHAR (pos) == '\n') |
|
7892
cabad721720f
(vmotion): Use find_next_newline_no_quit.
Richard M. Stallman <rms@gnu.org>
parents:
7566
diff
changeset
|
461 pos = find_next_newline_no_quit (pos - 1, -1); |
|
5943
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
462 return (position_indentation (pos) >= column); |
|
35526ee8b790
(indented_beyond_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
5941
diff
changeset
|
463 } |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
464 |
| 165 | 465 |
|
13124
e44b06fc718d
(Fmove_to_column): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
466 DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p", |
| 165 | 467 "Move point to column COLUMN in the current line.\n\ |
| 468 The column of a character is calculated by adding together the widths\n\ | |
| 469 as displayed of the previous characters in the line.\n\ | |
| 470 This function ignores line-continuation;\n\ | |
| 471 there is no upper limit on the column number a character can have\n\ | |
|
1208
fa662930e654
* indent.c (Fmove_to_column): Pass the right number of arguments
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
472 and horizontal scrolling has no effect.\n\ |
|
fa662930e654
* indent.c (Fmove_to_column): Pass the right number of arguments
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
473 \n\ |
| 165 | 474 If specified column is within a character, point goes after that character.\n\ |
| 475 If it's past end of line, point goes to end of line.\n\n\ | |
| 476 A non-nil second (optional) argument FORCE means, if the line\n\ | |
| 477 is too short to reach column COLUMN then add spaces/tabs to get there,\n\ | |
|
13453
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
478 and if COLUMN is in the middle of a tab character, change it to spaces.\n\ |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
479 \n\ |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
480 The return value is the current column.") |
| 165 | 481 (column, force) |
| 482 Lisp_Object column, force; | |
| 483 { | |
| 484 register int pos; | |
| 485 register int col = current_column (); | |
| 486 register int goal; | |
| 487 register int end; | |
| 488 register int tab_width = XINT (current_buffer->tab_width); | |
| 488 | 489 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
|
490 register struct Lisp_Char_Table *dp = buffer_display_table (); |
| 165 | 491 |
| 492 Lisp_Object val; | |
| 493 int prev_col; | |
| 494 int c; | |
| 495 | |
|
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
496 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
| 165 | 497 CHECK_NATNUM (column, 0); |
| 498 goal = XINT (column); | |
| 499 | |
| 500 retry: | |
| 501 pos = point; | |
| 502 end = ZV; | |
| 503 | |
| 504 /* If we're starting past the desired column, | |
| 505 back up to beginning of line and scan from there. */ | |
| 506 if (col > goal) | |
| 507 { | |
| 508 pos = find_next_newline (pos, -1); | |
| 509 col = 0; | |
| 510 } | |
| 511 | |
| 512 while (col < goal && pos < end) | |
| 513 { | |
| 514 c = FETCH_CHAR (pos); | |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
515 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
516 { |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
517 col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
518 pos++; |
|
11312
f48922d85166
(Fmove_to_column): Fix minor bug in prev change.
Richard M. Stallman <rms@gnu.org>
parents:
11300
diff
changeset
|
519 continue; |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
520 } |
| 165 | 521 if (c == '\n') |
| 522 break; | |
| 523 if (c == '\r' && EQ (current_buffer->selective_display, Qt)) | |
| 524 break; | |
| 525 pos++; | |
| 526 if (c == '\t') | |
| 527 { | |
| 528 prev_col = col; | |
| 529 col += tab_width; | |
| 530 col = col / tab_width * tab_width; | |
| 531 } | |
| 532 else if (ctl_arrow && (c < 040 || c == 0177)) | |
|
5162
9672138155c1
(Fmove_to_column): Increments for control characters
Richard M. Stallman <rms@gnu.org>
parents:
5085
diff
changeset
|
533 col += 2; |
| 165 | 534 else if (c < 040 || c >= 0177) |
|
5162
9672138155c1
(Fmove_to_column): Increments for control characters
Richard M. Stallman <rms@gnu.org>
parents:
5085
diff
changeset
|
535 col += 4; |
| 165 | 536 else |
| 537 col++; | |
| 538 } | |
| 539 | |
| 540 SET_PT (pos); | |
| 541 | |
| 542 /* If a tab char made us overshoot, change it to spaces | |
| 543 and scan through it again. */ | |
| 488 | 544 if (!NILP (force) && col > goal && c == '\t' && prev_col < goal) |
| 165 | 545 { |
| 573 | 546 int old_point; |
| 547 | |
| 165 | 548 del_range (point - 1, point); |
| 573 | 549 Findent_to (make_number (goal), Qnil); |
| 550 old_point = point; | |
| 551 Findent_to (make_number (col), Qnil); | |
| 552 SET_PT (old_point); | |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
553 /* Set the last_known... vars consistently. */ |
|
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
554 col = goal; |
| 165 | 555 } |
| 556 | |
| 557 /* If line ends prematurely, add space to the end. */ | |
| 488 | 558 if (col < goal && !NILP (force)) |
|
1208
fa662930e654
* indent.c (Fmove_to_column): Pass the right number of arguments
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
559 Findent_to (make_number (col = goal), Qnil); |
| 165 | 560 |
| 561 last_known_column = col; | |
| 562 last_known_column_point = point; | |
| 563 last_known_column_modified = MODIFF; | |
| 564 | |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
565 XSETFASTINT (val, col); |
| 165 | 566 return val; |
| 567 } | |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
568 |
| 165 | 569 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
570 /* 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
|
571 |
| 165 | 572 struct position val_compute_motion; |
| 573 | |
| 574 /* Scan the current buffer forward from offset FROM, pretending that | |
| 575 this is at line FROMVPOS, column FROMHPOS, until reaching buffer | |
| 576 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
|
577 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
|
578 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
|
579 multi-column character), overshoot. |
| 165 | 580 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
581 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
|
582 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
|
583 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
|
584 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
|
585 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
|
586 |
| 165 | 587 WIDTH is the number of columns available to display text; |
| 588 compute_motion uses this to handle continuation lines and such. | |
| 589 HSCROLL is the number of columns not being displayed at the left | |
| 590 margin; this is usually taken from a window's hscroll member. | |
| 543 | 591 TAB_OFFSET is the number of columns of the first tab that aren't |
| 592 being displayed, perhaps because of a continuation line or | |
| 593 something. | |
| 165 | 594 |
| 595 compute_motion returns a pointer to a struct position. The bufpos | |
| 596 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
|
597 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
|
598 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
|
599 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
|
600 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
601 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
|
602 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
|
603 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
|
604 -HSCROLL + (HSCROLL > 0). |
| 165 | 605 |
| 6400 | 606 Note that FROMHPOS and TOHPOS should be expressed in real screen |
| 607 columns, taking HSCROLL and the truncation glyph at the left margin | |
| 608 into account. That is, beginning-of-line moves you to the hpos | |
| 609 -HSCROLL + (HSCROLL > 0). | |
| 610 | |
| 165 | 611 For example, to find the buffer position of column COL of line LINE |
| 612 of a certain window, pass the window's starting location as FROM | |
| 613 and the window's upper-left coordinates as FROMVPOS and FROMHPOS. | |
| 614 Pass the buffer's ZV as TO, to limit the scan to the end of the | |
| 615 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
|
616 TOHPOS. |
| 165 | 617 |
| 618 When displaying in window w, a typical formula for WIDTH is: | |
| 619 | |
| 620 window_width - 1 | |
|
1994
73ce9dd21093
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1777
diff
changeset
|
621 - (has_vertical_scroll_bars |
| 8946 | 622 ? 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
|
623 : (window_width + window_left != frame_width)) |
| 165 | 624 |
| 625 where | |
| 626 window_width is XFASTINT (w->width), | |
| 627 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
|
628 has_vertical_scroll_bars is |
|
73ce9dd21093
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1777
diff
changeset
|
629 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
|
630 and frame_width = FRAME_WIDTH (XFRAME (window->frame)) |
| 165 | 631 |
| 6400 | 632 Or you can let window_internal_width do this all for you, and write: |
| 633 window_internal_width (w) - 1 | |
|
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1208
diff
changeset
|
634 |
|
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1208
diff
changeset
|
635 The `-1' accounts for the continuation-line backslashes; the rest |
| 5941 | 636 accounts for window borders if the window is split horizontally, and |
| 6400 | 637 the scroll bars if they are turned on. */ |
| 165 | 638 |
| 639 struct position * | |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
640 compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width, hscroll, tab_offset, win) |
| 165 | 641 int from, fromvpos, fromhpos, to, tovpos, tohpos; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
642 int did_motion; |
| 165 | 643 register int width; |
| 644 int hscroll, tab_offset; | |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
645 struct window *win; |
| 165 | 646 { |
| 526 | 647 register int hpos = fromhpos; |
| 648 register int vpos = fromvpos; | |
| 165 | 649 |
| 650 register int pos; | |
| 651 register int c; | |
| 652 register int tab_width = XFASTINT (current_buffer->tab_width); | |
| 488 | 653 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
|
654 register struct Lisp_Char_Table *dp = window_display_table (win); |
| 165 | 655 int selective |
|
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
656 = (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
|
657 ? 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
|
658 : !NILP (current_buffer->selective_display) ? -1 : 0); |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
659 int prev_vpos = vpos, prev_hpos = 0; |
| 165 | 660 int selective_rlen |
|
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
661 = (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
|
662 ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0); |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
663 /* 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
|
664 overlay starts or ends. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
665 int next_boundary = from; |
| 165 | 666 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
667 /* For computing runs of characters with similar widths. |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
668 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
|
669 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
|
670 width_run_width. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
671 int width_run_start = from; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
672 int width_run_end = from; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
673 int width_run_width = 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
674 Lisp_Object *width_table; |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
675 Lisp_Object buffer; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
676 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
677 /* 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
|
678 int next_width_run = from; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
679 |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
680 XSETBUFFER (buffer, current_buffer); |
|
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
681 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
682 width_run_cache_on_off (); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
683 if (dp == buffer_display_table ()) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
684 width_table = (VECTORP (current_buffer->width_table) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
685 ? XVECTOR (current_buffer->width_table)->contents |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
686 : 0); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
687 else |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
688 /* 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
|
689 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
|
690 width_table = 0; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
691 |
|
2325
7b5299f3a8fc
(current_column, Findent_to, position_indentation):
Richard M. Stallman <rms@gnu.org>
parents:
2017
diff
changeset
|
692 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; |
| 526 | 693 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
694 pos = from; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
695 while (1) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
696 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
697 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
|
698 { |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
699 /* 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
|
700 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
|
701 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
|
702 through, so clear the flag after testing it. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
703 if (!did_motion) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
704 /* We need to skip past the overlay strings. Currently those |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
705 strings must contain single-column printing characters; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
706 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
|
707 to be changed here. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
708 hpos += overlay_strings (pos, win, (char **)0); |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
709 did_motion = 0; |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
710 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
711 if (pos >= to) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
712 break; |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
713 |
|
5085
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
714 { |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
715 Lisp_Object prop, position, end, limit, proplimit; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
716 |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
717 XSETFASTINT (position, pos); |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
718 |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
719 /* Give faster response for overlay lookup near POS. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
720 recenter_overlay_lists (current_buffer, pos); |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
721 |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
722 /* We must not advance farther than the next overlay change. |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
723 The overlay change might change the invisible property; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
724 or there might be overlay strings to be displayed there. */ |
|
6092
a3e4e8ac2a33
(compute_motion): Allow for invisible overlays in next_invisible lookahead.
Karl Heuer <kwzh@gnu.org>
parents:
6067
diff
changeset
|
725 limit = Fnext_overlay_change (position); |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
726 /* As for text properties, this gives a lower bound |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
727 for where the invisible text property could change. */ |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
728 proplimit = Fnext_property_change (position, buffer, Qt); |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
729 if (XFASTINT (limit) < XFASTINT (proplimit)) |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
730 proplimit = limit; |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
731 /* PROPLIMIT is now a lower bound for the next change |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
732 in invisible status. If that is plenty far away, |
|
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
733 use that lower bound. */ |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
734 if (XFASTINT (proplimit) > pos + 100 || XFASTINT (proplimit) >= to) |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
735 next_boundary = XFASTINT (proplimit); |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
736 /* Otherwise, scan for the next `invisible' property change. */ |
|
5085
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
737 else |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
738 { |
|
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
739 /* Don't scan terribly far. */ |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
740 XSETFASTINT (proplimit, min (pos + 100, to)); |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
741 /* No matter what. don't go past next overlay change. */ |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
742 if (XFASTINT (limit) < XFASTINT (proplimit)) |
|
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
743 proplimit = limit; |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
744 end = Fnext_single_property_change (position, Qinvisible, |
|
11037
802a774b44b7
(compute_motion, Fmove_to_column, current_column)
Richard M. Stallman <rms@gnu.org>
parents:
10964
diff
changeset
|
745 buffer, proplimit); |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
746 next_boundary = XFASTINT (end); |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
747 } |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
748 /* if the `invisible' property is set, we can skip to |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
749 the next property change */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
750 prop = Fget_char_property (position, Qinvisible, |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
751 Fcurrent_buffer ()); |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
752 if (TEXT_PROP_MEANS_INVISIBLE (prop)) |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
753 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
|
754 } |
|
82bcf2c36929
(compute_motion): Pass new arg to Fnext_single_property_change.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
755 } |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
756 |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
757 /* Handle right margin. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
758 if (hpos >= width |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
759 && (hpos > width |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
760 || (pos < ZV && FETCH_CHAR (pos) != '\n'))) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
761 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
762 if (hscroll |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
763 || (truncate_partial_width_windows |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
764 && width + 1 < FRAME_WIDTH (XFRAME (WINDOW_FRAME (win)))) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
765 || !NILP (current_buffer->truncate_lines)) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
766 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
767 /* Truncating: skip to newline. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
768 pos = find_before_next_newline (pos, to, 1); |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
769 hpos = width; |
|
13453
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
770 /* If we just skipped next_boundary, |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
771 loop around in the main while |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
772 and handle it. */ |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
773 if (pos >= next_boundary) |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
774 next_boundary = pos + 1; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
775 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
776 else |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
777 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
778 /* Continuing. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
779 vpos += hpos / width; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
780 tab_offset += hpos - hpos % width; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
781 hpos %= width; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
782 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
783 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
784 |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
785 /* Stop if past the target buffer position or screen position. */ |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
786 if (pos >= to) |
|
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
787 break; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
788 if (vpos > tovpos || (vpos == tovpos && hpos >= tohpos)) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
789 break; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
790 |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
791 prev_vpos = vpos; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
792 prev_hpos = hpos; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
793 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
794 /* 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
|
795 the text character-by-character. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
796 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
|
797 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
798 int run_end; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
799 int common_width |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
800 = region_cache_forward (current_buffer, |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
801 current_buffer->width_run_cache, |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
802 pos, &run_end); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
803 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
804 /* 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
|
805 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
|
806 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
|
807 if (common_width != 0) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
808 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
809 int run_end_hpos; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
810 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
811 /* 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
|
812 requested. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
813 if (run_end > to) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
814 run_end = to; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
815 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
816 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
|
817 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
818 /* 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
|
819 requested. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
820 if (vpos == tovpos && run_end_hpos > tohpos) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
821 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
822 run_end = pos + (tohpos - hpos) / common_width; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
823 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
|
824 } |
|
10538
48c620ae0853
(compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents:
10011
diff
changeset
|
825 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
826 /* Don't go past the margin. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
827 if (run_end_hpos >= width) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
828 { |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
829 run_end = pos + (width - hpos) / common_width; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
830 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
|
831 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
832 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
833 hpos = run_end_hpos; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
834 if (run_end > pos) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
835 prev_hpos = hpos - common_width; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
836 pos = run_end; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
837 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
838 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
839 next_width_run = run_end + 1; |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
840 } |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
841 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
842 /* We have to scan the text character-by-character. */ |
| 165 | 843 else |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
844 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
845 c = FETCH_CHAR (pos); |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
846 pos++; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
847 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
848 /* Perhaps add some info to the width_run_cache. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
849 if (current_buffer->width_run_cache) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
850 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
851 /* 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
|
852 the run. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
853 if (pos - 1 == width_run_end |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
854 && width_table[c] == width_run_width) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
855 width_run_end = pos; |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
856 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
857 /* 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
|
858 different position, or a different width. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
859 else |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
860 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
861 /* 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
|
862 (Currently, we only cache runs of width == 1). */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
863 if (width_run_start < width_run_end |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
864 && width_run_width == 1) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
865 know_region_cache (current_buffer, |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
866 current_buffer->width_run_cache, |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
867 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
|
868 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
869 /* Start recording a new width run. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
870 width_run_width = width_table[c]; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
871 width_run_start = pos - 1; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
872 width_run_end = pos; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
873 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
874 } |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
875 |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
876 if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c))) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
877 hpos += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
878 else if (c >= 040 && c < 0177) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
879 hpos++; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
880 else if (c == '\t') |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
881 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
882 int tem = (hpos + tab_offset + hscroll - (hscroll > 0)) % tab_width; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
883 if (tem < 0) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
884 tem += tab_width; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
885 hpos += tab_width - tem; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
886 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
887 else if (c == '\n') |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
888 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
889 if (selective > 0 && indented_beyond_p (pos, selective)) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
890 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
891 /* Skip any number of invisible lines all at once */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
892 do |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
893 pos = find_before_next_newline (pos, to, 1) + 1; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
894 while (pos < to |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
895 && indented_beyond_p (pos, selective)); |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
896 /* Allow for the " ..." that is displayed for them. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
897 if (selective_rlen) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
898 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
899 hpos += selective_rlen; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
900 if (hpos >= width) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
901 hpos = width; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
902 } |
|
10538
48c620ae0853
(compute_motion): Don't get hung in selective-display loop.
Karl Heuer <kwzh@gnu.org>
parents:
10011
diff
changeset
|
903 --pos; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
904 /* We have skipped the invis text, but not the |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
905 newline after. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
906 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
907 else |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
908 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
909 /* A visible line. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
910 vpos++; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
911 hpos = 0; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
912 hpos -= hscroll; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
913 /* Count the truncation glyph on column 0 */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
914 if (hscroll > 0) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
915 hpos++; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
916 tab_offset = 0; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
917 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
918 } |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
919 else if (c == CR && selective < 0) |
| 165 | 920 { |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
921 /* In selective display mode, |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
922 everything from a ^M to the end of the line is invisible. |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
923 Stop *before* the real newline. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
924 pos = find_before_next_newline (pos, to, 1); |
|
13453
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
925 /* If we just skipped next_boundary, |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
926 loop around in the main while |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
927 and handle it. */ |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
928 if (pos > next_boundary) |
|
ea373c55ed95
(Fmove_to_column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
13363
diff
changeset
|
929 next_boundary = pos; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
930 /* Allow for the " ..." that is displayed for them. */ |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
931 if (selective_rlen) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
932 { |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
933 hpos += selective_rlen; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
934 if (hpos >= width) |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
935 hpos = width; |
|
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
936 } |
| 165 | 937 } |
| 938 else | |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
939 hpos += (ctl_arrow && c < 0200) ? 2 : 4; |
| 165 | 940 } |
| 941 } | |
| 942 | |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
943 /* Remember any final width run in the cache. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
944 if (current_buffer->width_run_cache |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
945 && width_run_width == 1 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
946 && width_run_start < width_run_end) |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
947 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
|
948 width_run_start, width_run_end); |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
949 |
| 165 | 950 val_compute_motion.bufpos = pos; |
| 526 | 951 val_compute_motion.hpos = hpos; |
| 952 val_compute_motion.vpos = vpos; | |
| 953 val_compute_motion.prevhpos = prev_hpos; | |
| 165 | 954 |
| 955 /* Nonzero if have just continued a line */ | |
| 956 val_compute_motion.contin | |
| 526 | 957 = (pos != from |
| 958 && (val_compute_motion.vpos != prev_vpos) | |
| 959 && c != '\n'); | |
| 165 | 960 |
| 961 return &val_compute_motion; | |
| 962 } | |
| 963 | |
| 6587 | 964 #if 0 /* The doc string is too long for some compilers, |
| 965 but make-docfile can find it in this comment. */ | |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
966 DEFUN ("compute-motion", Ffoo, Sfoo, 7, 7, 0, |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
967 "Scan through the current buffer, calculating screen position.\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
968 Scan the current buffer forward from offset FROM,\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
969 assuming it is at position FROMPOS--a cons of the form (HPOS . VPOS)--\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
970 to position TO or position TOPOS--another cons of the form (HPOS . VPOS)--\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
971 and return the ending buffer position and screen location.\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
972 \n\ |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
973 There are three additional arguments:\n\ |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
974 \n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
975 WIDTH is the number of columns available to display text;\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
976 this affects handling of continuation lines.\n\ |
| 6587 | 977 This is usually the value returned by `window-width', less one (to allow\n\ |
| 978 for the continuation glyph).\n\ | |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
979 \n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
980 OFFSETS is either nil or a cons cell (HSCROLL . TAB-OFFSET).\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
981 HSCROLL is the number of columns not being displayed at the left\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
982 margin; this is usually taken from a window's hscroll member.\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
983 TAB-OFFSET is the number of columns of the first tab that aren't\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
984 being displayed, perhaps because the line was continued within it.\n\ |
| 6585 | 985 If OFFSETS is nil, HSCROLL and TAB-OFFSET are assumed to be zero.\n\ |
|
6846
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
986 \n\ |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
987 WINDOW is the window to operate on. Currently this is used only to\n\ |
|
6846
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
988 find the display table. It does not matter what buffer WINDOW displays;\n\ |
|
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
989 `compute-motion' always operates on the current buffer.\n\ |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
990 \n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
991 The value is a list of five elements:\n\ |
|
6586
de99006a8b38
(Fcompute_motion): Don't use XFASTINT on possibly-negative coords.
Karl Heuer <kwzh@gnu.org>
parents:
6585
diff
changeset
|
992 (POS HPOS VPOS PREVHPOS CONTIN)\n\ |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
993 POS is the buffer position where the scan stopped.\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
994 VPOS is the vertical position where the scan stopped.\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
995 HPOS is the horizontal position where the scan stopped.\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
996 \n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
997 PREVHPOS is the horizontal position one character back from POS.\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
998 CONTIN is t if a line was continued after (or within) the previous character.\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
999 \n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1000 For example, to find the buffer position of column COL of line LINE\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1001 of a certain window, pass the window's starting location as FROM\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1002 and the window's upper-left coordinates as FROMPOS.\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1003 Pass the buffer's (point-max) as TO, to limit the scan to the end of the\n\ |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1004 visible section of the buffer, and pass LINE and COL as TOPOS.") |
|
7566
8a0a7fb9f7d4
Add "args" to dummy definition of compute-motion.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1005 (from, frompos, to, topos, width, offsets, window) |
| 6587 | 1006 #endif |
| 1007 | |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1008 DEFUN ("compute-motion", Fcompute_motion, Scompute_motion, 7, 7, 0, |
| 6587 | 1009 0) |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1010 (from, frompos, to, topos, width, offsets, window) |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1011 Lisp_Object from, frompos, to, topos; |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1012 Lisp_Object width, offsets, window; |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1013 { |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1014 Lisp_Object bufpos, hpos, vpos, prevhpos, contin; |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1015 struct position *pos; |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1016 int hscroll, tab_offset; |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1017 |
|
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1018 CHECK_NUMBER_COERCE_MARKER (from, 0); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1019 CHECK_CONS (frompos, 0); |
|
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1020 CHECK_NUMBER (XCONS (frompos)->car, 0); |
|
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1021 CHECK_NUMBER (XCONS (frompos)->cdr, 0); |
|
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1022 CHECK_NUMBER_COERCE_MARKER (to, 0); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1023 CHECK_CONS (topos, 0); |
|
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1024 CHECK_NUMBER (XCONS (topos)->car, 0); |
|
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1025 CHECK_NUMBER (XCONS (topos)->cdr, 0); |
|
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1026 CHECK_NUMBER (width, 0); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1027 if (!NILP (offsets)) |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1028 { |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1029 CHECK_CONS (offsets, 0); |
|
6573
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1030 CHECK_NUMBER (XCONS (offsets)->car, 0); |
|
33ae9314b443
Fix glitches in previous change.
Karl Heuer <kwzh@gnu.org>
parents:
6572
diff
changeset
|
1031 CHECK_NUMBER (XCONS (offsets)->cdr, 0); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1032 hscroll = XINT (XCONS (offsets)->car); |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1033 tab_offset = XINT (XCONS (offsets)->cdr); |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1034 } |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1035 else |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1036 hscroll = tab_offset = 0; |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1037 |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1038 if (NILP (window)) |
|
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1039 window = Fselected_window (); |
|
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1040 else |
|
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1041 CHECK_LIVE_WINDOW (window, 0); |
|
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1042 |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1043 pos = compute_motion (XINT (from), XINT (XCONS (frompos)->cdr), |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1044 XINT (XCONS (frompos)->car), 0, |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1045 XINT (to), XINT (XCONS (topos)->cdr), |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1046 XINT (XCONS (topos)->car), |
|
6691
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1047 XINT (width), hscroll, tab_offset, |
|
3b56d4742266
(compute_motion): Add window argument.
Karl Heuer <kwzh@gnu.org>
parents:
6588
diff
changeset
|
1048 XWINDOW (window)); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1049 |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
1050 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
|
1051 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
|
1052 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
|
1053 XSETINT (prevhpos, pos->prevhpos); |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1054 |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1055 return Fcons (bufpos, |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1056 Fcons (hpos, |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1057 Fcons (vpos, |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1058 Fcons (prevhpos, |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1059 Fcons (pos->contin ? Qt : Qnil, Qnil))))); |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1060 |
|
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1061 } |
| 165 | 1062 |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1063 /* Return the column of position POS in window W's buffer. |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1064 The result is rounded down to a multiple of the internal width of W. |
| 165 | 1065 This is the amount of indentation of position POS |
| 1066 that is not visible in its horizontal position in the window. */ | |
| 1067 | |
| 1068 int | |
| 1069 pos_tab_offset (w, pos) | |
| 1070 struct window *w; | |
| 1071 register int pos; | |
| 1072 { | |
|
8601
c67a4530319e
(pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
8543
diff
changeset
|
1073 int opoint = PT; |
| 165 | 1074 int col; |
|
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1208
diff
changeset
|
1075 int width = window_internal_width (w) - 1; |
| 165 | 1076 |
| 1077 if (pos == BEGV || FETCH_CHAR (pos - 1) == '\n') | |
| 1078 return 0; | |
|
8601
c67a4530319e
(pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
8543
diff
changeset
|
1079 TEMP_SET_PT (pos); |
| 165 | 1080 col = current_column (); |
|
8601
c67a4530319e
(pos_tab_offset): Don't trigger point-motion hooks.
Karl Heuer <kwzh@gnu.org>
parents:
8543
diff
changeset
|
1081 TEMP_SET_PT (opoint); |
| 165 | 1082 return col - (col % width); |
| 1083 } | |
| 1084 | |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1085 |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1086 /* Fvertical_motion and vmotion */ |
| 165 | 1087 struct position val_vmotion; |
| 1088 | |
| 1089 struct position * | |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1090 vmotion (from, vtarget, w) |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1091 register int from, vtarget; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1092 struct window *w; |
| 165 | 1093 { |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1094 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
|
1095 int hscroll = XINT (w->hscroll); |
| 165 | 1096 struct position pos; |
| 1097 /* vpos is cumulative vertical position, changed as from is changed */ | |
| 1098 register int vpos = 0; | |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1099 Lisp_Object prevline; |
| 165 | 1100 register int first; |
| 1101 int lmargin = hscroll > 0 ? 1 - hscroll : 0; | |
| 1102 int selective | |
|
9126
e475f8108156
(buffer_display_table, current_column, Fmove_to_column, compute_motion,
Karl Heuer <kwzh@gnu.org>
parents:
8946
diff
changeset
|
1103 = (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
|
1104 ? 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
|
1105 : !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
|
1106 Lisp_Object window; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1107 int start_hpos = 0; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1108 int did_motion; |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1109 |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1110 XSETWINDOW (window, w); |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1111 |
|
6811
d84152a9b7e5
(vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents:
6763
diff
changeset
|
1112 /* The omission of the clause |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1113 && marker_position (w->start) == BEG |
|
6811
d84152a9b7e5
(vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents:
6763
diff
changeset
|
1114 here is deliberate; I think we want to measure from the prompt |
|
d84152a9b7e5
(vmotion): Use minibuf_prompt_width despite window-start.
Karl Heuer <kwzh@gnu.org>
parents:
6763
diff
changeset
|
1115 position even if the minibuffer window has scrolled. */ |
|
11300
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
1116 if (EQ (window, minibuf_window)) |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
1117 { |
|
11813
5b7a7c92323d
(vmotion): handle the case where `minibuf_prompt' is nil.
Karl Heuer <kwzh@gnu.org>
parents:
11811
diff
changeset
|
1118 if (minibuf_prompt_width == 0 && STRINGP (minibuf_prompt)) |
|
11704
6c9716b7a23d
(string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents:
11312
diff
changeset
|
1119 minibuf_prompt_width |
|
6c9716b7a23d
(string_display_width): Renamed from string_width.
Richard M. Stallman <rms@gnu.org>
parents:
11312
diff
changeset
|
1120 = string_display_width (minibuf_prompt, Qnil, Qnil); |
|
11300
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
1121 |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
1122 start_hpos = minibuf_prompt_width; |
|
474b17d364db
(string_width): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11037
diff
changeset
|
1123 } |
| 165 | 1124 |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1125 if (vpos >= vtarget) |
| 165 | 1126 { |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1127 /* To move upward, go a line at a time until |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1128 we have gone at least far enough */ |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1129 |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1130 first = 1; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1131 |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1132 while ((vpos > vtarget || first) && from > BEGV) |
| 165 | 1133 { |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1134 Lisp_Object propval; |
|
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1135 |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1136 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
|
1137 while (XFASTINT (prevline) > BEGV |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1138 && ((selective > 0 |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1139 && indented_beyond_p (XFASTINT (prevline), selective)) |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1140 #ifdef USE_TEXT_PROPERTIES |
|
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1141 /* 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
|
1142 || (propval = Fget_char_property (prevline, |
|
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1143 Qinvisible, |
|
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1144 window), |
|
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1145 TEXT_PROP_MEANS_INVISIBLE (propval)) |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1146 #endif |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1147 )) |
|
9310
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
1148 XSETFASTINT (prevline, |
|
1dfd9def3467
(Fcurrent_column, Findent_to, Fcurrent_indentation, Fmove_to_column,
Karl Heuer <kwzh@gnu.org>
parents:
9269
diff
changeset
|
1149 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
|
1150 -1)); |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1151 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
|
1152 lmargin + (XFASTINT (prevline) == BEG |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1153 ? start_hpos : 0), |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1154 0, |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13185
diff
changeset
|
1155 from, 1 << (BITS_PER_INT - 2), 0, |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1156 width, hscroll, 0, w); |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1157 vpos -= pos.vpos; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1158 first = 0; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1159 from = XFASTINT (prevline); |
| 165 | 1160 } |
| 1161 | |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1162 /* 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
|
1163 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
|
1164 return point found */ |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1165 if (vpos >= vtarget) |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1166 { |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1167 val_vmotion.bufpos = from; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1168 val_vmotion.vpos = vpos; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1169 val_vmotion.hpos = lmargin; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1170 val_vmotion.contin = 0; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1171 val_vmotion.prevhpos = 0; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1172 return &val_vmotion; |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1173 } |
| 165 | 1174 |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1175 /* 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
|
1176 } |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1177 /* 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
|
1178 to determine hpos of starting point */ |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1179 if (from > BEGV && FETCH_CHAR (from - 1) != '\n') |
| 165 | 1180 { |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1181 Lisp_Object propval; |
|
10964
474b6b03a71f
(compute_motion): Call recenter_overlay_lists sooner.
Richard M. Stallman <rms@gnu.org>
parents:
10538
diff
changeset
|
1182 |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1183 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
|
1184 while (XFASTINT (prevline) > BEGV |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1185 && ((selective > 0 |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1186 && indented_beyond_p (XFASTINT (prevline), selective)) |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1187 #ifdef USE_TEXT_PROPERTIES |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1188 /* 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
|
1189 || (propval = Fget_char_property (prevline, Qinvisible, |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1190 window), |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1191 TEXT_PROP_MEANS_INVISIBLE (propval)) |
|
4385
edffa4f0c5d9
(compute_motion): Compute correctly for invisible text.
Richard M. Stallman <rms@gnu.org>
parents:
2961
diff
changeset
|
1192 #endif |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1193 )) |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1194 XSETFASTINT (prevline, |
|
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1195 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
|
1196 -1)); |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1197 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
|
1198 lmargin + (XFASTINT (prevline) == BEG |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1199 ? start_hpos : 0), |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1200 0, |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13185
diff
changeset
|
1201 from, 1 << (BITS_PER_INT - 2), 0, |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1202 width, hscroll, 0, w); |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1203 did_motion = 1; |
| 165 | 1204 } |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1205 else |
| 165 | 1206 { |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1207 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
|
1208 pos.vpos = 0; |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1209 did_motion = 0; |
| 165 | 1210 } |
|
11853
6578a356c540
(compute_motion): Handle overlay strings.
Karl Heuer <kwzh@gnu.org>
parents:
11813
diff
changeset
|
1211 return compute_motion (from, vpos, pos.hpos, did_motion, |
|
13363
941c37982f37
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents:
13185
diff
changeset
|
1212 ZV, vtarget, - (1 << (BITS_PER_INT - 2)), |
|
11811
a0db528dfa1c
(vmotion): Simplify. Replace last three args with a single
Karl Heuer <kwzh@gnu.org>
parents:
11704
diff
changeset
|
1213 width, hscroll, pos.vpos * width, w); |
| 165 | 1214 } |
| 1215 | |
|
6327
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
1216 DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0, |
| 165 | 1217 "Move to start of screen line LINES lines down.\n\ |
| 1218 If LINES is negative, this is moving up.\n\ | |
|
6846
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
1219 \n\ |
|
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
1220 The optional second argument WINDOW specifies the window to use for\n\ |
|
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
1221 parameters such as width, horizontal scrolling, and so on.\n\ |
|
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
1222 the default is the selected window.\n\ |
|
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
1223 It does not matter what buffer is displayed in WINDOW.\n\ |
|
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
1224 `vertical-motion' always uses the current buffer.\n\ |
|
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
1225 \n\ |
| 165 | 1226 Sets point to position found; this may be start of line\n\ |
|
6846
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
1227 or just the start of a continuation line.\n\ |
| 165 | 1228 Returns number of lines moved; may be closer to zero than LINES\n\ |
|
6846
a6803ff29cca
(compute_motion): Do not abort if window shows some other buffer.
Richard M. Stallman <rms@gnu.org>
parents:
6811
diff
changeset
|
1229 if beginning or end of buffer was reached.") |
|
6327
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
1230 (lines, window) |
|
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
1231 Lisp_Object lines, window; |
| 165 | 1232 { |
| 1233 struct position pos; | |
| 1234 | |
| 1235 CHECK_NUMBER (lines, 0); | |
|
6327
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
1236 if (! NILP (window)) |
|
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
1237 CHECK_WINDOW (window, 0); |
|
d93a087868cb
(Fvertical_motion): New optional arg WINDOW.
Richard M. Stallman <rms@gnu.org>
parents:
6296
diff
changeset
|
1238 else |
|
8905
2ef3da79aabb
(vmotion, Fvertical_motion): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents:
8648
diff
changeset
|
1239 window = selected_window; |
| 165 | 1240 |
| 12090 | 1241 pos = *vmotion (point, (int) XINT (lines), XWINDOW (window)); |
| 165 | 1242 |
| 1243 SET_PT (pos.bufpos); | |
| 1244 return make_number (pos.vpos); | |
| 1245 } | |
| 1246 | |
|
9407
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1247 /* file's initialization. */ |
|
4dcc0221b449
* indent.c: #include "region-cache.h".
Jim Blandy <jimb@redhat.com>
parents:
9310
diff
changeset
|
1248 |
| 165 | 1249 syms_of_indent () |
| 1250 { | |
| 1251 DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode, | |
| 1252 "*Indentation can insert tabs if this is non-nil.\n\ | |
| 1253 Setting this variable automatically makes it local to the current buffer."); | |
| 1254 indent_tabs_mode = 1; | |
| 1255 | |
| 1256 defsubr (&Scurrent_indentation); | |
| 1257 defsubr (&Sindent_to); | |
| 1258 defsubr (&Scurrent_column); | |
| 1259 defsubr (&Smove_to_column); | |
| 1260 defsubr (&Svertical_motion); | |
|
6296
a1b438e4754b
(compute_motion): Initialize prev_hpos.
Richard M. Stallman <rms@gnu.org>
parents:
6092
diff
changeset
|
1261 defsubr (&Scompute_motion); |
| 165 | 1262 } |
