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

[James Vega]

The following commit has been merged in the master branch:
commit 0ff1a26bdb147eea78836e02a360653ea9a41941
Author: James Vega <jamessan at debian.org>
Date:   Thu Jul 30 17:42:48 2009 +0200

    Emit a warning when a user uses the amend sub-command
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/src/vim/addon-manager.rb b/src/vim/addon-manager.rb
index eb05a3b..1ce18e3 100644
--- a/src/vim/addon-manager.rb
+++ b/src/vim/addon-manager.rb
@@ -100,11 +100,11 @@ module Vim
         addons.each do |addon|
           if not addon.disabled_by_line
             Vim.warn \
-              "#{addon} can't be amended (since it has no disabledby field)"
+              "#{addon} can't be enabled (since it has no disabledby field)"
             next
           end
 	  if lines.any? {|line| addon.is_disabled_by? line}
-	    Vim.info "amending disabled addon '#{addon}'"
+	    Vim.info "enabling disabled addon '#{addon}'"
 	    lines.reject! {|line| addon.is_disabled_by? line}
 	  else
 	    Vim.info "ignoring addon '#{addon}' which is enabled"
@@ -114,6 +114,8 @@ module Vim
     end
 
     def amend(addons)
+      Vim.warn "the 'amend' command is deprecated and will disappear in a " +
+               "future release.  Please use the 'enable' command instead."
       enable(addons)
     end
 
diff --git a/src/vim/common.rb b/src/vim/common.rb
index 6177e5b..2ccd641 100644
--- a/src/vim/common.rb
+++ b/src/vim/common.rb
@@ -31,7 +31,7 @@ module Vim
     end
 
     def warn(s)
-      puts "Warning: #{s}"
+      $stderr.puts "Warning: #{s}"
     end
 
     def info(s)

-- 
vim-addon-manager packaging