Merge from trunk

4 files changed, 13 insertions, 5 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 35190fd2a8f..3f1e287db34 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,13 @@
+2012-09-17  Glenn Morris  <rgm@gnu.org>
+
+        * ebrowse.c (version):
+        * etags.c (print_version): Use COPYRIGHT.
+
+2012-09-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * pop.c (socket_connection) [HAVE_GETADDRINFO]:
+        Prefer assignment to memcpy when either will do.
+
 2012-08-31  Andreas Schwab  <schwab@linux-m68k.org>
 
         * etags.c (consider_token): Always zero-terminate token buffer.
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index f8569fe3747..056ed471fde 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -3516,8 +3516,7 @@ usage (int error)
 static _Noreturn void
 version (void)
 {
-  /* Makes it easier to update automatically. */
-  char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc.";
+  char emacs_copyright[] = COPYRIGHT;
 
   printf ("ebrowse %s\n", VERSION);
   puts (emacs_copyright);
diff --git a/lib-src/etags.c b/lib-src/etags.c
index e65082de534..ec415e9905f 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -836,8 +836,7 @@ etags --help --lang=ada.");
 static void
 print_version (void)
 {
-  /* Makes it easier to update automatically. */
-  char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc.";
+  char emacs_copyright[] = COPYRIGHT;
 
   printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
   puts (emacs_copyright);
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 74054e0e1b1..bfbcb8c9466 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1083,7 +1083,7 @@ socket_connection (char *host, int flags)
           if (it->ai_addrlen == sizeof (addr))
             {
               struct sockaddr_in *in_a = (struct sockaddr_in *) it->ai_addr;
-              memcpy (&addr.sin_addr, &in_a->sin_addr, sizeof (addr.sin_addr));
+              addr.sin_addr = in_a->sin_addr;
               if (! connect (sock, (struct sockaddr *) &addr, sizeof (addr)))
                 break;
             }