(coded-charset-entity-reference-alist): Add setting for

[chise/xemacs-chise.git.1] / src / callint.c

diff --git a/src/callint.c b/src/callint.c
index b3abc7b..fa89f16 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -37,7 +37,7 @@ Boston, MA 02111-1307, USA.  */
 #include "insdel.h"
 #include "window.h"
 
-extern int num_input_chars;
+extern Charcount num_input_chars;
 
 Lisp_Object Vcurrent_prefix_arg;
 Lisp_Object Qcall_interactively;
@@ -307,8 +307,9 @@ when reading the arguments.
 
       if (EQ (funcar, Qautoload))
        {
-         struct gcpro gcpro1, gcpro2;
-         GCPRO2 (function, prefix);
+         struct gcpro gcpro1;
+         GCPRO1 (prefix);
+         /* do_autoload GCPROs both arguments */
          do_autoload (fun, function);
          UNGCPRO;
          goto retry;
@@ -573,7 +574,7 @@ when reading the arguments.
        int prompt_length;
        prompt_length = ((prompt_limit)
                         ? (prompt_limit - prompt_start)
-                        : strlen (prompt_start));
+                        : (int) strlen (prompt_start));
        if (prompt_limit && prompt_limit[1] == 0)
          {
            prompt_limit = 0;   /* "sfoo:\n" -- strip tailing return */