81c2858
To: vim-dev@vim.org
81c2858
Subject: Patch 7.2.222
81c2858
Fcc: outbox
81c2858
From: Bram Moolenaar <Bram@moolenaar.net>
81c2858
Mime-Version: 1.0
81c2858
Content-Type: text/plain; charset=UTF-8
81c2858
Content-Transfer-Encoding: 8bit
81c2858
------------
81c2858
81c2858
Patch 7.2.222
81c2858
Problem:   ":mksession" doesn't work properly with 'acd' set. 
81c2858
Solution:   Make it work. (Yakov Lerner)
81c2858
Files:	    src/ex_docmd.c
81c2858
81c2858
81c2858
*** ../vim-7.2.221/src/ex_docmd.c	2009-05-16 17:29:37.000000000 +0200
81c2858
--- src/ex_docmd.c	2009-07-01 20:18:22.000000000 +0200
81c2858
***************
81c2858
*** 8686,8691 ****
81c2858
--- 8693,8700 ----
81c2858
      }
81c2858
  
81c2858
  #ifdef FEAT_SESSION
81c2858
+     /* Use the short file name until ":lcd" is used.  We also don't use the
81c2858
+      * short file name when 'acd' is set, that is checked later. */
81c2858
      did_lcd = FALSE;
81c2858
  
81c2858
      /* ":mkview" or ":mkview 9": generate file name with 'viewdir' */
81c2858
***************
81c2858
*** 10573,10578 ****
81c2858
--- 10582,10590 ----
81c2858
      if (buf->b_sfname != NULL
81c2858
  	    && flagp == &ssop_flags
81c2858
  	    && (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR))
81c2858
+ #ifdef FEAT_AUTOCHDIR
81c2858
+ 	    && !p_acd
81c2858
+ #endif
81c2858
  	    && !did_lcd)
81c2858
  	name = buf->b_sfname;
81c2858
      else
81c2858
*** ../vim-7.2.221/src/version.c	2009-07-01 18:04:30.000000000 +0200
81c2858
--- src/version.c	2009-07-01 20:16:19.000000000 +0200
81c2858
***************
81c2858
*** 678,679 ****
81c2858
--- 678,681 ----
81c2858
  {   /* Add new patch number below this line */
81c2858
+ /**/
81c2858
+     222,
81c2858
  /**/
81c2858
81c2858
-- 
81c2858
hundred-and-one symptoms of being an internet addict:
81c2858
43. You tell the kids they can't use the computer because "Daddy's got work to
81c2858
    do" and you don't even have a job.
81c2858
81c2858
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
81c2858
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
81c2858
\\\        download, build and distribute -- http://www.A-A-P.org        ///
81c2858
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///