From: William Morgan <wmorgan-sup@masanjin.net>
Date: Wed, 9 Sep 2009 14:08:33 +0000 (-0400)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.cworth.org/git?p=sup;a=commitdiff_plain;h=3f08a0191a824c5d6e7731a3d25106d1a0c3931e

Merge branch 'master' into next

Conflicts:
	lib/sup/ferret_index.rb
---

3f08a0191a824c5d6e7731a3d25106d1a0c3931e
diff --cc lib/sup/modes/console-mode.rb
index af3d66d,f0c626e..e9bf47c
--- a/lib/sup/modes/console-mode.rb
+++ b/lib/sup/modes/console-mode.rb
@@@ -64,15 -65,9 +65,9 @@@ class ConsoleMode < LogMod
    end
  
    def initialize
 -    super
 +    super "console"
      @console = Console.new self
      @binding = @console.instance_eval { binding }
-     self << <<EOS
- Sup #{VERSION} console.
- Available commands: #{(@console.methods - Object.methods) * ", "}
- Ctrl-g stops evaluation; 'e' restarts it.
- 
- EOS
    end
  
    def execute cmd
diff --cc lib/sup/xapian_index.rb
index 1395601,ab25ea0..e1cfe65
--- a/lib/sup/xapian_index.rb
+++ b/lib/sup/xapian_index.rb
@@@ -185,7 -192,8 +192,8 @@@ EO
    def parse_query s
      query = {}
  
-     subs = s.gsub(/\b(to|from):(\S+)\b/) do
+     subs = HookManager.run("custom-search", :subs => s) || s
 -    subs = s.gsub(/\b(to|from):(\S+)\b/) do
++    subs = subs.gsub(/\b(to|from):(\S+)\b/) do
        field, name = $1, $2
        if(p = ContactManager.contact_for(name))
          [field, p.email]