Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ec6ecaad
Commit
ec6ecaad
authored
Jun 17, 2013
by
Paul Eggert
Browse files
* frame.c (x_report_frame_params): Cast parent_desc to uintptr_t.
Needed if HAVE_NTGUI. Reported by Juanma Barranquero.
parent
0a4df6a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
src/ChangeLog
src/ChangeLog
+3
-0
src/frame.c
src/frame.c
+1
-1
No files found.
src/ChangeLog
View file @
ec6ecaad
2013-06-17 Paul Eggert <eggert@cs.ucla.edu>
* frame.c (x_report_frame_params): Cast parent_desc to uintptr_t.
Needed if HAVE_NTGUI. Reported by Juanma Barranquero.
* nsfont.m (ns_registry_to_script): Parenthesize while expression.
2013-06-17 Eli Zaretskii <eliz@gnu.org>
...
...
src/frame.c
View file @
ec6ecaad
...
...
@@ -2925,7 +2925,7 @@ x_report_frame_params (struct frame *f, Lisp_Object *alistptr)
if
(
FRAME_X_OUTPUT
(
f
)
->
parent_desc
==
FRAME_X_DISPLAY_INFO
(
f
)
->
root_window
)
tem
=
Qnil
;
else
XSETFASTINT (tem,
FRAME_X_OUTPUT (f)->parent_desc);
tem
=
make_natnum
((
uintptr_t
)
FRAME_X_OUTPUT
(
f
)
->
parent_desc
);
store_in_alist
(
alistptr
,
Qexplicit_name
,
(
f
->
explicit_name
?
Qt
:
Qnil
));
store_in_alist
(
alistptr
,
Qparent_id
,
tem
);
store_in_alist
(
alistptr
,
Qtool_bar_position
,
f
->
tool_bar_position
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment