change version to 2.1.17

doc/NERD_commenter.txt

@@ -40,9 +40,9 @@ CONTENTS                                               *NERDCommenterContents*
         4.1 Delimiter detection heuristics....|NERDComHeuristics|
         4.2 Nesting issues....................|NERDComNesting|
     5.The author..............................|NERDComAuthor|
-    6.TODO list...............................|NERDComTodo|
+    6.Changelog...............................|NERDComChangelog|
-    7.Changelog...............................|NERDComChangelog|
+    7.Credits.................................|NERDComCredits|
-    8.Credits.................................|NERDComCredits|
+    8.License.................................|NERDComLicense|
 
 ==============================================================================
 1. Intro                                                       *NERDCommenter*
@@ -111,8 +111,9 @@ Adds comment delimiters to the start of line and goes into insert mode between
 them.
 
 
-<C-c> |NERDComInsertComment| 
+ |NERDComInsertComment|
 Adds comment delimiters at the current cursor position and inserts between.
+Disabled by default.
 
 
 ,ca |NERDComAltDelim|
@@ -288,13 +289,19 @@ insert mode between the new delimiters.
 ------------------------------------------------------------------------------
 2.2.11 Insert comment map                               *NERDComInsertComment*
 
-Default mapping: <C-c>
+Default mapping: disabled by default.
 Change the mapping with: NERDComInInsertMap.
 Applicable modes: insert.
 
 Adds comment delimiters at the current cursor position and inserts
 between them.
 
+NOTE: prior to version 2.1.17 this was mapped to ctrl-c. To restore this
+mapping add >
+    let NERDComInsertMap='<c-c>'
+<
+to your vimrc.
+
 ------------------------------------------------------------------------------
 2.2.12 Use alternate delims map                              *NERDComAltDelim*
 
@@ -651,17 +658,17 @@ When we uncomment this line it will go back to what it was.
 ------------------------------------------------------------------------------
                                                                *NERDMapleader*
 Values: arbitrary string.
-Default: \c
+Default: ,c
 
 NERDMapleader is used to specify what all the NERD commenter key mappings
 begin with.
 
 The default key mappings will look like this: >
-    \cc
+    ,cc
-    \cu
+    ,cu
-    \ca
+    ,ca
-    \ci
+    ,ci
-    \cs
+    ,cs
     ...
 <
 However, if this line: >
@@ -839,7 +846,7 @@ will become: >
 for simplicity)
 
 ==============================================================================
-6. The author                                                  *NERDComAuthor*
+5. The author                                                  *NERDComAuthor*
 
 The author of the NERD commenter is Martyzillatron --- the half robot, half
 dinosaur bastard son of Megatron and Godzilla. He enjoys destroying
