Merge branch master of git.sv.gnu.org:/srv/git/emacs.

16 files changed, 283 insertions, 100 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 07a72ecaf0d..9a1fc7a3e9f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,38 @@
+2015-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use 0 for Qnil
+        * make-docfile.c (compare_globals): Consider 'nil' to be the least.
+
+        Compute C decls for DEFSYMs automatically
+        Fixes Bug#15880.
+        * make-docfile.c: Revamp to generate table of symbols, too.
+        Include <stdbool.h>.
+        (xstrdup): New function.
+        (main): Don't process the same file twice.
+        (SYMBOL): New constant in enum global_type.
+        (struct symbol): Turn 'value' member into a union, either v.value
+        for int or v.svalue for string.  All uses changed.
+        (add_global): New arg svalue, which overrides value, so that globals
+        can have a string value.
+        (close_emacs_global): New arg num_symbols; all uses changed.
+        Output lispsym decl.
+        (write_globals): Output symbol globals too.  Output more
+        ATTRIBUTE_CONST, now that Qnil etc. are C constants.
+        Output defsym_name table.
+        (scan_c_file): Move most of guts into ...
+        (scan_c_stream): ... new function.  Scan for DEFSYMs and
+        record symbols found.  Don't read past EOF if file doesn't
+        end in newline.
+
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        'temacs -nw' should not call missing functions
+        * make-docfile.c (write_globals):
+        Declare Fframe_windows_min_size with ATTRIBUTE_CONST, too.  Sort.
+
+        Less 'make' chatter for lib-src
+        * Makefile.in (blessmail): Less 'make' chatter here.
+
 2014-12-27  Eli Zaretskii  <eliz@gnu.org>
 
         * Makefile.in (etags_libs, ebrowse${EXEEXT}, profile${EXEEXT})
@@ -6,6 +41,17 @@
         since GCC sometimes calls stpcpy when it sees strcpy, under
         optimization switches.
 
+2014-12-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * ebrowse.c (sym_scope_1, operator_name, open_file):
+        * emacsclient.c (get_server_config, set_local_socket)
+        (start_daemon_and_retry_set_socket):
+        * etags.c (main, C_entries, relative_filename):
+        * pop.c (sendline):
+        * update-game-score.c (main):
+        Rewrite to avoid the need for strcat, typically by using stpcpy
+        and/or lispstpcpy.  strcat tends to be part of O(N**2) algorithms.
+
 2014-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         * etags.c (analyze_regex): Rename from analyse_regex.
@@ -135,8 +181,7 @@
 
 2014-05-26  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix rcs2log problems with CVS.
-        Problem reported by Glenn Morris in
+        Fix rcs2log problems with CVS.  Reported by Glenn Morris in
         <http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00277.html>.
         Plus, fix some security and filename quoting problems.
         * rcs2log (logdir): Prefer mktemp if available.
@@ -3491,7 +3536,7 @@
 2004-04-17  Paul Eggert  <eggert@gnu.org>
 
         * rcs2log (Help): Clarify wording of the usage message.
-        Problem reported by Alan Mackenzie in
+        Reported by Alan Mackenzie in
         <http://mail.gnu.org/archive/html/bug-gnu-emacs/2004-04/msg00188.html>.
 
 2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -8417,7 +8462,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1988-1999, 2001-2014 Free Software Foundation, Inc.
+  Copyright (C) 1988-1999, 2001-2015 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 13a7a05156c..22a5ecad8d8 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,7 +1,7 @@
 ### @configure_input@
 
-# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2014
-#   Free Software Foundation, Inc.
+# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2015 Free Software
+# Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -223,8 +223,8 @@ $(EXE_FILES): ../lib/libgnu.a
 ## Only used if we need blessmail, but no harm in always defining.
 ## This makes the actual blessmail executable.
 blessmail: $(srcdir)/../lisp/mail/blessmail.el
