diff options
| author | Paul Eggert | 2018-03-04 17:16:39 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-03-04 17:16:39 -0800 |
| commit | bd6c1976fba03bd2e4ca0a52cea562c8ecf23ef8 (patch) | |
| tree | f5611596b3c70cdd536adfc06e9880bdd1bfc211 /lisp/term.el | |
| parent | 78589529a7e7ea21f78c972c87b9e2c94ef27610 (diff) | |
| parent | f2caf08ca625f64c7eeea8dfa8f65a5b1bac58e2 (diff) | |
| download | emacs-bd6c1976fba03bd2e4ca0a52cea562c8ecf23ef8.tar.gz emacs-bd6c1976fba03bd2e4ca0a52cea562c8ecf23ef8.zip | |
Merge from origin/emacs-26
f2caf08ca6 ; Spelling fixes
f0e5f220b6 * lisp/progmodes/grep.el (zrgrep):
a0f71260f8 Minor copyedits in doc/emacs/text.texi
adfe2f580f Remove outdated comment in syntax.el
b80e15b6a6 Prevent Flyspell from changing unrelated words
e385599457 Avoid errors in flymake in builds --without-x
d691e30cb0 More improvements of the Emacs manual
Diffstat (limited to 'lisp/term.el')
| -rw-r--r-- | lisp/term.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/term.el b/lisp/term.el index a0313d88dac..cf7699abc94 100644 --- a/lisp/term.el +++ b/lisp/term.el | |||
| @@ -487,7 +487,7 @@ inconsistent with the state of the terminal understood by the | |||
| 487 | inferior process. Only the process filter is allowed to make | 487 | inferior process. Only the process filter is allowed to make |
| 488 | changes to the buffer. | 488 | changes to the buffer. |
| 489 | 489 | ||
| 490 | Customize this option to nil if you want the previous behaviour." | 490 | Customize this option to nil if you want the previous behavior." |
| 491 | :version "26.1" | 491 | :version "26.1" |
| 492 | :type 'boolean | 492 | :type 'boolean |
| 493 | :group 'term) | 493 | :group 'term) |
| @@ -508,7 +508,7 @@ commands can be invoked on the mouse-selected point or region, | |||
| 508 | until the process filter (or user) moves point to the process | 508 | until the process filter (or user) moves point to the process |
| 509 | mark once again. | 509 | mark once again. |
| 510 | 510 | ||
| 511 | Customize this option to nil if you want the previous behaviour." | 511 | Customize this option to nil if you want the previous behavior." |
| 512 | :version "26.1" | 512 | :version "26.1" |
| 513 | :type 'boolean | 513 | :type 'boolean |
| 514 | :group 'term) | 514 | :group 'term) |