Mercurial > hg > xemacs-beta

diff src/callint.c @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents fdefd0186b75
children e38acbeb1cae
line wrap: on
line diff
--- a/src/callint.c	Fri Mar 08 13:33:14 2002 +0000
+++ b/src/callint.c	Wed Mar 13 08:54:06 2002 +0000
@@ -1,6 +1,6 @@
 /* Call a Lisp function interactively.
    Copyright (C) 1985, 1986, 1992, 1993, 1994 Free Software Foundation, Inc.
-   Copyright (C) 1995, 1996 Ben Wing.
+   Copyright (C) 1995, 1996, 2001 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -74,10 +74,8 @@
 Lisp_Object Qread_string;
 Lisp_Object Qevents_to_keys;
 
-#if defined(MULE) || defined(FILE_CODING)
 Lisp_Object Qread_coding_system;
 Lisp_Object Qread_non_nil_coding_system;
-#endif
 
 /* ARGSUSED */
 DEFUN ("interactive", Finteractive, 0, UNEVALLED, 0, /*
@@ -275,7 +273,7 @@
   if (!strchr ((char *) XSTRING_DATA (s), '%'))
     return s;
   GCPRO1 (s);
-  RETURN_UNGCPRO (emacs_doprnt_string_lisp (0, s, 0, nargs, args));
+  RETURN_UNGCPRO (emacs_vsprintf_string_lisp (0, s, nargs, args));
 }
 
 /* `lambda' for RECORD-FLAG is an XEmacs addition. */
@@ -598,7 +596,7 @@
       }
       if (set_zmacs_region_stays)
 	zmacs_region_stays = 1;
-      return unbind_to (speccount, fun);
+      return unbind_to_1 (speccount, fun);
     }
 
   /* Read interactive arguments */
@@ -693,7 +691,7 @@
               /* visargs[argnum] = Fsingle_key_description (tem); */
 	      /* FSF has visargs[argnum] = Fchar_to_string (tem); */
 
-	      unbind_to (shadowing_speccount, Qnil);
+	      unbind_to (shadowing_speccount);
 
 	      /* #### `C-x / a' should not leave the prompt in the minibuffer.
 		 This isn't the right fix, because (message ...) (read-char)
@@ -926,7 +924,6 @@
 	    }
 	  case 'Z':		/* Coding-system symbol or nil if no prefix */
 	    {
-#if defined(MULE) || defined(FILE_CODING)
 	      if (NILP (prefix))
 		{
 		  args[argnum] = Qnil;
@@ -937,19 +934,12 @@
 		    call1 (Qread_non_nil_coding_system, PROMPT ());
 		  arg_from_tty = 1;
 		}
-#else
-	      args[argnum] = Qnil;
-#endif
 	      break;
 	    }
 	  case 'z':		/* Coding-system symbol */
 	    {
-#if defined(MULE) || defined(FILE_CODING)
 	      args[argnum] = call1 (Qread_coding_system, PROMPT ());
 	      arg_from_tty = 1;
-#else
-	      args[argnum] = Qnil;
-#endif
 	      break;
 	    }
 
@@ -974,7 +964,7 @@
 	  prompt_data = (const char *) XSTRING_DATA (specs);
 	prompt_index += prompt_length + 1 + 1; /* +1 to skip spec, +1 for \n */
       }
-    unbind_to (speccount, Qnil);
+    unbind_to (speccount);
 
     QUIT;
 
@@ -1009,7 +999,7 @@
     UNGCPRO;
     if (set_zmacs_region_stays)
       zmacs_region_stays = 1;
-    return unbind_to (speccount, fun);
+    return unbind_to_1 (speccount, fun);
   }
 }
 
@@ -1047,10 +1037,8 @@
   DEFSYMBOL (Qread_command);
   DEFSYMBOL (Qread_number);
   DEFSYMBOL (Qread_expression);
-#if defined(MULE) || defined(FILE_CODING)
   DEFSYMBOL (Qread_coding_system);
   DEFSYMBOL (Qread_non_nil_coding_system);
-#endif
   DEFSYMBOL (Qevents_to_keys);
   DEFSYMBOL (Qcommand_debug_status);
   DEFSYMBOL (Qenable_recursive_minibuffers);