Spelling fixes.

* lib-src/Makefile.in (regex.o): Remove reference to no-longer-used macros
CONFIG_BROKETS and INHIBIT_STRING_HEADER.  "BROKETS" was a
misspelling anyway....
* src/nsterm.h (updateCollectionBehavior): Rename from
updateCollectionBehaviour.  All uses changed.

16 files changed, 39 insertions, 36 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c76eaceba78..c398a34f93b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -131,7 +131,7 @@
         * shell.el (shell-dynamic-complete-command): Doc fix.
         (shell--command-completion-data): Shell completion now matches
         executable filenames from the current buffer's directory, on
-        systems in which this behaviour is the default (windows-nt, ms-dos).
+        systems in which this behavior is the default (windows-nt, ms-dos).
 
 2013-12-27  Lars Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 966661c3abb..fdf00236235 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -49,7 +49,7 @@
 ;;      The normal case: delete the active region prior to executing
 ;;      the command which will insert replacement text.
 ;;  <function>
-;;      For commands which need to dynamically determine this behaviour.
+;;      For commands which need to dynamically determine this behavior.
 ;;      The function should return one of the above values or nil.
 
 ;;; Code:
@@ -99,7 +99,7 @@ If KILLP in not-nil, the active region is killed instead of deleted."
      The normal case: delete the active region prior to executing
      the command which will insert replacement text.
  FUNCTION
