[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master cc5b6cb: Fix backtrace when query-about-changed-file nil and file
From: |
Lars Ingebrigtsen |
Subject: |
master cc5b6cb: Fix backtrace when query-about-changed-file nil and file has changed |
Date: |
Thu, 26 Aug 2021 22:01:05 -0400 (EDT) |
branch: master
commit cc5b6cb6bcc63d447663e1e98b05b7a16bd27f99
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Fix backtrace when query-about-changed-file nil and file has changed
* lisp/userlock.el (userlock--check-content-unchanged): Make the
assertion more robust -- we may be called here from a different
contexts if `query-about-changed-file' is nil.
---
lisp/userlock.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/userlock.el b/lisp/userlock.el
index 38aaf6a..a38f6ac 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -125,7 +125,8 @@ You can <%s>uit; don't modify this file."
(with-demoted-errors "Unchanged content check: %S"
;; Even tho we receive `filename', we know that `filename' refers to the
current
;; buffer's file.
- (cl-assert (equal filename (expand-file-name buffer-file-truename)))
+ (cl-assert (equal (expand-file-name filename)
+ (expand-file-name buffer-file-truename)))
;; Note: rather than read the file and compare to the buffer, we could save
;; the buffer and compare to the file, but for encrypted data this
;; wouldn't work well (and would risk exposing the data).
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master cc5b6cb: Fix backtrace when query-about-changed-file nil and file has changed,
Lars Ingebrigtsen <=