changeset 96376:c3309dba6542

American English spelling fix.

--- a/ChangeLog	Fri Jun 27 07:30:14 2008 +0000
+++ b/ChangeLog	Fri Jun 27 07:34:53 2008 +0000
@@ -6894,7 +6894,7 @@
 
 	* make-dist: Check the flag called "make_tar", not "make_dir"; the
 	latter, being a typo, is always false, resulting in a program
-	whose default behaviour is to painstakingly build a copy of the
+	whose default behavior is to painstakingly build a copy of the
 	source tree, and then delete it.  Rah.
 
 	* Makefile.in: Add dist target, and comment for it.

--- a/admin/ChangeLog	Fri Jun 27 07:30:14 2008 +0000
+++ b/admin/ChangeLog	Fri Jun 27 07:34:53 2008 +0000
@@ -463,7 +463,7 @@
 
 2005-02-15  Jason Rumney  <[e-mail]>
 
-	* nt/makedist.bat: Do not rely on non-standard behaviour of
+	* nt/makedist.bat: Do not rely on non-standard behavior of
 	tar --exclude.
 
 2004-11-02  Jan Djärv  <[e-mail]>

--- a/admin/notes/multi-tty	Fri Jun 27 07:30:14 2008 +0000
+++ b/admin/notes/multi-tty	Fri Jun 27 07:34:53 2008 +0000
@@ -93,7 +93,7 @@
 
 		emacsclient -e '(top-level)'
 
-	  Note that this (perhaps) unintuitive behaviour is by design.
+	  Note that this (perhaps) unintuitive behavior is by design.
 	  Single-kboard mode is required because of an intrinsic Emacs
 	  limitation that is very hard to eliminate.  (This limitation
 	  is related to the single-threaded nature of Emacs.)
@@ -733,7 +733,7 @@
    term_init/delete_tty.  The hint was right, in a way.)
 
 -- Issue with SIGIO: it needs to be disabled during redisplay.  See if
-   fcntl kernel behaviour could be emulated by emacsclient.
+   fcntl kernel behavior could be emulated by emacsclient.
 
    (Done.  Simply disabled the SIGIO emulation hack in emacsclient.)
    (Update: it was added back.)  (Update^2: and removed again.)

--- a/doc/emacs/ChangeLog	Fri Jun 27 07:30:14 2008 +0000
+++ b/doc/emacs/ChangeLog	Fri Jun 27 07:34:53 2008 +0000
@@ -4964,7 +4964,7 @@
 
 2003-08-03  Glenn Morris  <[e-mail]>
 
-	* calendar.texi (Date Formats): Document changed behaviour of
+	* calendar.texi (Date Formats): Document changed behavior of
 	abbreviations.
 
 2003-07-24  Markus Rost  <[e-mail]>

--- a/doc/misc/ChangeLog	Fri Jun 27 07:30:14 2008 +0000
+++ b/doc/misc/ChangeLog	Fri Jun 27 07:34:53 2008 +0000
@@ -659,7 +659,7 @@
 2007-11-18  Michael Albinus  <[e-mail]>
 
 	* tramp.texi (Filename completion): Simplify explanation of
-	double-slash behaviour.  Explain directory contents flushing.
+	double-slash behavior.  Explain directory contents flushing.
 
 2007-11-16  Jay Belanger  <[e-mail]>
 

Binary file doc/misc/tramp.texi has changed

--- a/etc/ChangeLog	Fri Jun 27 07:30:14 2008 +0000
+++ b/etc/ChangeLog	Fri Jun 27 07:34:53 2008 +0000
@@ -2964,7 +2964,7 @@
 
 2001-05-17  Francesco Potortì  <[e-mail]>
 
-	* etags.1: Add the latest changes to etags behaviour.
+	* etags.1: Add the latest changes to etags behavior.
 
 2001-05-04  Eli Zaretskii  <[e-mail]>
 

--- a/etc/ETAGS.EBNF	Fri Jun 27 07:30:14 2008 +0000
+++ b/etc/ETAGS.EBNF	Fri Jun 27 07:34:53 2008 +0000
@@ -10,7 +10,7 @@
 
 ====================== 1) EBNF tag file description =====================
 
-Productions created from current behaviour to aid extensions
+Productions created from current behavior to aid extensions
 Francesco Potorti` <[e-mail]> 2002
 ----------------
 

--- a/etc/NEWS	Fri Jun 27 07:30:14 2008 +0000
+++ b/etc/NEWS	Fri Jun 27 07:34:53 2008 +0000
@@ -712,7 +712,7 @@
 with the face `eldoc-highlight-function-argument'.
 
 *** In Etags, the --members option is now the default.
-Use --no-members if you want the old default behaviour of not tagging
+Use --no-members if you want the old default behavior of not tagging
 struct members in C, members variables in C++ and variables in PHP.
 
 *** The `gdb' command only works with the graphical interface now.

--- a/etc/NEWS.1-17	Fri Jun 27 07:30:14 2008 +0000
+++ b/etc/NEWS.1-17	Fri Jun 27 07:34:53 2008 +0000
@@ -1026,7 +1026,7 @@
 as those of buffer-menu-mode.
 
 This is a useful thing to bind to c-x c-b in your `.emacs' file if the
