aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-01-12 13:04:17 -0800
committerPaul Eggert2016-01-12 13:04:34 -0800
commit0ed0a9b7f09495394dc9b60a9f7c937679c49afe (patch)
tree8159ecfa365c670f7da065d63dff47627b1dcdd3
parentc3528f1e20db17b66eed5127905222a4a26a05fd (diff)
downloademacs-0ed0a9b7f09495394dc9b60a9f7c937679c49afe.tar.gz
emacs-0ed0a9b7f09495394dc9b60a9f7c937679c49afe.zip
Merge from gnulib
This mostly just changes "UTC" to "UTC0" for POSIX conformance. It also updates to the latest version of texinfo.tex. * build-aux/gitlog-to-changelog, build-aux/move-if-change: * build-aux/update-copyright, doc/misc/texinfo.tex: Update from gnulib.
-rwxr-xr-xbuild-aux/gitlog-to-changelog4
-rwxr-xr-xbuild-aux/move-if-change4
-rwxr-xr-xbuild-aux/update-copyright4
-rw-r--r--doc/misc/texinfo.tex62
4 files changed, 66 insertions, 8 deletions
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index e25d48ec3a2..a42650478a2 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
3 if 0; 3 if 0;
4# Convert git log output to ChangeLog format. 4# Convert git log output to ChangeLog format.
5 5
6my $VERSION = '2015-06-11 01:03'; # UTC 6my $VERSION = '2016-01-11 22:04'; # UTC
7# The definition above must lie within the first 8 lines in order 7# The definition above must lie within the first 8 lines in order
8# for the Emacs time-stamp write hook (at end) to update it. 8# for the Emacs time-stamp write hook (at end) to update it.
9# If you change this file with Emacs, please let the write hook 9# If you change this file with Emacs, please let the write hook
@@ -487,6 +487,6 @@ sub git_dir_option($)
487# eval: (add-hook 'write-file-hooks 'time-stamp) 487# eval: (add-hook 'write-file-hooks 'time-stamp)
488# time-stamp-start: "my $VERSION = '" 488# time-stamp-start: "my $VERSION = '"
489# time-stamp-format: "%:y-%02m-%02d %02H:%02M" 489# time-stamp-format: "%:y-%02m-%02d %02H:%02M"
490# time-stamp-time-zone: "UTC" 490# time-stamp-time-zone: "UTC0"
491# time-stamp-end: "'; # UTC" 491# time-stamp-end: "'; # UTC"
492# End: 492# End:
diff --git a/build-aux/move-if-change b/build-aux/move-if-change
index cd744a92f36..e3fe71d18f5 100755
--- a/build-aux/move-if-change
+++ b/build-aux/move-if-change
@@ -2,7 +2,7 @@
2# Like mv $1 $2, but if the files are the same, just delete $1. 2# Like mv $1 $2, but if the files are the same, just delete $1.
3# Status is zero if successful, nonzero otherwise. 3# Status is zero if successful, nonzero otherwise.
4 4
5VERSION='2012-01-06 07:23'; # UTC 5VERSION='2016-01-11 22:04'; # UTC
6# The definition above must lie within the first 8 lines in order 6# The definition above must lie within the first 8 lines in order
7# for the Emacs time-stamp write hook (at end) to update it. 7# for the Emacs time-stamp write hook (at end) to update it.
8# If you change this file with Emacs, please let the write hook 8# If you change this file with Emacs, please let the write hook
@@ -78,6 +78,6 @@ fi
78## eval: (add-hook 'write-file-hooks 'time-stamp) 78## eval: (add-hook 'write-file-hooks 'time-stamp)
79## time-stamp-start: "VERSION='" 79## time-stamp-start: "VERSION='"
80## time-stamp-format: "%:y-%02m-%02d %02H:%02M" 80## time-stamp-format: "%:y-%02m-%02d %02H:%02M"
81## time-stamp-time-zone: "UTC" 81## time-stamp-time-zone: "UTC0"
82## time-stamp-end: "'; # UTC" 82## time-stamp-end: "'; # UTC"
83## End: 83## End:
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index 40f7b9817bc..8c6ee1fdd3c 100755
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}'
3 if 0; 3 if 0;
4# Update an FSF copyright year list to include the current year. 4# Update an FSF copyright year list to include the current year.
5 5
6my $VERSION = '2015-01-15.20:53'; # UTC 6my $VERSION = '2016-01-11.22:04'; # UTC
7 7
8# Copyright (C) 2009-2016 Free Software Foundation, Inc. 8# Copyright (C) 2009-2016 Free Software Foundation, Inc.
9# 9#
@@ -269,6 +269,6 @@ else
269# eval: (add-hook 'write-file-hooks 'time-stamp) 269# eval: (add-hook 'write-file-hooks 'time-stamp)
270# time-stamp-start: "my $VERSION = '" 270# time-stamp-start: "my $VERSION = '"
271# time-stamp-format: "%:y-%02m-%02d.%02H:%02M" 271# time-stamp-format: "%:y-%02m-%02d.%02H:%02M"
272# time-stamp-time-zone: "UTC" 272# time-stamp-time-zone: "UTC0"
273# time-stamp-end: "'; # UTC" 273# time-stamp-end: "'; # UTC"
274# End: 274# End:
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index f140bba94b8..936c32dc5f4 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{2015-12-20.12} 6\def\texinfoversion{2016-01-11.19}
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 10% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
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
@@ -9428,6 +9428,45 @@ directory should work if nowhere else does.}
9428 \global\righthyphenmin = #3\relax 9428 \global\righthyphenmin = #3\relax
9429} 9429}
9430 9430
9431% Get input by bytes instead of by UTF-8 codepoints for XeTeX and LuaTeX,
9432% otherwise the encoding support is completely broken.
9433\ifx\XeTeXrevision\thisisundefined
9434\else
9435\XeTeXdefaultencoding "bytes" % For subsequent files to be read
9436\XeTeXinputencoding "bytes" % Effective in texinfo.tex only
9437% Unfortunately, there seems to be no corresponding XeTeX command for
9438% output encoding. This is a problem for auxiliary index and TOC files.
9439% The only solution would be perhaps to write out @U{...} sequences in
9440% place of UTF-8 characters.
9441\fi
9442
9443\ifx\luatexversion\thisisundefined
9444\else
9445\directlua{
9446local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub
9447local function convert_char (char)
9448 return utf8_char(byte(char))
9449end
9450
9451local function convert_line (line)
9452 return gsub(line, ".", convert_char)
9453end
9454
9455callback.register("process_input_buffer", convert_line)
9456
9457local function convert_line_out (line)
9458 local line_out = ""
9459 for c in string.utfvalues(line) do
9460 line_out = line_out .. string.char(c)
9461 end
9462 return line_out
9463end
9464
9465callback.register("process_output_buffer", convert_line_out)
9466}
9467\fi
9468
9469
9431% Helpers for encodings. 9470% Helpers for encodings.
9432% Set the catcode of characters 128 through 255 to the specified number. 9471% Set the catcode of characters 128 through 255 to the specified number.
9433% 9472%
@@ -9452,6 +9491,14 @@ directory should work if nowhere else does.}
9452% 9491%
9453\def\documentencoding{\parseargusing\filenamecatcodes\documentencodingzzz} 9492\def\documentencoding{\parseargusing\filenamecatcodes\documentencodingzzz}
9454\def\documentencodingzzz#1{% 9493\def\documentencodingzzz#1{%
9494 % Get input by bytes instead of by UTF-8 codepoints for XeTeX,
9495 % otherwise the encoding support is completely broken.
9496 % This settings is for the document root file.
9497 \ifx\XeTeXrevision\thisisundefined
9498 \else
9499 \XeTeXinputencoding "bytes"
9500 \fi
9501 %
9455 % Encoding being declared for the document. 9502 % Encoding being declared for the document.
9456 \def\declaredencoding{\csname #1.enc\endcsname}% 9503 \def\declaredencoding{\csname #1.enc\endcsname}%
9457 % 9504 %
@@ -11004,9 +11051,20 @@ directory should work if nowhere else does.}
11004{@catcode`@^=7 @catcode`@^^M=13% 11051{@catcode`@^=7 @catcode`@^^M=13%
11005@gdef@eatinput input texinfo#1^^M{@fixbackslash}} 11052@gdef@eatinput input texinfo#1^^M{@fixbackslash}}
11006 11053
11054% Emergency active definition of newline, in case an active newline token
11055% appears by mistake.
11056{@catcode`@^=7 @catcode13=13%
11057@gdef@enableemergencynewline{%
11058 @gdef^^M{%
11059 @par%
11060 %<warning: active newline>@par%
11061}}}
11062
11063
11007@gdef@fixbackslash{% 11064@gdef@fixbackslash{%
11008 @ifx\@eatinput @let\ = @ttbackslash @fi 11065 @ifx\@eatinput @let\ = @ttbackslash @fi
11009 @catcode13=5 % regular end of line 11066 @catcode13=5 % regular end of line
11067 @enableemergencynewline
11010 @let@c=@texinfoc 11068 @let@c=@texinfoc
11011 % Also turn back on active characters that might appear in the input 11069 % Also turn back on active characters that might appear in the input
11012 % file name, in case not using a pre-dumped format. 11070 % file name, in case not using a pre-dumped format.