r1264 - in /trunk/packages/vim-scripts: debian/changelog debian/vim-scripts.status doc/NERD_commenter.txt html/index.html html/plugin_NERD_commenter.vim.html plugin/NERD_commenter.vim

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Mon Jun 23 14:59:48 UTC 2008


Author: jamessan
Date: Mon Jun 23 14:59:48 2008
New Revision: 1264

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1264
Log:
Update NERD commenter plugin


Modified:
    trunk/packages/vim-scripts/debian/changelog
    trunk/packages/vim-scripts/debian/vim-scripts.status
    trunk/packages/vim-scripts/doc/NERD_commenter.txt
    trunk/packages/vim-scripts/html/index.html
    trunk/packages/vim-scripts/html/plugin_NERD_commenter.vim.html
    trunk/packages/vim-scripts/plugin/NERD_commenter.vim

Modified: trunk/packages/vim-scripts/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1264&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/changelog (original)
+++ trunk/packages/vim-scripts/debian/changelog Mon Jun 23 14:59:48 2008
@@ -1,7 +1,12 @@
 vim-scripts (7.1.8) UNRELEASED; urgency=low
 
+  [ martin f. krafft ]
   * Updated addons:
     - Markdown syntax
+
+  [ James Vega ]
+  * Updated addons:
+    - NERD Commenter
 
  -- martin f. krafft <madduck at debian.org>  Thu, 19 Jun 2008 17:24:13 +0200
 

Modified: trunk/packages/vim-scripts/debian/vim-scripts.status
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1264&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/vim-scripts.status (original)
+++ trunk/packages/vim-scripts/debian/vim-scripts.status Mon Jun 23 14:59:48 2008
@@ -250,10 +250,10 @@
 author:      Marty Grenfell
 author_url:  http://www.vim.org/account/profile.php?user_id=7006
 email:       mrg39 at student.canterbury.ac.nz
-license:     no license
+license:     wtfpl [6], see below
 extras:      doc/NERD_commenter.txt
 disabledby:  let loaded_nerd_comments = 1
-version:     2.1.12
+version:     2.1.15
 
 script_name: plugin/project.vim
 addon:       project
@@ -540,3 +540,10 @@
   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
+
+license [6]
+ This program is free software. It comes without any warranty,
+ 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

Modified: trunk/packages/vim-scripts/doc/NERD_commenter.txt
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/doc/NERD_commenter.txt?rev=1264&op=diff
==============================================================================
--- trunk/packages/vim-scripts/doc/NERD_commenter.txt (original)
+++ trunk/packages/vim-scripts/doc/NERD_commenter.txt Mon Jun 23 14:59:48 2008
@@ -8,7 +8,7 @@
 
 
 ==============================================================================
-CONTENTS                                               *NERDCommenterContents* 
+CONTENTS                                               *NERDCommenterContents*
 
     1.Intro...................................|NERDCommenter|
     2.Functionality provided..................|NERDComFunctionality|
@@ -16,8 +16,8 @@
         2.2 Functionality Details.............|NERDComFunctionalityDetails|
             2.2.1 Comment map.................|NERDComComment|
             2.2.2 Nested comment map..........|NERDComNestedComment|
-            2.2.3 Toggle comment map..........|NERDComToggleComment| 
-            2.2.4 Minimal comment map.........|NERDComMinimalComment| 
+            2.2.3 Toggle comment map..........|NERDComToggleComment|
+            2.2.4 Minimal comment map.........|NERDComMinimalComment|
             2.2.5 Invert comment map..........|NERDComInvertComment|
             2.2.6 Sexy comment map............|NERDComSexyComment|
             2.2.7 Yank comment map............|NERDComYankComment|
@@ -40,9 +40,9 @@
         4.1 Delimiter detection heuristics....|NERDComHeuristics|
         4.2 Nesting issues....................|NERDComNesting|
     5.The author..............................|NERDComAuthor|
-    6.TODO list...............................|NERDComTodo|
-    7.Changelog...............................|NERDComChangelog|
-    8.Credits.................................|NERDComCredits|
+    6.Changelog...............................|NERDComChangelog|
+    7.Credits.................................|NERDComCredits|
+    8.License.................................|NERDComLicense|
 
 ==============================================================================
 1. Intro                                                       *NERDCommenter*
@@ -66,30 +66,30 @@
 Most of the following mappings are for normal/visual mode only. The
 |NERDComInsertComment| mapping is for insert mode only.
 
-[count],cc |NERDComComment| 
+[count],cc |NERDComComment|
 Comments out the current line or text selected in visual mode.
 
 
-[count],cn |NERDComNestedComment| 
+[count],cn |NERDComNestedComment|
 Same as |NERDComComment| but forces nesting.
 
-[count],c<space> |NERDComToggleComment| 
+[count],c<space> |NERDComToggleComment|
 Toggles the comment state of the selected line(s). If the topmost selected
 line is commented, all selected lines are uncommented and vice versa.
 
 
-[count],cm |NERDComMinimalComment| 
+[count],cm |NERDComMinimalComment|
 Comments the given lines using only one set of multipart delimiters if
-possible. 
-
-
-[count],ci |NERDComInvertComment| 
+possible.
+
+
+[count],ci |NERDComInvertComment|
 Toggles the comment state of the selected line(s) individually. Each selected
 line that is commented is uncommented and vice versa.
 
 
-[count],cs |NERDComSexyComment| 
-Comments out the selected lines ``sexually''
+[count],cs |NERDComSexyComment|
+Comments out the selected lines ``sexily''
 
 
 [count],cy |NERDComYankComment|
@@ -97,37 +97,37 @@
 before commenting.
 
 
-,c$ |NERDComEOLComment| 
+,c$ |NERDComEOLComment|
 Comments the current line from the cursor to the end of line.
 
 
-,cA |NERDComAppendComment| 
+,cA |NERDComAppendComment|
 Adds comment delimiters to the end of line and goes into insert mode between
 them.
 
 
-,cI |NERDComPrependComment| 
+,cI |NERDComPrependComment|
 Adds comment delimiters to the start of line and goes into insert mode between
 them.
 
 
-<C-c> |NERDComInsertComment| 
+<C-c> |NERDComInsertComment|
 Adds comment delimiters at the current cursor position and inserts between.
 
 
-,ca |NERDComAltDelim| 
+,ca |NERDComAltDelim|
 Switches to the alternative set of delimiters.
 
 
-[count],cl 
-[count],cr 
-[count],cb    |NERDComAlignedComment| 
+[count],cl
+[count],cr
+[count],cb    |NERDComAlignedComment|
 Same as |NERDComComment| except that the delimiters are aligned down the
 left side (,cl), the right side (,cr) or both sides
 (,cb).
 
 
-[count],cu |NERDComUncommentLine| 
+[count],cu |NERDComUncommentLine|
 Uncomments the selected line(s).
 
 ------------------------------------------------------------------------------
@@ -137,8 +137,8 @@
 2.2.1 Comment map                                             *NERDComComment*
 
 Default mapping: [count],cc
-Change the mapping with: NERDComLineMap. 
-Applicable modes: normal visual visual-line visual-block.  
+Change the mapping with: NERDComLineMap.
+Applicable modes: normal visual visual-line visual-block.
 
 
 Comments out the current line. If multiple lines are selected in visual-line
@@ -157,12 +157,12 @@
 Applicable modes: normal visual visual-line visual-block.
 
 Performs nested commenting.  Works the same as ,cc except that if a
-line is already commented then it will be commented again. 
+line is already commented then it will be commented again.
 
 If |NERDUsePlaceHolders| is set then the previous comment delimiters will
 be replaced by place-holder delimiters if needed.  Otherwise the nested
 comment will only be added if the current commenting delimiters have no right
-delimiter (to avoid syntax errors) 
+delimiter (to avoid syntax errors)
 
 If a [count] is given in normal mode, the mapping works as though that many
 lines were selected in visual-line mode.
@@ -171,15 +171,15 @@
 |NERDDefaultNesting|
 
 ------------------------------------------------------------------------------
-2.2.3 Toggle comment map                                *NERDComToggleComment* 
-
-Default mapping: [count],c<space> 
+2.2.3 Toggle comment map                                *NERDComToggleComment*
+
+Default mapping: [count],c<space>
 Change the mapping with: NERDComLineToggleMap.
 Applicable modes: normal visual-line.
 
 Toggles commenting of the lines selected. The behaviour of this mapping
 depends on whether the first line selected is commented or not.  If so, all
-selected lines are uncommented and vice versa. 
+selected lines are uncommented and vice versa.
 
 With this mapping, a line is only considered to be commented if it starts with
 a left delimiter.
@@ -188,7 +188,7 @@
 lines were selected in visual-line mode.
 
 ------------------------------------------------------------------------------
-2.2.4 Minimal comment map                              *NERDComMinimalComment* 
+2.2.4 Minimal comment map                              *NERDComMinimalComment*
 
 Default mapping: [count],cm
 Change the mapping with: NERDComLineMinimalMap
@@ -212,13 +212,13 @@
 ------------------------------------------------------------------------------
 2.2.5 Invert comment map                                *NERDComInvertComment*
 
-Default mapping: ,ci 
+Default mapping: ,ci
 Change the mapping with: NERDComLineInvertMap.
 Applicable modes: normal visual-line.
 
 Inverts the commented state of each selected line. If the a selected line is
 commented then it is uncommented and vice versa. Each line is examined and
-commented/uncommented individually. 
+commented/uncommented individually.
 
 With this mapping, a line is only considered to be commented if it starts with
 a left delimiter.
@@ -229,13 +229,13 @@
 ------------------------------------------------------------------------------
 2.2.6 Sexy comment map                                    *NERDComSexyComment*
 
-Default mapping: [count],cs  
+Default mapping: [count],cs
 Change the mapping with: NERDComLineSexyMap
 Applicable modes: normal, visual-line.
 
 Comments the selected line(s) ``sexily''... see |NERDComSexyComments| for
 a description of what sexy comments are. Can only be done on filetypes for
-which there is at least one set of multipart comment delimiters specified. 
+which there is at least one set of multipart comment delimiters specified.
 
 Sexy comments cannot be nested and lines inside a sexy comment cannot be
 commented again.
@@ -249,31 +249,31 @@
 ------------------------------------------------------------------------------
 2.2.7 Yank comment map                                    *NERDComYankComment*
 
-Default mapping: [count],cy  
+Default mapping: [count],cy
 Change the mapping with: NERDComLineYankMap
 Applicable modes: normal visual visual-line visual-block.
 
-Same as ,cc except that it yanks the line(s) that are commented first. 
+Same as ,cc except that it yanks the line(s) that are commented first.
 
 ------------------------------------------------------------------------------
 2.2.8 Comment to EOL map                                   *NERDComEOLComment*
 
-Default mapping: ,c$ 
-Change the mapping with: NERDComToEOLMap 
+Default mapping: ,c$
+Change the mapping with: NERDComToEOLMap
 Applicable modes: normal.
 
 Comments the current line from the current cursor position up to the end of
-the line. 
+the line.
 
 ------------------------------------------------------------------------------
 2.2.9 Append com to line map                            *NERDComAppendComment*
 
-Default mapping: ,cA      
-Change the mapping with: NERDAppendComMap. 
+Default mapping: ,cA
+Change the mapping with: NERDAppendComMap.
 Applicable modes: normal.
 
 Appends comment delimiters to the end of the current line and goes
-to insert mode between the new delimiters.  
+to insert mode between the new delimiters.
 
 ------------------------------------------------------------------------------
 2.2.10 Prepend com to line map                         *NERDComPrependComment*
@@ -283,17 +283,17 @@
 Applicable modes: normal.
 
 Prepends comment delimiters to the start of the current line and goes to
-insert mode between the new delimiters.  
+insert mode between the new delimiters.
 
 ------------------------------------------------------------------------------
 2.2.11 Insert comment map                               *NERDComInsertComment*
 
 Default mapping: <C-c>
-Change the mapping with: NERDComInInsertMap. 
+Change the mapping with: NERDComInInsertMap.
 Applicable modes: insert.
 
 Adds comment delimiters at the current cursor position and inserts
-between them. 
+between them.
 
 ------------------------------------------------------------------------------
 2.2.12 Use alternate delims map                              *NERDComAltDelim*
@@ -304,21 +304,21 @@
 
 Changes to the alternative commenting style if one is available. For example,
 if the user is editing a c++ file using // comments and they hit ,ca
-then they will be switched over to /**/ comments.  
+then they will be switched over to /**/ comments.
 
 See also |NERDComDefaultDelims|
 
 ------------------------------------------------------------------------------
 2.2.13 Comment aligned maps                            *NERDComAlignedComment*
 
-Default mappings: [count],cl   [count],cr   [count],cb    
+Default mappings: [count],cl   [count],cr   [count],cb
 Change the mappings with: NERDComAlignLeftMap, NERDComAlignRightMap and
 NERDComAlignBothMap.
 Applicable modes: normal visual-line.
 
 Same as ,cc except that the comment delimiters are aligned on the left
 side, right side or both sides respectively. These comments are always nested
-if the line(s) are already commented. 
+if the line(s) are already commented.
 
 If a [count] is given in normal mode, the mapping works as though that many
 lines were selected in visual-line mode.
@@ -326,7 +326,7 @@
 ------------------------------------------------------------------------------
 2.2.14 Uncomment line map                               *NERDComUncommentLine*
 
-Default mapping: [count],cu      
+Default mapping: [count],cu
 Change the mapping with: NERDUncomLineMap.
 Applicable modes: normal visual visual-line visual-block.
 
@@ -375,7 +375,7 @@
 plaintex texinfo texmf tf tidy tli trasys tsalt tsscl tssgm uc uil vb verilog
 verilog_systemverilog vgrindefs vhdl vim viminfo virata vo_base vrml vsejcl
 webmacro wget winbatch wml wvdial xdefaults xf86conf xhtml xkb xmath xml
-xmodmap xpm2 xpm xslt yacc yaml z8a 
+xmodmap xpm2 xpm xslt yacc yaml z8a
 
 If a language is not in the list of hardcoded supported filetypes then the
 &commentstring vim option is used.
@@ -390,7 +390,7 @@
      */
 
     /* This is a c style sexy comment
-     * So there! 
+     * So there!
      * But this one is ``compact'' style */
 <
 Here the multipart delimiters are /* and */ and the marker is *. The NERD
@@ -402,9 +402,9 @@
 All of the NERD commenter mappings and menu items invoke a single function
 which delegates the commenting work to other functions. This function is
 public and has the prototype: >
-    function! NERDComment(isVisual, type) 
-<
-The arguments to this function are simple: 
+    function! NERDComment(isVisual, type)
+<
+The arguments to this function are simple:
     - isVisual: if you wish to do any kind of visual comment then set this to
       1 and the function will use the '< and '> marks to find the comment
       boundries. If set to 0 then the function will operate on the current
@@ -418,7 +418,7 @@
     :call NERDComment(1, 'sexy')
 <
 then the script would do a sexy comment on the last visual selection.
- 
+
 
 ==============================================================================
 3. Options                                                    *NERDComOptions*
@@ -450,7 +450,7 @@
 |NERDRemoveExtraSpaces|               Tells the script to always remove the
                                       extra spaces when uncommenting
                                       (regardless of whether NERDSpaceDelims
-                                      is set) 
+                                      is set)
 |NERDRPlace|                          Specifies what to use as the right
                                       delimiter placeholder when nesting
                                       comments.
@@ -466,7 +466,7 @@
 ------------------------------------------------------------------------------
 3.3 Options details                                    *NERDComOptionsDetails*
 
-To enable any of the below options you should put the given line in your 
+To enable any of the below options you should put the given line in your
 ~/.vimrc
 
                                                        *loaded_nerd_comments*
@@ -476,7 +476,7 @@
 <
 ------------------------------------------------------------------------------
                                                     *NERDAllowAnyVisualDelims*
-Values: 0 or 1.                            
+Values: 0 or 1.
 Default: 1.
 
 If set to 1 then, when doing a visual or visual-block comment (but not a
@@ -489,7 +489,7 @@
     System.out.println(foo * bar);
 <
 If we are using // comments and select the "foo" and "bar" in visual-block
-mode, as shown left below (where '|'s are used to represent the visual-block 
+mode, as shown left below (where '|'s are used to represent the visual-block
 boundary), and comment it then the script will use the alternative delims as
 shown on the right: >
 
@@ -499,7 +499,7 @@
 <
 ------------------------------------------------------------------------------
                                                      *NERDBlockComIgnoreEmpty*
-Values: 0 or 1.                            
+Values: 0 or 1.
 Default: 1.
 
 This option  affects visual-block mode commenting. If this option is turned
@@ -516,7 +516,7 @@
    |   | while(1){
    |   |     fork();
    |   | }
-   |}  | 
+   |}  |
 <
 If NERDBlockComIgnoreEmpty=0 then this code will become: >
     #include <sys/types.h>
@@ -527,7 +527,7 @@
     /*   */ while(1){
     /*   */     fork();
     /*   */ }
-    /*}  */ 
+    /*}  */
 <
 Otherwise, the code block would become: >
     #include <sys/types.h>
@@ -538,7 +538,7 @@
     while(1){
         fork();
     }
-    /*}  */ 
+    /*}  */
 <
 ------------------------------------------------------------------------------
                                                 *NERDCommentWholeLinesInVMode*
@@ -629,7 +629,7 @@
                                                                   *NERDLPlace*
                                                                   *NERDRPlace*
 Values: arbitrary string.
-Default: 
+Default:
     NERDLPlace: "[>"
     NERDRPlace: "<]"
 
@@ -637,8 +637,8 @@
 Place holder delimiters are used when performing nested commenting when the
 filetype supports commenting styles with both left and right delimiters.
 To set these options use lines like: >
-    let NERDLPlace="FOO" 
-    let NERDRPlace="BAR" 
+    let NERDLPlace="FOO"
+    let NERDRPlace="BAR"
 <
 Following the above example, if we have line of c code: >
     /* int horse */
@@ -654,7 +654,7 @@
 Default: \c
 
 NERDMapleader is used to specify what all the NERD commenter key mappings
-begin with. 
+begin with.
 
 The default key mappings will look like this: >
     \cc
@@ -688,7 +688,7 @@
     "1": Turns the 'comment' menu on with no menu shortcut.
     "2": Turns the 'comment 'menu on with <alt>-c as the shortcut.
     "3": Turns the 'Plugin -> comment' menu on with <alt>-c as the shortcut.
-    
+
 ------------------------------------------------------------------------------
                                                          *NERDUsePlaceHolders*
 Values: 0 or 1.
@@ -733,10 +733,10 @@
      * in c */
 <
 As opposed to like this: >
-    /* 
+    /*
      * Hi There!
      * This is a sexy comment
-     * in c 
+     * in c
      */
 <
 If this option is set to 1 then the top style will be used.
@@ -769,11 +769,11 @@
 
 These options are used to override the default keys that are used for the
 commenting mappings. Their values must be set to strings. As an example: if
-you wanted to use the mapping ,foo to uncomment lines of code then 
+you wanted to use the mapping ,foo to uncomment lines of code then
 you would place this line in your vimrc >
     let NERDUncomLineMap=",foo"
 <
-Check out |NERDComFunctionality| for details about what the following 
+Check out |NERDComFunctionality| for details about what the following
 mappings do.
 
 Default Mapping     Option to override~
@@ -793,7 +793,7 @@
 ,c$                 NERDComToEOLMap
 ,cy                 NERDComLineYankMap
 ,cu                 NERDUncomLineMap
-                 
+
 ==============================================================================
 4. Issues with the script                                      *NERDComIssues*
 
@@ -809,7 +809,7 @@
 example, Java uses // comments but the line >
     System.out.println("//");
 <
-clearly contains no real comment delimiters. 
+clearly contains no real comment delimiters.
 
 To distinguish between ``real'' comment delimiters and ``fake'' ones we use a
 set of heuristics. For example, one such heuristic states that any comment
@@ -839,7 +839,7 @@
 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 +850,31 @@
 if your face looked like a toaster and a t-rex put together? :(
 
 ==============================================================================
-7. TODO list                                                     *NERDComTodo*
-
-Uncommenting of minimal comments needs to be more robust. Currently it is easy
-to get illegal syntax when uncommenting them.
-
-
-
-==============================================================================
-8. Changelog                                                *NERDComChangelog*
-
+7. Changelog                                                *NERDComChangelog*
+
+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
+    - 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
+      Benz, A Pontus, and Stromnov for emailing me and/or posting issues.
+    - set the NERDRemoveExtraSpaces option to 1 by default as the doc states
+    - other fixes: (thanks to Zhang Shuhan for all his emails and testing)
+        * made the sexy comment mapping fall back to normal commenting if sexy
+          comments arent possible for the current filetype
+        * fixed some bugs with sexy comments
+        * made the uncommenting side of toggle comments slightly more robust
+        * fixed a bug where some extra spaces werent being removed (although
+          the currect options were set)
 2.1.12
     - added support for patran and dakota, thx to Jacobo Diaz for the email
     - added support for gentoo-env-d, gentoo-init-d, gentoo-make-conf, grub,
@@ -883,7 +898,7 @@
       nicothakis for posting the issue
 
 2.1.8
-    - fixed a couple of bugs with the NERDSpaceDelims option, thx to 
+    - fixed a couple of bugs with the NERDSpaceDelims option, thx to
       David Miani and Jeremy Hinegardner
     - added dummy support for lhaskell, thx to pipp for posting the issue
     - added an alternative set of delims for the plsql filetype, thx to Kuchma
@@ -893,7 +908,7 @@
     - added support for asymptote, thx to Vladimir Lomov
     - made NERDDefaultNesting enabled by default as this seems more intuitive,
       thx to marco for the suggestion
-    
+
 
 2.1.7
     - added support for haml, thx to Greb Weber
@@ -972,7 +987,7 @@
     - Made it so that the NERDShutUp option now only controls the "Pleeease
       email the delimiters..." requests. It no longer affects the general
       output of the script.
-    - Simplified the names of the help tags. 
+    - Simplified the names of the help tags.
 
 2.0.5
     - Added support for autoit, autohotkey and docbk filetypes (thanks to
@@ -1013,7 +1028,7 @@
 
 2.0.0:
     - NOTE: renamed the script to  NERD_commenter.vim. When you install this
-      version you must delete the old files: NERD_comments.vim and 
+      version you must delete the old files: NERD_comments.vim and
       NERD_comments.txt.
     - Reworked the mappings and main entry point function for the script to
       avoid causing visual-bells and screen scrolling.
@@ -1028,7 +1043,7 @@
           ways)
         - Some have been removed altogether, namely: NERD_create_h_filetype
           (why was a commenting script creating a filetype?!),
-          NERD_left_align_regexp, NERD_right_align_regexp, 
+          NERD_left_align_regexp, NERD_right_align_regexp,
 
     - Removed all the NERD_use_alt_style_XXX_coms options and replaced them
       with a better system. Now if a filetype has alternative delims, the
@@ -1043,31 +1058,31 @@
       filetypes.
     - Added '#' comments as an alternative for the asm filetype
 
-Thanks to Markus Klinik and Anders for bug reports, and again to Anders
-for his patch. Thanks to John O'Shea and fREW for the filetype
-information.
+    Thanks to Markus Klinik and Anders for bug reports, and again to Anders
+    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:
 
 Thanks to Nick Brettell for his many ideas and criticisms. A bloody good
-bastard.  
+bastard.
 :normal :.-2s/good//
 
 Thanks to Matthew Hawkins for his awesome refactoring!
 
-Thanks to the authors of the vimspell whose documentation 
+Thanks to the authors of the vimspell whose documentation
 installation function I stole :)
 
 Thanks to Greg Searle for the idea of using place-holders for nested comments.
 
 Thanks to Nguyen for the suggestions and pointing the h file highlighting bug!
 Also, thanks for the idea of doing sexy comments as well as his suggestions
-relating to it :P 
-Thanks again to Nguyen for complaining about the NERD_comments menu mapping 
-(<Alt>-c) interfering with another mapping of his... and thus the 
+relating to it :P
+Thanks again to Nguyen for complaining about the NERD_comments menu mapping
+(<Alt>-c) interfering with another mapping of his... and thus the
 NERD_dont_create_menu_shortcut option was born :P
 (it was then replaced with NERD_menu_mode in version 1.67 :)
 
@@ -1121,7 +1136,7 @@
 
 Thanks to Alexander "boesi" Bosecke for pointing out a bug that was stopping
 the NERD_space_delim_filetype_regexp option from working with left aligned
-toggle comments. And for pointing out a bug when initialising VB comments. 
+toggle comments. And for pointing out a bug when initialising VB comments.
 
 Thanks to Stefano Zacchiroli for suggesting the idea of "Minimal comments".
 And for suggested improvements to minimal comments.
@@ -1167,6 +1182,12 @@
 Thanks to marco for suggesting NERDDefaultNesting be set by default.
 
 Thanks to Ingo Karkat for the bug reports and the bugfix patch.
+
+Thanks to Zhang Shuhan for sending me a report about spaces not being removed
+properly in some circumstances. Also, thanks for emailing me a bunch of bug
+reports about sexy/toggle comments and for testing my fixes.
+
+Thanks to tpope for the english lesson.
 
 Not to forget! Thanks to the following people for sending me new filetypes to
 support :D
@@ -1208,7 +1229,7 @@
 Greg Weber                          D, haml
 Bruce Sherrod                       velocity
 timberke                            cobol
-Aaron Schaefer                      factor 
+Aaron Schaefer                      factor
 Laurent ARNOUD                      asterisk, mplayerconf
 Kuchma Michael                      plsql
 Brett Warneke                       spectre
@@ -1217,9 +1238,23 @@
 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,
                                     gentoo-make-conf, grub, modconf, sudoers
-
+SpookeyPeanut                       rib
+Greg Jandl                          pyrex/cython
+Christophe Benz                     services, gitcommit
+A Pontus                            vimperator
+Stromnov                            slice, bzr
+Martin Kustermann                   pamconf
+Indriði Einarsson                   mason
+Chris                               map
+Krzysztof A. Adamski                group
+
+==============================================================================
+8. License                                                    *NERDComLicense*
+
+The NERD commenter is released under the wtfpl.
+See http://sam.zoy.org/wtfpl/COPYING.

