bug#73330: 31.0.50; Incorrect completions for 'cond' clauses

[Eshel Yaron via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Eshel Yaron <me@eshelyaron.com>
>> Cc: 73330@debbugs.gnu.org
>> Date: Thu, 19 Sep 2024 14:25:13 +0200
>> 
>> Eli Zaretskii <eliz@gnu.org> writes:
>> 
>> >> Date: Wed, 18 Sep 2024 14:36:18 +0200
>> >> From:  Eshel Yaron via "Bug reports for GNU Emacs,
>> >>  the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
>> >> 
>> >> 1. emacs -Q
>> >> 2. Insert "(cond (current-p
>> >> 3. Hit M-TAB to complete
>> >> 
>> >> We're completing a symbol in the condition of a cond clause, so it is
>> >> expected to be completed as a variable, to current-prefix-argument.
>> >> However, Emacs mistakenly thinks that we're completing a function name,
>> >> and completes to current-bidi-paragraph-direction.
>> >
>> > Thanks.  Does the patch below give good results?
>> 
>> It helps
>
> Does "helps" mean the original scenario is fixed? or are there any
> leftovers in that scenario?

Yes, it fixed the original scenario.

>> but also seems to cause a regression.  With this change I get:
>> 
>> 1. emacs -Q
>> 2. Insert "(cond ((current-p"
>>                   ^note the additional parenthesis
>> 3. Hit M-TAB to complete
>> 
>> This shows an opposite bug: Emacs should complete function names (and
>> without the change, it does), but with the change we now get variable
>> name completion.
>
> How about the patch below?

That works well in both the original scenario and the modified one.


Thank!

Eshel