5 files changed, 48 insertions, 44 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a8f9a0ac4be..983754eb1c3 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-14  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (all): Make sure "all" is the first target.
+
 2011-10-27  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacsclient.c (w32_getenv): Silence compiler warnings.
@@ -2028,7 +2032,7 @@
         * etags.c [ETAGS_REGEXPS]: Now is unconditionally defined.
         [LONG_OPTIONS]: Changed to NO_LONG_OPTIONS, which is undefined.
         (Objc_suffixes): Suggest using --lang=c for full help.
-        (C_entries): Initialise savetoken to 0 to shut up the compiler.
+        (C_entries): Initialize savetoken to 0 to shut up the compiler.
 
 2006-07-20  Andreas Schwab  <schwab@suse.de>
 
@@ -2734,7 +2738,7 @@
         (add_regex, regex_tag_multiline, readline): Use it.
         (main): Free some global structures.
         (fdesc): New member `written'.
-        (readline, process_file): Initialise it.
+        (readline, process_file): Initialize it.
         (put_entries): Set it.
         (main): Use it to create entries for files without tags.
         (total_size_of_entries): Do not count invalid tags.
@@ -2845,7 +2849,7 @@
         (find_entries): Rewind unconditionally.
         (find_entries): Do not call language functions directly, now calls
         itself.
-        (find_entries): Do general initialisations here.
+        (find_entries): Do general initializations here.
         (CNL_SAVE_DEFINEDEF, C_entries, LOOP_ON_INPUT_LINES, F_getit)
         (Ada_getit, Pascal_functions, Pascal_functions)
         (prolog_skip_comment): Do not do them here.
@@ -3081,7 +3085,7 @@
         (TeX_commands): Name tags.  Correction of old disabled code.
 
         * etags.c (curfiledir, curtagfname): New global variables.
-        (process_file): Initialise them.
+        (process_file): Initialize them.
         (readline): Canonicalize the name found in #line directive.
 
 2002-03-06  Jason Rumney  <jasonr@gnu.org>
@@ -3171,7 +3175,7 @@
         (L_getit): Simplify by using get_tag.
         (Perl_functions, Postscript_functions, erlang_attribute): Use the
         modified LOOKING_AT.
-        (notinname): Remove '[' and added ')' to the recognised chars.
+        (notinname): Remove '[' and added ')' to the recognized chars.
         (LOOKING_AT, get_tag, PHP_functions): Use notinname.
         (Ada_getit, Ada_funcs, Python_functions, Scheme_functions):
         Clarified, using strneq or notinname.
@@ -3238,7 +3242,7 @@
         (Scheme_functions, Texinfo_nodes): Use it.
         (Perl_functions): Use strneq.
         (prolog_pred): Rename to prolog_pr.
-        (prolog_pr): Recognise Prolog rules in addition to predicates.
+        (prolog_pr): Recognize Prolog rules in addition to predicates.
         [ETAGS_REGEXPS] [!HAVE_CONFIG_H] [__CYGWIN__]: Prevent
         unmodified compile, as Cygwin's regex.h is incompatible with us.
         [!HAVE_CONFIG_H] [!__STDC__]: #define const as the empty string.
@@ -3512,7 +3516,7 @@
         * etags.c (enum sym_type): New label st_C_template.
         (gperf input): Use it for switching to C++ from C.
         (consider_token): Do it.
-        (C_entries): Initialise typdefcblev to quiet compilers.
+        (C_entries): Initialize typdefcblev to quiet compilers.
         [!HAVE_CONFIG_H] [!__STDC__]: #define static as nothing.
 
 2001-02-22  Andrew Innes  <andrewi@gnu.org>
@@ -3638,7 +3642,7 @@
         (lang_names): Add a NULL member for every entry, added an entry
         for makefiles.
         (Makefile_targets): New function.
-        (Texinfo_nodes): Rename from Texinfo_fuctions and made
+        (Texinfo_nodes): Rename from Texinfo_functions and made
         it conformant to the style of the rest of the code.
 
 2001-01-13  Gerd Moellmann  <gerd@gnu.org>
@@ -3963,7 +3967,7 @@
 
         * etags.c (C_entries, consider_token): C++ `operator' now is
         tagged in most cases.
