Skip to content

Commit acd0d3a

Browse files
committed
Use the US spelling of behavior consistently
1 parent daac347 commit acd0d3a

File tree

10 files changed

+25
-25
lines changed

10 files changed

+25
-25
lines changed

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ macros, special forms and methods.
152152
* **(Breaking)** Upgrade to nREPL 0.6.0. This is now the minimum required version.
153153
* **(Breaking)** Upgrade to piggieback 0.4.0. This is now the minimum required version.
154154
* **(Breaking)** Remove `cider.nrepl.middleware.pprint`. All functionality has been replaced by the built-in printing support in nREPL 0.6.
155-
* Option `cider-repl-scroll-on-output` is now obsolete, and the default REPL behaviour has changed to _not_ recenter the window. The built-in variable `scroll-conservatively` can be set to 101 (either globally or locally in the REPL buffer) to restore the old behaviour. This change has a dramatic positive effect on REPL performance.
155+
* Option `cider-repl-scroll-on-output` is now obsolete, and the default REPL behavior has changed to _not_ recenter the window. The built-in variable `scroll-conservatively` can be set to 101 (either globally or locally in the REPL buffer) to restore the old behavior. This change has a dramatic positive effect on REPL performance.
156156
* `cider-pprint-fn` and `cider-pprint-options` are now obsolete, replaced by `cider-print-fn` and `cider-print-options`.
157157
* `cider-debug-print-options`, `cider-stacktrace-print-options`, and `cider-repl-pretty-print-width` are now all obsolete, replaced by `cider-print-options`.
158158
* [#2546](https://github.com/clojure-emacs/cider/pull/2546): New defcustom `cider-ns-save-files-on-refresh-modes` to control for which buffers `cider-ns-refresh` should save before refreshing.
@@ -460,7 +460,7 @@ within the scope of your current Emacs session.
460460
### Changes
461461

462462
* [#1758](https://github.com/clojure-emacs/cider/issues/1758): Disable nREPL message logging by default due to its negative impact on performance.
463-
* Warn when running `cider-jack-in` without a Clojure project. This behaviour is controllable via `cider-allow-jack-in-without-project`.
463+
* Warn when running `cider-jack-in` without a Clojure project. This behavior is controllable via `cider-allow-jack-in-without-project`.
464464

465465
### Bugs Fixed
466466

@@ -704,7 +704,7 @@ and try to associate the created connection with this project automatically.
704704
* [#1220](https://github.com/clojure-emacs/cider/issues/1220): Treat keywords as symbols in lookup commands like `cider-find-var`.
705705
* [#1241](https://github.com/clojure-emacs/cider/pull/1241): Passing a double prefix argument to `cider-refresh` will now clear the state of the namespace tracker used by the refresh middleware. This is useful for recovering from errors that a normal reload would not otherwise recover from, but may cause stale code in any deleted files to not be completely unloaded.
706706
* New defcustom `cider-result-use-clojure-font-lock` allows you disable the use of Clojure font-locking for interactive results.
707-
* [#1239](https://github.com/clojure-emacs/cider/issues/1239): New defcustom `cider-refresh-show-log-buffer`, controls the behaviour of the `*cider-refresh-log*` buffer when calling `cider-refresh`. When set to nil (the default), the log buffer will still be written to, but not displayed automatically. Instead, the most relevant information will be displayed in the echo area. When set to non-nil, the log buffer will be displayed every time `cider-refresh` is called.
707+
* [#1239](https://github.com/clojure-emacs/cider/issues/1239): New defcustom `cider-refresh-show-log-buffer`, controls the behavior of the `*cider-refresh-log*` buffer when calling `cider-refresh`. When set to nil (the default), the log buffer will still be written to, but not displayed automatically. Instead, the most relevant information will be displayed in the echo area. When set to non-nil, the log buffer will be displayed every time `cider-refresh` is called.
708708
* [#1328](https://github.com/clojure-emacs/cider/issues/1328): Auto-scroll the `*nrepl-server*` buffer on new output.
709709
* [#1300](https://github.com/clojure-emacs/cider/issues/1300): Add the ability to replicate an existing connection with `cider-replicate-connection`.
710710
* [#1330](https://github.com/clojure-emacs/cider/issues/1330): Leverage nREPL 0.2.11's source-tracking feature.

cider-debug.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
;;; Customization
4646
(defgroup cider-debug nil
47-
"Presentation and behaviour of the cider debugger."
47+
"Presentation and behavior of the cider debugger."
4848
:prefix "cider-debug-"
4949
:group 'cider
5050
:package-version '(cider . "0.10.0"))

cider-eval.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ navigate to this buffer."
7777
:group 'cider)
7878

7979
(defcustom cider-auto-jump-to-error t
80-
"Control the cursor jump behaviour in compilation error buffer.
80+
"Control the cursor jump behavior in compilation error buffer.
8181
When non-nil automatically jump to error location during interactive
8282
compilation. When set to 'errors-only, don't jump to warnings.
8383
When set to nil, don't jump at all."

cider-inspector.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
;;; Customization
4242
(defgroup cider-inspector nil
43-
"Presentation and behaviour of the CIDER value inspector."
43+
"Presentation and behavior of the CIDER value inspector."
4444
:prefix "cider-inspector-"
4545
:group 'cider
4646
:package-version '(cider . "0.10.0"))

doc/modules/ROOT/pages/basics/up_and_running.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ but was subsequently switched to `clj`, Clojure's basic startup command.
105105
TIP: You can set `cider-allow-jack-in-without-project` to `t` if you'd like to
106106
disable the warning displayed when jacking-in outside a project.
107107

108-
=== Customizing the Jack-in Command Behaviour
108+
=== Customizing the Jack-in Command Behavior
109109

110110
You can use kbd:[C-u M-x] `cider-jack-in` kbd:[RET] to
111111
specify the exact command that `cider-jack-in` would run.
@@ -119,7 +119,7 @@ in some other directory currently. This option is also useful if your project
119119
contains some combination of project.clj, build.boot and deps.edn and you want
120120
to launch a REPL for one or the other.
121121

122-
NOTE: The examples use only `cider-jack-in`, but this behaviour is consistent
122+
NOTE: The examples use only `cider-jack-in`, but this behavior is consistent
123123
for all `cider-jack-in-*` commands.
124124

125125
You can further customize the command line CIDER uses for `cider-jack-in` by

doc/modules/ROOT/pages/config/basic_config.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ CIDER releases).
4343

4444
== Control what window to use when jumping to a definition
4545

46-
By default kbd:[M-.] and other commands that jump to a definition have the following behaviour:
46+
By default kbd:[M-.] and other commands that jump to a definition have the following behavior:
4747

4848
* If the definition buffer is visible simply switch to it.
4949
* Otherwise, use the current window to show the definition.
5050

51-
Other behaviour is possible, and is controlled with
51+
Other behavior is possible, and is controlled with
5252
`cider-jump-to-pop-to-buffer-actions`; the value of this is passed as the
5353
`action` argument to `pop-to-buffer`.
5454

@@ -73,19 +73,19 @@ For other possibilities, see the documentation for `display-buffer`.
7373
You jump to `map` in `core.clj` when `core.clj` *_is not_* being displayed in another
7474
window in the current frame.
7575

76-
With both the default behaviour and the alternative behaviour defined above, the
76+
With both the default behavior and the alternative behavior defined above, the
7777
definition of `map` will be shown in the current window.
7878

7979
=== Example 2
8080

8181
You jump to `map` in `core.clj` when `core.clj` *_is_* being displayed in another window
8282
in the current frame.
8383

84-
With the default behaviour, the definition of `map` will be shown in the current
84+
With the default behavior, the definition of `map` will be shown in the current
8585
window; you will now have two windows showing `core.clj`, and the existing
8686
`core.clj` window will be unchanged.
8787

88-
With the alternative behaviour defined above, the definition of `map` will be
88+
With the alternative behavior defined above, the definition of `map` will be
8989
shown in the existing `core.clj` window; all windows will show the same buffer as
9090
before the jump, and the current window will now be the one showing `core.clj`.
9191

doc/modules/ROOT/pages/config/eldoc.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ respect to your cursor's position).
2727

2828
CIDER also would show the eldoc for the symbol at point. So in `+(map inc ...)+`
2929
when the cursor is over `inc` its eldoc would be displayed. You can turn off this
30-
behaviour by:
30+
behavior by:
3131

3232
[source,lisp]
3333
----
@@ -38,10 +38,10 @@ behaviour by:
3838

3939
CIDER respects the value of `eldoc-echo-area-use-multiline-p` when
4040
displaying documentation in the minibuffer. You can customize this variable to change
41-
its behaviour.
41+
its behavior.
4242

4343
|===
44-
| eldoc-echo-area-use-multiline-p | Behaviour
44+
| eldoc-echo-area-use-multiline-p | Behavior
4545

4646
| `t`
4747
| Never attempt to truncate messages. Complete symbol name and function arglist or variable documentation will be displayed even if echo area must be resized to fit.

doc/modules/ROOT/pages/repl/configuration.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
== Behavior on connect
55

66
Normally, when you first establish a REPL connection, the REPL buffer is
7-
auto-displayed in a separate window. You can suppress this behaviour
7+
auto-displayed in a separate window. You can suppress this behavior
88
like this:
99

1010
[source,lisp]
@@ -110,7 +110,7 @@ and kbd:[C-Return] send the form off for evaluation.
110110
Prior to version 0.21.0, the REPL buffer would be automatically re-centered
111111
whenever any output was printed, so that the prompt was on the bottom line of
112112
the window, displaying the maximum possible amount of output above it. This is
113-
no longer the default behaviour -- you can now replicate it by setting the
113+
no longer the default behavior -- you can now replicate it by setting the
114114
built-in option `scroll-conservatively`, for example:
115115

116116
[source,lisp]
@@ -163,7 +163,7 @@ By default, REPL results have no prefix.
163163
By default `cider-repl-set-ns` won't require the target ns, just set
164164
it. That's done with the assumption that you've probably evaluated the ns in
165165
question already before switching to it (e.g. by doing kbd:[C-c C-k]
166-
(`cider-load-buffer`) in its source buffer). If you want to change this behaviour
166+
(`cider-load-buffer`) in its source buffer). If you want to change this behavior
167167
(to avoid calling `cider-repl-set-ns` and then `(require 'my-ns)` manually), you
168168
can set:
169169

@@ -195,7 +195,7 @@ Normally, code in the REPL is font-locked the same way as in
195195
`clojure-mode`. Before CIDER 0.10, by default, REPL input was
196196
font-locked with `cider-repl-input-face` (after pressing
197197
kbd:[Return]) and results were font-locked with
198-
`cider-repl-result-face`. If you want to restore the old behaviour
198+
`cider-repl-result-face`. If you want to restore the old behavior
199199
use:
200200

201201
[source,lisp]
@@ -247,10 +247,10 @@ in `cider-util.el`.
247247
By default the REPL always prints the results of your evaluations using the
248248
printing function specified by `cider-print-fn`.
249249

250-
NOTE: This behaviour was changed in CIDER 0.20. In prior CIDER releases
250+
NOTE: This behavior was changed in CIDER 0.20. In prior CIDER releases
251251
pretty-printing was disabled by default.
252252

253-
You can temporarily disable this behaviour and revert to the default behaviour
253+
You can temporarily disable this behavior and revert to the default behavior
254254
(equivalent to `clojure.core/pr`) using kbd:[M-x cider-repl-toggle-pretty-printing]
255255
or the REPL shortcut `toggle-pprint`.
256256

@@ -284,7 +284,7 @@ disabled due to some rough edges with the feature that were
284284
never properly addressed. See this https://github.com/clojure-emacs/cider/issues/2825[bug report]
285285
for details.
286286

287-
Alternatively, you can toggle this behaviour on and off using kbd:[M-x cider-repl-toggle-content-types]
287+
Alternatively, you can toggle this behavior on and off using kbd:[M-x cider-repl-toggle-content-types]
288288
or the REPL shortcut `toggle-content-types`.
289289

290290
== REPL type detection

doc/modules/ROOT/pages/usage/code_evaluation.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Note that this also affects the position of debugger overlays.
120120

121121
Normally, CIDER prompts you to save a modified Clojure buffer when you
122122
type kbd:[C-c C-k] (`cider-load-buffer`). You can change this
123-
behaviour by adjusting `cider-save-file-on-load`.
123+
behavior by adjusting `cider-save-file-on-load`.
124124

125125
Don't prompt and don't save:
126126

nrepl-client.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ should take a single argument, a dict representing the message. See
421421
`nrepl--dispatch-response' for an example.
422422
423423
These functions are called before the message's own callbacks, so that they
424-
can affect the behaviour of the callbacks. Errors signaled by these
424+
can affect the behavior of the callbacks. Errors signaled by these
425425
functions are demoted to messages, so that they don't prevent the
426426
callbacks from running.")
427427

0 commit comments

Comments
 (0)