From d75a3471c2e618764dfca3e0bf2ed03d9914a169 Mon Sep 17 00:00:00 2001
From: gwenn <gtreguier@gmail.com>
Date: Sun, 18 Feb 2018 11:55:23 +0100
Subject: [PATCH] Fix move to next word

---
 src/line_buffer.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/line_buffer.rs b/src/line_buffer.rs
index 9915f731..d08063f9 100644
--- a/src/line_buffer.rs
+++ b/src/line_buffer.rs
@@ -407,7 +407,7 @@ impl LineBuffer {
         }
         let mut wp = 0;
         let mut gis = self.buf[pos..].grapheme_indices(true);
-        let mut gi = if at != At::Start {
+        let mut gi = if at == At::BeforeEnd {
             // TODO Validate
             gis.next()
         } else {
@@ -1088,6 +1088,11 @@ mod test {
         let ok = s.move_to_next_word(At::AfterEnd, Word::Emacs, 1);
         assert_eq!(true, ok);
         assert_eq!(7, s.pos); // after 'c'
+
+        s.move_home();
+        let ok = s.move_to_next_word(At::AfterEnd, Word::Emacs, 1);
+        assert_eq!(true, ok);
+        assert_eq!(1, s.pos); // after 'a'
     }
 
     #[test]
-- 
GitLab