updated for version 7.0108

diff --git a/src/os_unix.c b/src/os_unix.c
index ce30a2db9853f6c4af22f08f6d9404e323545cfe..e22f62267e7f2602e075e9a2dcb5f8b8ff79b13e 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -929,7 +929,7 @@ deathtrap SIGDEFARG(sigarg)
                || sigarg == SIGUSR2
 # endif
                )
-           && !handle_signal(sigarg))
+           && !vim_handle_signal(sigarg))
        SIGRETURN;
 #endif
 
@@ -1223,7 +1223,7 @@ catch_signals(func_deadly, func_other)
  * Returns TRUE when Vim should exit.
  */
     int
-handle_signal(sig)
+vim_handle_signal(sig)
     int                sig;
 {
     static int got_signal = 0;

diff --git a/src/tag.c b/src/tag.c
index 95a90d4078758b7a92d3279154e71cd0319e11a9..a06edebd437b69cd0d710e2f2952e794804b58f1 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -1273,18 +1273,19 @@ find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname)
     vim_memset(&search_info, 0, (size_t)1);
 #endif
 
-/*
- * When finding a specified number of matches, first try with matching case,
- * so binary search can be used, and try ignore-case matches in a second loop.
- * When finding all matches, 'tagbsearch' is off, or there is no fixed string
- * to look for, ignore case right away to avoid going though the tags files
- * twice.
- * When the tag file is case-fold sorted, it is either one or the other.
- * Only ignore case when TAG_NOIC not used or 'ignorecase' set.
- */
+    /*
+     * When finding a specified number of matches, first try with matching
+     * case, so binary search can be used, and try ignore-case matches in a
+     * second loop.
+     * When finding all matches, 'tagbsearch' is off, or there is no fixed
+     * string to look for, ignore case right away to avoid going though the
+     * tags files twice.
+     * When the tag file is case-fold sorted, it is either one or the other.
+     * Only ignore case when TAG_NOIC not used or 'ignorecase' set.
+     */
 #ifdef FEAT_TAG_BINS
     pats->regmatch.rm_ic = ((p_ic || !noic)
-                                  && (findall || pats->headlen == 0 || !p_tbs));
+                               && (findall || pats->headlen == 0 || !p_tbs));
     for (round = 1; round <= 2; ++round)
     {
       linear = (pats->headlen == 0 || !p_tbs || round == 2);
@@ -2270,9 +2271,8 @@ line_read_in:
       } /* end of for-each-file loop */
 
 #ifdef FEAT_TAG_BINS
-      /* stop searching when already did a linear search, or when
-       * TAG_NOIC used, and 'ignorecase' not set
-       * or already did case-ignore search */
+      /* stop searching when already did a linear search, or when TAG_NOIC
+       * used, and 'ignorecase' not set or already did case-ignore search */
       if (stop_searching || linear || (!p_ic && noic) || pats->regmatch.rm_ic)
          break;
 # ifdef FEAT_CSCOPE