2007-02-05 Mike Sperber <mike(a)xemacs.org&gt; * fileio.c (Finsert_file_contents_internal): Clean up dead `handler' variable. -- Cheers =8-} Mike Friede, Völkerverständigung und überhaupt blabla Index: src/fileio.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/fileio.c,v retrieving revision 1.110 diff -u -r1.110 fileio.c --- src/fileio.c 8 Jan 2007 13:33:43 -0000 1.110 +++ src/fileio.c 5 Feb 2007 15:28:12 -0000 ＠＠ -2886,7 +2886,7 ＠＠ 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 ＠＠ 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 ＠＠ { 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, _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches