Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-664
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-665
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-666
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-447

1 files changed, 3 insertions, 3 deletions

diff --git a/src/undo.c b/src/undo.c
index 9839906ca7e..ecbb714fddd 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -378,11 +378,11 @@ truncate_undo_list (b)
       && size_so_far > XINT (Vundo_outer_limit)
       && !NILP (Vundo_outer_limit_function))
     {
-      Lisp_Object temp = last_undo_buffer;
+      Lisp_Object temp = last_undo_buffer, tem;
 
       /* Normally the function this calls is undo-outer-limit-truncate.  */
-      if (! NILP (call1 (Vundo_outer_limit_function,
-                         make_number (size_so_far))))
+      tem = call1 (Vundo_outer_limit_function, make_number (size_so_far));
+      if (! NILP (tem))
         {
           /* The function is responsible for making
              any desired changes in buffer-undo-list.  */