commit 80828f88334bb445846004939b8bef83f3dcd8d9
parent e711bce879a7ccd433cfede92d33e68bc91bb59a
Author: Rich Lane <rlane@club.cc.cmu.edu>
Date: Mon, 8 Mar 2010 08:02:17 -0800
Merge branch 'master' into next
Diffstat:
6 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -2,40 +2,42 @@ William Morgan <wmorgan-sup at the masanjin dot nets>
Rich Lane <rlane at the club.cc.cmu dot edus>
Ismo Puustinen <ismo at the iki dot fis>
Nicolas Pouillard <nicolas.pouillard at the gmail dot coms>
+Eric Sherman <hyperbolist at the gmail dot coms>
Ben Walton <bwalton at the artsci.utoronto dot cas>
Mike Stipicevic <stipim at the rpi dot edus>
Marcus Williams <marcus-sup at the bar-coded dot nets>
Lionel Ott <white.magic at the gmx dot des>
+Tero Tilus <tero at the tilus dot nets>
Ingmar Vanhassel <ingmar at the exherbo dot orgs>
Mark Alexander <marka at the pobox dot coms>
Christopher Warrington <chrisw at the rice dot edus>
Richard Brown <rbrown at the exherbo dot orgs>
-Anthony Martinez <pi+sup at the pihost dot uss>
Marc Hartstein <marc.hartstein at the alum.vassar dot edus>
Israel Herraiz <israel.herraiz at the gmail dot coms>
-Tero Tilus <tero at the tilus dot nets>
+Anthony Martinez <pi+sup at the pihost dot uss>
+Michael Stapelberg <michael at the stapelberg dot des>
Bo Borgerson <gigabo at the gmail dot coms>
William Erik Baxter <web at the superscript dot coms>
Grant Hollingworth <grant at the antiflux dot orgs>
Adeodato Simó <dato at the net.com.org dot ess>
-Edward Z. Yang <ezyang at the mit dot edus>
+Daniel Schoepe <daniel.schoepe at the googlemail dot coms>
Steve Goldman <sgoldman at the tower-research dot coms>
-Michael Stapelberg <michael at the stapelberg dot des>
+Edward Z. Yang <ezyang at the MIT dot EDUs>
Decklin Foster <decklin at the red-bean dot coms>
-Eric Sherman <hyperbolist at the gmail dot coms>
Cameron Matheson <cam+sup at the cammunism dot orgs>
Carl Worth <cworth at the cworth dot orgs>
-Alex Vandiver <alex at the chmrr dot nets>
-Jeff Balogh <its.jeff.balogh at the gmail dot coms>
Andrew Pimlott <andrew at the pimlott dot nets>
+Alex Vandiver <alexmv at the mit dot edus>
+Jeff Balogh <its.jeff.balogh at the gmail dot coms>
Peter Harkins <ph at the malaprop dot orgs>
Kornilios Kourtis <kkourt at the cslab.ece.ntua dot grs>
+Michael Hamann <michael at the content-space dot des>
Giorgio Lando <patroclo7 at the gmail dot coms>
Benoît PIERRE <benoit.pierre at the gmail dot coms>
Jonah <Jonah at the GoodCoffee dot cas>
ian <ian at the lorf dot orgs>
Steven Walter <swalter at the monarch.(none)>
-Jon M. Dugan <jdugan at the es dot nets>
+Alex Vandiver <alex at the chmrr dot nets>
Stefan Lundström <lundst at the snabb.(none)>
-Michael Hamann <michael at the content-space dot des>
+Jon M. Dugan <jdugan at the es dot nets>
Kirill Smelkov <kirr at the landau.phys.spbu dot rus>
diff --git a/History.txt b/History.txt
@@ -1,3 +1,17 @@
+== 0.11 / 2010-03-07
+* Remove deprecated Ferret backend.
+* Add deprecation notices to IMAP, IMAPS, and mbox+ssh sources.
+* 256 color support.
+* Backwards-compatible index format improvements.
+* Saved searches.
+* Improved support for custom keybindings.
+* Idle detection - poll totals accumulate and index flushes on idle.
+* Several textfield improvments.
+* New hooks: publish, mentions-attachments, keybindings,
+ index-mode-date-widget, gpg-args, and crypto-settings.
+* sup-cmd for easy programmatic access to a Sup index.
+* As always, many bugfixes and tweaks.
+
== 0.10.2 / 2010-01-26
* Update gem dependencies to pull in xapian-full and ncursesw instead of ferret
and ncurses.
diff --git a/README.txt b/README.txt
@@ -12,8 +12,7 @@ email as an extension of your long-term memory, Sup is for you.
Sup makes it easy to:
- Handle massive amounts of email.
-- Mix email from different sources: mbox files (even across different
- machines), Maildir directories, IMAP folders, and GMail accounts.
+- Mix email from different sources: mbox files and Maildirs.
- Instantaneously search over your entire email collection. Search over
body text, or use a query language to combine search predicates in any
@@ -39,7 +38,7 @@ Features:
operability, regardless of how much amount of email you have.
- Immediate full-text search of your entire email archive, using the
- Ferret query language. Search over message bodies, labels, from: and
+ Xapian query language. Search over message bodies, labels, from: and
to: fields, or any combination thereof.
- Thread-centrism. Operations are performed at the thread, not the
@@ -73,13 +72,6 @@ Current limitations which will be fixed:
source (read, move, delete, etc) with another client Sup will punish
you with a lengthy reindexing process.
-- Support for mbox, Maildir, and IMAP only at this point. No support for
- POP or mh.
-
-- IMAP support is very slow due mostly to Ruby's IMAP library. You may
- consider something like offlineimap to mirror your IMAP folders with
- local Maildir ones.
-
- Unix-centrism in MIME attachment handling and in sendmail invocation.
== SYNOPSYS:
@@ -96,7 +88,7 @@ Current limitations which will be fixed:
== REQUIREMENTS:
- - ferret >= 0.11.6
+ - xapian-full >= 1.1.3.2
- ncurses >= 0.9.1
- rmail >= 0.17
- highline
diff --git a/ReleaseNotes b/ReleaseNotes
@@ -1,3 +1,19 @@
+Release 0.11:
+
+The deprecated Ferret index has been removed.
+
+Remote sources (IMAP, IMAPS, and mbox+ssh) have been deprecated and will be
+removed in 0.12. Tools like offlineimap, fetchmail, and rsync provide a much
+better user experience for these mail sources than Sup would ever be able to by
+itself.
+
+If your terminal supports it you can now use 256 colors in your colorscheme. Run
+the contrib/colorpicker.rb program to get the color names to put in colors.yaml.
+
+Saved searches are now supported. Hit '%' in search-results-mode to save the
+current search, and enter an empty search string to open the list of saved
+searches.
+
Release 0.10:
The Xapian backend is now the default. Convert your old, crash-prone Ferret
diff --git a/lib/sup/keymap.rb b/lib/sup/keymap.rb
@@ -126,7 +126,7 @@ EOS
end
def self.run_hook global_keymap
- modes = Hash[Mode.keymaps.map { |klass,keymap| [Mode.make_name(klass.name),klass] }]
+ modes = Hash[*Mode.keymaps.map { |klass,keymap| [Mode.make_name(klass.name),klass] }]
locals = {
:modes => modes,
:global_keymap => global_keymap,
diff --git a/www/index.html b/www/index.html
@@ -109,8 +109,8 @@
<h2>Status</h2>
<p>
- The current version of Sup is 0.10.2, released 2010-01-26. This is a
- beta release. It supports mbox, IMAP, IMAPS, and Maildir mailstores.
+ The current version of Sup is 0.11, released 2010-03-07. This is a
+ beta release. It supports mbox and Maildir mailstores.
</p>
<p>To be notified by email of Sup releases, subscribe to the
@@ -159,50 +159,51 @@
<li> Rich Lane </li>
<li> Ismo Puustinen </li>
<li> Nicolas Pouillard </li>
+ <li> Eric Sherman </li>
<li> Ben Walton </li>
<li> Mike Stipicevic </li>
<li> Marcus Williams </li>
<li> Lionel Ott </li>
+ <li> Tero Tilus </li>
<li> Ingmar Vanhassel </li>
<li> Mark Alexander </li>
<li> Christopher Warrington </li>
<li> Richard Brown </li>
- <li> Anthony Martinez </li>
<li> Marc Hartstein </li>
<li> Israel Herraiz </li>
- <li> Tero Tilus </li>
+ <li> Anthony Martinez </li>
+ <li> Michael Stapelberg </li>
<li> Bo Borgerson </li>
<li> William Erik Baxter </li>
<li> Grant Hollingworth </li>
<li> Adeodato Simó </li>
- <li> Edward Z. Yang </li>
+ <li> Daniel Schoepe </li>
<li> Steve Goldman </li>
- <li> Michael Stapelberg </li>
+ <li> Edward Z. Yang </li>
<li> Decklin Foster </li>
- <li> Eric Sherman </li>
<li> Cameron Matheson </li>
<li> Carl Worth </li>
+ <li> Andrew Pimlott </li>
<li> Alex Vandiver </li>
<li> Jeff Balogh </li>
- <li> Andrew Pimlott </li>
<li> Peter Harkins </li>
<li> Kornilios Kourtis </li>
+ <li> Michael Hamann </li>
<li> Giorgio Lando </li>
<li> Benoît PIERRE </li>
+ <li> Jonah </li>
+ <li> ian </li>
<li> Steven Walter </li>
- <li> Jon M. Dugan </li>
+ <li> Alex Vandiver </li>
<li> Stefan Lundström </li>
- <li> Michael Hamann </li>
+ <li> Jon M. Dugan </li>
<li> Kirill Smelkov </li>
</ul>
</p>
<p>
- Sup is made possible by the hard work of <a
- href="http://www.davebalmain.com/">Dave Balmain</a> and his
- tragically abandoned IR engine <a
- href="http://ferret.davebalmain.com/trac/">Ferret</a>, and by that of <a
- href="http://www.lickey.com/">Matt Armstrong</a> and his
+ Sup is made possible by the <a href="http://xapian.org">Xapian</a> search engine,
+ and by <a href="http://www.lickey.com/">Matt Armstrong</a> and his
tragically abandoned <a href="http://www.rfc20.org/rubymail/">RubyMail</a>
package.
</p>