updated for version 7.1a

3 files changed, 7 insertions, 4 deletions

diff --git a/src/feature.h b/src/feature.h
index 9e99b91a4..00dd014b8 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1257,4 +1257,3 @@
 	    || defined(FEAT_BIG)
 # define FEAT_AUTOCHDIR
 #endif
-
diff --git a/src/os_unix.c b/src/os_unix.c
index a18845291..beeea3f9c 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1256,9 +1256,11 @@ catch_signals(func_deadly, func_other)
 
 /*
  * Handling of SIGHUP, SIGQUIT and SIGTERM:
- * "when" == a signal: when busy, postpone, otherwise return TRUE
- * "when" == SIGNAL_BLOCK: Going to be busy, block signals
- * "when" == SIGNAL_UNBLOCK: Going wait, unblock signals
+ * "when" == a signal:       when busy, postpone and return FALSE, otherwise
+ *			     return TRUE
+ * "when" == SIGNAL_BLOCK:   Going to be busy, block signals
+ * "when" == SIGNAL_UNBLOCK: Going to wait, unblock signals, use postponed
+ *                           signal
  * Returns TRUE when Vim should exit.
  */
     int
diff --git a/src/tag.c b/src/tag.c
index 66bcfcd0c..aa1ab755e 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1625,6 +1625,8 @@ find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname)
 		eof = tag_fgets(lbuf, LSIZE, fp);
 		if (!eof && search_info.curr_offset != 0)
 		{
+		    /* The explicit cast is to work around a bug in gcc 3.4.2
+		     * (repeated below). */
 		    search_info.curr_offset = ftell(fp);
 		    if (search_info.curr_offset == search_info.high_offset)
 		    {