1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 17:10:51 -08:00
Commit graph

87 commits

Author SHA1 Message Date
Kenichi Handa
ae87e39643 (char_bytes): Use ((1 << CHARACTERBITS) - 1) instead
of GLYPH_MASK_CHAR.
1999-12-27 05:04:47 +00:00
Kenichi Handa
99529c2c73 In this entry, just `Modified' means that codes for a
composite character is deleted.
(Qcomposition) (leading_code_composition)
(charset_composition) (min_composite_char) (cmpchar_table)
(cmpchar_table_size) (n_cmpchars): Deleted.
(SPLIT_COMPOSITE_SEQ): Deleted.
(SPLIT_MULTIBYTE_SEQ): Modified.
(char_to_string): Renamed from non_ascii_char_to_string.
Modified.
(string_to_char): Renamed from string_to_non_ascii_char.
(split_string): Renamed from split_non_ascii_string.
(char_printable_p) (Fsplit_char)
(Ffind_charset_region) (Ffind_charset_string) (char_valid_p)
(char_bytes) (Fchar_width) (strwidth): Modified.
(find_charset_in_str): Argument CMPCHARP deleted.  Modified.
(Fstring): Adjusted for the change of CHAR_STRING.  Modified.
(hash_string) (CMPCHAR_HASH_TABLE_SIZE) (cmpchar_hash_table)
(CMPCHAR_HASH_SIZE) (CMPCHAR_HASH_USED) (CMPCHAR_HASH_CMPCHAR_ID)
(str_cmpchar_id) (cmpchar_component) (Fcmpcharp)
(Fcmpchar_component) (Fcmpchar_cmp_rule) (Fcmpchar_cmp_rule_p)
(Fcmpchar_cmp_count): Deleted.
(Fcompose_string): Implemented by Emacs Lisp in composite.el.
(init_charset_once): Modified.
(syms_of_charset): Modified.
1999-12-15 00:04:59 +00:00
Eli Zaretskii
613a83462a (Fmake_char_internal): Print the charset ID when
signalling an error.
1999-11-28 10:20:12 +00:00
Dave Love
5865af0db1 (split_non_ascii_string): Define return value. 1999-11-03 14:30:11 +00:00
Paul Eggert
68c45bf065 Add support for large files, 64-bit Solaris, system locale codings.
* Makefile.in (emacs): Set the LC_ALL environment variable to "C"
when dumping, so that the dumped Emacs doesn't have stray locale info.
(dired.o): Depend on systime.h.
(editfns.o): Depend on coding.h.

* alloc.c, buffer.c, callproc.c, ccl.c, charset.c, coding.c, data.c,
dispnew.c, editfns.c, emacs.c, filelock.c, floatfns.c, hftctl.c,
keyboard.c, process.c, sysdep.c, unexelf.c, unexhp9k800.c,
unexsunos4.c, vmsfns.c, vmsgmalloc.c, w32faces.c, w32menu.c, w32term.c,
w32xfns.c, xfaces.c, xfns.c, xmenu.c, xterm.c:
Include <config.h> before any system include files.

* alloc.c, buffer.c, ccl.c, data.c, editfns.c, emacs.c, eval.c,
fileio.c, filelock.c, frame.c, insdel.c, keymap.c, lread.c,
m/alpha.h, print.c, search.c, sysdep.c, xdisp.c, xfaces.c, xfns.c,
xmenu.c, xterm.c:
Do not include <stdlib.h>, as <config.h> does this now.

* callproc.c (Fcall_process):
Synchronize messages locale before invoking strerror.
Decode resulting string with locale-coding-system.

* coding.c (Vlocale_coding_system): New var.
(syms_of_coding): Adjust to above change.
(emacs_strerror): New function.

* coding.h (emacs_strerror, Vlocale_coding_system): New decls.

* config.in (HAVE_STDIO_EXT_H, HAVE_TM_GMTOFF, HAVE___FPENDING,
HAVE_FTELLO, HAVE_GETLOADAVG, HAVE_MBLEN, HAVE_MBRLEN,
HAVE_STRSIGNAL): New macros.
(BITS_PER_LONG): Default to 64 if _LP64 is defined.
<stdlib.h>: Include if HAVE_STDLIB_H is defined and NOT_C_CODE isn't.

* dired.c: Include "systime.h".
(Ffile_attributes): Do not cast s.st_size to int; this loses
information if int is 32 bits but st_size and EMACS_INT are larger.
Treat large device numbers like large inode numbers.

* dispnew.c (PENDING_OUTPUT_COUNT): Use __fpending if available.

* editfns.c: Include coding.h.
(emacs_strftime): Remove decl.
(emacs_strftimeu): New decl.
(emacs_memftimeu): Renamed from emacs_memftime; new arg UT.
Use emacs_strftimeu instead of emacs_strftime.
(Fformat_time_string): Convert format string using
Vlocale_coding_system, and convert result back.  Synchronize time
locale before invoking lower level function.  Invoke
emacs_memftimeu, passing ut, instead of emacs_memftime.

* emacs.c: Include <locale.h> if HAVE_SETLOCALE is defined.
(Vmessages_locale, Vprevious_messages_locale, Vtime_locale,
Vprevious_time_locale): New variables.
(main): Invoke setlocale early, so that initial error messages are
localized properly.  But skip locale-setting if LC_ALL is "C".
Fix up locale when it's safe to do so.
(fixup_locale): Moved here from xterm.c.
(synchronize_locale, synchronize_time_locale,
synchronize_messages_locale): New functions.
(syms_of_emacs): Accommodate above changes.

* fileio.c (report_file_error): Convert strerror output according
to Vlocale_coding_system.
(Finsert_file_contents): Check for arithmetic overflow in
computations that depend on file size.  Report IO errors
with emacs_strerror, not strerror.

* fns.c (Fgethash): Declare dflt parameter.

* gmalloc.c: Do not define const to nothing if HAVE_CONFIG_H
is defined; that's config.h's job.

* lisp.h (EMACS_INT, BITS_PER_EMACS_INT, EMACS_UINT): If _LP64,
default these values to long, BITS_PER_LONG, and unsigned long.
(VALBITS, MARKBIT, XINT): Do not assume 32-bit EMACS_INT.
(PNTR_COMPARISON_TYPE): Default to EMACS_UINT, not to unsigned int.
(code_convert_string_norecord, fixup_locale,
synchronize_messages_locale, synchronize_time_locale,
emacs_open, emacs_close, emacs_read, emacs_write): New decls.
All Emacs callers of open, close, read, write changed to use
emacs_open, emacs_close, emacs_read, emacs_write.

* lread.c (file_offset, file_tell): New macros.  All uses of ftell
changed to file_tell.
(saved_doc_string_position, prev_saved_doc_string_position): Now
of type file_offset.
(init_lread): Do not fix locale here; fixup_locale now does this.

* m/amdahl.h, s/usg5-4.h:
(NSIG): Remove.
(NSIG_MINIMUM): New macro.

* m/cydra5.h, m/dpx2.h, m/mips.h, m/pfa50.h, m/sps7.h, m/stride.h,
m/ustation.h, s/gnu-linux.h, s/hpux.h, s/iris3-5.h, s/iris3-6.h,
s/umips.h, s/usg5-4.h:
(SIGIO): Do not undef.
(BROKEN_SIGIO): New macro.

* m/ustation.h:
(SIGTSTP): Do not undef.
(BROKEN_SIGTSTP): New macro.

* s/gnu-linux.h:
(SIGPOLL, SIGURG): Do not undef.
(BROKEN_SIGPOLL, BROKEN_SIGURG): New macros.

* s/ptx4.h:
(SIGINFO): Do not undef.
(BROKEN_SIGINFO): New macros.

* m/delta.h, s/ptx.h, s/template.h: Doc fix.

* mktime.c, strftime.c: Update to glibc 2.1.2 version, with
some Emacs-related changes merged.

* print.c (float_to_string): Prepend "-" to representation of a
NaN if the NaN is negative.

* process.c (sys_siglist): Omit if HAVE_STRSIGNAL.
(wait_reading_process_input): Use emacs_strerror, not strerror.

* process.c (status_message, sigchld_handler): Synchronize locale,
then use strsignal istead of sys_siglist.
* w32proc.c (sys_wait): Likewise.

* s/aix3-1.h, s/bsd4-1.h, s/dgux.h, s/gnu-linux.h, s/hiuxmpp.h,
s/hpux.h, s/iris3-5.h, s/iris3-6.h, s/irix3-3.h, s/osf1.h, s/rtu.h,
s/sunos4-1.h, s/unipl5-0.h, s/unipl5-2.h, s/usg5-0.h, s/usg5-2-2.h,
s/usg5-2.h, s/usg5-3.h, s/xenix.h:
(open, close, read, write, INTERRUPTIBLE_OPEN,
INTERRUPTIBLE_CLOSE, INTERRUPTIBLE_IO): Remove.

* s/sol2-5.h (_LARGEFILE_SOURCE, _FILE_OFFSET_BITS): New macros.
* sysdep.c (sys_read, sys_write, read, write, sys_close, close,
sys_open, open): Remove.
(emacs_open, emacs_close, emacs_read, emacs_write): Always define;
the old INTERRUPTIBLE_OPEN, INTERRUPTIBLE_CLOSE, and INTERRUPTIBLE_IO
macros are no longer used.
(emacs_open): Renamed from sys_open.  Merge BSD4_1 version.
(emacs_close): Renamed from sys_close.
(emacs_read): Renamed from sys_read.
(emacs_write): Renamed from sys_write.
(sys_siglist): Do not declare if HAVE_STRSIGNAL.
(dup2): Do not print error on failure; the real dup2 doesn't.
(strsignal): New function, defined if !HAVE_STRSIGNAL.

* syssignal.h (SIGINFO): Undef if defined and if BROKEN_SIGINFO
is defined.
(SIGIO, SIGPOLL, SIGTSTP, SIGURG): Likewise.
(NSIG): If less than NSIG_MINIMUM, define to NSIG_MINIMUM.
(strsignal): Declare if !HAVE_STRSIGNAL.

* unexelf.c (ElfBitsW, ELFSIZE, ElfExpandBitsW): New macros.
(ElfW): Define in terms of ElfExpandBitsW.

* w32proc.c (sys_siglist): Remove decl.

* xdisp.c (decode_mode_spec): 3rd arg is int, not char, to comply
with ANSI C.
(display_string): Declare face_string_pos arg.

* xfns.c (Fx_show_tip): Declare timeout param.

* xterm.c: No need to include locale.h.
(x_alloc_lighter_color, x_setup_relief_color):
Pass arg as double, not float, for compatibility with ANSI C.
(fixup_locale): Move to emacs.c.
(x_term_init): Do not setlocale or fixup locale; the main program
does this now.
1999-10-19 07:25:11 +00:00
Kenichi Handa
63f4d57914 (CHAR_COMPONENTS_VALID_P): Fix for ASCII. 1999-09-08 11:49:34 +00:00
Kenichi Handa
0ad3f83d15 Reset MSBs of arguments of MAKE_CHAR. 1999-09-08 11:16:02 +00:00
Kenichi Handa
44c6492dfa Lots of comments fixed.
(SPLIT_MULTIBYTE_SEQ): Make it work also for ASCII string.
(CHAR_COMPONENTS_VALID_P): Name changed from
CHAR_COMPONENT_VALID_P.  Caller changed.
1999-09-07 12:19:26 +00:00
Kenichi Handa
ac4137cca6 (SPLIT_COMPOSITE_SEQ): New macro.
(SPLIT_CHARACTER_SEQ): New macro.
(SPLIT_MULTIBYTE_SEQ): New macro.
(CHAR_COMPONENT_VALID_P): New macro.
(non_ascii_char_to_string): Generate a multibyte sequence as far
as possible.
(string_to_non_ascii_char): The 4th arg exclude_tail_garbage is
deleted.  Caller changed.  Use the macro SPLIT_MULTIBYTE_SEQ.
(split_non_ascii_string): Likewise.
(multibyte_form_length): Use the macro PARSE_MULTIBYTE_SEQ.
(char_printable_p): New function.
(translate_char): Check character by NATNUMP instead of INTEGERP.
(unibyte_char_to_multibyte): Call char_valid_p instead of
VALID_MULTIBYTE_CHAR_P.
(Fmake_char_internal): Check the arguments more rigidly.
(Fcharset_after): Use the macro SPLIT_MULTIBYTE_SEQ.
(char_valid_p): Check the validity by CHAR_COMPONENT_VALID_P.
(Fmultibyte_char_to_unibyte): Check the validity of character by
CHAR_VALID_P.
(chars_in_text): Call multibyte_chars_in_text.
(multibyte_chars_in_text): Use the macro PARSE_MULTIBYTE_SEQ.
(Fcompose_string): Use the macro STRING_CHAR_AND_LENGTH instead of
STRING_CHAR_AND_CHAR_LENGTH (which is obsolete now).
1999-09-03 01:28:42 +00:00
Kenichi Handa
6662e69b7f (non_ascii_char_to_string): Handle modifier bits as
the same as Lisp reader.
1999-08-13 12:54:08 +00:00
Richard M. Stallman
38f02ede3f (Ffind_charset_region): Fix doc typo. 1999-01-02 20:00:29 +00:00
Kenichi Handa
e6e114f231 (Fcharset_after): Check range. If POS is out of
range, return nil.
1998-12-22 06:06:48 +00:00
Eli Zaretskii
543b4f618f (unibyte_char_to_multibyte): Don't convert 7-bit ASCII characters via
nonascii-translation-table.
1998-12-21 16:12:53 +00:00
Kenichi Handa
0282eb6915 (Qunknown): New variable.
(init_charset_once): Intern and staticpro Qunknown.  Initialize
all elements of Vcharset_symbol_table to Qunknown.
(find_charset_in_str): New arg MULTIBYTE.  If it is zero, check
unibyte characters only.  For an invalid composition sequence, set
CHARSETS[1] to 1.
(Ffind_charset_region): Call find_charset_in_str with an
appropriate MULTIBYTE arg.  If undefined charsets are found,
include `unknown' is the return value.
(Ffind_charset_string): Likewise.
(Fsplit_char): If CHAR is invalid, return `(unknown CHAR)'.
(str_cmpchar_id): Max composite character code should be less than
GENERIC_COMPOSITION_CHAR.
1998-12-15 04:35:38 +00:00
Kenichi Handa
8ac5a9ccbe (non_ascii_char_to_string): If C has modifier bits,
make an appropriate one byte string.
(char_bytes): Handle the case that C is a single byte char or has
modifier bits.
1998-11-26 08:12:12 +00:00
Kenichi Handa
da63a5fee1 (non_ascii_char_to_string): If C is negative, signal error. 1998-11-16 06:26:27 +00:00
Kenichi Handa
32278fd599 (char_valid_p): Handle a composite character correctly. 1998-11-11 10:31:24 +00:00
Kenichi Handa
9b4d1fe69d (str_cmpchar_id): Check the byte sequence for
composition more rigidly.
(Fcompose_string): Allow DEL to be composed.  Signal error if STR
contains an invalid multibyte sequence.
1998-11-11 03:36:15 +00:00
Kenichi Handa
de54b0d5ec (cmpchar_component): New arg NOERROR. Check
composition char ID more strictly.
(Fcmpchar_component): Call cmpchar_component with NOERROR arg
zero.
(Fcmpchar_cmp_rule): If CHARACTER should be composed relatively,
return 255.
(Fcompose_string): Signal error if STR contains a rule-based
composition character.
1998-11-10 00:24:40 +00:00
Kenichi Handa
1dca54f61e (string_to_non_ascii_char): Return correct length for
a charset of dimension 2 and composition character.
1998-11-09 07:06:11 +00:00
Kenichi Handa
6038393415 (init_charset_once): Fix previous change. 1998-11-07 01:42:20 +00:00
Kenichi Handa
bb63e573a8 (string_to_non_ascii_char): Fix previous change.
(char_valid_p): The the validity of CHARSET by CHARSET_DEFINED_P.
1998-11-06 10:59:09 +00:00
Kenichi Handa
a6c253264f (string_to_non_ascii_char): Fix previous change. 1998-11-06 00:44:16 +00:00
Kenichi Handa
6ef23ebb48 (string_to_non_ascii_char): Change the check for the
varidity of multibyte form.
(update_charset_table): Check validity of BYTES.  Don't set
bytes_by_char_head here.
(init_charset_once): Set bytes_by_char_head completely.
1998-11-04 10:48:53 +00:00
Andreas Schwab
60022cb712 (Fchar_bytes): Doc fix.
(char_bytes): Fix returned value to match returned type.
(syms_of_charset): Fix type clash in initialisation of
Vauto_fill_chars.
1998-10-30 10:13:36 +00:00
Kenichi Handa
c1a08b4c81 (Vauto_fill_chars, Qauto_fill_chars): New variables.
(syms_of_charset): Staticpro and initialize Qauto_fill_chars.
Declare auto-fill-chars as a Lisp variable and initialize it.
1998-10-19 00:40:10 +00:00
Kenichi Handa
020da46098 (Fstring): Call make_string instead of
make_string_from_bytes.
(Ffind_charset_region): Include `composition' in the returned list
if the region contains any composite characters.
(Ffind_charset_string): Include `composition' in the returned list
if the string contains any composite characters.
(find_charset_in_str): Handle CMPCHARP arg correctly.
1998-10-12 12:00:44 +00:00
Kenichi Handa
ba7434e5bf (invalid_character): Prepend `0' to octal
representation.  Give error sufficient args.
1998-10-08 06:45:36 +00:00
Kenichi Handa
2e45bf1801 (Ffind_charset_region): Optimization for unibyte buffer.
(Ffind_charset_string): For unibyte string, return (ascii).
1998-09-08 02:01:59 +00:00
Kenichi Handa
bbf12bb32b (unibyte_char_to_multibyte):
Vnonacii_translation_table will convert a 7-bit charcater.
(multibyte_char_to_unibyte): Handle the case that
Vnonacii_translation_table converts a multibyte charcater to a
unibyte charcter of less than 128.
(init_charset_once): Initialize nonascii_insert_offset and
Vnonacii_translation_table.
1998-08-31 03:50:17 +00:00
Kenichi Handa
f78643efc0 (Fchar_bytes): Add \n\ in doc-string. 1998-08-29 01:26:19 +00:00
Kenichi Handa
9b6a601f87 (Fchar_bytes): Now always return 1.
(char_bytes): New function.
1998-08-28 12:22:39 +00:00
Richard M. Stallman
1bcc15674c (Fmultibyte_char_to_unibyte): New function.
(syms_of_charset): defsubr it.
1998-08-18 11:02:54 +00:00
Kenichi Handa
76d7b82914 (multibyte_char_to_unibyte): New function.
(charset_id_internal): Avoid initializer for Lisp_Object.
(init_charset_once): Likewise.
1998-08-07 05:04:36 +00:00
Kenichi Handa
277576f6bc (Fdefine_charset): Fix doc-string. 1998-07-19 05:17:35 +00:00
Richard M. Stallman
17e7ef1b77 (Fchars_in_region): Coerce markers. 1998-07-12 03:15:53 +00:00
Kenichi Handa
8a73a70484 (Vgeneric_character_list): New variable.
(init_charset_once): Init and staticpro it.
(Fgeneric_character_list): New function.
(syms_of_charset): defsubr it.
1998-07-06 06:33:55 +00:00
Kenichi Handa
8ea691a60b (find_charset_in_str): Do not set the value of
charsets[LEADING_CODE_COMPOSITION].
1998-06-20 03:01:00 +00:00
Kenichi Handa
5d76bc89d4 (string_to_non_ascii_char): Don't check the arg
EXCLUDE_TAIL_GARBAGE for an invalid composite characters.
1998-06-02 08:10:36 +00:00
Karl Heuer
da4d65af17 (syms_of_charset): Put \n\ at eol of docstring. 1998-05-30 14:52:20 +00:00
Kenichi Handa
537efd8df0 Change term "character translation table" to
"translation table".
(string_to_non_ascii_char): New arg EXCLUDE_TAIL_GARBAGE.  Caller
changed.
(Funibyte_char_to_multibyte): Doc-string fixed.
(syms_of_charset): Doc-string fixed.
1998-05-22 09:44:27 +00:00
Kenichi Handa
1d67c29bf7 (find_charset_in_str): New arg CMPCHARP.
(Ffind_charset_region): Call find_charset_in_str with CMPCHARP 0.
(Ffind_charset_string): Likewise.
1998-05-21 01:48:52 +00:00
Kenichi Handa
b4e9dd77cc Change terms unify/unification to
translate/translation respectively throughtout the file.
(ONE_BYTE_CHAR_WIDTH): Delete unnecessary continuation line at the
tail.
1998-05-18 00:59:38 +00:00
Richard M. Stallman
3e8ceaacd1 (syms_of_charset): Doc fix for nonascii-insert-offset. 1998-04-23 04:12:09 +00:00
Richard M. Stallman
340b8d58ac (Funibyte_char_to_multibyte): Doc fix. 1998-04-23 04:00:47 +00:00
Andreas Schwab
a8c21066b7 (Fchars_in_region): Fix mixing of Lisp_Object and int. 1998-04-14 12:53:36 +00:00
Andreas Schwab
dfcf069d56 Fix -Wimplicit warnings. 1998-04-14 12:25:56 +00:00
Kenichi Handa
90d7b74e9a (string_to_non_ascii_char): Include garbage bytes (if
any) following a multibyte character in *ACTUAL_LEN.
(Fcharset_after): New function.
(syms_of_charset): Defsubr it.
(multibyte_form_length): Modified to be consistent with
string_to_non_ascii_char.
1998-04-09 05:40:23 +00:00
Karl Heuer
8867de6748 (string_to_non_ascii_char, multibyte_form_length)
(split_non_ascii_string, str_cmpchar_id): Make the STR argument
const unsigned char *.
1998-04-08 06:55:55 +00:00
Richard M. Stallman
2780260006 (Fstring): Use make_string_from_bytes.
(Fcompose_string): Likewise.
1998-03-21 18:00:38 +00:00