From d567c5942a06fa2604d065101c990d3743bf5f13 Mon Sep 17 00:00:00 2001
From: Yoni Rabkin <yoni@rabkins.net>
Date: Fri, 11 Dec 2020 14:29:00 -0500
Subject: * rt-liberation.el: fix n/p in viewer2

Not the best solution, but one that reliably works.
---
 rt-liberation.el | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

(limited to 'rt-liberation.el')

diff --git a/rt-liberation.el b/rt-liberation.el
index 3c2962f..d708f43 100644
--- a/rt-liberation.el
+++ b/rt-liberation.el
@@ -243,6 +243,9 @@ This variable is made buffer local for the ticket history")
 (defvar rt-liber-display-ticket-at-point-f 'rt-liber-viewer2-display-ticket-at-point
   "Function for displaying ticket at point in the browser.")
 
+(defvar rt-liber-viewer2-section-regexp "^Ticket [0-9]+ by "
+  "Regular expression to match a section in the viewer.")
+
 (defvar rt-liber-viewer2-recenter 4
   "Argument passed to `recenter' in the viewer.")
 
@@ -1521,25 +1524,29 @@ ASSOC-BROWSER if non-nil should be a ticket browser."
 
 (defun rt-liber-viewer2-next-section-in ()
   (interactive)
-  (forward-line)
-  (let ((next (next-single-property-change
-	       (point)
-	       'rt-liberation-viewer-header)))
-    (if (not next)
-	(message "no next section")
-      (goto-char next)
-      (recenter rt-liber-viewer2-recenter))))
+  (when (looking-at rt-liber-viewer2-section-regexp)
+    (goto-char (1+ (point))))
+  (let ((next (re-search-forward rt-liber-viewer2-section-regexp
+				 (point-max)
+				 t)))
+    (cond ((not next)
+	   (message "no next section"))
+	  (t
+	   (recenter rt-liber-viewer2-recenter)))
+    (goto-char (point-at-bol))))
 
 (defun rt-liber-viewer2-previous-section-in ()
   (interactive)
-  (let ((prev (previous-single-property-change
-	       (point-at-bol)
-	       'rt-liberation-viewer-header)))
-    (if (not prev)
-	(message "no previous section")
-      (goto-char prev)
-      (forward-line -1)
-      (recenter rt-liber-viewer2-recenter))))
+  (when (looking-at rt-liber-viewer2-section-regexp)
+    (goto-char (1- (point))))
+  (let ((prev (re-search-backward rt-liber-viewer2-section-regexp
+				  (point-min)
+				  t)))
+    (cond ((not prev)
+	   (message "no previous section"))
+	  (t
+	   (recenter rt-liber-viewer2-recenter)))
+    (goto-char (point-at-bol))))
 
 (defun rt-liber-viewer2-answer ()
   (interactive)
-- 
cgit v1.2.3