-rather non-standard `electric' behaviour of the buffer list suits your taste.
+rather non-standard `electric' behavior of the buffer list suits your taste.
 Type C-h after invoking electric-buffer-list for more information.
 
 Calls value of `electric-buffer-menu-mode-hook' if non-nil on entry.

--- a/etc/NEWS.22	Fri Jun 27 07:30:14 2008 +0000
+++ b/etc/NEWS.22	Fri Jun 27 07:34:53 2008 +0000
@@ -102,7 +102,7 @@
 ** focus-follows-mouse defaults to nil on MS Windows.
 Previously this variable was incorrectly documented as having no effect
 on MS Windows, and the default was inappropriate for the majority of
-Windows installations. Users of software which modifies the behaviour of
+Windows installations. Users of software which modifies the behavior of
 Windows to cause focus to follow the mouse will now need to explicitly set
 this variable.
 
@@ -2484,7 +2484,7 @@
 breakpoints.
 
 To use this package just type M-x gdb.  See the Emacs manual if you want the
-old behaviour.
+old behavior.
 
 *** GUD mode has its own tool bar for controlling execution of the inferior
 and other common debugger commands.

--- a/etc/NXML-NEWS	Fri Jun 27 07:30:14 2008 +0000
+++ b/etc/NXML-NEWS	Fri Jun 27 07:34:53 2008 +0000
@@ -93,7 +93,7 @@
 previous element.
 
 By default, the sexp commands (C-M-f, C-M-b, C-M-k, C-M-SPC) operate
-on tags rather than elements.  To restore the old behaviour,
+on tags rather than elements.  To restore the old behavior,
 customize nxml-sexp-element-flag.
 
 The file TUTORIAL has been replaced by nxml-mode.info; this is in info
@@ -137,7 +137,7 @@
   M-x customize-variable RET nxml-slash-auto-complete-flag RET
 
 and then follow the instructions displayed in the buffer to get the
-old behaviour.
+old behavior.
 
 Completion after </ will complete the rest of the end-tag. Completion
 after < will include the end-tag in the possibilities if allowed by

--- a/etc/termcap.src	Fri Jun 27 07:30:14 2008 +0000
+++ b/etc/termcap.src	Fri Jun 27 07:34:53 2008 +0000
@@ -6070,7 +6070,7 @@
 # this speed.
 #   dch1 has been commented out because it causes annoying glittering when
 # vi deletes one character at the beginning of a line with tabs in it.
-#   dch makes sysgen(1M) have a horrible behaviour when deleting
+#   dch makes sysgen(1M) have a horrible behavior when deleting
 # a screen and makes screen(1) behave badly, so it is disabled too. The nice
 # thing is that vi goes crazy if smir-rmir are present and both dch-dch1 are
 # not, so smir and rmir are commented out as well.
@@ -6323,7 +6323,7 @@
 # terminal bug (not sending \E[) was acknowledged by Wyse (so it's not just
 # me), but I can't find that and the server under my bookmark to "Wyse
 # Technical" isn't responding.  So there's the question of wether the wy85
-# terminfo should reflect the manufactuer's intended behaviour of the terminal
+# terminfo should reflect the manufactuer's intended behavior of the terminal
 # or the actual."
 # (untranslatable capabilities removed to fit entry within 1023 bytes)
 # (sgr removed to fit entry within 1023 bytes)

--- a/leim/ChangeLog	Fri Jun 27 07:30:14 2008 +0000
+++ b/leim/ChangeLog	Fri Jun 27 07:34:53 2008 +0000
@@ -544,7 +544,7 @@
 2003-07-21  KAWABATA, Taichi  <[e-mail]>
 
 	* quail/indian.el (quail-indian-update-translation): Adjust the
-	behaviour according to the change of quail-translate-key.
+	behavior according to the change of quail-translate-key.
 
 2003-05-22  Kenichi Handa  <[e-mail]>
 

--- a/lisp/ChangeLog.10	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/ChangeLog.10	Fri Jun 27 07:34:53 2008 +0000
@@ -14464,7 +14464,7 @@
 	* simple.el (push-mark-command): Added optional NOMSG arg.
 
 	* emulation/cua-base.el (cua-set-mark): Align pop to mark
-	behaviour with standard set-mark-command.
+	behavior with standard set-mark-command.
 	(cua--pre-command-handler): Use push-mark-command.
 	(cua-repeat-replace-region): Improve functionality when
 	repeated after moving point or changing buffer.
@@ -14482,7 +14482,7 @@
 2002-05-26  Glenn Morris  <[e-mail]>
 
 	* progmodes/f90.el (f90-previous-block, f90-next-block): New names,
-	and slightly changed behaviour, for `f90-previous-block-start' and
+	and slightly changed behavior, for `f90-previous-block-start' and
 	`f90-next-block-end'.
 	(f90-beginning-of-subprogram, f90-end-of-subprogram): Simplify.
 
@@ -17724,7 +17724,7 @@
 	directory names in classpath/sourcepath lists, update comment.
 	(jdb): Add setting of gud-jdb-sourcepath, update comment.
 	(gud-find-class): Add gud-jdb-sourcepath use, and correct
-	behaviour for the case when classpath is not used--backward
+	behavior for the case when classpath is not used--backward
 	compatibility fix.
 
 2002-03-27  Eli Zaretskii  <[e-mail]>
@@ -22062,7 +22062,7 @@
 2001-11-18  Stephen Eglen  <[e-mail]>
 
 	* iswitchb.el (iswitchb-cannot-complete-hook): New variable to
-	control behaviour when no further completion is possible.
+	control behavior when no further completion is possible.
 
 2001-11-19  Colin Walters  <[e-mail]>
 

--- a/lisp/ChangeLog.12	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/ChangeLog.12	Fri Jun 27 07:34:53 2008 +0000
@@ -3869,7 +3869,7 @@
 
 2006-11-26  Nick Roberts  <[e-mail]>
 
-	* speedbar.el (speedbar-timer-fn): Revert to old behaviour when not
+	* speedbar.el (speedbar-timer-fn): Revert to old behavior when not
 	in GUD mode.
 
 	* progmodes/gud.el (gud-install-speedbar-variables): Remove bindings:
@@ -4512,7 +4512,7 @@
 
 	* printing.el (pr-alist-custom-set, pr-ps-utility-custom-set)
 	(pr-ps-name-custom-set, pr-txt-name-custom-set): Return back the old
-	behaviour.
+	behavior.
 	(pr-menu-bind): Act on global-map instead of menu-bar-file-menu
 	directly.
 

--- a/lisp/ChangeLog.13	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/ChangeLog.13	Fri Jun 27 07:34:53 2008 +0000
@@ -3985,7 +3985,7 @@
 2008-01-17  Vinicius Jose Latorre  <[e-mail]>
 	    Miles Bader  <[e-mail]>
 
-	* blank-mode.el: New file.  Minor mode to visualise (HARD) SPACE,
+	* blank-mode.el: New file.  Minor mode to visualize (HARD) SPACE,
 	TAB, NEWLINE.  Miles Bader <[e-mail]> wrote the original code
 	for handling display table (via visws.el package), his code was
 	modified, but the main idea was kept.

--- a/lisp/ChangeLog.3	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/ChangeLog.3	Fri Jun 27 07:34:53 2008 +0000
@@ -2696,7 +2696,7 @@
 	* fortran.el (fortran-prepare-abbrev-list-buffer): Put quote in
 	front of first argument to `insert-abbrev-table-description'.
 
-	* fortran.el (fortran-is-in-string-p): Fixed incorrect behaviour
+	* fortran.el (fortran-is-in-string-p): Fixed incorrect behavior
 	when in first statement of a buffer.
 
 1993-02-08  Roland McGrath  ([e-mail])

--- a/lisp/ChangeLog.5	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/ChangeLog.5	Fri Jun 27 07:34:53 2008 +0000
@@ -4533,7 +4533,7 @@
 
 	* imenu.el (imenu-always-use-completion-buffer-p): A value of
 	`never' now means never display a completion buffer.
