* Partial revert and subsequent fix of commit c7d08b7.

diff --git a/jiten-pai.py b/jiten-pai.py
index 26a91a4b0e63c00c52c0ed76d04e6cd51f9ac889..7660fabf843c80725ebf9cdee73f02eee9c64f49 100755 (executable)
--- a/jiten-pai.py
+++ b/jiten-pai.py
@@ -1314,13 +1314,13 @@ class jpMainWindow(QMainWindow):
             ok = True
             if len(dics) > 1:
                 result.append(['#', d[0]])
-                rdiff -= 1
+                rdiff += 1
             # search de-inflected verbs
             if len(inflist) > 0:
                 r, ok = self._search_deinflected(inflist, d[1], mode, limit)
                 self._search_show_progress()
                 result.extend(r)
-                limit -= (len(r) + rdiff)
+                limit -= len(r)
                 if limit <= 0:
                     break
                 if not ok:
@@ -1333,7 +1333,7 @@ class jpMainWindow(QMainWindow):
                 r, ok = dict_lookup(d[1], s_term, mode, limit)
                 self._search_show_progress()
                 result.extend(r)
-                limit -= (len(r) + rdiff)
+                limit -= len(r)
                 if not ok:
                     self._search_show_dict_error(d[0])
                 # relax search options
@@ -1345,7 +1345,7 @@ class jpMainWindow(QMainWindow):
                 break
         # report results
         rlen = len(result)
-        self.result_group.setTitle('Search results: %d%s' % (rlen + rdiff, '+' if rlen>=slimit else ''))
+        self.result_group.setTitle('Search results: %d%s' % (rlen - rdiff, '+' if (rlen-rdiff)>=slimit else ''))
         QApplication.processEvents()
         # format result
         if rlen > cfg['hardlimit'] / 2: