Merge branch 'trunk' into xwidget

Conflicts:
	src/xdisp.c

15 files changed, 178 insertions, 80 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d0f229a9c9e..2fe1914f926 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,62 @@
+2013-07-08  Tassilo Horn  <tsdh@gnu.org>
+
+        * gnus.texi (lines): Correct description of
+        `gnus-registry-track-extra's default value.  Mention
+        `gnus-registry-remove-extra-data'.
+
+2013-07-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Group Parameters): Mention regexp
+        substitutions (bug#11688).
+
+2013-07-06  Nathan Trapuzzano  <nbtrap@nbtrap.com>  (tiny change)
+
+        * gnus.texi (Generic Marking Commands): Fix grammar (bug#13368).
+
+2013-07-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Emacsen): Fix version.
+
+        * gnus-faq.texi (FAQ 1-6): Mention the correct Emacs version.
+
+2013-07-06  Glenn Morris  <rgm@gnu.org>
+
+        * mh-e.texi: Fix external links.
+        (Using This Manual): Printed elisp manuals no longer available.
+
+        * newsticker.texi (Overview): Update URL.
+
+        * nxml-mode.texi (Introduction): Update URL.
+
+        * org.texi (JavaScript support): Fix URL.
+
+        * wisent.texi (Wisent Overview): Remove incorrect, unnecessary uref.
+
+        * eudc.texi (CCSO PH/QI): Remove defunct URL.
+
+        * dbus.texi (Introspection): Update URL to a less defunct one.
+
+        * gnus.texi (Top): Restrict "Other related manuals" to info output.
+        (Foreign Groups): Use @indicateurl for examples.
+        (Direct Functions): Remove defunct URL.
+        (RSS): Update URL.
+
+        * gnus-faq.texi (FAQ 5-8, FAQ 6-3): Remove defunct URLs.
+        (FAQ 7-1): Update URL.
+
+        * pgg.texi (Top, Overview): Add note about obsolescence.
+
+2013-07-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * texinfo.tex: Merge from gnulib.
+
+2013-07-03  Glenn Morris  <rgm@gnu.org>
+
+        * bovine.texi (top):
+        * cc-mode.texi (AWK Mode Font Locking):
+        * mh-e.texi (Preface):
+        * url.texi (URI Parsing): Fix cross-references to other manuals.
+
 2013-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Client-Side IMAP Splitting):
diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi
index 978345e5cc8..81ec2eb80ec 100644
--- a/doc/misc/bovine.texi
+++ b/doc/misc/bovine.texi
@@ -76,7 +76,7 @@ The @dfn{bovine} parser is the original @semantic{} parser, and is an
 implementation of an @acronym{LL} parser.  It is good for simple
 languages.  It has many conveniences making grammar writing easy.  The
 conveniences make it less powerful than a Bison-like @acronym{LALR}
