From aae7b5a31029ad527d8bf7d8120405d9d13a18f9 Mon Sep 17 00:00:00 2001
From: Jason Cox <dev@jasoncarloscox.com>
Date: Fri, 29 Oct 2021 01:10:02 -0600
Subject: [PATCH] vim: fix extracting message ids from list (#247)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The current method doesn't work because the list uses a fancy line
character (`│`) as the separator, not a regular pipe character (`|`).
Matching for the first number in the line instead solves the problem and
will continue to work regardless of what separator is used.
---
 vim/autoload/himalaya/msg.vim | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vim/autoload/himalaya/msg.vim b/vim/autoload/himalaya/msg.vim
index 8905296..aa9bc75 100644
--- a/vim/autoload/himalaya/msg.vim
+++ b/vim/autoload/himalaya/msg.vim
@@ -326,9 +326,13 @@ function! s:bufwidth()
   return width - numwidth - foldwidth - signwidth
 endfunction
 
+function! s:get_msg_id(line)
+    return matchstr(a:line, '[0-9]*')
+endfunction
+
 function! s:get_focused_msg_id()
   try
-    return s:trim(split(getline("."), "|")[0])
+    return s:get_msg_id(getline("."))
   catch
     throw "message not found"
   endtry
@@ -336,7 +340,7 @@ endfunction
 
 function! s:get_focused_msg_ids(from, to)
   try
-    return join(map(range(a:from, a:to), "s:trim(split(getline(v:val), '|')[0])"), ",")
+    return join(map(range(a:from, a:to), "s:get_msg_id(getline(v:val))"), ",")
   catch
     throw "messages not found"
   endtry