diff options
| author | Paul Eggert | 2017-04-06 16:29:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-04-06 16:30:09 -0700 |
| commit | 022755953fc63ef70b72576e14e94324d055ef60 (patch) | |
| tree | 47ea3e6fb2396a41f413badaf203d698543d68c3 /doc/misc | |
| parent | 451a0c8b6955006f5aaa8b660a9e0b935b4fa095 (diff) | |
| download | emacs-022755953fc63ef70b72576e14e94324d055ef60.tar.gz emacs-022755953fc63ef70b72576e14e94324d055ef60.zip | |
Merge from gnulib
This merges some getopt fixes from Zack Weinberg, and affects only
non-GNUish platforms. It incorporates:
2017-04-06 getopt-gnu: omit some duplicate code
2017-04-06 getopt-posix: use angle-bracket include
2017-04-06 getopt: annotate files with relationship to glibc
2017-04-06 getopt: split up getopt.in.h and eliminate __need_getopt
2017-04-06 getopt: better handling of ambiguous options
2017-04-06 getopt: refactor long-option handling
2017-04-06 getopt: tidy up _getopt_initialize a bit
2017-04-06 getopt: merge from glibc: repetition reduction
2017-04-06 getopt: clean up error reporting
2017-04-06 getopt: fix fencepost error in ambiguous-W-option handling
2017-04-06 getopt: clean up getopt.c and getopt1.c file headers
2017-04-06 getopt: harmonize comments with glibc
2017-04-06 getopt: remove USE_NONOPTION_FLAGS
2017-04-06 getopt: tabify, in preparation for merge with glibc
2017-04-06 md5, sha1, sha256, sha512: Add comments re correctness
* build-aux/config.sub, doc/misc/texinfo.tex, lib/getopt.c:
* lib/getopt.in.h, lib/getopt1.c, lib/getopt_int.h, lib/md5.c:
* lib/md5.h, lib/sha1.c, lib/sha1.h, lib/sha256.c, lib/sha256.h:
* lib/sha512.c, lib/sha512.h, lib/unistd.in.h, m4/getopt.m4:
Copy from gnulib.
* lib/getopt_cdefs.in.h, lib/getopt_core.h, lib/getopt_ext.h:
* lib/getopt_pfx_core.h, lib/getopt_pfx_ext.h:
New files, taken from gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4:
Regenerate.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/texinfo.tex | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 970d8784688..7bcb27b76e1 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex | |||
| @@ -3,11 +3,11 @@ | |||
| 3 | % Load plain if necessary, i.e., if running under initex. | 3 | % Load plain if necessary, i.e., if running under initex. |
| 4 | \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi | 4 | \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi |
| 5 | % | 5 | % |
| 6 | \def\texinfoversion{2017-03-07.20} | 6 | \def\texinfoversion{2017-03-25.14} |
| 7 | % | 7 | % |
| 8 | % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, | 8 | % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, |
| 9 | % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, | 9 | % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, |
| 10 | % 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 | 10 | % 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 |
| 11 | % Free Software Foundation, Inc. | 11 | % Free Software Foundation, Inc. |
| 12 | % | 12 | % |
| 13 | % This texinfo.tex file is free software: you can redistribute it and/or | 13 | % This texinfo.tex file is free software: you can redistribute it and/or |
| @@ -11312,7 +11312,6 @@ directory should work if nowhere else does.} | |||
| 11312 | % | 11312 | % |
| 11313 | \lispnarrowing = 0.3in | 11313 | \lispnarrowing = 0.3in |
| 11314 | \tolerance = 700 | 11314 | \tolerance = 700 |
| 11315 | \hfuzz = 1pt | ||
| 11316 | \contentsrightmargin = 0pt | 11315 | \contentsrightmargin = 0pt |
| 11317 | \defbodyindent = .5cm | 11316 | \defbodyindent = .5cm |
| 11318 | }} | 11317 | }} |
| @@ -11330,7 +11329,6 @@ directory should work if nowhere else does.} | |||
| 11330 | % | 11329 | % |
| 11331 | \lispnarrowing = 0.25in | 11330 | \lispnarrowing = 0.25in |
| 11332 | \tolerance = 700 | 11331 | \tolerance = 700 |
| 11333 | \hfuzz = 1pt | ||
| 11334 | \contentsrightmargin = 0pt | 11332 | \contentsrightmargin = 0pt |
| 11335 | \defbodyindent = .4cm | 11333 | \defbodyindent = .4cm |
| 11336 | }} | 11334 | }} |
| @@ -11356,7 +11354,6 @@ directory should work if nowhere else does.} | |||
| 11356 | {297mm}{210mm}% | 11354 | {297mm}{210mm}% |
| 11357 | % | 11355 | % |
| 11358 | \tolerance = 700 | 11356 | \tolerance = 700 |
| 11359 | \hfuzz = 1pt | ||
| 11360 | \contentsrightmargin = 0pt | 11357 | \contentsrightmargin = 0pt |
| 11361 | \defbodyindent = 5mm | 11358 | \defbodyindent = 5mm |
| 11362 | }} | 11359 | }} |
| @@ -11375,7 +11372,6 @@ directory should work if nowhere else does.} | |||
| 11375 | % | 11372 | % |
| 11376 | \lispnarrowing = 0.2in | 11373 | \lispnarrowing = 0.2in |
| 11377 | \tolerance = 800 | 11374 | \tolerance = 800 |
| 11378 | \hfuzz = 1.2pt | ||
| 11379 | \contentsrightmargin = 0pt | 11375 | \contentsrightmargin = 0pt |
| 11380 | \defbodyindent = 2mm | 11376 | \defbodyindent = 2mm |
| 11381 | \tableindent = 12mm | 11377 | \tableindent = 12mm |
| @@ -11431,6 +11427,9 @@ directory should work if nowhere else does.} | |||
| 11431 | % | 11427 | % |
| 11432 | \letterpaper | 11428 | \letterpaper |
| 11433 | 11429 | ||
| 11430 | % Default value of \hfuzz, for suppressing warnings about overfull hboxes. | ||
| 11431 | \hfuzz = 1pt | ||
| 11432 | |||
| 11434 | 11433 | ||
| 11435 | \message{and turning on texinfo input format.} | 11434 | \message{and turning on texinfo input format.} |
| 11436 | 11435 | ||