[Pinfo-devel] r233 - pinfo/branches/cxx/src

[Nathanael Nerode]

Author: neroden-guest
Date: 2005-09-26 01:17:16 +0000 (Mon, 26 Sep 2005)
New Revision: 233

Modified:
   pinfo/branches/cxx/src/mainfunction.cxx
Log:
Small patch-ups.


Modified: pinfo/branches/cxx/src/mainfunction.cxx
===================================================================
--- pinfo/branches/cxx/src/mainfunction.cxx	2005-09-26 01:10:32 UTC (rev 232)
+++ pinfo/branches/cxx/src/mainfunction.cxx	2005-09-26 01:17:16 UTC (rev 233)
@@ -44,6 +44,7 @@
  * caused by the sequential auto-pgdn reading code
  */
 int toggled_by_menu = 0;
+/* File-scope globals.  FIXME */
 long pos;
 long infomenu;
 long infocolumn=0;
@@ -279,7 +280,7 @@
 							pos = 0;
 						} else if (newpos + lines_visible <= my_message.size()) {
 							pos = newpos;
-						} else if (lines_visible <= my_message.size()) {
+						} else if (lines_visible < my_message.size()) {
 							pos = my_message.size() - lines_visible;
 						} else { /* very short message */
 							pos = 0;
@@ -860,9 +861,11 @@
 			if ((key == keys.end_1) ||
 					(key == keys.end_2))
 			{
-				pos = my_message.size() - lines_visible;
-				if (pos < 0)
+				if (lines_visible < my_message.size()) {
+					pos = my_message.size() - lines_visible;
+				} else {
 					pos = 0;
+				}
 				cursor = hyperobjects.size() - 1;
 			}
 			/*==========================================================================*/