@@ -850,16 +857,32 @@ its a lonely life being the worlds premier terror machine. How would you feel
 if your face looked like a toaster and a t-rex put together? :(
 
 ==============================================================================
-7. TODO list                                                     *NERDComTodo*
+7. Changelog                                                *NERDComChangelog*
 
-Uncommenting of minimal comments needs to be more robust. Currently it is easy
+2.1.17
-to get illegal syntax when uncommenting them.
+    - fixed haskell delimiters (hackily). Thanks to Elias Pipping.
+    - add support for mailcap. Thanks to Pascal Brueckner.
+    - add support for stata. Thanks to Jerónimo Carballo.
+    - applied a patch from ewfalor to fix an error in the help file with the
+      NERDMapleader doc
+    - disable the insert mode ctrl-c mapping by default, see :help
+      NERDComInsertComment if you wish to restore it
 
+2.1.16
+    - compatibility fix for vim7.2, cheers to Ben Schmidt, David Fishburn, and
+      Erik Falor for the emails, and to JaGoTerr for posting the issue.
 
+2.1.15
+    - added pamconf support, thanks to Martin Kustermann
+    - added mason support, thanks to Indriði Einarsson
+    - added map support, thanks to Chris
+    - added bzr support, thanks to Stromnov
+    - added group support, thanks to Krzysztof A. Adamski
+    - change license to wtfpl
 
-==============================================================================
+2.1.14
-8. Changelog                                                *NERDComChangelog*
+    - added support for gitconfig, tar, nerdtree
-
+    - added support for dtrace, thanks to nicothakis for the post
 2.1.13
     - added support for rib, pyrex/cython, liquid, services, gitcommit,
       vimperator, and slice. Thanks to spookypeanut, Greg Jandl, Christophe
@@ -1060,7 +1083,7 @@ for his patch. Thanks to John O'Shea and fREW for the filetype
     information.
 
 ==============================================================================
-8. Credits                                                    *NERDComCredits*
+7. Credits                                                    *NERDComCredits*
 
 Thanks and respect to the following people:
 
@@ -1186,6 +1209,11 @@ reports about sexy/toggle comments and for testing my fixes.
 
 Thanks to tpope for the english lesson.
 
+Thanks to Ben Schmidt, David Fishburn, and Erik Falor for emailing me about an
+incompatibility with vim7.2. Thanks also to JaGoTerr for posting the issue.
+
+Thanks to Elias Pipping for sending me a bug report about haskell commenting.
+
 Not to forget! Thanks to the following people for sending me new filetypes to
 support :D
 
@@ -1235,7 +1263,7 @@ Renald Buter                        scala
 Vladimir Lomov                      asymptote
 Marco                               mrxvtrc, aap
 nicothakis                          SVNAnnotate, CVSAnnotate, SVKAnnotate,
-                                    SVNdiff, gitAnnotate, gitdiff
+                                    SVNdiff, gitAnnotate, gitdiff, dtrace
 Chen Xing                           Wikipedia
 Jacobo Diaz                         dakota, patran
 Li Jin                              gentoo-env-d, gentoo-init-d,
@@ -1244,4 +1272,16 @@ SpookeyPeanut                       rib
 Greg Jandl                          pyrex/cython
 Christophe Benz                     services, gitcommit
 A Pontus                            vimperator
-Stromnov                            slice
+Stromnov                            slice, bzr
+Martin Kustermann                   pamconf
+Indriði Einarsson                   mason
+Chris                               map
+Krzysztof A. Adamski                group
+Pascal Brueckner                    mailcap
+Jerónimo Carballo                   stata
+
+==============================================================================
+8. License                                                    *NERDComLicense*
+
+The NERD commenter is released under the wtfpl.
+See http://sam.zoy.org/wtfpl/COPYING.

plugin/NERD_commenter.vim

@@ -1,11 +1,16 @@
-" vim global plugin that provides easy code commenting for various file types
+" ============================================================================
-" Last Change:  4 May 2008
+" File:        NERD_commenter.vim
-" Maintainer:   Martin Grenfell <martin_grenfell at msn.com>
+" Description: vim global plugin that provides easy code commenting
-let s:NERD_commenter_version = 2.1.13
+" Maintainer:  Martin Grenfell <martin_grenfell at msn dot com>
-
+" Version:     2.1.17
-" For help documentation type :help NERDCommenter. If this fails, Restart vim
+" Last Change: 27 June, 2008
-" and try again. If it sill doesnt work... the help page is at the bottom 
+" License:     This program is free software. It comes without any warranty,
-" of this file.
+"              to the extent permitted by applicable law. You can redistribute
+"              it and/or modify it under the terms of the Do What The Fuck You
+"              Want To Public License, Version 2, as published by Sam Hocevar.
+"              See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+" ============================================================================
 
 " Section: script init stuff {{{1
 if exists("loaded_nerd_comments")
@@ -72,7 +77,7 @@ call s:InitVariable("g:NERDAppendComMap", g:NERDMapleader . 'A')
 call s:InitVariable("g:NERDComAlignBothMap", g:NERDMapleader . 'b')
 call s:InitVariable("g:NERDComAlignLeftMap", g:NERDMapleader . 'l')
 call s:InitVariable("g:NERDComAlignRightMap", g:NERDMapleader . 'r')
-call s:InitVariable("g:NERDComInInsertMap", '<C-c>')
+call s:InitVariable("g:NERDComInInsertMap", '')
 call s:InitVariable("g:NERDComLineInvertMap", g:NERDMapleader . 'i')
 call s:InitVariable("g:NERDComLineMap", g:NERDMapleader . 'c')
 call s:InitVariable("g:NERDComLineNestMap", g:NERDMapleader . 'n')
@@ -200,6 +205,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('%', '')
     elseif a:filetype == "btm"
         call s:MapDelimiters('::', '')
+    elseif a:filetype == "bzr"
+        call s:MapDelimiters('', '')
     elseif a:filetype == "caos"
         call s:MapDelimiters('*', '')
     elseif a:filetype == "catalog"
@@ -290,6 +297,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('<!--','-->')
     elseif a:filetype == "dtml"
         call s:MapDelimiters('<dtml-comment>','</dtml-comment>')
+    elseif a:filetype == "dtrace"
+        call s:MapDelimiters('/*','*/')
     elseif a:filetype == "dylan"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
     elseif a:filetype == 'ebuild'
@@ -360,18 +369,22 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('', '')
     elseif a:filetype == 'gitcommit'
         call s:MapDelimiters('', '')
+    elseif a:filetype == 'gitconfig'
+        call s:MapDelimiters(';', '')
     elseif a:filetype == 'gitdiff'
         call s:MapDelimiters('', '')
     elseif a:filetype == "gnuplot"
         call s:MapDelimiters('#','')
     elseif a:filetype == "groovy"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "group"
+        call s:MapDelimiters('','')
     elseif a:filetype == "grub"
         call s:MapDelimiters('#', '')
     elseif a:filetype == "gtkrc"
         call s:MapDelimiters('#', '')
     elseif a:filetype == "haskell"
-        call s:MapDelimitersWithAlternative('--','', '{-', '-}') 
+        call s:MapDelimitersWithAlternative('{-','-}', '--', '--')
     elseif a:filetype == "hb"
         call s:MapDelimiters('#', '')
     elseif a:filetype == "h"
@@ -474,14 +487,20 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('dnl ', '')
     elseif a:filetype == "mail"
         call s:MapDelimiters('> ','')
+    elseif a:filetype == "mailcap"
+        call s:MapDelimiters('#','')
     elseif a:filetype == "make"
         call s:MapDelimiters('#','')
+    elseif a:filetype == "map"
+        call s:MapDelimiters('%', '')
     elseif a:filetype == "maple"
         call s:MapDelimiters('#', '')
     elseif a:filetype == "markdown"
         call s:MapDelimiters('<!--', '-->')
     elseif a:filetype == "masm"
         call s:MapDelimiters(';', '')
+    elseif a:filetype == "mason"
+        call s:MapDelimiters('<% #', '%>')
     elseif a:filetype == "master"
         call s:MapDelimiters('$', '')
     elseif a:filetype == "matlab"
@@ -526,6 +545,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('/*', '')
     elseif a:filetype == "ncf"
         call s:MapDelimiters(';', '')
+    elseif a:filetype == "nerdtree"
+        call s:MapDelimiters('', '')
     elseif a:filetype == "netdict"
         call s:MapDelimiters('', '')
     elseif a:filetype == "netrw"
@@ -558,6 +579,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('', '')
     elseif a:filetype == "ox"
         call s:MapDelimiters('//', '')
+    elseif a:filetype == "pamconf"
+        call s:MapDelimiters('#', '')
     elseif a:filetype == "pascal"
         call s:MapDelimitersWithAlternative('{','}', '(*', '*)')
     elseif a:filetype == "passwd"
@@ -738,6 +761,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('#', '')
     elseif a:filetype == "st"
         call s:MapDelimiters('"','')
+    elseif a:filetype == "stata"
+        call s:MapDelimiters('/*','*/')
     elseif a:filetype == "stp"
         call s:MapDelimiters('--', '')
     elseif a:filetype == "strace"
@@ -764,6 +789,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters(';', '')
     elseif a:filetype == "tak"
         call s:MapDelimiters('$', '')
+    elseif a:filetype == "tar"
+        call s:MapDelimiters('', '')
     elseif a:filetype == "tasm"
         call s:MapDelimiters(';', '')
     elseif a:filetype == "tcl"