aboutsummaryrefslogtreecommitdiffstats
path: root/src/xwidget.h
diff options
context:
space:
mode:
authorStephen Leake2019-04-11 14:00:02 -0700
committerStephen Leake2019-04-11 14:00:02 -0700
commit7ba7def5caf7ec9d9bebffff489f0a658229fbda (patch)
treee0cfcb59937ca0528fb81769d7d48a904a91f5dc /src/xwidget.h
parent7768581172e11be52b1fcd8224f4594e126bbdb7 (diff)
parentde238b39e335c6814283faa171b35145f124edf2 (diff)
downloademacs-7ba7def5caf7ec9d9bebffff489f0a658229fbda.tar.gz
emacs-7ba7def5caf7ec9d9bebffff489f0a658229fbda.zip
Merge commit 'de238b39e335c6814283faa171b35145f124edf2'
Diffstat (limited to 'src/xwidget.h')
-rw-r--r--src/xwidget.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/xwidget.h b/src/xwidget.h
index 8c598efb2e2..1b6368daabf 100644
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -49,8 +49,7 @@ struct xwidget
49 49
50 /* Vector of currently executing scripts with callbacks. */ 50 /* Vector of currently executing scripts with callbacks. */
51 Lisp_Object script_callbacks; 51 Lisp_Object script_callbacks;
52 52 /* Here ends the Lisp part. script_callbacks is the marker field. */
53 /* Here ends the Lisp part. "height" is the marker field. */
54 53
55 int height; 54 int height;
56 int width; 55 int width;
@@ -68,8 +67,7 @@ struct xwidget_view
68 union vectorlike_header header; 67 union vectorlike_header header;
69 Lisp_Object model; 68 Lisp_Object model;
70 Lisp_Object w; 69 Lisp_Object w;
71 70 /* Here ends the lisp part. "w" is the marker field. */
72 /* Here ends the lisp part. "redisplayed" is the marker field. */
73 71
74 /* If touched by redisplay. */ 72 /* If touched by redisplay. */
75 bool redisplayed; 73 bool redisplayed;