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

10633 commits

Author SHA1 Message Date
Kenichi Handa
ce51c54c3f (Fsubstitute_in_file_name): Adjusted for the change of
CHAR_STRING.
(Finsert_file_contents): Set Vlast_coding_system_used before
calling signal_after_change.  Call update_compositions if some
texts are inserted..
(Fwrite_region): Adjusted for the change of a_write and e_write.
(a_write): Argument changed.  Work based on character position,
not byte position.
(e_write): Argument changed.  Handle new way of composition.
1999-12-15 00:11:24 +00:00
Kenichi Handa
9d100795e3 (main): Call syms_of_composite. 1999-12-15 00:10:49 +00:00
Kenichi Handa
d5c2c40348 (Fchar_to_string): Adjusted for the change of
CHAR_STRING.
(general_insert_function): Likewise.
(Finsert_char): Likewise.
(Fsubst_char_in_region): Likewise.  Call update_compositions.
(Ftranslate_region): Call update_compositions.
(Ftranspose_regions): Call update_compositions.
1999-12-15 00:10:23 +00:00
Kenichi Handa
91f045dfa3 (doprnt1): Adjusted for the change of CHAR_STRING. 1999-12-15 00:09:57 +00:00
Kenichi Handa
959804a08d (direct_output_forward_char): Check point moving into
or out of a composition.  If so, give up direct method.
1999-12-15 00:09:32 +00:00
Kenichi Handa
a90fbbf691 (enum glyph_type): New member COMPOSITE_GLYPH.
(struct glyph): Add new sub-structure cmp to the union `u'.
(enum display_element_type): New member IT_COMPOSITION.
(enum prop_idx): New member COMPOSITION_PROP_IDX.
(struct it): New members cmp_id, cmp_len.
1999-12-15 00:09:03 +00:00
Kenichi Handa
e19c1eb40e (Faref): Delete codes for a composite character..
(Faset): Likewise.  Adjusted for the change of CHAR_STRING.
1999-12-15 00:08:39 +00:00
Kenichi Handa
ca4c9455f8 New file 1999-12-15 00:08:01 +00:00
Kenichi Handa
ec6d2bb84b Include composite.h.
(DECODE_CHARACTER_ASCII): Don't handle composition here.
(DECODE_CHARACTER_DIMENSION1): Likewise.  Don't check the validity
of multibyte code here.
(DECODE_CHARACTER_DIMENSION2): Likewise.
(detect_coding_emacs_mule): Change the case label from
EMACS_leading_code_composition to 0x80.
(detect_coding_iso2022): Handle new composition sequence.
(DECODE_ISO_CHARACTER): Likewise.
(check_composing_code): Deleted.
(coding_allocate_composition_data): New function.
(CODING_ADD_COMPOSITION_START) (CODING_ADD_COMPOSITION_END)
(CODING_ADD_COMPOSITION_COMPONENT) (DECODE_COMPOSITION_START)
(DECODE_COMPOSITION_END) (DECODE_COMPOSITION_RULE): New macros.
(decode_coding_iso2022): Handle new composition sequence.
(ENCODE_ISO_CHARACTER): Don't check composition here.
(ENCODE_COMPOSITION_RULE) (ENCODE_COMPOSITION_START): New macros.
(ENCODE_COMPOSITION_NO_RULE_START)
(ENCODE_COMPOSITION_WITH_RULE_START): Deleted.
(ENCODE_COMPOSITION_END): Handle new composition sequence.
(ENCODE_COMPOSITION_FAKE_START): New macro.
(encode_coding_iso2022): Handle new composition sequence.
(ENCODE_SJIS_BIG5_CHARACTER): Delete superfluous `;' at the tail.
(encode_coding_sjis_big5): Ignore composition.
(setup_coding_system): Initialize new members of struct
coding_system.  Enable composition only when the coding system has
`composition' property t.
(coding_free_composition_data) (coding_adjust_composition_offset)
(coding_save_composition) (coding_restore_composition): New
functions.
(code_convert_region): Call coding_save_composition for encoding
and coding_allocate_composition_data for decoding.  Don't skip
ASCII characters if we handle composition on encoding.  Call
signal_after_change with Check_BORDER.
(code_convert_string): Call coding_save_composition for encoding
and coding_allocate_composition_data for decoding.  Don't skip
ASCII characters if we handle composition on encoding.
(code_convert_string1): Set Vlast_coding_system_used after calling
code_convert_string.
(code_convert_string_norecord): Disable composition.
(Fset_terminal_coding_system_internal): Likewise.
(Fset_safe_terminal_coding_system_internal): Likewise.
(Fset_keyboard_coding_system_internal): Likewise.
(init_coding_once): Set emacs_code_class[0x80] to
EMACS_invalid_code.
1999-12-15 00:06:45 +00:00
Kenichi Handa
279d9f7b8d (emacs_code_class_type): Delete the member
EMACS_leading_code_composition.
(COMPOSING_NO) (COMPOSING_WITH_RULE_HEAD) (COMPOSING_NO_RULE_HEAD)
(COMPOSING_WITH_RULE_TAIL) (COMPOSING_NO_RULE_TAIL)
(COMPOSING_WITH_RULE_RULE) (COMPOSING_HEAD_P)
(COMPOSING_WITH_RULE_P): Macros deleted.
(COMPOSITION_DATA_SIZE) (COMPOSITION_DATA_MAX_BUNCH_LENGTH): New
macros.
(struct composition_data): New structure.
(CODING_FINISH_INSUFFICIENT_CMP): New macro.
(struct coding_system): New members composition_rule_follows,
cmp_data, cmp_data_start, cmp_data_index.
(coding_save_composition) (coding_free_composition_data)
(coding_adjust_composition_offset): Extern them.
1999-12-15 00:05:57 +00:00
Kenichi Handa
e55d9cfd36 (internal_self_insert): Adjusted for the change of
CHAR_STRING.
1999-12-15 00:05:19 +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
Kenichi Handa
f49b37c9a3 In this entry, just `Modified' means that codes for a
composite character is deleted.
(LEADING_CODE_COMPOSITION) (CHARSET_COMPOSITION)
(charset_composition) (MIN_CHAR_COMPOSITION)
(MAX_CHAR_COMPOSITION) (GENERIC_COMPOSITION_CHAR)
(COMPOSITE_CHAR_P) (MAKE_COMPOSITE_CHAR) (COMPOSITE_CHAR_ID)
(PARSE_COMPOSITE_SEQ) (PARSE_CHARACTER_SEQ): Deleted.
(MAX_CHAR) (CHARSET_VALID_P) (CHARSET_DEFINED_P) (CHARSET_AT)
(FIRST_CHARSET_AT) (SAME_CHARSET_P) (MAKE_NON_ASCII_CHAR)
(PARSE_MULTIBYTE_SEQ) (SPLIT_NON_ASCII_CHAR) (CHAR_PRINTABLE_P):
Modified.
(SPLIT_STRING): Call split_string, not split_non_ascii_string.
(CHAR_STRING): Delete WORKBUF argument.  Call char_string, not
non_ascii_char_to_string.
(STRING_CHAR): Call string_to_char, not string_to_non_ascii_char.
(STRING_CHAR_AND_LENGTH): Likewise.
(FETCH_CHAR_ADVANCE): New macro.
(MAX_COMPONENT_COUNT) (struct cmpchar_info): Deleted.
(MAX_MULTIBYTE_LENGTH): New macro.
(MAX_LENGTH_OF_MULTI_BYTE_FORM): Deleted.
(find_charset_in_str): Argument adjusted.
(CHAR_LEN): Modified.
1999-12-15 00:04:14 +00:00
Kenichi Handa
6982083b65 (CCL_WRITE_CHAR): Adjusted for the change of CHAR_STRING.
(ccl_driver): Delete codes for a composite character.
1999-12-15 00:03:45 +00:00
Kenichi Handa
70414a3dac (word_boundary_p): Delete codes for a composite
character.
(Fmake_category_table): New function.
(syms_of_category): Defsubr it.
1999-12-15 00:03:16 +00:00
Kenichi Handa
759f98632f (CATEGORY_SET): Delete codes for a composite character. 1999-12-15 00:02:55 +00:00
Kenichi Handa
66da28809c Include composite.h.
(casify_object): Use MAX_MULTIBYTE_LENGTH to allocate memory for a
multibyte character.  Adjusted for the change of CHAR_STRING.
(casify_region): Likewise.  Call update_compositions.
1999-12-15 00:02:33 +00:00
Kenichi Handa
bca78757c1 (Fcall_process): Call code_convert_string to encode
arguments.  Use CODING_REQUIRE_DECODING to check if the process
output should be decoded.
1999-12-15 00:02:12 +00:00
Kenichi Handa
c80329d154 (Fmake_string): Adjusted for the change of CHAR_STRING. 1999-12-15 00:01:44 +00:00
Kenichi Handa
5b2f4dcae9 (INTERVAL_SRC): Include composite.h.
(INTERVAL_OBJ): Include composite.o.
(SOME_MACHINE_OBJECTS): Include composite.o.
(casefiddle.o) (dispnew.o) (indent.o) (process.o) (search.o)
(syntax.o) (window.o) (xdisp.o) (xfaces.o) (xterm.o) (print.o):
Depend on composite.h.
(doc.o): Depend on charset.h.
(keyboard.o) (textprop.o) (intervals.o): Depend on INTERVAL_SRC.
(composite.o): New target.
1999-12-15 00:01:14 +00:00
Gerd Moellmann
c3c60f13d5 *** empty log message *** 1999-12-14 10:46:48 +00:00
Gerd Moellmann
54a91a0fc6 (show_mouse_face): Don't use updated_area, use TEXT_AREA. 1999-12-14 10:44:20 +00:00
Richard M. Stallman
c838eb57a5 *** empty log message *** 1999-12-13 05:47:15 +00:00
Richard M. Stallman
f84db7d56a (Fstart_kbd_macro): Handle case where last-kbd-macro
has been changed by the Lisp code.
1999-12-13 03:50:21 +00:00
Richard M. Stallman
d3887e33a9 (Fall_completions): Doc fix. 1999-12-13 03:50:00 +00:00
Gerd Moellmann
d8eccf12ba *** empty log message *** 1999-12-12 13:23:20 +00:00
Gerd Moellmann
0b60fc911b Indentation fixes. 1999-12-12 12:23:08 +00:00
Stefan Monnier
f28eba7baf *** empty log message *** 1999-12-12 06:57:54 +00:00
Stefan Monnier
ae56feaeda *** empty log message *** 1999-12-10 18:14:01 +00:00
Stefan Monnier
db74249bb9 (x_initialize): only setup xaw3d_* if they've been declared. 1999-12-10 17:37:57 +00:00
Gerd Moellmann
dfa1c6ae2c (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Moved
to frame.h.
1999-12-10 08:55:12 +00:00
Gerd Moellmann
3da48525dc (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL)
[!MSDOS && !WINDOWSNT && !macintosh]: Moved here from xterm.h.
1999-12-10 08:54:11 +00:00
Stefan Monnier
ec18280fd8 (#includes): Allow compilation with only Xaw.
(xaw3d_arrow_scroll, xaw3d_pick_top): New variables.
(xt_action_hook): Replace XAW3D by XAW.
(xaw3d_jump_callback): Renamed to xaw_jump_callback.
(xaw_jump_callback): Renamed from xaw3d_jump_callback.
Determine epsilon dynamically and don't try to be too clever.
(xaw3d_scroll_callback): Renamed to xaw_scroll_callback.
(xaw_scroll_callback): Renamed from xaw3d_scroll_callback.
Handle both Xaw3d with arrow-scrollbars and with Xaw-style
scrollbar (using `ratio').
(x_create_toolkit_scroll_bar): Try to detect which style of Xaw3d
scrollbar we have so as to set it up more optimally and to fix
xaw3d_arrow_scroll and xaw3d_pick_top.
(x_set_toolkit_scroll_bar_thumb): Try to maintain 2 spare pixels at the
bottom of the Xaw3d scrollbar, to work around its tendency to refuse
shrinking the thumb.  Also make sure that `XawScrollbarSetThumb'
is not ignored, using a major gross hack.
(x_initialize): Init default values for xaw3d_arrow_scroll and
xaw3d_pick_top.
1999-12-10 01:40:47 +00:00
Stefan Monnier
eef28553ff * keyboard.c (Qratio): New symbol.
(scroll_bar_parts): Add `Qratio' to it.
(syms_of_keyboard): Init `Qratio'.
1999-12-10 01:39:53 +00:00
Stefan Monnier
57207f1e9c (scroll_bar_part): Add `scroll_bar_move_ratio'. 1999-12-10 01:39:30 +00:00
Dave Love
83b6d970f1 *** empty log message *** 1999-12-09 17:54:56 +00:00
Dave Love
7870923124 (PIX_TYPE) [! HAVE_X_WINDOWS]: Define PIX_TYPE. 1999-12-09 17:41:58 +00:00
Eli Zaretskii
036480cbb9 Oops, forgot to commit the change in dispextern.h together with the
rest of the changes for tty color support.
1999-12-08 14:22:24 +00:00
Gerd Moellmann
3648c84252 (call_debugger): When entering the debugger while redisplaying,
reset redisplaying_p, and go back to the top-level if the debugger
returns.
1999-12-08 12:00:57 +00:00
Gerd Moellmann
05e71564d8 (delete_window): Block input for the time window
matrices are being changed.
1999-12-07 20:20:30 +00:00
Gerd Moellmann
15daa94436 (x_set_menu_resources_from_menu_face): Make sure
basic faces are realized before trying to use face `menu'.
1999-12-07 20:06:40 +00:00
Dave Love
b46cd53651 *** empty log message *** 1999-12-07 11:07:41 +00:00
Dave Love
3ccf78e059 (Fintern_soft): Fix newlines in doc string. 1999-12-07 11:06:22 +00:00
Gerd Moellmann
96acb1f72f (UNEXEC): Use unexelf.o instead of unexsgi.o. 1999-12-07 09:54:52 +00:00
Gerd Moellmann
2bf57b132c (UNEXEC) [USG5_4]: Use unexelf.o instead of
unexsgi.o again.
1999-12-07 09:50:50 +00:00
Gerd Moellmann
52da6a59f1 Include <syms.h>, not <sym.h> on IRIX. Removed
duplicate definition of ElfW.
(find_section): Copied from unexsgi.c.
(unexec): Use find_section.  Adjust whitespace.  Initialize
new_data2_offset based on old_data, not sbss (this fixes a bug on
IRIX6).  Change #ifdef __mips to __sgi, since it's IRIX-specific.
Adjust test for presence of .mdebug section to the new return
value of find_section.

Merge changes from 20.5.
(unexec): Handle .lit4 and .lit8 unconditionally.
1999-12-07 09:50:01 +00:00
Stefan Monnier
7dae4502b6 * editfns.c (Fdelete_and_extract_region): New function.
(syms_of_editfns): register it.
* insdel.c (del_range): update del_range_1 call.
(del_range_1, del_range_2): Add a ret_string argument to
request that the deleted text be returned.
(del_range_byte, del_range_both): Update del_range_2 call.
* lisp.h (del_range_1, del_range_2): change prototype
* casefiddle.c (casify_region): Update del_range_1 call.
* coding.c (code_convert_region): Update del_range_2 call.
* fileio.c (Finsert_file_contents): Update del_range_2 call.
1999-12-07 04:42:40 +00:00
Gerd Moellmann
397e4fae84 (set_lface_from_font_name): Fix incomplete merge. 1999-12-06 21:23:20 +00:00
Gerd Moellmann
3d973f7115 *** empty log message *** 1999-12-06 19:46:40 +00:00
Gerd Moellmann
b55048d4d6 (Fintern_soft): Accept a symbol argument. 1999-12-06 17:52:27 +00:00