From: Glenn Morris <rgm@gnu.org>
Date: Tue, 1 Jul 2008 03:05:49 +0000 (+0000)
Subject: American English spelling fixes.
X-Git-Tag: emacs-pretest-23.0.90~4369
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a7c29764d9dd1df1e77be02001b5bcc838dd561e;p=emacs.git

American English spelling fixes.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index ae247d96cfe..854b01a0c1d 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -436,7 +436,7 @@
 
 	* etags.c (readline): When creating a relative file name from a
 	#line directive, leave the file name alone.  The previous
-	behaviour was to make it relative to the tags file directory,
+	behavior was to make it relative to the tags file directory,
 	under the hypothesis that the #line directive file name was
 	relative to the directory of the tagged file.  That hypothesis is
 	wrong with Cpp and Lex.
@@ -1784,7 +1784,7 @@
 2002-03-05  Francesco Potortì  <pot@gnu.org>
 
 	* etags.c: Honour #line directives.
-	(no_line_directive): New global var; set it for old behaviour.
+	(no_line_directive): New global var; set it for old behavior.
 	(main): Remove some #ifdef in the getopt switch.
 	(add_node, put_entries): Code added to merge different chunks of
 	nodes referring to the same file.  Currently the tags are just
@@ -2662,7 +2662,7 @@
 
 	* etags.c (sym_type): New st_C_extern tag.
 	(gperf input): Use it for spotting external declarations.
-	(print_help): Document the new behaviour of --declarations.
+	(print_help): Document the new behavior of --declarations.
 	(fvextern): New global variable.
 	(consider_token, C_entries): Use it.
 
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 80aaf6b4a7e..290a43c0a7e 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -233,7 +233,7 @@ Available modes are `shift-default' and`shift-always'."
   "Current Bubbles score.")
 
 (defvar bubbles--neighbourhood-score 0
-  "Score of active bubbles neighbourhood.")
+  "Score of active bubbles neighborhood.")
 
 (defvar bubbles--faces nil
   "List of currently used faces.")
@@ -1083,7 +1083,7 @@ Set `bubbles--col-offset' and `bubbles--row-offset'."
       nil)))
 
 (defun bubbles--mark-direct-neighbours (row col char)
-  "Mark direct neighbours of bubble at ROW COL with same CHAR."
+  "Mark direct neighbors of bubble at ROW COL with same CHAR."
   (save-excursion
     (let ((count 0))
       (when (and (bubbles--goto row col)
@@ -1099,7 +1099,7 @@ Set `bubbles--col-offset' and `bubbles--row-offset'."
       count)))
 
 (defun bubbles--mark-neighbourhood (&optional pos)
-  "Mark neighbourhood of point.
+  "Mark neighborhood of point.
 Use optional parameter POS instead of point if given."
   (when bubbles--playing
     (unless pos (setq pos (point)))
@@ -1124,7 +1124,7 @@ Use optional parameter POS instead of point if given."
       (error (message "Bubbles: Internal error %s" err)))))
 
 (defun bubbles--neighbourhood-available ()
-  "Return t if another valid neighbourhood is available."
+  "Return t if another valid neighborhood is available."
   (catch 'found
     (save-excursion
       (dotimes (i (bubbles--grid-height))
@@ -1159,7 +1159,7 @@ Use optional parameter POS instead of point if given."
   (bubbles--show-scores))
 
 (defun bubbles--update-neighbourhood-score (size)
-  "Calculate and display score of active neighbourhood from its SIZE."
+  "Calculate and display score of active neighborhood from its SIZE."
   (if (> size 1)
       (setq bubbles--neighbourhood-score (expt (- size 1) 2))
     (setq bubbles--neighbourhood-score 0))