[elpa] externals/mct 872732ac63 1/4: Fix cycling when candidates have spaces/newlines

[ELPA Syncer]

branch: externals/mct
commit 872732ac636fe23ea30567b53c9b18f30543ff58
Author: Protesilaos Stavrou <i...@protesilaos.com>
Commit: Protesilaos Stavrou <i...@protesilaos.com>

    Fix cycling when candidates have spaces/newlines
    
    Thanks to Tomasz Hołubowicz for reporting the bug in issue 2 over at the
    GitHub mirror: <https://github.com/protesilaos/mct/issues/2>.
---
 mct.el | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/mct.el b/mct.el
index 586cf44f5f..6e1698a203 100644
--- a/mct.el
+++ b/mct.el
@@ -524,6 +524,12 @@ by `mct-completion-windows-regexp'."
     (or (get-text-property point 'completion--string)
         (get-text-property point 'mouse-face))))
 
+(defun mct--arg-completion-point-p (arg)
+  "Return non-nil if ARGth next completion exists."
+  (save-excursion
+    (mct--next-completion arg)
+    (mct--completions-completion-p)))
+
 (defun mct--first-completion-point ()
   "Return the `point' of the first completion."
   (save-excursion
@@ -596,6 +602,16 @@ a `one-column' value."
            (truncate (/ (window-body-height) 4.0))))
    t))
 
+(defun mct--empty-line-p (arg)
+  "Return non-nil if ARGth line is empty."
+  (unless (mct--arg-completion-point-p arg)
+    (save-excursion
+      (goto-char (point-at-bol))
+      (and (not (bobp))
+              (or (beginning-of-line (1+ arg)) t)
+              (save-match-data
+                (looking-at "[\s\t]*$"))))))
+
 (defun mct--bottom-of-completions-p (arg)
   "Test if point is at the notional bottom of the Completions.
 ARG is a numeric argument for `next-completion', as described in
@@ -603,13 +619,9 @@ ARG is a numeric argument for `next-completion', as 
described in
   (or (eobp)
       (mct--completions-line-boundary (mct--last-completion-point))
       (= (save-excursion (next-completion arg) (point)) (point-max))
-      ;; The empty final line case...
-      (save-excursion
-        (goto-char (point-at-bol))
-        (and (not (bobp))
-                (or (beginning-of-line (1+ arg)) t)
-                (save-match-data
-                  (looking-at "[\s\t]*$"))))))
+      ;; The empty final line case which should avoid candidates with
+      ;; spaces or line breaks...
+      (mct--empty-line-p arg))))
 
 (defun mct--next-completion (arg)
   "Routine to move to the next ARGth completion candidate."