Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-81

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 532-541)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 112-115)

   - Update from CVS

73 files changed, 2852 insertions, 1295 deletions

diff --git a/AUTHORS b/AUTHORS
index 88d4edbebdd..f7339296b79 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,19 +3,19 @@ Foundation's distribution of GNU Emacs.  To show our appreciation for
 their public spirit, we list here in alphabetical order a condensed
 list of their contributions.
 
-Aaron Larson: changed bibtex.el
+Aaron Hawley: changed files.el
 
-Aaron M. Ucko: changed mail-source.el message.el nnmail.el nnsoup.el
+Aaron Larson: changed bibtex.el
 
 Abraham Nahum: changed configure.in dgux4.h sysdep.c
 
 Abramo Bagnara: changed term.c
 
-Adam P. Jenkins: changed gnus-sum.el
+Adrian Colley: changed aix3-2.h
 
-Adrian Aichner: changed nnmail.el
+Adrian Lanz: changed mail-source.el
 
-Adrian Colley: changed aix3-2.h
+Aidan Kehoe: changed mm-util.el
 
 Ake Stenhoff: wrote imenu.el
 and changed cc-mode.el perl-mode.el
@@ -25,104 +25,143 @@ Aki Vehtari: changed bibtex.el gnus-art.el gnus-score.el gnus-sum.el
 
 Alakazam Petrofsky: changed hanoi.el
 
-Alan Shutko: changed diary-lib.el bindings.el cal-hebrew.el calendar.el
-  easy-mmode.el ibuf-ext.el ibuffer.el lunar.el solar.el
+Alan Mackenzie: wrote cc-awk.el
+and changed cc-engine.el cc-mode.el cc-fonts.el cc-cmds.el cc-vars.el
+  isearch.el search.texi buffers.texi cc-align.el cc-defs.el cc-langs.el
+  cc-mode-19.el cc-styles.el ebrowse.el emacs.texi fill.el frames.texi
+  page.el programs.texi regexp-opt.el simple.el text.texi
 
-Alastair Burt: changed smiley.el
+Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el
+  easy-mmode.el gnus-sum.el ibuf-ext.el ibuffer.el lunar.el macros.el
+  solar.el
 
-Albert: wrote rcompile.el
+Alastair Burt: changed gnus-art.el smiley.el
 
 Albert L. Ting: changed gnus-group.el mail-hist.el
 
+Alex Coventry: changed files.el
+
+Alex Ott: changed TUTORIAL.ru ispell.el ru-refcard.ps ru-refcard.tex
+
 Alex Rezinsky: wrote which-func.el
 
-Alex Schroeder: wrote ansi-color.el cus-theme.el master.el sql.el
-and changed comint.el goto-addr.el cus-edit.el cus-face.el custom.el
+Alex Schroeder: wrote ansi-color.el cus-theme.el master.el spam-stat.el
+  sql.el
+and changed comint.el custom.el goto-addr.el sending.texi smtpmail.texi
+  Makefile.in cmdargs.texi cus-edit.el cus-face.el misc.texi nnrss.el
+  xml.el
+
+Alexander Klimov: changed man.el
 
-Alexander Pohoyda: changed rmail.el sendmail.el
+Alexander Kreuzer: changed nnrss.el
+
+Alexander Pohoyda: changed rmailsum.el man.el rmail.el sendmail.el
 
 Alexander Zhuckov: changed ebrowse.c
 
 Alexandre Oliva: wrote gnus-mlspl.el
-and changed nnmail.el unexelf.c gnus.el format.el gnus-cus.el
-  gnus-mlsplt.el iris4d.h iris5d.h unexsgi.c
+and changed unexelf.c format.el iris4d.h iris5d.h unexsgi.c
+
+Alexandre Veyrenc: changed fr-refcard.tex
 
 Alfred Correira: changed generic-x.el
 
+Alfred M. Szmidt: changed compile.el
+
+Ami Fischman: changed calendar.el diary-lib.el
+
 Anders Holst: wrote hippie-exp.el
 
 Anders Lindgren: wrote autorevert.el cwarn.el follow.el
 and changed font-lock.el etags.c compile.el
 
 Andre Spiegel: changed vc.el vc-hooks.el vc-cvs.el vc-rcs.el vc-sccs.el
