diff options
| author | Jan Djärv | 2011-02-08 08:19:20 +0100 |
|---|---|---|
| committer | Jan Djärv | 2011-02-08 08:19:20 +0100 |
| commit | 9aabf64c78017a55dedab5481ed20776c57f284b (patch) | |
| tree | 8fc0f6c271bb237cf8b7af3d566661a973393cf3 /src | |
| parent | 8a6f24e5f283563fc25a8bc088d314034699f286 (diff) | |
| download | emacs-9aabf64c78017a55dedab5481ed20776c57f284b.tar.gz emacs-9aabf64c78017a55dedab5481ed20776c57f284b.zip | |
* nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
zero.
Fixes: debbugs:7348
Diffstat (limited to 'src')
| -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 @@ | |||
| 1 | 2011-02-08 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become | ||
| 4 | zero (Bug#7348). | ||
| 5 | |||
| 1 | 2011-02-03 Glenn Morris <rgm@gnu.org> | 6 | 2011-02-03 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * xfaces.c (Finternal_set_lisp_face_attribute): | 8 | * 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) | |||
| 5721 | win = nwin; | 5721 | win = nwin; |
| 5722 | condemned = NO; | 5722 | condemned = NO; |
| 5723 | pixel_height = NSHeight (r); | 5723 | pixel_height = NSHeight (r); |
| 5724 | if (pixel_height == 0) pixel_height = 1; | ||
| 5724 | min_portion = 20 / pixel_height; | 5725 | min_portion = 20 / pixel_height; |
| 5725 | 5726 | ||
| 5726 | frame = XFRAME (XWINDOW (win)->frame); | 5727 | frame = XFRAME (XWINDOW (win)->frame); |
| @@ -5750,6 +5751,7 @@ ns_term_shutdown (int sig) | |||
| 5750 | NSTRACE (EmacsScroller_setFrame); | 5751 | NSTRACE (EmacsScroller_setFrame); |
| 5751 | /* BLOCK_INPUT; */ | 5752 | /* BLOCK_INPUT; */ |
| 5752 | pixel_height = NSHeight (newRect); | 5753 | pixel_height = NSHeight (newRect); |
| 5754 | if (pixel_height == 0) pixel_height = 1; | ||
| 5753 | min_portion = 20 / pixel_height; | 5755 | min_portion = 20 / pixel_height; |
| 5754 | [super setFrame: newRect]; | 5756 | [super setFrame: newRect]; |
| 5755 | [self display]; | 5757 | [self display]; |