diff options
author | Alexander Gramiak <agrambot@gmail.com> | 2019-04-13 09:40:03 -0600 |
---|---|---|
committer | Alexander Gramiak <agrambot@gmail.com> | 2019-04-26 16:54:17 -0600 |
commit | a411517faf624657aa58979f5463115115093309 (patch) | |
tree | bd75804dd99876f424c9e6805212e356683c54d4 /src/fontset.c | |
parent | da9541dd1086b7bab52940c82915efe114bb7419 (diff) | |
download | emacs-a411517faf624657aa58979f5463115115093309.tar.gz |
Rename generic x_* identifiers
* src/image.c: Rename x_* procedures to image_*.
* src/frame.c: Rename x_* procedures to gui_*. Rename
xrdb_get_resource to gui_display_get_resource. Rename x_get_arg to
gui_display_get arg.
* src/frame.h: Rename can_x_set_window_size to can_set_window_size.
* src/xfaces.c: Rename realize_x_face to realize_gui_face. Rename
x_supports_face_attributes_p to gui_supports_face_attributes_p.
* src/keyboard.c:
* src/lisp.h:
* src/nsterm.m:
* src/w32term.c:
* src/xterm.c: Rename x_get_keysym_name to get_keysym_name.
* src/nsfns.c:
* src/nsterm.m: Rename x_* procedures to ns_*.
* src/w32fns.c:
* src/w32term.c: Rename x_* procedures to w32_*.
* src/termhooks.h (query_colors, get_focus_frame, focus_frame_hook)
(frame_visible_invisible_hook, iconify_frame_hook)
(set_window_size_hook, set_frame_offset_hook, set_frame_alpha_hook)
(set_new_font_hook, set_bitmap_icon_hook, implicit_set_name_hook)
(activate_menubar_hook, change_tool_bar_height_hook)
(set_scroll_bar_default_width_hook)
(set_scroll_bar_default_height_hook, get_string_resource_hook): New
terminal hooks to replace backend-specific x_* procedures.
* src/dispextern.h (clear_under_internal_border): New RIF procedure.
* src/alloc.c:
* src/frame.c:
* src/xdisp.c: Use FRAME_OUTPUT_DATA instead of FRAME_X_OUTPUT.
* src/frame.c:
* src/w32term.c:
* src/w32fns.c: Use FRAME_NATIVE_WINDOW instead of FRAME_X_WINDOW.
Diffstat (limited to 'src/fontset.c')
-rw-r--r-- | src/fontset.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/fontset.c b/src/fontset.c index eec1e0da4cc..2c45c95c3a2 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1061,7 +1061,7 @@ font_for_char (struct face *face, int c, ptrdiff_t pos, Lisp_Object object) /* Make a realized fontset for ASCII face FACE on frame F from the base fontset BASE_FONTSET_ID. If BASE_FONTSET_ID is -1, use the default fontset as the base. Value is the id of the new fontset. - Called from realize_x_face. */ + Called from realize_gui_face. */ int make_fontset_for_ascii_face (struct frame *f, int base_fontset_id, struct face *face) @@ -1743,13 +1743,14 @@ static Lisp_Object auto_fontset_alist; static ptrdiff_t num_auto_fontsets; /* Return a fontset synthesized from FONT-OBJECT. This is called from - x_new_font when FONT-OBJECT is used for the default ASCII font of a - frame, and the returned fontset is used for the default fontset of - that frame. The fontset specifies a font of the same registry as - FONT-OBJECT for all characters in the repertory of the registry - (see Vfont_encoding_alist). If the repertory is not known, the - fontset specifies the font for all Latin characters assuming that a - user intends to use FONT-OBJECT for Latin characters. */ + the terminal hook set_new_font_hook when FONT-OBJECT is used for + the default ASCII font of a frame, and the returned fontset is used + for the default fontset of that frame. The fontset specifies a + font of the same registry as FONT-OBJECT for all characters in the + repertory of the registry (see Vfont_encoding_alist). If the + repertory is not known, the fontset specifies the font for all + Latin characters assuming that a user intends to use FONT-OBJECT + for Latin characters. */ int fontset_from_font (Lisp_Object font_object) |