-	(imenu--completion-buffer): Implement 'never behaviour.
+	(imenu--completion-buffer): Implement 'never behavior.
 
 1994-12-21  Stefan Schoef  <[e-mail]>
 

--- a/lisp/ChangeLog.6	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/ChangeLog.6	Fri Jun 27 07:34:53 2008 +0000
@@ -5291,7 +5291,7 @@
 
 	* skeleton.el (skeleton-end-hook): Now defvared and responsible for
 	pushing out anything following skeleton to next line.  Thus this
-	behaviour can now be controlled by modes.
+	behavior can now be controlled by modes.
 	(skeleton-insert): Parameter `no-newline' removed.
 	(skeleton-read): Take this into account.
 	(skeleton-internal-1): Less spurious empty lines when wrapping.
@@ -6721,7 +6721,7 @@
 
 	* skeleton.el (skeleton-newline-indent-rigidly): New variable.
 	(skeleton-internal-1): Use it for indenting after \n because previous
-	behaviour was only useful for `sh-script.el' and old `ada.el'.  Other
+	behavior was only useful for `sh-script.el' and old `ada.el'.  Other
 	modes now get their own indentation.
 	(skeleton, skeleton-modified, skeleton-point, skeleton-regions): `New'
 	variables for passing between the mutually recursive functions of

--- a/lisp/ChangeLog.7	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/ChangeLog.7	Fri Jun 27 07:34:53 2008 +0000
@@ -6528,7 +6528,7 @@
 	are used for key generation as well.
 	(bibtex-member-of-regexp): Case is honoured for matches now.
 	(bibtex-autokey-titleword-ignore): Added entries provide compatibility
-	to former behaviour.
+	to former behavior.
 
 	* bibtex.el (bibtex-autokey-titleword-ignore): Title words found in
 	this list are always ignored (previously only at the beginning of the
@@ -21591,7 +21591,7 @@
 
 	* find-file.el (general): Enabled commentary for Finder.
 	(ff-search-directories): Changed /usr/include/* to /usr/include.
-	(ff-get-file-name): Improve behaviour when file is found in a buffer.
+	(ff-get-file-name): Improve behavior when file is found in a buffer.
 
 1996-11-02  Richard Stallman  <[e-mail]>
 

--- a/lisp/ChangeLog.8	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/ChangeLog.8	Fri Jun 27 07:34:53 2008 +0000
@@ -7276,7 +7276,7 @@
 
 	* rmail.el (rmail-encode-string): Make sure mask value is
 	positive; (emacs-pid) returns a negative number on Windows 9x
-	which causes odd behaviour.
+	which causes odd behavior.
 
 1998-12-31  Eli Zaretskii  <[e-mail]>
 

--- a/lisp/ChangeLog.9	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/ChangeLog.9	Fri Jun 27 07:34:53 2008 +0000
@@ -3535,7 +3535,7 @@
 2001-05-07  MORIOKA Tomohiko  <[e-mail]>
 
 	The following changes are to provide infrastructure for handling
-	MIME messages to rmail.  They don't affect the original behaviour
+	MIME messages to rmail.  They don't affect the original behavior
 	if rmail-enable-mime is nil.
 
 	* mail/rmail.el (rmail-insert-mime-forwarded-message-function)
@@ -3792,7 +3792,7 @@
 
 2001-04-24  Gerd Moellmann  <[e-mail]>
 
-	* rect.el (string-rectangle): Revert to 20.x behaviour.
+	* rect.el (string-rectangle): Revert to 20.x behavior.
 	(replace-rectangle): Make it an alias for string-rectangle.
 	(string-insert-rectangle): New function.
 
@@ -13875,7 +13875,7 @@
 
 	* timer.el (run-with-idle-timer): Undo last change, so that timer
 	is not activated immediately if Emacs is already idle.  Some
-	existing code relies on this behaviour.
+	existing code relies on this behavior.
 
 2000-08-30  Miles Bader  <[e-mail]>
 
@@ -16846,7 +16846,7 @@
 
 	* recentf.el: Added some "Commentary".
 	(recentf-open-more-files, recentf-edit-list): Minor changes to
-	move the point at the top of the file list.  This behaviour is
+	move the point at the top of the file list.  This behavior is
 	consistent with the menu one when the list contains a lot of
 	files.
 	(recentf-cleanup): Now displays the number of items removed from

--- a/lisp/arc-mode.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/arc-mode.el	Fri Jun 27 07:34:53 2008 +0000
@@ -230,7 +230,7 @@
 			(string :format "%v")))
   :group 'archive-zip)
 
-;; For several reasons the latter behaviour is not desirable in general.
+;; For several reasons the latter behavior is not desirable in general.
 ;; (1) It uses more disk space.  (2) Error checking is worse or non-
 ;; existent.  (3) It tends to do funny things with other systems' file
 ;; names.

--- a/lisp/complete.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/complete.el	Fri Jun 27 07:34:53 2008 +0000
@@ -933,7 +933,7 @@
     ;; completions of "(ne", which is presumably not what one wants.
     ;;
     ;; This is arguably (at least, it seems to be the existing intended
-    ;; behaviour) what one _does_ want if point has been explicitly
+    ;; behavior) what one _does_ want if point has been explicitly
     ;; positioned on the hyphen. Note that if PC-do-completion (qv) binds
     ;; completion-base-size to nil, then completion does not replace the
     ;; correct amount of text in such cases.
@@ -945,12 +945,12 @@
     ;; the minibuffer. The same is not true for lisp symbols.
     ;;
     ;; [1] An alternate fix would be to not move point to the hyphen
-    ;; in such cases, but that would make the behaviour different from
+    ;; in such cases, but that would make the behavior different from
     ;; that for filenames. It seems PC moves point to the site of the
     ;; first difference between the possible completions.
     ;;
     ;; Alternatively alternatively, maybe end should be computed in
-    ;; the same way as beg. That would change the behaviour though.
+    ;; the same way as beg. That would change the behavior though.
     (if (equal last-command 'PC-lisp-complete-symbol)
         (PC-do-completion nil beg PC-lisp-complete-end t)
       (if PC-lisp-complete-end

--- a/lisp/emulation/cua-base.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/emulation/cua-base.el	Fri Jun 27 07:34:53 2008 +0000
@@ -63,7 +63,7 @@
 ;; - press the prefix key and the following key within 0.2 seconds, or
 ;; - use the SHIFT key with the prefix key, i.e. C-X or C-C
 ;;
-;; This behaviour can be customized via the
+;; This behavior can be customized via the
 ;; cua-prefix-override-inhibit-delay variable.
 
 ;; In addition to using the shifted movement keys, you can also use

--- a/lisp/emulation/pc-select.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/emulation/pc-select.el	Fri Jun 27 07:34:53 2008 +0000
@@ -30,7 +30,7 @@
 ;; programs (which is the same as the MAC gui and (sorry for that) MS-Windows).
 ;; It modifies the keybindings of the cursor keys and the next, prior,
 ;; home and end keys. They will modify mark-active.
-;; You can still get the old behaviour of cursor moving with the
+;; You can still get the old behavior of cursor moving with the
 ;; control sequences C-f, C-b, etc.
 ;; This package uses transient-mark-mode and
 ;; delete-selection-mode.
@@ -71,7 +71,7 @@
 ;;    which will operate on the active region
 ;;    It was not possible to bind them to C-v, C-x and C-c for obvious
 ;;    emacs reasons.
-;;    They will be bound according to the "old" behaviour to S-delete (cut),
+;;    They will be bound according to the "old" behavior to S-delete (cut),
 ;;    S-insert (paste) and C-insert (copy). These keys do the same in many
 ;;    other programs.
 ;;

--- a/lisp/erc/ChangeLog.02	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/erc/ChangeLog.02	Fri Jun 27 07:34:53 2008 +0000
@@ -162,7 +162,7 @@
 
 	* erc.el 1.384 (erc-truncate-buffer-on-save):
 	Removed documentation that
-	described behaviour now changed.  It used to say "When nil, no
+	described behavior now changed.  It used to say "When nil, no
 	buffer is ever truncated."  This is no longer true; even when
 	buffers are NOT truncated on save, they can be truncated, eg. by
 	adding erc-truncate-buffer to the hook.
@@ -1916,7 +1916,7 @@
 	Fix C-c C-t to not include the nick/time info
 	(both from antifuchs)
 
-	* erc-complete.el 1.9: Fix for xemacs elt behaviour
+	* erc-complete.el 1.9: Fix for xemacs elt behavior
 
 2002-04-17  John Wiegley  <[e-mail]>
 
@@ -1970,7 +1970,7 @@
 2002-04-11  Mario Lang  <[e-mail]>
 
 	* erc-track.el 1.10:
-	try to fix behaviour when used with different frames.
+	try to fix behavior when used with different frames.
 
 2002-04-09  Mario Lang  <[e-mail]>
 
@@ -2162,7 +2162,7 @@
 	* erc-match.el 1.3:
 	Minor fix related to hook call method change (-until-seccess now)
 
-	* erc.el 1.222: fixed ctcp behaviour abit (with auto-query on)
+	* erc.el 1.222: fixed ctcp behavior abit (with auto-query on)
 
 	* erc-list.el 1.1: ChanList mode.
 	Load it, and type M-x erc-chanlist RET
@@ -2396,7 +2396,7 @@
 2002-01-30  Andreas Fuchs  <[e-mail]>
 
 	* erc.el 1.190:
-	* erc-send-current-line: fix behaviour where buffer changes.
+	* erc-send-current-line: fix behavior where buffer changes.
 	* erc-mark-message: fix stupid face bug. highlighting of pals should work now.
 
 	* erc-ring.el 1.2, erc.el 1.189:

--- a/lisp/erc/erc-truncate.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/erc/erc-truncate.el	Fri Jun 27 07:34:53 2008 +0000
@@ -70,7 +70,7 @@
       (set-buffer buffer)
       ;; Note that when erc-insert-post-hook runs, the buffer is
       ;; narrowed to the new message.  So do this delicate widening.
-      ;; I am not sure, I think this was not recommended behaviour in
+      ;; I am not sure, I think this was not recommended behavior in
       ;; Emacs 20.
       (save-restriction
 	(widen)

--- a/lisp/filesets.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/filesets.el	Fri Jun 27 07:34:53 2008 +0000
@@ -52,7 +52,7 @@
 ;; programs.  See `filesets-external-viewers'.
 
 ;; BTW, if you close a fileset, files, which have been changed, will