-        $(EMACS) $(EMACSOPT) -l $<
-        chmod +x $@
+        $(AM_V_GEN)$(EMACS) $(EMACSOPT) -l $<
+        $(AM_V_at)chmod +x $@
 
 ## This checks if we need to run blessmail.
 ## Do not charge ahead and do it!  Let the installer decide.
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index b7431593c3e..d16c9ae54af 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,6 +1,6 @@
 /* ebrowse.c --- parsing files for the ebrowse C++ browser
 
-Copyright (C) 1992-2014 Free Software Foundation, Inc.
+Copyright (C) 1992-2015 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index cfc321a1830..a04dda6408f 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1,6 +1,6 @@
 /* Client process that communicates with GNU Emacs acting as server.
 
-Copyright (C) 1986-1987, 1994, 1999-2014 Free Software Foundation, Inc.
+Copyright (C) 1986-1987, 1994, 1999-2015 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 78b3fed1128..dc2ced50933 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -28,7 +28,7 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2014 Free Software
+Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2015 Free Software
 Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 51744ab08a2..490f72731b4 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,5 +1,5 @@
 /* Convert files for Emacs Hexl mode.
-   Copyright (C) 1989, 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001-2015 Free Software Foundation, Inc.
 
 Author: Keith Gabryelski
 (according to authors.el)
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 884b6c1001e..22c4bad2e3f 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,6 +1,6 @@
 /* Generate doc-string file for GNU Emacs from source files.
 
-Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2014 Free Software
+Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2015 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -36,6 +36,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>   /* config.h unconditionally includes this anyway */
 
@@ -63,6 +64,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 static int scan_file (char *filename);
 static int scan_lisp_file (const char *filename, const char *mode);
 static int scan_c_file (char *filename, const char *mode);
+static int scan_c_stream (FILE *infile);
 static void start_globals (void);
 static void write_globals (void);
 
@@ -106,6 +108,17 @@ xmalloc (unsigned int size)
   return result;
 }
 
+/* Like strdup, but get fatal error if memory is exhausted.  */
+
+static char *
+xstrdup (char *s)
+{
+  char *result = strdup (s);
+  if (! result)
+    fatal ("virtual memory exhausted", 0);
+  return result;
+}
+
 /* Like realloc but get fatal error if memory is exhausted.  */
 
 static void *
@@ -123,7 +136,6 @@ main (int argc, char **argv)
 {
   int i;
   int err_count = 0;
-  int first_infile;
 
   progname = argv[0];
 
@@ -167,16 +179,21 @@ main (int argc, char **argv)
   if (generate_globals)
     start_globals ();
 
-  first_infile = i;
-  for (; i < argc; i++)
+  if (argc <= i)
+    scan_c_stream (stdin);
+  else
     {
-      int j;
-      /* Don't process one file twice.  */
-      for (j = first_infile; j < i; j++)
-        if (! strcmp (argv[i], argv[j]))
-          break;
-      if (j == i)
-        err_count += scan_file (argv[i]);
+      int first_infile = i;
+      for (; i < argc; i++)
+        {
+          int j;
+          /* Don't process one file twice.  */
+          for (j = first_infile; j < i; j++)
+            if (strcmp (argv[i], argv[j]) == 0)
+              break;
+          if (j == i)
+            err_count += scan_file (argv[i]);
+        }
     }
 
   if (err_count == 0 && generate_globals)
@@ -528,13 +545,15 @@ write_c_args (char *func, char *buf, int minargs, int maxargs)
 }
 
 /* The types of globals.  These are sorted roughly in decreasing alignment
-   order to avoid allocation gaps, except that functions are last.  */
+   order to avoid allocation gaps, except that symbols and functions
+   are last.  */
 enum global_type
 {
   INVALID,
   LISP_OBJECT,
   EMACS_INTEGER,
   BOOLEAN,
+  SYMBOL,
   FUNCTION
 };
 
