annotate src/indent.c @ 102192:900958845745

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