This is a patch that transforms trn 3.4 into trn 3.4.1.  It is in unified
diff format, so you either need a modern version of patch (any of the
versions with 'u' or 'g' in them, such as the latest gnu version will
work fine) or you need to make the unipatch filter program by typing:

	make unipatch

in the trn source directory.

To apply this patch, chdir to your trn 3.4 source directory and use
one of the following commands:

	patch -p <THIS_FILE
or	unipatch <THIS_FILE | patch -p

Once the source is patched you just need to "make" and "make install"
and you're done.

Wayne Davison
davison@borland.com

Index:patchlevel.h
Prereq: 3.4
@@ -1,1 +1,1 @@
-#define PATCHLEVEL "Version: 3.4 "
+#define PATCHLEVEL "Version: 3.4.1 "
Index:HINTS
@@ -70,2 +70,12 @@
 not affected).
 ----------
+I find it convienient to have all my kill files in one directory instead of
+spread out all over a directory hierarchy.  To do this, use the commands:
+
+-EKILLLOCAL="%p/KillFiles/%C"
+-EKILLGLOBAL="%p/KillFiles/Global"
+
+(Though the latter command isn't strictly required if you don't want your
+global kill file relocated).  Note that you need a file system that allows
+long file names to make this work.
+----------
Index:getactive.c
@@ -86,4 +86,40 @@
 }
 
+/* return ptr to little string in big string, NULL if not found */
+
+char *
+instr(big, little, case_matters)
+char *big, *little;
+bool_int case_matters;
+{
+    register char *t, *s, *x;
+
+    for (t = big; *t; t++) {
+	for (x=t,s=little; *s; x++,s++) {
+	    if (!*x)
+		return Nullch;
+	    if (case_matters == TRUE) {
+		if(*s != *x)
+		    break;
+	    } else {
+		register char c,d;
+		if (isupper(*s)) 
+		    c = tolower(*s);
+		else
+		    c = *s;
+		if (isupper(*x)) 
+		    d = tolower(*x);
+		else
+		    d = *x;
+		if ( c != d )
+		    break;
+	   }
+	}
+	if (!*s)
+	    return t;
+    }
+    return Nullch;
+}
+
 void
 finalize(num)
Index:intrp.c
@@ -146,5 +146,6 @@
 
     phostname = PHOSTNAME;
-    if (*phostname == '/') {
+    if (*phostname == '/' || *phostname == '~') {
+	phostname = filexp(phostname);
 	if ((tmpfp = fopen(phostname,"r")) == NULL) {
 	    printf("Warning: Couldn't open %s to determine hostname!\n",
Index:ng.c
@@ -130,5 +130,4 @@
     /* FROM HERE ON, RETURN THRU CLEANUP OR WE ARE SCREWED */
 
-    in_ng = TRUE;			/* tell the world we are here */
     forcelast = TRUE;			/* if 0 unread, do not bomb out */
     recent_artp = curr_artp = Nullart;
Index:ngdata.c
@@ -107,4 +107,5 @@
 
     dmcount = 0;
+    in_ng = TRUE;			/* tell the world we are here */
 
     build_cache();
Index:nntpclient.c
@@ -121,5 +121,5 @@
 	printf("<%s\n", ser_line) FLUSH;
 #endif
-    if (atoi(ser_line) == NNTP_TMPERR_VAL) {
+    if (atoi(ser_line) == NNTP_TMPERR_VAL && instr(ser_line,"timeout",FALSE)) {
 	/* See if this was really a timeout */
 	return nntp_handle_timeout(strict);
Index:nntpinit.c
@@ -95,4 +95,8 @@
 	nntp_command("MODE READER");
 	nntp_gets(line2, sizeof line2);
+#if defined(DEBUG) && defined(FLUSH)
+	if (debug & DEB_NNTP)
+	    printf("<%s\n", line2) FLUSH;
+#endif
 	if (atoi(line2) != NNTP_BAD_COMMAND_VAL)
 	    strcpy(ser_line, line2);
Index:rt-ov.c
@@ -40,5 +40,5 @@
 	do {
 	    nntp_gets(ser_line, sizeof ser_line);
-	} while (NNTP_LIST_END(ser_line));
+	} while (!NNTP_LIST_END(ser_line));
     }
 #endif
Index:rthread.c
@@ -242,4 +242,6 @@
 	if (!sp)
 	    goto num_inc;
+	if (sel_mode == SM_THREAD && sp->thread)
+	    sp = sp->thread->subj;
 	do {
 	    if (ap)
@@ -248,6 +250,4 @@
 		ap = first_art(sp);
 	    while (!ap) {
-		if (sel_mode == SM_THREAD && sp->thread)
-		    sp = sp->thread->subj;
 		while ((sp = sp->next) != Nullsubj
 		    && (sp->flags & subj_mask) != subj_mask)
@@ -336,4 +336,6 @@
 	if (!sp)
 	    goto num_dec;
+	if (sel_mode == SM_THREAD && sp->thread)
+	    sp = sp->thread->subj;
 	do {
 	    if (ap)
@@ -342,6 +344,4 @@
 		ap = last_art(sp);
 	    while (!ap) {
-		if (sel_mode == SM_THREAD && sp->thread)
-		    sp = sp->thread->subj;
 		while ((sp = sp->prev) != Nullsubj
 		    && (sp->flags & subj_mask) != subj_mask)
Index:trn.1
@@ -1497,4 +1497,6 @@
 tells trn to auto-select your postings and their replies as it encounters them
 in the various groups you read.
+For each article it finds it executes the command \*(L"T.\*(R" on it (which
+tells trn to memorize the auto-selection of this article and all its replies).
 .TP 5
 .B \-q