diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-05-14 17:18:18 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-05-14 17:18:18 -0700 |
| commit | 5fe9375a5164960c3ecb65a7ef6d742069b8a7d7 (patch) | |
| tree | 315715009d9fe5af40be38cb0dfccecfaf4c5528 /src/indent.c | |
| parent | 0f63e17663f99742425c9ec4f282f5e7e3194b1b (diff) | |
| parent | 02bee7860f7e650ef13e00fe1a7f9a362e3eb001 (diff) | |
| download | emacs-5fe9375a5164960c3ecb65a7ef6d742069b8a7d7.tar.gz | |
Merge from origin/emacs-26
02bee78 Let dir locals for more specific modes override those from less
b1235f9 Improve documentation of Hexl mode
32d1813 Fix description of (move-to-column <n> t) when column <n> is ...
0397b7c ; Fix smtpmail-stream-type docstring
7dab3ee Recognize single quote attribute values in nxml and sgml (Bug...
e4cde42 Disable extra display of in nxml-mode (Bug#32897)
ca14dd1 Fix nxml-get-inside (Bug#32003)
e7ab351 Fix positioning client buffer as instructed by emacsclient
# Conflicts:
# lisp/files.el
# lisp/textmodes/sgml-mode.el
Diffstat (limited to 'src/indent.c')
| -rw-r--r-- | src/indent.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/indent.c b/src/indent.c index c76e6b7b4bd..90d8b1ce8e9 100644 --- a/src/indent.c +++ b/src/indent.c @@ -983,9 +983,10 @@ If specified column is within a character, point goes after that character. If it's past end of line, point goes to end of line. Optional second argument FORCE non-nil means if COLUMN is in the -middle of a tab character, change it to spaces. -In addition, if FORCE is t, and the line is too short to reach -COLUMN, add spaces/tabs to get there. +middle of a tab character, either change it to spaces (when +`indent-tabs-mode' is nil), or insert enough spaces before it to reach +COLUMN (otherwise). In addition, if FORCE is t, and the line is too short +to reach COLUMN, add spaces/tabs to get there. The return value is the current column. */) (Lisp_Object column, Lisp_Object force) |