commit 6c8e3b84e90505127c7e8bccdea6729c222e46c8
parent 0c5aecc959b988b057b5d5cf30c2ba6e50cbe70e
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Thu, 24 Jan 2008 20:44:20 -0800
Merge branch 'stop-saving' into next
Diffstat:
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/sup-sync b/bin/sup-sync
@@ -238,7 +238,7 @@ rescue Exception => e
File.open("sup-exception-log.txt", "w") { |f| f.puts e.backtrace }
raise
ensure
- index.save
+ #index.save # actually, don't want to save!
Redwood::finish
index.unlock
end
diff --git a/lib/sup/modes/thread-view-mode.rb b/lib/sup/modes/thread-view-mode.rb
@@ -49,14 +49,14 @@ EOS
k.add :unsubscribe_from_list, "Subscribe to/unsubscribe from mailing list", ")"
k.add :pipe_message, "Pipe message or attachment to a shell command", '|'
- k.add_multi "(A)rchive/(d)elete/mark as (s)pam/mark as u(N)read:", '.' do |kk|
+ k.add_multi "(a)rchive/(d)elete/mark as (s)pam/mark as u(N)read:", '.' do |kk|
kk.add :archive_and_kill, "Archive this thread and kill buffer", 'a'
kk.add :delete_and_kill, "Delete this thread and kill buffer", 'd'
kk.add :spam_and_kill, "Mark this thread as spam and kill buffer", 's'
kk.add :unread_and_kill, "Mark this thread as unread and kill buffer", 'N'
end
- k.add_multi "(A)rchive/(d)elete/mark as (s)pam/mark as u(N)read/do (n)othing:", ',' do |kk|
+ k.add_multi "(a)rchive/(d)elete/mark as (s)pam/mark as u(N)read/do (n)othing:", ',' do |kk|
kk.add :archive_and_next, "Archive this thread, kill buffer, and view next", 'a'
kk.add :delete_and_next, "Delete this thread, kill buffer, and view next", 'd'
kk.add :spam_and_next, "Mark this thread as spam, kill buffer, and view next", 's'