Merge from origin/emacs-25

ad250f2 Sync with gnulib
c0165ea Resurrect GNUS-NEWS autogeneration

# Conflicts:
#	etc/GNUS-NEWS
#	lisp/Makefile.in

6 files changed, 378 insertions, 95 deletions

diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index a2513d0efc7..83bafdffa6f 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" "$@"'
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2016-01-12 23:09'; # UTC
+my $VERSION = '2016-03-22 21:49'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -298,9 +298,7 @@ sub git_dir_option($)
             {
               if ($sha =~ /^$_/)
                 {
-                  $skipflag = 1;
-                  ## Perhaps only warn if a pattern matches more than once?
-                  warn "$ME: warning: skipping $sha due to $_\n";
+                  $skipflag = $_;
                   last;
                 }
             }
@@ -386,8 +384,17 @@ sub git_dir_option($)
       }
 
       # Ignore commits that match the --ignore-matching pattern, if specified.
-      if (! ($skipflag || (defined $ignore_matching
-             && @line && $line[0] =~ /$ignore_matching/)))
+      if (defined $ignore_matching && @line && $line[0] =~ /$ignore_matching/)
+        {
+          $skipflag = 1;
+        }
+      elsif ($skipflag)
+        {
+          ## Perhaps only warn if a pattern matches more than once?
+          warn "$ME: warning: skipping $sha due to $skipflag\n";
+        }
+
+      if (! $skipflag)
         {
           if (defined $ignore_line && @line)
             {
diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi
index 3b2c4afe55b..661e705b157 100644
--- a/doc/misc/gnus-coding.texi
+++ b/doc/misc/gnus-coding.texi
@@ -364,11 +364,11 @@ such multiple commits, like whitespace differences, and unify those ;-).
 
 @heading @file{GNUS-NEWS}
 
-Starting from No Gnus, the @file{GNUS-NEWS} is created from
-@file{texi/gnus-news.texi}.  Don't edit @file{GNUS-NEWS}.  Edit
-@file{texi/gnus-news.texi}, type @command{make GNUS-NEWS} in the
-@file{texi} directory and commit @file{GNUS-NEWS} and
-@file{texi/gnus-news.texi}.
+The @file{etc/GNUS-NEWS} is created from
+@file{doc/misc/gnus-news.texi}.  Don't edit @file{etc/GNUS-NEWS}.
+Edit @file{doc/misc/gnus-news.texi}, type @command{make
+update-gnus-news} in the @file{lisp} directory and commit
+@file{etc/GNUS-NEWS} and @file{doc/misc/gnus-news.texi}.
 
 @heading Conventions for version information in defcustoms
 
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index d04e2ddd3b3..9437a4d3e31 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{2016-03-06.18}
+\def\texinfoversion{2016-03-22.15}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1513,10 +1513,27 @@ output) for that.)}
 \fi  % \ifx\pdfoutput
 
 %
-% PDF outline support for XeTeX
+% For XeTeX
 %
+\newif\iftxiuseunicodedestname
 \ifx\XeTeXrevision\thisisundefined
 \else
+  %
+  % XeTeX version check
+  %
+  \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99995}>-1
+    % XeTeX 0.99995+ contains xdvipdfmx 20160307+.
+    % It can handle Unicode destination name for PDF.
+    \txiuseunicodedestnametrue
+  \else
+    % XeTeX < 0.99995 can not handle Unicode destination name for PDF
+    % because xdvipdfmx 20150315 has UTF-16 convert issue.
+    % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
+    \txiuseunicodedestnamefalse
+  \fi
+  %
+  % PDF outline support
+  %
   \pdfmakepagedesttrue \relax
   % Emulate the primitive of pdfTeX
   \def\pdfdest name#1 xyz{%
@@ -1525,15 +1542,25 @@ output) for that.)}
   \def\pdfmkdest#1{{%
     % We have to set dummies so commands such as @code, and characters
     % such as \, aren't expanded when present in a section title.
