[SCM] vim-addon-manager packaging branch, master, updated. c5d8d3c543a55b173223771fd3eb055ed6f30a5a

[James Vega]

The following commit has been merged in the master branch:
commit c5d8d3c543a55b173223771fd3eb055ed6f30a5a
Author: James Vega <jamessan at debian.org>
Date:   Thu Jul 30 16:59:47 2009 +0200

    Rename amend sub-command to enable.
    
    Closes: #501439
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index cc1c406..a2511fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ vim-addon-manager (0.4.2) UNRELEASED; urgency=low
     - Update Vcs-* fields to point to git
     - Remove vim-tiny from Recommends since it's lacking +eval which most
       addons need.
+  * Rename amend sub-command to enable.  Leave amend as an undocumented
+    command for a little while for people that are used to the old name.
+    (Closes: #501439)
 
  -- James Vega <jamessan at debian.org>  Fri, 24 Jul 2009 19:56:48 +0200
 
diff --git a/src/vim-addons b/src/vim-addons
index 26ffada..c8c3f8d 100755
--- a/src/vim-addons
+++ b/src/vim-addons
@@ -82,7 +82,7 @@ A description of the semantics of each command is reported below.
   definitions which will inhibit the given addon to be used. Requires at least
   one addon argument
 
-:amend
+:enable
   undo the effects of a previous disable command. Requires at least one addon
   argument
 
@@ -153,7 +153,7 @@ def die_usage
 Usage:
   vim-addons [OPTION ...] [COMMAND [ADDON ...]]
 Commands:
-  list, status (default command), install, remove, disable, amend, files, show
+  list, status (default command), install, remove, disable, enable, files, show
 Options:
   -h, --help          show this usage message and exit
   -q, --query         be quiet and make the output more parseable
@@ -181,7 +181,7 @@ def parse_cmdline
     :query        => false,
     :system_wide  => false,
   }
-  cmds = %w{install remove disable amend list status files show}
+  cmds = %w{install remove disable enable list status files show}
   req_arg_cmds = # commands requiring >= 1 arg
     %w{install remove disable amend files}
   cmdline =
diff --git a/src/vim/addon-manager.rb b/src/vim/addon-manager.rb
index 35d76c2..eb05a3b 100644
--- a/src/vim/addon-manager.rb
+++ b/src/vim/addon-manager.rb
@@ -95,7 +95,7 @@ module Vim
       end
     end
 
-    def amend(addons)
+    def enable(addons)
       map_override_lines do |lines|
         addons.each do |addon|
           if not addon.disabled_by_line
@@ -113,6 +113,10 @@ module Vim
       end
     end
 
+    def amend(addons)
+      enable(addons)
+    end
+
     def show(addons)
       addons.each do |addon|
         puts "Addon: #{addon}"

-- 
vim-addon-manager packaging