diff options
| author | Glenn Morris | 2018-01-29 07:50:21 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-01-29 07:50:21 -0800 |
| commit | 9c2c7b1cdc733ea9277676e43ba458d173491b66 (patch) | |
| tree | 2013c8951fa2b3006aed36f224193633d08f574c /src | |
| parent | ea8c0e1b9eaa6651919fb4e039e3fcb5a1fa73db (diff) | |
| parent | 6415b2d40c13be2c5cd5f797718c391d1c4ce9e6 (diff) | |
| download | emacs-9c2c7b1cdc733ea9277676e43ba458d173491b66.tar.gz emacs-9c2c7b1cdc733ea9277676e43ba458d173491b66.zip | |
Merge from origin/emacs-26
6415b2d Allow read-passwd to hide characters inserted by C-y. (Secur...
8cb4ffb * etc/PROBLEMS: Document issues with double-buffering. (Bug#...
fd10070 * lisp/window.el (window-largest-empty-rectangle): Fix grammar.
e1a4403 Minor changes in the Emacs manual
372fda6 Improve the "Files" chapter of the Emacs manual
9afc86d Improve the "Search" chapter of the Emacs manual
22f98b3 * src/indent.c (Findent_to): Doc fix. (Bug#30260)
085ee43 Improve documentation of 'edebug-defun'
4dd1b33 Mention crashes due to Noto Serif Kannada fonts
Diffstat (limited to 'src')
| -rw-r--r-- | src/indent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/indent.c b/src/indent.c index 1a8bcebddc9..316171e609b 100644 --- a/src/indent.c +++ b/src/indent.c | |||
| @@ -813,7 +813,7 @@ DEFUN ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ", | |||
| 813 | Optional second argument MINIMUM says always do at least MINIMUM spaces | 813 | Optional second argument MINIMUM says always do at least MINIMUM spaces |
| 814 | even if that goes past COLUMN; by default, MINIMUM is zero. | 814 | even if that goes past COLUMN; by default, MINIMUM is zero. |
| 815 | 815 | ||
| 816 | The return value is COLUMN. */) | 816 | The return value is the column where the insertion ends. */) |
| 817 | (Lisp_Object column, Lisp_Object minimum) | 817 | (Lisp_Object column, Lisp_Object minimum) |
| 818 | { | 818 | { |
| 819 | EMACS_INT mincol; | 819 | EMACS_INT mincol; |