diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-07-25 23:34:55 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-07-25 23:34:55 +0900 |
| commit | 13a9a5e836cbe6e64aadaba40fe1f7eb83320d08 (patch) | |
| tree | 242ac1f485cf6762680a904952747d63b295e198 /src/frame.h | |
| parent | b242394f24b154f8e20f5abf4b2f826629e99ea6 (diff) | |
| parent | 41a55a330f518254da795719ac6e3085254d4110 (diff) | |
| download | emacs-13a9a5e836cbe6e64aadaba40fe1f7eb83320d08.tar.gz | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'src/frame.h')
| -rw-r--r-- | src/frame.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/frame.h b/src/frame.h index d3ae548ed3b..9856890c315 100644 --- a/src/frame.h +++ b/src/frame.h @@ -158,8 +158,8 @@ struct frame There are four additional elements of nil at the end, to terminate. */ Lisp_Object menu_bar_items; - /* Alist of elements (FACE-NAME . FACE-VECTOR-DATA). */ - Lisp_Object face_alist; + /* Hash table of FACE-NAME keys and FACE-VECTOR-DATA values. */ + Lisp_Object face_hash_table; /* A vector that records the entire structure of this frame's menu bar. For the format of the data, see extensive comments in xmenu.c. @@ -673,9 +673,9 @@ fset_condemned_scroll_bars (struct frame *f, Lisp_Object val) f->condemned_scroll_bars = val; } INLINE void -fset_face_alist (struct frame *f, Lisp_Object val) +fset_face_hash_table (struct frame *f, Lisp_Object val) { - f->face_alist = val; + f->face_hash_table = val; } #if defined (HAVE_WINDOW_SYSTEM) INLINE void |