From da5ecfa9b951691fc8bbf17f24fc8626216a706b Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Sat, 4 Jan 2014 18:56:08 -0800
Subject: 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.
---
 src/ChangeLog | 4 ++++
 src/nsterm.h  | 2 +-
 src/nsterm.m  | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/ChangeLog b/src/ChangeLog
index 42f79d2ae46..a6c308771c2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2014-01-05  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Spelling fixes.
+	* nsterm.h (updateCollectionBehavior): Rename from
+	updateCollectionBehaviour.  All uses changed.
+
 	Port to GNU/Linux with recent grsecurity/PaX patches (Bug#16343).
 	* Makefile.in (SETFATTR): New macro.
 	(temacs$(EXEEXT)): Use it.
diff --git a/src/nsterm.h b/src/nsterm.h
index bf1a2e24b41..796d6ef8ca0 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -183,7 +183,7 @@ typedef float EmacsCGFloat;
 - (BOOL) fsIsNative;
 - (BOOL) isFullscreen;
 #ifdef HAVE_NATIVE_FS
-- (void) updateCollectionBehaviour;
+- (void) updateCollectionBehavior;
 #endif
 
 #ifdef NS_IMPL_GNUSTEP
diff --git a/src/nsterm.m b/src/nsterm.m
index 0097b5b30e4..eefaea8888f 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3497,7 +3497,7 @@ check_native_fs ()
       if (FRAME_NS_P (f))
         {
           EmacsView *view = FRAME_NS_VIEW (f);
-          [view updateCollectionBehaviour];
+          [view updateCollectionBehavior];
         }
     }
 }
@@ -6317,7 +6317,7 @@ if (cols > 0 && rows > 0)
   [self setFSValue: fs_before_fs];
   fs_before_fs = -1;
 #ifdef HAVE_NATIVE_FS
-  [self updateCollectionBehaviour];
+  [self updateCollectionBehavior];
 #endif
   if (FRAME_EXTERNAL_TOOL_BAR (emacsframe))
     {
@@ -6349,7 +6349,7 @@ if (cols > 0 && rows > 0)
 }
 
 #ifdef HAVE_NATIVE_FS
-- (void)updateCollectionBehaviour
+- (void)updateCollectionBehavior
 {
   if (! [self isFullscreen])
     {
@@ -7647,7 +7647,7 @@ Default is t for OSX >= 10.7, nil otherwise. */);
 
   DEFVAR_BOOL ("ns-use-srgb-colorspace", ns_use_srgb_colorspace,
      doc: /*Non-nil means to use sRGB colorspace on OSX >= 10.7.
-Note that this does not apply to images.            
+Note that this does not apply to images.
 This variable is ignored on OSX < 10.7 and GNUStep.  Default is t. */);
   ns_use_srgb_colorspace = YES;
 
-- 
cgit v1.2.1