merge master

3 files changed, 18 insertions, 13 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e9205fdd12a..37f037ef324 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,15 @@
+2015-01-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (AM_V_RC, am__v_RC_, am__v_RC_0, am__v_RC_1): New
+        macros.
+        (emacsclient.res): Use $(AM_V_RC).
+
+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/Makefile.in b/lib-src/Makefile.in
index 22a5ecad8d8..01592bd21a5 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -58,6 +58,11 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 =
 
+AM_V_RC = $(am__v_RC_@AM_V@)
+am__v_RC_ = $(am__v_RC_@AM_DEFAULT_V@)
+am__v_RC_0 = @echo "  RC      " $@;
+am__v_RC_1 =
+
 # ==================== Where To Install Things ====================
 
 # Location to install Emacs.app under GNUstep / Mac OS X.
@@ -381,6 +386,6 @@ update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
           $< $(NTLIB) $(LOADLIBES) -o $@
 
 emacsclient.res: ../nt/emacsclient.rc $(NTINC)/../icons/emacs.ico
-        $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
+        $(AM_V_RC)$(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
 
 ## Makefile ends here.
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 (";");
         }