GNU bug report logs - #24966
26.0.50; test-completion with alist COLLECTION calls PREDICATE incorrectly

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 24966 in the body.
You can then email your comments to 24966 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Mark Oteiza <mvoteiza <at> udel.edu>
To: bug-gnu-emacs <at> gnu.org
Subject: 26.0.50; 
Date: Sat, 19 Nov 2016 05:26:25 -0500

Hi,

dd98ee8992c3246861e44 appears to be the culprit for breaking the
following from -Q:

1. C-x C-f /tmp/foo.tex
2. M-x reftex-mode
3. Insert the following: \label{foobar}
4. M-x reftex-goto-label

and, when attempting to complete, a wrong-type-argument error occurs.

Debugger entered--Lisp error: (wrong-type-argument listp "argh")
  #[(x) "@;\207" [x] 1]("argh")
  test-completion("argh" ((xr nil "\\\\\\\\\\\\") (index-tags) (is-multi nil) (bibview-cache) (master-dir . "/tmp/") (label-numbers) (bof "/tmp/lol.tex") ("argh" "s" " " "/tmp/lol.tex" nil) (eof "/tmp/lol.tex")) #[(x) "@;\207" [x] 1])
  completion--do-completion(8 8)
  completion--in-region-1(8 8)
  #[1028 "
\n\203!\304!\203\202\305!\305\306\"F\307\310!\210\311\"*\207" [minibuffer-completion-predicate minibuffer-completion-table completion-in-region-mode-predicate completion-in-region--data markerp copy-marker t completion-in-region-mode 1 completion--in-region-1] 8 "\n\n(fn START END COLLECTION PREDICATE)"](8 8 ((xr nil "\\\\\\\\\\\\") (index-tags) (is-multi nil) (bibview-cache) (master-dir . "/tmp/") (label-numbers) (bof "/tmp/lol.tex") ("argh" "s" " " "/tmp/lol.tex" nil) (eof "/tmp/lol.tex")) #[(x) "@;\207" [x] 1])
  apply(#[1028 "
\n\203!\304!\203\202\305!\305\306\"F\307\310!\210\311\"*\207" [minibuffer-completion-predicate minibuffer-completion-table completion-in-region-mode-predicate completion-in-region--data markerp copy-marker t completion-in-region-mode 1 completion--in-region-1] 8 "\n\n(fn START END COLLECTION PREDICATE)"] (8 8 ((xr nil "\\\\\\\\\\\\") (index-tags) (is-multi nil) (bibview-cache) (master-dir . "/tmp/") (label-numbers) (bof "/tmp/lol.tex") ("argh" "s" " " "/tmp/lol.tex" nil) (eof "/tmp/lol.tex")) #[(x) "@;\207" [x] 1]))
  #[771 ":\2030@\301=\203\300\242\302A\"\303#\207\304@\305\306\307\310\311\312\300!\313\"\314\315%A##\207\304\316\"\207" [(#0) t append nil apply apply-partially make-byte-code 642 "\300\242#\207" vconcat vector [] 7 "\n\n(fn FUNS GLOBAL &rest ARGS)" #[1028 "
\n\203!\304!\203\202\305!\305\306\"F\307\310!\210\311\"*\207" [minibuffer-completion-predicate minibuffer-completion-table completion-in-region-mode-predicate completion-in-region--data markerp copy-marker t completion-in-region-mode 1 completion--in-region-1] 8 "\n\n(fn START END COLLECTION PREDICATE)"]] 12 "\n\n(fn FUNS GLOBAL ARGS)"](nil nil (8 8 ((xr nil "\\\\\\\\\\\\") (index-tags) (is-multi nil) (bibview-cache) (master-dir . "/tmp/") (label-numbers) (bof "/tmp/lol.tex") ("argh" "s" " " "/tmp/lol.tex" nil) (eof "/tmp/lol.tex")) #[(x) "@;\207" [x] 1]))
  completion--in-region(8 8 ((xr nil "\\\\\\\\\\\\") (index-tags) (is-multi nil) (bibview-cache) (master-dir . "/tmp/") (label-numbers) (bof "/tmp/lol.tex") ("argh" "s" " " "/tmp/lol.tex" nil) (eof "/tmp/lol.tex")) #[(x) "@;\207" [x] 1])
  completion-in-region(8 8 ((xr nil "\\\\\\\\\\\\") (index-tags) (is-multi nil) (bibview-cache) (master-dir . "/tmp/") (label-numbers) (bof "/tmp/lol.tex") ("argh" "s" " " "/tmp/lol.tex" nil) (eof "/tmp/lol.tex")) #[(x) "@;\207" [x] 1])
  minibuffer-complete()
  funcall-interactively(minibuffer-complete)
  call-interactively(minibuffer-complete nil nil)
  command-execute(minibuffer-complete)
  read-from-minibuffer("Label: " nil (keymap (10 . minibuffer-complete-and-exit) (13 . minibuffer-complete-and-exit) keymap (menu-bar keymap (minibuf "Minibuf" keymap (tab menu-item "Complete" minibuffer-complete :help "Complete as far as possible") (space menu-item "Complete Word" minibuffer-complete-word :help "Complete at most one word") (63 menu-item "List Completions" minibuffer-completion-help :help "Display all possible completions") "Minibuf")) (27 keymap (118 . switch-to-completions)) (prior . switch-to-completions) (63 . minibuffer-completion-help) (32 . minibuffer-complete-word) (9 . minibuffer-complete) keymap (menu-bar keymap (minibuf "Minibuf" keymap (previous menu-item "Previous History Item" previous-history-element :help "Put previous minibuffer history element in the minibuffer") (next menu-item "Next History Item" next-history-element :help "Put next minibuffer history element in the minibuffer") (isearch-backward menu-item "Isearch History Backward" isearch-backward :help "Incrementally search minibuffer history backward") (isearch-forward menu-item "Isearch History Forward" isearch-forward :help "Incrementally search minibuffer history forward") (return menu-item "Enter" exit-minibuffer :key-sequence "" :help "Terminate input and exit minibuffer") (quit menu-item "Quit" abort-recursive-edit :help "Abort input and exit minibuffer") "Minibuf")) (10 . exit-minibuffer) (13 . exit-minibuffer) (7 . abort-recursive-edit) (C-tab . file-cache-minibuffer-complete) (9 . self-insert-command) (XF86Back . previous-history-element) (up . previous-line-or-history-element) (prior . previous-history-element) (XF86Forward . next-history-element) (down . next-line-or-history-element) (next . next-history-element) (27 keymap (114 . previous-matching-history-element) (115 . next-matching-history-element) (112 . previous-history-element) (110 . next-history-element))) nil nil nil nil)
  completing-read-default("Label: " ((xr nil "\\\\\\\\\\\\") (index-tags) (is-multi nil) (bibview-cache) (master-dir . "/tmp/") (label-numbers) (bof "/tmp/lol.tex") ("argh" "s" " " "/tmp/lol.tex" nil) (eof "/tmp/lol.tex")) #[(x) "@;\207" [x] 1] t nil nil nil nil)
  completing-read("Label: " ((xr nil "\\\\\\\\\\\\") (index-tags) (is-multi nil) (bibview-cache) (master-dir . "/tmp/") (label-numbers) (bof "/tmp/lol.tex") ("argh" "s" " " "/tmp/lol.tex" nil) (eof "/tmp/lol.tex")) #[(x) "@;\207" [x] 1] t nil nil nil)
  reftex-goto-label(nil)
  funcall-interactively(reftex-goto-label nil)
  call-interactively(reftex-goto-label record nil)
  command-execute(reftex-goto-label record)
  execute-extended-command(nil "reftex-goto-label" nil)
  funcall-interactively(execute-extended-command nil "reftex-goto-label" nil)
  call-interactively(execute-extended-command nil nil)
  command-execute(execute-extended-command)


In GNU Emacs 26.0.50.2 (x86_64-unknown-linux-gnu, X toolkit, Xaw scroll bars)
 of 2016-11-18 built on logos
Repository revision: 6cdd1c333034b308e74e70c4fd10399fbb5329b9

Message #8 received at 24966 <at> debbugs.gnu.org (full text, mbox):

From: npostavs <at> users.sourceforge.net
To: Mark Oteiza <mvoteiza <at> udel.edu>
Cc: 24966 <at> debbugs.gnu.org
Subject: Re: bug#24966: 26.0.50;
Date: Sun, 20 Nov 2016 23:24:19 -0500

unarchive 23533
# It was marked for 25.2 before master was renumbered to 26
notfixed 23533 25.2
fixed 23533 26.0.50
retitle 24966 26.0.50; test-completion with alist COLLECTION calls PREDICATE incorrectly
tags 24966 confirmed
quit

Mark Oteiza <mvoteiza <at> udel.edu> writes:

> Hi,
>
> dd98ee8992c3246861e44 appears to be the culprit for breaking the
> following from -Q:

Yup, I didn't fix test-completion correctly.

>
> 1. C-x C-f /tmp/foo.tex
> 2. M-x reftex-mode
> 3. Insert the following: \label{foobar}
> 4. M-x reftex-goto-label
>
> and, when attempting to complete, a wrong-type-argument error occurs.
>
> Debugger entered--Lisp error: (wrong-type-argument listp "argh")
>   #[(x) "@;\207" [x] 1]("argh")
>   test-completion("argh" ((xr nil "\\\\\\\\\\\\") (index-tags) (is-multi nil) (bibview-cache) (master-dir . "/tmp/") (label-numbers) (bof "/tmp/lol.tex") ("argh" "s" " " "/tmp/lol.tex" nil) (eof "/tmp/lol.tex")) #[(x) "@;\207" [x] 1])

I tentatively suggest the patch below, but I want to add some tests
before commiting anything.

diff --git i/src/minibuf.c w/src/minibuf.c
index 57eea05..fe187b3 100644
--- i/src/minibuf.c
+++ w/src/minibuf.c
@@ -1686,8 +1686,6 @@ DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0,
       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))
     {
@@ -1765,14 +1763,16 @@ DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0,
   /* Reject this element if it fails to match all the regexps.  */
   if (CONSP (Vcompletion_regexp_list))
     {
+      Lisp_Object temstr = (CONSP (tem)) ? XCAR (tem) : tem;
+      if (SYMBOLP (temstr))
+        temstr = string;
+
       ptrdiff_t count = SPECPDL_INDEX ();
       specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
       for (regexps = Vcompletion_regexp_list; CONSP (regexps);
 	   regexps = XCDR (regexps))
 	{
-	  if (NILP (Fstring_match (XCAR (regexps),
-				   SYMBOLP (tem) ? string : tem,
-				   Qnil)))
+	  if (NILP (Fstring_match (XCAR (regexps), temstr, Qnil)))
 	    return unbind_to (count, Qnil);
 	}
       unbind_to (count, Qnil);

Message #15 received at 24966 <at> debbugs.gnu.org (full text, mbox):

From: Mark Oteiza <mvoteiza <at> udel.edu>
To: npostavs <at> users.sourceforge.net
Cc: 24966 <at> debbugs.gnu.org
Subject: Re: bug#24966: 26.0.50;
Date: Mon, 21 Nov 2016 14:42:26 -0500

On 20/11/16 at 11:24pm, npostavs <at> users.sourceforge.net wrote:
> unarchive 23533
> # It was marked for 25.2 before master was renumbered to 26
> notfixed 23533 25.2
> fixed 23533 26.0.50
> retitle 24966 26.0.50; test-completion with alist COLLECTION calls PREDICATE incorrectly
> tags 24966 confirmed
> quit
> 
> Mark Oteiza <mvoteiza <at> udel.edu> writes:
> 
> > Hi,
> >
> > dd98ee8992c3246861e44 appears to be the culprit for breaking the
> > following from -Q:
> 
> Yup, I didn't fix test-completion correctly.
> 
> >
> > 1. C-x C-f /tmp/foo.tex
> > 2. M-x reftex-mode
> > 3. Insert the following: \label{foobar}
> > 4. M-x reftex-goto-label
> >
> > and, when attempting to complete, a wrong-type-argument error occurs.
> >
> > Debugger entered--Lisp error: (wrong-type-argument listp "argh")
> >   #[(x) "@;\207" [x] 1]("argh")
> >   test-completion("argh" ((xr nil "\\\\\\\\\\\\") (index-tags) (is-multi nil) (bibview-cache) (master-dir . "/tmp/") (label-numbers) (bof "/tmp/lol.tex") ("argh" "s" " " "/tmp/lol.tex" nil) (eof "/tmp/lol.tex")) #[(x) "@;\207" [x] 1])
> 
> I tentatively suggest the patch below, but I want to add some tests
> before commiting anything.
> 
> diff --git i/src/minibuf.c w/src/minibuf.c
> index 57eea05..fe187b3 100644
> --- i/src/minibuf.c
> +++ w/src/minibuf.c
> @@ -1686,8 +1686,6 @@ DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0,
>        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))
>      {
> @@ -1765,14 +1763,16 @@ DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0,
>    /* Reject this element if it fails to match all the regexps.  */
>    if (CONSP (Vcompletion_regexp_list))
>      {
> +      Lisp_Object temstr = (CONSP (tem)) ? XCAR (tem) : tem;
> +      if (SYMBOLP (temstr))
> +        temstr = string;
> +
>        ptrdiff_t count = SPECPDL_INDEX ();
>        specbind (Qcase_fold_search, completion_ignore_case ? Qt : Qnil);
>        for (regexps = Vcompletion_regexp_list; CONSP (regexps);
>  	   regexps = XCDR (regexps))
>  	{
> -	  if (NILP (Fstring_match (XCAR (regexps),
> -				   SYMBOLP (tem) ? string : tem,
> -				   Qnil)))
> +	  if (NILP (Fstring_match (XCAR (regexps), temstr, Qnil)))
>  	    return unbind_to (count, Qnil);
>  	}
>        unbind_to (count, Qnil);
> 

Thanks, this does indeed fix the recipe.

Message #18 received at 24966 <at> debbugs.gnu.org (full text, mbox):

From: npostavs <at> users.sourceforge.net
To: Mark Oteiza <mvoteiza <at> udel.edu>
Cc: 24966 <at> debbugs.gnu.org
Subject: Re: bug#24966: 26.0.50;
 test-completion with alist COLLECTION calls PREDICATE incorrectly
Date: Sun, 27 Nov 2016 15:24:27 -0500

[Message part 1 (text/plain, inline)]

tags 24966 patch
quit

npostavs <at> users.sourceforge.net writes:
>
> I tentatively suggest the patch below, but I want to add some tests
> before commiting anything.

While adding tests, I found another inconsistency: when given a
hashtable with symbol keys, test-completion passes the symbol-name to
PREDICATE, while all-completions and try-completion pass the original
symbol key.  Here are two patches, the first for this bug, and the
second for the other inconsistency.

[v1-0001-Give-test-completion-s-PREDICATE-full-alist-entry.patch (text/plain, attachment)]

[v1-0002-Give-test-completion-s-PREDICATE-the-hashtable-ke.patch (text/plain, attachment)]

Message #23 received at 24966 <at> debbugs.gnu.org (full text, mbox):

From: Mark Oteiza <mvoteiza <at> udel.edu>
To: npostavs <at> users.sourceforge.net
Cc: 24966 <at> debbugs.gnu.org
Subject: Re: bug#24966: 26.0.50; test-completion with alist COLLECTION calls
 PREDICATE incorrectly
Date: Mon, 28 Nov 2016 15:59:17 -0500

On 27/11/16 at 03:24pm, npostavs <at> users.sourceforge.net wrote:
> tags 24966 patch
> quit
> 
> npostavs <at> users.sourceforge.net writes:
> >
> > I tentatively suggest the patch below, but I want to add some tests
> > before commiting anything.
> 
> While adding tests, I found another inconsistency: when given a
> hashtable with symbol keys, test-completion passes the symbol-name to
> PREDICATE, while all-completions and try-completion pass the original
> symbol key.  Here are two patches, the first for this bug, and the
> second for the other inconsistency.

The first hunk of 2/2 isn't applying here.

Message #26 received at 24966 <at> debbugs.gnu.org (full text, mbox):

From: Noam Postavsky <npostavs <at> users.sourceforge.net>
To: Mark Oteiza <mvoteiza <at> udel.edu>
Cc: 24966 <at> debbugs.gnu.org
Subject: Re: bug#24966: 26.0.50; test-completion with alist COLLECTION calls
 PREDICATE incorrectly
Date: Mon, 28 Nov 2016 16:03:29 -0500

On Mon, Nov 28, 2016 at 3:59 PM, Mark Oteiza <mvoteiza <at> udel.edu> wrote:
>>
>> npostavs <at> users.sourceforge.net writes:
>> >
>> > I tentatively suggest the patch below, but I want to add some tests
>> > before commiting anything.
>>
>> While adding tests, I found another inconsistency: when given a
>> hashtable with symbol keys, test-completion passes the symbol-name to
>> PREDICATE, while all-completions and try-completion pass the original
>> symbol key.  Here are two patches, the first for this bug, and the
>> second for the other inconsistency.
>
> The first hunk of 2/2 isn't applying here.

Oh, that's probably because I generated it with -w, so some whitespace
changes are missing in 1/2. I'll post a full patch tonight.

Message #29 received at 24966 <at> debbugs.gnu.org (full text, mbox):

From: npostavs <at> users.sourceforge.net
To: Mark Oteiza <mvoteiza <at> udel.edu>
Cc: 24966 <at> debbugs.gnu.org
Subject: Re: bug#24966: 26.0.50;
 test-completion with alist COLLECTION calls PREDICATE incorrectly
Date: Mon, 28 Nov 2016 22:31:32 -0500

[Message part 1 (text/plain, inline)]

Noam Postavsky <npostavs <at> users.sourceforge.net> writes:

> On Mon, Nov 28, 2016 at 3:59 PM, Mark Oteiza <mvoteiza <at> udel.edu> wrote:
>>>
>>> npostavs <at> users.sourceforge.net writes:
>>> >
>>> > I tentatively suggest the patch below, but I want to add some tests
>>> > before commiting anything.
>>>
>>> While adding tests, I found another inconsistency: when given a
>>> hashtable with symbol keys, test-completion passes the symbol-name to
>>> PREDICATE, while all-completions and try-completion pass the original
>>> symbol key.  Here are two patches, the first for this bug, and the
>>> second for the other inconsistency.
>>
>> The first hunk of 2/2 isn't applying here.
>
> Oh, that's probably because I generated it with -w, so some whitespace
> changes are missing in 1/2. I'll post a full patch tonight.

Here are the same patches with full whitespace changes.

[v1-0001-Give-test-completion-s-PREDICATE-full-alist-entry.patch (text/plain, attachment)]

[v1-0002-Give-test-completion-s-PREDICATE-the-hashtable-ke.patch (text/plain, attachment)]

Message #32 received at 24966 <at> debbugs.gnu.org (full text, mbox):

From: Mark Oteiza <mvoteiza <at> udel.edu>
To: npostavs <at> users.sourceforge.net
Cc: 24966 <at> debbugs.gnu.org
Subject: Re: bug#24966: 26.0.50; test-completion with alist COLLECTION calls
 PREDICATE incorrectly
Date: Tue, 29 Nov 2016 21:04:15 -0500

On 28/11/16 at 10:31pm, npostavs <at> users.sourceforge.net wrote:
> Noam Postavsky <npostavs <at> users.sourceforge.net> writes:
> 
> > On Mon, Nov 28, 2016 at 3:59 PM, Mark Oteiza <mvoteiza <at> udel.edu> wrote:
> >>>
> >>> npostavs <at> users.sourceforge.net writes:
> >>> >
> >>> > I tentatively suggest the patch below, but I want to add some tests
> >>> > before commiting anything.
> >>>
> >>> While adding tests, I found another inconsistency: when given a
> >>> hashtable with symbol keys, test-completion passes the symbol-name to
> >>> PREDICATE, while all-completions and try-completion pass the original
> >>> symbol key.  Here are two patches, the first for this bug, and the
> >>> second for the other inconsistency.
> >>
> >> The first hunk of 2/2 isn't applying here.
> >
> > Oh, that's probably because I generated it with -w, so some whitespace
> > changes are missing in 1/2. I'll post a full patch tonight.
> 
> Here are the same patches with full whitespace changes.

Thanks, all is well here with these patches

Message #35 received at 24966 <at> debbugs.gnu.org (full text, mbox):

From: Mark Oteiza <mvoteiza <at> udel.edu>
To: npostavs <at> users.sourceforge.net
Cc: 24966 <at> debbugs.gnu.org
Subject: Re: bug#24966: 26.0.50; test-completion with alist COLLECTION calls
 PREDICATE incorrectly
Date: Mon, 5 Dec 2016 20:50:38 -0500

On 29/11/16 at 09:04pm, Mark Oteiza wrote:
> On 28/11/16 at 10:31pm, npostavs <at> users.sourceforge.net wrote:
> > Noam Postavsky <npostavs <at> users.sourceforge.net> writes:
> > 
> > > On Mon, Nov 28, 2016 at 3:59 PM, Mark Oteiza <mvoteiza <at> udel.edu> wrote:
> > >>>
> > >>> npostavs <at> users.sourceforge.net writes:
> > >>> >
> > >>> > I tentatively suggest the patch below, but I want to add some tests
> > >>> > before commiting anything.
> > >>>
> > >>> While adding tests, I found another inconsistency: when given a
> > >>> hashtable with symbol keys, test-completion passes the symbol-name to
> > >>> PREDICATE, while all-completions and try-completion pass the original
> > >>> symbol key.  Here are two patches, the first for this bug, and the
> > >>> second for the other inconsistency.
> > >>
> > >> The first hunk of 2/2 isn't applying here.
> > >
> > > Oh, that's probably because I generated it with -w, so some whitespace
> > > changes are missing in 1/2. I'll post a full patch tonight.
> > 
> > Here are the same patches with full whitespace changes.
> 
> Thanks, all is well here with these patches

Anything holding back applying these?

Message #38 received at 24966 <at> debbugs.gnu.org (full text, mbox):

From: npostavs <at> users.sourceforge.net
To: Mark Oteiza <mvoteiza <at> udel.edu>
Cc: 24966 <at> debbugs.gnu.org
Subject: Re: bug#24966: 26.0.50;
 test-completion with alist COLLECTION calls PREDICATE incorrectly
Date: Tue, 06 Dec 2016 22:31:34 -0500

tags 24966 fixed
close 24966 
quit

Mark Oteiza <mvoteiza <at> udel.edu> writes:

> On 29/11/16 at 09:04pm, Mark Oteiza wrote:
>> > >>>
>> > >>> npostavs <at> users.sourceforge.net writes:
>> > >>>
>> > >>> While adding tests, I found another inconsistency: when given a
>> > >>> hashtable with symbol keys, test-completion passes the symbol-name to
>> > >>> PREDICATE, while all-completions and try-completion pass the original
>> > >>> symbol key.  Here are two patches, the first for this bug, and the
>> > >>> second for the other inconsistency.
>> 
>> Thanks, all is well here with these patches
>
> Anything holding back applying these?

I was waiting to see if there were any comments, especially about the
second patch, but it's been long enough by now.  Pushed as 60fe6301,
2a3420d9.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.