masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from gnulib.

Browse source 
This incorporates:
2012-08-05 extern-inline: also ignore -Wmissing-declarations
This commit is contained in:
Paul Eggert 2012-08-13 20:15:52 -07:00
parent 5884c3244a
commit 76d0e68f8d
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2012-08-10 Juanma Barranquero <lekktu@gmail.com>
* lib/makefile.w32-in (STAT_TIME_H): New macro. * lib/makefile.w32-in (STAT_TIME_H): New macro.

15
doc/misc/texinfo.tex
View file

@ -3146,12 +3146,17 @@
% hopefully nobody will notice/care. % hopefully nobody will notice/care.
\edef\ecsize{\csname\curfontsize ecsize\endcsname}% \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
\edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
\ifx\curfontstyle\bfstylename \ifmonospace
% bold: % typewriter:
\font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize \font\thisecfont = ectt\ecsize \space at \nominalsize
\else \else
% regular: \ifx\curfontstyle\bfstylename
\font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize % 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 \fi
\thisecfont \thisecfont
} }

3
m4/extern-inline.m4
View file

@ -24,7 +24,8 @@ AC_DEFUN([gl_EXTERN_INLINE],
# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__ # if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
# define _GL_INLINE_HEADER_BEGIN \ # define _GL_INLINE_HEADER_BEGIN \
_Pragma ("GCC diagnostic push") \ _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 \ # define _GL_INLINE_HEADER_END \
_Pragma ("GCC diagnostic pop") _Pragma ("GCC diagnostic pop")
# endif # endif