Modified: trunk/packages/vim-scripts/html/index.html
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/index.html?rev=1264&op=diff
==============================================================================
--- trunk/packages/vim-scripts/html/index.html (original)
+++ trunk/packages/vim-scripts/html/index.html Mon Jun 23 14:59:48 2008
@@ -50,7 +50,7 @@
    <li><a href="syntax_mkd.vim.html">syntax/mkd.vim.html</a></li>
   </ul>
   <p>
-  Page generated on Mon, 23 Jun 2008 10:45:32 -0400
+  Page generated on Mon, 23 Jun 2008 10:59:27 -0400
 .
   </p>
  </body>

Modified: trunk/packages/vim-scripts/html/plugin_NERD_commenter.vim.html
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/plugin_NERD_commenter.vim.html?rev=1264&op=diff
==============================================================================
--- trunk/packages/vim-scripts/html/plugin_NERD_commenter.vim.html (original)
+++ trunk/packages/vim-scripts/html/plugin_NERD_commenter.vim.html Mon Jun 23 14:59:48 2008
@@ -153,8 +153,8 @@
 <tr>
   <td class="lightbg"><b>&nbsp;script karma&nbsp;</b></td>
   <td>
-    Rating <b>681/226</b>,
-    Downloaded by 10063  </td>
+    Rating <b>736/242</b>,
+    Downloaded by 11106  </td>
 </tr>
 </table>
 <p>
@@ -167,10 +167,10 @@
 <tr><td>utility</td></tr>
 <tr><td>&nbsp;</td></tr>
 <tr><td class="prompt">description</td></tr>
-<tr><td>NOTE: As of version 2.1.4 the script requires vim7.
<br>
<br>Issue tracker: <a target="_blank" href="http://code.google.com/p/nerdcommenter/issues/list">http://code.google.com/p/nerdcommenter/issues/list</A>
<br>
<br>The following key mappings are provided by default (there is also a menu
<br>provided that contains menu items corresponding to all the below mappings):
<br>
<br>Most of the following mappings are for normal/visual mode only. The
<br>|NERDComInsertComment| mapping is for insert mode only.
<br>
<br>,cc |NERDComComment| 
<br>Comments out the current line or text selected in visual mode.
<br>
<br>,cn |NERDComNestedComment| 
<br>Same as |NERDComComment| but forces nesting.
<br>
<br>,c&lt;space&gt; |NERDComToggleComment| 
<br>Toggles the comment state of the selected line(s). If the topmost selected
<br>line is commented, all selected lines are uncommented and vice versa.
<br>
<br>,cm |NERDComMinimalComment| 
<br>Comments the given lines using only one set of multipart delimiters if
<br>possible. 
<br>
<br>,ci |NERDComInvertComment| 
<br>Toggles the comment state of the selected line(s) individually. Each selected
<br>line that is commented is uncommented and vice versa.
<br>
<br>,cs |NERDComSexyComment| 
<br>Comments out the selected lines ``sexually''
<br>
<br>,cy |NERDComYankComment|
<br>Same as |NERDComComment| except that the commented line(s) are yanked
<br>before commenting.
<br>
<br>,c$ |NERDComEOLComment| 
<br>Comments the current line from the cursor to the end of line.
<br>
<br>,cA |NERDComAppendComment| 
<br>Adds comment delimiters to the end of line and goes into insert mode between
<br>them.
<br>
<br>,cI |NERDComPrependComment| 
<br>Adds comment delimiters to the start of line and goes into insert mode between
<br>them.
<br>
<br>&lt;C-c&gt; |NERDComInsertComment| 
<br>Adds comment delimiters at the current cursor position and inserts between.
<br>
<br>,ca |NERDComAltDelim| 
<br>Switches to the alternative set of delimiters.
<br>
<br>,cl OR ,cr OR ,cb |NERDComAlignedComment| 
<br>Same as |NERDComComment| except that the delimiters are aligned down the
<br>left side (,cl), the right side (,cr) or both sides
<br>(,cb).
<br>
<br>,cu |NERDComUncommentLine| 
<br>Uncomments the selected line(s).
<br>
<br>Filetypes that can be commented by this plugin:
<br>abaqus abc acedb ada ahdl amiga aml ampl ant apache apachestyle asm68k asm asn
<br>aspvbs atlas autohotkey autoit automake ave awk basic b bc bdf bib bindzone bst
<br>btm caos catalog c cfg cg ch changelog cl clean clipper cmake conf config
<br>context cpp crontab cs csc csp css cterm cupl csv cvs dcl debchangelog
<br>debcontrol debsources def diff django docbk dns dosbatch dosini dot dracula dsl
<br>dtd dtml dylan ecd eiffel elf elmfilt erlang eruby eterm expect exports
<br>fetchmail fgl focexec form fortran foxpro fstab fvwm fx gdb gdmo geek
<br>gentoo-package-keywords' gentoo-package-mask' gentoo-package-use' gnuplot gtkrc
<br>haskell hb h help hercules hog html htmldjango htmlos ia64 icon idlang idl
<br>indent inform inittab ishd iss ist jam java javascript jess jgraph jproperties
<br>jproperties jsp kconfig kix kscript lace lex lftp lifelines lilo lisp lite
<br>lotos lout lprolog lscript lss lua lynx m4 mail make maple masm master matlab
<br>mel mf mib mma model moduala.&nbsp;&nbsp;modula2 modula3 monk mush muttrc named nasm
<br>nastran natural ncf netdict netrw nqc nroff nsis ocaml occam omlet omnimark
<br>openroad opl ora otl ox pascal passwd pcap pccts perl pfmain php phtml pic pike
<br>pilrc pine plaintex plm plsql po postscr pov povini ppd ppwiz procmail progress
<br>prolog psf ptcap python python qf radiance ratpoison r rc readline rebol
<br>registry remind rexx robots rpl rtf ruby sa samba sas sather scheme scilab
<br>screen scsh sdl sed selectbuf sgml sgmldecl sgmllnx sicad simula sinda skill
<br>slang sl slrnrc sm smarty smil smith sml snnsnet snnspat snnsres snobol4 spec
<br>specman spice sql sqlforms sqlj sqr squid st stp strace svn systemverilog tads
<br>taglist tags tak tasm tcl terminfo tex text plaintex texinfo texmf tf tidy tli
<br>trasys tsalt tsscl tssgm uc uil vb verilog verilog_systemverilog vgrindefs vhdl
<br>vim viminfo virata vo_base vrml vsejcl webmacro wget winbatch wml [^w]*sh
<br>wvdial xdefaults xf86conf xhtml xkb xmath xml xmodmap xpm2 xpm xslt yacc yaml
<br>z8a 
<br></td></tr>
+<tr><td>NOTE: As of version 2.1.4 the script requires vim7.
<br>
<br>Issue tracker: <a target="_blank" href="http://code.google.com/p/nerdcommenter/issues/list">http://code.google.com/p/nerdcommenter/issues/list</A>
<br>
<br>The following key mappings are provided by default (there is also a menu
<br>provided that contains menu items corresponding to all the below mappings):
<br>
<br>Most of the following mappings are for normal/visual mode only. The
<br>|NERDComInsertComment| mapping is for insert mode only.
<br>
<br>,cc |NERDComComment| 
<br>Comments out the current line or text selected in visual mode.
<br>
<br>,cn |NERDComNestedComment| 
<br>Same as |NERDComComment| but forces nesting.
<br>
<br>,c&lt;space&gt; |NERDComToggleComment| 
<br>Toggles the comment state of the selected line(s). If the topmost selected
<br>line is commented, all selected lines are uncommented and vice versa.
<br>
<br>,cm |NERDComMinimalComment| 
<br>Comments the given lines using only one set of multipart delimiters if
<br>possible. 
<br>
<br>,ci |NERDComInvertComment| 
<br>Toggles the comment state of the selected line(s) individually. Each selected
<br>line that is commented is uncommented and vice versa.
<br>
<br>,cs |NERDComSexyComment| 
<br>Comments out the selected lines ``sexily''
<br>
<br>,cy |NERDComYankComment|
<br>Same as |NERDComComment| except that the commented line(s) are yanked
<br>before commenting.
<br>
<br>,c$ |NERDComEOLComment| 
<br>Comments the current line from the cursor to the end of line.
<br>
<br>,cA |NERDComAppendComment| 
<br>Adds comment delimiters to the end of line and goes into insert mode between
<br>them.
<br>
<br>,cI |NERDComPrependComment| 
<br>Adds comment delimiters to the start of line and goes into insert mode between
<br>them.
<br>
<br>&lt;C-c&gt; |NERDComInsertComment| 
<br>Adds comment delimiters at the current cursor position and inserts between.
<br>
<br>,ca |NERDComAltDelim| 
<br>Switches to the alternative set of delimiters.
<br>
<br>,cl OR ,cr OR ,cb |NERDComAlignedComment| 
<br>Same as |NERDComComment| except that the delimiters are aligned down the
<br>left side (,cl), the right side (,cr) or both sides
<br>(,cb).
<br>
<br>,cu |NERDComUncommentLine| 
<br>Uncomments the selected line(s).
<br>
<br>Filetypes that can be commented by this plugin:
<br>abaqus abc acedb ada ahdl amiga aml ampl ant apache apachestyle asm68k asm asn
<br>aspvbs atlas autohotkey autoit automake ave awk basic b bc bdf bib bindzone bst
<br>btm caos catalog c cfg cg ch changelog cl clean clipper cmake conf config
<br>context cpp crontab cs csc csp css cterm cupl csv cvs dcl debchangelog
<br>debcontrol debsources def diff django docbk dns dosbatch dosini dot dracula dsl
<br>dtd dtml dylan ecd eiffel elf elmfilt erlang eruby eterm expect exports
<br>fetchmail fgl focexec form fortran foxpro fstab fvwm fx gdb gdmo geek
<br>gentoo-package-keywords' gentoo-package-mask' gentoo-package-use' gnuplot gtkrc
<br>haskell hb h help hercules hog html htmldjango htmlos ia64 icon idlang idl
<br>indent inform inittab ishd iss ist jam java javascript jess jgraph jproperties
<br>jproperties jsp kconfig kix kscript lace lex lftp lifelines lilo lisp lite
<br>lotos lout lprolog lscript lss lua lynx m4 mail make maple masm master matlab
<br>mel mf mib mma model moduala.&nbsp;&nbsp;modula2 modula3 monk mush muttrc named nasm
<br>nastran natural ncf netdict netrw nqc nroff nsis ocaml occam omlet omnimark
<br>openroad opl ora otl ox pascal passwd pcap pccts perl pfmain php phtml pic pike
<br>pilrc pine plaintex plm plsql po postscr pov povini ppd ppwiz procmail progress
<br>prolog psf ptcap python python qf radiance ratpoison r rc readline rebol
<br>registry remind rexx robots rpl rtf ruby sa samba sas sather scheme scilab
<br>screen scsh sdl sed selectbuf sgml sgmldecl sgmllnx sicad simula sinda skill
<br>slang sl slrnrc sm smarty smil smith sml snnsnet snnspat snnsres snobol4 spec
<br>specman spice sql sqlforms sqlj sqr squid st stp strace svn systemverilog tads
<br>taglist tags tak tasm tcl terminfo tex text plaintex texinfo texmf tf tidy tli
<br>trasys tsalt tsscl tssgm uc uil vb verilog verilog_systemverilog vgrindefs vhdl
<br>vim viminfo virata vo_base vrml vsejcl webmacro wget winbatch wml [^w]*sh
<br>wvdial xdefaults xf86conf xhtml xkb xmath xml xmodmap xpm2 xpm xslt yacc yaml
<br>z8a 
<br></td></tr>
 <tr><td>&nbsp;</td></tr>
 <tr><td class="prompt">install details</td></tr>
-<tr><td>***NOTE***: In version 2.0.0 the script file and help file were renamed to NERD_commenter.vim and NERD_commenter.txt. 
<br>If you are upgrading from version &lt; 2.0.0 to version &gt;= 2.0.0 then you must delete the old files NERD_comments.vim and
<br>NERD_comments.txt.
<br>
<br>Stick it in the plugin directory. The help doc should be installed when you next run vim. If it isnt then you can find it at the bottom of the script.</td></tr>
+<tr><td>***NOTE***: In version 2.0.0 the script file and help file were renamed to NERD_commenter.vim and NERD_commenter.txt. 
<br>If you are upgrading from version &lt; 2.0.0 to version &gt;= 2.0.0 then you must delete the old files NERD_comments.vim and
<br>NERD_comments.txt.
<br>
<br>Stick the NERD_comments.vim in ~/.vim/plugin and NERD_comments.txt in ~/.vim/doc. 
<br>
<br>Run :helptags ~/.vim/doc.
<br>
<br>Restart vim.
<br>
<br>Go :help NERD_commenter.txt to read the help file.</td></tr>
 <tr><td>&nbsp;</td></tr>
 </table>
 
@@ -204,740 +204,764 @@
     <th valign="top">release notes</th>
 </tr>
 <tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=8510">NERD_commenter.zip</a></td>
-    <td class="rowodd" valign="top" nowrap><b>2.1.12</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2008-03-30</i></td>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=8833">NERD_commenter.zip</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.1.15</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2008-06-21</i></td>
     <td class="rowodd" valign="top" nowrap>7.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- added support for patran and dakota, thx to Jacobo Diaz for the email
<br>- added support for gentoo-env-d, gentoo-init-d, gentoo-make-conf, grub, modconf and sudoers filetypes, thx to Li Jin for the patch.
<br>- added support for SVNdiff, gitAnnotate, gitdiff. Thx to nicothakis for posting the issue
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=8335">NERD_commenter.zip</a></td>
-    <td class="roweven" valign="top" nowrap><b>2.1.11</b></td>
-    <td class="roweven" valign="top" nowrap><i>2008-02-23</i></td>
+    <td class="rowodd" valign="top" width="2000">- added pamconf support, thanks to Martin Kustermann
<br>- added mason support, thanks to Indriði Einarsson
<br>- added map support, thanks to Chris
<br>- added bzr support, thanks to Stromnov
<br>- added group support, thanks to Krzysztof A. Adamski
<br>- change license to wtfpl
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=8700">NERD_commenter.zip</a></td>
+    <td class="roweven" valign="top" nowrap><b>2.1.14</b></td>
+    <td class="roweven" valign="top" nowrap><i>2008-05-16</i></td>
     <td class="roweven" valign="top" nowrap>7.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">- fixed a bug with the selection option and visual commenting (again).&nbsp;&nbsp;Thanks to Ingo Karkat (again).
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=8325">NERD_commenter.zip</a></td>
-    <td class="rowodd" valign="top" nowrap><b>2.1.10</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2008-02-22</i></td>
+    <td class="roweven" valign="top" width="2000">- added support for gitconfig, tar, nerdtree
<br>- added support for dtrace, thanks to nicothakis for the post
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=8643">NERD_commenter.zip</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.1.13</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2008-05-03</i></td>
     <td class="rowodd" valign="top" nowrap>7.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- added support for Wikipedia (thanks to Chen Xing)
<br>- added support for mplayerconf
<br>- bugfixes (thanks to Ingo Karkat for the bug report/patch)
<br>- added support for mkd (thanks to Stefano Zacchiroli)
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=8161">NERD_commenter.zip</a></td>
-    <td class="roweven" valign="top" nowrap><b>2.1.9</b></td>
-    <td class="roweven" valign="top" nowrap><i>2008-01-18</i></td>
+    <td class="rowodd" valign="top" width="2000"> - added support for rib, pyrex/cython, liquid, services, gitcommit,
<br>&nbsp;&nbsp;vimperator, and slice. Thanks to spookypeanut, Greg Jandl, Christophe
<br>&nbsp;&nbsp;Benz, A Pontus, and Stromnov for emailing me and/or posting issues.
<br>- set the NERDRemoveExtraSpaces option to 1 by default as the doc states
<br>- other fixes: (thanks to Zhang Shuhan for all his emails and testing)
<br>&nbsp;&nbsp;&nbsp;&nbsp;* made the sexy comment mapping fall back to normal commenting if sexy
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;comments arent possible for the current filetype
<br>&nbsp;&nbsp;&nbsp;&nbsp;* fixed some bugs with sexy comments
<br>&nbsp;&nbsp;&nbsp;&nbsp;* made the uncommenting side of toggle comments slightly more robust
<br>&nbsp;&nbsp;&nbsp;&nbsp;* fixed a bug where some extra spaces werent being removed (although
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;the currect options were set)
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=8510">NERD_commenter.zip</a></td>
+    <td class="roweven" valign="top" nowrap><b>2.1.12</b></td>
+    <td class="roweven" valign="top" nowrap><i>2008-03-30</i></td>
     <td class="roweven" valign="top" nowrap>7.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">- added support for mrxvtrc and aap, thx to Marco for the emails
<br>- added dummy support for SVNAnnotate, SVKAnnotate and CVSAnnotate, thx to nicothakis for posting the issue
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=8051">NERD_commenter.zip</a></td>
-    <td class="rowodd" valign="top" nowrap><b>2.1.8</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2007-12-13</i></td>
+    <td class="roweven" valign="top" width="2000">- added support for patran and dakota, thx to Jacobo Diaz for the email
<br>- added support for gentoo-env-d, gentoo-init-d, gentoo-make-conf, grub, modconf and sudoers filetypes, thx to Li Jin for the patch.
<br>- added support for SVNdiff, gitAnnotate, gitdiff. Thx to nicothakis for posting the issue
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=8335">NERD_commenter.zip</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.1.11</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2008-02-23</i></td>
     <td class="rowodd" valign="top" nowrap>7.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- fixed a couple of bugs with the NERDSpaceDelims option, thx to David Miani and Jeremy Hinegardner
<br>- added dummy support for lhaskell, thx to pipp for posting the issue
<br>- added an alternative set of delims for the plsql filetype, thx to Kuchma Michael
<br>- added support for spectre, thx to Brett Warneke
<br>- added support for scala, thx to Renald Buter
<br>- added support for asymptote, thx to Vladimir Lomov
<br>- made NERDDefaultNesting enabled by default as this seems more intuitive, thx to marco for the suggestion
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7827">NERD_commenter.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>2.1.6</b></td>
-    <td class="roweven" valign="top" nowrap><i>2007-10-25</i></td>
+    <td class="rowodd" valign="top" width="2000">- fixed a bug with the selection option and visual commenting (again).&nbsp;&nbsp;Thanks to Ingo Karkat (again).
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=8325">NERD_commenter.zip</a></td>
+    <td class="roweven" valign="top" nowrap><b>2.1.10</b></td>
+    <td class="roweven" valign="top" nowrap><i>2008-02-22</i></td>
     <td class="roweven" valign="top" nowrap>7.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">- added support for gentoo-conf-d thanks to tinoucas for posting the issue and the patch
<br>- added support for the D filetype. Thanks to Greg Weber for the email.
<br>- added dummy support for cobol, cheers to timberke for posting the issue.
<br>- added support for velocity. Thanks to Bruce Sherrod for the email.
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7786">NERD_commenter.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>2.1.5</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2007-10-12</i></td>
+    <td class="roweven" valign="top" width="2000">- added support for Wikipedia (thanks to Chen Xing)
<br>- added support for mplayerconf
<br>- bugfixes (thanks to Ingo Karkat for the bug report/patch)
<br>- added support for mkd (thanks to Stefano Zacchiroli)
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=8161">NERD_commenter.zip</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.1.9</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2008-01-18</i></td>
     <td class="rowodd" valign="top" nowrap>7.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- added support for lilypond, bbx and lytex. Thanks to Eyolf Østrem for the email.
<br>- added an alterative set of delimiters for the dosbatch filetype, thanks to Ingo Karkat for the email.
<br>- added support for the markdown filetype. Thanks to Nicolas Weber for posting the issue.
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7731">NERD_commenter.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>2.1.4</b></td>
-    <td class="roweven" valign="top" nowrap><i>2007-09-29</i></td>
+    <td class="rowodd" valign="top" width="2000">- added support for mrxvtrc and aap, thx to Marco for the emails
<br>- added dummy support for SVNAnnotate, SVKAnnotate and CVSAnnotate, thx to nicothakis for posting the issue
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=8051">NERD_commenter.zip</a></td>
+    <td class="roweven" valign="top" nowrap><b>2.1.8</b></td>
+    <td class="roweven" valign="top" nowrap><i>2007-12-13</i></td>
     <td class="roweven" valign="top" nowrap>7.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">- added support for the ahk filetype. Cheers to Don Hatlestad for the email.
<br>- added support for desktop and xsd filetypes. Thanks to Christophe Benz.
<br>- added dummy support for Rails-log
<br>- fixed a bunch of bugs in the comment delimiter setup process, thanks to Cheng Fang for the email :D
<br>- hardcore refactoring and removal of seldomly used, overly-complex functionality
<br>- the script now requires vim 7
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7570">NERD_commenter.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>2.1.3</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2007-08-27</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- fixed numerous bugs that were causing tabs to permanently be converted to spaces, even if noexpandtab was set. Thanks to Heptite on #vim for working with me to track them down :)
<br>- added dummy support for &quot;lookupfile&quot;. Thanks to David Fishburn for the email.
<br>- added support for &quot;rst&quot;, thanks to Niels Aan de Brugh for the email.
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7543">NERD_commenter.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>2.1.2</b></td>
-    <td class="roweven" valign="top" nowrap><i>2007-08-22</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Added support for the vera and ldif filetypes. Thanks to Normandie
<br>Azucena and Florian Apolloner for the emails.
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7525">NERD_commenter.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>2.1.1</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2007-08-18</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- added dummy support for SVNcommitlog and vcscommit. Thanks to John O'Shea for the email.
<br>- added support for Groovy. Thanks to Jason Mills for the email.
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7466">NERD_commenter.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>2.1.0</b></td>
-    <td class="roweven" valign="top" nowrap><i>2007-08-08</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">- now the script resets the delimiters when the filetype of the buffer changes (thanks to James Hales for the patch)
<br>- added formal support/doc for prepending a count to many of the commenting maps so you can go, eg, 5,cc to comment 5 lines from normal&nbsp;&nbsp;mode. Thanks again to James Hales for the patch.
<br>- added support for the &quot;gams&quot; filetype that Jorge Rodrigues created.
<br>- added support for the &quot;objc&quot; filetype, thanks to Rainer Müller for the email.
<br>- added support for the &quot;sass&quot; filetype that Dmitry Ilyashevich created.</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7391">NERD_commenter.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>2.0.7</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2007-07-22</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Added support for eclass and ebuild filetypes. Thanks to Alex Tarkovsky
<br>for the email.
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7309">NERD_commenter.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>2.0.6</b></td>
-    <td class="roweven" valign="top" nowrap><i>2007-06-29</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">- Changed the default setting of NERDMapleader to &quot;,c&quot;, meaning all the maps now start with ,c instead of \c. This is to stop a major mapping clash with the vcscommand plugin. Anyone wanting to keep the \c map leader should read :help NERDMapleader.
<br>- Added support for debcontrol and dummy support for debchangelog filetypes, thanks to Stefano Zacchiroli for the email.
<br>- Made it so that the NERDShutUp option now only controls the &quot;Pleeease email the delimiters...&quot; requests. It no longer affects the general output of the script.
<br>- Simplified the names of the help tags. 
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7253">NERD_commenter.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>2.0.5</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2007-06-16</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- Added support for autoit, autohotkey and docbk filetypes (thanks to&nbsp;&nbsp;Michael Böhler)
<br>- Added support for cmake (thanks to Aaron Small)
<br>- Added support for htmldjango and django filetypes (thanks to Ramiro&nbsp;&nbsp;Morales)
<br>- Improved the delimiters for eruby again
<br>- Applied a patch from Seth Mason to fix some pathing issues with the help&nbsp;&nbsp;file installation.
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7097">NERD_commenter.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>2.0.4</b></td>
-    <td class="roweven" valign="top" nowrap><i>2007-05-11</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">- Added support for verilog_systemverilog and systemverilog filetypes
<br>&nbsp;&nbsp;(Thanks to Alexey for the email)
<br>- Added support for fstab, thanks to Lizendir for the email.
<br>- Added support for the smarty filetype.
<br>- Improved the delimiters for eruby.
<br>- Added dummy support for changelog filetype.
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7060">NERD_commenter.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>2.0.3</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2007-05-03</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- Added dummy support for the csv filetype (thx to Mark Woodward for the
<br>&nbsp;&nbsp;email)
<br>- Added dummy support for vo_base and otl filetypes (thanks to fREW for
<br>&nbsp;&nbsp;the email)
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=6977">NERD_commenter.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>2.0.2</b></td>
-    <td class="roweven" valign="top" nowrap><i>2007-04-13</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Minor bug fix that was stopping nested comments from working</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=6972">NERD_commenter.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>2.0.1</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2007-04-12</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- Fixed the visual bell for the |NERDComToEOLMap| map.
<br>- Added another possible value to the NERDMenuMode option which causes the
<br>&nbsp;&nbsp;menu to be displayed under 'Plugin -&gt; Comment'. See :h NERDMenuMode.
<br>&nbsp;&nbsp;This new menu mode is now the default.
<br>- Added support for the occam filetype (thanks to Anders for emailing me)
<br>- Made the main commenting function (NERDComment) available outside the
<br>&nbsp;&nbsp;script. See :h NERD_com_NERDComment
<br>- bug fixes and refactoring
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=6938">NERD_commenter.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>2.0.0</b></td>
-    <td class="roweven" valign="top" nowrap><i>2007-04-02</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">- NOTE: renamed the script to&nbsp;&nbsp;NERD_commenter.vim. When you install this
<br>&nbsp;&nbsp;version you must delete the old files: NERD_comments.vim and 
<br>&nbsp;&nbsp;NERD_comments.txt.
<br>- Reworked the mappings and main entry point function for the script to
<br>&nbsp;&nbsp;avoid causing visual-bells and screen scrolling.
<br>- Changes to the script options (see |NERD_com-Customisation| for
<br>&nbsp;&nbsp;details):
<br>&nbsp;&nbsp;&nbsp;&nbsp;- They are all camel case now instead of underscored.
<br>&nbsp;&nbsp;&nbsp;&nbsp;- Converted all of the regular expression options into simple boolean
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;options for simplicity.
<br>&nbsp;&nbsp;&nbsp;&nbsp;- All the options are now stated positively, eg.
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NERD_dont_remove_spaces_regexp has become NERDRemoveExtraSpaces.
<br>&nbsp;&nbsp;&nbsp;&nbsp;- Some of the option names have been changed (other than in the above
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ways)
<br>&nbsp;&nbsp;&nbsp;&nbsp;- Some have been removed altogether, namely: NERD_create_h_filetype
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(why was a commenting script creating a filetype?!),
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NERD_left_align_regexp, NERD_right_align_regexp, 
<br>
<br>- Removed all the NERD_use_alt_style_XXX_coms options and replaced them
<br>&nbsp;&nbsp;with a better system. Now if a filetype has alternative delims, the
<br>&nbsp;&nbsp;script will check whether an option of the form
<br>&nbsp;&nbsp;&quot;NERD_&lt;&filetype&gt;_alt_style&quot; exists, and if it does then alt delims will
<br>&nbsp;&nbsp;be used. See |NERD_com-cust-delims| for details.
<br>- The script no longer removes extra spaces for sexy comments for the
<br>&nbsp;&nbsp;NERDRemoveExtraSpaces option (it will still remove spaces if
<br>&nbsp;&nbsp;NERDSpaceDelims is set).
<br>- Added dummy support for viminfo and rtf.
<br>- Added support for the &quot;gentoo-package-\(keywords\|mask\|use\)&quot;
<br>&nbsp;&nbsp;filetypes.
<br>- Added '#' comments as an alternative for the asm filetype
<br>
<br>Thanks to Markus Klinik and Anders for bug reports, and again to Anders
<br>for his patch. Thanks to John O'Shea and fREW for the filetype
<br>information.
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=6659">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.69.2</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2007-01-25</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Added dummy support for the qf (quickfix filetype). This stops the script from spitting out the &quot;unknown filetype&quot; message when you go :copen.
<br>
<br>Thanks to Ilia N Ternovich for emailing me about this.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=6624">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.69.1</b></td>
-    <td class="roweven" valign="top" nowrap><i>2007-01-18</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">*fixed the mark clobbering that was occuring.
<br>
<br>*added support for the following filetypes: netdict, bib, bst, passwd, omlet and kconfig. Thanks to Michael Brunner, Antono Vasiljev, Melissa Reid and Tim Carey-Smith for telling me about these filetypes (hope i didnt miss anyone)</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=6152">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.69</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2006-09-08</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">fixed a bug when initializing vb comment delimiters (cheers to boesi for pointing it out). Added support for the following filetypes: debsources, eruby, xhtml and yaml. Added &quot;dummy&quot; support for the following filetypes: netrw, svn, taglist, and the null filetype. These filetypes have no comment delimiters but now that NERD knows about them it doesnt complain anymore.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=6067">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.68</b></td>
-    <td class="roweven" valign="top" nowrap><i>2006-08-13</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Added an option called NERD_mapleader which allows you to change the two keys that all the mappings begin with by default. This will allow users to change all mappings easily so they dont conflict with any other plugins. Thanks to Tim Carey-Smith and Gary Church whose complaints prompted me to make this option :)</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=5716">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.67</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2006-05-18</i></td>
+    <td class="roweven" valign="top" width="2000">- fixed a couple of bugs with the NERDSpaceDelims option, thx to David Miani and Jeremy Hinegardner
<br>- added dummy support for lhaskell, thx to pipp for posting the issue
<br>- added an alternative set of delims for the plsql filetype, thx to Kuchma Michael
<br>- added support for spectre, thx to Brett Warneke
<br>- added support for scala, thx to Renald Buter
<br>- added support for asymptote, thx to Vladimir Lomov
<br>- made NERDDefaultNesting enabled by default as this seems more intuitive, thx to marco for the suggestion
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7827">NERD_commenter.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.1.6</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2007-10-25</i></td>
     <td class="rowodd" valign="top" nowrap>7.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Replaced the NERD_dont_create_menu_shortcut option with NERD_menu_mode. This new option allows the user to specify 1) whether a comment menu should be made and 2) whether this menu should have &lt;alt&gt;-c as a shortcut. Go :help NERD_menu_mode for more info. Thanks to Joseph Barker for the sugesting that the menu should be an optional feature.
