(LD_SWITCH_SYSTEM_TEMACS): Define this instead of LD_SWITCH_SYSTEM.

[gnu-emacs] / src / callint.c

diff --git a/src/callint.c b/src/callint.c
index 150e70e6526f81cf72b0dfe551b442e9f050c22d..7a579fcb20e293d2249548f3e0ac2ce728dad981 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -293,11 +293,11 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
   else if (string == 0)
     {
       Lisp_Object input;
-      i = num_input_chars;
+      i = num_input_events;
       input = specs;
       /* Compute the arg values using the user's expression.  */
       specs = Feval (specs);
-      if (i != num_input_chars || !NILP (record_flag))
+      if (i != num_input_events || !NILP (record_flag))
        {
          /* We should record this command on the command history.  */
          Lisp_Object values, car;
@@ -592,7 +592,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
                if (!  first)
                  {
                    message ("Please enter a number.");
-                   sit_for (1, 0, 0, 0);
+                   sit_for (1, 0, 0, 0, 0);
                  }
                first = 0;
 
@@ -634,12 +634,13 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
          break;
 
        case 's':               /* String read via minibuffer.  */
-         args[i] = Fread_string (build_string (callint_message), Qnil, Qnil);
+         args[i] = Fread_string (build_string (callint_message),
+                                 Qnil, Qnil, Qnil);
          break;
 
        case 'S':               /* Any symbol.  */
          visargs[i] = Fread_string (build_string (callint_message),
-                                    Qnil, Qnil);
+                                    Qnil, Qnil, Qnil);
          /* Passing args[i] directly stimulates compiler bug */
          teml = visargs[i];
          args[i] = Fintern (teml, Qnil);