diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2011-02-08 08:19:20 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2011-02-08 08:19:20 +0100 |
| commit | 9aabf64c78017a55dedab5481ed20776c57f284b (patch) | |
| tree | 8fc0f6c271bb237cf8b7af3d566661a973393cf3 | |
| parent | 8a6f24e5f283563fc25a8bc088d314034699f286 (diff) | |
| download | emacs-9aabf64c78017a55dedab5481ed20776c57f284b.tar.gz | |
* nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
zero.
Fixes: debbugs:7348
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2b02030fd4f..2df187383a4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-02-08 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become + zero (Bug#7348). + 2011-02-03 Glenn Morris <rgm@gnu.org> * xfaces.c (Finternal_set_lisp_face_attribute): diff --git a/src/nsterm.m b/src/nsterm.m index addb6d01d71..30b73c2fd13 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -5721,6 +5721,7 @@ ns_term_shutdown (int sig) win = nwin; condemned = NO; pixel_height = NSHeight (r); + if (pixel_height == 0) pixel_height = 1; min_portion = 20 / pixel_height; frame = XFRAME (XWINDOW (win)->frame); @@ -5750,6 +5751,7 @@ ns_term_shutdown (int sig) NSTRACE (EmacsScroller_setFrame); /* BLOCK_INPUT; */ pixel_height = NSHeight (newRect); + if (pixel_height == 0) pixel_height = 1; min_portion = 20 / pixel_height; [super setFrame: newRect]; [self display]; |