diff options
| author | Po Lu | 2022-01-29 20:38:13 +0800 |
|---|---|---|
| committer | Po Lu | 2022-01-29 20:38:13 +0800 |
| commit | 4bac7d8c73440be88eaf07a6da54feb7eaaf2503 (patch) | |
| tree | ab291d8cc6b99aae020d0a9f3092011a7f5a6b39 /src | |
| parent | 04bba4a28f959cb202e7fb993b619c7358084ec3 (diff) | |
| download | emacs-4bac7d8c73440be88eaf07a6da54feb7eaaf2503.tar.gz emacs-4bac7d8c73440be88eaf07a6da54feb7eaaf2503.zip | |
Fix error after merge
* src/filelock.c (lock_file): Fix test against I_OWN_IT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/filelock.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 682 | if (!NILP (subject_buf) | 682 | if (!NILP (subject_buf) |
| 683 | && NILP (Fverify_visited_file_modtime (subject_buf)) | 683 | && NILP (Fverify_visited_file_modtime (subject_buf)) |
| 684 | && !NILP (Ffile_exists_p (fn)) | 684 | && !NILP (Ffile_exists_p (fn)) |
| 685 | && !(lfname && (current_lock_owner (NULL, lfname) != I_OWN_IT))) | 685 | && !(lfname && (current_lock_owner (NULL, lfname) == I_OWN_IT))) |
| 686 | call1 (intern ("userlock--ask-user-about-supersession-threat"), fn); | 686 | call1 (intern ("userlock--ask-user-about-supersession-threat"), fn); |
| 687 | 687 | ||
| 688 | /* Don't do locking if the user has opted out. */ | 688 | /* Don't do locking if the user has opted out. */ |