1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-29 16:41:45 -08:00
Commit graph

10572 commits

Author SHA1 Message Date
Dave Love
a744a2ec4d (Fx_show_tip): Add missing UNGCPRO. 1999-12-20 10:51:59 +00:00
Richard M. Stallman
d43f85c277 (Fcompleting_read): Rename arg INIT to INITIAL_INPUT. 1999-12-19 19:13:08 +00:00
Gerd Moellmann
9e6985ed7a *** empty log message *** 1999-12-19 13:16:06 +00:00
Gerd Moellmann
556d73147e (debugger_may_continue): New variable.
(syms_of_eval): Add a DEFVAR_BOOL for it.
(call_debugger): Bind it.
1999-12-19 13:07:33 +00:00
Eli Zaretskii
3b6207313b (IT_set_face): Don't swap face colors when highlight or
fp->tty_reverse_p is set, unless the computed colors are identical
to frame colors.  Print both original and computed colors to
termscript file.
(IT_write_glyphs): Track the changes in handling of composite
characters.
(IT_set_frame_parameters): Don't set frame colors from
unspecified-fg and unspecified-bg pseudo-colors.
1999-12-19 11:22:35 +00:00
Dave Love
0f9a51c47c *** empty log message *** 1999-12-17 15:06:49 +00:00
Dave Love
cda9b832d4 (Fkeywordp): New function.
(syms_of_data): Install it.
1999-12-17 15:00:56 +00:00
Eli Zaretskii
363e4e4226 (tty_defined_color): Fix last change. 1999-12-16 09:38:21 +00:00
Dave Love
6c27ec258d (BUILD_GLYPH_STRINGS): For pcc, remove continuation in arg list. 1999-12-15 17:46:18 +00:00
Gerd Moellmann
cfad01b4c1 (redisplay_window) <optional new window start>: Check
that window start is in [BEGV..ZV].
1999-12-15 16:27:45 +00:00
Dave Love
362ba9c6ae Copyright up-date. 1999-12-15 15:18:34 +00:00
Dave Love
1c8c6d3948 1999-12-15 Kenichi Handa <handa@etl.go.jp>
* regex.c (regex_compile): Adjusted for the change of CHAR_STRING.

1999-12-04  Stefan Monnier  <monnier@cs.yale.edu>

	* regex.c (regex_compile): Recognize *?, +? and ?? as non-greedy
	operators and handle them properly.
	* regex.h (RE_ALL_GREEDY): New option.
	(RE_UNMATCHED_RIGHT_PAREN_ORD): Moved to the end where alphabetic
	sorting would put it.
	(RE_SYNTAX_AWK, RE_SYNTAX_GREP, RE_SYNTAX_EGREP)
	(_RE_SYNTAX_POSIX_COMMON): Use the new option to keep old behavior.
1999-12-15 15:15:29 +00:00
Eli Zaretskii
f9d2fdc464 Changes for separate unspecified foreground and background colors
on character terminals:

* dispextern.h (FACE_TTY_DEFAULT_FG_COLOR)
(FACE_TTY_DEFAULT_BG_COLOR):  New macros.

* xfaces.c (Qunspecified_fg, Qunspecified_bg): New variables.
(syms_of_xfaces): Initialize and staticpro them.
(tty_defined_color): If the color name is unspecified-fg or
unspecified-bg, return FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR, respectively, as the pixel value.
(tty_color_name): If the color pixel value is either
FACE_TTY_DEFAULT_FG_COLOR or FACE_TTY_DEFAULT_BG_COLOR, return
Qunspecified_fg or Qunspecified_bg, respectively.
(Finternal_set_lisp_face_attribute): Allow values Qunspecified_fg
and Qunspecified_bg for foreground and background colors.
(realize_default_face): If the foreground and background colors
are not specified, default to Qunspecified_fg and Qunspecified_bg.
(realize_tty_face): By default, set the face colors to
FACE_TTY_DEFAULT_FG_COLOR and FACE_TTY_DEFAULT_BG_COLOR.
[MSDOS]: Handle FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR when face colors are not defined.
Reverse the colors if the default colors were reversed.

* dispnew.c (init_display): Initialize the frame pixels of the
initial frame to FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR.

* term.c (turn_on_face): If the default fore- and background
colors are reversed, enter inverse video mode.  Don't send color
escape sequences for unspecified foreground and background colors.
(turn_off_face): Handle unspecified-fg and unspecified-bg colors.

* dosfns.c (unspecified_colors): New variable.
(msdos_stdcolor_idx): Handle unspecified-fg and unspecified-bg
color names, return FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR, respectively.
(msdos_stdcolor_name): Handle FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR, return Qunspecified_fg and
Qunspecified_bg, respectively.

