Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
1540a61a
Commit
1540a61a
authored
Feb 07, 2008
by
Jan Djärv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(USAGE3): Add --parent-id
(standard_args): Ditto.
parent
2532f20c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
0 deletions
+32
-0
src/ChangeLog
src/ChangeLog
+30
-0
src/emacs.c
src/emacs.c
+2
-0
No files found.
src/ChangeLog
View file @
1540a61a
2008-02-07 Timo Savola <timo.savola@iki.fi>
* xterm.c (x_detect_focus_change): Handle embed client message.
(handle_one_xevent): Ditto.
(handle_one_xevent): If embedded and we get a button press/release,
request focus.
(xembed_set_info, xembed_send_message): New functions.
(x_make_frame_visible): Call xembed_set_info if embedded.
(x_make_frame_invisible): Call xembed_set_info if embedded.
(x_term_init): Initialize Xatom_XEMBED.
(x_make_frame_visible): Check for FRAME_X_EMBEDDED_P also.
(x_iconify_frame): Ditto.
* xterm.h (struct x_display_info): Add AtomXatom_XEMBED.
(enum xembed_info, enum xerm srmbed_message, enum xembed_focus)
(enum xembed_modifier, enum xembed_accelerator): New.
(xembed_set_info, xembed_send_message): Declare.
(FRAME_X_EMBEDDED_P): New.
* gtkutil.c (xg_create_frame_widgets): If frame is embedded, call
gtk_plug_new.
* xfns.c (Fx_create_frame): Do not override the explicitly set parent
window ID of a frame.
(x_window): Reparent frame if embedded.
(Fx_create_frame): Don't set border width if embedded.
* emacs.c (USAGE3): Add --parent-id
(standard_args): Ditto.
2008-02-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* coding.c (DECODE_EMACS_MULE_COMPOSITION_CHAR): Use "do...while (0)".
...
...
src/emacs.c
View file @
1540a61a
...
...
@@ -326,6 +326,7 @@ Display options:\n\
--title, -T TITLE title for initial Emacs frame\n\
--vertical-scroll-bars, -vb enable vertical scroll bars\n\
--xrm XRESOURCES set additional X resources\n\
--parent-id XID set parent window\n\
--help display this help and exit\n\
--version output version information and exit\n\
\n"
...
...
@@ -1867,6 +1868,7 @@ struct standard_args standard_args[] =
{
"-title"
,
0
,
10
,
1
},
{
"-name"
,
"--name"
,
10
,
1
},
{
"-xrm"
,
"--xrm"
,
10
,
1
},
{
"-parent-id"
,
"--parent-id"
,
10
,
1
},
{
"-r"
,
"--reverse-video"
,
5
,
0
},
{
"-rv"
,
0
,
5
,
0
},
{
"-reverse"
,
0
,
5
,
0
},
...
...
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