-        As before, :: is not recognised if surrounded by spaces.
+        As before, :: is not recognized if surrounded by spaces.
 
         * etags.c (relative_filename): Account for DOS file names such
         that is impossible to make one relative to another.
@@ -4572,7 +4576,7 @@
         * etags.c (C_entries): Use "." instead of "::" for Java.
         (consider_token): is_func renamed to is_func_or_var.
         (C_entries): is_func renamed to funorvar.
-        (C_entries): Initialise tok.named.
+        (C_entries): Initialize tok.named.
         (sym_type, C_stab_entry, consider_token): st_C_ignore is used to
         get rid of "import", "package" and "friend".
         (fvdef): Rename from funcdef.  Also some constants renamed.
@@ -4626,13 +4630,13 @@
         (lang_names): Add Java.
         (sym_type): Add st_C_javastruct for Java.
         (C_stab_entry): Add `extends' and `implements' keywords.
-        (consider_token, C_entries): Recognise Java structures.
+        (consider_token, C_entries): Recognize Java structures.
 
 1997-05-12  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
 
-        * etags.c (Cplusplus_suffixes): .pdb is Postscript with C syntax.
-        (Postscript_suffixes): .ps is Postscript.
-        (lang_names): Add Postscript.
+        * etags.c (Cplusplus_suffixes): .pdb is PostScript with C syntax.
+        (Postscript_suffixes): .ps is PostScript.
+        (lang_names): Add postscript.
         (Postscript_functions): New function.
         (TEX_decode_env): Close minor memory leak.
         (just_read_file): Correct the char number of the tag.
@@ -4674,7 +4678,7 @@
 
         * etags.c (xnew): Add support for debugging with chkmalloc.
         (error): Use this instead of printf whenever possible.
-        (main): Only call xnew after having initialised progname.
+        (main): Only call xnew after having initialized progname.
         (substitute): Bad memory corruption error corrected.
 
 1997-04-08  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
@@ -5130,7 +5134,7 @@
 
 1996-03-15  Anders Lindgren  <andersl@csd.uu.se>
 
-        * etags.c: Prolog language totaly rewritten.
+        * etags.c: Prolog language totally rewritten.
         (Prolog_functions): Rewritten from scratch.
         (skip_comment, prolog_getit): Removed.
         (prolog_skip_comment): New function, like old skip_comment.
@@ -5592,8 +5596,8 @@
 
 1995-02-22  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (C_entries): token_saved removed.  Initialise tok.valid and
-        savetok.valid.  Mark token as valid when it is initialised.
+        * etags.c (C_entries): token_saved removed.  Initialize tok.valid and
+        savetok.valid.  Mark token as valid when it is initialized.
         (make_tag): Make token only if token is valid and reset validity.
         (CNL_SAVE_DEFINEDEF): Test for savetok.valid instead of token_saved.
         (TOKEN): Add a new member: valid.
@@ -5605,15 +5609,15 @@
 
 1995-02-14  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (C_entries): Initialise the new members of TOKEN.
+        * etags.c (C_entries): Initialize the new members of TOKEN.
         (C_entries): Do not allocate a new space for each token found by
         consider_token.  Let make_tag do that instead.
         (make_tag): Since now TOKEN has memory of where it is taken from,
         this new macro substitutes both make_tag_from_new_lb and
         make_tag_from_oth_lb.  All callers changed.
         (TOKEN): Add linepos and buffer members.
-        (main): Initialise token_str.
-        (lang_extensions): Recognise .c++ and .h++ as C++ file suffixes.
+        (main): Initialize token_str.
+        (lang_extensions): Recognize .c++ and .h++ as C++ file suffixes.
         (token_str): New global variable used by C_entries.
 
 1995-02-07  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
@@ -5622,7 +5626,7 @@
 
 1995-02-01  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (pfnote): Initialise been_warned in the node.
+        * etags.c (pfnote): Initialize been_warned in the node.
         (C_entries): Remove a speed hack for the sake of clarity.
 
 1995-01-18  Francesco Potortì  (pot@cnuce.cnr.it)
