summaryrefslogtreecommitdiff
path: root/lisp/term.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-03-04 17:16:39 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-03-04 17:16:39 -0800
commitbd6c1976fba03bd2e4ca0a52cea562c8ecf23ef8 (patch)
treef5611596b3c70cdd536adfc06e9880bdd1bfc211 /lisp/term.el
parent78589529a7e7ea21f78c972c87b9e2c94ef27610 (diff)
parentf2caf08ca625f64c7eeea8dfa8f65a5b1bac58e2 (diff)
downloademacs-bd6c1976fba03bd2e4ca0a52cea562c8ecf23ef8.tar.gz
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.el4
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
inferior process. Only the process filter is allowed to make
changes to the buffer.
-Customize this option to nil if you want the previous behaviour."
+Customize this option to nil if you want the previous behavior."
:version "26.1"
:type 'boolean
:group 'term)
@@ -508,7 +508,7 @@ commands can be invoked on the mouse-selected point or region,
until the process filter (or user) moves point to the process
mark once again.
-Customize this option to nil if you want the previous behaviour."
+Customize this option to nil if you want the previous behavior."
:version "26.1"
:type 'boolean
:group 'term)