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 @@
 2013-01-11  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Backport typo fix from trunk, for AIX (Bug#13408).
+        * 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>.
+
         Fix SIGDANGER handlers, for AIX (Bug#13408).
         * sysdep.c.c (handle_danger_signal, deliver_danger_signal) [SIGDANGER]:
         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)
 
   for (backlist = backtrace_list; backlist; backlist = backlist->next)
     {
-      mark_object (*backlist->function);
+      mark_object (backlist->function);
 
       if (backlist->nargs == UNEVALLED
           || backlist->nargs == MANY) /* FIXME: Can this happen?  */