Merge from emacs-24

[gnu-emacs] / src / editfns.c

diff --git a/src/editfns.c b/src/editfns.c
index b8a0f6fe637c815ac1af1828db3289fa8466bb4e..e7c960dfffe22b75ae141c7c48acd3d44d51e392 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4362,7 +4362,8 @@ usage: (format STRING &rest OBJECTS)  */)
 Lisp_Object
 format2 (const char *string1, Lisp_Object arg0, Lisp_Object arg1)
 {
-  return Fformat (3, (Lisp_Object []) { SCOPED_STRING (string1), arg0, arg1 });
+  AUTO_STRING (format, string1);
+  return Fformat (3, (Lisp_Object []) {format, arg0, arg1});
 }
 \f
 DEFUN ("char-equal", Fchar_equal, Schar_equal, 2, 2, 0,