From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 27 Aug 2021 02:00:58 +0000 (+0200)
Subject: Fix backtrace when query-about-changed-file nil and file has changed
X-Git-Tag: emacs-28.0.90~1294
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc5b6cb6bcc63d447663e1e98b05b7a16bd27f99;p=emacs.git

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.
---

diff --git a/lisp/userlock.el b/lisp/userlock.el
index 38aaf6aec23..a38f6ac4222 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).