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
66d13b20
Commit
66d13b20
authored
Sep 29, 2013
by
Jan Djärv
Browse files
* window.c (calc_absolute_offset): #elif should be #elif defined.
parent
caa50be2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
src/ChangeLog
src/ChangeLog
+2
-0
src/window.c
src/window.c
+1
-1
No files found.
src/ChangeLog
View file @
66d13b20
2013-09-29 Jan Djärv <jan.h.d@swipnet.se>
* window.c (calc_absolute_offset): #elif should be #elif defined.
* frame.c (delete_frame): Block/unblock input to overcome race
condition (Bug#15475).
...
...
src/window.c
View file @
66d13b20
...
...
@@ -945,7 +945,7 @@ calc_absolute_offset (struct window *w, int *add_x, int *add_y)
#endif
#ifdef FRAME_TOOLBAR_TOP_HEIGHT
*add_y += FRAME_TOOLBAR_TOP_HEIGHT (f);
#elif FRAME_TOOLBAR_HEIGHT
#elif
defined (
FRAME_TOOLBAR_HEIGHT
)
*add_y += FRAME_TOOLBAR_HEIGHT (f);
#endif
#ifdef FRAME_NS_TITLEBAR_HEIGHT
...
...
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