X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fcallint.c;h=fa89f168329c76bad028d587b33c1f229a6b3df2;hb=166ba1350d802535b6a6ea7ea0bc29c56a71b7ec;hp=08173ffa1283953abd83f8a00a4c1ee90047a0f6;hpb=3e447015251ce6dcde843cbed10d9033d5538622;p=chise%2Fxemacs-chise.git.1

diff --git a/src/callint.c b/src/callint.c
index 08173ff..fa89f16 100644
--- 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;
@@ -53,10 +53,13 @@ Lisp_Object Vmark_even_if_inactive;
 #endif
 
 #if 0 /* ill-conceived */
+/* FSF calls Qmouse_leave_buffer_hook at all sorts of random places,
+   including a bunch of places in their mouse.el.  If this is
+   implemented, it has to be done cleanly. */
 Lisp_Object Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook;
 #endif
 
-Lisp_Object Qlet, QletX, Qsave_excursion;
+Lisp_Object QletX, Qsave_excursion;
 
 Lisp_Object Qread_from_minibuffer;
 Lisp_Object Qread_file_name;
@@ -304,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;
@@ -570,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 */
@@ -807,14 +811,6 @@ when reading the arguments.
 	    }
 	  case 'S':		/* Any symbol.  */
 	    {
-#if 0				/* Historical crock */
-	      Lisp_Object tem = intern ("minibuffer-local-ns-map");
-	      tem = find_symbol_value (tem);
-	      if (UNBOUNDP (tem)) tem = Qnil;
-	      tem = call3 (Qread_from_minibuffer, PROMPT (), Qnil,
-			   tem);
-	      args[argnum] = Fintern (tem, Qnil);
-#else /* 1 */
 	      visargs[argnum] = Qnil;
 	      for (;;)
 		{
@@ -837,7 +833,6 @@ when reading the arguments.
                        directly */
 		    break;
 		}
-#endif /* 1 */
 	      arg_from_tty = 1;
 	      break;
 	    }
@@ -952,7 +947,7 @@ when reading the arguments.
 }
 
 DEFUN ("prefix-numeric-value", Fprefix_numeric_value, 1, 1, 0, /*
-Return numeric meaning of raw prefix argument ARG.
+Return numeric meaning of raw prefix argument RAW.
 A raw prefix argument is what you get from `(interactive "P")'.
 Its numeric meaning is what you would get from `(interactive "p")'.
 */
@@ -993,7 +988,6 @@ syms_of_callint (void)
   defsymbol (&Qcommand_debug_status, "command-debug-status");
   defsymbol (&Qenable_recursive_minibuffers, "enable-recursive-minibuffers");
 
-  defsymbol (&Qlet, "let");
   defsymbol (&QletX, "let*");
   defsymbol (&Qsave_excursion, "save-excursion");
 #if 0 /* ill-conceived */