procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #18331 with "C-h k C-g" not showing documentation on Windows.

Browse source 
src/data.c (set_internal): Use assq_no_quit, not Fassq, to find an
 existing binding of a variable, to avoid silently aborting
 commands that use specbind.
This commit is contained in:
Eli Zaretskii 2014-09-04 18:09:49 +03:00
parent f8c4cd6e05
commit e97a29cbec
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2014-09-04 Eli Zaretskii <eliz@gnu.org>
* data.c (set_internal): Use assq_no_quit, not Fassq, to find an
existing binding of a variable, to avoid silently aborting
commands that use specbind. (Bug#18331)
2014-09-02 Eli Zaretskii <eliz@gnu.org>
* dispnew.c (buffer_posn_from_coords): Fix an off-by-one error in

8
src/data.c
View file

@ -1241,10 +1241,10 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where,
/* 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;