[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100458: * nsterm.m (setFrame, i
From: |
Jan D. |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100458: * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become |
Date: |
Tue, 08 Feb 2011 08:19:20 +0100 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100458
committer: Jan D. <address@hidden>
branch nick: emacs-23
timestamp: Tue 2011-02-08 08:19:20 +0100
message:
* nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
zero.
modified:
src/ChangeLog
src/nsterm.m
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-03 06:55:48 +0000
+++ b/src/ChangeLog 2011-02-08 07:19:20 +0000
@@ -1,3 +1,8 @@
+2011-02-08 Jan Djärv <address@hidden>
+
+ * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
+ zero (Bug#7348).
+
2011-02-03 Glenn Morris <address@hidden>
* xfaces.c (Finternal_set_lisp_face_attribute):
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2011-01-02 23:50:46 +0000
+++ b/src/nsterm.m 2011-02-08 07:19:20 +0000
@@ -5721,6 +5721,7 @@
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 @@
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];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100458: * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become,
Jan D. <=