7.1.161

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.1.161
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.1.161
  11 Problem:    Compilation errors with tiny features and EXITFREE.
  12 Solution:   Add #ifdefs. (Dominique Pelle)
  13 Files:      src/edit.c, src/misc2.c
  14
  15
  16 *** ../vim-7.1.160/src/edit.c   Thu Nov  8 13:03:33 2007
  17 --- src/edit.c  Sat Nov 24 14:57:46 2007
  18 ***************
  19 *** 2236,2242 ****
  20             while (i < actual_len && (p - IObuff + 6) < IOSIZE)
  21   #ifdef FEAT_MBYTE
  22                 if (has_mbyte)
  23 !                   p += mb_char2bytes(wca[i++], p);
  24                 else
  25   #endif
  26                     *(p++) = wca[i++];
  27 --- 2236,2242 ----
  28             while (i < actual_len && (p - IObuff + 6) < IOSIZE)
  29   #ifdef FEAT_MBYTE
  30                 if (has_mbyte)
  31 !                   p += (*mb_char2bytes)(wca[i++], p);
  32                 else
  33   #endif
  34                     *(p++) = wca[i++];
  35 ***************
  36 *** 6444,6451 ****
  37 --- 6444,6453 ----
  38   {
  39       vim_free(last_insert);
  40       last_insert = NULL;
  41 + # ifdef FEAT_INS_EXPAND
  42       vim_free(compl_orig_text);
  43       compl_orig_text = NULL;
  44 + # endif
  45   }
  46   #endif
  47
  48 *** ../vim-7.1.160/src/misc2.c  Thu Nov  8 20:47:34 2007
  49 --- src/misc2.c Sat Nov 24 15:01:46 2007
  50 ***************
  51 *** 964,970 ****
  52   {
  53       buf_T     *buf, *nextbuf;
  54       static int        entered = FALSE;
  55 -     win_T     *win;
  56
  57       /* When we cause a crash here it is caught and Vim tries to exit cleanly.
  58        * Don't try freeing everything again. */
  59 --- 965,970 ----
  60 ***************
  61 *** 972,986 ****
  62         return;
  63       entered = TRUE;
  64
  65       block_autocmds();     /* don't want to trigger autocommands here */
  66
  67 ! #ifdef FEAT_WINDOWS
  68       /* close all tabs and windows */
  69       if (first_tabpage->tp_next != NULL)
  70         do_cmdline_cmd((char_u *)"tabonly!");
  71       if (firstwin != lastwin)
  72         do_cmdline_cmd((char_u *)"only!");
  73 ! #endif
  74
  75   # if defined(FEAT_SPELL)
  76       /* Free all spell info. */
  77 --- 972,988 ----
  78         return;
  79       entered = TRUE;
  80
  81 + # ifdef FEAT_AUTOCMD
  82       block_autocmds();     /* don't want to trigger autocommands here */
  83 + # endif
  84
  85 ! # ifdef FEAT_WINDOWS
  86       /* close all tabs and windows */
  87       if (first_tabpage->tp_next != NULL)
  88         do_cmdline_cmd((char_u *)"tabonly!");
  89       if (firstwin != lastwin)
  90         do_cmdline_cmd((char_u *)"only!");
  91 ! # endif
  92
  93   # if defined(FEAT_SPELL)
  94       /* Free all spell info. */
  95 ***************
  96 *** 1031,1038 ****
  97 --- 1033,1044 ----
  98       free_regexp_stuff();
  99       free_tag_stuff();
 100       free_cd_dir();
 101 + # ifdef FEAT_EVAL
 102       set_expr_line(NULL);
 103 + # endif
 104 + # ifdef FEAT_DIFF
 105       diff_clear(curtab);
 106 + # endif
 107       clear_sb_text();        /* free any scrollback text */
 108
 109       /* Free some global vars. */
 110 ***************
 111 *** 1041,1059 ****
 112       vim_free(clip_exclude_prog);
 113   # endif
 114       vim_free(last_cmdline);
 115       vim_free(new_last_cmdline);
 116       set_keep_msg(NULL, 0);
 117       vim_free(ff_expand_buffer);
 118
 119       /* Clear cmdline history. */
 120       p_hi = 0;
 121       init_history();
 122
 123   #ifdef FEAT_QUICKFIX
 124 !     qf_free_all(NULL);
 125 !     /* Free all location lists */
 126 !     FOR_ALL_WINDOWS(win)
 127 !       qf_free_all(win);
 128   #endif
 129
 130       /* Close all script inputs. */
 131 --- 1047,1073 ----
 132       vim_free(clip_exclude_prog);
 133   # endif
 134       vim_free(last_cmdline);
 135 + # ifdef FEAT_CMDHIST
 136       vim_free(new_last_cmdline);
 137 + # endif
 138       set_keep_msg(NULL, 0);
 139       vim_free(ff_expand_buffer);
 140
 141       /* Clear cmdline history. */
 142       p_hi = 0;
 143 + # ifdef FEAT_CMDHIST
 144       init_history();
 145 + # endif
 146
 147   #ifdef FEAT_QUICKFIX
 148 !     {
 149 !       win_T   *win;
 150 !
 151 !       qf_free_all(NULL);
 152 !       /* Free all location lists */
 153 !       FOR_ALL_WINDOWS(win)
 154 !           qf_free_all(win);
 155 !     }
 156   #endif
 157
 158       /* Close all script inputs. */
 159 *** ../vim-7.1.160/src/version.c        Sat Nov 24 15:44:17 2007
 160 --- src/version.c       Sat Nov 24 20:55:38 2007
 161 ***************
 162 *** 668,669 ****
 163 --- 668,671 ----
 164   {   /* Add new patch number below this line */
 165 + /**/
 166 +     161,
 167   /**/
 168
 169 --
 170 hundred-and-one symptoms of being an internet addict:
 171 143. You dream in pallettes of 216 websafe colors.
 172
 173  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 174 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 175 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 176  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///