From 50d2831081b3444590ea12dc1fbbd1a1c824e078 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 17 Oct 2023 11:30:23 -0400
Subject: [PATCH] Cleanup.

---
 src/parser/keyword.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/parser/keyword.rs b/src/parser/keyword.rs
index 0424f942..1374ffe4 100644
--- a/src/parser/keyword.rs
+++ b/src/parser/keyword.rs
@@ -22,6 +22,7 @@ use super::org_source::BracketDepth;
 use super::org_source::OrgSource;
 use super::util::get_consumed;
 use super::util::maybe_consume_trailing_whitespace_if_not_exiting;
+use super::util::org_line_ending;
 use crate::context::bind_context;
 use crate::context::parser_with_context;
 use crate::context::RefContext;
@@ -50,9 +51,7 @@ fn _filtered_keyword<'s, F: Fn(OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s
     // TODO: When key is a member of org-element-parsed-keywords, value can contain the standard set objects, excluding footnote references.
     let (remaining, (consumed_input, (_, _, parsed_key, _))) =
         consumed(tuple((space0, tag("#+"), key_parser, tag(":"))))(input)?;
-    if let Ok((remaining, _)) =
-        tuple((space0::<_, CustomError>, alt((line_ending, eof))))(remaining)
-    {
+    if let Ok((remaining, _)) = tuple((space0::<_, CustomError>, org_line_ending))(remaining) {
         return Ok((
             remaining,
             Keyword {
@@ -64,11 +63,9 @@ fn _filtered_keyword<'s, F: Fn(OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s
         ));
     }
     let (remaining, _ws) = space0(remaining)?;
-    let (remaining, parsed_value) = recognize(many_till(
-        anychar,
-        peek(tuple((space0, alt((line_ending, eof))))),
-    ))(remaining)?;
-    let (remaining, _ws) = tuple((space0, alt((line_ending, eof))))(remaining)?;
+    let (remaining, parsed_value) =
+        recognize(many_till(anychar, peek(tuple((space0, org_line_ending)))))(remaining)?;
+    let (remaining, _ws) = tuple((space0, org_line_ending))(remaining)?;
     Ok((
         remaining,
         Keyword {