Re: master 4a1f69ebca 2/2: Use (TICKS . HZ) for current-time etc.

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

On 4/26/22 18:29, Po Lu wrote:

> The change you installed fixes my problem (though I really don't see why
> it did, since nothing is saved.)

desktop-file-modtime's value is saved, and was compared for list 
equality not time equality.

> Also, shouldn't the desktop file version be bumped when the format of
> the time data changes?

Yes, or we could not change the desktop file format. I installed the 
attached to do the latter.

[-- Attachment #2: 0001-Avoid-change-to-desktop-file-format.patch --]
[-- Type: text/x-patch, Size: 2047 bytes --]

From 8c2ea3a7086353ab2e62e70f8fc7567d8cd75f7a Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 26 Apr 2022 21:03:21 -0700
Subject: [PATCH] Avoid change to desktop file format

* lisp/desktop.el (desktop--get-file-modtime): New function.
(desktop-save, desktop-read): Use it.
---
 lisp/desktop.el | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lisp/desktop.el b/lisp/desktop.el
index baa3f32970..f41a41c3c3 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -645,6 +645,14 @@ desktop-file-modtime
   "When the desktop file was last modified to the knowledge of this Emacs.
 Used to detect desktop file conflicts.")
 
+(defun desktop--get-file-modtime ()
+  "Get desktop file modtime, in list form for desktop format version 208."
+  (setq desktop-file-modtime
+	(time-convert (file-attribute-modification-time
+		       (file-attributes
+			(desktop-full-file-name)))
+		      'list)))
+
 (defvar desktop-var-serdes-funs
   (list (list
 	 'mark-ring
@@ -1221,9 +1229,7 @@ desktop-save
 		(write-region (point-min) (point-max) (desktop-full-file-name) nil 'nomessage))
 	      (setq desktop-file-checksum checksum)
 	      ;; We remember when it was modified (which is presumably just now).
-	      (setq desktop-file-modtime (file-attribute-modification-time
-					  (file-attributes
-					   (desktop-full-file-name)))))))))))
+	      (desktop--get-file-modtime))))))))
 
 ;; ----------------------------------------------------------------------------
 ;;;###autoload
@@ -1332,9 +1338,7 @@ desktop-read
                           'window-configuration-change-hook)))
 	    (desktop-auto-save-disable)
 	    ;; Evaluate desktop buffer and remember when it was modified.
-	    (setq desktop-file-modtime (file-attribute-modification-time
-					(file-attributes
-					 (desktop-full-file-name))))
+	    (desktop--get-file-modtime)
 	    (load (desktop-full-file-name) t t t)
 	    ;; If it wasn't already, mark it as in-use, to bother other
 	    ;; desktop instances.
-- 
2.32.0