<br>
<br>Added suppport for plaintex, context and mail filetypes (when commenting a &quot;mail&quot; file &quot;&gt; &quot; is used as the left delimiter so that the commented text appears as quoted text in the email). Thanks to Jonathan Derque for emailing me with these filetypes.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=5576">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.66</b></td>
-    <td class="roweven" valign="top" nowrap><i>2006-04-18</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Applied a patch that Norick Chen emailed to me that fixed the asp delimiters (which were wrong and caused an error)
<br>
<br>Thanks Norick :)
<br>
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=5542">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.65</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2006-04-11</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Made minimal comments use the NERD_place_holder_regexp option. Now if place holders are needed but are disabled for the current filetype then the minimal comment is aborted. Thanks to Stefano Zacchiroli emailing me and prompting this change.
<br>
<br>Fixed a minor bug with minimal comments.
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=5535">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.64</b></td>
-    <td class="roweven" valign="top" nowrap><i>2006-04-09</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Refactored the code a bit and removed the NERD_use_toggle_coms_default and
<br>NERD_use_sexy_coms_default_regexp options. Now you have to adjust the key
<br>mappings to achieve the same effects as these options
<br>
<br>Sexy comments now always use the c style delimiters if they are available (even if another set of multipart delims is available) because they generally look the best.
<br>
<br>Fixed a bug that occured when using the tabs in vim7 (thanks to Harry for pointing it out:).
<br>
<br>Added a new commenting type called &quot;minimal&quot; comments where a SINGLE set of multipart delimiters is used to comment out a bunch of lines. Go :help NERD_com-minimal-comment for details. Thanks to Stefano Zacchiroli for this suggestion.
<br>
<br>Fixed some random little bugs.</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=5167">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.63</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2006-02-12</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">fixed a bug that was stopping the NERD_space_delim_filetype_regexp option from working with left aligned toggle comments. Thanks to boesi for pointing this out.
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4985">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.62</b></td>
-    <td class="roweven" valign="top" nowrap><i>2006-01-17</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixed 2 bugs that caused problems when uncommenting sexy comments. Thanks to Torsten Blix for emailing me about them.</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4970">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.61</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2006-01-14</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Applied a patch sent to me by Eike Von Seggern that fixed a bug that caused a space to be added to the end of the line when commenting with single-part delimiters. </td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4956">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.60</b></td>
-    <td class="roweven" valign="top" nowrap><i>2006-01-10</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Added a new option that turns off the NERD_comments menu shortcut (Alt-c) which could interfere with other (Non-NERD)&nbsp;&nbsp;mappings. Thanks to Nguyen for pointing out this problem :)</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4697">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.59</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-10-25</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">fixed a small bug that was causing problems with spaces around delimiters.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4696">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.58</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-10-24</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">fixed a bug that could be a problem when changing buffers. Thanks to David Bourgeois for pointing it out.</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4691">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.57</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-10-21</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Fixed a retarded bug when commenting c files (thanks to David&nbsp;&nbsp;Bourgeois for pointing it out).
<br>Changed the NERD_dont_remove_spaces option to NERD_dont_remove_spaces_regexp and made it take a regular expression. Go :help NERD_dont_remove_spaces_regexp for details. Put a section in the help file that gives some examples of regular expressions that&nbsp;&nbsp;you may want to use for some of the options. Go :help NERD_com-reg-exps for details.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4641">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.56</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-10-01</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Tweaked the behaviour of the &quot;toggle comment&quot; mapping: now if you are commenting a range (with toggle comments) and&nbsp;&nbsp;you have the NERD_use_nested_comments_default option turned on it will comment the already comment lines again. Cheers to Igor Prischepoff for this suggestion. I also reorgansied the help page and added some stuff to make it more readable :)</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4581">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.55</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-09-14</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">made the \ci mapping work with whole lines line the \c&lt;space&gt; mapping does i.e the mapping only counts a line as commented if it commented from the start of the line.
<br>Fixed a couple of silly bugs</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4578">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.54</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-09-13</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixed the \cn mapping that i broke in the last version. Thanks to harry for pointing that out.
<br>Changed the behaviour of toggle comments: now lines are only counted as commented if they are commented from the beginning of the line. Thanks to Igor Prischepoff for suggesting this. I applied a patch by Richard (Krischikm) which fixed a couple of bugs and added a new option (see :help NERD_use_ada_with_spaces for details). I changed how the script handles tabs: now each line is examined individually instead of using examining the &expandtabs option and assuming it applies to every line. The script should not interfere with the tabbing style of any file you edit now... even if they alternate between soft and hard tabs with each line :).&nbsp;&nbsp;Stopped the cursor jumping when the \cu mapping is used.</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4566">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.53</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-09-12</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Made some changes to how spaces around comments are removed when uncommenting... basically they are always removed unless the new option NERD_dont_remove_spaces is set. Go :help NERD_dont_remove_spaces for details. I added this functionality because i usually dont have NERD_comments adding spaces after/before the left/right delimiters but when im editing code written by people who DO it makes me insane because it is uncommented incorrectly.&nbsp;&nbsp;Fixed the cursor and screen jumping bugs... hopefully :)</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4557">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.52</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-09-06</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixed an error in the help file. Added support for // comments in c. Made an option to turn these // comments on by default (go :help NERD_use_single_part_c_comments for details). Thanks to Richard Willis whose feedback prompted these changes :)</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4554">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.51</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-09-05</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Added yet another mapping (&lt;leader&gt;ci) which inverts the commented state of every selected line. i.e. for each line selected, if it is commented it is uncommented and vice versa. Thanks to Nick Brettell for the idea. Improved the cursor positioning after commenting is done so if you do a visual comment the cursor returns to a better position. Removed some line continuations that were screwing up on some systems. Thanks to Richard for pointing that out to me.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4541">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.50</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-08-31</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Added a new mapping &lt;leader&gt;c&lt;space&gt; that toggles the comment state of the selected lines. It uncomments all the lines if the first line is commented and comments them otherwise. The mapping can be changed with this option: NERD_com_line_toggle_map. Toggle commenting can be made the default commenting method (so it applied when &lt;leader&gt;cc is pressed) with this option: NERD_use_toggle_coms_default. Thanks to Igor Prischepoff for the idea :)</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4538">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.49</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-08-30</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Fixed a bug that was causing problems when the ignorecase option in vim was set. Thanks to Brent Rice for telling me about this problem and helping me track the bug down :)</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4533">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.48</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-08-28</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixed a bug with sexy comments that was stopping them from working when you were using the alternative set of delimiters for some languages (eg c/java/etc)</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4516">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.47</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-08-25</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Fixed bugs with sexy comments (most of the bugs were only an issue when using compact sexy comments): Now they work properly if they end on a blank line. When uncommenting sexy comments the display window doesnt jump anymore. If the sexy comment starts or ends on another ordinary&nbsp;&nbsp;comment it no longer screws up. Sexy comments no longer delete parts of lines (which they did from time to time). Blank lines above compact sexy comments are no longer removed when uncommenting.
<br>Fixed another bug with the &lt;C-c&gt; mapping.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4436">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.46</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-07-17</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">enhanced the option: NERD_comment_whole_lines_in_v_mode so that it can now take 2 values. Go :help NERD_comment_whole_lines_in_v_mode for an explaination. Thanks to jorge scandaliaris for emailing me with his criticism about this :)</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4429">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.45</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-07-14</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Now the script doesnt create a seperate filetype for h files unless&nbsp;&nbsp;you tell it to with a new option called NERD_create_h_filetype. Go :help NERD_create_h_filetype for more info.
<br>This update was done to prevent NERD_comments from&nbsp;&nbsp;screwing with the taglist plugin. 
<br>
<br>Thanks to Markus Erlmann for pointing out that it caused problems.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4413">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.44</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-07-06</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixed a bug with the &lt;C-c&gt; mapping after i broke it (again :().
<br>Thanks to Martin Stubenschrott for pointing this bug out!
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4404">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.43</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-06-30</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Fixed a bug with visual commenting.
<br>Added a new option, go :help NERD_comment_whole_lines_in_v_mode for details. Thanks to&nbsp;&nbsp;jorge scandaliaris and&nbsp;&nbsp;Shufeng Zheng for their suggestions about this.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4393">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.42</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-06-26</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Now, when any visual comments are made, the cursor is placed at the top left line/col of the visual selection block after the comment is done instead of on the top line at the first col. Thanks to Nick Brettell for complaining about this.
<br>
<br>Added support for .geek files hahahaha</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4369">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.41</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-06-16</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">fixed a small bug with the &lt;C-c&gt; functionality when the script is configured to put extra spaces between the delimiters.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4292">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.40</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-05-18</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixed a bug that was screwing up place holders with nested commenting when NERD_use_nested_comments_default option is set. Changed the left and right default place holders because the strings that were being used were sort of common in c/c++/java/... files. If you liked them the way they were you can just set them back with the NERD_lPlace and NERD_rPlace options.
<br>Thanx to Nick for complaining about the place holders and spotting the other bug :P
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4283">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.39</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-05-15</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Fixed a retarded bug with the &lt;C-c&gt; mapping.
<br>Changed the &lt;leader&gt;ce mapping to have a default mapping of &lt;leader&gt;cA and added a new mapping that adds a comment delimiter to the start of the current line and inserts between the delimiters - the default mapping is &lt;leader&gt;cI (thats an uppercase i not a lowercase L).
<br>Fixed a bug that caused the script to spaz out if you tried to comment a file with no filetype.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4279">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.38</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-05-13</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Added new functionality for when text is commented in normal visual mode (i.e not visual-block or visual-line). Now Nerd_comments comments out exactly the text that is selected in visual mode regardless of the type of visual mode you are in. 
<br>Thanks to Nick Brettell his ideas about this!
<br>
<br>Also, if you are commenting out text in visual or visual-block mode, NERD_comments will use multip-part delimiters is they are available so that the exact text that was selected will be exactly what is commented out - a new option has been added to turn off this behaviour (go :help NERD_allow_any_visual_delims_regexp for details).
<br>
<br>Fixed a couple of small bugs with the &lt;C-c&gt; mapping that prolly on one even noticed :P
<br>
<br>
<br>
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4260">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.37</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-05-09</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Added a new mapping/menu item:
<br>Now when &lt;leader&gt;ce is pressed a comment is appended to the EOL and the cursor gets put in insert mode in the appropriate place to type the comment.
<br>
<br>Thanks to Litchi for emailing me with this idea :)
<br>
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4258">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.36</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-05-08</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">added lots more supported filetypes</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4237">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.35</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-05-04</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Added support for some new filetypes.
<br>Fixed a small bug with sexy comments.
<br>Fixed a bug with tabs that was not too serious but would screw up commenting of things like makefiles in a big way. Cheers to Nick Brettell for pointing this bug out!</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4223">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.34</b></td>
+    <td class="rowodd" valign="top" width="2000">- added support for gentoo-conf-d thanks to tinoucas for posting the issue and the patch
<br>- added support for the D filetype. Thanks to Greg Weber for the email.
<br>- added dummy support for cobol, cheers to timberke for posting the issue.
<br>- added support for velocity. Thanks to Bruce Sherrod for the email.
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7786">NERD_commenter.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>2.1.5</b></td>
+    <td class="roweven" valign="top" nowrap><i>2007-10-12</i></td>
+    <td class="roweven" valign="top" nowrap>7.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">- added support for lilypond, bbx and lytex. Thanks to Eyolf Østrem for the email.
<br>- added an alterative set of delimiters for the dosbatch filetype, thanks to Ingo Karkat for the email.
<br>- added support for the markdown filetype. Thanks to Nicolas Weber for posting the issue.
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7731">NERD_commenter.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.1.4</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2007-09-29</i></td>
+    <td class="rowodd" valign="top" nowrap>7.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">- added support for the ahk filetype. Cheers to Don Hatlestad for the email.
<br>- added support for desktop and xsd filetypes. Thanks to Christophe Benz.
<br>- added dummy support for Rails-log
<br>- fixed a bunch of bugs in the comment delimiter setup process, thanks to Cheng Fang for the email :D
<br>- hardcore refactoring and removal of seldomly used, overly-complex functionality
<br>- the script now requires vim 7
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7570">NERD_commenter.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>2.1.3</b></td>
+    <td class="roweven" valign="top" nowrap><i>2007-08-27</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">- fixed numerous bugs that were causing tabs to permanently be converted to spaces, even if noexpandtab was set. Thanks to Heptite on #vim for working with me to track them down :)
<br>- added dummy support for &quot;lookupfile&quot;. Thanks to David Fishburn for the email.
<br>- added support for &quot;rst&quot;, thanks to Niels Aan de Brugh for the email.
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7543">NERD_commenter.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.1.2</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2007-08-22</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Added support for the vera and ldif filetypes. Thanks to Normandie
<br>Azucena and Florian Apolloner for the emails.
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7525">NERD_commenter.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>2.1.1</b></td>
+    <td class="roweven" valign="top" nowrap><i>2007-08-18</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">- added dummy support for SVNcommitlog and vcscommit. Thanks to John O'Shea for the email.
<br>- added support for Groovy. Thanks to Jason Mills for the email.
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7466">NERD_commenter.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.1.0</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2007-08-08</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">- now the script resets the delimiters when the filetype of the buffer changes (thanks to James Hales for the patch)
<br>- added formal support/doc for prepending a count to many of the commenting maps so you can go, eg, 5,cc to comment 5 lines from normal&nbsp;&nbsp;mode. Thanks again to James Hales for the patch.
<br>- added support for the &quot;gams&quot; filetype that Jorge Rodrigues created.
<br>- added support for the &quot;objc&quot; filetype, thanks to Rainer Müller for the email.
<br>- added support for the &quot;sass&quot; filetype that Dmitry Ilyashevich created.</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7391">NERD_commenter.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>2.0.7</b></td>
+    <td class="roweven" valign="top" nowrap><i>2007-07-22</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Added support for eclass and ebuild filetypes. Thanks to Alex Tarkovsky
<br>for the email.
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7309">NERD_commenter.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.0.6</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2007-06-29</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">- Changed the default setting of NERDMapleader to &quot;,c&quot;, meaning all the maps now start with ,c instead of \c. This is to stop a major mapping clash with the vcscommand plugin. Anyone wanting to keep the \c map leader should read :help NERDMapleader.
<br>- Added support for debcontrol and dummy support for debchangelog filetypes, thanks to Stefano Zacchiroli for the email.
<br>- Made it so that the NERDShutUp option now only controls the &quot;Pleeease email the delimiters...&quot; requests. It no longer affects the general output of the script.
<br>- Simplified the names of the help tags. 
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7253">NERD_commenter.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>2.0.5</b></td>
+    <td class="roweven" valign="top" nowrap><i>2007-06-16</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">- Added support for autoit, autohotkey and docbk filetypes (thanks to&nbsp;&nbsp;Michael Böhler)
<br>- Added support for cmake (thanks to Aaron Small)
<br>- Added support for htmldjango and django filetypes (thanks to Ramiro&nbsp;&nbsp;Morales)
<br>- Improved the delimiters for eruby again
<br>- Applied a patch from Seth Mason to fix some pathing issues with the help&nbsp;&nbsp;file installation.
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7097">NERD_commenter.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.0.4</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2007-05-11</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">- Added support for verilog_systemverilog and systemverilog filetypes
<br>&nbsp;&nbsp;(Thanks to Alexey for the email)
<br>- Added support for fstab, thanks to Lizendir for the email.
<br>- Added support for the smarty filetype.
<br>- Improved the delimiters for eruby.
<br>- Added dummy support for changelog filetype.
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7060">NERD_commenter.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>2.0.3</b></td>
+    <td class="roweven" valign="top" nowrap><i>2007-05-03</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">- Added dummy support for the csv filetype (thx to Mark Woodward for the
<br>&nbsp;&nbsp;email)
<br>- Added dummy support for vo_base and otl filetypes (thanks to fREW for
<br>&nbsp;&nbsp;the email)
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=6977">NERD_commenter.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.0.2</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2007-04-13</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Minor bug fix that was stopping nested comments from working</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=6972">NERD_commenter.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>2.0.1</b></td>
+    <td class="roweven" valign="top" nowrap><i>2007-04-12</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">- Fixed the visual bell for the |NERDComToEOLMap| map.
<br>- Added another possible value to the NERDMenuMode option which causes the
<br>&nbsp;&nbsp;menu to be displayed under 'Plugin -&gt; Comment'. See :h NERDMenuMode.
<br>&nbsp;&nbsp;This new menu mode is now the default.
<br>- Added support for the occam filetype (thanks to Anders for emailing me)
<br>- Made the main commenting function (NERDComment) available outside the
<br>&nbsp;&nbsp;script. See :h NERD_com_NERDComment
<br>- bug fixes and refactoring
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=6938">NERD_commenter.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>2.0.0</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2007-04-02</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">- NOTE: renamed the script to&nbsp;&nbsp;NERD_commenter.vim. When you install this
<br>&nbsp;&nbsp;version you must delete the old files: NERD_comments.vim and 
<br>&nbsp;&nbsp;NERD_comments.txt.
<br>- Reworked the mappings and main entry point function for the script to
<br>&nbsp;&nbsp;avoid causing visual-bells and screen scrolling.
<br>- Changes to the script options (see |NERD_com-Customisation| for
<br>&nbsp;&nbsp;details):
<br>&nbsp;&nbsp;&nbsp;&nbsp;- They are all camel case now instead of underscored.
<br>&nbsp;&nbsp;&nbsp;&nbsp;- Converted all of the regular expression options into simple boolean
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;options for simplicity.
<br>&nbsp;&nbsp;&nbsp;&nbsp;- All the options are now stated positively, eg.
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NERD_dont_remove_spaces_regexp has become NERDRemoveExtraSpaces.
<br>&nbsp;&nbsp;&nbsp;&nbsp;- Some of the option names have been changed (other than in the above
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ways)
<br>&nbsp;&nbsp;&nbsp;&nbsp;- Some have been removed altogether, namely: NERD_create_h_filetype
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(why was a commenting script creating a filetype?!),
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NERD_left_align_regexp, NERD_right_align_regexp, 
<br>
<br>- Removed all the NERD_use_alt_style_XXX_coms options and replaced them
<br>&nbsp;&nbsp;with a better system. Now if a filetype has alternative delims, the
<br>&nbsp;&nbsp;script will check whether an option of the form
<br>&nbsp;&nbsp;&quot;NERD_&lt;&filetype&gt;_alt_style&quot; exists, and if it does then alt delims will
<br>&nbsp;&nbsp;be used. See |NERD_com-cust-delims| for details.
<br>- The script no longer removes extra spaces for sexy comments for the
<br>&nbsp;&nbsp;NERDRemoveExtraSpaces option (it will still remove spaces if
<br>&nbsp;&nbsp;NERDSpaceDelims is set).
<br>- Added dummy support for viminfo and rtf.
<br>- Added support for the &quot;gentoo-package-\(keywords\|mask\|use\)&quot;
<br>&nbsp;&nbsp;filetypes.
<br>- Added '#' comments as an alternative for the asm filetype
<br>
<br>Thanks to Markus Klinik and Anders for bug reports, and again to Anders
<br>for his patch. Thanks to John O'Shea and fREW for the filetype
<br>information.
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=6659">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.69.2</b></td>
+    <td class="roweven" valign="top" nowrap><i>2007-01-25</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Added dummy support for the qf (quickfix filetype). This stops the script from spitting out the &quot;unknown filetype&quot; message when you go :copen.
<br>
<br>Thanks to Ilia N Ternovich for emailing me about this.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=6624">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.69.1</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2007-01-18</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">*fixed the mark clobbering that was occuring.
<br>
<br>*added support for the following filetypes: netdict, bib, bst, passwd, omlet and kconfig. Thanks to Michael Brunner, Antono Vasiljev, Melissa Reid and Tim Carey-Smith for telling me about these filetypes (hope i didnt miss anyone)</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=6152">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.69</b></td>
+    <td class="roweven" valign="top" nowrap><i>2006-09-08</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">fixed a bug when initializing vb comment delimiters (cheers to boesi for pointing it out). Added support for the following filetypes: debsources, eruby, xhtml and yaml. Added &quot;dummy&quot; support for the following filetypes: netrw, svn, taglist, and the null filetype. These filetypes have no comment delimiters but now that NERD knows about them it doesnt complain anymore.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=6067">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.68</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2006-08-13</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Added an option called NERD_mapleader which allows you to change the two keys that all the mappings begin with by default. This will allow users to change all mappings easily so they dont conflict with any other plugins. Thanks to Tim Carey-Smith and Gary Church whose complaints prompted me to make this option :)</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=5716">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.67</b></td>
+    <td class="roweven" valign="top" nowrap><i>2006-05-18</i></td>
+    <td class="roweven" valign="top" nowrap>7.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Replaced the NERD_dont_create_menu_shortcut option with NERD_menu_mode. This new option allows the user to specify 1) whether a comment menu should be made and 2) whether this menu should have &lt;alt&gt;-c as a shortcut. Go :help NERD_menu_mode for more info. Thanks to Joseph Barker for the sugesting that the menu should be an optional feature.
<br>
<br>Added suppport for plaintex, context and mail filetypes (when commenting a &quot;mail&quot; file &quot;&gt; &quot; is used as the left delimiter so that the commented text appears as quoted text in the email). Thanks to Jonathan Derque for emailing me with these filetypes.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=5576">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.66</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2006-04-18</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Applied a patch that Norick Chen emailed to me that fixed the asp delimiters (which were wrong and caused an error)
<br>
<br>Thanks Norick :)
<br>
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=5542">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.65</b></td>
+    <td class="roweven" valign="top" nowrap><i>2006-04-11</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Made minimal comments use the NERD_place_holder_regexp option. Now if place holders are needed but are disabled for the current filetype then the minimal comment is aborted. Thanks to Stefano Zacchiroli emailing me and prompting this change.
<br>
<br>Fixed a minor bug with minimal comments.
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=5535">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.64</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2006-04-09</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Refactored the code a bit and removed the NERD_use_toggle_coms_default and
<br>NERD_use_sexy_coms_default_regexp options. Now you have to adjust the key
<br>mappings to achieve the same effects as these options
<br>
<br>Sexy comments now always use the c style delimiters if they are available (even if another set of multipart delims is available) because they generally look the best.
<br>
<br>Fixed a bug that occured when using the tabs in vim7 (thanks to Harry for pointing it out:).
<br>
<br>Added a new commenting type called &quot;minimal&quot; comments where a SINGLE set of multipart delimiters is used to comment out a bunch of lines. Go :help NERD_com-minimal-comment for details. Thanks to Stefano Zacchiroli for this suggestion.
<br>
<br>Fixed some random little bugs.</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=5167">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.63</b></td>
+    <td class="roweven" valign="top" nowrap><i>2006-02-12</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">fixed a bug that was stopping the NERD_space_delim_filetype_regexp option from working with left aligned toggle comments. Thanks to boesi for pointing this out.
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4985">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.62</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2006-01-17</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Fixed 2 bugs that caused problems when uncommenting sexy comments. Thanks to Torsten Blix for emailing me about them.</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4970">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.61</b></td>
+    <td class="roweven" valign="top" nowrap><i>2006-01-14</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Applied a patch sent to me by Eike Von Seggern that fixed a bug that caused a space to be added to the end of the line when commenting with single-part delimiters. </td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4956">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.60</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2006-01-10</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Added a new option that turns off the NERD_comments menu shortcut (Alt-c) which could interfere with other (Non-NERD)&nbsp;&nbsp;mappings. Thanks to Nguyen for pointing out this problem :)</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4697">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.59</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-10-25</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">fixed a small bug that was causing problems with spaces around delimiters.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4696">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.58</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-10-24</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">fixed a bug that could be a problem when changing buffers. Thanks to David Bourgeois for pointing it out.</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4691">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.57</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-10-21</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Fixed a retarded bug when commenting c files (thanks to David&nbsp;&nbsp;Bourgeois for pointing it out).
<br>Changed the NERD_dont_remove_spaces option to NERD_dont_remove_spaces_regexp and made it take a regular expression. Go :help NERD_dont_remove_spaces_regexp for details. Put a section in the help file that gives some examples of regular expressions that&nbsp;&nbsp;you may want to use for some of the options. Go :help NERD_com-reg-exps for details.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4641">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.56</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-10-01</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Tweaked the behaviour of the &quot;toggle comment&quot; mapping: now if you are commenting a range (with toggle comments) and&nbsp;&nbsp;you have the NERD_use_nested_comments_default option turned on it will comment the already comment lines again. Cheers to Igor Prischepoff for this suggestion. I also reorgansied the help page and added some stuff to make it more readable :)</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4581">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.55</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-09-14</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">made the \ci mapping work with whole lines line the \c&lt;space&gt; mapping does i.e the mapping only counts a line as commented if it commented from the start of the line.
<br>Fixed a couple of silly bugs</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4578">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.54</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-09-13</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Fixed the \cn mapping that i broke in the last version. Thanks to harry for pointing that out.
<br>Changed the behaviour of toggle comments: now lines are only counted as commented if they are commented from the beginning of the line. Thanks to Igor Prischepoff for suggesting this. I applied a patch by Richard (Krischikm) which fixed a couple of bugs and added a new option (see :help NERD_use_ada_with_spaces for details). I changed how the script handles tabs: now each line is examined individually instead of using examining the &expandtabs option and assuming it applies to every line. The script should not interfere with the tabbing style of any file you edit now... even if they alternate between soft and hard tabs with each line :).&nbsp;&nbsp;Stopped the cursor jumping when the \cu mapping is used.</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4566">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.53</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-09-12</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Made some changes to how spaces around comments are removed when uncommenting... basically they are always removed unless the new option NERD_dont_remove_spaces is set. Go :help NERD_dont_remove_spaces for details. I added this functionality because i usually dont have NERD_comments adding spaces after/before the left/right delimiters but when im editing code written by people who DO it makes me insane because it is uncommented incorrectly.&nbsp;&nbsp;Fixed the cursor and screen jumping bugs... hopefully :)</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4557">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.52</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-09-06</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Fixed an error in the help file. Added support for // comments in c. Made an option to turn these // comments on by default (go :help NERD_use_single_part_c_comments for details). Thanks to Richard Willis whose feedback prompted these changes :)</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4554">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.51</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-09-05</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Added yet another mapping (&lt;leader&gt;ci) which inverts the commented state of every selected line. i.e. for each line selected, if it is commented it is uncommented and vice versa. Thanks to Nick Brettell for the idea. Improved the cursor positioning after commenting is done so if you do a visual comment the cursor returns to a better position. Removed some line continuations that were screwing up on some systems. Thanks to Richard for pointing that out to me.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4541">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.50</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-08-31</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Added a new mapping &lt;leader&gt;c&lt;space&gt; that toggles the comment state of the selected lines. It uncomments all the lines if the first line is commented and comments them otherwise. The mapping can be changed with this option: NERD_com_line_toggle_map. Toggle commenting can be made the default commenting method (so it applied when &lt;leader&gt;cc is pressed) with this option: NERD_use_toggle_coms_default. Thanks to Igor Prischepoff for the idea :)</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4538">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.49</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-08-30</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Fixed a bug that was causing problems when the ignorecase option in vim was set. Thanks to Brent Rice for telling me about this problem and helping me track the bug down :)</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4533">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.48</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-08-28</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Fixed a bug with sexy comments that was stopping them from working when you were using the alternative set of delimiters for some languages (eg c/java/etc)</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4516">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.47</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-08-25</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Fixed bugs with sexy comments (most of the bugs were only an issue when using compact sexy comments): Now they work properly if they end on a blank line. When uncommenting sexy comments the display window doesnt jump anymore. If the sexy comment starts or ends on another ordinary&nbsp;&nbsp;comment it no longer screws up. Sexy comments no longer delete parts of lines (which they did from time to time). Blank lines above compact sexy comments are no longer removed when uncommenting.
<br>Fixed another bug with the &lt;C-c&gt; mapping.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4436">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.46</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-07-17</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">enhanced the option: NERD_comment_whole_lines_in_v_mode so that it can now take 2 values. Go :help NERD_comment_whole_lines_in_v_mode for an explaination. Thanks to jorge scandaliaris for emailing me with his criticism about this :)</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4429">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.45</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-07-14</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Now the script doesnt create a seperate filetype for h files unless&nbsp;&nbsp;you tell it to with a new option called NERD_create_h_filetype. Go :help NERD_create_h_filetype for more info.
<br>This update was done to prevent NERD_comments from&nbsp;&nbsp;screwing with the taglist plugin. 
<br>
<br>Thanks to Markus Erlmann for pointing out that it caused problems.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4413">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.44</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-07-06</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Fixed a bug with the &lt;C-c&gt; mapping after i broke it (again :().
<br>Thanks to Martin Stubenschrott for pointing this bug out!
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4404">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.43</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-06-30</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Fixed a bug with visual commenting.
<br>Added a new option, go :help NERD_comment_whole_lines_in_v_mode for details. Thanks to&nbsp;&nbsp;jorge scandaliaris and&nbsp;&nbsp;Shufeng Zheng for their suggestions about this.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4393">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.42</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-06-26</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Now, when any visual comments are made, the cursor is placed at the top left line/col of the visual selection block after the comment is done instead of on the top line at the first col. Thanks to Nick Brettell for complaining about this.
<br>
<br>Added support for .geek files hahahaha</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4369">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.41</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-06-16</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">fixed a small bug with the &lt;C-c&gt; functionality when the script is configured to put extra spaces between the delimiters.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4292">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.40</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-05-18</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Fixed a bug that was screwing up place holders with nested commenting when NERD_use_nested_comments_default option is set. Changed the left and right default place holders because the strings that were being used were sort of common in c/c++/java/... files. If you liked them the way they were you can just set them back with the NERD_lPlace and NERD_rPlace options.
<br>Thanx to Nick for complaining about the place holders and spotting the other bug :P
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4283">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.39</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-05-15</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Fixed a retarded bug with the &lt;C-c&gt; mapping.
<br>Changed the &lt;leader&gt;ce mapping to have a default mapping of &lt;leader&gt;cA and added a new mapping that adds a comment delimiter to the start of the current line and inserts between the delimiters - the default mapping is &lt;leader&gt;cI (thats an uppercase i not a lowercase L).
<br>Fixed a bug that caused the script to spaz out if you tried to comment a file with no filetype.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4279">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.38</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-05-13</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Added new functionality for when text is commented in normal visual mode (i.e not visual-block or visual-line). Now Nerd_comments comments out exactly the text that is selected in visual mode regardless of the type of visual mode you are in. 
<br>Thanks to Nick Brettell his ideas about this!
<br>
<br>Also, if you are commenting out text in visual or visual-block mode, NERD_comments will use multip-part delimiters is they are available so that the exact text that was selected will be exactly what is commented out - a new option has been added to turn off this behaviour (go :help NERD_allow_any_visual_delims_regexp for details).
<br>
<br>Fixed a couple of small bugs with the &lt;C-c&gt; mapping that prolly on one even noticed :P
<br>
<br>
<br>
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4260">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.37</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-05-09</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Added a new mapping/menu item:
<br>Now when &lt;leader&gt;ce is pressed a comment is appended to the EOL and the cursor gets put in insert mode in the appropriate place to type the comment.
<br>
<br>Thanks to Litchi for emailing me with this idea :)
<br>
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4258">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.36</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-05-08</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">added lots more supported filetypes</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4237">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.35</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-05-04</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Added support for some new filetypes.
<br>Fixed a small bug with sexy comments.
<br>Fixed a bug with tabs that was not too serious but would screw up commenting of things like makefiles in a big way. Cheers to Nick Brettell for pointing this bug out!</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4223">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.34</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-04-29</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Add support for a couple more filetypes. Thanks to Sam R for emailing me about them!</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4221">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.33</b></td>
     <td class="roweven" valign="top" nowrap><i>2005-04-29</i></td>
     <td class="roweven" valign="top" nowrap>6.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Add support for a couple more filetypes. Thanks to Sam R for emailing me about them!</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4221">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.33</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-04-29</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">added a new mapping/menuItem that yanks the current line or selected text before commenting it out. This is handy if you wanna experiment with a piece of code... u just comment out the code and put a copy underneath it that you experiment on.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4201">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.32</b></td>
