--- a/src/callint.c	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/callint.c	Mon Aug 13 11:20:41 2007 +0200
@@ -56,8 +56,11 @@
 Lisp_Object Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook;
 #endif
 
-Lisp_Object QletX, Qsave_excursion;
+Lisp_Object Qlet, QletX, Qsave_excursion;
 
+Lisp_Object Qcurrent_prefix_arg;
+
+Lisp_Object Quser_variable_p;
 Lisp_Object Qread_from_minibuffer;
 Lisp_Object Qread_file_name;
 Lisp_Object Qread_directory_name;
@@ -167,8 +170,8 @@
 static Lisp_Object
 quotify_args (Lisp_Object expr)
 {
-  Lisp_Object tail;
-  Lisp_Cons *ptr;
+  REGISTER Lisp_Object tail;
+  REGISTER struct Lisp_Cons *ptr;
   for (tail = expr; CONSP (tail); tail = ptr->cdr)
     {
       ptr = XCONS (tail);
@@ -193,8 +196,8 @@
 }
 
 static Lisp_Object
-callint_prompt (const Bufbyte *prompt_start, Bytecount prompt_length,
-                const Lisp_Object *args, int nargs)
+callint_prompt (CONST Bufbyte *prompt_start, Bytecount prompt_length,
+                CONST Lisp_Object *args, int nargs)
 {
   Lisp_Object s = make_string (prompt_start, prompt_length);
   struct gcpro gcpro1;
@@ -241,7 +244,7 @@
 #endif
   /* If SPECS is a string, we reset prompt_data to string_data
    * (XSTRING (specs)) every time a GC might have occurred */
-  const char *prompt_data = 0;
+  CONST char *prompt_data = 0;
   int prompt_index = 0;
   int argcount;
   int set_zmacs_region_stays = 0;
@@ -425,7 +428,7 @@
     for (;;)
       {
 	if (STRINGP (specs))
-	  prompt_data = (const char *) XSTRING_DATA (specs);
+	  prompt_data = (CONST char *) XSTRING_DATA (specs);
 
 	if (prompt_data[prompt_index] == '+')
 	  error ("`+' is not used in `interactive' for ordinary commands");
@@ -486,7 +489,7 @@
      us give to the function.  */
   argcount = 0;
   {
-    const char *tem;
+    CONST char *tem;
     for (tem = prompt_data + prompt_index; *tem; )
       {
 	/* 'r' specifications ("point and mark as 2 numeric args")
@@ -495,7 +498,7 @@
 	  argcount += 2;
 	else
 	  argcount += 1;
-	tem = (const char *) strchr (tem + 1, '\n');
+	tem = (CONST char *) strchr (tem + 1, '\n');
 	if (!tem)
 	  break;
 	tem++;
@@ -565,8 +568,8 @@
 
     for (argnum = 0; ; argnum++)
       {
-	const char *prompt_start = prompt_data + prompt_index + 1;
-	const char *prompt_limit = (const char *) strchr (prompt_start, '\n');
+	CONST char *prompt_start = prompt_data + prompt_index + 1;
+	CONST char *prompt_limit = (CONST char *) strchr (prompt_start, '\n');
 	int prompt_length;
 	prompt_length = ((prompt_limit)
 			 ? (prompt_limit - prompt_start)
@@ -580,7 +583,7 @@
 	   prompts with "Set key C-x C-f to command: "instead of printing
 	   event objects in there.
 	 */
-#define PROMPT() callint_prompt ((const Bufbyte *) prompt_start, prompt_length, visargs, argnum)
+#define PROMPT() callint_prompt ((CONST Bufbyte *) prompt_start, prompt_length, visargs, argnum)
 	switch (prompt_data[prompt_index])
 	  {
 	  case 'a':		/* Symbol defined as a function */
@@ -909,7 +912,7 @@
 	if (!prompt_limit)
 	  break;
 	if (STRINGP (specs))
-	  prompt_data = (const char *) XSTRING_DATA (specs);
+	  prompt_data = (CONST char *) XSTRING_DATA (specs);
 	prompt_index += prompt_length + 1 + 1; /* +1 to skip spec, +1 for \n */
       }
     unbind_to (speccount, Qnil);
@@ -992,7 +995,10 @@
   defsymbol (&Qevents_to_keys, "events-to-keys");
   defsymbol (&Qcommand_debug_status, "command-debug-status");
   defsymbol (&Qenable_recursive_minibuffers, "enable-recursive-minibuffers");
+  defsymbol (&Quser_variable_p, "user-variable-p");
+  defsymbol (&Qcurrent_prefix_arg, "current-prefix-arg");
 
+  defsymbol (&Qlet, "let");
   defsymbol (&QletX, "let*");
   defsymbol (&Qsave_excursion, "save-excursion");
 #if 0 /* ill-conceived */