aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-07-01 03:05:49 +0000
committerGlenn Morris2008-07-01 03:05:49 +0000
commita7c29764d9dd1df1e77be02001b5bcc838dd561e (patch)
treec5177667ab7068e9357827394993afa94f1f65b9
parentf838179402f8cc11610180c166258a607b2b6709 (diff)
downloademacs-a7c29764d9dd1df1e77be02001b5bcc838dd561e.tar.gz
emacs-a7c29764d9dd1df1e77be02001b5bcc838dd561e.zip
American English spelling fixes.
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lisp/play/bubbles.el10
2 files changed, 8 insertions, 8 deletions
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 @@
436 436
437 * etags.c (readline): When creating a relative file name from a 437 * etags.c (readline): When creating a relative file name from a
438 #line directive, leave the file name alone. The previous 438 #line directive, leave the file name alone. The previous
439 behaviour was to make it relative to the tags file directory, 439 behavior was to make it relative to the tags file directory,
440 under the hypothesis that the #line directive file name was 440 under the hypothesis that the #line directive file name was
441 relative to the directory of the tagged file. That hypothesis is 441 relative to the directory of the tagged file. That hypothesis is
442 wrong with Cpp and Lex. 442 wrong with Cpp and Lex.
@@ -1784,7 +1784,7 @@
17842002-03-05 Francesco Potortì <pot@gnu.org> 17842002-03-05 Francesco Potortì <pot@gnu.org>
1785 1785
1786 * etags.c: Honour #line directives. 1786 * etags.c: Honour #line directives.
1787 (no_line_directive): New global var; set it for old behaviour. 1787 (no_line_directive): New global var; set it for old behavior.
1788 (main): Remove some #ifdef in the getopt switch. 1788 (main): Remove some #ifdef in the getopt switch.
1789 (add_node, put_entries): Code added to merge different chunks of 1789 (add_node, put_entries): Code added to merge different chunks of
1790 nodes referring to the same file. Currently the tags are just 1790 nodes referring to the same file. Currently the tags are just
@@ -2662,7 +2662,7 @@
2662 2662
2663 * etags.c (sym_type): New st_C_extern tag. 2663 * etags.c (sym_type): New st_C_extern tag.
2664 (gperf input): Use it for spotting external declarations. 2664 (gperf input): Use it for spotting external declarations.
2665 (print_help): Document the new behaviour of --declarations. 2665 (print_help): Document the new behavior of --declarations.
2666 (fvextern): New global variable. 2666 (fvextern): New global variable.
2667 (consider_token, C_entries): Use it. 2667 (consider_token, C_entries): Use it.
2668 2668
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'."
233 "Current Bubbles score.") 233 "Current Bubbles score.")
234 234
235(defvar bubbles--neighbourhood-score 0 235(defvar bubbles--neighbourhood-score 0
236 "Score of active bubbles neighbourhood.") 236 "Score of active bubbles neighborhood.")
237 237
238(defvar bubbles--faces nil 238(defvar bubbles--faces nil
239 "List of currently used faces.") 239 "List of currently used faces.")
@@ -1083,7 +1083,7 @@ Set `bubbles--col-offset' and `bubbles--row-offset'."
1083 nil))) 1083 nil)))
1084 1084
1085(defun bubbles--mark-direct-neighbours (row col char) 1085(defun bubbles--mark-direct-neighbours (row col char)
1086 "Mark direct neighbours of bubble at ROW COL with same CHAR." 1086 "Mark direct neighbors of bubble at ROW COL with same CHAR."
1087 (save-excursion 1087 (save-excursion
1088 (let ((count 0)) 1088 (let ((count 0))
1089 (when (and (bubbles--goto row col) 1089 (when (and (bubbles--goto row col)
@@ -1099,7 +1099,7 @@ Set `bubbles--col-offset' and `bubbles--row-offset'."
1099 count))) 1099 count)))
1100 1100
1101(defun bubbles--mark-neighbourhood (&optional pos) 1101(defun bubbles--mark-neighbourhood (&optional pos)
1102 "Mark neighbourhood of point. 1102 "Mark neighborhood of point.
1103Use optional parameter POS instead of point if given." 1103Use optional parameter POS instead of point if given."
1104 (when bubbles--playing 1104 (when bubbles--playing
1105 (unless pos (setq pos (point))) 1105 (unless pos (setq pos (point)))
@@ -1124,7 +1124,7 @@ Use optional parameter POS instead of point if given."
1124 (error (message "Bubbles: Internal error %s" err))))) 1124 (error (message "Bubbles: Internal error %s" err)))))
1125 1125
1126(defun bubbles--neighbourhood-available () 1126(defun bubbles--neighbourhood-available ()
1127 "Return t if another valid neighbourhood is available." 1127 "Return t if another valid neighborhood is available."
1128 (catch 'found 1128 (catch 'found
1129 (save-excursion 1129 (save-excursion
1130 (dotimes (i (bubbles--grid-height)) 1130 (dotimes (i (bubbles--grid-height))
@@ -1159,7 +1159,7 @@ Use optional parameter POS instead of point if given."
1159 (bubbles--show-scores)) 1159 (bubbles--show-scores))
1160 1160
1161(defun bubbles--update-neighbourhood-score (size) 1161(defun bubbles--update-neighbourhood-score (size)
1162 "Calculate and display score of active neighbourhood from its SIZE." 1162 "Calculate and display score of active neighborhood from its SIZE."
1163 (if (> size 1) 1163 (if (> size 1)
1164 (setq bubbles--neighbourhood-score (expt (- size 1) 2)) 1164 (setq bubbles--neighbourhood-score (expt (- size 1) 2))
1165 (setq bubbles--neighbourhood-score 0)) 1165 (setq bubbles--neighbourhood-score 0))