* lisp/ido.el (ido-use-virtual-buffers): Doc fix.

Reset :version, since the default value has not changed.

* etc/NEWS: Related edits.

diff --git a/etc/NEWS b/etc/NEWS
index 2c7d42a26b8984b4492b205f28b0de2ff8548a16..dfba6da980cfe657cb1be302131325011f5eb97d 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -558,11 +558,17 @@ will revert to the old behavior.
 
 ** Ido
 
-*** Ido has a manual now.
++++
+*** An Ido user manual is now included.
 
-*** `ido-use-virtual-buffers' takes a new value 'auto.
+---
+*** The option `ido-use-virtual-buffers' can now take the value `auto'.
+This means to use virtual buffers if the current ido input does not match
+an existing buffer.
 
-*** `ido-decorations' has been slightly extended to give a bit more control.
+---
+*** The variable `ido-decorations' can optionally have two new elements,
+which are the brackets to use around the sole remaining completion.
 
 ** Image mode
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c14a4021a1012815b8372c946913e8d71fa4bdb..c14487ed721583a68efa7f38523bcc850c327822 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-01-31  Glenn Morris  <rgm@gnu.org>
 
+       * ido.el (ido-use-virtual-buffers): Doc fix.
+       Reset :version, since the default value has not changed.
+
        * register.el (register-preview-delay, register-read-with-preview):
        Doc fixes.
 

diff --git a/lisp/ido.el b/lisp/ido.el
index 265a9a9f1c1c9c6fb0f2e62f2b1876048c894569..52dd3850ce599215898f5358997dd07f08c4d607 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -795,13 +795,11 @@ remaining completion.  If absent, elements 5 and 6 are used instead."
   :group 'ido)
 
 (defcustom ido-use-virtual-buffers nil
-  "Specify how virtual buffers should be used.
-The value can be one of the following:
-
-  nil:  No virtual buffers are used.
-  auto: Use virtual buffers when the current input matches no
-        existing buffers.
+  "If non-nil, refer to past (\"virtual\") buffers as well as existing ones.
+The options are:
+  nil:  Do not use virtual buffers.
   t:    Always use virtual buffers.
+  auto: Use virtual buffers if the current input matches no existing buffer.
 
 Essentially it works as follows: Say you are visiting a file and
 the buffer gets cleaned up by midnight.el.  Later, you want to
@@ -811,10 +809,11 @@ the `ido-virtual' face, and always at the end), and if you select
 it, it opens the file back up again.  This allows you to think
 less about whether recently opened files are still open or not.
 Most of the time you can quit Emacs, restart, and then switch to
-a file buffer that was previously open as if it still were.  This
-feature relies upon the `recentf' package, which will be enabled
-if this variable is configured to a non-nil value."
-  :version "24.4"
+a file buffer that was previously open as if it still were.
+
+This feature relies upon the `recentf' package, which will be
+enabled if this variable is configured to a non-nil value."
+  :version "24.1"
   :type '(choice (const :tag "Always" t)
                 (const :tag "Automatic" auto)
                 (const :tag "Never" nil))