Mercurial > emacs

comparison src/ChangeLog @ 58516:3bd95b9c636a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 25 Nov 2004 16:48:45 +0000
parents dc83ecc1ac97
children 1a5509ec45da
comparison
equal deleted inserted replaced
58515:48ee6f993bc1 58516:3bd95b9c636a
15 x-use-old-gtk-file-dialog. 15 x-use-old-gtk-file-dialog.
16 16
17 * xfns.c: Define x_use_old_gtk_file_dialog. 17 * xfns.c: Define x_use_old_gtk_file_dialog.
18 (syms_of_xfns): Rename use-old-gtk-file-dialog to x-... Move it 18 (syms_of_xfns): Rename use-old-gtk-file-dialog to x-... Move it
19 outside ifdef USE_GTK. 19 outside ifdef USE_GTK.
20
21 2004-11-23 Stefan Monnier <monnier@iro.umontreal.ca>
22
23 * coding.h (ENCODE_FILE, DECODE_FILE, ENCODE_SYSTEM, DECODE_SYSTEM):
24 Don't use XFASTINT blindly.
25
26 * config.in (RE_TRANSLATE_P): Don't use XFASTINT blindly.
27
28 * indent.c (skip_invisible): Avoid non-idempotent side-effects
29 in macro arguments.
30
31 * keymap.c (Flookup_key): Check INTEGERP before XINT.
32
33 * lread.c (oblookup): Don't use XFASTINT blindly.
34
35 * window.c (Fset_window_scroll_bars): Don't use XINT if it isn't int.
36 (decode_next_window_args, window_loop): Don't use XFASTINT blindly.
20 37
21 2004-11-23 Kim F. Storm <storm@cua.dk> 38 2004-11-23 Kim F. Storm <storm@cua.dk>
22 39
23 * dispextern.h (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P) 40 * dispextern.h (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P)
24 (MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P): Not if dpvec_index is zero. 41 (MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P): Not if dpvec_index is zero.
6396 6413
6397 * lread.c (openp): Make sure STR is a string. 6414 * lread.c (openp): Make sure STR is a string.
6398 6415
6399 2003-06-01 David Ponce <david@dponce.com> 6416 2003-06-01 David Ponce <david@dponce.com>
6400 6417
6401 * termhooks.h (enum event_kind): Added new WHEEL_EVENT event. 6418 * termhooks.h (enum event_kind): Add new WHEEL_EVENT event.
6402 Declare MOUSE_WHEEL_EVENT only if MAC_OSX defined. 6419 Declare MOUSE_WHEEL_EVENT only if MAC_OSX defined.
6403 6420
6404 * keyboard.c (Qmouse_wheel): Declare only if MAC_OSX defined. 6421 * keyboard.c (Qmouse_wheel): Declare only if MAC_OSX defined.
6405 (mouse_wheel_syms, lispy_mouse_wheel_names): Likewise. 6422 (mouse_wheel_syms, lispy_mouse_wheel_names): Likewise.
6406 (discard_mouse_events): Discard WHEEL_EVENT events too. 6423 (discard_mouse_events): Discard WHEEL_EVENT events too.
6407 (lispy_wheel_names, wheel_syms): New. 6424 (lispy_wheel_names, wheel_syms): New.
6408 (syms_of_keyboard): Init and staticpro `wheel_syms'. Init and 6425 (syms_of_keyboard): Init and staticpro `wheel_syms'. Init and
6409 staticpro `Qmouse_wheel' and `mouse_wheel_syms' only if MAC_OSX 6426 staticpro `Qmouse_wheel' and `mouse_wheel_syms' only if MAC_OSX defined.
6410 defined.
6411 (make_lispy_event): Add WHEEL_EVENT handler. 6427 (make_lispy_event): Add WHEEL_EVENT handler.
6412 6428
6413 * w32term.c (construct_mouse_wheel): Construct WHEEL_EVENT. 6429 * w32term.c (construct_mouse_wheel): Construct WHEEL_EVENT.
6414 (w32_read_socket): Map w32 WM_MOUSEWHEEL events to Emacs 6430 (w32_read_socket): Map w32 WM_MOUSEWHEEL events to Emacs
6415 WHEEL_EVENT events. 6431 WHEEL_EVENT events.
6447 * coding.c (ccl_coding_driver): Set ccl->eight_bit_control 6463 * coding.c (ccl_coding_driver): Set ccl->eight_bit_control
6448 properly before calling ccl_driver. 6464 properly before calling ccl_driver.
6449 6465
6450 * ccl.h (struct ccl_program) <eight_bit_control>: Comment fixed. 6466 * ccl.h (struct ccl_program) <eight_bit_control>: Comment fixed.
6451 6467
6452 * ccl.c (CCL_WRITE_CHAR): Increment extra_bytes only when it is 6468 * ccl.c (CCL_WRITE_CHAR): Increment extra_bytes only when it is nonzero.
6453 nonzero.
6454 (ccl_driver): Initialize extra_bytes to ccl->eight_bit_control. 6469 (ccl_driver): Initialize extra_bytes to ccl->eight_bit_control.
6455 (setup_ccl_program): Initialize ccl->eight_bit_control to zero. 6470 (setup_ccl_program): Initialize ccl->eight_bit_control to zero.
6456 6471
6457 2003-05-29 Glenn Morris <gmorris@ast.cam.ac.uk> 6472 2003-05-29 Glenn Morris <gmorris@ast.cam.ac.uk>
6458 6473
6464 * coding.c (decode_coding_iso2022): Pay attention to the byte 6479 * coding.c (decode_coding_iso2022): Pay attention to the byte
6465 sequence of CTEXT extended segment, and retain those bytes as is. 6480 sequence of CTEXT extended segment, and retain those bytes as is.
6466 6481
6467 2003-05-28 Kenichi Handa <handa@m17n.org> 6482 2003-05-28 Kenichi Handa <handa@m17n.org>
6468 6483
6469 * coding.c (ENCODE_UNSAFE_CHARACTER): Adjusted for the name change 6484 * coding.c (ENCODE_UNSAFE_CHARACTER): Adjust for the name change
6470 of CODING_REPLACEMENT_CHARACTER. 6485 of CODING_REPLACEMENT_CHARACTER.
6471 (decode_coding_iso2022): If CODING_FLAG_ISO_SAFE, set 6486 (decode_coding_iso2022): If CODING_FLAG_ISO_SAFE, set
6472 CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag in coding->mode, and 6487 CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag in coding->mode, and
6473 check this flag on encoding. 6488 check this flag on encoding.
6474 (encode_coding_sjis_big5): Check 6489 (encode_coding_sjis_big5):
6475 CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag of coding->mode. 6490 Check CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag of coding->mode.
6476 (Fset_terminal_coding_system_internal): Set 6491 (Fset_terminal_coding_system_internal):
6477 CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag in terminal_coding.mode 6492 Set CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag in terminal_coding.mode
6478 instead of setting CODING_FLAG_ISO_SAFE flag in 6493 instead of setting CODING_FLAG_ISO_SAFE flag in terminal_coding.flags.
6479 terminal_coding.flags. 6494
6480 6495 * coding.h (CODING_REPLACEMENT_CHARACTER): Rename from
6481 * coding.h (CODING_REPLACEMENT_CHARACTER): Renamed from
6482 CODING_INHIBIT_CHARACTER_SUBSTITUTION. 6496 CODING_INHIBIT_CHARACTER_SUBSTITUTION.
6483 (CODING_MODE_INHIBIT_UNENCODABLE_CHAR): New macro. 6497 (CODING_MODE_INHIBIT_UNENCODABLE_CHAR): New macro.
6484 6498
6485 2003-05-28 Richard M. Stallman <rms@gnu.org> 6499 2003-05-28 Richard M. Stallman <rms@gnu.org>
6486 6500
6618 config_scroll_bar_width, and scroll_bar_cols to 6632 config_scroll_bar_width, and scroll_bar_cols to
6619 config_scroll_bar_cols. All uses changed. 6633 config_scroll_bar_cols. All uses changed.
6620 (struct frame): New member scroll_bar_actual_width which 6634 (struct frame): New member scroll_bar_actual_width which
6621 consolidates and renames the vertical_scroll_bar_extra member of 6635 consolidates and renames the vertical_scroll_bar_extra member of
6622 x_output, w32_output, and mac_output structures. All uses changed. 6636 x_output, w32_output, and mac_output structures. All uses changed.
6623 (FRAME_PIXEL_HEIGHT): Renamed from PIXEL_HEIGHT and moved 6637 (FRAME_PIXEL_HEIGHT): Rename from PIXEL_HEIGHT and moved
6624 from x/w32/macterm.h files. All uses changed. Also change code 6638 from x/w32/macterm.h files. All uses changed. Also change code
6625 which referred to f->output_data...->pixel_height. 6639 which referred to f->output_data...->pixel_height.
6626 (FRAME_PIXEL_WIDTH): Renamed from PIXEL_WIDTH and moved 6640 (FRAME_PIXEL_WIDTH): Rename from PIXEL_WIDTH and moved
6627 from x/w32/macterm.h files. All uses changed. Also change code 6641 from x/w32/macterm.h files. All uses changed. Also change code
6628 which referred to f->output_data...->pixel_width. 6642 which referred to f->output_data...->pixel_width.
6629 (FRAME_LINES): Renamed from FRAME_HEIGHT. All uses changed. 6643 (FRAME_LINES): Rename from FRAME_HEIGHT. All uses changed.
6630 Also change code which referred to f->height. 6644 Also change code which referred to f->height.
6631 (FRAME_COLS): Renamed from FRAME_WIDTH. All uses changed. 6645 (FRAME_COLS): Rename from FRAME_WIDTH. All uses changed.
6632 Also change code which referred to f->width. 6646 Also change code which referred to f->width.
6633 (FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH): Remove macros; change uses 6647 (FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH): Remove macros; change uses
6634 to update new_text_lines and new_text_cols members directly. 6648 to update new_text_lines and new_text_cols members directly.
6635 (FRAME_CONFIG_SCROLL_BAR_WIDTH): Renamed from 6649 (FRAME_CONFIG_SCROLL_BAR_WIDTH): Rename from
6636 FRAME_SCROLL_BAR_PIXEL_WIDTH. All uses changed. 6650 FRAME_SCROLL_BAR_PIXEL_WIDTH. All uses changed.
6637 (FRAME_CONFIG_SCROLL_BAR_COLS): Renamed from 6651 (FRAME_CONFIG_SCROLL_BAR_COLS): Rename from
6638 FRAME_SCROLL_BAR_COLS. All uses changed. 6652 FRAME_SCROLL_BAR_COLS. All uses changed.
6639 (FRAME_LEFT_SCROLL_BAR_COLS, FRAME_RIGHT_SCROLL_BAR_COLS): 6653 (FRAME_LEFT_SCROLL_BAR_COLS, FRAME_RIGHT_SCROLL_BAR_COLS):
6640 Renamed from FRAME_LEFT_SCROLL_BAR_WIDTH and 6654 Rename from FRAME_LEFT_SCROLL_BAR_WIDTH and
6641 FRAME_RIGHT_SCROLL_BAR_WIDTH, resp. All uses changed. 6655 FRAME_RIGHT_SCROLL_BAR_WIDTH, resp. All uses changed.
6642 (FRAME_SCROLL_BAR_AREA_WIDTH, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH) 6656 (FRAME_SCROLL_BAR_AREA_WIDTH, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
6643 (FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH): New macros. 6657 (FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH): New macros.
6644 (FRAME_TOTAL_COLS): Renamed from FRAME_WINDOW_WIDTH. 6658 (FRAME_TOTAL_COLS): Rename from FRAME_WINDOW_WIDTH.
6645 (SET_FRAME_COLS): Renamed from SET_FRAME_WIDTH. 6659 (SET_FRAME_COLS): Rename from SET_FRAME_WIDTH.
6646 (FRAME_TOTAL_COLS_ARG): Renamed from FRAME_WINDOW_WIDTH_ARG. 6660 (FRAME_TOTAL_COLS_ARG): Rename from FRAME_WINDOW_WIDTH_ARG.
6647 (WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Remove unused macro. 6661 (WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Remove unused macro.
6648 (WINDOW_VERTICAL_SCROLL_BAR_HEIGHT): Remove unused macro. 6662 (WINDOW_VERTICAL_SCROLL_BAR_HEIGHT): Remove unused macro.
6649 (FRAME_LINE_HEIGHT): Renamed from CANON_Y_UNIT. Unconditionally 6663 (FRAME_LINE_HEIGHT): Rename from CANON_Y_UNIT.
6650 return line_height member (it now has proper value also for 6664 Unconditionally return line_height member (it now has proper value
6651 non-window frames). 6665 also for non-window frames).
6652 (FRAME_COLUMN_WIDTH): Renamed from CANON_X_UNIT. Unconditionally 6666 (FRAME_COLUMN_WIDTH): Rename from CANON_X_UNIT. Unconditionally
6653 return new column_width member (rather than the default font width). 6667 return new column_width member (rather than the default font width).
6654 (FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH) 6668 (FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH)
6655 (FRAME_RIGHT_FRINGE_WIDTH): Renamed from FRAME_X_... and moved 6669 (FRAME_RIGHT_FRINGE_WIDTH): Rename from FRAME_X_... and moved
6656 from x/w32/macterm.h files. Unconditionally return corresponding 6670 from x/w32/macterm.h files. Unconditionally return corresponding
6657 member of frame structure (they now have proper values also for 6671 member of frame structure (they now have proper values also for
6658 non-window frames). 6672 non-window frames).
6659 (FRAME_TOTAL_FRINGE_WIDTH): Renamed from FRAME_FRINGE_WIDTH. 6673 (FRAME_TOTAL_FRINGE_WIDTH): Rename from FRAME_FRINGE_WIDTH.
6660 Calculate return value from left and right widths. 6674 Calculate return value from left and right widths.
6661 (FRAME_INTERNAL_BORDER_WIDTH): Unconditionally return 6675 (FRAME_INTERNAL_BORDER_WIDTH): Unconditionally return
6662 internal_border_width member (has proper value for non-window frame). 6676 internal_border_width member (has proper value for non-window frame).
6663 (FRAME_PIXEL_X_FROM_CANON_X): Renamed from PIXEL_X_FROM_CANON_X. 6677 (FRAME_PIXEL_X_FROM_CANON_X): Rename from PIXEL_X_FROM_CANON_X.
6664 (FRAME_PIXEL_Y_FROM_CANON_Y): Renamed from PIXEL_Y_FROM_CANON_Y. 6678 (FRAME_PIXEL_Y_FROM_CANON_Y): Rename from PIXEL_Y_FROM_CANON_Y.
6665 (FRAME_CANON_X_FROM_PIXEL_X): Renamed from CANON_X_FROM_PIXEL_X. 6679 (FRAME_CANON_X_FROM_PIXEL_X): Rename from CANON_X_FROM_PIXEL_X.
6666 (FRAME_CANON_Y_FROM_PIXEL_Y): Renamed from CANON_Y_FROM_PIXEL_Y. 6680 (FRAME_CANON_Y_FROM_PIXEL_Y): Rename from CANON_Y_FROM_PIXEL_Y.
6667 (FRAME_LINE_TO_PIXEL_Y): Renamed from CHAR_TO_PIXEL_ROW, 6681 (FRAME_LINE_TO_PIXEL_Y): Rename from CHAR_TO_PIXEL_ROW,
6668 consolidated from xterm.h, macterm.h, and w32term.h. 6682 consolidated from xterm.h, macterm.h, and w32term.h.
6669 (FRAME_COL_TO_PIXEL_X): Renamed from CHAR_TO_PIXEL_COL, 6683 (FRAME_COL_TO_PIXEL_X): Rename from CHAR_TO_PIXEL_COL,
6670 consolidated from xterm.h, macterm.h, and w32term.h. 6684 consolidated from xterm.h, macterm.h, and w32term.h.
6671 (FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Renamed from 6685 (FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Rename from
6672 CHAR_TO_PIXEL_WIDTH consolidated from x/mac/w32term.h. 6686 CHAR_TO_PIXEL_WIDTH consolidated from x/mac/w32term.h.
6673 (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Renamed from 6687 (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Rename from
6674 CHAR_TO_PIXEL_HEIGHT consolidated from x/mac/w32term.h. 6688 CHAR_TO_PIXEL_HEIGHT consolidated from x/mac/w32term.h.
6675 (FRAME_PIXEL_Y_TO_LINE): Renamed from PIXEL_TO_CHAR_ROW 6689 (FRAME_PIXEL_Y_TO_LINE): Rename from PIXEL_TO_CHAR_ROW
6676 consolidated from x/mac/w32term.h. 6690 consolidated from x/mac/w32term.h.
6677 (FRAME_PIXEL_X_TO_COL): Renamed from PIXEL_TO_CHAR_COL 6691 (FRAME_PIXEL_X_TO_COL): Rename from PIXEL_TO_CHAR_COL
6678 consolidated from x/mac/w32term.h. 6692 consolidated from x/mac/w32term.h.
6679 (FRAME_PIXEL_WIDTH_TO_TEXT_COLS): Renamed from 6693 (FRAME_PIXEL_WIDTH_TO_TEXT_COLS): Rename from
6680 PIXEL_TO_CHAR_WIDTH consolidated from x/mac/w32term.h. 6694 PIXEL_TO_CHAR_WIDTH consolidated from x/mac/w32term.h.
6681 (FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): Renamed from 6695 (FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): Rename from
6682 PIXEL_TO_CHAR_HEIGHT consolidated from x/mac/w32term.h. 6696 PIXEL_TO_CHAR_HEIGHT consolidated from x/mac/w32term.h.
6683 6697
6684 * window.h (struct window): Rename members left to left_col, 6698 * window.h (struct window): Rename members left to left_col,
6685 top to top_line, height to total_lines, width to total_cols, 6699 top to top_line, height to total_lines, width to total_cols,
6686 left_margin_width to left_margin_cols, right_margin_width to 6700 left_margin_width to left_margin_cols, right_margin_width to
6698 referred to XINT (w->width) * canon_x_unit. 6712 referred to XINT (w->width) * canon_x_unit.
6699 (WINDOW_TOTAL_HEIGHT): New macro. Change relevant code that 6713 (WINDOW_TOTAL_HEIGHT): New macro. Change relevant code that
6700 referred to XINT (w->height) * canon_y_unit. 6714 referred to XINT (w->height) * canon_y_unit.
6701 (WINDOW_LEFT_EDGE_COL): New macro. Change relevant code that 6715 (WINDOW_LEFT_EDGE_COL): New macro. Change relevant code that
6702 referred to XINT (w->left). 6716 referred to XINT (w->left).
6703 (WINDOW_RIGHT_EDGE_COL): Renamed from WINDOW_RIGHT_EDGE. Change 6717 (WINDOW_RIGHT_EDGE_COL): Rename from WINDOW_RIGHT_EDGE. Change
6704 all uses and code that referred to XINT (w->left) + XINT (w->width). 6718 all uses and code that referred to XINT (w->left) + XINT (w->width).
6705 (WINDOW_TOP_EDGE_LINE): New macro. Change relevant code that 6719 (WINDOW_TOP_EDGE_LINE): New macro. Change relevant code that
6706 referred to XINT (w->top). 6720 referred to XINT (w->top).
6707 (WINDOW_BOTTOM_EDGE_LINE): New macro. Change relevant code that 6721 (WINDOW_BOTTOM_EDGE_LINE): New macro. Change relevant code that
6708 referred to XINT (w->top) + XINT (w->height). 6722 referred to XINT (w->top) + XINT (w->height).
6713 (WINDOW_TOP_EDGE_Y): New macro. Change relevant code that 6727 (WINDOW_TOP_EDGE_Y): New macro. Change relevant code that
6714 referred to XINT (w->top) * canon_y_unit. 6728 referred to XINT (w->top) * canon_y_unit.
6715 (WINDOW_BOTTOM_EDGE_Y): New macro. Change relevant code that 6729 (WINDOW_BOTTOM_EDGE_Y): New macro. Change relevant code that
6716 referred to (XINT (w->top) + XINT (w->height)) * canon_y_unit. 6730 referred to (XINT (w->top) + XINT (w->height)) * canon_y_unit.
6717 (WINDOW_LEFTMOST_P): New macro. 6731 (WINDOW_LEFTMOST_P): New macro.
6718 (WINDOW_BOX_LEFT_EDGE_COL): Renamed from WINDOW_LEFT_MARGIN. 6732 (WINDOW_BOX_LEFT_EDGE_COL): Rename from WINDOW_LEFT_MARGIN.
6719 All uses changed. 6733 All uses changed.
6720 (WINDOW_BOX_RIGHT_EDGE_COL): Renamed from WINDOW_RIGHT_MARGIN. 6734 (WINDOW_BOX_RIGHT_EDGE_COL): Rename from WINDOW_RIGHT_MARGIN.
6721 All uses changed. 6735 All uses changed.
6722 (WINDOW_BOX_LEFT_EDGE_X): Renamed from 6736 (WINDOW_BOX_LEFT_EDGE_X): Rename from
6723 WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X, moved from dispextern.h. 6737 WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X, moved from dispextern.h.
6724 Do not exclude left fringe width. 6738 Do not exclude left fringe width.
6725 (WINDOW_BOX_RIGHT_EDGE_X): Renamed from 6739 (WINDOW_BOX_RIGHT_EDGE_X): Rename from
6726 WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X, moved from dispextern.h. 6740 WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X, moved from dispextern.h.
6727 Do not exclude fringe widths. 6741 Do not exclude fringe widths.
6728 (WINDOW_LEFT_FRINGE_WIDTH, WINDOW_RIGHT_FRINGE_WIDTH) 6742 (WINDOW_LEFT_FRINGE_WIDTH, WINDOW_RIGHT_FRINGE_WIDTH)
6729 (WINDOW_FRINGE_COLS, WINDOW_TOTAL_FRINGE_WIDTH): New macros. 6743 (WINDOW_FRINGE_COLS, WINDOW_TOTAL_FRINGE_WIDTH): New macros.
6730 Change relevant code that referred to FRAME_LEFT_FRINGE_WIDTH, 6744 Change relevant code that referred to FRAME_LEFT_FRINGE_WIDTH,
6747 (WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH): New macro. Change code 6761 (WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH): New macro. Change code
6748 that referred to FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT and 6762 that referred to FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT and
6749 FRAME_SCROLL_BAR_WIDTH. 6763 FRAME_SCROLL_BAR_WIDTH.
6750 (WINDOW_SCROLL_BAR_COLS, WINDOW_SCROLL_BAR_AREA_WIDTH) 6764 (WINDOW_SCROLL_BAR_COLS, WINDOW_SCROLL_BAR_AREA_WIDTH)
6751 (WINDOW_SCROLL_BAR_AREA_X): New macros. 6765 (WINDOW_SCROLL_BAR_AREA_X): New macros.
6752 (WINDOW_HEADER_LINE_HEIGHT): Renamed from 6766 (WINDOW_HEADER_LINE_HEIGHT): Rename from
6753 WINDOW_DISPLAY_HEADER_LINE_HEIGHT, moved from dispextern.h. 6767 WINDOW_DISPLAY_HEADER_LINE_HEIGHT, moved from dispextern.h.
6754 (WINDOW_BOX_HEIGHT_NO_MODE_LINE): Renamed from 6768 (WINDOW_BOX_HEIGHT_NO_MODE_LINE): Rename from
6755 WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE, moved from dispextern.h. 6769 WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE, moved from dispextern.h.
6756 (WINDOW_BOX_TEXT_HEIGHT): Renamed from 6770 (WINDOW_BOX_TEXT_HEIGHT): Rename from
6757 WINDOW_DISPLAY_PIXEL_WIDTH, moved from dispextern.h. 6771 WINDOW_DISPLAY_PIXEL_WIDTH, moved from dispextern.h.
6758 (WINDOW_TO_FRAME_PIXEL_X, WINDOW_TO_FRAME_PIXEL_Y) 6772 (WINDOW_TO_FRAME_PIXEL_X, WINDOW_TO_FRAME_PIXEL_Y)
6759 (FRAME_TO_WINDOW_PIXEL_X, FRAME_TO_WINDOW_PIXEL_Y) 6773 (FRAME_TO_WINDOW_PIXEL_X, FRAME_TO_WINDOW_PIXEL_Y)
6760 (WINDOW_TEXT_TO_FRAME_PIXEL_X): Moved here from dispextern.h. 6774 (WINDOW_TEXT_TO_FRAME_PIXEL_X): Move here from dispextern.h.
6761 (WINDOW_LEFT_MARGIN_WIDTH): Renamed from 6775 (WINDOW_LEFT_MARGIN_WIDTH): Rename from
6762 WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH, moved from dispextern.h. 6776 WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH, moved from dispextern.h.
6763 (WINDOW_RIGHT_MARGIN_WIDTH): Renamed from 6777 (WINDOW_RIGHT_MARGIN_WIDTH): Rename from
6764 WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH, moved from dispextern.h. 6778 WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH, moved from dispextern.h.
6765 (window_from_coordinates): Update prototype. 6779 (window_from_coordinates): Update prototype.
6766 (Fset_window_buffer): Update EXFUN. 6780 (Fset_window_buffer): Update EXFUN.
6767 (set_window_buffer): Update prototype. 6781 (set_window_buffer): Update prototype.
6768 6782
6852 new macros in dispextern.h, frame.h and window.h. 6866 new macros in dispextern.h, frame.h and window.h.
6853 (make_window): Initialize new members 6867 (make_window): Initialize new members
6854 left_margin_cols, right_margin_cols, left_fringe_width, 6868 left_margin_cols, right_margin_cols, left_fringe_width,
6855 right_fringe_width, fringes_outside_margins, scroll_bar_width, 6869 right_fringe_width, fringes_outside_margins, scroll_bar_width,
6856 and vertical_scroll_bar_type. 6870 and vertical_scroll_bar_type.
6857 (coordinates_in_window): Adapted to new fringe/margin positions 6871 (coordinates_in_window): Adapt to new fringe/margin positions
6858 and per-window fringes and scroll-bars. 6872 and per-window fringes and scroll-bars.
6859 Fix bug related to incorrectly adjusting coordinates by 6873 Fix bug related to incorrectly adjusting coordinates by
6860 frame's internal_border_width (the effect normally negible since 6874 frame's internal_border_width (the effect normally negible since
6861 the internal_border_width is typically 0 or 1 pixel, but very 6875 the internal_border_width is typically 0 or 1 pixel, but very
6862 noticeable for an internal_border_width of e.g. 25 pixels). 6876 noticeable for an internal_border_width of e.g. 25 pixels).
6887 When splitting horizontally, call adjust_window_margins on both 6901 When splitting horizontally, call adjust_window_margins on both
6888 windows to ensure that the text area of the new windows is non too 6902 windows to ensure that the text area of the new windows is non too
6889 narrow. This fixes a bug which could cause Emacs to trap if the 6903 narrow. This fixes a bug which could cause Emacs to trap if the
6890 width of the split window was less than the width of the display 6904 width of the split window was less than the width of the display
6891 margins. 6905 margins.
6892 (window_box_text_cols): Renamed from window_internal_width. 6906 (window_box_text_cols): Rename from window_internal_width.
6893 All uses changed. Adapt to per-window fringes and scroll bars. 6907 All uses changed. Adapt to per-window fringes and scroll bars.
6894 Fix bug that caused vertical separator to be subtracted also on 6908 Fix bug that caused vertical separator to be subtracted also on
6895 window frames. Fix another bug that did not reduce the returned 6909 window frames. Fix another bug that did not reduce the returned
6896 value by the columns used for display margins. 6910 value by the columns used for display margins.
6897 (window_scroll_line_based): Fix bug related to scrolling too much 6911 (window_scroll_line_based): Fix bug related to scrolling too much
6919 the text area doesn't get too narrow. This fixes a bug which 6933 the text area doesn't get too narrow. This fixes a bug which
6920 could cause Emacs to trap if setting display margins wider than 6934 could cause Emacs to trap if setting display margins wider than
6921 the width of the window. 6935 the width of the window.
6922 (Fset_window_fringes): New defun to allow user to specifically set 6936 (Fset_window_fringes): New defun to allow user to specifically set
6923 this window's fringe widths and position vs. display margins. 6937 this window's fringe widths and position vs. display margins.
6924 (Fwindow_fringes): New defun to return window's actual fringe 6938 (Fwindow_fringes): New defun to return window's actual fringe settings.
6925 settings.
6926 (Fset_window_scroll_bars): New defun to allow user to specifically 6939 (Fset_window_scroll_bars): New defun to allow user to specifically
6927 set this window's scroll bar width and position. 6940 set this window's scroll bar width and position.
6928 (Fwindow_scroll_bars): New defun to return window's actual scroll 6941 (Fwindow_scroll_bars): New defun to return window's actual scroll
6929 bar settings. 6942 bar settings.
6930 (compare_window_configurations): Also compare display margins, 6943 (compare_window_configurations): Also compare display margins,
6987 x_pixels_diff, and y_pixels_diff to struct frame (frame.h). 7000 x_pixels_diff, and y_pixels_diff to struct frame (frame.h).
6988 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h. 7001 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h.
6989 (FRAME_DEFAULT_FONT_WIDTH): Remove macro. 7002 (FRAME_DEFAULT_FONT_WIDTH): Remove macro.
6990 (PIXEL_WIDTH, PIXEL_HEIGHT) 7003 (PIXEL_WIDTH, PIXEL_HEIGHT)
6991 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH) 7004 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH)
6992 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Moved to 7005 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Move to
6993 frame.h and renamed [see frame.h changes]. 7006 frame.h and renamed [see frame.h changes].
6994 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH) 7007 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH)
6995 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) 7008 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL)
6996 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h 7009 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Move to frame.h
6997 and renamed [see frame.h changes]. 7010 and renamed [see frame.h changes].
6998 7011
6999 * xterm.c: Make (several) trivial substitutions for renamed and 7012 * xterm.c: Make (several) trivial substitutions for renamed and
7000 new macros in dispextern.h, frame.h and window.h. 7013 new macros in dispextern.h, frame.h and window.h.
7001 (x_draw_glyph_string_box): Adapt to per-window fringes and 7014 (x_draw_glyph_string_box): Adapt to per-window fringes and scroll-bars.
7002 scroll-bars.
7003 (scroll_run): Adapt to new fringe position. 7015 (scroll_run): Adapt to new fringe position.
7004 (glyph_rect): Use window coordinates returned from 7016 (glyph_rect): Use window coordinates returned from
7005 window_from_coordinates rather than frame_to_window_pixel_xy. 7017 window_from_coordinates rather than frame_to_window_pixel_xy.
7006 (XTset_vertical_scroll_bar): Adapt to per-window fringes and 7018 (XTset_vertical_scroll_bar): Adapt to per-window fringes and
7007 scroll-bars. 7019 scroll-bars.
7021 x_pixels_diff, and y_pixels_diff to struct frame (frame.h). 7033 x_pixels_diff, and y_pixels_diff to struct frame (frame.h).
7022 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h. 7034 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h.
7023 (FRAME_DEFAULT_FONT_WIDTH): Remove macro. 7035 (FRAME_DEFAULT_FONT_WIDTH): Remove macro.
7024 (PIXEL_WIDTH, PIXEL_HEIGHT) 7036 (PIXEL_WIDTH, PIXEL_HEIGHT)
7025 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH) 7037 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH)
7026 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Moved to 7038 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Move to
7027 frame.h and renamed [see frame.h changes]. 7039 frame.h and renamed [see frame.h changes].
7028 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH) 7040 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH)
7029 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) 7041 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL)
7030 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h 7042 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Move to frame.h
7031 and renamed [see frame.h changes]. 7043 and renamed [see frame.h changes].
7032 7044
7033 * w32term.c: Make (several) trivial substitutions for renamed and 7045 * w32term.c: Make (several) trivial substitutions for renamed and
7034 new macros in dispextern.h, frame.h and window.h. 7046 new macros in dispextern.h, frame.h and window.h.
7035 (x_draw_glyph_string_box): Adapt to per-window fringes and 7047 (x_draw_glyph_string_box): Adapt to per-window fringes and scroll-bars.
7036 scroll-bars.
7037 (glyph_rect): Use window coordinates returned from 7048 (glyph_rect): Use window coordinates returned from
7038 window_from_coordinates rather than frame_to_window_pixel_xy. 7049 window_from_coordinates rather than frame_to_window_pixel_xy.
7039 (XTset_vertical_scroll_bar): Adapt to per-window fringes and 7050 (XTset_vertical_scroll_bar): Adapt to per-window fringes and
7040 scroll-bars. 7051 scroll-bars.
7041 (w32_clip_to_row): Remove superfluous whole_line_p arg and code 7052 (w32_clip_to_row): Remove superfluous whole_line_p arg and code
7062 x_pixels_diff, y_pixels_diff to struct frame (frame.h). 7073 x_pixels_diff, y_pixels_diff to struct frame (frame.h).
7063 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h. 7074 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h.
7064 (FRAME_DEFAULT_FONT_WIDTH): Remove macro. 7075 (FRAME_DEFAULT_FONT_WIDTH): Remove macro.
7065 (PIXEL_WIDTH, PIXEL_HEIGHT) 7076 (PIXEL_WIDTH, PIXEL_HEIGHT)
7066 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH) 7077 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH)
7067 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Moved to 7078 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Move to
7068 frame.h and renamed [see frame.h changes]. 7079 frame.h and renamed [see frame.h changes].
7069 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH) 7080 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH)
7070 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) 7081 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL)
7071 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h 7082 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Move to frame.h
7072 and renamed [see frame.h changes]. 7083 and renamed [see frame.h changes].
7073 7084
7074 * macterm.c: Make (several) trivial substitutions for renamed and 7085 * macterm.c: Make (several) trivial substitutions for renamed and
7075 new macros in dispextern.h, frame.h and window.h. 7086 new macros in dispextern.h, frame.h and window.h.
7076 (x_draw_glyph_string_box): Adapt to per-window fringes and 7087 (x_draw_glyph_string_box): Adapt to per-window fringes and scroll-bars.
7077 scroll-bars.
7078 (glyph_rect): Use window coordinates returned from 7088 (glyph_rect): Use window coordinates returned from
7079 window_from_coordinates rather than frame_to_window_pixel_xy. 7089 window_from_coordinates rather than frame_to_window_pixel_xy.
7080 (XTset_vertical_scroll_bar): Adapt to per-window fringes and 7090 (XTset_vertical_scroll_bar): Adapt to per-window fringes and
7081 scroll-bars. 7091 scroll-bars.
7082 (x_clip_to_row): Remove superfluous whole_line_p arg and code 7092 (x_clip_to_row): Remove superfluous whole_line_p arg and code