fix label tab-completion downcase issue

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@631 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/bin/sup b/bin/sup
index be455fa6789bc5e50851f31834148d24127cca9f..68d9c7314f7e553d93b91e6b7628f5a4e20e7e60 100644 (file)
--- a/bin/sup
+++ b/bin/sup
@@ -238,7 +238,7 @@ begin
           when nil, /^\s*$/
             bm.spawn_modal("Label list", LabelListMode.new) if user_label && user_label.empty?
           else
-            user_label.intern
+            LabelManager.label_for user_label
           end
         
         case user_label

diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb
index 3a696824a444873870c72c723fbb5be8c856e22d..c96232f05520720e40f0d9d7f6d6647ccdd81b4a 100644 (file)
--- a/lib/sup/buffer.rb
+++ b/lib/sup/buffer.rb
@@ -340,7 +340,7 @@ class BufferManager
 
   def ask_with_completions domain, question, completions, default=nil
     ask domain, question, default do |s|
-      completions.select { |x| x =~ /^#{s}/i }.map { |x| [x.downcase, x] }
+      completions.select { |x| x =~ /^#{s}/i }.map { |x| [x, x] }
     end
   end
 

diff --git a/lib/sup/label.rb b/lib/sup/label.rb
index 3288493625c902b93ec7ccbfdb3643152d9079aa..ada17104e8c6d5a46ab620dbbe85b9d557220c82 100644 (file)
--- a/lib/sup/label.rb
+++ b/lib/sup/label.rb
@@ -50,6 +50,16 @@ class LabelManager
       l.to_s
     end
   end
+
+  def label_for s
+    l = s.intern
+    l2 = s.downcase.intern
+    if RESERVED_LABELS.include? l2
+      l2
+    else
+      l
+    end
+  end
   
   def << t
     t = t.intern unless t.is_a? Symbol