[Emacs-diffs] trunk r113537: Merge from emacs-24; up to r111392

[Glenn Morris]

------------------------------------------------------------
revno: 113537 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-07-25 00:10:56 -0700
message:
  Merge from emacs-24; up to r111392
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/erc.texi              erc.texi-20091113204419-o5vbwnq5f7feedwu-6298
  doc/misc/eshell.texi           
eshell.texi-20091113204419-o5vbwnq5f7feedwu-6299
  doc/misc/faq.texi              faq.texi-20091113204419-o5vbwnq5f7feedwu-6301
  doc/misc/pcl-cvs.texi          
pclcvs.texi-20091113204419-o5vbwnq5f7feedwu-6314
  doc/misc/reftex.texi           
reftex.texi-20091113204419-o5vbwnq5f7feedwu-6317
  doc/misc/ses.texi              ses.texi-20091113204419-o5vbwnq5f7feedwu-6319
  doc/misc/woman.texi            woman.texi-20091113204419-o5vbwnq5f7feedwu-6330
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/dired-x.el                diredx.el-20091113204419-o5vbwnq5f7feedwu-649

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-07-24 22:32:48 +0000
+++ b/doc/misc/ChangeLog        2013-07-25 07:10:56 +0000
@@ -1,3 +1,26 @@
+2013-07-25  Glenn Morris  <address@hidden>
+
+       * erc.texi (Special Features): Update contact information.
+       (History): Avoid using @email.
+
+       * eshell.texi (Bugs and ideas): Minor updates.
+
+       * faq.texi (Reporting bugs, Origin of the term Emacs)
+       (Setting up a customization file)
+       (Using an already running Emacs process, Turning off beeping)
+       (Packages that do not come with Emacs)
+       (Replying to the sender of a message): Avoid using @email.
+
+       * pcl-cvs.texi (Contributors, Bugs): Avoid using @email.
+
+       * reftex.texi (Imprint): Avoid using @email.
+
+       * ses.texi (Top): Update bug reporting instructions.
+       (Acknowledgments): Avoid using @email.
+
+       * woman.texi (Introduction, Background): Remove outdated information.
+       (Bugs, Acknowledgments): Avoid using @email.
+
 2013-07-24  Xue Fuqiao  <address@hidden>
 
        * ido.texi: New file.

=== modified file 'doc/misc/erc.texi'
--- a/doc/misc/erc.texi 2013-05-28 01:05:41 +0000
+++ b/doc/misc/erc.texi 2013-07-25 07:10:56 +0000
@@ -234,9 +234,8 @@
 
 Different channels and servers may have different language encodings.
 
-In addition, it is possible to translate the messages that ERC uses
-into multiple languages.  Please contact the developers of Emacs at
address@hidden@@gnu.org} if you are interested in helping with the
+multiple languages.  Please contact the Emacs developers
+if you are interested in helping with the
 translation effort.
 
 @item user scripting
@@ -784,9 +783,9 @@
 @chapter History
 @cindex history, of ERC
 
-ERC was originally written by Alexander L. Belikoff
address@hidden@@bfr.co.il} and Sergey Berezin
address@hidden@@cs.cmu.edu}.  They stopped development around
address@hidden abel@@bfr.co.il, sergey.berezin@@cs.cmu.edu
+ERC was originally written by Alexander L. Belikoff and Sergey Berezin.
+They stopped development around
 December 1999.  Their last released version was ERC 2.0.
 
 P.S.: If one of the original developers of ERC reads this, we'd like to
@@ -796,8 +795,9 @@
 @itemize
 @item 2001
 
