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.

2 files changed, 8 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index bc1161f169d..5f80ccdd60b 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Spelling fixes.
+        * Makefile.in (regex.o): Remove reference to no-longer-used macros
+        CONFIG_BROKETS and INHIBIT_STRING_HEADER.  "BROKETS" was a
+        misspelling anyway....
+
 2013-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use bool for boolean, focusing on headers.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 91a8e74819f..56cdc09e0fe 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -315,8 +315,7 @@ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
         cd ../lib && $(MAKE) libgnu.a
 
 regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
-        ${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
-          ${srcdir}/../src/regex.c
+        ${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c
 
 etags${EXEEXT}: ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
         $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \