The R Project SVN – R – Diff – /branches/R-exp-R5/src/modules/X11/dataentry.c

+{
     KeySym iokey;
     char *text;
     iokey = GetKey(event);
-    text = GetCharP(event);
+    if(DE->isEditor) text = GetCharP(event);
     if (CheckControl(event))
 	doControl(DE, event);
     else if ((iokey == XK_Return)  || (iokey == XK_KP_Enter) ||
 	     (iokey == XK_Linefeed)|| (iokey == XK_Down))
+    }
 #endif
 #ifdef XK_Page_Down
     else if (iokey == XK_Page_Down) {
 	if(DE->isEditor)
-	   jumpwin(DE, DE->colmin, DE->rowmax);
+	    jumpwin(DE, DE->colmin, DE->rowmax);
 	else {
 	    int i = DE->ymaxused - DE->nhigh + 2;
-	    jumpwin(DE, DE->colmin, max(i, 1));
+            jumpwin(DE, DE->colmin, min(i, DE->rowmax));
+	}
 	cell_cursor_init(DE);
+    }
 #elif defined(XK_Next)
     else if (iokey == XK_Next) {
+	if(DE->isEditor)
-	jumpwin(DE, DE->colmin, DE->rowmax);
+	    jumpwin(DE, DE->colmin, DE->rowmax);
+	else {
+	    int i = DE->ymaxused - DE->nhigh + 2;
+            jumpwin(DE, DE->colmin, min(i, DE->rowmax));
+	}
 	cell_cursor_init(DE);
+    }
 #endif
     else if (DE->isEditor && (iokey == XK_BackSpace || iokey == XK_Delete)) {
 	if (clength > 0) {

The R Project SVN R