comparison src/indent.c @ 793:e38acbeb1cae

[xemacs-hg @ 2002-03-29 04:46:17 by ben] lots o' fixes etc/ChangeLog: New file. Separated out all entries for etc/ into their own ChangeLog. Includes entries for the following files: etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad, etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL, etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS, etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL, etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se, etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh, etc/custom/example-themes/europe-theme.el, etc/custom/example-themes/ex-custom-file, etc/custom/example-themes/example-theme.el, etc/e/eterm.ti, etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1, etc/gnuserv.README, etc/package-index.LATEST.gpg, etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm, etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs, etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E, etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm, etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm, etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar, etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1, etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL, etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el, etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\* unicode/unicode-consortium/8859-16.TXT: New file. mule/english.el: Define this charset now, since a bug was fixed that formerly prevented it. mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be integers. Makefile.in.in: Always include gui.c, to fix compile error when TTY-only. EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo(). Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate nearly all uses of Lisp_String * in favor of Lisp_Object, and correct macros so most of them favor Lisp_Object. Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings, but at level `debug' (usually ignored). Use it when instantiating specifiers, so problems can be debugged. Move log-warning-minimum-level into C so that we can optimize ERROR_ME_DEBUG_WARN. Fix warning levels consistent with new definitions. Add default_ and parent fields to char table; not yet implemented. New fun Dynarr_verify(); use for further error checking on Dynarrs. Rearrange code at top of lisp.h in conjunction with dynarr changes. Fix eifree(). Use Eistrings in various places (format_event_object(), where_is_to_char(), and callers thereof) to avoid fixed-size strings buffers. New fun write_eistring(). Reindent and fix GPM code to follow standards. Set default MS Windows font to Lucida Console (same size as Courier New but less interline spacing, so more lines fit). Increase default frame size on Windows to 50 lines. (If that's too big for the workspace, the frame will be shrunk as necessary.) Fix problem with text files with no newlines (). (Change `convert-eol' coding system to use `nil' for autodetect, consistent with make-coding-system.) Correct compile warnings in vm-limit.c. Fix handling of reverse-direction charsets to avoid errors when opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el. Recode some object printing methods to use write_fmt_string() instead of a fixed buffer and sprintf. Turn on display of png comments as warnings (level `info'), now that they're unobtrusive. Revamped the sound documentation. Fixed bug in redisplay w.r.t. hscroll/truncation/continuation glyphs causing jumping up and down of the lines, since they're bigger than the line size. (It was seen most obviously when there's a horizontal scroll bar, e.g. do C-h a glyph or something like that.) The problem was that the glyph-contrib-p setting on glyphs was ignored even if it was set properly, which it wasn't until now.
author ben
date Fri, 29 Mar 2002 04:49:13 +0000
parents fdefd0186b75
children 6728e641994e
comparison
equal deleted inserted replaced
792:4e83fdb13eb9 793:e38acbeb1cae
1 /* Indentation functions. 1 /* Indentation functions.
2 Copyright (C) 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995 3 Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995
4 Copyright (C) 2002 Ben Wing.
4 Free Software Foundation, Inc. 5 Free Software Foundation, Inc.
5 6
6 This file is part of XEmacs. 7 This file is part of XEmacs.
7 8
8 XEmacs is free software; you can redistribute it and/or modify it 9 XEmacs is free software; you can redistribute it and/or modify it
67 last_visible_position (Charbpos pos, struct buffer *buf) 68 last_visible_position (Charbpos pos, struct buffer *buf)
68 { 69 {
69 Lisp_Object buffer; 70 Lisp_Object buffer;
70 Lisp_Object value; 71 Lisp_Object value;
71 72
72 XSETBUFFER (buffer, buf); 73 buffer = wrap_buffer (buf);
73 value = Fprevious_single_property_change (make_int (pos), Qinvisible, 74 value = Fprevious_single_property_change (make_int (pos), Qinvisible,
74 buffer, Qnil); 75 buffer, Qnil);
75 if (NILP (value)) 76 if (NILP (value))
76 return 0; /* no visible position found */ 77 return 0; /* no visible position found */
77 else 78 else
193 194
194 return col; 195 return col;
195 } 196 }
196 197
197 int 198 int
198 string_column_at_point (Lisp_String* s, Charbpos init_pos, int tab_width) 199 string_column_at_point (Lisp_Object s, Charbpos init_pos, int tab_width)
199 { 200 {
200 int col; 201 int col;
201 int tab_seen; 202 int tab_seen;
202 int post_tab; 203 int post_tab;
203 Charbpos pos = init_pos; 204 Charbpos pos = init_pos;
210 { 211 {
211 if (pos <= 0) 212 if (pos <= 0)
212 break; 213 break;
213 214
214 pos--; 215 pos--;
215 c = string_char (s, pos); 216 c = XSTRING_CHAR (s, pos);
216 if (c == '\t') 217 if (c == '\t')
217 { 218 {
218 if (tab_seen) 219 if (tab_seen)
219 col = ((col + tab_width) / tab_width) * tab_width; 220 col = ((col + tab_width) / tab_width) * tab_width;
220 221
289 if (NILP (minimum)) 290 if (NILP (minimum))
290 minimum = Qzero; 291 minimum = Qzero;
291 else 292 else
292 CHECK_INT (minimum); 293 CHECK_INT (minimum);
293 294
294 XSETBUFFER (buffer, buf); 295 buffer = wrap_buffer (buf);
295 296
296 fromcol = current_column (buf); 297 fromcol = current_column (buf);
297 mincol = fromcol + XINT (minimum); 298 mincol = fromcol + XINT (minimum);
298 if (mincol < XINT (column)) mincol = XINT (column); 299 if (mincol < XINT (column)) mincol = XINT (column);
299 300
369 (buffer)) 370 (buffer))
370 { 371 {
371 struct buffer *buf = decode_buffer (buffer, 0); 372 struct buffer *buf = decode_buffer (buffer, 0);
372 Charbpos pos = find_next_newline (buf, BUF_PT (buf), -1); 373 Charbpos pos = find_next_newline (buf, BUF_PT (buf), -1);
373 374
374 XSETBUFFER (buffer, buf); 375 buffer = wrap_buffer (buf);
375 376
376 if (!NILP (Fextent_at (make_int (pos), buffer, Qinvisible, Qnil, Qnil))) 377 if (!NILP (Fextent_at (make_int (pos), buffer, Qinvisible, Qnil, Qnil)))
377 return Qzero; 378 return Qzero;
378 379
379 return make_int (bi_spaces_at_point (buf, charbpos_to_bytebpos (buf, pos))); 380 return make_int (bi_spaces_at_point (buf, charbpos_to_bytebpos (buf, pos)));
409 int tab_width = XINT (buf->tab_width); 410 int tab_width = XINT (buf->tab_width);
410 411
411 int prev_col = 0; 412 int prev_col = 0;
412 Emchar c = 0; 413 Emchar c = 0;
413 414
414 XSETBUFFER (buffer, buf); 415 buffer = wrap_buffer (buf);
415 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; 416 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
416 CHECK_NATNUM (column); 417 CHECK_NATNUM (column);
417 goal = XINT (column); 418 goal = XINT (column);
418 419
419 retry: 420 retry:
567 XINT (XCAR (frompos)), 568 XINT (XCAR (frompos)),
568 XINT (to), XINT (XCDR (topos)), 569 XINT (to), XINT (XCDR (topos)),
569 XINT (XCAR (topos)), 570 XINT (XCAR (topos)),
570 XINT (width), hscroll, tab_offset, w); 571 XINT (width), hscroll, tab_offset, w);
571 572
572 XSETINT (charbpos, pos->charbpos); 573 charbpos = make_int (pos->charbpos);
573 XSETINT (hpos, pos->hpos); 574 hpos = make_int (pos->hpos);
574 XSETINT (vpos, pos->vpos); 575 vpos = make_int (pos->vpos);
575 XSETINT (prevhpos, pos->prevhpos); 576 prevhpos = make_int (pos->prevhpos);
576 577
577 return list5 (charbpos, hpos, vpos, prevhpos, 578 return list5 (charbpos, hpos, vpos, prevhpos,
578 pos->contin ? Qt : Qnil); 579 pos->contin ? Qt : Qnil);
579 } 580 }
580 581