-;; be silently saved.  Change this behaviour by setting
+;; be silently saved.  Change this behavior by setting
 ;; `filesets-save-buffer-fn'.
 
 ;;; Supported modes for inclusion groups (`filesets-ingroup-patterns'):

--- a/lisp/font-core.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/font-core.el	Fri Jun 27 07:34:53 2008 +0000
@@ -252,7 +252,7 @@
 ;; Although Global Font Lock mode is a pseudo-mode, I think that the user
 ;; interface should conform to the usual Emacs convention for modes, i.e., a
 ;; command to toggle the feature (`global-font-lock-mode') with a variable for
-;; finer control of the mode's behaviour (`font-lock-global-modes').
+;; finer control of the mode's behavior (`font-lock-global-modes').
 ;;
 ;; The feature should not be enabled by loading font-lock.el, since other
 ;; mechanisms for turning on Font Lock mode, such as M-x font-lock-mode RET or

--- a/lisp/font-lock.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/font-lock.el	Fri Jun 27 07:34:53 2008 +0000
@@ -109,7 +109,7 @@
 ;; the pattern definitions.)  Font Lock mode chooses which variable to use for
 ;; fontification based on `font-lock-maximum-decoration'.
 ;;
-;; Font Lock mode fontification behaviour can be modified in a number of ways.
+;; Font Lock mode fontification behavior can be modified in a number of ways.
 ;; See the below comments and the comments distributed throughout this file.
 
 ;;; Constructing patterns:

--- a/lisp/gnus/ChangeLog.2	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/gnus/ChangeLog.2	Fri Jun 27 07:34:53 2008 +0000
@@ -12322,7 +12322,7 @@
 	* mm-encode.el (mm-encode-content-transfer-encoding): Fix error
 	message.  (Gnus does not "default" to using 8bit for the message,
 	it default to use 8bit encoding and the user-supplied CTE
-	value.  Calling this behaviour "treating it as 8bit" is perhaps
+	value.  Calling this behavior "treating it as 8bit" is perhaps
 	better.)
 
 	* mm-bodies.el (mm-body-encoding): Intern encoding if needed
@@ -12607,7 +12607,7 @@
 	(imap-remassoc): Copied from `gnus-remassoc'.
 	(imap-add-callback): New function.
 	(imap-mailbox-expunge, imap-mailbox-close): Support asynchronous
-	behaviour.
+	behavior.
 	(imap-parse-response): Call the callback.
 
 	* message.el (message-insert-canlock): New variable.

--- a/lisp/gnus/gnus-demon.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/gnus/gnus-demon.el	Fri Jun 27 07:34:53 2008 +0000
@@ -1,4 +1,4 @@
-;;; gnus-demon.el --- daemonic Gnus behaviour
+;;; gnus-demon.el --- daemonic Gnus behavior
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.