* msdos.c (IT_set_face): Support FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR as pixel values.

* faces.el (face-read-integer, read-face-attribute)
(color-defined-p, color-values): Allow color values unspecified-fg
and unspecified-bg, handle them as unspecified.
1999-12-15 13:14:38 +00:00
Kenichi Handa
e19539f184 (code_convert_region): Fix the secoding arg to
update_compositions.
1999-12-15 12:49:36 +00:00
Kenichi Handa
5ec14d3c00 *** empty log message *** 1999-12-15 00:53:45 +00:00
Kenichi Handa
b4192550b1 (x_append_glyph): Setup members of struct glyph properly
for composition.
(x_append_composite_glyph): New function.
(VCENTER_BASELINE_OFFSET): New macro.
(x_produce_glyphs): If it->what == IT_COMPOSITION, setup members
of struct it for the composition.  Cache pixel offsets in the
struct composition.  Delete codes for a composite character.
Handle Vignore_relative_composition in composition code.
(struct glyph_string): Delete member cmpcharp, add new member cmp.
(x_set_cursor_gc): Check s->cmp, not s->cmpcharp.
(x_compute_glyph_string_overhangs): Likewise.
(x_get_glyph_overhangs): Delete codes for a composite character.
(x_right_overwritten): Check s->cmp, not s->cmpcharp.
(x_draw_glyph_string_background): Likewise.  Delete codes for
checking s->gidx for a composition.
(x_draw_glyph_string_foreground): Delete code for a composite
character.
(x_draw_composite_glyph_string_foreground): New function.
(x_draw_glyph_string_box): Check s->cmp, not s->cmpcharp.
(x_draw_glyph_string): Handle the case of COMPOSITE_GLYPH.
(struct work): Deleted.
(x_fill_composite_glyph_string): Argument changed.  Mostly
rewritten for that.
(x_fill_glyph_string): Don't check CHARSET_COMPOSITION.
(BUILD_CHAR_GLYPH_STRINGS): Don't handle composition here.
(BUILD_COMPOSITE_GLYPH_STRING): New macro.
(BUILD_GLYPH_STRINGS): For composition, call
BUILD_COMPOSITE_GLYPH_STRING.
(x_new_font): Initialize f->output_data.x->baseline_offset, not
f->output_data.x->font_baseline.
1999-12-15 00:27:21 +00:00
Kenichi Handa
b6c3d03479 (struct x_output): Change member font_baseline to
baseline_offset.
1999-12-15 00:26:32 +00:00
Kenichi Handa
99e1184e5c (lisp_data_to_selection_data): Adjusted for the change
for find_charset_in_str.
1999-12-15 00:26:05 +00:00
Kenichi Handa
58cad5ed4f Include intervals.h.
(syms_of_xfns): Make `display' property nonsticky by default.
1999-12-15 00:25:34 +00:00
Kenichi Handa
78d2079c49 (choose_face_fontset_font): Delete codes for a
composite character.
(realize_x_face): Likewise.  Change a place to set local variable
`f' to avoid a bug of GCC 2.8.1 on Solaris.
1999-12-15 00:24:07 +00:00
Kenichi Handa
260a86a07c (it_props): Add an entry for composition.
(face_before_or_after_it_pos): For composition, check face of a
character after the composition.
(handle_composition_prop): New function.
(get_next_display_element): Adjusted for the change of
CHAR_STRING.
(set_iterator_to_next): Handle the case that it->method ==
next_element_from_composition.
(next_element_from_composition): New function.
(message_dolog): Adjusted for the change of CHAR_STRING.
(set_message_1): Likewise.
(check_point_in_composition): New function.
(reconsider_clip_changes): If point moved into or out of
composition, set b->clip_changed to 1 to force updating of the
screen.
(disp_char_vector): Delete codes for a composite character.
(decode_mode_spec_coding): Adjusted for the change of CHAR_STRING.
1999-12-15 00:23:27 +00:00
Kenichi Handa
f02d6d5cbb (Frecenter): Clear all caches of compositions. 1999-12-15 00:22:26 +00:00
Kenichi Handa
abc2f676d6 (Vtext_property_default_nonsticky): New variable
(syms_of_textprop): Declare it as a Lisp variable.
1999-12-15 00:21:42 +00:00
Kenichi Handa
c7cba11dec (encode_terminal_code): Delete codes for a composite
character.  Adjusted for the change of CHAR_STRING.
(produce_glyphs): When called, it->what can be IT_COMPOSITION.
Delete codes for a composite character.
1999-12-15 00:21:15 +00:00
Kenichi Handa
aa9b6dd66b (SYNTAX_ENTRY_INT): Delete codes for a composite
character.
1999-12-15 00:20:44 +00:00
Kenichi Handa
daaa6ed868 (search_buffer): Adjusted for the change of CHAR_STRING. 1999-12-15 00:20:26 +00:00
Kenichi Handa
e0016554c4 Include composite.h.
(read_process_output): Call update_compositions.
1999-12-15 00:17:54 +00:00
Kenichi Handa
19a86a032e (printchar): Adjusted for the change of CHAR_STRING. 1999-12-15 00:17:25 +00:00
Kenichi Handa
449fea3977 (readchar): Adjusted for the change of CHAR_STRING.
Delete a code that handles an invalid too-long multibyte sequence
because we are now sure that we never encounter with such a
sequence.
(read_multibyte): Use macro MAX_MULTIBYTE_LENGTH, not
MAX_LENGTH_OF_MULTI_BYTE_FORM.
(init_obarray): Likewise.
(read1): Likewise.  Adjusted for the change of CHAR_STRING.
1999-12-15 00:17:03 +00:00
Kenichi Handa
1948175262 (QCtest, QCweakness, Qequal): Extern them.
(hash_put): Adjusted for the change of the definition.
(signal_after_change): Likewise.
(check_point_in_composition): Extern it.
1999-12-15 00:16:30 +00:00
Kenichi Handa
0a16479ffe (push_key_description): Adjusted for the change of
CHAR_STRING.
(Ftext_char_description): Likewise.
1999-12-15 00:15:57 +00:00
Kenichi Handa
adf5cb9c38 (Vdisable_point_adjustment): New variable.
(Vglobal_disable_point_adjustment): New variable.
(syms_of_keyboard): Declare them as Lisp variables.
(command_loop_1): Check them and call adjust_point_for_property if
necessary.
(adjust_point_for_property): New function.
1999-12-15 00:15:16 +00:00
Kenichi Handa
f56b42ac9e (adjust_intervals_for_insertion): To check stickines
of properties, pay attention to text-property-default-nonsticky.
(merge_properties_sticky): Likewise.
(get_property_and_range): New function.
1999-12-15 00:14:44 +00:00
Kenichi Handa
a5ecc8a315 Include composite.h.
(get_property_and_range): Extern it.
(Vtext_property_default_nonsticky): Extern it.
1999-12-15 00:14:19 +00:00
Kenichi Handa
0ef71121ca (copy_text): Adjusted for the change of CHAR_STRING.
(insert_char): Likewise.
(insert): Call update_compositions.
(insert_and_inherit): Likewise.
(insert_before_markers): Likewise.
(insert_before_markers_and_inherit): Likewise.
(insert_from_string): Likewise.
(insert_from_string_before_markers): Likewise.
(insert_from_buffer): Likewise.
(replace_range): Likewise.
(count_combining_composition): Deleted.
(count_combining_before): Delete codes for a composite character.
(count_combining_after): Likewise.
(del_range_1): Call update_compositions.
(del_range_byte): Likewise.
(del_range_both): Likewise.
(Fcombine_after_change_execute): Likewise.
1999-12-15 00:13:49 +00:00
Kenichi Handa
012fd715d2 (check_composition): New function.
(MULTIBYTE_BYTES_WIDTH): Call STRING_CHAR_AND_LENGTH with
MAX_MULTIBYTE_LENGTH, not MAX_LENGTH_OF_MULTI_BYTE_FORM.
(current_column_1): Handle new way of composition.
(Fmove_to_column): Likewise.
(compute_motion): Likewise.
1999-12-15 00:13:13 +00:00
Kenichi Handa
810abb8758 (Vvertical_centering_font_regexp): New variable.
(syms_of_fontset): Declare it as a Lisp variable and initialize.
Set Vignore_relative_composition to nil.
(fs_load_font): Initialize `vertical_centering' of struct
font_info.
1999-12-15 00:12:47 +00:00
Kenichi Handa
21fa1afa72 (struct font_info): New member vertical_centering.
(Vvertical_centering_font_regexp): Extern it.
1999-12-15 00:12:19 +00:00
Kenichi Handa
64a5094a4a (Flength): The length of char-table is MAX_CHAR.
(concat): Adjusted for the change of CHAR_STRING.
(Ffillarray): Adjusted for the change of CHAR_STRING.
(Fset_char_table_default): Delete codes for a composite character.
(hash_put): Return hash index.
1999-12-15 00:11:56 +00:00
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