+    <td class="roweven" valign="top" width="2000">added a new mapping/menuItem that yanks the current line or selected text before commenting it out. This is handy if you wanna experiment with a piece of code... u just comment out the code and put a copy underneath it that you experiment on.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4201">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.32</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-04-25</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">now,&nbsp;&nbsp;if the current filetype matches NERD_use_sexy_coms_default_regexp then sexy comments will only be used if you are commenting more than one line with &lt;leader&gt;cc... i thought sexy comments on one line looked retarded. Of course you can still do one line sexy comments with &lt;leader&gt;cs</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4198">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.31</b></td>
     <td class="roweven" valign="top" nowrap><i>2005-04-25</i></td>
     <td class="roweven" valign="top" nowrap>6.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">now,&nbsp;&nbsp;if the current filetype matches NERD_use_sexy_coms_default_regexp then sexy comments will only be used if you are commenting more than one line with &lt;leader&gt;cc... i thought sexy comments on one line looked retarded. Of course you can still do one line sexy comments with &lt;leader&gt;cs</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4198">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.31</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-04-25</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Added a new option called NERD_use_sexy_coms_default_regexp. This option is used to tell NERD_comments to use sexy comments for certain filetypes by default when &lt;leader&gt;cc is pressed.
<br>
<br>Now if you edit a filetype that the script doesnt know about the warning it echos isnt so &quot;loud&quot;
<br>
<br>Thanks to Nguyen for suggesting these changes.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4195">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.30</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-04-22</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Have finally implemented &quot;sexy&quot; comments. Go :help NERD_com_sexy_commenting to see what they are... i cant even be stuffed explaining.
<br>
<br>There is an option to make your sexy comments compact and use up less lines, go :help NERD_use_compact_sexy_com_regexp.
<br>
<br>Thanks to Nguyen for the idea... sorry it took so long dude :P</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4181">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.29</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-04-18</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">There are a couple of new options to tell NERD_comments to always left align, right align or both align, comment delimiters when commenting multiple lines in visual mode. Go :help NERD_left_align_regexp, :help NERD_right_align_regexp. If the current filetype matches one or both of these regular expressions then hitting &lt;leader&gt;cc will automatically align the delimiters. 
<br>
<br>There are comment mappings/menu items which can be used to do aligned comments for any filetype. The mappings are &lt;leader&gt;cl &lt;leader&gt;cr and &lt;leader&gt;cb for left, right and both aligned comments respectively. These mappings and menu items assume that the comments will be nested if need be.
<br>
<br>Now, when uncommenting lines, the script looks for left and right delimiters separately so for eg: if you uncomment a line with one right delimiter on it (but no left delim) then it will still be removed.
<br>
<br>Fixed a couple of minor bugs.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4156">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.28</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-04-12</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Added a menu with menu items for each of the scripts key mappings.
<br>Refactored the code a bit.
<br>Now, if&nbsp;&nbsp;you edit a filetype that vim doesnt know about the script wont crap out.
<br>Added support for a couple more filetypes.</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4131">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.27</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-04-06</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">a few bug fixes</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4122">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.26</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-04-05</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Removed an echoerr that i forgot to remove from last release...</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4119">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.25</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-04-04</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Updated comment recognition heuristics. Modified the place holder system a bit so it is better. Did some refactoring to simplify the code a bit. Fixed some random bugs</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4113">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.24</b></td>
+    <td class="roweven" valign="top" width="2000">Added a new option called NERD_use_sexy_coms_default_regexp. This option is used to tell NERD_comments to use sexy comments for certain filetypes by default when &lt;leader&gt;cc is pressed.
<br>
<br>Now if you edit a filetype that the script doesnt know about the warning it echos isnt so &quot;loud&quot;
<br>
<br>Thanks to Nguyen for suggesting these changes.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4195">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.30</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-04-22</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Have finally implemented &quot;sexy&quot; comments. Go :help NERD_com_sexy_commenting to see what they are... i cant even be stuffed explaining.
<br>
<br>There is an option to make your sexy comments compact and use up less lines, go :help NERD_use_compact_sexy_com_regexp.
<br>
<br>Thanks to Nguyen for the idea... sorry it took so long dude :P</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4181">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.29</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-04-18</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">There are a couple of new options to tell NERD_comments to always left align, right align or both align, comment delimiters when commenting multiple lines in visual mode. Go :help NERD_left_align_regexp, :help NERD_right_align_regexp. If the current filetype matches one or both of these regular expressions then hitting &lt;leader&gt;cc will automatically align the delimiters. 
<br>
<br>There are comment mappings/menu items which can be used to do aligned comments for any filetype. The mappings are &lt;leader&gt;cl &lt;leader&gt;cr and &lt;leader&gt;cb for left, right and both aligned comments respectively. These mappings and menu items assume that the comments will be nested if need be.
<br>
<br>Now, when uncommenting lines, the script looks for left and right delimiters separately so for eg: if you uncomment a line with one right delimiter on it (but no left delim) then it will still be removed.
<br>
<br>Fixed a couple of minor bugs.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4156">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.28</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-04-12</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Added a menu with menu items for each of the scripts key mappings.
<br>Refactored the code a bit.
<br>Now, if&nbsp;&nbsp;you edit a filetype that vim doesnt know about the script wont crap out.
<br>Added support for a couple more filetypes.</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4131">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.27</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-04-06</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">a few bug fixes</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4122">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.26</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-04-05</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Removed an echoerr that i forgot to remove from last release...</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4119">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.25</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-04-04</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Updated comment recognition heuristics. Modified the place holder system a bit so it is better. Did some refactoring to simplify the code a bit. Fixed some random bugs</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4113">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.24</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-04-01</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Fixed some bugs with place holders.
<br>
<br>Parameterised some of the place holder stuff to make it more customisable. There are now 3 more options: NERD_lPlace, NERD_rPlace and NERD_place_holder_regexp. These options are used to control the strings that are used as place holders and to specify the filetypes NERD_comments will use place holders for. Go :help and the name of each option for more info
<br>
<br>Now when a line is uncommented, the outtermost delimiters are removed regardless of whether they are the alternative delimiters for that filetype or not</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4111">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.23</b></td>
     <td class="roweven" valign="top" nowrap><i>2005-04-01</i></td>
     <td class="roweven" valign="top" nowrap>6.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixed some bugs with place holders.
<br>
<br>Parameterised some of the place holder stuff to make it more customisable. There are now 3 more options: NERD_lPlace, NERD_rPlace and NERD_place_holder_regexp. These options are used to control the strings that are used as place holders and to specify the filetypes NERD_comments will use place holders for. Go :help and the name of each option for more info
<br>
<br>Now when a line is uncommented, the outtermost delimiters are removed regardless of whether they are the alternative delimiters for that filetype or not</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4111">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.23</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-04-01</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Added support for place holders when nesting comments with left AND right delimiters.
<br>Now if you go &lt;leader&gt;cn on a line of already commented code (eg: /* int foo */), the current delimiters will be swapped for place holders so the example line will become: /*[+ int foo +]*/ where [+ and +] are the place holders.
<br>Also, i fixed a pretty major bug with visual-block commenting</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4088">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.22</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-03-28</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixed the syntax highlighting probs with h files.
<br>
<br>There is a new option which is used to place a space after the left delimiter and before the right delimiter. The option is set to a regular expression and any filetypes that match this expression have the aforementioned spaces added when commenting. Go :help NERD_space_delim_filetype_regexp for details.
<br>
<br>Thanks to Nguyen for pointing these emailing me about these things!!
<br>
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4082">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.21</b></td>
+    <td class="roweven" valign="top" width="2000">Added support for place holders when nesting comments with left AND right delimiters.
<br>Now if you go &lt;leader&gt;cn on a line of already commented code (eg: /* int foo */), the current delimiters will be swapped for place holders so the example line will become: /*[+ int foo +]*/ where [+ and +] are the place holders.
<br>Also, i fixed a pretty major bug with visual-block commenting</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4088">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.22</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-03-28</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Fixed the syntax highlighting probs with h files.
<br>
<br>There is a new option which is used to place a space after the left delimiter and before the right delimiter. The option is set to a regular expression and any filetypes that match this expression have the aforementioned spaces added when commenting. Go :help NERD_space_delim_filetype_regexp for details.
<br>
<br>Thanks to Nguyen for pointing these emailing me about these things!!
<br>
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4082">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.21</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-03-26</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">fixed some bugs.
<br>added support for more filetypes</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4081">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.20</b></td>
     <td class="rowodd" valign="top" nowrap><i>2005-03-26</i></td>
     <td class="rowodd" valign="top" nowrap>6.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">fixed some bugs.
<br>added support for more filetypes</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4081">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.20</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-03-26</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">did some refactoring
<br>
<br>added support for more filetypes</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4068">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.19</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-03-24</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">If the filetype is unkown to the script it now looks at &commentstring to get the comment delimiters for that filetype</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4064">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.18</b></td>
+    <td class="rowodd" valign="top" width="2000">did some refactoring
<br>
<br>added support for more filetypes</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4068">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.19</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-03-24</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">If the filetype is unkown to the script it now looks at &commentstring to get the comment delimiters for that filetype</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4064">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.18</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-03-23</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Block commenting is done automatically now... if you select some text in visual-block mode and go &lt;leader&gt;cc it will&nbsp;&nbsp;behave the same as if you pushed &lt;leader&gt;cb before.
<br>
<br>Similarly, if you select some text with visual-block mode and go &lt;leader&gt;cn it wll behave as if you had pushed &lt;leader&gt;cB
<br>
<br>the &lt;leader&gt;cb and &lt;leader&gt;cB mappings have now been removed cos they are redundant
<br>
<br>The comment recognition heuristics have been updated a little bit so NERD_comments is now a bit better at recognising comment delimiters</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4062">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.17</b></td>
     <td class="roweven" valign="top" nowrap><i>2005-03-23</i></td>
     <td class="roweven" valign="top" nowrap>6.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Block commenting is done automatically now... if you select some text in visual-block mode and go &lt;leader&gt;cc it will&nbsp;&nbsp;behave the same as if you pushed &lt;leader&gt;cb before.
<br>
<br>Similarly, if you select some text with visual-block mode and go &lt;leader&gt;cn it wll behave as if you had pushed &lt;leader&gt;cB
<br>
<br>the &lt;leader&gt;cb and &lt;leader&gt;cB mappings have now been removed cos they are redundant
<br>
<br>The comment recognition heuristics have been updated a little bit so NERD_comments is now a bit better at recognising comment delimiters</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4062">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.17</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-03-23</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">block commenting is much better now</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4047">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.16</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-03-21</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">umm, the script has been changed a lot...
<br>- the keymappings and options are different and there is waaaay more of them
<br>- there is now way more functionality provided by the script
<br>- there is a help file that is self-installing and fully contained in the script (i stole the installation function from the vimspell plugin (thx vimspell!!))
<br>- the internals of the script are a bit more sophisticated in the way they recognise comments (they have to be cos of the new functionality) but it is not perfect at recognising comment delimiters (infact it only uses a set of heuristics) 
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4026">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.15</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-03-15</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Changed the guts of the script a bit.
<br>
<br>Now the imap for &lt;C-c&gt; is done automatically which means that adding support for commenting another language is really easy and takes just one line!
<br>
<br>Haskell and lisp are now supported
<br>
<br>There is a new function that is designed to handle programming languages with more than one commenting style which is a bit of a hack but works well. 
<br>
<br>Theres another option NERD_use_c_style_prolog_comments
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3983">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.14</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-03-09</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Did a bit of refactoring... no functionality changes.
<br>
<br>Thanks to Matthew Hawkins for pointing out the code repitition :P</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3976">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.13</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-03-07</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- added a new option: NERD_use_c_comments_for_h_files. This option is needed cos
<br>&nbsp;&nbsp;h files are used with c files which only allow /**/ comments, but they are also
<br>&nbsp;&nbsp;used with c++/c# which allow // comments which are illegal in c
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<br>- the option NERD_use_slash_star_java_cpp_comments now affects c# files as well.
<br>&nbsp;&nbsp;This means that c# files are now commented like c++/java files
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<br>- added a new autocommand which sets the filetype to h if we enter a buffer with
<br>&nbsp;&nbsp;an h file in it. This was needed cos some versions of vim dont seem to have an h
<br>&nbsp;&nbsp;filetype. Some versions of vim treat h files as cpp files which screws everything up!!!
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3971">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.12</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-03-06</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Fixed a bug with forced commenting (&lt;leader&gt;&lt;leader&gt;c)</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3967">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.11</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-03-05</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Some minor bug fixes and improvements</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3957">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.10</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-03-03</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">An additional mapping has been added:
<br>&lt;leader&gt;&lt;leader&gt;c will now comment out the selected lines and will force nested commenting (provided the comment style has no right delimiter - to avoid compiler errors). Note that if the option NERD_allow_nested_comments is set then &lt;leader&gt;c performs this behaviour anyway...
<br></td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3946">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.09</b></td>
+    <td class="roweven" valign="top" width="2000">block commenting is much better now</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=4047">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.16</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-03-21</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">umm, the script has been changed a lot...
<br>- the keymappings and options are different and there is waaaay more of them
<br>- there is now way more functionality provided by the script
<br>- there is a help file that is self-installing and fully contained in the script (i stole the installation function from the vimspell plugin (thx vimspell!!))
<br>- the internals of the script are a bit more sophisticated in the way they recognise comments (they have to be cos of the new functionality) but it is not perfect at recognising comment delimiters (infact it only uses a set of heuristics) 
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=4026">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.15</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-03-15</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Changed the guts of the script a bit.
<br>
<br>Now the imap for &lt;C-c&gt; is done automatically which means that adding support for commenting another language is really easy and takes just one line!
<br>
<br>Haskell and lisp are now supported
<br>
<br>There is a new function that is designed to handle programming languages with more than one commenting style which is a bit of a hack but works well. 
<br>
<br>Theres another option NERD_use_c_style_prolog_comments
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3983">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.14</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-03-09</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Did a bit of refactoring... no functionality changes.
<br>
<br>Thanks to Matthew Hawkins for pointing out the code repitition :P</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3976">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.13</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-03-07</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">- added a new option: NERD_use_c_comments_for_h_files. This option is needed cos
<br>&nbsp;&nbsp;h files are used with c files which only allow /**/ comments, but they are also
<br>&nbsp;&nbsp;used with c++/c# which allow // comments which are illegal in c
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<br>- the option NERD_use_slash_star_java_cpp_comments now affects c# files as well.
<br>&nbsp;&nbsp;This means that c# files are now commented like c++/java files
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<br>- added a new autocommand which sets the filetype to h if we enter a buffer with
<br>&nbsp;&nbsp;an h file in it. This was needed cos some versions of vim dont seem to have an h
<br>&nbsp;&nbsp;filetype. Some versions of vim treat h files as cpp files which screws everything up!!!
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3971">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.12</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-03-06</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Fixed a bug with forced commenting (&lt;leader&gt;&lt;leader&gt;c)</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3967">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.11</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-03-05</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">Some minor bug fixes and improvements</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3957">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.10</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-03-03</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">An additional mapping has been added:
<br>&lt;leader&gt;&lt;leader&gt;c will now comment out the selected lines and will force nested commenting (provided the comment style has no right delimiter - to avoid compiler errors). Note that if the option NERD_allow_nested_comments is set then &lt;leader&gt;c performs this behaviour anyway...
<br></td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3946">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.09</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-03-01</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">- there is a new option NERD_allow_nested_comments which will allow nested comments provided that there is no right delimiter for that commenting style. This should prevent nested commenting errors.
<br>
<br>eg. the option will allow nested // style java comments (which will not produce compiler errors) but will not allow nested /* */ style c comments (which would cause compiler errors). 
<br>The reason this feature has been added is the following: Say that you have commented out an entire function which already has comments in it... when you uncomment out the function, errors will result because of the comments that were already there that have been uncommented. This way those comments will become nested comments and the function will be exactly as it was before you commented it.
<br>
<br>- the option NERD_double_slash_java_comments has been changed to NERD_use_star_slash_java_cpp_comments. Now, when editing java/c++ file&nbsp;&nbsp;// style comments are used by default unless this option is set. This is to make it easier for ppl who want to use the nested comments option as well...</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3944">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.08</b></td>
     <td class="rowodd" valign="top" nowrap><i>2005-03-01</i></td>
     <td class="rowodd" valign="top" nowrap>6.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- there is a new option NERD_allow_nested_comments which will allow nested comments provided that there is no right delimiter for that commenting style. This should prevent nested commenting errors.
