procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

savehist.el: Unbreak tests

Browse source 
* lisp/savehist.el (savehist-loaded): Fix typo.
(savehist--reload): Add compatibility with test case.
This commit is contained in:
Stefan Monnier 2025-04-12 22:49:48 -04:00
parent bfeb755e03
commit 356178c8e7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/savehist.el
View file

@ -162,7 +162,7 @@ along with minibuffer history. You can change its value off
(defvar savehist-loaded nil
"Whether the history has already been loaded.")
(make-obsolete-variable savehist-loaded 'savehist--file-sync-modtime "31")
(make-obsolete-variable 'savehist-loaded 'savehist--file-sync-modtime "31")
(defvar savehist--file-sync-modtime nil
"Modtime of the `savehist-file' when we last sync'd up with it.")
@ -209,7 +209,9 @@ histories, which is probably undesirable."
"Load the history data from `savehist-file'.
Be careful to do it while preserving the current history data."
(when (and (file-exists-p savehist-file)
(not (equal savehist--file-sync-modtime (savehist--file-modtime))))
(not (and savehist-loaded
(equal savehist--file-sync-modtime
(savehist--file-modtime)))))
;; FIXME: Process the file manually rather than passing it to `load'.
(let ((savehist-old-minibuffer-history-variables
(mapcar (lambda (s) (and (boundp s) (cons s (symbol-value s))))