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
ce1b23bb
Commit
ce1b23bb
authored
May 06, 2009
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(-windowDidResize:): Avoid inf-loop under GNUStep.
parent
bcda200f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
src/ChangeLog
src/ChangeLog
+4
-0
src/nsterm.m
src/nsterm.m
+9
-3
No files found.
src/ChangeLog
View file @
ce1b23bb
2009-05-06 Stefan Monnier <monnier@iro.umontreal.ca>
* nsterm.m (-windowDidResize:): Avoid inf-loop under GNUStep.
2009-05-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* keyboard.h (add_user_signal): Fix typo in extern.
...
...
src/nsterm.m
View file @
ce1b23bb
...
...
@@ -1151,10 +1151,10 @@ Free a pool and temporary objects it refers to (callable from C)
pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
/* If we have a toolbar, take its height into account. */
/* XXX: GNUstep has not yet implemented the first method below, added
in Panther, however the second is incorrect under Cocoa. */
if (tb)
FRAME_NS_TOOLBAR_HEIGHT (f) =
/* XXX: GNUstep has not yet implemented the first method below, added
in Panther, however the second is incorrect under Cocoa. */
#ifdef NS_IMPL_COCOA
NSHeight ([window frameRectForContentRect: NSMakeRect (0, 0, 0, 0)])
/* NOTE: previously this would generate wrong result if toolbar not
...
...
@@ -5059,8 +5059,14 @@ - (void)windowDidResize: (NSNotification *)notification
}
#endif /* NS_IMPL_COCOA */
// Calling x_set_window_size tends to get us into inf-loops
// (x_set_window_size causes a resize which causes
// a "windowDidResize" which calls x_set_window_size).
// At least with GNUStep, don't know about MacOSX. --Stef
#ifndef NS_IMPL_GNUSTEP
if (cols > 0 && rows > 0)
x_set_window_size (emacsframe, 0, cols, rows);
x_set_window_size (emacsframe, 0, cols, rows);
#endif
ns_send_appdefined (-1);
}
...
...
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