--- a/lisp/gnus/message.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/gnus/message.el	Fri Jun 27 07:34:53 2008 +0000
@@ -4543,7 +4543,7 @@
 	(apply
 	 'call-process-region (point-min) (point-max)
 	 message-qmail-inject-program nil nil nil
-	 ;; qmail-inject's default behaviour is to look for addresses on the
+	 ;; qmail-inject's default behavior is to look for addresses on the
 	 ;; command line; if there're none, it scans the headers.
 	 ;; yes, it does The Right Thing w.r.t. Resent-To and it's kin.
 	 ;;

--- a/lisp/gnus/rfc2047.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/gnus/rfc2047.el	Fri Jun 27 07:34:53 2008 +0000
@@ -291,7 +291,7 @@
 	     ;; 8-bit names.  The group name mail copy just got
 	     ;; unconditionally encoded.  Previously, it would ask
 	     ;; whether to encode, which was quite confusing for the
-	     ;; user.  If the new behaviour is wrong, tell me. I have
+	     ;; user.  If the new behavior is wrong, tell me. I have
 	     ;; left the old code commented out below.
 	     ;; -- Per Abrahamsen <[e-mail]> Date: 2001-10-07.
 	     ;; Modified by Dave Love, with the commented-out code changed

--- a/lisp/gs.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/gs.el	Fri Jun 27 07:34:53 2008 +0000
@@ -196,7 +196,7 @@
  	;; proper implementation not waiting at all but creating
  	;; appropriate queues, or b) permanently bad display due to
  	;; bad cached images.  So remember that this
- 	;; is just a hack and if people don't like the behaviour, they
+ 	;; is just a hack and if people don't like the behavior, they
  	;; will most likely like the easy alternatives even less.
  	;; And at least the image cache will make the delay apparent
  	;; just once.

