--- x026-1.0/x026.c.orig	2003-07-29 10:03:36.000000000 +0200
+++ x026-1.0/x026.c	2003-07-29 10:41:43.000000000 +0200
@@ -114,32 +114,32 @@
 };
 
 /* Xt actions. */
-static void data(Widget, XEvent *, String *, Cardinal *);
-static void delete_window(Widget, XEvent *, String *, Cardinal *);
-static void home(Widget, XEvent *, String *, Cardinal *);
-static void left(Widget, XEvent *, String *, Cardinal *);
-static void next(Widget, XEvent *, String *, Cardinal *);
-static void redraw(Widget, XEvent *, String *, Cardinal *);
-static void right(Widget, XEvent *, String *, Cardinal *);
-static void tab(Widget, XEvent *, String *, Cardinal *);
-static void insert_selection(Widget, XEvent *, String *, Cardinal *);
-static void confirm(Widget, XEvent *, String *, Cardinal *);
+static void x026_data(Widget, XEvent *, String *, Cardinal *);
+static void x026_delete_window(Widget, XEvent *, String *, Cardinal *);
+static void x026_home(Widget, XEvent *, String *, Cardinal *);
+static void x026_left(Widget, XEvent *, String *, Cardinal *);
+static void x026_next(Widget, XEvent *, String *, Cardinal *);
+static void x026_redraw(Widget, XEvent *, String *, Cardinal *);
+static void x026_right(Widget, XEvent *, String *, Cardinal *);
+static void x026_tab(Widget, XEvent *, String *, Cardinal *);
+static void x026_insert_selection(Widget, XEvent *, String *, Cardinal *);
+static void x026_confirm(Widget, XEvent *, String *, Cardinal *);
 
 /* Xt callbacks. */
-static void discard(Widget, XtPointer, XtPointer);
+static void x026_discard(Widget, XtPointer, XtPointer);
 
 /* Actions. */
 XtActionsRec actions[] = {
-	{ "Data",	data },
-	{ "DeleteWindow", delete_window },
-	{ "Home",	home },
-	{ "Left",	left },
-	{ "Next",	next },
-	{ "Redraw",	redraw },
-	{ "Right",	right },
-	{ "Tab",	tab },
-	{ "insert-selection", insert_selection },
-	{ "confirm",	confirm }
+	{ "Data",	x026_data },
+	{ "DeleteWindow", x026_delete_window },
+	{ "Home",	x026_home },
+	{ "Left",	x026_left },
+	{ "Next",	x026_next },
+	{ "Redraw",	x026_redraw },
+	{ "Right",	x026_right },
+	{ "Tab",	x026_tab },
+	{ "insert-selection", x026_insert_selection },
+	{ "confirm",	x026_confirm }
 };
 int actioncount = XtNumber(actions);
 
@@ -389,7 +389,7 @@
 	    XtNborderWidth, BUTTON_BW,
 	    XtNborderColor, appres.background,
 	    NULL);
-	XtAddCallback(ww, XtNcallback, discard, NULL);
+	XtAddCallback(ww, XtNcallback, x026_discard, NULL);
 
 	/* Create graphics contexts for drawing. */
 	xgcv.foreground = appres.foreground;
@@ -575,7 +575,7 @@
 
 /* Redraw the entire card image. */
 static void
-redraw(Widget wid, XEvent  *event, String  *params, Cardinal *num_params)
+x026_redraw(Widget wid, XEvent  *event, String  *params, Cardinal *num_params)
 {
 	int i;
 	Dimension x, y, w, h;
@@ -641,7 +641,7 @@
 
 /* Exit. */
 static void
-delete_window(Widget wid, XEvent *event, String *params, Cardinal *num_params)
+x026_delete_window(Widget wid, XEvent *event, String *params, Cardinal *num_params)
 {
 	exit(0);
 }
@@ -696,6 +696,7 @@
 #if defined(SOUND) /*[*/
 		loud_click();
 #endif /*]*/
+		do_right(0);
 	}
 }
 
@@ -841,7 +842,7 @@
  */
 
 static void
-data(Widget wid, XEvent *event, String *params, Cardinal *num_params)
+x026_data(Widget wid, XEvent *event, String *params, Cardinal *num_params)
 {
 	XKeyEvent *kevent = (XKeyEvent *)event;
 	char buf[10];
@@ -858,19 +859,19 @@
 }
 
 static void
-left(Widget wid, XEvent *event, String *params, Cardinal *num_params)
+x026_left(Widget wid, XEvent *event, String *params, Cardinal *num_params)
 {
 	enq_event(LEFT, 0, !appres.typeahead, SLOW);
 }
 
 static void
-right(Widget wid, XEvent *event, String *params, Cardinal *num_params)
+x026_right(Widget wid, XEvent *event, String *params, Cardinal *num_params)
 {
 	enq_event(RIGHT, 1, !appres.typeahead, SLOW);
 }
 
 static void
-home(Widget wid, XEvent *event, String *params, Cardinal *num_params)
+x026_home(Widget wid, XEvent *event, String *params, Cardinal *num_params)
 {
 	int i;
 
@@ -882,7 +883,7 @@
 }
 
 static void
-next(Widget wid, XEvent *event, String *params, Cardinal *num_params)
+x026_next(Widget wid, XEvent *event, String *params, Cardinal *num_params)
 {
 	if (ccard->next) {
 		ccard = ccard->next;
@@ -892,7 +893,7 @@
 }
 
 static void
-tab(Widget wid, XEvent *event, String *params, Cardinal *num_params)
+x026_tab(Widget wid, XEvent *event, String *params, Cardinal *num_params)
 {
 	int i;
 
@@ -905,7 +906,7 @@
 
 /* Throw away this card. */
 static void
-discard(Widget w, XtPointer client_data, XtPointer call_data)
+x026_discard(Widget w, XtPointer client_data, XtPointer call_data)
 {
 	int i;
 
@@ -993,7 +994,7 @@
 }
 
 static void
-insert_selection(Widget w, XEvent *event, String *params, Cardinal *num_params)
+x026_insert_selection(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
 	int	i;
 	Atom	a;
@@ -1115,7 +1116,7 @@
 }
 
 static void
-confirm(Widget w, XEvent *event, String *params, Cardinal *num_params)
+x026_confirm(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
 	save_file();
 }