diff options
| author | Xue Fuqiao | 2013-08-08 22:03:56 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-08-08 22:03:56 +0800 |
| commit | 04263d23c5890d728cc62fd64873f687adff620c (patch) | |
| tree | 1970d7dbdca26d1cbc70443c31c536d88f346f44 | |
| parent | 9dfc8491bb0b62e1a83265f6141d4a866e96d91d (diff) | |
| download | emacs-04263d23c5890d728cc62fd64873f687adff620c.tar.gz emacs-04263d23c5890d728cc62fd64873f687adff620c.zip | |
doc/lispref/buffers.texi: Add documentation for ido-record-command(s).
* lisp/ido.el (ido-record-command): Add doc string.
| -rw-r--r-- | doc/misc/ido.texi | 9 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ido.el | 10 |
3 files changed, 16 insertions, 7 deletions
diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi index 48636a9fb92..e0b28e3b2cb 100644 --- a/doc/misc/ido.texi +++ b/doc/misc/ido.texi | |||
| @@ -631,7 +631,7 @@ fraction of the frame width. | |||
| 631 | @end defvr | 631 | @end defvr |
| 632 | 632 | ||
| 633 | @defvr {User Option} ido-max-window-height | 633 | @defvr {User Option} ido-max-window-height |
| 634 | If the value of this user option is non@code{nil}, its value will | 634 | If the value of this user option is non-@code{nil}, its value will |
| 635 | override the variable @code{max-mini-window-height}, which is the | 635 | override the variable @code{max-mini-window-height}, which is the |
| 636 | maximum height for resizing mini-windows (the minibuffer and the echo | 636 | maximum height for resizing mini-windows (the minibuffer and the echo |
| 637 | area). If it's a floating point number, it specifies a fraction of | 637 | area). If it's a floating point number, it specifies a fraction of |
| @@ -639,7 +639,12 @@ the mini-window frame's height. If it's an integer, it specifies the | |||
| 639 | number of lines. | 639 | number of lines. |
| 640 | @end defvr | 640 | @end defvr |
| 641 | 641 | ||
| 642 | @c @defvr {User Option} ido-record-commands | 642 | @defvr {User Option} ido-record-commands |
| 643 | If the value of this user option is non-@code{nil}, Ido will record | ||
| 644 | commands in the variable @code{command-history}. Note that non-Ido | ||
| 645 | equivalent is recorded. | ||
| 646 | @end defvr | ||
| 647 | |||
| 643 | @c @defvr {User Option} ido-enable-last-directory-history | 648 | @c @defvr {User Option} ido-enable-last-directory-history |
| 644 | @c @defvr {User Option} ido-enable-tramp-completion | 649 | @c @defvr {User Option} ido-enable-tramp-completion |
| 645 | @c @defvr {User Option} ido-unc-hosts | 650 | @c @defvr {User Option} ido-unc-hosts |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6f5469f4d55..6ab96b11327 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-08 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * ido.el (ido-record-command): Add doc string. | ||
| 4 | |||
| 1 | 2013-08-08 Juanma Barranquero <lekktu@gmail.com> | 5 | 2013-08-08 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * frameset.el (frameset): Do not disable creation of the default | 7 | * frameset.el (frameset): Do not disable creation of the default |
diff --git a/lisp/ido.el b/lisp/ido.el index d3c0e0f09f7..5d017069c5e 100644 --- a/lisp/ido.el +++ b/lisp/ido.el | |||
| @@ -523,8 +523,8 @@ window with completion alternatives, or `ido-next-match' or | |||
| 523 | 523 | ||
| 524 | 524 | ||
| 525 | (defcustom ido-record-commands t | 525 | (defcustom ido-record-commands t |
| 526 | "Non-nil means that `ido' will record commands in command history. | 526 | "Non-nil means that Ido will record commands in command history. |
| 527 | Note that the non-ido equivalent command is recorded." | 527 | Note that the non-Ido equivalent command is recorded." |
| 528 | :type 'boolean | 528 | :type 'boolean |
| 529 | :group 'ido) | 529 | :group 'ido) |
| 530 | 530 | ||
| @@ -1789,10 +1789,10 @@ This function also adds a hook to the minibuffer." | |||
| 1789 | (ido-set-current-directory (expand-file-name (or dir "~/")))) | 1789 | (ido-set-current-directory (expand-file-name (or dir "~/")))) |
| 1790 | 1790 | ||
| 1791 | (defun ido-record-command (command arg) | 1791 | (defun ido-record-command (command arg) |
| 1792 | ;; Add (command arg) to command-history if ido-record-commands is t | 1792 | "Add (COMMAND ARG) to `command-history' if `ido-record-commands' is non-nil." |
| 1793 | (if ido-record-commands | 1793 | (if ido-record-commands ; FIXME: use `when' instead of `if'? |
| 1794 | (let ((cmd (list command arg))) | 1794 | (let ((cmd (list command arg))) |
| 1795 | (if (or (not command-history) | 1795 | (if (or (not command-history) ; FIXME: ditto |
| 1796 | (not (equal cmd (car command-history)))) | 1796 | (not (equal cmd (car command-history)))) |
| 1797 | (setq command-history (cons cmd command-history)))))) | 1797 | (setq command-history (cons cmd command-history)))))) |
| 1798 | 1798 | ||