From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 11 Apr 2025 03:52:58 +0000 (-0700)
Subject: Half-fix rendering bug
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a43c3d032c1effca19324da8058dc1508d3c5480;p=pspp

Half-fix rendering bug
---

diff --git a/rust/pspp/src/output/pivot/output.rs b/rust/pspp/src/output/pivot/output.rs
index 24ae41ee96..05febd7cfc 100644
--- a/rust/pspp/src/output/pivot/output.rs
+++ b/rust/pspp/src/output/pivot/output.rs
@@ -414,7 +414,7 @@ impl<'a> Heading<'a> {
             // Merge adjacent identical categories (but don't merge across a vertical rule).
             let categories = categories
                 .coalesce(|(a_r, a), (b_r, b)| {
-                    if !vrules[b_r.start] && std::ptr::eq(a, b) {
+                    if a_r.end == b_r.start && !vrules[b_r.start] && std::ptr::eq(a, b) {
                         Ok((a_r.start..b_r.end, a))
                     } else {
                         Err(((a_r, a), (b_r, b)))