Merge branch 'master' into next

Conflicts:
	lib/sup/ferret_index.rb

diff --cc bin/sup
Simple merge

diff --cc lib/sup/buffer.rb
Simple merge

diff --cc lib/sup/ferret_index.rb
Simple merge

diff --cc lib/sup/modes/console-mode.rb
index af3d66d00d1c8fdd85521fecdf8edeef23c6c36b,f0c626e60e1024cdeee957e1dc5d0309f7f3973b..e9bf47cc914a978c0278d319c37654b2a6c8f97d
--- 1/lib/sup/modes/console-mode.rb
--- 2/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 1395601367ef49fdebb9ef5019a82a07a0c83ca3,ab25ea04125eb9f8b1ee204a02bdb015d19604aa..e1cfe65a0c1266d6280d79d5e5fda8c310bd0508
--- 1/lib/sup/xapian_index.rb
--- 2/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]