To: [email protected]
Subject: Patch 7.2b.016
Fcc: outbox
From: Bram Moolenaar <[email protected]>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2b.016
Problem:    Build fails with normal features but without +autocmd.
Solution:   Fix #ifdefs. (Ian Kelling)
Files:      src/eval.c, src/ex_cmds.c, src/quickfix.c, src/option.c,
           src/ex_docmd.c


*** ../vim-7.2b.015/src/eval.c  Mon Jul 14 23:04:13 2008
--- src/eval.c  Fri Jul 18 14:48:42 2008
***************
*** 18073,18079 ****
     return vimvars[idx].vv_nr;
 }

- #if defined(FEAT_AUTOCMD) || defined(PROTO)
 /*
  * Get string v: variable value.  Uses a static buffer, can only be used once.
  */
--- 18073,18078 ----
***************
*** 18083,18089 ****
 {
     return get_tv_string(&vimvars[idx].vv_tv);
 }
- #endif

 /*
  * Set v:count, v:count1 and v:prevcount.
--- 18082,18087 ----
*** ../vim-7.2b.015/src/ex_cmds.c       Sun Jul 13 19:15:10 2008
--- src/ex_cmds.c       Thu Jul 24 17:03:48 2008
***************
*** 3141,3150 ****
 #ifdef FEAT_BROWSE
       if (cmdmod.browse)
       {
           if (
! # ifdef FEAT_GUI
               !gui.in_use &&
! # endif
                   au_has_group((char_u *)"FileExplorer"))
           {
               /* No browsing supported but we do have the file explorer:
--- 3144,3154 ----
 #ifdef FEAT_BROWSE
       if (cmdmod.browse)
       {
+ # ifdef FEAT_AUTOCMD
           if (
! #  ifdef FEAT_GUI
               !gui.in_use &&
! #  endif
                   au_has_group((char_u *)"FileExplorer"))
           {
               /* No browsing supported but we do have the file explorer:
***************
*** 3153,3158 ****
--- 3157,3163 ----
                   ffname = (char_u *)".";
           }
           else
+ # endif
           {
               browse_file = do_browse(0, (char_u *)_("Edit File"), ffname,
                                                   NULL, NULL, NULL, curbuf);
*** ../vim-7.2b.015/src/quickfix.c      Mon Jul 14 23:04:13 2008
--- src/quickfix.c      Fri Jul 18 14:53:02 2008
***************
*** 2999,3012 ****
     char_u    *save_ei = NULL;
 #endif
     aco_save_T        aco;
- #ifdef FEAT_AUTOCMD
-     char_u    *au_name =  NULL;
     int               flags = 0;
     colnr_T   col;
     long      tomatch;
     char_u    dirname_start[MAXPATHL];
     char_u    dirname_now[MAXPATHL];
     char_u    *target_dir = NULL;

     switch (eap->cmdidx)
     {
--- 2999,3012 ----
     char_u    *save_ei = NULL;
 #endif
     aco_save_T        aco;
     int               flags = 0;
     colnr_T   col;
     long      tomatch;
     char_u    dirname_start[MAXPATHL];
     char_u    dirname_now[MAXPATHL];
     char_u    *target_dir = NULL;
+ #ifdef FEAT_AUTOCMD
+     char_u    *au_name =  NULL;

     switch (eap->cmdidx)
     {
*** ../vim-7.2b.015/src/option.c        Tue Jul  8 17:15:08 2008
--- src/option.c        Fri Jul 18 15:05:33 2008
***************
*** 8622,8629 ****
 #  endif
 # endif
 # if defined(FEAT_AUTOCMD)
!                           p->indir == PV_FT)
 # endif
                   {
                       if (fprintf(fd, "if &%s != '%s'", p->fullname,
                                                      *(char_u **)(varp)) < 0
--- 8622,8630 ----
 #  endif
 # endif
 # if defined(FEAT_AUTOCMD)
!                           p->indir == PV_FT
 # endif
+                           )
                   {
                       if (fprintf(fd, "if &%s != '%s'", p->fullname,
                                                      *(char_u **)(varp)) < 0
*** ../vim-7.2b.015/src/ex_docmd.c      Sun Jul 13 19:15:10 2008
--- src/ex_docmd.c      Fri Jul 18 17:03:59 2008
***************
*** 7095,7104 ****
 # endif
           && eap->cmdidx != CMD_new)
     {
       if (
! # ifdef FEAT_GUI
           !gui.in_use &&
! # endif
               au_has_group((char_u *)"FileExplorer"))
       {
           /* No browsing supported but we do have the file explorer:
--- 7095,7105 ----
 # endif
           && eap->cmdidx != CMD_new)
     {
+ # ifdef FEAT_AUTOCMD
       if (
! #  ifdef FEAT_GUI
           !gui.in_use &&
! #  endif
               au_has_group((char_u *)"FileExplorer"))
       {
           /* No browsing supported but we do have the file explorer:
***************
*** 7107,7112 ****
--- 7108,7114 ----
               eap->arg = (char_u *)".";
       }
       else
+ # endif
       {
           fname = do_browse(0, (char_u *)_("Edit File in new window"),
                                         eap->arg, NULL, NULL, NULL, curbuf);
*** ../vim-7.2b.015/src/version.c       Thu Jul 24 17:19:58 2008
--- src/version.c       Thu Jul 24 18:42:30 2008
***************
*** 678,679 ****
--- 678,681 ----
 {   /* Add new patch number below this line */
+ /**/
+     16,
 /**/

--
GUARD #1:  What -- a swallow carrying a coconut?
ARTHUR:    It could grip it by the husk!
GUARD #1:  It's not a question of where he grips it!  It's a simple question
          of weight ratios!  A five ounce bird could not carry a 1 pound
          coconut.
                                 The Quest for the Holy Grail (Monty Python)

/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
\\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

You are viewing proxied material from ftp.icm.edu.pl. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.