<br>
<br>eg. the option will allow nested // style java comments (which will not produce compiler errors) but will not allow nested /* */ style c comments (which would cause compiler errors). 
<br>The reason this feature has been added is the following: Say that you have commented out an entire function which already has comments in it... when you uncomment out the function, errors will result because of the comments that were already there that have been uncommented. This way those comments will become nested comments and the function will be exactly as it was before you commented it.
<br>
<br>- the option NERD_double_slash_java_comments has been changed to NERD_use_star_slash_java_cpp_comments. Now, when editing java/c++ file&nbsp;&nbsp;// style comments are used by default unless this option is set. This is to make it easier for ppl who want to use the nested comments option as well...</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3944">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.08</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-03-01</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">- Massive refactoring which has significantly reduced the size of the script
<br>- Corrections to some of the comment delimiters used
<br>- also the filetype event used in the auto commands that turn on the mappings has been capitalised to FileType to fix a problem with some versions of vim
<br>- version number is now in the script
<br>
<br>All of this was done by Matthew Hawkins... THANK YOU VERY MUCH !!! :) </td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3939">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.07</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-02-28</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">- Now, when commenting lines of code, lines that are already commented out are not commented again
<br>- when commenting code, blank lines (or lines containing only spaces and/or tabs) are not commented
<br>- an option has been added which lets you have // style java comments instead of /* */ java comments just stick 'let NERD_double_slash_java_comments=1' in your vimrc
<br></td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3928">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.06</b></td>
+    <td class="rowodd" valign="top" width="2000">- Massive refactoring which has significantly reduced the size of the script
<br>- Corrections to some of the comment delimiters used
<br>- also the filetype event used in the auto commands that turn on the mappings has been capitalised to FileType to fix a problem with some versions of vim
<br>- version number is now in the script
<br>
<br>All of this was done by Matthew Hawkins... THANK YOU VERY MUCH !!! :) </td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3939">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.07</b></td>
+    <td class="roweven" valign="top" nowrap><i>2005-02-28</i></td>
+    <td class="roweven" valign="top" nowrap>6.0</td>
+    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="roweven" valign="top" width="2000">- Now, when commenting lines of code, lines that are already commented out are not commented again
<br>- when commenting code, blank lines (or lines containing only spaces and/or tabs) are not commented
<br>- an option has been added which lets you have // style java comments instead of /* */ java comments just stick 'let NERD_double_slash_java_comments=1' in your vimrc
<br></td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3928">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.06</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-02-27</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">Now the left comment delimiter is placed in the position that the leftmost character occupies instead of at the start of the line. This means that indenting is preserved</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3924">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.05</b></td>
     <td class="roweven" valign="top" nowrap><i>2005-02-27</i></td>
     <td class="roweven" valign="top" nowrap>6.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Now the left comment delimiter is placed in the position that the leftmost character occupies instead of at the start of the line. This means that indenting is preserved</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3924">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.05</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-02-27</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">fixed bug for removing comment delimiters
<br>
<br>added support for shite loads more filetypes</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3915">NERD_comments.vim</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.04</b></td>
+    <td class="roweven" valign="top" width="2000">fixed bug for removing comment delimiters
<br>
<br>added support for shite loads more filetypes</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3915">NERD_comments.vim</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.04</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-02-26</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">The functions that turn on the comment mappings are now local to the script</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3914">NERD_comments.vim</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.03</b></td>
     <td class="roweven" valign="top" nowrap><i>2005-02-26</i></td>
     <td class="roweven" valign="top" nowrap>6.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">The functions that turn on the comment mappings are now local to the script</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3914">NERD_comments.vim</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.03</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2005-02-26</i></td>
-    <td class="rowodd" valign="top" nowrap>6.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">Now the comment mappings are loaded automatically.</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3913">NERD_comments.vim.gz</a></td>
-    <td class="roweven" valign="top" nowrap><b>1.02</b></td>
+    <td class="roweven" valign="top" width="2000">Now the comment mappings are loaded automatically.</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3913">NERD_comments.vim.gz</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1.02</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2005-02-25</i></td>
+    <td class="rowodd" valign="top" nowrap>6.0</td>
+    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
+    <td class="rowodd" valign="top" width="2000">fixed some bugs. Comments now work for c. Also the hlsearch option is not potentially changed when the comment mappings are used</td>
+</tr>
+<tr>
+        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3908">NERD_comments.vim.gz</a></td>
+    <td class="roweven" valign="top" nowrap><b>1.01</b></td>
     <td class="roweven" valign="top" nowrap><i>2005-02-25</i></td>
     <td class="roweven" valign="top" nowrap>6.0</td>
     <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">fixed some bugs. Comments now work for c. Also the hlsearch option is not potentially changed when the comment mappings are used</td>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3908">NERD_comments.vim.gz</a></td>
-    <td class="rowodd" valign="top" nowrap><b>1.01</b></td>
+    <td class="roweven" valign="top" width="2000">err, various corrections to comments</td>
+</tr>
+<tr>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=3907">NERD_comments.vim.gz</a></td>
+    <td class="rowodd" valign="top" nowrap><b>1</b></td>
     <td class="rowodd" valign="top" nowrap><i>2005-02-25</i></td>
     <td class="rowodd" valign="top" nowrap>6.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="rowodd" valign="top" width="2000">err, various corrections to comments</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=3907">NERD_comments.vim.gz</a></td>
-    <td class="roweven" valign="top" nowrap><b>1</b></td>
-    <td class="roweven" valign="top" nowrap><i>2005-02-25</i></td>
-    <td class="roweven" valign="top" nowrap>6.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=7006">Marty Grenfell</a></i></td>
-    <td class="roweven" valign="top" width="2000">Initial upload</td>
+    <td class="rowodd" valign="top" width="2000">Initial upload</td>
 </tr>
 </table>
 <!-- finish off the framework -->

Modified: trunk/packages/vim-scripts/plugin/NERD_commenter.vim
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/NERD_commenter.vim?rev=1264&op=diff
==============================================================================
--- trunk/packages/vim-scripts/plugin/NERD_commenter.vim (original)
+++ trunk/packages/vim-scripts/plugin/NERD_commenter.vim Mon Jun 23 14:59:48 2008
@@ -1,11 +1,16 @@
-" vim global plugin that provides easy code commenting for various file types
-" Last Change:  31 March 2008
-" Maintainer:   Martin Grenfell <martin_grenfell at msn.com>
-let s:NERD_commenter_version = 2.1.12
-
-" For help documentation type :help NERDCommenter. If this fails, Restart vim
-" and try again. If it sill doesnt work... the help page is at the bottom 
-" of this file.
+" ============================================================================
+" File:        NERD_commenter.vim
+" Description: vim global plugin that provides easy code commenting
+" Maintainer:  Martin Grenfell <martin_grenfell at msn dot com>
+" Last Change: 22 June, 2008
+" License:     This program is free software. It comes without any warranty,
+"              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.
+"
+" ============================================================================
+let s:NERD_commenter_version = 2.1.15
 
 " Section: script init stuff {{{1
 if exists("loaded_nerd_comments")
@@ -59,7 +64,7 @@
 call s:InitVariable("g:NERDLPlace", "[>")
 call s:InitVariable("g:NERDUsePlaceHolders", 1)
 call s:InitVariable("g:NERDRemoveAltComs", 1)
-call s:InitVariable("g:NERDRemoveExtraSpaces", 0)
+call s:InitVariable("g:NERDRemoveExtraSpaces", 1)
 call s:InitVariable("g:NERDRPlace", "<]")
 call s:InitVariable("g:NERDShutUp", '0')
 call s:InitVariable("g:NERDSpaceDelims", 0)
@@ -96,11 +101,11 @@
     augroup commentEnablers
 
         "if the user enters a buffer or reads a buffer then we gotta set up
-        "the comment delimiters for that new filetype 
+        "the comment delimiters for that new filetype
         autocmd BufEnter,BufRead * :call s:SetUpForNewFiletype(&filetype, 0)
 
         "if the filetype of a buffer changes, force the script to reset the
-        "delims for the buffer 
+        "delims for the buffer
         autocmd Filetype * :call s:SetUpForNewFiletype(&filetype, 1)
     augroup END
 
@@ -108,7 +113,7 @@
 
 
 " Function: s:SetUpForNewFiletype(filetype) function {{{2
-" This function is responsible for setting up buffer scoped variables for the 
+" This function is responsible for setting up buffer scoped variables for the
 " given filetype.
 "
 " These variables include the comment delimiters for the given filetype and calls
@@ -129,220 +134,224 @@
     let b:sexyComMarker = ''
 
     "check the filetype against all known filetypes to see if we have
-    "hardcoded the comment delimiters to use 
-    if a:filetype == "" 
+    "hardcoded the comment delimiters to use
+    if a:filetype == ""
         call s:MapDelimiters('', '')
-    elseif a:filetype == "aap" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "abaqus" 
+    elseif a:filetype == "aap"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "abaqus"
         call s:MapDelimiters('**', '')
-    elseif a:filetype == "abc" 
+    elseif a:filetype == "abc"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "acedb" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "ada" 
+    elseif a:filetype == "acedb"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "ada"
         call s:MapDelimitersWithAlternative('--','', '--  ', '')
-    elseif a:filetype == "ahdl" 
+    elseif a:filetype == "ahdl"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "ahk" 
+    elseif a:filetype == "ahk"
         call s:MapDelimitersWithAlternative(';', '', '/*', '*/')
-    elseif a:filetype == "amiga" 
+    elseif a:filetype == "amiga"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "aml" 
+    elseif a:filetype == "aml"
         call s:MapDelimiters('/*', '')
-    elseif a:filetype == "ampl" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "ant" 
-        call s:MapDelimiters('<!--','-->') 
-    elseif a:filetype == "apache" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "apachestyle" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "asm68k" 
+    elseif a:filetype == "ampl"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "ant"
+        call s:MapDelimiters('<!--','-->')
+    elseif a:filetype == "apache"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "apachestyle"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "asm68k"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "asm" 
+    elseif a:filetype == "asm"
         call s:MapDelimitersWithAlternative(';', '', '#', '')