-    \indexnofonts  % For avoiding UTF-16 convert issue of xdvipdfmx 20150315.
+    \indexnofonts
+    \iftxiuseunicodedestname
+      \def\pdfdestname{#1}% Pass through Unicode characters.
+    \else
+      \edef\pdfdestname{#1}% Replace Unicode characters to ASCII.
+    \fi
+    \turnoffactive
     \makevalueexpandable
     % In the case of XeTeX, xdvipdfmx converts strings to UTF-16.
     % Therefore \txiescapepdf is not necessary.
-    \safewhatsit{\pdfdest name{#1} xyz}%
+    \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
   }}
   %
   \def\dopdfoutline#1#2#3#4{%
-    \edef\pdfoutlinedest{#3}%
+    \iftxiuseunicodedestname
+      \def\pdfoutlinedest{#3}% Pass through Unicode characters.
+    \else
+      \edef\pdfoutlinedest{#3}% Replace Unicode characters to ASCII.
+    \fi
     \ifx\pdfoutlinedest\empty
       \def\pdfoutlinedest{#4}%
     \fi
@@ -1574,7 +1601,7 @@ output) for that.)}
       % In the case of XeTeX, xdvipdfmx converts strings to UTF-16.
       % Therefore, the encoding and the language may not be considered.
       %
-      \indexnofonts % For avoiding UTF-16 convert issue of xdvipdfmx 20150315.
+      \indexnofonts
       \setupdatafile
       % We can have normal brace characters in the PDF outlines, unlike
       % Texinfo index files.  So set that up.
@@ -1596,14 +1623,31 @@ output) for that.)}
   % However, due to UTF-16 convert issue of xdvipdfmx 20150315,
   % ``\special{pdf:dest ...}'' can not handle non-ASCII strings.
   % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
-\fi
-
 %
-% @image support for XeTeX
+  % make a live url in pdf output.
+  \def\pdfurl#1{%
+    \begingroup
+      % it seems we really need yet another set of dummies; have not
+      % tried to figure out what each command should do in the context
+      % of @url.  for now, just make @/ a no-op, that's the only one
+      % people have actually reported a problem with.
+      %
+      \normalturnoffactive
+      \def\@{@}%
+      \let\/=\empty
+      \makevalueexpandable
+      % do we want to go so far as to use \indexnofonts instead of just
+      % special-casing \var here?
+      \def\var##1{##1}%
+      %
+      \leavevmode\setcolor{\urlcolor}%
+      \special{pdf:bann << /Border [0 0 0]
+        /Subtype /Link /A << /S /URI /URI (#1) >> >>}%
+    \endgroup}
+  \def\endlink{\setcolor{\maincolor}\special{pdf:eann}}
 %
-\newif\ifxeteximgpdf
-\ifx\XeTeXrevision\thisisundefined
-\else
+  %
+  % @image support
   %
   % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
   \def\doxeteximage#1#2#3{%
@@ -1615,7 +1659,6 @@ output) for that.)}
     % someone has a scalable image, presumably better to use that than a
     % bitmap.
     \let\xeteximgext=\empty
-    \xeteximgpdffalse
     \begingroup
       \openin 1 #1.pdf \ifeof 1
         \openin 1 #1.PDF \ifeof 1
@@ -1632,17 +1675,23 @@ output) for that.)}
             \fi
           \else \gdef\xeteximgext{png}%
           \fi
-        \else \gdef\xeteximgext{PDF} \global\xeteximgpdftrue%
+        \else \gdef\xeteximgext{PDF}%
         \fi
-      \else \gdef\xeteximgext{pdf} \global\xeteximgpdftrue%
+      \else \gdef\xeteximgext{pdf}%
       \fi
       \closein 1
     \endgroup
     %
