astepano / rpms / vim

Forked from rpms/vim 6 years ago
Clone
8235461
To: vim-dev@vim.org
8235461
Subject: Patch 7.1.263
8235461
Fcc: outbox
8235461
From: Bram Moolenaar <Bram@moolenaar.net>
8235461
Mime-Version: 1.0
8235461
Content-Type: text/plain; charset=ISO-8859-1
8235461
Content-Transfer-Encoding: 8bit
8235461
------------
8235461
8235461
Patch 7.1.263
8235461
Problem:    The filetype can consist of two dot separated names.  This works
8235461
	    for syntax and ftplugin, but not for indent. (Brett Stahlman)
8235461
Solution:   Use split() and loop over each dot separated name.
8235461
Files:	    runtime/indent.vim
8235461
8235461
8235461
*** ../vim-7.1.262/runtime/indent.vim	Mon Mar 28 22:56:55 2005
8235461
--- runtime/indent.vim	Fri Feb 22 21:05:39 2008
8235461
***************
8235461
*** 1,7 ****
8235461
  " Vim support file to switch on loading indent files for file types
8235461
  "
8235461
  " Maintainer:	Bram Moolenaar <Bram@vim.org>
8235461
! " Last Change:	2005 Mar 28
8235461
  
8235461
  if exists("did_indent_on")
8235461
    finish
8235461
--- 1,7 ----
8235461
  " Vim support file to switch on loading indent files for file types
8235461
  "
8235461
  " Maintainer:	Bram Moolenaar <Bram@vim.org>
8235461
! " Last Change:	2008 Feb 22
8235461
  
8235461
  if exists("did_indent_on")
8235461
    finish
8235461
***************
8235461
*** 15,25 ****
8235461
        exe b:undo_indent
8235461
        unlet! b:undo_indent b:did_indent
8235461
      endif
8235461
!     if expand("<amatch>") != ""
8235461
        if exists("b:did_indent")
8235461
  	unlet b:did_indent
8235461
        endif
8235461
!       runtime! indent/<amatch>.vim
8235461
      endif
8235461
    endfunc
8235461
  augroup END
8235461
--- 15,31 ----
8235461
        exe b:undo_indent
8235461
        unlet! b:undo_indent b:did_indent
8235461
      endif
8235461
!     let s = expand("<amatch>")
8235461
!     if s != ""
8235461
        if exists("b:did_indent")
8235461
  	unlet b:did_indent
8235461
        endif
8235461
! 
8235461
!       " When there is a dot it is used to separate filetype names.  Thus for
8235461
!       " "aaa.bbb" load "indent/aaa.vim" and then "indent/bbb.vim".
8235461
!       for name in split(s, '\.')
8235461
! 	exe 'runtime! indent/' . name . '.vim'
8235461
!       endfor
8235461
      endif
8235461
    endfunc
8235461
  augroup END
8235461
*** ../vim-7.1.262/src/version.c	Wed Feb 20 20:09:44 2008
8235461
--- src/version.c	Mon Feb 25 20:44:04 2008
8235461
***************
8235461
*** 668,669 ****
8235461
--- 668,671 ----
8235461
  {   /* Add new patch number below this line */
8235461
+ /**/
8235461
+     263,
8235461
  /**/
8235461
8235461
-- 
8235461
hundred-and-one symptoms of being an internet addict:
8235461
45. You buy a Captain Kirk chair with a built-in keyboard and mouse.
8235461
8235461
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8235461
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8235461
\\\        download, build and distribute -- http://www.A-A-P.org        ///
8235461
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///