2 files changed, 13 insertions, 6 deletions

diff --git a/src/eval.c b/src/eval.c
index e82fba1559e..a030ff8b700 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,5 +1,5 @@
 /* Evaluator for GNU Emacs Lisp interpreter.
-   Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1837,7 +1837,11 @@ Thus, (funcall 'cons 'x 'y) returns (x . y).")
           goto done;
 
         default:
-          error ("funcall: this number of args not handled.");
+
+          /* If a subr takes more than 6 arguments without using MANY
+             or UNEVALLED, we need to extend this function to support it. 
+             Until this is done, there is no way to call the function.  */
+          abort ();
         }
     }
   if (XTYPE (fun) == Lisp_Compiled)
diff --git a/src/indent.c b/src/indent.c
index f87ca13192a..977383d3b40 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1,5 +1,5 @@
 /* Indentation functions.
-   Copyright (C) 1985, 1986, 1987, 1988 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1992 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -344,10 +344,13 @@ and if COLUMN is in the middle of a tab character, change it to spaces.")
      and scan through it again.  */
   if (!NILP (force) && col > goal && c == '\t' && prev_col < goal)
     {
+      int old_point;
+
       del_range (point - 1, point);
-      Findent_to (make_number (col - 1));
-      insert_char (' ');
-      goto retry;
+      Findent_to (make_number (goal), Qnil);
+      old_point = point;
+      Findent_to (make_number (col), Qnil);
+      SET_PT (old_point);
     }
 
   /* If line ends prematurely, add space to the end.  */