[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117479: Fix bug #18331 with "C-h k C-g" not show
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-24 r117479: Fix bug #18331 with "C-h k C-g" not showing documentation on Windows. |
Date: |
Thu, 04 Sep 2014 15:10:30 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117479
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18331
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-09-04 18:09:49 +0300
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/data.c data.c-20091113204419-o5vbwnq5f7feedwu-251
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-09-02 15:16:42 +0000
+++ b/src/ChangeLog 2014-09-04 15:09:49 +0000
@@ -1,3 +1,9 @@
+2014-09-04 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* dispnew.c (buffer_posn_from_coords): Fix an off-by-one error in
=== modified file 'src/data.c'
--- a/src/data.c 2014-06-08 00:51:10 +0000
+++ b/src/data.c 2014-09-04 15:09:49 +0000
@@ -1241,10 +1241,10 @@
/* 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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117479: Fix bug #18331 with "C-h k C-g" not showing documentation on Windows.,
Eli Zaretskii <=