-     For commands which need to dynamically determine this behaviour.
+     For commands which need to dynamically determine this behavior.
      FUNCTION should take no argument and return one of the above values or nil."
   (condition-case data
       (cond ((eq type 'kill)
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 21c944e4997..a2d637e2aea 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -169,7 +169,7 @@ be considered.")
 (defun electric-pair-backward-delete-char (n &optional killflag untabify)
   "Delete characters backward, and maybe also two adjacent paired delimiters.
 
-Remaining behaviour is given by `backward-delete-char' or, if UNTABIFY is
+Remaining behavior is given by `backward-delete-char' or, if UNTABIFY is
 non-nil, `backward-delete-char-untabify'."
   (interactive "*p\nP")
   (let* ((prev (char-before))
@@ -191,7 +191,7 @@ non-nil, `backward-delete-char-untabify'."
 (defun electric-pair-backward-delete-char-untabify (n &optional killflag)
   "Delete characters backward, and maybe also two adjacent paired delimiters.
 
-Remaining behaviour is given by `backward-delete-char-untabify'."
+Remaining behavior is given by `backward-delete-char-untabify'."
   (interactive "*p\nP")
   (electric-pair-backward-delete-char n killflag t))
 
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index b8ad7244929..32e2f1d84c7 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -32,6 +32,9 @@
 
 (require 'erc)
 
+;; FIXME: It's ISO 639-1, not ISO 638.  ISO 638 is for paper, board and pulps.
+;; The Lisp variable should be renamed.
+
 (defvar iso-638-languages
   '(("aa" . "Afar")
     ("ab" . "Abkhazian")
@@ -42,7 +45,7 @@
     ("ay" . "Aymara")
     ("az" . "Azerbaijani")
     ("ba" . "Bashkir")
-    ("be" . "Byelorussian")
+    ("be" . "Belarusian")
     ("bg" . "Bulgarian")
     ("bh" . "Bihari")
     ("bi" . "Bislama")
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index abef3981764..1c6636a3065 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -107,7 +107,7 @@ days since you first checked new mails.  If this is nil, mails will be
 deleted on the server right after fetching.
 
 Gnus users should use the `:leave' keyword in a mail source to direct
-the behaviour per server, rather than directly modifying this value.
+the behavior per server, rather than directly modifying this value.
 
 Note that POP servers maintain no state information between sessions,
 so what the client believes is there and what is actually there may
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 31f70653ff8..9fef6155705 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1619,7 +1619,7 @@ span also begins a invisible portion of text.
 
 An implementation can use TEXT-BLOCK, TEXT-ID,
 TEXT-BEGINS-BLOCK-P to implement fold/unfold-on-mouse-click like
-behaviour.
+behavior.
 
 The default handler is `hfy-begin-span'.")
 
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index f55c5d08513..241cd84fcab 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -41,7 +41,7 @@
 ;; Written by Valery Alexeev <valery@math.uga.edu>.
 
 (defvar cyrillic-language-alist
-      (list '("Belorussian") '("Bulgarian") '("Macedonian")
+      (list '("Belarusian") '("Bulgarian") '("Macedonian")
             '("Russian") '("Serbo-Croatian") '("Ukrainian"))
       "List of known cyrillic languages.")
 
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 65404a7af18..87280e57b36 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1714,7 +1714,7 @@
         * org.el (org-previous-line-empty-p): New parameter to allow
         checking next line.  Add a docstring.
         (org-insert-heading): Handle two universal prefix arguments as
-        advertized in the docstring.  Don't insert new lines when
+        advertised in the docstring.  Don't insert new lines when
         creating a heading after the first heading in the current
         subtree.
         (org-insert-heading-respect-content): New optional argument
@@ -3522,7 +3522,7 @@
         parsing.
 
         * org.el (org-adaptive-fill-function): Do not handle
-        `adaptive-fill-regexp' in comments as the behaviour is not
+        `adaptive-fill-regexp' in comments as the behavior is not
         satisfying.
 
         * org-list.el (org-list-struct-apply-struct): Do not move item's
@@ -3677,7 +3677,7 @@
         "wrong-type-argument" error in template insertion.
 
         * org.el (org-fill-paragraph): Use empty commented lines as
-        separators when filling comments.  This mimics default behaviour
+        separators when filling comments.  This mimics default behavior
         from "newcomment.el", which is not used in Org.
 
         * ox-html.el (org-html-link): Add image attributes to "img" tag,
@@ -3984,7 +3984,7 @@
         * ox.el (org-export-with-timestamps): Only applies to isolated
         timestamps, i.e. timestamps in a paragraph containing only
         timestamps and empty strings.
-        (org-export--skip-p): Skip timestamps according to new behaviour.
+        (org-export--skip-p): Skip timestamps according to new behavior.
 
         * ox-latex.el (org-latex--script-size): Handle consecutive
         alterning sub and superscript.
@@ -4313,7 +4313,7 @@
         * ox.el (org-export-as): Store export options in :export-options
         porperty within communication channel.
 
-        * ox-latex.el (org-latex-item): Fix wrong behaviour when a counter
+        * ox-latex.el (org-latex-item): Fix wrong behavior when a counter
         is set in an ordered list while its parent is not ordered.
 
         * ox.el (org-export-format-code-default): Handle empty source
@@ -4942,7 +4942,7 @@
         timestamps ranges with repeaters.
 
         * org.el (org-edit-special): Rewrite `org-edit-special' using Org
-        Elements tools.  Behaviour should be unchanged.
+        Elements tools.  Behavior should be unchanged.
 
         * org-element.el (org-element-context): Add an optional argument
         so that (org-element-context) and (org-element-context
@@ -6383,7 +6383,7 @@
         * org.el: Make `org-closest-date' aware of hours repeaters.
 
         * org.el (org-end-of-line): Do not call `end-of-visual-line' when
-        moving to the end of line.  Also improve behaviour on elements that
+        moving to the end of line.  Also improve behavior on elements that
         can be hidden.
 
         * org.el (org-sparse-tree): Allow to call `org-show-todo-tree'
@@ -10565,7 +10565,7 @@
 2012-04-01  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-beginning-of-line, org-end-of-line): Fix special C-a
-        and C-e behaviour with visual lines.
+        and C-e behavior with visual lines.
 
 2012-04-01  Eric Schulte  <eric.schulte@gmx.com>
 
@@ -11105,7 +11105,7 @@
 
         * ob-emacs-lisp.el: A comment on the last line of an emacs-lisp
         code block would cause an error when the block is was executed.
-        This fix cures this behaviour.
+        This fix cures this behavior.
 
 2012-04-01  Eric Schulte  <eric.schulte@gmx.com>
 
@@ -12994,7 +12994,7 @@
 2012-01-03  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-list-separating-blank-lines-number):
-        The behaviour of `org-back-over-empty-lines' depends on the
+        The behavior of `org-back-over-empty-lines' depends on the
         associated value of `headline' in
         `org-blank-before-new-entry', which is out of context in a
         list.
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 41775bdab6d..faf543be1b5 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -63,19 +63,19 @@
 ;; with the same name as the link; then, if unsuccessful, ask the user if
 ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if
 ;; the user wishes to append 'tag' as a new toplevel heading at the end of
-;; the buffer; and finally, defer to org's default behaviour which is to
+;; the buffer; and finally, defer to org's default behavior which is to
 ;; search the entire text of the current buffer for 'tag'.
 ;;
-;; This behaviour can be modified by changing the value of
+;; This behavior can be modified by changing the value of
 ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my
-;; .emacs, which describes the same behaviour as the above paragraph with
+;; .emacs, which describes the same behavior as the above paragraph with
 ;; one difference:
 ;;
 ;; (setq org-ctags-open-link-functions
 ;;       '(org-ctags-find-tag
 ;;         org-ctags-ask-rebuild-tags-file-then-find-tag
 ;;         org-ctags-ask-append-topic
-;;         org-ctags-fail-silently))  ; <-- prevents org default behaviour
+;;         org-ctags-fail-silently))  ; <-- prevents org default behavior
 ;;
 ;;
 ;; Usage
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index 8df3ff9265e..45a20ddb826 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -580,7 +580,7 @@ The function must accept two parameters:
 The function should return the string to be exported.
 
 For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
 
 The default value simply returns the value of CONTENTS."
   :group 'org-export-html
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index 8294938477f..9fc1031d391 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -589,7 +589,7 @@ The function must accept six parameters:
 The function should return the string to be exported.
 
 For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
 
 \(defun org-latex-format-inlinetask \(todo type priority name tags contents\)
 \"Format an inline task element for LaTeX export.\"
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 20d5272831d..16189ecba54 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -228,7 +228,7 @@ If you create a site-map file, adjust the sorting like this:
   `:sitemap-sort-files'
 
     The site map is normally sorted alphabetically.  You can
-    change this behaviour setting this to `anti-chronologically',
+    change this behavior setting this to `anti-chronologically',
     `chronologically', or nil.
 
   `:sitemap-ignore-case'
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index a55f298ddc3..93279f3291e 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -348,7 +348,7 @@ The function must accept six parameters:
 The function should return the string to be exported.
 
 For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
 
 \(defun org-texinfo-format-inlinetask \(todo type priority name tags contents\)
 \"Format an inline task element for Texinfo export.\"
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 1887382de8c..3f24801f10b 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -143,7 +143,7 @@
   "Alist between export properties and ways to set them.
 
 The CAR of the alist is the property name, and the CDR is a list
-like (KEYWORD OPTION DEFAULT BEHAVIOUR) where:
+like (KEYWORD OPTION DEFAULT BEHAVIOR) where:
 
 KEYWORD is a string representing a buffer keyword, or nil.  Each
   property defined this way can also be set, during subtree
@@ -152,7 +152,7 @@ KEYWORD is a string representing a buffer keyword, or nil.  Each
   property).
 OPTION is a string that could be found in an #+OPTIONS: line.
 DEFAULT is the default value for the property.
-BEHAVIOUR determines how Org should handle multiple keywords for
+BEHAVIOR determines how Org should handle multiple keywords for
   the same property.  It is a symbol among:
   nil       Keep old value and discard the new one.
   t         Replace old value with the new one.
@@ -493,7 +493,7 @@ t           Allow export of math snippets."
   "The last level which is still exported as a headline.
 
 Inferior levels will usually produce itemize or enumerate lists
-when exported, but back-end behaviour may differ.
+when exported, but back-end behavior may differ.
 
 This option can also be set with the OPTIONS keyword,
 e.g. \"H:2\"."
@@ -1649,7 +1649,7 @@ for export.  Return options as a plist."
                           ((member keyword org-element-document-properties)
                            (org-element-parse-secondary-string
                             value (org-element-restriction 'keyword)))
-                          ;; If BEHAVIOUR is `split' expected value is
+                          ;; If BEHAVIOR is `split' expected value is
                           ;; a list of strings, not a string.
                           ((eq (nth 4 option) 'split) (org-split-string value))
                           (t value)))))))))
@@ -1726,13 +1726,13 @@ Assume buffer is in Org mode.  Narrowing, if any, is ignored."
                       (t
                        ;; Options in `org-export-options-alist'.
                        (dolist (property (funcall find-properties key))
-                         (let ((behaviour (nth 4 (assq property options))))
+                         (let ((behavior (nth 4 (assq property options))))
                            (setq plist
                                  (plist-put
                                   plist property
                                   ;; Handle value depending on specified
-                                  ;; BEHAVIOUR.
-                                  (case behaviour
+                                  ;; BEHAVIOR.
+                                  (case behavior
                                     (space
                                      (if (not (plist-get plist property))
                                          (org-trim val)
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 9d96f8a7242..4a329b9999e 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -896,7 +896,7 @@ When index is restricted, select the previous section as restriction criterion."
   ;; If FINAL is t, stay there
   ;; If FINAL is 'hide, hide the *Index* window.
   ;; Otherwise, move cursor back into *Index* window.
-  ;; NO-REVISIT means don't visit files, just use live biffers.
+  ;; NO-REVISIT means don't visit files, just use live buffers.
 
   (let* ((data (get-text-property (point) :data))
          (index-window (selected-window))
diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el
index 8ba721a96d5..87469b91032 100644
--- a/lisp/url/url-queue.el
+++ b/lisp/url/url-queue.el
@@ -69,7 +69,7 @@ The variable `url-queue-timeout' sets a timeout."
                                       :inhibit-cookiesp inhibit-cookies))))
   (url-queue-setup-runners))
 
-;; To ensure asynch behaviour, we start the required number of queue
+;; To ensure asynch behavior, we start the required number of queue
 ;; runners from `run-with-idle-timer'.  So we're basically going
 ;; through the queue in two ways: 1) synchronously when a program
 ;; calls `url-queue-retrieve' (which will then start the required