CVS update by michaels xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: michaels
  Date: 07/02/05 16:33:23

  Modified:    xemacs/src ChangeLog fileio.c
Log:
2007-02-05  Mike Sperber  <mike at xemacs.org>

	* fileio.c (Finsert_file_contents_internal): Clean up dead
	`handler' variable.

Revision  Changes    Path
1.1041    +5 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1040
retrieving revision 1.1041
diff -u -p -r1.1040 -r1.1041
--- ChangeLog	2007/01/27 17:14:20	1.1040
+++ ChangeLog	2007/02/05 15:33:17	1.1041
@@ -1,3 +1,8 @@
+2007-02-05  Mike Sperber  <mike at xemacs.org>
+
+	* fileio.c (Finsert_file_contents_internal): Clean up dead
+	`handler' variable.
+
 2007-01-27  Mike Sperber  <mike at xemacs.org>
 
 	* faces.c (complex_vars_of_faces): Move declarations of fontptr



1.111     +17 -23    XEmacs/xemacs/src/fileio.c

Index: fileio.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/fileio.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- fileio.c	2007/01/08 13:33:43	1.110
+++ fileio.c	2007/02/05 15:33:19	1.111
@@ -2886,7 +2886,7 @@ under Mule, is very difficult.)
   Charcount inserted = 0;
   int speccount;
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
-  Lisp_Object handler = Qnil, val;
+  Lisp_Object val;
   int total;
   Ibyte read_buf[READ_BUF_SIZE];
   int mc_count;
@@ -2909,7 +2909,7 @@ under Mule, is very difficult.)
 
   curbuf = wrap_buffer (buf);
 
-  GCPRO5 (filename, val, visit, handler, curbuf);
+  GCPRO4 (filename, val, visit, curbuf);
 
   mc_count = (NILP (replace)) ?
     begin_multiple_change (buf, BUF_PT  (buf), BUF_PT (buf)) :
@@ -3230,31 +3230,25 @@ under Mule, is very difficult.)
     {
       if (!EQ (buf->undo_list, Qt))
 	buf->undo_list = Qnil;
-      if (NILP (handler))
-	{
-	  buf->modtime = st.st_mtime;
-	  buf->filename = filename;
-	  /* XEmacs addition: */
-	  /* This function used to be in C, ostensibly so that
-	     it could be called here.  But that's just silly.
-	     There's no reason C code can't call out to Lisp
-	     code, and it's a lot cleaner this way. */
-	  /*  Note: compute-buffer-file-truename is called for
-	      side-effect!  Its return value is intentionally
-	      ignored. */
-	  if (!NILP (Ffboundp (Qcompute_buffer_file_truename)))
-	    call1 (Qcompute_buffer_file_truename, wrap_buffer (buf));
-	}
+      buf->modtime = st.st_mtime;
+      buf->filename = filename;
+      /* XEmacs addition: */
+      /* This function used to be in C, ostensibly so that
+	 it could be called here.  But that's just silly.
+	 There's no reason C code can't call out to Lisp
+	 code, and it's a lot cleaner this way. */
+      /*  Note: compute-buffer-file-truename is called for
+	  side-effect!  Its return value is intentionally
+	  ignored. */
+      if (!NILP (Ffboundp (Qcompute_buffer_file_truename)))
+	call1 (Qcompute_buffer_file_truename, wrap_buffer (buf));
       BUF_SAVE_MODIFF (buf) = BUF_MODIFF (buf);
       buf->auto_save_modified = BUF_MODIFF (buf);
       buf->saved_size = make_int (BUF_SIZE (buf));
 #ifdef CLASH_DETECTION
-      if (NILP (handler))
-	{
-	  if (!NILP (buf->file_truename))
-	    unlock_file (buf->file_truename);
-	  unlock_file (filename);
-	}
+      if (!NILP (buf->file_truename))
+	unlock_file (buf->file_truename);
+      unlock_file (filename);
 #endif /* CLASH_DETECTION */
       if (not_regular)
 	RETURN_UNGCPRO (Fsignal (Qfile_error,