From: Eric Wong <e@80x24.org>
Date: Mon, 17 Aug 2015 03:11:43 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/search'
X-Git-Tag: v1.0.0~1066
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=118ac5c2dc0e7a193ff58f2a9003636e1353583c;hp=9041b136ba7a106ed5ff33da4b6ae28c2a0f4333

Merge remote-tracking branch 'origin/search'

* origin/search:
  view: deduplicate common code for loading search results
  SearchMsg: ensure metadata for ghost messages mid
  implement /s/$SUBJECT_PATH.html lookups
  search: remove unnecessary xpfx export
  www: /t/$MESSAGE_ID.html for threads
  view: hoist out index_walk function
  view: reply threading adjustment
  thread: common sorting code
  view: display replies in per-message view
  search: make search results more OO
  extract redundant Message-ID handling code
  search: implement index_sync to fixup indexer
  initial search backend implementation
---

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 575c5ffd..47082431 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -201,14 +201,17 @@ sub index_walk {
 	# Drop signatures
 	$s =~ s/^-- \n.*\z//ms and $$more = 'more...';
 
-	# kill any leading or trailing whitespace
-	$s =~ s/\A\s+//s;
+	# kill any leading or trailing whitespace lines
+	$s =~ s/^\s*$//sgm;
 	$s =~ s/\s+\z//s;
 
 	if (length $s) {
 		# add prefix:
 		$s =~ s/^/$pfx/sgm;
 
+		# kill per-line trailing whitespace
+		$s =~ s/[ \t]+$//sgm;
+
 		$rv .= $s . "\n";
 	}
 	$rv;