Mercurial > hg > xemacs-beta
diff src/file-coding.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 | 2923009caf47 |
children | a5954632b187 |
line wrap: on
line diff
--- a/src/file-coding.c Sat Mar 23 05:08:52 2002 +0000 +++ b/src/file-coding.c Fri Mar 29 04:49:13 2002 +0000 @@ -1018,7 +1018,7 @@ static void setup_eol_coding_systems (Lisp_Object codesys) { - int len = string_length (XSYMBOL (XCODING_SYSTEM_NAME (codesys))->name); + int len = XSTRING_LENGTH (XSYMBOL (XCODING_SYSTEM_NAME (codesys))->name); Intbyte *codesys_name = (Intbyte *) alloca (len + 7); int mlen = -1; Intbyte *codesys_mnemonic = 0; @@ -1026,7 +1026,7 @@ int i; memcpy (codesys_name, - string_data (XSYMBOL (XCODING_SYSTEM_NAME (codesys))->name), len); + XSTRING_DATA (XSYMBOL (XCODING_SYSTEM_NAME (codesys))->name), len); if (STRINGP (XCODING_SYSTEM_MNEMONIC (codesys))) { @@ -1177,7 +1177,7 @@ cs = allocate_coding_system (meths, meths->extra_data_size, name_or_existing); - XSETCODING_SYSTEM (csobj, cs); + csobj = wrap_coding_system (cs); cs->internal_p = !!prefix; @@ -1457,9 +1457,9 @@ The following additional property is recognized if TYPE is 'convert-eol: 'subtype - One of `lf', `crlf', `cr' or `autodetect'. When decoding, the - corresponding sequence will be converted to LF. When encoding, the - opposite happens. This coding system converts characters to + One of `lf', `crlf', `cr' or nil (for autodetection). When decoding, + the corresponding sequence will be converted to LF. When encoding, + the opposite happens. This coding system converts characters to characters. @@ -1645,12 +1645,12 @@ UNBOUNDP (new_name) ? Qnil : Ffind_coding_system (new_name); if (NILP (new_coding_system)) { - XSETCODING_SYSTEM - (new_coding_system, - allocate_coding_system - (XCODING_SYSTEM (old_coding_system)->methods, - XCODING_SYSTEM (old_coding_system)->methods->extra_data_size, - new_name)); + new_coding_system = + wrap_coding_system + (allocate_coding_system + (XCODING_SYSTEM (old_coding_system)->methods, + XCODING_SYSTEM (old_coding_system)->methods->extra_data_size, + new_name)); if (!UNBOUNDP (new_name)) Fputhash (new_name, new_coding_system, Vcoding_system_hash_table); } @@ -2306,7 +2306,6 @@ { Lstream *lstr = Lstream_new (lstream_coding, mode); struct coding_stream *str = CODING_STREAM_DATA (lstr); - Lisp_Object obj; codesys = Fget_coding_system (codesys); xzero (*str); @@ -2318,8 +2317,7 @@ str->convert_from = Dynarr_new (unsigned_char); str->direction = direction; set_coding_stream_coding_system (lstr, codesys); - XSETLSTREAM (obj, lstr); - return obj; + return wrap_lstream (lstr); } Lisp_Object @@ -2961,7 +2959,7 @@ main encoding routine is ASCII compatible (Unicode is definitely not, for example). -There is one parameter: `subtype', either `cr', `lf', `crlf', or `autodetect'. +There is one parameter: `subtype', either `cr', `lf', `crlf', or nil. */ DEFINE_CODING_SYSTEM_TYPE (convert_eol); @@ -2996,7 +2994,7 @@ data->subtype == EOL_LF ? "lf" : data->subtype == EOL_CRLF ? "crlf" : data->subtype == EOL_CR ? "cr" : - data->subtype == EOL_AUTODETECT ? "autodetect" : + data->subtype == EOL_AUTODETECT ? "nil" : (abort(), "")); } @@ -3022,7 +3020,7 @@ data->subtype = EOL_CRLF; else if (EQ (value, Qcr) /* || EQ (value, Qmac) */) data->subtype = EOL_CR; - else if (EQ (value, Qautodetect) /* || EQ (value, Qmac) */) + else if (EQ (value, Qnil)) data->subtype = EOL_AUTODETECT; else invalid_constant ("Unrecognized eol type", value); } @@ -3044,7 +3042,7 @@ case EOL_LF: return Qlf; case EOL_CRLF: return Qcrlf; case EOL_CR: return Qcr; - case EOL_AUTODETECT: return Qautodetect; + case EOL_AUTODETECT: return Qnil; default: abort (); } } @@ -3664,7 +3662,7 @@ if (likelihood < DET_AS_LIKELY_AS_UNLIKELY) warn_when_safe_lispobj (intern ("detection"), - Qerror, + Qwarning, emacs_sprintf_string_lisp ( "Detected coding %s is unlikely to be correct (likelihood == `%s')", @@ -4797,7 +4795,7 @@ build_msg_string ( "Autodetect the end-of-line type."), Qmnemonic, build_string ("Auto-EOL"), - Qsubtype, Qautodetect), + Qsubtype, Qnil), /* VERY IMPORTANT! Tell make-coding-system not to generate subsidiaries -- it needs the coding systems we're creating to do so! */