From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 14 Aug 2012 03:15:52 +0000 (-0700)
Subject: Merge from gnulib.
X-Git-Tag: emacs-24.2.90~699
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=76d0e68f8d6bbae0886443c98322e81eab0dc5aa;p=emacs.git

Merge from gnulib.

This incorporates:
2012-08-05 extern-inline: also ignore -Wmissing-declarations
---

diff --git a/ChangeLog b/ChangeLog
index 051819daf29..c29a9856a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge from gnulib, incorporating:
+	2012-08-05 extern-inline: also ignore -Wmissing-declarations
+
 2012-08-10  Juanma Barranquero  <lekktu@gmail.com>
 
 	* lib/makefile.w32-in (STAT_TIME_H): New macro.
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index c7354edcaf9..dc4bf6400c4 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3146,12 +3146,17 @@ end
   % hopefully nobody will notice/care.
   \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
   \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
-  \ifx\curfontstyle\bfstylename
-    % bold:
-    \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+  \ifmonospace
+    % typewriter:
+    \font\thisecfont = ectt\ecsize \space at \nominalsize
   \else
-    % regular:
-    \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+    \ifx\curfontstyle\bfstylename
+      % bold:
+      \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+    \else
+      % regular:
+      \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+    \fi
   \fi
   \thisecfont
 }
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index cacf8a08b16..187a33599a3 100644
--- a/m4/extern-inline.m4
+++ b/m4/extern-inline.m4
@@ -24,7 +24,8 @@ AC_DEFUN([gl_EXTERN_INLINE],
 # if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
 #  define _GL_INLINE_HEADER_BEGIN \
      _Pragma ("GCC diagnostic push") \
-     _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"")
+     _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
+     _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"")
 #  define _GL_INLINE_HEADER_END \
      _Pragma ("GCC diagnostic pop")
 # endif