-In June 2001, Mario Lang @email{mlang@@delysid.org} and Alex Schroeder
address@hidden@@gnu.org} took over development and created a ERC Project at
address@hidden mlang@@delysid.org, alex@@gnu.org
+In June 2001, Mario Lang and Alex Schroeder
+took over development and created a ERC Project at
 @uref{http://sourceforge.net/projects/erc}.
 
 In reaction to a mail about the new ERC development effort, Sergey
@@ -825,7 +825,8 @@
 
 @item 2005
 
-ERC 5.0 was released.  Michael Olson @email{mwolson@@gnu.org} became
address@hidden mwolson@@gnu.org
+ERC 5.0 was released.  Michael Olson became
 the release manager and eventually the maintainer.
 
 After some discussion between him and the Emacs developers, it was

=== modified file 'doc/misc/eshell.texi'
--- a/doc/misc/eshell.texi      2013-06-24 06:58:52 +0000
+++ b/doc/misc/eshell.texi      2013-07-25 07:10:56 +0000
@@ -819,16 +819,18 @@
 @cindex known bugs
 @cindex bugs, known
 
-If you find a bug or misfeature, don't hesitate to let me know!  Send
-email to @email{johnw@@gnu.org}.  Feature requests should also be sent
-there.  I prefer discussing one thing at a time.  If you find several
+If you find a bug or misfeature, don't hesitate to report it, by
+using @kbd{M-x report-emacs-bug}.  The same applies to feature requests.
+It is best to discuss one thing at a time.  If you find several
 unrelated bugs, please report them separately.
 
address@hidden
 If you have ideas for improvements, or if you have written some
 extensions to this package, I would like to hear from you.  I hope you
 find this package useful!
address@hidden ignore
 
-Below is a complete list of known problems with Eshell version 2.4.2,
+Below is a list of some known problems with Eshell version 2.4.2,
 which is the version included with Emacs 22.
 
 @table @asis

=== modified file 'doc/misc/faq.texi'
--- a/doc/misc/faq.texi 2013-03-08 08:37:59 +0000
+++ b/doc/misc/faq.texi 2013-07-25 07:10:56 +0000
@@ -444,9 +444,9 @@
 
 The correct way to report Emacs bugs is to use the command
 @kbd{M-x report-emacs-bug}.  It sets up a mail buffer with the
-essential information and the correct e-mail address, which is
address@hidden@@gnu.org} for the released versions of Emacs.
-Anything sent to @email{bug-gnu-emacs@@gnu.org} also appears in the
+essential information and the correct e-mail address,
address@hidden@@gnu.org}.
+Anything sent there also appears in the
 newsgroup @uref{news:gnu.emacs.bug}, but please use e-mail instead of
 news to submit the bug report.  This ensures a reliable return address
 so you can be contacted for further details.
@@ -459,13 +459,17 @@
 RMS says:
 
 @quotation
-Sending bug reports to @email{help-gnu-emacs@@gnu.org} (which has the
-effect of posting on @uref{news:gnu.emacs.help}) is undesirable because
-it takes the time of an unnecessarily large group of people, most of
-whom are just users and have no idea how to fix these problem.
address@hidden@@gnu.org} reaches a much smaller group of people
-who are more likely to know what to do and have expressed a wish to
-receive more messages about Emacs than the others.
+Sending bug reports to
address@hidden://lists.gnu.org/mailman/listinfo/help-gnu-emacs,
+the help-gnu-emacs mailing list}
+(which has the effect of posting on @uref{news:gnu.emacs.help}) is
+undesirable because it takes the time of an unnecessarily large group
+of people, most of whom are just users and have no idea how to fix
+these problem.
address@hidden://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, The
+bug-gnu-emacs list} reaches a much smaller group of people who are
+more likely to know what to do and have expressed a wish to receive
+more messages about Emacs than the others.
 @end quotation
 
 RMS says it is sometimes fine to post to @uref{news:gnu.emacs.help}:
@@ -960,7 +964,8 @@
 Editor and COrrector) under ITS (the Incompatible Timesharing System) on
 a PDP-10.  RMS had already extended TECO with a ``real-time''
 full-screen mode with reprogrammable keys.  Emacs was started by
address@hidden@@east.sun.com, Guy Steele} as a project to unify the many
address@hidden gls@@east.sun.com
+Guy Steele as a project to unify the many
 divergent TECO command sets and key bindings at MIT, and completed by
 RMS.
 
@@ -1340,7 +1345,9 @@
 
 In general, new Emacs users should not be provided with @file{.emacs}
 files, because this can cause confusing non-standard behavior.  Then
