components/vim/vim72-patches/7.2.222
changeset 198 172fc01ce997
equal deleted inserted replaced
197:fd801ec0737c 198:172fc01ce997
       
     1 To: [email protected]
       
     2 Subject: Patch 7.2.222
       
     3 Fcc: outbox
       
     4 From: Bram Moolenaar <[email protected]>
       
     5 Mime-Version: 1.0
       
     6 Content-Type: text/plain; charset=UTF-8
       
     7 Content-Transfer-Encoding: 8bit
       
     8 ------------
       
     9 
       
    10 Patch 7.2.222
       
    11 Problem:   ":mksession" doesn't work properly with 'acd' set. 
       
    12 Solution:   Make it work. (Yakov Lerner)
       
    13 Files:	    src/ex_docmd.c
       
    14 
       
    15 
       
    16 *** ../vim-7.2.221/src/ex_docmd.c	2009-05-16 17:29:37.000000000 +0200
       
    17 --- src/ex_docmd.c	2009-07-01 20:18:22.000000000 +0200
       
    18 ***************
       
    19 *** 8686,8691 ****
       
    20 --- 8693,8700 ----
       
    21       }
       
    22   
       
    23   #ifdef FEAT_SESSION
       
    24 +     /* Use the short file name until ":lcd" is used.  We also don't use the
       
    25 +      * short file name when 'acd' is set, that is checked later. */
       
    26       did_lcd = FALSE;
       
    27   
       
    28       /* ":mkview" or ":mkview 9": generate file name with 'viewdir' */
       
    29 ***************
       
    30 *** 10573,10578 ****
       
    31 --- 10582,10590 ----
       
    32       if (buf->b_sfname != NULL
       
    33   	    && flagp == &ssop_flags
       
    34   	    && (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR))
       
    35 + #ifdef FEAT_AUTOCHDIR
       
    36 + 	    && !p_acd
       
    37 + #endif
       
    38   	    && !did_lcd)
       
    39   	name = buf->b_sfname;
       
    40       else
       
    41 *** ../vim-7.2.221/src/version.c	2009-07-01 18:04:30.000000000 +0200
       
    42 --- src/version.c	2009-07-01 20:16:19.000000000 +0200
       
    43 ***************
       
    44 *** 678,679 ****
       
    45 --- 678,681 ----
       
    46   {   /* Add new patch number below this line */
       
    47 + /**/
       
    48 +     222,
       
    49   /**/
       
    50 
       
    51 -- 
       
    52 hundred-and-one symptoms of being an internet addict:
       
    53 43. You tell the kids they can't use the computer because "Daddy's got work to
       
    54     do" and you don't even have a job.
       
    55 
       
    56  /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
       
    57 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
       
    58 \\\        download, build and distribute -- http://www.A-A-P.org        ///
       
    59  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///