summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/misc/flymake.texi2
-rw-r--r--lisp/progmodes/flymake.el5
-rw-r--r--lisp/use-package/bind-key.el4
3 files changed, 5 insertions, 6 deletions
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 4561b760c04..80e1bceb8ec 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -847,7 +847,7 @@ Binding,,, elisp, The Emacs Lisp Reference Manual}) to be active.
@findex flymake-proc-legacy-flymake
The backend @code{flymake-proc-legacy-flymake} was originally designed
to be extended for supporting new syntax check tools and error message
-patterns. It is also controlled by its own set of customization variables
+patterns. It is also controlled by its own set of customization variables.
@node Proc customization variables
@section Customization variables for the Proc backend
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index adb984c3e59..a4a8cd84050 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -54,9 +54,8 @@
;; (question mark) if no backends were even configured.
;;
;; For programmers interested in writing a new Flymake backend, the
-;; docstring of `flymake-diagnostic-functions', the Flymake manual,
-;; and the code of existing backends are probably a good starting
-;; point.
+;; docstring of `flymake-diagnostic-functions', the Flymake manual, and the
+;; code of existing backends are probably good starting points.
;;
;; The user wishing to customize the appearance of error types should
;; set properties on the symbols associated with each diagnostic type.
diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el
index 9a1d65ba5ef..a5d6a5f45bb 100644
--- a/lisp/use-package/bind-key.el
+++ b/lisp/use-package/bind-key.el
@@ -282,7 +282,7 @@ Accepts keyword arguments:
key in the repeat map, but will not set the
`repeat-map' property of the bound command.
:continue BINDINGS - Within the scope of `:repeat-map' forces the
- same behaviour as if no special keyword had
+ same behavior as if no special keyword had
been used (that is, the command is bound, and
it's `repeat-map' property set)
:filter FORM - optional form to determine when bindings apply
@@ -429,7 +429,7 @@ Accepts keyword arguments:
key in the repeat map, but will not set the
`repeat-map' property of the bound command.
:continue BINDINGS - Within the scope of `:repeat-map' forces the
- same behaviour as if no special keyword had
+ same behavior as if no special keyword had
been used (that is, the command is bound, and
it's `repeat-map' property set)
:filter FORM - optional form to determine when bindings apply