-they send questions to @email{help-gnu-emacs@@gnu.org} asking why Emacs
+they send questions to
address@hidden://lists.gnu.org/mailman/listinfo/help-gnu-emacs,
+the help-gnu-emacs mailing list} asking why Emacs
 isn't behaving as documented.
 
 Emacs includes the Customize facility (@pxref{Using Customize}).  This
@@ -1805,7 +1812,8 @@
 
 @cindex @code{gnuserv}
 There is an alternative version of @samp{emacsclient} called
address@hidden, written by @email{ange@@hplb.hpl.hp.com, Andy Norman}
address@hidden ange@@hplb.hpl.hp.com
address@hidden, written by Andy Norman
 (@pxref{Packages that do not come with Emacs}).  @samp{gnuserv} uses
 Internet domain sockets, so it can work across most network connections.
 
@@ -1973,7 +1981,8 @@
 @cindex Visible bell
 @cindex Bell, visible
 
address@hidden@@cc.gatech.edu, Martin R. Frank} writes:
address@hidden martin@@cc.gatech.edu
+Martin R. Frank writes:
 
 Tell Emacs to use the @dfn{visible bell} instead of the audible bell,
 and set the visible bell to nothing.
@@ -3304,7 +3313,7 @@
 wish, Emacs can download and automatically install it for you.
 
 @uref{http://www.damtp.cam.ac.uk/user/sje30/emacs/ell.html, The Emacs Lisp
-List (ELL)}, maintained by @email{S.J.Eglen@@damtp.cam.ac.uk, Stephen Eglen},
+List (ELL)}, maintained by Stephen Eglen,
 aims to provide one compact list with links to all of the current Emacs
 Lisp files on the Internet.  The ELL can be browsed over the web, or
 from Emacs with @uref{http://www.damtp.cam.ac.uk/user/sje30/emacs/ell.el,
@@ -4313,7 +4322,8 @@
 @cindex Sender, replying only to
 @cindex Rmail, replying to the sender of a message in
 
address@hidden@@seas.upenn.edu, Ron Isaacson} says: When you hit
address@hidden isaacson@@seas.upenn.edu
+Ron Isaacson says: When you hit
 @key{r} to reply in Rmail, by default it CCs all of the original
 recipients (everyone on the original @samp{To} and @samp{CC}
 lists). With a prefix argument (i.e., typing @kbd{C-u} before @key{r}),

=== modified file 'doc/misc/pcl-cvs.texi'
--- a/doc/misc/pcl-cvs.texi     2013-01-05 21:18:01 +0000
+++ b/doc/misc/pcl-cvs.texi     2013-07-25 07:10:56 +0000
@@ -172,17 +172,20 @@
 PCL-CVS as well as all the documentation.
 
 @item
address@hidden@@lysator.liu.se, Inge Wallin} wrote the skeleton of
address@hidden inge@@lysator.liu.se
+Inge Wallin wrote the skeleton of
 @file{pcl-cvs.texi}, and gave useful comments on it.  He also wrote
 the files @file{elib-node.el} and @file{compile-all.el}.  The file
 @file{cookie.el} was inspired by address@hidden
 
 @item
address@hidden@@lysator.liu.se, Linus Tolke} contributed useful comments
address@hidden linus@@lysator.liu.se
+Linus Tolke contributed useful comments
 on both the functionality and the address@hidden
 
 @item
address@hidden@@jwz.com, Jamie Zawinski} contributed
address@hidden jwz@@jwz.com
+Jamie Zawinski contributed
 @file{pcl-cvs-lucid.el}, which was later renamed to
 @address@hidden
 
@@ -191,34 +194,40 @@
 remote CVS support).
 
 @item
address@hidden@@cyclic.com, Jim Blandy} contributed hooks to automatically
address@hidden jimb@@cyclic.com
+Jim Blandy contributed hooks to automatically
 guess CVS log entries from @file{ChangeLog} contents, and initial support of
 the new Cygnus / Cyclic remote CVS, as well as various sundry bug fixes
 and cleanups.
 
 @item
address@hidden@@cyclic.com, Jim Kingdon} contributed lots of fixes to
address@hidden kingdon@@cyclic.com
+Jim Kingdon contributed lots of fixes to
 the build and installation procedure.
 
 @item