@@ -543,7 +562,11 @@ struct global
 {
   enum global_type type;
   char *name;
-  int value;
+  union
+  {
+    int value;
+    char const *svalue;
+  } v;
 };
 
 /* All the variable names we saw while scanning C sources in `-g'
@@ -553,7 +576,7 @@ int num_globals_allocated;
 struct global *globals;
 
 static void
-add_global (enum global_type type, char *name, int value)
+add_global (enum global_type type, char *name, int value, char const *svalue)
 {
   /* Ignore the one non-symbol that can occur.  */
   if (strcmp (name, "..."))
@@ -574,7 +597,10 @@ add_global (enum global_type type, char *name, int value)
 
       globals[num_globals - 1].type = type;
       globals[num_globals - 1].name = name;
-      globals[num_globals - 1].value = value;
+      if (svalue)
+        globals[num_globals - 1].v.svalue = svalue;
+      else
+        globals[num_globals - 1].v.value = value;
     }
 }
 
@@ -587,21 +613,58 @@ compare_globals (const void *a, const void *b)
   if (ga->type != gb->type)
     return ga->type - gb->type;
 
+  /* Consider "nil" to be the least, so that aQnil is firat.  That
+     way, Qnil's internal representation is zero, which is a bit faster.  */
+  if (ga->type == SYMBOL)
+    {
+      bool a_nil = strcmp (ga->name, "Qnil") == 0;
+      bool b_nil = strcmp (gb->name, "Qnil") == 0;
+      if (a_nil | b_nil)
+        return b_nil - a_nil;
+    }
+
   return strcmp (ga->name, gb->name);
 }
 
 static void
