[6235] sync

[karl]

Revision: 6235
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6235
Author:   karl
Date:     2015-05-02 23:04:53 +0000 (Sat, 02 May 2015)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/build-aux/texinfo.tex
    trunk/util/dir-example
    trunk/util/srclist-txi

Modified: trunk/build-aux/texinfo.tex
===================================================================
--- trunk/build-aux/texinfo.tex 2015-05-01 12:34:52 UTC (rev 6234)
+++ trunk/build-aux/texinfo.tex 2015-05-02 23:04:53 UTC (rev 6235)
@@ -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{2015-01-31.10}
+\def\texinfoversion{2015-04-29.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4489,7 +4489,6 @@
 % Called from \indexdummies and \atdummies.
 %
 \def\commondummies{%
-  %
   % \definedummyword defines \#1 as \string\#1\space, thus effectively
   % preventing its expansion.  This is used only for control words,
   % not control letters, because the \space would be incorrect for
@@ -4566,6 +4565,7 @@
   \definedummyword\guilsinglright
   \definedummyword\lbracechar
   \definedummyword\leq
+  \definedummyword\mathopsup
   \definedummyword\minus
   \definedummyword\ogonek
   \definedummyword\pounds
@@ -4579,6 +4579,8 @@
   \definedummyword\quotesinglbase
   \definedummyword\rbracechar
   \definedummyword\result
+  \definedummyword\sub
+  \definedummyword\sup
   \definedummyword\textdegree
   %
   % We want to disable all macros so that they are not expanded by \write.
@@ -4653,6 +4655,7 @@
   \definedummyword\samp
   \definedummyword\strong
   \definedummyword\tie
+  \definedummyword\U
   \definedummyword\uref
   \definedummyword\url
   \definedummyword\var
@@ -8335,14 +8338,7 @@
   \catcode`\\=\other
   %
   % Make the characters 128-255 be printing characters.
-  {%
-    \count1=128
-    \def\loop{%
-      \catcode\count1=\other
-      \advance\count1 by 1
-      \ifnum \count1<256 \loop \fi
-    }%
-  }%
+  {\setnonasciicharscatcodenonglobal\other}%
   %
   % @ is our escape character in .aux files, and we need braces.
   \catcode`\{=1
@@ -9831,15 +9827,62 @@
   \DeclareUnicodeCharacter{2261}{\equiv}
 }% end of \utfeightchardefs
 
-
 % US-ASCII character definitions.
 \def\asciichardefs{% nothing need be done
    \relax
 }
 
+% Latin1 (ISO-8859-1) character definitions.
+\def\nonasciistringdefs{%
+  \setnonasciicharscatcode\active
+  \def\defstringchar##1{\def##1{\string##1}}%
+  %
+  \defstringchar^^80\defstringchar^^81\defstringchar^^82\defstringchar^^83%
+  \defstringchar^^84\defstringchar^^85\defstringchar^^86\defstringchar^^87%
+  \defstringchar^^88\defstringchar^^89\defstringchar^^8a\defstringchar^^8b%
+  \defstringchar^^8c\defstringchar^^8d\defstringchar^^8e\defstringchar^^8f%
+  %
+  \defstringchar^^90\defstringchar^^91\defstringchar^^92\defstringchar^^93%
+  \defstringchar^^94\defstringchar^^95\defstringchar^^96\defstringchar^^97%
+  \defstringchar^^98\defstringchar^^99\defstringchar^^9a\defstringchar^^9b%
+  \defstringchar^^9c\defstringchar^^9d\defstringchar^^9e\defstringchar^^9f%
+  %
+  \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3%
+  \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7%
+  \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab%
+  \defstringchar^^ac\defstringchar^^ad\defstringchar^^ae\defstringchar^^af%
+  %
+  \defstringchar^^b0\defstringchar^^b1\defstringchar^^b2\defstringchar^^b3%
+  \defstringchar^^b4\defstringchar^^b5\defstringchar^^b6\defstringchar^^b7%
+  \defstringchar^^b8\defstringchar^^b9\defstringchar^^ba\defstringchar^^bb%
+  \defstringchar^^bc\defstringchar^^bd\defstringchar^^be\defstringchar^^bf%
+  %
+  \defstringchar^^c0\defstringchar^^c1\defstringchar^^c2\defstringchar^^c3%
+  \defstringchar^^c4\defstringchar^^c5\defstringchar^^c6\defstringchar^^c7%
+  \defstringchar^^c8\defstringchar^^c9\defstringchar^^ca\defstringchar^^cb%
+  \defstringchar^^cc\defstringchar^^cd\defstringchar^^ce\defstringchar^^cf%
+  %
+  \defstringchar^^d0\defstringchar^^d1\defstringchar^^d2\defstringchar^^d3%
+  \defstringchar^^d4\defstringchar^^d5\defstringchar^^d6\defstringchar^^d7%
+  \defstringchar^^d8\defstringchar^^d9\defstringchar^^da\defstringchar^^db%
+  \defstringchar^^dc\defstringchar^^dd\defstringchar^^de\defstringchar^^df%
+  %
+  \defstringchar^^e0\defstringchar^^e1\defstringchar^^e2\defstringchar^^e3%
+  \defstringchar^^e4\defstringchar^^e5\defstringchar^^e6\defstringchar^^e7%
+  \defstringchar^^e8\defstringchar^^e9\defstringchar^^ea\defstringchar^^eb%
+  \defstringchar^^ec\defstringchar^^ed\defstringchar^^ee\defstringchar^^ef%
+  %
+  \defstringchar^^f0\defstringchar^^f1\defstringchar^^f2\defstringchar^^f3%
+  \defstringchar^^f4\defstringchar^^f5\defstringchar^^f6\defstringchar^^f7%
+  \defstringchar^^f8\defstringchar^^f9\defstringchar^^fa\defstringchar^^fb%
+  \defstringchar^^fc\defstringchar^^fd\defstringchar^^fe\defstringchar^^ff%
+}
+
+
 % define all the unicode characters we know about, for the sake of @U.
 \utfeightchardefs
 
+
 % Make non-ASCII characters printable again for compatibility with
 % existing Texinfo documents that may use them, even without declaring a
 % document encoding.
@@ -10193,6 +10236,7 @@
 %
 address@hidden = @active
  @address@hidden
+   @nonasciistringdefs
    @address@hidden
    @let"address@hidden
    @address@hidden %$ font-lock fix

Modified: trunk/util/dir-example
===================================================================
--- trunk/util/dir-example      2015-05-01 12:34:52 UTC (rev 6234)
+++ trunk/util/dir-example      2015-05-02 23:04:53 UTC (rev 6235)
@@ -156,7 +156,7 @@
 
 Emacs editing modes
 * Ada mode: (ada-mode).         Emacs mode for editing and compiling Ada code.
-* CC Mode: (ccmode).            Emacs mode for editing C, C++, Objective-C,
+* CC Mode: (ccmode).            Emacs mode for editing C, C++, Objective-C, 
                                   Java, Pike, AWK, and CORBA IDL code.
 * IDLWAVE: (idlwave).           Major mode and shell for IDL files.
 * Octave mode: (octave-mode).   Emacs mode for editing GNU Octave files.
@@ -170,11 +170,10 @@
 * Emacs MIME: (emacs-mime).     Emacs MIME de/composition library.
 * SMTP: (smtpmail).             Emacs library for sending mail via SMTP.
 * URL: (url).                   URL loading package.
-* Widget: (widget).             The "widget" package used by the Emacs
-                                  Customization facility.
+* Widget: (widget).             The "widget" package used by Customization.
 
 Emacs misc features
-* Autotype: (autotype).         Convenient features for text that you enter
+* Autotype: (autotype).         Convenient features for text that you enter 
                                   frequently in Emacs.
 * Bovine: (bovine).             Semantic bovine parser development.
 * Calc: (calc).                 Advanced desk calculator and mathematical tool.
@@ -186,16 +185,16 @@
 * EWW: (eww).                   Emacs Web Wowser
 * EasyPG Assistant: (epa).      An Emacs user interface to GNU Privacy Guard.
 * Ebrowse: (ebrowse).           A C++ class browser for Emacs.
-* Ediff: (ediff).               A visual interface for comparing and merging
+* Ediff: (ediff).               A visual interface for comparing and merging 
                                   programs.
 * Eshell: (eshell).             A command shell implemented in Emacs Lisp.
 * Flymake: (flymake).           A universal on-the-fly syntax checker.
-* Forms: (forms).               Emacs package for editing data bases by
+* Forms: (forms).               Emacs package for editing data bases by 
                                   filling in forms.
 * Htmlfontify: (htmlfontify).   Convert source code to html.
 * Ido: (ido).                   Interactively do things with buffers and files.
 * PCL-CVS: (pcl-cvs).           Emacs front-end to CVS.
-* RefTeX: (reftex).             Emacs support for LaTeX cross-references and
+* RefTeX: (reftex).             Emacs support for LaTeX cross-references and 
                                   citations.
 * Remember: (remember).         Simple information manager for Emacs.
 * SES: (ses).                   Simple Emacs Spreadsheet.
@@ -203,7 +202,7 @@
 * Semantic: (semantic).         Source code parser library and utilities.
 * Speedbar: (speedbar).         File/Tag summarizing utility.
 * Todo Mode: (todo-mode).       Make and maintain todo lists.
-* VIP: (vip).                   An older VI-emulation for Emacs.
+* VIP: (vip).                   An obsolete VI-emulation for Emacs.
 * VIPER: (viper).               A VI-emulation mode for Emacs.
 * Wisent: (wisent).             Semantic Wisent parser development.
 * WoMan: (woman).               Browse UN*X Manual Pages "W.O. (without) Man".
@@ -215,16 +214,16 @@
 * Gnus: (gnus).                 The newsreader Gnus.
 * MH-E: (mh-e).                 Emacs interface to the MH mail system.
 * Mairix: (mairix-el).          Emacs interface to the Mairix mail indexer.
-* Message: (message).           Mail and news composition mode that goes with
+* Message: (message).           Mail and news composition mode that goes with 
                                   Gnus.
 * Newsticker: (newsticker).     A Newsticker for Emacs.
 * PGG: (pgg).                   Emacs interface to various PGP implementations.
 * Rcirc: (rcirc).               Internet Relay Chat (IRC) client.
 * SASL: (sasl).                 The Emacs SASL library.
-* SC: (sc).                     Supercite lets you cite parts of messages
-                                  you're replying to, in flexible ways.
+* SC: (sc).                     Supercite lets you cite parts of messages 
+                                  you’re replying to, in flexible ways.
 * Sieve: (sieve).               Managing Sieve scripts in Emacs.
-* TRAMP: (tramp).               Transparent Remote Access, Multiple Protocol
+* TRAMP: (tramp).               Transparent Remote Access, Multiple Protocol 
                                   Emacs remote file access via ssh and scp.
 
 GNU Gettext Utilities

Modified: trunk/util/srclist-txi
===================================================================
--- trunk/util/srclist-txi      2015-05-01 12:34:52 UTC (rev 6234)
+++ trunk/util/srclist-txi      2015-05-02 23:04:53 UTC (rev 6235)
@@ -3,7 +3,7 @@
 # Texinfo's wrapper for the Gnulib script config/srclist-update,
 # to define particular variables our srclist.txt uses.
 # 
-# Copyright 2013, 2014 Free Software Foundation, Inc.
+# Copyright 2013, 2014, 2015 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -16,8 +16,8 @@
 # per-user overrides.
 case $LOGNAME in
 karl)
-  : ${EMACSSRC=/usr/local/gnu/src/emacs-24.4};      export EMACSSRC
-  : ${GETTEXT=/usr/local/gnu/src/gettext-0.19.4};   export GETTEXT
+  : ${EMACSSRC=/usr/local/gnu/src/dist-emacs};      export EMACSSRC
+  : ${GETTEXT=/usr/local/gnu/src/dist-gettext};     export GETTEXT
   : ${AUTOMAKE=/usr/local/gnu/share/automake-1.15}; export AUTOMAKE
   : ${GSASL=$HOME/gnu/src/gsasl};                   export GSASL
   : ${GNULIB=$HOME/gnu/src/gnulib};                 export GNULIB