diff options
| author | Eli Zaretskii | 2014-09-04 18:09:49 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-09-04 18:09:49 +0300 |
| commit | e97a29cbecc8765aad2bfea5940e215789d4cd7c (patch) | |
| tree | faf4a4b00163f1df7399722329347bdcf607f446 /src/data.c | |
| parent | f8c4cd6e058ea981011545fc656c42df8cb85087 (diff) | |
| download | emacs-e97a29cbecc8765aad2bfea5940e215789d4cd7c.tar.gz emacs-e97a29cbecc8765aad2bfea5940e215789d4cd7c.zip | |
Fix bug #18331 with "C-h k C-g" not showing documentation on Windows.
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.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/data.c b/src/data.c index 4cb569bd943..5aeb24b16dc 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -1241,10 +1241,10 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where, | |||
| 1241 | 1241 | ||
| 1242 | /* Find the new binding. */ | 1242 | /* Find the new binding. */ |
| 1243 | XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ | 1243 | XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ |
| 1244 | tem1 = Fassq (symbol, | 1244 | tem1 = assq_no_quit (symbol, |
| 1245 | (blv->frame_local | 1245 | (blv->frame_local |
| 1246 | ? XFRAME (where)->param_alist | 1246 | ? XFRAME (where)->param_alist |
| 1247 | : BVAR (XBUFFER (where), local_var_alist))); | 1247 | : BVAR (XBUFFER (where), local_var_alist))); |
| 1248 | set_blv_where (blv, where); | 1248 | set_blv_where (blv, where); |
| 1249 | blv->found = 1; | 1249 | blv->found = 1; |
| 1250 | 1250 | ||