emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/gnus-cloud b992a2e 42/61: Merge branch 'master' of


From: Teodor Zlatanov
Subject: [Emacs-diffs] scratch/gnus-cloud b992a2e 42/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Fri, 1 Jul 2016 17:37:55 +0000 (UTC)

branch: scratch/gnus-cloud
commit b992a2edf7fafef1e12f428171e4f2d5fbe730fd
Merge: dde06db dd98ee8
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 src/minibuf.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/minibuf.c b/src/minibuf.c
index efce7e2..57eea05 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))
     {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]