--- a/lisp/ido.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/ido.el	Fri Jun 27 07:34:53 2008 +0000
@@ -225,7 +225,7 @@
 ;; to show you more of the matching files (depending on the setting
 ;; of the variables `resize-mini-windows' and `max-mini-window-height').
 ;; If you want ido to behave differently from the default minibuffer
-;; resizing behaviour, set the variable `ido-max-window-height'.
+;; resizing behavior, set the variable `ido-max-window-height'.
 ;;
 ;; Also, to improve the responsiveness of ido, the maximum number of
 ;; matching items is limited to 12, but you can increase or removed
@@ -272,7 +272,7 @@
 ;; To use ido for all buffer and file selections in Emacs, customize the
 ;; variable `ido-everywhere'.
 
-;; Using ido-like behaviour in other lisp packages
+;; Using ido-like behavior in other lisp packages
 ;; -----------------------------------------------
 
 ;; If you don't want to rely on the `ido-everywhere' functionality,
@@ -2267,7 +2267,7 @@
 	   (or ido-use-url-at-point ido-use-filename-at-point))
       (let (fn d)
 	(require 'ffap)
-	;; Duplicate code from ffap-guesser as we want different behaviour for files and URLs.
+	;; Duplicate code from ffap-guesser as we want different behavior for files and URLs.
 	(cond
 	 ((with-no-warnings
 	    (and ido-use-url-at-point

--- a/lisp/international/mule-cmds.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/international/mule-cmds.el	Fri Jun 27 07:34:53 2008 +0000
@@ -2588,7 +2588,7 @@
 	  ;; only).  At least X and MS Windows can generate
 	  ;; multilingual input.
 	  ;; XXX This was disabled unless `window-system', but that
-	  ;; leads to buggy behaviour when a tty frame is opened
+	  ;; leads to buggy behavior when a tty frame is opened
 	  ;; later.  Setting the keyboard coding system has no adverse
 	  ;; effect on X, so let's do it anyway. -- Lorentey
 	  (let ((kcs (or coding-system

--- a/lisp/international/utf-7.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/international/utf-7.el	Fri Jun 27 07:34:53 2008 +0000
@@ -31,7 +31,7 @@
 ;; implementation in Gnus, but has been substantially re-done.
 
 ;; This probably needs more attention.  In particular, it's not
-;; completely consistent with iconv's behaviour.  It's arguable
+;; completely consistent with iconv's behavior.  It's arguable
 ;; whether the IMAP version should be a coding system since it's
 ;; apparently only used for IMAP mailbox names, so it's commented out.
 

--- a/lisp/iswitchb.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/iswitchb.el	Fri Jun 27 07:34:53 2008 +0000
@@ -175,7 +175,7 @@
 ;; iswitch for all buffer selections in Emacs, add:
 ;; (setq read-buffer-function 'iswitchb-read-buffer)
 ;; (This variable was introduced in Emacs 20.3.)
-;; XEmacs users can get the same behaviour by doing:
+;; XEmacs users can get the same behavior by doing:
 ;; (defalias 'read-buffer 'iswitchb-read-buffer)
 ;; since `read-buffer' is defined in lisp.
 
@@ -212,7 +212,7 @@
 ;; 			iswitchb-mode-map "\C-o"
 ;; 			'iswitchb-exclude-nonmatching)))
 
-;; Other lisp packages extend iswitchb behaviour to other tasks.  See
+;; Other lisp packages extend iswitchb behavior to other tasks.  See
 ;; ido.el (by Kim Storm) and mcomplete.el (Yuji Minejima).
 
 ;; Window managers: Switching frames/focus follows mouse; Sawfish.

--- a/lisp/mail/mailabbrev.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/mail/mailabbrev.el	Fri Jun 27 07:34:53 2008 +0000
@@ -115,7 +115,7 @@
 ;; If you want multiple addresses separated by a string other than ", " then
 ;; you can set the variable mail-alias-separator-string to it.  This has to
 ;; be a comma bracketed by whitespace if you want any kind of reasonable
-;; behaviour.
+;; behavior.
 ;;
 ;; Thanks to Harald Hanche-Olsen, Michael Ernst, David Loeffler, and
 ;; Noah Friedman for suggestions and bug reports.

--- a/lisp/mail/mspools.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/mail/mspools.el	Fri Jun 27 07:34:53 2008 +0000
@@ -103,7 +103,7 @@
 ;; Rather than showing size in bytes, could we see the number of msgs
 ;; waiting?  (Could be more time demanding / system dependent).
 ;; Maybe just call a perl script to do all the hard work, and
-;; visualise the results in the buffer.
+;; visualize the results in the buffer.
 
 ;; Shrink wrap the buffer to remove excess white-space?
 

--- a/lisp/man.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/man.el	Fri Jun 27 07:34:53 2008 +0000
@@ -74,7 +74,7 @@
 
 ;; ============= TODO ===========
 ;; - Add a command for printing.
-;; - The awk script deletes multiple blank lines.  This behaviour does
+;; - The awk script deletes multiple blank lines.  This behavior does
 ;;   not allow to understand if there was indeed a blank line at the
 ;;   end or beginning of a page (after the header, or before the
 ;;   footer).  A different algorithm should be used.  It is easy to

--- a/lisp/mouse-sel.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/mouse-sel.el	Fri Jun 27 07:34:53 2008 +0000
@@ -113,14 +113,14 @@
 ;; * I like to leave point at the end of the region nearest to where the
 ;;   mouse was, even though this makes region highlighting mis-leading (the
 ;;   cursor makes it look like one extra character is selected).  You can
-;;   disable this behaviour with:
+;;   disable this behavior with:
 ;;
 ;;     (setq mouse-sel-leave-point-near-mouse nil)
 ;;
 ;; * By default, mouse-select cycles the click count after 4 clicks.  That
 ;;   is, clicking mouse-1 five times has the same effect as clicking it
 ;;   once, clicking six times has the same effect as clicking twice, etc.
-;;   Disable this behaviour with:
+;;   Disable this behavior with:
 ;;
 ;;     (setq mouse-sel-cycle-clicks nil)
 ;;

--- a/lisp/mouse.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/mouse.el	Fri Jun 27 07:34:53 2008 +0000
@@ -1110,7 +1110,7 @@
 	   ;; Here, we can't use skip-syntax-forward/backward because
 	   ;; they don't pay attention to word-separating-categories,
 	   ;; and thus they will skip over a true word boundary.  So,
-	   ;; we simulate the original behaviour by using forward-word.
+	   ;; we simulate the original behavior by using forward-word.
 	   (if (< dir 0)
 	       (if (not (looking-at "\\<"))
 		   (forward-word -1))

--- a/lisp/net/rcirc.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/net/rcirc.el	Fri Jun 27 07:34:53 2008 +0000
@@ -28,7 +28,7 @@
 ;; communication in discussion forums called channels, but also allows
 ;; one-to-one communication.
 
-;; Rcirc has simple defaults and clear and consistent behaviour.
+;; Rcirc has simple defaults and clear and consistent behavior.
 ;; Message arrival timestamps, activity notification on the modeline,
 ;; message filling, nick completion, and keepalive pings are all
 ;; enabled by default, but can easily be adjusted or turned off.  Each

--- a/lisp/nxml/nxml-ns.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/nxml/nxml-ns.el	Fri Jun 27 07:34:53 2008 +0000
@@ -71,7 +71,7 @@
   (setq nxml-ns-state (cons (car nxml-ns-state) nxml-ns-state)))
 
 (defun nxml-ns-pop-state ()
-  "Change the state by ending an element.  The behaviour is undefined
+  "Change the state by ending an element.  The behavior is undefined
 if there is no open element."
   (setq nxml-ns-state (cdr nxml-ns-state)))
 

--- a/lisp/progmodes/f90.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/progmodes/f90.el	Fri Jun 27 07:34:53 2008 +0000
@@ -635,7 +635,7 @@
     (modify-syntax-entry ?=  "."  table)
     (modify-syntax-entry ?*  "."  table)
     (modify-syntax-entry ?/  "."  table)
-    ;; I think that the f95 standard leaves the behaviour of \
+    ;; I think that the f95 standard leaves the behavior of \
     ;; unspecified, but that f2k will require it to be non-special.
     ;; Use `f90-backslash-not-special' to change.
     (modify-syntax-entry ?\\ "\\" table) ; escape chars

--- a/lisp/progmodes/sql.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/progmodes/sql.el	Fri Jun 27 07:34:53 2008 +0000
@@ -408,7 +408,7 @@
                         special character treatment by font-lock and
                         imenu. ")
 
-;; misc customization of sql.el behaviour
+;; misc customization of sql.el behavior
 
 (defcustom sql-electric-stuff nil
   "Treat some input as electric.

--- a/lisp/tempo.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/tempo.el	Fri Jun 27 07:34:53 2008 +0000
@@ -82,7 +82,7 @@
 
 ;; If the 'o is the first element in a template, strange things can
 ;; happen when the template is inserted at the beginning of a
-;; line. This is due to strange behaviour in open-line. But it should
+;; line. This is due to strange behavior in open-line. But it should
 ;; be easily avoided.
 
 ;; The 'o tag is also a problem when including the region. This will

--- a/lisp/term/internal.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/term/internal.el	Fri Jun 27 07:34:53 2008 +0000
@@ -27,7 +27,7 @@
 ;; ---------------------------------------------------------------------------
 ;; keyboard setup -- that's simple!
 (set-input-mode nil nil 0)
-(define-key local-function-key-map [backspace] "\177") ; Normal behaviour for BS
+(define-key local-function-key-map [backspace] "\177") ; Normal behavior for BS
 (define-key local-function-key-map [delete] "\C-d") ; ... and Delete
 (define-key local-function-key-map [tab] [?\t])
 (define-key local-function-key-map [linefeed] [?\n])

--- a/lisp/textmodes/rst.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/textmodes/rst.el	Fri Jun 27 07:34:53 2008 +0000
@@ -1014,9 +1014,9 @@
 Adjust/rotate the section decoration for the section title
 around point or promote/demote the decorations inside the region,
 depending on if the region is active.  This function is meant to
-be invoked possibly multiple times, and can vary its behaviour
+be invoked possibly multiple times, and can vary its behavior
 with a positive prefix argument (toggle style), or with a
-negative prefix argument (alternate behaviour).
+negative prefix argument (alternate behavior).
 
 This function is the main focus of this module and is a bit of a
 swiss knife.  It is meant as the single most essential function
@@ -1079,7 +1079,7 @@
 "Adjust/rotate the section decoration for the section title around point.
 
 This function is meant to be invoked possibly multiple times, and
-can vary its behaviour with a true TOGGLE-STYLE argument, or with
+can vary its behavior with a true TOGGLE-STYLE argument, or with
 a REVERSE-DIRECTION argument.
 
 General Behaviour

--- a/lisp/url/ChangeLog	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/url/ChangeLog	Fri Jun 27 07:34:53 2008 +0000
@@ -1444,7 +1444,7 @@
 	needed.  I should use my brain sometime.
 
 	* lisp/url-vars.el (and): Fix feature test for xemacs and
-	coding-system-list behaviour.
+	coding-system-list behavior.
 
 	* lisp/url-http.el
 	(url-http-chunked-encoding-after-change-function): Add optional

--- a/lisp/vcursor.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/vcursor.el	Fri Jun 27 07:34:53 2008 +0000
@@ -30,7 +30,7 @@
 ;; - *IMPORTANT* vcursor-key-bindings is now nil by default, to avoid
 ;;   side-effects when the package is loaded.  This means no keys are
 ;;   bound by default.  Use customize to change it to t to restore
-;;   the old behaviour.  (If you do it by hand in .emacs, it
+;;   the old behavior.  (If you do it by hand in .emacs, it
 ;;   must come before vcursor is loaded.)
 ;; - You can alter the main variables and the vcursor face via
 ;;   M-x customize: go to the Editing group and find Vcursor.
@@ -52,7 +52,7 @@
 ;; Virtual cursor commands.  I got this idea from the old BBC micro.
 ;; You need Emacs 19 or 20 and a window system for the best effects.
 ;; For character terminals, at least Emacs 19.29 is required
-;; (special behaviour for the overlay property
+;; (special behavior for the overlay property
 ;; "before-string" must be implemented).  Search for "dumb terminals"
 ;; for more information.
 ;;
@@ -104,7 +104,7 @@
 ;; In the "on" state, moving the virtual cursor will copy the
 ;; moved-over text to the normal cursor position (including when going
 ;; backwards, though each piece of text moved over is copied forwards:
-;; compare the behaviour of C-S-up and C-S-left).
+;; compare the behavior of C-S-up and C-S-left).
 ;;
 ;; However, that's just a small part of the magic.  If the virtual
 ;; cursor goes off the display, it will be redisplayed in some other

--- a/lisp/woman.el	Fri Jun 27 07:30:14 2008 +0000
+++ b/lisp/woman.el	Fri Jun 27 07:34:53 2008 +0000
@@ -109,7 +109,7 @@
 
 ;; (By default, WoMan will automatically define the dired keys "W" and
 ;; "w" when it loads, but only if they are not already defined.  This
-;; behaviour is controlled by the user option `woman-dired-keys'.
+;; behavior is controlled by the user option `woman-dired-keys'.
 ;; Note that the `dired-x' (dired extra) package binds
 ;; `dired-copy-filename-as-kill' to the key "w" (as pointed out by Jim
 ;; Davidson), although "W" appears to be really unused.  The `dired-x'

--- a/nt/cmdproxy.c	Fri Jun 27 07:30:14 2008 +0000
+++ b/nt/cmdproxy.c	Fri Jun 27 07:34:53 2008 +0000
@@ -341,7 +341,7 @@
     case CTRL_BREAK_EVENT:
       if (!interactive)
 	{
-	  /* Both command.com and cmd.exe have the annoying behaviour of
+	  /* Both command.com and cmd.exe have the annoying behavior of
 	     prompting "Terminate batch job (y/n)?" when interrupted
 	     while running a batch file, even if running in
 	     non-interactive (-c) mode.  Try to make up for this

--- a/src/ChangeLog.10	Fri Jun 27 07:30:14 2008 +0000
+++ b/src/ChangeLog.10	Fri Jun 27 07:34:53 2008 +0000
@@ -5561,7 +5561,7 @@
 
 2006-01-26  Lőrentey Károly  <[e-mail]>
 
-	* editfns.c (Fconstrain_to_field): Fix behaviour on field boundaries.
+	* editfns.c (Fconstrain_to_field): Fix behavior on field boundaries.
 	(find_field): Set before_field to after_field when pos is at BEGV.
 	(Fline_beginning_position, Fline_end_position):
 	Clarify confusing doc string.
@@ -11188,7 +11188,7 @@
 
 2004-12-23  Jason Rumney  <[e-mail]>
 
-	* image.c (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour
+	* image.c (__WIN32__) [HAVE_NTGUI]: Define for correct behavior
 	of JPEG library.
 
 2004-12-22  Richard M. Stallman  <[e-mail]>
@@ -16570,7 +16570,7 @@
 	Use non-text cursor when mouse pointer is outside editable text,
 	i.e. in the void after end-of-line or end-of-buffer; this was
 	already done for W32, but is now standard for all systems --
-	user can toggle show-text-cursor-in-void to get old behaviour.
+	user can toggle show-text-cursor-in-void to get old behavior.
 	(syms_of_xdisp): DEFVAR_LISP Vshow_text_cursor_in_void and
 	Vdisplay_pixels_per_inch.
 
@@ -20827,7 +20827,7 @@
 2003-01-13  Francesco Potortì  <[e-mail]>
 
 	* fileio.c (Fdelete_directory, Fdelete_file): Document the
-	behaviour in front of symlinks.
+	behavior in front of symlinks.
 	(Fdelete_file): Raise an error on directories.
 
 2003-01-13  Dave Love  <[e-mail]>

--- a/src/ChangeLog.3	Fri Jun 27 07:30:14 2008 +0000
+++ b/src/ChangeLog.3	Fri Jun 27 07:34:53 2008 +0000
@@ -12709,7 +12709,7 @@
 	free_screen_glyphs now takes screen argument.
 
 	* window.c (Fnext_window, Fprevious_window): Fixed typo.  New
-	behaviour: mini non-nil implies all_screens if global mini screen
+	behavior: mini non-nil implies all_screens if global mini screen
 	exists, implies current screen only if not.
 	(Fdisplay_buffer): Simplification of multi-screen code.
 

--- a/src/ChangeLog.4	Fri Jun 27 07:30:14 2008 +0000
+++ b/src/ChangeLog.4	Fri Jun 27 07:34:53 2008 +0000
@@ -4274,7 +4274,7 @@
 
 	* systty.h (EMACS_GETPGRP): New macro hides argument passing to
 	system getpgrp.  Reinstate some semblance of control over this
-	macros behaviour by paying attention to GETPGRP_NO_ARG.
+	macros behavior by paying attention to GETPGRP_NO_ARG.
 	* sysdep.c (sys_suspend): Use EMACS_GETPGRP macro.
 	* emacs.c (main): Use EMACS_GETPGRP macro.
 	(shut_down_emacs): Use EMACS_GETPGRP macro.

--- a/src/ChangeLog.6	Fri Jun 27 07:30:14 2008 +0000
+++ b/src/ChangeLog.6	Fri Jun 27 07:34:53 2008 +0000
@@ -1578,7 +1578,7 @@
 
 	* msdos.c (check_timer): Removed; use gettime instead.
 	(sys_select): Call __dpmi_yield while waiting for input to
-	improve multitasking behaviour.
+	improve multitasking behavior.
 	Do not check timer when no timeout.
 
 1996-04-16  Richard Stallman  <[e-mail]>

--- a/src/ChangeLog.7	Fri Jun 27 07:30:14 2008 +0000
+++ b/src/ChangeLog.7	Fri Jun 27 07:34:53 2008 +0000
@@ -124,7 +124,7 @@
 
 1998-08-13  Andrew Innes  <[e-mail]>
 
-	* w32.c (stat): Fall-back to default behaviour when we cannot get
+	* w32.c (stat): Fall-back to default behavior when we cannot get
 	accurate information on file attributes.
 
 1998-08-12  Richard Stallman  <[e-mail]>
@@ -3309,17 +3309,17 @@
 
 1998-02-19  Kenichi Handa  <[e-mail]>
 
-	* buffer.c (advance_to_char_boundary): Make the behaviour
+	* buffer.c (advance_to_char_boundary): Make the behavior
 	consistent with INC_POS.
 
 	* ccl.c (Fccl_execute_on_string): Add new arg UNIBYTE-P.
 
 	* charset.h (INC_POS): Use macro BASE_LEADING_CODE_P.
-	(DEC_POS): Make the behaviour consistent with INC_POS.
+	(DEC_POS): Make the behavior consistent with INC_POS.
 	(BUF_INC_POS, BUF_DEC_POS): Likewise.
 
 	* charset.c (invalid_character): New function.
-	(chars_in_text): Make the behaviour consistent with INC_POS.
+	(chars_in_text): Make the behavior consistent with INC_POS.
 	(multibyte_chars_in_text): Likewise.
 	(str_cmpchar_id): Likewise.
 	(non_ascii_char_to_string): Call invalid_character.
@@ -3368,7 +3368,7 @@
 	* search.c (search_buffer): Update POS_BYTE for regexp search.
 
 	* xdisp.c (display_text_line): Handling of a wide-column character
-	fixed.  Make the behaviour consistent with INC_POS.
+	fixed.  Make the behavior consistent with INC_POS.
 
 1998-02-18  Richard Stallman  <[e-mail]>
 

--- a/src/lread.c	Fri Jun 27 07:30:14 2008 +0000
+++ b/src/lread.c	Fri Jun 27 07:34:53 2008 +0000
@@ -2034,7 +2034,7 @@
 {
   register int c = READCHAR;
   /* \u allows up to four hex digits, \U up to eight. Default to the
-     behaviour for \u, and change this value in the case that \U is seen. */
+     behavior for \u, and change this value in the case that \U is seen. */
   int unicode_hex_count = 4;
 
   switch (c)

--- a/src/w32.c	Fri Jun 27 07:30:14 2008 +0000
+++ b/src/w32.c	Fri Jun 27 07:34:53 2008 +0000
@@ -1265,7 +1265,7 @@
 	  profile_result = get_folder_path (NULL, CSIDL_APPDATA, NULL,
 					    0, default_home);
 
-	  /* If we can't get the appdata dir, revert to old behaviour.  */
+	  /* If we can't get the appdata dir, revert to old behavior.  */
 	  if (profile_result == S_OK)
 	    env_vars[0].def_value = default_home;
 	}
@@ -2514,7 +2514,7 @@
 	return -1;
     }
 
-  /* Emulate Unix behaviour - newname is deleted if it already exists
+  /* Emulate Unix behavior - newname is deleted if it already exists
      (at least if it is a file; don't do this for directories).
 
      Since we mustn't do this if we are just changing the case of the

--- a/src/w32fns.c	Fri Jun 27 07:30:14 2008 +0000
+++ b/src/w32fns.c	Fri Jun 27 07:34:53 2008 +0000
@@ -6841,7 +6841,7 @@
  ***********************************************************************/
 extern Lisp_Object Qfile_name_history;
 
-/* Callback for altering the behaviour of the Open File dialog.
+/* Callback for altering the behavior of the Open File dialog.
    Makes the Filename text field contain "Current Directory" and be
    read-only when "Directories" is selected in the filter.  This
    allows us to work around the fact that the standard Open File

--- a/src/w32inevt.c	Fri Jun 27 07:30:14 2008 +0000
+++ b/src/w32inevt.c	Fri Jun 27 07:34:53 2008 +0000
@@ -154,7 +154,7 @@
   if (mods & SCROLLLOCK_ON)
     retval |= w32_key_to_modifier (VK_SCROLL);
 
-  /* Just in case someone wanted the original behaviour, make it
+  /* Just in case someone wanted the original behavior, make it
      optional by setting w32-capslock-is-shiftlock to t.  */
   if (NILP (Vw32_capslock_is_shiftlock)
       /* Keys that should _not_ be affected by CapsLock.  */

--- a/src/w32proc.c	Fri Jun 27 07:30:14 2008 +0000
+++ b/src/w32proc.c	Fri Jun 27 07:34:53 2008 +0000
@@ -71,7 +71,7 @@
 
 /* Control whether spawnve quotes arguments as necessary to ensure
    correct parsing by child process.  Because not all uses of spawnve
-   are careful about constructing argv arrays, we make this behaviour
+   are careful about constructing argv arrays, we make this behavior
    conditional (off by default). */
 Lisp_Object Vw32_quote_process_args;
 
@@ -973,7 +973,7 @@
 #if 0
 	  /* This version does not escape quotes if they occur at the
 	     beginning or end of the arg - this could lead to incorrect
-	     behaviour when the arg itself represents a command line
+	     behavior when the arg itself represents a command line
 	     containing quoted args.  I believe this was originally done
 	     as a hack to make some things work, before
 	     `w32-quote-process-args' was added.  */

--- a/src/w32term.c	Fri Jun 27 07:30:14 2008 +0000
+++ b/src/w32term.c	Fri Jun 27 07:34:53 2008 +0000
@@ -5401,7 +5401,7 @@
      resize will happen asynchronously. But on Windows, the menu bar
      automatically wraps when the frame is too narrow to contain it,
      and that causes any calculations made here to come out wrong. The
-     end is some nasty buggy behaviour, including the potential loss
+     end is some nasty buggy behavior, including the potential loss
      of the minibuffer.
 
      Disabling this code is either not sufficient to fix the problems
@@ -5524,9 +5524,9 @@
   BLOCK_INPUT;
 
   /* Strictly speaking, raise-frame should only change the frame's Z
-     order, leaving input focus unchanged.  This is reasonable behaviour
+     order, leaving input focus unchanged.  This is reasonable behavior
      on X where the usual policy is point-to-focus.  However, this
-     behaviour would be very odd on Windows where the usual policy is
+     behavior would be very odd on Windows where the usual policy is
      click-to-focus.
 
      On X, if the mouse happens to be over the raised frame, it gets