Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-18

Fix merge screwups

1 files changed, 2 insertions, 0 deletions

diff --git a/src/fns.c b/src/fns.c
index 2058fb63a4e..ef1ce628b17 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -918,6 +918,8 @@ string_make_multibyte (string)
 {
   unsigned char *buf;
   int nbytes;
+  Lisp_Object ret;
+  USE_SAFE_ALLOCA;
 
   if (STRING_MULTIBYTE (string))
     return string;