@@ -5907,8 +5911,8 @@
 
 1994-09-29  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * etags.c (C_entries): Recognise typedef of ANSI style functions.
-        (C_entries): Recognise #define inside a struct.
+        * etags.c (C_entries): Recognize typedef of ANSI style functions.
+        (C_entries): Recognize #define inside a struct.
         (C_entries): ANSI tells that preprocessor commands do not have to
         start on the first column.
         (print_help): Documentation corrected for -d and -D.
@@ -6022,7 +6026,7 @@
 
 1994-07-08  Dave Love  (d.love@dl.ac.uk)
 
-        * etags.c (takeprec): Recognise `character*(*) function'.
+        * etags.c (takeprec): Recognize `character*(*) function'.
 
 1994-07-08  Francesco Potortì  (pot@cnuce.cnr.it)
 
@@ -6215,7 +6219,7 @@
         TeX_functions, Prolog_functions.
         (inf): No more a global variable.
         (C_entries): Take 2nd parameter `inf' instead of using the global one.
-        (find_entries): Add the cp1 var for optimisation.
+        (find_entries): Add the cp1 var for optimization.
         (find_entries): Add more suffixes for assembler files.
         (Asm_funcs): Now finds labels even without an ending colon.
 
@@ -6243,7 +6247,7 @@
         functions added to compute filenames in tags files.
         (process_file): Filenames in tags file are relative to the
         directory where the tags file is (useful with the -o option).
-        (main): Initialise the outfiledir var.
+        (main): Initialize the outfiledir var.
         (TYPEDST): Add the `tignore' value.
         (C_entries): Corrected various small bugs.
 
@@ -6549,7 +6553,7 @@
 
 1993-09-20  Francesco Potortì  (pot@fly)
 
-        * etags.c (C_entries): is_func is initialised here instead of in
+        * etags.c (C_entries): is_func is initialized here instead of in
         consider_token for the sake of the yacc rules section.
         (C_entries): Now class, struct, enum, union and typedef produce
         named tags.
@@ -6603,7 +6607,7 @@
 
 1993-08-04  Francesco Potortì  (pot@spiff.gnu.ai.mit.edu)
 
-        * etags.c (L_isdef, L_isquote, L_getit): Small optimisations.
+        * etags.c (L_isdef, L_isquote, L_getit): Small optimizations.
         (L_funcs): The (foo::defmumble stuff now should work.
         (consider_token): Function returned random value--corrected.
         (C_entries): Corrected == versus = typo.
@@ -6625,7 +6629,7 @@
         (C_entries, consider_token): Make use of fignore.
         (consider_token): Reset funcdef when next_token_is_func: when in
         ctags mode makes DEFVAR and others work better.
-        (L_isquote): Function that recognises the "(quote" string.
+        (L_isquote): Function that recognizes the "(quote" string.
         (L_getit): Ignore quoting via "'" or "(quote".  Useful for defalias.
 
 1993-07-29  Paul Eggert  (eggert@twinsun.com)
@@ -6972,7 +6976,7 @@
         (TOKEN): Member linestart removed.
         (linepos, prev_linepos, lb1): Deleted.
         (main): Call initbuffer on lbs array instead of lb1.
-        (init): Remove the initialisation of the logical _gd array.
+        (init): Remove the initialization of the logical _gd array.
         (find_entries): A .sa suffix means assembler file.
         (C_create_stab): "auto", "void", "extern", "static" are st_C_typespec.
         All C state machines rewritten.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 499305ec512..c5e117f66f9 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -175,11 +175,11 @@ ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
 LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
 CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
+all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
+
 LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM)
 $(EXE_FILES): ../lib/libgnu.a
 
-all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
-
 ## These targets copy the scripts into the build directory so that
 ## they can be run from there in an uninstalled Emacs.
 ## Nothing to do if pwd = srcdir.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 76aa21884de..56e17c100be 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1193,7 +1193,7 @@ handle_sigtstp (int signalnum)
     send_to_emacs (emacs_socket, "-suspend \n");
 
   /* Unblock this signal and call the default handler by temporarily
-     changing the handler and resignalling. */
+     changing the handler and resignaling.  */
   sigprocmask (SIG_BLOCK, NULL, &set);
   sigdelset (&set, signalnum);
   signal (signalnum, SIG_DFL);
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 5bd8077265f..30d90e9d911 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -326,7 +326,7 @@ typedef struct regexp
   struct re_pattern_buffer *pat; /* the compiled pattern */
   struct re_registers regs;     /* re registers */
   bool error_signaled;          /* already signaled for this regexp */
