about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/GridText.c2
-rw-r--r--src/LYCurses.h17
-rw-r--r--src/LYGetFile.c83
-rw-r--r--src/LYLocal.c5
-rw-r--r--src/LYOptions.c11
-rw-r--r--src/LYUpload.c2
-rw-r--r--src/LYUtils.c93
-rw-r--r--src/UCAux.c4
-rw-r--r--src/UCdomap.c56
9 files changed, 167 insertions, 106 deletions
diff --git a/src/GridText.c b/src/GridText.c
index 433b86b2..493e66cc 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -2459,7 +2459,7 @@ PUBLIC void HText_endAnchor ARGS2(
      *  without needing to close any anchor with an HREF
      *  within which that link might be embedded. - FM
      */
-    if (number <= 0) {
+    if (number <= 0 || text->last_anchor->number == number) {
 	a = text->last_anchor;
     } else {
         for (a = text->first_anchor; a; a = a->next) {
diff --git a/src/LYCurses.h b/src/LYCurses.h
index 4a889faa..2c9d61c8 100644
--- a/src/LYCurses.h
+++ b/src/LYCurses.h
@@ -110,6 +110,23 @@ extern void LYsubwindow PARAMS((WINDOW * param));
 #define BOXHORI '*'	/* character for popup window horizontal borders */
 #endif
 
+#if defined(BROKEN_CURSES_8BIT_ACS) && defined(ALT_CHAR_SET)
+#define FIX_ACS(cht_acs) ((cht_acs & 0x80) ? ((cht_acs & 0xff) | A_ALTCHARSET) : cht_acs)
+#ifdef box
+#undef box
+#endif
+#define box(win,verch,horch) \
+	wborder(win,\
+	       FIX_ACS((verch ? verch : ACS_VLINE)),\
+	       FIX_ACS((verch ? verch : ACS_VLINE)),\
+	       FIX_ACS((horch ? horch : ACS_HLINE)),\
+	       FIX_ACS((horch ? horch : ACS_HLINE)),\
+	       FIX_ACS(ACS_ULCORNER),\
+	       FIX_ACS(ACS_URCORNER),\
+	       FIX_ACS(ACS_LLCORNER),\
+	       FIX_ACS(ACS_LRCORNER))
+#endif /* BROKEN_CURSES_8BIT_ACS */
+
 extern int LYlines;  /* replaces LINES */
 extern int LYcols;   /* replaces COLS */
 
diff --git a/src/LYGetFile.c b/src/LYGetFile.c
index ebc708e6..e51f714f 100644
--- a/src/LYGetFile.c
+++ b/src/LYGetFile.c
@@ -93,10 +93,8 @@ PUBLIC BOOLEAN getfile ARGS1(
 	char *cp = NULL;
 	char *temp = NULL;
 	DocAddress WWWDoc;  /* a WWW absolute doc address struct */
-	int redirection_counter = 0;
 
 Try_Redirected_URL:
-	redirection_counter++;
 	/*
 	 *  Load the WWWDoc struct in case we need to use it.
 	 */
@@ -242,25 +240,6 @@ Try_Redirected_URL:
 		    HTAlert(UNSUPPORTED_DATA_URL);
 		    return(NULLFILE);
 
-		} else if (redirection_counter != 1 &&
-			   (url_type == LYNXDOWNLOAD_URL_TYPE ||
-			    url_type == LYNXEXEC_URL_TYPE ||
-			    url_type == LYNXPROG_URL_TYPE ||
-			    url_type == LYNXDIRED_URL_TYPE)) {
-		    /*
-		     *  Some schemes are definitely not acceptable
-		     *  from server redirections. - kw
-		     */
-		    HTAlert(INVALID_URL_SCHEME_IN_REDIRECTION);
-		    if (LYCursesON) {
-			_user_message("Bad URL: %s", doc->address);
-			sleep(AlertSecs);
-		    } else {
-			fprintf(stderr,
-				"Bad Redirection URL: %s", doc->address);
-		    }
-		    return(NULLFILE);
-
 		} else if (url_type == LYNXPRINT_URL_TYPE) {
 		    return(printfile(doc));
 
@@ -737,6 +716,68 @@ Try_Redirected_URL:
 				FREE(temp);
 			    }
 			    HTMLSetCharacterHandling(current_char_set);
+			    url_type = is_url(use_this_url_instead);
+			    if (url_type == LYNXDOWNLOAD_URL_TYPE ||
+				url_type == LYNXEXEC_URL_TYPE ||
+				url_type == LYNXPROG_URL_TYPE ||
+#ifdef DIRED_SUPPORT
+				url_type == LYNXDIRED_URL_TYPE ||
+#endif /* DIRED_SUPPORT */
+				url_type == LYNXPRINT_URL_TYPE ||
+				url_type == LYNXHIST_URL_TYPE ||
+				url_type == LYNXCOOKIE_URL_TYPE ||
+				(LYValidate &&
+				 url_type != HTTP_URL_TYPE &&
+				 url_type != HTTPS_URL_TYPE) ||
+				((no_file_url || no_goto_file) &&
+				 url_type == FILE_URL_TYPE) ||
+				(no_goto_lynxcgi &&
+				 url_type == LYNXCGI_URL_TYPE) ||
+				(no_goto_cso &&
+				 url_type == CSO_URL_TYPE) ||
+				(no_goto_finger &&
+				 url_type == FINGER_URL_TYPE) ||
+				(no_goto_ftp &&
+				 url_type == FTP_URL_TYPE) ||
+				(no_goto_gopher &&
+				 url_type == GOPHER_URL_TYPE) ||
+				(no_goto_http &&
+				 url_type == HTTP_URL_TYPE) ||
+				(no_goto_https &&
+				 url_type == HTTPS_URL_TYPE) ||
+				(no_goto_mailto &&
+				 url_type == MAILTO_URL_TYPE) ||
+				(no_goto_news &&
+				 url_type == NEWS_URL_TYPE) ||
+				(no_goto_nntp &&
+				 url_type == NNTP_URL_TYPE) ||
+				(no_goto_rlogin &&
+				 url_type == RLOGIN_URL_TYPE) ||
+				(no_goto_snews &&
+				 url_type == SNEWS_URL_TYPE) ||
+				(no_goto_telnet &&
+				 url_type == TELNET_URL_TYPE) ||
+				(no_goto_tn3270 &&
+				 url_type == TN3270_URL_TYPE) ||
+				(no_goto_wais &&
+				 url_type == WAIS_URL_TYPE)) {
+				/*
+				 *  Some schemes are not acceptable from
+				 *  server redirections. - KW & FM
+				 */
+				HTAlert(ILLEGAL_REDIRECTION_URL);
+				if (LYCursesON) {
+				    _user_message("Illegal URL: %s",
+				    		  use_this_url_instead);
+				    sleep(AlertSecs);
+				} else {
+				    fprintf(stderr,
+					    "Illegal Redirection URL: %s",
+					    use_this_url_instead);
+				}
+				FREE(use_this_url_instead);
+				return(NULLFILE);
+			    }
 			    if (TRACE)
 			        sleep(MessageSecs);
 			    _user_message("Using %s", use_this_url_instead);
diff --git a/src/LYLocal.c b/src/LYLocal.c
index 3b65287f..1524d84f 100644
--- a/src/LYLocal.c
+++ b/src/LYLocal.c
@@ -1248,7 +1248,7 @@ form to permit %s %s.\n</Ol>\n</Form>\n",
 	/*
 	 *  Make sure we have a valid set-permission
 	 *  file comparison string loaded via a previous
-	 *  call with srcpath != NULL. - kw
+	 *  call with srcpath != NULL. - KW
 	 */
 	if (LYValidPermitFile[0] == '\0') {
 	    if (LYCursesON)
@@ -1275,7 +1275,7 @@ form to permit %s %s.\n</Ol>\n</Form>\n",
 	
 	/*
 	 *  Make sure that the file string is the one from
-	 *  the last displayed File Permissions menu. - kw
+	 *  the last displayed File Permissions menu. - KW
 	 */
 	if (strcmp(destpath, LYValidPermitFile)) {
 	    if (LYCursesON)
@@ -1287,6 +1287,7 @@ form to permit %s %s.\n</Ol>\n</Form>\n",
 			destpath);
 	    return 0;
 	}
+
 	/*
 	 *  A couple of sanity tests.
 	 */
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 84f2f3a7..59ba4822 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -336,7 +336,7 @@ draw_options:
 #else
     addstr(local_exec_on_local_files ? "FOR LOCAL FILES ONLY" :
 				       "ALWAYS OFF          ");
-#endif /* NEVER_ALLOW_REMOTE_EXEC */
+#endif /* !NEVER_ALLOW_REMOTE_EXEC */
 #endif /* ALLOW_USERS_TO_CHANGE_EXEC_WITHIN_OPTIONS */
 
     move(LYlines-3, 2);
@@ -1369,9 +1369,8 @@ draw_options:
 		if (local_exec) {
 		    itmp = 2;
 		} else
-#else
+#endif /* !NEVER_ALLOW_REMOTE_EXEC */
 		{
-#endif /* NEVER_ALLOW_REMOTE_EXEC */
 		    if (local_exec_on_local_files) {
 			itmp= 1;
 		    } else {
@@ -1389,7 +1388,7 @@ draw_options:
 #ifndef NEVER_ALLOW_REMOTE_EXEC
 		StrAllocCopy(choices[2], "ALWAYS ON           ");
 		choices[3] = NULL;
-#endif /* NEVER_ALLOW_REMOTE_EXEC */
+#endif /* !NEVER_ALLOW_REMOTE_EXEC */
 		if (!LYSelectPopups) {
 		    itmp = boolean_choice(itmp,
 					  L_EXEC, -1,
@@ -1409,7 +1408,7 @@ draw_options:
 		FREE(choices[1]);
 #ifndef NEVER_ALLOW_REMOTE_EXEC
 		FREE(choices[2]);
-#endif /* NEVER_ALLOW_REMOTE_EXEC */
+#endif /* !NEVER_ALLOW_REMOTE_EXEC */
 		if (!exec_frozen) {
 		    switch (itmp) {
 			case 0:
@@ -1425,7 +1424,7 @@ draw_options:
 			    local_exec = TRUE;
 			    local_exec_on_local_files = FALSE;
 			    break;
-#endif /* NEVER_ALLOW_REMOTE_EXEC */
+#endif /* !NEVER_ALLOW_REMOTE_EXEC */
 		    } /* end switch */
 		}
 		response = ' ';
diff --git a/src/LYUpload.c b/src/LYUpload.c
index 2fd3b373..1623a414 100644
--- a/src/LYUpload.c
+++ b/src/LYUpload.c
@@ -218,7 +218,7 @@ cancelled:
  *  LYUpload_options writes out the current upload choices to a
  *  file so that the user can select printers in the same way that
  *  they select all other links.  Upload links look like:
- *	LYNXDIRED//UPLOAD=<#>/TO=<STRING>
+ *	LYNXDIRED://UPLOAD=<#>/TO=<STRING>
  */
 PUBLIC int LYUpload_options ARGS2(
 	char **,	newfile,
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 5aef9fde..2777eeb2 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -110,7 +110,7 @@ PUBLIC void highlight ARGS3(
 #ifdef EXP_CHARTRANS
     BOOL utf_flag = (LYCharSet_UC[current_char_set].enc == UCT_ENC_UTF8);
 #else
-#define utf_flag TRUE
+#define utf_flag FALSE
 #endif
 
     tmp[0] = tmp[1] = tmp[2] = '\0';
@@ -211,7 +211,7 @@ PUBLIC void highlight ARGS3(
 			tmp[1] = links[cur].hightext2[++i];
 			addstr(tmp);
 			tmp[1] = '\0';
-	} else {
+		    } else {
 			addstr(tmp);
 		    }
 		 }
@@ -234,7 +234,7 @@ PUBLIC void highlight ARGS3(
 	 *  our link), and with all IsSpecial characters stripped, so we
 	 *  don't need to deal with them here. - FM
 	 */
-	if (target && *target && links[cur].type == WWW_LINK_TYPE &&
+	if (target && *target && (links[cur].type & WWW_LINK_TYPE) &&
 	    links[cur].hightext && *links[cur].hightext &&
 	    HText_getFirstTargetInLine(HTMainText,
 				       links[cur].anchor_line_num,
@@ -247,7 +247,7 @@ PUBLIC void highlight ARGS3(
 	    char *data;
 	    int tlen = strlen(target);
 	    int hlen, hLen;
-	    int hline = links[cur].ly, hoffset = links[cur].lx;
+	    int hLine = links[cur].ly, hoffset = links[cur].lx;
 	    size_t utf_extra = 0;
 
 	    /*
@@ -324,7 +324,7 @@ PUBLIC void highlight ARGS3(
 		 *  Go to the start of the hightext and
 		 *  handle its first character. - FM
 		 */
-		move(hline, offset);
+		move(hLine, offset);
 		tmp[0] = data[itmp];
 		if (utf_flag && !isascii(tmp[0])) {
 		    if ((*tmp & 0xe0) == 0xc0) {
@@ -363,7 +363,7 @@ PUBLIC void highlight ARGS3(
 			TargetEmphasisON = TRUE;
 			addstr(tmp);
 		    } else {
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    }
 		    tmp[1] = '\0';
 		    written += (utf_extra + 1);
@@ -382,7 +382,7 @@ PUBLIC void highlight ARGS3(
 			TargetEmphasisON = TRUE;
 			addstr(tmp);
 		    } else {
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    }
 		    tmp[1] = '\0';
 		    written += 2;
@@ -396,7 +396,7 @@ PUBLIC void highlight ARGS3(
 			TargetEmphasisON = TRUE;
 			addstr(tmp);
 		    } else {
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    }
 		    written++;
 		}
@@ -461,7 +461,7 @@ PUBLIC void highlight ARGS3(
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
-			    move(hline, (offset + 1));
+			    move(hLine, (offset + 1));
 			} else {
 			    addstr(tmp);
 			}
@@ -482,7 +482,7 @@ PUBLIC void highlight ARGS3(
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
-			    move(hline, (offset + 1));
+			    move(hLine, (offset + 1));
 			} else {
 			    addstr(tmp);
 			}
@@ -498,7 +498,7 @@ PUBLIC void highlight ARGS3(
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
-			    move(hline, (offset + 1));
+			    move(hLine, (offset + 1));
 			} else {
 			    addstr(tmp);
 			}
@@ -588,7 +588,7 @@ highlight_hit_within_hightext:
 	     *  Go to the start of the hit and
 	     *  handle its first character. - FM
 	     */
-	    move(hline, offset);
+	    move(hLine, offset);
 	    tmp[0] = data[itmp];
 	    if (utf_flag && !isascii(tmp[0])) {
 		if ((*tmp & 0xe0) == 0xc0) {
@@ -621,15 +621,16 @@ highlight_hit_within_hightext:
 		/*
 		 *  Start emphasis immediately if we are making
 		 *  the link non-current, or we are making it
-		 *  current but this is not the first character
-		 *  of the hightext. - FM
+		 *  current but this is not the first or last
+		 *  character of the hightext. - FM
 		 */
-		if (flag != ON || offset > hoffset) {
+		if (flag != ON ||
+		    (offset > hoffset && data[itmp+1] != '\0')) {
 		    LYstartTargetEmphasis();
 		    TargetEmphasisON = TRUE;
 		    addstr(tmp);
 		} else {
-		    move(hline, (offset + 1));
+		    move(hLine, (offset + 1));
 		}
 		tmp[1] = '\0';
 		written += (utf_extra + 1);
@@ -642,15 +643,16 @@ highlight_hit_within_hightext:
 		/*
 		 *  Start emphasis immediately if we are making
 		 *  the link non-current, or we are making it
-		 *  current but this is not the first character
-		 *  of the hightext. - FM
+		 *  current but this is not the first or last
+		 *  character of the hightext. - FM
 		 */
-		if (flag != ON || offset > hoffset) {
+		if (flag != ON ||
+		    (offset > hoffset && data[itmp+1] != '\0')) {
 		    LYstartTargetEmphasis();
 		    TargetEmphasisON = TRUE;
 		    addstr(tmp);
 		} else {
-		    move(hline, (offset + 1));
+		    move(hLine, (offset + 1));
 		}
 		tmp[1] = '\0';
 		written += 2;
@@ -661,12 +663,13 @@ highlight_hit_within_hightext:
 		 *  current but this is not the first character
 		 *  of the hightext. - FM
 		 */
-		if (flag != ON || offset > hoffset) {
+		if (flag != ON ||
+		    (offset > hoffset && data[itmp+1] != '\0')) {
 		    LYstartTargetEmphasis();
 		    TargetEmphasisON = TRUE;
 		    addstr(tmp);
 		} else {
-		    move(hline, (offset + 1));
+		    move(hLine, (offset + 1));
 		}
 		written++;
 	    }
@@ -728,7 +731,7 @@ highlight_hit_within_hightext:
 			LYstopTargetEmphasis();
 			TargetEmphasisON = FALSE;
 			LYGetYX(y, offset);
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    } else {
 			addstr(tmp);
 		    }
@@ -749,7 +752,7 @@ highlight_hit_within_hightext:
 			LYstopTargetEmphasis();
 			TargetEmphasisON = FALSE;
 			LYGetYX(y, offset);
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    } else {
 			addstr(tmp);
 		    }
@@ -765,7 +768,7 @@ highlight_hit_within_hightext:
 			LYstopTargetEmphasis();
 			TargetEmphasisON = FALSE;
 			LYGetYX(y, offset);
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    } else {
 			addstr(tmp);
 		    }
@@ -828,7 +831,7 @@ highlight_hit_within_hightext:
 		    (hoffset + hLen)) {
 		    offset = (HitOffset + offset);
 		    data = (buffer + (offset - hoffset));
-		    move(hline, offset);
+		    move(hLine, offset);
 		    itmp = 0;
 		    written = 0;
 		    len = strlen(data);
@@ -884,7 +887,7 @@ highlight_hit_within_hightext:
 				LYstopTargetEmphasis();
 				TargetEmphasisON = FALSE;
 				LYGetYX(y, offset);
-				move(hline, (offset + 1));
+				move(hLine, (offset + 1));
 			    } else {
 				addstr(tmp);
 			    }
@@ -943,7 +946,7 @@ highlight_hit_within_hightext:
 	    goto highlight_search_hightext2;
 	}
 highlight_search_hightext2:
-	if (target && *target && links[cur].type == WWW_LINK_TYPE &&
+	if (target && *target && (links[cur].type & WWW_LINK_TYPE) &&
 	    links[cur].hightext2 && *links[cur].hightext2 &&
 	    links[cur].ly < display_lines &&
 	    HText_getFirstTargetInLine(HTMainText,
@@ -957,7 +960,7 @@ highlight_search_hightext2:
 	    char *data;
 	    int tlen = strlen(target);
 	    int hlen, hLen;
-	    int hline = (links[cur].ly + 1);
+	    int hLine = (links[cur].ly + 1);
 	    int hoffset = links[cur].hightext2_offset;
 	    size_t utf_extra = 0;
 
@@ -1029,7 +1032,7 @@ highlight_search_hightext2:
 		 *  Go to the start of the hightext2 and
 		 *  handle its first character. - FM
 		 */
-		move(hline, offset);
+		move(hLine, offset);
 		tmp[0] = data[itmp];
 		if (utf_flag && !isascii(tmp[0])) {
 		    if ((*tmp & 0xe0) == 0xc0) {
@@ -1068,7 +1071,7 @@ highlight_search_hightext2:
 			TargetEmphasisON = TRUE;
 			addstr(tmp);
 		    } else {
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    }
 		    tmp[1] = '\0';
 		    written += (utf_extra + 1);
@@ -1087,7 +1090,7 @@ highlight_search_hightext2:
 			TargetEmphasisON = TRUE;
 			addstr(tmp);
 		    } else {
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    }
 		    tmp[1] = '\0';
 		    written += 2;
@@ -1101,7 +1104,7 @@ highlight_search_hightext2:
 			TargetEmphasisON = TRUE;
 			addstr(tmp);
 		    } else {
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    }
 		    written++;
 		}
@@ -1166,7 +1169,7 @@ highlight_search_hightext2:
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
-			    move(hline, (offset + 1));
+			    move(hLine, (offset + 1));
 			} else {
 			    addstr(tmp);
 			}
@@ -1187,7 +1190,7 @@ highlight_search_hightext2:
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
-			    move(hline, (offset + 1));
+			    move(hLine, (offset + 1));
 			} else {
 			    addstr(tmp);
 			}
@@ -1203,7 +1206,7 @@ highlight_search_hightext2:
 			    LYstopTargetEmphasis();
 			    TargetEmphasisON = FALSE;
 			    LYGetYX(y, offset);
-			    move(hline, (offset + 1));
+			    move(hLine, (offset + 1));
 			} else {
 			    addstr(tmp);
 			}
@@ -1293,7 +1296,7 @@ highlight_hit_within_hightext2:
 	     *  Go to the start of the hit and
 	     *  handle its first character. - FM
 	     */
-	    move(hline, offset);
+	    move(hLine, offset);
 	    tmp[0] = data[itmp];
 	    if (utf_flag && !isascii(tmp[0])) {
 		if ((*tmp & 0xe0) == 0xc0) {
@@ -1334,7 +1337,7 @@ highlight_hit_within_hightext2:
 		    TargetEmphasisON = TRUE;
 		    addstr(tmp);
 		} else {
-		    move(hline, (offset + 1));
+		    move(hLine, (offset + 1));
 		}
 		tmp[1] = '\0';
 		written += (utf_extra + 1);
@@ -1355,7 +1358,7 @@ highlight_hit_within_hightext2:
 		    TargetEmphasisON = TRUE;
 		    addstr(tmp);
 		} else {
-		    move(hline, (offset + 1));
+		    move(hLine, (offset + 1));
 		}
 		tmp[1] = '\0';
 		written += 2;
@@ -1371,7 +1374,7 @@ highlight_hit_within_hightext2:
 		    TargetEmphasisON = TRUE;
 		    addstr(tmp);
 		} else {
-		    move(hline, (offset + 1));
+		    move(hLine, (offset + 1));
 		}
 		written++;
 	    }
@@ -1433,7 +1436,7 @@ highlight_hit_within_hightext2:
 			LYstopTargetEmphasis();
 			TargetEmphasisON = FALSE;
 			LYGetYX(y, offset);
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    } else {
 			addstr(tmp);
 		    }
@@ -1454,7 +1457,7 @@ highlight_hit_within_hightext2:
 			LYstopTargetEmphasis();
 			TargetEmphasisON = FALSE;
 			LYGetYX(y, offset);
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    } else {
 			addstr(tmp);
 		    }
@@ -1470,7 +1473,7 @@ highlight_hit_within_hightext2:
 			LYstopTargetEmphasis();
 			TargetEmphasisON = FALSE;
 			LYGetYX(y, offset);
-			move(hline, (offset + 1));
+			move(hLine, (offset + 1));
 		    } else {
 			addstr(tmp);
 		    }
@@ -1533,7 +1536,7 @@ highlight_hit_within_hightext2:
 		    (hoffset + hLen)) {
 		    offset = (HitOffset + offset);
 		    data = (buffer + (offset - hoffset));
-		    move(hline, offset);
+		    move(hLine, offset);
 		    itmp = 0;
 		    written = 0;
 		    len = strlen(data);
@@ -1589,7 +1592,7 @@ highlight_hit_within_hightext2:
 				LYstopTargetEmphasis();
 				TargetEmphasisON = FALSE;
 				LYGetYX(y, offset);
-				move(hline, (offset + 1));
+				move(hLine, (offset + 1));
 			    } else {
 				addstr(tmp);
 			    }
diff --git a/src/UCAux.c b/src/UCAux.c
index a1065489..e6d9247f 100644
--- a/src/UCAux.c
+++ b/src/UCAux.c
@@ -62,11 +62,11 @@ PUBLIC BOOL UCCanTranslateFromTo ARGS2(
 	}
 	if (!strcmp(fromname, "koi8-r")) {
 	    /*
-	     *  Will try to uses stripping of high bit...
+	     *  Will try to use stripping of high bit...
 	     */
 	    return YES;
 	}
-	    
+
 	if (!strcmp(fromname, "koi8-r") || /* from cyrillic */
 	    !strcmp(fromname, "iso-8859-5") ||
 	    !strcmp(fromname, "windows-1251") ||
diff --git a/src/UCdomap.c b/src/UCdomap.c
index fba41b45..c32044f2 100644
--- a/src/UCdomap.c
+++ b/src/UCdomap.c
@@ -1264,13 +1264,13 @@ PUBLIC int UCGetLYhndl_byMIME ARGS1(
 	} else if (!strcmp(UC_MIMEcharset, "gb2312")) {
 	  return UCGetLYhndl_byMIME("iso-2022-cn");
 	} else if (!strcmp(UC_MIMEcharset, "euc-cn")) {
-	  return UCGetLYhndl_byMIME("iso-2022-cn");
+	    return UCGetLYhndl_byMIME("iso-2022-cn");
 	} else if (!strcmp(UC_MIMEcharset, "windows-1252")) {
 	    /*
 	     *  It's not my fault that Microsoft hasn't registered
-	     *  the name people are using... - kw
+	     *  the name people are using. - KW
 	     */
-	  return UCGetLYhndl_byMIME("iso-8859-1-windows-3.1-latin-1");
+	    return UCGetLYhndl_byMIME("iso-8859-1-windows-3.1-latin-1");
 	} else if (!strncmp(UC_MIMEcharset, "ibm", 3)) {
 	    CONST char * cp = UC_MIMEcharset + 3;
 	    char * cptmp = NULL;
@@ -1278,7 +1278,7 @@ PUBLIC int UCGetLYhndl_byMIME ARGS1(
 		*(cp++) && isdigit(*cp) &&
 		*(cp++) && isdigit(*cp)) {
 		/*
-		 *  For "ibmNNN<...>", try "cpNNN<...>" if not yet found - kw
+		 *  For "ibmNNN<...>", try "cpNNN<...>" if not yet found. - KW
 		 */
 		StrAllocCopy(cptmp, UC_MIMEcharset + 1);
 		cptmp[0] = 'c';
@@ -1652,30 +1652,30 @@ PRIVATE void UCcleanup_mem NOARGS
 
 PUBLIC void UCInit NOARGS
 {
-  UCreset_allocated_LYCharSets();
-  atexit(UCcleanup_mem);
-  UCconsole_map_init();
-
-  UC_CHARSET_SETUP;
-  UC_CHARSET_SETUP_iso_8859_1;
-  UC_CHARSET_SETUP_iso_8859_2;
-  UC_CHARSET_SETUP_iso_8859_3;
-  UC_CHARSET_SETUP_iso_8859_4;
-  UC_CHARSET_SETUP_iso_8859_5;
-  UC_CHARSET_SETUP_iso_8859_7;
-  UC_CHARSET_SETUP_iso_8859_9;
-  UC_CHARSET_SETUP_iso_8859_10;
-  UC_CHARSET_SETUP_koi8_r;
-
-  UC_CHARSET_SETUP_cp437;
-  UC_CHARSET_SETUP_cp850;
-  UC_CHARSET_SETUP_cp852;
-  UC_CHARSET_SETUP_windows_1250;
-  UC_CHARSET_SETUP_windows_1251;
-  UC_CHARSET_SETUP_iso_8859_1_windows_;
-  UC_CHARSET_SETUP_unicode_1_1_utf_8;
-  UC_CHARSET_SETUP_mnemonic_ascii_0;
-  UC_CHARSET_SETUP_mnemonic;
+    UCreset_allocated_LYCharSets();
+    atexit(UCcleanup_mem);
+    UCconsole_map_init();
+
+    UC_CHARSET_SETUP;
+    UC_CHARSET_SETUP_iso_8859_1;
+    UC_CHARSET_SETUP_iso_8859_2;
+    UC_CHARSET_SETUP_iso_8859_3;
+    UC_CHARSET_SETUP_iso_8859_4;
+    UC_CHARSET_SETUP_iso_8859_5;
+    UC_CHARSET_SETUP_iso_8859_7;
+    UC_CHARSET_SETUP_iso_8859_9;
+    UC_CHARSET_SETUP_iso_8859_10;
+    UC_CHARSET_SETUP_koi8_r;
+
+    UC_CHARSET_SETUP_cp437;
+    UC_CHARSET_SETUP_cp850;
+    UC_CHARSET_SETUP_cp852;
+    UC_CHARSET_SETUP_windows_1250;
+    UC_CHARSET_SETUP_windows_1251;
+    UC_CHARSET_SETUP_iso_8859_1_windows_;
+    UC_CHARSET_SETUP_unicode_1_1_utf_8;
+    UC_CHARSET_SETUP_mnemonic_ascii_0;
+    UC_CHARSET_SETUP_mnemonic;
 #ifdef NOTDEFINED
     UC_CHARSET_SETUP_mnem;
 #endif /* NOTDEFINED */