===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vim/Attic/gui_athena.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- src/usr.bin/vim/Attic/gui_athena.c	1996/09/07 21:40:28	1.1
+++ src/usr.bin/vim/Attic/gui_athena.c	1996/09/21 06:23:03	1.2
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gui_athena.c,v 1.1 1996/09/07 21:40:28 downsj Exp $	*/
+/*	$OpenBSD: gui_athena.c,v 1.2 1996/09/21 06:23:03 downsj Exp $	*/
 /* vi:set ts=4 sw=4:
  *
  * VIM - Vi IMproved			by Bram Moolenaar
@@ -28,7 +28,7 @@
 #define puller_width	19
 #define puller_height	19
 
-static char puller_bits[] =
+static char_u puller_bits[] =
 {
 	0x00,0x00,0xf8,0x00,0x00,0xf8,0xf8,0x7f,0xf8,0x04,0x80,0xf8,0x04,0x80,0xf9,
 	0x84,0x81,0xf9,0x84,0x83,0xf9,0x84,0x87,0xf9,0x84,0x8f,0xf9,0x84,0x8f,0xf9,
@@ -100,7 +100,7 @@
 
 			sb = &wp->w_scrollbar;
 
-			value = *((float *)call_data) * (float)sb->max + 0.5;
+			value = *((float *)call_data) * (float)(sb->max - 1) + 0.5;
 			++value;						/* range is 1 to line_count */
 			sb->value = value;
 			
@@ -562,9 +562,9 @@
 		XtAddCallback(menu->id, XtNcallback, gui_x11_menu_cb,
 			(XtPointer)menu);
 
-		pullright_name = strnsave(menu->name, strlen(menu->name) +
-														strlen("-pullright"));
-		strcat(pullright_name, "-pullright");
+		pullright_name = strnsave(menu->name,
+								   STRLEN(menu->name) + strlen("-pullright"));
+		strcat((char *)pullright_name, "-pullright");
 		menu->submenu_id = XtVaCreatePopupShell(pullright_name,
 			simpleMenuWidgetClass, parent->submenu_id,
 			XtNforeground, gui.menu_fg_pixel,
@@ -1016,9 +1016,9 @@
 	if (event->xmotion.x < (width * 3) / 4)
 		return;
 
-	pullright_name = strnsave(XtName(menuw), strlen(XtName(menuw)) +
-													strlen("-pullright"));
-	strcat(pullright_name, "-pullright");
+	pullright_name = strnsave((char_u *)XtName(menuw),
+								strlen(XtName(menuw)) + strlen("-pullright"));
+	strcat((char *)pullright_name, "-pullright");
 	popup = XtNameToWidget(w, pullright_name);
 	vim_free(pullright_name);