|
0
|
1 /* Indentation functions.
|
|
|
2 Copyright (C) 1995 Board of Trustees, University of Illinois.
|
|
|
3 Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995
|
|
|
4 Free Software Foundation, Inc.
|
|
|
5
|
|
|
6 This file is part of XEmacs.
|
|
|
7
|
|
|
8 XEmacs is free software; you can redistribute it and/or modify it
|
|
|
9 under the terms of the GNU General Public License as published by the
|
|
|
10 Free Software Foundation; either version 2, or (at your option) any
|
|
|
11 later version.
|
|
|
12
|
|
|
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT
|
|
|
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
16 for more details.
|
|
|
17
|
|
|
18 You should have received a copy of the GNU General Public License
|
|
|
19 along with XEmacs; see the file COPYING. If not, write to
|
|
|
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
21 Boston, MA 02111-1307, USA. */
|
|
|
22
|
|
|
23 /* This file has been Mule-ized. */
|
|
|
24
|
|
|
25 /* Synched up with: 19.30. Diverges significantly from FSF. */
|
|
|
26
|
|
|
27
|
|
|
28 #include <config.h>
|
|
|
29 #include "lisp.h"
|
|
|
30
|
|
|
31 #include "buffer.h"
|
|
|
32 #include "device.h"
|
|
|
33 #include "extents.h"
|
|
|
34 #include "faces.h"
|
|
|
35 #include "frame.h"
|
|
|
36 #include "glyphs.h"
|
|
|
37 #include "insdel.h"
|
|
|
38 #ifdef REGION_CACHE_NEEDS_WORK
|
|
|
39 #include "region-cache.h"
|
|
|
40 #endif
|
|
|
41 #include "window.h"
|
|
|
42
|
|
|
43 /* Indentation can insert tabs if this is non-zero;
|
|
|
44 otherwise always uses spaces */
|
|
|
45 int indent_tabs_mode;
|
|
|
46
|
|
|
47 /* Avoid recalculation by remembering things in these variables. */
|
|
|
48
|
|
|
49 /* Last value returned by current_column.
|
|
|
50
|
|
|
51 Some things set last_known_column_point to -1
|
|
|
52 to mark the memoized value as invalid */
|
|
|
53 static int last_known_column;
|
|
|
54
|
|
|
55 /* Last buffer searched by current_column */
|
|
|
56 static struct buffer *last_known_column_buffer;
|
|
|
57
|
|
|
58 /* Value of point when current_column was called */
|
|
|
59 static Bufpos last_known_column_point;
|
|
|
60
|
|
|
61 /* Value of MODIFF when current_column was called */
|
|
|
62 static int last_known_column_modified;
|
|
|
63
|
|
|
64 static Bufpos
|
|
|
65 last_visible_position (Bufpos pos, struct buffer *buf)
|
|
|
66 {
|
|
|
67 Lisp_Object buffer;
|
|
|
68 Lisp_Object value;
|
|
|
69
|
|
|
70 XSETBUFFER (buffer, buf);
|
|
|
71 value = Fprevious_single_property_change (make_int (pos), Qinvisible,
|
|
|
72 buffer, Qnil);
|
|
|
73 if (NILP (value))
|
|
|
74 return 0; /* no visible position found */
|
|
|
75 else
|
|
|
76 /* #### bug bug bug!!! This will return the position of the beginning
|
|
|
77 of an invisible extent; this extent is very likely to be start-closed,
|
|
|
78 and thus the spaces inserted in `indent-to' will go inside the
|
|
|
79 invisible extent.
|
|
|
80
|
|
|
81 Not sure what the correct solution is here. Rethink indent-to? */
|
|
|
82 return XINT (value);
|
|
|
83 }
|
|
|
84
|
|
|
85 #ifdef REGION_CACHE_NEEDS_WORK
|
|
|
86
|
|
|
87 /* Allocate or free the width run cache, as requested by the current
|
|
|
88 state of current_buffer's cache_long_line_scans variable. */
|
|
|
89 static void
|
|
|
90 width_run_cache_on_off (struct buffer *buf)
|
|
|
91 {
|
|
|
92 if (NILP (buf->cache_long_line_scans))
|
|
|
93 {
|
|
|
94 /* It should be off. */
|
|
|
95 if (buf->width_run_cache)
|
|
|
96 {
|
|
|
97 free_region_cache (buf->width_run_cache);
|
|
|
98 buf->width_run_cache = 0;
|
|
|
99 buf->width_table = Qnil;
|
|
|
100 }
|
|
|
101 }
|
|
|
102 else
|
|
|
103 {
|
|
|
104 /* It should be on. */
|
|
|
105 if (buf->width_run_cache == 0)
|
|
|
106 {
|
|
|
107 buf->width_run_cache = new_region_cache ();
|
|
|
108 recompute_width_table (buf, buffer_display_table ());
|
|
|
109 }
|
|
|
110 }
|
|
|
111 }
|
|
|
112
|
|
|
113 #endif /* REGION_CACHE_NEEDS_WORK */
|
|
|
114
|
|
|
115
|
|
|
116 /* Cancel any recorded value of the horizontal position. */
|
|
|
117
|
|
|
118 void
|
|
|
119 invalidate_current_column (void)
|
|
|
120 {
|
|
|
121 last_known_column_point = -1;
|
|
|
122 }
|
|
|
123
|
|
|
124 int
|
|
|
125 column_at_point (struct buffer *buf, Bufpos init_pos, int cur_col)
|
|
|
126 {
|
|
|
127 int col;
|
|
|
128 int tab_seen;
|
|
|
129 int tab_width = XINT (buf->tab_width);
|
|
|
130 int post_tab;
|
|
|
131 Bufpos pos = init_pos;
|
|
16
|
132 Emchar c;
|
|
0
|
133
|
|
|
134 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
|
|
|
135 col = tab_seen = post_tab = 0;
|
|
|
136
|
|
|
137 while (1)
|
|
|
138 {
|
|
|
139 if (pos <= BUF_BEGV (buf))
|
|
|
140 break;
|
|
|
141
|
|
|
142 pos--;
|
|
16
|
143 c = BUF_FETCH_CHAR (buf, pos);
|
|
|
144 if (c == '\t')
|
|
0
|
145 {
|
|
|
146 if (tab_seen)
|
|
|
147 col = ((col + tab_width) / tab_width) * tab_width;
|
|
|
148
|
|
|
149 post_tab += col;
|
|
|
150 col = 0;
|
|
|
151 tab_seen = 1;
|
|
|
152 }
|
|
16
|
153 else if (c == '\n' ||
|
|
|
154 (EQ (buf->selective_display, Qt) && c == '\r'))
|
|
0
|
155 break;
|
|
|
156 else
|
|
|
157 {
|
|
|
158 /* #### This needs updating to handle the new redisplay. */
|
|
|
159 /* #### FSFmacs looks at ctl_arrow, display tables.
|
|
|
160 We need to do similar. */
|
|
|
161 #if 0
|
|
|
162 displayed_glyphs = glyphs_from_bufpos (sel_frame, buf,
|
|
|
163 XWINDOW (selected_window),
|
|
|
164 pos, dp, 0, col, 0, 0, 0);
|
|
|
165 col += (displayed_glyphs->columns
|
|
|
166 - (displayed_glyphs->begin_columns
|
|
|
167 + displayed_glyphs->end_columns));
|
|
16
|
168 #else /* XEmacs */
|
|
|
169 col ++;
|
|
|
170 #endif /* XEmacs */
|
|
0
|
171 }
|
|
|
172 }
|
|
|
173
|
|
|
174 if (tab_seen)
|
|
|
175 {
|
|
|
176 col = ((col + tab_width) / tab_width) * tab_width;
|
|
|
177 col += post_tab;
|
|
|
178 }
|
|
|
179
|
|
|
180 if (cur_col)
|
|
|
181 {
|
|
|
182 last_known_column_buffer = buf;
|
|
|
183 last_known_column = col;
|
|
|
184 last_known_column_point = BUF_PT (buf);
|
|
|
185 last_known_column_modified = BUF_MODIFF (buf);
|
|
|
186 }
|
|
|
187
|
|
|
188 return col;
|
|
|
189 }
|
|
|
190
|
|
|
191 int
|
|
|
192 current_column (struct buffer *buf)
|
|
|
193 {
|
|
|
194 if (buf == last_known_column_buffer
|
|
|
195 && BUF_PT (buf) == last_known_column_point
|
|
|
196 && BUF_MODIFF (buf) == last_known_column_modified)
|
|
|
197 return last_known_column;
|
|
|
198
|
|
|
199 return column_at_point (buf, BUF_PT (buf), 1);
|
|
|
200 }
|
|
|
201
|
|
|
202 DEFUN ("current-column", Fcurrent_column, Scurrent_column, 0, 1, 0 /*
|
|
|
203 Return the horizontal position of point. Beginning of line is column 0.
|
|
|
204 This is calculated by adding together the widths of all the displayed
|
|
|
205 representations of the character between the start of the previous line
|
|
|
206 and point. (e.g. control characters will have a width of 2 or 4, tabs
|
|
|
207 will have a variable width.)
|
|
|
208 Ignores finite width of frame, which means that this function may return
|
|
|
209 values greater than (frame-width).
|
|
|
210 Whether the line is visible (if `selective-display' is t) has no effect;
|
|
|
211 however, ^M is treated as end of line when `selective-display' is t.
|
|
|
212 If BUFFER is nil, the current buffer is assumed.
|
|
|
213 */ )
|
|
|
214 (buffer)
|
|
|
215 Lisp_Object buffer;
|
|
|
216 {
|
|
|
217 return (make_int (current_column (decode_buffer (buffer, 0))));
|
|
|
218 }
|
|
|
219
|
|
|
220
|
|
|
221 DEFUN ("indent-to", Findent_to, Sindent_to, 1, 3, "NIndent to column: " /*
|
|
|
222 Indent from point with tabs and spaces until COLUMN is reached.
|
|
|
223 Optional second argument MIN says always do at least MIN spaces
|
|
|
224 even if that goes past COLUMN; by default, MIN is zero.
|
|
|
225 If BUFFER is nil, the current buffer is assumed.
|
|
|
226 */ )
|
|
|
227 (col, minimum, buffer)
|
|
|
228 Lisp_Object col, minimum, buffer;
|
|
|
229 {
|
|
|
230 /* This function can GC */
|
|
|
231 int mincol;
|
|
|
232 int fromcol;
|
|
|
233 struct buffer *buf = decode_buffer (buffer, 0);
|
|
|
234 int tab_width = XINT (buf->tab_width);
|
|
|
235 Bufpos opoint = 0;
|
|
|
236
|
|
|
237 CHECK_INT (col);
|
|
|
238 if (NILP (minimum))
|
|
|
239 minimum = Qzero;
|
|
|
240 else
|
|
|
241 CHECK_INT (minimum);
|
|
|
242
|
|
|
243 XSETBUFFER (buffer, buf);
|
|
|
244
|
|
|
245 fromcol = current_column (buf);
|
|
|
246 mincol = fromcol + XINT (minimum);
|
|
|
247 if (mincol < XINT (col)) mincol = XINT (col);
|
|
|
248
|
|
|
249 if (fromcol == mincol)
|
|
|
250 return make_int (mincol);
|
|
|
251
|
|
|
252 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
|
|
|
253
|
|
|
254 if (!NILP (Fextent_at (make_int (BUF_PT (buf)), buffer, Qinvisible,
|
|
|
255 Qnil, Qnil)))
|
|
|
256 {
|
|
|
257 Bufpos last_visible = last_visible_position (BUF_PT (buf), buf);
|
|
|
258
|
|
|
259 opoint = BUF_PT (buf);
|
|
|
260 if (last_visible >= BUF_BEGV (buf))
|
|
|
261 BUF_SET_PT (buf, last_visible);
|
|
|
262 else
|
|
|
263 error ("Visible portion of buffer not modifiable");
|
|
|
264 }
|
|
|
265
|
|
|
266 if (indent_tabs_mode)
|
|
|
267 {
|
|
|
268 int n = mincol / tab_width - fromcol / tab_width;
|
|
|
269 if (n != 0)
|
|
|
270 {
|
|
|
271 Finsert_char (make_char ('\t'), make_int (n), Qnil, buffer);
|
|
|
272
|
|
|
273 fromcol = (mincol / tab_width) * tab_width;
|
|
|
274 }
|
|
|
275 }
|
|
|
276
|
|
|
277 Finsert_char (make_char (' '), make_int (mincol - fromcol), Qnil, buffer);
|
|
|
278
|
|
|
279 last_known_column_buffer = buf;
|
|
|
280 last_known_column = mincol;
|
|
|
281 last_known_column_point = BUF_PT (buf);
|
|
|
282 last_known_column_modified = BUF_MODIFF (buf);
|
|
|
283
|
|
|
284 /* Not in FSF: */
|
|
|
285 if (opoint > 0)
|
|
|
286 BUF_SET_PT (buf, opoint);
|
|
|
287
|
|
|
288 return (make_int (mincol));
|
|
|
289 }
|
|
|
290
|
|
|
291 int
|
|
|
292 bi_spaces_at_point (struct buffer *b, Bytind bi_pos)
|
|
|
293 {
|
|
|
294 Bytind bi_end = BI_BUF_ZV (b);
|
|
|
295 int col = 0;
|
|
|
296 Emchar c;
|
|
|
297 int tab_width = XINT (b->tab_width);
|
|
|
298
|
|
|
299 if (tab_width <= 0 || tab_width > 1000)
|
|
|
300 tab_width = 8;
|
|
|
301
|
|
|
302 while (bi_pos < bi_end &&
|
|
|
303 (c = BI_BUF_FETCH_CHAR (b, bi_pos),
|
|
|
304 (c == '\t'
|
|
|
305 ? (col += tab_width - col % tab_width)
|
|
|
306 : (c == ' ' ? ++col : 0))))
|
|
|
307 INC_BYTIND (b, bi_pos);
|
|
|
308
|
|
|
309 return col;
|
|
|
310 }
|
|
|
311
|
|
|
312
|
|
|
313 DEFUN ("current-indentation", Fcurrent_indentation, Scurrent_indentation,
|
|
|
314 0, 1, 0 /*
|
|
|
315 Return the indentation of the current line.
|
|
|
316 This is the horizontal position of the character
|
|
|
317 following any initial whitespace.
|
|
|
318 */ )
|
|
|
319 (buffer)
|
|
|
320 Lisp_Object buffer;
|
|
|
321 {
|
|
|
322 struct buffer *buf = decode_buffer (buffer, 0);
|
|
|
323 Bufpos pos = find_next_newline (buf, BUF_PT (buf), -1);
|
|
|
324
|
|
|
325 XSETBUFFER (buffer, buf);
|
|
|
326
|
|
|
327 if (!NILP (Fextent_at (make_int (pos), buffer, Qinvisible, Qnil, Qnil)))
|
|
|
328 return Qzero;
|
|
|
329
|
|
|
330 return make_int (bi_spaces_at_point (buf, bufpos_to_bytind (buf, pos)));
|
|
|
331 }
|
|
|
332
|
|
|
333
|
|
|
334 DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 3, 0 /*
|
|
|
335 Move point to column COLUMN in the current line.
|
|
|
336 The column of a character is calculated by adding together the widths
|
|
|
337 as displayed of the previous characters in the line.
|
|
|
338 This function ignores line-continuation;
|
|
|
339 there is no upper limit on the column number a character can have
|
|
|
340 and horizontal scrolling has no effect.
|
|
|
341
|
|
|
342 If specified column is within a character, point goes after that character.
|
|
|
343 If it's past end of line, point goes to end of line.
|
|
|
344
|
|
|
345 A non-nil second (optional) argument FORCE means, if the line
|
|
|
346 is too short to reach column COLUMN then add spaces/tabs to get there,
|
|
|
347 and if COLUMN is in the middle of a tab character, change it to spaces.
|
|
|
348 Returns the actual column that it moved to.
|
|
|
349 */ )
|
|
|
350 (column, force, buffer)
|
|
|
351 Lisp_Object column, force, buffer;
|
|
|
352 {
|
|
|
353 /* This function can GC */
|
|
|
354 Bufpos pos;
|
|
|
355 struct buffer *buf = decode_buffer (buffer, 0);
|
|
|
356 int col = current_column (buf);
|
|
|
357 int goal;
|
|
|
358 Bufpos end;
|
|
|
359 int tab_width = XINT (buf->tab_width);
|
|
|
360
|
|
|
361 int prev_col = 0;
|
|
16
|
362 Emchar c;
|
|
0
|
363
|
|
|
364 XSETBUFFER (buffer, buf);
|
|
|
365 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
|
|
|
366 CHECK_NATNUM (column);
|
|
|
367 goal = XINT (column);
|
|
|
368
|
|
|
369 retry:
|
|
|
370 pos = BUF_PT (buf);
|
|
|
371 end = BUF_ZV (buf);
|
|
|
372
|
|
|
373 /* If we're starting past the desired column,
|
|
|
374 back up to beginning of line and scan from there. */
|
|
|
375 if (col > goal)
|
|
|
376 {
|
|
|
377 pos = find_next_newline (buf, pos, -1);
|
|
|
378 col = 0;
|
|
|
379 }
|
|
|
380
|
|
|
381 while (col < goal && pos < end)
|
|
|
382 {
|
|
|
383 c = BUF_FETCH_CHAR (buf, pos);
|
|
|
384 if (c == '\n')
|
|
|
385 break;
|
|
|
386 if (c == '\r' && EQ (buf->selective_display, Qt))
|
|
|
387 break;
|
|
|
388 if (c == '\t')
|
|
|
389 {
|
|
|
390 prev_col = col;
|
|
|
391 col += tab_width;
|
|
|
392 col = col / tab_width * tab_width;
|
|
|
393 }
|
|
|
394 else
|
|
|
395 {
|
|
|
396 /* #### oh for the days of the complete new redisplay */
|
|
|
397 /* #### FSFmacs looks at ctl_arrow, display tables.
|
|
|
398 We need to do similar. */
|
|
|
399 #if 0
|
|
|
400 displayed_glyphs = glyphs_from_bufpos (selected_frame (),
|
|
|
401 buf,
|
|
|
402 XWINDOW (Fselected_window (Qnil)),
|
|
|
403 pos, dp, 0, col, 0, 0, 0);
|
|
|
404 col += (displayed_glyphs->columns
|
|
|
405 - (displayed_glyphs->begin_columns
|
|
|
406 + displayed_glyphs->end_columns));
|
|
16
|
407 #else /* XEmacs */
|
|
|
408 col ++;
|
|
|
409 #endif /* XEmacs */
|
|
0
|
410 }
|
|
|
411
|
|
|
412 pos++;
|
|
|
413 }
|
|
|
414
|
|
|
415 BUF_SET_PT (buf, pos);
|
|
|
416
|
|
|
417 /* If a tab char made us overshoot, change it to spaces
|
|
|
418 and scan through it again. */
|
|
|
419 if (!NILP (force) && col > goal && c == '\t' && prev_col < goal)
|
|
|
420 {
|
|
|
421 buffer_delete_range (buf, BUF_PT (buf) - 1, BUF_PT (buf), 0);
|
|
|
422 Findent_to (make_int (col - 1), Qzero, buffer);
|
|
|
423 buffer_insert_emacs_char (buf, ' ');
|
|
|
424 goto retry;
|
|
|
425 }
|
|
|
426
|
|
|
427 /* If line ends prematurely, add space to the end. */
|
|
|
428 if (col < goal && !NILP (force))
|
|
|
429 {
|
|
|
430 col = goal;
|
|
|
431 Findent_to (make_int (col), Qzero, buffer);
|
|
|
432 }
|
|
|
433
|
|
|
434 last_known_column_buffer = buf;
|
|
|
435 last_known_column = col;
|
|
|
436 last_known_column_point = BUF_PT (buf);
|
|
|
437 last_known_column_modified = BUF_MODIFF (buf);
|
|
|
438
|
|
|
439 return (make_int (col));
|
|
|
440 }
|
|
|
441
|
|
|
442 #if 0 /* #### OK boys, this function needs to be present, I think.
|
|
|
443 It was there before the 19.12 redisplay rewrite. */
|
|
|
444
|
|
|
445 xxDEFUN ("compute-motion", Fcompute_motion, Scompute_motion, 7, 7, 0 /*
|
|
|
446 "Scan through the current buffer, calculating screen position.
|
|
|
447 Scan the current buffer forward from offset FROM,
|
|
|
448 assuming it is at position FROMPOS--a cons of the form (HPOS . VPOS)--
|
|
|
449 to position TO or position TOPOS--another cons of the form (HPOS . VPOS)--
|
|
|
450 and return the ending buffer position and screen location.
|
|
|
451
|
|
|
452 There are three additional arguments:
|
|
|
453
|
|
|
454 WIDTH is the number of columns available to display text;
|
|
|
455 this affects handling of continuation lines.
|
|
|
456 This is usually the value returned by `window-width', less one (to allow
|
|
|
457 for the continuation glyph).
|
|
|
458
|
|
|
459 OFFSETS is either nil or a cons cell (HSCROLL . TAB-OFFSET).
|
|
|
460 HSCROLL is the number of columns not being displayed at the left
|
|
|
461 margin; this is usually taken from a window's hscroll member.
|
|
|
462 TAB-OFFSET is the number of columns of the first tab that aren't
|
|
|
463 being displayed, perhaps because the line was continued within it.
|
|
|
464 If OFFSETS is nil, HSCROLL and TAB-OFFSET are assumed to be zero.
|
|
|
465
|
|
|
466 WINDOW is the window to operate on. Currently this is used only to
|
|
|
467 find the display table. It does not matter what buffer WINDOW displays;
|
|
|
468 `compute-motion' always operates on the current buffer.
|
|
|
469
|
|
|
470 The value is a list of five elements:
|
|
|
471 (POS HPOS VPOS PREVHPOS CONTIN)
|
|
|
472 POS is the buffer position where the scan stopped.
|
|
|
473 VPOS is the vertical position where the scan stopped.
|
|
|
474 HPOS is the horizontal position where the scan stopped.
|
|
|
475
|
|
|
476 PREVHPOS is the horizontal position one character back from POS.
|
|
|
477 CONTIN is t if a line was continued after (or within) the previous character.
|
|
|
478
|
|
|
479 For example, to find the buffer position of column COL of line LINE
|
|
|
480 of a certain window, pass the window's starting location as FROM
|
|
|
481 and the window's upper-left coordinates as FROMPOS.
|
|
|
482 Pass the buffer's (point-max) as TO, to limit the scan to the end of the
|
|
|
483 visible section of the buffer, and pass LINE and COL as TOPOS.
|
|
|
484 */ )
|
|
|
485 (from, frompos, to, topos, width, offsets, window)
|
|
|
486 Lisp_Object from, frompos, to, topos;
|
|
|
487 Lisp_Object width, offsets, window;
|
|
|
488 {
|
|
|
489 Lisp_Object bufpos, hpos, vpos, prevhpos, contin;
|
|
|
490 struct position *pos;
|
|
|
491 int hscroll, tab_offset;
|
|
|
492 struct window *w = decode_window (window);
|
|
|
493
|
|
|
494 CHECK_INT_COERCE_MARKER (from);
|
|
|
495 CHECK_CONS (frompos);
|
|
|
496 CHECK_INT (XCAR (frompos));
|
|
|
497 CHECK_INT (XCDR (frompos));
|
|
|
498 CHECK_INT_COERCE_MARKER (to);
|
|
|
499 CHECK_CONS (topos);
|
|
|
500 CHECK_INT (XCAR (topos));
|
|
|
501 CHECK_INT (XCDR (topos));
|
|
|
502 CHECK_INT (width);
|
|
|
503 if (!NILP (offsets))
|
|
|
504 {
|
|
|
505 CHECK_CONS (offsets);
|
|
|
506 CHECK_INT (XCAR (offsets));
|
|
|
507 CHECK_INT (XCDR (offsets));
|
|
|
508 hscroll = XINT (XCAR (offsets));
|
|
|
509 tab_offset = XINT (XCDR (offsets));
|
|
|
510 }
|
|
|
511 else
|
|
|
512 hscroll = tab_offset = 0;
|
|
|
513
|
|
|
514 pos = compute_motion (XINT (from), XINT (XCDR (frompos)),
|
|
|
515 XINT (XCAR (frompos)),
|
|
|
516 XINT (to), XINT (XCDR (topos)),
|
|
|
517 XINT (XCAR (topos)),
|
|
|
518 XINT (width), hscroll, tab_offset, w);
|
|
|
519
|
|
|
520 XSETINT (bufpos, pos->bufpos);
|
|
|
521 XSETINT (hpos, pos->hpos);
|
|
|
522 XSETINT (vpos, pos->vpos);
|
|
|
523 XSETINT (prevhpos, pos->prevhpos);
|
|
|
524
|
|
|
525 return list5 (bufpos,
|
|
|
526 hpos,
|
|
|
527 vpos,
|
|
|
528 prevhpos,
|
|
|
529 pos->contin ? Qt : Qnil);
|
|
|
530
|
|
|
531 }
|
|
|
532
|
|
|
533 #endif /* 0 */
|
|
|
534
|
|
|
535 /*****************************************************************************
|
|
|
536 vmotion
|
|
|
537
|
|
|
538 Given a starting position ORIG, move point VTARGET lines in WINDOW.
|
|
|
539 Returns the new value for point. If the arg ret_vpos is not nil, it is
|
|
|
540 taken to be a pointer to an int and the number of lines actually moved is
|
|
|
541 returned in it.
|
|
|
542 ****************************************************************************/
|
|
|
543 Bufpos
|
|
|
544 vmotion (struct window *w, Bufpos orig, int vtarget, int *ret_vpos)
|
|
|
545 {
|
|
|
546 struct buffer *b = XBUFFER (w->buffer);
|
|
|
547 int elt;
|
|
|
548
|
|
|
549 elt = point_in_line_start_cache (w, orig, (vtarget < 0
|
|
|
550 ? -vtarget
|
|
|
551 : vtarget));
|
|
|
552
|
|
|
553 /* #### This assertion must be true before the if statements are hit
|
|
|
554 but may possibly be wrong after the call to
|
|
|
555 point_in_line_start_cache if orig is outside of the visible
|
|
|
556 region of the buffer. Handle this. */
|
|
|
557 assert (elt >= 0);
|
|
|
558
|
|
|
559 /* Moving downward. */
|
|
|
560 if (vtarget > 0)
|
|
|
561 {
|
|
|
562 int cur_line = Dynarr_length (w->line_start_cache) - 1 - elt;
|
|
|
563 Bufpos ret_pt;
|
|
|
564
|
|
|
565 if (cur_line > vtarget)
|
|
|
566 cur_line = vtarget;
|
|
|
567
|
|
|
568 /* The traditional FSF behavior is to return the end of buffer
|
|
|
569 position if we couldn't move far enough because we hit it. */
|
|
|
570 if (cur_line < vtarget)
|
|
|
571 ret_pt = BUF_ZV (b);
|
|
|
572 else
|
|
|
573 ret_pt = Dynarr_atp (w->line_start_cache, cur_line + elt)->start;
|
|
|
574
|
|
|
575 while (ret_pt > BUF_ZV (b) && cur_line > 0)
|
|
|
576 {
|
|
|
577 cur_line--;
|
|
|
578 ret_pt = Dynarr_atp (w->line_start_cache, cur_line + elt)->start;
|
|
|
579 }
|
|
|
580
|
|
|
581 if (ret_vpos) *ret_vpos = cur_line;
|
|
|
582 return (ret_pt);
|
|
|
583 }
|
|
|
584 else if (vtarget < 0)
|
|
|
585 {
|
|
|
586 if (elt < -vtarget)
|
|
|
587 {
|
|
|
588 if (ret_vpos) *ret_vpos = -elt;
|
|
|
589 /* #### This should be BUF_BEGV (b), right? */
|
|
|
590 return (Dynarr_atp (w->line_start_cache, 0)->start);
|
|
|
591 }
|
|
|
592 else
|
|
|
593 {
|
|
|
594 if (ret_vpos) *ret_vpos = vtarget;
|
|
|
595 return (Dynarr_atp (w->line_start_cache, elt + vtarget)->start);
|
|
|
596 }
|
|
|
597 }
|
|
|
598 else
|
|
|
599 {
|
|
|
600 /* No vertical motion requested so we just return the position
|
|
|
601 of the beginning of the current line. */
|
|
|
602 if (ret_vpos) *ret_vpos = 0;
|
|
|
603
|
|
|
604 return (Dynarr_atp (w->line_start_cache, elt)->start);
|
|
|
605 }
|
|
|
606
|
|
|
607 RETURN_NOT_REACHED(0) /* shut up compiler */
|
|
|
608 }
|
|
|
609
|
|
|
610 DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0 /*
|
|
|
611 Move to start of frame line LINES lines down.
|
|
|
612 If LINES is negative, this is moving up.
|
|
|
613
|
|
|
614 The optional second argument WINDOW specifies the window to use for
|
|
|
615 parameters such as width, horizontal scrolling, and so on.
|
|
|
616 the default is the selected window.
|
|
|
617 Note that `vertical-motion' sets WINDOW's buffer's point, not
|
|
|
618 WINDOW's point. (This differs from FSF Emacs, which buggily always
|
|
|
619 sets current buffer's point, regardless of WINDOW.)
|
|
|
620
|
|
|
621 Sets point to position found; this may be start of line
|
|
|
622 or just the start of a continuation line.
|
|
|
623 Returns number of lines moved; may be closer to zero than LINES
|
|
|
624 if beginning or end of buffer was reached.
|
|
|
625 Optional second argument is WINDOW to move in.
|
|
|
626 */ )
|
|
|
627 (lines, window)
|
|
|
628 Lisp_Object lines, window;
|
|
|
629 {
|
|
|
630 if (NILP (window))
|
|
|
631 window = Fselected_window (Qnil);
|
|
|
632 CHECK_WINDOW (window);
|
|
|
633 {
|
|
|
634 Bufpos bufpos;
|
|
|
635 int vpos;
|
|
|
636 struct window *w = XWINDOW (window);
|
|
|
637
|
|
|
638 CHECK_INT (lines);
|
|
|
639
|
|
|
640 bufpos = vmotion (XWINDOW (window), BUF_PT (XBUFFER (w->buffer)),
|
|
|
641 XINT (lines), &vpos);
|
|
|
642
|
|
|
643 /* Note that the buffer's point is set, not the window's point. */
|
|
|
644 BUF_SET_PT (XBUFFER (w->buffer), bufpos);
|
|
|
645
|
|
|
646 return make_int (vpos);
|
|
|
647 }
|
|
|
648 }
|
|
|
649
|
|
|
650
|
|
|
651 void
|
|
|
652 syms_of_indent (void)
|
|
|
653 {
|
|
|
654 defsubr (&Scurrent_indentation);
|
|
|
655 defsubr (&Sindent_to);
|
|
|
656 defsubr (&Scurrent_column);
|
|
|
657 defsubr (&Smove_to_column);
|
|
|
658 #if 0 /* #### */
|
|
|
659 defsubr (&Scompute_motion);
|
|
|
660 #endif
|
|
|
661 defsubr (&Svertical_motion);
|
|
|
662 }
|
|
|
663
|
|
|
664 void
|
|
|
665 vars_of_indent (void)
|
|
|
666 {
|
|
|
667 DEFVAR_BOOL ("indent-tabs-mode", &indent_tabs_mode /*
|
|
|
668 *Indentation can insert tabs if this is non-nil.
|
|
|
669 Setting this variable automatically makes it local to the current buffer.
|
|
|
670 */ );
|
|
|
671 indent_tabs_mode = 1;
|
|
|
672 }
|
