From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <eg@gaute.vetsj.com>
Received: from localhost (158-37-227-78.hib.no [158.37.227.78])
        by mx.google.com with ESMTPS id w20sm7750632eeh.18.2010.11.04.06.21.20
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Thu, 04 Nov 2010 06:21:20 -0700 (PDT)
From: Gaute Hope <eg@gaute.vetsj.com>
To: sup-devel <sup-devel@rubyforge.org>
Subject: [PATCH] More UTF-8 support; load all labels as UTF-8
Date: Thu, 04 Nov 2010 14:21:20 +0100
Message-Id: <1288876769-sup-4049@qwerzila>
User-Agent: Sup/git
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-1288876880-669137-13911-3783-1-="


--=-1288876880-669137-13911-3783-1-=
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline

Even if the labels.txt file is read as UTF-8 apparantly after a label is
symoblized, it will be US-ASCII on .to_s if possible. This patch forces
UTF-8.

If you use L to select a US-ASCII label (i.e. Sent) then want to narrow
the search by pressing L again and use tab to match against an UTF-8
label sup crashes.

Also fixes one whitespace error in bin/sup
---
 bin/sup           |    4 +++-
 lib/sup/buffer.rb |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/sup b/bin/sup
index fd1dde8..10be161 100755
--- a/bin/sup
+++ b/bin/sup
@@ -49,7 +49,7 @@ No variables.
 No return value.
 EOS
 
-Redwood::HookManager.register "shutdown", <<EOS 
+Redwood::HookManager.register "shutdown", <<EOS
 Executes when sup is shutting down. May be run when sup is crashing,
 so don\'t do anything too important. Run before the label, contacts,
 and people are saved.
@@ -299,6 +299,8 @@ begin
       SearchResultsMode.spawn_from_query "is:unread"
     when :list_labels
       labels = LabelManager.all_labels.map { |l| LabelManager.string_for l }
+      labels = labels.each { |l| l.force_encoding 'UTF-8' if l.methods.include?(:encoding) }
+
       user_label = bm.ask_with_completions :label, "Show threads with label (enter for listing): ", labels
       unless user_label.nil?
         if user_label.empty?
diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb
index f3cfb8a..c36ca56 100644
--- a/lib/sup/buffer.rb
+++ b/lib/sup/buffer.rb
@@ -454,7 +454,7 @@ EOS
   def ask_with_completions domain, question, completions, default=nil
     ask domain, question, default do |s|
       s.force_encoding 'UTF-8' if s.methods.include?(:encoding)
