aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorPaul Eggert2017-04-15 22:22:49 -0700
committerPaul Eggert2017-04-15 22:23:05 -0700
commit0ef7f64407525a1e1bcc8aef4d1fd19a1cf60ec6 (patch)
tree8ef5acb8ebb49d0fe5113af24fc0cb8ab918af57 /doc/misc
parent23d3eeb798c7edc27898b0dbd4c2364a6ca6247d (diff)
downloademacs-0ef7f64407525a1e1bcc8aef4d1fd19a1cf60ec6.tar.gz
emacs-0ef7f64407525a1e1bcc8aef4d1fd19a1cf60ec6.zip
Merge from gnulib
This incorporates: 2017-04-14 intprops: try to avoid tickling similar bugs 2017-04-14 intprops: port to Oracle Studio 12.3 x86 * doc/misc/texinfo.tex, lib/intprops.h: Copy from gnulib.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/texinfo.tex6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 7bcb27b76e1..9cd73101c1f 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,7 +3,7 @@
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-25.14} 6\def\texinfoversion{2017-04-14.11}
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,
@@ -11595,6 +11595,9 @@ directory should work if nowhere else does.}
11595 @def ^^M{@let^^M@secondlinenl}% 11595 @def ^^M{@let^^M@secondlinenl}%
11596 % Definition for a newline in the main Texinfo file. 11596 % Definition for a newline in the main Texinfo file.
11597 @gdef @secondlinenl{@fixbackslash}% 11597 @gdef @secondlinenl{@fixbackslash}%
11598 % In case the first line has a whole-line command on it
11599 @let@originalparsearg@parsearg
11600 @def@parsearg{@fixbackslash@originalparsearg}
11598}} 11601}}
11599 11602
11600{@catcode`@^=7 @catcode`@^^M=13% 11603{@catcode`@^=7 @catcode`@^^M=13%
@@ -11615,6 +11618,7 @@ directory should work if nowhere else does.}
11615 @catcode13=5 % regular end of line 11618 @catcode13=5 % regular end of line
11616 @enableemergencynewline 11619 @enableemergencynewline
11617 @let@c=@texinfoc 11620 @let@c=@texinfoc
11621 @let@parsearg@originalparsearg
11618 % Also turn back on active characters that might appear in the input 11622 % Also turn back on active characters that might appear in the input
11619 % file name, in case not using a pre-dumped format. 11623 % file name, in case not using a pre-dumped format.
11620 @catcode`+=@active 11624 @catcode`+=@active