Merge.

[gnu-emacs] / src / fns.c

diff --git a/src/fns.c b/src/fns.c
index e5538d6acbc36345e29c15ff677fb4ee49f9c304..2c9ce915ae55f7edbf275b241289dbab140cdbba 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -1,5 +1,5 @@
 /* Random utility Lisp functions.
-   Copyright (C) 1985-1987, 1993-1995, 1997-2011
+   Copyright (C) 1985-1987, 1993-1995, 1997-2012
                 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -602,12 +602,7 @@ concat (ptrdiff_t nargs, Lisp_Object *args,
 
   prev = Qnil;
   if (STRINGP (val))
-    {
-      if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *textprops < nargs)
-       memory_full (SIZE_MAX);
-      SAFE_ALLOCA (textprops, struct textprop_rec *,
-                  sizeof *textprops * nargs);
-    }
+    SAFE_NALLOCA (textprops, 1, nargs);
 
   for (argnum = 0; argnum < nargs; argnum++)
     {
@@ -3257,9 +3252,9 @@ DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string,
   return decoded_string;
 }
 
-/* Base64-decode the data at FROM of LENGHT bytes into TO.  If
+/* Base64-decode the data at FROM of LENGTH bytes into TO.  If
    MULTIBYTE is nonzero, the decoded result should be in multibyte
-   form.  If NCHARS_RETRUN is not NULL, store the number of produced
+   form.  If NCHARS_RETURN is not NULL, store the number of produced
    characters in *NCHARS_RETURN.  */
 
 static EMACS_INT
@@ -4709,13 +4704,13 @@ secure_hash (Lisp_Object algorithm, Lisp_Object object, Lisp_Object start, Lisp_
                    force_raw_text = 1;
                }
 
-             if (NILP (coding_system) && !NILP (Fbuffer_file_name(object)))
+             if (NILP (coding_system) && !NILP (Fbuffer_file_name (object)))
                {
                  /* Check file-coding-system-alist.  */
                  Lisp_Object args[4], val;
 
                  args[0] = Qwrite_region; args[1] = start; args[2] = end;
-                 args[3] = Fbuffer_file_name(object);
+                 args[3] = Fbuffer_file_name (object);
                  val = Ffind_operation_coding_system (4, args);
                  if (CONSP (val) && !NILP (XCDR (val)))
                    coding_system = XCDR (val);