-close_emacs_globals (void)
+close_emacs_globals (int num_symbols)
 {
-  puts ("};");
-  puts ("extern struct emacs_globals globals;");
+  printf (("};\n"
+           "extern struct emacs_globals globals;\n"
+           "\n"
+           "#ifndef DEFINE_SYMBOLS\n"
+           "extern\n"
+           "#endif\n"
+           "struct Lisp_Symbol lispsym[%d];\n"),
+          num_symbols);
 }
 
 static void
 write_globals (void)
 {
-  int i, seen_defun = 0;
+  int i, j;
+  bool seen_defun = false;
+  int symnum = 0;
+  int num_symbols = 0;
   qsort (globals, num_globals, sizeof (struct global), compare_globals);
+
+  j = 0;
+  for (i = 0; i < num_globals; i++)
+    {
+      while (i + 1 < num_globals
+             && strcmp (globals[i].name, globals[i + 1].name) == 0)
+        {
+          if (globals[i].type == FUNCTION
+              && globals[i].v.value != globals[i + 1].v.value)
+            error ("function '%s' defined twice with differing signatures",
+                   globals[i].name);
+          i++;
+        }
+      num_symbols += globals[i].type == SYMBOL;
+      globals[j++] = globals[i];
+    }
+  num_globals = j;
+
   for (i = 0; i < num_globals; ++i)
     {
       char const *type = 0;
@@ -617,12 +680,13 @@ write_globals (void)
         case LISP_OBJECT:
           type = "Lisp_Object";
           break;
+        case SYMBOL:
         case FUNCTION:
           if (!seen_defun)
             {
-              close_emacs_globals ();
+              close_emacs_globals (num_symbols);
               putchar ('\n');
-              seen_defun = 1;
+              seen_defun = true;
             }
           break;
         default:
@@ -635,6 +699,13 @@ write_globals (void)
           printf ("#define %s globals.f_%s\n",
                   globals[i].name, globals[i].name);
         }
+      else if (globals[i].type == SYMBOL)
+        printf (("DEFINE_LISP_SYMBOL_BEGIN (%s)\n"
+                 "#define a%s (&lispsym[%d])\n"
+                 "#define %s make_lisp_symbol (a%s)\n"
+                 "DEFINE_LISP_SYMBOL_END (a%s)\n\n"),
+                globals[i].name, globals[i].name, symnum++,
+                globals[i].name, globals[i].name, globals[i].name);
       else
         {
           /* It would be nice to have a cleaner way to deal with these
@@ -647,38 +718,65 @@ write_globals (void)
             fputs ("_Noreturn ", stdout);
 
           printf ("EXFUN (%s, ", globals[i].name);
-          if (globals[i].value == -1)
+          if (globals[i].v.value == -1)
             fputs ("MANY", stdout);
-          else if (globals[i].value == -2)
+          else if (globals[i].v.value == -2)
             fputs ("UNEVALLED", stdout);
           else
-            printf ("%d", globals[i].value);
+            printf ("%d", globals[i].v.value);
           putchar (')');
 
           /* It would be nice to have a cleaner way to deal with these
              special hacks, too.  */
-          if (strcmp (globals[i].name, "Fbyteorder") == 0
-              || strcmp (globals[i].name, "Ftool_bar_height") == 0
+          if (strcmp (globals[i].name, "Fatom") == 0
+              || strcmp (globals[i].name, "Fbyteorder") == 0
+              || strcmp (globals[i].name, "Fcharacterp") == 0
+              || strcmp (globals[i].name, "Fchar_or_string_p") == 0
+              || strcmp (globals[i].name, "Fconsp") == 0
+              || strcmp (globals[i].name, "Feq") == 0
+              || strcmp (globals[i].name, "Fface_attribute_relative_p") == 0
+              || strcmp (globals[i].name, "Fframe_windows_min_size") == 0
+              || strcmp (globals[i].name, "Fgnutls_errorp") == 0
+              || strcmp (globals[i].name, "Fidentity") == 0
+              || strcmp (globals[i].name, "Fintegerp") == 0
+              || strcmp (globals[i].name, "Finteractive") == 0
+              || strcmp (globals[i].name, "Ffloatp") == 0
+              || strcmp (globals[i].name, "Flistp") == 0
               || strcmp (globals[i].name, "Fmax_char") == 0
-              || strcmp (globals[i].name, "Fidentity") == 0)
+              || strcmp (globals[i].name, "Fnatnump") == 0
+              || strcmp (globals[i].name, "Fnlistp") == 0
+              || strcmp (globals[i].name, "Fnull") == 0
+              || strcmp (globals[i].name, "Fnumberp") == 0
+              || strcmp (globals[i].name, "Fstringp") == 0
+              || strcmp (globals[i].name, "Fsymbolp") == 0
+              || strcmp (globals[i].name, "Ftool_bar_height") == 0
+              || strcmp (globals[i].name, "Fwindow__sanitize_window_sizes") == 0
+#ifndef WINDOWSNT
+              || strcmp (globals[i].name, "Fgnutls_available_p") == 0
+              || strcmp (globals[i].name, "Fzlib_available_p") == 0
+#endif
+              || 0)
             fputs (" ATTRIBUTE_CONST", stdout);
 
           puts (";");
         }
-
-      while (i + 1 < num_globals
-             && !strcmp (globals[i].name, globals[i + 1].name))
-        {
-          if (globals[i].type == FUNCTION
-              && globals[i].value != globals[i + 1].value)
-            error ("function '%s' defined twice with differing signatures",
-                   globals[i].name);
-          ++i;
-        }
     }
 
   if (!seen_defun)
-    close_emacs_globals ();
+    close_emacs_globals (num_symbols);
+
+  puts ("#ifdef DEFINE_SYMBOLS");
+  puts ("static char const *const defsym_name[] = {");
+  for (int i = 0; i < num_globals; i++)
+    {
+      if (globals[i].type == SYMBOL)
+        printf ("\t\"%s\",\n", globals[i].v.svalue);
+      while (i + 1 < num_globals
+             && strcmp (globals[i].name, globals[i + 1].name) == 0)
+        i++;
+    }
+  puts ("};");
+  puts ("#endif");
 }
 
 