-      completions.select { |x| x =~ /^#{Regexp::escape s}/i }.map { |x| [x, x] }
+      completions.select { |x| x =~ /^#{Regexp::escape s}/iu }.map { |x| [x, x] }
     end
   end
 
-- 
1.7.3.2


--=-1288876880-669137-13911-3783-1-=
Content-Disposition: attachment; filename="0001-More-UTF-8-support-load-all-labels-as-UTF-8.patch"
Content-Type: application/octet-stream; name="0001-More-UTF-8-support-load-all-labels-as-UTF-8.patch"
Content-Transfer-Encoding: base64

RnJvbSAxMzI1ODkyOWI5MDgzYTg4YWQ5YzZiYTkyNGUxMDkzZmUwMzJlODk5
IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBHYXV0ZSBIb3BlIDxl
Z0BnYXV0ZS52ZXRzai5jb20+CkRhdGU6IFRodSwgNCBOb3YgMjAxMCAxNDox
MjowOSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIE1vcmUgVVRGLTggc3VwcG9y
dDsgbG9hZCBhbGwgbGFiZWxzIGFzIFVURi04CgpFdmVuIGlmIHRoZSBsYWJl
bHMudHh0IGZpbGUgaXMgcmVhZCBhcyBVVEYtOCBhcHBhcmFudGx5IGFmdGVy
IGEgbGFiZWwgaXMKc3ltb2JsaXplZCwgaXQgd2lsbCBiZSBVUy1BU0NJSSBv
biAudG9fcyBpZiBwb3NzaWJsZS4gVGhpcyBwYXRjaCBmb3JjZXMKVVRGLTgu
CgpJZiB5b3UgdXNlIEwgdG8gc2VsZWN0IGEgVVMtQVNDSUkgbGFiZWwgKGku
ZS4gU2VudCkgdGhlbiB3YW50IHRvIG5hcnJvdwp0aGUgc2VhcmNoIGJ5IHBy
ZXNzaW5nIEwgYWdhaW4gYW5kIHVzZSB0YWIgdG8gbWF0Y2ggYWdhaW5zdCBh
biBVVEYtOApsYWJlbCBzdXAgY3Jhc2hlcy4KCkFsc28gZml4ZXMgb25lIHdo
aXRlc3BhY2UgZXJyb3IgaW4gYmluL3N1cAotLS0KIGJpbi9zdXAgICAgICAg
ICAgIHwgICAgNCArKystCiBsaWIvc3VwL2J1ZmZlci5yYiB8ICAgIDIgKy0K
IDIgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9u
cygtKQoKZGlmZiAtLWdpdCBhL2Jpbi9zdXAgYi9iaW4vc3VwCmluZGV4IGZk
MWRkZTguLjEwYmUxNjEgMTAwNzU1Ci0tLSBhL2Jpbi9zdXAKKysrIGIvYmlu
L3N1cApAQCAtNDksNyArNDksNyBAQCBObyB2YXJpYWJsZXMuCiBObyByZXR1
cm4gdmFsdWUuCiBFT1MKIAotUmVkd29vZDo6SG9va01hbmFnZXIucmVnaXN0
ZXIgInNodXRkb3duIiwgPDxFT1MgCitSZWR3b29kOjpIb29rTWFuYWdlci5y
ZWdpc3RlciAic2h1dGRvd24iLCA8PEVPUwogRXhlY3V0ZXMgd2hlbiBzdXAg
aXMgc2h1dHRpbmcgZG93bi4gTWF5IGJlIHJ1biB3aGVuIHN1cCBpcyBjcmFz
aGluZywKIHNvIGRvblwndCBkbyBhbnl0aGluZyB0b28gaW1wb3J0YW50LiBS
dW4gYmVmb3JlIHRoZSBsYWJlbCwgY29udGFjdHMsCiBhbmQgcGVvcGxlIGFy
ZSBzYXZlZC4KQEAgLTI5OSw2ICsyOTksOCBAQCBiZWdpbgogICAgICAgU2Vh
cmNoUmVzdWx0c01vZGUuc3Bhd25fZnJvbV9xdWVyeSAiaXM6dW5yZWFkIgog
ICAgIHdoZW4gOmxpc3RfbGFiZWxzCiAgICAgICBsYWJlbHMgPSBMYWJlbE1h
bmFnZXIuYWxsX2xhYmVscy5tYXAgeyB8bHwgTGFiZWxNYW5hZ2VyLnN0cmlu
Z19mb3IgbCB9CisgICAgICBsYWJlbHMgPSBsYWJlbHMuZWFjaCB7IHxsfCBs
LmZvcmNlX2VuY29kaW5nICdVVEYtOCcgaWYgbC5tZXRob2RzLmluY2x1ZGU/
KDplbmNvZGluZykgfQorCiAgICAgICB1c2VyX2xhYmVsID0gYm0uYXNrX3dp
dGhfY29tcGxldGlvbnMgOmxhYmVsLCAiU2hvdyB0aHJlYWRzIHdpdGggbGFi
ZWwgKGVudGVyIGZvciBsaXN0aW5nKTogIiwgbGFiZWxzCiAgICAgICB1bmxl
c3MgdXNlcl9sYWJlbC5uaWw/CiAgICAgICAgIGlmIHVzZXJfbGFiZWwuZW1w
dHk/CmRpZmYgLS1naXQgYS9saWIvc3VwL2J1ZmZlci5yYiBiL2xpYi9zdXAv
YnVmZmVyLnJiCmluZGV4IGYzY2ZiOGEuLmMzNmNhNTYgMTAwNjQ0Ci0tLSBh
L2xpYi9zdXAvYnVmZmVyLnJiCisrKyBiL2xpYi9zdXAvYnVmZmVyLnJiCkBA
IC00NTQsNyArNDU0LDcgQEAgRU9TCiAgIGRlZiBhc2tfd2l0aF9jb21wbGV0
aW9ucyBkb21haW4sIHF1ZXN0aW9uLCBjb21wbGV0aW9ucywgZGVmYXVsdD1u
aWwKICAgICBhc2sgZG9tYWluLCBxdWVzdGlvbiwgZGVmYXVsdCBkbyB8c3wK
ICAgICAgIHMuZm9yY2VfZW5jb2RpbmcgJ1VURi04JyBpZiBzLm1ldGhvZHMu
aW5jbHVkZT8oOmVuY29kaW5nKQotICAgICAgY29tcGxldGlvbnMuc2VsZWN0
IHsgfHh8IHggPX4gL14je1JlZ2V4cDo6ZXNjYXBlIHN9L2kgfS5tYXAgeyB8
eHwgW3gsIHhdIH0KKyAgICAgIGNvbXBsZXRpb25zLnNlbGVjdCB7IHx4fCB4
ID1+IC9eI3tSZWdleHA6OmVzY2FwZSBzfS9pdSB9Lm1hcCB7IHx4fCBbeCwg
eF0gfQogICAgIGVuZAogICBlbmQKIAotLSAKMS43LjMuMgoK

--=-1288876880-669137-13911-3783-1-=--