comparison src/ChangeLog @ 111997:a5a188ddc758

Minor clean up to silence some gcc warnings. * src/window.c (Fset_window_buffer): * src/xterm.c (x_set_frame_alpha): Restructure code to silence compiler warning. (handle_one_xevent): Remove unused var `p'. (do_ewmh_fullscreen): Remove unused var `lval'. (xembed_set_info): Remove unused var `atom'. * src/textprop.c (Fremove_list_of_text_properties): Add braces to silence compiler warning. * src/fontset.c (fontset_id_valid_p, dump_fontset): * src/ftfont.c (ftfont_drive_otf): Modernize k&r declaration. * src/eval.c (Feval, Ffuncall): Avoid unneeded gotos. * src/dispnew.c (update_frame, update_frame_1): Compile the `do_pause' label only when it's used. * src/image.c (x_create_bitmap_from_xpm_data): * src/dispextern.h (x_create_bitmap_from_xpm_data): Use const char** like its callers. * src/coding.c (detect_coding_utf_16): Remove unused vars `src_base' and `consumed_chars'. (DECODE_EMACS_MULE_21_COMPOSITION): Remove unused var `charbuf_base'. (decode_coding_emacs_mule): Remove unused label `retry'. (detect_eol): Add parens to silence compiler warning. * src/alloc.c (bytes_used_when_reconsidered): Move to the #ifdef where it's used to silence the compiler. (make_number): Modernize k&r declaration. (mark_char_table): Add parens to silence compiler warning.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 19 Dec 2010 00:43:42 -0500
parents 968255ee954a
children bc8dc4ac1e28
comparison
equal deleted inserted replaced
111996:90a2d870e83e 111997:a5a188ddc758
1 2010-12-19 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 Minor clean up to silence some gcc warnings.
4 * window.c (Fset_window_buffer):
5 * xterm.c (x_set_frame_alpha): Restructure code to silence
6 compiler warning.
7 (handle_one_xevent): Remove unused var `p'.
8 (do_ewmh_fullscreen): Remove unused var `lval'.
9 (xembed_set_info): Remove unused var `atom'.
10 * textprop.c (Fremove_list_of_text_properties): Add braces to silence
11 compiler warning.
12 * fontset.c (fontset_id_valid_p, dump_fontset):
13 * ftfont.c (ftfont_drive_otf): Modernize k&r declaration.
14 * eval.c (Feval, Ffuncall): Avoid unneeded gotos.
15 * dispnew.c (update_frame, update_frame_1): Compile the `do_pause'
16 label only when it's used.
17 * image.c (x_create_bitmap_from_xpm_data):
18 * dispextern.h (x_create_bitmap_from_xpm_data): Use const char** like
19 its callers.
20 * coding.c (detect_coding_utf_16): Remove unused vars `src_base' and
21 `consumed_chars'.
22 (DECODE_EMACS_MULE_21_COMPOSITION): Remove unused var `charbuf_base'.
23 (decode_coding_emacs_mule): Remove unused label `retry'.
24 (detect_eol): Add parens to silence compiler warning.
25 * alloc.c (bytes_used_when_reconsidered): Move to the #ifdef where
26 it's used to silence the compiler.
27 (make_number): Modernize k&r declaration.
28 (mark_char_table): Add parens to silence compiler warning.
29
1 2010-12-17 Chong Yidong <cyd@stupidchicken.com> 30 2010-12-17 Chong Yidong <cyd@stupidchicken.com>
2 31
3 * keyboard.c (parse_tool_bar_item): Allow menu separators in 32 * keyboard.c (parse_tool_bar_item): Allow menu separators in
4 tool-bar maps. 33 tool-bar maps.
5 (menu_separator_name_p): New function, from gtkutil.c. 34 (menu_separator_name_p): New function, from gtkutil.c.
10 * gtkutil.c (XG_BIN_CHILD): New macro. 39 * gtkutil.c (XG_BIN_CHILD): New macro.
11 (xg_get_menu_item_label, xg_update_menubar) 40 (xg_get_menu_item_label, xg_update_menubar)
12 (xg_update_menu_item, xg_tool_bar_menu_proxy) 41 (xg_update_menu_item, xg_tool_bar_menu_proxy)
13 (xg_show_toolbar_item, update_frame_tool_bar): Use it. 42 (xg_show_toolbar_item, update_frame_tool_bar): Use it.
14 (separator_names, xg_separator_p): Move to keyboard.c. 43 (separator_names, xg_separator_p): Move to keyboard.c.
15 (create_menus, xg_update_submenu, update_frame_tool_bar): Use 44 (create_menus, xg_update_submenu, update_frame_tool_bar):
16 menu_separator_name_p. 45 Use menu_separator_name_p.
17 46
18 * nsmenu.m (name_is_separator): Function deleted. 47 * nsmenu.m (name_is_separator): Function deleted.
19 (addItemWithWidgetValue): Use menu_separator_name_p. 48 (addItemWithWidgetValue): Use menu_separator_name_p.
20 49
21 * w32menu.c (name_is_separator): Function deleted. 50 * w32menu.c (name_is_separator): Function deleted.
945 (note_mouse_highlight): Call it instead of fast_find_string_pos. 974 (note_mouse_highlight): Call it instead of fast_find_string_pos.
946 (note_mode_line_or_margin_highlight): Support bidi-reordered 975 (note_mode_line_or_margin_highlight): Support bidi-reordered
947 strings and R2L glyph rows. Fix comments. 976 strings and R2L glyph rows. Fix comments.
948 (note_mouse_highlight): When bidi reordering is turned on in a 977 (note_mouse_highlight): When bidi reordering is turned on in a
949 buffer, call next-single-property-change and 978 buffer, call next-single-property-change and
950 previous-single-property-change with last argument nil. Clear 979 previous-single-property-change with last argument nil.
951 mouse highlight when mouse pointer is in a R2L row on the stretch 980 Clear mouse highlight when mouse pointer is in a R2L row on the stretch
952 glyph that stands for no text beyond the line end. 981 glyph that stands for no text beyond the line end.
953 (row_containing_pos): Don't return too early when CHARPOS is in a 982 (row_containing_pos): Don't return too early when CHARPOS is in a
954 bidi-reordered continued line. Return immediately when the first 983 bidi-reordered continued line. Return immediately when the first
955 hit is found in a line that is not continued, or when an exact 984 hit is found in a line that is not continued, or when an exact
956 match for CHARPOS is found. 985 match for CHARPOS is found.
1389 1418
1390 * xml.c (parse_string): Use const. 1419 * xml.c (parse_string): Use const.
1391 1420
1392 2010-09-30 Lars Magne Ingebrigtsen <larsi@gnus.org> 1421 2010-09-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
1393 1422
1394 * eval.c (Fbacktrace): Don't overwrite print-level on exit. Also 1423 * eval.c (Fbacktrace): Don't overwrite print-level on exit.
1395 only override Vprint_level if it isn't already bound, and increase 1424 Also only override Vprint_level if it isn't already bound, and increase
1396 the level to 8 to produce more useful backtraces for bug reports. 1425 the level to 8 to produce more useful backtraces for bug reports.
1397 1426
1398 2010-09-30 Dan Nicolaescu <dann@ics.uci.edu> 1427 2010-09-30 Dan Nicolaescu <dann@ics.uci.edu>
1399 1428
1400 * Makefile.in: ecrt0.c does not exist anymore, do not mention it. 1429 * Makefile.in: ecrt0.c does not exist anymore, do not mention it.
1529 1558
1530 * lisp.h (xd_pending_messages, xd_read_queued_messages): Remove. 1559 * lisp.h (xd_pending_messages, xd_read_queued_messages): Remove.
1531 1560
1532 2010-09-27 Lars Magne Ingebrigtsen <larsi@gnus.org> 1561 2010-09-27 Lars Magne Ingebrigtsen <larsi@gnus.org>
1533 1562
1534 * gnutls.c (gnutls_log_function): Added more debugging. 1563 * gnutls.c (gnutls_log_function): Add more debugging.
1535 (emacs_gnutls_read): Don't infloop while reading. 1564 (emacs_gnutls_read): Don't infloop while reading.
1536 1565
1537 2010-09-27 Kenichi Handa <handa@m17n.org> 1566 2010-09-27 Kenichi Handa <handa@m17n.org>
1538 1567
1539 These changes are to remove restriction on the number of glyphs in 1568 These changes are to remove restriction on the number of glyphs in
1571 * process.h (add_read_fd, delete_read_fd, add_write_fd) 1600 * process.h (add_read_fd, delete_read_fd, add_write_fd)
1572 (delete_write_fd): Declare. 1601 (delete_write_fd): Declare.
1573 1602
1574 * process.c (gpm_wait_mask, max_gpm_desc): Remove. 1603 * process.c (gpm_wait_mask, max_gpm_desc): Remove.
1575 (write_mask): New variable. 1604 (write_mask): New variable.
1576 (max_input_desc): Renamed from max_keyboard_desc. 1605 (max_input_desc): Rename from max_keyboard_desc.
1577 (fd_callback_info): New variable. 1606 (fd_callback_info): New variable.
1578 (add_read_fd, delete_read_fd, add_write_fd, delete_write_fd): 1607 (add_read_fd, delete_read_fd, add_write_fd, delete_write_fd):
1579 New functions. 1608 New functions.
1580 (Fmake_network_process): FD_SET write_mask. 1609 (Fmake_network_process): FD_SET write_mask.
1581 (deactivate_process): FD_CLR write_mask. 1610 (deactivate_process): FD_CLR write_mask.
2190 2219
2191 * cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring. 2220 * cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
2192 2221
2193 2010-09-14 Lars Magne Ingebrigtsen <larsi@gnus.org> 2222 2010-09-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
2194 2223
2195 * xml.c (parse_buffer): Renamed to parse_string(), since that's 2224 * xml.c (parse_buffer): Rename to parse_string(), since that's
2196 what it does. 2225 what it does.
2197 (parse_string): Return nil when the document can't be parsed. 2226 (parse_string): Return nil when the document can't be parsed.
2198 2227
2199 2010-09-14 Jan Djärv <jan.h.d@swipnet.se> 2228 2010-09-14 Jan Djärv <jan.h.d@swipnet.se>
2200 2229
3348 * gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro. 3377 * gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro.
3349 (xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth. 3378 (xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
3350 (xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH. 3379 (xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH.
3351 (xg_create_frame_widgets): Create a hobox for placing widgets 3380 (xg_create_frame_widgets): Create a hobox for placing widgets
3352 vertically. Use gtk_box_pack_start. 3381 vertically. Use gtk_box_pack_start.
3353 (xg_height_or_width_changed): Renamed from xg_height_changed. 3382 (xg_height_or_width_changed): Rename from xg_height_changed.
3354 (x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width. 3383 (x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width.
3355 (xg_update_frame_menubar, free_frame_menubar): Change to 3384 (xg_update_frame_menubar, free_frame_menubar): Change to
3356 xg_height_or_width_changed. 3385 xg_height_or_width_changed.
3357 (xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar 3386 (xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar
3358 size correctly. Remove hardcoded 4, instead use handlebox size - 3387 size correctly. Remove hardcoded 4, instead use handlebox size -
3988 * font.c (font_open_entity): Record ENTITY in FONT_OBJECT's slot 4017 * font.c (font_open_entity): Record ENTITY in FONT_OBJECT's slot
3989 of FONT_ENTITY_INDEX. 4018 of FONT_ENTITY_INDEX.
3990 (Ffont_get): If KEY is :otf and the font-object doesn't have the 4019 (Ffont_get): If KEY is :otf and the font-object doesn't have the
3991 property, get the property value dynamically. 4020 property, get the property value dynamically.
3992 (Ffont_put): Accept font-entity and font-object too. 4021 (Ffont_put): Accept font-entity and font-object too.
3993 (Ffont_get_glyhphs): Renamed from Fget_font_glyphs. Arguments and 4022 (Ffont_get_glyhphs): Rename from Fget_font_glyphs. Arguments and
3994 return value changed. 4023 return value changed.
3995 (syms_of_font): Adjust for the above change. 4024 (syms_of_font): Adjust for the above change.
3996 4025
3997 2010-07-11 Andreas Schwab <schwab@linux-m68k.org> 4026 2010-07-11 Andreas Schwab <schwab@linux-m68k.org>
3998 4027
4061 2010-07-11 Ken Raeburn <raeburn@raeburn.org> 4090 2010-07-11 Ken Raeburn <raeburn@raeburn.org>
4062 4091
4063 * doprnt.c (doprnt): Take a va_list argument instead of count and 4092 * doprnt.c (doprnt): Take a va_list argument instead of count and
4064 pointer. 4093 pointer.
4065 * eval.c (error): Change to a standard-C variadic function. 4094 * eval.c (error): Change to a standard-C variadic function.
4066 * xdisp.c (vmessage): Renamed from message, made static, and 4095 * xdisp.c (vmessage): Rename from message, made static, and
4067 changed to take a va_list argument. 4096 changed to take a va_list argument.
4068 (message): New variadic wrapper. 4097 (message): New variadic wrapper.
4069 (message_nolog): Now a variadic function, calling vmessage. 4098 (message_nolog): Now a variadic function, calling vmessage.
4070 * lisp.h: Include stdarg.h for va_list. 4099 * lisp.h: Include stdarg.h for va_list.
4071 (doprnt, error, message, message_nolog): Decls updated. 4100 (doprnt, error, message, message_nolog): Decls updated.
5074 5103
5075 2010-06-19 Eli Zaretskii <eliz@gnu.org> 5104 2010-06-19 Eli Zaretskii <eliz@gnu.org>
5076 5105
5077 * xdisp.c (try_scrolling): Compute the limit for searching point 5106 * xdisp.c (try_scrolling): Compute the limit for searching point
5078 in forward scroll from scroll_max, instead of an arbitrary limit 5107 in forward scroll from scroll_max, instead of an arbitrary limit
5079 of 10 screen lines. See 5108 of 10 screen lines.
5080 http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00766.html 5109 See http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00766.html
5081 and 5110 and
5082 http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00773.html 5111 http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00773.html
5083 for details. 5112 for details.
5084 5113
5085 2010-06-16 Glenn Morris <rgm@gnu.org> 5114 2010-06-16 Glenn Morris <rgm@gnu.org>
5323 2010-05-29 Eli Zaretskii <eliz@gnu.org> 5352 2010-05-29 Eli Zaretskii <eliz@gnu.org>
5324 5353
5325 Fix cursor motion in bidi-reordered continued lines. 5354 Fix cursor motion in bidi-reordered continued lines.
5326 * xdisp.c (try_cursor_movement): Backup to non-continuation line 5355 * xdisp.c (try_cursor_movement): Backup to non-continuation line
5327 only after finding point's row. Fix the logic. Rewrite the loop 5356 only after finding point's row. Fix the logic. Rewrite the loop
5328 over continuation lines in bidi-reordered buffers. Return 5357 over continuation lines in bidi-reordered buffers.
5329 CURSOR_MOVEMENT_MUST_SCROLL upon failure to find a suitable row, 5358 Return CURSOR_MOVEMENT_MUST_SCROLL upon failure to find a suitable row,
5330 rather than CURSOR_MOVEMENT_CANNOT_BE_USED. 5359 rather than CURSOR_MOVEMENT_CANNOT_BE_USED.
5331 5360
5332 2010-05-28 Michael Albinus <michael.albinus@gmx.de> 5361 2010-05-28 Michael Albinus <michael.albinus@gmx.de>
5333 5362
5334 * fileio.c (Fdelete_file): Pass TRASH arg to handler call. 5363 * fileio.c (Fdelete_file): Pass TRASH arg to handler call.
6443 HAVE_XFT. 6472 HAVE_XFT.
6444 (something_changedCB): store_font_changed_event is now 6473 (something_changedCB): store_font_changed_event is now
6445 store_config_changed_event. 6474 store_config_changed_event.
6446 (parse_settings): Rename from parse_xft_settings. 6475 (parse_settings): Rename from parse_xft_settings.
6447 Read non-xft xsettings outside #ifdef HAVE_XFT. 6476 Read non-xft xsettings outside #ifdef HAVE_XFT.
6448 (read_settings): Renamed from read_xft_settings. 6477 (read_settings): Rename from read_xft_settings.
6449 (apply_xft_settings): Take current settings as parameter. Do not 6478 (apply_xft_settings): Take current settings as parameter. Do not
6450 call read_(xft)_settings. 6479 call read_(xft)_settings.
6451 (read_and_apply_settings): New function. 6480 (read_and_apply_settings): New function.
6452 (xft_settings_event): Do non-xft stuff out of HAVE_XFT. 6481 (xft_settings_event): Do non-xft stuff out of HAVE_XFT.
6453 Call read_and_apply_settings if there are settings to be read. 6482 Call read_and_apply_settings if there are settings to be read.
6454 (init_xsettings): Renamed from init_xfd_settings. 6483 (init_xsettings): Rename from init_xfd_settings.
6455 Call read_and_apply_settings unconditionally. 6484 Call read_and_apply_settings unconditionally.
6456 (xsettings_initialize): Call init_xsettings. 6485 (xsettings_initialize): Call init_xsettings.
6457 (Ftool_bar_get_system_style): New function. 6486 (Ftool_bar_get_system_style): New function.
6458 (syms_of_xsettings): Define Qmonospace_font_name and 6487 (syms_of_xsettings): Define Qmonospace_font_name and
6459 Qtool_bar_style. Initialize current_tool_bar_style to nil. 6488 Qtool_bar_style. Initialize current_tool_bar_style to nil.
9605 9634
9606 2009-08-28 Eli Zaretskii <eliz@gnu.org> 9635 2009-08-28 Eli Zaretskii <eliz@gnu.org>
9607 9636
9608 * makefile.w32-in ($(BLD)/doc.$(O)): Depend on buildobj.h, not on 9637 * makefile.w32-in ($(BLD)/doc.$(O)): Depend on buildobj.h, not on
9609 $(SRC)/buildobj.h. 9638 $(SRC)/buildobj.h.
9610 (buildobj.h): Renamed from $(SRC)/buildobj.h. 9639 (buildobj.h): Rename from $(SRC)/buildobj.h.
9611 (make-buildobj-CMD, make-buildobj-SH): Create buildobj.h, not 9640 (make-buildobj-CMD, make-buildobj-SH): Create buildobj.h, not
9612 $(SRC)/buildobj.h. 9641 $(SRC)/buildobj.h.
9613 (clean): Add buildobj.h. 9642 (clean): Add buildobj.h.
9614 9643
9615 2009-08-28 Teodor Zlatanov <tzz@lifelogs.com> 9644 2009-08-28 Teodor Zlatanov <tzz@lifelogs.com>
12649 done in init_frame_faces. Remove ancient "null_pixel" cruft. 12678 done in init_frame_faces. Remove ancient "null_pixel" cruft.
12650 (x_delete_display): Free x_dnd_atoms member. 12679 (x_delete_display): Free x_dnd_atoms member.
12651 12680
12652 2008-12-13 Kenichi Handa <handa@m17n.org> 12681 2008-12-13 Kenichi Handa <handa@m17n.org>
12653 12682
12654 * font.c (font_rescale_ratio): Moved from xfaces.c. 12683 * font.c (font_rescale_ratio): Move from xfaces.c.
12655 Argument type changed. Handle a font-spec too. 12684 Argument type changed. Handle a font-spec too.
12656 (font_score): Check Vface_font_rescale_alist. 12685 (font_score): Check Vface_font_rescale_alist.
12657 (font_open_entity): Likewise. (Bug#1547) 12686 (font_open_entity): Likewise. (Bug#1547)
12658 12687
12659 * xfaces.c (font_rescale_ratio): Moved to font.c. 12688 * xfaces.c (font_rescale_ratio): Move to font.c.
12660 12689
12661 2008-12-13 Chong Yidong <cyd@stupidchicken.com> 12690 2008-12-13 Chong Yidong <cyd@stupidchicken.com>
12662 12691
12663 * xfns.c (Fx_wm_set_size_hint): Check if the frame is an X frame. 12692 * xfns.c (Fx_wm_set_size_hint): Check if the frame is an X frame.
12664 12693
12672 * term.c (init_tty): Move setting the terminal name before the 12701 * term.c (init_tty): Move setting the terminal name before the
12673 potential user: maybe_fatal. 12702 potential user: maybe_fatal.
12674 12703
12675 2008-12-11 Chong Yidong <cyd@stupidchicken.com> 12704 2008-12-11 Chong Yidong <cyd@stupidchicken.com>
12676 12705
12677 * term.c (tty_free_frame_resources): Renamed from delete_tty_output; 12706 * term.c (tty_free_frame_resources): Rename from delete_tty_output;
12678 all callers changed. Call free_frame_faces to free the face cache. 12707 all callers changed. Call free_frame_faces to free the face cache.
12679 12708
12680 2008-12-11 Jason Rumney <jasonr@gnu.org> 12709 2008-12-11 Jason Rumney <jasonr@gnu.org>
12681 12710
12682 * w32font.c (fill_in_logfont): Don't assume symbol script means 12711 * w32font.c (fill_in_logfont): Don't assume symbol script means
18002 (FONT_WEIGHT_SYMBOLIC, FONT_SLANT_SYMBOLIC, FONT_WIDTH_SYMBOLIC) 18031 (FONT_WEIGHT_SYMBOLIC, FONT_SLANT_SYMBOLIC, FONT_WIDTH_SYMBOLIC)
18003 (FONT_WEIGHT_FOR_FACE, FONT_SLANT_FOR_FACE, FONT_WIDTH_FOR_FACE) 18032 (FONT_WEIGHT_FOR_FACE, FONT_SLANT_FOR_FACE, FONT_WIDTH_FOR_FACE)
18004 (FONT_WEIGHT_NAME_NUMERIC, FONT_SLANT_NAME_NUMERIC) 18033 (FONT_WEIGHT_NAME_NUMERIC, FONT_SLANT_NAME_NUMERIC)
18005 (FONT_WIDTH_NAME_NUMERIC, FONT_SET_STYLE): New macros. 18034 (FONT_WIDTH_NAME_NUMERIC, FONT_SET_STYLE): New macros.
18006 (struct font_spec, struct font_entity): New structs. 18035 (struct font_spec, struct font_entity): New structs.
18007 (FONT_ENCODING_NOT_DECIDED): Moved from fontset.h. 18036 (FONT_ENCODING_NOT_DECIDED): Move from fontset.h.
18008 (struct font): Many members from old "struct font_info" moved to 18037 (struct font): Many members from old "struct font_info" moved to
18009 here. Members font and entity deleted. 18038 here. Members font and entity deleted.
18010 (FONT_SPEC_P, FONT_ENTITY_P, FONT_OBJECT_P, FONTP): Modified for 18039 (FONT_SPEC_P, FONT_ENTITY_P, FONT_OBJECT_P, FONTP): Modified for
18011 the new font-related objects. 18040 the new font-related objects.
18012 (CHECK_FONT_SPEC, CHECK_FONT_ENTITY, CHECK_FONT_OBJECT) 18041 (CHECK_FONT_SPEC, CHECK_FONT_ENTITY, CHECK_FONT_OBJECT)
18013 (CHECK_FONT_GET_OBJECT): Likewise. 18042 (CHECK_FONT_GET_OBJECT): Likewise.
18014 (XFONT_SPEC, XFONT_ENTITY, XFONT_OBJECT, XSETFONT): New macros. 18043 (XFONT_SPEC, XFONT_ENTITY, XFONT_OBJECT, XSETFONT): New macros.
18015 (PT_PER_INCH, POINT_TO_PIXEL, PIXEL_TO_POINT): Moved from font.h. 18044 (PT_PER_INCH, POINT_TO_PIXEL, PIXEL_TO_POINT): Move from font.h.
18016 (struct font_driver): New members case_sensitive anc check. 18045 (struct font_driver): New members case_sensitive anc check.
18017 Type of the member list and open changed. 18046 Type of the member list and open changed.
18018 (enable_font_backend, font_symbolic_weight, font_symbolic_slant) 18047 (enable_font_backend, font_symbolic_weight, font_symbolic_slant)
18019 (font_symbolic_width, font_find_object, font_get_spec) 18048 (font_symbolic_width, font_find_object, font_get_spec)
18020 (font_set_lface_from_name): Delete extern. 18049 (font_set_lface_from_name): Delete extern.
18022 18051
18023 * font.c: Include <strings.h>. 18052 * font.c: Include <strings.h>.
18024 (enable_font_backend): Delete it. 18053 (enable_font_backend): Delete it.
18025 (Qfont_spec, Qfont_entity, Qfont_object): New variables. 18054 (Qfont_spec, Qfont_entity, Qfont_object): New variables.
18026 (CHECK_VALIDATE_FONT_SPEC): Delete it. 18055 (CHECK_VALIDATE_FONT_SPEC): Delete it.
18027 (PT_PER_INCH, POINT_TO_PIXEL, PIXEL_TO_POINT): Moved to font.h. 18056 (PT_PER_INCH, POINT_TO_PIXEL, PIXEL_TO_POINT): Move to font.h.
18028 (null_string): Delete it. 18057 (null_string): Delete it.
18029 (null_vector): Make it static. 18058 (null_vector): Make it static.
18030 (font_family_alist): Delete it. 18059 (font_family_alist): Delete it.
18031 (Qnormal): Extern it. 18060 (Qnormal): Extern it.
18032 (QCextra, QClanguage): Delete it. 18061 (QCextra, QClanguage): Delete it.
18033 (QClang, QCavgwidth, QCfont_entity, QCfc_unknown_spec): New variables. 18062 (QClang, QCavgwidth, QCfont_entity, QCfc_unknown_spec): New variables.
18034 (font_make_spec, font_make_entity, font_make_object) 18063 (font_make_spec, font_make_entity, font_make_object)
18035 (font_intern_prop): Renamed from intern_downcase. Don't downcase 18064 (font_intern_prop): Rename from intern_downcase. Don't downcase
18036 the string. Callers changed. 18065 the string. Callers changed.
18037 (font_pixel_size): Adjust for the format change of font-related 18066 (font_pixel_size): Adjust for the format change of font-related
18038 objects. 18067 objects.
18039 (prop_name_to_numeric, prop_numeric_to_name): Delete them. 18068 (prop_name_to_numeric, prop_numeric_to_name): Delete them.
18040 (font_style_to_value, font_style_symbolic): New function. 18069 (font_style_to_value, font_style_symbolic): New function.
18050 (font_prop_validate): Arguments changed. 18079 (font_prop_validate): Arguments changed.
18051 (font_put_extra): Adjust for the change of font-related objects. 18080 (font_put_extra): Adjust for the change of font-related objects.
18052 (font_expand_wildcards, font_parse_xlfd, font_unparse_xlfd) 18081 (font_expand_wildcards, font_parse_xlfd, font_unparse_xlfd)
18053 (font_parse_fcname, font_unparse_fcname) 18082 (font_parse_fcname, font_unparse_fcname)
18054 (font_prepare_composition): Likewise. 18083 (font_prepare_composition): Likewise.
18055 (font_parse_family_registry): Renamed from font_merge_old_spec. 18084 (font_parse_family_registry): Rename from font_merge_old_spec.
18056 (otf_open): Delete the 1st arg entity. 18085 (otf_open): Delete the 1st arg entity.
18057 (font_otf_capability): Adjust for the above change. 18086 (font_otf_capability): Adjust for the above change.
18058 (font_score): New arg alternate_families. Adjusted for the change 18087 (font_score): New arg alternate_families. Adjusted for the change
18059 of font-related objects. 18088 of font-related objects.
18060 (font_sort_entites): New arg best_only. 18089 (font_sort_entites): New arg best_only.
18078 (font_at): Adjust for the change of font-related objects. 18107 (font_at): Adjust for the change of font-related objects.
18079 (font_range): New function. 18108 (font_range): New function.
18080 (Ffontp, Ffont_spec, Ffont_get, Ffont_put, Flist_fonts) 18109 (Ffontp, Ffont_spec, Ffont_get, Ffont_put, Flist_fonts)
18081 (Ffont_xlfd_name): Adjust for the change of font-related objects. 18110 (Ffont_xlfd_name): Adjust for the change of font-related objects.
18082 (Fcopy_font_spec, Fmerge_font_spec): New function. 18111 (Fcopy_font_spec, Fmerge_font_spec): New function.
18083 (Ffont_family_list): Renamed from list-families. 18112 (Ffont_family_list): Rename from list-families.
18084 (Finternal_set_font_style_table): Arguments changed. 18113 (Finternal_set_font_style_table): Arguments changed.
18085 (Ffont_fill_gstring, Ffont_shape_text, Fopen_font) 18114 (Ffont_fill_gstring, Ffont_shape_text, Fopen_font)
18086 (Ffont_drive_otf, Fquery_font, Ffont_match_p): Adjust for the 18115 (Ffont_drive_otf, Fquery_font, Ffont_match_p): Adjust for the
18087 change of font-related objects. 18116 change of font-related objects.
18088 (syms_of_font): Delete "ifdef USE_FONT_BACKEND". DEFSYM new symbols. 18117 (syms_of_font): Delete "ifdef USE_FONT_BACKEND". DEFSYM new symbols.
18089 18118
18090 * fontset.h (struct font_info): Delete it. Most members go to 18119 * fontset.h (struct font_info): Delete it. Most members go to
18091 struct font. 18120 struct font.
18092 (FONT_ENCODING_NOT_DECIDED): Moved to font.h. 18121 (FONT_ENCODING_NOT_DECIDED): Move to font.h.
18093 (enum FONT_SPEC_INDEX): Delete it. 18122 (enum FONT_SPEC_INDEX): Delete it.
18094 (font_info, list_fonts_func, load_font_func, query_font_func) 18123 (font_info, list_fonts_func, load_font_func, query_font_func)
18095 (set_frame_fontset_func, find_ccl_program_func) 18124 (set_frame_fontset_func, find_ccl_program_func)
18096 (get_font_repertory_func, new_fontset_from_font_name): 18125 (get_font_repertory_func, new_fontset_from_font_name):
18097 Delete externs. 18126 Delete externs.
18129 (Fset_fontset_font): Likewise. Use new macros to set elements of 18158 (Fset_fontset_font): Likewise. Use new macros to set elements of
18130 font-def. 18159 font-def.
18131 (Fnew_fontset): Use font_unparse_xlfd to generate 18160 (Fnew_fontset): Use font_unparse_xlfd to generate
18132 FONTSET_ASCII (fontset). 18161 FONTSET_ASCII (fontset).
18133 (new_fontset_from_font_name): Deleted. 18162 (new_fontset_from_font_name): Deleted.
18134 (fontset_from_font): Renamed from new_fontset_from_font. Check if 18163 (fontset_from_font): Rename from new_fontset_from_font. Check if
18135 a fontset is already created for the font. FIx updating of 18164 a fontset is already created for the font. FIx updating of
18136 Vfontset_alias_alist. 18165 Vfontset_alias_alist.
18137 (fontset_ascii_font): Deleted. 18166 (fontset_ascii_font): Deleted.
18138 (Ffont_info): Adjust for the format change of font-spec. 18167 (Ffont_info): Adjust for the format change of font-spec.
18139 (Finternal_char_font): Likewise. 18168 (Finternal_char_font): Likewise.
18238 (LFACE_AVGWIDTH): Deleted. 18267 (LFACE_AVGWIDTH): Deleted.
18239 (check_lface_attrs): Don't check LFACE_AVGWIDTH. Check LFACE_FONT 18268 (check_lface_attrs): Don't check LFACE_AVGWIDTH. Check LFACE_FONT
18240 by FONTP. 18269 by FONTP.
18241 (lface_fully_specified_p): Don't check LFACE_AVGWIDTH. 18270 (lface_fully_specified_p): Don't check LFACE_AVGWIDTH.
18242 (set_lface_from_font_name): Delete it. 18271 (set_lface_from_font_name): Delete it.
18243 (set_lface_from_font): Renamed from 18272 (set_lface_from_font): Rename from
18244 set_lface_from_font_and_fontset. Caller changed. Don't set 18273 set_lface_from_font_and_fontset. Caller changed. Don't set
18245 LFACE_AVGWIDTH. Use FONT_XXX_FOR_FACE to get a symbol suitable 18274 LFACE_AVGWIDTH. Use FONT_XXX_FOR_FACE to get a symbol suitable
18246 for face. 18275 for face.
18247 (merge_face_vectors): Copy font-spec if necessary. 18276 (merge_face_vectors): Copy font-spec if necessary.
18248 Clear properties of the font-spec if necessary. 18277 Clear properties of the font-spec if necessary.
18279 get_font_repertory_func. 18308 get_font_repertory_func.
18280 18309
18281 * xfont.c: Include <stdlib.h> and "ccl.h". 18310 * xfont.c: Include <stdlib.h> and "ccl.h".
18282 (struct xfont_info): New structure. 18311 (struct xfont_info): New structure.
18283 (xfont_query_font): Deleted. 18312 (xfont_query_font): Deleted.
18284 (xfont_find_ccl_program): Renamed from x_find_ccl_program and 18313 (xfont_find_ccl_program): Rename from x_find_ccl_program and
18285 moved from xterm.c. 18314 moved from xterm.c.
18286 (xfont_driver): Adjust for the change of struct font_driver. 18315 (xfont_driver): Adjust for the change of struct font_driver.
18287 (compare_font_names): New function. 18316 (compare_font_names): New function.
18288 (xfont_list_pattern): Sort font names case insensitively. Make 18317 (xfont_list_pattern): Sort font names case insensitively.
18289 font_entity by calling font_make_entity. Avoid auto-scaled fonts. 18318 Make font_entity by calling font_make_entity. Avoid auto-scaled fonts.
18290 (xfont_list): Return a list, not vector. 18319 (xfont_list): Return a list, not vector.
18291 (xfont_match): If the font doesn't have QCname property, generate 18320 (xfont_match): If the font doesn't have QCname property, generate
18292 a name from the other font properties. 18321 a name from the other font properties.
18293 (xfont_open): Return a font-object. Adjusted for the change of 18322 (xfont_open): Return a font-object. Adjusted for the change of
18294 struct font. Get underline_thickness and underline_position from 18323 struct font. Get underline_thickness and underline_position from
18332 `struct face'. 18361 `struct face'.
18333 (x_draw_glyph_string_foreground) 18362 (x_draw_glyph_string_foreground)
18334 (x_draw_composite_glyph_string_foreground): Likewise. 18363 (x_draw_composite_glyph_string_foreground): Likewise.
18335 (x_draw_glyph_string): Likewise. Use font->underline_position and 18364 (x_draw_glyph_string): Likewise. Use font->underline_position and
18336 font->underline_thickness. 18365 font->underline_thickness.
18337 (x_new_font): Renamed from x_new_fontset2. 18366 (x_new_font): Rename from x_new_fontset2.
18338 (x_new_fontset, x_get_font_info, x_list_fonts): Deleted. 18367 (x_new_fontset, x_get_font_info, x_list_fonts): Deleted.
18339 (x_check_font): Call `check' method of a font driver. 18368 (x_check_font): Call `check' method of a font driver.
18340 (x_font_min_bounds, x_compute_min_glyph_bounds, x_load_font) 18369 (x_font_min_bounds, x_compute_min_glyph_bounds, x_load_font)
18341 (x_query_font, x_get_font_repertory): Deleted. 18370 (x_query_font, x_get_font_repertory): Deleted.
18342 (x_find_ccl_program): Renamed and moved to xfont.c. 18371 (x_find_ccl_program): Rename and moved to xfont.c.
18343 (x_redisplay_interface): Adjust for the change of `struct 18372 (x_redisplay_interface): Adjust for the change of `struct
18344 redisplay_interface'. 18373 redisplay_interface'.
18345 18374
18346 * w32fns.c: Throughout the file, delete all USE_FONT_BACKEND 18375 * w32fns.c: Throughout the file, delete all USE_FONT_BACKEND
18347 conditionals. Don't check enable_font_backend. Delete all codes 18376 conditionals. Don't check enable_font_backend. Delete all codes
18362 (w32font_open): Return a font-object. Make a font-object by 18391 (w32font_open): Return a font-object. Make a font-object by
18363 font_make_object. Adjusted for the change of struct w32font_info. 18392 font_make_object. Adjusted for the change of struct w32font_info.
18364 (w32font_close): Don't free struct font. Adjusted for the change 18393 (w32font_close): Don't free struct font. Adjusted for the change
18365 of struct w32font_info. 18394 of struct w32font_info.
18366 (w32font_encode_char, w32font_text_extents, w32font_draw): 18395 (w32font_encode_char, w32font_text_extents, w32font_draw):
18367 Adjusted for the change of struct w32font_info. 18396 Adjust for the change of struct w32font_info.
18368 (w32font_draw): Likewise. 18397 (w32font_draw): Likewise.
18369 (w32font_list_internal): Return a list, not vector. 18398 (w32font_list_internal): Return a list, not vector.
18370 (w32font_open_internal): Change the 4th arg to font-object. 18399 (w32font_open_internal): Change the 4th arg to font-object.
18371 Adjusted for the change of struct w32font_info and font-object format. 18400 Adjusted for the change of struct w32font_info and font-object format.
18372 (add_font_name_to_list): Don't downcase names. 18401 (add_font_name_to_list): Don't downcase names.
19764 2008-03-01 Jan Djärv <jan.h.d@swipnet.se> 19793 2008-03-01 Jan Djärv <jan.h.d@swipnet.se>
19765 19794
19766 * xterm.c (handle_one_xevent): For Gtk+ and ConfigureNotify, call 19795 * xterm.c (handle_one_xevent): For Gtk+ and ConfigureNotify, call
19767 xg_frame_resized when the event is for the edit widget. 19796 xg_frame_resized when the event is for the edit widget.
19768 19797
19769 * gtkutil.h (xg_frame_resized): Renamed from xg_resize_widgets. 19798 * gtkutil.h (xg_frame_resized): Rename from xg_resize_widgets.
19770 19799
19771 * gtkutil.c (xg_resize_outer_widget): Only do one of set_geometry or 19800 * gtkutil.c (xg_resize_outer_widget): Only do one of set_geometry or
19772 set_char_size. 19801 set_char_size.
19773 (xg_frame_resized): Renamed from xg_resize_widgets. Remove all 19802 (xg_frame_resized): Rename from xg_resize_widgets. Remove all
19774 operations on widgets here. Just set frame size if needed. 19803 operations on widgets here. Just set frame size if needed.
19775 (flush_and_sync, x_wm_size_hint_off, xg_pack_tool_bar): New functions. 19804 (flush_and_sync, x_wm_size_hint_off, xg_pack_tool_bar): New functions.
19776 (xg_frame_set_char_size): Call x_wm_size_hint_off before resizing. 19805 (xg_frame_set_char_size): Call x_wm_size_hint_off before resizing.
19777 (x_wm_set_size_hint): Set size hints on the edit widget only, not 19806 (x_wm_set_size_hint): Set size hints on the edit widget only, not
19778 the whole frame. 19807 the whole frame.
22164 * font.h (struct font): Fix typo. 22193 * font.h (struct font): Fix typo.
22165 22194
22166 * font.c (enum xlfd_field_index): Rename XLFD_XXX_SIZE_INDEX to 22195 * font.c (enum xlfd_field_index): Rename XLFD_XXX_SIZE_INDEX to
22167 XLFD_XXX_INDEX. 22196 XLFD_XXX_INDEX.
22168 (enum xlfd_field_mask): New enum. 22197 (enum xlfd_field_mask): New enum.
22169 (intern_font_field): Changed argument. Change caller. If digits 22198 (intern_font_field): Change argument. Change caller. If digits
22170 are followed by non-digits, return a symbol. 22199 are followed by non-digits, return a symbol.
22171 (font_expand_wildcards): New function. 22200 (font_expand_wildcards): New function.
22172 (font_parse_xlfd): Fix wildcard handling. 22201 (font_parse_xlfd): Fix wildcard handling.
22173 (Ffont_spec): If :name is specified, reflect the info in the other 22202 (Ffont_spec): If :name is specified, reflect the info in the other
22174 properties. 22203 properties.
24904 (emacs_mule_char): New arg src. Delete arg `composition'. 24933 (emacs_mule_char): New arg src. Delete arg `composition'.
24905 Change caller. Handle 2-byte and 3-byte charsets correctly. 24934 Change caller. Handle 2-byte and 3-byte charsets correctly.
24906 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Rename from 24935 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Rename from
24907 DECODE_EMACS_MULE_COMPOSITION_RULE. Change caller. 24936 DECODE_EMACS_MULE_COMPOSITION_RULE. Change caller.
24908 (DECODE_EMACS_MULE_COMPOSITION_RULE_21): New macro. 24937 (DECODE_EMACS_MULE_COMPOSITION_RULE_21): New macro.
24909 (DECODE_EMACS_MULE_21_COMPOSITION): Call 24938 (DECODE_EMACS_MULE_21_COMPOSITION):
24910 DECODE_EMACS_MULE_COMPOSITION_RULE_21. Produce correct annotation 24939 Call DECODE_EMACS_MULE_COMPOSITION_RULE_21. Produce correct annotation
24911 sequence. 24940 sequence.
24912 (decode_coding_emacs_mule): Handle composition correctly. Rewind 24941 (decode_coding_emacs_mule): Handle composition correctly. Rewind
24913 `src' and `consumed_chars' correctly before calling emacs_mule_char. 24942 `src' and `consumed_chars' correctly before calling emacs_mule_char.
24914 (DECODE_COMPOSITION_START): Correctly handle the case of altchar 24943 (DECODE_COMPOSITION_START): Correctly handle the case of altchar
24915 and alt&rule composition. 24944 and alt&rule composition.
25326 (CHARACTERBITS): Define as 22. 25355 (CHARACTERBITS): Define as 22.
25327 (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjust for the above change. 25356 (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjust for the above change.
25328 (SUB_CHAR_TABLE_P): Check PVEC_CHAR_TABLE. 25357 (SUB_CHAR_TABLE_P): Check PVEC_CHAR_TABLE.
25329 (GC_SUB_CHAR_TABLE_P): New macro. 25358 (GC_SUB_CHAR_TABLE_P): New macro.
25330 (Fencode_coding_string, Fdecode_coding_string): Update EXFUN. 25359 (Fencode_coding_string, Fdecode_coding_string): Update EXFUN.
25331 (code_convert_string_norecord): Deleted extern. 25360 (code_convert_string_norecord): Delete extern.
25332 (init_character_once, syms_of_character, init_charset) 25361 (init_character_once, syms_of_character, init_charset)
25333 (syms_of_composite, Qeq, Fmakehash, insert_from_gap): Extern them. 25362 (syms_of_composite, Qeq, Fmakehash, insert_from_gap): Extern them.
25334 25363
25335 * lread.c: Include "character.h". 25364 * lread.c: Include "character.h".
25336 (read_multibyte): New arg NBYTES. 25365 (read_multibyte): New arg NBYTES.