[Emacs-diffs] /srv/bzr/emacs/trunk r106730: * callint.c (Fcall_interactively): Don't truncate prompt string.

[Andreas Schwab]

------------------------------------------------------------
revno: 106730
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2011-12-25 10:06:42 +0100
message:
  * callint.c (Fcall_interactively): Don't truncate prompt string.
modified:
  src/ChangeLog
  src/callint.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-12-24 19:24:10 +0000
+++ b/src/ChangeLog     2011-12-25 09:06:42 +0000
@@ -1,3 +1,7 @@
+2011-12-24  Andreas Schwab  <address@hidden>
+
+       * callint.c (Fcall_interactively): Don't truncate prompt string.
+
 2011-12-23  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (handle_invisible_prop): Handle correctly an invisible

=== modified file 'src/callint.c'
--- a/src/callint.c     2011-11-25 07:14:48 +0000
+++ b/src/callint.c     2011-12-25 09:06:42 +0000
@@ -274,8 +274,6 @@
 
   ptrdiff_t i, nargs;
   int foo;
-  char prompt1[100];
-  char *tem1;
   int arg_from_tty = 0;
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
   int key_count;
@@ -491,13 +489,8 @@
   tem = string;
   for (i = 1; *tem; i++)
     {
-      strncpy (prompt1, tem + 1, sizeof prompt1 - 1);
-      prompt1[sizeof prompt1 - 1] = 0;
-      tem1 = strchr (prompt1, '\n');
-      if (tem1) *tem1 = 0;
-
-      visargs[0] = build_string (prompt1);
-      if (strchr (prompt1, '%'))
+      visargs[0] = make_string (tem + 1, strcspn (tem + 1, "\n"));
+      if (strchr (SSDATA (visargs[0]), '%'))
        callint_message = Fformat (i, visargs);
       else
        callint_message = visargs[0];