vim/patches/vim-7.3.421.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.421
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.421
  11 Problem:    Get E832 when setting 'undofile' in vimrc and there is a file to
  12             be edited on the command line. (Toothpik)
  13 Solution:   Do not try reading the undo file for a file that wasn't loaded.
  14 Files:      src/option.c
  15
  16
  17 *** ../vim-7.3.420/src/option.c 2012-01-10 22:26:12.000000000 +0100
  18 --- src/option.c        2012-01-28 17:55:24.000000000 +0100
  19 ***************
  20 *** 7527,7536 ****
  21         {
  22             /* When 'undofile' is set globally: for every buffer, otherwise
  23              * only for the current buffer: Try to read in the undofile, if
  24 !            * one exists and the buffer wasn't changed. */
  25             if ((curbuf == save_curbuf
  26                                 || (opt_flags & OPT_GLOBAL) || opt_flags == 0)
  27 !                   && !curbufIsChanged())
  28             {
  29                 u_compute_hash(hash);
  30                 u_read_undo(NULL, hash, curbuf->b_fname);
  31 --- 7527,7537 ----
  32         {
  33             /* When 'undofile' is set globally: for every buffer, otherwise
  34              * only for the current buffer: Try to read in the undofile, if
  35 !            * one exists and the buffer wasn't changed and the buffer was
  36 !            * loaded. */
  37             if ((curbuf == save_curbuf
  38                                 || (opt_flags & OPT_GLOBAL) || opt_flags == 0)
  39 !                   && !curbufIsChanged() && curbuf->b_ml.ml_mfp != NULL)
  40             {
  41                 u_compute_hash(hash);
  42                 u_read_undo(NULL, hash, curbuf->b_fname);
  43 *** ../vim-7.3.420/src/version.c        2012-01-26 20:58:21.000000000 +0100
  44 --- src/version.c       2012-01-28 18:03:09.000000000 +0100
  45 ***************
  46 *** 716,717 ****
  47 --- 716,719 ----
  48   {   /* Add new patch number below this line */
  49 + /**/
  50 +     421,
  51   /**/
  52
  53 --
  54 hundred-and-one symptoms of being an internet addict:
  55 4. Your eyeglasses have a web site burned in on them.
  56
  57  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  58 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  59 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  60  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///