diff options
| author | Paul Eggert | 2013-01-10 23:51:25 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-10 23:51:25 -0800 |
| commit | 45b7bfdd5414ee4be86b10468afbcd493aacd5ef (patch) | |
| tree | 7eff08f4ff3860a559908169aaaadf750b75aadf /src | |
| parent | b6f960a0ea4a19ed3dc8a6c5e34cf1d2e02b4bb9 (diff) | |
| download | emacs-45b7bfdd5414ee4be86b10468afbcd493aacd5ef.tar.gz emacs-45b7bfdd5414ee4be86b10468afbcd493aacd5ef.zip | |
Backport typo fix from trunk, for AIX.
* eval.c (mark_backtrace) [BYTE_MARK_STACK]: Remove stray '*'.
This follows up on the 2012-09-29 patch that removed indirection
for the 'function' field. Reported by Sergey Vinokurov in
<http://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00263.html>.
Fixes: debbugs:13408
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/eval.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 696a70fc08d..0ba5b2ccab2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2013-01-11 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2013-01-11 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | Backport typo fix from trunk, for AIX (Bug#13408). | ||
| 4 | * eval.c (mark_backtrace) [BYTE_MARK_STACK]: Remove stray '*'. | ||
| 5 | This follows up on the 2012-09-29 patch that removed indirection | ||
| 6 | for the 'function' field. Reported by Sergey Vinokurov in | ||
| 7 | <http://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00263.html>. | ||
| 8 | |||
| 3 | Fix SIGDANGER handlers, for AIX (Bug#13408). | 9 | Fix SIGDANGER handlers, for AIX (Bug#13408). |
| 4 | * sysdep.c.c (handle_danger_signal, deliver_danger_signal) [SIGDANGER]: | 10 | * sysdep.c.c (handle_danger_signal, deliver_danger_signal) [SIGDANGER]: |
| 5 | Move handlers here from emacs.c; they were out of place. | 11 | Move handlers here from emacs.c; they were out of place. |
diff --git a/src/eval.c b/src/eval.c index 7709b8ba2dc..a0db6e0745c 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -3377,7 +3377,7 @@ mark_backtrace (void) | |||
| 3377 | 3377 | ||
| 3378 | for (backlist = backtrace_list; backlist; backlist = backlist->next) | 3378 | for (backlist = backtrace_list; backlist; backlist = backlist->next) |
| 3379 | { | 3379 | { |
| 3380 | mark_object (*backlist->function); | 3380 | mark_object (backlist->function); |
| 3381 | 3381 | ||
| 3382 | if (backlist->nargs == UNEVALLED | 3382 | if (backlist->nargs == UNEVALLED |
| 3383 | || backlist->nargs == MANY) /* FIXME: Can this happen? */ | 3383 | || backlist->nargs == MANY) /* FIXME: Can this happen? */ |