diff options
| author | Glenn Morris | 2014-01-27 20:49:02 -0500 |
|---|---|---|
| committer | Glenn Morris | 2014-01-27 20:49:02 -0500 |
| commit | e3bd7eed8cac658aae9f6f904eec23bf3482d4bb (patch) | |
| tree | 73b0f743e10345861cd7898845ee96a0bc1c5788 | |
| parent | a22359a7676690cf8e5eddd0029f612cdb85ea31 (diff) | |
| download | emacs-e3bd7eed8cac658aae9f6f904eec23bf3482d4bb.tar.gz emacs-e3bd7eed8cac658aae9f6f904eec23bf3482d4bb.zip | |
Some doc related to tab-stops
* doc/lispref/text.texi (Indent Tabs): Update related to tab-stops.
* lisp/indent.el (tab-stop-list): Doc fix. Add :version.
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/text.texi | 20 | ||||
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/indent.el | 15 |
4 files changed, 24 insertions, 17 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 6f27e71b7b7..78d7531f869 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-01-28 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * text.texi (Indent Tabs): Update related to tab-stops. | ||
| 4 | |||
| 1 | 2014-01-24 Glenn Morris <rgm@gnu.org> | 5 | 2014-01-24 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * control.texi (Handling Errors): Update with-demoted-errors. | 7 | * control.texi (Handling Errors): Update with-demoted-errors. |
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 60cda8068bb..a6e98763d8f 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi | |||
| @@ -2460,19 +2460,19 @@ stop feature only in a few major modes, such as Text mode. | |||
| 2460 | 2460 | ||
| 2461 | @deffn Command tab-to-tab-stop | 2461 | @deffn Command tab-to-tab-stop |
| 2462 | This command inserts spaces or tabs before point, up to the next tab | 2462 | This command inserts spaces or tabs before point, up to the next tab |
| 2463 | stop column defined by @code{tab-stop-list}. It searches the list for | 2463 | stop column defined by @code{tab-stop-list}. |
| 2464 | an element greater than the current column number, and uses that element | ||
| 2465 | as the column to indent to. It does nothing if no such element is | ||
| 2466 | found. | ||
| 2467 | @end deffn | 2464 | @end deffn |
| 2468 | 2465 | ||
| 2469 | @defopt tab-stop-list | 2466 | @defopt tab-stop-list |
| 2470 | This variable is the list of tab stop columns used by | 2467 | This variable defines the tab stop columns used by @code{tab-to-tab-stop}. |
| 2471 | @code{tab-to-tab-stops}. The elements should be integers in increasing | 2468 | It should be either @code{nil}, or a list of increasing integers, |
| 2472 | order. The tab stop columns need not be evenly spaced. | 2469 | which need not be evenly spaced. The list is implicitly |
| 2473 | 2470 | extended to infinity through repetition of the interval between the | |
| 2474 | Use @kbd{M-x edit-tab-stops} to edit the location of tab stops | 2471 | last and penultimate elements (or @code{tab-width} if the list has |
| 2475 | interactively. | 2472 | fewer than two elements). A value of @code{nil} means a tab stop |
| 2473 | every @code{tab-width} columns. | ||
| 2474 | |||
| 2475 | Use @kbd{M-x edit-tab-stops} to edit the location of tab stops interactively. | ||
| 2476 | @end defopt | 2476 | @end defopt |
| 2477 | 2477 | ||
| 2478 | @node Motion by Indent | 2478 | @node Motion by Indent |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6200de759b4..a9a5e6eb3b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-01-28 Glenn Morris <rgm@gnu.org> | 1 | 2014-01-28 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * indent.el (tab-stop-list): Doc fix. Add :version. | ||
| 4 | |||
| 3 | * vc/pcvs.el (vc-editable-p, vc-checkout): Remove unused declarations. | 5 | * vc/pcvs.el (vc-editable-p, vc-checkout): Remove unused declarations. |
| 4 | (cvs-append-to-ignore): Add compatibility alias. | 6 | (cvs-append-to-ignore): Add compatibility alias. |
| 5 | 7 | ||
diff --git a/lisp/indent.el b/lisp/indent.el index ca221530458..c042db891c4 100644 --- a/lisp/indent.el +++ b/lisp/indent.el | |||
| @@ -586,16 +586,17 @@ See also `indent-relative-maybe'." | |||
| 586 | (move-marker opoint nil)) | 586 | (move-marker opoint nil)) |
| 587 | (tab-to-tab-stop)))) | 587 | (tab-to-tab-stop)))) |
| 588 | 588 | ||
| 589 | (defcustom tab-stop-list | 589 | (defcustom tab-stop-list nil |
| 590 | nil | ||
| 591 | "List of tab stop positions used by `tab-to-tab-stop'. | 590 | "List of tab stop positions used by `tab-to-tab-stop'. |
| 592 | This should be a list of integers, ordered from smallest to largest. | 591 | This should be nil, or a list of integers, ordered from smallest to largest. |
| 593 | It implicitly extends to infinity by repeating the last step (e.g. '(1 2 5) | 592 | It implicitly extends to infinity through repetition of the last step. |
| 594 | is equivalent to '(1 2 5 8 11)). | 593 | For example, '(1 2 5) is equivalent to '(1 2 5 8 11 ...). If the list has |
| 595 | If the list has less than 2 elements, `tab-width' is used as the \"last step\"." | 594 | fewer than 2 elements, `tab-width' is used as the \"last step\". |
| 595 | A value of nil means a tab stop every `tab-width' columns." | ||
| 596 | :group 'indent | 596 | :group 'indent |
| 597 | :version "24.4" ; from explicit list to nil | ||
| 598 | :safe 'listp | ||
| 597 | :type '(repeat integer)) | 599 | :type '(repeat integer)) |
| 598 | (put 'tab-stop-list 'safe-local-variable 'listp) | ||
| 599 | 600 | ||
| 600 | (defvar edit-tab-stops-map | 601 | (defvar edit-tab-stops-map |
| 601 | (let ((map (make-sparse-keymap))) | 602 | (let ((map (make-sparse-keymap))) |