summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2014-05-01 02:28:01 +0200
committermathieui <mathieui@mathieui.net>2014-05-01 02:28:01 +0200
commitc287a959b424efbff3817352d33f0a12e9eacdfb (patch)
treee661a196738c1a40bde7cf8f4e80a70e7651c61f
parent48e59d377fc03feb1203c6a02d7e6424a533be62 (diff)
downloadpoezio-c287a959b424efbff3817352d33f0a12e9eacdfb.tar.gz
poezio-c287a959b424efbff3817352d33f0a12e9eacdfb.tar.bz2
poezio-c287a959b424efbff3817352d33f0a12e9eacdfb.tar.xz
poezio-c287a959b424efbff3817352d33f0a12e9eacdfb.zip
Fix bugs in the previous/next highlight functions
-rw-r--r--CHANGELOG3
-rw-r--r--src/windows.py8
2 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 53bf3b1d..4f1d8609 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,9 @@ For more detailed changelog, see the roadmap:
http://dev.louiz.org/projects/poezio/roadmap
* Poezio 0.8.3 - dev
+- a change_title plugin changes the title of the terminal depending
+ on the current tab. Also, poezio is now "poezio" and not "python3".
+- the OTR plugin now tries to interpret html by default
- The interface will adapt if the terminal is too small
- Implement XEP-0184 (message delivery receipts)
- better setup scripts (use setuptools)
diff --git a/src/windows.py b/src/windows.py
index 3087c786..5500059a 100644
--- a/src/windows.py
+++ b/src/windows.py
@@ -767,8 +767,8 @@ class TextWin(Win):
highlights, scroll to the end of the buffer.
"""
log.debug('Going to the next highlight…')
- if not self.highlights or self.hl_pos != self.hl_pos or \
- self.hl_pos == len(self.highlights)-1:
+ if (not self.highlights or self.hl_pos != self.hl_pos or
+ self.hl_pos >= len(self.highlights) - 1):
self.hl_pos = float('nan')
self.pos = 0
return
@@ -789,6 +789,7 @@ class TextWin(Win):
self.hl_pos = float('nan')
self.pos = 0
return
+ self.hl_pos = 0
hl = self.highlights[0]
self.pos = len(self.built_lines) - pos - self.height
if self.pos < 0 or self.pos >= len(self.built_lines):
@@ -808,7 +809,7 @@ class TextWin(Win):
return
if self.hl_pos != self.hl_pos:
self.hl_pos = len(self.highlights) - 1
- elif self.hl_pos > 0:
+ else:
self.hl_pos -= 1
log.debug("self.hl_pos = %s", self.hl_pos)
hl = self.highlights[self.hl_pos]
@@ -822,6 +823,7 @@ class TextWin(Win):
self.hl_pos = float('nan')
self.pos = 0
return
+ self.hl_pos = 0
hl = self.highlights[0]
self.pos = len(self.built_lines) - pos - self.height
if self.pos < 0 or self.pos >= len(self.built_lines):