Subject: Re: bug#18331: 24.4.50; REGRESSION, no `C-h k' for `C-g'
From: Eli Zaretskii <[email-masked]>
To: [email-masked], Drew Adams <[email-masked]>
Cc: [email-masked], [email-masked]
Date: Thu, 04 Sep 2014 18:12:38 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

> Date: Wed, 27 Aug 2014 18:30:15 +0300
> From: Eli Zaretskii <[email-masked]>
> Cc: [email-masked], [email-masked]
> 
> I can fix this problem with the simple patch below.  Does anyone see
> any problems with it?
> 
> --- src/data.c~	2014-08-03 08:43:52 +0300
> +++ src/data.c	2014-08-27 18:28:13 +0300
> @@ -1311,10 +1311,10 @@ set_internal (Lisp_Object symbol, Lisp_O
>  
>  	    /* Find the new binding.  */
>  	    XSETSYMBOL (symbol, sym); /* May have changed via aliasing.  */
> -	    tem1 = Fassq (symbol,
> -			  (blv->frame_local
> -			   ? XFRAME (where)->param_alist
> -			   : BVAR (XBUFFER (where), local_var_alist)));
> +	    tem1 = assq_no_quit (symbol,
> +				 (blv->frame_local
> +				  ? XFRAME (where)->param_alist
> +				  : BVAR (XBUFFER (where), local_var_alist)));
>  	    set_blv_where (blv, where);
>  	    blv->found = 1;

No comments, so I installed this on the emacs-24 branch (r117479) and
I'm marking this done.