# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1088527698 0
# Node ID 8282359ed2128817c906032ef02d97ebc96b64c7
# Parent  59dcbfe9738576ed3077c019c89baecee677a3e9
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-18

Fix merge screwups

diff -r 59dcbfe97385 -r 8282359ed212 src/fns.c
--- a/src/fns.c	Tue Jun 29 16:46:06 2004 +0000
+++ b/src/fns.c	Tue Jun 29 16:48:18 2004 +0000
@@ -918,6 +918,8 @@
 {
   unsigned char *buf;
   int nbytes;
+  Lisp_Object ret;
+  USE_SAFE_ALLOCA;
 
   if (STRING_MULTIBYTE (string))
     return string;