@@ -691,9 +789,6 @@ static int
 scan_c_file (char *filename, const char *mode)
 {
   FILE *infile;
-  register int c;
-  register int commas;
-  int minargs, maxargs;
   int extension = filename[strlen (filename) - 1];
 
   if (extension == 'o')
@@ -719,8 +814,15 @@ scan_c_file (char *filename, const char *mode)
 
   /* Reset extension to be able to detect duplicate files.  */
   filename[strlen (filename) - 1] = extension;
+  return scan_c_stream (infile);
+}
+
+static int
+scan_c_stream (FILE *infile)
+{
+  int commas, minargs, maxargs;
+  int c = '\n';
 
-  c = '\n';
   while (!feof (infile))
     {
       int doc_keyword = 0;
@@ -749,37 +851,53 @@ scan_c_file (char *filename, const char *mode)
           if (c != 'F')
             continue;
           c = getc (infile);
-          if (c != 'V')
-            continue;
-          c = getc (infile);
-          if (c != 'A')
-            continue;
-          c = getc (infile);
-          if (c != 'R')
-            continue;
-          c = getc (infile);
-          if (c != '_')
-            continue;
-
-          defvarflag = 1;
-
-          c = getc (infile);
-          defvarperbufferflag = (c == 'P');
-          if (generate_globals)
+          if (c == 'S')
             {
-              if (c == 'I')
-                type = EMACS_INTEGER;
-              else if (c == 'L')
-                type = LISP_OBJECT;
-              else if (c == 'B')
-                type = BOOLEAN;
+              c = getc (infile);
+              if (c != 'Y')
+                continue;
+              c = getc (infile);
+              if (c != 'M')
+                continue;
+              c = getc (infile);
+              if (c != ' ' && c != '\t' && c != '(')
+                continue;
+              type = SYMBOL;
             }
+          else if (c == 'V')
+            {
+              c = getc (infile);
+              if (c != 'A')
+                continue;
+              c = getc (infile);
+              if (c != 'R')
+                continue;
+              c = getc (infile);
+              if (c != '_')
+                continue;
 
-          c = getc (infile);
-          /* We need to distinguish between DEFVAR_BOOL and
-             DEFVAR_BUFFER_DEFAULTS.  */
-          if (generate_globals && type == BOOLEAN && c != 'O')
-            type = INVALID;
+              defvarflag = 1;
+
+              c = getc (infile);
+              defvarperbufferflag = (c == 'P');
+              if (generate_globals)
+                {
+                  if (c == 'I')
+                    type = EMACS_INTEGER;
+                  else if (c == 'L')
+                    type = LISP_OBJECT;
+                  else if (c == 'B')
+                    type = BOOLEAN;
+                }
+
+              c = getc (infile);
+              /* We need to distinguish between DEFVAR_BOOL and
+                 DEFVAR_BUFFER_DEFAULTS.  */
+              if (generate_globals && type == BOOLEAN && c != 'O')
+                type = INVALID;
+            }
+          else
+            continue;
         }
       else if (c == 'D')
         {
@@ -796,7 +914,7 @@ scan_c_file (char *filename, const char *mode)
 
       if (generate_globals
           && (!defvarflag || defvarperbufferflag || type == INVALID)
-          && !defunflag)
+          && !defunflag && type != SYMBOL)
         continue;
 
       while (c != '(')
@@ -806,15 +924,19 @@ scan_c_file (char *filename, const char *mode)
           c = getc (infile);
         }
 
