From 4bac7d8c73440be88eaf07a6da54feb7eaaf2503 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sat, 29 Jan 2022 20:38:13 +0800 Subject: [PATCH] Fix error after merge * src/filelock.c (lock_file): Fix test against I_OWN_IT. --- src/filelock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filelock.c b/src/filelock.c index 7dfdd5ddec7..cb548ac79bd 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -682,7 +682,7 @@ lock_file (Lisp_Object fn) if (!NILP (subject_buf) && NILP (Fverify_visited_file_modtime (subject_buf)) && !NILP (Ffile_exists_p (fn)) - && !(lfname && (current_lock_owner (NULL, lfname) != I_OWN_IT))) + && !(lfname && (current_lock_owner (NULL, lfname) == I_OWN_IT))) call1 (intern ("userlock--ask-user-about-supersession-threat"), fn); /* Don't do locking if the user has opted out. */ -- 2.39.5