comparison src/insdel.c @ 460:223736d75acb r21-2-45

Import from CVS: tag r21-2-45
author cvs
date Mon, 13 Aug 2007 11:43:24 +0200
parents abe6d1db359e
children 183866b06e0b
comparison
equal deleted inserted replaced
459:9d4fd877b885 460:223736d75acb
2322 XSETBUFFER (buffer, buf); 2322 XSETBUFFER (buffer, buf);
2323 GCPRO1 (buffer); 2323 GCPRO1 (buffer);
2324 if (!NILP (buf->filename) && lockit && 2324 if (!NILP (buf->filename) && lockit &&
2325 BUF_SAVE_MODIFF (buf) >= BUF_MODIFF (buf)) 2325 BUF_SAVE_MODIFF (buf) >= BUF_MODIFF (buf))
2326 { 2326 {
2327 #ifdef CLASH_DETECTION
2328 if (!NILP (buf->file_truename))
2329 /* Make binding buffer-file-name to nil effective. */
2330 lock_file (buf->file_truename);
2331 #else
2332 /* At least warn if this file has changed on disk since it was visited.*/ 2327 /* At least warn if this file has changed on disk since it was visited.*/
2333 if (NILP (Fverify_visited_file_modtime (buffer)) 2328 if (NILP (Fverify_visited_file_modtime (buffer))
2334 && !NILP (Ffile_exists_p (buf->filename))) 2329 && !NILP (Ffile_exists_p (buf->filename)))
2335 call1_in_buffer (buf, intern ("ask-user-about-supersession-threat"), 2330 call1_in_buffer (buf, intern ("ask-user-about-supersession-threat"),
2336 buf->filename); 2331 buf->filename);
2332 #ifdef CLASH_DETECTION
2333 if (!NILP (buf->file_truename))
2334 /* Make binding buffer-file-name to nil effective. */
2335 lock_file (buf->file_truename);
2337 #endif /* not CLASH_DETECTION */ 2336 #endif /* not CLASH_DETECTION */
2338 } 2337 }
2339 UNGCPRO; 2338 UNGCPRO;
2340 2339
2341 /* #### dmoore - is this reasonable in case of buf being killed above? */ 2340 /* #### dmoore - is this reasonable in case of buf being killed above? */