-    elseif a:filetype == "asn" 
+    elseif a:filetype == "asn"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "aspvbs" 
+    elseif a:filetype == "aspvbs"
         call s:MapDelimiters('''', '')
-    elseif a:filetype == "asterisk" 
+    elseif a:filetype == "asterisk"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "asy" 
+    elseif a:filetype == "asy"
         call s:MapDelimiters('//', '')
-    elseif a:filetype == "atlas" 
-        call s:MapDelimiters('C','$') 
-    elseif a:filetype == "autohotkey" 
-        call s:MapDelimiters(';','') 
-    elseif a:filetype == "autoit" 
-        call s:MapDelimiters(';','') 
-    elseif a:filetype == "automake" 
-        call s:MapDelimitersWithAlternative('#','', 'dnl ', '') 
-    elseif a:filetype == "ave" 
-        call s:MapDelimiters("'",'') 
-    elseif a:filetype == "awk" 
-        call s:MapDelimiters('#','') 
-    elseif a:filetype == "basic" 
+    elseif a:filetype == "atlas"
+        call s:MapDelimiters('C','$')
+    elseif a:filetype == "autohotkey"
+        call s:MapDelimiters(';','')
+    elseif a:filetype == "autoit"
+        call s:MapDelimiters(';','')
+    elseif a:filetype == "automake"
+        call s:MapDelimitersWithAlternative('#','', 'dnl ', '')
+    elseif a:filetype == "ave"
+        call s:MapDelimiters("'",'')
+    elseif a:filetype == "awk"
+        call s:MapDelimiters('#','')
+    elseif a:filetype == "basic"
         call s:MapDelimitersWithAlternative("'",'', 'REM ', '')
-    elseif a:filetype == "b" 
+    elseif a:filetype == "b"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "bbx" 
+    elseif a:filetype == "bbx"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "bc" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "bdf" 
+    elseif a:filetype == "bc"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "bdf"
         call s:MapDelimiters('COMMENT ', '')
-    elseif a:filetype == "bib" 
-        call s:MapDelimiters('%','') 
-    elseif a:filetype == "bindzone" 
+    elseif a:filetype == "bib"
+        call s:MapDelimiters('%','')
+    elseif a:filetype == "bindzone"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "bst" 
+    elseif a:filetype == "bst"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "btm" 
+    elseif a:filetype == "btm"
         call s:MapDelimiters('::', '')
-    elseif a:filetype == "caos" 
+    elseif a:filetype == "bzr"
+        call s:MapDelimiters('', '')
+    elseif a:filetype == "caos"
         call s:MapDelimiters('*', '')
-    elseif a:filetype == "catalog" 
-        call s:MapDelimiters('--','--') 
-    elseif a:filetype == "c" 
-        call s:MapDelimitersWithAlternative('/*','*/', '//', '') 
-    elseif a:filetype == "cfg" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "cg" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "ch" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "changelog" 
+    elseif a:filetype == "catalog"
+        call s:MapDelimiters('--','--')
+    elseif a:filetype == "c"
+        call s:MapDelimitersWithAlternative('/*','*/', '//', '')
+    elseif a:filetype == "cfg"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "cg"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "ch"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "changelog"
         call s:MapDelimiters('','')
-    elseif a:filetype == "cl" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "clean" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "clipper" 
+    elseif a:filetype == "cl"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "clean"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "clipper"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
     elseif a:filetype == "cmake"
         call s:MapDelimiters('#','')
-    elseif a:filetype == "cobol" 
+    elseif a:filetype == "cobol"
         call s:MapDelimiters('', '')
-    elseif a:filetype == "conf" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "config" 
+    elseif a:filetype == "conf"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "config"
         call s:MapDelimiters('dnl ', '')
     elseif a:filetype == "context"
         call s:MapDelimiters('%','')
-    elseif a:filetype == "cpp" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "crontab" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "cs" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "csc" 
+    elseif a:filetype == "cpp"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "crontab"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "cs"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "csc"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "csp" 
+    elseif a:filetype == "csp"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "css" 
+    elseif a:filetype == "css"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "cterm" 
+    elseif a:filetype == "cterm"
         call s:MapDelimiters('*', '')
-    elseif a:filetype == "cupl" 
+    elseif a:filetype == "cupl"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "csv" 
+    elseif a:filetype == "csv"
         call s:MapDelimiters('','')
-    elseif a:filetype == "cvs" 
+    elseif a:filetype == "cvs"
         call s:MapDelimiters('CVS:','')
-    elseif a:filetype == "CVSAnnotate" 
+    elseif a:filetype == "CVSAnnotate"
         call s:MapDelimiters('','')
-    elseif a:filetype == "d" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "dcl" 
+    elseif a:filetype == "d"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "dcl"
         call s:MapDelimiters('$!', '')
-    elseif a:filetype == "dakota" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "debchangelog" 
+    elseif a:filetype == "dakota"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "debchangelog"
         call s:MapDelimiters('', '')
-    elseif a:filetype == "debcontrol" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "debsources" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "def" 
+    elseif a:filetype == "debcontrol"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "debsources"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "def"
         call s:MapDelimiters(';', '')
     elseif a:filetype == "desktop"
         call s:MapDelimiters('#', '')
-    elseif a:filetype == "diff" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "django" 
-        call s:MapDelimitersWithAlternative('<!--','-->', '{#', '#}') 
-    elseif a:filetype == "docbk" 
+    elseif a:filetype == "diff"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "django"
+        call s:MapDelimitersWithAlternative('<!--','-->', '{#', '#}')
+    elseif a:filetype == "docbk"
         call s:MapDelimiters('<!--', '-->')
-    elseif a:filetype == "dns" 
+    elseif a:filetype == "dns"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "dosbatch" 
+    elseif a:filetype == "dosbatch"
         call s:MapDelimitersWithAlternative('REM ','', '::', '')
-    elseif a:filetype == "dosini" 
+    elseif a:filetype == "dosini"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "dot" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "dracula" 
+    elseif a:filetype == "dot"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "dracula"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "dsl" 
+    elseif a:filetype == "dsl"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "dtd" 
-        call s:MapDelimiters('<!--','-->') 
-    elseif a:filetype == "dtml" 
-        call s:MapDelimiters('<dtml-comment>','</dtml-comment>') 
-    elseif a:filetype == "dylan" 
+    elseif a:filetype == "dtd"
+        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'
         call s:MapDelimiters('#', '')
-    elseif a:filetype == "ecd" 
+    elseif a:filetype == "ecd"
         call s:MapDelimiters('#', '')
     elseif a:filetype == 'eclass'
         call s:MapDelimiters('#', '')
-    elseif a:filetype == "eiffel" 
+    elseif a:filetype == "eiffel"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "elf" 
+    elseif a:filetype == "elf"
         call s:MapDelimiters("'", '')
-    elseif a:filetype == "elmfilt" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "erlang" 
+    elseif a:filetype == "elmfilt"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "erlang"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "eruby" 
+    elseif a:filetype == "eruby"
         call s:MapDelimitersWithAlternative('<!--', '-->', '<%#', '%>')
-    elseif a:filetype == "eterm" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "expect" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "exports" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "factor" 
+    elseif a:filetype == "eterm"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "expect"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "exports"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "factor"
         call s:MapDelimitersWithAlternative('! ', '', '!# ', '')
-    elseif a:filetype == "fetchmail" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "fgl" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "focexec" 
+    elseif a:filetype == "fetchmail"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "fgl"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "focexec"
         call s:MapDelimiters('-*', '')
-    elseif a:filetype == "form" 
+    elseif a:filetype == "form"
         call s:MapDelimiters('*', '')
-    elseif a:filetype == "fortran" 
+    elseif a:filetype == "fortran"
         call s:MapDelimiters('!', '')
-    elseif a:filetype == "foxpro" 
+    elseif a:filetype == "foxpro"
         call s:MapDelimiters('*', '')
-    elseif a:filetype == "fstab" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "fvwm" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "fx" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "gams" 
+    elseif a:filetype == "fstab"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "fvwm"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "fx"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "gams"
         call s:MapDelimiters('*', '')
-    elseif a:filetype == "gdb" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "gdmo" 
+    elseif a:filetype == "gdb"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "gdmo"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "geek" 
+    elseif a:filetype == "geek"
         call s:MapDelimiters('GEEK_COMMENT:', '')
-    elseif a:filetype == "gentoo-conf-d" 
+    elseif a:filetype == "gentoo-conf-d"
         call s:MapDelimiters('#', '')
     elseif a:filetype == "gentoo-env-d"
         call s:MapDelimiters('#', '')
@@ -352,521 +361,549 @@
         call s:MapDelimiters('#', '')
     elseif a:filetype == 'gentoo-package-keywords'
         call s:MapDelimiters('#', '')
-    elseif a:filetype == 'gentoo-package-mask' 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == 'gentoo-package-use' 
+    elseif a:filetype == 'gentoo-package-mask'
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == 'gentoo-package-use'
         call s:MapDelimiters('#', '')
     elseif a:filetype == 'gitAnnotate'
         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" 
+    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('--','', '{-', '-}') 
-    elseif a:filetype == "hb" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "h" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "haml" 
+    elseif a:filetype == "gtkrc"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "haskell"
+        call s:MapDelimitersWithAlternative('--','', '{-', '-}')
+    elseif a:filetype == "hb"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "h"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "haml"
         call s:MapDelimiters('/', '')
-    elseif a:filetype == "help" 
+    elseif a:filetype == "help"
         call s:MapDelimiters('"','')
-    elseif a:filetype == "hercules" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "hog" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "html" 
-        call s:MapDelimitersWithAlternative('<!--','-->', '//', '') 
-    elseif a:filetype == "htmldjango" 
-        call s:MapDelimitersWithAlternative('<!--','-->', '{#', '#}') 
+    elseif a:filetype == "hercules"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "hog"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "html"
+        call s:MapDelimitersWithAlternative('<!--','-->', '//', '')
+    elseif a:filetype == "htmldjango"
+        call s:MapDelimitersWithAlternative('<!--','-->', '{#', '#}')
     elseif a:filetype == "htmlos"
-        call s:MapDelimiters('#','/#') 
-    elseif a:filetype == "ia64" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "icon" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "idlang" 
+        call s:MapDelimiters('#','/#')
+    elseif a:filetype == "ia64"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "icon"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "idlang"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "idl" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "indent" 
+    elseif a:filetype == "idl"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "indent"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "inform" 
+    elseif a:filetype == "inform"
         call s:MapDelimiters('!', '')
-    elseif a:filetype == "inittab" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "ishd" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "iss" 
+    elseif a:filetype == "inittab"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "ishd"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "iss"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "ist" 
+    elseif a:filetype == "ist"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "jam" 
+    elseif a:filetype == "jam"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "java" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "javascript" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "jess" 
+    elseif a:filetype == "java"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "javascript"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "jess"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "jgraph" 
-        call s:MapDelimiters('(*','*)') 
-    elseif a:filetype == "jproperties" 
+    elseif a:filetype == "jgraph"
+        call s:MapDelimiters('(*','*)')
+    elseif a:filetype == "jproperties"
         call s:MapDelimiters('#','')
-    elseif a:filetype == "jsp" 
+    elseif a:filetype == "jsp"
         call s:MapDelimiters('<%--', '--%>')
-    elseif a:filetype == "kconfig" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "kix" 
+    elseif a:filetype == "kconfig"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "kix"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "kscript" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "lace" 
+    elseif a:filetype == "kscript"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "lace"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "ldif" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "lex" 
+    elseif a:filetype == "ldif"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "lex"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "lftp" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "lhaskell" 
+    elseif a:filetype == "lftp"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "lhaskell"
         call s:MapDelimiters('','')
-    elseif a:filetype == "lifelines" 
+    elseif a:filetype == "lifelines"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "lilo" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "lilypond" 
+    elseif a:filetype == "lilo"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "lilypond"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "lisp" 
-        call s:MapDelimitersWithAlternative(';','', '#|', '|#') 
-    elseif a:filetype == "lite" 
+    elseif a:filetype == "liquid"
+        call s:MapDelimiters('{%', '%}')
+    elseif a:filetype == "lisp"
+        call s:MapDelimitersWithAlternative(';','', '#|', '|#')
+    elseif a:filetype == "lite"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "lookupfile" 
-        call s:MapDelimiters('', '') 
-    elseif a:filetype == "lotos" 
-        call s:MapDelimiters('(*','*)') 
-    elseif a:filetype == "lout" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "lprolog" 
+    elseif a:filetype == "lookupfile"
+        call s:MapDelimiters('', '')
+    elseif a:filetype == "lotos"
+        call s:MapDelimiters('(*','*)')
+    elseif a:filetype == "lout"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "lprolog"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "lscript" 
+    elseif a:filetype == "lscript"
         call s:MapDelimiters("'", '')
-    elseif a:filetype == "lss" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "lua" 
-        call s:MapDelimitersWithAlternative('--','', '--[[', ']]') 
-    elseif a:filetype == "lynx" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "lytex" 
+    elseif a:filetype == "lss"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "lua"
+        call s:MapDelimitersWithAlternative('--','', '--[[', ']]')
+    elseif a:filetype == "lynx"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "lytex"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "m4" 
+    elseif a:filetype == "m4"
         call s:MapDelimiters('dnl ', '')
     elseif a:filetype == "mail"
         call s:MapDelimiters('> ','')
-    elseif a:filetype == "make" 
-        call s:MapDelimiters('#','') 
-    elseif a:filetype == "maple" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "markdown" 
+    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" 
+    elseif a:filetype == "masm"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "master" 
+    elseif a:filetype == "mason"
+        call s:MapDelimiters('<% #', '%>')
+    elseif a:filetype == "master"
         call s:MapDelimiters('$', '')
-    elseif a:filetype == "matlab" 
+    elseif a:filetype == "matlab"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "mel" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "mf" 
+    elseif a:filetype == "mel"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "mf"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "mib" 
+    elseif a:filetype == "mib"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "mkd" 
+    elseif a:filetype == "mkd"
         call s:MapDelimiters('>', '')
-    elseif a:filetype == "mma" 
-        call s:MapDelimiters('(*','*)') 
+    elseif a:filetype == "mma"
+        call s:MapDelimiters('(*','*)')
     elseif a:filetype == "modconf"
         call s:MapDelimiters('#', '')
     elseif a:filetype == "model"
-        call s:MapDelimiters('$','$') 
-    elseif a:filetype =~ "moduala." 
-        call s:MapDelimiters('(*','*)') 
-    elseif a:filetype == "modula2" 
-        call s:MapDelimiters('(*','*)') 
-    elseif a:filetype == "modula3" 
-        call s:MapDelimiters('(*','*)') 
-    elseif a:filetype == "monk" 
+        call s:MapDelimiters('$','$')
+    elseif a:filetype =~ "moduala."
+        call s:MapDelimiters('(*','*)')
+    elseif a:filetype == "modula2"
+        call s:MapDelimiters('(*','*)')
+    elseif a:filetype == "modula3"
+        call s:MapDelimiters('(*','*)')
+    elseif a:filetype == "monk"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "mplayerconf" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "mrxvtrc" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "mush" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "muttrc" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "named" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "nasm" 
+    elseif a:filetype == "mplayerconf"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "mrxvtrc"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "mush"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "muttrc"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "named"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "nasm"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "nastran" 
+    elseif a:filetype == "nastran"
         call s:MapDelimiters('$', '')
-    elseif a:filetype == "natural" 
+    elseif a:filetype == "natural"
         call s:MapDelimiters('/*', '')
-    elseif a:filetype == "ncf" 
+    elseif a:filetype == "ncf"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "netdict" 
+    elseif a:filetype == "nerdtree"
         call s:MapDelimiters('', '')
-    elseif a:filetype == "netrw" 
+    elseif a:filetype == "netdict"
         call s:MapDelimiters('', '')
-    elseif a:filetype == "nqc" 
+    elseif a:filetype == "netrw"
+        call s:MapDelimiters('', '')
+    elseif a:filetype == "nqc"
         call s:MapDelimiters('/*','*/')
     elseif a:filetype == "nroff"
         call s:MapDelimiters('\"', '')
-    elseif a:filetype == "nsis" 
+    elseif a:filetype == "nsis"
         call s:MapDelimiters('#', '')
     elseif a:filetype == "objc"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
     elseif a:filetype == "objcpp"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "ocaml" 
-        call s:MapDelimiters('(*','*)') 
-    elseif a:filetype == "occam" 
-        call s:MapDelimiters('--','') 
-    elseif a:filetype == "omlet" 
-        call s:MapDelimiters('(*','*)') 
-    elseif a:filetype == "omnimark" 
+    elseif a:filetype == "ocaml"
+        call s:MapDelimiters('(*','*)')
+    elseif a:filetype == "occam"
+        call s:MapDelimiters('--','')
+    elseif a:filetype == "omlet"
+        call s:MapDelimiters('(*','*)')
+    elseif a:filetype == "omnimark"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "openroad" 
+    elseif a:filetype == "openroad"
         call s:MapDelimiters('//', '')
-    elseif a:filetype == "opl" 
+    elseif a:filetype == "opl"
         call s:MapDelimiters("REM", "")
-    elseif a:filetype == "ora" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "otl" 
+    elseif a:filetype == "ora"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "otl"
         call s:MapDelimiters('', '')
-    elseif a:filetype == "ox" 
+    elseif a:filetype == "ox"
         call s:MapDelimiters('//', '')
-    elseif a:filetype == "pascal" 
+    elseif a:filetype == "pamconf"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "pascal"
         call s:MapDelimitersWithAlternative('{','}', '(*', '*)')
-    elseif a:filetype == "passwd" 
+    elseif a:filetype == "passwd"
         call s:MapDelimiters('','')
-    elseif a:filetype == "patran" 
+    elseif a:filetype == "patran"
         call s:MapDelimitersWithAlternative('$','','/*', '*/')
-    elseif a:filetype == "pcap" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "pccts" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "perl" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "pfmain" 
+    elseif a:filetype == "pcap"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "pccts"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "perl"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "pfmain"
         call s:MapDelimiters('//', '')
-    elseif a:filetype == "php" 
+    elseif a:filetype == "php"
         call s:MapDelimitersWithAlternative('//','','/*', '*/')
-    elseif a:filetype == "phtml" 
+    elseif a:filetype == "phtml"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "pic" 
+    elseif a:filetype == "pic"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "pike" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "pilrc" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "pine" 
+    elseif a:filetype == "pike"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "pilrc"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "pine"
         call s:MapDelimiters('#', '')
     elseif a:filetype == "plaintex"
         call s:MapDelimiters('%','')
-    elseif a:filetype == "plm" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "plsql" 
+    elseif a:filetype == "plm"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "plsql"
         call s:MapDelimitersWithAlternative('--', '', '/*', '*/')
-    elseif a:filetype == "po" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "postscr" 
+    elseif a:filetype == "po"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "postscr"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "pov" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "povini" 
+    elseif a:filetype == "pov"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "povini"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "ppd" 
+    elseif a:filetype == "ppd"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "ppwiz" 
+    elseif a:filetype == "ppwiz"
         call s:MapDelimiters(';;', '')
-    elseif a:filetype == "procmail" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "progress" 
+    elseif a:filetype == "procmail"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "progress"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "prolog" 
-        call s:MapDelimitersWithAlternative('%','','/*','*/') 
-    elseif a:filetype == "psf" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "ptcap" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "python" 
-        call s:MapDelimiters('#','') 
-    elseif a:filetype == "qf" 
-        call s:MapDelimiters('','') 
-    elseif a:filetype == "radiance" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "Rails-log" 
+    elseif a:filetype == "prolog"
+        call s:MapDelimitersWithAlternative('%','','/*','*/')
+    elseif a:filetype == "psf"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "ptcap"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "pyrex"
+        call s:MapDelimiters('#','')
+    elseif a:filetype == "python"
+        call s:MapDelimiters('#','')
+    elseif a:filetype == "qf"
+        call s:MapDelimiters('','')
+    elseif a:filetype == "radiance"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "Rails-log"
         call s:MapDelimiters('', '')
-    elseif a:filetype == "ratpoison" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "r" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "rc" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "readline" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "rebol" 
+    elseif a:filetype == "ratpoison"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "r"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "rc"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "readline"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "rebol"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "registry" 
+    elseif a:filetype == "registry"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "remind" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "rexx" 
+    elseif a:filetype == "remind"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "rexx"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "robots" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "rpl" 
+    elseif a:filetype == "rib"
+        call s:MapDelimiters('#','')
+    elseif a:filetype == "robots"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "rpl"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "rst" 
+    elseif a:filetype == "rst"
         call s:MapDelimiters('..', '')
-    elseif a:filetype == "rtf" 
+    elseif a:filetype == "rtf"
         call s:MapDelimiters('', '')
-    elseif a:filetype == "ruby" 
-        call s:MapDelimiters('#','') 
-    elseif a:filetype == "sa" 
-        call s:MapDelimiters('--','') 
-    elseif a:filetype == "samba" 
-        call s:MapDelimitersWithAlternative(';','', '#', '') 
-    elseif a:filetype == "sas" 
+    elseif a:filetype == "ruby"
+        call s:MapDelimiters('#','')
+    elseif a:filetype == "sa"
+        call s:MapDelimiters('--','')
+    elseif a:filetype == "samba"
+        call s:MapDelimitersWithAlternative(';','', '#', '')
+    elseif a:filetype == "sas"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "sass" 
+    elseif a:filetype == "sass"
         call s:MapDelimitersWithAlternative('//','', '/*', '')
-    elseif a:filetype == "sather" 
+    elseif a:filetype == "sather"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "scala" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "scheme" 
+    elseif a:filetype == "scala"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "scheme"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "scilab" 
+    elseif a:filetype == "scilab"
         call s:MapDelimiters('//', '')
-    elseif a:filetype == "screen" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "scsh" 
+    elseif a:filetype == "screen"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "scsh"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "sdl" 
+    elseif a:filetype == "sdl"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "sed" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "selectbuf" 
+    elseif a:filetype == "sed"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "selectbuf"
         call s:MapDelimiters('', '')
-    elseif a:filetype == "sgml" 
-        call s:MapDelimiters('<!','>') 
-    elseif a:filetype == "sgmldecl" 
-        call s:MapDelimiters('--','--') 
-    elseif a:filetype == "sgmllnx" 
-        call s:MapDelimiters('<!--','-->') 
-    elseif a:filetype == "sicad" 
+    elseif a:filetype == "services"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "sgml"
+        call s:MapDelimiters('<!','>')
+    elseif a:filetype == "sgmldecl"
+        call s:MapDelimiters('--','--')
+    elseif a:filetype == "sgmllnx"
+        call s:MapDelimiters('<!--','-->')
+    elseif a:filetype == "sicad"
         call s:MapDelimiters('*', '')
-    elseif a:filetype == "simula" 
+    elseif a:filetype == "simula"
         call s:MapDelimitersWithAlternative('%', '', '--', '')
-    elseif a:filetype == "sinda" 
+    elseif a:filetype == "sinda"
         call s:MapDelimiters('$', '')
-    elseif a:filetype == "skill" 
+    elseif a:filetype == "skill"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "slang" 
+    elseif a:filetype == "slang"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "sl" 
+    elseif a:filetype == "sl"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "slrnrc" 
+    elseif a:filetype == "slice"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "slrnrc"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "sm" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "smarty" 
+    elseif a:filetype == "sm"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "smarty"
         call s:MapDelimiters('{*', '*}')
-    elseif a:filetype == "smil" 
-        call s:MapDelimiters('<!','>') 
-    elseif a:filetype == "smith" 
+    elseif a:filetype == "smil"
+        call s:MapDelimiters('<!','>')
+    elseif a:filetype == "smith"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "sml" 
-        call s:MapDelimiters('(*','*)') 
-    elseif a:filetype == "snnsnet" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "snnspat" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "snnsres" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "snobol4" 
+    elseif a:filetype == "sml"
+        call s:MapDelimiters('(*','*)')
+    elseif a:filetype == "snnsnet"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "snnspat"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "snnsres"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "snobol4"
         call s:MapDelimiters('*', '')
-    elseif a:filetype == "spec" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "specman" 
+    elseif a:filetype == "spec"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "specman"
         call s:MapDelimiters('//', '')
-    elseif a:filetype == "spectre" 
+    elseif a:filetype == "spectre"
         call s:MapDelimitersWithAlternative('//', '', '*', '')
-    elseif a:filetype == "spice" 
+    elseif a:filetype == "spice"
         call s:MapDelimiters('$', '')
-    elseif a:filetype == "sql" 
+    elseif a:filetype == "sql"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "sqlforms" 
+    elseif a:filetype == "sqlforms"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "sqlj" 
+    elseif a:filetype == "sqlj"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "sqr" 
+    elseif a:filetype == "sqr"
         call s:MapDelimiters('!', '')
-    elseif a:filetype == "squid" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "st" 
+    elseif a:filetype == "squid"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "st"
         call s:MapDelimiters('"','')
-    elseif a:filetype == "stp" 
+    elseif a:filetype == "stp"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "strace" 
+    elseif a:filetype == "strace"
         call s:MapDelimiters('/*','*/')
     elseif a:filetype == "sudoers"
         call s:MapDelimiters('#', '')
-    elseif a:filetype == "SVKAnnotate" 
+    elseif a:filetype == "SVKAnnotate"
         call s:MapDelimiters('','')
-    elseif a:filetype == "svn" 
+    elseif a:filetype == "svn"
         call s:MapDelimiters('','')
-    elseif a:filetype == "SVNAnnotate" 
+    elseif a:filetype == "SVNAnnotate"
         call s:MapDelimiters('','')
-    elseif a:filetype == "SVNcommitlog" 
+    elseif a:filetype == "SVNcommitlog"
         call s:MapDelimiters('','')
     elseif a:filetype == "SVNdiff"
         call s:MapDelimiters('','')
-    elseif a:filetype == "systemverilog" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "tads" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "taglist" 
+    elseif a:filetype == "systemverilog"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "tads"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "taglist"
         call s:MapDelimiters('', '')
-    elseif a:filetype == "tags" 
+    elseif a:filetype == "tags"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "tak" 
+    elseif a:filetype == "tak"
         call s:MapDelimiters('$', '')
-    elseif a:filetype == "tasm" 
+    elseif a:filetype == "tar"
+        call s:MapDelimiters('', '')
+    elseif a:filetype == "tasm"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "tcl" 
-        call s:MapDelimiters('#','') 
-    elseif a:filetype == "terminfo" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "tex" 
-        call s:MapDelimiters('%','') 
-    elseif a:filetype == "text" 
-        call s:MapDelimiters('','') 
-    elseif a:filetype == "texinfo" 
+    elseif a:filetype == "tcl"
+        call s:MapDelimiters('#','')
+    elseif a:filetype == "terminfo"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "tex"
+        call s:MapDelimiters('%','')
+    elseif a:filetype == "text"
+        call s:MapDelimiters('','')
+    elseif a:filetype == "texinfo"
         call s:MapDelimiters("@c ", "")
-    elseif a:filetype == "texmf" 
+    elseif a:filetype == "texmf"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "tf" 
+    elseif a:filetype == "tf"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "tidy" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "tli" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "trasys" 
+    elseif a:filetype == "tidy"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "tli"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "trasys"
         call s:MapDelimiters("$", "")
-    elseif a:filetype == "tsalt" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "tsscl" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "tssgm" 
-        call s:MapDelimiters("comment = '","'") 
-    elseif a:filetype == "uc" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "uil" 
+    elseif a:filetype == "tsalt"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "tsscl"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "tssgm"
+        call s:MapDelimiters("comment = '","'")
+    elseif a:filetype == "uc"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "uil"
         call s:MapDelimiters('!', '')
-    elseif a:filetype == "vb" 
-        call s:MapDelimiters("'","") 
-    elseif a:filetype == "vcscommit" 
+    elseif a:filetype == "vb"
+        call s:MapDelimiters("'","")
+    elseif a:filetype == "vcscommit"
         call s:MapDelimiters('','')
-    elseif a:filetype == "velocity" 
-        call s:MapDelimitersWithAlternative("##","", '#*', '*#') 
-    elseif a:filetype == "vera" 
+    elseif a:filetype == "velocity"
+        call s:MapDelimitersWithAlternative("##","", '#*', '*#')
+    elseif a:filetype == "vera"
         call s:MapDelimitersWithAlternative('/*','*/','//','')
-    elseif a:filetype == "verilog" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "verilog_systemverilog" 
-        call s:MapDelimitersWithAlternative('//','', '/*','*/')
-    elseif a:filetype == "vgrindefs" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "vhdl" 
+    elseif a:filetype == "verilog"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "verilog_systemverilog"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "vgrindefs"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "vhdl"
         call s:MapDelimiters('--', '')
-    elseif a:filetype == "vim" 
-        call s:MapDelimiters('"','') 
-    elseif a:filetype == "viminfo" 
-        call s:MapDelimiters('','') 
-    elseif a:filetype == "virata" 
+    elseif a:filetype == "vim"
+        call s:MapDelimiters('"','')
+    elseif a:filetype == "viminfo"
+        call s:MapDelimiters('','')
+    elseif a:filetype == "vimperator"
+        call s:MapDelimiters('"','')
+    elseif a:filetype == "virata"
         call s:MapDelimiters('%', '')
-    elseif a:filetype == "vo_base" 
+    elseif a:filetype == "vo_base"
         call s:MapDelimiters('', '')
-    elseif a:filetype == "vrml" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "vsejcl" 
+    elseif a:filetype == "vrml"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "vsejcl"
         call s:MapDelimiters('/*', '')
-    elseif a:filetype == "webmacro" 
+    elseif a:filetype == "webmacro"
         call s:MapDelimiters('##', '')
-    elseif a:filetype == "wget" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype ==? "Wikipedia" 
-        call s:MapDelimiters('<!--','-->') 
-    elseif a:filetype == "winbatch" 
+    elseif a:filetype == "wget"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype ==? "Wikipedia"
+        call s:MapDelimiters('<!--','-->')
+    elseif a:filetype == "winbatch"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "wml" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype =~ "[^w]*sh" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "wvdial" 
+    elseif a:filetype == "wml"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype =~ "[^w]*sh"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "wvdial"
         call s:MapDelimiters(';', '')
-    elseif a:filetype == "xdefaults" 
+    elseif a:filetype == "xdefaults"
         call s:MapDelimiters('!', '')
-    elseif a:filetype == "xf86conf" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "xhtml" 
+    elseif a:filetype == "xf86conf"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "xhtml"
         call s:MapDelimiters('<!--', '-->')
-    elseif a:filetype == "xkb" 
+    elseif a:filetype == "xkb"
         call s:MapDelimiters('//', '')
-    elseif a:filetype == "xmath" 
-        call s:MapDelimiters('#', '')
-    elseif a:filetype == "xml" 
-        call s:MapDelimiters('<!--','-->') 
-    elseif a:filetype == "xmodmap" 
+    elseif a:filetype == "xmath"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "xml"
+        call s:MapDelimiters('<!--','-->')
+    elseif a:filetype == "xmodmap"
         call s:MapDelimiters('!', '')
-    elseif a:filetype == "xpm2" 
+    elseif a:filetype == "xpm2"
         call s:MapDelimiters('!', '')
-    elseif a:filetype == "xpm" 
+    elseif a:filetype == "xpm"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "xsd" 
-        call s:MapDelimiters('<!--','-->') 
-    elseif a:filetype == "xslt" 
-        call s:MapDelimiters('<!--','-->') 
-    elseif a:filetype == "yacc" 
+    elseif a:filetype == "xsd"
+        call s:MapDelimiters('<!--','-->')
+    elseif a:filetype == "xslt"
+        call s:MapDelimiters('<!--','-->')
+    elseif a:filetype == "yacc"
         call s:MapDelimiters('/*','*/')
-    elseif a:filetype == "yaml" 
+    elseif a:filetype == "yaml"
         call s:MapDelimiters('#','')
-    elseif a:filetype == "z8a" 
+    elseif a:filetype == "z8a"
         call s:MapDelimiters(';', '')
 
     elseif a:filetype == ""
-        call s:MapDelimitersWithAlternative("","", "", "") 
+        call s:MapDelimitersWithAlternative("","", "", "")
 
         "we have not hardcoded the comment delimiters to use for this filetype so
         "get them from &commentstring.
     else
-        "print a disclaimer to the user :) 
+        "print a disclaimer to the user :)
         if !g:NERDShutUp
             call s:NerdEcho("Unknown filetype '".a:filetype."', setting delimiters by &commentstring.\nPleeeeease email the author of the NERD commenter with this filetype\nand its delimiters!", 0)
         endif
 
-        "extract the delims from &commentstring 
+        "extract the delims from &commentstring
         let left= substitute(&commentstring, '\(.*\)%s.*', '\1', '')
         let right= substitute(&commentstring, '.*%s\(.*\)', '\1', 'g')
 
@@ -915,30 +952,30 @@
 "
 " Args:
 "   -printMsgs: if this is 1 then a message is echoed to the user telling them
-"    if this function changed the delimiters or not 
+"    if this function changed the delimiters or not
 function s:SwitchToAlternativeDelimiters(printMsgs)
     "if both of the alternative delimiters are empty then there is no
-    "alternative comment style so bail out 
+    "alternative comment style so bail out
     if b:leftAlt == "" && b:rightAlt == ""
-        if a:printMsgs 
+        if a:printMsgs
             call s:NerdEcho("Cannot use alternative delimiters, none are specified", 0)
         endif
         return 0
     endif
 
-    "save the current delimiters 
+    "save the current delimiters
     let tempLeft = b:left
     let tempRight = b:right
 
-    "swap current delimiters for alternative 
+    "swap current delimiters for alternative
     let b:left = b:leftAlt
     let b:right = b:rightAlt
 
-    "set the previously current delimiters to be the new alternative ones 
+    "set the previously current delimiters to be the new alternative ones
     let b:leftAlt = tempLeft
     let b:rightAlt = tempRight
 
-    "tell the user what comment delimiters they are now using 
+    "tell the user what comment delimiters they are now using
     if a:printMsgs
         let leftNoEsc = b:left
         let rightNoEsc = b:right
@@ -958,19 +995,19 @@
     let right = s:GetRight(0,1,0)
 
     " get the len of the right delim
-    let lenRight = strlen(right) 
+    let lenRight = strlen(right)
 
     let isLineEmpty = strlen(getline(".")) == 0
     let insOrApp = (isLineEmpty==1 ? 'i' : 'A')
 
     "stick the delimiters down at the end of the line. We have to format the
-    "comment with spaces as appropriate 
+    "comment with spaces as appropriate
     execute ":normal " . insOrApp . (isLineEmpty ? '' : ' ') . left . right . " "
 
     " if there is a right delimiter then we gotta move the cursor left
     " by the len of the right delimiter so we insert between the delimiters
-    if lenRight > 0 
-        let leftMoveAmount = lenRight 
+    if lenRight > 0
+        let leftMoveAmount = lenRight
         execute ":normal " . leftMoveAmount . "h"
     endif
     startinsert
@@ -985,8 +1022,8 @@
 "   -bottom: the line number for the bottom line of code in the region
 "   -lSide: the column number for the left most column in the region
 "   -rSide: the column number for the right most column in the region
-"   -forceNested: a flag indicating whether comments should be nested 
-function s:CommentBlock(top, bottom, lSide, rSide, forceNested ) 
+"   -forceNested: a flag indicating whether comments should be nested
+function s:CommentBlock(top, bottom, lSide, rSide, forceNested )
     " we need to create local copies of these arguments so we can modify them
     let top = a:top
     let bottom = a:bottom
@@ -994,13 +1031,13 @@
     let rSide = a:rSide
 
     "if the top or bottom line starts with tabs we have to adjust the left and
-    "right boundaries so that they are set as though the tabs were spaces 
+    "right boundaries so that they are set as though the tabs were spaces
     let topline = getline(top)
     let bottomline = getline(bottom)
     if s:HasLeadingTabs(topline, bottomline)
 
         "find out how many tabs are in the top line and adjust the left
-        "boundary accordingly 
+        "boundary accordingly
         let numTabs = s:NumberOfLeadingTabs(topline)
         if lSide < numTabs
             let lSide = &ts * lSide
@@ -1009,13 +1046,13 @@
         endif
 
         "find out how many tabs are in the bottom line and adjust the right
-        "boundary accordingly 
+        "boundary accordingly
         let numTabs = s:NumberOfLeadingTabs(bottomline)
         let rSide = (rSide - numTabs) + (&ts * numTabs)
     endif
 
     "we must check that bottom IS actually below top, if it is not then we
-    "swap top and bottom. Similarly for left and right. 
+    "swap top and bottom. Similarly for left and right.
     if bottom < top
         let temp = top
         let top = bottom
@@ -1029,7 +1066,7 @@
 
     "if the current delimiters arent multipart then we will switch to the
     "alternative delims (if THEY are) as the comment will be better and more
-    "accurate with multipart delims 
+    "accurate with multipart delims
     let switchedDelims = 0
     if !s:Multipart() && g:NERDAllowAnyVisualDelims && s:AltMultipart()
         let switchedDelims = 1
@@ -1041,10 +1078,10 @@
     let currentLine=top
     while currentLine <= bottom
 
-        "check if we are allowed to comment this line 
+        "check if we are allowed to comment this line
         if s:CanCommentLine(a:forceNested, currentLine)
 
-            "convert the leading tabs into spaces 
+            "convert the leading tabs into spaces
             let theLine = getline(currentLine)
             let lineHasLeadTabs = s:HasLeadingTabs(theLine)
             if lineHasLeadTabs
@@ -1057,18 +1094,18 @@
 
                 "attempt to place the cursor in on the left of the boundary box,
                 "then check if we were successful, if not then we cant comment this
-                "line 
+                "line
                 call setline(currentLine, theLine)
                 if s:CanPlaceCursor(currentLine, lSide)
 
                     let leftSpaced = s:GetLeft(0,1,0)
                     let rightSpaced = s:GetRight(0,1,0)
 
-                    "stick the left delimiter down 
+                    "stick the left delimiter down
                     let theLine = strpart(theLine, 0, lSide-1) . leftSpaced . strpart(theLine, lSide-1)
 
                     if s:Multipart()
-                        "stick the right delimiter down 
+                        "stick the right delimiter down
                         let theLine = strpart(theLine, 0, rSide+strlen(leftSpaced)) . rightSpaced . strpart(theLine, rSide+strlen(leftSpaced))
 
                         let firstLeftDelim = s:FindDelimiterIndex(b:left, theLine)
@@ -1079,10 +1116,10 @@
                             let searchStr = strpart(searchStr, firstLeftDelim+strlen(b:left))
 
                             "replace the outter most delims in searchStr with
-                            "place-holders 
+                            "place-holders
                             let theLineWithPlaceHolders = s:ReplaceDelims(b:left, b:right, g:NERDLPlace, g:NERDRPlace, searchStr)
 
-                            "add the right delimiter onto the line 
+                            "add the right delimiter onto the line
                             let theLine = strpart(theLine, 0, firstLeftDelim+strlen(b:left)) . theLineWithPlaceHolders . strpart(theLine, lastRightDelim)
                         endif
                     endif
@@ -1100,7 +1137,7 @@
         let currentLine = currentLine + 1
     endwhile
 
-    "if we switched delims then we gotta go back to what they were before 
+    "if we switched delims then we gotta go back to what they were before
     if switchedDelims == 1
         call s:SwitchToAlternativeDelimiters(0)
     endif
@@ -1115,7 +1152,7 @@
 "   -alignRight/alignLeft: 0/1 if the comments delimiters should/shouldnt be
 "    aligned left/right
 "   -firstLine/lastLine: the top and bottom lines to comment
-function s:CommentLines(forceNested, alignLeft, alignRight, firstLine, lastLine) 
+function s:CommentLines(forceNested, alignLeft, alignRight, firstLine, lastLine)
     " we need to get the left and right indexes of the leftmost char in the
     " block of of lines and the right most char so that we can do alignment of
     " the delimiters if the user has specified
@@ -1126,15 +1163,15 @@
     " we'll be adding a left delim to the line
     let rightAlignIndx = rightAlignIndx + strlen(s:GetLeft(0,1,0))
 
-    " now we actually comment the lines. Do it line by line 
+    " now we actually comment the lines. Do it line by line
     let currentLine = a:firstLine
     while currentLine <= a:lastLine
 
-        " get the next line, check commentability and convert spaces to tabs 
+        " get the next line, check commentability and convert spaces to tabs
         let theLine = getline(currentLine)
         let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
         let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-        if s:CanCommentLine(a:forceNested, currentLine) 
+        if s:CanCommentLine(a:forceNested, currentLine)
             "if the user has specified forceNesting then we check to see if we
             "need to switch delimiters for place-holders
             if a:forceNested && g:NERDUsePlaceHolders
@@ -1142,10 +1179,10 @@
             endif
 
             " find out if the line is commented using normal delims and/or
-            " alternate ones 
+            " alternate ones
             let isCommented = s:IsCommented(b:left, b:right, theLine) || s:IsCommented(b:leftAlt, b:rightAlt, theLine)
 
-            " check if we can comment this line 
+            " check if we can comment this line
             if !isCommented || g:NERDUsePlaceHolders || s:Multipart()
                 if a:alignLeft
                     let theLine = s:AddLeftDelimAligned(s:GetLeft(0,1,0), theLine, leftAlignIndx)
@@ -1160,12 +1197,12 @@
             endif
         endif
 
-        " restore leading tabs if appropriate 
+        " restore leading tabs if appropriate
         if lineHasLeadingTabs
             let theLine = s:ConvertLeadingSpacesToTabs(theLine)
         endif
 
-        " we are done with this line 
+        " we are done with this line
         call setline(currentLine, theLine)
         let currentLine = currentLine + 1
     endwhile
@@ -1177,24 +1214,24 @@
 "
 " Args:
 "   -firstLine/lastLine: the top and bottom lines to comment
-function s:CommentLinesMinimal(firstLine, lastLine) 
-    "check that minimal comments can be done on this filetype 
+function s:CommentLinesMinimal(firstLine, lastLine)
+    "check that minimal comments can be done on this filetype
     if !s:HasMultipartDelims()
         throw 'NERDCommenter.Delimiters exception: Minimal comments can only be used for filetypes that have multipart delimiters'
     endif
 
     "if we need to use place holders for the comment, make sure they are
-    "enabled for this filetype 
+    "enabled for this filetype
     if !g:NERDUsePlaceHolders && s:DoesBlockHaveMultipartDelim(a:firstLine, a:lastLine)
         throw 'NERDCommenter.Settings exception: Placeoholders are required but disabled.'
     endif
 
-    "get the left and right delims to smack on 
+    "get the left and right delims to smack on
     let left = s:GetSexyComLeft(g:NERDSpaceDelims,0)
     let right = s:GetSexyComRight(g:NERDSpaceDelims,0)
 
     "make sure all multipart delims on the lines are replaced with
-    "placeholders to prevent illegal syntax 
+    "placeholders to prevent illegal syntax
     let currentLine = a:firstLine
     while(currentLine <= a:lastLine)
         let theLine = getline(currentLine)
@@ -1203,7 +1240,7 @@
         let currentLine = currentLine + 1
     endwhile
 
-    "add the delim to the top line 
+    "add the delim to the top line
     let theLine = getline(a:firstLine)
     let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
     let theLine = s:ConvertLeadingTabsToSpaces(theLine)
@@ -1213,7 +1250,7 @@
     endif
     call setline(a:firstLine, theLine)
 
-    "add the delim to the bottom line 
+    "add the delim to the bottom line
     let theLine = getline(a:lastLine)
     let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
     let theLine = s:ConvertLeadingTabsToSpaces(theLine)
@@ -1236,7 +1273,7 @@
     let left = s:GetSexyComLeft(0, 0)
     let right = s:GetSexyComRight(0, 0)
 
-    "check if we can do a sexy comment with the available delimiters 
+    "check if we can do a sexy comment with the available delimiters
     if left == -1 || right == -1
         throw 'NERDCommenter.Delimiters exception: cannot perform sexy comments with available delimiters.'
     endif
@@ -1251,7 +1288,7 @@
     let sexyComMarkerSpaced = s:GetSexyComMarker(1,0)
 
 
-    " we jam the comment as far to the right as possible 
+    " we jam the comment as far to the right as possible
     let leftAlignIndx = s:LeftMostIndx(1, 1, a:topline, a:bottomline)
 
     "check if we should use the compact style i.e that the left/right
@@ -1260,7 +1297,7 @@
     if g:NERDCompactSexyComs
         let spaceString = (g:NERDSpaceDelims ? s:spaceStr : '')
 
-        "comment the top line 
+        "comment the top line
         let theLine = getline(a:topline)
         let lineHasTabs = s:HasLeadingTabs(theLine)
         if lineHasTabs
@@ -1273,13 +1310,15 @@
         endif
         call setline(a:topline, theLine)
 
-        "comment the bottom line 
-        let theLine = getline(a:bottomline)
-        let lineHasTabs = s:HasLeadingTabs(theLine)
-        if lineHasTabs
-            let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-        endif
-        let theLine = s:SwapOutterMultiPartDelimsForPlaceHolders(theLine)
+        "comment the bottom line
+        if a:bottomline != a:topline
+            let theLine = getline(a:bottomline)
+            let lineHasTabs = s:HasLeadingTabs(theLine)
+            if lineHasTabs
+                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+            endif
+            let theLine = s:SwapOutterMultiPartDelimsForPlaceHolders(theLine)
+        endif
         let theLine = s:AddRightDelim(spaceString . right, theLine)
         if lineHasTabs
             let theLine = s:ConvertLeadingSpacesToTabs(theLine)
@@ -1287,14 +1326,14 @@
         call setline(a:bottomline, theLine)
     else
 
-        " add the left delimiter one line above the lines that are to be commented 
-        call cursor(a:topline, 1) 
+        " add the left delimiter one line above the lines that are to be commented
+        call cursor(a:topline, 1)
         execute 'normal! O'
         call setline(a:topline, strpart(s:spaces, 0, leftAlignIndx) . left )
 
         " add the right delimiter after bottom line (we have to add 1 cos we moved
         " the lines down when we added the left delim
-        call cursor(a:bottomline+1, 1) 
+        call cursor(a:bottomline+1, 1)
         execute 'normal! o'
         call setline(a:bottomline+2, strpart(s:spaces, 0, leftAlignIndx) . strpart(s:spaces, 0, strlen(left)-strlen(sexyComMarker)) . right )
 
@@ -1304,7 +1343,7 @@
     " line in the appropriate place to align them with the comment delims
     let currentLine = a:topline+1
     while currentLine <= a:bottomline + !g:NERDCompactSexyComs
-        " get the line and convert the tabs to spaces 
+        " get the line and convert the tabs to spaces
         let theLine = getline(currentLine)
         let lineHasTabs = s:HasLeadingTabs(theLine)
         if lineHasTabs
@@ -1313,7 +1352,7 @@
 
         let theLine = s:SwapOutterMultiPartDelimsForPlaceHolders(theLine)
 
-        " add the sexyComMarker 
+        " add the sexyComMarker
         let theLine = strpart(s:spaces, 0, leftAlignIndx) . strpart(s:spaces, 0, strlen(left)-strlen(sexyComMarker)) . sexyComMarkerSpaced . strpart(theLine, leftAlignIndx)
 
         if lineHasTabs
@@ -1321,7 +1360,7 @@
         endif
 
 
-        " set the line and move onto the next one 
+        " set the line and move onto the next one
         call setline(currentLine, theLine)
         let currentLine = currentLine + 1
     endwhile
@@ -1335,15 +1374,15 @@
 "   -forceNested: a flag indicating whether the called is requesting the comment
 "    to be nested if need be
 "   -firstLine/lastLine: the top and bottom lines to comment
-function s:CommentLinesToggle(forceNested, firstLine, lastLine) 
+function s:CommentLinesToggle(forceNested, firstLine, lastLine)
     let currentLine = a:firstLine
     while currentLine <= a:lastLine
 
-        " get the next line, check commentability and convert spaces to tabs 
+        " get the next line, check commentability and convert spaces to tabs
         let theLine = getline(currentLine)
         let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
         let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-        if s:CanToggleCommentLine(a:forceNested, currentLine) 
+        if s:CanToggleCommentLine(a:forceNested, currentLine)
 
             "if the user has specified forceNesting then we check to see if we
             "need to switch delimiters for place-holders
@@ -1355,12 +1394,12 @@
             let theLine = s:AddRightDelim(s:GetRight(0, 1, 0), theLine)
         endif
 
-        " restore leading tabs if appropriate 
+        " restore leading tabs if appropriate
         if lineHasLeadingTabs
             let theLine = s:ConvertLeadingSpacesToTabs(theLine)
         endif
 
-        " we are done with this line 
+        " we are done with this line
         call setline(currentLine, theLine)
         let currentLine = currentLine + 1
     endwhile
@@ -1377,7 +1416,7 @@
 "   -bottomCol: the bottom right col for this comment
 "   -forceNested: whether the caller wants comments to be nested if the
 "    line(s) are already commented
-function s:CommentRegion(topLine, topCol, bottomLine, bottomCol, forceNested) 
+function s:CommentRegion(topLine, topCol, bottomLine, bottomCol, forceNested)
 
     "switch delims (if we can) if the current set isnt multipart
     let switchedDelims = 0
@@ -1386,23 +1425,23 @@
         call s:SwitchToAlternativeDelimiters(0)
     endif
 
-    "if there is only one line in the comment then just do it 
+    "if there is only one line in the comment then just do it
     if a:topLine == a:bottomLine
         call s:CommentBlock(a:topLine, a:bottomLine, a:topCol, a:bottomCol, a:forceNested)
 
-    "there are multiple lines in the comment 
+    "there are multiple lines in the comment
     else
         "comment the top line
         call s:CommentBlock(a:topLine, a:topLine, a:topCol, strlen(getline(a:topLine)), a:forceNested)
 
-        "comment out all the lines in the middle of the comment 
+        "comment out all the lines in the middle of the comment
         let topOfRange = a:topLine+1
         let bottomOfRange = a:bottomLine-1
         if topOfRange <= bottomOfRange
             call s:CommentLines(a:forceNested, 0, 0, topOfRange, bottomOfRange)
         endif
 
-        "comment the bottom line 
+        "comment the bottom line
         let bottom = getline(a:bottomLine)
         let numLeadingSpacesTabs = strlen(substitute(bottom, '^\([ \t]*\).*$', '\1', ''))
         call s:CommentBlock(a:bottomLine, a:bottomLine, numLeadingSpacesTabs+1, a:bottomCol, a:forceNested)
@@ -1412,7 +1451,7 @@
     "stick the cursor back on the char it was on before the comment
     call cursor(a:topLine, a:topCol + strlen(b:left) + g:NERDSpaceDelims)
 
-    "if we switched delims then we gotta go back to what they were before 
+    "if we switched delims then we gotta go back to what they were before
     if switchedDelims == 1
         call s:SwitchToAlternativeDelimiters(0)
     endif
@@ -1425,21 +1464,21 @@
 " Args:
 "   -firstLine: the top of the range of lines to be inverted
 "   -lastLine: the bottom of the range of lines to be inverted
-function s:InvertComment(firstLine, lastLine) 
-
-    " go thru all lines in the given range 
+function s:InvertComment(firstLine, lastLine)
+
+    " go thru all lines in the given range
     let currentLine = a:firstLine
     while currentLine <= a:lastLine
         let theLine = getline(currentLine)
 
-        let sexyComBounds = s:FindBoundingLinesOfSexyCom(currentLine) 
-
-        " if the line is commented normally, uncomment it 
+        let sexyComBounds = s:FindBoundingLinesOfSexyCom(currentLine)
+
+        " if the line is commented normally, uncomment it
         if s:IsCommentedFromStartOfLine(b:left, theLine) || s:IsCommentedFromStartOfLine(b:leftAlt, theLine)
-            call s:UncommentLines(1, currentLine, currentLine)
+            call s:UncommentLines(currentLine, currentLine)
             let currentLine = currentLine + 1
 
-        " check if the line is commented sexually 
+        " check if the line is commented sexually
         elseif !empty(sexyComBounds)
             let numLinesBeforeSexyComRemoved = s:NumLinesInBuf()
             call s:UncommentLinesSexy(sexyComBounds[0], sexyComBounds[1])
@@ -1448,7 +1487,7 @@
             let numLinesAfterSexyComRemoved = s:NumLinesInBuf()
             let currentLine = bottomBound - (numLinesBeforeSexyComRemoved - numLinesAfterSexyComRemoved) + 1
 
-        " the line isnt commented 
+        " the line isnt commented
         else
             call s:CommentLinesToggle(1, currentLine, currentLine)
             let currentLine = currentLine + 1
@@ -1467,7 +1506,7 @@
 "    'minimal', 'toggle', 'alignLeft', 'alignRight', 'alignBoth', 'norm',
 "    'nested', 'toEOL', 'prepend', 'append', 'insert', 'uncomment', 'yank'
 function! NERDComment(isVisual, type) range
-    " we want case sensitivity when commenting 
+    " we want case sensitivity when commenting
     let oldIgnoreCase = &ignorecase
     set noignorecase
 
@@ -1506,7 +1545,7 @@
         try
             call s:CommentLinesSexy(firstLine, lastLine)
         catch /NERDCommenter.Delimiters/
-            call s:NerdEcho("Sexy comments cannot be done with the available delimiters", 0)
+            call s:CommentLines(forceNested, 0, 0, firstLine, lastLine)
         catch /NERDCommenter.Nesting/
             call s:NerdEcho("Sexy comment aborted. Nested sexy cannot be nested", 0)
         endtry
@@ -1515,7 +1554,7 @@
         let theLine = getline(firstLine)
 
         if s:IsInSexyComment(firstLine) || s:IsCommentedFromStartOfLine(b:left, theLine) || s:IsCommentedFromStartOfLine(b:leftAlt, theLine)
-            call s:UncommentLines(1, firstLine, lastLine)
+            call s:UncommentLines(firstLine, lastLine)
         else
             call s:CommentLinesToggle(forceNested, firstLine, lastLine)
         endif
@@ -1544,10 +1583,10 @@
         call s:PlaceDelimitersAndInsBetween()
 
     elseif a:type == 'uncomment'
-        call s:UncommentLines(0, firstLine, lastLine)
+        call s:UncommentLines(firstLine, lastLine)
 
     elseif a:type == 'yank'
-        if a:isVisual 
+        if a:isVisual
             normal gvy
         elseif countWasGiven
             execute firstLine .','. lastLine .'yank'
@@ -1564,7 +1603,7 @@
 " This is function is called to place comment delimiters down and place the
 " cursor between them
 function s:PlaceDelimitersAndInsBetween()
-    " get the left and right delimiters without any escape chars in them 
+    " get the left and right delimiters without any escape chars in them
     let left = s:GetLeft(0, 1, 0)
     let right = s:GetRight(0, 1, 0)
 
@@ -1578,21 +1617,21 @@
     call cursor(line("."), untabbedCol)
 
     " get the len of the right delim
-    let lenRight = strlen(right) 
+    let lenRight = strlen(right)
 
     let isDelimOnEOL = col(".") >= strlen(getline("."))
 
     " if the cursor is in the first col then we gotta insert rather than
-    " append the comment delimiters here  
+    " append the comment delimiters here
     let insOrApp = (col(".")==1 ? 'i' : 'a')
 
     " place the delimiters down. We do it differently depending on whether
-    " there is a left AND right delimiter 
-    if lenRight > 0 
-        execute ":normal " . insOrApp . left . right 
+    " there is a left AND right delimiter
+    if lenRight > 0
+        execute ":normal " . insOrApp . left . right
         execute ":normal " . lenRight . "h"
     else
-        execute ":normal " . insOrApp . left 
+        execute ":normal " . insOrApp . left
 
         " if we are tacking the delim on the EOL then we gotta add a space
         " after it cos when we go out of insert mode the cursor will move back
@@ -1604,7 +1643,7 @@
     normal l
 
     "if needed convert spaces back to tabs and adjust the cursors col
-    "accordingly 
+    "accordingly
     if lineHasLeadTabs
         let tabbedCol = s:TabbedCol(getline("."), col("."))
         call setline(line("."), s:ConvertLeadingSpacesToTabs(getline(".")))
@@ -1618,28 +1657,28 @@
 " This function prepends comment delimiters to the start of line and places
 " the cursor in position to start typing the comment
 function s:PrependCommentToLine()
-    " get the left and right delimiters without any escape chars in them 
+    " get the left and right delimiters without any escape chars in them
     let left = s:GetLeft(0, 1, 0)
     let right = s:GetRight(0, 1, 0)
 
     " get the len of the right delim
-    let lenRight = strlen(right) 
+    let lenRight = strlen(right)
 
 
     "if the line is empty then we need to know about this later on
     let isLineEmpty = strlen(getline(".")) == 0
 
     "stick the delimiters down at the start of the line. We have to format the
-    "comment with spaces as appropriate 
+    "comment with spaces as appropriate
     if lenRight > 0
-        execute ":normal I" . left . right 
+        execute ":normal I" . left . right
     else
-        execute ":normal I" . left 
+        execute ":normal I" . left
     endif
 
     " if there is a right delimiter then we gotta move the cursor left
     " by the len of the right delimiter so we insert between the delimiters
-    if lenRight > 0 
+    if lenRight > 0
         let leftMoveAmount = lenRight
         execute ":normal " . leftMoveAmount . "h"
     endif
@@ -1656,7 +1695,7 @@
 endfunction
 " Function: s:RemoveDelimiters(left, right, line) {{{2
 " this function is called to remove the first left comment delimiter and the
-" last right delimiter of the given line. 
+" last right delimiter of the given line.
 "
 " The args left and right must be strings. If there is no right delimiter (as
 " is the case for e.g vim file comments) them the arg right should be ""
@@ -1676,7 +1715,7 @@
 
     let line = a:line
 
-    "look for the left delimiter, if we find it, remove it. 
+    "look for the left delimiter, if we find it, remove it.
     let leftIndx = s:FindDelimiterIndex(a:left, line)
     if leftIndx != -1
         let line = strpart(line, 0, leftIndx) . strpart(line, leftIndx+lenLeft)
@@ -1688,7 +1727,7 @@
         endif
     endif
 
-    "look for the right delimiter, if we find it, remove it 
+    "look for the right delimiter, if we find it, remove it
     let rightIndx = s:FindDelimiterIndex(a:right, line)
     if rightIndx != -1
         let line = strpart(line, 0, rightIndx) . strpart(line, rightIndx+lenRight)
@@ -1703,14 +1742,13 @@
     return line
 endfunction
 
-" Function: s:UncommentLines(onlyWholeLineComs, topLine, bottomLine) {{{2
+" Function: s:UncommentLines(topLine, bottomLine) {{{2
 " This function uncomments the given lines
 "
 " Args:
-" onlyWholeLineComs: should be 1 for toggle style uncommenting
 " topLine: the top line of the visual selection to uncomment
 " bottomLine: the bottom line of the visual selection to uncomment
-function s:UncommentLines(onlyWholeLineComs, topLine, bottomLine) 
+function s:UncommentLines(topLine, bottomLine)
     "make local copies of a:firstline and a:lastline and, if need be, swap
     "them around if the top line is below the bottom
     let l:firstline = a:topLine
@@ -1724,7 +1762,7 @@
     let currentLine = firstline
     while currentLine <= lastline
 
-        "check the current line to see if it is part of a sexy comment 
+        "check the current line to see if it is part of a sexy comment
         let sexyComBounds = s:FindBoundingLinesOfSexyCom(currentLine)
         if !empty(sexyComBounds)
 
@@ -1741,14 +1779,9 @@
             let currentLine = sexyComBounds[1] - numLinesRemoved + 1
             let lastline = lastline - numLinesRemoved
 
-        "no sexy com was detected so uncomment the line as normal 
+        "no sexy com was detected so uncomment the line as normal
         else
-            let theLine = getline(currentLine)
-            if a:onlyWholeLineComs && (s:IsCommentedFromStartOfLine(b:left, theLine) || s:IsCommentedFromStartOfLine(b:leftAlt, theLine))
-                call s:UncommentLinesNormal(currentLine, currentLine)
-            elseif !a:onlyWholeLineComs
-                call s:UncommentLinesNormal(currentLine, currentLine)
-            endif
+            call s:UncommentLinesNormal(currentLine, currentLine)
             let currentLine = currentLine + 1
         endif
     endwhile
@@ -1766,7 +1799,7 @@
 
 
     "check if it is even possible for sexy comments to exist with the
-    "available delimiters 
+    "available delimiters
     if left == -1 || right == -1
         throw 'NERDCommenter.Delimiters exception: cannot uncomment sexy comments with available delimiters.'
     endif
@@ -1783,7 +1816,7 @@
 
     " go thru the intermediate lines of the sexy comment and remove the
     " sexy comment markers (eg the '*'s on the start of line in a c sexy
-    " comment) 
+    " comment)
     let currentLine = a:topline+1
     while currentLine < a:bottomline
         let theLine = getline(currentLine)
@@ -1801,25 +1834,25 @@
 
         let theLine = s:ConvertLeadingWhiteSpace(theLine)
 
-        " move onto the next line 
+        " move onto the next line
         call setline(currentLine, theLine)
         let currentLine = currentLine + 1
     endwhile
 
     " gotta make a copy of a:bottomline cos we modify the position of the
-    " last line  it if we remove the topline 
+    " last line  it if we remove the topline
     let bottomline = a:bottomline
 
-    " get the first line so we can remove the left delim from it 
+    " get the first line so we can remove the left delim from it
     let theLine = getline(a:topline)
 
-    " if the first line contains only the left delim then just delete it 
+    " if the first line contains only the left delim then just delete it
     if theLine =~ '^[ \t]*' . left . '[ \t]*$' && !g:NERDCompactSexyComs
         call cursor(a:topline, 1)
         normal dd
         let bottomline = bottomline - 1
 
-    " topline contains more than just the left delim 
+    " topline contains more than just the left delim
     else
 
         " remove the delim. If there is a space after it
@@ -1837,12 +1870,12 @@
     " get the last line so we can remove the right delim
     let theLine = getline(bottomline)
 
-    " if the bottomline contains only the right delim then just delete it 
+    " if the bottomline contains only the right delim then just delete it
     if theLine =~ '^[ \t]*' . right . '[ \t]*$'
         call cursor(bottomline, 1)
         normal dd
 
-    " the last line contains more than the right delim  
+    " the last line contains more than the right delim
     else
         " remove the right delim. If there is a space after it and
         " if the appropriate options are set then remove this too.
@@ -1879,11 +1912,11 @@
 function s:UncommentLineNormal(line)
     let line = a:line
 
-    "get the comment status on the line so we know how it is commented 
-    let lineCommentStatus =  s:IsCommentedOuttermost(b:left, b:right, b:leftAlt, b:rightAlt, line) 
+    "get the comment status on the line so we know how it is commented
+    let lineCommentStatus =  s:IsCommentedOuttermost(b:left, b:right, b:leftAlt, b:rightAlt, line)
 
     "it is commented with b:left and b:right so remove these delims
-    if lineCommentStatus == 1 
+    if lineCommentStatus == 1
         let line = s:RemoveDelimiters(b:left, b:right, line)
 
     "it is commented with b:leftAlt and b:rightAlt so remove these delims
@@ -1891,26 +1924,26 @@
         let line = s:RemoveDelimiters(b:leftAlt, b:rightAlt, line)
 
     "it is not properly commented with any delims so we check if it has
-    "any random left or right delims on it and remove the outtermost ones 
+    "any random left or right delims on it and remove the outtermost ones
     else
-        "get the positions of all delim types on the line 
+        "get the positions of all delim types on the line
         let indxLeft = s:FindDelimiterIndex(b:left, line)
         let indxLeftAlt = s:FindDelimiterIndex(b:leftAlt, line)
         let indxRight = s:FindDelimiterIndex(b:right, line)
         let indxRightAlt = s:FindDelimiterIndex(b:rightAlt, line)
 
-        "remove the outter most left comment delim 
+        "remove the outter most left comment delim
         if indxLeft != -1 && (indxLeft < indxLeftAlt || indxLeftAlt == -1)
-            let line = s:ReplaceLeftMostDelim(b:left, '', line)
+            let line = s:RemoveDelimiters(b:left, '', line)
         elseif indxLeftAlt != -1
-            let line = s:ReplaceLeftMostDelim(b:leftAlt, '', line)
-        endif
-
-        "remove the outter most right comment delim 
+            let line = s:RemoveDelimiters(b:leftAlt, '', line)
+        endif
+
+        "remove the outter most right comment delim
         if indxRight != -1 && (indxRight < indxRightAlt || indxRightAlt == -1)
-            let line = s:ReplaceRightMostDelim(b:right, '', line)
+            let line = s:RemoveDelimiters('', b:right, line)
         elseif indxRightAlt != -1
-            let line = s:ReplaceRightMostDelim(b:rightAlt, '', line)
+            let line = s:RemoveDelimiters('', b:rightAlt, line)
         endif
     endif
 
@@ -1934,7 +1967,7 @@
     "if there are place-holders on the line then we check to see if they are
     "the outtermost delimiters on the line. If so then we replace them with
     "real delimiters
-    if indxLeftPlace != -1 
+    if indxLeftPlace != -1
         if (indxLeftPlace < indxLeft || indxLeft==-1) && (indxLeftPlace < indxLeftAlt || indxLeftAlt==-1)
             let line = s:ReplaceDelims(g:NERDLPlace, g:NERDRPlace, left, right, line)
         endif
@@ -1978,7 +2011,7 @@
 function s:AddLeftDelimAligned(delim, theLine, alignIndx)
 
     "if the line is not long enough then bung some extra spaces on the front
-    "so we can align the delim properly 
+    "so we can align the delim properly
     let theLine = a:theLine
     if strlen(theLine) < a:alignIndx
         let theLine = strpart(s:spaces, 0, a:alignIndx - strlen(theLine))
@@ -2010,7 +2043,7 @@
         let extraSpaces = ''
         let extraSpaces = strpart(s:spaces, 0, a:alignIndx-strlen(a:theLine))
 
-        " add the right delim 
+        " add the right delim
         return substitute(a:theLine, '$', extraSpaces . a:delim, '')
     endif
 endfunction
@@ -2033,11 +2066,11 @@
     let theLine = getline(a:lineNum)
 
     " make sure we don't comment lines that are just spaces or tabs or empty.
-    if theLine =~ "^[ \t]*$" 
+    if theLine =~ "^[ \t]*$"
         return 0
     endif
 
-    "if the line is part of a sexy comment then just flag it...  
+    "if the line is part of a sexy comment then just flag it...
     if s:IsInSexyComment(a:lineNum)
         return 0
     endif
@@ -2045,7 +2078,7 @@
     let isCommented = s:IsCommentedNormOrSexy(a:lineNum)
 
     "if the line isnt commented return true
-    if !isCommented 
+    if !isCommented
         return 1
     endif
 
@@ -2071,7 +2104,7 @@
 " Function: s:CanSexyCommentLines(topline, bottomline) {{{2
 " Return: 1 if the given lines can be commented sexually, 0 otherwise
 function s:CanSexyCommentLines(topline, bottomline)
-    " see if the selected regions have any sexy comments 
+    " see if the selected regions have any sexy comments
     let currentLine = a:topline
     while(currentLine <= a:bottomline)
         if s:IsInSexyComment(currentLine)
@@ -2094,11 +2127,11 @@
     endif
 
     " make sure we don't comment lines that are just spaces or tabs or empty.
-    if theLine =~ "^[ \t]*$" 
+    if theLine =~ "^[ \t]*$"
         return 0
     endif
 
-    "if the line is part of a sexy comment then just flag it...  
+    "if the line is part of a sexy comment then just flag it...
     if s:IsInSexyComment(a:lineNum)
         return 0
     endif
@@ -2169,13 +2202,13 @@
     let indx = stridx(a:str, a:searchstr)
 
     "if there is an instance of searchstr in str process it
-    if indx != -1 
+    if indx != -1
         "get the remainder of str after this instance of searchstr is removed
         let lensearchstr = strlen(a:searchstr)
         let strLeft = strpart(a:str, indx+lensearchstr)
 
         "if this instance of searchstr is not escaped, add one to the count
-        "and recurse. If it is escaped, just recurse 
+        "and recurse. If it is escaped, just recurse
         if !s:IsEscaped(a:str, indx, a:escChar)
             return 1 + s:CountNonESCedOccurances(strLeft, a:searchstr, a:escChar)
         else
@@ -2243,16 +2276,16 @@
     let l:delimiter = a:delimiter
     let lenDel = strlen(l:delimiter)
 
-    "get the index of the first occurrence of the delimiter 
+    "get the index of the first occurrence of the delimiter
     let delIndx = stridx(a:line, l:delimiter)
 
     "keep looping thru the line till we either find a real comment delimiter
-    "or run off the EOL 
+    "or run off the EOL
     while delIndx != -1
 
         "if we are not off the EOL get the str before the possible delimiter
         "in question and check if it really is a delimiter. If it is, return
-        "its position 
+        "its position
         if delIndx != -1
             if s:IsDelimValid(l:delimiter, delIndx, a:line)
                 return delIndx
@@ -2260,13 +2293,13 @@
         endif
 
         "we have not yet found a real comment delimiter so move past the
-        "current one we are lookin at 
+        "current one we are lookin at
         let restOfLine = strpart(a:line, delIndx + lenDel)
         let distToNextDelim = stridx(restOfLine , l:delimiter)
 
         "if distToNextDelim is -1 then there is no more potential delimiters
         "on the line so set delIndx to -1. Otherwise, move along the line by
-        "distToNextDelim 
+        "distToNextDelim
         if distToNextDelim == -1
             let delIndx = -1
         else
@@ -2274,7 +2307,7 @@
         endif
     endwhile
 
-    "there is no comment delimiter on this line 
+    "there is no comment delimiter on this line
     return -1
 endfunction
 
@@ -2291,7 +2324,7 @@
 "   top/bottom/middle of a sexy comment then -1 is returned
 function s:FindBoundingLinesOfSexyCom(lineNum)
 
-    "find which delimiters to look for as the start/end delims of the comment 
+    "find which delimiters to look for as the start/end delims of the comment
     let left = ''
     let right = ''
     if s:Multipart()
@@ -2311,38 +2344,38 @@
     let bottom = -1
 
     let currentLine = a:lineNum
-    while top == -1 || bottom == -1 
+    while top == -1 || bottom == -1
         let theLine = getline(currentLine)
 
         "check if the current line is the top of the sexy comment
-        if theLine =~ '^[ \t]*' . left && theLine !~ '.*' . right
+        if currentLine <= a:lineNum && theLine =~ '^[ \t]*' . left && theLine !~ '.*' . right && currentLine < s:NumLinesInBuf()
             let top = currentLine
             let currentLine = a:lineNum
 
         "check if the current line is the bottom of the sexy comment
-        elseif theLine =~ '^[ \t]*' . right && theLine !~ '.*' . left
+        elseif theLine =~ '^[ \t]*' . right && theLine !~ '.*' . left && currentLine > 1
             let bottom = currentLine
 
-        "the right delimiter is on the same line as the last sexyComMarker 
+        "the right delimiter is on the same line as the last sexyComMarker
         elseif theLine =~ '^[ \t]*' . sexyComMarker . '.*' . right
             let bottom = currentLine
 
         "we have not found the top or bottom line so we assume currentLine is an
-        "intermediate line and look to prove otherwise 
+        "intermediate line and look to prove otherwise
         else
 
             "if the line doesnt start with a sexyComMarker then it is not a sexy
-            "comment 
+            "comment
             if theLine !~ '^[ \t]*' . sexyComMarker
                 return []
             endif
 
         endif
 
-        "if top is -1 then we havent found the top yet so keep looking up 
+        "if top is -1 then we havent found the top yet so keep looking up
         if top == -1
             let currentLine = currentLine - 1
-        "if we have found the top line then go down looking for the bottom 
+        "if we have found the top line then go down looking for the bottom
         else
             let currentLine = currentLine + 1
         endif
@@ -2368,7 +2401,7 @@
             return ''
         else
             let delim = b:leftAlt
-        endif 
+        endif
     endif
     if delim == ''
         return ''
@@ -2400,14 +2433,14 @@
             return ''
         else
             let delim = b:rightAlt
-        endif 
+        endif
     endif
     if delim == ''
         return ''
     endif
 
-    if a:space && g:NERDSpaceDelims 
-        let delim = s:spaceStr . delim 
+    if a:space && g:NERDSpaceDelims
+        let delim = s:spaceStr . delim
     endif
 
     if a:esc
@@ -2432,11 +2465,11 @@
 function s:GetSexyComMarker(space, esc)
     let sexyComMarker = b:sexyComMarker
 
-    "if there is no hardcoded marker then we find one 
+    "if there is no hardcoded marker then we find one
     if sexyComMarker == ''
 
         "if the filetype has c style comments then use standard c sexy
-        "comments 
+        "comments
         if s:HasCStyleComments()
             let sexyComMarker = '*'
         else
@@ -2451,17 +2484,17 @@
             elseif s:AltMultipart()
                 let left = b:leftAlt
             else
-                return -1 
+                return -1
             endif
 
-            "get the last char of left 
+            "get the last char of left
             let sexyComMarker = strpart(left, strlen(left)-1)
         endif
     endif
 
     if a:space && g:NERDSpaceDelims
         let sexyComMarker = sexyComMarker . s:spaceStr
-    endif 
+    endif
 
     if a:esc
         let sexyComMarker = s:Esc(sexyComMarker)
@@ -2482,11 +2515,11 @@
     let lenLeftAlt = strlen(b:leftAlt)
     let left = ''
 
-    "assume c style sexy comments if possible 
+    "assume c style sexy comments if possible
     if s:HasCStyleComments()
         let left = '/*'
     else
-        "grab the longest left delim that has a right 
+        "grab the longest left delim that has a right
         if s:Multipart() && lenLeft >= lenLeftAlt
             let left = b:left
         elseif s:AltMultipart()
@@ -2520,11 +2553,11 @@
     let lenLeftAlt = strlen(b:leftAlt)
     let right = ''
 
-    "assume c style sexy comments if possible 
+    "assume c style sexy comments if possible
     if s:HasCStyleComments()
         let right = '*/'
     else
-        "grab the right delim that pairs with the longest left delim 
+        "grab the right delim that pairs with the longest left delim
         if s:Multipart() && lenLeft >= lenLeftAlt
             let right = b:right
         elseif s:AltMultipart()
@@ -2535,7 +2568,7 @@
     endif
 
     if a:space && g:NERDSpaceDelims
-        let right = s:spaceStr . right 
+        let right = s:spaceStr . right
     endif
 
     if a:esc
@@ -2581,7 +2614,7 @@
         return 1
     endif
 
-    "if the line is part of a sexy comment return 1 
+    "if the line is part of a sexy comment return 1
     if s:IsInSexyComment(a:lineNum)
         return 1
     endif
@@ -2639,14 +2672,14 @@
     let indxRight = s:LastIndexOfDelim(a:right, a:line)
     let indxRightAlt = s:LastIndexOfDelim(a:rightAlt, a:line)
 
-    "check if the line has a left delim before a leftAlt delim 
-    if (indxLeft <= indxLeftAlt || indxLeftAlt == -1) && indxLeft != -1 
+    "check if the line has a left delim before a leftAlt delim
+    if (indxLeft <= indxLeftAlt || indxLeftAlt == -1) && indxLeft != -1
         "check if the line has a right delim after any rightAlt delim
         if (indxRight > indxRightAlt && indxRight > indxLeft) || !s:Multipart()
             return 1
         endif
 
-        "check if the line has a leftAlt delim before a left delim 
+        "check if the line has a leftAlt delim before a left delim
     elseif (indxLeftAlt <= indxLeft || indxLeft == -1) && indxLeftAlt != -1
         "check if the line has a rightAlt delim after any right delim
         if (indxRightAlt > indxRight && indxRightAlt > indxLeftAlt) || !s:AltMultipart()
@@ -2676,53 +2709,53 @@
 "   -line: the line that delimiter occurs in
 "
 " Returns:
-" 0 if the given delimiter is not a real delimiter (as far as we can tell) , 
+" 0 if the given delimiter is not a real delimiter (as far as we can tell) ,
 " 1 otherwise
 function s:IsDelimValid(delimiter, delIndx, line)
-    "get the delimiter without the escchars 
+    "get the delimiter without the escchars
     let l:delimiter = a:delimiter
 
-    "get the strings before and after the delimiter 
+    "get the strings before and after the delimiter
     let preComStr = strpart(a:line, 0, a:delIndx)
     let postComStr = strpart(a:line, a:delIndx+strlen(delimiter))
 
     "to check if the delimiter is real, make sure it isnt preceded by
     "an odd number of quotes and followed by the same (which would indicate
     "that it is part of a string and therefore is not a comment)
-    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, '"', "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, '"', "\\")) 
+    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, '"', "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, '"', "\\"))
         return 0
     endif
-    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, "'", "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, "'", "\\")) 
+    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, "'", "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, "'", "\\"))
         return 0
     endif
-    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, "`", "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, "`", "\\")) 
+    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, "`", "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, "`", "\\"))
         return 0
     endif
 
 
-    "if the comment delimiter is escaped, assume it isnt a real delimiter 
+    "if the comment delimiter is escaped, assume it isnt a real delimiter
     if s:IsEscaped(a:line, a:delIndx, "\\")
         return 0
     endif
 
     "vim comments are so fuckin stupid!! Why the hell do they have comment
     "delimiters that are used elsewhere in the syntax?!?! We need to check
-    "some conditions especially for vim 
+    "some conditions especially for vim
     if &filetype == "vim"
         if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, '"', "\\"))
             return 0
         endif
 
         "if the delimiter is on the very first char of the line or is the
-        "first non-tab/space char on the line then it is a valid comment delimiter 
+        "first non-tab/space char on the line then it is a valid comment delimiter
         if a:delIndx == 0 || a:line =~ "^[ \t]\\{" . a:delIndx . "\\}\".*$"
             return 1
         endif
 
-        let numLeftParen =s:CountNonESCedOccurances(preComStr, "(", "\\") 
-        let numRightParen =s:CountNonESCedOccurances(preComStr, ")", "\\") 
-
-        "if the quote is inside brackets then assume it isnt a comment 
+        let numLeftParen =s:CountNonESCedOccurances(preComStr, "(", "\\")
+        let numRightParen =s:CountNonESCedOccurances(preComStr, ")", "\\")
+
+        "if the quote is inside brackets then assume it isnt a comment
         if numLeftParen > numRightParen
             return 0
         endif
@@ -2755,12 +2788,12 @@
 "   -indx: the index into str that we want to check
 "   -escChar: the escape char the char at indx may be ESCed with
 function s:IsEscaped(str, indx, escChar)
-    "initialise numEscChars to 0 and look at the char before indx 
+    "initialise numEscChars to 0 and look at the char before indx
     let numEscChars = 0
     let curIndx = a:indx-1
 
     "keep going back thru str until we either reach the start of the str or
-    "run out of esc chars 
+    "run out of esc chars
     while curIndx >= 0 && strpart(a:str, curIndx, 1) == a:escChar
 
         "we have found another esc char so add one to the count and move left
@@ -2789,7 +2822,7 @@
 "   -bottomline: the line that the possible sexy comment stops on
 function s:IsSexyComment(topline, bottomline)
 
-    "get the delim set that would be used for a sexy comment 
+    "get the delim set that would be used for a sexy comment
     let left = ''
     let right = ''
     if s:Multipart()
@@ -2802,36 +2835,36 @@
         return 0
     endif
 
-    "swap the top and bottom line numbers around if need be  
+    "swap the top and bottom line numbers around if need be
     let topline = a:topline
     let bottomline = a:bottomline
-    if bottomline < topline 
+    if bottomline < topline
         topline = bottomline
         bottomline = a:topline
     endif
 
-    "if there is < 2 lines in the comment it cannot be sexy 
+    "if there is < 2 lines in the comment it cannot be sexy
     if (bottomline - topline) <= 0
         return 0
     endif
 
-    "if the top line doesnt begin with a left delim then the comment isnt sexy 
+    "if the top line doesnt begin with a left delim then the comment isnt sexy
     if getline(a:topline) !~ '^[ \t]*' . left
         return 0
     endif
 
-    "if there is a right delim on the top line then this isnt a sexy comment 
+    "if there is a right delim on the top line then this isnt a sexy comment
     if s:FindDelimiterIndex(right, getline(a:topline)) != -1
         return 0
     endif
 
-    "if there is a left delim on the bottom line then this isnt a sexy comment 
+    "if there is a left delim on the bottom line then this isnt a sexy comment
     if s:FindDelimiterIndex(left, getline(a:bottomline)) != -1
         return 0
     endif
 
     "if the bottom line doesnt begin with a right delim then the comment isnt
-    "sexy 
+    "sexy
     if getline(a:bottomline) !~ '^.*' . right . '$'
         return 0
     endif
@@ -2839,12 +2872,12 @@
     let sexyComMarker = s:GetSexyComMarker(0, 1)
 
     "check each of the intermediate lines to make sure they start with a
-    "sexyComMarker 
+    "sexyComMarker
     let currentLine = a:topline+1
     while currentLine < a:bottomline
         let theLine = getline(currentLine)
 
-        if theLine !~ '^[ \t]*' . sexyComMarker 
+        if theLine !~ '^[ \t]*' . sexyComMarker
             return 0
         endif
 
@@ -2879,7 +2912,7 @@
         return -1
     endif
 
-    "keep moving to the next instance of delim in str till there is none left 
+    "keep moving to the next instance of delim in str till there is none left
     while 1
 
         "search for the next delim after the previous one
@@ -2888,7 +2921,7 @@
 
         "if we find a delim update indx to record the position of it, if we
         "dont find another delim then indx is the last one so break out of
-        "this loop 
+        "this loop
         if indx2 != -1
             let indx = indx + indx2 + lenDelim
         else
@@ -2902,7 +2935,7 @@
 
 " Function: s:LeftMostIndx(countCommentedLines, countEmptyLines, topline, bottomline) {{{2
 " This function takes in 2 line numbers and returns the index of the left most
-" char (that is not a space or a tab) on all of these lines. 
+" char (that is not a space or a tab) on all of these lines.
 " Args:
 "   -countCommentedLines: 1 if lines that are commented are to be checked as
 "    well. 0 otherwise
@@ -2911,29 +2944,29 @@
 "   -bottomline: the bottom line to be checked
 function s:LeftMostIndx(countCommentedLines, countEmptyLines, topline, bottomline)
 
-    " declare the left most index as an extreme value 
+    " declare the left most index as an extreme value
     let leftMostIndx = 1000
 
-    " go thru the block line by line updating leftMostIndx 
+    " go thru the block line by line updating leftMostIndx
     let currentLine = a:topline
     while currentLine <= a:bottomline
 
         " get the next line and if it is allowed to be commented, or is not
         " commented, check it
         let theLine = getline(currentLine)
-        if a:countEmptyLines || theLine !~ '^[ \t]*$' 
+        if a:countEmptyLines || theLine !~ '^[ \t]*$'
             if a:countCommentedLines || (!s:IsCommented(b:left, b:right, theLine) && !s:IsCommented(b:leftAlt, b:rightAlt, theLine))
                 " convert spaces to tabs and get the number of leading spaces for
                 " this line and update leftMostIndx if need be
                 let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-                let leadSpaceOfLine = strlen( substitute(theLine, '\(^[ \t]*\).*$','\1','') ) 
+                let leadSpaceOfLine = strlen( substitute(theLine, '\(^[ \t]*\).*$','\1','') )
                 if leadSpaceOfLine < leftMostIndx
                     let leftMostIndx = leadSpaceOfLine
                 endif
             endif
         endif
 
-        " move on to the next line 
+        " move on to the next line
         let currentLine = currentLine + 1
     endwhile
 
@@ -2968,7 +3001,7 @@
 " Function: s:NumberOfLeadingTabs(s) {{{2
 " returns the number of leading tabs in the given string
 function s:NumberOfLeadingTabs(s)
-    return strlen(substitute(a:s, '^\(\t*\).*$', '\1', "")) 
+    return strlen(substitute(a:s, '^\(\t*\).*$', '\1', ""))
 endfunction
 
 " Function: s:NumLinesInBuf() {{{2
@@ -2980,7 +3013,7 @@
 " Function: s:ReplaceDelims(toReplace1, toReplace2, replacor1, replacor2, str) {{{2
 " This function takes in a string, 2 delimiters in that string and 2 strings
 " to replace these delimiters with.
-" 
+"
 " Args:
 "   -toReplace1: the first delimiter to replace
 "   -toReplace2: the second delimiter to replace
@@ -3004,11 +3037,11 @@
 function s:ReplaceLeftMostDelim(toReplace, replacor, str)
     let toReplace = a:toReplace
     let replacor = a:replacor
-    "get the left most occurrence of toReplace 
+    "get the left most occurrence of toReplace
     let indxToReplace = s:FindDelimiterIndex(toReplace, a:str)
 
     "if there IS an occurrence of toReplace in str then replace it and return
-    "the resulting string 
+    "the resulting string
     if indxToReplace != -1
         let line = strpart(a:str, 0, indxToReplace) . replacor . strpart(a:str, indxToReplace+strlen(toReplace))
         return line
@@ -3025,16 +3058,16 @@
 "   -toReplace: the delimiter in str that is to be replaced
 "   -replacor: the string to replace toReplace with
 "   -str: the string that contains toReplace
-" 
+"
 function s:ReplaceRightMostDelim(toReplace, replacor, str)
     let toReplace = a:toReplace
     let replacor = a:replacor
     let lenToReplace = strlen(toReplace)
 
-    "get the index of the last delim in str 
+    "get the index of the last delim in str
     let indxToReplace = s:LastIndexOfDelim(toReplace, a:str)
 
-    "if there IS a delimiter in str, replace it and return the result 
+    "if there IS a delimiter in str, replace it and return the result
     let line = a:str
     if indxToReplace != -1
         let line = strpart(a:str, 0, indxToReplace) . replacor . strpart(a:str, indxToReplace+strlen(toReplace))
@@ -3042,7 +3075,7 @@
     return line
 endfunction
 
-"FUNCTION: s:RestoreScreenState() {{{2 
+"FUNCTION: s:RestoreScreenState() {{{2
 "
 "Sets the screen state back to what it was when s:SaveScreenState was last
 "called.
@@ -3059,7 +3092,7 @@
 
 " Function: s:RightMostIndx(countCommentedLines, countEmptyLines, topline, bottomline) {{{2
 " This function takes in 2 line numbers and returns the index of the right most
-" char on all of these lines. 
+" char on all of these lines.
 " Args:
 "   -countCommentedLines: 1 if lines that are commented are to be checked as
 "    well. 0 otherwise
@@ -3069,18 +3102,18 @@
 function s:RightMostIndx(countCommentedLines, countEmptyLines, topline, bottomline)
     let rightMostIndx = -1
 
-    " go thru the block line by line updating rightMostIndx 
+    " go thru the block line by line updating rightMostIndx
     let currentLine = a:topline
     while currentLine <= a:bottomline
 
         " get the next line and see if it is commentable, otherwise it doesnt
         " count
         let theLine = getline(currentLine)
-        if a:countEmptyLines || theLine !~ '^[ \t]*$' 
+        if a:countEmptyLines || theLine !~ '^[ \t]*$'
 
             if a:countCommentedLines || (!s:IsCommented(b:left, b:right, theLine) && !s:IsCommented(b:leftAlt, b:rightAlt, theLine))
 
-                " update rightMostIndx if need be 
+                " update rightMostIndx if need be
                 let theLine = s:ConvertLeadingTabsToSpaces(theLine)
                 let lineLen = strlen(theLine)
                 if lineLen > rightMostIndx
@@ -3089,16 +3122,16 @@
             endif
         endif
 
-        " move on to the next line 
+        " move on to the next line
         let currentLine = currentLine + 1
     endwhile
 
     return rightMostIndx
 endfunction
 
-"FUNCTION: s:SaveScreenState() {{{2 
+"FUNCTION: s:SaveScreenState() {{{2
 "Saves the current cursor position in the current buffer and the window
-"scroll position 
+"scroll position
 function s:SaveScreenState()
     let t:NERDComOldPos = getpos(".")
     let t:NERDComOldTopLine = line("w0")
@@ -3109,10 +3142,10 @@
 " place holders
 " Args:
 "   -line: the line to swap the delims in
-" 
+"
 function s:SwapOutterMultiPartDelimsForPlaceHolders(line)
     " find out if the line is commented using normal delims and/or
-    " alternate ones 
+    " alternate ones
     let isCommented = s:IsCommented(b:left, b:right, a:line)
     let isCommentedAlt = s:IsCommented(b:leftAlt, b:rightAlt, a:line)
 
@@ -3124,7 +3157,7 @@
         let line2 = s:ReplaceDelims(b:left, b:right, g:NERDLPlace, g:NERDRPlace, a:line)
 
     "similarly if the line is commented with the alternative
-    "delimiters 
+    "delimiters
     elseif isCommentedAlt && s:AltMultipart()
         let line2 = s:ReplaceDelims(b:leftAlt, b:rightAlt, g:NERDLPlace, g:NERDRPlace, a:line)
     endif
@@ -3137,7 +3170,7 @@
 " multi-part delims
 " Args:
 "   -line: the line to swap the delims in
-" 
+"
 function s:SwapOutterPlaceHoldersForMultiPartDelims(line)
     let left = ''
     let right = ''
@@ -3157,14 +3190,14 @@
 " number is the col number when all leading spaces are converted to tabs
 " Args:
 "   -line:the line to get the rel col for
-"   -col: the abs col 
+"   -col: the abs col
 function s:TabbedCol(line, col)
     let lineTruncated = strpart(a:line, 0, a:col)
     let lineSpacesToTabs = substitute(lineTruncated, s:TabSpace(), '\t', 'g')
     return strlen(lineSpacesToTabs)
 endfunction
-"FUNCTION: s:TabSpace() {{{2 
-"returns a string of spaces equal in length to &tabstop 
+"FUNCTION: s:TabSpace() {{{2
+"returns a string of spaces equal in length to &tabstop
 function s:TabSpace()
     let tabSpace = ""
     let spacesPerTab = &tabstop
@@ -3200,7 +3233,7 @@
 " This is where the mappings calls are made that set up the commenting key
 " mappings.
 
-" set up the mapping to switch to/from alternative delimiters 
+" set up the mapping to switch to/from alternative delimiters
 execute 'nnoremap <silent>' . g:NERDAltComMap . ' :call <SID>SwitchToAlternativeDelimiters(1)<cr>'
 
 " set up the mappings to comment out lines
@@ -3227,23 +3260,23 @@
 execute 'nmap <silent>' . g:NERDComLineYankMap . ' :call NERDComment(0, "yank")<CR>'
 execute 'vmap <silent>' . g:NERDComLineYankMap . ' <ESC>:call NERDComment(1, "yank")<CR>'
 
-" set up the mappings for left aligned comments 
+" set up the mappings for left aligned comments
 execute 'nnoremap <silent>' . g:NERDComAlignLeftMap . ' :call NERDComment(0, "alignLeft")<cr>'
 execute 'vnoremap <silent>' . g:NERDComAlignLeftMap . ' <ESC>:call NERDComment(1, "alignLeft")<cr>'
 
-" set up the mappings for right aligned comments 
+" set up the mappings for right aligned comments
 execute 'nnoremap <silent>' . g:NERDComAlignRightMap . ' :call NERDComment(0, "alignRight")<cr>'
 execute 'vnoremap <silent>' . g:NERDComAlignRightMap . ' <ESC>:call NERDComment(1, "alignRight")<cr>'
 
-" set up the mappings for left and right aligned comments 
+" set up the mappings for left and right aligned comments
 execute 'nnoremap <silent>' . g:NERDComAlignBothMap . ' :call NERDComment(0, "alignBoth")<cr>'
 execute 'vnoremap <silent>' . g:NERDComAlignBothMap . ' <ESC>:call NERDComment(1, "alignBoth")<cr>'
 
-" set up the mappings to do nested comments 
+" set up the mappings to do nested comments
 execute 'nnoremap <silent>' . g:NERDComLineNestMap . ' :call NERDComment(0, "nested")<cr>'
 execute 'vnoremap <silent>' . g:NERDComLineNestMap . ' <ESC>:call NERDComment(1, "nested")<cr>'
 
-" set up the mapping to uncomment a line 
+" set up the mapping to uncomment a line
 execute 'nnoremap <silent>' . g:NERDUncomLineMap . ' :call NERDComment(0, "uncomment")<cr>'
 execute 'vnoremap <silent>' . g:NERDUncomLineMap . ' :call NERDComment(1, "uncomment")<cr>'
 
@@ -3261,7 +3294,7 @@
 
 " Section: Menu item setup {{{1
 " ===========================================================================
-"check if the user wants the menu to be displayed 
+"check if the user wants the menu to be displayed
 if g:NERDMenuMode != 0
 
     let menuRoot = ""
@@ -3293,7 +3326,7 @@
     execute 'nmenu <silent> '. menuRoot .'.Comment\ Sexily<TAB>' . escape(g:NERDComLineSexyMap, '\') . ' :call NERDComment(0,"sexy")<CR>'
     execute 'vmenu <silent> '. menuRoot .'.Comment\ Sexily<TAB>' . escape(g:NERDComLineSexyMap, '\') . ' <ESC>:call NERDComment(1,"sexy")<CR>'
 
-    execute 'nmenu <silent> '. menuRoot .'.Yank\ line(s)\ then\ comment<TAB>' . escape(g:NERDComLineYankMap, '\') . ' "0Y' . g:NERDComLineMap 
+    execute 'nmenu <silent> '. menuRoot .'.Yank\ line(s)\ then\ comment<TAB>' . escape(g:NERDComLineYankMap, '\') . ' "0Y' . g:NERDComLineMap
     execute 'vmenu <silent> '. menuRoot .'.Yank\ line(s)\ then\ comment<TAB>' . escape(g:NERDComLineYankMap, '\') . ' "0ygv' . g:NERDComLineMap
 
     execute 'nmenu <silent> '. menuRoot .'.Append\ Comment\ to\ Line<TAB>' . escape(g:NERDAppendComMap, '\') . ' :call NERDComment(0, "append")<cr>'




More information about the pkg-vim-maintainers mailing list