-parser.  For more information, @inforef{top, the Wisent Parser Manual,
+parser.  For more information, @inforef{Top, The Wisent Parser Manual,
 wisent}.
 
 Bovine @acronym{LL} grammars are stored in files with a @file{.by}
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 4fa4e12cf88..4cc5d9c5767 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -2111,7 +2111,7 @@ contributing it: send a note to @email{bug-cc-mode@@gnu.org}.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 The general appearance of font-locking in AWK mode is much like in any
-other programming mode.  @xref{Faces For Font Lock,,,elisp, GNU Emacs
+other programming mode.  @xref{Faces for Font Lock,,,elisp, GNU Emacs
 Lisp Reference Manual}.
 
 The following faces are, however, used in a non-standard fashion in
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index c40a5e313f5..52c3c883cc8 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -403,8 +403,11 @@ Every dictionary entry has a string as key, and a variant as value.
 The interface offers also a signal, which returns 2 parameters: an
 integer, and an array consisting of elements which are a struct of a
 string and 2 boolean values.@footnote{ The interfaces of the service
-@samp{org.freedesktop.Hal} are described at
-@uref{http://people.freedesktop.org/~david/hal-spec/hal-spec.html#interfaces}.}
+@samp{org.freedesktop.Hal} are described in
+@c Previous link is gone.  Since HAL is now obsolete, this URL
+@c (unchanged in ~ 4 years) feels like it might go too...
+@uref{http://people.freedesktop.org/~dkukawka/hal-spec-git/hal-spec.html#interfaces,
+the HAL specification}.}
 @end defun
 
 @defun dbus-introspect-xml bus service path
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index 5b06cc7f11a..747494ffbde 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -150,14 +150,17 @@ phone number, email, academic information or any other details it was
 configured to.  Nowadays this system is not widely used.
 
 The system consists of two parts: a database server traditionally called
-@samp{qi} and a command-line client called @samp{ph}.  As of 2010, the
-code can still be downloaded from @url{http://www-dev.cites.uiuc.edu/ph/}.
-
-The original command-line @samp{ph} client that comes with the
-@samp{ph/qi} distribution provides additional features like the
-possibility to communicate with the server in login-mode which makes it
-possible to change records in the database.  This is not implemented in
-EUDC.
+@samp{qi} and a command-line client called @samp{ph}.
+@ignore
+Until 2010, the code could be downloaded from
+@url{http://www-dev.cites.uiuc.edu/ph/}.
+@end ignore
+
+The original command-line @samp{ph} client that came with the
+@samp{ph/qi} distribution provided additional features that are
+not implemented in EUDC, like the possibility to communicate with the
+server in login-mode, which made it possible to change records in the
+database.
 
 
 @node BBDB
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index cb900626670..1a0469c14f4 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -222,10 +222,9 @@ Which version of Emacs do I need?
 
 @subsubheading Answer
 
-Gnus 5.10 requires an Emacs version that is greater than or equal
-to Emacs 20.7 or XEmacs 21.1.
-The development versions of Gnus (aka No Gnus) requires Emacs 21
-or XEmacs 21.4.
+Gnus 5.13 requires an Emacs version that is greater than or equal
+to Emacs 23.1 or XEmacs 21.1, although there are some features that
+only work on Emacs 24.
 
 @node FAQ 1-7
 @subsubheading Question 1.7
@@ -1518,8 +1517,9 @@ cat file.face | sed 's/\\/\\\\/g;s/\"/\\\"/g;' > file.face.quoted
 
 If you can't use compface, there's an online X-face converter at
 @uref{http://www.dairiki.org/xface/}.
-If you use MS Windows, you could also use the WinFace program from
-@uref{http://www.xs4all.nl/~walterln/winface/}.
+If you use MS Windows, you could also use the WinFace program,
+which used to be available from
+@indicateurl{http://www.xs4all.nl/~walterln/winface/}.
 Now you only have to tell Gnus to include the X-face in your postings by saying
 
 @example
@@ -1812,15 +1812,20 @@ too.
 Of course you can also use grep to search through your
 local mail, but this is both slow for big archives and
 inconvenient since you are not displaying the found mail
-in Gnus. Here comes nnir into action. Nnir is a front end
+in Gnus.  Here nnir comes into action.  Nnir is a front end
 to search engines like swish-e or swish++ and
-others. You index your mail with one of those search
+others.  You index your mail with one of those search
 engines and with the help of nnir you can search through
 the indexed mail and generate a temporary group with all
-messages which met your search criteria. If this sound
-cool to you get nnir.el from
+messages which met your search criteria.  If this sounds
+cool to you, get nnir.el from
+@c FIXME Isn't this file in Gnus?
+@ignore
+@c Dead link 2013/7.
 @uref{ftp://ls6-ftp.cs.uni-dortmund.de/pub/src/emacs/}
-or @uref{ftp://ftp.is.informatik.uni-duisburg.de/pub/src/emacs/}.
+or
+@end ignore
+@uref{ftp://ftp.is.informatik.uni-duisburg.de/pub/src/emacs/}.
 Instructions on how to use it are at the top of the file.
 
 @node FAQ 6-4
@@ -1943,7 +1948,7 @@ the easiest solution is a small nntp server like
 @uref{http://infa.abo.fi/~patrik/sn/, sn},
 of course you can also install a full featured news
 server like
-@uref{http://www.isc.org/products/INN/, inn}.
+@uref{http://www.isc.org/software/inn/, inn}.
 Then you want to fetch your Mail, popular choices
 are @uref{http://www.catb.org/~esr/fetchmail/, fetchmail}
 and @uref{http://pyropus.ca/software/getmail/, getmail}.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 6df72f87fc7..e5ba2c19eec 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -420,6 +420,9 @@ This manual corresponds to Gnus v5.13
 * Index::                    Variable, function and concept index.
 * Key Index::                Key Index.
 
+@c Doesn't work right in html.
+@c FIXME Do this in a more standard way.
+@ifinfo
 Other related manuals
 
 * Message:(message).         Composing messages.
@@ -427,6 +430,7 @@ Other related manuals
 * Sieve:(sieve).             Managing Sieve scripts in Emacs.
 * EasyPG:(epa).              @acronym{PGP/MIME} with Gnus.
 * SASL:(sasl).               @acronym{SASL} authentication in Emacs.
+@end ifinfo
 
 @detailmenu
  --- The Detailed Node Listing ---
@@ -2712,11 +2716,11 @@ the article range.
 This command is similar to @code{gnus-read-ephemeral-gmane-group}, but
 the group name and the article number and range are constructed from a
 given @acronym{URL}.  Supported @acronym{URL} formats include:
-@url{http://thread.gmane.org/gmane.foo.bar/12300/focus=12399},
-@url{http://thread.gmane.org/gmane.foo.bar/12345/},
-@url{http://article.gmane.org/gmane.foo.bar/12345/},
-@url{http://permalink.gmane.org/gmane.foo.bar/12345/}, and
-@url{http://news.gmane.org/group/gmane.foo.bar/thread=12345}.
+@indicateurl{http://thread.gmane.org/gmane.foo.bar/12300/focus=12399},
+@indicateurl{http://thread.gmane.org/gmane.foo.bar/12345/},
+@indicateurl{http://article.gmane.org/gmane.foo.bar/12345/},
+@indicateurl{http://permalink.gmane.org/gmane.foo.bar/12345/}, and
+@indicateurl{http://news.gmane.org/group/gmane.foo.bar/thread=12345}.
 
 @item gnus-read-ephemeral-emacs-bug-group
 @findex gnus-read-ephemeral-emacs-bug-group
@@ -3087,6 +3091,12 @@ if address "sender" ["name@@one.org", "else@@two.org"] @{
 @}
 @end example
 
+You can also use regexp expansions in the rules:
+
+@example
+(sieve header :regex "list-id" "<c++std-\\1.accu.org>")
+@end example
+
 See @pxref{Sieve Commands} for commands and variables that might be of
 interest in relation to the sieve parameter.
 
@@ -6376,10 +6386,10 @@ The default is @code{t}.
 @node Generic Marking Commands
 @subsection Generic Marking Commands
 
-Some people would like the command that ticks an article (@kbd{!}) go to
-the next article.  Others would like it to go to the next unread
-article.  Yet others would like it to stay on the current article.  And
-even though I haven't heard of anybody wanting it to go to the
+Some people would like the command that ticks an article (@kbd{!}) to
+go to the next article.  Others would like it to go to the next unread
+article.  Yet others would like it to stay on the current article.
+And even though I haven't heard of anybody wanting it to go to the
 previous (unread) article, I'm sure there are people that want that as
 well.
 
@@ -13809,9 +13819,12 @@ installed.  You then define a server as follows:
 @findex nntp-open-ssl-stream
 @item nntp-open-ssl-stream
 Opens a connection to a server over a @dfn{secure} channel.  To use
-this you must have @uref{http://www.openssl.org, OpenSSL} or
-@uref{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL, SSLeay} installed.  You
-then define a server as follows:
+this you must have @uref{http://www.openssl.org, OpenSSL}
+@ignore
+@c Defunct URL, ancient package, so don't mention it.
+or @uref{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL, SSLeay}
+@end ignore
+installed.  You then define a server as follows:
 
 @lisp
 ;; @r{"snews" is port 563 and is predefined in our @file{/etc/services}}
@@ -16953,7 +16966,7 @@ Some web sites have an RDF Site Summary (@acronym{RSS}).
 @acronym{RSS} is a format for summarizing headlines from news related
 sites (such as BBC or CNN).  But basically anything list-like can be
 presented as an @acronym{RSS} feed: weblogs, changelogs or recent
-changes to a wiki (e.g., @url{http://cliki.net/recent-changes.rdf}).
+changes to a wiki (e.g., @url{http://cliki.net/site/recent-changes}).
 
 @acronym{RSS} has a quite regular and nice interface, and it's
 possible to get the information Gnus needs to keep groups updated.
@@ -25993,9 +26006,13 @@ following variables.
 
 @defvar gnus-registry-track-extra
 This is a list of symbols, so it's best to change it from the
-Customize interface.  By default it's @code{(subject sender)}, which
-may work for you.  It can be annoying if your mail flow is large and
-people don't stick to the same groups.
+Customize interface.  By default it's @code{(subject sender recipient)},
+which may work for you.  It can be annoying if your mail flow is large
+and people don't stick to the same groups.
+
+When you decide to stop tracking any of those extra data, you can use
+the command @code{gnus-registry-remove-extra-data} to purge it from
+the existing registry entries.
 @end defvar
 
 @defvar gnus-registry-split-strategy
@@ -26568,7 +26585,7 @@ This version of Gnus should work on:
 @itemize @bullet
 
 @item
-Emacs 21.1 and up.
+Emacs 23.1 and up.
 
 @item
 XEmacs 21.4 and up.
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 154120f2e3b..a0ea0fe6de9 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -233,7 +233,7 @@ read an online tutorial by starting GNU Emacs and typing @kbd{C-h t}
 @cite{GNU Emacs Manual},
 @end iftex
 @ifinfo
-@ref{top, , GNU Emacs Manual, emacs, GNU Emacs Manual},
+@ref{Top, , GNU Emacs Manual, emacs, GNU Emacs Manual},
 @end ifinfo
 @ifhtml
 @uref{http://www.gnu.org/software/emacs/manual/html_node/emacs/,
@@ -1121,38 +1121,23 @@ exist,
 @footnote{The @cite{GNU Emacs Lisp Reference Manual} may be available
 online in the Info system by typing @kbd{C-h i m Emacs Lisp
 @key{RET}}. It is also available online at @*
-@uref{http://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/}.
-You can also order a printed manual, which has the desirable
-side-effect of helping to support the Free Software Foundation which
-made all this great software available. You can find an order form by
-running @kbd{C-h C-d}, or you can request an order form from @i{gnu at
-gnu.org}.}
+@uref{http://www.gnu.org/software/emacs/manual/elisp.html}.}
 @end iftex
 @ifinfo
 @footnote{@xref{Top, The GNU Emacs Lisp Reference Manual, , elisp, GNU
 Emacs Lisp Reference Manual}, which may be available online in the
 Info system. It is also available online at
-@uref{http://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/}.
-You can also order a printed manual, which has the desirable
-side-effect of helping to support the Free Software Foundation which
-made all this great software available. You can find an order form by
-running @kbd{C-h C-d}, or you can request an order form from @i{gnu at
-gnu.org}.}
+@uref{http://www.gnu.org/software/emacs/manual/elisp.html}.}
 @end ifinfo
 @ifhtml
 @footnote{The
-@uref{http://www.gnu.org/savannah-checkouts/gnu/emacs/manual/html_node/elisp/,
+@uref{http://www.gnu.org/software/emacs/manual/elisp.html,
 The GNU Emacs Lisp Reference Manual} may also be available online in
-the Info system by typing @kbd{C-h i m Emacs Lisp @key{RET}}. You can
-also order a printed manual, which has the desirable side-effect of
-helping to support the Free Software Foundation which made all this
-great software available. You can find an order form by running
-@kbd{C-h C-d}, or you can request an order form from @i{gnu at
-gnu.org}.}
+the Info system by typing @kbd{C-h i m Emacs Lisp @key{RET}}.}
 @end ifhtml
 and you can look at the code itself for examples. Look in the Emacs
 Lisp directory on your system (such as
-@file{/usr/local/lib/emacs/lisp/mh-e}) and find all the @file{mh-*.el}
+@file{/usr/local/share/emacs/lisp/mh-e}) and find all the @file{mh-*.el}
 files there. When calling MH-E and other Emacs Lisp functions directly
 from Emacs Lisp code, you'll need to know the correct arguments. Use
 the online help for this. For example, try @kbd{C-h f
@@ -2848,7 +2833,7 @@ See @cite{The PGG Manual}.
 @end ifinfo
 @ifhtml
 See
-@uref{http://www.dk.xemacs.org/Documentation/packages/html/pgg.html,
+@uref{http://www.gnu.org/software/emacs/manual/pgg.html,
 @cite{The PGG Manual}}.
 @end ifhtml
 
@@ -5058,7 +5043,7 @@ for the next hook function. The standard prefix
 @vindex mh-yank-behavior
 
 For example, if you use the hook function
-@uref{http://shasta.cs.uiuc.edu/~lrclause/tc.html,
+@uref{http://www.emacswiki.org/emacs/TrivialCite,
 @code{trivial-cite}} (which is NOT part of Emacs), set
 @code{mh-yank-behavior} to @samp{Body and Header}.
 
@@ -5615,7 +5600,7 @@ See @cite{The PGG Manual}.
 @end ifinfo
 @ifhtml
 See
-@uref{http://www.dk.xemacs.org/Documentation/packages/html/pgg.html,
+@uref{http://www.gnu.org/software/emacs/manual/pgg.html,
 @cite{The PGG Manual}}.
 @end ifhtml
 
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index 8f37453524c..ab3bffc2ce9 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -89,7 +89,7 @@ works with the following RSS formats:
 as well as the following Atom formats:
 @item Atom 0.3
 @item Atom 1.0 (see
-@uref{http://www.ietf.org/internet-drafts/draft-ietf-atompub-format-11.txt}).
+@uref{https://datatracker.ietf.org/doc/rfc4287/}).
 @end itemize
 
 That makes Newsticker.el an ``Atom aggregator'', ``RSS reader'', ``Feed
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index 13e91d12819..8c81b6fbd20 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -86,7 +86,11 @@ convert a RELAX NG XML syntax schema to an RNC schema.
 
 @noindent To convert a RELAX NG XML syntax (@samp{.rng}) schema to a RNC
 one, you can also use the XSLT stylesheet from
+@url{https://github.com/oleg-pavliv/emacs/tree/master/xsl}.
+@ignore
+@c Original location, now defunct.
 @url{http://www.pantor.com/download.html}.
+@end ignore
 
 To convert a W3C XML Schema to an RNC schema, you need first to convert it
 to RELAX NG XML syntax using the RELAX NG converter tool @code{rngconv}
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 1d7de18ada6..832976e9ea0 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -10393,7 +10393,7 @@ view type is a @emph{folding} view much like Org provides inside Emacs.  The
 script is available at @url{http://orgmode.org/org-info.js} and you can find
 the documentation for it at @url{http://orgmode.org/worg/code/org-info-js/}.
 We host the script at our site, but if you use it a lot, you might
-not want to be dependent on @url{orgmode.org} and prefer to install a local
+not want to be dependent on @url{http://orgmode.org} and prefer to install a local
 copy on your own web server.
 
 To use the script, you need to make sure that the @file{org-jsinfo.el} module
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index a18a22e649f..370998c855a 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -54,6 +54,8 @@ modify this GNU manual.''
 PGG is an interface library between Emacs
 and various tools for secure communication.  PGG also provides a simple
 user interface to encrypt, decrypt, sign, and verify MIME messages.
+This package is obsolete; for new code we recommend EasyPG instead.
+@xref{Top,, EasyPG, epa, EasyPG Assistant User's Manual}.
 
 @ifnottex
 @insertcopying
@@ -78,6 +80,9 @@ communication.  Even though Mailcrypt has similar feature, it does not
 deal with detached PGP messages, normally used in PGP/MIME
 infrastructure.  This was the main reason why I wrote the new library.
 
+Note that the PGG library is now obsolete, replaced by EasyPG.
+@xref{Top,, EasyPG, epa, EasyPG Assistant User's Manual}.
+
 PGP/MIME is an application of MIME Object Security Services (RFC1848).
 The standard is documented in RFC2015.
 
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 85f184cc4cb..3427d2ad0e3 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{2013-02-01.11}
+\def\texinfoversion{2013-06-23.10}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2475,14 +2475,14 @@ end
 }
 
 % We *must* turn on hyphenation at `-' and `_' in @code.
+% (But see \codedashfinish below.)
 % Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.
 %
 % Unfortunately, TeX uses one parameter (\hyphenchar) to control
 % both hyphenation at - and hyphenation within words.
 % We must therefore turn them both off (\tclose does that)
-% and arrange explicitly to hyphenate at a dash.
-%  -- rms.
+% and arrange explicitly to hyphenate at a dash. -- rms.
 {
   \catcode`\-=\active \catcode`\_=\active
   \catcode`\'=\active \catcode`\`=\active
@@ -2499,14 +2499,33 @@ end
      \let-\normaldash
      \let_\realunder
     \fi
+    % Given -foo (with a single dash), we do not want to allow a break
+    % after the hyphen.
+    \global\let\codedashprev=\codedash
+    %
     \codex
   }
+  %
+  \gdef\codedash{\futurelet\next\codedashfinish}
+  \gdef\codedashfinish{%
+    \normaldash % always output the dash character itself.
+    % 
+    % Now, output a discretionary to allow a line break, unless
+    % (a) the next character is a -, or
+    % (b) the preceding character is a -.
+    % E.g., given --posix, we do not want to allow a break after either -.
+    % Given --foo-bar, we do want to allow a break between the - and the b.
+    \ifx\next\codedash \else
+      \ifx\codedashprev\codedash 
+      \else \discretionary{}{}{}\fi
+    \fi
+    \global\let\codedashprev=\next
+  }
 }
-
+\def\normaldash{-}
+%
 \def\codex #1{\tclose{#1}\endgroup}
 
-\def\normaldash{-}
-\def\codedash{-\discretionary{}{}{}}
 \def\codeunder{%
   % this is all so @math{@code{var_name}+1} can work.  In math mode, _
   % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
@@ -4211,8 +4230,9 @@ end
 
 % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
 % with @set.
-%
-% To get special treatment of `@end ifset,' call \makeond and the redefine.
+% 
+% To get the special treatment we need for `@end ifset,' we call
+% \makecond and then redefine.
 %
 \makecond{ifset}
 \def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
@@ -6402,7 +6422,7 @@ end
 \newdimen\nonfillparindent
 \def\nonfillstart{%
   \aboveenvbreak
-  \hfuzz = 12pt % Don't be fussy
+  \ifdim\hfuzz < 12pt \hfuzz = 12pt \fi % Don't be fussy
   \sepspaces % Make spaces be word-separators rather than space tokens.
   \let\par = \lisppar % don't ignore blank lines
   \obeylines % each line of input is a line of output
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 49f8f3f0959..fdec68b1c61 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -138,7 +138,7 @@ Given a parsed URI, this function returns the corresponding URI string.
   The return value of @code{url-generic-parse-url}, and the argument
 expected by @code{url-recreate-url}, is a @dfn{parsed URI}: a CL
 structure whose slots hold the various components of the URI@.
-@xref{top,the CL Manual,,cl,GNU Emacs Common Lisp Emulation}, for
+@xref{Top,the CL Manual,,cl,GNU Emacs Common Lisp Emulation}, for
 details about CL structures.  Most of the other functions in the
 @code{url} library act on parsed URIs.
 
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index d8557b84a4f..c0f18f6363a 100644
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -113,9 +113,6 @@ of GNU Bison 1.28 & 1.31.
 
 For more details on the basic concepts for understanding Wisent, it is
 worthwhile to read the @ref{Top, Bison Manual, , bison}.
-@ifhtml
-@uref{http://www.gnu.org/manual/bison/html_node/index.html}.
-@end ifhtml
 
 Wisent can generate compilers compatible with the @semantic{} tool set.
 See the @ref{Top, Semantic Manual, , semantic}.