-    \ifxeteximgpdf
+    \def\xetexpdfext{pdf}%
+    \ifx\xeteximgext\xetexpdfext
       \XeTeXpdffile "#1".\xeteximgext ""
     \else
-      \XeTeXpicfile "#1".\xeteximgext ""
+      \def\xetexpdfext{PDF}%
+      \ifx\xeteximgext\xetexpdfext
+        \XeTeXpdffile "#1".\xeteximgext ""
+      \else
+        \XeTeXpicfile "#1".\xeteximgext ""
+      \fi
     \fi
     \ifdim \wd0 >0pt width \xeteximagewidth \fi
     \ifdim \wd2 >0pt height \xeteximageheight \fi \relax
@@ -7804,7 +7853,7 @@ end
   % Process the macro body under the current catcode regime.
   \scantokens{#1\texinfoc}\aftermacro%
   %
-  % The \c is to remove the \newlinechar added by \scantokens, and
+  % The \texinfoc is to remove the \newlinechar added by \scantokens, and
   % can be noticed by \parsearg.
   %   The \aftermacro allows a \comment at the end of the macro definition
   % to duplicate itself past the final \newlinechar added by \scantokens:
@@ -7817,15 +7866,7 @@ end
 
 % Used for copying and captions
 \def\scanexp#1{%
-  \bgroup
-  % Undo catcode changes of \startcontents and \printindex
-  % When called from @insertcopying or (short)caption, we need active
-  % backslash to get it printed correctly.
-  % FIXME: This may not be needed.
-  %\catcode`\@=0 \catcode`\\=\active \escapechar=`\@
-  \edef\temp{\noexpand\scanmacro{#1}}%
-  \temp
-  \egroup
+  \expandafter\scanmacro\expandafter{#1}%
 }
 
 \newcount\paramno   % Count of parameters
@@ -9371,7 +9412,7 @@ end
     %
     \ifx\thiscaption\empty \else
       \ifx\floatident\empty \else
-        \appendtomacro\captionline{: }% had ident, so need a colon between
+        \appendtomacro\captionline{: }% had ident, so need a colon between
       \fi
       %
       % caption text.
@@ -9398,30 +9439,17 @@ end
         \requireauxfile
         \atdummies
         %
-        % since we read the caption text in the macro world, where ^^M
-        % is turned into a normal character, we have to scan it back, so
-        % we don't write the literal three characters "^^M" into the aux file.
-        \scanexp{%
-          \xdef\noexpand\gtemp{%
-            \ifx\thisshortcaption\empty
-              \thiscaption
-            \else
-              \thisshortcaption
-            \fi
-          }%
-        }%
+        \ifx\thisshortcaption\empty
+          \def\gtemp{\thiscaption}%
+        \else
+          \def\gtemp{\thisshortcaption}%
+        \fi
         \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
-          \ifx\gtemp\empty \else : \gtemp \fi}}%
+          \ifx\gtemp\empty \else : \gtemp \fi}}%
       }%
     \fi
   \egroup  % end of \vtop
   %
-  % place the captured inserts
-  %
-  % BEWARE: when the floats start floating, we have to issue warning
-  % whenever an insert appears inside a float which could possibly
-  % float. --kasal, 26may04
-  %
   \checkinserts
 }
 
@@ -10865,6 +10893,10 @@ directory should work if nowhere else does.}
   \unicodechardefs
 }
 
+% Whether the active definitions of non-ASCII characters expand to
+% non-active tokens with the same character code.  This is used to
+% write characters literally, instead of using active definitions for
+% printing the correct glyphs.
 \newif\ifpassthroughchars
 \passthroughcharsfalse
 
@@ -10917,13 +10949,6 @@ directory should work if nowhere else does.}
    \relax
 }
 
-% Whether the active definitions of non-ASCII characters expand to
-% non-active tokens with the same character code.  This is used to
-% write characters literally, instead of using active definitions for
-% printing the correct glyphs.
-\newif\ifpassthroughchars
-\passthroughcharsfalse
-
 % define all the unicode characters we know about, for the sake of @U.
 \iftxinativeunicodecapable
   \nativeunicodechardefsatu
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index c1a5bd757c6..06badc18375 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -7,42 +7,286 @@ Please send Gnus bug reports to bugs@gnus.org.
 For older news, see Gnus info node "New Features".
 
 
-* New features
+* Supported Emacs versions The following Emacs versions are supported by No
+Gnus:
 
-** message-alternative-emails can take a function as a value.
+** Emacs 22 and up
+** XEmacs 21.4
+** XEmacs 21.5
+** SXEmacs
 
-** nnimap can request and use the Gmail "X-GM-LABELS".
+
+* Installation changes
+
+** Upgrading from previous (stable) version if you have used No Gnus.
+
+If you have tried No Gnus (the unstable Gnus branch leading to this
+release) but went back to a stable version, be careful when upgrading to
+this version.  In particular, you will probably want to remove the
+'~/News/marks' directory (perhaps selectively), so that flags are read
+from your '~/.newsrc.eld' instead of from the stale marks file, where
+this release will store flags for nntp.  See a later entry for more
+information about nntp marks.  Note that downgrading isn't safe in
+general.
+
+** Incompatibility when switching from Emacs 23 to Emacs 22 In Emacs 23,
+Gnus uses Emacs's new internal coding system 'utf-8-emacs' for saving
+articles drafts and '~/.newsrc.eld'.  These files may not be read
+correctly in Emacs 22 and below.  If you want to use Gnus across
+different Emacs versions, you may set 'mm-auto-save-coding-system' to
+'emacs-mule'.
+
+** Lisp files are now installed in '.../site-lisp/gnus/' by default.  It
+defaulted to '.../site-lisp/' formerly.  In addition to this, the new
+installer issues a warning if other Gnus installations which will shadow
+the latest one are detected.  You can then remove those shadows manually
+or remove them using 'make remove-installed-shadows'.
+
+** The installation directory name is allowed to have spaces and/or tabs.
+
+
+* New packages and libraries within Gnus
+
+** New version of 'nnimap'
+
+'nnimap' has been reimplemented in a mostly-compatible way.  See the Gnus
+manual for a description of the new interface.  In particular,
+'nnimap-inbox' and the client side split method has changed.
 
-** New package `gnus-notifications.el' can send notifications when you
-   receive new messages.
+** Gnus includes the Emacs Lisp SASL library.
 
-** If you have the "tnef" program installed, Gnus will display ms-tnef
-   files, aka "winmail.dat".
+This provides a clean API to SASL mechanisms from within Emacs.  The user
+visible aspects of this, compared to the earlier situation, include
+support for DIGEST-MD5 and NTLM.  *Note Emacs SASL: (sasl)Top.
 
-** Archives (like tar and zip files) will be automatically unpacked,
-   and the files inside the packages will be displayed as MIME parts.
+** ManageSieve connections uses the SASL library by default.
 
-** shr has a new command `z' that cycles through image sizes.
+The primary change this brings is support for DIGEST-MD5 and NTLM, when
+the server supports it.
+
+** Gnus includes a password cache mechanism in password.el.
+
+It is enabled by default (see 'password-cache'), with a short timeout of
+16 seconds (see 'password-cache-expiry').  If PGG is used as the PGP back
+end, the PGP passphrase is managed by this mechanism.  Passwords for
+ManageSieve connections are managed by this mechanism, after querying the
+user about whether to do so.
+
+** Using EasyPG with Gnus When EasyPG, is available, Gnus will use it
+instead of PGG.  EasyPG is an Emacs user interface to GNU Privacy Guard.
+ *Note EasyPG Assistant user's manual: (epa)Top.  EasyPG is included in
+Emacs 23 and available separately as well.
+
+
+* Changes in group mode
+
+** Symbols like 'gcc-self' now have the same precedence rules in
+'gnus-parameters' as other "real" variables: The last match wins instead
+of the first match.
+
+** Old intermediate incoming mail files ('Incoming*') are deleted after a
+couple of days, not immediately.  *Note Mail Source Customization::.
+(New in Gnus 5.10.10 / No Gnus 0.8)
+
+
+* Changes in summary and article mode
 
-** `backtab' in the summary buffer now selects the previous link in
-   the article buffer.
+** There's now only one variable that determines how HTML is rendered:
+'mm-text-html-renderer'.
 
-** Using the "X-Message-SMTP-Method" header in Message buffers now
-   allows specifying how messages are to be sent.  For example:
+** Gnus now supports sticky article buffers.  Those are article buffers that
+are not reused when you select another article.  *Note Sticky Articles::.
 
-   X-Message-SMTP-Method: smtp smtp.fsf.org 587
+** Gnus can selectively display 'text/html' articles with a WWW browser with
+'K H'.  *Note MIME Commands::.
 
-** Gnus keeps track of non-existent articles for nnimap groups, so
-   that sparse IMAP folders now list a correct number of messages in
-   them.
+** International host names (IDNA) can now be decoded inside article bodies
+using 'W i' ('gnus-summary-idna-message').  This requires that GNU Libidn
+(<http://www.gnu.org/software/libidn/>) has been installed.
 
-** Gnus will guess the real type of MIME parts of type
-   application/octet-stream based on the file suffix.  So an
-   application/octet-stream with a name of "rms.jpg" will be displayed
-   as an image/jpeg type by default, for instance.
+** The non-ASCII group names handling has been much improved.  The back ends
+that fully support non-ASCII group names are now 'nntp', 'nnml', and
+'nnrss'.  Also the agent, the cache, and the marks features work with
+those back ends.  *Note Non-ASCII Group Names::.
+
+** Gnus now displays DNS master files sent as text/dns using dns-mode.
+
+** Gnus supports new limiting commands in the Summary buffer: '/ r'
+('gnus-summary-limit-to-replied') and '/ R'
+('gnus-summary-limit-to-recipient').  *Note Limiting::.
+
+** You can now fetch all ticked articles from the server using 'Y t'
+('gnus-summary-insert-ticked-articles').  *Note Summary Generation
+Commands::.
+
+** Gnus supports a new sort command in the Summary buffer: 'C-c C-s C-t'
+('gnus-summary-sort-by-recipient').  *Note Summary Sorting::.
+
+** S/MIME now features LDAP user certificate searches.  You need to
+configure the server in 'smime-ldap-host-list'.
+
+** URLs inside OpenPGP headers are retrieved and imported to your PGP key
+ring when you click on them.
+
+** Picons can be displayed right from the textual address, see
+'gnus-picon-style'.  *Note Picons::.
+
+** ANSI SGR control sequences can be transformed using 'W A'.
+
+ANSI sequences are used in some Chinese hierarchies for highlighting
+articles ('gnus-article-treat-ansi-sequences').
+
+** Gnus now MIME decodes articles even when they lack "MIME-Version" header.
+This changes the default of 'gnus-article-loose-mime'.
+
+** 'gnus-decay-scores' can be a regexp matching score files.  For example,
+set it to '\\.ADAPT\\'' and only adaptive score files will be decayed.
+ *Note Score Decays::.
+
+** Strings prefixing to the 'To' and 'Newsgroup' headers in summary lines
+when using 'gnus-ignored-from-addresses' can be customized with
+'gnus-summary-to-prefix' and 'gnus-summary-newsgroup-prefix'.  *Note To
+From Newsgroups::.
+
+** You can replace MIME parts with external bodies.  See
+'gnus-mime-replace-part' and 'gnus-article-replace-part'.  *Note MIME
+Commands::, *note Using MIME::.
+
+** The option 'mm-fill-flowed' can be used to disable treatment of
+format=flowed messages.  Also, flowed text is disabled when sending
+inline PGP signed messages.  *Note Flowed text: (emacs-mime)Flowed text.
+(New in Gnus 5.10.7)
+
+** Now the new command 'S W' ('gnus-article-wide-reply-with-original') for a
+wide reply in the article buffer yanks a text that is in the active
+region, if it is set, as well as the 'R'
+('gnus-article-reply-with-original') command.  Note that the 'R' command
+in the article buffer no longer accepts a prefix argument, which was used
+to make it do a wide reply.  *Note Article Keymap::.
+
+** The new command 'C-h b' ('gnus-article-describe-bindings') used in the
+article buffer now shows not only the article commands but also the real
+summary commands that are accessible from the article buffer.
+
+
+* Changes in Message mode
 
-** `nnimap-inbox' can now be a list of mail box names.
-   
+** Gnus now defaults to saving all outgoing messages in per-month nnfolder
+archives.
+
+** Gnus now supports the "hashcash" client puzzle anti-spam mechanism.  Use
+'(setq message-generate-hashcash t)' to enable.  *Note Hashcash::.
+
+** You can now drag and drop attachments to the Message buffer.  See
+'mml-dnd-protocol-alist' and 'mml-dnd-attach-options'.  *Note MIME:
+(message)MIME.
+
+** The option 'message-yank-empty-prefix' now controls how empty lines are
+prefixed in cited text.  *Note Insertion Variables: (message)Insertion
+Variables.
+
+** Gnus uses narrowing to hide headers in Message buffers.  The 'References'
+header is hidden by default.  To make all headers visible, use '(setq
+message-hidden-headers nil)'.  *Note Message Headers: (message)Message
+Headers.
+
+** You can highlight different levels of citations like in the article
+buffer.  See 'gnus-message-highlight-citation'.
+
+** 'auto-fill-mode' is enabled by default in Message mode.  See
+'message-fill-column'.  *Note Message Headers: (message)Various Message
+Variables.
+
+** You can now store signature files in a special directory named
+'message-signature-directory'.
+
+** The option 'message-citation-line-format' controls the format of the
+"Whomever writes:" line.  You need to set
+'message-citation-line-function' to
+'message-insert-formatted-citation-line' as well.
+
+
+* Changes in Browse Server mode
+
+** Gnus' sophisticated subscription methods are now available in Browse
+Server buffers as well using the variable
+'gnus-browse-subscribe-newsgroup-method'.
+
+
+* Changes in back ends
+
+** The nntp back end stores article marks in '~/News/marks'.
+
+The directory can be changed using the (customizable) variable
+'nntp-marks-directory', and marks can be disabled using the (back end)
+variable 'nntp-marks-is-evil'.  The advantage of this is that you can
+copy '~/News/marks' (using rsync, scp or whatever) to another Gnus
+installation, and it will realize what articles you have read and marked.
+The data in '~/News/marks' has priority over the same data in
+'~/.newsrc.eld'.
+
+** You can import and export your RSS subscriptions from OPML files.  *Note
+RSS::.
+
+** IMAP identity (RFC 2971) is supported.
+
+By default, Gnus does not send any information about itself, but you can
+customize it using the variable 'nnimap-id'.
+
+** The 'nnrss' back end now supports multilingual text.  Non-ASCII group
+names for the 'nnrss' groups are also supported.  *Note RSS::.
+
+** Retrieving mail with POP3 is supported over SSL/TLS and with StartTLS.
+
+** The nnml back end allows other compression programs beside 'gzip' for
+compressed message files.  *Note Mail Spool::.
+
+** The nnml back end supports group compaction.
+
+This feature, accessible via the functions 'gnus-group-compact-group' ('G
+z' in the group buffer) and 'gnus-server-compact-server' ('z' in the
+server buffer) renumbers all articles in a group, starting from 1 and
+removing gaps.  As a consequence, you get a correct total article count
+(until messages are deleted again).
+
+
+* Appearance
+
+** The tool bar has been updated to use GNOME icons.  You can also customize
+the tool bars: 'M-x customize-apropos RET -tool-bar$' should get you
+started.  (Only for Emacs, not in XEmacs.)
+
+** The tool bar icons are now (de)activated correctly in the group buffer,
+see the variable 'gnus-group-update-tool-bar'.  Its default value depends
+on your Emacs version.
+
+** You can change the location of XEmacs's toolbars in Gnus buffers.  See
+'gnus-use-toolbar' and 'message-use-toolbar'.
+
+
+* Miscellaneous changes
+
+** Having edited the select-method for the foreign server in the server
+buffer is immediately reflected to the subscription of the groups which
+use the server in question.  For instance, if you change
+'nntp-via-address' into 'bar.example.com' from 'foo.example.com', Gnus
+will connect to the news host by way of the intermediate host
+'bar.example.com' from next time.
+
+** The 'all.SCORE' file can be edited from the group buffer using 'W e'.
+
+** You can set 'gnus-mark-copied-or-moved-articles-as-expirable' to a
+non-'nil' value so that articles that have been read may be marked as
+expirable automatically when copying or moving them to a group that has
+auto-expire turned on.  The default is 'nil' and copying and moving of
+articles behave as before; i.e., the expirable marks will be unchanged
+except that the marks will be removed when copying or moving articles to
+a group that has not turned auto-expire on.  *Note Expiring Mail::.
+
+** NoCeM support has been removed.
+
+** Carpal mode has been removed.
+
 * For older news, see Gnus info node "New Features".
 
 ----------------------------------------------------------------------
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index a557e04ab5d..9a2622f9789 100644
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -81,8 +81,9 @@
    of 'struct timeval', and no definition of this type.
    Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
    in <sys/time.h>.
-   But avoid namespace pollution on glibc systems.  */
-# ifndef __GLIBC__
+   But avoid namespace pollution on glibc systems and "unknown type
+   name" problems on Cygwin.  */
+# if !(defined __GLIBC__ || defined __CYGWIN__)
 #  include <sys/time.h>
 # endif
 
@@ -100,10 +101,11 @@
 #endif
 
 /* Get definition of 'sigset_t'.
-   But avoid namespace pollution on glibc systems.
+   But avoid namespace pollution on glibc systems and "unknown type
+   name" problems on Cygwin.
    Do this after the include_next (for the sake of OpenBSD 5.0) but before
    the split double-inclusion guard (for the sake of Solaris).  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__)
 # include <signal.h>
 #endif
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 83714d0f5a7..12bb9c7a3ce 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -201,7 +201,7 @@ update-subdirs:
            $(srcdir)/../build-aux/update-subdirs $$file; \
         done;
 
-.PHONY: updates repo-update update-authors
+.PHONY: updates repo-update update-authors update-gnus-news
 
 # Some modes of make-dist use this.
 updates: update-subdirs autoloads finder-data custom-deps
@@ -214,12 +214,17 @@ updates: update-subdirs autoloads finder-data custom-deps
 # this directory's autoloads rule.
 repo-update: compile finder-data custom-deps
 
-# Update the AUTHORS file.
+# Update etc/AUTHORS and etc/GNUS-NEWS.
 
 update-authors:
         $(emacs) -L "$(top_srcdir)/admin" -l authors \
           -f batch-update-authors "$(top_srcdir)/etc/AUTHORS" "$(top_srcdir)"
 
+update-gnus-news:
+        $(emacs) -L "$(top_srcdir)/doc/misc" -l gnus-news -f batch-gnus-news \
+          "$(top_srcdir)/doc/misc/gnus-news.texi" \
+          "$(top_srcdir)/etc/GNUS-NEWS"
+
 FORCE:
 .PHONY: FORCE