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
4988180d
Commit
4988180d
authored
Jan 26, 2014
by
Jan Djärv
Browse files
* xterm.c (x_focus_changed): Check for non-X terminal-frame
Fixes: debbugs:16540
parent
de6a923b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
src/ChangeLog
src/ChangeLog
+4
-0
src/xterm.c
src/xterm.c
+3
-1
No files found.
src/ChangeLog
View file @
4988180d
2014-01-26 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (x_focus_changed): Check for non-X terminal-frame (Bug#16540)
2014-01-26 Paul Eggert <eggert@cs.ucla.edu>
When decoding, prefer ptrdiff_t to int for buffer positions etc.
...
...
src/xterm.c
View file @
4988180d
...
...
@@ -3235,7 +3235,9 @@ x_focus_changed (int type, int state, struct x_display_info *dpyinfo, struct fra
/* Don't stop displaying the initial startup message
for a switch-frame event we don't need. */
/* When run as a daemon, Vterminal_frame is always NIL. */
bufp->arg = (((NILP (Vterminal_frame) || EQ (Fdaemonp (), Qt))
bufp->arg = (((NILP (Vterminal_frame)
|| ! FRAME_X_P (XFRAME (Vterminal_frame))
|| EQ (Fdaemonp (), Qt))
&& CONSP (Vframe_list)
&& !NILP (XCDR (Vframe_list)))
? Qt : Qnil);
...
...
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