[Emacs-diffs] trunk r113758: doc/lispref/buffers.texi: Add documentation of some user options for Ido.

[Xue Fuqiao]

------------------------------------------------------------
revno: 113758
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-08 21:53:30 +0800
message:
  doc/lispref/buffers.texi: Add documentation of some user options for Ido.
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/ido.texi              ido.texi-20130724222900-50gdum2iefexcdgi-1

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-08-08 12:52:25 +0000
+++ b/doc/misc/ChangeLog        2013-08-08 13:53:30 +0000
@@ -2,7 +2,8 @@
 
        * ido.texi (Top): Insert node "Working Directories" in menu.
        (Working Directories): New node.
-       (Misc Customization): Add documentation of 
`ido-confirm-unique-completion'.
+       (Misc Customization): Add documentation of
+       `ido-confirm-unique-completion' and some other user options.
 
 2013-08-07  Eli Zaretskii  <address@hidden>
 

=== modified file 'doc/misc/ido.texi'
--- a/doc/misc/ido.texi 2013-08-08 12:52:25 +0000
+++ b/doc/misc/ido.texi 2013-08-08 13:53:30 +0000
@@ -582,6 +582,9 @@
 @section Miscellaneous Customization
 @cindex miscellaneous customization for Ido
 
address@hidden Variables described in this sections may be moved to new nodes in
address@hidden the future.
+
 @defvr {User Option} ido-mode
 This user option determines for which functional group (buffer and
 files) Ido behavior should be enabled.
@@ -606,16 +609,37 @@
 @end defvr
 
 @defvr {User Option} ido-confirm-unique-completion
-If the value of this user option is address@hidden , even a unique
+If the value of this user option is address@hidden, even a unique
 completion must be confirmed.  This means that @code{ido-complete}
 (@key{TAB}) must always be followed by @code{ido-exit-minibuffer}
 (@key{RET}) even when there is only one unique completion.
 @end defvr
 
address@hidden @defvr {User Option} ido-cannot-complete-command
address@hidden {User Option} ido-cannot-complete-command
+When @code{ido-complete} can't complete any more, it will run the
+command specified by this user option.  The most useful values are
address@hidden, which pops up a window with completion
+alternatives, or @code{ido-next-match} or @code{ido-prev-match}, which
+cycle the buffer list.
address@hidden defvr
+
address@hidden {User Option} ido-max-file-prompt-width
+This user option specifies the upper limit of the prompt string.  If
+its value is an integer, it specifies the number of characters of the
+string.  If its value is a floating point number, it specifies a
+fraction of the frame width.
address@hidden defvr
+
address@hidden {User Option} ido-max-window-height
+If the value of this user option is address@hidden, its value will
+override the variable @code{max-mini-window-height}, which is the
+maximum height for resizing mini-windows (the minibuffer and the echo
+area).  If it's a floating point number, it specifies a fraction of
+the mini-window frame's height.  If it's an integer, it specifies the
+number of lines.
address@hidden defvr
+
 @c @defvr {User Option} ido-record-commands
address@hidden @defvr {User Option} ido-max-file-prompt-width
address@hidden @defvr {User Option} ido-max-window-height
 @c @defvr {User Option} ido-enable-last-directory-history
 @c @defvr {User Option} ido-enable-tramp-completion
 @c @defvr {User Option} ido-unc-hosts