From: Noam Postavsky <npostavs@gmail.com>
Date: Sat, 25 Jun 2016 00:44:44 +0000 (-0400)
Subject: Fix test-completion with completion-regexp-list
X-Git-Tag: emacs-26.0.90~1840^2~161
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd98ee8992c3246861e44447ffcd02886a52878e;p=emacs.git

Fix test-completion with completion-regexp-list

* src/minibuf.c (Ftest_completion): Handle alist COLLECTION with non-nil
completion-regexp-list (Bug #23533).
---

diff --git a/src/minibuf.c b/src/minibuf.c
index efce7e26b29..57eea05b0fc 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1686,6 +1686,8 @@ the values STRING, PREDICATE and `lambda'.  */)
       tem = Fassoc_string (string, collection, completion_ignore_case ? Qt : Qnil);
       if (NILP (tem))
 	return Qnil;
+      else if (CONSP (tem))
+        tem = XCAR (tem);
     }
   else if (VECTORP (collection))
     {