3 files changed, 19 insertions, 5 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index ba801f024db..1fc9fcdb1f5 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Omit redundant extern decls.
+        * emacsclient.c (getenv): Remove decl.
+        * make-docfile.c (write_globals): Add ATTRIBUTE_CONST for
+        Fbyteorder, Ftool_bar_height, Fmax_char, Fidentity.
+
 2014-06-15  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (LDFLAGS): Explicitly set via configure.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index a1177f54576..ddc1b6de5e3 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -82,10 +82,6 @@ char *w32_getenv (char *);
 #include <signal.h>
 #include <errno.h>
 
-
-
-char *getenv (const char *);
-
 #ifndef VERSION
 #define VERSION "unspecified"
 #endif
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 2eb2413815e..15ffa138b51 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -665,6 +665,7 @@ write_globals (void)
               || strcmp (globals[i].name, "Fexit_recursive_edit") == 0
               || strcmp (globals[i].name, "Fabort_recursive_edit") == 0)
             fprintf (outfile, "_Noreturn ");
+
           fprintf (outfile, "EXFUN (%s, ", globals[i].name);
           if (globals[i].value == -1)
             fprintf (outfile, "MANY");
@@ -672,7 +673,17 @@ write_globals (void)
             fprintf (outfile, "UNEVALLED");
           else
             fprintf (outfile, "%d", globals[i].value);
-          fprintf (outfile, ");\n");
+          fprintf (outfile, ")");
+
+          /* 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
+              || strcmp (globals[i].name, "Fmax_char") == 0
+              || strcmp (globals[i].name, "Fidentity") == 0)
+            fprintf (outfile, " ATTRIBUTE_CONST");
+
+          fprintf (outfile, ";\n");
         }
 
       while (i + 1 < num_globals