upstream

5 files changed, 16 insertions, 12 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a8f9a0ac4be..d043f41962e 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.
@@ -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>
@@ -4630,9 +4634,9 @@
 
 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.
@@ -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.
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 cdcc6461a64..b739e8f00c5 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -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\
@@ -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:
@@ -6097,7 +6097,7 @@ readline (linebuffer *lbp, FILE *stream)
   lineno += 1;                  /* increment global line number */
   charno += result;             /* increment global char number */
 
-  /* Honour #line directives. */
+  /* Honor #line directives. */
   if (!no_line_directive)
     {
       static bool discard_until_line_directive;
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++;