Mercurial > hg > xemacs-beta

comparison src/indent.c @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-05 09:54:39 by ben] Textual renaming: text/char names abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization. [a] distinguish between "charptr" when it refers to operations on the pointer itself and when it refers to operations on text; and [b] use consistent naming for everything referring to internal format, i.e. Itext == text in internal format Ibyte == a byte in such text Ichar == a char as represented in internal character format thus e.g. set_charptr_emchar -> set_itext_ichar The pre and post tags on either side of this change are: pre-internal-format-textual-renaming post-internal-format-textual-renaming See the Internals Manual for details of exactly how this was done, how to handle the change in your workspace, etc.
author ben
date Wed, 05 Jun 2002 09:58:45 +0000
parents 6728e641994e
children e22b0213b713
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
130 int col; 130 int col;
131 int tab_seen; 131 int tab_seen;
132 int tab_width = XINT (buf->tab_width); 132 int tab_width = XINT (buf->tab_width);
133 int post_tab; 133 int post_tab;
134 Charbpos pos = init_pos; 134 Charbpos pos = init_pos;
135 Emchar c; 135 Ichar c;
136 136
137 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; 137 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
138 col = tab_seen = post_tab = 0; 138 col = tab_seen = post_tab = 0;
139 139
140 while (1) 140 while (1)
168 col += (displayed_glyphs->columns 168 col += (displayed_glyphs->columns
169 - (displayed_glyphs->begin_columns 169 - (displayed_glyphs->begin_columns
170 + displayed_glyphs->end_columns)); 170 + displayed_glyphs->end_columns));
171 #else /* XEmacs */ 171 #else /* XEmacs */
172 #ifdef MULE 172 #ifdef MULE
173 col += XCHARSET_COLUMNS (emchar_charset (c)); 173 col += XCHARSET_COLUMNS (ichar_charset (c));
174 #else 174 #else
175 col ++; 175 col ++;
176 #endif /* MULE */ 176 #endif /* MULE */
177 #endif /* XEmacs */ 177 #endif /* XEmacs */
178 } 178 }
200 { 200 {
201 int col; 201 int col;
202 int tab_seen; 202 int tab_seen;
203 int post_tab; 203 int post_tab;
204 Charbpos pos = init_pos; 204 Charbpos pos = init_pos;
205 Emchar c; 205 Ichar c;
206 206
207 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; 207 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
208 col = tab_seen = post_tab = 0; 208 col = tab_seen = post_tab = 0;
209 209
210 while (1) 210 while (1)
211 { 211 {
212 if (pos <= 0) 212 if (pos <= 0)
213 break; 213 break;
214 214
215 pos--; 215 pos--;
216 c = string_emchar (s, pos); 216 c = string_ichar (s, pos);
217 if (c == '\t') 217 if (c == '\t')
218 { 218 {
219 if (tab_seen) 219 if (tab_seen)
220 col = ((col + tab_width) / tab_width) * tab_width; 220 col = ((col + tab_width) / tab_width) * tab_width;
221 221
225 } 225 }
226 else if (c == '\n') 226 else if (c == '\n')
227 break; 227 break;
228 else 228 else
229 #ifdef MULE 229 #ifdef MULE
230 col += XCHARSET_COLUMNS (emchar_charset (c)); 230 col += XCHARSET_COLUMNS (ichar_charset (c));
231 #else 231 #else
232 col ++; 232 col ++;
233 #endif /* MULE */ 233 #endif /* MULE */
234 } 234 }
235 235
343 int 343 int
344 byte_spaces_at_point (struct buffer *b, Bytebpos byte_pos) 344 byte_spaces_at_point (struct buffer *b, Bytebpos byte_pos)
345 { 345 {
346 Bytebpos byte_end = BYTE_BUF_ZV (b); 346 Bytebpos byte_end = BYTE_BUF_ZV (b);
347 int col = 0; 347 int col = 0;
348 Emchar c; 348 Ichar c;
349 int tab_width = XINT (b->tab_width); 349 int tab_width = XINT (b->tab_width);
350 350
351 if (tab_width <= 0 || tab_width > 1000) 351 if (tab_width <= 0 || tab_width > 1000)
352 tab_width = 8; 352 tab_width = 8;
353 353
408 int goal; 408 int goal;
409 Charbpos end; 409 Charbpos end;
410 int tab_width = XINT (buf->tab_width); 410 int tab_width = XINT (buf->tab_width);
411 411
412 int prev_col = 0; 412 int prev_col = 0;
413 Emchar c = 0; 413 Ichar c = 0;
414 414
415 buffer = wrap_buffer (buf); 415 buffer = wrap_buffer (buf);
416 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; 416 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
417 CHECK_NATNUM (column); 417 CHECK_NATNUM (column);
418 goal = XINT (column); 418 goal = XINT (column);
455 col += (displayed_glyphs->columns 455 col += (displayed_glyphs->columns
456 - (displayed_glyphs->begin_columns 456 - (displayed_glyphs->begin_columns
457 + displayed_glyphs->end_columns)); 457 + displayed_glyphs->end_columns));
458 #else /* XEmacs */ 458 #else /* XEmacs */
459 #ifdef MULE 459 #ifdef MULE
460 col += XCHARSET_COLUMNS (emchar_charset (c)); 460 col += XCHARSET_COLUMNS (ichar_charset (c));
461 #else 461 #else
462 col ++; 462 col ++;
463 #endif /* MULE */ 463 #endif /* MULE */
464 #endif /* XEmacs */ 464 #endif /* XEmacs */
465 } 465 }