-  bool force_explicit_name;     /* do not allow implict tag name */
+  bool force_explicit_name;     /* do not allow implicit tag name */
   bool ignore_case;             /* ignore case when matching */
   bool multi_line;              /* do a multi-line match on the whole file */
 } regexp;
@@ -611,7 +611,7 @@ using `--declarations'.";
 static const char *Cplusplus_suffixes [] =
   { "C", "c++", "cc", "cpp", "cxx", "H", "h++", "hh", "hpp", "hxx",
     "M",                        /* Objective C++ */
-    "pdb",                      /* Postscript with C syntax */
+    "pdb",                      /* PostScript with C syntax */
     NULL };
 static const char Cplusplus_help [] =
 "In C++ code, all the tag constructs of C code are tagged.  (Use\n\
@@ -1862,10 +1862,10 @@ find_entries (FILE *inf)
 
   assert (parser != NULL);
 
-  /* Generic initialisations before reading from file. */
+  /* Generic initializations before reading from file. */
   linebuffer_setlen (&filebuf, 0); /* reset the file buffer */
 
-  /* Generic initialisations before parsing file with readline. */
+  /* Generic initializations before parsing file with readline. */
   lineno = 0;                  /* reset global line number */
   charno = 0;                  /* reset global char number */
   linecharno = 0;              /* reset global char number of line start */
@@ -1895,7 +1895,7 @@ find_entries (FILE *inf)
  *  4. the character, if any, immediately after NAME in LINESTART must
  *     also be a character in NONAM.
  *
- * The implementation uses the notinname() macro, which recognises the
+ * The implementation uses the notinname() macro, which recognizes the
  * characters stored in the string `nonam'.
  * etags.el needs to use the same characters that are in NONAM.
  */
@@ -3057,7 +3057,7 @@ make_C_tag (int isfun)
     make_tag (token_name.buffer, token_name.len, isfun, token.line,
               token.offset+token.length+1, token.lineno, token.linepos);
   else if (DEBUG)
-    {                             /* this branch is optimised away if !DEBUG */
+    {                             /* this branch is optimized away if !DEBUG */
       make_tag (concat ("INVALID TOKEN:-->", token_name.buffer, ""),
                 token_name.len + 17, isfun, token.line,
                 token.offset+token.length+1, token.lineno, token.linepos);
@@ -3304,7 +3304,7 @@ C_entries (int c_ext, FILE *inf)
                   if (c == ':' && *lp == ':' && begtoken (lp[1]))
                     /* This handles :: in the middle,
                        but not at the beginning of an identifier.
-                       Also, space-separated :: is not recognised. */
+                       Also, space-separated :: is not recognized. */
                     {
                       if (c_ext & C_AUTO) /* automatic detection of C++ */
                         c_ext = (c_ext | C_PLPL) & ~C_AUTO;
@@ -4846,7 +4846,7 @@ Lua_functions (FILE *inf)
 
 
 /*
- * Postscript tags
+ * PostScript tags
  * Just look for lines where the first character is '/'
  * Also look at "defineps" for PSWrap
  * Ideas by:
@@ -5900,7 +5900,7 @@ regex_tag_multiline (void)
       if (!rp->multi_line)
         continue;               /* skip normal regexps */
 
-      /* Generic initialisations before parsing file from memory. */
+      /* Generic initializations before parsing file from memory. */
       lineno = 1;               /* reset global line number */
       charno = 0;               /* reset global char number */
       linecharno = 0;           /* reset global char number of line start */
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 9fba51a33de..e335617df4d 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -346,7 +346,7 @@ read_scores (const char *filename, struct score_entry **scores, int *count)
     return -1;
   while ((readval = read_score (f, &ret[scorecount])) == 0)
     {
-      /* We encoutered an error */
+      /* We encountered an error.  */
       if (readval < 0)
         return -1;
       scorecount++;