From: Glenn Morris <rgm@gnu.org>
Date: Wed, 3 Oct 2018 16:25:26 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4347
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f5621181111ba7cc58967ee9b1cfa08020d3e3ea;p=emacs.git

Merge from origin/emacs-26

9c028d6 * lisp/savehist.el (savehist-mode): Doc fix.  (Bug#32889)
3a2b5a7 ; * lisp/bindings.el (bindings--define-key): Doc fix.  (Bug#3...
6a7a869 Org manual: Rewrite the Org Mobile section

# Conflicts:
#	lisp/savehist.el
---

f5621181111ba7cc58967ee9b1cfa08020d3e3ea
diff --cc lisp/savehist.el
index e555450c209,893590ce809..329929be515
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@@ -171,11 -171,31 +171,28 @@@ minibuffer history."
  ;;;###autoload
  (define-minor-mode savehist-mode
    "Toggle saving of minibuffer history (Savehist mode).
 -With a prefix argument ARG, enable Savehist mode if ARG is
 -positive, and disable it otherwise.  If called from Lisp,
 -also enable the mode if ARG is omitted or nil.
  
  When Savehist mode is enabled, minibuffer history is saved
- periodically and when exiting Emacs.  When Savehist mode is
- enabled for the first time in an Emacs session, it loads the
- previous minibuffer history from `savehist-file'.
+ to `savehist-file' periodically and when exiting Emacs.  When
+ Savehist mode is enabled for the first time in an Emacs session,
+ it loads the previous minibuffer histories from `savehist-file'.
+ The variable `savehist-autosave-interval' controls the
+ periodicity of saving minibuffer histories.
+ 
+ If `savehist-save-minibuffer-history' is non-nil (the default),
+ all recorded minibuffer histories will be saved.  You can arrange
+ for additional history variables to be saved and restored by
+ customizing `savehist-additional-variables', which by default is
+ an empty list.  For example, to save the history of commands
+ invoked via \\[execute-extended-command], add `command-history' to the list in
+ `savehist-additional-variables'.
+ 
+ Alternatively, you could customize `savehist-save-minibuffer-history'
+ to nil, and add to `savehist-additional-variables' only those
+ history variables you want to save.
+ 
+ To ignore some history variables, add their symbols to the list
+ in `savehist-ignored-variables'.
  
  This mode should normally be turned on from your Emacs init file.
  Calling it at any other time replaces your current minibuffer