-  files.el dired.el ediff-util.el log-view.el startup.el viper-util.el
+  files.el dired.el files.texi cperl-mode.el ediff-util.el log-view.el
+  parse-time.el startup.el vc-arch.el vc-mcvs.el vc-svn.el viper-util.el
+
+Andre Srinivasan: changed gnus.texi
+
+Andreas B,A|(Bsching: changed emacsclient.c
+
+Andreas Fuchs: changed mml-sec.el
 
-Andrea Arcangeli: changed message.el
+Andreas Jaeger: changed gnus-msg.el gnus-start.el gnus-xmas.el
 
-Andreas Jaeger: changed gnus-cus.el gnus-msg.el gnus-start.el gnus-uu.el
-  gnus-xmas.el
+Andreas Leue: changed artist.el
 
 Andreas Luik: changed xfns.c xterm.c
 
-Andreas Schwab: changed Makefile.in files.el xdisp.c coding.c editfns.c
-  fns.c lisp.h alloc.c eval.c dired.el fileio.c simple.el keyboard.c
-  minibuf.c buffer.c emacs.c indent.c process.c xterm.c configure.in
-  cus-edit.el and 381 other files
+Andreas Schwab: changed Makefile.in files.el xdisp.c lisp.h alloc.c fns.c
+  coding.c configure.in dired.el editfns.c info.el eval.c fileio.c
+  print.c simple.el buffer.c keyboard.c minibuf.c xterm.c emacs.c
+  process.c and 435 other files
 
 Andrew Choi: wrote mac-win.el
-and changed macterm.c mac.c macfns.c macmenu.c INSTALL darwin.h sysdep.c
-  emacs.c macterm.h fontset.c xfaces.c README cw5-mcp.xml cw6-mcp.xml
-  frame.c keyboard.c macgui.h makefile.MPW Emacs.r Info.plist Makefile.in
-  and 60 other files
+and changed macterm.c mac.c macfns.c INSTALL macmenu.c darwin.h macterm.h
+  sysdep.c emacs.c fontset.c frame.c keyboard.c macgui.h xfaces.c Emacs.r
+  README cw5-mcp.xml cw6-mcp.xml dispextern.h make-package makefile.MPW
+  and 62 other files
+
+Andrew Cohen: changed dns.el
 
 Andrew Csillag: wrote m4-mode.el
 
 Andrew Hall: changed paren.el
 
-Andrew Innes: changed makefile.w32-in makefile.nt w32fns.c w32term.c
-  w32.c w32proc.c fileio.c gmake.defs dos-w32.el ms-w32.h nmake.defs
-  w32-fns.el w32term.h makefile.def unexw32.c w32menu.c w32xfns.c addpm.c
-  cmdproxy.c emacs.c w32-win.el and 134 other files
-
-Andrew J. Cosgriff: changed mm-view.el
+Andrew Innes: changed makefile.w32-in w32fns.c w32term.c w32.c w32proc.c
+  fileio.c gmake.defs dos-w32.el ms-w32.h nmake.defs w32-fns.el w32term.h
+  unexw32.c w32menu.c w32xfns.c addpm.c cmdproxy.c emacs.c w32-win.el
+  w32inevt.c configure.bat and 136 other files
 
 Andrew Oram: changed man/calendar.texi
   miscellaneous changes to files in man/
 
 Andy Norman: wrote ange-ftp.el
 
-Andy Piper: changed nnmail.el
+Andy Petrusenco: changed w32term.c
 
-Arisawa Akihiro: changed ps-print.el
+Ari Roponen: changed startup.el
+
+Arisawa Akihiro: changed ps-print.el time.el utf-8.el
 
 Arne Georg Gleditsch: changed gnus-sum.el
 
-Ashwin Ram: wrote refer.el
+Arne J,Ax(Brgensen: wrote latexenc.el
+and changed smime.el mm-decode.el mule-conf.el nnimap.el nnrss.el
+  wid-edit.el
 
-Atae@Spva.Physics.Imperial.Ac.Uk: wrote cdl.el
+Artem Chuprina: changed message.el
+
+Ashwin Ram: wrote refer.el
 
 Aubrey Jaffer: changed info.el
 
 Axel Boldt: changed ehelp.el electric.el
 
+B. Anyos: changed w32term.c
+
 Barry A. Warsaw: wrote assoc.el elp.el man.el regi.el reporter.el
   supercite.el
 and changed cc-mode.el cc-cmds.el cc-engine.el cc-langs.el cc-styles.el
   cc-vars.el c++-mode.el cc-menus.el cc-align.el cc-defs.el cplus-md1.el
   syntax.c syntax.h
 
-Ben Gertzfield: changed gnus-sum.el
+Barry Fishman: changed gnu-linux.h
 
 Ben Harris: changed configure.in
 
 Ben Key: changed w32.c w32fns.c w32menu.c makefile.w32-in w32.h w32term.c
   emacs.c gmake.defs ms-w32.h nmake.defs sound.c
 
+Ben North: changed fill.el lisp-mode.el
+
 Benjamin Drieu: wrote pong.el
 
-Benjamin Riefenstahl: changed mac-win.el macterm.c
+Benjamin Riefenstahl: changed emacs.c mac-win.el macterm.c ms-w32.h
+  mule-cmds.el runemacs.c tcl.el w32.c w32.h w32select.c
 
-Benjamin Rutt: changed simple.el
+Benjamin Rutt: changed vc.el diff-mode.el ffap.el nnmbox.el simple.el
+  vc-cvs.el
 
 Bill Burton: changed ptx.h sequent-ptx.h
 
@@ -130,6 +169,9 @@ Bill Carpenter: wrote feedmail.el (public domain)
 
 Bill Mann: changed configure.in unexaix.c ibmrs6000.h usg5-4-3.h
 
+Bill Perry: wrote url-dav.el url-gw.el url-http.el url-util.el url.el
+  vc-dav.el
+
 Bill Pringlemeir: changed messcompat.el
 
 Bill Richter: changed fill.el quail.el ccl.el encoded-kb.el fontset.el
@@ -141,14 +183,18 @@ Bill Rozas: wrote scheme.el
 and changed xscheme.el
 
 Bill Wohler: wrote mh-comp.el mh-customize.el mh-e.el mh-funcs.el
-  mh-mime.el mh-pick.el mh-seq.el mh-utils.el
-and changed mh-xemacs-compat.el MH-E-NEWS mh-index.el mh-speed.el
-  mh-alias.el mh-identity.el mh-loaddefs.el alias.pbm alias.xpm
-  execute.pbm execute.xpm makefile.nt makefile.w32-in mh-e page-down.pbm
-  page-down.xpm refile.pbm refile.xpm repack.pbm repack.xpm reply-all.pbm
-  and 14 other files
+  mh-loaddefs.el mh-mime.el mh-pick.el mh-seq.el mh-utils.el
+and changed mh-index.el MH-E-NEWS Makefile README mh-identity.el
+  mh-alias.el mh-speed.el mh-unit.el mh-xemacs-compat.el mh-junk.el
+  mh-inc.el mh-xemacs.el mh-gnus.el mh-init.el mh-xemacs-toolbar.el
+  ChangeLog mh-acros.el *.el *.pbm alias.pbm alias.xpm and 26 other files
+
+Bjorn Solberg: changed nnimap.el
 
-Bj,Av(Brn Torkelsson: changed message.el mm-util.el nnheader.el rfc2047.el
+Bj,Av(Brn Torkelsson: changed gnus-art.el gnus-group.el gnus-srvr.el
+  gnus-sum.el gnus-mlspl.el gnus-msg.el message.el dgnushack.el
+  gnus-agent.el gnus-cus.el gnus-gl.el gnus-nocem.el gnus-score.el
+  gnus-topic.el gnus.el mail-source.el nnmail.el
 
 Blitz Product Development Corporation: wrote ispell.el
 
@@ -168,11 +214,13 @@ and changed fill.el simple.el indent.el paragraphs.el cmds.c intervals.c
   text-mode.el textprop.c ada.el allout.el awk-mode.el bibtex.el buffer.c
   buffer.h c-mode.el and 38 other files
 
+Boyd Lynn Gerber: changed configure.in
+
 Brad Howes: changed gnus-demon.el
 
 Brad Miller: wrote gnus-gl.el
 
-Brendan Kehoe: changed gnus-sum.el hpux9.h
+Brendan Kehoe: changed hpux9.h
 
 Brian D. Carlstrom: changed gud.el smtpmail.el
 
@@ -191,7 +239,7 @@ Brian Preble: changed abbrev.el apropos.el asm-mode.el doctex.el
 
 Bryan O'sullivan: changed ange-ftp.el
 
-Bryan P. Johnson: changed gnus-group.el
+Bzyl Wlodzimierz: changed latin-pre.el
 
 Caleb Deupree: changed winnt.el
 
@@ -199,27 +247,32 @@ Carl D. Roth: changed gnus-nocem.el
 
 Carsten Bormann: changed ibmrs6000.h
 
-Carsten Dominik: wrote idlw-rinfo.el idlw-shell.el idlw-toolbar.el
-  idlwave.el reftex-auc.el reftex-cite.el reftex-dcr.el reftex-global.el
+Carsten Dominik: wrote idlw-complete-structtag.el idlw-toolbar.el org.el
+  reftex-auc.el reftex-cite.el reftex-dcr.el reftex-global.el
   reftex-index.el reftex-parse.el reftex-ref.el reftex-sel.el
   reftex-toc.el reftex-vars.el reftex.el
-and changed reftex-vcr.el bibtex.el files.el idlwave-rinfo.el
-  idlwave-shell.el idlwave-toolbar.el reftex.texi
-
-Carsten Leonhardt: changed mail-source.el nnmail.el
-
-Castor: changed nntp.el
+and changed org.texi idlw-shell.el idlwave.el idlw-rinfo.el reftex.texi
+  diary-lib.el reftex-vcr.el bibtex.el bookmark.el files.el
+  idlwave-rinfo.el idlwave-shell.el idlwave-toolbar.el
 
 Caveh Jalali: changed configure.in intel386.h sol2-4.h
 
 Changwoo Ryu: changed files.el
 
+Chao-Hong Liu: changed TUTORIAL.cn TUTORIAL.zh
+
 Charles Hannum: changed aix3-1.h aix3-2.h configure ibmrs6000.h
   keyboard.c netbsd.h pop.c sysdep.c systime.h systty.h xrdb.c
 
 Charlie Martin: wrote autoinsert.el
 
-Chris Brierley: changed gnus-sum.el
+Cheng Gao: changed MORE.STUFF flymake.el tips.texi
+
+Chong Yidong: changed text.texi files.texi dired.texi display.texi
+  anti.texi frames.texi longlines.el misc.texi positions.texi ack.texi
+  buff-menu.el building.texi calendar.texi custom.el custom.texi
+  emacs.texi help.texi minibuf.texi modes.texi mule.texi nonascii.texi
+  and 26 other files
 
 Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c
   hp9000s300.h keyboard.c process.c texinfmt.el emacsclient.c sort.el
@@ -237,31 +290,33 @@ Christian Plaunt: wrote soundex.el
 
 Christian Von Roques: changed gnus-start.el
 
-Christoph Conrad: changed gnus-draft.el qp.el
-
-Christoph Rohland: changed rfc2047.el
+Christoph Conrad: changed qp.el
 
 Christoph Wedler: wrote antlr-mode.el
-and changed gnus-art.el gnus-picon.el message.el register.el smiley.el
+and changed format.el gnus-art.el gnus-picon.el message.el register.el
+  smiley.el texinfmt.el
 
 Christopher J. Madsen: wrote decipher.el
-and changed files.el replace.el time.el
+and changed files.el ispell.el replace.el time.el
+
+Chunyu Wang: changed pcl-cvs.texi
 
-Colin Rafferty: changed message.el gnus-art.el gnus-sum.el
+Colin Marquardt: changed gnus.el message.el
+
+Colin Rafferty: changed message.el
 
 Colin Walters: wrote ibuf-ext.el ibuf-macs.el ibuffer.el
 and changed calc.el replace.el update-game-score.c calc-ext.el
   calc-misc.el Makefile.in calc-macs.el calc-mode.el calc-graph.el
   gamegrid.el calc-aent.el calc-bin.el calc-embed.el calc-keypd.el
   calc-math.el calc-prog.el calc-units.el calcalg2.el font-core.el
-  info.el calc-alg.el and 75 other files
-
-Conrad Sauerwald: changed mm-decode.el
+  info.el calc-alg.el and 78 other files
 
-Daiki Ueno: wrote starttls.el
-and changed imap.el gnus-sum.el
+Daiki Ueno: wrote pgg-def.el pgg-gpg.el pgg-parse.el pgg-pgp.el
+  pgg-pgp5.el pgg.el starttls.el
+and changed gnus-agent.el mml2015.el
 
-Dale Hagglund: changed gnus-art.el gnus-sum.el mm-decode.el unexelf.c
+Dale Hagglund: changed unexelf.c
 
 Dale R. Worley: wrote emerge.el (public domain)
 
@@ -269,32 +324,42 @@ Dale Worley: changed mail-extr.el
 
 Damon Anton Permezel: wrote hanoi.el (public domain)
 
-Dan Christensen: changed gnus-score.el nnfolder.el gnus-art.el
-  gnus-group.el nnmail.el
+Dan Christensen: changed nnfolder.el gnus-art.el gnus-group.el
+  gnus-score.el gnus-sum.el nnmail.el
 
 Dan Nicolaescu: wrote iris-ansi.el romanian.el
-and changed hideshow.el icon.el isearch.el bindings.el cus-edit.el
-  dabbrev.el imenu.el outline.el speedbar.el abbrev.el autoload.el
-  cus-dep.el files.el generic.el iswitchb.el pc-select.el rsz-mini.el
-  subr.el term.el vhdl-mode.el autoinsert.el and 43 other files
+and changed hideshow.el term.el xterm.el icon.el isearch.el cus-edit.el
+  eterm.ti eterm sh-script.el vhdl-mode.el bindings.el compile.el
+  dabbrev.el faces.el grep.el imenu.el outline.el replace.el simple.el
+  speedbar.el abbrev.el and 112 other files
+
+Daniel Brockman: changed ibuffer.el
 
 Daniel Laliberte: wrote cl-specs.el cust-print.el edebug.el hideif.el
   isearch.el
 and changed mlconvert.el eval-region.el
 
-Daniel Pfeiffer: wrote copyright.el executable.el sh-script.el
-  skeleton.el two-column.el wyse50.el
-and changed apropos.el mpuz.el autoinsert.el facemenu.el gomoku.el
-  sgml-mode.el autoload.el buff-menu.el help.el mailalias.el sendmail.el
-  tex-mode.el
+Daniel M Coffman: changed arc-mode.el
+
+Daniel N,Ai(Bri: changed message.el
+
+Daniel Ortmann: changed paragraphs.el
+
+Daniel Pfeiffer: wrote conf-mode.el copyright.el executable.el
+  sh-script.el skeleton.el two-column.el wyse50.el
+and changed compile.el files.el make-mode.el apropos.el buff-menu.el
+  font-lock.el grep.el mpuz.el sgml-mode.el autoinsert.el cperl-mode.el
+  facemenu.el gomoku.el help.el imenu.el autoload.el autorevert.el
+  bindings.el button.el cc-fonts.el cc-mode.el and 12 other files
 
 Daniel Pittman: wrote tramp-vc.el
+and changed gnus-sum.el
 
 Daniel Quinlan: changed dired.el info.el
 
 Danny Roozendaal: wrote handwrite.el
 
-Danny Siu: changed gnus-picon.el nndoc.el smiley.el
+Danny Siu: changed gnus-picon.el gnus-sum.el nndoc.el nnimap.el smiley.el
 
 Darren Stalder: changed gnus-util.el
 
@@ -304,45 +369,59 @@ Dave Edmondson: changed message.el
 
 Dave Lambert: changed sol2-5.h xfns.c xterm.c xterm.h
 
-Dave Love: wrote autoarg.el autoconf.el code-pages.el elide-head.el
-  georgian.el hl-line.el latin-8.el latin-9.el latin1-disp.el refill.el
-  rfc1345.el sgml-input.el smiley-ems.el subst-big5.el subst-gb2312.el
-  subst-jis.el subst-ksc.el tool-bar.el ucs-tables.el uni-input.el
-  utf-16.el utf-8-lang.el welsh.el
-and changed help.el Makefile.in configure.in fortran.el browse-url.el
-  mule-cmds.el gnus-art.el simple.el cus-edit.el info.el files.el
-  message.el mule.el vc.el wid-edit.el xterm.c buffer.c byte-opt.el
-  config.in fns.c imenu.el and 673 other files
+Dave Love: wrote autoarg.el autoconf.el benchmark.el cfengine.el
+  code-pages.el elide-head.el georgian.el hl-line.el latin-8.el
+  latin-9.el latin1-disp.el python.el refill.el rfc1345.el sgml-input.el
+  smiley.el subst-big5.el subst-gb2312.el subst-jis.el subst-ksc.el
+  tool-bar.el ucs-tables.el uni-input.el utf-16.el utf-7.el utf-8-lang.el
+  welsh.el
+and changed configure.in Makefile.in help.el fortran.el browse-url.el
+  mule-cmds.el simple.el xterm.c cus-edit.el files.el info.el mule.el
+  wid-edit.el vc.el fns.c rfc2047.el bindings.el cus-start.el buffer.c
+  byte-opt.el bytecomp.el and 728 other files
 
 Dave Pearson: wrote 5x5.el quickurl.el
 
-David Aspinwall: changed gnus-art.el
+David A. Capello: changed etags.c
+
+David Abrahams: changed coding.c
 
 David Bakhash: wrote strokes.el
 
 David Byers: changed minibuf.c
 
-David Edmondson: changed gnus.el
+David Casperson: changed menu-bar.el tex-mode.el
+
+David Edmondson: changed message.el gnus-cite.el imap.el mm-view.el
 
 David Gillespie: wrote calc-aent.el calc-alg.el calc-arith.el calc-bin.el
   calc-comb.el calc-cplx.el calc-embed.el calc-ext.el calc-fin.el
   calc-forms.el calc-frac.el calc-funcs.el calc-graph.el calc-help.el
-  calc-incom.el calc-keypd.el calc-lang.el calc-macs.el calc-maint.el
-  calc-map.el calc-math.el calc-misc.el calc-mode.el calc-mtx.el
-  calc-poly.el calc-prog.el calc-rewr.el calc-rules.el calc-sel.el
-  calc-stat.el calc-store.el calc-stuff.el calc-trail.el calc-undo.el
-  calc-units.el calc-vec.el calc-yank.el calc.el calcalg2.el calcalg3.el
-  calccomp.el calcsel2.el cl-compat.el cl-extra.el cl-macs.el cl-seq.el
-  cl.el cl.texinfo complete.el edmacro.el
+  calc-incom.el calc-keypd.el calc-lang.el calc-macs.el calc-map.el
+  calc-math.el calc-misc.el calc-mode.el calc-mtx.el calc-poly.el
+  calc-prog.el calc-rewr.el calc-rules.el calc-sel.el calc-stat.el
+  calc-store.el calc-stuff.el calc-trail.el calc-undo.el calc-units.el
+  calc-vec.el calc-yank.el calc.el calcalg2.el calcalg3.el calccomp.el
+  calcsel2.el cl-compat.el cl-extra.el cl-macs.el cl-seq.el cl.el
+  cl.texinfo complete.el edmacro.el
 and changed info.el bytecomp.el
 
+David Hansen: changed nnrss.el tempo.el
+
+David Herring: changed comint.el
+
+David Hunter: changed config.nt flymake.el ms-w32.h process.c
+
 David J. Mackenzie: changed configure.in etags.c fakemail.c movemail.c
   wakeup.c Makefile cvtmail.c qsort.c termcap.c yow.c Makefile.in
   avoid.el b2m.c digest-doc.c emacsclient.c emacsserver.c emacstool.c
   etags-vmslib.c fortran.el hexl.c isearch.el and 12 other files
 
-David Kastrup: changed calc.el Makefile.in ange-ftp.el autoload.el
-  calc-alg.el configure.in mouse-drag.el window.c
+David Kastrup: changed greek.el replace.el search.c ange-ftp.el calc.el
+  faq.texi meta-mode.el process.c search.texi DEBUG MAILINGLISTS
+  Makefile.in autoload.el browse-url.el buffer.c building.texi
+  calc-alg.el configure.in cus-theme.el desktop.el easymenu.el
+  and 18 other files
 
 David K,Ae(Bgedal: wrote tempo.el
 and changed sendmail.el xmenu.c
@@ -352,8 +431,6 @@ David Lawrence: changed loaddefs.el comint.el simple.el files.el
   Makefile c-mode.el cl.el dired.el emacs.1 emacsserver.c emerge.el
   gnus.el history.el lisp-mode.el lisp.el and 78 other files
 
-David M Smith: changed ielm.el
-
 David M. Brown: wrote array.el
 
 David M. Koppelman: wrote hi-lock.el
@@ -361,6 +438,8 @@ David M. Koppelman: wrote hi-lock.el
 David M. Smith: wrote ielm.el
 and changed imenu.el
 
+David Mccabe: changed lisp-mode.el
+
 David Megginson: wrote derived.el
 and changed mode-clone.el
 
@@ -372,17 +451,26 @@ David Mosberger-Tang: changed alpha.h unexelf.c cm.h config.in
   fakemail.c keyboard.c mem-limits.h process.c profile.c sorted-doc.c
   sysdep.c terminfo.c unexelf1.c yow.c
 
-David Ponce: wrote recentf.el ruler-mode.el
-and changed w32menu.c bytecomp.el emacs.rc makefile.w32-in w32fns.c
-  w32term.c
+David Ponce: wrote recentf.el ruler-mode.el tree-widget.el
+and changed w32menu.c w32term.c keyboard.c bytecomp.el callint.c
+  commands.texi cus-edit.el emacs.rc fileio.c files.el lread.c
+  makefile.w32-in mouse.el print.c termhooks.h tree-widget w32fns.c
+  which-func.el wid-edit.el windows.texi
+
+David Reitter: changed menu-bar.el url-http.el
 
 David Robinson: changed menu-bar.el x-win.el
 
-David S. Goldberg: changed mm-decode.el emacs-mime.texi gnus-art.el
+David S. Goldberg: changed gnus-art.el
+
+David Z. Maze: changed nnrss.el
+
+Davis Herring: changed isearch.el
 
 Decklin Foster: changed nngateway.el
 
-Deepak Goel: changed README calc.el doctor.el snake.el
+Deepak Goel: changed README appt.el calc-forms.el calc.el diary-lib.el
+  doctor.el snake.el
 
 Denis Howe: wrote browse-url.el
 
@@ -390,15 +478,23 @@ Derek L. Davies: changed gud.el
 
 Detlev Zundel: wrote re-builder.el
 
+Dhruva Krishnamurthy: changed makefile.w32-in
+
+Diane Murray: changed rmail-spam-filter.el rmail.el
+
 Dick King: wrote uniquify.el
 
-Didier Verna: changed gnus-picon.el gnus-msg.el gnus-start.el nnmail.el
-  rect.el binhex.el gnus-art.el gnus-spec.el gnus-sum.el gnus.el
-  gnus.texi message.el mm-bodies.el mm-util.el
+Didier Verna: wrote gnus-diary.el nndiary.el
+and changed nntp.el gnus-art.el gnus-msg.el gnus-group.el gnus-start.el
+  gnus-sum.el gnus-xmas.el gnus-picon.el gnus-salt.el cus-edit.el rect.el
+  dgnushack.el gnus-agent.el gnus-ems.el gnus-fun.el gnus-topic.el
+  message.el nnmail.el nnmbox.el smiley.el
 
 Dirk Herrmann: changed bibtex.el
 
-Dirk Meyer: changed gnus-demon.el
+Dmitry Antipov: changed keyboard.c
+
+Dominique De Waleffe: changed pcvs-info.el
 
 Don Morrison: wrote dabbrev.el
 
@@ -406,35 +502,45 @@ Don Woods: changed replace.el
 
 Doug Cutting: wrote disass.el
 
-Dr Francis J. Wright: changed comint.el
-
 Drew Csillag: changed m4-mode.el
 
 E. Jay Berkenbilt: changed flyspell.el ispell.el window.h
 
+Ed L. Cashin: changed gnus-sum.el imap.el
+
+Ed Swarthout: changed hexl.el
+
+Eduardo Mu,Aq(Boz: changed dired.el ls-lisp.el
+
 Edward M. Reingold: wrote cal-china.el cal-coptic.el cal-french.el
   cal-islam.el cal-iso.el cal-julian.el cal-menu.el cal-move.el
   cal-persia.el calendar.el diary-lib.el holidays.el lunar.el solar.el
 and changed diary.el tex-mode.el cal-tex.el cal-mayan.el holiday.el
   cal-x.el cal-hebrew.el cal-chinese.el cal-dst.el diary-ins.el
-  diary-insert.el cal-persian.el cal-islamic.el list-holidays.el
+  diary-insert.el cal-persian.el cal-islamic.el calendar.texi
+  list-holidays.el
+
+Edwin Steiner: changed gnus-nocem.el
 
-Ehud Karni: changed aviion-intel.h configure.in
+Ehud Karni: changed rmail.el aviion-intel.h compile.el complete.el
+  configure.in frame.el rmailsum.el sort.el xdisp.c
 
 Eirik Fuller: changed ralloc.c xterm.c
 
 Eli Barzilay: wrote calculator.el
 
-Eli Zaretskii: wrote codepage.el rxvt.el tty-colors.el
-and changed msdos.c Makefile.in info.el files.el mainmake.v2 fileio.c
-  pc-win.el startup.el internal.el msdos.h config.bat dosfns.c xfaces.c
-  faces.el frame.c frame.el menu-bar.el simple.el w16select.c xdisp.c
-  sed2.inp and 348 other files
+Eli Tziperman: wrote rmail-spam-filter.el
 
-Emerick Rogul: changed message.el
+Eli Zaretskii: wrote codepage.el rxvt.el tty-colors.el
+and changed msdos.c Makefile.in files.el info.el fileio.c mainmake.v2
+  config.bat pc-win.el startup.el internal.el msdos.h simple.el xfaces.c
+  dosfns.c menu-bar.el faces.el frame.c frame.el rmail.el makefile.w32-in
+  w16select.c and 430 other files
 
-Emilio Lopes: changed help.el apropos.el bookmark.el fortran.el
-  hscroll.el iso-acc.el process.c window.el
+Emilio C. Lopes: changed cmuscheme.el help.el woman.el apropos.el
+  bookmark.el cal-menu.el calendar.el calendar.texi display.texi
+  emacsclient.1 esh-cmd.el fortran.el hscroll.el iso-acc.el lisp.el
+  process.c window.el
 
 Emmanuel Briot: wrote ada-prj.el xml.el
 and changed ada-mode.el ada-stmt.el ada-xref.el
@@ -444,11 +550,15 @@ Enami Tsugutomo: changed frame.c keyboard.c dispnew.c fileio.c process.c
   frame.h gnus-group.el perl-mode.el rmailsum.el sysdep.c vc.el window.c
   window.el
 
+Era Eriksson: changed dired.el shell.el
+
 Eric Decker: changed hp9000s800.h hpux.h sysdep.c
 
 Eric Ding: wrote goto-addr.el
+and changed mh-utils.el mh-comp.el mh-e.el mh-mime.el
 
-Eric Hanchrow: changed emacsclient.c
+Eric Hanchrow: changed TUTORIAL.es abbrev.el autorevert.el dired.el
+  emacsclient.c make-dist
 
 Eric M. Ludlam: wrote checkdoc.el speedbar.el
 and changed info.el rmail.el speedbspec.el gud.el Makefile.in comint.el
@@ -456,14 +566,14 @@ and changed info.el rmail.el speedbspec.el gud.el Makefile.in comint.el
   sb-dir-plus.xpm sb-dir.xpm sb-file+.xpm sb-file-.xpm sb-file.xpm
   sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm sb-pg.xpm and 9 other files
 
-Eric Marsden: changed nnslashdot.el gnus-art.el
+Eric Marsden: changed url-util.el
 
 Eric S. Raymond: wrote AT386.el asm-mode.el cookie1.el finder.el gud.el
   keyswap.el lisp-mnt.el loadhist.el
-and changed vc.el Makefile.in files.el NEWS comint.el loaddefs.el
-  simple.el vc-hooks.el cust-print.el dired.el emacsbug.el help.el
-  isearch.el makefile.el tex-mode.el x-win.el bibtex.el buff-menu.el
-  bytecomp.el c-mode.el cmulisp.el and 219 other files
+and changed vc.el Makefile.in files.el comint.el loaddefs.el simple.el
+  vc-hooks.el cust-print.el dired.el emacsbug.el help.el isearch.el
+  makefile.el tex-mode.el x-win.el bibtex.el buff-menu.el bytecomp.el
+  c-mode.el cmulisp.el cmuscheme.el and 217 other files
 
 Eric Youngdale: changed etags-vmslib.c
 
@@ -472,68 +582,69 @@ Erik Naggum: wrote disp-table.el latin-4.el latin-5.el mailheader.el
 and changed simple.el emacs.c files.el lread.c rmail.el alloc.c editfns.c
   keyboard.c apropos.el configure.in dispnew.c filelock.c fns.c keymap.c
   lisp.h print.c process.c add-log.el buffer.c casetab.c cl-macs.el
-  and 111 other files
+  and 112 other files
 
-Erik Toubro Nielsen: changed gnus-sum.el gnus-topic.el gnus-util.el
+Erik Toubro Nielsen: changed gnus-sum.el gnus-topic.el
 
 Espen Skoglund: wrote pascal.el
 
 Ethan Bradford: changed ispell.el ange-ftp.el gnus.el gnuspost.el lpr.el
   mailalias.el vt-control.el
 
-Ettore Perazzoli: changed mail-source.el
-
 Eugene Exarevsky: changed sql.el
 
-Evgeny Roubinchtein: changed pc-select.el
+Evgeni Dobrev: changed man.el
+
+Evgeny Roubinchtein: changed mail-source.el pc-select.el
 
 F. Thomas May: wrote blackbox.el
 
 Fabrice Bauzac: changed dired-aux.el
 
-Fabrice Popineau: changed etags.c gnus-cache.el gnus-score.el
+Fabrice Popineau: changed etags.c gnus-cache.el
 
-Felix Lee: changed nntp.el flyspell.el gnus-async.el outline.el
-  compile.el data.c gnus.el gud.el process.c vc.el xdisp.c
+Felix Lee: changed flyspell.el outline.el compile.el data.c gud.el
+  nntp.el process.c vc.el xdisp.c
+
+Ferenc Wagner: changed nnweb.el
 
 Flemming Hoejstrup Hansen: changed forms.el
 
-Florian Weimer: changed gnus-msg.el mm-bodies.el message.el mm-util.el
-  mml.el mailcap.el rfc2047.el gnus-cite.el gnus-score.el gnus-spec.el
-  gnus-uu.el mm-encode.el nnultimate.el qp.el
+Florian Weimer: changed message.el coding.c gnus-art.el gnus.el gnus.texi
+  mm-util.el
 
 Francesco Potort,Al(B: wrote cmacexp.el
-and changed etags.c man.el delta.h uniquify.el latin-post.el latin-alt.el
-  rmail.el sgml-mode.el Makefile.in comint.el configure.in etags.1
-  filelock.c gud.el hanoi.el mailalias.el sendmail.el simple.el
-  skeleton.el vc-hooks.el b2m.c undigest.el etags.el data.c
-  generic-x.el tetris.el admin.el ange-ftp.el configure.in delta.h
-  dired-aux.el dos-w32.el etags.1 fileio.c files.el fns.c
-  maintaining.texi make-announcement make-tarball.txt mule.el pong.el
-  and 21 other files
+and changed etags.c man.el delta.h undigest.el comint.el configure.in
+  uniquify.el latin-post.el rmail.el etags.1 etags.el latin-alt.el
+  sgml-mode.el Makefile.in data.c european.el filelock.c files.el
+  generic-x.el gud.el hanoi.el and 41 other files
 
 Francis J. Wright: wrote woman.el
+and changed dired.el comint.el files.el
 
-Francis Litterio: changed gnus-group.el saveplace.el
-
-Francis Wright: changed dired.el
+Francis Litterio: changed keymaps.texi message.el os.texi saveplace.el
 
-Francisco Solsona: changed message.el
-
-Francois Felix Ingrand: changed gnus-salt.el gnus-start.el
+Francois Felix Ingrand: changed gnus-salt.el
 
 Frank Bennett: changed nnmail.el
 
 Frank Bresz: wrote diff.el
 
+Frank Schmitt: changed gnus-sum.el
+
+Frank Weinberg: changed gnus-art.el
+
 Fran,Ag(Bois Pinard: changed nndoc.el allout.el bytecomp.el gnus-sum.el
-  gnus-util.el gnus-uu.el gnus-win.el make-mode.el nnmail.el rmailsum.el
-  timezone.el
+  gnus-util.el gnus-uu.el make-mode.el nnmail.el rmailsum.el timezone.el
+
+Fran,Ag(Bois-David Collin: changed message.el mm-decode.el
 
 Fred Fish: changed linux.h unexec.c
 
 Fred Oberhauser: changed nnmail.el
 
+Frederic Han: changed iso-cvt.el
+
 Frederic Lepied: wrote expand.el
 and changed gnus.el
 
@@ -543,11 +654,16 @@ and changed xmenu.c xterm.c xfns.c dpx2.h lwlib.c rmailsum.el rmail.el
   lwlib-Xaw.h lwlib-int.h xdisp.c compile.el editfns.c fns.c frame.h
   hilit19.el and 9 other files
 
+Frederik Fouvry: changed sendmail.el TUTORIAL.nl emacs.bash faces.el
+  filecache.el mailalias.el rmail.el thumbs.el
+
 Fritz Knabe: changed mh-mime.el
 
+Fr,Ai(Bd,Ai(Bric Bothamy: changed TUTORIAL.fr
+
 G Dinesh Dutt: changed etags.el
 
-Gareth Jones: changed gnus-art.el gnus-score.el
+Gareth Jones: changed fns.c gnus-score.el
 
 Garrett Wollman: changed sendmail.el
 
@@ -558,39 +674,51 @@ and changed gnus-group.el gnus-topic.el
 
 Gary Delp: wrote mailpost.el (public domain)
 
+Gary Howell: changed server.el
+
 Gary Oberbrunner: changed gud.el
 
 Gary Wong: changed termcap.c tparam.c
 
+Gaute B Strokkenes: changed process.c
+
 Geoff Voelker: wrote lisp/makefile.nt nt.c nt.h ntheap.c ntheap.h
   ntinevt.c ntproc.c ntterm.c src/makefile.nt w32-fns.el windowsnt.h
   winnt.el
-and changed makefile.nt w32.c w32fns.c fileio.c w32heap.c w32term.c
-  makefile.def w32inevt.c callproc.c s/ms-w32.h w32proc.c unexw32.c
-  w32term.h dos-w32.el emacs.bat loadup.el w32-win.el emacs.c keyboard.c
-  process.c w32console.c and 108 other files
+and changed w32.c w32fns.c fileio.c w32heap.c w32term.c w32inevt.c
+  callproc.c s/ms-w32.h w32proc.c unexw32.c w32term.h dos-w32.el
+  emacs.bat loadup.el w32-win.el emacs.c keyboard.c process.c
+  w32console.c addpm.c cmdproxy.c and 107 other files
 
-George V. Reilly: changed emacs.ico makefile.nt
+George V. Reilly: changed emacs.ico
 
 Georges Brun-Cottan: wrote easy-mmode.el
 
 Gerd Moellmann: wrote authors.el ebrowse.el jit-lock.el rx.el tooltip.el
 and changed xdisp.c xterm.c dispnew.c dispextern.h xfns.c xfaces.c
-  window.c keyboard.c lisp.h faces.el Makefile.in alloc.c buffer.c
+  window.c keyboard.c lisp.h Makefile.in faces.el alloc.c buffer.c
   startup.el xterm.h fns.c simple.el term.c configure.in frame.c xmenu.c
-  and 618 other files
+  and 622 other files
 
 Germano Caronni: changed ralloc.c
 
 Gernot Heiser: changed refer.el
 
-Glenn Morris: changed f90.el fortran.el scroll-all.el files.el
-  timeclock.el autoinsert.el calendar.el imenu.el startup.el
+Giuseppe Scrivano: changed buffer.c configure configure.in sysdep.c
+  xsmfns.c
+
+Glenn Morris: changed f90.el diary-lib.el fortran.el calendar.el
+  calendar.texi appt.el sh-script.el timeclock.el cal-hebrew.el
+  cal-islam.el cal-menu.el files.el programs.texi scroll-all.el
+  startup.el cal-coptic.el cal-julian.el cal-move.el cal-x.el
+  display.texi emacs-xtra.texi and 37 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
 Gordon Matzigkeit: changed gnus-uu.el
 
+Greg Hill: changed bytecomp.el
+
 Greg Hudson: changed configure.in indent.c
 
 Greg Klanderman: changed messagexmas.el
@@ -602,6 +730,10 @@ Greg Stark: changed gnus-ems.el timezone.el
 Gregor Schmid: wrote tcl-mode.el
 and changed intervals.c intervals.h textprop.c dispnew.c indent.c xdisp.c
 
+Gregorio Gervasio, Jr.: changed gnus-sum.el
+
+Gregory Chernov: changed nnslashdot.el
+
 Gregory Neil Shapiro: changed mailabbrev.el
 
 Guillermo J. Rozas: wrote fakemail.c
@@ -612,11 +744,12 @@ Gustav H,Ae(Bllberg: changed compile.el
 
 Guy Geens: changed gnus-score.el
 
-Gvran Uddeborg: changed isc4-1.h
+G,Av(Bran Uddeborg: changed isc4-1.h
+
+Hallvard B. Furuseth: changed gnus-util.el editfns.c gnus-cache.el
+  gnus-sum.el lread.c messcompat.el nntp.el print.c process.c search.c
 
-Hallvard B. Furuseth: changed gnus-sum.el gnus-util.el editfns.c
-  gnus-cache.el lread.c mailcap.el messcompat.el mm-bodies.el mm-util.el
-  nntp.el print.c process.c rfc2047.el search.c
+Han Boetes: changed netbsd.h
 
 Han-Wen Nienhuys: changed emacsclient.c server.el
 
@@ -629,14 +762,18 @@ Harald Maier: changed w32heap.c
 
 Heiko Muenkel: changed b2m.c
 
+Helmut Waitzmann: changed gnus.texi
+
 Henrik Enberg: changed lread.c
 
 Henry Guillaume: wrote find-file.el
 
-Henry Kautz: wrote refbib.el
+Henry Kautz: wrote bib-mode.el refbib.el
 
 Hewlett-Packard: changed emacsclient.c emacsserver.c keyboard.c server.el
 
+Hiroshi Fujishima: changed faq.texi
+
 Hiroshi Nakano: changed ralloc.c unexelf.c
 
 Holger Schauer: wrote fortune.el
@@ -651,13 +788,15 @@ Howard Melman: changed imenu.el picture.el
 
 Howie Kaye: wrote sort.el
 
-Hrvoje Niksic: changed message.el gnus-art.el mml.el gnus-xmas.el
-  mm-decode.el nnmail.el fileio.c fns.c gnus-salt.el gnus-spec.el
-  gnus-sum.el mm-bodies.el uudecode.el add-log.el appt.el arc-mode.el
-  avoid.el binhex.el bookmark.el cal-china.el cal-tex.el
-  and 90 other files
-
 Hrvoje Nik,B9(Bi,Bf(B: wrote croatian.el
+and changed gnus-xmas.el message.el nnmail.el fileio.c fns.c gnus-art.el
+  gnus-salt.el gnus-spec.el mm-decode.el add-log.el appt.el arc-mode.el
+  avoid.el bookmark.el cal-china.el cal-tex.el calendar.el cl-indent.el
+  cmacexp.el comint.el compile.el and 83 other files
+
+H,Ae(Bkan Granath: changed dired.el
+
+H,Ae(Bkon Malmedal: changed calendar.el holidays.el
 
 Ian Lance Taylor: changed sco4.h
 
@@ -666,6 +805,8 @@ and changed ange-ftp.el desktop.el tex-mode.el
 
 Ilja Weis: wrote gnus-topic.el
 
+Ilya N. Golubev: changed shell.el
+
 Ilya Zakharevich: wrote tmm.el
 and changed syntax.c cperl-mode.el syntax.h textprop.c dired.c
   font-lock.el interval.c intervals.c intervals.h regex.c regex.h
@@ -677,8 +818,8 @@ Indiana University Foundation: changed buffer.c buffer.h indent.c
   region-cache.c region-cache.h search.c xdisp.c
 
 Inge Frick: changed easymenu.el keyboard.c view.el compile.el
-  dired-aux.el arc-mode.el dired.el files.el keyboard.h keymap.c
-  tar-mode.el window.el xmenu.c
+  dired-aux.el arc-mode.el dired.el files.el gnus-sum.el keyboard.h
+  keymap.c tar-mode.el window.el xmenu.c
 
 Inoue Seiichiro: changed xterm.c xfns.c xterm.h
 
@@ -687,36 +828,33 @@ International Business Machines: changed emacs.c fileio.c ibmrt-aix.h
 
 Ishikawa Chiaki: changed aviion.h dgux.h
 
-Istvan Marko: changed gnus-agent.el mm-decode.el
+Istvan Marko: changed gnus-agent.el xfns.c
 
-Ivan Zakharyaschev: changed codepage.el
+Ivan Zakharyaschev: changed codepage.el lread.c
 
 Ivar Rummelhoff: wrote winner.el
 
 Iwamuro Motonori: changed gnus-kill.el
 
-J.D. Smith: changed idlw-rinfo.el idlw-shell.el idlw-toolbar.el
-  idlwave.el
-
-Jaap-Henk Hoepman: changed gnus-msg.el
+J.D. Smith: wrote idlw-rinfo.el
+and changed idlwave.el idlw-shell.el idlw-toolbar.el idlw-help.el
 
 Jack Repenning: changed unexelfsgi.c
 
-Jack Vinson: changed mailcap.el
+Jack Twilley: changed message.el
 
 Jacques Duthen: changed ps-print.el
 
-Jaeyoun Chung: changed hangul3.el hanja3.el gnus-mule.el gnus.el
-  hangul.el
+Jaeyoun Chung: changed hangul3.el hanja3.el gnus-mule.el hangul.el
 
 James Clark: wrote sgml-mode.el
-and changed window.c xselect.c
+and changed fns.c window.c xselect.c
 
-James H. Cloos, Jr.: changed gnus-art.el gnus-sum.el
+James Cloos: changed url-history.el
 
 James R. Larus: wrote mh-e.el
 
-James Thompson: changed ps-print.el
+James R. Van Zandt: changed sh-script.el
 
 James Troup: changed gnus-sum.el
 
@@ -726,38 +864,47 @@ Jamie Zawinski: wrote byte-opt.el byte-run.el bytecomp.el disass.el
   mailabbrev.el tar-mode.el
 and changed bytecode.c mail-extr.el subr.el
 
-Jan Dj,Ad(Brv: changed xterm.c gtkutil.c xfns.c xterm.h configure.in
-  keyboard.c startup.el x-win.el xmenu.c Makefile.in config.in emacs.c
-  gtkutil.h lisp.h lwlib-Xm.c xlwmenu.c Activate.c DEBUG INSTALL alloc.c
-  authors.el and 8 other files
+Jan Dj,Ad(Brv: wrote dnd.el x-dnd.el
+and changed gtkutil.c xterm.c xfns.c xmenu.c xterm.h gtkutil.h
+  configure.in Makefile.in config.in keyboard.c configure frames.texi
+  xselect.c emacs.c alloc.c xdisp.c xlwmenu.c fileio.c frame.c x-win.el
+  xfaces.c and 158 other files
 
-Jan Nieuwenhuizen: changed emacs.c emacsclient.c server.el startup.el
+Jan Nieuwenhuizen: changed info.el TUTORIAL.nl emacs.c emacsclient.c
+  gud.el nnmh.el server.el startup.el
 
 Jan Schormann: wrote solitaire.el
 
-Jan Vroonhof: changed gnus-cite.el gnus-msg.el message.el nntp.el
+Jan Vroonhof: changed gnus-cite.el gnus-msg.el nntp.el
 
 Jan-Hein Buhrman: changed ange-ftp.el env.el
 
-Jari Aalto: changed add-log.el gnus-art.el apropos.el cperl-mode.el
-  debug.el files.el font-lock.el lisp-mnt.el ls-lisp.el mailcap.el
-  nnmail.el
+Jari Aalto: changed add-log.el filecache.el gnus-art.el lisp-mnt.el
+  nnmail.el apropos.el autorevert.el compile.el cperl-mode.el debug.el
+  executable.el files.el finder.el font-lock.el grep.el ls-lisp.el man.el
+  terminal.el
 
-Jason R Mastaler: changed drums.el
+Jason Merrill: changed imap.el
 
 Jason Rumney: wrote w32-vars.el
-and changed w32term.c w32fns.c w32menu.c w32-win.el w32term.h makefile.nt
-  w32-fns.el w32.c w32bdf.c makefile.w32-in w32console.c w32gui.h
-  w32select.c mule-cmds.el w32bdf.h config.nt keyboard.c w32faces.c
-  w32inevt.c w32proc.c emacs.c and 55 other files
+and changed w32fns.c w32term.c w32menu.c w32-win.el w32term.h
+  makefile.w32-in w32.c w32bdf.c w32-fns.el w32select.c w32console.c
+  w32gui.h w32proc.c keyboard.c mule-cmds.el emacs.c fileio.c w32bdf.h
+  w32inevt.c config.nt configure.bat and 76 other files
 
-Jay K. Adams: wrote jka-compr.el
+Jay Belanger: changed calc.texi calc.el calc-ext.el calc-embed.el
+  calc-aent.el calc-prog.el calc-help.el calc-graph.el calc-lang.el
+  calc-store.el calc-yank.el calc-units.el calcalg2.el calc-misc.el
+  calc-alg.el calc-arith.el calc-poly.el calccomp.el calc-vec.el
+  calc-forms.el calc-math.el and 23 other files
 
-Jay R. Adams: changed jka-compr.el
+Jay K. Adams: wrote jka-cmpr-hook.el jka-compr.el
 
 Jay Sachs: changed gnus-score.el gnus-win.el
 
-Jeff Dwork: changed ehelp.el
+Jean-Philippe Theberge: wrote thumbs.el
+
+Jeff Dwork: changed ehelp.el facemenu.el
 
 Jeff Morgenthaler: changed flow-ctrl.el vt200.el vt201.el vt220.el
   vt240.el
@@ -766,7 +913,12 @@ Jeff Norden: wrote kermit.el
 
 Jeff Peck: wrote sun-curs.el sun-fns.el sun-mouse.el sun.el
 
-Jeffrey C Honig: changed bsdos4.h
+Jeffrey C Honig: wrote mh-print.el
+and changed mh-comp.el mh-e.el mh-utils.el mh-customize.el mh-funcs.el
+  mh-seq.el Makefile bsdos4.h mh-alias.el mh-junk.el mh-loaddefs.el
+  mh-mime.el
+
+Jens Krinke: changed smime.el
 
 Jens Lautenbacher: changed gnus.el
 
@@ -775,22 +927,27 @@ and changed ffap.el
 
 Jens Toivo Berger Thielemann: changed word-help.el
 
-Jens-Ulrik Holger Petersen: changed cus-edit.el find-func.el
-  gnus-group.el gnus-msg.el gnus.el
+Jens-Ulrik Holger Petersen: changed cus-edit.el find-func.el gnus.el
+
+Jeremy Maitin-Shepard: changed mml.el
 
 Jerry Frain: changed systime.h usg5-4.h
 
 Jerry James: changed format.el
 
-Jesper Harder: changed message.el
+Jesper Harder: wrote yenc.el
+and changed gnus-art.el gnus-sum.el message.el gnus-msg.el gnus.el
+  gnus-group.el mm-bodies.el gnus-util.el mm-util.el mm-decode.el
+  rfc2047.el mml.el mml1991.el mailcap.el mm-uu.el pgg-gpg.el
+  gnus-srvr.el gnus-uu.el info.el nnmail.el pgg.el and 180 other files
+
+Jhair Tocancipa Triana: changed gnus-audio.el
 
 Jim Blandy: wrote tvi970.el
 and changed keyboard.c xterm.c xfns.c Makefile.in window.c process.c
   dispnew.c xdisp.c sysdep.c configure.in lisp.h keymap.c configure
   make-dist buffer.c frame.c screen.c x-win.el simple.el alloc.c emacs.c
-  and 391 other files
-
-Jim Davidson: changed gnus-sum.el message.el
+  and 389 other files
 
 Jim Kingdon: changed MACHINES SERVICE emacsclient.c emacs.tex hp300bsd.h
   rmail.el
@@ -805,11 +962,25 @@ Jim Thompson: wrote ps-print.el
 
 Jim Wilson: changed Makefile.in alloca.c
 
+Jirka Kosek: changed mule.el
+
+Joakim Hove: wrote html2text.el
+
 Joanna Pluta: changed TUTORIAL.pl
 
 Jochen K,A|(Bpper: changed calc-units.el
 
-Joe Buehler: changed gnus-util.el
+Joe Buehler: changed Makefile.in cygwin.h MACHINES browse-url.el
+  comint.el configure configure.in dired-aux.el dired.el dirtrack.el
+  dos-w32.el fast-lock.el filecache.el fileio.c files.el gmalloc.c
+  gnus-util.el hippie-exp.el keyboard.c lastfile.c loadup.el
+  and 12 other files
+
+Joe Corneli: changed subr.el
+
+Joe Edmonds: changed lisp-mode.el
+
+Joe Kelsey: changed skeleton.el
 
 Joe Ramey: changed filelock.c rmailsum.el
 
@@ -819,20 +990,18 @@ Joe Wells: wrote apropos.el mail-extr.el resume.el
 
 Joel N. Weber Ii: changed comint.el make-dist
 
-Joel Ray Holveck: changed info.el
-
-Joerg Lenneis: changed nneething.el nnheader.el
+Joel Ray Holveck: changed gnus-sum.el info.el
 
 Joev Dubach: changed nntp.el
 
-Johan Kullstam: changed mm-encode.el
+Johan Bockgard: changed cl-macs.el cl.texi
+
+Johan Bockg,Ae(Brd: changed cl-macs.el custom.el flyspell.el help-fns.el
 
 Johan Vromans: wrote forms-d2.el forms.el iso-acc.el
 and changed complete.el
 
-Johannes Weinert: changed gnus-sum.el
-
-John Eaton: wrote octave-hlp.el octave-inf.el octave-mod.el
+John Basrai: changed man.el
 
 John F. Carr: changed dired.c
 
@@ -840,51 +1009,54 @@ John F. Whitehead: changed mule-cmds.el mule-diag.el
 
 John Grabowski: changed xfaces.c xfns.c
 
-John H. Palmieri: changed mail-source.el
+John H. Palmieri: changed gnus-fun.el
 
 John Heidemann: wrote mouse-copy.el mouse-drag.el zone-mode.el
 
 John Hughes: changed term.c
 
-John Paul Wallington: changed ibuffer.el ibuf-ext.el rmail.el startup.el
-  apropos.el eudc.el help-fns.el info.el browse-url.el bytecomp.el
-  chistory.el cl-indent.el comint.el cus-start.el doctor.el ediff-util.el
-  eldoc.el em-cmpl.el em-dirs.el em-glob.el em-hist.el and 28 other files
+John Paul Wallington: changed ibuffer.el ibuf-ext.el subr.el files.el
+  thumbs.el fns.c rmail.el bindings.el bytecomp.el cus-theme.el
+  help-fns.el info.el re-builder.el startup.el apropos.el browse-url.el
+  cus-start.el display.texi ebuff-menu.el emerge.el eudc.el
+  and 105 other files
 
 John Robinson: wrote bg-mouse.el
 
 John Tobey: changed gud.el
 
-John W. Eaton: changed octave-mod.el
+John W. Eaton: wrote octave-hlp.el octave-inf.el octave-mod.el
 
-John Wiegley: wrote align.el em-alias.el em-banner.el em-basic.el
-  em-cmpl.el em-dirs.el em-glob.el em-hist.el em-ls.el em-pred.el
-  em-prompt.el em-rebind.el em-script.el em-smart.el em-term.el
-  em-unix.el em-xtra.el esh-arg.el esh-cmd.el esh-ext.el esh-io.el
-  esh-maint.el esh-mode.el esh-module.el esh-opt.el esh-proc.el
-  esh-test.el esh-util.el esh-var.el eshell.el pcmpl-cvs.el pcomplete.el
-  timeclock.el
-and changed mail-source.el Makefile.in allout.el compile.el desktop.el
-  gnus-art.el gnus-mlspl.el gnus-topic.el outline.el pcmpl-gnu.el term.el
+John Wiegley: wrote align.el cal-bahai.el em-alias.el em-banner.el
+  em-basic.el em-cmpl.el em-dirs.el em-glob.el em-hist.el em-ls.el
+  em-pred.el em-prompt.el em-rebind.el em-script.el em-smart.el
+  em-term.el em-unix.el em-xtra.el esh-arg.el esh-cmd.el esh-ext.el
+  esh-io.el esh-maint.el esh-mode.el esh-module.el esh-opt.el esh-proc.el
+  esh-test.el esh-util.el esh-var.el eshell.el isearchb.el pcmpl-cvs.el
+  pcomplete.el timeclock.el
+and changed iswitchb.el Makefile.in allout.el cal-menu.el calendar.el
+  compile.el desktop.el diary-lib.el flyspell.el holidays.el outline.el
+  pcmpl-gnu.el term.el
 
 Jon K Hellan: wrote utf7.el
 
-Jon Kv: changed nnfolder.el
-
-Jonas Steverud: changed gnus-art.el
-
 Jonathan I. Kamens: changed pop.c movemail.c rmail.el configure.in
   Makefile.in b2m.pl config.in files.el pop.h terminal.el vc.el
-  jka-compr.el rmailout.el rnewspost.el sendmail.el simple.el timezone.el
-  vc-hooks.el
+  gnus-sum.el jka-compr.el rmailout.el rnewspost.el sendmail.el simple.el
+  timezone.el vc-hooks.el
 
 Jonathan Stigelman: wrote hilit19.el
 
 Jonathan Vail: changed vc.el
 
-Jonathan Yavner: wrote ses.el tcover-ses.el tcover-unsafep.el
-  testcover.el unsafep.el
-and changed Makefile.in files.el ses-example.ses ses.texi
+Jonathan Yavner: wrote tcover-ses.el tcover-unsafep.el
+and changed testcover.el Makefile.in files.el functions.texi
+  ses-example.ses ses.el ses.texi testcover-ses.el testcover-unsafep.el
+  unsafep.el variables.texi
+
+Jorgen Schaefer: changed type-break.el
+
+Jose E. Marchesi: changed smtpmail.el
 
 Joseph Arceneaux: wrote xrdb.c
 and changed xterm.c xfns.c keyboard.c screen.c dispnew.c xdisp.c window.c
@@ -894,10 +1066,21 @@ and changed xterm.c xfns.c keyboard.c screen.c dispnew.c xdisp.c window.c
 
 Joseph M. Kelsey: changed dir.h fileio.c uaf.h vms-pwd.h vmsfns.c
 
-Juanma Barranquero: changed makefile.w32-in faces.el subr.el help-fns.el
-  w32fns.c fileio.c grep-changelog idlw-shell.el replace.el sh-script.el
-  composite.c editfns.c filesets.el idlwave.el ielm.el keyboard.c
-  macfns.c mule-util.el mule.el speedbar.el timer.el and 186 other files
+Josh Huber: changed mml-sec.el gnus-msg.el message.el mml.el mml2015.el
+  nnmail.el ChangeLog ChangeLog.1 gnus-cite.el gnus-delay.el gnus-spec.el
+  mml1991.el nnultimate.el nnwfm.el gnus-cus.el gnus-smiley.el
+  gnus-start.el gnus-topic.el gnus.el nnbabyl.el nndiary.el
+  and 7 other files
+
+Joshua Varner: changed intro.texi
+
+Juan Le,As(Bn Lahoz Garc,Am(Ba: wrote wdired.el
+and changed files.el perl-mode.el
+
+Juanma Barranquero: changed makefile.w32-in help-fns.el subr.el faces.el
+  files.el w32fns.c cperl-mode.el replace.el simple.el eval.c comint.el
+  sh-script.el xdisp.c allout.el idlwave.el process.c thumbs.el
+  vhdl-mode.el xfaces.c .cvsignore desktop.el and 539 other files
 
 Juergen Nickelsen: wrote ws-mode.el
 
@@ -905,7 +1088,17 @@ Julien Gilles: wrote gnus-ml.el
 
 Junio Hamano: changed window.el
 
-Justin Sheehy: changed gnus-util.el nnmail.el nntp.el
+Jure Cuhalev: changed ispell.el
+
+Juri Linkov: changed info.el isearch.el compile.el replace.el simple.el
+  grep.el faces.el dired.el descr-text.el display.texi dired-aux.el
+  edebug.el lisp.el files.el help-fns.el lisp-mode.el help.el ispell.el
+  mule.el startup.el building.texi and 151 other files
+
+Justin Sheehy: changed gnus-sum.el nntp.el
+
+J,Ai(Br,At(Bme Marant: changed Makefile.in make-dist bindings.el configure
+  configure.in emacsclient.c
 
 K. Shane Hartman: wrote chistory.el echistory.el electric.el emacsbug.el
   helper.el picture.el view.el
@@ -916,75 +1109,91 @@ and changed rmail.el loaddefs.el ebuff-menu.el dired.el simple.el
 
 Kahlil Hodgson: changed timeclock.el
 
-Kai Gro,A_(Bjohann: wrote tramp-util.el tramp-uu.el tramp.el
-and changed dired.el paragraphs.el Makefile.in ange-ftp.el files.el
-  gnus-art.el gnus-sum.el lisp.el message.el nnmail.el tramp.texi alloc.c
-  configure.in diary-lib.el dir eshell.el gnus-cus.el gnus-start.el
-  gnus-util.el info.el log-view.el and 12 other files
+Kai Gro,A_(Bjohann: wrote gnus-delay.el tramp-util.el tramp-uu.el tramp.el
+  trampver.el
+and changed message.el gnus-agent.el gnus-sum.el gnus-art.el nnmail.el
+  files.el tramp.texi gnus.el simple.el ange-ftp.el gnus-group.el
+  gnus-msg.el Makefile.in dired.el nnml.el paragraphs.el bindings.el
+  files.texi gnus-start.el imap.el man.el and 56 other files
 
-Karl Berry: changed filelock.c dired.c compile.el fileio.c info.texi
-  isc2-2.h sort.el
+Kailash C. Chowksey: changed HELLO Makefile.in ind-util.el kannada.el
+  knd-util.el loadup.el makefile.w32-in
+
+Karl Berry: changed info.texi filelock.c copyright.el dired.c elisp.texi
+  texinfo.el compile.el emacs.texi fileio.c help.texi isc2-2.h sort.el
+  syntax.texi tex-mode.el
+
+Karl Chen: changed files.el align.el gnus-art.el help-mode.el python.el
+  vc-svn.el
 
 Karl Eichwalder: changed Makefile.in add-log.el bookmark.el dired-aux.el
-  dired.el info.el menu-bar.el midnight.el
+  dired.el info.el menu-bar.el midnight.el po.el
 
 Karl Fogel: wrote bookmark.el mail-hist.el saveplace.el
-and changed isearch.el autogen.sh editfns.c menu-bar.el window.c
+and changed isearch.el menu-bar.el autogen.sh editfns.c vc-svn.el
+  window.c
 
 Karl Heuer: changed keyboard.c lisp.h xdisp.c buffer.c xfns.c xterm.c
-  alloc.c files.el frame.c window.c configure.in data.c minibuf.c
+  alloc.c files.el frame.c configure.in window.c data.c minibuf.c
   editfns.c fns.c process.c fileio.c simple.el keymap.c indent.c sysdep.c
-  and 445 other files
+  and 444 other files
 
-Karl Kleinpaste: changed gnus-art.el gnus-sum.el gnus-util.el gnus-cus.el
-  gnus-msg.el gnus-score.el mailcap.el message.el mm-encode.el mm-uu.el
-  nnheader.el
+Karl Kleinpaste: changed gnus-art.el gnus-picon.el gnus-score.el
+  gnus-sum.el gnus-uu.el gnus-xmas.el mm-uu.el mml.el nnmail.el smiley.el
 
 Karl M. Hegbloom: changed gnus.el
 
-Katsumi Yamaoka: changed gnus-art.el gnus-sum.el gnus-group.el
-  gnus-start.el mail-source.el nntp.el frame.el gnus-util.el message.el
-  mm-bodies.el nnagent.el nnheader.el nnimap.el nnmail.el parse-time.el
+Karl Pfl,Ad(Bsterer: changed spam-stat.el
+
+Katsuhiro Hermit Endo: changed gnus-spec.el
+
+Katsumi Yamaoka: wrote canlock.el
+and changed gnus-art.el message.el gnus-sum.el mm-view.el gnus-msg.el
+  gnus-util.el mm-decode.el gnus.el lpath.el mm-util.el gnus-agent.el
+  dgnushack.el gnus-group.el nntp.el gnus-start.el spam.el mml.el
+  nndraft.el emacs-mime.texi gnus-score.el gnus-spec.el
+  and 59 other files
 
 Kaveh R. Ghazi: changed delta88k.h xterm.c
 
 Kawabata, Taichi: wrote indian.el
-and changed devanagari.el Makefile.in characters.el devan-util.el
-  fontset.el ind-util.el mule-conf.el
+and changed devanagari.el ind-util.el Makefile.in devan-util.el
+  characters.el fontset.el malayalam.el mlm-util.el mule-conf.el tamil.el
+  tml-util.el
 
 Kayvan Sylvan: changed sc.el
 
-Kazushi: changed filelock.c hexl.c profile.c unexalpha.c
+Kazushi Marukawa: changed filelock.c hexl.c profile.c unexalpha.c
+
+Keiichi Suzuki: changed nntp.el
 
 Keisuke Nishida: changed print.c alloc.c bytecomp.el data.c keymap.c
 
 Keith Gabryelski: wrote hexl.c hexl.el
 
-Ken  Manheimer: changed allout.el
+Ken Brush: changed emacsclient.c
 
 Ken Laprade: changed simple.el
 
 Ken Manheimer: wrote allout.el icomplete.el
 
 Ken Raeburn: changed lisp.h alloc.c buffer.c keyboard.c lread.c coding.c
-  Makefile.in fns.c minibuf.c editfns.c fileio.c keymap.c xfns.c xterm.c
+  minibuf.c Makefile.in fns.c editfns.c fileio.c keymap.c xfns.c xterm.c
   charset.h fontset.c search.c undo.c window.c xdisp.c charset.c
-  and 82 other files
+  and 83 other files
 
 Ken Stevens: wrote ispell.el
 
 Kenichi Handa: wrote cyrillic.el isearch-x.el py-punct.el pypunct-b5.el
-  quail.el
-and changed coding.c mule-cmds.el mule.el charset.c xterm.c ccl.c
-  fileio.c fns.c charset.h mule-conf.el coding.h Makefile.in fontset.el
-  mule-diag.el fontset.c insdel.c japanese.el xdisp.c editfns.c process.c
-  mule-util.el and 232 other files
+  quail.el thai-word.el
+and changed coding.c mule-cmds.el mule.el charset.c fns.c fileio.c
+  xterm.c ccl.c mule-conf.el Makefile.in fontset.c charset.h fontset.el
+  coding.h mule-diag.el xdisp.c editfns.c insdel.c japanese.el process.c
+  mule-util.el and 267 other files
 
 Kenneth Stailey: changed alpha.h configure.in ns32000.h openbsd.h pmax.h
   sparc.h unexalpha.c unexelf.c
 
-Kenry Kautz: wrote bib-mode.el
-
 Kevin Blake: changed font-lock.el ring.el
 
 Kevin Broadey: wrote foldout.el
@@ -996,111 +1205,141 @@ Kevin Gallagher: wrote edt-lk201.el edt-mapper.el edt-pc.el edt-vt100.el
 and changed edt-user.doc
 
 Kevin Gallo: wrote w32-win.el
-and changed makefile.nt dispnew.c addpm.c config.nt dispextern.h emacs.c
-  facemenu.el faces.el fns.c frame.c frame.h keyboard.c makefile.def
-  mouse.el ntterm.c process.c s/ms-w32.h scroll.c startup.el sysdep.c
-  term.c and 18 other files
+and changed dispnew.c addpm.c config.nt dispextern.h emacs.c facemenu.el
+  faces.el fns.c frame.c frame.h keyboard.c mouse.el ntterm.c process.c
+  s/ms-w32.h scroll.c startup.el sysdep.c term.c unexw32.c w32.c
+  and 16 other files
 
-Kevin J. Greiner: changed gud.el
+Kevin Greiner: changed gnus-agent.el gnus-start.el gnus-sum.el
+  gnus-int.el gnus.el gnus-util.el nntp.el gnus-group.el gnus-cus.el
+  legacy-gnus-agent.el gnus-art.el gnus-cache.el gnus-range.el
+  gnus-srvr.el nnagent.el nnheader.el dgnushack.el gnus-async.el
+  gnus-draft.el gnus-registry.el gnus-salt.el and 4 other files
 
 Kevin Layer: changed w32proc.c
 
-Kevin Rodgers: changed compile.el mailabbrev.el ange-ftp.el byte-opt.el
-  dired-x.el dired-x.texi files.el isearch.el loadhist.el mailalias.el
-  print.c replace.el sendmail.el simple.el vc.el xfns.c
-
-Kevin Ryde: changed info.el info-look.el makeinfo.el
+Kevin Rodgers: changed compile.el mailabbrev.el dired-x.el ange-ftp.el
+  byte-opt.el desktop.el dired-x.texi ffap.el files.el isearch.el
+  loadhist.el mailalias.el menu-bar.el print.c replace.el sendmail.el
+  simple.el vc.el xfns.c
 
-Kevin The Bandicoot: changed gnus-art.el
+Kevin Ryde: wrote info-xref.el
+and changed info-look.el info.el gnus-art.el gnus-sum.el MORE.STUFF
+  cc-align.el display.texi em-alias.el em-dirs.el em-hist.el em-unix.el
+  emacs-lisp-intro.texi ffap.el frames.texi glossary.texi gnus.texi
+  makeinfo.el programs.texi simple.el streams.texi strings.texi
+  and 3 other files
 
 Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el
   keypad.el kmacro.el
-and changed simple.el process.c keyboard.c xdisp.c subr.el xterm.c
-  w32term.c window.c info.el dispextern.h keymap.c lisp.h macterm.c
-  msdos.c files.el frame.c w32fns.c xfns.c frame.h macfns.c msdos.h
-  and 72 other files
+and changed xdisp.c dispextern.h simple.el process.c keyboard.c window.c
+  xterm.c w32term.c lisp.h macterm.c subr.el fringe.c dispnew.c xfaces.c
+  alloc.c fns.c xterm.h info.el display.texi msdos.c xfns.c
+  and 199 other files
 
-Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-art.el
-  gnus-start.el gnus-win.el gnus-xmas.el gnus.texi imap.el message.el
-  mm-decode.el mm-encode.el nndraft.el nnml.el
+Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el
+  gnus-win.el gnus-xmas.el gnus.texi message.el nndraft.el nnml.el
 
 Kishore Kumar: changed terminal.el
 
-Kiyokazu Suto: changed nnspool.el
+Klaus Straubinger: changed url-http.el
 
-Kjetil Torgrim Homme: changed nnmail.el
+Klaus Zeitler: changed configure.in sh-script.el vcursor.el
 
 Koaunghi Un: wrote hanja3.el
 and changed hanja.el hangul.el hangul3.el hanja-jis.el symbol-ksc.el
 
-Kobayashi Yasuhiro: changed w32fns.c w32term.c w32term.h
+Kobayashi Yasuhiro: changed w32fns.c configure.bat w32term.c w32term.h
+  window.c xfns.c
 
 Kohtala Marko: changed info.el
 
-Koseki Yoshinori: changed mm-util.el nnmail.el
+Koseki Yoshinori: wrote iimage.el
+and changed nnmail.el
 
 Kurt Hornik: wrote octave-hlp.el octave-inf.el octave-mod.el
-and changed ielm.el term.el
+and changed battery.el ielm.el term.el
 
-Kurt Swanson: changed gnus-art.el gnus-salt.el gnus-msg.el gnus-sum.el
-  gnus-ems.el gnus-group.el gnus-score.el gnus-util.el nnmail.el window.c
+Kurt Swanson: changed gnus-art.el gnus-salt.el gnus-sum.el gnus-ems.el
+  gnus-group.el gnus-msg.el gnus-score.el gnus-util.el nnmail.el window.c
 
 Kyle E. Jones: wrote mldrag.el
 
 Kyle Jones: wrote life.el
 and changed saveconf.el buffer.c mail-utils.el sendmail.el
 
-Lantz Moore: changed nnmail.el
+K,Ba(Broly L,Bu(Brentey: changed keyboard.c coding.c xfns.c xterm.c xterm.h
 
 Larry Kolodney: wrote cvtmail.c
 
 Lars Balker Rasmussen: changed gnus-art.el gnus-agent.el message.el
 
+Lars Brinkhoff: changed building.texi config.in configure configure.in
+  editfns.c fns.c os.texi
+
+Lars Hansen: changed desktop.el mh-e.el info.el dired.el rmail.el
+  dired-x.el dired-x.texi dired.c files.texi grp.h ls-lisp.el misc.texi
+  url-auth.el url-cache.el url-dired.el url-ftp.el url-irc.el url-misc.el
+  url-news.el url-privacy.el url-vars.el and 33 other files
+
 Lars Lindberg: wrote imenu.el msb.el
 and changed dabbrev.el
 
-Lars Magne Ingebrigtsen: wrote format-spec.el gnus-agent.el gnus-art.el
-  gnus-async.el gnus-bcklg.el gnus-cache.el gnus-demon.el gnus-draft.el
-  gnus-dup.el gnus-eform.el gnus-ems.el gnus-group.el gnus-int.el
-  gnus-logic.el gnus-move.el gnus-nocem.el gnus-range.el gnus-salt.el
-  gnus-spec.el gnus-srvr.el gnus-start.el gnus-sum.el gnus-undo.el
-  gnus-util.el gnus-uu.el gnus-win.el ietf-drums.el mail-parse.el
-  mail-prsvr.el mail-source.el message.el messcompat.el mm-bodies.el
-  mm-decode.el mm-encode.el mm-util.el mm-view.el mml.el netrc.el
-  nnagent.el nnbabyl.el nndir.el nndoc.el nndraft.el nneething.el
-  nngateway.el nnkiboze.el nnlistserv.el nnmail.el nnmbox.el nnmh.el
-  nnml.el nnoo.el nnslashdot.el nnsoup.el nntp.el nnultimate.el nnweb.el
-  qp.el rfc2045.el rfc2047.el rfc2231.el score-mode.el time-date.el
-and changed gnus.el gnus-msg.el gnus-score.el gnus-topic.el nnheader.el
-  nnfolder.el mailcap.el gnus-cite.el gnus-picon.el nnvirtual.el drums.el
-  gnus-xmas.el gnus-cus.el parse-time.el date.el dgnushack.el editfns.c
-  gnus-mh.el gnus-soup.el pop3.el fns.c and 38 other files
+Lars Magne Ingebrigtsen: wrote compface.el dns.el format-spec.el
+  gnus-agent.el gnus-art.el gnus-async.el gnus-bcklg.el gnus-cache.el
+  gnus-demon.el gnus-draft.el gnus-dup.el gnus-eform.el gnus-ems.el
+  gnus-fun.el gnus-group.el gnus-int.el gnus-logic.el gnus-move.el
+  gnus-nocem.el gnus-picon.el gnus-range.el gnus-salt.el gnus-spec.el
+  gnus-srvr.el gnus-start.el gnus-sum.el gnus-undo.el gnus-util.el
+  gnus-uu.el gnus-win.el ietf-drums.el mail-parse.el mail-prsvr.el
+  mail-source.el message.el messcompat.el mm-bodies.el mm-decode.el
+  mm-encode.el mm-util.el mm-view.el mml.el netrc.el nnagent.el
+  nnbabyl.el nndir.el nndoc.el nndraft.el nneething.el nngateway.el
+  nnkiboze.el nnlistserv.el nnmail.el nnmbox.el nnmh.el nnoo.el
+  nnslashdot.el nnsoup.el nntp.el nnultimate.el nnweb.el nnwfm.el qp.el
+  rfc2045.el rfc2047.el rfc2231.el score-mode.el spam.el time-date.el
+and changed gnus.el gnus-msg.el gnus-score.el gnus-topic.el gnus-xmas.el
+  nnfolder.el gnus-cite.el nnheader.el nnml.el lpath.el nnvirtual.el
+  dgnushack.el gnus-cus.el smiley-ems.el editfns.c gnus-mh.el
+  gnus-soup.el gnus.texi nnrss.el pop3.el fns.c and 46 other files
 
 Lasse Rasinen: changed gnus-start.el
 
+Lawrence Mitchell: changed subr.el
+
 Lawrence R. Dodd: wrote dired-x.el
 and changed fortran.el ispell.el sendmail.el cmuscheme.el comint.el
   compile.el dired.el find-dired.el gnus.el gud.el inf-lisp.el info.el
   lisp.el loaddefs.el man.el minibuf.c rcs2log rmail.el simple.el
   terminal.el text-mode.el and 4 other files
 
-Lee Willis: changed gnus-art.el
-
 Leigh Stoller: changed emacsclient.c emacsserver.c server.el
 
+Lennart Borgman: changed w32term.c w32term.h
+
 Lennart Staflin: changed dired.el diary-ins.el diary-lib.el tq.el xdisp.c
 
 Leonard H. Tower Jr.: changed rnews.el rnewspost.el emacsbug.el
   rmailout.el
 
-Lloyd Zusman: changed gnus-sum.el mailcap.el nnmail.el
+Lloyd Zusman: changed mml.el
 
-Luc Teirlinck: changed ielm.el dired-aux.el files.el sh-script.el subr.el
+Luc Teirlinck: wrote help-at-pt.el
+and changed files.el autorevert.el simple.el subr.el frames.texi
+  display.texi files.texi dired.el Makefile.in frame.el ielm.el
+  startup.el variables.texi comint.el custom.el fns.c minibuf.texi
+  modes.texi buffer.c buffers.texi commands.texi and 187 other files
 
 Lucid, Inc.: changed byte-opt.el byte-run.el bytecode.c bytecomp.el
   delsel.el disass.el faces.el font-lock.el lmenu.el lselect.el
   mailabbrev.el select.el xfaces.c xselect.c
 
+Lute Kamstra: changed modes.texi generic.el debug.el generic-x.el
+  font-lock.el subr.el debugging.texi easy-mmode.el elisp.texi hl-line.el
+  simple.el Makefile.in battery.el bindings.el calc.el cmdargs.texi
+  edebug.texi emacs.texi info.el make-tarball.txt octave-inf.el
+  and 219 other files
+
 Lynn Slater: wrote help-macro.el
 
 MCC: wrote xmenu.c
@@ -1108,6 +1347,10 @@ and changed emacsclient.c emacsserver.c etags.c lisp.h movemail.c
   rmail.el rmailedit.el rmailkwd.el rmailmsc.el rmailout.el rmailsum.el
   scribe.el server.el sysdep.c unexec.c
 
+Maciek Pasternacki: changed nnrss.el
+
+Magnus Henoch: changed ispell.el
+
 Manuel Serrano: wrote flyspell.el
 
 Marc Fleischeuers: changed files.el
@@ -1116,6 +1359,11 @@ Marc Girod: changed informat.el rmail.el rmailsum.el sendmail.el
 
 Marc Shapiro: changed bibtex.el
 
+Marcelo Toledo: changed TUTORIAL.pt_BR FOR-RELEASE TUTORIAL.cn
+  TUTORIAL.cs TUTORIAL.de TUTORIAL.es TUTORIAL.fr TUTORIAL.it TUTORIAL.ja
+  TUTORIAL.ko TUTORIAL.pl TUTORIAL.ro TUTORIAL.ru TUTORIAL.sk TUTORIAL.sl
+  TUTORIAL.th TUTORIAL.translators TUTORIAL.zh add-log.el european.el
+
 Marco Melgazzi: changed term.el
 
 Marco Walther: changed mips-siemens.h unexelfsni.c unexsni.c
@@ -1125,14 +1373,22 @@ Marcus G. Daniels: changed xterm.c configure.in lwlib-Xm.c lwlib.c
   editfns.c emacs.c irix5-0.h linux.h lwlib-Xm.h lwlib.h ptx4.h
   sequent-ptx.h unexelf.c
 
-Mario Lang: changed files.el
+Marek Martin: changed nnfolder.el
 
-Mark A. Hershberger: changed xml.el
+Mario Lang: changed battery.el diff.el files.el gud.el
 
-Mark D. Baushke: changed etags.c
+Mark A. Hershberger: changed xml.el nnrss.el cperl-mode.el mm-url.el
+  gnus-group.el
+
+Mark D. Baushke: changed mh-e.el mh-utils.el mh-mime.el mh-comp.el
+  mh-customize.el mh-index.el mh-loaddefs.el Makefile mh-identity.el
+  mh-seq.el mh-speed.el mh-funcs.el mh-alias.el MH-E-NEWS etags.c
+  mh-junk.el mh-pick.el mh-xemacs-compat.el
 
 Mark Diekhans: changed compile.el
 
+Mark H. Weaver: changed comint.el
+
 Mark Lambert: changed process.c process.h
 
 Mark Mitchell: changed font-lock.el
@@ -1141,9 +1397,11 @@ Mark Neale: changed fortran.el
 
 Mark Osbourne: changed hexl-mode.el
 
+Mark Plaksin: changed nnrss.el
+
 Mark W Maimone: changed mpuz.el
 
-Mark W. Eichin: changed gnus.el keyboard.c xterm.c
+Mark W. Eichin: changed keyboard.c xterm.c
 
 Marko Kohtala: changed info.el
 
@@ -1156,66 +1414,88 @@ Markus Heritsch: wrote ada-xref.el
 Markus Holmberg: changed thingatpt.el
 
 Markus Rost: wrote cus-test.el
-and changed cus-edit.el Makefile.in compile.el files.el find-func.el
-  rmail.el rmailsum.el simple.el tex-mode.el cus-dep.el mule-cmds.el
-  rmailout.el checkdoc.el configure.in custom.el emacsbug.el gnus.el
-  help-fns.el ls-lisp.el mwheel.el sendmail.el and 105 other files
+and changed cus-edit.el Makefile.in files.el compile.el rmail.el
+  tex-mode.el find-func.el rmailsum.el simple.el cus-dep.el dired.el
+  mule-cmds.el rmailout.el checkdoc.el configure.in custom.el emacsbug.el
+  gnus.el help-fns.el ls-lisp.el mwheel.el and 122 other files
 
 Markus Triska: changed doctor.el
 
+Marshall T. Vandegrift: changed gnus-fun.el
+
 Martin Boyer: changed bibtex.el menu-bar.el
 
 Martin Buchholz: changed etags.c
 
-Martin Larose: changed message.el
+Martin Kretzschmar: changed gnus-spec.el
 
-Martin Lorentzon: changed vc-hooks.el vc.el
+Martin Larose: changed message.el
 
-Martin Lorentzson: changed vc.el vc-cvs.el vc-rcs.el vc-hooks.el
+Martin Lorentzon: changed vc.el vc-cvs.el vc-hooks.el vc-rcs.el
   vc-sccs.el
 
 Martin Neitzel: changed sc.el
 
+Martin Rudalics: changed font-lock.el
+
 Martin Stjernholm: wrote cc-bytecomp.el
-and changed cc-engine.el cc-cmds.el cc-langs.el cc-vars.el cc-mode.el
-  cc-align.el cc-styles.el cc-defs.el cc-menus.el cc-mode-19.el
-  cc-lobotomy.el cc-make.el cc-mode.texi cc-style.el
+and changed cc-engine.el cc-cmds.el cc-langs.el cc-mode.el cc-defs.el
+  cc-vars.el cc-align.el cc-styles.el cc-fonts.el cc-menus.el
+  cc-mode.texi Makefile.in cc-fix.el cc-mode-19.el ack.texi awk-mode.el
+  cc-guess.el cc-lobotomy.el cc-make.el cc-style.el files.el
+  and 3 other files
 
 Masahiko Sato: wrote vip.el
 
 Masanobu Umeda: wrote gnus-kill.el gnus-mh.el gnus-msg.el gnus.el
-  metamail.el nnheader.el nnspool.el prolog.el rmailsort.el timezone.el
+  metamail.el nndb.el nnheader.el nnspool.el prolog.el rmailsort.el
+  timezone.el
 and changed gnuspost.el
 
-Masatake Yamato: changed cus-face.el faces.el register.el asm-mode.el
-  bookmark.el page-ext.el ruler-mode.el
+Masatake Yamato: wrote ld-script.el
+and changed etags.el xdisp.c bindings.el hexl.el asm-mode.el faces.el
+  pcvs.el register.el ruler-mode.el wid-edit.el buffer.c cus-face.el
+  display.texi gud.el help.el man.el server.el simple.el smerge-mode.el
+  add-log.el animate.el and 31 other files
 
-Masayuki Ataka: changed texinfmt.el make-mode.el texinfo.el
+Masayuki Ataka: changed texinfmt.el texinfo.el characters.el make-mode.el
 
-Mats Lidell: changed european.el
+Mats Lidell: changed TUTORIAL.sv european.el
 
-Matt Pharr: changed message.el gnus-msg.el gnus-group.el
+Matt Hodges: changed em-pred.el icon.el paragraphs.el simple.el table.el
+  telnet.el
+
+Matt Pharr: changed message.el
 
 Matt Simmons: changed message.el
 
-Matt Swift: changed gnus-group.el gnus-uu.el
+Matt Swift: changed compile.el dired.el editfns.c lisp-mode.el
+  mm-decode.el outline.el rx.el simple.el startup.el
+
+Matthew Mundell: changed calendar.texi diary-lib.el files.texi
+  type-break.el debugging.texi display.texi edebug.texi editfns.c eval.c
+  fileio.c frames.texi help.texi internals.texi modes.texi nonascii.texi
+  objects.texi os.texi positions.texi searching.texi subr.el text.texi
+  tips.texi
 
-Matthew Swift: changed compile.el editfns.c outline.el rx.el simple.el
+Matthias F,Av(Brste: changed files.el
 
-Matthias Andree: changed imap.el
+Matthias Wiehl: changed gnus.el
 
 Matthieu Devin: wrote delsel.el
 
-Max Froumentin: changed gnus-score.el
+Matthieu Moy: changed message.el
+
+Max Froumentin: changed gnus-art.el
 
 Michael Albinus: wrote tramp-ftp.el tramp-smb.el
-and changed tramp.el
+and changed tramp.el tramp.texi tramp-vc.el files.el ange-ftp.el
+  files.texi tramp-util.el tramp-uu.el find-dired.el tramp*.el
+  trampver.el woman.el
 
 Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h
   unexec.c
 
-Michael Cook: changed gnus-art.el gnus-cite.el
-
 Michael D. Ernst: wrote reposition.el
 and changed dired-x.el uniquify.el ispell.el rmail.el bibtex.el dired.el
   simple.el dired-aux.el gud.el rmailsum.el bytecomp.el compare-w.el
@@ -1225,8 +1505,12 @@ and changed dired-x.el uniquify.el ispell.el rmail.el bibtex.el dired.el
 Michael D. Prange: wrote fortran.el
 and changed tex-mode.el
 
+Michael Downes: changed gnus-sum.el
+
 Michael Gschwind: wrote iso-cvt.el latin-2.el
 
+Michael Hotchin: changed compile.el
+
 Michael I. Bushnell: changed rmail.el simple.el callproc.c gnu.h gnus.el
   lread.c process.c screen.el search.c sendmail.el startup.el timer.c
 
@@ -1240,22 +1524,32 @@ Michael Kifer: wrote cal-x.el ediff-diff.el ediff-help.el ediff-hook.el
   viper-init.el viper-keym.el viper-macs.el viper-mous.el viper-util.el
   viper.el
 and changed ediff*.el viper*.el ediff-hooks.el ediff-merge.el menu-bar.el
-  appt.el ediff-meta.el ediff-nult.el ediff.texi viper-mouse.el
-  viper.texi
+  appt.el desktop.el ediff-meta.el ediff-nult.el ediff.texi
+  viper-mouse.el viper.texi
+
+Michael Piotrowski: changed ps-print.el
 
 Michael R. Cook: changed gnus-topic.el gnus-art.el gnus-sum.el
 
+Michael R. Mauger: changed sql.el cua-base.el facemenu.el recentf.el
+  replace.el tramp.el w32fns.c
+
+Michael R. Wolf: changed ange-ftp.el
+
+Michael Schierl: changed pgg-pgp.el
+
 Michael Schmidt: wrote modula2.el (public domain)
 
-Michael Shields: changed intel386.h
+Michael Shields: changed gnus-art.el gnus-cite.el gnus-sum.el intel386.h
+  nndraft.el
 
 Michael Sperber [Mr. Preprocessor]: changed aix3-1.h aix4-2.h
 
 Michael Staats: wrote pc-select.el
 
-Michael Welsh Duggan: changed lisp.h w32term.c buffer.c gnus-art.el
-  gnus-start.el keyboard.c termhooks.h w32-win.el w32fns.c w32menu.c
-  w32term.h xdisp.c xterm.c
+Michael Welsh Duggan: changed lisp.h w32term.c buffer.c gnus-spec.el
+  keyboard.c nnmail.el termhooks.h url-http.el w32-win.el w32fns.c
+  w32menu.c w32term.h xdisp.c xterm.c
 
 Michal Jankowski: changed insdel.c keyboard.c
 
@@ -1264,14 +1558,13 @@ and changed gnus-score.el
 
 Mikael Djurfeldt: changed xdisp.c
 
-Mike Fabian: changed gnus-group.el
-
 Mike Haertel: changed 7300.h
 
+Mike Kupfer: changed mh-e.el mh-utils.el
+
 Mike Long: changed b2m.c make-dist make-mode.el netbsd.h view.el vms.h
 
-Mike Mcewan: changed gnus-agent.el gnus-sum.el gnus.texi gnus-art.el
-  gnus-score.el mml.el
+Mike Mcewan: changed gnus-agent.el gnus-sum.el gnus-score.el
 
 Mike Newton: changed bibtex.el
 
@@ -1281,17 +1574,19 @@ Mike Rowan: changed process.c alloc.c dispnew.c keyboard.c process.h
 Mike Williams: wrote mouse-sel.el thingatpt.el
 and changed sgml-mode.el xml-lite.el
 
-Mikio Nakajima: changed viper-util.el
+Mike Woolley: changed gnus-sum.el
+
+Mikio Nakajima: changed ring.el viper-util.el
 
 Milan Zamazal: wrote czech.el glasses.el tildify.el
-and changed slovak.el abbrev.el compile.el filecache.el
+and changed slovak.el abbrev.el compile.el filecache.el files.el
 
-Miles Bader: wrote button.el image-file.el minibuf-eldef.el
+Miles Bader: wrote button.el image-file.el macroexp.el minibuf-eldef.el
   rfn-eshadow.el
-and changed comint.el faces.el simple.el editfns.c info.el minibuf.c
-  wid-edit.el xterm.c window.el xdisp.c xfaces.c cus-edit.el diff-mode.el
-  subr.el help.el textprop.c xfns.c lisp.h menu-bar.el refill.el window.c
-  and 138 other files
+and changed comint.el faces.el simple.el editfns.c xfaces.c info.el
+  xdisp.c minibuf.c wid-edit.el xterm.c window.el cus-edit.el
+  diff-mode.el subr.el dispextern.h xfns.c help.el lisp.h
+  quick-install-emacs textprop.c menu-bar.el and 205 other files
 
 Miyashita Hisashi: changed ccl.c coding.c coding.h mule-cmds.el
   mule-conf.el mule.el pop3.el
@@ -1314,54 +1609,70 @@ Mukesh Prasad: wrote vmsproc.el
 
 Murata Shuuichirou: changed coding.c
 
+N. Raghavendra: changed timezone.el
+
 Nachum Dershowitz: wrote cal-hebrew.el
 
-Naoto Takahashi: changed ethio-util.el ethiopic.el fontset.el
-  latin-post.el mule-conf.el quail.el
+Nagy Andras: wrote gnus-sieve.el
+and changed imap.el
+
+Nakamura Toshikazu: changed w32fns.c
 
 NeXT, Inc.: wrote unexnext.c
 
 Neal Ziring: wrote vi.el (public domain)
 
-Neil Crellin: changed mail-source.el
-
 Neil Mager: wrote appt.el
 
 Neil W. Van Dyke: wrote webjump.el
 
+Nelson H. F. Beebe: changed configure.in
+
 Nelson Jose Dos Santos Ferreira: changed nnsoup.el
 
+Nevin Kapur: changed nnmail.el gnus-group.el gnus-sum.el gnus.el
+  nnbabyl.el nnfolder.el nnimap.el nnmbox.el nnmh.el nnml.el
+
 Niall Mansfield: changed etags.c
 
 Nick Roberts: wrote gdb-ui.el
-and changed gud.el tooltip.el gud-break.pbm gud-break.xpm gud-cont.pbm
-  gud-cont.xpm gud-display.pbm gud-display.xpm gud-down.pbm gud-down.xpm
-  gud-finish.pbm gud-finish.xpm gud-goto.pbm gud-goto.xpm gud-next.pbm
-  gud-next.xpm gud-print.pbm gud-print.xpm gud-remove.pbm gud-remove.xpm
-  gud-run.pbm and 6 other files
+and changed gud.el building.texi tooltip.el cc-mode.el subr.el
+  xt-mouse.el frames.texi gud-display.pbm DEBUG TODO bindings.el
+  byte-run.el bytecomp.el cc-vars.el cmacexp.el emacs.c gud-break.pbm
+  gud-break.xpm gud-cont.pbm gud-cont.xpm gud-display.xpm
+  and 64 other files
 
 Nico Francois: changed w32fns.c w32inevt.c w32menu.c
 
 Noah Friedman: wrote eldoc.el rlogin.el rsz-mini.el type-break.el
-and changed comint.el files.el mailabbrev.el sendmail.el subr.el timer.el
-  yow.el battery.el complete.el config.in configure.in copyright.h fns.c
-  gnu-linux.h hpux7.h irix3-3.h lisp-mnt.el loaddefs.el mailalias.el
-  menu-bar.el pp.el and 11 other files
+and changed comint.el files.el emacs-buffer.gdb mailabbrev.el sendmail.el
+  subr.el timer.el yow.el battery.el complete.el config.in configure.in
+  copyright.h fns.c gnu-linux.h hpux7.h irix3-3.h lisp-mnt.el loaddefs.el
+  mailalias.el menu-bar.el and 14 other files
 
 Nobuyuki Hikichi: changed news-risc.h
 
+Noel Cragg: changed mh-junk.el
+
+Nozomu Ando: changed buffer.c sysselect.h unexmacosx.c
+
+Nuutti Kotivuori: changed gnus-cache.el
+
 Odd Gripenstam: wrote dcl-mode.el
 
+Ognyan Kulev: changed TUTORIAL.bg cyrillic.el
+
 Olaf Sylvester: wrote bs.el
 
 Ole Aamot: changed compile.el
 
-Oleg S. Tihonov: changed cyrillic.el gnus-sum.el ispell.el map-ynp.el
-  subr.el
+Oleg S. Tihonov: changed cyrillic.el ispell.el map-ynp.el subr.el
 
 Olin Shivers: wrote cmuscheme.el comint.el inf-lisp.el shell.el
 
-Oliver Scholz: changed gamegrid.el
+Olive Lin: changed tex-mode.el
+
+Oliver Scholz: changed gamegrid.el rx.el startup.el update-game-score.c
 
 Oliver Seidel: wrote todo-mode.el
 
@@ -1375,25 +1686,36 @@ Oscar Figueiredo: wrote eudc-bob.el eudc-export.el eudc-hotlist.el
   eudc-vars.el eudc.el eudcb-bbdb.el eudcb-ldap.el eudcb-ph.el ldap.el
 and changed ph.el
 
+Oystein Viggen: changed dgnushack.el
+
 P. E. Jareth Hein: changed gnus-util.el
 
 Pace Willisson: wrote ispell.el
 
+Pascal Dupuis: changed octave-inf.el
+
 Paul D. Smith: wrote snmp-mode.el
 and changed imenu.el make-mode.el
 
 Paul Eggert: wrote cal-dst.el rcs2log vcdiff
-and changed vc.el editfns.c configure.in Makefile.in vc-hooks.el data.c
-  emacs.c gnus.el config.in floatfns.c process.c sysdep.c calendar.el
+and changed vc.el editfns.c Makefile.in configure.in vc-hooks.el data.c
+  emacs.c gnus.el calendar.el config.in floatfns.c process.c sysdep.c
   dired.el xterm.c callproc.c fileio.c filelock.c lread.c print.c
-  rmail.el and 274 other files
+  rmail.el and 287 other files
 
-Paul Fisher: changed fns.c mm-decode.el
+Paul Fisher: changed fns.c
 
 Paul Franklin: changed nnmail.el message.el
 
 Paul Hilfinger: changed fill.el
 
+Paul Jarc: wrote nnmaildir.el nnnil.el
+and changed message.el gnus-util.el gnus-int.el gnus.el gnus-agent.el
+  gnus-start.el gnus-sum.el lpath.el nnmail.el
+
+Paul Pogonyshev: changed subr.el align.el dabbrev.el display.texi
+  etags.el info.el ses.el tar-mode.el url-http.el which-func.el window.el
+
 Paul Reilly: wrote dgux5-4r3.h gux5-4r2.h
 and changed dgux.h lwlib-Xm.c lwlib.c xlwmenu.c configure.in process.c
   xfns.c Makefile.in dgux5-4R2.h dgux5-4R3.h files.el keyboard.c
@@ -1402,27 +1724,26 @@ and changed dgux.h lwlib-Xm.c lwlib.c xlwmenu.c configure.in process.c
 
 Paul Rubin: changed config.h sun2.h texinfmt.el window.c
 
-Paul Stevenson: changed gnus-sum.el
+Paul Stevenson: changed nnvirtual.el
 
-Paul Stodghill: changed message.el gnus-agent.el gnus-msg.el nnimap.el
+Paul Stodghill: changed gnus-agent.el
 
-Pavel Jan,Am(Bk: changed keyboard.c xterm.c xdisp.c emacs.c menu-bar.el
-  process.c COPYING coding.c eval.c fileio.c indent.c ldap.el lisp.h
-  buffer.c data.c flyspell.el fns.c keymap.c msdos.c sysdep.c xfns.c
-  and 231 other files
+Pavel Jan,Bm(Bk: changed COPYING keyboard.c xterm.c xdisp.c Makefile.in
+  process.c emacs.c lisp.h menu-bar.el ldap.el make-dist xfns.c buffer.c
+  coding.c eval.c fileio.c flyspell.el fns.c indent.c callint.c
+  cus-start.el and 693 other files
 
-Pavel Jan,Bm(Bk: changed COPYING Makefile.in make-dist configure.in xlwmenu.c
-  TUTORIAL.cs TUTORIAL.sk landmark.el lucid.el tpu-edt.el antlr-mode.el
-  b2m.c battery.el binhex.el buff-menu.el callint.c cdl.el delim-col.el
-  diff.el dired-aux.el easy-mmode.el and 576 other files
+Pavel Kobiakov: wrote flymake.el
+and changed flymake.texi
 
 Per Abrahamsen: wrote cpp.el cus-dep.el cus-edit.el cus-face.el
   cus-start.el custom.el double.el gnus-cite.el gnus-cus.el gnus-score.el
   gnus-soup.el wid-browse.el wid-edit.el widget.el xt-mouse.el
-and changed menu-bar.el message.el gnus-art.el gnus.el frame.el nnmail.el
-  tool-bar.el apropos.el easymenu.el facemenu.el faces.el gnus-msg.el
-  gnus-start.el ispell.el lisp-mode.el makefile.el mouse.el simple.el
-  texinfo.el Makefile cc-vars.el and 23 other files
+and changed message.el menu-bar.el gnus.el gnus-art.el gnus-msg.el
+  gnus-group.el frame.el gnus-draft.el gnus-sum.el tool-bar.el
+  widget.texi apropos.el easymenu.el facemenu.el faces.el gnus-srvr.el
+  gnus-uu.el ispell.el lisp-mode.el makefile.el mouse.el
+  and 27 other files
 
 Per Bothner: wrote term.el
 and changed iso-acc.el process.c sysdep.c
@@ -1436,28 +1757,38 @@ Per Starback: changed ispell.el gnus-start.el apropos.el bytecomp.el
   characters.el charset.h coding.c dired.el doctor.el emacs.c european.el
   iso-transl.el replace.el startup.el vc.el xdisp.c
 
+Pete Kazmier: changed gnus-art.el
+
 Pete Ware: wrote auto-show.el (public domain)
 and changed message.el
 
+Pete-Temp: changed gnus-art.el
+
 Peter Breton: wrote dirtrack.el filecache.el find-lisp.el generic-x.el
   generic.el locate.el net-utils.el
 
-Peter Galbraith: changed simple.el
+Peter Heslin: changed flyspell.el outline.el
 
 Peter Kleiweg: wrote ps-mode.el
 
 Peter Liljenberg: wrote elint.el
 
-Peter Runestig: changed emacs.rc
+Peter Runestig: changed makefile.w32-in configure.bat dos-w32.el emacs.rc
+  envadd.bat gmake.defs multi-install-info.bat nmake.defs w32fns.c
+  zone-mode.el
 
-Peter S. Galbraith: wrote mh-alias.el mh-identity.el
-and changed info-look.el goto-addr.el
+Peter S. Galbraith: wrote mh-alias.el mh-identity.el mh-inc.el mh-init.el
+and changed mh-comp.el mh-e.el mh-utils.el mh-mime.el mh-customize.el
+  mh-seq.el Makefile mh-loaddefs.el mh-pick.el mh-xemacs-compat.el
+  mh-xemacs-toolbar.el README info-look.el mh-funcs.el .cvsignore
+  MH-E-NEWS alias.pbm alias.xpm cabinet.xpm goto-addr.el highlight.xpm
+  and 12 other files
 
-Peter Stephenson: wrote vcursor.el
+Peter Seibel: changed cl-indent.el lisp-mode.el
 
-Peter Von Der Ahe: changed gnus-sum.el message.el
+Peter Stephenson: wrote vcursor.el
 
-Petersen Jens-Ulrik: changed gnus-start.el
+Peter Whaite: changed data.c
 
 Petri Kaurinkoski: changed configure.in iris4d.h irix6-0.h irix6-5.h
   usg5-4.h
@@ -1466,27 +1797,39 @@ Philippe Schnoebelen: wrote gomoku.el mpuz.el
 
 Philippe Waroquiers: changed etags.el
 
-Piet Van Oostrum: changed smtpmail.el
+Piet Van Oostrum: changed data.c fileio.c smtpmail.el
 
-Pmr-Sav: changed mail-utils.el rmail.el
+Pieter E.J. Pareit: wrote mixal-mode.el
 
-Puneet Goel: changed message.el
+Pinku Surana: changed sql.el
+
+Pmr-Sav: changed mail-utils.el rmail.el
 
 R. Bernstein: changed gud.el
 
+Rafael Sep,Az(Blveda: changed TUTORIAL.es
+
 Rainer Schoepf: wrote alpha.h unexalpha.c
 and changed osf1.h alloc.c buffer.c callint.c data.c dispextern.h doc.c
   editfns.c floatfns.c frame.h lisp.h lread.c marker.c mem-limits.h
   print.c puresize.h window.h xdisp.c xterm.h
 
+Raja R Harinath: changed nnml.el
+
 Rajappa Iyer: changed gnus-salt.el
 
 Rajesh Vaidheeswarran: wrote whitespace.el
+and changed ffap.el
+
+Ralf Angeli: wrote scroll-lock.el
+and changed comint.el gnus-art.el window.c
 
 Ralf Fassel: changed dabbrev.el files.el fill.el iso-acc.el tar-mode.el
 
 Ralph Schleicher: wrote battery.el info-look.el
-and changed libc.el
+and changed libc.el fileio.c mm-decode.el nnultimate.el
+
+Ramakrishnan M: changed mlm-util.el
 
 Randal Schwartz: wrote pp.el
 
@@ -1496,37 +1839,48 @@ Raul Acevedo: changed info.el options.el
 
 Ray Blaak: wrote delphi.el
 
+Raymond Scholz: wrote deuglify.el
+and changed gnus-art.el gnus-msg.el gnus.texi message.el nnmail.el
+
+Reiner Steib: changed gnus-art.el message.el gnus-sum.el gnus.el
+  gnus.texi gnus-msg.el gnus-score.el gnus-group.el mml.el gnus-faq.texi
+  gnus-start.el gnus-util.el message.texi deuglify.el gnus-agent.el
+  mm-decode.el nnimap.el nnmail.el nnweb.el spam-report.el spam.el
+  and 102 other files
+
 Remek Trzaska: changed gnus-ems.el
 
-Renaud Rioboo: changed gnus-demon.el nnmail.el
+Renaud Rioboo: changed nnmail.el
+
+Ren,Ai(B Kyllingstad: changed pcomplete.el
 
 Reto Zimmermann: changed vhdl-mode.el
 
 Richard Dawe: changed Makefile.in config.in
 
+Richard G Bielawski: changed paren.el
+
 Richard Hoskins: changed message.el
 
 Richard King: wrote backquote.el filelock.c userlock.el
 
 Richard L. Pieri: wrote pop3.el
 
-Richard M. Alderson Iii: changed gnus-art.el
-
 Richard M. Heiberger: changed tex-mode.el
 
 Richard M. Stallman: wrote [The original GNU emacs and numerous files]
-  easymenu.el font-lock.el menu-bar.el paren.el
+  easymenu.el font-lock.el image-mode.el menu-bar.el paren.el
 and changed keyboard.c files.el simple.el xterm.c xdisp.c rmail.el
-  fileio.c process.c sysdep.c xfns.c Makefile.in buffer.c configure.in
-  window.c dispnew.c subr.el emacs.c editfns.c sendmail.el startup.el
-  info.el and 1121 other files
+  fileio.c process.c sysdep.c xfns.c buffer.c Makefile.in window.c
+  configure.in subr.el sendmail.el emacs.c dispnew.c editfns.c startup.el
+  info.el and 1301 other files
 
 Richard Mlynarik: wrote cl-indent.el ebuff-menu.el ehelp.el env.c
   rfc822.el terminal.el yow.el
 and changed files.el sysdep.c rmail.el info.el keyboard.c fileio.c
   loaddefs.el simple.el process.c window.c startup.el editfns.c unexec.c
   xfns.c bytecomp.el sendmail.el dispnew.c emacs.c buffer.c debug.el
-  indent.c and 120 other files
+  indent.c and 119 other files
 
 Richard Sharman: wrote hilit-chg.el
 and changed sh-script.el ediff-init.el regexp-opt.el simple.el
@@ -1536,68 +1890,65 @@ Rick Farnbach: wrote morse.el
 Rick Sladkey: wrote backquote.el
 and changed gud.el intervals.c intervals.h simple.el
 
-Rob Browning: changed gnus-art.el
+Rob Browning: changed configure.in
+
+Rob Kaut: changed vhdl-mode.el
 
 Rob Riepel: wrote tpu-edt.el tpu-extras.el tpu-mapper.el vt-control.el
 and changed tpu-doc.el
 
-Robert Bihlmeyer: changed gnus-score.el mml.el gnus-art.el gnus-util.el
-  message.el mm-view.el
+Robert Bihlmeyer: changed gnus-score.el gnus-util.el message.el
 
 Robert Fenk: changed desktop.el
 
 Robert J. Chassell: wrote makeinfo.el texinfo.el texnfo-upd.el
 and changed texinfmt.el emacs.tex page-ext.el info.el loaddefs.el
-  texinfo-update.el case-table.el cl.texinfo emacs-lisp-intro.texi
-  history.el informat.el latin-1.el latin-2.el latin-3.el latin-4.el
-  page.el tex-mode.el texinfo.tex texinfo.texinfo vip.texinfo
-
-Robert Pluim: changed mm-util.el
-
-Robin S. Socha: changed message.el
-
-Rod Whitby: changed nnmail.el gnus-sum.el nnml.el
+  texinfo-update.el INSTALL case-table.el cl.texinfo
+  emacs-lisp-intro.texi history.el informat.el latin-1.el latin-2.el
+  latin-3.el latin-4.el page.el tex-mode.el texinfo.tex texinfo.texinfo
+  vip.texinfo
 
 Roderick Schertler: changed dgux.h dgux4.h gud.el sysdep.c
 
 Roger Breitenstein: changed smtpmail.el
 
-Roland B Roberts: wrote logout.com mailemacs.com
+Roland B. Roberts: wrote logout.com mailemacs.com vms-pmail.el
 and changed buffer.h build.com callproc.c compile.com dired.c files.el
-  kepteditor.com precomp.com process.c sort.el sysdep.c systty.h
-  vmspaths.h vmsproc.el
+  gnus-group.el gnus-sum.el kepteditor.com precomp.com process.c sort.el
+  sysdep.c systty.h vmspaths.h vmsproc.el
 
-Roland B. Roberts: wrote vms-pmail.el
-and changed gnus-group.el gnus-sum.el
+Roland Mcgrath: wrote autoload.el etags.el find-dired.el grep.el
+  map-ynp.el
+and changed compile.el add-log.el configure.in files.el vc.el Makefile.in
+  simple.el mailabbrev.el buffer.c comint.el upd-copyr.el etags.c
+  menu-bar.el loaddefs.el mem-limits.h ralloc.c fileio.c data.c process.c
+  rlogin.el rmail.el and 137 other files
 
-Roland Mcgrath: wrote autoload.el compile.el etags.el find-dired.el
-  grep.el map-ynp.el
-and changed add-log.el configure.in files.el vc.el Makefile.in simple.el
-  mailabbrev.el comint.el upd-copyr.el buffer.c etags.c menu-bar.el
-  loaddefs.el mem-limits.h ralloc.c fileio.c rlogin.el rmail.el shell.el
-  data.c diff.el and 108 other files
+Roland Winkler: changed bibtex.el
 
 Rolf Ebert: wrote ada-mode.el
 and changed files.el find-file.el
 
+Romain Francoise: changed gnus-fun.el ibuf-ext.el message.el FOR-RELEASE
+  antlr-mode.el compile.el ibuffer.el sgml-mode.el buffer.c data.c
+  gnus-art.el gnus-uu.el indent.c makeinfo.el python.el term.c
+
 Roman Belenov: changed which-func.el
 
 Ron Schnell: wrote dunnet.el
 
 Ronan Waide: changed smtpmail.el
 
-Rui Zhu: changed gnus-art.el gnus-sum.el
-
 Rui-Tao Dong: changed nnweb.el
 
 Rune Kleveland: changed xfns.c
 
-Rupa Schomaker: changed gnus-msg.el message.el
-
 Russ Allbery: changed message.el
 
 Ryszard Kubiak: changed ogonek.el
 
+Saito Takuya: changed compile.el mule.el
+
 Sam Dooley: changed keyboard.c
 
 Sam Falkner: changed nntp.el
@@ -1605,55 +1956,76 @@ Sam Falkner: changed nntp.el
 Sam Kendall: changed etags.c etags.el
 
 Sam Steingold: wrote gulp.el midnight.el
-and changed cl-indent.el font-lock.el ange-ftp.el tex-mode.el vc-cvs.el
-  bindings.el bookmark.el debug.el dired.el mouse.el sgml-mode.el
-  simple.el browse-url.el buff-menu.el bytecomp.el compile.el
-  diary-lib.el etags.el files.el inf-lisp.el info.el and 86 other files
+and changed cl-indent.el font-lock.el ange-ftp.el mouse.el tex-mode.el
+  vc-cvs.el add-log.el bindings.el bookmark.el debug.el diary-lib.el
+  dired.el pcvs.el sgml-mode.el simple.el browse-url.el buff-menu.el
+  bytecomp.el cc-mode.el compile.el etags.el and 94 other files
+
+Sanghyuk Suh: changed mac-win.el macterm.c
+
+Sascha L,A|(Bdecke: wrote mml1991.el
+and changed gnus-win.el
 
-Satyaki Das: wrote mh-index.el mh-speed.el
+Satyaki Das: wrote mh-acros.el mh-gnus.el mh-index.el mh-junk.el
+  mh-speed.el
+and changed mh-e.el mh-utils.el mh-seq.el mh-comp.el mh-mime.el
+  mh-customize.el mh-loaddefs.el mh-funcs.el Makefile mh-alias.el
+  mh-pick.el mh-unit.el mh-make.el mh-xemacs-toolbar.el mh-identity.el
+  mh-init.el mh-xemacs-compat.el mh-inc.el highlight.xpm mh-func.el
+  mh-loadddefs.el and 6 other files
 
 Schlumberger Technology Corporation: changed gud.el
 
-Scott Byer: wrote nnfolder.el
-and changed gnus-sum.el
+Scott Byer: changed gnus-sum.el
 
 Scott Draves: wrote tq.el
 
-Scott Hofmann: changed nntp.el
-
 Scott M. Meyers: changed cmacexp.el
 
+Sean O'rourke: changed ibuf-ext.el
+
 Sebastian Kremer: wrote dired-aux.el dired-x.el dired.el ls-lisp.el
 and changed add-log.el
 
+Sebastian Tennant: changed desktop.el
+
+Sebastien Kirche: changed mail-extr.el
+
 Sen Nagata: wrote crm.el rfc2368.el
 
-Seokchan Lee: changed message.el mm-bodies.el
+Seokchan Lee: changed message.el
+
+Sergey Poznyakoff: changed rmail.el rmail.texi smtpmail.el
 
 Shawn M. Carey: wrote freebsd.h
 
-Shenghuo Zhu: wrote binhex.el mm-partial.el mm-uu.el nnwarchive.el
-  rfc1843.el uudecode.el webmail.el
-and changed gnus-art.el gnus-sum.el message.el mm-util.el gnus-agent.el
-  mml.el mm-view.el rfc2047.el mm-decode.el gnus-msg.el gnus-group.el
-  nnmail.el gnus-util.el mail-source.el mm-bodies.el nnweb.el gnus.el
-  nnfolder.el nnslashdot.el gnus-start.el nnheader.el and 60 other files
+Shenghuo Zhu: wrote binhex.el mm-extern.el mm-partial.el mm-url.el
+  mm-uu.el mml2015.el nnrss.el nnwarchive.el rfc1843.el uudecode.el
+  webmail.el
+and changed message.el gnus-art.el gnus-sum.el gnus-msg.el gnus.el
+  gnus-agent.el mm-decode.el mm-util.el gnus-group.el mml.el
+  gnus-start.el gnus-util.el nnfolder.el mm-view.el nnmail.el
+  nnslashdot.el gnus-xmas.el nntp.el gnus-topic.el rfc2047.el
+  dgnushack.el and 103 other files
 
 Shinichirou Sugou: changed etags.c
 
-Shuhei Kobayashi: changed gnus-group.el message.el nnmail.el
+Shuhei Kobayashi: wrote hex-util.el sha1.el
+and changed gnus-group.el message.el nnmail.el
 
 Sidney Markowitz: changed doctor.el
 
 Sigbjorn Finne: changed gnus-srvr.el
 
-Simon Josefsson: wrote flow-fill.el fringe.el imap.el nnimap.el
-  rfc2104.el
-and changed gnus-sum.el smtpmail.el gnus-agent.el gnus-start.el gnus.el
-  gnus-group.el gnus-range.el sendmail.el browse-url.el gnus-art.el
-  mail-source.el gnus-srvr.el mm-decode.el nnmail.el fns.c gnus-cus.el
-  gnus-msg.el gnus-util.el gnus.texi mail-extr.el mailcap.el
-  and 32 other files
+Simon Josefsson: wrote dig.el dns-mode.el flow-fill.el fringe.el imap.el
+  mml-sec.el mml-smime.el nnfolder.el nnimap.el nnml.el rfc2104.el
+  sieve-manage.el sieve-mode.el sieve.el smime.el starttls.el tls.el
+  url-imap.el
+and changed message.el gnus-sum.el gnus-art.el smtpmail.el pgg-gpg.el
+  pgg.el mml2015.el gnus-agent.el mml.el mm-decode.el mml1991.el
+  gnus-group.el gnus-msg.el gnus.el pgg-pgp5.el gnus-cache.el
+  gnus-sieve.el browse-url.el gnus-int.el mail-source.el gnus-spec.el
+  and 88 other files
 
 Simon Leinen: changed smtpmail.el Makefile Makefile.in cm.c cm.h hpux9.h
   indent.c process.c sc.texinfo sgml-mode.el term.c xfns.c xmenu.c
@@ -1667,39 +2039,37 @@ and changed comint.el font-lock.el shell.el rmail.el fortran.el
 
 Skip Collins: changed w32fns.c w32term.c w32term.h
 
+Slawomir Nowaczyk: changed TUTORIAL.pl
+
 Spencer Thomas: changed dabbrev.el emacsclient.c emacsserver.c gnus.texi
   server.el tcp.c unexec.c
 
-Stainless Steel Rat: changed pop3.el gnus-sum.el
-
 Stanislav Shalunov: wrote uce.el
-and changed message.el
-
-Stefan Monnier: wrote cvs-status.el diff-mode.el log-edit.el log-view.el
-  pcvs-defs.el pcvs-info.el pcvs-parse.el pcvs-util.el reveal.el
-  smerge-mode.el
-and changed vc.el newcomment.el pcvs.el regex.c easy-mmode.el
-  font-lock.el subr.el keymap.c fill.el syntax.c vc-cvs.el keyboard.c
-  vc-hooks.el lisp.h sgml-mode.el tex-mode.el info.el simple.el
-  derived.el vc-rcs.el xterm.c and 354 other files
 
-Stefan Schoef: wrote bibtex.el
+Stefan Monnier: wrote bibtex.el cvs-status.el diff-mode.el log-edit.el
+  log-view.el pcvs-defs.el pcvs-info.el pcvs-parse.el pcvs-util.el
+  reveal.el smerge-mode.el
+and changed vc.el pcvs.el font-lock.el newcomment.el subr.el lisp.h
+  keyboard.c tex-mode.el keymap.c fill.el easy-mmode.el alloc.c
+  compile.el info.el regex.c vc-hooks.el xdisp.c syntax.c simple.el
+  files.el vc-cvs.el and 465 other files
 
-Stefan Waldherr: changed nnweb.el
-
-Steinar Bang: changed nnweb.el
+Stephan Stahl: changed which-func.el buff-menu.el buffer.c dired-x.texi
+  ediff-mult.el
 
 Stephen A. Wood: changed fortran.el
 
 Stephen Eglen: wrote iswitchb.el mspools.el
 and changed diary-lib.el locate.el octave-inf.el replace.el hexl.el
-  sendmail.el spell.el uce.el advice.el allout.el autoinsert.el avoid.el
-  backquote.el battery.el bib-mode.el bruce.el c-mode.el ccl.el
-  cmuscheme.el compare-w.el cperl-mode.el and 66 other files
+  info-look.el sendmail.el spell.el uce.el MORE.STUFF add-log.el
+  advice.el allout.el autoinsert.el avoid.el backquote.el battery.el
+  bib-mode.el bruce.el c-mode.el ccl.el and 71 other files
 
 Stephen Gildea: wrote mh-funcs.el mh-pick.el refcard.tex
 and changed time-stamp.el mh-e.el mh-utils.el mh-comp.el files.el
-  fortran.el mh-e.texi mh-mime.el mwheel.el tex-mode.el
+  fortran.el mh-customize.el mh-e.texi mh-mime.el mwheel.el tex-mode.el
+
+Stephen J. Turnbull: changed strings.texi subr.el
 
 Steve Fisk: wrote cal-tex.el
 
@@ -1707,23 +2077,27 @@ Steve Nygard: changed unexnext.c
 
 Steve Strassman: wrote spook.el
 
-Steve Youngs: changed browse-url.el
+Steve Youngs: changed mh-utils.el mh-xemacs-compat.el dgnushack.el
+  mh-customize.el mh-e.el mh-comp.el mh-mime.el Makefile gnus-xmas.el
+  Makefile.in browse-url.el dns.el gnus-art.el gnus-sum.el gnus-util.el
+  lpath.el mh-seq.el .cvsignore em-unix.el gnus-async.el gnus.el
+  and 16 other files
 
 Steven L. Baur: wrote earcon.el footnote.el gnus-audio.el gnus-setup.el
-and changed gnus-xmas.el gnus-msg.el gnus-sum.el message.el add-log.el
-  dgnushack.el edebug.el gnus-art.el gnus-ems.el gnus-picon.el
-  gnus-start.el gnus-topic.el mm-decode.el mm-view.el nnbabyl.el nntp.el
+and changed gnus-xmas.el gnus-msg.el add-log.el dgnushack.el edebug.el
+  gnus-ems.el gnus-start.el gnus-topic.el message.el nnbabyl.el nntp.el
   webjump.el
 
 Steven Suhr: changed dispnew.c scroll.c term.c termchar.h
 
-Steven Tamm: changed make-package macterm.c mac.c INSTALL Makefile.in
-  scroll-bar.el unexmacosx.c MACHINES README configure.in eval.c fns.c
-  generic-x.el mac-win.el macmenu.c sysdep.c
+Steven Tamm: changed macterm.c make-package mac.c macfns.c unexmacosx.c
+  INSTALL configure.in mac-win.el Makefile.in README configure darwin.h
+  editfns.c lread.c macmenu.c scroll-bar.el MACHINES config.h config.in
+  dispnew.c eval.c and 8 other files
 
 Stewart M. Clamen: wrote cal-mayan.el
 
-Sudish Joseph: changed gnus.el
+Sudish Joseph: changed mac-win.el
 
 Sun Microsystems, Inc: wrote emacs.icon emacstool.1 emacstool.c
   sun-curs.el sun-fns.el sun-mouse.el sun.el sunfns.c
@@ -1731,37 +2105,51 @@ and changed emacsclient.c emacsserver.c server.el
 
 Sundar Narasimhan: changed rnews.el rnewspost.el
 
-Sven Fischer: changed mailcap.el
+Sven Joachim: changed sed3v2.inp
+
+Svend Tollak Munkejord: changed deuglify.el
 
 Takaaki Ota: wrote table.el
-and changed dired.c makefile.w32-in w32bdf.c
+and changed appt.el compile.el dired.c etags.c ldap.el makefile.w32-in
+  recentf.el subr.el w32bdf.c
 
 Takahashi Kaoru: changed texinfmt.el
 
 Takahashi Naoto: wrote cyrillic.el ethio-util.el ethiopic.el latin-alt.el
   latin-ltx.el latin-post.el utf-8.el
+and changed fontset.el mule-conf.el quail.el
+
+Takai Kousuke: changed ccl.el
 
 Takeshi Yamada: changed fns.c
 
 Taro Kawagishi: changed arc-mode.el
 
-Tatsuya Ichikawa: changed gnus-agent.el mail-source.el gnus-cache.el
-  pop3.el
+Tatsuya Ichikawa: changed gnus-agent.el gnus-cache.el
 
 Ted Lemon: changed emacs.c lastfile.c puresize.h
 
+Teodor Zlatanov: wrote gnus-registry.el spam-report.el
+and changed spam.el gnus.el gnus-sum.el nnmail.el spam-stat.el
+  gnus-start.el gnus.texi gnus-group.el lpath.el nnbabyl.el nnfolder.el
+  nnimap.el nnmbox.el nnmh.el nnml.el replace.el simple.el building.texi
+  compile.el dig.el gnus-draft.el and 4 other files
+
+Terje Rosten: changed xfns.c version.el xterm.c xterm.h
+
 Terrence Brannon: wrote landmark.el
 
 Terry Jones: wrote shadow.el
 
-Theodore Jump: changed makefile.nt makefile.def w32-win.el w32faces.c
+Theodore Jump: changed w32-win.el w32faces.c
 
-Thien-Thi Nguyen: wrote hideshow.el
-and changed info.el zone.el battery.el bytecode.c cmds.c compile.el
-  desktop.el diary-lib.el ediff-init.el emacsbug.el indent.c keymap.c
-  lisp.h minibuf.c prolog.el vc.el xdisp.c xml.el
+Thien-Thi Nguyen: wrote hideshow.el make-mms-derivative.el
+and changed info.el zone.el Makefile.in fileio.c scheme.el dcl-mode.el
+  lisp-mode.el sysdep.c vc.el TUTORIAL.it TUTORIAL.ja diary-lib.el
+  dired.el ebuff-menu.el emacs.c floatfns.c frames.texi grep.el
+  help-fns.el make-docfile.c modes.texi and 103 other files
 
-Thierry Emery: changed timezone.el wid-edit.el
+Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el
 
 Thomas Deweese: changed x-win.el
 
@@ -1777,6 +2165,8 @@ Thomas Morgan: changed forms.el
 Thomas Neumann: wrote make-mode.el
 and changed makefile.el
 
+Thomas W Murphy: changed outline.el
+
 Thomas Wurgler: changed emacs-lock.el
 
 Thor Kristoffersen: changed nntp.el
@@ -1785,9 +2175,11 @@ Thorsten Ohl: changed lread.c next.h
 
 Tim Fleehart: wrote makefile.nt
 
-Tim Van Holder: changed Makefile.in compile.el
+Tim Van Holder: changed Makefile.in compile.el configure.in which-func.el
+
+Toby Allsopp: changed eudc.el
 
-Toby Speight: changed mm-view.el window.el
+Toby Speight: changed window.el
 
 Tom Breton: changed autoinsert.el gnus-agent.el lread.c
 
@@ -1797,12 +2189,16 @@ Tom Houlder: wrote mantemp.el
 
 Tom Tromey: wrote tcl.el
 and changed makefile.el buffer.c make-mode.el add-log.el blackbox.el
-  buff-menu.el doc.c info.el man.el replace.el xfns.c xterm.c xterm.h
+  buff-menu.el doc.c emacsclient.c info.el man.el replace.el xfns.c
+  xterm.c xterm.h
 
 Tom Wurgler: wrote emacs-lock.el
+and changed subr.el
 
 Tomas Abrahamsson: wrote artist.el
 
+Tommi Vainikainen: changed gnus-sum.el
+
 Tomohiko Morioka: changed gnus-sum.el nnfolder.el nnmail.el nnmh.el
   nnml.el coding.c gnus-art.el gnus-ems.el gnus-mule.el nnheader.el
   nnspool.el nntp.el
@@ -1817,16 +2213,26 @@ Toru Tomabechi: wrote tibet-util.el tibetan.el
 
 Toshiaki Nomura: changed uxpds.h
 
-Tozawa Akihiko: changed nndoc.el
+Trey Jackson: changed spam-stat.el
 
 Triet Hoai Lai: changed vntelex.el viet-util.el vietnamese.el
 
 Trung Tran-Duc: changed nntp.el
 
+Tsuchiya Masatoshi: changed gnus-art.el nneething.el mm-view.el
+  gnus-sum.el nnheader.el nnml.el gnus-agent.el gnus-cache.el gnus-msg.el
+  lpath.el nndiary.el nnfolder.el nnimap.el nnmaildir.el pgg.el
+  rfc2047.el
+
 Tsugutomo Enami: changed nnheader.el regex.c regex.h
 
+Tsuyoshi Akiho: changed gnus-sum.el nnrss.el
+
 Tudor Hulubei: changed iso-acc.el latin-pre.el
 
+Ulf Jasper: wrote icalendar.el
+and changed calendar.texi
+
 Ulrich Leodolter: changed w32proc.c
 
 Ulrich Mueller: changed gud.el case-table.el fortran.el iso-acc.el
@@ -1835,42 +2241,42 @@ Ulrich Mueller: changed gud.el case-table.el fortran.el iso-acc.el
 Ulrik Vieth: wrote meta-mode.el
 and changed files.el
 
-Urban Engberg: changed gnus-demon.el
+Vadim Nasardinov: changed allout.el
 
 Valery Alexeev: changed cyril-util.el cyrillic.el
 
-Vasily Korytov: changed cperl-mode.el
-
-Victor S. Miller: changed webmail.el
+Vasily Korytov: changed cperl-mode.el gnus-art.el gnus-dired.el
+  gnus-msg.el gnus-util.el mail-source.el message.el smiley.el
 
 Victor Zandy: wrote zone.el
 
 Viktor Dukhovni: wrote unexsunos4.c
 
-Ville Skytt,Ad(B: changed tcl.el
+Ville Skytt,Ad(B: changed mh-comp.el tcl.el
 
 Vincent Del Vecchio: changed info.el mh-utils.el
 
-Vinicius Jose Latorre: wrote delim-col.el ebnf-bnf.el ebnf-iso.el
-  ebnf-otz.el ebnf-yac.el ebnf2ps.el ps-mule.el
-and changed ps-print.el ps-prin1.ps ps-prin0.ps ps-prin3.ps ps-prin2.ps
-  ps-bdf.el lpr.el ps-print-def.el ps-print0.ps ps-vars.el
+Vinicius Jose Latorre: wrote delim-col.el ebnf-abn.el ebnf-bnf.el
+  ebnf-dtd.el ebnf-ebx.el ebnf-iso.el ebnf-otz.el ebnf-yac.el ebnf2ps.el
+  printing.el ps-mule.el
+and changed ps-print.el ps-prin1.ps ps-prin0.ps ps-prin3.ps ps-bdf.el
+  ps-prin2.ps lpr.el subr.el ps-print-def.el ps-print0.ps ps-vars.el
 
 Vladimir Alexiev: changed arc-mode.el nnvirtual.el tmm.el
 
-Vladimir Volovich: changed message.el mm-bodies.el
+Walter C. Pelissero: changed browse-url.el url-methods.el
 
 Wayne Mesard: wrote hscroll.el
 
 Werner Benger: changed keyboard.c
 
-Werner Lemberg: wrote vntelex.el
-and changed chinese.el czech.el european.el slovak.el Makefile.in
-  china-util.el cyrillic.el fill.el greek.el hebrew.el indian.el
-  japanese.el korean.el lao.el mule-conf.el mule-diag.el thai.el
-  tibetan.el vietnamese.el
+Werner Lemberg: wrote sisheng.el vntelex.el
+and changed Makefile.in TUTORIAL.de calc.texi chinese.el czech.el
+  european.el idlwave.el reftex-vars.el reftex.el reftex.texi slovak.el
+  supercite.el .cvsignore advice.el calc-forms.el calc-sel.el calendar.el
+  china-util.el cl-macs.el cl.texi complete.el and 42 other files
 
-Wes Hardaker: changed gnus-score.el gnus-art.el gnus-win.el
+Wes Hardaker: changed gnus-score.el gnus-art.el gnus-sum.el gnus-win.el
 
 Will Mengarini: wrote repeat.el
 
@@ -1879,44 +2285,59 @@ William F. Mann: wrote perl-mode.el
 William F. Schelter: wrote telnet.el
 
 William M. Perry: wrote mailcap.el
-and changed mail-source.el mm-view.el image.el mwheel.el xfns.c
+and changed url-http.el url-dav.el url-handlers.el url.el url-file.el
+  url-util.el url-methods.el url-vars.el url-https.el aclocal.m4
+  mule-sysdp.el url-imap.el url-news.el url-nfs.el configure.in image.el
+  mwheel.el url-about.el url-auth.el url-cid.el url-dired.el
+  and 12 other files
 
 William Sommerfeld: wrote emacsclient.c emacsserver.c scribe.el server.el
 
 Wilson H. Tien: changed unexelf.c
 
-Wjcarpenter: changed feedmail.el
+Wim Nieuwenhuizen: changed TUTORIAL.nl
 
 Wlodzimierz Bzyl: wrote ogonek.el
 and changed latin-pre.el refcard-pl.ps refcard-pl.tex survival.tex
 
 Wolfgang Glas: changed unexsgi.c
 
+Wolfgang Jenkner: changed pcvs.el
+
 Wolfgang Rupprecht: wrote float-sup.el floatfns.c sup-mouse.el
 and changed process.c alloc.c callint.c config.h.in config.in
   configure.in crt0.c data.c fns.c lisp-mode.el lisp.h loadup.el lread.c
   net-utils.el nntp.el print.c sort.el sun3.h ymakefile
 
+Wolfgang Scherer: changed vc-cvs.el
+
 Wolfram Gloger: changed emacs.c
 
-Yamamoto Kouji: changed nnmail.el
+Xavier Maillard: changed gnus-faq.texi
+
+Yagi Tatsuya: changed gnus-start.el
 
-Yamamoto Mitsuharu: changed byte-opt.el mac-win.el mule.el
+Yamamoto Mitsuharu: changed macterm.c macfns.c mac-win.el mac.c macterm.h
+  macgui.h macmenu.c image.c keyboard.c emacs.c makefile.MPW xfaces.c
+  config.h darwin.h macselect.c xdisp.c Info.plist Makefile.in
+  dispextern.h make-docfile.c s-mac.h and 29 other files
 
 Yann Dirson: changed imenu.el
 
-Yoshiki Hayashi: changed texinfmt.el gnus-art.el nnheader.el nnvirtual.el
+Yoichi Nakayama: changed browse-url.el finder.el man.el rfc2368.el
+
+Yoshiki Hayashi: changed texinfmt.el nnheader.el
 
 Yutaka Niibe: changed indent.c xdisp.c configure.in Makefile.in dispnew.c
   sysdep.c config.in dired.el emacs.c fill.el fns.c gmalloc.c gnu-linux.h
   indent.h process.c simple.el term.c window.c
 
-Zhu Shenghuo: changed mm-decode.el gnus-art.el gnus-cus.el
+Zhang Wei: changed x-win.el
 
 Zoltan Kemenczy: changed gud.el
 
+Zoran Milojevic: changed avoid.el
+
 Local Variables:
 coding: iso-2022-7bit
 End:
-
-arch-tag: 7ec2c5ea-4fe4-4937-b2cf-863e3cadc5c3
diff --git a/ChangeLog b/ChangeLog
index 5f4a80df113..2973030acc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-09-11  Kim F. Storm  <storm@cua.dk>
+
+        * AUTHORS: Regenerate.
+
+2005-09-10  Giuseppe Scrivano  <gscrivano@gmail.com>
+
+        Remove the MAXPATHLEN limitations:
+
+        * configure.in (AC_CHECK_FUNCS): Check for get_current_dir_name.
+        * configure: Regenerated.
+
+2005-09-09  Eli Zaretskii  <eliz@fencepost.gnu.org>
+
+        * configure.in <lynxsos*>: Support for LynxOS on PPC.
+        * configure: Regenerated.
+
 2005-09-05  Paul Eggert  <eggert@cs.ucla.edu>
 
         * config.guess, config.sub: Updated from master source.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index d41dcec061b..fe1bad8241c 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -27,10 +27,6 @@ face name prefixes should be in it for good results.
 
 * NEW FEATURES
 
-** Make VC-over-Tramp work where possible, or at least fail
-gracefully if something isn't supported over Tramp.
-To be done by Andre Spiegel <spiegel@gnu.org>.
-
 ** Update Speedbar.
 
 * FATAL ERRORS
@@ -52,9 +48,6 @@ back burner waiting for a legal comment or an alternate implementation
 
 * BUGS
 
-** The header-line buttons in the buffer list buffer
-should respond to Mouse-1.
-
 ** Fix recognition of shell's `dirs' command.
 
 Is his change right?
@@ -235,13 +228,13 @@ lispref/frames.texi      "Luc Teirlinck"   Chong Yidong
 lispref/functions.texi   "Luc Teirlinck"   Chong Yidong
 lispref/hash.texi        "Luc Teirlinck"   Chong Yidong
 lispref/help.texi        "Luc Teirlinck"   Chong Yidong
-lispref/hooks.texi       Lute Kamstra
+lispref/hooks.texi       Lute Kamstra      Chong Yidong
 lispref/internals.texi   "Luc Teirlinck"   Chong Yidong
 lispref/intro.texi       "Luc Teirlinck"   Josh Varner
 lispref/keymaps.texi     "Luc Teirlinck"   Chong Yidong
 lispref/lists.texi       "Luc Teirlinck"   Chong Yidong
 lispref/loading.texi     "Luc Teirlinck"   Chong Yidong
-lispref/locals.texi
+lispref/locals.texi      Chong Yidong
 lispref/macros.texi      "Luc Teirlinck"   Chong Yidong
 lispref/maps.texi
 lispref/markers.texi     "Luc Teirlinck"   Chong Yidong
diff --git a/configure b/configure
index aa788f6d5cb..04beba7684a 100755
--- a/configure
+++ b/configure
@@ -988,7 +988,7 @@ esac
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@@ -1764,6 +1764,15 @@ _ACEOF
     esac
   ;;
 
+  ## LynxOS ports
+  *-*-lynxos* )
+    opsys=lynxos
+    case "${canonical}" in
+      i[3456]86-*-lynxos*) machine=intel386 ;;
+      powerpc-*-lynxos*) machine=powerpc ;;
+    esac
+  ;;
+
   ## Acorn RISCiX:
   arm-acorn-riscix1.1* )
     machine=acorn opsys=riscix1-1
@@ -2565,7 +2574,6 @@ _ACEOF
       *-darwin )                opsys=darwin
                                 CPP="${CC-cc} -E -no-cpp-precomp"
                                 ;;
-      *-lynxos* )               opsys=lynxos ;;
       *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;;
       *-isc2.2* )               opsys=isc2-2 ;;
       *-isc4.0* )               opsys=isc4-0 ;;
@@ -3270,7 +3278,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3328,7 +3337,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3444,7 +3454,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3498,7 +3509,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3543,7 +3555,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3587,7 +3600,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4220,7 +4234,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4496,7 +4511,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4525,7 +4541,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4595,7 +4612,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4647,7 +4665,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4718,7 +4737,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4770,7 +4790,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4840,7 +4861,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5010,7 +5032,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5079,7 +5102,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5233,7 +5257,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5329,7 +5354,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5471,7 +5497,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5590,7 +5617,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5755,7 +5783,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5818,7 +5847,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5891,7 +5921,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5977,7 +6008,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6050,7 +6082,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6120,7 +6153,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6179,7 +6213,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6248,7 +6283,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6309,7 +6345,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6375,7 +6412,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6521,7 +6559,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6585,7 +6624,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6650,7 +6690,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6696,7 +6737,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6770,7 +6812,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6835,7 +6878,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6879,7 +6923,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6950,7 +6995,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7000,7 +7046,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7071,7 +7118,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7121,7 +7169,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7192,7 +7241,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7242,7 +7292,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7313,7 +7364,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7363,7 +7415,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7434,7 +7487,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7484,7 +7538,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7571,7 +7626,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7677,7 +7733,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7737,7 +7794,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7861,7 +7919,6 @@ fi
 echo "$as_me:$LINENO: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
-ac_path_x_has_been_run=yes
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -7954,7 +8011,7 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for a specified header file.
+  # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8028,7 +8085,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8088,12 +8146,8 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
                 ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  # It might be that x_includes is empty (headers are found in the
-  # standard search path. Then output the corresponding message
-  ac_out_x_includes=$x_includes
-  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
 if test "$no_x" = yes; then
@@ -8218,7 +8272,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8404,7 +8459,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8499,7 +8555,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8558,7 +8615,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8642,7 +8700,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8826,7 +8885,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9078,7 +9138,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9145,7 +9206,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9214,7 +9276,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9299,7 +9362,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9376,7 +9440,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9430,7 +9495,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9499,7 +9565,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9603,7 +9670,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9670,7 +9738,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9740,7 +9809,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9980,7 +10050,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10089,7 +10160,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10192,7 +10264,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10270,7 +10343,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10424,7 +10498,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10498,7 +10573,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10570,7 +10646,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10652,7 +10729,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10731,7 +10809,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10802,7 +10881,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10871,7 +10951,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10944,7 +11025,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11067,7 +11149,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11169,7 +11252,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11249,7 +11333,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11317,7 +11402,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11462,7 +11548,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11571,7 +11658,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11716,7 +11804,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11823,7 +11912,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11977,7 +12067,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12052,7 +12143,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12200,7 +12292,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12277,7 +12370,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12424,7 +12518,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12497,7 +12592,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12699,7 +12795,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12772,7 +12869,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12917,7 +13015,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12993,7 +13092,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13056,7 +13156,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13137,7 +13238,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13278,7 +13380,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13423,7 +13526,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13499,7 +13603,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13572,7 +13677,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13727,7 +13833,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13793,7 +13900,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13976,8 +14084,9 @@ done
 
 
 
+
 for ac_func in gethostname getdomainname dup2 \
-rename closedir mkdir rmdir sysinfo getrusage \
+rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \
 random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
 strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
 utimes setrlimit setpgid getcwd getwd shutdown getaddrinfo \
@@ -14052,7 +14161,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14119,7 +14229,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14271,7 +14382,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14455,7 +14567,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14782,7 +14895,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14883,7 +14997,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14956,7 +15071,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15035,7 +15151,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15104,7 +15221,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15172,7 +15290,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15246,7 +15365,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15350,7 +15470,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15425,7 +15546,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15577,7 +15699,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15645,7 +15768,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15822,7 +15946,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15898,7 +16023,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16052,7 +16178,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16203,7 +16330,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16354,7 +16482,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16496,7 +16625,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16540,7 +16670,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16686,7 +16817,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16730,7 +16862,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16795,7 +16928,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16849,6 +16983,7 @@ fi
 
 
 
+
   GETOPT_H=
 
 for ac_header in getopt.h
@@ -16884,7 +17019,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17071,7 +17207,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17141,7 +17278,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17210,7 +17348,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17342,7 +17481,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17444,7 +17584,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17513,7 +17654,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17620,7 +17762,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17723,7 +17866,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17799,7 +17943,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17903,7 +18048,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17995,7 +18141,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18060,7 +18207,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18126,7 +18274,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18236,7 +18385,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18301,7 +18451,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18381,7 +18532,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18454,7 +18606,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18527,7 +18680,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18600,7 +18754,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18674,7 +18829,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18746,7 +18902,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18821,7 +18978,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18893,7 +19051,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18966,7 +19125,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19116,7 +19276,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19262,7 +19423,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19408,7 +19570,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19565,7 +19728,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19711,7 +19875,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19857,7 +20022,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20015,7 +20181,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20173,7 +20340,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20362,7 +20530,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20435,7 +20604,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20503,7 +20673,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20549,7 +20720,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20623,7 +20795,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20687,7 +20860,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20825,7 +20999,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20886,7 +21061,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21031,7 +21207,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21187,7 +21364,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21358,7 +21536,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21426,7 +21605,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21611,7 +21791,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21904,7 +22085,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21969,7 +22151,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22032,7 +22215,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22098,7 +22282,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22139,7 +22324,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22206,7 +22392,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+         { ac_try='test -z "$ac_c_werror_flag"
+                         || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23322,6 +23509,11 @@ esac
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -23360,12 +23552,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
          fi;;
       esac
     done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
diff --git a/configure.in b/configure.in
index 5cb3f808688..f8f2d524214 100644
--- a/configure.in
+++ b/configure.in
@@ -282,6 +282,15 @@ dnl see the `changequote' comment above.
     esac
   ;;
 
+  ## LynxOS ports
+  *-*-lynxos* )
+    opsys=lynxos
+    case "${canonical}" in
+      i[3456]86-*-lynxos*) machine=intel386 ;;
+      powerpc-*-lynxos*) machine=powerpc ;;
+    esac
+  ;;
+
   ## Acorn RISCiX:
   arm-acorn-riscix1.1* )
     machine=acorn opsys=riscix1-1
@@ -1083,7 +1092,6 @@ dnl see the `changequote' comment above.
       *-darwin )                opsys=darwin
                                 CPP="${CC-cc} -E -no-cpp-precomp"
                                 ;;
-      *-lynxos* )               opsys=lynxos ;;
       *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;;
       *-isc2.2* )               opsys=isc2-2 ;;
       *-isc4.0* )               opsys=isc4-0 ;;
@@ -2414,7 +2422,7 @@ AC_CHECK_FUNCS(touchlock)
 AC_CHECK_HEADERS(maillock.h)
 
 AC_CHECK_FUNCS(gethostname getdomainname dup2 \
-rename closedir mkdir rmdir sysinfo getrusage \
+rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \
 random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
 strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
 utimes setrlimit setpgid getcwd getwd shutdown getaddrinfo \
diff --git a/etc/ChangeLog b/etc/ChangeLog
index bf83b688b17..fb751b8ac22 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2005-09-00  Kevin Ryde  <user42@zip.com.au>
+
+        * MORE.STUFF: Update url for calculator.el.
+
+2005-09-08  Kenichi Handa  <handa@m17n.org>
+
+        * PROBLEMS: Show a patch for Mule-UCS to make it byte-compiled
+        correctly.
+
 2005-08-31  Michael Albinus  <michael.albinus@gmx.de>
 
         * NEWS: Add entry for `make-auto-save-file-name'.
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 0a81c1817a4..2121267e50e 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -43,7 +43,7 @@ You might find bug-fixes or enhancements in these places.
 
  * BS: <URL:http://www.geekware.de/software/emacs/index.html>
 
- * Calculator: <URL:http://www.cs.cornell.edu/eli/misc/calculator.el>
+ * Calculator: <URL:http://www.barzilay.org/misc/calculator.el>
 
  * CC mode: <URL:http://cc-mode.sourceforge.net/>
 
diff --git a/etc/NEWS b/etc/NEWS
index ca64a31c52b..b9090c53e54 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1219,6 +1219,12 @@ fontset appropriately.
 ** Customize changes:
 
 +++
+*** Custom themes are collections of customize options.  Create a
+custom theme with M-x customize-create-theme.  Use M-x load-theme to
+load and enable a theme, and M-x disable-theme to disable it.  Use M-x
+enable-theme to renable a disabled theme.
+
++++
 *** The commands M-x customize-face and M-x customize-face-other-window
 now look at the character after point.  If a face or faces are
 specified for that character, the commands by default customize those
@@ -1835,6 +1841,12 @@ boundaries during scrolling.
 
 * Changes in Specialized Modes and Packages in Emacs 22.1:
 
+** The variable `woman-topic-at-point' was renamed
+to `woman-use-topic-at-point' and behaves differently: if this
+variable is non-nil, the `woman' command uses the word at point
+automatically, without asking for a confirmation.  Otherwise, the word
+at point is suggested as default, but not inserted at the prompt.
+
 ---
 ** Changes to cmuscheme
 
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 8e6fc32121e..03b2820d035 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -907,6 +907,36 @@ distributions, such as Debian, may already have applied such a patch.)
 Note that Emacs has native support for Unicode, roughly equivalent to
 Mule-UCS's, so you may not need it.
 
+** Mule-UCS compilation problem.
+
+Emacs of old versions and XEmacs byte-compile the form `(progn progn
+...)' the same way as `(progn ...)', but Emacs of version 21.3 and the
+later process that form just as interpreter does, that is, as `progn'
+variable reference.  Apply the following patch to Mule-UCS 0.84 to
+make it compiled by the latest Emacs.
+
+--- mucs-ccl.el 2 Sep 2005 00:42:23 -0000       1.1.1.1
++++ mucs-ccl.el 2 Sep 2005 01:31:51 -0000       1.3
+@@ -639,10 +639,14 @@
+       (mucs-notify-embedment 'mucs-ccl-required name)
+       (setq ccl-pgm-list (cdr ccl-pgm-list)))
+ ;   (message "MCCLREGFIN:%S" result)
+-    `(progn
+-       (setq mucs-ccl-facility-alist
+-            (quote ,mucs-ccl-facility-alist))
+-       ,@result)))
++    ;; The only way the function is used in this package is included
++    ;; in `mucs-package-definition-end-hook' value, where it must
++    ;; return (possibly empty) *list* of forms.  Do this.  Do not rely
++    ;; on byte compiler to remove extra `progn's in `(progn ...)' 
++    ;; form.
++    `((setq mucs-ccl-facility-alist
++           (quote ,mucs-ccl-facility-alist))
++      ,@result)))
+ 
+ ;;; Add hook for embedding translation informations to a package.
+ (add-hook 'mucs-package-definition-end-hook
+
 ** Accented ISO-8859-1 characters are displayed as | or _.
 
 Try other font set sizes (S-mouse-1).  If the problem persists with
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0256150af9..b0e895a3707 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,187 @@
-2005-09-05  Chong Yidong  <cyd@stupidchicken.com>
+2005-09-11  Kim F. Storm  <storm@cua.dk>
+
+        * emacs-lisp/authors.el (authors-aliases): Update list.
+        (authors-fixed-entries): Update mldrag.el entry.
+
+2005-09-10  Alan Mackenzie  <acm@muc.de>
+
+        * page.el (narrow-to-page): Exclude _entire_ multi-line delimiter
+        from the region narrowed to.
+
+2005-09-10  Magnus Henoch  <mange@freemail.hu>
+
+        * textmodes/ispell.el (ispell-check-version): Signal an error if
+        aspell version is less than 0.60.
+
+2005-09-10  Pascal Dupuis  <Pascal.Dupuis@esat.kuleuven.be>  (tiny change)
+
+        * progmodes/octave-inf.el (inferior-octave-startup): Resync
+        current dir at the end.
+
+2005-09-10  Emilio C. Lopes  <eclig@gmx.net>
+
+        * woman.el (woman-topic-at-point-default): Renamed to
+        woman-use-topic-at-point-default.
+        (woman-topic-at-point): Renamed to woman-use-topic-at-point.
+        (woman-file-name): Reflect renames above.  Automatically use the
+        word at point as topic if woman-use-topic-at-point is non-nil.
+        Otherwise offer it as default but don't insert it in the
+        minibuffer.  Also use `test-completion' instead of `assoc' as
+        suggested by Stefan Monnier.
+
+2005-09-10  Andre Spiegel  <spiegel@gnu.org>
+
+        * vc.el (vc-directory, vc-update-change-log): Throw an error on
+        the attempt to do it over Tramp.  This is not yet supported.
+
+2005-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * menu-bar.el (menu-bar-menu-frame-live-and-visible-p)
+        (menu-bar-non-minibuffer-window-p): New functions.
+        ("Split Window", "Save As..."): Use them.
+        ("Postscript Print Buffer (B+W)", "Postscript Print Buffer")
+        ("Print Buffer", "Truncate Long Lines in this Buffer"):  Use
+        menu-bar-menu-frame-live-and-visible-p.
+        ("Save Buffer", "Insert File", "Open Directory...")
+        ("Open File...", "Visit New File..."): Use
+        menu-bar-non-minibuffer-window-p.
+        (kill-this-buffer-enabled-p, dired <menu-enable>): Use
+        menu-bar-non-minibuffer-window-p.
+
+2005-09-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * cus-start.el (all): Don't complain about fringe-related
+        built-ins if fringes are not supported.  Ditto about
+        selection-related built-ins.  Fix the test for GTK-related
+        built-ins.
+
+        * menu-bar.el ("Split Window", "Postscript Print Buffer (B+W)")
+        ("Postscript Print Buffer", "Print Region", "Save As...")
+        ("Save", "Insert File...", "Open Directory...")
+        ("Open File...", "Visit New File..."")
+        ("Truncate Long Lines in this Buffer"): Don't look at
+        menu-updating-frame if this display does not support multiple
+        frames.
+
+2005-09-09  Frederik Fouvry  <fouvry@CoLi.Uni-SB.DE>
+
+        * mail/sendmail.el (default-sendmail-coding-system): Doc fix.
+
+2005-09-09  Emilio Lopes  <eclig@gmx.net>
+
+        * woman.el: Format- and whitespace-related changes.
+
+2005-09-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * woman.el: Fix my email address.
+
+2005-09-08  Richard M. Stallman  <rms@gnu.org>
+
+        * progmodes/sh-script.el (sh-skeleton-pair-default-alist): New var.
+        (sh-mode): Locally set skeleton-pair-default-alist.
+
+        * progmodes/make-mode.el (makefile-add-log-defun): Trim the result.
+
+        * progmodes/flymake.el: Require `compile' unconditionally.
+
+        * mail/sendmail.el (send-mail-function): Add Mailclient alternative.
+
+        * woman.el (woman-file-name): Provide a default, not initial input.
+
+        * smerge-mode.el (smerge-resolve): Pass args to smerge-remove-props.
+
+        * font-lock.el (font-lock-support-mode): Doc fix.
 
-        * custom.el (custom-push-theme): Fix last change.
+        * descr-text.el (describe-property-list): Handle non-symbol prop names.
+
+2005-09-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * net/ange-ftp.el (ange-ftp-process-filter): Revert to ^#+$.
+        Use with-current-buffer.
+        (ange-ftp-gwp-start): Remove unused var `gw-user'.
+        (ange-ftp-guess-hash-mark-size): Remove unused var `result'.
+        (ange-ftp-insert-directory): Remove unused var `short'.
+        (ange-ftp-file-name-sans-versions): Remove unused var `host-type'.
+
+2005-08-30  Richard M. Stallman  <rms@gnu.org>
+
+        * simple.el (blink-matching-open): Get rid of text props from
+        the string shown in echo area.  Don't permanently set point.
+        Some rearrangements.
+
+        * files.el (risky-local-variable-p):
+        Match `-predicates' and `-commands.
+
+        * cus-edit.el (custom-buffer-sort-alphabetically): Default to t.
+        (custom-save-all): Visit the file if necessary;
+        kill the buffer if we created it.
+        (custom-save-delete): Don't visit file or kill buffer here.
+
+2005-09-08  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * recentf.el (recentf-filename-handler): Add custom choice
+        `abbreviate-file-name'.
+
+        * msb.el (msb--very-many-menus): Fix typo.
+
+        * disp-table.el (standard-display-european): Don't set
+        enable-multibyte-characters to nil.
+
+2005-09-08  David Ponce  <david@dponce.com>
+
+        * recentf.el (recentf-show-file-shortcuts-flag): New option.
+        (recentf-expand-file-name): Doc fix.
+        (recentf-dialog-mode-map): Define digit shortcuts.
+        (recentf--files-with-key): New variable.
+        (recentf-show-digit-shortcut-filter): New function.
+        (recentf-open-files-items): New function.
+        (recentf-open-files): Use it.
+        (recentf-open-file-with-key): New command.
+
+2005-09-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        * woman.el (top): Remap `man' command by `woman' in `woman-mode-map'.
+        (Man-getpage-in-background-advice): Remove defadvice; it isn't
+        necessary any longer with the remapped command.
+        (Man-bgproc-sentinel-advice): Remove defadvice which counts
+        formatting time only.
+
+        * net/tramp.el (tramp-action-password)
+        (tramp-multi-action-password): Compile the password prompt from
+        `method', `user' and `host'.  Sometimes it isn't obvious which
+        password to enter, for example with remote files offered by
+        recentf.el, or with multiple steps.  Suggested by Robert Marshall
+        <robert@chezmarshall.freeserve.co.uk>.
+
+2005-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/perl-mode.el (perl-font-lock-syntactic-keywords):
+        Fix regexp for when "s///" is at the beginning of line.
+
+2005-09-07  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-poly.el (math-expand-term): Multiply out any powers
+        when in matrix mode.
+
+2005-09-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * buff-menu.el (Buffer-menu-sort-by-column): New function.
+        Suggested by Kim F. Storm.
+        (Buffer-menu-sort-button-map): Global keymap for sort buttons.
+        (Buffer-menu-make-sort-button): Use global keymap.
+
+2005-09-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * buff-menu.el (Buffer-menu-make-sort-button): Add docstrings, use
+        non-anonymous functions.
+
+2005-09-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * buff-menu.el (Buffer-menu-make-sort-button): Allow mouse-1 clicks
+        when using a header line.  Otherwise, use mouse-1-click-follows-link.
+
+        * mouse.el (mouse-drag-header-line): Do nothing if the header-line
+        can't be moved; don't signal an error.
 
 2005-09-05  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -11,8 +192,7 @@
         (custom-push-theme): Save old values in the standard theme.
         (disable-theme): Correct typo.
         (custom-face-theme-value) Deleted unused function.
-        (custom-theme-recalc-face): Rewritten to treat enable/disable
-        properly.
+        (custom-theme-recalc-face): Rewritten to treat enable/disable properly.
 
 2005-09-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -211,6 +391,16 @@
         (tramp-advice-make-auto-save-file-name): Make defadvice only when
         `make-auto-save-file-name' is not a magic file name operation.
 
+2005-08-30  Richard M. Stallman  <rms@gnu.org>
+
+        * files.el (risky-local-variable-p):
+        Match `-predicates' and `-commands.
+
+        * cus-edit.el (custom-buffer-sort-alphabetically): Default to t.
+        (custom-save-all): Visit the file if necessary;
+        kill the buffer if we created it.
+        (custom-save-delete): Don't visit file or kill buffer here.
+
 2005-08-30  Carsten Dominik  <dominik@science.uva.nl>
 
         * textmodes/org.el (org-special-keyword): New face.
@@ -762,7 +952,7 @@
 
 2005-08-15  David Ponce  <david@dponce.com>
 
-        * tree-widget.el Update Commentary header.
+        * tree-widget.el: Update Commentary header.
         (tree-widget-theme): Doc fix.
         (tree-widget-space-width): New option.
         (tree-widget-image-properties): Look up in the default theme too.
@@ -2420,7 +2610,7 @@
 
         * ediff-ptch.el (ediff-file-name-sans-prefix): Quote regexp.
 
-        * ediff-init: Get rid of -face in face names.
+        * ediff-init.el: Get rid of -face in face names.
 
 2005-07-10  Richard M. Stallman  <rms@gnu.org>
 
@@ -8631,18 +8821,16 @@
 
 2005-03-25  Werner Lemberg  <wl@gnu.org>
 
-        * calc/calc-forms.el, calc/calc-sel: Replace `illegal' with `invalid'.
-        * midnight.el, vc-cvs.el: Replace `illegal' with `invalid'.
-        * emacs-lisp/cl-macs.el: Replace `illegal' with `invalid'.
-        * emulation/vip.el: Replace `illegal' with `invalid'.
-        * eshell/esh-io.el, eshell/esh-var.el: Replace `illegal' with
-        `invalid'.
-        * mail/supercite.el: Replace `illegal' with `invalid'.
+        * calc/calc-forms.el, calc/calc-sel.el:
+        * midnight.el, vc-cvs.el:
+        * emacs-lisp/cl-macs.el:
+        * emulation/vip.el:
+        * eshell/esh-io.el, eshell/esh-var.el:
+        * mail/supercite.el:
         * progmodes/ebnf-abn.el, progmodes/ebnf-bnf.el
         * progmodes/ebnf-ebx.el, progmodes/ebnf-dtd.el, progmodes/ebnf-iso.el
         * progmodes/ebnf-yac.el, progmodes/ebnf2ps.el, progmodes/idlwave.el
         * progmodes/sh-script.el, progmodes/xscheme.el:
-        Replace `illegal' with `invalid'.
         * textmodes/refbib.el, textmodes/refer.el, textmodes/reftex-cite.el
         * textmodes/reftex-index.el, textmodes/reftex-parse.el
         * textmodes/reftex-ref.el, textmodes/reftex-vars.el
@@ -8807,7 +8995,7 @@
 
 2005-03-22  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-embed (calc-embedded-original-modes): New variable.
+        * calc/calc-embed.el (calc-embedded-original-modes): New variable.
         (calc-embedded-save-original-modes)
         (calc-embedded-restore-original-modes): New functions.
         (calc-do-embedded): Save original modes when entering embedded mode
@@ -18626,7 +18814,7 @@
 
 2004-05-09  Jason Rumney  <jasonr@gnu.org>
 
-        * international/code-pages (cp932, cp936, cp949, c950): Remove.
+        * international/code-pages.el (cp932, cp936, cp949, c950): Remove.
         Only define cp125* if windows-125* is already defined.
 
         * language/korean.el (cp949): Add alias.
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index a0688eefe37..6bd0b347c30 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -1127,7 +1127,7 @@
 
         * isearch.el (isearch-intersects-p): Fix end checks.
 
-2001-09-11  Eli Zaretskii  <a34785@is.elta.co.il>
+2001-09-11  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * gud.el (dbx) <gud-dbx-use-stopformat-p>: Move this case into the
         `t' branch of `cond', since Irix 6.1 and up is a special case of
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 9418eebe98f..4c45847df0f 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -633,35 +633,40 @@ For more information, see the function `buffer-menu'."
             (insert m2)))
         (forward-line)))))
 
+(defun Buffer-menu-sort-by-column (&optional e)
+  "Sort the buffer menu by the column clicked on."
+  (interactive (list last-input-event))
+  (if e (mouse-select-window e))
+  (let* ((pos (event-start e))
+         (obj (posn-object pos))
+         (col (if obj
+                  (get-text-property (cdr obj) 'column (car obj))
+                (get-text-property (posn-point pos) 'column))))
+    (Buffer-menu-sort col)))
+
+(defvar Buffer-menu-sort-button-map
+  (let ((map (make-sparse-keymap)))
+    ;; This keymap handles both nil and non-nil values for
+    ;; Buffer-menu-use-header-line.
+    (define-key map [header-line mouse-1] 'Buffer-menu-sort-by-column)
+    (define-key map [header-line mouse-2] 'Buffer-menu-sort-by-column)
+    (define-key map [mouse-2] 'Buffer-menu-sort-by-column)
+    (define-key map [follow-link] 'mouse-face)
+    (define-key map "\C-m" 'Buffer-menu-sort-by-column)
+    map)
+  "Local keymap for Buffer menu sort buttons.")
+
 (defun Buffer-menu-make-sort-button (name column)
   (if (equal column Buffer-menu-sort-column) (setq column nil))
   (propertize name
-              'help-echo (if column
-                             (if Buffer-menu-use-header-line
-                                 (concat "mouse-2: sort by " (downcase name))
-                               (concat "mouse-2, RET: sort by "
-                                       (downcase name)))
-                           (if Buffer-menu-use-header-line
-                               "mouse-2: sort by visited order"
-                             "mouse-2, RET: sort by visited order"))
+              'column column
+              'help-echo (concat
+                          (if Buffer-menu-use-header-line
+                              "mouse-1, mouse-2: sort by "
+                            "mouse-2, RET: sort by ")
+                          (if column (downcase name) "visited order"))
               'mouse-face 'highlight
-              'keymap (let ((map (make-sparse-keymap)))
-                        (if Buffer-menu-use-header-line
-                            (define-key map [header-line mouse-2]
-                              `(lambda (e)
-                                 (interactive "e")
-                                 (save-window-excursion
-                                   (if e (mouse-select-window e))
-                                   (Buffer-menu-sort ,column))))
-                          (define-key map [mouse-2]
-                            `(lambda (e)
-                               (interactive "e")
-                               (if e (mouse-select-window e))
-                               (Buffer-menu-sort ,column)))
-                          (define-key map "\C-m"
-                            `(lambda () (interactive)
-                               (Buffer-menu-sort ,column))))
-                        map)))
+              'keymap Buffer-menu-sort-button-map))
 
 (defun list-buffers-noselect (&optional files-only buffer-list)
   "Create and return a buffer with a list of names of existing buffers.
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el
index 3dd19b6f67a..e27705de98a 100644
--- a/lisp/calc/calc-poly.el
+++ b/lisp/calc/calc-poly.el
@@ -1069,18 +1069,45 @@
          (math-add-or-sub (list '/ (nth 1 (nth 1 expr)) (nth 2 expr))
                           (list '/ (nth 2 (nth 1 expr)) (nth 2 expr))
                           nil (eq (car (nth 1 expr)) '-)))
+        ((and (eq calc-matrix-mode 'matrix)
+              (eq (car-safe expr) '^)
+              (natnump (nth 2 expr))
+              (> (nth 2 expr) 1)
+              (memq (car-safe (nth 1 expr)) '(+ -)))
+         (if (= (nth 2 expr) 2)
+             (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr))
+                              (list '* (nth 2 (nth 1 expr)) (nth 1 expr))
+                              nil (eq (car (nth 1 expr)) '-))
+           (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (list '^ (nth 1 expr) 
+                                                                (1- (nth 2 expr))))
+                            (list '* (nth 2 (nth 1 expr)) (list '^ (nth 1 expr) 
+                                                                (1- (nth 2 expr))))
+                            nil (eq (car (nth 1 expr)) '-))))
         ((and (eq (car-safe expr) '^)
               (memq (car-safe (nth 1 expr)) '(+ -))
               (integerp (nth 2 expr))
-              (if (> (nth 2 expr) 0)
-                  (or (and (or (> math-mt-many 500000) (< math-mt-many -500000))
-                           (math-expand-power (nth 1 expr) (nth 2 expr)
-                                              nil t))
-                      (list '*
-                            (nth 1 expr)
-                            (list '^ (nth 1 expr) (1- (nth 2 expr)))))
-                (if (< (nth 2 expr) 0)
-                    (list '/ 1 (list '^ (nth 1 expr) (- (nth 2 expr))))))))
+              (if (and (eq calc-matrix-mode 'matrix)
+                       (> (nth 2 expr) 1))
+                  (if (= (nth 2 expr) 2)
+                      (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr))
+                                       (list '* (nth 2 (nth 1 expr)) (nth 1 expr))
+                                       nil (eq (car (nth 1 expr)) '-))
+                    (math-add-or-sub (list '* (nth 1 (nth 1 expr)) 
+                                           (list '^ (nth 1 expr) 
+                                                 (1- (nth 2 expr))))
+                                     (list '* (nth 2 (nth 1 expr)) 
+                                           (list '^ (nth 1 expr) 
+                                                 (1- (nth 2 expr))))
+                                     nil (eq (car (nth 1 expr)) '-)))
+                (if (> (nth 2 expr) 0)
+                    (or (and (or (> math-mt-many 500000) (< math-mt-many -500000))
+                             (math-expand-power (nth 1 expr) (nth 2 expr)
+                                                nil t))
+                        (list '*
+                              (nth 1 expr)
+                              (list '^ (nth 1 expr) (1- (nth 2 expr)))))
+                  (if (< (nth 2 expr) 0)
+                      (list '/ 1 (list '^ (nth 1 expr) (- (nth 2 expr)))))))))
         (t expr)))
 
 (defun calcFunc-expand (expr &optional many)
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 71565963e3d..87393e43ff7 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -369,9 +369,16 @@ since it could result in memory overflow and make Emacs crash."
                       ((string-match "\\`w32-" (symbol-name symbol))
                        (eq system-type 'windows-nt))
                       ((string-match "\\`x-.*gtk" (symbol-name symbol))
-                       (or (boundp 'gtk) (not (eq system-type 'windows-nt))))
+                       (or (boundp 'gtk)
+                           (and window-system
+                                (not (eq window-system 'pc))
+                                (not (eq system-type 'windows-nt)))))
                       ((string-match "\\`x-" (symbol-name symbol))
                        (fboundp 'x-create-frame))
+                      ((string-match "selection" (symbol-name symbol))
+                       (fboundp 'x-selection-exists-p))
+                      ((string-match "fringe" (symbol-name symbol))
+                       (fboundp 'define-fringe-bitmap))
                       (t t))))
     (if (not (boundp symbol))
         ;; If variables are removed from C code, give an error here!
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 5ca9aa08093..cf6ac6ac4ad 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -108,7 +108,8 @@ into widget buttons that call `describe-text-category' or
                        (while properties
                          (push (list (pop properties) (pop properties)) ret))
                        ret)
-                     (lambda (a b) (string< (nth 0 a) (nth 0 b)))))
+                     (lambda (a b) (string< (prin1-to-string (nth 0 a) t)
+                                            (prin1-to-string (nth 0 b) t)))))
     (let ((key (nth 0 elt))
           (value (nth 1 elt)))
       (widget-insert (propertize (format "  %-20s " key)
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 87b3eb5057a..f7052013bae 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -220,8 +220,10 @@ for users who call this function in `.emacs'."
         (unless (or (memq window-system '(x w32)))
           (and (terminal-coding-system)
                (set-terminal-coding-system nil))))
-    ;; Turn off multibyte chars for more compatibility.
-    (setq-default enable-multibyte-characters nil)
+
+    (display-warning 'i18n
+                     "`standard-display-european' is semi-obsolete"
+                     :warning)
 
     ;; Switch to Latin-1 language environment
     ;; unless some other has been specified.
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index ec5446eef38..437332baec9 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -78,6 +78,7 @@ files.")
     ("Jay K. Adams" "jka@ece.cmu.edu" "Jay Adams")
     ("J,Ai(Br,At(Bme Marant" "J,bi(Br,bt(Bme Marant" "Jerome Marant")
     ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen")
+    ("Johan Bockg,Ae(Brd" "Johan Bockgard")
     ("John W. Eaton" "John Eaton")
     ("Jonathan I. Kamens" "Jonathan Kamens")
     ("Joseph Arceneaux" "Joe Arceneaux")
@@ -195,7 +196,7 @@ Changes to files in this list are not listed.")
     ("Michael K. Johnson" :changed "configure.in" "emacs.c" "intel386.h"
      "mem-limits.h" "process.c" "template.h" "sysdep.c" "syssignal.h" "systty.h" "unexec.c"
       "ymakefile" "linux.h")
-    ("Kyle E. Jones" :wrote "mldrag.el")
+    ("Kyle Jones" :wrote "mldrag.el")
     ("Henry Kautz" :wrote "bib-mode.el")
     ("Joseph M. Kelsey" :changed "fileio.c" "vms-pwd.h" "vmsfns.c" "dir.h"
      "uaf.h")
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 38ea3aa029d..21e25ac8a54 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -846,9 +846,13 @@ happens, so the major mode can be corrected."
 (defcustom font-lock-support-mode 'jit-lock-mode
   "*Support mode for Font Lock mode.
 Support modes speed up Font Lock mode by being choosy about when fontification
-occurs.  Known support modes are Fast Lock mode (symbol `fast-lock-mode'),
-Lazy Lock mode (symbol `lazy-lock-mode'), and Just-in-time Lock mode (symbol
-`jit-lock-mode'.  See those modes for more info.
+occurs.  The default support mode, Just-in-time Lock mode (symbol
+`jit-lock-mode'), is recommended.
+
+Other, older support modes are Fast Lock mode (symbol `fast-lock-mode') and
+Lazy Lock mode (symbol `lazy-lock-mode').  See those modes for more info.
+However, they are no longer recommended, as Just-in-time Lock mode is better.
+
 If nil, means support for Font Lock mode is never performed.
 If a symbol, use that support mode.
 If a list, each element should be of the form (MAJOR-MODE . SUPPORT-MODE),
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 530758aefb0..96052e04c12 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,37 @@
+2005-09-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * spam-report.el (spam-report-gmane): Fix generation of spam
+        report URL.
+
+2005-09-10  Simon Josefsson  <jas@extundo.com>
+
+        * gnus-agent.el (gnus-agent-synchronize-flags): Make the default
+        t, based on discussion on the ding list with Robert Epprecht
+        <epprecht@solnet.ch>.
+
+2005-09-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * spam-report.el (spam-report-gmane): Make it work without
+        X-Report-Spam header.  Gmane now only provides Archived-At.  This
+        is only used if `spam-report-gmane-use-article-number' is nil.
+        (spam-report-gmane-spam-header): Removed.  Not used anymore.
+
+        * nnweb.el (nnweb-google-wash-article): Print a message if article
+        is not available.
+
+2005-09-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+        * gnus-art.el (gnus-mime-display-single): Decode text/* parts
+        content before displaying.
+
+2005-09-06  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * mml-smime.el: Remove defvar of gnus-extract-address-components.
+
+2005-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-view.el (mm-display-inline-fontify): Disable support modes.
+
 2005-09-05  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * message.el (message-tab-body-function): Fixed mismatched custom
@@ -5,7 +39,7 @@
 
         * gnus.el (gnus-group-change-level-function): Ditto.
 
-        * gnus-msg.el (gnus-outgoing-message-group):  Ditto.
+        * gnus-msg.el (gnus-outgoing-message-group): Ditto.
 
         * gnus-art.el (gnus-signature-limit)
         (gnus-article-mime-part-function): Ditto.
@@ -237,8 +271,6 @@
         * gnus-util.el (gnus-beginning-of-window): Remove.
         (gnus-end-of-window): Remove.
 
-        * lpath.el: Don't bind scroll-margin.
-
 2005-07-25  Simon Josefsson  <jas@extundo.com>
 
         * pgg.el (pgg-insert-url-with-w3): Don't load w3, it is possible
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 5d7a608054e..f39bf525db8 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -7658,7 +7658,7 @@
 
         * spam.el: more compilation fixes for BBDB
 
-        * spam-stat.el added code from Alex Schroeder <alex@gnu.org>
+        * spam-stat.el: added code from Alex Schroeder <alex@gnu.org>
         (spam-stat-reduce-size): Interactive.
         (spam-stat-reset): New function.
         (spam-stat-save): Interactive.
@@ -12404,7 +12404,7 @@
 
 2001-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-        * mm-view.wl (mm-inline-text): Decode a charset-encoded rich text.
+        * mm-view.el (mm-inline-text): Decode a charset-encoded rich text.
 
 2001-12-04 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index ea45a139ab0..47d1dfd7364 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -115,7 +115,7 @@ If nil, only read articles will be expired."
   :group 'gnus-agent
   :type 'function)
 
-(defcustom gnus-agent-synchronize-flags nil
+(defcustom gnus-agent-synchronize-flags t
   "Indicate if flags are synchronized when you plug in.
 If this is `ask' the hook will query the user."
   :version "21.1"
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index b07954772d2..3bdc93935bc 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4862,7 +4862,14 @@ If displaying \"text/html\" is discouraged \(see
               (forward-line -1)
               (setq beg (point)))
             (gnus-article-insert-newline)
-            (mm-insert-inline handle (mm-get-part handle))
+            (mm-insert-inline handle
+                              (let ((charset
+                                     (mail-content-type-get
+                                      (mm-handle-type handle) 'charset)))
+                                (if (eq charset 'gnus-decoded)
+                                    (mm-get-part handle)
+                                  (mm-decode-string (mm-get-part handle)
+                                                    charset))))
             (goto-char (point-max))))
           ;; Do highlighting.
           (save-excursion
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 2d78ccab864..ac408aa179f 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -476,14 +476,16 @@
             (buffer-disable-undo)
             (mm-insert-part handle)
             (require 'font-lock)
-            ;; Inhibit font-lock this time (*-mode-hook might run
-            ;; `turn-on-font-lock') so that jit-lock may not turn off
-            ;; font-lock immediately after this.
-            (let ((font-lock-mode t))
-              (funcall mode))
-            (let ((font-lock-verbose nil))
-              ;; I find font-lock a bit too verbose.
-              (font-lock-fontify-buffer))
+            (let ((font-lock-maximum-size nil)
+                  ;; Disable support modes, e.g., jit-lock, lazy-lock, etc.
+                  (font-lock-mode-hook nil)
+                  (font-lock-support-mode nil)
+                  ;; I find font-lock a bit too verbose.
+                  (font-lock-verbose nil))
+              (funcall mode)
+              ;; The mode function might have already turned on font-lock.
+              (unless (symbol-value 'font-lock-mode)
+                (font-lock-fontify-buffer)))
             ;; By default, XEmacs font-lock uses non-duplicable text
             ;; properties.  This code forces all the text properties
             ;; to be copied along with the text.
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 25cb3094cbb..2933c14744a 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -29,8 +29,6 @@
 
 (eval-when-compile (require 'cl))
 
-(defvar gnus-extract-address-components)
-
 (require 'smime)
 (require 'mm-decode)
 (autoload 'message-narrow-to-headers "message")
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index 85c8d4c5239..d3737cd66fd 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -319,12 +319,22 @@ Valid types include `google', `dejanews', and `gmane'.")
   ;; We have Google's masked e-mail addresses here.  :-/
   (let ((case-fold-search t))
     (goto-char (point-min))
-    (delete-region (point-min)
-                   (1+ (re-search-forward "^<pre>" nil t)))
-    (goto-char (point-min))
-    (delete-region (- (re-search-forward "^</pre>" nil t) (length "</pre>"))
-                   (point-max))
-    (mm-url-decode-entities)))
+    (if (save-excursion
+          (or (re-search-forward "The requested message.*could not be found."
+                                 nil t)
+              (not (and (re-search-forward "^<pre>" nil t)
+                        (re-search-forward "^</pre>" nil t)))))
+        ;; FIXME: Don't know how to indicate "not found".
+        ;; Should this function throw an error?  --rsteib
+        (progn
+          (gnus-message 3 "Requested article not found")
+          (erase-buffer))
+      (delete-region (point-min)
+                     (1+ (re-search-forward "^<pre>" nil t)))
+      (goto-char (point-min))
+      (delete-region (- (re-search-forward "^</pre>" nil t) (length "</pre>"))
+                     (point-max))
+      (mm-url-decode-entities))))
 
 (defun nnweb-google-parse-1 (&optional Message-ID)
   (let ((i 0)
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 50a564885bb..173306ec55e 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -49,12 +49,6 @@ instead."
                 (regexp :value "^nntp\+.*:gmane\."))
   :group 'spam-report)
 
-(defcustom spam-report-gmane-spam-header
-  "^X-Report-Spam: http://\\([^/]+\\)\\(.*\\)$"
-  "String matching Gmane spam-reporting header.  Two match groups are needed."
-  :type 'regexp
-  :group 'spam-report)
-
 (defcustom spam-report-gmane-use-article-number t
   "Whether the article number (faster!) or the header should be used."
   :type 'boolean
@@ -103,19 +97,42 @@ undo that change.")
                    article))
         (with-current-buffer nntp-server-buffer
           (gnus-request-head article gnus-newsgroup-name)
-          (goto-char (point-min))
-          (if (re-search-forward spam-report-gmane-spam-header nil t)
-              (let* ((host (match-string 1))
-                     (report (match-string 2))
-                     (url (format "http://%s%s" host report)))
-                (gnus-message 7 "Reporting spam through URL %s..." url)
-                (spam-report-url-ping host report))
-            (gnus-message 3 "Could not find X-Report-Spam in article %d..."
-                          article)))))))
+          (let ((case-fold-search t)
+                field host report url)
+            ;; First check for X-Report-Spam because it's more specific to
+            ;; spam reporting than Archived-At.  OTOH, all new articles on
+            ;; Gmane don't have X-Report-Spam anymore (unless Lars changes his
+            ;; mind :-)).
+            ;;
+            ;; There might be more than one Archived-At header so we need to
+            ;; find (and transform) the one related to Gmane.
+            (setq field (or (gnus-fetch-field "X-Report-Spam")
+                            (gnus-fetch-field "Archived-At")))
+            (setq host (progn
+                         (string-match
+                          (concat "http://\\([a-z]+\\.gmane\\.org\\)"
+                                  "\\(/[^:/]+[:/][0-9]+\\)")
+                          field)
+                         (match-string 1 field)))
+            (setq report (match-string 2 field))
+            (when (string-equal "permalink.gmane.org" host)
+              (setq host "spam.gmane.org")
+              (setq report (gnus-replace-in-string
+                            report "/\\([0-9]+\\)$" ":\\1")))
+            (setq url (format "http://%s%s" host report))
+            (if (not (and host report url))
+                (gnus-message
+                 3 "Could not find a spam report header in article %d..."
+                 article)
+              (gnus-message 7 "Reporting spam through URL %s..." url)
+              (spam-report-url-ping host report))))))))
 
 (defun spam-report-url-ping (host report)
   "Ping a host through HTTP, addressing a specific GET resource using
 the function specified by `spam-report-url-ping-function'."
+  ;; Example:
+  ;; host: "spam.gmane.org"
+  ;; report: "/gmane.some.group:123456"
   (funcall spam-report-url-ping-function host report))
 
 (defun spam-report-url-ping-plain (host report)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index b7ea845f8ae..4255788605f 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -130,6 +130,7 @@ This is used by the default mail-sending commands.  See also
   :type '(radio (function-item sendmail-send-it :tag "Use Sendmail package")
                 (function-item smtpmail-send-it :tag "Use SMTPmail package")
                 (function-item feedmail-send-it :tag "Use Feedmail package")
+                (function-item mailclient-send-it :tag "Use Mailclient package")
                 function)
   :group 'sendmail)
 
@@ -886,9 +887,9 @@ See also the function `select-message-coding-system'.")
   "Default coding system for encoding the outgoing mail.
 This variable is used only when `sendmail-coding-system' is nil.
 
-This variable is set/changed by the command set-language-environment.
+This variable is set/changed by the command `set-language-environment'.
 User should not set this variable manually,
-instead use sendmail-coding-system to get a constant encoding
+instead use `sendmail-coding-system' to get a constant encoding
 of outgoing mails regardless of the current language environment.
 See also the function `select-message-coding-system'.")
 
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 302ede8c8ff..401513c3583 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -105,10 +105,8 @@ A large number or nil slows down menu responsiveness."
 
 (define-key menu-bar-file-menu [split-window]
   '(menu-item "Split Window" split-window-vertically
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame )
-                           (not (window-minibuffer-p
-                                 (frame-selected-window menu-updating-frame))))
+              :enable (and (menu-bar-menu-frame-live-and-visible-p)
+                           (menu-bar-non-minibuffer-window-p))
               :help "Split selected window in two windows"))
 
 (define-key menu-bar-file-menu [separator-window]
@@ -120,8 +118,7 @@ A large number or nil slows down menu responsiveness."
               :help "Pretty-print marked region in black and white to PostScript printer"))
 (define-key menu-bar-file-menu [ps-print-buffer]
   '(menu-item "Postscript Print Buffer (B+W)" ps-print-buffer
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame ))
+              :enable (menu-bar-menu-frame-live-and-visible-p)
               :help "Pretty-print current buffer in black and white to PostScript printer"))
 (define-key menu-bar-file-menu [ps-print-region-faces]
   '(menu-item "Postscript Print Region" ps-print-region-with-faces
@@ -129,8 +126,7 @@ A large number or nil slows down menu responsiveness."
               :help "Pretty-print marked region to PostScript printer"))
 (define-key menu-bar-file-menu [ps-print-buffer-faces]
   '(menu-item "Postscript Print Buffer" ps-print-buffer-with-faces
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame ))
+              :enable (menu-bar-menu-frame-live-and-visible-p)
               :help "Pretty-print current buffer to PostScript printer"))
 (define-key menu-bar-file-menu [print-region]
   '(menu-item "Print Region" print-region
@@ -138,8 +134,7 @@ A large number or nil slows down menu responsiveness."
               :help "Print region between mark and current position"))
 (define-key menu-bar-file-menu [print-buffer]
   '(menu-item "Print Buffer" print-buffer
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame ))
+              :enable (menu-bar-menu-frame-live-and-visible-p)
               :help "Print current buffer with page headings"))
 
 (define-key menu-bar-file-menu [separator-print]
@@ -170,17 +165,14 @@ A large number or nil slows down menu responsiveness."
               :help "Re-read current buffer from its file"))
 (define-key menu-bar-file-menu [write-file]
   '(menu-item "Save As..." write-file
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame )
-                           (not (window-minibuffer-p
-                                 (frame-selected-window menu-updating-frame))))
+              :enable (and (menu-bar-menu-frame-live-and-visible-p)
+                           (menu-bar-non-minibuffer-window-p))
               :help "Write current buffer to another file"))
 (define-key menu-bar-file-menu [save-buffer]
   '(menu-item "Save" save-buffer
               :enable (and (buffer-modified-p)
                            (buffer-file-name)
-                           (not (window-minibuffer-p
-                                 (frame-selected-window menu-updating-frame))))
+                           (menu-bar-non-minibuffer-window-p))
               :help "Save current buffer to its file"))
 
 (define-key menu-bar-file-menu [separator-save]
@@ -192,23 +184,19 @@ A large number or nil slows down menu responsiveness."
               :help "Discard (kill) current buffer"))
 (define-key menu-bar-file-menu [insert-file]
   '(menu-item "Insert File..." insert-file
-              :enable (not (window-minibuffer-p
-                            (frame-selected-window menu-updating-frame)))
+              :enable (menu-bar-non-minibuffer-window-p)
               :help "Insert another file into current buffer"))
 (define-key menu-bar-file-menu [dired]
   '(menu-item "Open Directory..." dired
-              :enable (not (window-minibuffer-p
-                            (frame-selected-window menu-updating-frame)))
+              :enable (menu-bar-non-minibuffer-window-p)
               :help "Read a directory, operate on its files"))
 (define-key menu-bar-file-menu [open-file]
   '(menu-item "Open File..." find-file-existing
-              :enable (not (window-minibuffer-p
-                            (frame-selected-window menu-updating-frame)))
+              :enable (menu-bar-non-minibuffer-window-p)
               :help "Read an existing file into an Emacs buffer"))
 (define-key menu-bar-file-menu [new-file]
   '(menu-item "Visit New File..." find-file
-              :enable (not (window-minibuffer-p
-                            (frame-selected-window menu-updating-frame)))
+              :enable (menu-bar-non-minibuffer-window-p)
               :help "Read or create a file and edit it"))
 
 
@@ -1043,8 +1031,7 @@ mail status in mode line"))
               toggle-truncate-lines
               :help "Truncate long lines on the screen"
               :button (:toggle . truncate-lines)
-              :enable (and (frame-live-p menu-updating-frame)
-                           (frame-visible-p menu-updating-frame))))
+              :enable (menu-bar-menu-frame-live-and-visible-p)))
 
 (define-key menu-bar-options-menu [highlight-separator]
   '("--"))
@@ -1425,6 +1412,23 @@ key, a click, or a menu-item"))
   '(menu-item "Emacs Tutorial" help-with-tutorial
               :help "Learn how to use Emacs"))
 
+(defun menu-bar-menu-frame-live-and-visible-p ()
+  "Return non-nil if the menu frame is alive and visible.
+The menu frame is the frame for which we are updating the menu."
+  (let ((menu-frame (if (display-multi-frame-p) menu-updating-frame
+                      (selected-frame))))
+    (and (frame-live-p menu-frame)
+         (frame-visible-p menu-frame))))
+
+(defun menu-bar-non-minibuffer-window-p ()
+  "Return non-nil if selected window of the menu frame is not a minibuf window.
+
+See the documentation of `menu-bar-menu-frame-live-and-visible-p'
+for the definition of the menu frame."
+  (let ((menu-frame (if (display-multi-frame-p) menu-updating-frame
+                      (selected-frame))))
+    (not (window-minibuffer-p (frame-selected-window menu-frame)))))
+
 (defun kill-this-buffer ()      ; for the menubar
   "Kill the current buffer."
   (interactive)
@@ -1437,11 +1441,10 @@ key, a click, or a menu-item"))
       (or (string-match "^ " (buffer-name (car buffers)))
           (setq count (1+ count)))
       (setq buffers (cdr buffers)))
-    (and (not (window-minibuffer-p (frame-selected-window menu-updating-frame)))
+    (and (menu-bar-non-minibuffer-window-p)
          (> count 1))))
 
-(put 'dired 'menu-enable
-     '(not (window-minibuffer-p (frame-selected-window menu-updating-frame))))
+(put 'dired 'menu-enable '(menu-bar-non-minibuffer-window-p))
 
 ;; Permit deleting frame if it would leave a visible or iconified frame.
 (defun delete-frame-enabled-p ()
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 82bedd7c2a6..28cc6c2a6d0 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -43,7 +43,7 @@
         (mh-show-from-face, mh-show-xface-face, mh-speedbar-folder-face)
         (mh-speedbar-selected-folder-face)
         (mh-speedbar-folder-with-unseen-messages-face)
-        (mh-speedbar-selected-folder-with-unseen-messages-face): 
+        (mh-speedbar-selected-folder-with-unseen-messages-face):
         New backward-compatibility aliases for renamed faces.
         (mh-folder-body-face, mh-folder-cur-msg-face)
         (mh-folder-cur-msg-number-face, mh-folder-date-face)
@@ -56,7 +56,7 @@
         (mh-show-pgg-unknown-face, mh-show-pgg-bad-face)
         (mh-show-to-face, mh-show-from-face, mh-show-subject-face)
         (mh-speedbar-folder-with-unseen-messages)
-        (mh-speedbar-selected-folder-with-unseen-messages): 
+        (mh-speedbar-selected-folder-with-unseen-messages):
         Use renamed MH-E faces.
 
         * mh-utils.el (mh-letter-font-lock-keywords)
@@ -900,7 +900,7 @@
 
         * mh-e.el (Version, mh-version): Updated for release 7.4.3.
 
-        * This patch release contains the following two patches:
+        This patch release contains the following two patches:
 
         * mh-identity.el (mh-identity-make-menu): Removed condition on
         mh-auto-fields-list. Use it to enable or disable menu item
@@ -8402,7 +8402,7 @@
         defcustom to mh-utils because I got an error about a nil value for
         mh-tool-bar-reply-3-buttons when I fired up mh-rmail.
 
-        * mh-comp.el, mh-funcs,el, mh-mime.el, mh-pick.el: Moved (provide)
+        * mh-comp.el, mh-funcs.el, mh-mime.el, mh-pick.el: Moved (provide)
         to the end of the file to be consistent with most other files (see
         additional rationale in mh-e.el description below).
 
@@ -9210,7 +9210,7 @@
 2002-08-19  Peter S Galbraith  <psg@debian.org>
 
         * reply-to.xpm, reply-to.pbm, reply-from.xpm, reply-from.pbm,
-        reply-all.xpm, reply-all.bpm:  New icons for various reply methods.
+        * reply-all.xpm, reply-all.bpm:  New icons for various reply methods.
         * mh-e.el (mh-folder-tool-bar-map): Split reply button into three
         that won't prompt for "from", "to" and "all".
         * mh-comp.el (mh-reply): Put variable reply-to in the interactive
@@ -10234,7 +10234,7 @@
         operations made on all messages in the selected range when
         transient-mark-mode is on doesn't work in XEmacs.
 
-        * mh-e.el, mh-utils: Conditionalize calls to
+        * mh-e.el, mh-utils.el: Conditionalize calls to
         'add-to-list 'facemenu-unlisted-faces for XEmacs.
 
 2001-12-11  Jeffrey C Honig  <jch@honig.net>
diff --git a/lisp/mouse.el b/lisp/mouse.el
index c928e04f8ed..1970fbf1eeb 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -538,11 +538,10 @@ resized by dragging their header-line."
          (window (posn-window start))
          (frame (window-frame window))
          (first-window (frame-first-window frame)))
-    (when (or (eq window first-window)
-              (= (nth 1 (window-edges window))
-                 (nth 1 (window-edges first-window))))
-      (error "Cannot move header-line at the top of the frame"))
-    (mouse-drag-mode-line-1 start-event nil)))
+    (unless (or (eq window first-window)
+                (= (nth 1 (window-edges window))
+                   (nth 1 (window-edges first-window))))
+      (mouse-drag-mode-line-1 start-event nil))))
 
 
 (defun mouse-drag-vertical-line (start-event)
diff --git a/lisp/msb.el b/lisp/msb.el
index 8fa63d98051..94a1599371f 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -185,7 +185,7 @@
      "Elisp Files (%d)")
     ((eq major-mode 'latex-mode)
      3030
-     "LaTex Files (%d)")
+     "LaTeX Files (%d)")
     ('no-multi
      3099
      "Other files (%d)")))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e721f3fb016..b8b3fb9068a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -5213,7 +5213,10 @@ Returns nil if none was found, else the command is returned."
 
 (defun tramp-action-password (p multi-method method user host)
   "Query the user for a password."
-  (let ((pw-prompt (match-string 0)))
+  (let ((pw-prompt
+         (format "Password for %s "
+                 (tramp-make-tramp-file-name
+                  nil method user host ""))))
     (tramp-message 9 "Sending password")
     (tramp-enter-password p pw-prompt user host)))
 
@@ -5300,8 +5303,12 @@ The terminal type can be configured with `tramp-terminal-type'."
 
 (defun tramp-multi-action-password (p method user host)
   "Query the user for a password."
-  (tramp-message 9 "Sending password")
-  (tramp-enter-password p (match-string 0) user host))
+  (let ((pw-prompt
+         (format "Password for %s "
+                 (tramp-make-tramp-file-name
+                  nil method user host ""))))
+    (tramp-message 9 "Sending password")
+    (tramp-enter-password p pw-prompt user host)))
 
 (defun tramp-multi-action-succeed (p method user host)
   "Signal success in finding shell prompt."
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index 0c94120a0f8..85f7e1339f3 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -4,6 +4,7 @@
 ;; Free Software Foundation, Inc.
 
 ;; Author: Ray Blaak <blaak@infomatch.com>
+;; Maintainer: FSF  (Blaak's email addr bounces, Aug 2005)
 ;; Keywords: languages
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index d137284f795..e5089d84fb0 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -960,8 +960,7 @@ Convert it to flymake internal format."
           (setq converted-list (cons (list regexp file line col) converted-list)))))
     converted-list))
 
-(eval-when-compile
-  (require 'compile))
+(require 'compile)
 
 (defvar flymake-err-line-patterns ; regexp file-idx line-idx col-idx (optional) text-idx(optional), match-end to end of string is error text
   (append
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index b8336691307..11ae1c66aa7 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1833,6 +1833,10 @@ If it isn't in one, return nil."
                       ;; Don't keep looking across a blank line or comment.
                       (looking-at "$\\|#")
                       (not (zerop (forward-line -1))))))
+      ;; Remove leading and trailing whitespace.
+      (when found
+        (setq found (replace-regexp-in-string "[ \t]+\\'" "" found))
+        (setq found (replace-regexp-in-string "\\`[ \t]+" "" found)))
       found)))
 
 (provide 'make-mode)
diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index 917016cf159..4f0875bbf99 100644
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -248,7 +248,11 @@ startup file, `~/.emacs-octave'."
 
     ;; And finally, everything is back to normal.
     (set-process-filter proc 'inferior-octave-output-filter)
-    (run-hooks 'inferior-octave-startup-hook)))
+    (run-hooks 'inferior-octave-startup-hook)
+    (run-hooks 'inferior-octave-startup-hook)
+    ;; Just in case, to be sure a cd in the startup file
+    ;; won't have detrimental effects.
+    (inferior-octave-resync-dirs)))
 
 
 (defun inferior-octave-complete ()
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 25a414e69d2..cb2ec81f501 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -267,12 +267,12 @@ The expansion is entirely correct because it uses the C preprocessor."
     ("\\<sub\\s-+\\S-+\\s-*(\\([^)]+\\))" 1 '(1))
     ;; regexp and funny quotes
     ("[?:.,;=!~({[][ \t\n]*\\(/\\)" (1 '(7)))
-    ("[?:.,;=!~({[ \t\n]\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)"
+    ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)"
      ;; Nasty cases:
      ;; /foo/m  $a->m  $#m $m @m %m
      ;; \s (appears often in regexps).
      ;; -s file
-     (2 (if (assoc (char-after (match-beginning 2))
+     (3 (if (assoc (char-after (match-beginning 3))
                    perl-quote-like-pairs)
             '(15) '(7))))
     ;; TODO: here-documents ("<<\\(\\sw\\|['\"]\\)")
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index d39cc4b7281..663332fb8c6 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -490,7 +490,10 @@ This is buffer-local in every such buffer.")
     map)
   "Keymap used in Shell-Script mode.")
 
-
+(defvar sh-skeleton-pair-default-alist '((?( _ ?)) (?\))
+                                      (?[ ?\s _ ?\s ?]) (?\])
+                                      (?{ _ ?}) (?\}))
+  "Value to use for `skeleton-pair-default-alist' in Shell-Script mode.")
 
 (defcustom sh-dynamic-complete-functions
   '(shell-dynamic-complete-environment-variable
@@ -1362,6 +1365,8 @@ with your script for an edit-interpret-debug cycle."
   (make-local-variable 'sh-shell-variables-initialized)
   (make-local-variable 'imenu-generic-expression)
   (make-local-variable 'sh-indent-supported-here)
+  (make-local-variable 'skeleton-pair-default-alist)
+  (setq skeleton-pair-default-alist sh-skeleton-pair-default-alist)
   (setq skeleton-end-hook (lambda ()
                             (or (eolp) (newline) (indent-relative)))
         paragraph-start (concat page-delimiter "\\|$")
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 524d00d389d..20251508941 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -5,7 +5,6 @@
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Created: July 19 1999
-;; Maintainer: FSF
 ;; Keywords: files
 
 ;; This file is part of GNU Emacs.
@@ -258,7 +257,16 @@ It is passed a filename to give a chance to transform it.
 If it returns nil, the filename is left unchanged."
   :group 'recentf
   :type '(choice (const :tag "None" nil)
+                 (const abbreviate-file-name)
                  function))
+
+(defcustom recentf-show-file-shortcuts-flag t
+  "Whether to show ``[N]'' for the Nth item up to 10.
+If non-nil, `recentf-open-files' will show labels for keys that can be
+used as shortcuts to open the Nth file."
+  :group 'recentf
+  :type 'boolean)
+
 
 ;;; Utilities
 ;;
@@ -349,7 +357,7 @@ filenames."
   "Convert filename NAME to absolute, and canonicalize it.
 See also the function `expand-file-name'.
 If defined, call the function `recentf-filename-handler'
-to postprocess the canonical name."
+to post process the canonical name."
   (let* ((filename (expand-file-name name)))
     (or (and recentf-filename-handler
              (funcall recentf-filename-handler filename))
@@ -926,6 +934,9 @@ Go to the beginning of buffer if not found."
     (set-keymap-parent km widget-keymap)
     (define-key km "q" 'recentf-cancel-dialog)
     (define-key km [down-mouse-1] 'widget-button-click)
+    ;; Keys in reverse order of appearence in help.
+    (dolist (k '("0" "9" "8" "7" "6" "5" "4" "3" "2" "1"))
+      (define-key km k 'recentf-open-file-with-key))
     km)
   "Keymap used in recentf dialogs.")
 
@@ -1063,6 +1074,18 @@ IGNORE other arguments."
   (kill-buffer (current-buffer))
   (funcall recentf-menu-action (widget-value widget)))
 
+;; List of files associated to a digit shortcut key.
+(defvar recentf--files-with-key nil)
+
+(defun recentf-show-digit-shortcut-filter (l)
+  "Filter the list of menu-elements L to show digit shortcuts."
+  (let ((i 0))
+    (dolist (e l)
+      (setq i (1+ i))
+      (recentf-set-menu-element-item
+       e (format "[%d] %s" (% i 10) (recentf-menu-element-item e))))
+    l))
+
 (defun recentf-open-files-item (menu-element)
   "Return a widget to display MENU-ELEMENT in a dialog buffer."
   (if (consp (cdr menu-element))
@@ -1085,6 +1108,26 @@ IGNORE other arguments."
            :action recentf-open-files-action
            ,(cdr menu-element))))
 
+(defun recentf-open-files-items (files)
+  "Return a list of widgets to display FILES in a dialog buffer."
+  (set (make-local-variable 'recentf--files-with-key)
+       (recentf-trunc-list files 10))
+  (mapcar 'recentf-open-files-item
+          (append
+           ;; When requested group the files with shortcuts together
+           ;; at the top of the list.
+           (when recentf-show-file-shortcuts-flag
+             (setq files (nthcdr 10 files))
+             (recentf-apply-menu-filter
+              'recentf-show-digit-shortcut-filter
+              (mapcar 'recentf-make-default-menu-element
+                      recentf--files-with-key)))
+           ;; Then the other files.
+           (recentf-apply-menu-filter
+            recentf-menu-filter
+            (mapcar 'recentf-make-default-menu-element
+                    files)))))
+
 (defun recentf-open-files (&optional files buffer-name)
   "Show a dialog to open a recent file.
 If optional argument FILES is non-nil, it is a list of recently-opened
@@ -1093,25 +1136,43 @@ If optional argument BUFFER-NAME is non-nil, it is a buffer name to
 use for the dialog.  It defaults to \"*`recentf-menu-title'*\"."
   (interactive)
   (recentf-dialog (or buffer-name (format "*%s*" recentf-menu-title))
-    (widget-insert "Click on a file to open it.
-Click on Cancel or type `q' to cancel.\n" )
+    (widget-insert "Click on a file"
+                   (if recentf-show-file-shortcuts-flag
+                       ", or type the corresponding digit key,"
+                     "")
+                   " to open it.\n"
+                   "Click on Cancel or type `q' to cancel.\n")
     ;; Use a L&F that looks like the recentf menu.
     (tree-widget-set-theme "folder")
     (apply 'widget-create
            `(group
              :indent 2
              :format "\n%v\n"
-             ,@(mapcar 'recentf-open-files-item
-                       (recentf-apply-menu-filter
-                        recentf-menu-filter
-                        (mapcar 'recentf-make-default-menu-element
-                                (or files recentf-list))))))
+             ,@(recentf-open-files-items (or files recentf-list))))
     (widget-create
      'push-button
      :notify 'recentf-cancel-dialog
      "Cancel")
     (recentf-dialog-goto-first 'link)))
 
+(defun recentf-open-file-with-key (n)
+  "Open the recent file with the shortcut numeric key N.
+N must be a valid digit.
+`1' opens the first file, `2' the second file, ... `9' the ninth file.
+`0' opens the tenth file."
+  (interactive
+   (list
+    (let ((n (string-to-number (this-command-keys))))
+      (cond
+       ((zerop n) 10)
+       ((and (> n 0) (< n 10)) n)
+       ((error "Invalid digit key %d" n))))))
+  (when recentf--files-with-key
+    (let ((file (nth (1- n) recentf--files-with-key)))
+      (unless file (error "Not that many recent files"))
+      (kill-buffer (current-buffer))
+      (funcall recentf-menu-action file))))
+
 (defun recentf-open-more-files ()
   "Show a dialog to open a recent file that is not in the menu."
   (interactive)
diff --git a/lisp/simple.el b/lisp/simple.el
index 746c670b086..20973e9e699 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4227,88 +4227,90 @@ If nil, search stops at the beginning of the accessible portion of the buffer."
 (defun blink-matching-open ()
   "Move cursor momentarily to the beginning of the sexp before point."
   (interactive)
-  (and (> (point) (1+ (point-min)))
-       blink-matching-paren
-       ;; Verify an even number of quoting characters precede the close.
-       (= 1 (logand 1 (- (point)
-                         (save-excursion
-                           (forward-char -1)
-                           (skip-syntax-backward "/\\")
-                           (point)))))
-       (let* ((oldpos (point))
-              (blinkpos)
-              (mismatch)
-              matching-paren)
-         (save-excursion
-           (save-restriction
-             (if blink-matching-paren-distance
-                 (narrow-to-region (max (point-min)
-                                        (- (point) blink-matching-paren-distance))
-                                   oldpos))
-             (condition-case ()
-                 (let ((parse-sexp-ignore-comments
-                        (and parse-sexp-ignore-comments
-                             (not blink-matching-paren-dont-ignore-comments))))
-                   (setq blinkpos (scan-sexps oldpos -1)))
-               (error nil)))
-           (and blinkpos
-                ;; Not syntax '$'.
-                (not (eq (syntax-class (syntax-after blinkpos)) 8))
-                (setq matching-paren
-                      (let ((syntax (syntax-after blinkpos)))
-                        (and (consp syntax)
-                             (eq (syntax-class syntax) 4)
-                             (cdr syntax)))
-                      mismatch
-                      (or (null matching-paren)
-                          (/= (char-after (1- oldpos))
-                              matching-paren))))
-           (if mismatch (setq blinkpos nil))
-           (if blinkpos
-               ;; Don't log messages about paren matching.
-               (let (message-log-max)
-                (goto-char blinkpos)
-                (if (pos-visible-in-window-p)
-                    (and blink-matching-paren-on-screen
-                         (sit-for blink-matching-delay))
-                  (goto-char blinkpos)
-                  (message
-                   "Matches %s"
-                   ;; Show what precedes the open in its line, if anything.
-                   (if (save-excursion
-                         (skip-chars-backward " \t")
-                         (not (bolp)))
-                       (buffer-substring (progn (beginning-of-line) (point))
-                                         (1+ blinkpos))
-                     ;; Show what follows the open in its line, if anything.
-                     (if (save-excursion
-                           (forward-char 1)
-                           (skip-chars-forward " \t")
-                           (not (eolp)))
-                         (buffer-substring blinkpos
-                                           (progn (end-of-line) (point)))
-                       ;; Otherwise show the previous nonblank line,
-                       ;; if there is one.
-                       (if (save-excursion
-                             (skip-chars-backward "\n \t")
-                             (not (bobp)))
-                           (concat
-                            (buffer-substring (progn
+  (when (and (> (point) (1+ (point-min)))
+             blink-matching-paren
+             ;; Verify an even number of quoting characters precede the close.
+             (= 1 (logand 1 (- (point)
+                               (save-excursion
+                                 (forward-char -1)
+                                 (skip-syntax-backward "/\\")
+                                 (point))))))
+    (let* ((oldpos (point))
+           blinkpos
+           message-log-max  ; Don't log messages about paren matching.
+           matching-paren
+           open-paren-line-string)
+      (save-excursion
+        (save-restriction
+          (if blink-matching-paren-distance
+              (narrow-to-region (max (point-min)
+                                     (- (point) blink-matching-paren-distance))
+                                oldpos))
+          (condition-case ()
+              (let ((parse-sexp-ignore-comments
+                     (and parse-sexp-ignore-comments
+                          (not blink-matching-paren-dont-ignore-comments))))
+                (setq blinkpos (scan-sexps oldpos -1)))
+            (error nil)))
+        (and blinkpos
+             ;; Not syntax '$'.
+             (not (eq (syntax-class (syntax-after blinkpos)) 8))
+             (setq matching-paren
+                   (let ((syntax (syntax-after blinkpos)))
+                     (and (consp syntax)
+                          (eq (syntax-class syntax) 4)
+                          (cdr syntax)))))
+        (cond
+         ((or (null matching-paren)
+              (/= (char-before oldpos)
+                  matching-paren))
+          (message "Mismatched parentheses"))
+         ((not blinkpos)
+          (if (not blink-matching-paren-distance)
+              (message "Unmatched parenthesis")))
+         ((pos-visible-in-window-p blinkpos)
+          ;; Matching open within window, temporarily move to blinkpos but only
+          ;; if `blink-matching-paren-on-screen' is non-nil.
+          (when blink-matching-paren-on-screen
+            (save-excursion
+              (goto-char blinkpos)
+              (sit-for blink-matching-delay))))
+         (t
+          (save-excursion
+            (goto-char blinkpos)
+            (setq open-paren-line-string
+                  ;; Show what precedes the open in its line, if anything.
+                  (if (save-excursion
+                        (skip-chars-backward " \t")
+                        (not (bolp)))
+                      (buffer-substring (line-beginning-position)
+                                        (1+ blinkpos))
+                    ;; Show what follows the open in its line, if anything.
+                    (if (save-excursion
+                          (forward-char 1)
+                          (skip-chars-forward " \t")
+                          (not (eolp)))
+                        (buffer-substring blinkpos
+                                          (line-end-position))
+                      ;; Otherwise show the previous nonblank line,
+                      ;; if there is one.
+                      (if (save-excursion
+                            (skip-chars-backward "\n \t")
+                            (not (bobp)))
+                          (concat
+                           (buffer-substring (progn
                                                (skip-chars-backward "\n \t")
-                                               (beginning-of-line)
-                                               (point))
-                                              (progn (end-of-line)
-                                                     (skip-chars-backward " \t")
-                                                     (point)))
-                            ;; Replace the newline and other whitespace with `...'.
-                            "..."
-                            (buffer-substring blinkpos (1+ blinkpos)))
-                         ;; There is nothing to show except the char itself.
-                         (buffer-substring blinkpos (1+ blinkpos))))))))
-             (cond (mismatch
-                    (message "Mismatched parentheses"))
-                   ((not blink-matching-paren-distance)
-                    (message "Unmatched parenthesis"))))))))
+                                               (line-beginning-position))
+                                             (progn (end-of-line)
+                                                    (skip-chars-backward " \t")
+                                                    (point)))
+                           ;; Replace the newline and other whitespace with `...'.
+                           "..."
+                           (buffer-substring blinkpos (1+ blinkpos)))
+                        ;; There is nothing to show except the char itself.
+                        (buffer-substring blinkpos (1+ blinkpos)))))))
+          (message "Matches %s"
+                   (substring-no-properties open-paren-line-string))))))))
 
 ;Turned off because it makes dbx bomb out.
 (setq blink-paren-function 'blink-matching-open)
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 4b677edc36a..31c7c4f2f12 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -372,7 +372,7 @@ This relies on mode-specific knowledge and thus only works in
 some major modes.  Uses `smerge-resolve-function' to do the actual work."
   (interactive)
   (smerge-match-conflict)
-  (smerge-remove-props)
+  (smerge-remove-props (match-beginning 0) (match-end 0))
   (cond
    ;; Trivial diff3 -A non-conflicts.
    ((and (eq (match-end 1) (match-end 3))
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index d8b6b6e23de..e1805f0e87d 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -814,7 +814,10 @@ Otherwise returns the library directory name, if that is defined."
         (goto-char (point-min))
         (let (case-fold-search)
           (setq ispell-really-aspell
-                (and (search-forward "(but really Aspell " nil t) t))))
+                (and (search-forward-regexp "(but really Aspell \\(.*\\))" nil t)
+                     (if (version< (match-string 1) "0.60")
+                         (error "aspell version 0.60 or greater is required")
+                       t)))))
       (kill-buffer (current-buffer)))
     result))
 
diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index ffb4c89f2db..3ec1eca1fb7 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -112,7 +112,7 @@ thus showing a page other than the one point was originally in."
              (save-excursion
                (goto-char (match-beginning 0)) ; was (beginning-of-line)
                (looking-at page-delimiter)))
-        (beginning-of-line))
+        (goto-char (match-beginning 0))) ; was (beginning-of-line)
     (narrow-to-region (point)
                       (progn
                         ;; Find the top of the page.
diff --git a/lisp/vc.el b/lisp/vc.el
index a0b6ffa0ad8..8e87cb50eb4 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2259,6 +2259,8 @@ With prefix arg READ-SWITCHES, specify a value to override
   (interactive "DDired under VC (directory): \nP")
   (let ((vc-dired-switches (concat vc-dired-listing-switches
                                    (if vc-dired-recurse "R" ""))))
+    (if (eq (string-match tramp-file-name-regexp dir) 0)
+        (error "Sorry, vc-directory does not work over Tramp"))
     (if read-switches
         (setq vc-dired-switches
               (read-string "Dired listing switches: "
@@ -2809,6 +2811,9 @@ log entries should be gathered."
           ;; it should find all relevant files relative to
           ;; the default-directory.
           nil)))
+  (dolist (file (or args (list default-directory)))
+    (if (eq (string-match tramp-file-name-regexp file) 0)
+        (error "Sorry, vc-update-change-log does not work over Tramp")))
   (vc-call-backend (vc-responsible-backend default-directory)
                    'update-changelog args))
 
diff --git a/lisp/woman.el b/lisp/woman.el
index 5ecc4744305..9b7bce889b3 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
-;; Maintainer: Francis J. Wright <F.J.Wright@qmul.ac.uk>
+;; Maintainer: FSF
 ;; Keywords: help, unix
 ;; Adapted-By: Eli Zaretskii <eliz@gnu.org>
 ;; Version: see `woman-version'
@@ -136,27 +136,23 @@
 ;;   man man_page_name
 
 
-;; Using the `word at point' as a topic suggestion
-;; ===============================================
+;; Using the word at point as the default topic
+;; ============================================
 
-;; By default, the `woman' command uses the word nearest to point in
-;; the current buffer as a suggestion for the topic to look up.  The
-;; topic must be confirmed or edited in the minibuffer.  This
-;; suggestion can be turned off, or `woman' can use the suggested
-;; topic without confirmation* if possible, by setting the user-option
-;; `woman-topic-at-point' to nil or t respectively.  (Its default
-;; value is neither nil nor t, meaning ask for confirmation.)
+;; The `woman' command uses the word nearest to point in the current
+;; buffer as the default topic to look up if it matches the name of a
+;; manual page installed on the system.  The default topic can also be
+;; used without confirmation by setting the user-option
+;; `woman-use-topic-at-point' to t; thanks to Benjamin Riefenstahl for
+;; suggesting this functionality.
 
-;; [* Thanks to Benjamin Riefenstahl for suggesting this
-;; functionality.]
-
-;; The variable `woman-topic-at-point' can be rebound locally, which
-;; may be useful to provide special private key bindings, e.g.
+;; The variable `woman-use-topic-at-point' can be rebound locally,
+;; which may be useful to provide special private key bindings, e.g.
 
 ;;  (global-set-key "\C-cw"
 ;;                (lambda ()
 ;;                  (interactive)
-;;                  (let ((woman-topic-at-point t))
+;;                  (let ((woman-use-topic-at-point t))
 ;;                    (woman)))))
 
 
@@ -420,10 +416,7 @@
 ;;   Paul A. Thompson <pat@po.cwru.edu>
 ;;   Arrigo Triulzi <arrigo@maths.qmw.ac.uk>
 ;;   Geoff Voelker <voelker@cs.washington.edu>
-;;   Eli Zaretskii <eliz@is.elta.co.il>
-
-;;; History:
-;;  For recent change log see end of file.
+;;   Eli Zaretskii <eliz@gnu.org>
 
 
 ;;; Code:
@@ -714,26 +707,21 @@ Default is \"CONTENTS\"."
   :type 'string
   :group 'woman-interface)
 
-(defcustom woman-topic-at-point-default 'confirm
-  ;; `woman-topic-at-point' may be let-bound when woman is loaded, in
-  ;; which case its global value does not get defined.
+(defcustom woman-use-topic-at-point-default nil
+  ;; `woman-use-topic-at-point' may be let-bound when woman is loaded,
+  ;; in which case its global value does not get defined.
   ;; `woman-file-name' sets it to this value if it is unbound.
-  "*Default value for `woman-topic-at-point'."
+  "*Default value for `woman-use-topic-at-point'."
   :type '(choice (const :tag "Yes" t)
-                 (const :tag "No" nil)
-                 (other :tag "Confirm" confirm))
+                 (const :tag "No" nil))
   :group 'woman-interface)
 
-(defcustom woman-topic-at-point woman-topic-at-point-default
-  "*Controls use by `woman' of `word at point' as a topic suggestion.
-If non-nil then the `woman' command uses the word at point as an
-initial topic suggestion when it reads a topic from the minibuffer; if
-t then the `woman' command uses the word at point WITHOUT
-INTERACTIVE CONFIRMATION if it exists as a topic.  The default value
-is `confirm', meaning suggest a topic and ask for confirmation."
+(defcustom woman-use-topic-at-point woman-use-topic-at-point-default
+  "*Control use of the word at point as the default topic.
+If non-nil the `woman' command uses the word at point automatically,
+without interactive confirmation, if it exists as a topic."
   :type '(choice (const :tag "Yes" t)
-                 (const :tag "No" nil)
-                 (other :tag "Confirm" confirm))
+                 (const :tag "No" nil))
   :group 'woman-interface)
 
 (defvar woman-file-regexp nil
@@ -956,8 +944,9 @@ This is usually either black or white."
     :group 'woman-faces)
 
   (defcustom woman-use-symbol-font nil
-    "*If non-nil then may use the symbol font.  It is off by default,
-mainly because it may change the line spacing (in NTEmacs 20.5)."
+    "*If non-nil then may use the symbol font.
+It is off by default, mainly because it may change the line spacing
+\(in NTEmacs 20.5)."
     :type 'boolean
     :group 'woman-faces)
 
@@ -1200,10 +1189,11 @@ It is saved to the file named by the variable `woman-cache-filename'."
 
 (defun woman-file-name (topic &optional re-cache)
   "Get the name of the UN*X man-page file describing a chosen TOPIC.
-When `woman' is called interactively, the word at point may be used as
-the topic or initial topic suggestion, subject to the value of the
-user option `woman-topic-at-point'.  Return nil if no file can be found.
-Optional argument RE-CACHE, if non-nil, forces the cache to be re-read."
+When `woman' is called interactively, the word at point may be
+automatically used as the topic, if the value of the user option
+`woman-use-topic-at-point' is non-nil.  Return nil if no file can
+be found.  Optional argument RE-CACHE, if non-nil, forces the
+cache to be re-read."
   ;; Handle the caching of the directory and topic lists:
   (if (and (not re-cache)
            (or
@@ -1221,25 +1211,30 @@ Optional argument RE-CACHE, if non-nil, forces the cache to be re-read."
   ;; completions, but to return only a case-sensitive match.  This
   ;; does not seem to work properly by default, so I re-do the
   ;; completion if necessary.
-  (let (files)
+  (let (files
+        (default (current-word)))
     (or (stringp topic)
-        (and (eq t
-                 (if (boundp 'woman-topic-at-point)
-                     woman-topic-at-point
-                   ;; Was let-bound when file loaded, so ...
-                   (setq woman-topic-at-point woman-topic-at-point-default)))
-             (setq topic
-                   (or (current-word t) ""))    ; only within or adjacent to word
-             (assoc topic woman-topic-all-completions))
+        (and (if (boundp 'woman-use-topic-at-point)
+                 woman-use-topic-at-point
+               ;; Was let-bound when file loaded, so ...
+               (setq woman-use-topic-at-point woman-use-topic-at-point-default))
+             (setq topic (or (current-word t) "")) ; only within or adjacent to word
+             (test-completion topic woman-topic-all-completions))
         (setq topic
-              (completing-read
-               "Manual entry: "
-               woman-topic-all-completions nil 1
-               ;; Initial input suggestion (was nil), with
-               ;; cursor at left ready to kill suggestion!:
-               (and woman-topic-at-point
-                    (cons (or (current-word) "") 0)) ; nearest word
-               'woman-topic-history)))
+              (let* ((word-at-point (current-word))
+                     (default
+                       (when (and word-at-point
+                                  (test-completion
+                                   word-at-point woman-topic-all-completions))
+                         word-at-point)))
+                (completing-read
+                 (if default
+                     (format "Manual entry [default: %s]: " default)
+                   "Manual entry: ")
+                 woman-topic-all-completions nil 1
+                 nil
+                 'woman-topic-history
+                 default))))
     ;; Note that completing-read always returns a string.
     (if (= (length topic) 0)
         nil                             ; no topic, so no file!
@@ -1259,10 +1254,9 @@ Optional argument RE-CACHE, if non-nil, forces the cache to be re-read."
         ;; Unread the command event (TAB = ?\t = 9) that runs the command
         ;; `minibuffer-complete' in order to automatically complete the
         ;; minibuffer contents as far as possible.
-        (setq unread-command-events '(9))       ; and delete any type-ahead!
+        (setq unread-command-events '(9)) ; and delete any type-ahead!
         (completing-read "Manual file: " files nil 1
-                         (try-completion "" files) 'woman-file-history)))
-      )))
+                         (try-completion "" files) 'woman-file-history))))))
 
 (defun woman-select (predicate list)
   "Select unique elements for which PREDICATE is true in LIST.
@@ -1741,7 +1735,10 @@ Leave point at end of new text.  Return length of inserted text."
   (define-key woman-mode-map "w" 'woman)
   (define-key woman-mode-map "\en" 'WoMan-next-manpage)
   (define-key woman-mode-map "\ep" 'WoMan-previous-manpage)
-  (define-key woman-mode-map [M-mouse-2] 'woman-follow-word))
+  (define-key woman-mode-map [M-mouse-2] 'woman-follow-word)
+
+  ;; We don't need to call `man' when we are in `woman-mode'.
+  (define-key woman-mode-map [remap man] 'woman))
 
 (defun woman-follow-word (event)
   "Run WoMan with word under mouse as topic.
@@ -1942,25 +1939,33 @@ Optional argument REDRAW, if non-nil, forces mode line to be updated."
 (defvar WoMan-Man-start-time nil
   "Used to record formatting time used by the `man' command.")
 
-(defadvice Man-getpage-in-background
-  (around Man-getpage-in-background-advice (topic) activate)
-  "Use WoMan unless invoked outside a WoMan buffer or invoked explicitly.
-Otherwise use Man and record start of formatting time."
-  (if (and (eq major-mode 'woman-mode)
-           (not (eq (caar command-history) 'man)))
-      (WoMan-getpage-in-background topic)
-    ;; Initiates man processing
-    (setq WoMan-Man-start-time (current-time))
-    ad-do-it))
-
-(defadvice Man-bgproc-sentinel
-  (after Man-bgproc-sentinel-advice activate)
-  ;; Terminates man processing
-  "Report formatting time."
-  (let* ((time (current-time))
-         (time (+ (* (- (car time) (car WoMan-Man-start-time)) 65536)
-                  (- (cadr time) (cadr WoMan-Man-start-time)))))
-    (message "Man formatting done in %d seconds" time)))
+;; Both advices are disabled because "a file in Emacs should not put
+;; advice on a function in Emacs" (see Info node "(elisp)Advising
+;; Functions").  Counting the formatting time is useful for
+;; developping, but less applicable for daily use.  The advice for
+;; `Man-getpage-in-background' can be discarded, because the
+;; key-binding in `woman-mode-map' has been remapped to call `woman'
+;; but `man'.  Michael Albinus <michael.albinus@gmx.de>
+
+;; (defadvice Man-getpage-in-background
+;;   (around Man-getpage-in-background-advice (topic) activate)
+;;   "Use WoMan unless invoked outside a WoMan buffer or invoked explicitly.
+;; Otherwise use Man and record start of formatting time."
+;;   (if (and (eq major-mode 'woman-mode)
+;;         (not (eq (caar command-history) 'man)))
+;;       (WoMan-getpage-in-background topic)
+;;     ;; Initiates man processing
+;;     (setq WoMan-Man-start-time (current-time))
+;;     ad-do-it))
+
+;; (defadvice Man-bgproc-sentinel
+;;   (after Man-bgproc-sentinel-advice activate)
+;;   ;; Terminates man processing
+;;   "Report formatting time."
+;;   (let* ((time (current-time))
+;;       (time (+ (* (- (car time) (car WoMan-Man-start-time)) 65536)
+;;                (- (cadr time) (cadr WoMan-Man-start-time)))))
+;;     (message "Man formatting done in %d seconds" time)))
 
 
 ;;; Buffer handling:
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 8fc5754bf80..41e6c1aa9eb 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,44 @@
+2005-09-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.texi (Saving Buffers): Fix typo.
+
+2005-09-08  Richard M. Stallman  <rms@gnu.org>
+
+        * tips.texi (Programming Tips): Correct the "default" prompt spec.
+
+2005-09-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * locals.texi (Standard Buffer-Local Variables): Don't include
+        mode variables for minor modes.
+        Fix xrefs for buffer-display-count, buffer-display-table,
+        buffer-offer-save, buffer-saved-size, cache-long-line-scans,
+        enable-multibyte-characters, fill-column, header-line-format,
+        left-fringe-width, left-margin, and right-fringe-width.
+
+        * hooks.texi (Standard Hooks): All hooks should conform to the
+        standard naming convention now.
+        Fix xref for `echo-area-clear-hook'.
+
+        * display.texi (Usual Display): Note that indicate-empty-lines and
+        tab-width are buffer-local.
+
+        * files.texi (Saving Buffers): Add xref to `Killing Buffers'.
+
+        * modes.texi (Mode Help): Note that major-mode is buffer-local.
+
+        * nonascii.texi (Encoding and I/O): Note that
+        buffer-file-coding-system is buffer-local.
+
+        * positions.texi (List Motion): Note that defun-prompt-regexp is
+        buffer-local.
+
+        * text.texi (Auto Filling): Note that auto-fill-function is
+        buffer-local.
+        (Undo): Note that buffer-undo-list is buffer-local.
+
+        * windows.texi (Buffers and Windows): Document
+        buffer-display-count.
+
 2005-09-06  Richard M. Stallman  <rms@gnu.org>
 
         * tips.texi (Coding Conventions): Sometimes it is ok to put the
diff --git a/lispref/display.texi b/lispref/display.texi
index 8addb3b67ec..b6348800fad 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -4546,11 +4546,11 @@ buffers that do not override it.  @xref{Default Value}.
 @end defvar
 
 @defopt tab-width
-The value of this variable is the spacing between tab stops used for
-displaying tab characters in Emacs buffers.  The value is in units of
-columns, and the default is 8.  Note that this feature is completely
-independent of the user-settable tab stops used by the command
-@code{tab-to-tab-stop}.  @xref{Indent Tabs}.
+The value of this buffer-local variable is the spacing between tab
+stops used for displaying tab characters in Emacs buffers.  The value
+is in units of columns, and the default is 8.  Note that this feature
+is completely independent of the user-settable tab stops used by the
+command @code{tab-to-tab-stop}.  @xref{Indent Tabs}.
 @end defopt
 
 @defopt indicate-empty-lines
@@ -4559,6 +4559,7 @@ independent of the user-settable tab stops used by the command
 When this is non-@code{nil}, Emacs displays a special glyph in the
 fringe of each empty line at the end of the buffer, on terminals that
 support it (window systems).  @xref{Fringes}.
+This variable is automatically buffer-local in every buffer.
 @end defopt
 
 @defvar indicate-buffer-boundaries
diff --git a/lispref/files.texi b/lispref/files.texi
index 1ec4b2e5dc2..5b8d77d2070 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -341,10 +341,10 @@ The optional @var{pred} argument controls which buffers to ask about
 If it is @code{nil}, that means to ask only about file-visiting buffers.
 If it is @code{t}, that means also offer to save certain other non-file
 buffers---those that have a non-@code{nil} buffer-local value of
-@code{buffer-offer-save}.  (A user who says @samp{yes} to saving a
-non-file buffer is asked to specify the file name to use.)  The
-@code{save-buffers-kill-emacs} function passes the value @code{t} for
-@var{pred}.
+@code{buffer-offer-save} (@pxref{Killing Buffers}).  A user who says
+@samp{yes} to saving a non-file buffer is asked to specify the file
+name to use.  The @code{save-buffers-kill-emacs} function passes the
+value @code{t} for @var{pred}.
 
 If @var{pred} is neither @code{t} nor @code{nil}, then it should be
 a function of no arguments.  It will be called in each buffer to decide
diff --git a/lispref/hooks.texi b/lispref/hooks.texi
index 11b2233dc0e..795048fdb25 100644
--- a/lispref/hooks.texi
+++ b/lispref/hooks.texi
@@ -26,14 +26,13 @@ are omitted in the list below.
 The variables whose names end in @samp{-hooks} or @samp{-functions} are
 usually @dfn{abnormal hooks}; their values are lists of functions, but
 these functions are called in a special way (they are passed arguments,
-or their values are used).  A few of these variables are actually normal
-hooks which were named before we established the convention that normal
-hooks' names should end in @samp{-hook}.
+or their values are used). The variables whose names end in
+@samp{-function} have single functions as their values.
 
-The variables whose names end in @samp{-function} have single functions
-as their values.  (In older Emacs versions, some of these variables had
-names ending in @samp{-hook} even though they were not normal hooks;
-however, we have renamed all of those.)
+(In older Emacs versions, some normal hooks had names ending in
+@samp{-hooks} or @samp{-functions}, and some abnormal hooks had names
+ending in @samp{-hook}.  We have renamed all of these to conform to
+the above conventions.)
 
 @c We need to xref to where each hook is documented or else document
 @c it here.
@@ -135,7 +134,7 @@ for appointment notification.
 @xref{Disabling Commands}.
 
 @item echo-area-clear-hook
-@xref{The Echo Area}.
+@xref{Echo Area Customization}.
 
 @item emacs-startup-hook
 @xref{Init File}.
diff --git a/lispref/locals.texi b/lispref/locals.texi
index 57b17d3d41b..e24117270a5 100644
--- a/lispref/locals.texi
+++ b/lispref/locals.texi
@@ -15,10 +15,11 @@ buffer-local only when set; a few of them are always local in every
 buffer.  Many Lisp packages define such variables for their internal
 use, but we don't try to list them all here.
 
-@table @code
-@item abbrev-mode
-@xref{Abbrevs}.
+Each minor modes defines a buffer-local variable named
+@samp{@var{modename}-mode}.  @xref{Minor Mode Conventions}.  Minor
+mode variables will not be listed here.
 
+@table @code
 @item auto-fill-function
 @xref{Auto Filling}.
 
@@ -29,13 +30,13 @@ use, but we don't try to list them all here.
 @xref{Auto-Saving}.
 
 @item buffer-backed-up
-@xref{Backup Files}.
+@xref{Making Backups}.
 
 @item buffer-display-count
-@xref{Displaying Buffers}.
+@xref{Buffers and Windows}.
 
 @item buffer-display-table
-@xref{Display Tables}.
+@xref{Active Display Table}.
 
 @item buffer-display-time
 @xref{Buffers and Windows}.
@@ -62,19 +63,19 @@ use, but we don't try to list them all here.
 @xref{Invisible Text}.
 
 @item buffer-offer-save
-@xref{Saving Buffers}.
+@xref{Killing Buffers}.
 
 @item buffer-read-only
 @xref{Read Only Buffers}.
 
 @item buffer-saved-size
-@xref{Point}.
+@xref{Auto-Saving}.
 
 @item buffer-undo-list
 @xref{Undo}.
 
 @item cache-long-line-scans
-@xref{Text Lines}.
+@xref{Truncation}.
 
 @item case-fold-search
 @xref{Searching and Case}.
@@ -103,10 +104,10 @@ Does not work yet.
 @end ignore
 
 @item enable-multibyte-characters
-@ref{Non-ASCII Characters}.
+@ref{Text Representations}.
 
 @item fill-column
-@xref{Auto Filling}.
+@xref{Margins}.
 
 @item fringes-outside-margins
 @xref{Fringes}.
@@ -115,7 +116,7 @@ Does not work yet.
 @xref{Moving Point,,, emacs, The GNU Emacs Manual}.
 
 @item header-line-format
-@xref{Mode Line Data}.
+@xref{Header Lines}.
 
 @item indicate-buffer-boundaries
 @xref{Usual Display}.
@@ -124,10 +125,10 @@ Does not work yet.
 @xref{Usual Display}.
 
 @item left-fringe-width
-@xref{Fringes}.
+@xref{Fringe Size/Pos}.
 
 @item left-margin
-@xref{Indentation}.
+@xref{Margins}.
 
 @item left-margin-width
 @xref{Display Margins}.
@@ -136,7 +137,7 @@ Does not work yet.
 @xref{Line Height}.
 
 @item local-abbrev-table
-@xref{Abbrevs}.
+@xref{Standard Abbrev Tables}.
 
 @item major-mode
 @xref{Mode Help}.
@@ -162,14 +163,11 @@ Does not work yet.
 @item mode-name
 @xref{Mode Line Variables}.
 
-@item overwrite-mode
-@xref{Insertion}.
-
 @item point-before-scroll
 Used for communication between mouse commands and scroll-bar commands.
 
 @item right-fringe-width
-@xref{Fringes}.
+@xref{Fringe Size/Pos}.
 
 @item right-margin-width
 @xref{Display Margins}.
@@ -195,9 +193,6 @@ Used for communication between mouse commands and scroll-bar commands.
 @item truncate-lines
 @xref{Truncation}.
 
-@item vc-mode
-@xref{Mode Line Variables}.
-
 @item vertical-scroll-bar
 @xref{Scroll Bars}.
 @end table
diff --git a/lispref/modes.texi b/lispref/modes.texi
index a391f27a80f..27aea507cc8 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -961,11 +961,11 @@ displays the documentation string of the major mode function.
 @end deffn
 
 @defvar major-mode
-This variable holds the symbol for the current buffer's major mode.
-This symbol should have a function definition that is the command to
-switch to that major mode.  The @code{describe-mode} function uses the
-documentation string of the function as the documentation of the major
-mode.
+This buffer-local variable holds the symbol for the current buffer's
+major mode.  This symbol should have a function definition that is the
+command to switch to that major mode.  The @code{describe-mode}
+function uses the documentation string of the function as the
+documentation of the major mode.
 @end defvar
 
 @node Derived Modes
diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi
index 2af367a0f85..73632e36514 100644
--- a/lispref/nonascii.texi
+++ b/lispref/nonascii.texi
@@ -717,8 +717,8 @@ operation finishes the job of choosing a coding system.  Very often
 you will want to find out afterwards which coding system was chosen.
 
 @defvar buffer-file-coding-system
-This variable records the coding system that was used for visiting the
-current buffer.  It is used for saving the buffer, and for writing part
+This buffer-local variable records the coding system that was used to visit
+the current buffer.  It is used for saving the buffer, and for writing part
 of the buffer with @code{write-region}.  If the text to be written
 cannot be safely encoded using the coding system specified by this
 variable, these operations select an alternative encoding by calling
diff --git a/lispref/positions.texi b/lispref/positions.texi
index cb249f526f1..77063addf9a 100644
--- a/lispref/positions.texi
+++ b/lispref/positions.texi
@@ -720,11 +720,11 @@ to 1.
 @end deffn
 
 @defopt defun-prompt-regexp
-If non-@code{nil}, this variable holds a regular expression that
-specifies what text can appear before the open-parenthesis that starts a
-defun.  That is to say, a defun begins on a line that starts with a
-match for this regular expression, followed by a character with
-open-parenthesis syntax.
+If non-@code{nil}, this buffer-local variable holds a regular
+expression that specifies what text can appear before the
+open-parenthesis that starts a defun.  That is to say, a defun begins
+on a line that starts with a match for this regular expression,
+followed by a character with open-parenthesis syntax.
 @end defopt
 
 @defopt open-paren-in-column-0-is-defun-start
diff --git a/lispref/text.texi b/lispref/text.texi
index 14a9dc9d5c6..1fa68fce917 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -1200,8 +1200,8 @@ text in the buffer automatically add elements to the front of the undo
 list, which is in the variable @code{buffer-undo-list}.
 
 @defvar buffer-undo-list
-This variable's value is the undo list of the current buffer.
-A value of @code{t} disables the recording of undo information.
+This buffer-local variable's value is the undo list of the current
+buffer. A value of @code{t} disables the recording of undo information.
 @end defvar
 
 Here are the kinds of elements an undo list can have:
@@ -1768,8 +1768,8 @@ justify existing text, see @ref{Filling}.
 justification style to refill portions of the text.  @xref{Margins}.
 
 @defvar auto-fill-function
-The value of this variable should be a function (of no arguments) to be
-called after self-inserting a character from the table
+The value of this buffer-local variable should be a function (of no
+arguments) to be called after self-inserting a character from the table
 @code{auto-fill-chars}.  It may be @code{nil}, in which case nothing
 special is done in that case.
 
diff --git a/lispref/tips.texi b/lispref/tips.texi
index fbf18047bde..4813ac41542 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -386,7 +386,7 @@ put it and the word @samp{default} inside parentheses.
 It should look like this:
 
 @example
-Enter the answer: (default 42)
+Enter the answer (default 42):
 @end example
 
 @item
diff --git a/lispref/windows.texi b/lispref/windows.texi
index e204a7ce7d0..01e33f1c0d4 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -717,6 +717,12 @@ based on the local variables of @var{buffer}.  However, if
 widths of @var{window} remain unchanged.  @xref{Fringes}.
 @end defun
 
+@defvar buffer-display-count
+This buffer-local variable records the number of times a buffer is
+displayed in a window.  It is incremented each time
+@code{set-window-buffer} is called for the buffer.
+@end defvar
+
 @defun window-buffer &optional window
 This function returns the buffer that @var{window} is displaying.  If
 @var{window} is omitted, this function returns the buffer for the
diff --git a/man/ChangeLog b/man/ChangeLog
index 3f956c71625..69cf7458a7a 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -2108,7 +2108,7 @@
         * pgg.texi (User Commands, Backend methods): Do.
         * gnus.texi: Markup fixes.
         (Setting Process Marks): Fix `M P a' entry.
-        * emacs-mime: Fixes.
+        * emacs-mime.texi: Fixes.
 
 2004-09-23  Reiner Steib  <Reiner.Steib@gmx.de>
 
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index ee8dc3fe9d5..7846f90c508 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-10  Sven Joachim  <svenjoac@gmx.de>  (tiny change)
+
+        * sed3v2.inp (GETOPT_H, GETOPTOBJS): Define to use getopt.h,
+        getopt.o and getopt1.o.
+
 2005-07-04  Lute Kamstra  <lute@gnu.org>
 
         Update FSF's address in GPL notices.
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index 46d9f2fc894..fb6b67cc422 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -31,6 +31,8 @@
 /^LOADLIBES *=/s!=.*$!=!
 /^ALLOCA *=/s!@ALLOCA@!!
 /^EXEEXT *=/s!@EXEEXT@!!
+/^GETOPT_H *=/s!@GETOPT_H@!getopt.h!
+/^GETOPTOBJS *=/s!@GETOPTOBJS@!getopt.o getopt1.o!
 /^INSTALLABLES/s/emacsclient *//
 s!^     \./!    !
 /^UTILITIES=/s/ wakeup//
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 854410b4f58..7436cd7b47e 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * config.nt (HAVE_GET_CURRENT_DIR_NAME): Undefine.
+
 2005-08-10  Juanma Barranquero  <lekktu@gmail.com>
 
         * .cvsignore: Add `obj' and `oo' for in-place installations.
diff --git a/nt/config.nt b/nt/config.nt
index 4b8c38823af..0f66a441c7b 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -233,6 +233,7 @@ Boston, MA 02110-1301, USA.  */
 #undef HAVE_MKTIME
 #undef HAVE_EUIDACCESS
 #undef HAVE_GETPAGESIZE
+#undef HAVE_GET_CURRENT_DIR_NAME
 #undef HAVE_TZSET
 #undef HAVE_SETLOCALE
 #undef HAVE_UTIMES
diff --git a/src/ChangeLog b/src/ChangeLog
index 7faeafe2329..99c9d951370 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,75 @@
+2005-09-11  Chris Prince  <cprince@gmail.com>  (tiny change)
+
+        * w32term.c (x_bitmap_icon): Load small icons too.
+
+2005-09-10  Romain Francoise  <romain@orebokech.com>
+
+        * buffer.c (init_buffer): Grow buffer to add directory separator
+        and terminal zero.  Fix typos.
+
+2005-09-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * buffer.c (init_buffer): Fix error message for failed call to
+        get_current_dir_name.
+        (get_current_dir_name): Remove prototype.
+
+        * xsmfns.c: (get_current_dir_name): Remove prototype.
+
+        * lisp.h: (get_current_dir_name) [!HAVE_GET_CURRENT_DIR_NAME]: Add
+        prototype.
+
+        * sysdep.c [WINDOWSNT]: Add prototype for getwd.
+        Don't #undef NULL after including blockinput.h.
+
+        * config.in: Regenerated.
+
+2005-09-10  Giuseppe Scrivano  <gscrivano@gmail.com>
+
+        Remove the MAXPATHLEN limitations:
+
+        * sysdep.c (get_current_dir_name) [!HAVE_GET_CURRENT_DIR_NAME]:
+        New function.
+
+        * buffer.c (init_buffer): Use it.
+
+        * xsmfns.c (smc_save_yourself_CB): Ditto.
+
+2005-09-09  Kim F. Storm  <storm@cua.dk>
+
+        * doc.c (Fsubstitute_command_keys): Lookup key binding for
+        commands that are remapped from some other command.
+
+        * xdisp.c (try_window_reusing_current_matrix): Clear mode_line_p
+        flag in disabled rows below the window.
+
+        * frame.h (struct frame): New member updated_p.
+
+        * xdisp.c (redisplay_internal): Mark updated frames in new updated_p
+        member.  Remove local `updated' array and associated variables.
+
+2005-09-07  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (handle_display_prop): Respect overlay window property.
+
+        * xdisp.c (try_window): Remove superfluous cursor_height calculation.
+        Fixes crash reported by YAMAMOTO Mitsuharu.
+
+2005-09-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (struct xlfdpat_block, struct xlfdpat): New structs.
+        (xlfdpat_destroy, xlfdpat_create, xlfdpat_exact_p)
+        (xlfdpat_block_match_1, xlfdpat_match): New functions.
+        (xlfdpat_block_match): New macro.
+        (mac_to_x_fontname): Don't use tolower for non-ASCII characters.
+        (x_font_name_to_mac_font_name): Set coding.dst_multibyte to 0.
+        (add_font_name_table_entry): Increase font_name_table_size more
+        rapidly.
+        (mac_c_string_match): Remove function.
+        (mac_do_list_fonts): Use XLFD pattern match instead of regular
+        expression match.
+
+        * xfaces.c (xstrlwr): Don't use tolower for non-ASCII characters.
+
 2005-09-03  Richard M. Stallman  <rms@gnu.org>
 
         * xdisp.c (redisplay_internal): Make UPDATED as long as needed.
diff --git a/src/buffer.c b/src/buffer.c
index 3450e88c72d..ae2a584e506 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -32,10 +32,6 @@ Boston, MA 02110-1301, USA.  */
 extern int errno;
 #endif
 
-#ifndef MAXPATHLEN
-/* in 4.1 [probably SunOS? -stef] , param.h fails to define this. */
-#define MAXPATHLEN 1024
-#endif /* not MAXPATHLEN */
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -5131,7 +5127,6 @@ init_buffer_once ()
 void
 init_buffer ()
 {
-  char buf[MAXPATHLEN + 1];
   char *pwd;
   struct stat dotstat, pwdstat;
   Lisp_Object temp;
@@ -5154,40 +5149,28 @@ init_buffer ()
   if (NILP (buffer_defaults.enable_multibyte_characters))
     Fset_buffer_multibyte (Qnil);
 
-  /* If PWD is accurate, use it instead of calling getwd.  PWD is
-     sometimes a nicer name, and using it may avoid a fatal error if a
-     parent directory is searchable but not readable.  */
-  if ((pwd = getenv ("PWD")) != 0
-      && (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1])))
-      && stat (pwd, &pwdstat) == 0
-      && stat (".", &dotstat) == 0
-      && dotstat.st_ino == pwdstat.st_ino
-      && dotstat.st_dev == pwdstat.st_dev
-      && strlen (pwd) < MAXPATHLEN)
-    strcpy (buf, pwd);
-#ifdef HAVE_GETCWD
-  else if (getcwd (buf, MAXPATHLEN+1) == 0)
-    fatal ("`getcwd' failed: %s\n", strerror (errno));
-#else
-  else if (getwd (buf) == 0)
-    fatal ("`getwd' failed: %s\n", buf);
-#endif
+  pwd = get_current_dir_name ();
+
+  if (!pwd)
+    fatal ("`get_current_dir_name' failed: %s\n", strerror (errno));
 
 #ifndef VMS
   /* Maybe this should really use some standard subroutine
      whose definition is filename syntax dependent.  */
-  rc = strlen (buf);
-  if (!(IS_DIRECTORY_SEP (buf[rc - 1])))
+  rc = strlen (pwd);
+  if (!(IS_DIRECTORY_SEP (pwd[rc - 1])))
     {
-      buf[rc] = DIRECTORY_SEP;
-      buf[rc + 1] = '\0';
+      /* Grow buffer to add directory separator and '\0'.  */
+      pwd = (char *) xrealloc (pwd, rc + 2);
+      pwd[rc] = DIRECTORY_SEP;
+      pwd[rc + 1] = '\0';
     }
 #endif /* not VMS */
 
-  current_buffer->directory = make_unibyte_string (buf, strlen (buf));
+  current_buffer->directory = make_unibyte_string (pwd, strlen (pwd));
   if (! NILP (buffer_defaults.enable_multibyte_characters))
-    /* At this momemnt, we still don't know how to decode the
-       direcotry name.  So, we keep the bytes in multibyte form so
+    /* At this moment, we still don't know how to decode the
+       directory name.  So, we keep the bytes in multibyte form so
        that ENCODE_FILE correctly gets the original bytes.  */
     current_buffer->directory
       = string_to_multibyte (current_buffer->directory);
@@ -5206,6 +5189,8 @@ init_buffer ()
 
   temp = get_minibuffer (0);
   XBUFFER (temp)->directory = current_buffer->directory;
+
+  free (pwd);
 }
 
 /* initialize the buffer routines */
diff --git a/src/config.in b/src/config.in
index f2afed2ecb1..b5b700c69bf 100644
--- a/src/config.in
+++ b/src/config.in
@@ -221,6 +221,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `getwd' function. */
 #undef HAVE_GETWD
 
+/* Define to 1 if you have the `get_current_dir_name' function. */
+#undef HAVE_GET_CURRENT_DIR_NAME
+
 /* Define to 1 if you have the ungif library (-lungif). */
 #undef HAVE_GIF
 
diff --git a/src/doc.c b/src/doc.c
index 0a455fed37a..82a2391c424 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -57,6 +57,8 @@ static Lisp_Object Vbuild_files;
 
 extern Lisp_Object Voverriding_local_map;
 
+extern Lisp_Object Qremap;
+
 /* For VMS versions with limited file name syntax,
    convert the name to something VMS will allow.  */
 static void
@@ -812,6 +814,7 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
       else if (strp[0] == '\\' && strp[1] == '[')
         {
           int start_idx;
+          int follow_remap = 1;
 
           changed = 1;
           strp += 2;            /* skip \[ */
@@ -830,11 +833,21 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
           idx = strp - SDATA (string);
           name = Fintern (make_string (start, length_byte), Qnil);
 
+        do_remap:
           /* Ignore remappings unless there are no ordinary bindings. */
           tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qt);
           if (NILP (tem))
             tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qnil);
 
+          if (VECTORP (tem) && XVECTOR (tem)->size > 1
+              && EQ (AREF (tem, 0), Qremap) && SYMBOLP (AREF (tem, 1))
+              && follow_remap)
+            {
+              name = AREF (tem, 1);
+              follow_remap = 0;
+              goto do_remap;
+            }
+
           /* Note the Fwhere_is_internal can GC, so we have to take
              relocation of string contents into account.  */
           strp = SDATA (string) + idx;
diff --git a/src/frame.h b/src/frame.h
index 2928b36f2f2..48cf61d3040 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -468,6 +468,9 @@ struct frame
   /* Set to non-zero if this frame has already been hscrolled during
      current redisplay.  */
   unsigned already_hscrolled_p : 1;
+
+  /* Set to non-zero when current redisplay has updated frame.  */
+  unsigned updated_p : 1;
 };
 
 #ifdef MULTI_KBOARD
diff --git a/src/lisp.h b/src/lisp.h
index 0346c8fd0d3..1cefd7ba4b5 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3141,6 +3141,9 @@ EXFUN (Fx_popup_dialog, 3);
 extern void syms_of_xmenu P_ ((void));
 
 /* defined in sysdep.c */
+#ifndef HAVE_GET_CURRENT_DIR_NAME
+extern char *get_current_dir_name P_ ((void));
+#endif
 extern void stuff_char P_ ((char c));
 extern void init_sigio P_ ((int));
 extern void request_sigio P_ ((void));
diff --git a/src/macterm.c b/src/macterm.c
index 099b69bfb09..d9b533a9b8c 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -6100,6 +6100,335 @@ x_wm_set_icon_position (f, icon_x, icon_y)
 
 
 /***********************************************************************
+                          XLFD Pattern Match
+ ***********************************************************************/
+
+/* An XLFD pattern is divided into blocks delimited by '*'.  This
+   structure holds information for each block.  */
+struct xlfdpat_block
+{
+  /* Length of the pattern string in this block.  Non-zero except for
+     the first and the last blocks.  */
+  int len;
+
+  /* Pattern string except the last character in this block.  The last
+     character is replaced with NUL in order to use it as a
+     sentinel.  */
+  unsigned char *pattern;
+
+  /* Last character of the pattern string.  Must not be '?'.  */
+  unsigned char last_char;
+
+  /* One of the tables for the Boyer-Moore string search.  It
+     specifies the number of positions to proceed for each character
+     with which the match fails.  */
+  int skip[256];
+
+  /* The skip value for the last character in the above `skip' is
+     assigned to `infinity' in order to simplify a loop condition.
+     The original value is saved here.  */
+  int last_char_skip;
+};
+
+struct xlfdpat
+{
+  /* Normalized pattern string.  "Normalized" means that capital
+     letters are lowered, blocks are not empty except the first and
+     the last ones, and trailing '?'s in a block that is not the last
+     one are moved to the next one.  The last character in each block
+     is replaced with NUL.  */
+  unsigned char *buf;
+
+  /* Number of characters except '*'s and trailing '?'s in the
+     normalized pattern string.  */
+  int nchars;
+
+  /* Number of trailing '?'s in the normalized pattern string.  */
+  int trailing_anychars;
+
+  /* Number of blocks and information for each block.  The latter is
+     NULL if the pattern is exact (no '*' or '?' in it).  */
+  int nblocks;
+  struct xlfdpat_block *blocks;
+};
+
+static void
+xlfdpat_destroy (pat)
+     struct xlfdpat *pat;
+{
+  if (pat)
+    {
+      if (pat->buf)
+        {
+          if (pat->blocks)
+            xfree (pat->blocks);
+          xfree (pat->buf);
+        }
+      xfree (pat);
+    }
+}
+
+static struct xlfdpat *
+xlfdpat_create (pattern)
+     char *pattern;
+{
+  struct xlfdpat *pat;
+  int nblocks, i, skip;
+  unsigned char last_char, *p, *q, *anychar_head;
+  struct xlfdpat_block *blk;
+
+  pat = xmalloc (sizeof (struct xlfdpat));
+  if (pat == NULL)
+    goto error;
+
+  pat->buf = xmalloc (strlen (pattern) + 1);
+  if (pat->buf == NULL)
+    goto error;
+
+  /* Normalize the pattern string and store it to `pat->buf'.  */
+  nblocks = 0;
+  anychar_head = NULL;
+  q = pat->buf;
+  last_char = '\0';
+  for (p = pattern; *p; p++)
+    {
+      unsigned char c = *p;
+
+      if (c == '*')
+        if (last_char == '*')
+          /*  ...a** -> ...a*  */
+          continue;
+        else
+          {
+            if (last_char == '?')
+              if (anychar_head > pat->buf && *(anychar_head - 1) == '*')
+                /*  ...*??* -> ...*??  */
+                continue;
+              else
+                /*  ...a??* -> ...a*??  */
+                {
+                  *anychar_head++ = '*';
+                  c = '?';
+                }
+            nblocks++;
+          }
+      else if (c == '?')
+        {
+          if (last_char != '?')
+            anychar_head = q;
+        }
+      else
+        /* On Mac OS X 10.3, tolower also converts non-ASCII
+           characters for some locales.  */
+        if (isascii (c))
+          c = tolower (c);
+
+      *q++ = last_char = c;
+    }
+  *q = '\0';
+  nblocks++;
+  pat->nblocks = nblocks;
+  if (last_char != '?')
+    pat->trailing_anychars = 0;
+  else
+    {
+      pat->trailing_anychars = q - anychar_head;
+      q = anychar_head;
+    }
+  pat->nchars = q - pat->buf - (nblocks - 1);
+
+  if (anychar_head == NULL && nblocks == 1)
+    {
+      /* The pattern is exact.  */
+      pat->blocks = NULL;
+      return pat;
+    }
+
+  pat->blocks = xmalloc (sizeof (struct xlfdpat_block) * nblocks);
+  if (pat->blocks == NULL)
+    goto error;
+
+  /* Divide the normalized pattern into blocks.  */
+  p = pat->buf;
+  for (blk = pat->blocks; blk < pat->blocks + nblocks - 1; blk++)
+    {
+      blk->pattern = p;
+      while (*p != '*')
+        p++;
+      blk->len = p - blk->pattern;
+      p++;
+    }
+  blk->pattern = p;
+  blk->len = q - blk->pattern;
+
+  /* Setup a table for the Boyer-Moore string search.  */
+  for (blk = pat->blocks; blk < pat->blocks + nblocks; blk++)
+    if (blk->len != 0)
+      {
+        blk->last_char = blk->pattern[blk->len - 1];
+        blk->pattern[blk->len - 1] = '\0';
+
+        for (skip = 1; skip < blk->len; skip++)
+          if (blk->pattern[blk->len - skip - 1] == '?')
+            break;
+
+        for (i = 0; i < 256; i++)
+          blk->skip[i] = skip;
+
+        p = blk->pattern + (blk->len - skip);
+        while (--skip > 0)
+          blk->skip[*p++] = skip;
+
+        blk->last_char_skip = blk->skip[blk->last_char];
+      }
+
+  return pat;
+
+ error:
+  xlfdpat_destroy (pat);
+  return NULL;
+}
+
+static INLINE int
+xlfdpat_exact_p (pat)
+     struct xlfdpat *pat;
+{
+  return (pat)->blocks == NULL;
+}
+
+/* Return the first string in STRING + 0, ..., STRING + START_MAX such
+   that the pattern in *BLK matches with its prefix.  Return NULL
+   there is no such strings.  STRING must be lowered in advance.  */
+
+static char *
+xlfdpat_block_match_1 (blk, string, start_max)
+     struct xlfdpat_block *blk;
+     unsigned char *string;
+     int start_max;
+{
+  int start, infinity;
+  unsigned char *p, *s;
+
+  xassert (blk->len > 0);
+  xassert (start_max + blk->len <= strlen (string));
+  xassert (blk->pattern[blk->len - 1] != '?');
+
+  /* See the comments in the function `boyer_moore' (search.c) for the
+     use of `infinity'.  */
+  infinity = start_max + blk->len + 1;
+  blk->skip[blk->last_char] = infinity;
+
+  start = 0;
+  do
+    {
+      /* Check the last character of the pattern. */
+      s = string + blk->len - 1;
+      do
+        {
+          start += blk->skip[*(s + start)];
+        }
+      while (start <= start_max);
+
+      if (start < infinity)
+        /* Couldn't find the last character.  */
+        return NULL;
+
+      /* No less than `infinity' means we could find the last
+         character at `s[start - infinity]'.  */
+      start -= infinity;
+
+      /* Check the remaining characters.  We prefer making no-'?'
+         cases faster because the use of '?' is really rare.  */
+      p = blk->pattern;
+      s = string + start;
+      do
+        {
+          while (*p++ == *s++)
+            ;
+        }
+      while (*(p - 1) == '?');
+
+      if (*(p - 1) == '\0')
+        /* Matched.  */
+        return string + start;
+
+      /* Didn't match.  */
+      start += blk->last_char_skip;
+    }
+  while (start <= start_max);
+
+  return NULL;
+}
+
+#define xlfdpat_block_match(b, s, m) \
+  ((b)->len == 1 ? memchr ((s), (b)->last_char, (m) + 1) \
+   : xlfdpat_block_match_1 (b, s, m))
+
+/* Check if XLFD pattern PAT, which is generated by `xfldpat_create',
+   matches with STRING.  STRING must be lowered in advance.  */
+
+static int
+xlfdpat_match (pat, string)
+     struct xlfdpat *pat;
+     unsigned char *string;
+{
+  int str_len, nblocks, i, start_max;
+  struct xlfdpat_block *blk;
+  unsigned char *s;
+
+  xassert (pat->nblocks > 0);
+
+  if (xlfdpat_exact_p (pat))
+    return strcmp (pat->buf, string) == 0;
+
+  /* The number of the characters in the string must not be smaller
+     than that in the pattern.  */
+  str_len = strlen (string);
+  if (str_len < pat->nchars + pat->trailing_anychars)
+    return 0;
+
+  /* Chop off the trailing '?'s.  */
+  str_len -= pat->trailing_anychars;
+
+  /* The last block.  When it is non-empty, it must match at the end
+     of the string.  */
+  nblocks = pat->nblocks;
+  blk = pat->blocks + (nblocks - 1);
+  if (nblocks == 1)
+    /* The last block is also the first one.  */
+    return (str_len == blk->len
+            && (blk->len == 0 || xlfdpat_block_match (blk, string, 0)));
+  else if (blk->len != 0)
+    if (!xlfdpat_block_match (blk, string + (str_len - blk->len), 0))
+      return 0;
+
+  /* The first block.  When it is non-empty, it must match at the
+     beginning of the string.  */
+  blk = pat->blocks;
+  if (blk->len != 0)
+    {
+      s = xlfdpat_block_match (blk, string, 0);
+      if (s == NULL)
+        return 0;
+      string = s + blk->len;
+    }
+
+  /* The rest of the blocks.  */
+  start_max = str_len - pat->nchars;
+  for (i = 1, blk++; i < nblocks - 1; i++, blk++)
+    {
+      s = xlfdpat_block_match (blk, string, start_max);
+      if (s == NULL)
+        return 0;
+      start_max -= s - string;
+      string = s + blk->len;
+    }
+
+  return 1;
+}
+
+
+/***********************************************************************
                                 Fonts
  ***********************************************************************/
 
@@ -6198,7 +6527,8 @@ mac_to_x_fontname (name, size, style, charset)
 {
   Str31 foundry, cs;
   Str255 family;
-  char xf[256], *result, *p;
+  char xf[256], *result;
+  unsigned char *p;
 
   if (sscanf (name, "%31[^-]-%255[^-]-%31s", foundry, family, cs) == 3)
     charset = cs;
@@ -6215,7 +6545,10 @@ mac_to_x_fontname (name, size, style, charset)
   result = xmalloc (strlen (foundry) + strlen (family) + strlen (xf) + 3 + 1);
   sprintf (result, "-%s-%s-%s", foundry, family, xf);
   for (p = result; *p; p++)
-    *p = tolower(*p);
+    /* On Mac OS X 10.3, tolower also converts non-ASCII characters
+       for some locales.  */
+    if (isascii (*p))
+      *p = tolower (*p);
   return result;
 }
 
@@ -6275,7 +6608,7 @@ x_font_name_to_mac_font_name (xf, mf, mf_decoded, style, cs)
     {
       setup_coding_system (coding_system, &coding);
       coding.src_multibyte = 1;
-      coding.dst_multibyte = 1;
+      coding.dst_multibyte = 0;
       coding.mode |= CODING_MODE_LAST_BLOCK;
       encode_coding (&coding, mf_decoded, mf,
                      strlen (mf_decoded), sizeof (Str255) - 1);
@@ -6290,13 +6623,13 @@ add_font_name_table_entry (char *font_name)
 {
   if (font_name_table_size == 0)
     {
-      font_name_table_size = 16;
+      font_name_table_size = 256;
       font_name_table = (char **)
         xmalloc (font_name_table_size * sizeof (char *));
     }
   else if (font_name_count + 1 >= font_name_table_size)
     {
-      font_name_table_size += 16;
+      font_name_table_size *= 2;
       font_name_table = (char **)
         xrealloc (font_name_table,
                   font_name_table_size * sizeof (char *));
@@ -6521,39 +6854,16 @@ static int xlfd_scalable_fields[] =
   };
 
 static Lisp_Object
-mac_c_string_match (regexp, string, nonspecial, exact)
-     Lisp_Object regexp;
-     const char *string, *nonspecial;
-     int exact;
-{
-  if (exact)
-    {
-      if (strcmp (string, nonspecial) == 0)
-        return build_string (string);
-    }
-  else if (strstr (string, nonspecial))
-    {
-      Lisp_Object str = build_string (string);
-
-      if (fast_string_match (regexp, str) >= 0)
-        return str;
-    }
-
-  return Qnil;
-}
-
-static Lisp_Object
 mac_do_list_fonts (pattern, maxnames)
      char *pattern;
      int maxnames;
 {
   int i, n_fonts = 0;
-  Lisp_Object font_list = Qnil, pattern_regex, fontname;
-  char *regex = (char *) alloca (strlen (pattern) * 2 + 3);
+  Lisp_Object font_list = Qnil;
+  struct xlfdpat *pat;
   char *scaled, *ptr;
   int scl_val[XLFD_SCL_LAST], *field, *val;
-  char *longest_start, *cur_start, *nonspecial;
-  int longest_len, exact;
+  int exact;
 
   if (font_name_table == NULL)  /* Initialize when first used.  */
     init_font_name_table ();
@@ -6611,61 +6921,17 @@ mac_do_list_fonts (pattern, maxnames)
   else
     scl_val[XLFD_SCL_PIXEL_SIZE] = -1;
 
-  ptr = regex;
-  *ptr++ = '^';
-
-  longest_start = cur_start = ptr;
-  longest_len = 0;
-  exact = 1;
-
-  /* Turn pattern into a regexp and do a regexp match.  Also find the
-     longest substring containing no special characters.  */
-  for (; *pattern; pattern++)
-    {
-      if (*pattern == '?' || *pattern == '*')
-        {
-          if (ptr - cur_start > longest_len)
-            {
-              longest_start = cur_start;
-              longest_len = ptr - cur_start;
-            }
-          exact = 0;
-
-          if (*pattern == '?')
-            *ptr++ = '.';
-          else /* if (*pattern == '*') */
-            {
-              *ptr++ = '.';
-              *ptr++ = '*';
-            }
-          cur_start = ptr;
-        }
-      else
-        *ptr++ = tolower (*pattern);
-    }
-
-  if (ptr - cur_start > longest_len)
-    {
-      longest_start = cur_start;
-      longest_len = ptr - cur_start;
-    }
-
-  *ptr = '$';
-  *(ptr + 1) = '\0';
-
-  nonspecial = xmalloc (longest_len + 1);
-  strncpy (nonspecial, longest_start, longest_len);
-  nonspecial[longest_len] = '\0';
+  pat = xlfdpat_create (pattern);
+  if (pat == NULL)
+    return Qnil;
 
-  pattern_regex = build_string (regex);
+  exact = xlfdpat_exact_p (pat);
 
   for (i = 0; i < font_name_count; i++)
     {
-      fontname = mac_c_string_match (pattern_regex, font_name_table[i],
-                                     nonspecial, exact);
-      if (!NILP (fontname))
+      if (xlfdpat_match (pat, font_name_table[i]))
         {
-          font_list = Fcons (fontname, font_list);
+          font_list = Fcons (build_string (font_name_table[i]), font_list);
           if (exact || maxnames > 0 && ++n_fonts >= maxnames)
             break;
         }
@@ -6675,6 +6941,8 @@ mac_do_list_fonts (pattern, maxnames)
           int former_len = ptr - font_name_table[i];
 
           scaled = xmalloc (strlen (font_name_table[i]) + 20 + 1);
+          if (scaled == NULL)
+            continue;
           memcpy (scaled, font_name_table[i], former_len);
           sprintf (scaled + former_len,
                    "-%d-%d-75-75-m-%d-%s",
@@ -6682,19 +6950,20 @@ mac_do_list_fonts (pattern, maxnames)
                    scl_val[XLFD_SCL_POINT_SIZE],
                    scl_val[XLFD_SCL_AVGWIDTH],
                    ptr + sizeof ("-0-0-0-0-m-0-") - 1);
-          fontname = mac_c_string_match (pattern_regex, scaled,
-                                         nonspecial, exact);
-          xfree (scaled);
-          if (!NILP (fontname))
+
+          if (xlfdpat_match (pat, scaled))
             {
-              font_list = Fcons (fontname, font_list);
+              font_list = Fcons (build_string (scaled), font_list);
+              xfree (scaled);
               if (exact || maxnames > 0 && ++n_fonts >= maxnames)
-                break;
+                  break;
             }
+          else
+            xfree (scaled);
         }
     }
 
-  xfree (nonspecial);
+  xlfdpat_destroy (pat);
 
   return font_list;
 }
diff --git a/src/sysdep.c b/src/sysdep.c
index e63ee904f14..c0ff47e3072 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -47,7 +47,6 @@ extern void srandom P_ ((unsigned int));
 #endif
 
 #include "blockinput.h"
-#undef NULL
 
 #ifdef MAC_OS8
 /* It is essential to include stdlib.h so that this file picks up
@@ -187,6 +186,7 @@ extern int quit_char;
 #define _P_WAIT 0
 int _CRTAPI1 _spawnlp (int, const char *, const char *, ...);
 int _CRTAPI1 _getpid (void);
+extern char *getwd (char *);
 #endif
 
 #ifdef NONSYSTEM_DIR_LIBRARY
@@ -258,6 +258,81 @@ void hft_reset ();
 
 SIGMASKTYPE sigprocmask_set;
 
+
+#ifndef HAVE_GET_CURRENT_DIR_NAME
+
+/* Return the current working directory.  Returns NULL on errors.
+   Any other returned value must be freed with free. This is used
+   only when get_current_dir_name is not defined on the system.  */
+char*
+get_current_dir_name ()
+{
+  char *buf;
+  char *pwd;
+  struct stat dotstat, pwdstat;
+  /* If PWD is accurate, use it instead of calling getwd.  PWD is
+     sometimes a nicer name, and using it may avoid a fatal error if a
+     parent directory is searchable but not readable.  */
+    if ((pwd = getenv ("PWD")) != 0
+      && (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1])))
+      && stat (pwd, &pwdstat) == 0
+      && stat (".", &dotstat) == 0
+      && dotstat.st_ino == pwdstat.st_ino
+      && dotstat.st_dev == pwdstat.st_dev
+#ifdef MAXPATHLEN
+      && strlen (pwd) < MAXPATHLEN
+#endif
+      )
+    {
+      buf = (char *) malloc (strlen (pwd) + 1);
+      if (!buf)
+        return NULL;
+      strcpy (buf, pwd);
+    }
+#ifdef HAVE_GETCWD
+  else
+    {
+      size_t buf_size = 1024;
+      buf = (char *) malloc (buf_size);
+      if (!buf)
+        return NULL;
+      for (;;)
+        {
+          if (getcwd (buf, buf_size) == buf)
+            break;
+          if (errno != ERANGE)
+            {
+              int tmp_errno = errno;
+              free (buf);
+              errno = tmp_errno;
+              return NULL;
+            }
+          buf_size *= 2;
+          buf = (char *) realloc (buf, buf_size);
+          if (!buf)
+            return NULL;
+        }
+    }
+#else
+  else
+    {
+      /* We need MAXPATHLEN here.  */
+      buf = (char *) malloc (MAXPATHLEN + 1);
+      if (!buf)
+        return NULL;
+      if (getwd (buf) == NULL)
+        {
+          int tmp_errno = errno;
+          free (buf);
+          errno = tmp_errno;
+          return NULL;
+        }
+    }
+#endif
+  return buf;
+}
+#endif
+
 
 /* Specify a different file descriptor for further input operations.  */
 
diff --git a/src/w32term.c b/src/w32term.c
index 5d14d758f74..f0d5dc507ac 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5418,16 +5418,25 @@ x_bitmap_icon (f, icon)
      struct frame *f;
      Lisp_Object icon;
 {
-  HANDLE hicon;
+  HANDLE main_icon;
+  HANDLE small_icon = NULL;
 
   if (FRAME_W32_WINDOW (f) == 0)
     return 1;
 
   if (NILP (icon))
-    hicon = LoadIcon (hinst, EMACS_CLASS);
+    main_icon = LoadIcon (hinst, EMACS_CLASS);
   else if (STRINGP (icon))
-    hicon = LoadImage (NULL, (LPCTSTR) SDATA (icon), IMAGE_ICON, 0, 0,
-                       LR_DEFAULTSIZE | LR_LOADFROMFILE);
+    {
+      /* Load the main icon from the named file.  */
+      main_icon = LoadImage (NULL, (LPCTSTR) SDATA (icon), IMAGE_ICON, 0, 0,
+                             LR_DEFAULTSIZE | LR_LOADFROMFILE);
+      /* Try to load a small icon to go with it.  */
+      small_icon = LoadImage (NULL, (LPCSTR) SDATA (icon), IMAGE_ICON,
+                              GetSystemMetrics (SM_CXSMICON),
+                              GetSystemMetrics (SM_CYSMICON),
+                              LR_LOADFROMFILE);
+    }
   else if (SYMBOLP (icon))
     {
       LPCTSTR name;
@@ -5447,16 +5456,21 @@ x_bitmap_icon (f, icon)
       else
         return 1;
 
-      hicon = LoadIcon (NULL, name);
+      main_icon = LoadIcon (NULL, name);
     }
   else
     return 1;
 
-  if (hicon == NULL)
+  if (main_icon == NULL)
     return 1;
 
   PostMessage (FRAME_W32_WINDOW (f), WM_SETICON, (WPARAM) ICON_BIG,
-               (LPARAM) hicon);
+               (LPARAM) main_icon);
+
+  /* If there is a small icon that goes with it, set that too.  */
+  if (small_icon)
+    PostMessage (FRAME_W32_WINDOW (f), WM_SETICON, (WPARAM) ICON_SMALL,
+                 (LPARAM) small_icon);
 
   return 0;
 }
diff --git a/src/xdisp.c b/src/xdisp.c
index 529dd7e4cd3..e4adb43d624 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3431,7 +3431,7 @@ handle_display_prop (it)
     }
   else
     {
-      object = it->w->buffer;
+      XSETWINDOW (object, it->w);
       position = &it->current.pos;
     }
 
@@ -3452,6 +3452,9 @@ handle_display_prop (it)
   if (NILP (prop))
     return HANDLED_NORMALLY;
 
+  if (!STRINGP (it->string))
+    object = it->w->buffer;
+
   if (CONSP (prop)
       /* Simple properties.  */
       && !EQ (XCAR (prop), Qimage)
@@ -10718,13 +10721,9 @@ redisplay_internal (preserve_echo_area)
   if (consider_all_windows_p)
     {
       Lisp_Object tail, frame;
-      int i, n = 0, size = 5;
-      struct frame **updated;
 
       FOR_EACH_FRAME (tail, frame)
-        size++;
-
-      updated = (struct frame **) alloca (size * sizeof *updated);
+        XFRAME (frame)->updated_p = 0;
 
       /* Recompute # windows showing selected buffer.  This will be
          incremented each time such a window is displayed.  */
@@ -10786,15 +10785,7 @@ redisplay_internal (preserve_echo_area)
                     break;
 #endif
 
-                  if (n == size)
-                    {
-                      int nbytes = size * sizeof *updated;
-                      struct frame **p = (struct frame **) alloca (2 * nbytes);
-                      bcopy (updated, p, nbytes);
-                      size *= 2;
-                    }
-
-                  updated[n++] = f;
+                  f->updated_p = 1;
                 }
             }
         }
@@ -10804,12 +10795,15 @@ redisplay_internal (preserve_echo_area)
           /* Do the mark_window_display_accurate after all windows have
              been redisplayed because this call resets flags in buffers
              which are needed for proper redisplay.  */
-          for (i = 0; i < n; ++i)
+          FOR_EACH_FRAME (tail, frame)
             {
-              struct frame *f = updated[i];
-              mark_window_display_accurate (f->root_window, 1);
-              if (frame_up_to_date_hook)
-                frame_up_to_date_hook (f);
+              struct frame *f = XFRAME (frame);
+              if (f->updated_p)
+                {
+                  mark_window_display_accurate (f->root_window, 1);
+                  if (frame_up_to_date_hook)
+                    frame_up_to_date_hook (f);
+                }
             }
         }
     }
@@ -12925,12 +12919,11 @@ try_window (window, pos, check_margins)
   if (check_margins
       && !MINI_WINDOW_P (w))
     {
-      int this_scroll_margin, cursor_height;
+      int this_scroll_margin;
 
       this_scroll_margin = max (0, scroll_margin);
       this_scroll_margin = min (this_scroll_margin, WINDOW_TOTAL_LINES (w) / 4);
       this_scroll_margin *= FRAME_LINE_HEIGHT (it.f);
-      cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height;
 
       if ((w->cursor.y < this_scroll_margin
            && CHARPOS (pos) > BEGV)
@@ -13181,7 +13174,7 @@ try_window_reusing_current_matrix (w)
           /* Disable lines in the current matrix which are now
              below the window.  */
           for (++row; row < bottom_row; ++row)
-            row->enabled_p = 0;
+            row->enabled_p = row->mode_line_p = 0;
         }
 
       /* Update window_end_pos etc.; last_reused_text_row is the last
diff --git a/src/xfaces.c b/src/xfaces.c
index 6d805feacae..34bee3298ba 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -835,7 +835,10 @@ xstrlwr (s)
   unsigned char *p = s;
 
   for (p = s; *p; ++p)
-    *p = tolower (*p);
+    /* On Mac OS X 10.3, tolower also converts non-ASCII characters
+       for some locales.  */
+    if (isascii (*p))
+      *p = tolower (*p);
 
   return s;
 }
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 4285dd76718..0215d562548 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -52,11 +52,6 @@ Boston, MA 02110-1301, USA.  */
 #include "termopts.h"
 #include "xterm.h"
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif /* not MAXPATHLEN */
-
-
 /* The user login name.  */
 
 extern Lisp_Object Vuser_login_name;
@@ -205,7 +200,7 @@ smc_save_yourself_CB (smcConn,
   int val_idx = 0;
   int props_idx = 0;
 
-  char cwd[MAXPATHLEN+1];
+  char *cwd = NULL;
   char *smid_opt;
 
   /* How to start a new instance of Emacs.  */
@@ -259,12 +254,9 @@ smc_save_yourself_CB (smcConn,
   props[props_idx]->vals[0].value = SDATA (Vuser_login_name);
   ++props_idx;
 
-  /* The current directory property, not mandatory.  */
-#ifdef HAVE_GETCWD
-  if (getcwd (cwd, MAXPATHLEN+1) != 0)
-#else
-  if (getwd (cwd) != 0)
-#endif
+  cwd = get_current_dir_name ();
+
+  if (cwd)
     {
       props[props_idx] = &prop_ptr[props_idx];
       props[props_idx]->name = SmCurrentDirectory;
@@ -281,6 +273,9 @@ smc_save_yourself_CB (smcConn,
 
   xfree (smid_opt);
 
+  if (cwd)
+    free (cwd);
+
   /* See if we maybe shall interact with the user.  */
   if (interactStyle != SmInteractStyleAny
       || ! shutdown