diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-02-05 11:41:03 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-02-05 11:41:03 -0800 |
| commit | 06c2ec49462474205dbd79a5dbd96bf73367d949 (patch) | |
| tree | 90a5090472895f15ff1fa9aa0bbe475a914b180c /doc | |
| parent | 81f9a6edde971d8ec7d31cab03a766feb6ae074b (diff) | |
| download | emacs-06c2ec49462474205dbd79a5dbd96bf73367d949.tar.gz | |
Merge from gnulib.
This incorporates:
2014-01-23 pthread: work around winpthread header pollution on mingw
* lib/time.in.h: Update from gnulib.
* doc/misc/texinfo.tex: Update from texinfo.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/texinfo.tex | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 0b79841256e..f1d06e0b1be 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2014-02-05 Paul Eggert <eggert@cs.ucla.edu> + + * texinfo.tex: Update from gnulib. + 2014-02-05 Glenn Morris <rgm@gnu.org> * epa.texi: Add indices. diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 704d66453f5..174e4abafda 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2014-01-16.10} +\def\texinfoversion{2014-01-30.15} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -4649,6 +4649,16 @@ end \definedummyword\verb \definedummyword\w \definedummyword\xref + % + % Consider: + % @macro mkind{arg1,arg2} + % @cindex \arg2\ + % @end macro + % @mkind{foo, bar} + % The space after the comma will end up in the temporary definition + % that we make for arg2 (see \parsemargdef ff.). We want all this to be + % expanded for the sake of the index, so we end up just seeing "bar". + \let\xeatspaces = \eatspaces } % \indexnofonts is used when outputting the strings to sort the index @@ -7474,7 +7484,7 @@ end % Parse the optional {params} list. Set up \paramno and \paramlist % so \defmacro knows what to do. Define \macarg.BLAH for each BLAH -% in the params list to some hook where the argument si to be expanded. If +% in the params list to some hook where the argument is to be expanded. If % there are less than 10 arguments that hook is to be replaced by ##N where N % is the position in that list, that is to say the macro arguments are to be % defined `a la TeX in the macro body. |