comparison src/fileio.c @ 112332:28ca83ef1128

Merge from mainline.

112331:f6578f2bd119

	    /* The error here is dubious, but there is little else we
	       can do.  The alternatives are to return nil, which is
	       as bad as (and in many cases worse than) throwing the
	       error, or to ignore the error, which will likely result
	       in looping through 225307 stat's, which is not only
	       dog-slow, but also useless since it will fallback to
	       the errow below, anyway.  */
	    report_file_error ("Cannot create temporary name for prefix",
			       Fcons (prefix, Qnil));
	  /* not reached */
	}
    }

  error ("Cannot create temporary name for prefix `%s'",
	 SDATA (prefix));
  return Qnil;
}


DEFUN ("make-temp-name", Fmake_temp_name, Smake_temp_name, 1, 1, 0,
       doc: /* Generate temporary file name (string) starting with PREFIX (a string).

		   Qnil, Qnil);
}

static Lisp_Object
do_auto_save_unwind (Lisp_Object arg)  /* used as unwind-protect function */
                     
{
  FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer;
  auto_saving = 0;
  if (stream != NULL)
    {

  return Qnil;
}

static Lisp_Object
do_auto_save_unwind_1 (Lisp_Object value)  /* used as unwind-protect function */
                       
{
  minibuffer_auto_raise = XINT (value);
  return Qnil;
}

#ifdef HAVE_SYNC
  defsubr (&Sunix_sync);
#endif
}

112332:28ca83ef1128

	    /* The error here is dubious, but there is little else we
	       can do.  The alternatives are to return nil, which is
	       as bad as (and in many cases worse than) throwing the
	       error, or to ignore the error, which will likely result
	       in looping through 225307 stat's, which is not only
	       dog-slow, but also useless since eventually nil would
	       have to be returned anyway.  */
	    report_file_error ("Cannot create temporary name for prefix",
			       Fcons (prefix, Qnil));
	  /* not reached */
	}
    }
}


DEFUN ("make-temp-name", Fmake_temp_name, Smake_temp_name, 1, 1, 0,
       doc: /* Generate temporary file name (string) starting with PREFIX (a string).

		   Qnil, Qnil);
}

static Lisp_Object
do_auto_save_unwind (Lisp_Object arg)  /* used as unwind-protect function */

{
  FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer;
  auto_saving = 0;
  if (stream != NULL)
    {

  return Qnil;
}

static Lisp_Object
do_auto_save_unwind_1 (Lisp_Object value)  /* used as unwind-protect function */

{
  minibuffer_auto_raise = XINT (value);
  return Qnil;
}

#ifdef HAVE_SYNC
  defsubr (&Sunix_sync);
#endif
}