aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Love1999-10-13 17:17:59 +0000
committerDave Love1999-10-13 17:17:59 +0000
commit8af8a9ca7c03bde417e6275c26a1b6898da29e0a (patch)
tree1dfe6eb9b1b9718f2b1be14c0b7d39422c16c780 /src
parentaccd12667f307e6d60ab47d50ce9630c1d8a86e4 (diff)
downloademacs-8af8a9ca7c03bde417e6275c26a1b6898da29e0a.tar.gz
emacs-8af8a9ca7c03bde417e6275c26a1b6898da29e0a.zip
(lock_file): Move gcpro of `fn'.
Diffstat (limited to 'src')
-rw-r--r--src/filelock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/filelock.c b/src/filelock.c
index bcb71cb8c77..6882443c1e5 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -566,6 +566,7 @@ lock_file (fn)
566 return; 566 return;
567 567
568 orig_fn = fn; 568 orig_fn = fn;
569 GCPRO1 (fn);
569 fn = Fexpand_file_name (fn, Qnil); 570 fn = Fexpand_file_name (fn, Qnil);
570 encoded_fn = ENCODE_FILE (fn); 571 encoded_fn = ENCODE_FILE (fn);
571 572
@@ -579,15 +580,14 @@ lock_file (fn)
579 struct gcpro gcpro1; 580 struct gcpro gcpro1;
580 581
581 subject_buf = get_truename_buffer (orig_fn); 582 subject_buf = get_truename_buffer (orig_fn);
582 GCPRO1 (fn);
583 583
584 if (!NILP (subject_buf) 584 if (!NILP (subject_buf)
585 && NILP (Fverify_visited_file_modtime (subject_buf)) 585 && NILP (Fverify_visited_file_modtime (subject_buf))
586 && !NILP (Ffile_exists_p (fn))) 586 && !NILP (Ffile_exists_p (fn)))
587 call1 (intern ("ask-user-about-supersession-threat"), fn); 587 call1 (intern ("ask-user-about-supersession-threat"), fn);
588 588
589 UNGCPRO;
590 } 589 }
590 UNGCPRO;
591 591
592 /* Try to lock the lock. */ 592 /* Try to lock the lock. */
593 if (lock_if_free (&lock_info, lfname) <= 0) 593 if (lock_if_free (&lock_info, lfname) <= 0)