[Emacs-diffs] /srv/bzr/emacs/trunk r109590: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 109590
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-13 20:15:52 -0700
message:
  Merge from gnulib.
  
  This incorporates:
  2012-08-05 extern-inline: also ignore -Wmissing-declarations
modified:
  ChangeLog
  doc/misc/texinfo.tex
  m4/extern-inline.m4

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-08-10 21:29:38 +0000
+++ b/ChangeLog 2012-08-14 03:15:52 +0000
@@ -1,3 +1,8 @@
+2012-08-14  Paul Eggert  <address@hidden>
+
+       Merge from gnulib, incorporating:
+       2012-08-05 extern-inline: also ignore -Wmissing-declarations
+
 2012-08-10  Juanma Barranquero  <address@hidden>
 
        * lib/makefile.w32-in (STAT_TIME_H): New macro.

=== modified file 'doc/misc/texinfo.tex'
--- a/doc/misc/texinfo.tex      2012-07-30 06:07:22 +0000
+++ b/doc/misc/texinfo.tex      2012-08-14 03:15:52 +0000
@@ -3146,12 +3146,17 @@
   % 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
 }

=== modified file 'm4/extern-inline.m4'
--- a/m4/extern-inline.m4       2012-08-02 04:46:10 +0000
+++ b/m4/extern-inline.m4       2012-08-14 03:15:52 +0000
@@ -24,7 +24,8 @@
 # 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