diff options
author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/indent.el | |
parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
download | emacs-25-merge.tar.gz |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/indent.el')
-rw-r--r-- | lisp/indent.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/indent.el b/lisp/indent.el index cba8f755f8f..cf3770f1f69 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -610,7 +610,7 @@ See also `indent-relative-maybe'." "List of tab stop positions used by `tab-to-tab-stop'. This should be nil, or a list of integers, ordered from smallest to largest. It implicitly extends to infinity through repetition of the last step. -For example, '(1 2 5) is equivalent to '(1 2 5 8 11 ...). If the list has +For example, (1 2 5) is equivalent to (1 2 5 8 11 ...). If the list has fewer than 2 elements, `tab-width' is used as the \"last step\". A value of nil means a tab stop every `tab-width' columns." :group 'indent |