aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/savehist.el13
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 4a86d6f0bde..f161958fcac 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -228,13 +228,10 @@ which is probably undesirable."
228(add-minor-mode 'savehist-mode "") 228(add-minor-mode 'savehist-mode "")
229 229
230(defun savehist-load () 230(defun savehist-load ()
231 "Obsolete function provided for transition from old versions of savehist. 231 "Load the variables stored in `savehist-file' and turn on `savehist-mode'.
232Don't call this from new code, use (savehist-mode 1) instead. 232If `savehist-file' is in the old format that doesn't record
233 233the value of `savehist-minibuffer-history-variables', that
234This function loads the variables stored in `savehist-file' and turns on 234value is deducted from the contents of the file."
235`savehist-mode'. If `savehist-file' is in the old format that doesn't
236record the value of `savehist-minibuffer-history-variables', that value
237is deducted from the contents of the file."
238 (savehist-mode 1) 235 (savehist-mode 1)
239 ;; Old versions of savehist distributed with XEmacs didn't save 236 ;; Old versions of savehist distributed with XEmacs didn't save
240 ;; savehist-minibuffer-history-variables. If that variable is nil 237 ;; savehist-minibuffer-history-variables. If that variable is nil
@@ -251,7 +248,7 @@ is deducted from the contents of the file."
251 ;; Collect VAR, i.e. (nth form 1). 248 ;; Collect VAR, i.e. (nth form 1).
252 (push (nth 1 form) vars)) 249 (push (nth 1 form) vars))
253 vars))))) 250 vars)))))
254(make-obsolete 'savehist-load 'savehist-mode) 251(make-obsolete 'savehist-load 'savehist-mode "22.1")
255 252
256(defun savehist-install () 253(defun savehist-install ()
257 "Hook savehist into Emacs. 254 "Hook savehist into Emacs.