-      /* Lisp variable or function name.  */
-      c = getc (infile);
-      if (c != '"')
-        continue;
-      c = read_c_string_or_comment (infile, -1, 0, 0);
+      if (type != SYMBOL)
+        {
+          /* Lisp variable or function name.  */
+          c = getc (infile);
+          if (c != '"')
+            continue;
+          c = read_c_string_or_comment (infile, -1, 0, 0);
+        }
 
       if (generate_globals)
         {
           int i = 0;
+          char const *svalue = 0;
 
           /* Skip "," and whitespace.  */
           do
@@ -826,6 +948,8 @@ scan_c_file (char *filename, const char *mode)
           /* Read in the identifier.  */
           do
             {
+              if (c < 0)
+                goto eof;
               input_buffer[i++] = c;
               c = getc (infile);
             }
@@ -836,13 +960,27 @@ scan_c_file (char *filename, const char *mode)
           name = xmalloc (i + 1);
           memcpy (name, input_buffer, i + 1);
 
+          if (type == SYMBOL)
+            {
+              do
+                c = getc (infile);
+              while (c == ' ' || c == '\t' || c == '\n' || c == '\r');
+              if (c != '"')
+                continue;
+              c = read_c_string_or_comment (infile, -1, 0, 0);
+              svalue = xstrdup (input_buffer);
+            }
+
           if (!defunflag)
             {
-              add_global (type, name, 0);
+              add_global (type, name, 0, svalue);
               continue;
             }
         }
 
+      if (type == SYMBOL)
+        continue;
+
       /* DEFVAR_LISP ("name", addr, "doc")
          DEFVAR_LISP ("name", addr /\* doc *\/)
          DEFVAR_LISP ("name", addr, doc: /\* doc *\/)  */
@@ -895,7 +1033,7 @@ scan_c_file (char *filename, const char *mode)
 
       if (generate_globals)
         {
-          add_global (FUNCTION, name, maxargs);
+          add_global (FUNCTION, name, maxargs, 0);
           continue;
         }
 
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 773c89745e5..a81a011084f 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
-# Copyright (C) 2000-2014 Free Software Foundation, Inc.
+# Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index b0196b309d8..5008c9b15f7 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,7 +1,7 @@
 /* movemail foo bar -- move file foo to file bar,
    locking file foo the way /bin/mail respects.
 
-Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2014 Free Software
+Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2015 Free Software
 Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 23d7ba77b8e..7d9dff9904c 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
 
-Copyright (C) 1994, 2001-2014 Free Software Foundation, Inc.
+Copyright (C) 1994, 2001-2015 Free Software Foundation, Inc.
 
 Author: Geoff Voelker (voelker@cs.washington.edu)
 Created: 10-8-94
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 40ef9fa982d..787a65d987f 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,5 +1,5 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994, 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002-2015 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 70011504a34..c6deaf73a2c 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,6 +1,6 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
 
-Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2014 Free Software
+Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2015 Free Software
 Foundation, Inc.
 
 Author: Jonathan Kamens <jik@security.ov.com>
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 51eaa8158af..cd8196939e2 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,5 +1,5 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
-   Copyright (C) 1991, 1993, 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 2001-2015 Free Software Foundation, Inc.
 
 Author:  Jonathan Kamens <jik@security.ov.com>
 
diff --git a/lib-src/profile.c b/lib-src/profile.c
index e159a92e86d..ffaa2256567 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,5 +1,5 @@
 /* profile.c --- generate periodic events for profiling of Emacs Lisp code.
-   Copyright (C) 1992, 1994, 1999, 2001-2014 Free Software Foundation,
+   Copyright (C) 1992, 1994, 1999, 2001-2015 Free Software Foundation,
    Inc.
 
 Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 8dd9cdcf2bb..242760362e8 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -2,7 +2,7 @@
 
 # RCS to ChangeLog generator
 
-# Copyright (C) 1992-1998, 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 1992-1998, 2001-2015 Free Software Foundation, Inc.
 
 # Author: Paul Eggert <eggert@twinsun.com>
 
@@ -20,7 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-Copyright='Copyright (C) 2014 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2015 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index b311001bd62..d3354af2783 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -1,6 +1,6 @@
 /* update-game-score.c --- Update a score file
 
-Copyright (C) 2002-2014 Free Software Foundation, Inc.
+Copyright (C) 2002-2015 Free Software Foundation, Inc.
 
 Author: Colin Walters <walters@debian.org>