address@hidden@@weird.com, Greg A. Woods} contributed code to implement
address@hidden woods@@weird.com
+Greg A. Woods contributed code to implement
 the use of per-file diff buffers, and vendor join diffs with emerge and
 ediff, as well as various and sundry bug fixes and cleanups.
 
 @item
address@hidden@@alum.mit.edu, Greg Klanderman} implemented
address@hidden greg.klanderman@@alum.mit.edu
+Greg Klanderman implemented
 toggling of marked files, setting of CVS command flags via prefix
 arguments, updated the XEmacs support, updated the manual, and fixed
 numerous bugs.
 
 @item
address@hidden@@gnu.org, Stefan Monnier} added a slew of other
address@hidden monnier@@gnu.org
+Stefan Monnier added a slew of other
 features and introduced even more new bugs.  If there's any bug left,
 you can be sure it's his.
 
 @item
 @c wordy to avoid an underfull hbox
address@hidden@@is.aist-nara.ac.jp, Masatake YAMATO} made a gracious
address@hidden masata-y@@is.aist-nara.ac.jp
+Masatake YAMATO made a gracious
 contribution of his cvstree code to display a tree of tags which was later
 superseded by the new @code{cvs-status-mode}.
 @end itemize
@@ -1369,18 +1378,19 @@
 @cindex FAQ
 @cindex Problems, list of common
 
-If you find a bug or misfeature, don't hesitate to tell us!  Send email
-to @email{bug-gnu-emacs@@gnu.org} which is gatewayed to the newsgroup
address@hidden  Feature requests should also be sent there.  We
-prefer discussing one thing at a time.  If you find several unrelated
+If you find a bug or misfeature, don't hesitate to tell us!
+Use @kbd{M-x report-emacs-bug} to send us a report.
+You can follow the same process for feature requests.
+We prefer discussing one thing at a time.  If you find several unrelated
 bugs, please report them separately.  If you are running PCL-CVS under
 XEmacs, you should also send a copy of bug reports to
address@hidden@@xemacs.org}.
+the @url{http://lists.xemacs.org/mailman/listinfo/xemacs-beta,
+XEmacs mailing list}.
 
 If you have problems using PCL-CVS or other questions, send them to
