vim/patches/vim-7.3.430.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.430
   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.430
  11 Problem:    When a custom filetype detection uses "augroup END" the conf
  12             fileytpe detection does not have the filetypedetect group.
  13 Solution:   Always end the group and include filetypedetect in the conf
  14             autocommand. (Lech Lorens)
  15 Files:      runtime/filetype.vim
  16
  17
  18 *** ../vim-7.3.429/runtime/filetype.vim 2012-02-05 20:08:08.000000000 +0100
  19 --- runtime/filetype.vim        2012-02-05 19:59:40.000000000 +0100
  20 ***************
  21 *** 2545,2561 ****
  22   " detected filetypes.
  23   runtime! ftdetect/*.vim
  24
  25
  26   " Generic configuration file (check this last, it's just guessing!)
  27 ! au BufNewFile,BufRead,StdinReadPost *
  28         \ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
  29         \    && (getline(1) =~ '^#' || getline(2) =~ '^#' || getline(3) =~ '^#'
  30         \       || getline(4) =~ '^#' || getline(5) =~ '^#') |
  31         \   setf conf |
  32         \ endif
  33
  34 - augroup END
  35 -
  36
  37   " If the GUI is already running, may still need to install the Syntax menu.
  38   " Don't do it when the 'M' flag is included in 'guioptions'.
  39 --- 2545,2563 ----
  40   " detected filetypes.
  41   runtime! ftdetect/*.vim
  42
  43 + " NOTE: The above command could have ended the filetypedetect autocmd group
  44 + " and started another one. Let's make sure it has ended to get to a consistant
  45 + " state.
  46 + augroup END
  47
  48   " Generic configuration file (check this last, it's just guessing!)
  49 ! au filetypedetect BufNewFile,BufRead,StdinReadPost *
  50         \ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
  51         \    && (getline(1) =~ '^#' || getline(2) =~ '^#' || getline(3) =~ '^#'
  52         \       || getline(4) =~ '^#' || getline(5) =~ '^#') |
  53         \   setf conf |
  54         \ endif
  55
  56
  57   " If the GUI is already running, may still need to install the Syntax menu.
  58   " Don't do it when the 'M' flag is included in 'guioptions'.
  59 *** ../vim-7.3.429/src/version.c        2012-02-05 01:18:41.000000000 +0100
  60 --- src/version.c       2012-02-05 20:02:18.000000000 +0100
  61 ***************
  62 *** 716,717 ****
  63 --- 716,719 ----
  64   {   /* Add new patch number below this line */
  65 + /**/
  66 +     430,
  67   /**/
  68
  69 --
  70 The technology involved in making anything invisible is so infinitely
  71 complex that nine hundred and ninety-nine billion, nine hundred and
  72 ninety-nine million, nine hundred and ninety-nine thousand, nine hundred
  73 and ninety-nine times out of a trillion it is much simpler and more
  74 effective just to take the thing away and do without it.
  75                 -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
  76
  77  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  78 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  79 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  80  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///