lisp/savehist.el (savehist--reload): Don't accidentally set nil

Reported by Michael Heerdegen <michael_heerdegen@web.de>.
This commit is contained in:
Stefan Monnier 2025-04-16 17:05:04 -04:00
parent f68482cbc0
commit 2330e7b6d6

View file

@ -214,9 +214,10 @@ Be careful to do it while preserving the current history data."
(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))))
(cons 'savehist-minibuffer-history-variables
savehist-minibuffer-history-variables))))
(delq nil (mapcar (lambda (s)
(and (boundp s) (cons s (symbol-value s))))
(cons 'savehist-minibuffer-history-variables
savehist-minibuffer-history-variables)))))
(condition-case errvar
(progn
;; Don't set coding-system-for-read -- we rely on the