address@hidden@@gnu.org}, which is gatewayed to the
address@hidden newsgroup.  This is a good place to get help, as
-is @email{cvs-info@@gnu.org}, gatewayed to @samp{gnu.cvs.help}.
+the @url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs,
+help-gnu-emacs mailing list}.  This is a good place to get help, as is
+the @url{http://lists.nongnu.org/mailman/listinfo/info-cvs, info-cvs list}.
 
 If you have ideas for improvements, or if you have written some
 extensions to this package, we would like to hear from you.  We hope that

=== modified file 'doc/misc/reftex.texi'
--- a/doc/misc/reftex.texi      2013-02-13 04:31:09 +0000
+++ b/doc/misc/reftex.texi      2013-07-25 07:10:56 +0000
@@ -3639,8 +3639,8 @@
 @cindex @code{http}, @RefTeX{} home page
 @cindex @code{ftp}, @RefTeX{} site
 
address@hidden was written by @i{Carsten Dominik}
address@hidden@@science.uva.nl}, with contributions by @i{Stephen
address@hidden dominik@@science.uva.nl
address@hidden was written by @i{Carsten Dominik}, with contributions by 
@i{Stephen
 Eglen}.  @RefTeX{} is currently maintained by @value{MAINTAINER}, see
 the @value{MAINTAINERSITE} for detailed information.
 

=== modified file 'doc/misc/ses.texi'
--- a/doc/misc/ses.texi 2013-03-04 08:45:03 +0000
+++ b/doc/misc/ses.texi 2013-07-25 07:10:56 +0000
@@ -60,7 +60,7 @@
 @end display
 @end ifnottex
 
-To report bugs, send email to @email{jyavner@@member.fsf.org}.
+To report bugs, use @kbd{M-x report-emacs-bug}.
 
 @insertcopying
 
@@ -997,39 +997,62 @@
 
 Coding by:
 @quotation
-Jonathan Yavner @email{jyavner@@address@hidden
-Stefan Monnier @email{monnier@@address@hidden
-Shigeru Fukaya @email{shigeru.fukaya@@gmail.com}
address@hidden jyavner@@member.fsf.org
+Jonathan Yavner,
address@hidden monnier@@gnu.org
+Stefan Monnier,
address@hidden shigeru.fukaya@@gmail.com
+Shigeru Fukaya
 @end quotation
 
 @noindent
 Texinfo manual by:
 @quotation
-Jonathan Yavner @email{jyavner@@address@hidden
-Brad Collins <brad@@chenla.org>
address@hidden jyavner@@member.fsf.org
+Jonathan Yavner,
address@hidden brad@@chenla.org
+Brad Collins
 @end quotation
 
 @noindent
 Ideas from:
 @quotation
-Christoph Conrad @email{christoph.conrad@@address@hidden
-CyberBob @email{cyberbob@@address@hidden
-Syver Enstad @email{syver-en@@address@hidden
-Ami Fischman @email{fischman@@address@hidden
-Thomas Gehrlein @email{Thomas.Gehrlein@@address@hidden
-Chris F.A. Johnson @email{c.f.a.johnson@@address@hidden
-Yusong Li @email{lyusong@@address@hidden
-Juri Linkov @email{juri@@address@hidden
-Harald Maier @email{maierh@@address@hidden
-Alan Nash @email{anash@@address@hidden
-François Pinard @email{pinard@@address@hidden
-Pedro Pinto @email{ppinto@@address@hidden
-Stefan Reichör @email{xsteve@@address@hidden
-Oliver Scholz @email{epameinondas@@address@hidden
-Richard M. Stallman @email{rms@@address@hidden
-Luc Teirlinck @email{teirllm@@address@hidden
-J. Otto Tennant @email{jotto@@address@hidden
-Jean-Philippe Theberge @email{jphil@@acs.pagesjaunes.fr}
address@hidden christoph.conrad@@gmx.de
+Christoph Conrad,
address@hidden cyberbob@@redneck.gacracker.org
+CyberBob,
address@hidden syver-en@@online.no
+Syver Enstad,
address@hidden fischman@@zion.bpnetworks.com
+Ami Fischman,
address@hidden Thomas.Gehrlein@@t-online.de
+Thomas Gehrlein,
address@hidden c.f.a.johnson@@rogers.com
+Chris F.A. Johnson,
address@hidden lyusong@@hotmail.com
+Yusong Li,
address@hidden juri@@jurta.org
+Juri Linkov,
address@hidden maierh@@myself.com
+Harald Maier,
address@hidden anash@@san.rr.com
+Alan Nash,
address@hidden pinard@@iro.umontreal.ca
+François Pinard,
address@hidden ppinto@@cs.cmu.edu
+Pedro Pinto,
address@hidden xsteve@@riic.at
+Stefan Reichör,
address@hidden epameinondas@@gmx.de
+Oliver Scholz,
address@hidden rms@@gnu.org
+Richard M. Stallman,
address@hidden teirllm@@dms.auburn.edu
+Luc Teirlinck,
address@hidden jotto@@pobox.com
+J. Otto Tennant,
address@hidden jphil@@acs.pagesjaunes.fr
+Jean-Philippe Theberge
 @end quotation
 
 @c ===================================================================

=== modified file 'doc/misc/woman.texi'
--- a/doc/misc/woman.texi       2013-02-13 04:31:09 +0000
+++ b/doc/misc/woman.texi       2013-07-25 07:10:56 +0000
@@ -105,10 +105,7 @@
 Microsoft Windows, but has also been tested on MS-DOS, and various
 versions of UNIX and GNU/Linux.
 
-WoMan is distributed with GNU Emacs.  In addition, the current source
-code and documentation files are available from
address@hidden://centaur.maths.qmw.ac.uk/Emacs/WoMan/, the WoMan web
-server}.
+WoMan is distributed with GNU Emacs.
 
 WoMan implements a subset of the formatting performed by the Emacs
 @code{man} (or @code{manual-entry}) command to format a Unix-style
@@ -148,11 +145,7 @@
 either running the command @code{woman-mini-help} or selecting the WoMan
 menu option @samp{Mini Help}.
 
-WoMan is (of course) still under development!  Please
address@hidden@@qmw.ac.uk, let me know} what doesn't work---I am
-adding and improving functionality as testing shows that it is
-necessary.  Guidance on reporting bugs is given below.  @xref{Bugs, ,
-Reporting Bugs}.
+Guidance on reporting bugs is given below.  @xref{Bugs, , Reporting Bugs}.
 
 @c ===================================================================
 
@@ -276,6 +269,7 @@
 and man can happily co-exist, which is very useful for comparison and
 debugging purposes.
 
address@hidden
 @code{nroff} simulates address@hidden characters by using one or more
 @acronym{ASCII} characters.  WoMan should be able to do much better than
 this.  I have recently begun to add support for WoMan to use more of the
@@ -284,6 +278,7 @@
 be possible to move WoMan from an emulation of @code{nroff} to an
 emulation of @code{troff} as GNU Emacs moves to providing bit-mapped
 display facilities.
address@hidden ignore
 
 @node Finding
 @chapter Finding and Formatting Man Pages
@@ -1290,8 +1285,8 @@
 on @uref{http://savannah.gnu.org/projects/emacs/}.  If it still fails, please
 
 @item
-send a bug report to @email{bug-gnu-emacs@@gnu.org} and to
address@hidden@@qmw.ac.uk}.  Please include the entry from the
+use @kbd{M-x report-emacs-bug} to send a bug report.
+Please include the entry from the
 @code{*WoMan-Log*} buffer relating to the problem file, together with
 a brief description of the problem.  Please indicate where you got the
 man source file from, but do not send it unless asked to send it.
@@ -1310,43 +1305,80 @@
 fragments, general interest, etc.:
 
 @quotation
-Jari Aalto, @email{jari.aalto@@address@hidden
-Dean Andrews, @email{dean@@address@hidden
-Juanma Barranquero, @email{barranquero@@address@hidden
-Karl Berry, @email{kb@@address@hidden
-Jim Chapman, @email{jchapman@@address@hidden
-Frederic Corne, @email{frederic.corne@@address@hidden
-Peter Craft, @email{craft@@address@hidden
-Charles Curley, @email{ccurley@@address@hidden
-Jim Davidson, @email{jdavidso@@address@hidden
-Kevin D'Elia, @email{Kevin.DElia@@address@hidden
-John Fitch, @email{jpff@@address@hidden
-Hans Frosch, @email{jwfrosch@@address@hidden
-Guy Gascoigne-Piggford, @email{ggp@@address@hidden
-Brian Gorka, @email{gorkab@@address@hidden
-Nicolai Henriksen, @email{nhe@@address@hidden
-Thomas Herchenroeder, @email{the@@address@hidden
-Alexander Hinds, @email{ahinds@@address@hidden
-Stefan Hornburg, @email{sth@@address@hidden
-Theodore Jump, @email{tjump@@address@hidden
-Paul Kinnucan, @email{paulk@@address@hidden
-Jonas Linde, @email{jonas@@address@hidden
-Andrew McRae, @email{andrewm@@address@hidden
-Howard Melman, @email{howard@@address@hidden
-Dennis Pixton, @email{dennis@@address@hidden
-T. V. Raman, @email{raman@@address@hidden
-Bruce Ravel, @email{bruce.ravel@@address@hidden
-Benjamin Riefenstahl, @email{benny@@address@hidden
-Kevin Ruland, @email{kruland@@address@hidden
-Tom Schutter, @email{tom@@address@hidden
-Wei-Xue Shi, @email{wxshi@@address@hidden
-Fabio Somenzi, @email{fabio@@address@hidden
-Karel Sprenger, @email{ks@@address@hidden
-Chris Szurgot, @email{szurgot@@address@hidden
-Paul A. Thompson, @email{pat@@address@hidden
-Arrigo Triulzi, @email{arrigo@@address@hidden
-Geoff Voelker, @email{voelker@@address@hidden
-Eli Zaretskii, @email{eliz@@is.elta.co.il}
address@hidden jari.aalto@@cs.tpu.fi
+Jari Aalto,
address@hidden dean@@dra.com
+Dean Andrews,
address@hidden barranquero@@laley-actualidad.es
+Juanma Barranquero,
address@hidden kb@@cs.umb.edu
+Karl Berry,
address@hidden jchapman@@netcomuk.co.uk
+Jim Chapman,
address@hidden frederic.corne@@erli.fr
+Frederic Corne,
address@hidden craft@@alacritech.com
+Peter Craft,
address@hidden ccurley@@trib.com
+Charles Curley,
address@hidden jdavidso@@teknowledge.com
+Jim Davidson,
address@hidden Kevin.DElia@@mci.com
+Kevin D'Elia,
address@hidden jpff@@maths.bath.ac.uk
+John Fitch,
address@hidden jwfrosch@@rish.b17c.ingr.com
+Hans Frosch,
address@hidden ggp@@informix.com
+Guy Gascoigne-Piggford,
address@hidden gorkab@@sanchez.com
+Brian Gorka,
address@hidden nhe@@lyngso-industri.dk
+Nicolai Henriksen,
address@hidden the@@software-ag.de
+Thomas Herchenroeder,
address@hidden ahinds@@thegrid.net
+Alexander Hinds,
address@hidden sth@@hacon.de
+Stefan Hornburg,
address@hidden tjump@@cais.com
+Theodore Jump,
address@hidden paulk@@mathworks.com
+Paul Kinnucan,
address@hidden jonas@@init.se
+Jonas Linde,
address@hidden andrewm@@optimation.co.nz
+Andrew McRae,
address@hidden howard@@silverstream.com
+Howard Melman,
address@hidden dennis@@math.binghamton.edu
+Dennis Pixton,
address@hidden raman@@Adobe.com
+T. V. Raman,
address@hidden bruce.ravel@@nist.gov
+Bruce Ravel,
address@hidden benny@@crocodial.de
+Benjamin Riefenstahl,
address@hidden kruland@@seistl.com
+Kevin Ruland,
address@hidden tom@@platte.com
+Tom Schutter,
address@hidden wxshi@@ma.neweb.ne.jp
+Wei-Xue Shi,
address@hidden fabio@@joplin.colorado.edu
+Fabio Somenzi,
address@hidden ks@@ic.uva.nl
+Karel Sprenger,
address@hidden szurgot@@itribe.net
+Chris Szurgot,
address@hidden pat@@po.cwru.edu
+Paul A. Thompson,
address@hidden arrigo@@maths.qmw.ac.uk
+Arrigo Triulzi,
address@hidden voelker@@cs.washington.edu
+Geoff Voelker,
address@hidden eliz@@is.elta.co.il
+Eli Zaretskii
 @end quotation
 
 @c ===================================================================

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-25 00:37:56 +0000
+++ b/lisp/ChangeLog    2013-07-25 07:10:56 +0000
@@ -1,3 +1,7 @@
+2013-07-25  Glenn Morris  <address@hidden>
+
+       * dired-x.el (dired-mark-extension): Convert comment to doc string.
+
 2013-07-25  Juanma Barranquero  <address@hidden>
 
        * desktop.el (desktop--make-frame): Do not pass the `fullscreen'

=== modified file 'lisp/dired-x.el'
--- a/lisp/dired-x.el   2013-07-22 01:04:10 +0000
+++ b/lisp/dired-x.el   2013-07-25 07:10:56 +0000
@@ -331,9 +331,9 @@
 ;; Mark files with some extension.
 (defun dired-mark-extension (extension &optional marker-char)
   "Mark all files with a certain EXTENSION for use in later commands.
-A `.' is *not* automatically prepended to the string entered."
-  ;; EXTENSION may also be a list of extensions instead of a single one.
-  ;; Optional MARKER-CHAR is marker to use.
+A `.' is *not* automatically prepended to the string entered.
+EXTENSION may also be a list of extensions instead of a single one.
+Optional MARKER-CHAR is marker to use."
   (interactive "sMarking extension: \nP")
   (or (listp extension)
       (setq extension (list extension)))