Mercurial > emacs

diff src/fileio.c @ 83533:02e39decdc84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-351 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-352 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-353 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-354 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-355 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-356 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-357 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-358 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-359 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-360 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-361 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-362 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-363 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-364 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-365 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-366 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-367 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-368 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-369 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-370 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-115 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-116 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-117 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-118 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-119 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-120 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-573
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 29 Jul 2006 09:59:12 +0000
parents b19aaf4ab0ee 6299774acc49
children 694bbb62a75d
line wrap: on
line diff
--- a/src/fileio.c	Fri Jul 14 05:56:32 2006 +0000
+++ b/src/fileio.c	Sat Jul 29 09:59:12 2006 +0000
@@ -282,7 +282,7 @@
     switch (errorno)
       {
       case EEXIST:
-	Fsignal (Qfile_already_exists, Fcons (errstring, data));
+	xsignal (Qfile_already_exists, Fcons (errstring, data));
 	break;
       default:
 	/* System error messages are capitalized.  Downcase the initial
@@ -290,7 +290,7 @@
 	if (SREF (errstring, 1) != '/')
 	  SSET (errstring, 0, DOWNCASE (SREF (errstring, 0)));
 
-	Fsignal (Qfile_error,
+	xsignal (Qfile_error,
 		 Fcons (build_string (string), Fcons (errstring, data)));
       }
 }
@@ -2386,9 +2386,8 @@
   if (lstat (SDATA (encoded_filename), &statbuf) >= 0)
     {
       if (! interactive)
-	Fsignal (Qfile_already_exists,
-		 Fcons (build_string ("File already exists"),
-			Fcons (absname, Qnil)));
+	xsignal2 (Qfile_already_exists,
+		  build_string ("File already exists"), absname);
       GCPRO1 (absname);
       tem = format2 ("File %s already exists; %s anyway? ",
 		     absname, build_string (querystring));
@@ -2398,9 +2397,8 @@
 	tem = do_yes_or_no_p (tem);
       UNGCPRO;
       if (NILP (tem))
-	Fsignal (Qfile_already_exists,
-		 Fcons (build_string ("File already exists"),
-			Fcons (absname, Qnil)));
+	xsignal2 (Qfile_already_exists,
+		  build_string ("File already exists"), absname);
       if (statptr)
 	*statptr = statbuf;
     }
@@ -2502,9 +2500,8 @@
 	{
 	  /* Restore original attributes.  */
 	  SetFileAttributes (filename, attributes);
-	  Fsignal (Qfile_date_error,
-		   Fcons (build_string ("Cannot set file date"),
-			  Fcons (newname, Qnil)));
+	  xsignal2 (Qfile_date_error,
+		    build_string ("Cannot set file date"), newname);
 	}
       /* Restore original attributes.  */
       SetFileAttributes (filename, attributes);
@@ -2600,9 +2597,8 @@
 	  EMACS_SET_SECS_USECS (mtime, st.st_mtime, 0);
 	  if (set_file_times (SDATA (encoded_newname),
 			      atime, mtime))
-	    Fsignal (Qfile_date_error,
-		     Fcons (build_string ("Cannot set file date"),
-			    Fcons (newname, Qnil)));
+	    xsignal2 (Qfile_date_error,
+		      build_string ("Cannot set file date"), newname);
 	}
     }
 
@@ -2698,9 +2694,9 @@
   GCPRO1 (filename);
   if (!NILP (Ffile_directory_p (filename))
       && NILP (Ffile_symlink_p (filename)))
-    Fsignal (Qfile_error,
- 	     Fcons (build_string ("Removing old name: is a directory"),
- 		    Fcons (filename, Qnil)));
+    xsignal2 (Qfile_error,
+	      build_string ("Removing old name: is a directory"),
+	      filename);
   UNGCPRO;
   filename = Fexpand_file_name (filename, Qnil);
 
@@ -3850,9 +3846,8 @@
 	goto notfound;
 
       if (! NILP (replace) || ! NILP (beg) || ! NILP (end))
-	Fsignal (Qfile_error,
-		 Fcons (build_string ("not a regular file"),
-			Fcons (orig_filename, Qnil)));
+	xsignal2 (Qfile_error,
+		  build_string ("not a regular file"), orig_filename);
     }
 #endif
 
@@ -4725,9 +4720,8 @@
 	}
 #endif /* CLASH_DETECTION */
       if (not_regular)
-	Fsignal (Qfile_error,
-		 Fcons (build_string ("not a regular file"),
-			Fcons (orig_filename, Qnil)));
+	xsignal2 (Qfile_error,
+		  build_string ("not a regular file"), orig_filename);
     }
 
   if (set_coding_system)
@@ -6632,19 +6626,17 @@
   staticpro (&Qcar_less_than_car);
 
   Fput (Qfile_error, Qerror_conditions,
-	Fcons (Qfile_error, Fcons (Qerror, Qnil)));
+	list2 (Qfile_error, Qerror));
   Fput (Qfile_error, Qerror_message,
 	build_string ("File error"));
 
   Fput (Qfile_already_exists, Qerror_conditions,
-	Fcons (Qfile_already_exists,
-	       Fcons (Qfile_error, Fcons (Qerror, Qnil))));
+	list3 (Qfile_already_exists, Qfile_error, Qerror));
   Fput (Qfile_already_exists, Qerror_message,
 	build_string ("File already exists"));
 
   Fput (Qfile_date_error, Qerror_conditions,
-	Fcons (Qfile_date_error,
-	       Fcons (Qfile_error, Fcons (Qerror, Qnil))));
+	list3 (Qfile_date_error, Qfile_error, Qerror));
   Fput (Qfile_date_error, Qerror_message,
 	build_string ("Cannot set file date"));