2 files changed, 6 insertions, 12 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e9205fdd12a..7cbf3274946 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Give up on -Wsuggest-attribute=const
+        * make-docfile.c (write_globals):
+        Remove special hack for Fnext_read_file_uses_dialog_p
+
 2015-01-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         Don't say Fnext_read_file_uses_dialog_p is const
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 741fa4bfa42..79d421a0a8e 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -729,18 +729,6 @@ write_globals (void)
 
           if (globals[i].flags & DEFUN_const)
             fputs (" ATTRIBUTE_CONST", stdout);
-          else if (strcmp (globals[i].name, "Fnext_read_file_uses_dialog_p")
-                   == 0)
-            {
-              /* It would be nice to have a cleaner way to deal with this
-                 special hack.  */
-              fputs (("\n"
-                      "#if ! (defined USE_GTK || defined USE_MOTIF \\\n"
-                      "       || defined HAVE_NS || defined HAVE_NTGUI)\n"
-                      "\tATTRIBUTE_CONST\n"
-                      "#endif\n"),
-                     stdout);
-            }
 
           puts (";");
         }