]> git.eshelyaron.com Git - emacs.git/commitdiff
Avoid change to desktop file format
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 27 Apr 2022 04:03:21 +0000 (21:03 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 27 Apr 2022 04:04:36 +0000 (21:04 -0700)
* lisp/desktop.el (desktop--get-file-modtime): New function.
(desktop-save, desktop-read): Use it.

lisp/desktop.el

index baa3f3297054b93c0aa734dcaa9e1427c4c3a968..f41a41c3c3df9ecb8d47328b6f7d09cfb243681f 100644 (file)
@@ -645,6 +645,14 @@ Only valid during frame saving & restoring; intended for internal use.")
   "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 @@ no questions asked."
                (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 @@ It returns t if a desktop file was loaded, nil otherwise.
                           '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.