diff options
| author | Noam Postavsky | 2019-07-20 22:02:36 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2019-07-20 22:02:36 -0400 |
| commit | 6490269becdad96ca4b3b9db0d96dbb04ef2ab6a (patch) | |
| tree | 20cccad69113acfe3072dcf50a677b06c6d7b4fb /doc/misc | |
| parent | f02b9e9a6ff701d041ef86afe8b9a92ba8e4fd30 (diff) | |
| parent | 150bdfe43acde8423612cbff4eafbbb88878b497 (diff) | |
| download | emacs-6490269becdad96ca4b3b9db0d96dbb04ef2ab6a.tar.gz emacs-6490269becdad96ca4b3b9db0d96dbb04ef2ab6a.zip | |
Merge from emacs-26
150bdfe43a Handle completely undecoded input in term (Bug#29918)
021f32cca1 * doc/misc/forms.texi (Control File Format): Fix a doc error.
76538d09b7 Fix typo in package-alist docstring
b2fde4b5e8 * doc/lispref/text.texi (Mode-Specific Indent): Fix a typo...
7e62778548 ; Another minor change in 'bidi-display-reordering's doc s...
4455ddbe56 Improve doc string of 'bidi-display-reordering'
34ee26dd93 Add warning to bidi-display-reordering doc string
# Conflicts:
# lisp/term.el
# test/lisp/term-tests.el
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/forms.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi index d669ed6d038..9423f946091 100644 --- a/doc/misc/forms.texi +++ b/doc/misc/forms.texi | |||
| @@ -431,7 +431,7 @@ file. Example: | |||
| 431 | If the control file does not set @code{forms-format-list} a default | 431 | If the control file does not set @code{forms-format-list} a default |
| 432 | format is used. In this situation, Forms mode will deduce the number of | 432 | format is used. In this situation, Forms mode will deduce the number of |
| 433 | fields from the data file providing this file exists and | 433 | fields from the data file providing this file exists and |
| 434 | @code{forms-number-of-records} has not been set in the control file. | 434 | @code{forms-number-of-fields} has not been set in the control file. |
| 435 | 435 | ||
| 436 | The control file can optionally set the following additional Forms mode | 436 | The control file can optionally set the following additional Forms mode |
| 437 | variables. Most of them have default values that are good for most | 437 | variables. Most of them have default values that are good for most |