From 6279babad20120a7cc5d4bc0968983f88545648f Mon Sep 17 00:00:00 2001
From: wmorgan <wmorgan@5c8cc53c-5e98-4d25-b20a-d8db53a31250>
Date: Mon, 2 Apr 2007 01:16:14 +0000
Subject: [PATCH] fixed cursor issue and slightly better error message for
 messages from broken sources

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@365 5c8cc53c-5e98-4d25-b20a-d8db53a31250
---
 doc/TODO                          | 10 +++++-----
 lib/sup/message.rb                |  6 +++++-
 lib/sup/modes/line-cursor-mode.rb |  5 +++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/doc/TODO b/doc/TODO
index 7888df7..dded681 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,12 +1,8 @@
 for 0.0.8
 ---------
 _ nice little startup config program
-_ bugfix: when one new message comes into an imap folder, we don't
-   catch it until a reload
-_ bugfix: triggering a pageup when cursor scrolling up jumps to the
+x bugfix: triggering a pageup when cursor scrolling up jumps to the
    bottom of the page rather than the next line
-_ bugfix: add new message counts until keypress
-_ bugfix: attachment filenames sometimes not detected (filename=)
 x bugfix: final logging messages to stdout?
 x bugfix: mbox directory shouldn't generate an exception, just an error
 x bugfix: m in thread-view-mode when a person is not selected should open up a
@@ -22,6 +18,10 @@ x bugfix: single-line messages come empty upon reply
 
 next release
 ------------
+_ bugfix: when one new message comes into an imap folder, we don't
+   catch it until a reload (sometimes?)
+_ bugfix: add new message counts until keypress
+_ bugfix: attachment filenames sometimes not detected (filename=)
 _ split out threading & message chunk parsing to a separate library
 
 near future
diff --git a/lib/sup/message.rb b/lib/sup/message.rb
index 26bd428..13f9377 100644
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@ -205,7 +205,11 @@ class Message
 ***********************************************************************
  An error occurred while loading this message. It is possible that
  the source has changed, or (in the case of remote sources) is down.
- The message source and offset are: #@source##@source_info
+ You can check the log for errors, though hopefully an error window
+ should have popped up at some point.
+
+ The message location was:
+ #@source##@source_info
 ***********************************************************************
 
 The error message was:
diff --git a/lib/sup/modes/line-cursor-mode.rb b/lib/sup/modes/line-cursor-mode.rb
index 5efefae..1405a78 100644
--- a/lib/sup/modes/line-cursor-mode.rb
+++ b/lib/sup/modes/line-cursor-mode.rb
@@ -61,7 +61,7 @@ protected
     return false unless @curpos < lines - 1
     if @curpos >= botline - 1
       page_down
-      set_cursor_pos [topline + 1, botline].min
+      set_cursor_pos topline
     else
       @curpos += 1
       unless buffer.dirty?
@@ -77,8 +77,9 @@ protected
   def cursor_up
     return false unless @curpos > @cursor_top
     if @curpos == topline
+      old_topline = topline
       page_up
-      set_cursor_pos [botline - 2, topline].max
+      set_cursor_pos [old_topline - 1, topline].max
     else
       @curpos -= 1
       unless buffer.dirty?
-- 
2.43.0