Fix error after merge

* src/filelock.c (lock_file): Fix test against I_OWN_IT.

diff --git a/src/filelock.c b/src/filelock.c
index 7dfdd5ddec7f3dfefd361c129a6bfdfa6067d0a2..cb548ac79bd1d2fd823cf793ddfe69270571bef5 100644 (file)
--- 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.  */