diff -ruN src-21.1/AUTHORS src-21.2/AUTHORS
--- src-21.1/AUTHORS	Thu Jan  1 01:00:00 1970
+++ src-21.2/AUTHORS	Wed Nov  7 19:41:04 2001
@@ -0,0 +1,2157 @@
+Aaron Larson (changed) bibtex.el
+Aaron M. Ucko (changed) mail-source.el
+Aaron M. Ucko (changed) message.el
+Aaron M. Ucko (changed) nnmail.el
+Aaron M. Ucko (changed) nnsoup.el
+Abraham Nahum (changed) configure.in
+Abraham Nahum (changed) dgux4.h
+Abraham Nahum (changed) sysdep.c
+Abramo Bagnara (changed) term.c
+Adam P. Jenkins (changed) gnus-sum.el
+Adrian Aichner (changed) nnmail.el
+Adrian Colley (changed) aix3-2.h
+Ake Stenhoff (changed) cc-mode.el
+Ake Stenhoff (changed) perl-mode.el
+Ake Stenhoff (wrote) imenu.el
+Aki Vehtari (changed) bibtex.el
+Aki Vehtari (changed) gnus-art.el
+Aki Vehtari (changed) gnus-score.el
+Aki Vehtari (changed) gnus-sum.el
+Aki Vehtari (changed) nnmail.el
+Aki Vehtari (changed) tar-mode.el
+Alakazam Petrofsky (changed) hanoi.el
+Alan Shutko (changed) bindings.el
+Alan Shutko (changed) easy-mmode.el
+Alastair Burt (changed) smiley.el
+Albert (wrote) rcompile.el
+Albert L. Ting (changed) gnus-group.el
+Albert L. Ting (changed) mail-hist.el
+Alex Rezinsky (wrote) which-func.el
+Alex Schroeder (changed) comint.el
+Alex Schroeder (changed) goto-addr.el
+Alex Schroeder (wrote) ansi-color.el
+Alex Schroeder (wrote) sql.el
+Alexander Zhuckov (changed) ebrowse.c
+Alexandre Oliva (changed) format.el
+Alexandre Oliva (changed) gnus-cus.el
+Alexandre Oliva (changed) gnus-mlsplt.el
+Alexandre Oliva (changed) gnus.el
+Alexandre Oliva (changed) iris4d.h
+Alexandre Oliva (changed) iris5d.h
+Alexandre Oliva (changed) nnmail.el
+Alexandre Oliva (changed) unexelf.c
+Alexandre Oliva (changed) unexsgi.c
+Alexandre Oliva (wrote) gnus-mlspl.el
+Alfred Correira (changed) generic-x.el
+Anders Holst (wrote) hippie-exp.el
+Anders Lindgren (changed) compile.el
+Anders Lindgren (changed) etags.c
+Anders Lindgren (changed) font-lock.el
+Anders Lindgren (wrote) autorevert.el
+Anders Lindgren (wrote) cwarn.el
+Anders Lindgren (wrote) follow.el
+Andre Spiegel (changed) dired.el
+Andre Spiegel (changed) ediff-util.el
+Andre Spiegel (changed) files.el
+Andre Spiegel (changed) startup.el
+Andre Spiegel (changed) vc-cvs.el
+Andre Spiegel (changed) vc-hooks.el
+Andre Spiegel (changed) vc-rcs.el
+Andre Spiegel (changed) vc-sccs.el
+Andre Spiegel (changed) vc.el
+Andre Spiegel (changed) viper-util.el
+Andrea Arcangeli (changed) message.el
+Andreas Jaeger (changed) gnus-cus.el
+Andreas Jaeger (changed) gnus-msg.el
+Andreas Jaeger (changed) gnus-start.el
+Andreas Jaeger (changed) gnus-uu.el
+Andreas Jaeger (changed) gnus-xmas.el
+Andreas Luik (changed) xfns.c
+Andreas Luik (changed) xterm.c
+Andreas Schwab (changed) [more than 20 files]
+Andrew Choi (changed) [more than 20 files]
+Andrew Choi (wrote) mac-win.el
+Andrew Csillag (wrote) m4-mode.el
+Andrew Hall (changed) paren.el
+Andrew Innes (changed) [more than 20 files]
+Andrew J. Cosgriff (changed) mm-view.el
+Andrew Oram (changed) man/calendar.texi
+Andrew Oram (changed) miscellaneous changes to files in man/
+Andy Norman (wrote) ange-ftp.el
+Andy Piper (changed) nnmail.el
+Arne Georg Gleditsch (changed) gnus-sum.el
+Ashwin Ram (wrote) refer.el
+Atae@Spva.Physics.Imperial.Ac.Uk (wrote) cdl.el
+Axel Boldt (changed) ehelp.el
+Axel Boldt (changed) electric.el
+Barry A. Warsaw (changed) [more than 20 files]
+Barry A. Warsaw (wrote) assoc.el
+Barry A. Warsaw (wrote) elp.el
+Barry A. Warsaw (wrote) man.el
+Barry A. Warsaw (wrote) regi.el
+Barry A. Warsaw (wrote) reporter.el
+Barry A. Warsaw (wrote) supercite.el
+Ben Gertzfield (changed) gnus-sum.el
+Ben Harris (changed) configure.in
+Benjamin Drieu (wrote) pong.el
+Bill Burton (changed) ptx.h
+Bill Burton (changed) sequent-ptx.h
+Bill Carpenter (wrote) feedmail.el
+Bill Mann (changed) configure.in
+Bill Mann (changed) ibmrs6000.h
+Bill Mann (changed) unexaix.c
+Bill Mann (changed) usg5-4-3.h
+Bill Pringlemeir (changed) messcompat.el
+Bill Richter (changed) ccl.el
+Bill Richter (changed) encoded-kb.el
+Bill Richter (changed) fill.el
+Bill Richter (changed) fontset.el
+Bill Richter (changed) kinsoku.el
+Bill Richter (changed) kkc.el
+Bill Richter (changed) mule-cmds.el
+Bill Richter (changed) mule-conf.el
+Bill Richter (changed) mule-util.el
+Bill Richter (changed) mule.el
+Bill Richter (changed) quail.el
+Bill Rosenblatt (wrote) float.el
+Bill Rozas (changed) xscheme.el
+Bill Rozas (wrote) scheme.el
+Bill Wohler (changed) mh-e.texi
+Bjorn Torkelsson (changed) message.el
+Bjorn Torkelsson (changed) mm-util.el
+Bjorn Torkelsson (changed) nnheader.el
+Bj,Av(Brn Torkelsson (changed) rfc2047.el
+Blitz Product Development Corporation (wrote) ispell.el
+Boaz Ben-Zvi (wrote) profile.el
+Bob Glickstein (changed) isearch.el
+Bob Glickstein (changed) sendmail.el
+Bob Glickstein (wrote) sregex.el
+Bob Weiner (changed) info.el
+Bob Weiner (changed) quail.el
+Boris Goldowsky (changed) [more than 20 files]
+Boris Goldowsky (wrote) avoid.el
+Boris Goldowsky (wrote) enriched.el
+Boris Goldowsky (wrote) facemenu.el
+Boris Goldowsky (wrote) format.el
+Boris Goldowsky (wrote) shadowfile.el
+Brad Howes (changed) gnus-demon.el
+Brad Miller (wrote) gnus-gl.el
+Brendan Kehoe (changed) gnus-sum.el
+Brendan Kehoe (changed) hpux9.h
+Brian D. Carlstrom (changed) gud.el
+Brian D. Carlstrom (changed) smtpmail.el
+Brian Fox (changed) [more than 20 files]
+Brian J. Fox (changed) keyboard.c
+Brian J. Fox (changed) linux.h
+Brian J. Fox (changed) lisp.h
+Brian J. Fox (changed) minibuf.c
+Brian J. Fox (changed) simple.el
+Brian J. Fox (changed) systty.h
+Brian Marick (wrote) hideif.el
+Brian Preble (changed) [more than 20 files]
+Bryan O'sullivan (changed) ange-ftp.el
+Bryan P. Johnson (changed) gnus-group.el
+Caleb Deupree (changed) winnt.el
+Carsten Bormann (changed) ibmrs6000.h
+Carsten Dominik (changed) [more than 20 files]
+Carsten Dominik (wrote) idlw-rinfo.el
+Carsten Dominik (wrote) idlw-toolbar.el
+Carsten Dominik (wrote) reftex-auc.el
+Carsten Dominik (wrote) reftex-cite.el
+Carsten Dominik (wrote) reftex-dcr.el
+Carsten Dominik (wrote) reftex-global.el
+Carsten Dominik (wrote) reftex-index.el
+Carsten Dominik (wrote) reftex-parse.el
+Carsten Dominik (wrote) reftex-ref.el
+Carsten Dominik (wrote) reftex-sel.el
+Carsten Dominik (wrote) reftex-toc.el
+Carsten Dominik (wrote) reftex-vars.el
+Carsten Dominik (wrote) reftex.el
+Carsten Leonhardt (changed) mail-source.el
+Carsten Leonhardt (changed) nnmail.el
+Castor (changed) nntp.el
+Caveh Jalali (changed) configure.in
+Caveh Jalali (changed) intel386.h
+Caveh Jalali (changed) sol2-4.h
+Changwoo Ryu (changed) files.el
+Charles Hannum (changed) aix3-1.h
+Charles Hannum (changed) aix3-2.h
+Charles Hannum (changed) configure
+Charles Hannum (changed) ibmrs6000.h
+Charles Hannum (changed) keyboard.c
+Charles Hannum (changed) netbsd.h
+Charles Hannum (changed) pop.c
+Charles Hannum (changed) sysdep.c
+Charles Hannum (changed) systime.h
+Charles Hannum (changed) systty.h
+Charles Hannum (changed) xrdb.c
+Charlie Martin (wrote) autoinsert.el
+Chris Brierley (changed) gnus-sum.el
+Chris Chase (wrote) idlw-shell.el
+Chris Chase (wrote) idlwave.el
+Chris Hanson (changed) [more than 20 files]
+Chris Smith (changed) icon-mode.el
+Chris Smith (wrote) icon.el
+Christian Limpach (changed) configure.in
+Christian Lynbech (changed) appt.el
+Christian Lynbech (changed) emacsserver.c
+Christian Plaunt (wrote) soundex.el
+Christian Von Roques (changed) gnus-start.el
+Christoph Conrad (changed) gnus-draft.el
+Christoph Conrad (changed) qp.el
+Christoph Rohland (changed) rfc2047.el
+Christoph Wedler (changed) gnus-art.el
+Christoph Wedler (changed) gnus-picon.el
+Christoph Wedler (changed) message.el
+Christoph Wedler (changed) register.el
+Christoph Wedler (changed) smiley.el
+Christoph Wedler (wrote) antlr-mode.el
+Christopher J. Madsen (changed) files.el
+Christopher J. Madsen (changed) replace.el
+Christopher J. Madsen (changed) time.el
+Christopher J. Madsen (wrote) decipher.el
+Chue Chi To (wrote) quick-b5.el
+Chue Chi To (wrote) quick-cns.el
+Chue Chi To (wrote) tsang-b5.el
+Chue Chi To (wrote) tsang-cns.el
+Chung Jae-Youn (changed) gnus-mule.el
+Colin Rafferty (changed) gnus-art.el
+Colin Rafferty (changed) gnus-sum.el
+Colin Rafferty (changed) message.el
+Colin Walters (changed) Makefile.in
+Colin Walters (changed) chistory.el
+Colin Walters (changed) comint.el
+Colin Walters (changed) ediff-util.el
+Colin Walters (changed) em-hist.el
+Colin Walters (changed) esh-cmd.el
+Colin Walters (changed) eshell.el
+Colin Walters (changed) filelock.c
+Colin Walters (changed) window.c
+Conrad Sauerwald (changed) mm-decode.el
+Daiki Ueno (changed) gnus-sum.el
+Daiki Ueno (changed) imap.el
+Daiki Ueno (wrote) starttls.el
+Dale Hagglund (changed) gnus-art.el
+Dale Hagglund (changed) gnus-sum.el
+Dale Hagglund (changed) mm-decode.el
+Dale Hagglund (changed) unexelf.c
+Dale R. Worley (wrote) emerge.el
+Dale Worley (changed) mail-extr.el
+Damon Anton Permezel (wrote) hanoi.el
+Dan Christensen (changed) gnus-art.el
+Dan Christensen (changed) gnus-group.el
+Dan Christensen (changed) gnus-score.el
+Dan Christensen (changed) nnfolder.el
+Dan Christensen (changed) nnmail.el
+Dan Nicolaescu (changed) [more than 20 files]
+Dan Nicolaescu (wrote) iris-ansi.el
+Dan Nicolaescu (wrote) romanian.el
+Daniel Laliberte (changed) eval-region.el
+Daniel Laliberte (changed) mlconvert.el
+Daniel Laliberte (wrote) cl-specs.el
+Daniel Laliberte (wrote) cust-print.el
+Daniel Laliberte (wrote) edebug.el
+Daniel Laliberte (wrote) hideif.el
+Daniel Laliberte (wrote) isearch.el
+Daniel Pfeiffer (changed) apropos.el
+Daniel Pfeiffer (changed) autoinsert.el
+Daniel Pfeiffer (changed) autoload.el
+Daniel Pfeiffer (changed) facemenu.el
+Daniel Pfeiffer (changed) gomoku.el
+Daniel Pfeiffer (changed) help.el
+Daniel Pfeiffer (changed) mailalias.el
+Daniel Pfeiffer (changed) sendmail.el
+Daniel Pfeiffer (changed) sgml-mode.el
+Daniel Pfeiffer (changed) tex-mode.el
+Daniel Pfeiffer (wrote) copyright.el
+Daniel Pfeiffer (wrote) executable.el
+Daniel Pfeiffer (wrote) sh-script.el
+Daniel Pfeiffer (wrote) skeleton.el
+Daniel Pfeiffer (wrote) two-column.el
+Daniel Pfeiffer (wrote) wyse50.el
+Daniel Quinlan (changed) dired.el
+Daniel Quinlan (changed) info.el
+Danny Roozendaal (wrote) handwrite.el
+Danny Siu (changed) gnus-picon.el
+Danny Siu (changed) nndoc.el
+Danny Siu (changed) smiley.el
+Darren Stalder (changed) gnus-util.el
+Darrin B. Jewell (changed) etags.c
+Darrin B. Jewell (changed) lisp.h
+Dave Edmondson (changed) message.el
+Dave Love (changed) [more than 20 files]
+Dave Love (wrote) autoarg.el
+Dave Love (wrote) autoconf.el
+Dave Love (wrote) elide-head.el
+Dave Love (wrote) hl-line.el
+Dave Love (wrote) latin-8.el
+Dave Love (wrote) latin-9.el
+Dave Love (wrote) latin1-disp.el
+Dave Love (wrote) refill.el
+Dave Love (wrote) smiley-ems.el
+Dave Love (wrote) tool-bar.el
+Dave Pearson (changed) [more than 20 files]
+Dave Pearson (wrote) 5x5.el
+Dave Pearson (wrote) quickurl.el
+David Aspinwall (changed) gnus-art.el
+David Bakhash (wrote) strokes.el
+David Byers (changed) minibuf.c
+David Edmondson (changed) gnus.el
+David Gillespie (changed) bytecomp.el
+David Gillespie (changed) info.el
+David Gillespie (wrote) cl-compat.el
+David Gillespie (wrote) cl-extra.el
+David Gillespie (wrote) cl-macs.el
+David Gillespie (wrote) cl-seq.el
+David Gillespie (wrote) cl.el
+David Gillespie (wrote) cl.texinfo
+David Gillespie (wrote) complete.el
+David Gillespie (wrote) edmacro.el
+David J. Mackenzie (changed) [more than 20 files]
+David Kegedal (changed) sendmail.el
+David K}Gedal (changed) sendmail.el
+David K}Gedal (wrote) tempo.el
+David K,Ae(Bgedal (changed) xmenu.c
+David Lawrence (changed) [more than 20 files]
+David M Smith (changed) ielm.el
+David M. Brown (wrote) array.el
+David M. Koppelman (wrote) hi-lock.el
+David M. Smith (changed) imenu.el
+David M. Smith (wrote) ielm.el
+David Megginson (changed) mode-clone.el
+David Megginson (wrote) derived.el
+David Moore (changed) gnus-xmas.el
+David Moore (wrote) nnvirtual.el
+David Mosberger-Tang (changed) alpha.h
+David Mosberger-Tang (changed) cm.h
+David Mosberger-Tang (changed) config.in
+David Mosberger-Tang (changed) configure.in
+David Mosberger-Tang (changed) cvtmail.c
+David Mosberger-Tang (changed) data.c
+David Mosberger-Tang (changed) dispnew.c
+David Mosberger-Tang (changed) emacsserver.c
+David Mosberger-Tang (changed) etags.c
+David Mosberger-Tang (changed) fakemail.c
+David Mosberger-Tang (changed) keyboard.c
+David Mosberger-Tang (changed) mem-limits.h
+David Mosberger-Tang (changed) process.c
+David Mosberger-Tang (changed) profile.c
+David Mosberger-Tang (changed) sorted-doc.c
+David Mosberger-Tang (changed) sysdep.c
+David Mosberger-Tang (changed) terminfo.c
+David Mosberger-Tang (changed) unexelf.c
+David Mosberger-Tang (changed) unexelf1.c
+David Mosberger-Tang (changed) yow.c
+David Ponce (wrote) recentf.el
+David Robinson (changed) menu-bar.el
+David Robinson (changed) x-win.el
+David S. Goldberg (changed) emacs-mime.texi
+David S. Goldberg (changed) gnus-art.el
+David S. Goldberg (changed) mm-decode.el
+David S. Goldberg (changed) mm-inline-override-types
+Decklin Foster (changed) nngateway.el
+Denis Howe (wrote) browse-url.el
+Derek L. Davies (changed) gud.el
+Detlev Zundel (wrote) re-builder.el
+Dick King (wrote) uniquify.el
+Didier Verna (changed) binhex.el
+Didier Verna (changed) gnus-art.el
+Didier Verna (changed) gnus-msg.el
+Didier Verna (changed) gnus-picon.el
+Didier Verna (changed) gnus-spec.el
+Didier Verna (changed) gnus-start.el
+Didier Verna (changed) gnus-sum.el
+Didier Verna (changed) gnus.el
+Didier Verna (changed) gnus.texi
+Didier Verna (changed) message.el
+Didier Verna (changed) mm-bodies.el
+Didier Verna (changed) mm-util.el
+Didier Verna (changed) nnmail.el
+Didier Verna (changed) rect.el
+Dirk Herrmann (changed) bibtex.el
+Dirk Meyer (changed) gnus-demon.el
+Don Morrison (wrote) dabbrev.el
+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
+E. Jay Berkenbilt (changed) ispell.el
+E. Jay Berkenbilt (changed) window.h
+Ed Reingold (changed) [more than 20 files]
+Edward M. Reingold (changed) cal-chinese.el
+Edward M. Reingold (changed) cal-dst.el
+Edward M. Reingold (changed) cal-hebrew.el
+Edward M. Reingold (changed) cal-islamic.el
+Edward M. Reingold (changed) cal-mayan.el
+Edward M. Reingold (changed) cal-tex.el
+Edward M. Reingold (changed) cal-x.el
+Edward M. Reingold (changed) diary-ins.el
+Edward M. Reingold (changed) diary-insert.el
+Edward M. Reingold (changed) diary.el
+Edward M. Reingold (changed) holiday.el
+Edward M. Reingold (changed) list-holidays.el
+Edward M. Reingold (changed) tex-mode.el
+Edward M. Reingold (wrote) cal-china.el
+Edward M. Reingold (wrote) cal-coptic.el
+Edward M. Reingold (wrote) cal-french.el
+Edward M. Reingold (wrote) cal-islam.el
+Edward M. Reingold (wrote) cal-iso.el
+Edward M. Reingold (wrote) cal-julian.el
+Edward M. Reingold (wrote) cal-menu.el
+Edward M. Reingold (wrote) cal-move.el
+Edward M. Reingold (wrote) cal-persia.el
+Edward M. Reingold (wrote) calendar.el
+Edward M. Reingold (wrote) diary-lib.el
+Edward M. Reingold (wrote) holidays.el
+Edward M. Reingold (wrote) lunar.el
+Edward M. Reingold (wrote) solar.el
+Ehud Karni (changed) aviion-intel.h
+Ehud Karni (changed) configure.in
+Eirik Fuller (changed) ralloc.c
+Eirik Fuller (changed) xterm.c
+Eli Barzilay (wrote) calculator.el
+Eli Zaretskii (changed) [more than 20 files]
+Eli Zaretskii (wrote) codepage.el
+Eli Zaretskii (wrote) tty-colors.el
+Emerick Rogul (changed) message.el
+Emilio Lopes (changed) apropos.el
+Emilio Lopes (changed) bookmark.el
+Emilio Lopes (changed) fortran.el
+Emilio Lopes (changed) help.el
+Emilio Lopes (changed) hscroll.el
+Emilio Lopes (changed) iso-acc.el
+Emilio Lopes (changed) process.c
+Emilio Lopes (changed) window.el
+Emmanuel Briot (changed) [more than 20 files]
+Emmanuel Briot (wrote) ada-prj.el
+Emmanuel Briot (wrote) xml.el
+Enami Tsugutomo (changed) add-log.el
+Enami Tsugutomo (changed) bytecomp.el
+Enami Tsugutomo (changed) configure.in
+Enami Tsugutomo (changed) dispnew.c
+Enami Tsugutomo (changed) editfns.c
+Enami Tsugutomo (changed) emacs.c
+Enami Tsugutomo (changed) fileio.c
+Enami Tsugutomo (changed) frame.c
+Enami Tsugutomo (changed) frame.h
+Enami Tsugutomo (changed) gnus-group.el
+Enami Tsugutomo (changed) keyboard.c
+Enami Tsugutomo (changed) perl-mode.el
+Enami Tsugutomo (changed) process.c
+Enami Tsugutomo (changed) rmailsum.el
+Enami Tsugutomo (changed) simple.el
+Enami Tsugutomo (changed) sysdep.c
+Enami Tsugutomo (changed) vc.el
+Enami Tsugutomo (changed) window.c
+Enami Tsugutomo (changed) window.el
+Enami Tsugutomo (changed) xdisp.c
+Eric Decker (changed) hp9000s800.h
+Eric Decker (changed) hpux.h
+Eric Decker (changed) sysdep.c
+Eric Ding (wrote) goto-addr.el
+Eric Hanchrow (changed) emacsclient.c
+Eric M. Ludlam (changed) [more than 20 files]
+Eric M. Ludlam (wrote) checkdoc.el
+Eric M. Ludlam (wrote) speedbar.el
+Eric Marsden (changed) gnus-art.el
+Eric Marsden (changed) nnslashdot.el
+Eric S. Raymond (changed) [more than 20 files]
+Eric S. Raymond (wrote) AT386.el
+Eric S. Raymond (wrote) asm-mode.el
+Eric S. Raymond (wrote) cookie1.el
+Eric S. Raymond (wrote) finder.el
+Eric S. Raymond (wrote) gud.el
+Eric S. Raymond (wrote) keyswap.el
+Eric S. Raymond (wrote) lisp-mnt.el
+Eric S. Raymond (wrote) loadhist.el
+Eric Youngdale (changed) etags-vmslib.c
+Erik Naggum (changed) [more than 20 files]
+Erik Naggum (wrote) disp-table.el
+Erik Naggum (wrote) latin-4.el
+Erik Naggum (wrote) latin-5.el
+Erik Naggum (wrote) mailheader.el
+Erik Naggum (wrote) parse-time.el
+Erik Toubro Nielsen (changed) gnus-sum.el
+Erik Toubro Nielsen (changed) gnus-topic.el
+Erik Toubro Nielsen (changed) gnus-util.el
+Espen Skoglund (wrote) pascal.el
+Ethan Bradford (changed) ange-ftp.el
+Ethan Bradford (changed) gnus.el
+Ethan Bradford (changed) gnuspost.el
+Ethan Bradford (changed) ispell.el
+Ethan Bradford (changed) lpr.el
+Ethan Bradford (changed) mailalias.el
+Ethan Bradford (changed) vt-control.el
+Ettore Perazzoli (changed) mail-source.el
+F. Thomas May (wrote) blackbox.el
+Fabrice Popineau (changed) etags.c
+Fabrice Popineau (changed) gnus-cache.el
+Fabrice Popineau (changed) gnus-score.el
+Felix Lee (changed) compile.el
+Felix Lee (changed) data.c
+Felix Lee (changed) flyspell.el
+Felix Lee (changed) gnus-async.el
+Felix Lee (changed) gnus.el
+Felix Lee (changed) gud.el
+Felix Lee (changed) nntp.el
+Felix Lee (changed) outline.el
+Felix Lee (changed) process.c
+Felix Lee (changed) vc.el
+Felix Lee (changed) xdisp.c
+Flemming Hoejstrup Hansen (changed) forms.el
+Florian Weimer (changed) gnus-cite.el
+Florian Weimer (changed) gnus-msg.el
+Florian Weimer (changed) gnus-score.el
+Florian Weimer (changed) gnus-spec.el
+Florian Weimer (changed) gnus-uu.el
+Florian Weimer (changed) mailcap.el
+Florian Weimer (changed) message.el
+Florian Weimer (changed) mm-bodies.el
+Florian Weimer (changed) mm-encode.el
+Florian Weimer (changed) mm-util.el
+Florian Weimer (changed) mml.el
+Florian Weimer (changed) nnultimate.el
+Florian Weimer (changed) qp.el
+Florian Weimer (changed) rfc2047.el
+Francesco Potort,Al(B (changed) [more than 20 files]
+Francesco Potort,Al(B (wrote) cmacexp.el
+Francis J. Wright (wrote) woman.el
+Francis Litterio (changed) gnus-group.el
+Francis Litterio (changed) saveplace.el
+Francis Wright (changed) dired.el
+Francisco Solsona (changed) message.el
+Francois Felix Ingrand (changed) gnus-salt.el
+Francois Felix Ingrand (changed) gnus-start.el
+Frank Bennett (changed) nnmail.el
+Frank Bresz (wrote) diff.el
+Fran,Ag(Bois Pinard (changed) allout.el
+Fran,Ag(Bois Pinard (changed) bytecomp.el
+Fran,Ag(Bois Pinard (changed) gnus
+Fran,Ag(Bois Pinard (changed) gnus-sum.el
+Fran,Ag(Bois Pinard (changed) gnus-util.el
+Fran,Ag(Bois Pinard (changed) gnus-uu.el
+Fran,Ag(Bois Pinard (changed) gnus-win.el
+Fran,Ag(Bois Pinard (changed) nndoc.el
+Fran,Ag(Bois Pinard (changed) nnmail.el
+Fran,Ag(Bois Pinard (changed) rmailsum.el
+Fran,Ag(Bois Pinard (changed) timezone.el
+Fred Fish (changed) linux.h
+Fred Fish (changed) unexec.c
+Fred Oberhauser (changed) nnmail.el
+Frederic Lepied (changed) gnus.el
+Frederic Lepied (wrote) expand.el
+Frederic Pierresteguy (changed) [more than 20 files]
+Frederic Pierresteguy (wrote) widget.c
+Fritz Knabe (changed) mh-mime.el
+G Dinesh Dutt (changed) etags.el
+Gareth Jones (changed) gnus-art.el
+Gareth Jones (changed) gnus-score.el
+Garrett Wollman (changed) sendmail.el
+Gary Byers (changed) xenix.h
+Gary D. Foster (changed) gnus-group.el
+Gary D. Foster (changed) gnus-topic.el
+Gary D. Foster (wrote) crisp.el
+Gary D. Foster (wrote) scroll-all.el
+Gary Delp (wrote) mailpost.el
+Gary Oberbrunner (changed) gud.el
+Geoff Voelker (changed) [more than 20 files]
+Geoff Voelker (wrote) lisp/makefile.nt
+Geoff Voelker (wrote) nt.c
+Geoff Voelker (wrote) nt.h
+Geoff Voelker (wrote) ntheap.c
+Geoff Voelker (wrote) ntheap.h
+Geoff Voelker (wrote) ntinevt.c
+Geoff Voelker (wrote) ntproc.c
+Geoff Voelker (wrote) ntterm.c
+Geoff Voelker (wrote) src/makefile.nt
+Geoff Voelker (wrote) w32-fns.el
+Geoff Voelker (wrote) windowsnt.h
+Geoff Voelker (wrote) winnt.el
+George V. Reilly (changed) emacs.ico
+George V. Reilly (changed) makefile.nt
+Georges Brun-Cottan (wrote) easy-mmode.el
+Gerd Moellmann (changed) [more than 20 files]
+Gerd Moellmann (wrote) authors.el
+Gerd Moellmann (wrote) ebrowse.el
+Gerd Moellmann (wrote) jit-lock.el
+Gerd Moellmann (wrote) rx.el
+Gerd Moellmann (wrote) tooltip.el
+Germano Caronni (changed) ralloc.c
+Gernot Heiser (changed) refer.el
+Glynn Clements (wrote) gamegrid.el
+Glynn Clements (wrote) snake.el
+Glynn Clements (wrote) tetris.el
+Gordon Matzigkeit (changed) gnus-uu.el
+Greg Hudson (changed) configure.in
+Greg Hudson (changed) indent.c
+Greg Klanderman (changed) messagexmas.el
+Greg Mcgary (changed) tar-mode.el
+Greg Stark (changed) gnus-ems.el
+Greg Stark (changed) timezone.el
+Gregor Schmid (changed) dispnew.c
+Gregor Schmid (changed) indent.c
+Gregor Schmid (changed) intervals.c
+Gregor Schmid (changed) intervals.h
+Gregor Schmid (changed) textprop.c
+Gregor Schmid (changed) xdisp.c
+Gregor Schmid (wrote) tcl-mode.el
+Gregory Neil Shapiro (changed) mailabbrev.el
+Guillermo J. Rozas (wrote) fakemail.c
+Gunnar Horrigmo (changed) gnus-sum.el
+Guy Geens (changed) gnus-score.el
+Gvran Uddeborg (changed) isc4-1.h
+Hallvard B. Furuseth (changed) editfns.c
+Hallvard B. Furuseth (changed) gnus-cache.el
+Hallvard B. Furuseth (changed) gnus-sum.el
+Hallvard B. Furuseth (changed) gnus-util.el
+Hallvard B. Furuseth (changed) lread.c
+Hallvard B. Furuseth (changed) mailcap.el
+Hallvard B. Furuseth (changed) messcompat.el
+Hallvard B. Furuseth (changed) mm-bodies.el
+Hallvard B. Furuseth (changed) mm-util.el
+Hallvard B. Furuseth (changed) nntp.el
+Hallvard B. Furuseth (changed) print.c
+Hallvard B. Furuseth (changed) process.c
+Hallvard B. Furuseth (changed) rfc2047.el
+Hallvard B. Furuseth (changed) search.c
+Han-Wen Nienhuys (changed) emacsclient.c
+Han-Wen Nienhuys (changed) server.el
+Hans Chalupsky (changed) bytecomp.el
+Hans Chalupsky (wrote) advice.el
+Hans Chalupsky (wrote) trace.el
+Hans Henrik Eriksen (wrote) simula.el
+Heiko Muenkel (changed) b2m.c
+Henry Guillaume (wrote) find-file.el
+Henry Kautz (wrote) refbib.el
+Hewlett-Packard (changed) emacsclient.c
+Hewlett-Packard (changed) emacsserver.c
+Hewlett-Packard (changed) keyboard.c
+Hewlett-Packard (changed) server.el
+Hiroshi Nakano (changed) ralloc.c
+Hiroshi Nakano (changed) unexelf.c
+Holger Schauer (wrote) fortune.el
+Hovav Shacham (wrote) windmove.el
+Howard Gayle (wrote) case-table.el
+Howard Gayle (wrote) casetab.c
+Howard Gayle (wrote) disp-table.el
+Howard Gayle (wrote) iso-ascii.el
+Howard Gayle (wrote) iso-insert.el
+Howard Gayle (wrote) iso-swed.el
+Howard Gayle (wrote) iso-syntax.el
+Howard Gayle (wrote) iso-transl.el
+Howard Gayle (wrote) latin-1.el
+Howard Gayle: (wrote) rot13.el
+Howard Gayle (wrote) swedish.el
+Howard Gayle (wrote) vt100-led.el
+Howard Melman (changed) imenu.el
+Howard Melman (changed) picture.el
+Howie Kaye (wrote) sort.el
+Hrvoje Niksic (changed) [more than 20 files]
+Ian Lance Taylor (changed) sco4.h
+Ian T Zimmerman (changed) ange-ftp.el
+Ian T Zimmerman (changed) desktop.el
+Ian T Zimmerman (changed) tex-mode.el
+Ian T Zimmerman (wrote) gametree.el
+Ilja Weis (wrote) gnus-topic.el
+Ilya Zakharevich (changed) cperl-mode.el
+Ilya Zakharevich (changed) dired.c
+Ilya Zakharevich (changed) font-lock.el
+Ilya Zakharevich (changed) interval.c
+Ilya Zakharevich (changed) intervals.c
+Ilya Zakharevich (changed) intervals.h
+Ilya Zakharevich (changed) regex.c
+Ilya Zakharevich (changed) regex.h
+Ilya Zakharevich (changed) search.c
+Ilya Zakharevich (changed) syntax.c
+Ilya Zakharevich (changed) syntax.h
+Ilya Zakharevich (changed) textprop.c
+Ilya Zakharevich (wrote) tmm.el
+Ilya Zakharevich And Bob Olson (wrote) cperl-mode.el
+Indiana University Foundation (changed) buffer.c
+Indiana University Foundation (changed) buffer.h
+Indiana University Foundation (changed) indent.c
+Indiana University Foundation (changed) region-cache.c
+Indiana University Foundation (changed) region-cache.h
+Indiana University Foundation (changed) search.c
+Indiana University Foundation (changed) xdisp.c
+Inge Frick (changed) arc-mode.el
+Inge Frick (changed) compile.el
+Inge Frick (changed) dired-aux.el
+Inge Frick (changed) dired.el
+Inge Frick (changed) easymenu.el
+Inge Frick (changed) files.el
+Inge Frick (changed) keyboard.c
+Inge Frick (changed) keyboard.h
+Inge Frick (changed) keymap.c
+Inge Frick (changed) tar-mode.el
+Inge Frick (changed) view.el
+Inge Frick (changed) window.el
+Inge Frick (changed) xmenu.c
+Inoue Seiichiro (changed) xfns.c
+Inoue Seiichiro (changed) xterm.c
+Inoue Seiichiro (changed) xterm.h
+International Business Machines (changed) emacs.c
+International Business Machines (changed) fileio.c
+International Business Machines (changed) ibmrt-aix.h
+International Business Machines (changed) ibmrt.h
+International Business Machines (changed) process.c
+International Business Machines (changed) sysdep.c
+International Business Machines (changed) unexec.c
+Ishikawa Chiaki (changed) aviion.h
+Ishikawa Chiaki (changed) dgux.h
+Istvan Marko (changed) gnus-agent.el
+Istvan Marko (changed) mm-decode.el
+Ivar Rummelhoff (wrote) winner.el
+Iwamuro Motonori (changed) gnus-kill.el
+Jaap-Henk Hoepman (changed) gnus-msg.el
+Jack Repenning (changed) unexelfsgi.c
+Jack Vinson (changed) mailcap.el
+Jacques Duthen (changed) ps-print.el
+Jae-You Chung (changed) gnus.el
+Jae-Youn Chung (changed) hanja3.el
+James Clark (changed) window.c
+James Clark (changed) xselect.c
+James Clark (wrote) sgml-mode.el
+James H. Cloos, Jr. (changed) gnus-art.el
+James H. Cloos, Jr. (changed) gnus-sum.el
+James R. Larus (wrote) mh-e.el
+James Thompson (changed) ps-print.el
+James Troup (changed) gnus-sum.el
+James Van Artsdalen (changed) unexec.c
+James Van Artsdalen (changed) usg5-4.h
+Jamie Zawinski (changed) bytecode.c
+Jamie Zawinski (changed) mail-extr.el
+Jamie Zawinski (changed) subr.el
+Jamie Zawinski (wrote) byte-opt.el
+Jamie Zawinski (wrote) byte-run.el
+Jamie Zawinski (wrote) bytecomp.el
+Jamie Zawinski (wrote) disass.el
+Jamie Zawinski (wrote) mailabbrev.el
+Jamie Zawinski (wrote) tar-mode.el
+Jan Nieuwenhuizen (changed) emacs.c
+Jan Nieuwenhuizen (changed) emacsclient.c
+Jan Nieuwenhuizen (changed) startup.el
+Jan Schormann (wrote) solitaire.el
+Jan Vroonhof (changed) gnus-cite.el
+Jan Vroonhof (changed) gnus-msg.el
+Jan Vroonhof (changed) message.el
+Jan Vroonhof (changed) nntp.el
+Jan-Hein Buhrman (changed) ange-ftp.el
+Jan-Hein Buhrman (changed) env.el
+Jari Aalto (changed) add-log.el
+Jari Aalto (changed) apropos.el
+Jari Aalto (changed) debug.el
+Jari Aalto (changed) font-lock.el
+Jari Aalto (changed) gnus-art.el
+Jari Aalto (changed) lisp-mnt.el
+Jari Aalto (changed) mailcap.el
+Jari Aalto (changed) nnmail.el
+Jason R Mastaler (changed) drums.el
+Jason Rumney (changed) [more than 20 files]
+Jay K. Adams (wrote) jka-compr.el
+Jay R. Adams (changed) jka-compr.el
+Jay Sachs (changed) gnus-score.el
+Jay Sachs (changed) gnus-win.el
+Jeff Dwork (changed) ehelp.el
+Jeff Morgenthaler (changed) flow-ctrl.el
+Jeff Morgenthaler (changed) vt200.el
+Jeff Morgenthaler (changed) vt201.el
+Jeff Morgenthaler (changed) vt220.el
+Jeff Morgenthaler (changed) vt240.el
+Jeff Norden (wrote) kermit.el
+Jeff Peck (wrote) sun-curs.el
+Jeff Peck (wrote) sun-fns.el
+Jeff Peck (wrote) sun-mouse.el
+Jeff Peck (wrote) sun.el
+Jeffrey C Honig (changed) bsdos4.h
+Jens Lautenbacher (changed) gnus.el
+Jens Petersen (changed) ffap.el
+Jens Petersen (wrote) find-func.el
+Jens Toivo Berger Thielemann (changed) word-help.el
+Jens-Ulrik Holger Petersen (changed) cus-edit.el
+Jens-Ulrik Holger Petersen (changed) find-func.el
+Jens-Ulrik Holger Petersen (changed) gnus-group.el
+Jens-Ulrik Holger Petersen (changed) gnus-msg.el
+Jens-Ulrik Holger Petersen (changed) gnus.el
+Jerry Frain (changed) systime.h
+Jerry Frain (changed) usg5-4.h
+Jerry James (changed) format.el
+Jesper Harder (changed) message.el
+Jim Blandy (changed) [more than 20 files]
+Jim Blandy (wrote) tvi970.el
+Jim Davidson (changed) gnus-sum.el
+Jim Davidson (changed) message.el
+Jim Kingdon (changed) MACHINES
+Jim Kingdon (changed) SERVICE
+Jim Kingdon (changed) emacs.tex
+Jim Kingdon (changed) emacsclient.c
+Jim Kingdon (changed) hp300bsd.h
+Jim Kingdon (changed) rmail.el
+Jim Meyering (changed) Makefile.in
+Jim Meyering (changed) grep-changelog
+Jim Radford (changed) gnus-start.el
+Jim Salem (wrote) completion.el
+Jim Thompson (wrote) ps-print.el
+Jim Wilson (changed) Makefile.in
+Jim Wilson (changed) alloca.c
+Joe Arceneax (wrote) xrdb.c
+Joe Buehler (changed) gnus-util.el
+Joe Ramey (changed) filelock.c
+Joe Ramey (changed) rmailsum.el
+Joe Reiss (changed) gnus-art.el
+Joe Wells (wrote) apropos.el
+Joe Wells (wrote) mail-extr.el
+Joe Wells (wrote) resume.el
+Joel N. Weber Ii (changed) comint.el
+Joel N. Weber Ii (changed) make-dist
+Joel Ray Holveck (changed) info.el
+Joerg Lenneis (changed) nneething.el
+Joerg Lenneis (changed) nnheader.el
+Joev Dubach (changed) nntp.el
+Johan Kullstam (changed) mm-encode.el
+Johan Vromans (changed) complete.el
+Johan Vromans (wrote) forms-d2.el
+Johan Vromans (wrote) forms.el
+Johan Vromans (wrote) iso-acc.el
+Johannes Weinert (changed) gnus-sum.el
+John Eaton (wrote) octave-hlp.el
+John Eaton (wrote) octave-inf.el
+John Eaton (wrote) octave-mod.el
+John F. Carr (changed) dired.c
+John F. Whitehead (changed) mule-cmds.el
+John F. Whitehead (changed) mule-diag.el
+John Grabowski (changed) xfaces.c
+John Grabowski (changed) xfns.c
+John H. Palmieri (changed) mail-source.el
+John Heidemann (wrote) mouse-copy.el
+John Heidemann (wrote) mouse-drag.el
+John Heidemann (wrote) zone-mode.el
+John Hughes (changed) term.c
+John Robinson (wrote) bg-mouse.el
+John Tobey (changed) gud.el
+John W. Eaton (changed) octave-mod.el
+John Wiegley (changed) Makefile.in
+John Wiegley (changed) allout.el
+John Wiegley (changed) compile.el
+John Wiegley (changed) desktop.el
+John Wiegley (changed) eshell.texi
+John Wiegley (changed) flyspell.el
+John Wiegley (changed) gnus-art.el
+John Wiegley (changed) gnus-mlspl.el
+John Wiegley (changed) gnus-topic.el
+John Wiegley (changed) mail-source.el
+John Wiegley (changed) outline.el
+John Wiegley (changed) pcmpl-gnu.el
+John Wiegley (changed) term.el
+John Wiegley (wrote) align.el
+John Wiegley (wrote) em-alias.el
+John Wiegley (wrote) em-banner.el
+John Wiegley (wrote) em-basic.el
+John Wiegley (wrote) em-cmpl.el
+John Wiegley (wrote) em-dirs.el
+John Wiegley (wrote) em-glob.el
+John Wiegley (wrote) em-hist.el
+John Wiegley (wrote) em-ls.el
+John Wiegley (wrote) em-pred.el
+John Wiegley (wrote) em-prompt.el
+John Wiegley (wrote) em-rebind.el
+John Wiegley (wrote) em-script.el
+John Wiegley (wrote) em-smart.el
+John Wiegley (wrote) em-term.el
+John Wiegley (wrote) em-unix.el
+John Wiegley (wrote) em-xtra.el
+John Wiegley (wrote) esh-arg.el
+John Wiegley (wrote) esh-cmd.el
+John Wiegley (wrote) esh-ext.el
+John Wiegley (wrote) esh-io.el
+John Wiegley (wrote) esh-maint.el
+John Wiegley (wrote) esh-mode.el
+John Wiegley (wrote) esh-module.el
+John Wiegley (wrote) esh-opt.el
+John Wiegley (wrote) esh-proc.el
+John Wiegley (wrote) esh-test.el
+John Wiegley (wrote) esh-util.el
+John Wiegley (wrote) esh-var.el
+John Wiegley (wrote) eshell.el
+John Wiegley (wrote) pcomplete.el
+John Wiegley (wrote) timeclock.el
+Jon K Hellan (wrote) utf7.el
+Jon Kv (changed) nnfolder.el
+Jonas Steverud (changed) gnus-art.el
+Jonathan I. Kamens (changed) Makefile.in
+Jonathan I. Kamens (changed) Makefile.in.in
+Jonathan I. Kamens (changed) config.in
+Jonathan I. Kamens (changed) configure.in
+Jonathan I. Kamens (changed) files.el
+Jonathan I. Kamens (changed) gnus.texi
+Jonathan I. Kamens (changed) jka-compr.el
+Jonathan I. Kamens (changed) movemail.c
+Jonathan I. Kamens (changed) pop.c
+Jonathan I. Kamens (changed) pop.h
+Jonathan I. Kamens (changed) rmail.el
+Jonathan I. Kamens (changed) rmail.texi
+Jonathan I. Kamens (changed) rmailout.el
+Jonathan I. Kamens (changed) rnewspost.el
+Jonathan I. Kamens (changed) sendmail.el
+Jonathan I. Kamens (changed) simple.el
+Jonathan I. Kamens (changed) terminal.el
+Jonathan I. Kamens (changed) timezone.el
+Jonathan I. Kamens (changed) vc.el
+Jonathan Stigelman (wrote) hilit19.el
+Jonathan Vail (changed) vc.el
+Josef Arceneaux (changed) bytecode.c
+Josef Arceneaux (changed) sink.hsinkmask.h
+Josef Arceneaux (changed) xfns.c
+Josef Arceneaux (changed) xterm.c
+Josef Arceneaux (changed) ymakefile
+Joseph Arceneaux (changed) [more than 20 files]
+Joseph Arceoeaux (changed) lread.c
+Joseph M. Kelsey (changed) dir.h
+Joseph M. Kelsey (changed) fileio.c
+Joseph M. Kelsey (changed) uaf.h
+Joseph M. Kelsey (changed) vms-pwd.h
+Joseph M. Kelsey (changed) vmsfns.c
+Juanma Barranquero (changed) grep-changelog
+Juergen Nickelsen (wrote) ws-mode.el
+Julien Gilles (wrote) gnus-ml.el
+Junio Hamano (changed) window.el
+Justin Sheehy (changed) gnus-util.el
+Justin Sheehy (changed) nnmail.el
+Justin Sheehy (changed) nntp.el
+K. Shane Hartman (changed) [more than 20 files]
+K. Shane Hartman (wrote) chistory.el
+K. Shane Hartman (wrote) echistory.el
+K. Shane Hartman (wrote) electric.el
+K. Shane Hartman (wrote) emacsbug.el
+K. Shane Hartman (wrote) helper.el
+K. Shane Hartman (wrote) picture.el
+K. Shane Hartman (wrote) view.el
+Kahlil Hodgson (changed) timeclock.el
+Kai Grossjohann (changed) nnheader.el
+Kai Gro,A_(Bjohann (changed) Makefile.in
+Kai Gro,A_(Bjohann (changed) gnus-art.el
+Kai Gro,A_(Bjohann (changed) gnus-cus.el
+Kai Gro,A_(Bjohann (changed) gnus-sum.el
+Kai Gro,A_(Bjohann (changed) gnus-util.el
+Kai Gro,A_(Bjohann (changed) gnus.texi
+Kai Gro,A_(Bjohann (changed) mail-source.el
+Kai Gro,A_(Bjohann (changed) message.el
+Kai Gro,A_(Bjohann (changed) nnimap.el
+Kai Gro,A_(Bjohann (changed) nnmail.el
+Karl Berry (changed) compile.el
+Karl Berry (changed) dired.c
+Karl Berry (changed) fileio.c
+Karl Berry (changed) filelock.c
+Karl Berry (changed) isc2-2.h
+Karl Eichwalder (changed) Makefile.in
+Karl Eichwalder (changed) add-log.el
+Karl Eichwalder (changed) bookmark.el
+Karl Eichwalder (changed) dired-aux.el
+Karl Eichwalder (changed) dired.el
+Karl Eichwalder (changed) info.el
+Karl Eichwalder (changed) menu-bar.el
+Karl Eichwalder (changed) midnight.el
+Karl Fogel (changed) editfns.c
+Karl Fogel (changed) menu-bar.el
+Karl Fogel (changed) window.c
+Karl Fogel (wrote) bookmark.el
+Karl Fogel (wrote) mail-hist.el
+Karl Fogel (wrote) saveplace.el
+Karl Heuer (changed) [more than 20 files]
+Karl Kleinpaste (changed) gnus-art.el
+Karl Kleinpaste (changed) gnus-cus.el
+Karl Kleinpaste (changed) gnus-msg.el
+Karl Kleinpaste (changed) gnus-score.el
+Karl Kleinpaste (changed) gnus-sum.el
+Karl Kleinpaste (changed) gnus-util.el
+Karl Kleinpaste (changed) mailcap.el
+Karl Kleinpaste (changed) message.el
+Karl Kleinpaste (changed) mm-encode.el
+Karl Kleinpaste (changed) mm-uu.el
+Karl Kleinpaste (changed) nnheader.el
+Karl M. Hegbloom (changed) gnus.el
+Katsumi Yamaoka (changed) gnus-art.el
+Katsumi Yamaoka (changed) gnus-group.el
+Katsumi Yamaoka (changed) gnus-start.el
+Katsumi Yamaoka (changed) gnus-sum.el
+Katsumi Yamaoka (changed) gnus-util.el
+Katsumi Yamaoka (changed) mail-source.el
+Katsumi Yamaoka (changed) message.el
+Katsumi Yamaoka (changed) mm-bodies.el
+Katsumi Yamaoka (changed) nnagent.el
+Katsumi Yamaoka (changed) nnheader.el
+Katsumi Yamaoka (changed) nnimap.el
+Katsumi Yamaoka (changed) nnmail.el
+Katsumi Yamaoka (changed) nntp.el
+Katsumi Yamaoka (changed) parse-time.el
+Kaveh R. Ghazi (changed) delta88k.h
+Kaveh R. Ghazi (changed) xterm.c
+Kawabata, Taichi (wrote) devan-util.el
+Kawabata, Taichi (wrote) devanagari.el
+Kawabata, Taichi (wrote) indian.el
+Kayvan Sylvan (changed) sc.el
+Kazushi (changed) filelock.c
+Kazushi (changed) hexl.c
+Kazushi (changed) profile.c
+Kazushi (changed) unexalpha.c
+Keisuke Nishida (changed) alloc.c
+Keisuke Nishida (changed) bytecomp.el
+Keisuke Nishida (changed) data.c
+Keisuke Nishida (changed) keymap.c
+Keisuke Nishida (changed) print.c
+Keith Gabryelski (wrote) hexl.c
+Keith Gabryelski (wrote) hexl.el
+Ken  Manheimer (changed) allout.el
+Ken Laprade (changed) simple.el
+Ken Manheimer (wrote) allout.el
+Ken Manheimer (wrote) icomplete.el
+Ken Raeburn (changed) [more than 20 files]
+Ken Stevens (wrote) ispell.el
+Kenichi Handa (changed) [more than 20 files]
+Kenichi Handa (wrote) isearch-x.el
+Kenichi Handa (wrote) ps-mule.el
+Kenichi Handa (wrote) ps-print.el
+Kenichi Handa (wrote) py-punct.el
+Kenichi Handa (wrote) pypunct-b5.el
+Kenichi Handa (wrote) quail.el
+Kenneth Stailey (changed) alpha.h
+Kenneth Stailey (changed) configure.in
+Kenneth Stailey (changed) ns32000.h
+Kenneth Stailey (changed) openbsd.h
+Kenneth Stailey (changed) pmax.h
+Kenneth Stailey (changed) sparc.h
+Kenneth Stailey (changed) unexalpha.c
+Kenneth Stailey (changed) unexelf.c
+Kenry Kautz (wrote) bib-mode.el
+Kevin Blake (changed) font-lock.el
+Kevin Blake (changed) ring.el
+Kevin Broadey (wrote) foldout.el
+Kevin Christian (changed) gnus-score.el
+Kevin Gallagher (changed) edt-user.doc
+Kevin Gallagher (wrote) edt-lk201.el
+Kevin Gallagher (wrote) edt-mapper.el
+Kevin Gallagher (wrote) edt-pc.el
+Kevin Gallagher (wrote) edt-vt100.el
+Kevin Gallagher (wrote) edt.el
+Kevin Gallagher (wrote) flow-ctrl.el
+Kevin Gallo (changed) [more than 20 files]
+Kevin Gallo (wrote) w32-win.el
+Kevin J. Greiner (changed) gud.el
+Kevin Layer (changed) ntproc.c
+Kevin Rodgers (changed) ange-ftp.el
+Kevin Rodgers (changed) byte-opt.el
+Kevin Rodgers (changed) compile.el
+Kevin Rodgers (changed) dired-x.el
+Kevin Rodgers (changed) dired-x.texi
+Kevin Rodgers (changed) files.el
+Kevin Rodgers (changed) isearch.el
+Kevin Rodgers (changed) loadhist.el
+Kevin Rodgers (changed) mailabbrev.el
+Kevin Rodgers (changed) mailalias.el
+Kevin Rodgers (changed) print.c
+Kevin Rodgers (changed) replace.el
+Kevin Rodgers (changed) sendmail.el
+Kevin Rodgers (changed) simple.el
+Kevin Rodgers (changed) vc.el
+Kevin Rodgers (changed) xfns.c
+Kevin The Bandicoot (changed) gnus-art.el
+Kim F. Storm (changed) addpm.c
+Kim F. Storm (changed) dosfns.c
+Kim F. Storm (changed) dosfns.h
+Kim F. Storm (changed) fileio.c
+Kim F. Storm (changed) files.el
+Kim F. Storm (changed) frame.c
+Kim F. Storm (changed) hippie.el
+Kim F. Storm (changed) keyboard.c
+Kim F. Storm (changed) msdos.c
+Kim F. Storm (changed) msdos.h
+Kim F. Storm (changed) nt.c
+Kim F. Storm (changed) ntproc.c
+Kim F. Storm (changed) puresize.h
+Kim F. Storm (changed) runemacs.c
+Kim F. Storm (changed) sed1.inp
+Kim F. Storm (changed) sysdep.c
+Kim F. Storm (changed) xfaces.c
+Kim F. Storm (changed) xterm.c
+Kim-Minh Kaplan (changed) [more than 20 files]
+Kishore Kumar (changed) terminal.el
+Kiyokazu Suto (changed) nnspool.el
+Kjetil Torgrim Homme (changed) nnmail.el
+Koaunghi Un (changed) hangul.el
+Koaunghi Un (changed) hangul3.el
+Koaunghi Un (changed) hanja-jis.el
+Koaunghi Un (changed) hanja.el
+Koaunghi Un (changed) symbol-ksc.el
+Koaunghi Un (wrote) hanja3.el
+Kohtala Marko (changed) info.el
+Koseki Yoshinori (changed) mm-util.el
+Koseki Yoshinori (changed) nnmail.el
+Kurt Hornik (changed) ielm.el
+Kurt Hornik (changed) term.el
+Kurt Hornik (wrote) octave-hlp.el
+Kurt Hornik (wrote) octave-inf.el
+Kurt Hornik (wrote) octave-mod.el
+Kurt Swanson (changed) gnus-art.el
+Kurt Swanson (changed) gnus-ems.el
+Kurt Swanson (changed) gnus-group.el
+Kurt Swanson (changed) gnus-msg.el
+Kurt Swanson (changed) gnus-salt.el
+Kurt Swanson (changed) gnus-score.el
+Kurt Swanson (changed) gnus-sum.el
+Kurt Swanson (changed) gnus-util.el
+Kurt Swanson (changed) nnmail.el
+Kurt Swanson (changed) window.c
+Kyle E. Jones (wrote) mldrag.el
+Kyle Jones (changed) buffer.c
+Kyle Jones (changed) mail-utils.el
+Kyle Jones (changed) saveconf.el
+Kyle Jones (changed) sendmail.el
+Kyle Jones (wrote) life.el
+Lantz Moore (changed) nnmail.el
+Larry Kolodney (wrote) cvtmail.c
+Lars Balker Rasmussen (changed) gnus-agent.el
+Lars Balker Rasmussen (changed) gnus-art.el
+Lars Balker Rasmussen (changed) message.el
+Lars Lindberg (changed) dabbrev.el
+Lars Lindberg (wrote) imenu.el
+Lars Lindberg (wrote) msb.el
+Lars Magne Ingebrigtsen (changed) [more than 20 files]
+Lars Magne Ingebrigtsen (wrote) format-spec.el
+Lars Magne Ingebrigtsen (wrote) gnus-agent.el
+Lars Magne Ingebrigtsen (wrote) gnus-art.el
+Lars Magne Ingebrigtsen (wrote) gnus-async.el
+Lars Magne Ingebrigtsen (wrote) gnus-bcklg.el
+Lars Magne Ingebrigtsen (wrote) gnus-cache.el
+Lars Magne Ingebrigtsen (wrote) gnus-demon.el
+Lars Magne Ingebrigtsen (wrote) gnus-draft.el
+Lars Magne Ingebrigtsen (wrote) gnus-dup.el
+Lars Magne Ingebrigtsen (wrote) gnus-eform.el
+Lars Magne Ingebrigtsen (wrote) gnus-ems.el
+Lars Magne Ingebrigtsen (wrote) gnus-group.el
+Lars Magne Ingebrigtsen (wrote) gnus-int.el
+Lars Magne Ingebrigtsen (wrote) gnus-logic.el
+Lars Magne Ingebrigtsen (wrote) gnus-move.el
+Lars Magne Ingebrigtsen (wrote) gnus-nocem.el
+Lars Magne Ingebrigtsen (wrote) gnus-range.el
+Lars Magne Ingebrigtsen (wrote) gnus-salt.el
+Lars Magne Ingebrigtsen (wrote) gnus-spec.el
+Lars Magne Ingebrigtsen (wrote) gnus-srvr.el
+Lars Magne Ingebrigtsen (wrote) gnus-start.el
+Lars Magne Ingebrigtsen (wrote) gnus-sum.el
+Lars Magne Ingebrigtsen (wrote) gnus-undo.el
+Lars Magne Ingebrigtsen (wrote) gnus-util.el
+Lars Magne Ingebrigtsen (wrote) gnus-uu.el
+Lars Magne Ingebrigtsen (wrote) gnus-win.el
+Lars Magne Ingebrigtsen (wrote) ietf-drums.el
+Lars Magne Ingebrigtsen (wrote) mail-parse.el
+Lars Magne Ingebrigtsen (wrote) mail-prsvr.el
+Lars Magne Ingebrigtsen (wrote) mail-source.el
+Lars Magne Ingebrigtsen (wrote) message.el
+Lars Magne Ingebrigtsen (wrote) messcompat.el
+Lars Magne Ingebrigtsen (wrote) mm-bodies.el
+Lars Magne Ingebrigtsen (wrote) mm-decode.el
+Lars Magne Ingebrigtsen (wrote) mm-encode.el
+Lars Magne Ingebrigtsen (wrote) mm-util.el
+Lars Magne Ingebrigtsen (wrote) mm-view.el
+Lars Magne Ingebrigtsen (wrote) mml.el
+Lars Magne Ingebrigtsen (wrote) nnagent.el
+Lars Magne Ingebrigtsen (wrote) nnbabyl.el
+Lars Magne Ingebrigtsen (wrote) nndir.el
+Lars Magne Ingebrigtsen (wrote) nndoc.el
+Lars Magne Ingebrigtsen (wrote) nndraft.el
+Lars Magne Ingebrigtsen (wrote) nneething.el
+Lars Magne Ingebrigtsen (wrote) nngateway.el
+Lars Magne Ingebrigtsen (wrote) nnkiboze.el
+Lars Magne Ingebrigtsen (wrote) nnlistserv.el
+Lars Magne Ingebrigtsen (wrote) nnmail.el
+Lars Magne Ingebrigtsen (wrote) nnmbox.el
+Lars Magne Ingebrigtsen (wrote) nnmh.el
+Lars Magne Ingebrigtsen (wrote) nnml.el
+Lars Magne Ingebrigtsen (wrote) nnoo.el
+Lars Magne Ingebrigtsen (wrote) nnslashdot.el
+Lars Magne Ingebrigtsen (wrote) nnsoup.el
+Lars Magne Ingebrigtsen (wrote) nntp.el
+Lars Magne Ingebrigtsen (wrote) nnultimate.el
+Lars Magne Ingebrigtsen (wrote) nnweb.el
+Lars Magne Ingebrigtsen (wrote) qp.el
+Lars Magne Ingebrigtsen (wrote) rfc2045.el
+Lars Magne Ingebrigtsen (wrote) rfc2047.el
+Lars Magne Ingebrigtsen (wrote) rfc2231.el
+Lars Magne Ingebrigtsen (wrote) score-mode.el
+Lars Magne Ingebrigtsen (wrote) time-date.el
+Lars Magne Ingebrigtsen- (changed) gnus-art.el
+Lars Magne Ingebrigtsen- (changed) mm-decode.el
+Lars Magne Ingebrigtsen- (changed) mm-view.el
+Lasse Rasinen (changed) gnus-start.el
+Lawrence R. Dodd (changed) [more than 20 files]
+Lawrence R. Dodd (wrote) dired-x.el
+Lee Willis (changed) gnus-art.el
+Leigh Stoller (changed) emacsclient.c
+Leigh Stoller (changed) emacsserver.c
+Leigh Stoller (changed) server.el
+Lennart Staflin (changed) diary-ins.el
+Lennart Staflin (changed) diary-lib.el
+Lennart Staflin (changed) dired.el
+Lennart Staflin (changed) tq.el
+Lennart Staflin (changed) xdisp.c
+Leonard H. Tower Jr. (changed) emacsbug.el
+Leonard H. Tower Jr. (changed) rmailout.el
+Leonard H. Tower Jr. (changed) rnews.el
+Leonard H. Tower Jr. (changed) rnewspost.el
+Leonard H. Tower Jr. (changed) rnewspost.el;
+Lloyd Zusman (changed) gnus-sum.el
+Lloyd Zusman (changed) mailcap.el
+Lloyd Zusman (changed) nnmail.el
+Lucid, Inc. (changed) byte-opt.el
+Lucid, Inc. (changed) byte-run.el
+Lucid, Inc. (changed) bytecode.c
+Lucid, Inc. (changed) bytecomp.el
+Lucid, Inc. (changed) delsel.el
+Lucid, Inc. (changed) disass.el
+Lucid, Inc. (changed) faces.el
+Lucid, Inc. (changed) font-lock.el
+Lucid, Inc. (changed) lmenu.el
+Lucid, Inc. (changed) lselect.el
+Lucid, Inc. (changed) mailabbrev.el
+Lucid, Inc. (changed) select.el
+Lucid, Inc. (changed) xfaces.c
+Lucid, Inc. (changed) xselect.c
+Lynn Slater (wrote) help-macro.el
+MCC (changed) emacsclient.c
+MCC (changed) emacsserver.c
+MCC (changed) etags.c
+MCC (changed) lisp.h
+MCC (changed) movemail.c
+MCC (changed) rmail.el
+MCC (changed) rmailedit.el
+MCC (changed) rmailkwd.el
+MCC (changed) rmailmsc.el
+MCC (changed) rmailout.el
+MCC (changed) rmailsum.el
+MCC (changed) scribe.el
+MCC (changed) server.el
+MCC (changed) sysdep.c
+MCC (changed) unexec.c
+MCC (wrote) xmenu.c
+Manuel Serrano (wrote) flyspell.el
+Marc Fleischeuers (changed) files.el
+Marc Girod (changed) informat.el
+Marc Girod (changed) rmail.el
+Marc Girod (changed) rmailsum.el
+Marc Girod (changed) sendmail.el
+Marc Shapiro (changed) bibtex.el
+Marco Melgazzi (changed) term.el
+Marco Walther (changed) mips-siemens.h
+Marco Walther (changed) unexelfsni.c
+Marco Walther (changed) unexsni.c
+Marcus G. Daniels (changed) Makefile.in
+Marcus G. Daniels (changed) alloc.c
+Marcus G. Daniels (changed) config.in
+Marcus G. Daniels (changed) configure.in
+Marcus G. Daniels (changed) dispnew.c
+Marcus G. Daniels (changed) editfns.c
+Marcus G. Daniels (changed) emacs.c
+Marcus G. Daniels (changed) irix5-0.h
+Marcus G. Daniels (changed) linux.h
+Marcus G. Daniels (changed) lwlib-Xm.c
+Marcus G. Daniels (changed) lwlib-Xm.h
+Marcus G. Daniels (changed) lwlib.c
+Marcus G. Daniels (changed) lwlib.h
+Marcus G. Daniels (changed) ptx4.h
+Marcus G. Daniels (changed) sequent-ptx.h
+Marcus G. Daniels (changed) unexelf.c
+Marcus G. Daniels (changed) xdisp.c
+Marcus G. Daniels (changed) xfns.c
+Marcus G. Daniels (changed) xmenu.c
+Marcus G. Daniels (changed) xterm.c
+Mark D. Baushke (changed) etags.c
+Mark Diekhans (changed) compile.el
+Mark Lambert (changed) process.c
+Mark Lambert (changed) process.h
+Mark Mitchell (changed) font-lock.el
+Mark Neale (changed) fortran.el
+Mark Osbourne (changed) hexl-mode.el
+Mark W Maimone (changed) mpuz.el
+Mark W. Eichin (changed) gnus.el
+Mark W. Eichin (changed) keyboard.c
+Mark W. Eichin (changed) xterm.c
+Marko Kohtala (changed) info.el
+Marko Rahamaa (wrote) latin-3.el
+Markus Armbruster (changed) avoid.el
+Markus Heritsch (wrote) ada-xref.el
+Markus Rost (changed) [more than 20 files]
+Martin Boyer (changed) bibtex.el
+Martin Boyer (changed) menu-bar.el
+Martin Buchholz (changed) etags.c
+Martin Larose (changed) message.el
+Martin Lorentzon (changed) vc-hooks.el
+Martin Lorentzon (changed) vc.el
+Martin Lorentzson (changed) vc-cvs.el
+Martin Lorentzson (changed) vc-hooks.el
+Martin Lorentzson (changed) vc-rcs.el
+Martin Lorentzson (changed) vc-sccs.el
+Martin Lorentzson (changed) vc.el
+Martin Neitzel (changed) sc.el
+Martin Stjernholm (changed) [more than 20 files]
+Martin Stjernholm (wrote) cc-bytecomp.el
+Masahiko Sato (wrote) vip.el
+Masanobu Umeda (changed) gnuspost.el
+Masanobu Umeda (wrote) gnus-kill.el
+Masanobu Umeda (wrote) gnus-mh.el
+Masanobu Umeda (wrote) gnus-msg.el
+Masanobu Umeda (wrote) gnus.el
+Masanobu Umeda (wrote) metamail.el
+Masanobu Umeda (wrote) nnheader.el
+Masanobu Umeda (wrote) nnspool.el
+Masanobu Umeda (wrote) prolog.el
+Masanobu Umeda (wrote) rmailsort.el
+Masanobu Umeda (wrote) tcp.el
+Masanobu Umeda (wrote) timezone.el
+Masatake Yamato (changed) bookmark.el
+Masatake Yamato (changed) cus-face.el
+Masatake Yamato (changed) faces.el
+Masatake Yamato (changed) page-ext.el
+Masayuki Ataka (changed) texinfmt.el
+Matt Pharr (changed) gnus-group.el
+Matt Pharr (changed) gnus-msg.el
+Matt Pharr (changed) message.el
+Matt Simmons (changed) message.el
+Matt Swift (changed) gnus-group.el
+Matt Swift (changed) gnus-uu.el
+Matthew Swift (changed) simple.el
+Matthias Andree (changed) imap.el
+Matthieu Devin (wrote) delsel.el
+Max Froumentin (changed) gnus-score.el
+Michael Ben-Gershon (changed) acorn.h
+Michael Ben-Gershon (changed) configure.in
+Michael Ben-Gershon (changed) riscix1-1.h
+Michael Ben-Gershon (changed) riscix1-2.h
+Michael Ben-Gershon (changed) unexec.c
+Michael Cook (changed) gnus-art.el
+Michael Cook (changed) gnus-cite.el
+Michael D. Ernst (changed) [more than 20 files]
+Michael D. Ernst (wrote) reposition.el
+Michael D. Prange (changed) tex-mode.el
+Michael D. Prange (wrote) fortran.el
+Michael Gschwind (wrote) iso-cvt.el
+Michael Gschwind (wrote) latin-2.el
+Michael I. Bushnell (changed) callproc.c
+Michael I. Bushnell (changed) gnu.h
+Michael I. Bushnell (changed) gnus.el
+Michael I. Bushnell (changed) lread.c
+Michael I. Bushnell (changed) process.c
+Michael I. Bushnell (changed) rmail.el
+Michael I. Bushnell (changed) screen.el
+Michael I. Bushnell (changed) search.c
+Michael I. Bushnell (changed) sendmail.el
+Michael I. Bushnell (changed) simple.el
+Michael I. Bushnell (changed) startup.el
+Michael I. Bushnell (changed) timer.c
+Michael K. Johnson (changed) configure.in
+Michael K. Johnson (changed) emacs.c
+Michael K. Johnson (changed) intel386.h
+Michael K. Johnson (changed) linux.h
+Michael K. Johnson (changed) mem-limits.h
+Michael K. Johnson (changed) process.c
+Michael K. Johnson (changed) sysdep.c
+Michael K. Johnson (changed) syssignal.h
+Michael K. Johnson (changed) systty.h
+Michael K. Johnson (changed) template.h
+Michael K. Johnson (changed) unexec.c
+Michael K. Johnson (changed) ymakefile
+Michael Kifer (changed) [more than 20 files]
+Michael Kifer (wrote) cal-x.el
+Michael Kifer (wrote) ediff-diff.el
+Michael Kifer (wrote) ediff-help.el
+Michael Kifer (wrote) ediff-hook.el
+Michael Kifer (wrote) ediff-init.el
+Michael Kifer (wrote) ediff-merg.el
+Michael Kifer (wrote) ediff-mult.el
+Michael Kifer (wrote) ediff-ptch.el
+Michael Kifer (wrote) ediff-util.el
+Michael Kifer (wrote) ediff-vers.el
+Michael Kifer (wrote) ediff-wind.el
+Michael Kifer (wrote) ediff.el
+Michael Kifer (wrote) viper-cmd.el
+Michael Kifer (wrote) viper-ex.el
+Michael Kifer (wrote) viper-init.el
+Michael Kifer (wrote) viper-keym.el
+Michael Kifer (wrote) viper-macs.el
+Michael Kifer (wrote) viper-mous.el
+Michael Kifer (wrote) viper-util.el
+Michael Kifer (wrote) viper.el
+Michael R. Cook (changed) gnus-art.el
+Michael R. Cook (changed) gnus-sum.el
+Michael R. Cook (changed) gnus-topic.el
+Michael Schmidt (wrote) modula2.el
+Michael Shields (changed) Makefile.in.in
+Michael Shields (changed) intel386.h
+Michael Sperber [Mr. Preprocessor] (changed) aix3-1.h
+Michael Sperber [Mr. Preprocessor] (changed) aix4-2.h
+Michael Staats (wrote) pc-select.el
+Michael Welsh Duggan (changed) gnus-art.el
+Michael Welsh Duggan (changed) gnus-start.el
+Michael Welsh Duggan (changed) keyboard.c
+Michael Welsh Duggan (changed) lisp.h
+Michael Welsh Duggan (changed) termhooks.h
+Michael Welsh Duggan (changed) w32-win.el
+Michael Welsh Duggan (changed) w32fns.c
+Michael Welsh Duggan (changed) w32menu.c
+Michael Welsh Duggan (changed) w32term.c
+Michael Welsh Duggan (changed) w32term.h
+Michal Jankowski (changed) insdel.c
+Michal Jankowski (changed) keyboard.c
+Michelangelo Grigni (changed) gnus-score.el
+Michelangelo Grigni (wrote) ffap.el
+Mikael Djurfeldt (changed) xdisp.c
+Mike Fabian (changed) gnus-group.el
+Mike Haertel (changed) m-7300.h
+Mike Long (changed) b2m.c
+Mike Long (changed) make-dist
+Mike Long (changed) make-mode.el
+Mike Long (changed) netbsd.h
+Mike Long (changed) view.el
+Mike Long (changed) vms.h
+Mike Mcewan (changed) gnus-agent.el
+Mike Mcewan (changed) gnus-art.el
+Mike Mcewan (changed) gnus-score.el
+Mike Mcewan (changed) gnus-sum.el
+Mike Mcewan (changed) gnus.texi
+Mike Mcewan (changed) mml.el
+Mike Newton (changed) bibtex.el
+Mike Rowan (changed) alloc.c
+Mike Rowan (changed) dispnew.c
+Mike Rowan (changed) keyboard.c
+Mike Rowan (changed) process.
+Mike Rowan (changed) process.c
+Mike Rowan (changed) sysdep.c
+Mike Rowan (changed) xdisp.c
+Mike Williams (wrote) mouse-sel.el
+Mike Williams (wrote) thingatpt.el
+Mikio Nakajima (changed) viper-util.el
+Milan Zamazal (changed) abbrev.el
+Milan Zamazal (changed) compile.el
+Milan Zamazal (changed) filecache.el
+Milan Zamazal (changed) slovak.el
+Milan Zamazal (wrote) czech.el
+Milan Zamazal (wrote) glasses.el
+Milan Zamazal (wrote) tildify.el
+Miles Bader (changed) [more than 20 files]
+Miles Bader (wrote) image-file.el
+Miles Bader (wrote) minibuf-eldef.el
+Miyashita Hisashi (changed) ccl.c
+Miyashita Hisashi (changed) charset.c
+Miyashita Hisashi (changed) coding.c
+Miyashita Hisashi (changed) coding.h
+Miyashita Hisashi (changed) mule-cmds.el
+Miyashita Hisashi (changed) mule-conf.el
+Miyashita Hisashi (changed) mule.el
+Miyashita Hisashi (changed) pop3.el
+Morioka Tomohiko (changed) fns.c
+Morioka Tomohiko (changed) message.el
+Morioka Tomohiko (changed) nnheader.el
+Morioka Tomohiko (changed) nnmail.el
+Morioka Tomohiko (changed) rmail.el
+Morioka Tomohiko (changed) rmailkwd.el
+Morioka Tomohiko (changed) rmailout.el
+Morioka Tomohiko (changed) rmailsum.el
+Morioka Tomohiko (changed) smiley.el
+Morten Welinder (changed) [more than 20 files]
+Morten Welinder (wrote) [many MSDOS files]
+Morten Welinder (wrote) arc-mode.el
+Morten Welinder (wrote) desktop.el
+Morten Welinder (wrote) dosfns.c
+Morten Welinder (wrote) internal.el
+Morten Welinder (wrote) msdos.h
+Morten Welinder (wrote) pc-win.el
+Morten Welinder (wrote) s-region.el
+Mosur Mohan (changed) etags.c
+Motorola (changed) buff-menu.el
+Mukesh Prasad (wrote) vmsproc.el
+Murata Shuuichirou (changed) coding.c
+Nachum Dershowitz (wrote) cal-hebrew.el
+Naoto Takahashi (changed) ethio-util.el
+Naoto Takahashi (changed) ethiopic.el
+Naoto Takahashi (changed) fontset.el
+Naoto Takahashi (changed) latin-post.el
+Naoto Takahashi (changed) mule-conf.el
+Naoto Takahashi (changed) quail.el
+NeXT, Inc. (wrote) unexnext.c
+Neal Ziring (wrote) vi.el
+Neil Crellin (changed) mail-source.el
+Neil Mager (wrote) appt.el
+Neil W. Van Dyke (wrote) webjump.el
+Nelson Jose Dos Santos Ferreira (changed) nnsoup.el
+Niall Mansfield (changed) etags.c
+Nico Francois (changed) ntinevt.c
+Nico Francois (changed) w32fns.c
+Nico Francois (changed) w32menu.c
+Noah Friedman (changed) [more than 20 files]
+Noah Friedman (wrote) eldoc.el
+Noah Friedman (wrote) rlogin.el
+Noah Friedman (wrote) rsz-mini.el
+Noah Friedman (wrote) type-break.el
+Nobuyuki Hikichi (changed) news-risc.h
+Odd Gripenstam (wrote) dcl-mode.el
+Olaf Sylvester (wrote) bs.el
+Oleg S. Tihonov (changed) cyrillic.el
+Oleg S. Tihonov (changed) gnus-sum.el
+Oleg S. Tihonov (changed) ispell.el
+Oleg S. Tihonov (changed) map-ynp.el
+Oleg S. Tihonov (changed) subr.el
+Olin Shivers (wrote) cmuscheme.el
+Olin Shivers (wrote) comint.el
+Olin Shivers (wrote) inf-lisp.el
+Olin Shivers (wrote) shell.el
+Oliver Seidel (wrote) todo-mode.el
+Olivier Laurens (changed) forms.el
+Olivier Lecarme (changed) ange-ftp.el
+Olivier Lecarme (changed) apropos.el
+Olivier Lecarme (changed) bibtex.el
+Olivier Lecarme (changed) cpp.el
+Olivier Lecarme (changed) facemenu.el
+Olivier Lecarme (changed) forms.el
+Olivier Lecarme (changed) hscroll.el
+Olivier Lecarme (changed) indent.el
+Olivier Lecarme (changed) make-mode.el
+Olivier Lecarme (changed) nroff-mode.el
+Olivier Lecarme (changed) paragraphs.el
+Olivier Lecarme (changed) server.el
+Olivier Lecarme (changed) sort.el
+Oscar Figueiredo (changed) ph.el
+Oscar Figueiredo (wrote) eudc-bob.el
+Oscar Figueiredo (wrote) eudc-export.el
+Oscar Figueiredo (wrote) eudc-hotlist.el
+Oscar Figueiredo (wrote) eudc-vars.el
+Oscar Figueiredo (wrote) eudc.el
+Oscar Figueiredo (wrote) eudcb-bbdb.el
+Oscar Figueiredo (wrote) eudcb-ldap.el
+Oscar Figueiredo (wrote) eudcb-ph.el
+Oscar Figueiredo (wrote) ldap.el
+P. E. Jareth Hein (changed) gnus-util.el
+Pace Willisson (wrote) ispell.el
+Paul D. Smith (changed) imenu.el
+Paul D. Smith (changed) make-mode.el
+Paul D. Smith (wrote) snmp-mode.el
+Paul Eggert (changed) [more than 20 files]
+Paul Eggert (wrote) cal-dst.el
+Paul Eggert (wrote) rcs2log
+Paul Eggert (wrote) vcdiff
+Paul Fisher (changed) fns.c
+Paul Fisher (changed) mm-decode.el
+Paul Franklin (changed) message.el
+Paul Franklin (changed) nnmail.el
+Paul Hilfinger (changed) fill.el
+Paul Reilly (changed) Makefile.in
+Paul Reilly (changed) configure.in
+Paul Reilly (changed) dgux.h
+Paul Reilly (changed) dgux5-4R2.h
+Paul Reilly (changed) dgux5-4R3.h
+Paul Reilly (changed) keyboard.c
+Paul Reilly (changed) lwlib-Xaw.c
+Paul Reilly (changed) lwlib-Xm.c
+Paul Reilly (changed) lwlib-Xm.h
+Paul Reilly (changed) lwlib-int.h
+Paul Reilly (changed) lwlib.c
+Paul Reilly (changed) lwlib.h
+Paul Reilly (changed) process.c
+Paul Reilly (changed) widget.c
+Paul Reilly (changed) widget.h
+Paul Reilly (changed) xfns.c
+Paul Reilly (changed) xlwmenu.c
+Paul Reilly (changed) xlwmenu.h
+Paul Reilly (changed) xmenu.c
+Paul Reilly (changed) xterm.c
+Paul Reilly (wrote) dgux5-4r3.h
+Paul Reilly (wrote) gux5-4r2.h
+Paul Rubin (changed) config.h
+Paul Rubin (changed) m-sun2.h
+Paul Rubin (changed) texinfmt.el
+Paul Rubin (changed) window.c
+Paul Stevenson (changed) gnus-sum.el
+Paul Stodghill (changed) gnus-agent.el
+Paul Stodghill (changed) gnus-msg.el
+Paul Stodghill (changed) message.el
+Paul Stodghill (changed) nnimap.el
+Pavel Janik Ml. (changed) gnus-draft.el
+Pavel Jan,Am(Bk (changed) levents.el
+Pavel Jan,Am(Bk (changed) lucid.el
+Pavel Jan,Am(Bk (changed) macterm.c
+Pavel Jan,Am(Bk (changed) mm-util.el
+Pavel Jan,Am(Bk (changed) pp.el
+Pavel Jan,Am(Bk (changed) uncompress.el
+Pavel Jan,Am(Bk (changed) uniquify.el
+Pavel Jan,Am(Bk (changed) vc.el
+Pavel Jan,Am(Bk (changed) view.el
+Pavel Jan,Am(Bk (changed) w32-fns.el
+Pavel Jan,Am(Bk (changed) window.el
+Pavel Jan,Bm(Bk (changed) [more than 20 files]
+Pavel Jan,Bm(Bk Ml. (changed) slovak.el
+Per Abhiddenware (wrote) gnus-cite.el
+Per Abrahamsen (changed) [more than 20 files]
+Per Abrahamsen (wrote) cpp.el
+Per Abrahamsen (wrote) cus-dep.el
+Per Abrahamsen (wrote) cus-edit.el
+Per Abrahamsen (wrote) cus-face.el
+Per Abrahamsen (wrote) cus-start.el
+Per Abrahamsen (wrote) custom.el
+Per Abrahamsen (wrote) double.el
+Per Abrahamsen (wrote) gnus-cus.el
+Per Abrahamsen (wrote) gnus-score.el
+Per Abrahamsen (wrote) gnus-soup.el
+Per Abrahamsen (wrote) wid-browse.el
+Per Abrahamsen (wrote) wid-edit.el
+Per Abrahamsen (wrote) widget.el
+Per Abrahamsen (wrote) xt-mouse.el
+Per Bothner (changed) iso-acc.el
+Per Bothner (changed) process.c
+Per Bothner (changed) sysdep.c
+Per Bothner (wrote) term.el
+Per Cederqvist (changed) forms.el
+Per Cederqvist (changed) hexl.el
+Per Cederqvist (changed) vc-hooks.el
+Per Cederqvist (changed) vc.el
+Per Cederqvist (wrote) ewoc.el
+Per Persson (wrote) gnus-vm.el
+Per Starback (changed) apropos.el
+Per Starback (changed) bytecomp.el
+Per Starback (changed) characters.el
+Per Starback (changed) charset.h
+Per Starback (changed) coding.c
+Per Starback (changed) dired.el
+Per Starback (changed) doctor.el
+Per Starback (changed) emacs.c
+Per Starback (changed) european.el
+Per Starback (changed) gnus-start.el
+Per Starback (changed) iso-transl.el
+Per Starback (changed) ispell.el
+Per Starback (changed) replace.el
+Per Starback (changed) startup.el
+Per Starback (changed) vc.el
+Per Starback (changed) xdisp.c
+Pete Ware (changed) message.el
+Pete Ware (wrote) auto-show.el
+Peter Breton (wrote) dirtrack.el
+Peter Breton (wrote) filecache.el
+Peter Breton (wrote) find-lisp.el
+Peter Breton (wrote) generic-x.el
+Peter Breton (wrote) generic.el
+Peter Breton (wrote) locate.el
+Peter Breton (wrote) net-utils.el
+Peter Galbraith (changed) simple.el
+Peter Kleiweg (wrote) ps-mode.el
+Peter Liljenberg (wrote) elint.el
+Peter S Galbraith (changed) goto-addr.el
+Peter S Galbraith (changed) info-look.el
+Peter Stephenson (wrote) vcursor.el
+Peter Von Der Ahe (changed) gnus-sum.el
+Peter Von Der Ahe (changed) message.el
+Petersen Jens-Ulrik (changed) gnus-start.el
+Petri Kaurinkoski (changed) configure.in
+Petri Kaurinkoski (changed) iris4d.h
+Petri Kaurinkoski (changed) irix6-0.h
+Petri Kaurinkoski (changed) irix6-5.h
+Petri Kaurinkoski (changed) usg5-4.h
+Philippe Schnoebelen (wrote) gomoku.el
+Philippe Schnoebelen (wrote) mpuz.el
+Philippe Waroquiers (changed) etags.el
+Piet Van Oostrum (changed) smtpmail.el
+Puneet Goel (changed) message.el
+Rainer Schoepf (changed) alloc.c
+Rainer Schoepf (changed) buffer.c
+Rainer Schoepf (changed) callint.c
+Rainer Schoepf (changed) data.c
+Rainer Schoepf (changed) dispextern.h
+Rainer Schoepf (changed) doc.c
+Rainer Schoepf (changed) editfns.c
+Rainer Schoepf (changed) floatfns.c
+Rainer Schoepf (changed) frame.h
+Rainer Schoepf (changed) lisp.h
+Rainer Schoepf (changed) lread.c
+Rainer Schoepf (changed) marker.c
+Rainer Schoepf (changed) mem-limits.h
+Rainer Schoepf (changed) osf1.h
+Rainer Schoepf (changed) print.c
+Rainer Schoepf (changed) puresize.h
+Rainer Schoepf (changed) window.h
+Rainer Schoepf (changed) xdisp.c
+Rainer Schoepf (changed) xterm.h
+Rainer Schoepf (wrote) alpha.h
+Rainer Schoepf (wrote) unexalpha.c
+Rajappa Iyer (changed) gnus-salt.el
+Rajesh Vaidheeswarran (wrote) whitespace.el
+Ralf Fassel (changed) dabbrev.el
+Ralf Fassel (changed) files.el
+Ralf Fassel (changed) fill.el
+Ralf Fassel (changed) iso-acc.el
+Ralf Fassel (changed) tar-mode.el
+Ralph Schleicher (changed) libc.el
+Ralph Schleicher (wrote) battery.el
+Ralph Schleicher (wrote) info-look.el
+Randal Schwartz (wrote) pp.el
+Randall Smith (changed) dired.el
+Raul Acevedo (changed) info.el
+Raul Acevedo (changed) options.el
+Ray Blaak (wrote) delphi.el
+Remek Trzaska (changed) gnus-ems.el
+Renaud Rioboo (changed) gnus-demon.el
+Renaud Rioboo (changed) nnmail.el
+Reto Zimmermann (changed) vhdl-mode.el
+Richard Hoskins (changed) message.el
+Richard King (wrote) backquote.el
+Richard King (wrote) filelock.c
+Richard King (wrote) 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 (changed) [more than 20 files]
+Richard M. Stallman (wrote) easymenu.el
+Richard M. Stallman (wrote) font-lock.el
+Richard M. Stallman (wrote) menu-bar.el
+Richard M. Stallman (wrote) paren.el
+Richard Mlynarik (changed) [more than 20 files]
+Richard Mlynarik (wrote) cl-indent.el
+Richard Mlynarik (wrote) ebuff-menu.el
+Richard Mlynarik (wrote) ehelp.el
+Richard Mlynarik (wrote) env.c
+Richard Mlynarik (wrote) rfc822.el
+Richard Mlynarik (wrote) terminal.el
+Richard Mlynarik (wrote) yow.el
+Richard Sharman (changed) ediff-init.el
+Richard Sharman (changed) regexp-opt.el
+Richard Sharman (changed) sh-script.el
+Richard Sharman (changed) simple.el
+Richard Sharman (wrote) hilit-chg.el
+Rick Farnbach (wrote) morse.el
+Rick Sladkey (changed) gud.el
+Rick Sladkey (changed) intervals.c
+Rick Sladkey (changed) intervals.h
+Rick Sladkey (changed) simple.el
+Rick Sladkey (wrote) backquote.el
+Rob Riepel (changed) tpu-doc.el
+Rob Riepel (wrote) tpu-edt.el
+Rob Riepel (wrote) tpu-extras.el
+Rob Riepel (wrote) tpu-mapper.el
+Rob Riepel (wrote) vt-control.el
+Robert Bihlmeyer (changed) gnus-art.el
+Robert Bihlmeyer (changed) gnus-score.el
+Robert Bihlmeyer (changed) gnus-util.el
+Robert Bihlmeyer (changed) message.el
+Robert Bihlmeyer (changed) mm-view.el
+Robert Bihlmeyer (changed) mml.el
+Robert J. Chassell (changed) [more than 20 files]
+Robert J. Chassell (wrote) makeinfo.el
+Robert J. Chassell (wrote) texinfo.el
+Robert J. Chassell (wrote) texnfo-upd.el
+Robert Pluim (changed) mm-util.el
+Robin S. Socha (changed) message.el
+Rod Whitby (changed) gnus-sum.el
+Rod Whitby (changed) nnmail.el
+Rod Whitby (changed) nnml.el
+Roderick Schertler (changed) dgux.h
+Roderick Schertler (changed) dgux4.h
+Roderick Schertler (changed) gud.el
+Roderick Schertler (changed) sysdep.c
+Roger Breitenstein (changed) smtpmail.el
+Roland B Roberts (changed) buffer.h
+Roland B Roberts (changed) build.com
+Roland B Roberts (changed) callproc.c
+Roland B Roberts (changed) compile.com
+Roland B Roberts (changed) dired.c
+Roland B Roberts (changed) files.el
+Roland B Roberts (changed) kepteditor.com
+Roland B Roberts (changed) precomp.com
+Roland B Roberts (changed) process.c
+Roland B Roberts (changed) sort.el
+Roland B Roberts (changed) sysdep.c
+Roland B Roberts (changed) systty.h
+Roland B Roberts (changed) vmspaths.h
+Roland B Roberts (changed) vmsproc.el
+Roland B Roberts (wrote) logout.com
+Roland B Roberts (wrote) mailemacs.com
+Roland B. Roberts (changed) gnus-group.el
+Roland B. Roberts (changed) gnus-sum.el
+Roland B. Roberts (wrote) vms-pmail.el
+Roland Mcgrath (changed) [more than 20 files]
+Roland Mcgrath (wrote) autoload.el
+Roland Mcgrath (wrote) compile.el
+Roland Mcgrath (wrote) etags.el
+Roland Mcgrath (wrote) find-dired.el
+Roland Mcgrath (wrote) map-ynp.el
+Rolf Ebert (changed) files.el
+Rolf Ebert (changed) find-file.el
+Rolf Ebert (wrote) ada-mode.el
+Roman Belenov (changed) which-func.el
+Ron Schnell (wrote) dunnet.el
+Ronan Waide (changed) smtpmail.el
+Roth@Klondike.Cse.Ucsc.Edu (changed) gnus-nocem.el
+Rui Zhu (changed) gnus-art.el
+Rui Zhu (changed) gnus-sum.el
+Rui-Tao Dong ~{6-Hpln~} (changed) nnweb.el
+Rupa Schomaker (changed) gnus-msg.el
+Rupa Schomaker (changed) message.el
+Russ Allbery (changed) message.el
+Ryszard Kubiak (changed) ogonek.el
+Sam Dooley (changed) keyboard.c
+Sam Falkner (changed) nntp.el
+Sam Kendall (changed) etags.c
+Sam Kendall (changed) etags.el
+Sam Steingold (changed) [more than 20 files]
+Sam Steingold (wrote) gulp.el
+Sam Steingold (wrote) midnight.el
+Schlumberger Technology Corporation (changed) gud.el
+Scott Byer (changed) gnus-sum.el
+Scott Byer (wrote) nnfolder.el
+Scott Draves (wrote) tq.el
+Scott Hofmann (changed) nntp.el
+Scott M. Meyers (changed) cmacexp.el
+Sebastian Kremer (changed) add-log.el
+Sebastian Kremer (wrote) dired-aux.el
+Sebastian Kremer (wrote) dired-x.el
+Sebastian Kremer (wrote) dired.el
+Sebastian Kremer (wrote) ls-lisp.el
+Sen Nagata (wrote) crm.el
+Sen Nagata (wrote) rfc2368.el
+Seokchan Lee (changed) message.el
+Seokchan Lee (changed) mm-bodies.el
+Shawn M. Carey (wrote) freebsd.h
+Shenghuo Zhu (changed) [more than 20 files]
+Shenghuo Zhu (wrote) binhex.el
+Shenghuo Zhu (wrote) mm-partial.el
+Shenghuo Zhu (wrote) mm-uu.el
+Shenghuo Zhu (wrote) nnwarchive.el
+Shenghuo Zhu (wrote) rfc1843.el
+Shenghuo Zhu (wrote) uudecode.el
+Shenghuo Zhu (wrote) webmail.el
+Shinichirou Sugou (changed) etags.c
+Shuhei Kobayashi (changed) gnus-group.el
+Shuhei Kobayashi (changed) message.el
+Shuhei Kobayashi (changed) nnmail.el
+Sidney Markowitz (changed) doctor.el
+Sigbjorn Finne (changed) gnus-srvr.el
+Simon Josefsson (changed) [more than 20 files]
+Simon Josefsson (wrote) flow-fill.el
+Simon Josefsson (wrote) imap.el
+Simon Josefsson (wrote) nnimap.el
+Simon Josefsson (wrote) rfc2104.el
+Simon Leinen (changed) Makefile
+Simon Leinen (changed) Makefile.in
+Simon Leinen (changed) cm.c
+Simon Leinen (changed) cm.h
+Simon Leinen (changed) hpux9.h
+Simon Leinen (changed) indent.c
+Simon Leinen (changed) process.c
+Simon Leinen (changed) sc.texinfo
+Simon Leinen (changed) sgml-mode.el
+Simon Leinen (changed) smtpmail.el
+Simon Leinen (changed) term.c
+Simon Leinen (changed) xfns.c
+Simon Leinen (changed) xmenu.c
+Simon Leinen (changed) xterm.c
+Simon Marshall (changed) [more than 20 files]
+Simon Marshall (wrote) fast-lock.el
+Simon Marshall (wrote) lazy-lock.el
+Simon Marshall (wrote) regexp-opt.el
+Skip Collins (changed) w32fns.c
+Skip Collins (changed) w32term.c
+Skip Collins (changed) w32term.h
+Spencer Thomas (changed) dabbrev.el
+Spencer Thomas (changed) emacsclient.c
+Spencer Thomas (changed) emacsserver.c
+Spencer Thomas (changed) gnus.texi
+Spencer Thomas (changed) server.el
+Spencer Thomas (changed) tcp.c
+Spencer Thomas (changed) unexec.c
+Stainless Steel Rat (changed) gnus-sum.el
+Stainless Steel Rat (changed) pop3.el
+Stanislav Shalunov (changed) message.el
+Stanislav Shalunov (wrote) uce.el
+Stefan Monnier (changed) [more than 20 files]
+Stefan Monnier (wrote) cvs-status.el
+Stefan Monnier (wrote) diff-mode.el
+Stefan Monnier (wrote) log-edit.el
+Stefan Monnier (wrote) log-view.el
+Stefan Monnier (wrote) pcvs-defs.el
+Stefan Monnier (wrote) pcvs-info.el
+Stefan Monnier (wrote) pcvs-parse.el
+Stefan Monnier (wrote) pcvs-util.el
+Stefan Monnier (wrote) smerge-mode.el
+Stefan Schoef (wrote) bibtex.el
+Stefan Waldherr (changed) nnweb.el
+Steinar Bang (changed) nnweb.el
+Stephen A. Wood (changed) fortran.el
+Stephen Eglen (changed) [more than 20 files]
+Stephen Eglen (wrote) iswitchb.el
+Stephen Eglen (wrote) mspools.el
+Stephen Gildea (changed) files.el
+Stephen Gildea (changed) fortran.el
+Stephen Gildea (changed) mh-comp.el
+Stephen Gildea (changed) mh-e.el
+Stephen Gildea (changed) mh-e.texi
+Stephen Gildea (changed) mh-mime.el
+Stephen Gildea (changed) mh-utils.el
+Stephen Gildea (changed) tex-mode.el
+Stephen Gildea (changed) time-stamp.el
+Stephen Gildea (wrote) mh-funcs.el
+Stephen Gildea (wrote) mh-pick.el
+Stephen Gildea (wrote) refcard.tex
+Steve Fisk (wrote) cal-tex.el
+Steve Nygard (changed) unexnext.c
+Steve Strassman (wrote) spook.el
+Steven L. Baur (changed) add-log.el
+Steven L. Baur (changed) dgnushack.el
+Steven L. Baur (changed) edebug.el
+Steven L. Baur (changed) gnus-art.el
+Steven L. Baur (changed) gnus-ems.el
+Steven L. Baur (changed) gnus-msg.el
+Steven L. Baur (changed) gnus-picon.el
+Steven L. Baur (changed) gnus-start.el
+Steven L. Baur (changed) gnus-sum.el
+Steven L. Baur (changed) gnus-topic.el
+Steven L. Baur (changed) gnus-xmas.el
+Steven L. Baur (changed) message.el
+Steven L. Baur (changed) mm-decode.el
+Steven L. Baur (changed) mm-view.el
+Steven L. Baur (changed) nnbabyl.el
+Steven L. Baur (changed) nntp.el
+Steven L. Baur (changed) webjump.el
+Steven L. Baur (wrote) earcon.el
+Steven L. Baur (wrote) footnote.el
+Steven L. Baur (wrote) gnus-audio.el
+Steven L. Baur (wrote) gnus-setup.el
+Steven Suhr (changed) dispnew.c
+Steven Suhr (changed) scroll.c
+Steven Suhr (changed) term.c
+Steven Suhr (changed) termchar.h
+Stewart M. Clamen (wrote) cal-mayan.el
+Stig@Netcom.Com (changed) hilit19.el
+Sudish Joseph (changed) gnus.el
+Sun Microsystems, Inc (changed) emacsclient.c
+Sun Microsystems, Inc (changed) emacsserver.c
+Sun Microsystems, Inc (changed) server.el
+Sun Microsystems, Inc (wrote) emacs.icon
+Sun Microsystems, Inc (wrote) emacstool.1
+Sun Microsystems, Inc (wrote) emacstool.c
+Sun Microsystems, Inc (wrote) sun-curs.el
+Sun Microsystems, Inc (wrote) sun-fns.el
+Sun Microsystems, Inc (wrote) sun-mouse.el
+Sun Microsystems, Inc (wrote) sun.el
+Sun Microsystems, Inc (wrote) sunfns.c
+Sundar Narasimhan (changed) rnews.el
+Sundar Narasimhan (changed) rnewspost.el
+Sven Fischer (changed) mailcap.el
+Tak Ota (changed) w32bdf.c
+Takahashi Naoto (wrote) ethio-util.el
+Takahashi Naoto (wrote) ethiopic.el
+Takahashi Naoto (wrote) latin-alt.el
+Takahashi Naoto (wrote) latin-post.el
+Takahashi Naoto (wrote) utf-8.el
+Takeshi Yamada (changed) fns.c
+Tatsuya Ichikawa (changed) gnus-agent.el
+Tatsuya Ichikawa (changed) gnus-cache.el
+Tatsuya Ichikawa (changed) mail-source.el
+Tatsuya Ichikawa (changed) pop3.el
+Ted Lemon (changed) emacs.c
+Ted Lemon (changed) lastfile.c
+Ted Lemon (changed) puresize.h
+Terrence Brannon (wrote) landmark.el
+Terry Jones (wrote) shadow.el
+Theodore Jump (changed) makefile.def
+Theodore Jump (changed) makefile.nt
+Theodore Jump (changed) w32-win.el
+Theodore Jump (changed) w32faces.c
+Thien-Thi Nguyen (changed) battery.el
+Thien-Thi Nguyen (changed) compile.el
+Thien-Thi Nguyen (changed) desktop.el
+Thien-Thi Nguyen (changed) ediff-init.el
+Thien-Thi Nguyen (changed) programs.texi
+Thien-Thi Nguyen (changed) vc.el
+Thien-Thi Nguyen (changed) zone.el
+Thien-Thi Nguyen (wrote) hideshow.el
+Thierry Emery (changed) timezone.el
+Thierry Emery (changed) wid-edit.el
+Thomas Horsley (changed) cxux-crt0.s
+Thomas Horsley (changed) emacs.c
+Thomas Horsley (changed) nh3000.h
+Thomas Horsley (changed) nh4000.h
+Thomas Horsley (changed) sysdep.c
+Thomas Horsley (changed) xterm.c
+Thomas Horsley (wrote) cxux.h
+Thomas Horsley (wrote) cxux7.h
+Thomas Neumann (changed) makefile.el
+Thomas Neumann (wrote) make-mode.el
+Thomas Wurgler (changed) emacs-lock.el
+Thor Kristoffersen (changed) nntp.el
+Thorsten Ohl (changed) lread.c
+Thorsten Ohl (changed) next.h
+Tim Fleehart (wrote) makefile.nt
+Toby Speight (changed) mm-view.el
+Toby Speight (changed) window.el
+Tom Breton (changed) autoinsert.el
+Tom Breton (changed) gnus-agent.el
+Tom Breton (changed) lread.c
+Tom Hageman (changed) etags.c
+Tom Houlder (wrote) mantemp.el
+Tom Tromey (changed) add-log.el
+Tom Tromey (changed) buff-menu.el
+Tom Tromey (changed) buffer.c
+Tom Tromey (changed) doc.c
+Tom Tromey (changed) info.el
+Tom Tromey (changed) make-mode.el
+Tom Tromey (changed) makefile.el
+Tom Tromey (changed) man.el
+Tom Tromey (changed) replace.el
+Tom Tromey (changed) xfns.c
+Tom Tromey (changed) xterm.c
+Tom Tromey (changed) xterm.h
+Tom Tromey (wrote) tcl.el
+Tom Wurgler (wrote) emacs-lock.el
+Tomas Abrahamsson (wrote) artist.el
+Tomohiko Morioka (changed) coding.c
+Tomohiko Morioka (changed) gnus-art.el
+Tomohiko Morioka (changed) gnus-ems.el
+Tomohiko Morioka (changed) gnus-mule.el
+Tomohiko Morioka (changed) gnus-sum.el
+Tomohiko Morioka (changed) nnfolder.el
+Tomohiko Morioka (changed) nnheader.el
+Tomohiko Morioka (changed) nnmail.el
+Tomohiko Morioka (changed) nnmh.el
+Tomohiko Morioka (changed) nnml.el
+Tomohiko Morioka (changed) nnspool.el
+Tomohiko Morioka (changed) nntp.el
+Tomoji Kagatani (wrote) smtpmail.el
+Torbj\"Orn Einarsson (wrote) f90.el
+Torbjorn Einarsson (changed) f90.el
+Torbjvrn Axelsson (changed) options.el
+Torbj|Rn Einarsson (changed) f90.el
+Toru Tomabechi, (wrote) tibet-util.el
+Toru Tomabechi, (wrote) tibetan.el
+Toshiaki Nomura (changed) uxpds.h
+Tozawa Akihiko (changed) nndoc.el
+Trung Tran-Duc (changed) nntp.el
+Tsugutomo Enami (changed) nnheader.el
+Tsugutomo Enami (changed) regex.c
+Tsugutomo Enami (changed) regex.h
+Tudor Hulubei (changed) iso-acc.el
+Tudor Hulubei (changed) latin-pre.el
+Ulrich Leodolter (changed) ntproc.c
+Ulrich Mueller (changed) case-table.el
+Ulrich Mueller (changed) fortran.el
+Ulrich Mueller (changed) gud.el
+Ulrich Mueller (changed) iso-acc.el
+Ulrich Mueller (changed) sysdep.c
+Ulrik Vieth (changed) files.el
+Ulrik Vieth (wrote) meta-mode.el
+Urban Engberg (changed) gnus-demon.el
+Valery Alexeev (changed) cyril-util.el
+Valery Alexeev (changed) cyrillic.el
+Victor S. Miller (changed) webmail.el
+Victor Zandy (wrote) zone.el
+Viktor Dukhovni (wrote) unexsunos4.c
+Vince Del Vecchio (changed) mh-utils.el
+Vincent Del Vecchio (changed) info.el
+Vinicius Jose Latorre (changed) lpr.el
+Vinicius Jose Latorre (changed) ps-bdf.el
+Vinicius Jose Latorre (changed) ps-prin0.ps
+Vinicius Jose Latorre (changed) ps-prin1.ps
+Vinicius Jose Latorre (changed) ps-prin2.ps
+Vinicius Jose Latorre (changed) ps-prin3.ps
+Vinicius Jose Latorre (changed) ps-print-def.el
+Vinicius Jose Latorre (changed) ps-print0.ps
+Vinicius Jose Latorre (changed) ps-vars.el
+Vinicius Jose Latorre (wrote) delim-col.el
+Vinicius Jose Latorre (wrote) ebnf-bnf.el
+Vinicius Jose Latorre (wrote) ebnf-iso.el
+Vinicius Jose Latorre (wrote) ebnf-otz.el
+Vinicius Jose Latorre (wrote) ebnf-yac.el
+Vinicius Jose Latorre (wrote) ebnf2ps.el
+Vinicius Jose Latorre (wrote) ps-mule.el
+Vinicius Jose Latorre (wrote) ps-print.el
+Vladimir Alexiev (changed) arc-mode.el
+Vladimir Alexiev (changed) nnvirtual.el
+Vladimir Alexiev (changed) tmm.el
+Vladimir Volovich (changed) message.el
+Vladimir Volovich (changed) mm-bodies.el
+Wayne Mesard (wrote) hscroll.el
+Werner Benger (changed) keyboard.c
+Werner Lemberg (changed) fill.el
+Wes Hardaker (changed) gnus-art.el
+Wes Hardaker (changed) gnus-score.el
+Wes Hardaker (changed) gnus-win.el
+Will Mengarini (wrote) repeat.el
+William F. Mann (wrote) perl-mode.el
+William F. Schelter (wrote) telnet.el
+William M. Perry (changed) image.el
+William M. Perry (changed) mail-source.el
+William M. Perry (changed) mm-view.el
+William M. Perry (changed) mwheel.el
+William M. Perry (changed) xfns.c
+William M. Perry (wrote) mailcap.el
+William Sommerfeld (wrote) emacsclient.c
+William Sommerfeld (wrote) emacsserver.c
+William Sommerfeld (wrote) scribe.el
+William Sommerfeld (wrote) server.el
+Wilson H. Tien (changed) unexelf.c
+Wjcarpenter (changed) feedmail.el
+Wlodzimierz Bzyl (changed) latin-pre.el
+Wlodzimierz Bzyl (changed) refcard-pl.ps
+Wlodzimierz Bzyl (changed) refcard-pl.tex
+Wlodzimierz Bzyl (changed) survival.tex
+Wolfgang Glas (changed) unexsgi.c
+Wolfgang Rupprecht (changed) alloc.c
+Wolfgang Rupprecht (changed) callint.c
+Wolfgang Rupprecht (changed) config.h.in
+Wolfgang Rupprecht (changed) config.in
+Wolfgang Rupprecht (changed) configure.in
+Wolfgang Rupprecht (changed) crt0.c
+Wolfgang Rupprecht (changed) data.c
+Wolfgang Rupprecht (changed) fns.c
+Wolfgang Rupprecht (changed) lisp-mode.el
+Wolfgang Rupprecht (changed) lisp.h
+Wolfgang Rupprecht (changed) loadup.el
+Wolfgang Rupprecht (changed) lread.c
+Wolfgang Rupprecht (changed) net-utils.el
+Wolfgang Rupprecht (changed) nntp.el
+Wolfgang Rupprecht (changed) print.c
+Wolfgang Rupprecht (changed) process.c
+Wolfgang Rupprecht (changed) sort.el
+Wolfgang Rupprecht (changed) sun3.h
+Wolfgang Rupprecht (changed) ymakefile
+Wolfgang Rupprecht (wrote) float-sup.el
+Wolfgang Rupprecht (wrote) floatfns.c
+Wolfgang Rupprecht (wrote) sup-mouse.el
+Wolfram Gloger (changed) emacs.c
+W{\L}Odek Bzyl, Ryszard Kubiak (wrote) ogonek.el
+Yamamoto Kouji (changed) nnmail.el
+Yamamoto Mitsuharu (changed) byte-opt.el
+Yann Dirson (changed) imenu.el
+Yoshiki Hayashi (changed) gnus-art.el
+Yoshiki Hayashi (changed) nnheader.el
+Yoshiki Hayashi (changed) nnvirtual.el
+Yoshiki Hayashi (changed) texinfmt.el
+Yutaka Niibe (changed) Makefile.in
+Yutaka Niibe (changed) config.in
+Yutaka Niibe (changed) configure.in
+Yutaka Niibe (changed) dired.el
+Yutaka Niibe (changed) dispnew.c
+Yutaka Niibe (changed) emacs.c
+Yutaka Niibe (changed) fill.el
+Yutaka Niibe (changed) fns.c
+Yutaka Niibe (changed) gmalloc.c
+Yutaka Niibe (changed) gnu-linux.h
+Yutaka Niibe (changed) indent.c
+Yutaka Niibe (changed) indent.h
+Yutaka Niibe (changed) process.c
+Yutaka Niibe (changed) simple.el
+Yutaka Niibe (changed) sysdep.c
+Yutaka Niibe (changed) term.c
+Yutaka Niibe (changed) window.c
+Yutaka Niibe (changed) xdisp.c
+Zhu Shenghuo (changed) gnus-art.el
+Zhu Shenghuo (changed) gnus-cus.el
+Zhu Shenghuo (changed) mm-decode.el
+
+Local Variables:
+coding: iso-2022-7bit
+End:
diff -ruN src-21.1/ChangeLog src-21.2/ChangeLog
--- src-21.1/ChangeLog	Sat Oct 20 18:16:09 2001
+++ src-21.2/ChangeLog	Sat Mar 16 11:42:52 2002
@@ -1,3 +1,71 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
+2002-03-15  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* configure.in: Support AIX 5.1.
+
+2002-02-22  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* make-dist: Fix the change from 2002-02-02.
+
+2002-02-18  Paul Eggert  <eggert@twinsun.com>
+
+	* make-dist: Port to POSIX 1003.1-2001, which doesn't allow "head -1".
+	"sed q" is a portable equivalent to plain "head -1".
+
+2002-02-02  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* make-dist: Remove the (empty) lisp/calc subdirectory after
+	linking.
+
+2002-01-28  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* configure.in: Recognize BSD/OS 5.0.
+
+2002-01-11  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* make-dist: Make version checking in emacs.texi consistent with
+	how we set it there.
+
+2001-11-07  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* AUTHORS: Regenerate.
+
+	* make-dist (tempdir): Copy AUTHORS as well.
+
+2001-11-01  Gerd Moellmann  <gerd@gnu.org>
+
+	* configure.in: Remove doubled `;;'.
+
+2001-11-01  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+	* configure.in: Reindent --help output.
+	From Per Starback (starback@ling.uu.se).
+
+2001-10-31  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* configure.in: New entry for HP/UX-11.
+
+	* Makefile.in (SOURCES): Replace GETTING.GNU.SOFTWARE with FTP.
+	From Eric S. Raymond <esr@golux.thyrsus.com>.
+
+2001-10-25  Gerd Moellmann  <gerd@gnu.org>
+
+	* Makefile.in (maybe_bootstrap): New target.
+	(all): Add to prerequisites to bootstrap if abbrev.elc doesn't
+	exist.
+
+2001-10-24  Gerd Moellmann  <gerd@gnu.org>
+
+	* configure.in: Use $MAKE for `make' if set.
+
+2001-10-22  Gerd Moellmann  <gerd@gnu.org>
+
+	* Makefile.in (install-arch-indep): Add -h (follow symlinks)
+	to tar options.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
@@ -5002,7 +5070,7 @@
 ;; coding: iso-2022-7bit-unix
 ;; End:
 
-    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
+    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002
 	Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff -ruN src-21.1/FTP src-21.2/FTP
--- src-21.1/FTP	Mon Nov 20 19:14:17 2000
+++ src-21.2/FTP	Sat Mar 16 11:34:37 2002
@@ -9,14 +9,14 @@
 any warranty.  No author or distributor of this software accepts
 responsibility to anyone for the consequences of using it or for
 whether it serves any particular purpose or works at all, unless he
-says so in writing. This is exactly the same warranty that the commercial
-software companies offer: None. If the distribution is incomplete or the
+says so in writing. This is exactly the same warranty that the proprietary
+software companies offer: None.  If the distribution is incomplete or the
 media fails, you can always download a replacement from any of the GNU
 mirrors, free of charge.
 
 * Updates
 
-A possibly more up-to-date list of GNU FTP sites is at
+You can always find the most recent version of this list of GNU FTP sites at
         http://www.gnu.org/order/ftp.html
 
 * How to FTP
@@ -37,17 +37,16 @@
 programs.  Some programs have misc support files as well.  Have a look
 on ftp.gnu.org to see which ones.  In most cases, the tar or diff
 files are compressed with the `gzip' program; this is indicated with
-the .gz suffix.
+the .gz suffix.  Binaries for gzip can be downloaded from
+http://www.gzip.org.
 
 Descriptions of GNU software are available at
 	http://www.gnu.org/software/software.html
+ and in the Free Software Directory at 
+        http://www.gnu.org/directory/index.html
 
 * Alternative Internet FTP Sources
 
-Please do NOT use a site outside your country, until you have checked
-all sites inside your country, and then your continent.  Trans-ocean
-TCP/IP links are very expensive and usually very low speed.
-
 The canonical GNU ftp site is located at ftp.gnu.org/gnu.
 You should probably use one of the many mirrors of that site - the
 mirrors will be less busy, and you can find one closer to your site.
@@ -57,123 +56,128 @@
 United States:
 
 
-California - labrea.stanford.edu/pub/gnu, gatekeeper.dec.com/pub/GNU, ftp.keystealth.org/pub/gnu
-Hawaii - ftp.hawaii.edu/mirrors/gnu
-Illinois - uiarchive.cso.uiuc.edu/pub/gnu (Internet address 128.174.5.14)
-Kentucky -  ftp.ms.uky.edu/pub/gnu
-Maryland - ftp.digex.net/pub/gnu (Internet address 164.109.10.23)
-Massachusetts - aeneas.mit.edu/pub/gnu
-Michigan - gnu.egr.msu.edu/pub/gnu
-Missouri - wuarchive.wustl.edu/systems/gnu
-New Mexico - ftp.cs.unm.edu/mirrors/gnu
-New York - ftp.cs.columbia.edu/archives/gnu/prep
-New York - ftp.stealth.net/pub/mirrors/ftp.gnu.org (Internet address 206.252.192.18)
-North Carolina - http://metalab.unc.edu/pub/gnu
-Ohio - ftp.cis.ohio-state.edu/mirror/gnu
-Pennsylvania - boron.club.cc.cmu.edu/gnu
-Tennessee - sunsite.utk.edu/pub/gnu/ftp
-Virginia - ftp.uu.net/archive/systems/gnu
-Washington - ftp.nodomainname.net/pub/mirrors/gnu
-Wisconsin - ftp.twtelecom.net/pub/GNU
+California - mirrors.kernel.org/gnu, http://mirrors.kernel.org/gnu
+California - gatekeeper.dec.com/pub/GNU/ 
+California - ftp.keystealth.org/pub/gnu/
+Illinois - uiarchive.cso.uiuc.edu/pub/ftp/ftp.gnu.org/gnu/
+Indiana - ftp.in-span.net/pub/mirrors/ftp.gnu.org/
+Kentucky - gnu.ms.uky.edu/pub/mirrors/gnu/
+Maryland - ftp.digex.net/pub/gnu/
+Massachusetts - aeneas.mit.edu/pub/gnu/
+Michigan - ftp.egr.msu.edu/pub/gnu/, http://ftp.egr.msu.edu/pub/gnu/
+Michigan - ftp.wayne.edu/gnu_mirror/
+Missouri - wuarchive.wustl.edu/systems/gnu/
+New Jersey - gnu.teleglobe.net/ftp.gnu.org/
+New York - ftp.cs.columbia.edu/archives/gnu/prep/
+New York - ftp.ece.cornell.edu/pub/mirrors/gnu/
+North Carolina - http://www.ibiblio.org/pub/gnu/
+Ohio - ftp.cis.ohio-state.edu/mirror/gnu/
+Pennsylvania - boron.club.cc.cmu.edu/gnu/
+Tennessee - sunsite.utk.edu/pub/gnu/ftp/, thales.memphis.edu/pub/gnu/
+Washington - ftp.nodomainname.net/pub/mirrors/gnu/, gnu.wwc.edu/
+Wisconsin - ftp.twtelecom.net/pub/GNU/
 
 Africa:
 
-South Africa - ftp.sun.ac.za/gnu
+South Africa - ftp.sun.ac.za/mirrorsites/ftp.gnu.org/pub/gnu
 
 The Americas:
 
-Brazil - ftp.unicamp.br/pub/gnu
-Brazil - master.softaplic.com.br/pub/gnu
-Brazil - ftp.matrix.com.br/pub/gnu
-Canada - ftp.cs.ubc.ca/mirror2/gnu
-Chile - ftp.inf.utfsm.cl/pub/gnu (Internet address 146.83.198.3)
-Costa Rica - sunsite.ulatina.ac.cr/Mirrors/GNU
-Mexico - ftp.uaem.mx/pub/gnu
+Brazil - ftp.unicamp.br/pub/gnu/
+Brazil - master.softaplic.com.br/pub/gnu/
+Brazil - ftp.matrix.com.br/pub/gnu/
+Canada - ftp.cs.ubc.ca/mirror2/gnu/
+Chile - ftp.inf.utfsm.cl/pub/gnu/
+Costa Rica - sunsite.ulatina.ac.cr/Mirrors/GNU/
+Mexico - www.gnu.unam.mx/pub/gnu/software/
+Mexico - gnu.cem.itesm.mx/pub/mirrors/gnu.org/
+Mexico - ftp.azc.uam.mx/mirrors/gnu/
 
 Australia:
 
-Australia - ftp.progsoc.uts.edu.au/pub/gnu
-Australia - mirror.aarnet.edu.au/pub/gnu
+Australia - mirror.aarnet.edu.au/pub/gnu/
+Australia - gnu.mirror.pacific.net.au/gnu/
 
 Asia:
 
-China - ftp.sea9.com/pub/gnu
-China - ftp.cs.cuhk.edu.hk/pub/gnu/
+China - ftp.sea9.com/pub/gnu/
+China - ftp.cs.cuhk.edu.hk/pub/gnu/gnu/
 China - sunsite.ust.hk/pub/gnu/
-Japan - tron.um.u-tokyo.ac.jp/pub/GNU/prep
-Japan - ftp.cs.titech.ac.jp/pub/gnu
-Japan - mirror.nucba.ac.jp/mirror/GNU/
-Japan - core.ring.gr.jp/pub/GNU
-Japan - ftp.ring.gr.jp/pub/GNU
-Korea - cair-archive.kaist.ac.kr/pub/gnu (Internet address 143.248.186.3)
-Korea - ftpmirror.hanyang.ac.kr/GNU 
-Saudi Arabia - ftp.isu.net.sa/pub/mirrors/prep.ai.mit.edu/pub/gnu
-Taiwan - coda.nctu.edu.tw/UNIX/gnu
+China - ftp.shellhung.org/pub/gnu/
+India - ftp.kernel.org.in/gnu.org/
+India - http://kernel.org.in/mirrors/gnu.org/
+India - www.imtech.res.in/mirror/gnuftp/
+Indonesia - sapi.vlsm.org/gnu
+Indonesia - http://sapi.vlsm.org/gnu/
+Israel - ftp.cs.huji.ac.il/mirror/GNU
+Japan - tron.um.u-tokyo.ac.jp/pub/GNU/prep/
+Japan - core.ring.gr.jp/pub/GNU/
+Japan - ftp.ring.gr.jp/pub/GNU/
+Japan - mirrors.hbi.co.jp/gnu/
+Japan - ftp.ayamura.org/pub/gnu/
+Korea - cair-archive.kaist.ac.kr/pub/gnu/ (Internet address 143.248.186.3)
+Korea - ftpmirror.hanyang.ac.kr/GNU/ 
+Korea - ftp.linux.sarang.net/mirror/gnu/gnu/ (also mirrors alpha.gnu.org/gnu/ at ../alpha/)
+Korea - ftp.xgate.co.kr/pub/mirror/gnu/
+Saudi Arabia - ftp.isu.net.sa/pub/gnu/
+Taiwan - ftp.nctu.edu.tw/UNIX/gnu/, coda.nctu.edu.tw/UNIX/gnu/
 Taiwan - ftp1.sinica.edu.tw/pub3/GNU/gnu/
-Thailand - ftp.nectec.or.th/pub/mirrors/gnu (Internet address - 192.150.251.32)
+Thailand - ftp.nectec.or.th/pub/mirrors/gnu/
 
 Europe:
 
-Austria - ftp.gnu.vbs.at/gnu
-Austria - ftp.univie.ac.at/packages/gnu
-Austria - gd.tuwien.ac.at/gnu/gnusrc
-Belgium - ftp.be.gnu.org
+Austria - ftp.gnu.vbs.at/
+Austria - ftp.univie.ac.at/packages/gnu/
+Austria - gd.tuwien.ac.at/gnu/gnusrc/
 Austria - http://gd.tuwien.ac.at/gnu/gnusrc/
 Czech Republic - ftp.fi.muni.cz/pub/gnu/
 Denmark - ftp.denet.dk/mirror/ftp.gnu.org/pub/gnu
 Denmark - ftp.dkuug.dk/pub/gnu/
-Finland - ftp.funet.fi/pub/gnu
-France - ftp.univ-lyon1.fr/pub/gnu
-France - ftp.irisa.fr/pub/gnu
-France - ftp.medasys-digital-systems.fr/pub/gnu
-France - ftp.fuitad.net/mirrors/ftp.gnu.org
+Denmark - sunsite.dk/mirrors/gnu, http://mirrors.sunsite.dk/gnu
+Finland - ftp.funet.fi/pub/gnu/prep/
+France - ftp.irisa.fr/pub/gnu/
+France - ftp.medasys-digital-systems.fr/pub/gnu/
+France - ftp.cs.univ-paris8.fr/mirrors/ftp.gnu.org/
+Germany - ftp.cs.tu-berlin.de/pub/gnu/
+Germany - ftp.fh-worms.de/pub/mirror/ftp.gnu.org/
 Germany - ftp.leo.org/pub/comp/os/unix/gnu/
-Germany - ftp.informatik.rwth-aachen.de/pub/gnu
-Germany - ftp.de.uu.net/pub/gnu
+Germany - ftp.informatik.rwth-aachen.de/pub/gnu/
+Germany - ftp.de.uu.net/pub/gnu/
 Germany - ftp.freenet.de/pub/ftp.gnu.org/gnu/
-Germany - ftp.gigabell.net/pub/gnu
 Germany - ftp.cs.uni-bonn.de/pub/gnu/
-Germany - ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org
-Germany - http://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org
-Greece - ftp.forthnet.gr/pub/gnu
-Greece - ftp.ntua.gr/pub/gnu
-Greece - ftp.duth.gr/pub/gnu
-Greece - ftp.aua.gr/pub/mirrors/GNU (Internet address 143.233.187.61)
-Hungary - ftp.kfki.hu/pub/gnu
-Ireland - ftp.esat.net/pub/gnu (Internet address 193.120.14.241)
-Israel - iglu.org.il/pub/GNU
-Italy - ftp.oasi.gpa.it/pub/gnu
-Netherlands - ftp.eu.net/gnu (Internet address 192.16.202.1)
-Netherlands - ftp.nluug.nl/pub/gnu
-Netherlands - ftp.win.tue.nl/pub/gnu (Internet address 131.155.70.19)
-Netherlands - ftp.mirror.nl/pub/mirror/gnu
-Netherlands - ftp.nl.uu.net/pub/gnu
-Norway - ftp.ntnu.no/pub/gnu (Internet address 129.241.11.142)
-Norway - sunsite.uio.no/pub/gnu
-Poland - ftp.task.gda.pl/pub/gnu
-Poland - sunsite.icm.edu.pl/pub/gnu
-Portugal - ftp.ci.uminho.pt/pub/mirrors/gnu 
-Portugal - http://ciumix.ci.uminho.pt/mirrors/gnu/
-Portugal - ftp.ist.utl.pt/pub/gnu
-Portugal - mirrors.netvisao.pt/gnu
-Romania - archive.logicnet.ro/mirrors/ftp.gnu.org/gnu/
-Russia - ftp.chg.ru/pub/gnu
-Slovenia - ftp.arnes.si/gnu
-Spain - ftp.etsimo.uniovi.es/pub/gnu
-Spain - ftp.rediris.es/pub/gnu
-Sweden - ftp.isy.liu.se/pub/gnu
-Sweden - ftp.stacken.kth.se
-Sweden - ftp.luth.se/pub/unix/gnu
-Sweden - ftp.sunet.se/pub/gnu (Internet address 130.238.127.3)
-         Also mirrors the Mailing List Archives.
+Germany - ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/
+Germany - http://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/
+Germany - ftp.stw-bonn.de/pub/mirror/ftp.gnu.org/
+Greece - ftp.forthnet.gr/pub/gnu/
+Greece - ftp.ntua.gr/pub/gnu/
+Greece - ftp.duth.gr/pub/gnu/
+Greece - ftp.physics.auth.gr/pub/gnu/
+Ireland - ftp.esat.net/pub/gnu/ (Internet address 193.120.14.241)
+Italy - ftp.oasi.gpa.it/pub/gnu/
+Italy - ftp.lugroma2.org/pub/gnu/
+Netherlands - ftp.nluug.nl/pub/gnu/
+Netherlands - ftp.mirror.nl/pub/mirror/gnu/
+Netherlands - ftp.nl.uu.net/pub/gnu/
+Netherlands - mirror.widexs.nl/pub/gnu/
+Norway - ftp.gnu.no/
+Poland - sunsite.icm.edu.pl/pub/gnu/
+Portugal - ftp.ist.utl.pt/pub/GNU/gnu/
+Romania - ftp.timisoara.roedu.net/mirrors/ftp.gnu.org/pub/gnu
+Russia - ftp.chg.ru/pub/gnu/
+Slovenia - ftp.arnes.si/software/gnu/
+Spain - ftp.etsimo.uniovi.es/pub/gnu/
+Spain - ftp.rediris.es/pub/gnu/
+Sweden - ftp.isy.liu.se/pub/gnu/
+Sweden - ftp.stacken.kth.se/pub/gnu/
+Sweden - ftp.sunet.se/pub/gnu/; also mirrors /non-gnu
 Sweden - ftp.chl.chalmers.se/pub/gnu/
-Switzerland - ftp.eunet.ch/mirrors4/gnu
-Switzerland - sunsite.cnlab-switch.ch/mirror/gnu (Internet address 193.5.24.1)
-Turkey - ftp.baskent.edu.tr/gnu/ftp
-United Kingdom - ftp.mcc.ac.uk/pub/gnu (Internet address 130.88.203.12)
+Switzerland - sunsite.cnlab-switch.ch/mirror/gnu/
+Ukraine - mirddin.farlep.net/pub/GNU/
+United Kingdom - ftp.mcc.ac.uk/pub/gnu/ 
 United Kingdom - ftp.mirror.ac.uk/sites/ftp.gnu.org/pub/gnu/
-United Kingdom - ftp.warwick.ac.uk/pub/gnu (Internet address 137.205.192.13)
-United Kingdom - SunSITE.doc.ic.ac.uk/gnu (Internet address 193.63.255.4)
+United Kingdom - ftp.warwick.ac.uk/pub/gnu/ (Internet address 137.205.192.13)
+United Kingdom - ftp.hands.com/ftp.gnu.org/
+United Kingdom - gnu.teleglobe.net/ftp.gnu.org/
 
 * How to FTP GNU Emacs
 
@@ -208,56 +212,23 @@
 is included on the GNU source CD-ROM.  See the file ORDERS in this
 directory for more information.
 
-* VMS FTP sites with GNU Software
-You can anonymously ftp a VMS version of GNU emacs from:
-	- ftp.vms.stacken.kth.se:[.GNU-VMS] - GNU Emacs and some other VMS
-ports (and some VMS binaries) of GNU software
-	- mango.rsmas.miami.edu has a VMS version of the GCC/G++ compiler.
-Contact angel@flipper.miami.edu (angel li) for details.
-	- RIGEL.EFD.LTH.SE [130.235.48.3] - GNU Emacs
-
-* Getting GNU software in Great Britain
-
-jpo@cs.nott.ac.uk is willing to distribute those GNU sources he has
-available.  The smaller items are available from the info-server (send
-to info-server@cs.nott.ac.uk); the larger items by negotiation.  Due to
-communication costs this service is only available within the UK.
-
-BattenIG@computer-science.birmingham.ac.uk (aka
-I.G.Batten@fulcrum.bt.co.uk) is also willing to distribute those GNU
-sources he has.
-
-wizards@doc.ic.ac.uk is willing to distribute those GNU sources they have
-along with most other freely distributable software.  The SunSITE archive
-on SunSITE.doc.ic.ac.uk (193.63.255.4) is available via ftp, http, fsp,
-gopher, NFS and Lanmanger over IP (SMB), and telnet.
-
-UK sites with just anonymous FTP access are in the above list.
-
-* Getting GNU software via UUCP
-
-OSU is distributing via UUCP: most GNU software, MIT C Scheme,
-Compress, News, RN, NNTP, Patch, some Appletalk stuff, some of the
-Internet Requests For Comment (RFC) et al..  See their periodic
-postings on the Usenet newsgroup comp.sources.d for informational
-updates.  Current details from <staff@cis.ohio-state.edu> or
-<...!osu-cis!staff>.
-
-Information on how to uucp some GNU programs is available via
-electronic mail from: uunet!hutch!barber, hqda-ai!merlin, acornrc!bob,
-hao!scicom!qetzal!upba!ugn!nepa!denny, ncar!noao!asuvax!hrc!dan,
-bigtex!james (aka james@bigtex.cactus.org), oli-stl!root,
-src@contrib.de (Germany), toku@dit.co.jp (Japan) and info@ftp.uu.net.
+* GNU Software for VMS
+
+        - ftp.vms.stacken.kth.se/MIRRORS/GNU-VMS/- lots of GNU ports to VMS,
+including Emacs 19, GCC, Bison, Make, RCS.
 
 * If You Like The Software
 
 If you like the software developed and distributed by the Free
 Software Foundation, please express your satisfaction with a donation.
 Your donations will help to support the Foundation and make our future
-efforts successful, including a complete development and operating
-system, called GNU (Gnu's Not Unix), which will run Unix user
-programs.  For more information on GNU and the Foundation, contact us
-at the above address, or see our web site at http://www.gnu.org.
+efforts successful.  The Foundation continues to improve GNU programs
+and encourage the writing of new free software to enhance GNU/Linux
+and GNU/Hurd systems.  For more information on GNU and the Foundation,
+see our web site at http://www.gnu.org.
 
 Ordering a GNU Source Code CD-ROM or Source Code CD-ROM Subscription
-is a good way for your organization to help support our work.
+is a good way for your organization to help support our work.  You can
+also purchase printed manuals, reference cards, t-shirts, and other
+items.  See our online ordering form at http://order.fsf.org for
+details.
diff -ruN src-21.1/Makefile.in src-21.2/Makefile.in
--- src-21.1/Makefile.in	Wed Apr 25 15:50:10 2001
+++ src-21.2/Makefile.in	Wed Oct 31 15:45:46 2001
@@ -223,7 +223,7 @@
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
 
-all: ${SUBDIR} leim
+all: maybe_bootstrap ${SUBDIR} leim
 
 removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
 
@@ -364,7 +364,7 @@
 	  [ -d $${dir} ] \
 	  && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
 	  && (echo "Copying $${dir} to $${dest}..." ; \
-	      (cd $${dir}; tar -cf - . ) \
+	      (cd $${dir}; tar -chf - . ) \
 		| (cd $${dest}; umask 022; \
                    tar -xvf - && cat > /dev/null) || exit 1; \
 	      for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \
@@ -403,7 +403,7 @@
 	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
 	then \
 	   echo "Copying etc/DOC-* to ${docdir} ..." ; \
-	   (cd ./etc; tar -cf - DOC*) \
+	   (cd ./etc; tar -chf - DOC*) \
 	     |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \
 	   (cd $(docdir); chmod a+r DOC*; rm DOC); \
 	else true; fi
@@ -414,7 +414,7 @@
 	   && [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \
 	then \
 	   echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
-	   (cd lisp; tar -cf - *.el *.elc) \
+	   (cd lisp; tar -chf - *.el *.elc) \
 	     |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \
 	else true; fi
 	-unset CDPATH; \
@@ -605,7 +605,7 @@
 ### Note: it's no disaster if these productions miss a file or two; tar
 ### and VC will swiftly let you know if this happens, and it is easily
 ### corrected.
-SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in \
+SOURCES = ChangeLog FTP INSTALL Makefile.in \
 	README configure make-dist move-if-change
 
 .PHONY: unlock relock
@@ -663,6 +663,12 @@
 ### used to compile Lisp files.  The last step is a "normal" make.
 
 .PHONY: bootstrap bootstrap-lisp-1 boostrap-src bootstrap-lisp bootstrap-clean
+.PHONY: maybe_bootstrap
+
+maybe_bootstrap:
+	if [ ! -f $(srcdir)/lisp/abbrev.elc ]; then \
+	  $(MAKE) $(MFLAGS) bootstrap; \
+	fi
 
 bootstrap: clean bootstrap-lisp-1 bootstrap-src bootstrap-lisp bootstrap-clean all info
 
diff -ruN src-21.1/README src-21.2/README
--- src-21.1/README	Sat Oct 20 18:51:48 2001
+++ src-21.2/README	Sat Mar 16 12:38:45 2002
@@ -1,4 +1,4 @@
-This directory tree holds version 21.1 of GNU Emacs, the extensible,
+This directory tree holds version 21.2 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 You may encounter bugs in this release.  If you do, please report
diff -ruN src-21.1/configure src-21.2/configure
--- src-21.1/configure	Fri Oct 19 20:04:37 2001
+++ src-21.2/configure	Fri Mar 15 13:46:09 2002
@@ -35,9 +35,9 @@
   --with-png              use -lpng for displaying PNG images"
 ac_help="$ac_help
   --without-toolkit-scroll-bars
-                           don't use Motif or Xaw3d scroll bars"
+                          don't use Motif or Xaw3d scroll bars"
 ac_help="$ac_help
-  --without-xim	   don't use X11 XIM"
+  --without-xim           don't use X11 XIM"
 ac_help="$ac_help
   --disable-largefile     omit support for large files"
 ac_help="$ac_help
@@ -862,7 +862,7 @@
       *-*-bsdi2.0* )		opsys=bsdos2 ;;
       *-*-bsdi2* )		opsys=bsdos2-1 ;;
       *-*-bsdi3* )		opsys=bsdos3 ;;
-      *-*-bsdi4* )		opsys=bsdos4 ;;
+      *-*-bsdi[45]* )		opsys=bsdos4 ;;
     esac
   ;;
 
@@ -1150,9 +1150,13 @@
   hppa*-hp-hpux9* )
     machine=hp800 opsys=hpux9
   ;;
-  hppa*-hp-hpux1[0-9]* )
+
+  hppa*-hp-hpux10* )
     machine=hp800 opsys=hpux10
   ;;
+  hppa*-hp-hpux1[1-9]* )
+    machine=hp800 opsys=hpux11
+  ;;
 
   ## HP 9000 series 700 and 800, running HP/UX
   hppa*-hp-hpux* )
@@ -1200,6 +1204,9 @@
   rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2*  )
     machine=ibmrs6000 opsys=aix4-2
   ;;
+  rs6000-ibm-aix5.1* | powerpc-ibm-aix5.1*  )
+    machine=ibmrs6000 opsys=aix4-2
+  ;;
   rs6000-ibm-aix4.0* | powerpc-ibm-aix4.0*  )
     machine=ibmrs6000 opsys=aix4
   ;;
@@ -1734,7 +1741,7 @@
   * ) # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1738: checking for $ac_word" >&5
+echo "configure:1745: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1764,7 +1771,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1768: checking for $ac_word" >&5
+echo "configure:1775: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1815,7 +1822,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1819: checking for $ac_word" >&5
+echo "configure:1826: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1847,7 +1854,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1851: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1858: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1858,12 +1865,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1862 "configure"
+#line 1869 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1889,12 +1896,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1893: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1900: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1898: checking whether we are using GNU C" >&5
+echo "configure:1905: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1903,7 +1910,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1922,7 +1929,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1926: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1933: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2002,7 +2009,7 @@
 #### #undef clause to src/config.h.in for autoconf to modify.
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2006: checking whether ln -s works" >&5
+echo "configure:2013: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2023,7 +2030,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2027: checking how to run the C preprocessor" >&5
+echo "configure:2034: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2038,13 +2045,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2042 "configure"
+#line 2049 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2055,13 +2062,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2059 "configure"
+#line 2066 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2072,13 +2079,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2076 "configure"
+#line 2083 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2114,7 +2121,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2118: checking for a BSD compatible install" >&5
+echo "configure:2125: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2171,7 +2178,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2175: checking for $ac_word" >&5
+echo "configure:2182: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2205,7 +2212,7 @@
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2209: checking for $ac_word" >&5
+echo "configure:2216: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2235,9 +2242,9 @@
 fi
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2239: checking for AIX" >&5
+echo "configure:2246: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2241 "configure"
+#line 2248 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2264,7 +2271,7 @@
 echo "checking the machine- and system-dependent files to find out
  - which libraries the lib-src programs will want, and
  - whether the GNU malloc routines are usable" 1>&6
-echo "configure:2268: checking the machine- and system-dependent files to find out
+echo "configure:2275: checking the machine- and system-dependent files to find out
  - which libraries the lib-src programs will want, and
  - whether the GNU malloc routines are usable" >&5
 
@@ -2414,7 +2421,7 @@
    if test "$enable_largefile" != no; then
 
      echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6
-echo "configure:2418: checking for special C compiler options needed for large files" >&5
+echo "configure:2425: checking for special C compiler options needed for large files" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_largefile_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2423,7 +2430,7 @@
 	  # IRIX 6.2 and later do not support large files by default,
 	  # so use the C compiler's -n32 option if that helps.
 	  cat > conftest.$ac_ext <<EOF
-#line 2427 "configure"
+#line 2434 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
     int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
@@ -2432,7 +2439,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -2441,7 +2448,7 @@
   ac_save_CC="$CC"
 	     CC="$CC -n32"
 	     cat > conftest.$ac_ext <<EOF
-#line 2445 "configure"
+#line 2452 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
     int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
@@ -2450,7 +2457,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_largefile_CC=' -n32'
 else
@@ -2470,13 +2477,13 @@
      fi
 
      echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:2474: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:2481: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_sys_file_offset_bits=no
       cat > conftest.$ac_ext <<EOF
-#line 2480 "configure"
+#line 2487 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
     int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
@@ -2485,14 +2492,14 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 2496 "configure"
+#line 2503 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -2503,7 +2510,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_file_offset_bits=64
 else
@@ -2523,27 +2530,27 @@
 
    fi
      echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:2527: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:2534: checking for _LARGE_FILES value needed for large files" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_sys_large_files=no
       cat > conftest.$ac_ext <<EOF
-#line 2533 "configure"
+#line 2540 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 2547 "configure"
+#line 2554 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 
@@ -2552,7 +2559,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_large_files=1
 else
@@ -2579,17 +2586,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2583: checking for $ac_hdr" >&5
+echo "configure:2590: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2588 "configure"
+#line 2595 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2617,7 +2624,7 @@
 
 # Emulation library used on NetBSD.
 echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6
-echo "configure:2621: checking for _oss_ioctl in -lossaudio" >&5
+echo "configure:2628: checking for _oss_ioctl in -lossaudio" >&5
 ac_lib_var=`echo ossaudio'_'_oss_ioctl | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2625,7 +2632,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lossaudio  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2629 "configure"
+#line 2636 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2636,7 +2643,7 @@
 _oss_ioctl()
 ; return 0; }
 EOF
-if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2665,17 +2672,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2669: checking for $ac_hdr" >&5
+echo "configure:2676: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2674 "configure"
+#line 2681 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2702,12 +2709,12 @@
 done
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2706: checking for ANSI C header files" >&5
+echo "configure:2713: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2711 "configure"
+#line 2718 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2715,7 +2722,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2732,7 +2739,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2736 "configure"
+#line 2743 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2750,7 +2757,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2754 "configure"
+#line 2761 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2771,7 +2778,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2775 "configure"
+#line 2782 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2782,7 +2789,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:2786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2806,12 +2813,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2810: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2817: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2815 "configure"
+#line 2822 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2820,7 +2827,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -2841,12 +2848,12 @@
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:2845: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:2852: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2850 "configure"
+#line 2857 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2858,7 +2865,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:2862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -2879,12 +2886,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2883: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2890: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2888 "configure"
+#line 2895 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2900,7 +2907,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -2922,12 +2929,12 @@
 
 
 echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
-echo "configure:2926: checking for struct utimbuf" >&5
+echo "configure:2933: checking for struct utimbuf" >&5
 if eval "test \"`echo '$''{'emacs_cv_struct_utimbuf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2931 "configure"
+#line 2938 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -2946,7 +2953,7 @@
 static struct utimbuf x; x.actime = x.modtime;
 ; return 0; }
 EOF
-if { (eval echo configure:2950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   emacs_cv_struct_utimbuf=yes
 else
@@ -2967,12 +2974,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2971: checking return type of signal handlers" >&5
+echo "configure:2978: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2976 "configure"
+#line 2983 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2989,7 +2996,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3009,19 +3016,19 @@
 
 
 echo $ac_n "checking for speed_t""... $ac_c" 1>&6
-echo "configure:3013: checking for speed_t" >&5
+echo "configure:3020: checking for speed_t" >&5
 if eval "test \"`echo '$''{'emacs_cv_speed_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3018 "configure"
+#line 3025 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int main() {
 speed_t x = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   emacs_cv_speed_t=yes
 else
@@ -3040,12 +3047,12 @@
 fi
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:3044: checking for struct timeval" >&5
+echo "configure:3051: checking for struct timeval" >&5
 if eval "test \"`echo '$''{'emacs_cv_struct_timeval'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3049 "configure"
+#line 3056 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -3061,7 +3068,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:3065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   emacs_cv_struct_timeval=yes
 else
@@ -3083,19 +3090,19 @@
 fi
 
 echo $ac_n "checking for struct exception""... $ac_c" 1>&6
-echo "configure:3087: checking for struct exception" >&5
+echo "configure:3094: checking for struct exception" >&5
 if eval "test \"`echo '$''{'emacs_cv_struct_exception'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3092 "configure"
+#line 3099 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 static struct exception x; x.arg1 = x.arg2 = x.retval; x.name = ""; x.type = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   emacs_cv_struct_exception=yes
 else
@@ -3117,12 +3124,12 @@
 fi
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3121: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:3128: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3126 "configure"
+#line 3133 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -3130,7 +3137,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:3134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -3151,12 +3158,12 @@
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3155: checking for tm_zone in struct tm" >&5
+echo "configure:3162: checking for tm_zone in struct tm" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3160 "configure"
+#line 3167 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -3164,7 +3171,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:3168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -3184,12 +3191,12 @@
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3188: checking for tzname" >&5
+echo "configure:3195: checking for tzname" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3193 "configure"
+#line 3200 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -3199,7 +3206,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:3203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -3221,19 +3228,19 @@
 fi
 
 echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:3225: checking for tm_gmtoff in struct tm" >&5
+echo "configure:3232: checking for tm_gmtoff in struct tm" >&5
 if eval "test \"`echo '$''{'emacs_cv_tm_gmtoff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3230 "configure"
+#line 3237 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 struct tm t; t.tm_gmtoff = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   emacs_cv_tm_gmtoff=yes
 else
@@ -3255,7 +3262,7 @@
 
 
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:3259: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:3266: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3272,7 +3279,7 @@
 do
   CC="$ac_save_CC $ac_arg"
   cat > conftest.$ac_ext <<EOF
-#line 3276 "configure"
+#line 3283 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -3306,7 +3313,7 @@
 return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
 ; return 0; }
 EOF
-if { (eval echo configure:3310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_prog_cc_stdc="$ac_arg"; break
 else
@@ -3328,7 +3335,7 @@
 esac
 
 echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
-echo "configure:3332: checking for function prototypes" >&5
+echo "configure:3339: checking for function prototypes" >&5
 if test "$ac_cv_prog_cc_stdc" != no; then
   echo "$ac_t""yes" 1>&6
   cat >> confdefs.h <<\EOF
@@ -3340,12 +3347,12 @@
 fi
 
 echo $ac_n "checking for working volatile""... $ac_c" 1>&6
-echo "configure:3344: checking for working volatile" >&5
+echo "configure:3351: checking for working volatile" >&5
 if eval "test \"`echo '$''{'ac_cv_c_volatile'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3349 "configure"
+#line 3356 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3354,7 +3361,7 @@
 int * volatile y;
 ; return 0; }
 EOF
-if { (eval echo configure:3358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_volatile=yes
 else
@@ -3375,12 +3382,12 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3379: checking for working const" >&5
+echo "configure:3386: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3384 "configure"
+#line 3391 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3429,7 +3436,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3450,19 +3457,19 @@
 fi
 
 echo $ac_n "checking for void * support""... $ac_c" 1>&6
-echo "configure:3454: checking for void * support" >&5
+echo "configure:3461: checking for void * support" >&5
 if eval "test \"`echo '$''{'emacs_cv_void_star'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3459 "configure"
+#line 3466 "configure"
 #include "confdefs.h"
 
 int main() {
 void * foo;
 ; return 0; }
 EOF
-if { (eval echo configure:3466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   emacs_cv_void_star=yes
 else
@@ -3488,7 +3495,7 @@
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:3492: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:3499: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3516,7 +3523,7 @@
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:3520: checking for long file names" >&5
+echo "configure:3527: checking for long file names" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3567,7 +3574,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:3571: checking for X" >&5
+echo "configure:3578: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -3629,12 +3636,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 3633 "configure"
+#line 3640 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3703,14 +3710,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3707 "configure"
+#line 3714 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:3714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -3891,12 +3898,12 @@
 GNU_MALLOC=yes
 doug_lea_malloc=yes
 echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
-echo "configure:3895: checking for malloc_get_state" >&5
+echo "configure:3902: checking for malloc_get_state" >&5
 if eval "test \"`echo '$''{'ac_cv_func_malloc_get_state'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3900 "configure"
+#line 3907 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_get_state(); below.  */
@@ -3919,7 +3926,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_get_state=yes"
 else
@@ -3940,12 +3947,12 @@
 fi
 
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3944: checking for malloc_set_state" >&5
+echo "configure:3951: checking for malloc_set_state" >&5
 if eval "test \"`echo '$''{'ac_cv_func_malloc_set_state'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3949 "configure"
+#line 3956 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3968,7 +3975,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_set_state=yes"
 else
@@ -3989,19 +3996,19 @@
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3993: checking whether __after_morecore_hook exists" >&5
+echo "configure:4000: checking whether __after_morecore_hook exists" >&5
 if eval "test \"`echo '$''{'emacs_cv_var___after_morecore_hook'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3998 "configure"
+#line 4005 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:4005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   emacs_cv_var___after_morecore_hook=yes
 else
@@ -4042,17 +4049,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4046: checking for $ac_hdr" >&5
+echo "configure:4053: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4051 "configure"
+#line 4058 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4081,12 +4088,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4085: checking for $ac_func" >&5
+echo "configure:4092: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4090 "configure"
+#line 4097 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4109,7 +4116,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4134,7 +4141,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:4138: checking for working mmap" >&5
+echo "configure:4145: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4142,7 +4149,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4146 "configure"
+#line 4153 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Haertel and Jim Avera for this test.
    Here is a matrix of mmap possibilities:
@@ -4276,7 +4283,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:4280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -4305,7 +4312,7 @@
 LIBS="$libsrc_libs $LIBS"
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4309: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4316: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4313,7 +4320,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4317 "configure"
+#line 4324 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4324,7 +4331,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4353,7 +4360,7 @@
 
 
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:4357: checking for main in -lXbsd" >&5
+echo "configure:4364: checking for main in -lXbsd" >&5
 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4361,14 +4368,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4365 "configure"
+#line 4372 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4390,7 +4397,7 @@
 
 
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:4394: checking for cma_open in -lpthreads" >&5
+echo "configure:4401: checking for cma_open in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4398,7 +4405,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpthreads  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4402 "configure"
+#line 4409 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4409,7 +4416,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4438,7 +4445,7 @@
 
 
 echo $ac_n "checking for XFree86 in /usr/X386""... $ac_c" 1>&6
-echo "configure:4442: checking for XFree86 in /usr/X386" >&5
+echo "configure:4449: checking for XFree86 in /usr/X386" >&5
 if test -d /usr/X386/include; then
   HAVE_XFREE386=yes
   : ${C_SWITCH_X_SITE="-I/usr/X386/include"}
@@ -4470,16 +4477,16 @@
 
   if test "${opsys}" = "gnu-linux"; then
     echo $ac_n "checking whether X on GNU/Linux needs -b to link""... $ac_c" 1>&6
-echo "configure:4474: checking whether X on GNU/Linux needs -b to link" >&5
+echo "configure:4481: checking whether X on GNU/Linux needs -b to link" >&5
     cat > conftest.$ac_ext <<EOF
-#line 4476 "configure"
+#line 4483 "configure"
 #include "confdefs.h"
 
 int main() {
 XOpenDisplay ("foo");
 ; return 0; }
 EOF
-if { (eval echo configure:4483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xlinux_first_failure=no
 else
@@ -4499,14 +4506,14 @@
       CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
       LIBS="$LIBS -b i486-linuxaout"
       cat > conftest.$ac_ext <<EOF
-#line 4503 "configure"
+#line 4510 "configure"
 #include "confdefs.h"
 
 int main() {
 XOpenDisplay ("foo");
 ; return 0; }
 EOF
-if { (eval echo configure:4510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xlinux_second_failure=no
 else
@@ -4535,9 +4542,9 @@
   # Reportedly, some broken Solaris systems have XKBlib.h but are missing
   # header files included from there.
   echo $ac_n "checking for Xkb""... $ac_c" 1>&6
-echo "configure:4539: checking for Xkb" >&5
+echo "configure:4546: checking for Xkb" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4541 "configure"
+#line 4548 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
@@ -4545,7 +4552,7 @@
 XkbDescPtr kb = XkbGetKeyboard (0, XkbAllComponentsMask, XkbUseCoreKbd);
 ; return 0; }
 EOF
-if { (eval echo configure:4549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   emacs_xkb=yes
 else
@@ -4567,12 +4574,12 @@
 XScreenNumberOfScreen XSetWMProtocols
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4571: checking for $ac_func" >&5
+echo "configure:4578: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4576 "configure"
+#line 4583 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4595,7 +4602,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4623,12 +4630,12 @@
 
 if test "${window_system}" = "x11"; then
   echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
-echo "configure:4627: checking X11 version 6" >&5
+echo "configure:4634: checking X11 version 6" >&5
   if eval "test \"`echo '$''{'emacs_cv_x11_version_6'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4632 "configure"
+#line 4639 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int main() {
@@ -4638,7 +4645,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   emacs_cv_x11_version_6=yes
 else
@@ -4663,12 +4670,12 @@
 
 if test "${window_system}" = "x11"; then
   echo $ac_n "checking X11 version 5""... $ac_c" 1>&6
-echo "configure:4667: checking X11 version 5" >&5
+echo "configure:4674: checking X11 version 5" >&5
   if eval "test \"`echo '$''{'emacs_cv_x11_version_5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4672 "configure"
+#line 4679 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 int main() {
@@ -4678,7 +4685,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   emacs_cv_x11_version_5=yes
 else
@@ -4706,12 +4713,12 @@
 if test x"${USE_X_TOOLKIT}" = xmaybe; then
   if test x"${HAVE_X11R5}" = xyes; then
     echo $ac_n "checking X11 version 5 with Xaw""... $ac_c" 1>&6
-echo "configure:4710: checking X11 version 5 with Xaw" >&5
+echo "configure:4717: checking X11 version 5 with Xaw" >&5
     if eval "test \"`echo '$''{'emacs_cv_x11_version_5_with_xaw'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4715 "configure"
+#line 4722 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -4720,7 +4727,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   emacs_cv_x11_version_5_with_xaw=yes
 else
@@ -4748,12 +4755,12 @@
 
 if test "${USE_X_TOOLKIT}" != "none"; then
   echo $ac_n "checking X11 toolkit version""... $ac_c" 1>&6
-echo "configure:4752: checking X11 toolkit version" >&5
+echo "configure:4759: checking X11 toolkit version" >&5
   if eval "test \"`echo '$''{'emacs_cv_x11_toolkit_version_6'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4757 "configure"
+#line 4764 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int main() {
@@ -4763,7 +4770,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   emacs_cv_x11_toolkit_version_6=yes
 else
@@ -4793,7 +4800,7 @@
     LIBS="-lXt $LIBS"
   fi
   echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6
-echo "configure:4797: checking for XmuConvertStandardSelection in -lXmu" >&5
+echo "configure:4804: checking for XmuConvertStandardSelection in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuConvertStandardSelection | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4801,7 +4808,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXmu  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4805 "configure"
+#line 4812 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4812,7 +4819,7 @@
 XmuConvertStandardSelection()
 ; return 0; }
 EOF
-if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4846,7 +4853,7 @@
 if test "${HAVE_X11}" = "yes"; then
   if test "${USE_X_TOOLKIT}" != "none"; then
     echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6
-echo "configure:4850: checking for XShapeQueryExtension in -lXext" >&5
+echo "configure:4857: checking for XShapeQueryExtension in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4854,7 +4861,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXext  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4858 "configure"
+#line 4865 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4865,7 +4872,7 @@
 XShapeQueryExtension()
 ; return 0; }
 EOF
-if { (eval echo configure:4869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4897,12 +4904,12 @@
 
 if test "${USE_X_TOOLKIT}" = "MOTIF"; then
   echo $ac_n "checking for Motif version 2.1""... $ac_c" 1>&6
-echo "configure:4901: checking for Motif version 2.1" >&5
+echo "configure:4908: checking for Motif version 2.1" >&5
 if eval "test \"`echo '$''{'emacs_cv_motif_version_2_1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4906 "configure"
+#line 4913 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 int main() {
@@ -4913,7 +4920,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   emacs_cv_motif_version_2_1=yes
 else
@@ -4934,7 +4941,7 @@
 EOF
 
     echo $ac_n "checking for XpCreateContext in -lXp""... $ac_c" 1>&6
-echo "configure:4938: checking for XpCreateContext in -lXp" >&5
+echo "configure:4945: checking for XpCreateContext in -lXp" >&5
 ac_lib_var=`echo Xp'_'XpCreateContext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4942,7 +4949,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4946 "configure"
+#line 4953 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4953,7 +4960,7 @@
 XpCreateContext()
 ; return 0; }
 EOF
-if { (eval echo configure:4957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4988,17 +4995,17 @@
   if test "${USE_X_TOOLKIT}" != "none"; then
     ac_safe=`echo "X11/Xaw3d/Scrollbar.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/Scrollbar.h""... $ac_c" 1>&6
-echo "configure:4992: checking for X11/Xaw3d/Scrollbar.h" >&5
+echo "configure:4999: checking for X11/Xaw3d/Scrollbar.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4997 "configure"
+#line 5004 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/Scrollbar.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5015,7 +5022,7 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for XawScrollbarSetThumb in -lXaw3d""... $ac_c" 1>&6
-echo "configure:5019: checking for XawScrollbarSetThumb in -lXaw3d" >&5
+echo "configure:5026: checking for XawScrollbarSetThumb in -lXaw3d" >&5
 ac_lib_var=`echo Xaw3d'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5023,7 +5030,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXaw3d  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5027 "configure"
+#line 5034 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5034,7 +5041,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:5038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5102,17 +5109,17 @@
   if test "${with_xpm}" != "no"; then
     ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6
-echo "configure:5106: checking for X11/xpm.h" >&5
+echo "configure:5113: checking for X11/xpm.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5111 "configure"
+#line 5118 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5129,7 +5136,7 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for XpmReadFileToPixmap in -lXpm""... $ac_c" 1>&6
-echo "configure:5133: checking for XpmReadFileToPixmap in -lXpm" >&5
+echo "configure:5140: checking for XpmReadFileToPixmap in -lXpm" >&5
 ac_lib_var=`echo Xpm'_'XpmReadFileToPixmap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5137,7 +5144,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXpm -lX11 $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5141 "configure"
+#line 5148 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5148,7 +5155,7 @@
 XpmReadFileToPixmap()
 ; return 0; }
 EOF
-if { (eval echo configure:5152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5174,9 +5181,9 @@
 
     if test "${HAVE_XPM}" = "yes"; then
       echo $ac_n "checking for XpmReturnAllocPixels preprocessor define""... $ac_c" 1>&6
-echo "configure:5178: checking for XpmReturnAllocPixels preprocessor define" >&5
+echo "configure:5185: checking for XpmReturnAllocPixels preprocessor define" >&5
       cat > conftest.$ac_ext <<EOF
-#line 5180 "configure"
+#line 5187 "configure"
 #include "confdefs.h"
 #include "X11/xpm.h"
 #ifndef XpmReturnAllocPixels
@@ -5217,17 +5224,17 @@
   if test "${with_jpeg}" != "no"; then
             ac_safe=`echo "jerror.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for jerror.h""... $ac_c" 1>&6
-echo "configure:5221: checking for jerror.h" >&5
+echo "configure:5228: checking for jerror.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5226 "configure"
+#line 5233 "configure"
 #include "confdefs.h"
 #include <jerror.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5244,7 +5251,7 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:5248: checking for jpeg_destroy_compress in -ljpeg" >&5
+echo "configure:5255: checking for jpeg_destroy_compress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5252,7 +5259,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5256 "configure"
+#line 5263 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5263,7 +5270,7 @@
 jpeg_destroy_compress()
 ; return 0; }
 EOF
-if { (eval echo configure:5267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5303,17 +5310,17 @@
   if test "${with_png}" != "no"; then
     ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:5307: checking for png.h" >&5
+echo "configure:5314: checking for png.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5312 "configure"
+#line 5319 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5330,7 +5337,7 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for png_get_channels in -lpng""... $ac_c" 1>&6
-echo "configure:5334: checking for png_get_channels in -lpng" >&5
+echo "configure:5341: checking for png_get_channels in -lpng" >&5
 ac_lib_var=`echo png'_'png_get_channels | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5338,7 +5345,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5342 "configure"
+#line 5349 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5349,7 +5356,7 @@
 png_get_channels()
 ; return 0; }
 EOF
-if { (eval echo configure:5353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5389,17 +5396,17 @@
   if test "${with_tiff}" != "no"; then
     ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:5393: checking for tiffio.h" >&5
+echo "configure:5400: checking for tiffio.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5398 "configure"
+#line 5405 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5419,7 +5426,7 @@
       # At least one tiff package requires the jpeg library.
       if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
       echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6
-echo "configure:5423: checking for TIFFGetVersion in -ltiff" >&5
+echo "configure:5430: checking for TIFFGetVersion in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5427,7 +5434,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff $tifflibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5431 "configure"
+#line 5438 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5438,7 +5445,7 @@
 TIFFGetVersion()
 ; return 0; }
 EOF
-if { (eval echo configure:5442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5478,17 +5485,17 @@
   if test "${with_gif}" != "no"; then
     ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
-echo "configure:5482: checking for gif_lib.h" >&5
+echo "configure:5489: checking for gif_lib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5487 "configure"
+#line 5494 "configure"
 #include "confdefs.h"
 #include <gif_lib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5505,7 +5512,7 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for DGifOpen in -lungif""... $ac_c" 1>&6
-echo "configure:5509: checking for DGifOpen in -lungif" >&5
+echo "configure:5516: checking for DGifOpen in -lungif" >&5
 ac_lib_var=`echo ungif'_'DGifOpen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5513,7 +5520,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lungif  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5517 "configure"
+#line 5524 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5524,7 +5531,7 @@
 DGifOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:5528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5560,19 +5567,19 @@
 
 # If netdb.h doesn't declare h_errno, we must declare it by hand.
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:5564: checking whether netdb declares h_errno" >&5
+echo "configure:5571: checking whether netdb declares h_errno" >&5
 if eval "test \"`echo '$''{'emacs_cv_netdb_declares_h_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5569 "configure"
+#line 5576 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:5576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   emacs_cv_netdb_declares_h_errno=yes
 else
@@ -5595,19 +5602,19 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:5599: checking for working alloca.h" >&5
+echo "configure:5606: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5604 "configure"
+#line 5611 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:5611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -5628,12 +5635,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:5632: checking for alloca" >&5
+echo "configure:5639: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5637 "configure"
+#line 5644 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -5661,7 +5668,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:5665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -5693,12 +5700,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:5697: checking whether alloca needs Cray hooks" >&5
+echo "configure:5704: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5702 "configure"
+#line 5709 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -5723,12 +5730,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5727: checking for $ac_func" >&5
+echo "configure:5734: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5732 "configure"
+#line 5739 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5751,7 +5758,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5778,7 +5785,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:5782: checking stack direction for C alloca" >&5
+echo "configure:5789: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5786,7 +5793,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 5790 "configure"
+#line 5797 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -5805,7 +5812,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:5809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -5830,7 +5837,7 @@
 # fmod, logb, and frexp are found in -lm on most systems.
 # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:5834: checking for sqrt in -lm" >&5
+echo "configure:5841: checking for sqrt in -lm" >&5
 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5838,7 +5845,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5842 "configure"
+#line 5849 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5849,7 +5856,7 @@
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:5853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5879,7 +5886,7 @@
 
 # Check for mail-locking functions in a "mail" library
 echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6
-echo "configure:5883: checking for maillock in -lmail" >&5
+echo "configure:5890: checking for maillock in -lmail" >&5
 ac_lib_var=`echo mail'_'maillock | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5887,7 +5894,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmail  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5891 "configure"
+#line 5898 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5898,7 +5905,7 @@
 maillock()
 ; return 0; }
 EOF
-if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5926,7 +5933,7 @@
 fi
 
 echo $ac_n "checking for maillock in -llockfile""... $ac_c" 1>&6
-echo "configure:5930: checking for maillock in -llockfile" >&5
+echo "configure:5937: checking for maillock in -llockfile" >&5
 ac_lib_var=`echo lockfile'_'maillock | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5934,7 +5941,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-llockfile  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5938 "configure"
+#line 5945 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5945,7 +5952,7 @@
 maillock()
 ; return 0; }
 EOF
-if { (eval echo configure:5949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5979,7 +5986,7 @@
       # Extract the first word of "liblockfile.so", so it can be a program name with args.
 set dummy liblockfile.so; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5983: checking for $ac_word" >&5
+echo "configure:5990: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_liblockfile'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6020,12 +6027,12 @@
 for ac_func in touchlock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6024: checking for $ac_func" >&5
+echo "configure:6031: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6029 "configure"
+#line 6036 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6048,7 +6055,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6076,17 +6083,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6080: checking for $ac_hdr" >&5
+echo "configure:6087: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6085 "configure"
+#line 6092 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6122,12 +6129,12 @@
 gai_strerror mkstemp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6126: checking for $ac_func" >&5
+echo "configure:6133: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6131 "configure"
+#line 6138 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6150,7 +6157,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6179,17 +6186,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6183: checking for $ac_hdr" >&5
+echo "configure:6190: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6188 "configure"
+#line 6195 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6218,12 +6225,12 @@
 for ac_func in alarm
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6222: checking for $ac_func" >&5
+echo "configure:6229: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6227 "configure"
+#line 6234 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6246,7 +6253,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6271,7 +6278,7 @@
 done
 
 echo $ac_n "checking for working mktime""... $ac_c" 1>&6
-echo "configure:6275: checking for working mktime" >&5
+echo "configure:6282: checking for working mktime" >&5
 if eval "test \"`echo '$''{'ac_cv_func_working_mktime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6279,7 +6286,7 @@
   ac_cv_func_working_mktime=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6283 "configure"
+#line 6290 "configure"
 #include "confdefs.h"
 /* Test program from Paul Eggert (eggert@twinsun.com)
    and Tony Leneis (tony@plaza.ds.adp.com).  */
@@ -6428,7 +6435,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:6432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_working_mktime=yes
 else
@@ -6456,11 +6463,62 @@
 
 ac_have_func=no # yes means we've found a way to get the load average.
 
-# Some systems with -lutil have (and need) -lkvm as well, some do not.
-# On Solaris, -lkvm requires nlist from -lelf, so check that first
-# to get the right answer into the cache.
-echo $ac_n "checking for elf_begin in -lelf""... $ac_c" 1>&6
-echo "configure:6464: checking for elf_begin in -lelf" >&5
+# Some systems have getloadavg without any extra libraries.
+echo $ac_n "checking for getloadavg""... $ac_c" 1>&6
+echo "configure:6469: checking for getloadavg" >&5
+if eval "test \"`echo '$''{'ac_cv_func_getloadavg'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 6474 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char getloadavg(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char getloadavg();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_getloadavg) || defined (__stub___getloadavg)
+choke me
+#else
+getloadavg();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:6497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_getloadavg=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_getloadavg=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'getloadavg`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ac_have_func=yes
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+if test $ac_have_func = no; then
+  # Some systems with -lutil have (and need) -lkvm as well, some do not.
+  # On Solaris, -lkvm requires nlist from -lelf, so check that first
+  # to get the right answer into the cache.
+  echo $ac_n "checking for elf_begin in -lelf""... $ac_c" 1>&6
+echo "configure:6522: checking for elf_begin in -lelf" >&5
 ac_lib_var=`echo elf'_'elf_begin | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6468,7 +6526,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lelf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6472 "configure"
+#line 6530 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6479,7 +6537,7 @@
 elf_begin()
 ; return 0; }
 EOF
-if { (eval echo configure:6483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6499,8 +6557,8 @@
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for kvm_open in -lkvm""... $ac_c" 1>&6
-echo "configure:6504: checking for kvm_open in -lkvm" >&5
+  echo $ac_n "checking for kvm_open in -lkvm""... $ac_c" 1>&6
+echo "configure:6562: checking for kvm_open in -lkvm" >&5
 ac_lib_var=`echo kvm'_'kvm_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6508,7 +6566,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lkvm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6512 "configure"
+#line 6570 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6519,7 +6577,7 @@
 kvm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:6523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6539,9 +6597,9 @@
   echo "$ac_t""no" 1>&6
 fi
 
-# Check for the 4.4BSD definition of getloadavg.
-echo $ac_n "checking for getloadavg in -lutil""... $ac_c" 1>&6
-echo "configure:6545: checking for getloadavg in -lutil" >&5
+  # Check for the 4.4BSD definition of getloadavg.
+  echo $ac_n "checking for getloadavg in -lutil""... $ac_c" 1>&6
+echo "configure:6603: checking for getloadavg in -lutil" >&5
 ac_lib_var=`echo util'_'getloadavg | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6549,7 +6607,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lutil  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6553 "configure"
+#line 6611 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6560,7 +6618,7 @@
 getloadavg()
 ; return 0; }
 EOF
-if { (eval echo configure:6564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6580,13 +6638,14 @@
   echo "$ac_t""no" 1>&6
 fi
 
+fi
 
 if test $ac_have_func = no; then
   # There is a commonly available library for RS/6000 AIX.
   # Since it is not a standard part of AIX, it might be installed locally.
   ac_getloadavg_LIBS="$LIBS"; LIBS="-L/usr/local/lib $LIBS"
   echo $ac_n "checking for getloadavg in -lgetloadavg""... $ac_c" 1>&6
-echo "configure:6590: checking for getloadavg in -lgetloadavg" >&5
+echo "configure:6649: checking for getloadavg in -lgetloadavg" >&5
 ac_lib_var=`echo getloadavg'_'getloadavg | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6594,7 +6653,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgetloadavg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6598 "configure"
+#line 6657 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6605,7 +6664,7 @@
 getloadavg()
 ; return 0; }
 EOF
-if { (eval echo configure:6609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6632,12 +6691,12 @@
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6636: checking for $ac_func" >&5
+echo "configure:6695: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6641 "configure"
+#line 6700 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6660,7 +6719,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6698,17 +6757,17 @@
   ac_have_func=no
   ac_safe=`echo "sys/dg_sys_info.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/dg_sys_info.h""... $ac_c" 1>&6
-echo "configure:6702: checking for sys/dg_sys_info.h" >&5
+echo "configure:6761: checking for sys/dg_sys_info.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6707 "configure"
+#line 6766 "configure"
 #include "confdefs.h"
 #include <sys/dg_sys_info.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6729,7 +6788,7 @@
 EOF
 
   echo $ac_n "checking for dg_sys_info in -ldgc""... $ac_c" 1>&6
-echo "configure:6733: checking for dg_sys_info in -ldgc" >&5
+echo "configure:6792: checking for dg_sys_info in -ldgc" >&5
 ac_lib_var=`echo dgc'_'dg_sys_info | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6737,7 +6796,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldgc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6741 "configure"
+#line 6800 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6748,7 +6807,7 @@
 dg_sys_info()
 ; return 0; }
 EOF
-if { (eval echo configure:6752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6793,17 +6852,17 @@
   if test $ac_have_func = no; then
     ac_safe=`echo "inq_stats/cpustats.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for inq_stats/cpustats.h""... $ac_c" 1>&6
-echo "configure:6797: checking for inq_stats/cpustats.h" >&5
+echo "configure:6856: checking for inq_stats/cpustats.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6802 "configure"
+#line 6861 "configure"
 #include "confdefs.h"
 #include <inq_stats/cpustats.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6836,17 +6895,17 @@
   if test $ac_have_func = no; then
     ac_safe=`echo "sys/cpustats.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/cpustats.h""... $ac_c" 1>&6
-echo "configure:6840: checking for sys/cpustats.h" >&5
+echo "configure:6899: checking for sys/cpustats.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6845 "configure"
+#line 6904 "configure"
 #include "confdefs.h"
 #include <sys/cpustats.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6877,17 +6936,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6881: checking for $ac_hdr" >&5
+echo "configure:6940: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6886 "configure"
+#line 6945 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6917,17 +6976,17 @@
 
   ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:6921: checking for nlist.h" >&5
+echo "configure:6980: checking for nlist.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6926 "configure"
+#line 6985 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6948,19 +7007,19 @@
 EOF
 
   echo $ac_n "checking for n_un in struct nlist""... $ac_c" 1>&6
-echo "configure:6952: checking for n_un in struct nlist" >&5
+echo "configure:7011: checking for n_un in struct nlist" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_nlist_n_un'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6957 "configure"
+#line 7016 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 int main() {
 struct nlist n; n.n_un.n_name = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:6964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_nlist_n_un=yes
 else
@@ -6987,12 +7046,12 @@
 
 # Some definitions of getloadavg require that the program be installed setgid.
 echo $ac_n "checking whether getloadavg requires setgid""... $ac_c" 1>&6
-echo "configure:6991: checking whether getloadavg requires setgid" >&5
+echo "configure:7050: checking whether getloadavg requires setgid" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getloadavg_setgid'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6996 "configure"
+#line 7055 "configure"
 #include "confdefs.h"
 #include "$srcdir/getloadavg.c"
 #ifdef LDAV_PRIVILEGED
@@ -7023,7 +7082,7 @@
 
 if test $ac_cv_func_getloadavg_setgid = yes; then
   echo $ac_n "checking group of /dev/kmem""... $ac_c" 1>&6
-echo "configure:7027: checking group of /dev/kmem" >&5
+echo "configure:7086: checking group of /dev/kmem" >&5
 if eval "test \"`echo '$''{'ac_cv_group_kmem'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7044,27 +7103,27 @@
 
 
 echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:7048: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:7107: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_largefile_source'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_sys_largefile_source=no
       cat > conftest.$ac_ext <<EOF
-#line 7054 "configure"
+#line 7113 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 return !fseeko;
 ; return 0; }
 EOF
-if { (eval echo configure:7061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 7068 "configure"
+#line 7127 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -7073,7 +7132,7 @@
 return !fseeko;
 ; return 0; }
 EOF
-if { (eval echo configure:7077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_largefile_source=1
 else
@@ -7097,20 +7156,20 @@
    # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
 
    echo $ac_n "checking for fseeko""... $ac_c" 1>&6
-echo "configure:7101: checking for fseeko" >&5
+echo "configure:7160: checking for fseeko" >&5
 if eval "test \"`echo '$''{'ac_cv_func_fseeko'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_func_fseeko=no
       cat > conftest.$ac_ext <<EOF
-#line 7107 "configure"
+#line 7166 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 return fseeko && fseeko (stdin, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_fseeko=yes
 else
@@ -7132,12 +7191,12 @@
 for ac_func in grantpt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7136: checking for $ac_func" >&5
+echo "configure:7195: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7141 "configure"
+#line 7200 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7160,7 +7219,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7189,12 +7248,12 @@
 for ac_func in getpt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7193: checking for $ac_func" >&5
+echo "configure:7252: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7198 "configure"
+#line 7257 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7217,7 +7276,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7247,7 +7306,7 @@
 # It's better to believe a function is not available
 # than to expect to find it in ncurses.
 echo $ac_n "checking for tparm in -lncurses""... $ac_c" 1>&6
-echo "configure:7251: checking for tparm in -lncurses" >&5
+echo "configure:7310: checking for tparm in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tparm | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7255,7 +7314,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7259 "configure"
+#line 7318 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7266,7 +7325,7 @@
 tparm()
 ; return 0; }
 EOF
-if { (eval echo configure:7270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7299,12 +7358,12 @@
   # Don't set $LIBS here -- see comments above.
   resolv=no
   echo $ac_n "checking for res_send""... $ac_c" 1>&6
-echo "configure:7303: checking for res_send" >&5
+echo "configure:7362: checking for res_send" >&5
 if eval "test \"`echo '$''{'ac_cv_func_res_send'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7308 "configure"
+#line 7367 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char res_send(); below.  */
@@ -7327,7 +7386,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_res_send=yes"
 else
@@ -7345,12 +7404,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for __res_send""... $ac_c" 1>&6
-echo "configure:7349: checking for __res_send" >&5
+echo "configure:7408: checking for __res_send" >&5
 if eval "test \"`echo '$''{'ac_cv_func___res_send'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7354 "configure"
+#line 7413 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char __res_send(); below.  */
@@ -7373,7 +7432,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func___res_send=yes"
 else
@@ -7391,7 +7450,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6
-echo "configure:7395: checking for res_send in -lresolv" >&5
+echo "configure:7454: checking for res_send in -lresolv" >&5
 ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7399,7 +7458,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7403 "configure"
+#line 7462 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7410,7 +7469,7 @@
 res_send()
 ; return 0; }
 EOF
-if { (eval echo configure:7414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7429,7 +7488,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for __res_send in -lresolv""... $ac_c" 1>&6
-echo "configure:7433: checking for __res_send in -lresolv" >&5
+echo "configure:7492: checking for __res_send in -lresolv" >&5
 ac_lib_var=`echo resolv'_'__res_send | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7437,7 +7496,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7441 "configure"
+#line 7500 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7448,7 +7507,7 @@
 __res_send()
 ; return 0; }
 EOF
-if { (eval echo configure:7452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7484,12 +7543,12 @@
     RESOLVLIB=
   fi
   echo $ac_n "checking for hes_getmailhost""... $ac_c" 1>&6
-echo "configure:7488: checking for hes_getmailhost" >&5
+echo "configure:7547: checking for hes_getmailhost" >&5
 if eval "test \"`echo '$''{'ac_cv_func_hes_getmailhost'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7493 "configure"
+#line 7552 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char hes_getmailhost(); below.  */
@@ -7512,7 +7571,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_hes_getmailhost=yes"
 else
@@ -7530,7 +7589,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for hes_getmailhost in -lhesiod""... $ac_c" 1>&6
-echo "configure:7534: checking for hes_getmailhost in -lhesiod" >&5
+echo "configure:7593: checking for hes_getmailhost in -lhesiod" >&5
 ac_lib_var=`echo hesiod'_'hes_getmailhost | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7538,7 +7597,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lhesiod $RESOLVLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7542 "configure"
+#line 7601 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7549,7 +7608,7 @@
 hes_getmailhost()
 ; return 0; }
 EOF
-if { (eval echo configure:7553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7580,7 +7639,7 @@
 # These tell us which Kerberos-related libraries to use.
 if test "${with_kerberos+set}" = set; then
   echo $ac_n "checking for com_err in -lcom_err""... $ac_c" 1>&6
-echo "configure:7584: checking for com_err in -lcom_err" >&5
+echo "configure:7643: checking for com_err in -lcom_err" >&5
 ac_lib_var=`echo com_err'_'com_err | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7588,7 +7647,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcom_err  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7592 "configure"
+#line 7651 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7599,7 +7658,7 @@
 com_err()
 ; return 0; }
 EOF
-if { (eval echo configure:7603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7627,7 +7686,7 @@
 fi
 
   echo $ac_n "checking for mit_des_cbc_encrypt in -lk5crypto""... $ac_c" 1>&6
-echo "configure:7631: checking for mit_des_cbc_encrypt in -lk5crypto" >&5
+echo "configure:7690: checking for mit_des_cbc_encrypt in -lk5crypto" >&5
 ac_lib_var=`echo k5crypto'_'mit_des_cbc_encrypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7635,7 +7694,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lk5crypto  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7639 "configure"
+#line 7698 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7646,7 +7705,7 @@
 mit_des_cbc_encrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:7650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7674,7 +7733,7 @@
 fi
 
   echo $ac_n "checking for mit_des_cbc_encrypt in -lcrypto""... $ac_c" 1>&6
-echo "configure:7678: checking for mit_des_cbc_encrypt in -lcrypto" >&5
+echo "configure:7737: checking for mit_des_cbc_encrypt in -lcrypto" >&5
 ac_lib_var=`echo crypto'_'mit_des_cbc_encrypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7682,7 +7741,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7686 "configure"
+#line 7745 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7693,7 +7752,7 @@
 mit_des_cbc_encrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:7697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7721,7 +7780,7 @@
 fi
 
   echo $ac_n "checking for krb5_init_context in -lkrb5""... $ac_c" 1>&6
-echo "configure:7725: checking for krb5_init_context in -lkrb5" >&5
+echo "configure:7784: checking for krb5_init_context in -lkrb5" >&5
 ac_lib_var=`echo krb5'_'krb5_init_context | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7729,7 +7788,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lkrb5  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7733 "configure"
+#line 7792 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7740,7 +7799,7 @@
 krb5_init_context()
 ; return 0; }
 EOF
-if { (eval echo configure:7744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7769,7 +7828,7 @@
 
   if test "${with_kerberos5+set}" != set; then
     echo $ac_n "checking for des_cbc_encrypt in -ldes425""... $ac_c" 1>&6
-echo "configure:7773: checking for des_cbc_encrypt in -ldes425" >&5
+echo "configure:7832: checking for des_cbc_encrypt in -ldes425" >&5
 ac_lib_var=`echo des425'_'des_cbc_encrypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7777,7 +7836,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldes425  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7781 "configure"
+#line 7840 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7788,7 +7847,7 @@
 des_cbc_encrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:7792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7814,7 +7873,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for des_cbc_encrypt in -ldes""... $ac_c" 1>&6
-echo "configure:7818: checking for des_cbc_encrypt in -ldes" >&5
+echo "configure:7877: checking for des_cbc_encrypt in -ldes" >&5
 ac_lib_var=`echo des'_'des_cbc_encrypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7822,7 +7881,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldes  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7826 "configure"
+#line 7885 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7833,7 +7892,7 @@
 des_cbc_encrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:7837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7863,7 +7922,7 @@
 fi
 
     echo $ac_n "checking for krb_get_cred in -lkrb4""... $ac_c" 1>&6
-echo "configure:7867: checking for krb_get_cred in -lkrb4" >&5
+echo "configure:7926: checking for krb_get_cred in -lkrb4" >&5
 ac_lib_var=`echo krb4'_'krb_get_cred | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7871,7 +7930,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lkrb4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7875 "configure"
+#line 7934 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7882,7 +7941,7 @@
 krb_get_cred()
 ; return 0; }
 EOF
-if { (eval echo configure:7886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7908,7 +7967,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for krb_get_cred in -lkrb""... $ac_c" 1>&6
-echo "configure:7912: checking for krb_get_cred in -lkrb" >&5
+echo "configure:7971: checking for krb_get_cred in -lkrb" >&5
 ac_lib_var=`echo krb'_'krb_get_cred | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7916,7 +7975,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lkrb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7920 "configure"
+#line 7979 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7927,7 +7986,7 @@
 krb_get_cred()
 ; return 0; }
 EOF
-if { (eval echo configure:7931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7963,17 +8022,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7967: checking for $ac_hdr" >&5
+echo "configure:8026: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7972 "configure"
+#line 8031 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8004,17 +8063,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8008: checking for $ac_hdr" >&5
+echo "configure:8067: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8013 "configure"
+#line 8072 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8041,17 +8100,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8045: checking for $ac_hdr" >&5
+echo "configure:8104: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8050 "configure"
+#line 8109 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8078,17 +8137,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8082: checking for $ac_hdr" >&5
+echo "configure:8141: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8087 "configure"
+#line 8146 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8124,17 +8183,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8128: checking for $ac_hdr" >&5
+echo "configure:8187: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8133 "configure"
+#line 8192 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8161,17 +8220,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8165: checking for $ac_hdr" >&5
+echo "configure:8224: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8170 "configure"
+#line 8229 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8198,17 +8257,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8202: checking for $ac_hdr" >&5
+echo "configure:8261: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8207 "configure"
+#line 8266 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8245,17 +8304,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8249: checking for $ac_hdr" >&5
+echo "configure:8308: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8254 "configure"
+#line 8313 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8286,7 +8345,7 @@
 # Solaris requires -lintl if you want strerror (which calls dgettext)
 # to return localized messages.
 echo $ac_n "checking for dgettext in -lintl""... $ac_c" 1>&6
-echo "configure:8290: checking for dgettext in -lintl" >&5
+echo "configure:8349: checking for dgettext in -lintl" >&5
 ac_lib_var=`echo intl'_'dgettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8294,7 +8353,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8298 "configure"
+#line 8357 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8305,7 +8364,7 @@
 dgettext()
 ; return 0; }
 EOF
-if { (eval echo configure:8309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8334,7 +8393,7 @@
 
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:8338: checking whether localtime caches TZ" >&5
+echo "configure:8397: checking whether localtime caches TZ" >&5
 if eval "test \"`echo '$''{'emacs_cv_localtime_cache'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8344,7 +8403,7 @@
 emacs_cv_localtime_cache=yes
 else
   cat > conftest.$ac_ext <<EOF
-#line 8348 "configure"
+#line 8407 "configure"
 #include "confdefs.h"
 #include <time.h>
 extern char **environ;
@@ -8376,7 +8435,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:8380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   emacs_cv_localtime_cache=no
 else
@@ -8406,12 +8465,12 @@
   for ac_func in gettimeofday
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8410: checking for $ac_func" >&5
+echo "configure:8469: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8415 "configure"
+#line 8474 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8434,7 +8493,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8459,12 +8518,12 @@
 done
 
   echo $ac_n "checking whether gettimeofday can accept two arguments""... $ac_c" 1>&6
-echo "configure:8463: checking whether gettimeofday can accept two arguments" >&5
+echo "configure:8522: checking whether gettimeofday can accept two arguments" >&5
 if eval "test \"`echo '$''{'emacs_cv_gettimeofday_two_arguments'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8468 "configure"
+#line 8527 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -8482,7 +8541,7 @@
      gettimeofday (&time, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:8486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   emacs_cv_gettimeofday_two_arguments=yes
 else
@@ -8505,25 +8564,25 @@
 
 if test "$ac_cv_func_gettimeofday" = yes; then
   echo $ac_n "checking for struct timezone""... $ac_c" 1>&6
-echo "configure:8509: checking for struct timezone" >&5
+echo "configure:8568: checking for struct timezone" >&5
 if eval "test \"`echo '$''{'emacs_cv_struct_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8514 "configure"
+#line 8573 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 int main() {
 struct timezone tz;
 ; return 0; }
 EOF
-if { (eval echo configure:8521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
               if test "$cross_compiling" = yes; then
   emacs_cv_struct_timezone=yes
 else
   cat > conftest.$ac_ext <<EOF
-#line 8527 "configure"
+#line 8586 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -8542,7 +8601,7 @@
   exit (gettimeofday (&time, &dummy));
 }
 EOF
-if { (eval echo configure:8546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   emacs_cv_struct_timezone=yes
 else
@@ -8568,12 +8627,12 @@
 
 ok_so_far=yes
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:8572: checking for socket" >&5
+echo "configure:8631: checking for socket" >&5
 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8577 "configure"
+#line 8636 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -8596,7 +8655,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -8619,17 +8678,17 @@
 if test $ok_so_far = yes; then
   ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:8623: checking for netinet/in.h" >&5
+echo "configure:8682: checking for netinet/in.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8628 "configure"
+#line 8687 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8655,17 +8714,17 @@
 if test $ok_so_far = yes; then
   ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:8659: checking for arpa/inet.h" >&5
+echo "configure:8718: checking for arpa/inet.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8664 "configure"
+#line 8723 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8703,7 +8762,7 @@
 fi
 
 echo $ac_n "checking whether system supports dynamic ptys""... $ac_c" 1>&6
-echo "configure:8707: checking whether system supports dynamic ptys" >&5
+echo "configure:8766: checking whether system supports dynamic ptys" >&5
 if test -d /dev/pts && ls -d /dev/ptmx > /dev/null 2>&1 ; then
   echo "$ac_t""yes" 1>&6
   cat >> confdefs.h <<\EOF
@@ -8715,12 +8774,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:8719: checking for pid_t" >&5
+echo "configure:8778: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8724 "configure"
+#line 8783 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -8749,17 +8808,17 @@
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:8753: checking for vfork.h" >&5
+echo "configure:8812: checking for vfork.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8758 "configure"
+#line 8817 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8784,18 +8843,18 @@
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:8788: checking for working vfork" >&5
+echo "configure:8847: checking for working vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:8794: checking for vfork" >&5
+echo "configure:8853: checking for vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8799 "configure"
+#line 8858 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -8818,7 +8877,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else
@@ -8840,7 +8899,7 @@
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 8844 "configure"
+#line 8903 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -8935,7 +8994,7 @@
   }
 }
 EOF
-if { (eval echo configure:8939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_vfork_works=yes
 else
@@ -8960,12 +9019,12 @@
 
 # Fixme: This should be replaced when we have autoconf 2.14.
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:8964: checking for size_t" >&5
+echo "configure:9023: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8969 "configure"
+#line 9028 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9159,7 +9218,7 @@
 ## C preprocessor.
 
 cat > conftest.$ac_ext <<EOF
-#line 9163 "configure"
+#line 9222 "configure"
 #include "confdefs.h"
 yes..yes
 EOF
@@ -9587,7 +9646,7 @@
 `"
 
 echo creating src/epaths.h
-make epaths-force
+${MAKE-make} epaths-force
 
 # As of 2000-11-19, newest development versions of GNU cpp preprocess
 # `..' to `. .'  unless invoked with -traditional
diff -ruN src-21.1/configure.in src-21.2/configure.in
--- src-21.1/configure.in	Fri Oct 19 16:09:18 2001
+++ src-21.2/configure.in	Fri Mar 15 13:44:20 2002
@@ -95,9 +95,9 @@
 [  --with-png              use -lpng for displaying PNG images])
 AC_ARG_WITH(toolkit-scroll-bars,
 [  --without-toolkit-scroll-bars
-                           don't use Motif or Xaw3d scroll bars])
+                          don't use Motif or Xaw3d scroll bars])
 AC_ARG_WITH(xim,
-[  --without-xim	   don't use X11 XIM])
+[  --without-xim           don't use X11 XIM])
 
 #### Make srcdir absolute, if it isn't already.  It's important to
 #### avoid running the path through pwd unnecessarily, since pwd can
@@ -236,7 +236,7 @@
       *-*-bsdi2.0* )		opsys=bsdos2 ;;
       *-*-bsdi2* )		opsys=bsdos2-1 ;;
       *-*-bsdi3* )		opsys=bsdos3 ;;
-      *-*-bsdi4* )		opsys=bsdos4 ;;
+      *-*-bsdi[45]* )		opsys=bsdos4 ;;
     esac
   ;;
 
@@ -524,9 +524,13 @@
   hppa*-hp-hpux9* )
     machine=hp800 opsys=hpux9
   ;;
-  hppa*-hp-hpux1[0-9]* )
+
+  hppa*-hp-hpux10* )
     machine=hp800 opsys=hpux10
   ;;
+  hppa*-hp-hpux1[1-9]* )
+    machine=hp800 opsys=hpux11
+  ;;
 
   ## HP 9000 series 700 and 800, running HP/UX
   hppa*-hp-hpux* )
@@ -574,6 +578,9 @@
   rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2*  )
     machine=ibmrs6000 opsys=aix4-2
   ;;
+  rs6000-ibm-aix5.1* | powerpc-ibm-aix5.1*  )
+    machine=ibmrs6000 opsys=aix4-2
+  ;;
   rs6000-ibm-aix4.0* | powerpc-ibm-aix4.0*  )
     machine=ibmrs6000 opsys=aix4
   ;;
@@ -2290,7 +2297,7 @@
 changequote([, ])dnl
 
 echo creating src/epaths.h
-make epaths-force
+${MAKE-make} epaths-force
 
 # As of 2000-11-19, newest development versions of GNU cpp preprocess
 # `..' to `. .'  unless invoked with -traditional
diff -ruN src-21.1/etc/ChangeLog src-21.2/etc/ChangeLog
--- src-21.1/etc/ChangeLog	Sat Oct 20 18:15:55 2001
+++ src-21.2/etc/ChangeLog	Sat Mar 16 11:47:28 2002
@@ -1,3 +1,7 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
diff -ruN src-21.1/etc/DEBUG src-21.2/etc/DEBUG
--- src-21.1/etc/DEBUG	Sun May  6 18:32:53 2001
+++ src-21.2/etc/DEBUG	Wed Feb  6 12:47:20 2002
@@ -41,7 +41,7 @@
 (C-g in Emacs) to be passed to Emacs and not give control back to GDB.
 On modern POSIX systems, you can override that with this command:
 
-   handle int stop nopass
+   handle SIGINT stop nopass
 
 After this `handle' command, SIGINT will return control to GDB.  If
 you want the C-g to cause a QUIT within Emacs as well, omit the
@@ -258,6 +258,49 @@
 the backtrace when Emacs stops inside that function will show what
 code causes the X protocol errors.
 
+Some bugs related to the X protocol disappear when Emacs runs in a
+synchronous mode.  To track down those bugs, we suggest the following
+procedure:
+
+  - Run Emacs under a debugger and put a breakpoint inside the
+    primitive function which, when called from Lisp, triggers the X
+    protocol errors.  For example, if the errors happen when you
+    delete a frame, put a breakpoint inside `Fdelete_frame'.
+
+  - When the breakpoint breaks, step through the code, looking for
+    calls to X functions (the ones whose names begin with "X" or
+    "Xt" or "Xm").
+
+  - Insert calls to `XSync' before and after each call to the X
+    functions, like this:
+
+       XSync (f->output_data.x->display_info->display, 0);
+
+    where `f' is the pointer to the `struct frame' of the selected
+    frame, normally available via XFRAME (selected_frame).  (Most
+    functions which call X already have some variable that holds the
+    pointer to the frame, perhaps called `f' or `sf', so you shouldn't
+    need to compute it.)
+
+    If your debugger can call functions in the program being debugged,
+    you should be able to issue the calls to `XSync' without recompiling
+    Emacs.  For example, with GDB, just type:
+
+       call XSync (f->output_data.x->display_info->display, 0)
+
+    before and immediately after the suspect X calls.  If your
+    debugger does not support this, you will need to add these pairs
+    of calls in the source and rebuild Emacs.
+
+    Either way, systematically step through the code and issue these
+    calls until you find the first X function called by Emacs after
+    which a call to `XSync' winds up in the function
+    `x_error_quitter'.  The first X function call for which this
+    happens is the one that generated the X protocol error.
+
+  - You should now look around this offending X call and try to figure
+    out what is wrong with it.
+
 ** If the symptom of the bug is that Emacs fails to respond
 
 Don't assume Emacs is `hung'--it may instead be in an infinite loop.
@@ -436,6 +479,31 @@
 some extra checks, such as look for broken relations between byte and
 character positions in buffers and strings; the resulting diagnostics
 might pinpoint the cause of the problem.
+
+** Debugging the TTY (non-windowed) version
+
+The most convenient method of debugging the character-terminal display
+is to do that on a window system such as X.  Begin by starting an
+xterm window, then type these commands inside that window:
+
+  $ tty
+  $ echo $TERM
+
+Let's say these commands print "/dev/ttyp4" and "xterm", respectively.
+
+Now start Emacs (the normal, windowed-display session, i.e. without
+the `-nw' option), and invoke "M-x gdb RET emacs RET" from there.  Now
+type these commands at GDB's prompt:
+
+  (gdb) set args -nw -t /dev/ttyp4
+  (gdb) set environment TERM xterm
+  (gdb) run
+
+The debugged Emacs should now start in no-window mode with its display
+directed to the xterm window you opened above.
+
+Similar arrangement is possible on a character terminal by using the
+`screen' package.
 
 ** Running Emacs built with malloc debugging packages
 
diff -ruN src-21.1/etc/MORE.STUFF src-21.2/etc/MORE.STUFF
--- src-21.1/etc/MORE.STUFF	Sun Aug 19 22:16:10 2001
+++ src-21.2/etc/MORE.STUFF	Sun Nov  4 04:18:39 2001
@@ -15,31 +15,6 @@
 Please submit a bug report if you find that any of the addresses
 listed here fail.
 
-* The LCD archive
-
-There is a large collection of Emacs Lisp code available for FTP at
-<URL:ftp://ftp.cis.ohio-state.edu> and various mirrors.  At this time,
-serious maintenance is resuming after a long hiatus.  
-
-To get started using this archive, do:
-
-	ftp ftp.cis.ohio-state.edu
-
-Once you're in FTP, do
-
-	cd pub/emacs-lisp
-	bin
-	get lispdir.el.Z
-	get LCD-datafile.Z
-
-and exit.  Then do:
-
-	gunzip *.Z
-
-The lispdir.el package will help you search for useful packages in the
-LCD-datafile, which is a list of the archive constants.  It will even
-fetch them for you on command.
-
 * The `Emacs Lisp List' at
   <URL:http://www.anc.ed.ac.uk/%7Estephen/emacs/ell.html> has pointers
   to sources of a large number of packages.
diff -ruN src-21.1/etc/NEWS src-21.2/etc/NEWS
--- src-21.1/etc/NEWS	Mon Oct 15 10:19:36 2001
+++ src-21.2/etc/NEWS	Fri Mar 15 14:01:27 2002
@@ -6,6 +6,57 @@
 For older news, see the file ONEWS
 
 
+* Installation changes in Emacs 21.2
+
+** Support for BSD/OS 5.0 has been added.
+
+** Support for AIX 5.1 was added.
+
+
+* Changes in Emacs 21.2
+
+** Emacs now supports ICCCM Extended Segments in X selections.
+
+Some versions of X, notably XFree86, use Extended Segments to encode
+in X selections characters that belong to character sets which are not
+part of the list of standard charsets supported by the ICCCM spec.
+Examples of such non-standard character sets include ISO 8859-14, ISO
+8859-15, KOI8-R, and BIG5.  To paste selections with such characters
+into Emacs, use the new coding system compound-text-with-extensions as
+the value of selection-coding-system.
+
+** The default values of `tooltip-delay' and `tooltip-hide-delay'
+were changed.
+
+** On terminals whose erase-char is ^H (Backspace), Emacs
+now uses normal-erase-is-backspace-mode.
+
+** When the *scratch* buffer is recreated, its mode is set from
+initial-major-mode, which normally is lisp-interaction-mode,
+instead of using default-major-mode.
+
+** The new option `Info-scroll-prefer-subnodes' causes Info to behave
+like the stand-alone Info reader (from the GNU Texinfo package) as far
+as motion between nodes and their subnodes is concerned.  If it is t
+(the default), Emacs behaves as before when you type SPC in a menu: it
+visits the subnode pointed to by the first menu entry.  If this option
+is nil, SPC scrolls to the end of the current node, and only then goes
+to the first menu item, like the stand-alone reader does.
+
+This change was already in Emacs 21.1, but wasn't advertised in the
+NEWS.
+
+
+* Lisp Changes in Emacs 21.2
+
+** The meanings of scroll-up-aggressively and scroll-down-aggressively
+have been interchanged, so that the former now controls scrolling up,
+and the latter now controls scrolling down.
+
+** The variable `compilation-parse-errors-filename-function' can
+be used to transform filenames found in compilation output.
+
+
 * Installation Changes in Emacs 21.1
 
 See the INSTALL file for information on installing extra libraries and
@@ -236,13 +287,9 @@
 
 Currently, the following actions have been defined:
 
-- Mouse-1 on the buffer name in the mode line switches between two
-buffers.
+- Mouse-1 on the buffer name in the mode line goes to the next buffer.
 
-- Mouse-2 on the buffer-name switches to the next buffer, and
-M-mouse-2 switches to the previous buffer in the buffer list.
-
-- Mouse-3 on the buffer-name displays a buffer menu.
+- Mouse-3 on the buffer-name goes to the previous buffer.
 
 - Mouse-2 on the read-only or modified status in the mode line (`%' or
 `*') toggles the status.
@@ -761,6 +808,11 @@
 wipe out all the other customizationss you might have on your init
 file.
 
+** If Emacs was invoked with the `-q' or `--no-init-file' options, it
+does not save disabled and enabled commands for future sessions, to
+avoid overwriting existing customizations of this kind that are
+already in your init file.
+
 ** New features in evaluation commands
 
 *** The commands to evaluate Lisp expressions, such as C-M-x in Lisp
@@ -781,7 +833,7 @@
 The default value of eval-expression-debug-on-error is t, so any error
 during evaluation produces a backtrace.
 
-*** The function `eval-defun' (M-C-x) now loads Edebug and instruments
+*** The function `eval-defun' (C-M-x) now loads Edebug and instruments
 code when called with a prefix argument.
 
 ** CC mode changes.
@@ -1440,7 +1492,7 @@
 *** Isearch now puts a call to `isearch-resume' in the command history,
 so that searches can be resumed.
 
-*** In Isearch mode, M-C-s and M-C-r are now bound like C-s and C-r,
+*** In Isearch mode, C-M-s and C-M-r are now bound like C-s and C-r,
 respectively, i.e. you can repeat a regexp isearch with the same keys
 that started the search.
 
@@ -2183,7 +2235,8 @@
 
 ** Since `format' preserves text properties, the idiom
 `(format "%s" foo)' no longer works to copy and remove properties.
-Use `copy-sequence' and `set-text-properties'.
+Use `copy-sequence' to copy the string, then use `set-text-properties'
+to remove the properties of the copy.
 
 ** Since the `keymap' text property now has significance, some code
 which uses both `local-map' and `keymap' properties (for portability)
@@ -2253,7 +2306,7 @@
 
 ** Function assq-delete-all replaces function assoc-delete-all.
 
-** The new function amimate-string, from lisp/play/animate.el 
+** The new function animate-string, from lisp/play/animate.el 
 allows the animated display of strings.
 
 ** The new function `interactive-form' can be used to obtain the
@@ -2461,11 +2514,6 @@
 
 * Lisp changes in Emacs 21.1 (see following page for display-related features)
 
-Note that +++ before an item means the Lisp manual has been updated.
---- means that I have decided it does not need to be in the Lisp manual.
-When you add a new item, please add it without either +++ or ---
-so I will know I still need to look at it -- rms.
-
 ** The new package rx.el provides an alternative sexp notation for
 regular expressions.
 
@@ -2994,7 +3042,7 @@
 
 ** Variables `beginning-of-defun-function' and `end-of-defun-function'
 can be used to define handlers for the functions that find defuns.
-Major modes can define these locally instead of rebinding M-C-a
+Major modes can define these locally instead of rebinding C-M-a
 etc. if the normal conventions for defuns are not appropriate for the
 mode.
 
@@ -3469,11 +3517,6 @@
 
 * New Lisp-level Display features in Emacs 21.1
 
-Note that +++ before an item means the Lisp manual has been updated.
---- means that I have decided it does not need to be in the Lisp manual.
-When you add a new item, please add it without either +++ or ---
-so I will know I still need to look at it -- rms.
-
 ** The function tty-suppress-bold-inverse-default-colors can be used
 to make Emacs avoid displaying text with bold black foreground on TTYs.
 
@@ -7285,7 +7328,7 @@
   * @		dired-mark-symlinks		@  (binding deleted)
   * u		dired-unmark			u
   * DEL		dired-unmark-backward		DEL
-  * ?		dired-unmark-all-files		M-C-?
+  * ?		dired-unmark-all-files		C-M-?
   * !		dired-unmark-all-marks
   * %		dired-mark-files-regexp		% m
   * C-n		dired-next-marked-file		M-}
@@ -7357,7 +7400,7 @@
 generating lines in buffers.
 
 *** Several commands in the group buffer can be undone with
-`M-C-_'.
+`C-M-_'.
 
 *** Scoring can be done on words using the new score type `w'.
 
@@ -7378,7 +7421,7 @@
    `M-x gnus-group-clear-data-on-native-groups'
 
 *** A new command for reading collections of documents
-(nndoc with nnvirtual on top) has been added -- `M-C-d'.
+(nndoc with nnvirtual on top) has been added -- `C-M-d'.
 
 *** Process mark sets can be pushed and popped.
 
@@ -8124,7 +8167,7 @@
 appropriate functions.
 
 *** New interactive functions for repositioning and marking of
-entries. They are bound by default to M-C-l and M-C-h.
+entries. They are bound by default to C-M-l and C-M-h.
 
 *** New hook bibtex-clean-entry-hook. It is called after entry has
 been cleaned.
diff -ruN src-21.1/etc/PROBLEMS src-21.2/etc/PROBLEMS
--- src-21.1/etc/PROBLEMS	Fri Oct 19 13:17:59 2001
+++ src-21.2/etc/PROBLEMS	Sat Mar 16 11:34:37 2002
@@ -19,7 +19,7 @@
 unknown ones.  To force the `configure' script to use `-traditional',
 run the script like this:
 
-  CPP='gcc -E -traditional" ./configure ...
+  CPP='gcc -E -traditional' ./configure ...
 
 (replace the ellipsis "..." with any additional arguments you pass to
 the script).
@@ -27,6 +27,23 @@
 Note that this problem does not pertain to the MS-Windows port of
 Emacs, since it doesn't use the preprocessor to generate Makefiles.
 
+* Building Emacs with a system compiler fails to link because of an
+  undefined symbol such as __eprintf which does not appear in Emacs.
+
+This can happen if some of the libraries linked into Emacs were built
+with GCC, but Emacs itself is being linked with a compiler other than
+GCC.  Object files compiled with GCC might need some helper functions
+from libgcc.a, the library which comes with GCC, but the system
+compiler does not instruct the linker to search libgcc.a during the
+link stage.
+
+A solution is to link with GCC, like this:
+
+  	make CC=gcc
+
+Since the .o object files already exist, this will not recompile Emacs
+with GCC, but just start by trying again to link temacs.
+
 * Building the MS-Windows port with Cygwin GCC can fail.
 
 Emacs may not build using recent Cygwin builds of GCC, such as Cygwin
@@ -40,7 +57,7 @@
 
 The error message might be something like this:
 
- Converting d:/emacs-21.1/leim/CXTERM-DIC/4Corner.tit to quail-package...
+ Converting d:/emacs-21.2/leim/CXTERM-DIC/4Corner.tit to quail-package...
  Invalid ENCODE: value in TIT dictionary
  NMAKE : fatal error U1077: '"../src/obj-spd/i386/emacs.exe"' : return code
        '0xffffffff'
@@ -200,12 +217,51 @@
 is probably a bug in Xaw3d; when Xaw3d is compiled with arrows, the
 problem disappears.
 
+* There are known binary incompatibilities between Xaw, Xaw3d, neXtaw,
+XawM and the few other derivatives of Xaw.  So when you compile with
+one of these, it may not work to dynamically link with another one.
+For example, strange problems, such as Emacs exiting when you type
+"C-x 1", were reported when Emacs compiled with Xaw3d and libXaw was
+used with neXtaw at run time.
+
+The solution is to rebuild Emacs with the toolkit version you actually
+want to use, or set LD_PRELOAD to preload the same toolkit version you
+built Emacs with.
+
 * Clicking C-mouse-2 in the scroll bar doesn't split the window.
 
 This currently doesn't work with scroll-bar widgets (and we don't know
 a good way of implementing it with widgets).  If Emacs is configured
 --without-toolkit-scroll-bars, C-mouse-2 on the scroll bar does work.
 
+* Emacs aborts inside the function `tparam1'.
+
+This can happen if Emacs was built without terminfo support, but the
+terminal's capabilities use format that is only supported by terminfo.
+If your system has ncurses installed, this might happen if your
+version of ncurses is broken; upgrading to a newer version of ncurses
+and reconfiguring and rebuilding Emacs should solve this.
+
+All modern systems support terminfo, so even if ncurses is not the
+problem, you should look for a way to configure Emacs so that it uses
+terminfo when built.
+
+* Error messages about undefined colors on X.
+
+The messages might say something like this:
+
+   Unable to load color "grey95"
+
+(typically, in the `*Messages*' buffer), or something like this:
+
+  Error while displaying tooltip: (error Undefined color lightyellow)
+
+These problems could happen if some other X program has used up too
+many colors of the X palette, leaving Emacs with insufficient system
+resources to load all the colors it needs.
+
+A solution is to exit the offending X programs before starting Emacs.
+
 * Colors are not available on a tty or in xterm.
 
 Emacs 21 supports colors on character terminals and terminal
@@ -244,6 +300,29 @@
 global-font-lock-mode RET" or by customizing the variable
 `global-font-lock-mode'.
 
+* Emacs on a tty switches the cursor to large blinking block.
+
+This was reported to happen on some GNU/Linux systems which use
+ncurses version 5.0, but could be relevant for other versions as well.
+These versions of ncurses come with a `linux' terminfo entry, where
+the "cvvis" capability (termcap "vs") is defined as "\E[?25h\E[?8c"
+(show cursor, change size).  This escape sequence switches on a
+blinking hardware text-mode cursor whose size is a full character
+cell.  This blinking cannot be stopped, since a hardware cursor
+always blinks.
+
+A work-around is to redefine the "cvvis" capability so that it
+enables a *software* cursor.  The software cursor works by inverting
+the colors of the character at point, so what you see is a block
+cursor that doesn't blink.  For this to work, you need to redefine
+the "cnorm" capability as well, so that it operates on the software
+cursor instead of the hardware cursor.
+
+To this end, run "infocmp linux > linux-term", edit the file
+`linux-term' to make both the "cnorm" and "cvvis" capabilities send
+the sequence "\E[?25h\E[?17;0;64c", and then run "tic linux-term" to
+produce a modified terminfo entry.
+
 * Problems in Emacs built with LessTif.
 
 The problems seem to depend on the version of LessTif and the Motif
@@ -262,32 +341,29 @@
 what causes these problems; they are not reproducible by Emacs
 developers.
 
-* Known problems with the MS-Windows port of Emacs 21.1.
+* Known problems with the MS-Windows port of Emacs 21.2.
 
-Emacs 21.1 built for MS-Windows doesn't support images, the tool bar,
+Emacs 21.2 built for MS-Windows doesn't support images, the tool bar,
 and tooltips.  Support for these will be added in future versions.
 
 Help text that is displayed in a tooltip on other window systems, on
 Windows is printed in the echo area, since tooltips are not yet
-available.  Help text for menu items is not displayed at all.
+available.
 
-There are problems with display if the variable `redisplay-dont-pause'
-is set to nil (w32-win.el sets it to t by default, to avoid these
-problems).  The problems include:
+Frames are not refreshed while the File or Font dialog or a pop-up menu
+is displayed. This also means help text for pop-up menu items is not
+displayed at all.  This is because message handling under Windows is
+synchronous, so we cannot handle repaint (or any other) messages while
+waiting for a system function to return the result of the dialog or
+pop-up menu interaction.
+
+There are problems with display if mouse-tracking is enabled and the
+mouse is moved off a frame, over another frame then back over the first
+frame.  A workaround is to click the left mouse button inside the frame
+after moving back into it.
 
-  . No redisplay as long as help echo is displayed in the echo area,
-    e.g. if the mouse is on a mouse-sensitive part of the mode line.
-
-  . When the mode line is dragged with the mouse, multiple copies of the
-    mode line are left behind, until the mouse button is released and
-    the next input event occurs.
-
-  . Window contents are not updated when text is selected by dragging
-    the mouse, and the mouse is dragged below the bottom line of the
-    window.  When the mouse button is released, the window display is
-    correctly updated.
-
-Again, these problems only occur if `redisplay-dont-pause' is nil.
+Some minor flickering still persists during mouse-tracking, although
+not as severely as in 21.1.
 
 Emacs can sometimes abort when non-ASCII text, possibly with null
 characters, is copied and pasted into a buffer.
@@ -295,9 +371,9 @@
 An inactive cursor remains in an active window after the Windows
 Manager driven switch of the focus, until a key is pressed.
 
-Windows 2000 input methods are not recognized by Emacs (as of v21.1).
-These input methods cause the keyboard to send characters encoded in
-the appropriate coding system (e.g., ISO 8859-1 for Latin-1
+Windows input methods are not recognized by Emacs (as of v21.2).  Some
+of these input methods cause the keyboard to send characters encoded
+in the appropriate coding system (e.g., ISO 8859-1 for Latin-1
 characters, ISO 8859-8 for Hebrew characters, etc.).  To make this
 work, set the keyboard coding system to the appropriate value after
 you activate the Windows input method.  For example, if you activate
@@ -306,15 +382,20 @@
 appropriate keyboard encoding automatically, but it doesn't do that
 yet.)
 
-Multilingual text put into the Windows 2000 clipboard by Windows
-applications cannot be safely pasted into Emacs (as of v21.1).  This
-is because Windows 2000 uses Unicode to represent multilingual text,
-but Emacs does not yet support Unicode well enough to decode it.  This
+Multilingual text put into the Windows clipboard by other Windows
+applications cannot be safely pasted into Emacs (as of v21.2).  This
+is because Windows uses Unicode to represent multilingual text, but
+Emacs does not yet support Unicode well enough to decode it.  This
 means that Emacs can only interchange non-ASCII text with other
-Windows 2000 programs if the characters are in the system codepage.
+Windows programs if the characters are in the system codepage.
 Reportedly, a partial solution is to install the Mule-UCS package and
 set selection-coding-system to utf-16-le-dos.
 
+The %h format specifier for format-time-string does not work on Windows.
+The %b format specifier does not produce abbreviated month names with
+consistent widths for some locales on some versions of Windows. This is
+caused by a deficiency in the underlying system library function.
+
 * The `configure' script doesn't find the jpeg library.
 
 This can happen because the linker by default only looks for shared
@@ -372,6 +453,17 @@
 
 The solution is to remove this line from `etc/fstab'.
 
+* Emacs binary is not in executable format, and cannot be run.
+
+This was reported to happen when Emacs is built in a directory mounted
+via NFS.  Usually, the file `emacs' produced in these cases is full of
+binary null characters, and the `file' utility says:
+
+    emacs: ASCII text, with no line terminators
+
+We don't know what exactly causes this failure.  A work-around is to
+build Emacs in a directory on a local disk.
+
 * Accented ISO-8859-1 characters are displayed as | or _.
 
 Try other font set sizes (S-mouse-1).  If the problem persists with
@@ -395,7 +487,7 @@
 * Large file support is disabled on HP-UX.  See the comments in
 src/s/hpux10.h.
 
-* Crashes when displaying uncompressed GIFs with version
+* Crashes when displaying GIF images in Emacs built with version
 libungif-4.1.0 are resolved by using version libungif-4.1.0b1.
 
 * Font Lock displays portions of the bufefr in incorrect faces.
@@ -420,6 +512,30 @@
 Another alternative is to avoid a paren in column zero.  For example,
 in a Lisp string you could precede the paren with a backslash.
 
+* When running on KDE, colors or fonts are not as specified for Emacs,
+or messed up.
+
+For examlpe, you could see background you set for Emacs only in the
+empty portions of the Emacs display, while characters have some other
+background.
+
+This happens because KDE's defaults apply its color and font
+definitions even to applications that weren't compiled for KDE.  The
+solution is to uncheck the "Apply fonts and colors to non-KDE apps"
+option in Preferences->Look&Feel->Style.
+
+Alternatively, if you do want the KDE defaults to apply to other
+applications, but not to Emacs, you could modify the file `Emacs.ad'
+(should be in the `/usr/share/apps/kdisplay/app-defaults/' directory)
+so that it doesn't set the default background and foreground only for
+Emacs.  For example, make sure the following resources are either not
+present or commented out:
+
+   Emacs.default.attributeForeground
+   Emacs.default.attributeBackground
+   Emacs*Foreground
+   Emacs*Background
+
 * Interrupting Cygwin port of Bash from Emacs doesn't work.
 
 Cygwin 1.x builds of the ported Bash cannot be interrupted from the
@@ -428,6 +544,23 @@
 keyboard interrupt event sent by Emacs to Bash.  (Older Cygwin ports
 of Bash, up to b20.1, did receive SIGINT from Emacs.)
 
+* Dired is very slow.
+
+This could happen if invocation of the `df' program takes a long
+time.  Possible reasons for this include:
+
+  - ClearCase mounted filesystems (VOBs) that sometimes make `df'
+    response time extremely slow (dozens of seconds);
+
+  - slow automounters on some old versions of Unix;
+
+  - slow operation of some versions of `df'.
+
+To work around the problem, you could either (a) set the variable
+`directory-free-space-program' to nil, and thus prevent Emacs from
+invoking `df'; (b) use `df' from the GNU Fileutils package; or
+(c) use CVS, which is Free Software, instead of ClearCase.
+
 * Accessing remote files with ange-ftp hangs the MS-Windows version of Emacs.
 
 If the FTP client is the Cygwin port of GNU `ftp', this appears to be
@@ -439,10 +572,10 @@
 
 The solution is to downgrade to an older version of the Cygwin DLL
 (version 1.3.2 was reported to solve the problem), or use the stock
-Windows FTP client, usually found in the `C:\WINDOWS' directory.  To
-force ange-ftp use the stock Windows client, set the variable
-`ange-ftp-ftp-program-name' to the absolute file name of the client's
-executable.  For example:
+Windows FTP client, usually found in the `C:\WINDOWS' or 'C:\WINNT'
+directory.  To force ange-ftp use the stock Windows client, set the
+variable `ange-ftp-ftp-program-name' to the absolute file name of the
+client's executable.  For example:
 
  (setq ange-ftp-ftp-program-name "c:/windows/ftp.exe")
 
@@ -452,153 +585,25 @@
  (setq ange-ftp-ftp-program-args '("-i" "-n" "-g" "-v" "--prompt" "")
 
 
-* The latest released version of the W3 package doesn't run properly
-with Emacs 21 and needs work.  However, these problems are already
-fixed in W3's CVS.  The patch below is reported to make w3-4.0pre.46
-work.
-
-Some users report they are unable to byte-compile W3 with Emacs 21.
-If the patches below don't help to resolve your problems, install the
-CVS version of W3, which should be compatible with Emacs 21.
-
-diff -aur --new-file w3-4.0pre.46-orig/lisp/w3-display.el w3-4.0pre.46-new/lisp/w3-display.el
---- w3-4.0pre.46-orig/lisp/w3-display.el	Sun Nov 14 22:00:12 1999
-+++ w3-4.0pre.46-new/lisp/w3-display.el	Thu Dec 14 14:59:15 2000
-@@ -181,7 +181,8 @@
- 		(dispatch-event (next-command-event)))
- 	    (error nil))))
-      (t
--      (if (and (not (sit-for 0)) (input-pending-p))
-+      ;; modified for GNU Emacs 21 by bob@rattlesnake.com on 2000 Dec 14
-+      (if  (and (not (sit-for 0)) nil)
- 	  (condition-case ()
- 	      (progn
- 		(setq w3-pause-keystroke
-diff -aur --new-file w3-4.0pre.46-orig/lisp/w3-e21.el w3-4.0pre.46-new/lisp/w3-e21.el
---- w3-4.0pre.46-orig/lisp/w3-e21.el	Thu Jan  1 00:00:00 1970
-+++ w3-4.0pre.46-new/lisp/w3-e21.el	Thu Dec 14 14:54:58 2000
-@@ -0,0 +1,5 @@
-+;;; w3-e21.el ---   ** required for GNU Emacs 21 **
-+;; Added by bob@rattlesnake.com on 2000 Dec 14
-+
-+(require 'w3-e19)
-+(provide 'w3-e21)
+* Some versions of the W3 package released before Emacs 21.1 don't run
+properly with Emacs 21.  These problems are fixed in W3 version
+4.0pre.47.
 
 * On AIX, if linking fails because libXbsd isn't found, check if you
 are compiling with the system's `cc' and CFLAGS containing `-O5'.  If
 so, you have hit a compiler bug.  Please make sure to re-configure
 Emacs so that it isn't compiled with `-O5'.
 
-* The PSGML package uses the obsolete variables
-`before-change-function' and `after-change-function', which are no
-longer used by Emacs.  These changes to PSGML 1.2.2 fix that.
+* Compiling on AIX 4.3.x or 4.4 fails.
 
---- psgml-edit.el	2001/03/03 00:23:31	1.1
-+++ psgml-edit.el	2001/03/03 00:24:22
-@@ -264,4 +264,4 @@
- 					; inhibit-read-only
--	(before-change-function nil)
--	(after-change-function nil))
-+	(before-change-functions nil)
-+	(after-change-functions nil))
-     (setq selective-display t)
-@@ -1544,3 +1544,3 @@
- 	(buffer-read-only nil)
--	(before-change-function nil)
-+	(before-change-functions nil)
- 	(markup-index			; match-data index in tag regexp
-@@ -1596,3 +1596,3 @@
- (defun sgml-expand-shortref-to-text (name)
--  (let (before-change-function
-+  (let (before-change-functions
- 	(entity (sgml-lookup-entity name (sgml-dtd-entities sgml-dtd-info))))
-@@ -1613,3 +1613,3 @@
- 	(re-found nil)
--	before-change-function)
-+	before-change-functions)
-     (goto-char sgml-markup-start)
-@@ -1646,3 +1646,3 @@
-     (goto-char (sgml-element-end element)) 
--    (let ((before-change-function nil))
-+    (let ((before-change-functions nil))
-       (sgml-normalize-content element only-one)))
---- psgml-other.el	2001/03/03 00:23:42	1.1
-+++ psgml-other.el	2001/03/03 00:30:05
-@@ -32,2 +32,3 @@
- (require 'easymenu)
-+(eval-when-compile (require 'cl))
- 
-@@ -61,4 +62,9 @@
- 		   (let ((submenu
--			  (subseq entries 0 (min (length entries)
--						 sgml-max-menu-size))))
-+;;; 			  (subseq entries 0 (min (length entries)
-+;;; 						 sgml-max-menu-size))
-+			  (let ((new (copy-sequence entries)))
-+			    (setcdr (nthcdr (1- (min (length entries)
-+						     sgml-max-menu-size))
-+					    new) nil)
-+			    new)))
- 		     (setq entries (nthcdr sgml-max-menu-size entries))
-@@ -113,9 +119,10 @@
-       (let ((inhibit-read-only t)
--	    (after-change-function nil)	; obsolete variable
--	    (before-change-function nil) ; obsolete variable
- 	    (after-change-functions nil)
--	    (before-change-functions nil))
-+	    (before-change-functions nil)
-+	    (modified (buffer-modified-p))
-+	    (buffer-undo-list t)
-+	    deactivate-mark)
- 	(put-text-property start end 'face face)
--        (when (< start end)
--          (put-text-property (1- end) end 'rear-nonsticky '(face)))))
-+	(when (and (not modified) (buffer-modified-p))
-+	  (set-buffer-modified-p nil))))
-      (t
---- psgml-parse.el	2001/03/03 00:23:57	1.1
-+++ psgml-parse.el	2001/03/03 00:29:56
-@@ -40,2 +40,4 @@
- 
-+(eval-when-compile (require 'cl))
-+
- 
-@@ -2493,8 +2495,8 @@
-       (setq sgml-scratch-buffer nil))
--    (when after-change-function		;***
--      (message "OOPS: after-change-function not NIL in scratch buffer %s: %s"
-+    (when after-change-functions		;***
-+      (message "OOPS: after-change-functions not NIL in scratch buffer %s: %S"
- 	       (current-buffer)
--	       after-change-function)
--      (setq before-change-function nil
--	    after-change-function nil))
-+	       after-change-functions)
-+      (setq before-change-functions nil
-+	    after-change-functions nil))
-     (setq sgml-last-entity-buffer (current-buffer))
-@@ -2878,6 +2880,5 @@
-   "Set initial state of parsing"
--  (make-local-variable 'before-change-function)
--  (setq before-change-function 'sgml-note-change-at)
--  (make-local-variable 'after-change-function)
--  (setq after-change-function 'sgml-set-face-after-change)
-+  (set (make-local-variable 'before-change-functions) '(sgml-note-change-at))
-+  (set (make-local-variable 'after-change-functions)
-+       '(sgml-set-face-after-change))
-   (sgml-set-active-dtd-indicator (sgml-dtd-doctype dtd))
-@@ -3925,7 +3926,7 @@
-   (sgml-need-dtd)
--  (unless before-change-function
--    (message "WARN: before-change-function has been lost, restoring (%s)"
-+  (unless before-change-functions
-+    (message "WARN: before-change-functions has been lost, restoring (%s)"
- 	     (current-buffer))
--    (setq before-change-function 'sgml-note-change-at)
--    (setq after-change-function 'sgml-set-face-after-change))
-+    (setq before-change-functions '(sgml-note-change-at))
-+    (setq after-change-functions '(sgml-set-face-after-change)))
-   (sgml-with-parser-syntax-ro
+This could happen if you use /bin/c89 as your compiler, instead of
+the default `cc'.  /bin/c89 treats certain warnings, such as benign
+redefinitions of macros, as errors, and fails the build.  A solution
+is to use the default compiler `cc'.
+
+* Old versions of the PSGML package use the obsolete variables
+`before-change-function' and `after-change-function', which are no
+longer used by Emacs.  Please use PSGML 1.2.3 or later.
 
 * The Calc package fails to build and signals errors with Emacs 21.
 
@@ -662,6 +667,7 @@
  (defun calc-invert-func ()
    (save-excursion
 
+Index: Makefile
 --- Makefile.~1~	Sun Dec 15 23:50:45 1996
 +++ Makefile	Thu Nov 30 15:09:45 2000
 @@ -41,7 +41,7 @@
@@ -686,6 +692,7 @@
  # Create an Emacs TAGS file
  tags: TAGS
 
+Index: calc-aent.el
 --- calc-aent.el.~1~	Sun Dec 15 23:50:36 1996
 +++ calc-aent.el	Tue Nov 21 18:34:33 2000
 @@ -385,7 +385,7 @@
@@ -731,6 +738,7 @@
    (exit-minibuffer)
  )
  
+Index: calc.el
 --- calc.el.~1~	Sun Dec 15 23:50:47 1996
 +++ calc.el	Wed Nov 22 13:08:49 2000
 @@ -2051,11 +2051,11 @@
@@ -859,7 +867,7 @@
 
 * Unicode characters are not unified with other Mule charsets.
 
-As of v21.1, Emacs charsets are still not unified.  This means that
+As of v21.2, Emacs charsets are still not unified.  This means that
 characters which belong to charsets such as Latin-2, Greek, Hebrew,
 etc. and the same characters in the `mule-unicode-*' charsets are
 different characters, as far as Emacs is concerned.  For example, text
@@ -871,6 +879,29 @@
 
 To work around this, install some add-on package such as Mule-UCS.
 
+* Problems when using Emacs with UTF-8 locales
+
+Some systems, including recent versions of GNU/Linux, have terminals
+or X11 subsystems that can be configured to provide Unicode/UTF-8
+input and display.  Normally, such a system sets environment variables
+such as LANG, LC_CTYPE, or LC_ALL to a string which ends with a
+`.UTF-8'.  For example, a system like this in a French locale might
+use `fr_FR.UTF-8' as the value of LANG.
+
+Since Unicode support in Emacs, as of v21.2, is not yet complete (see
+the previous entry in this file), UTF-8 support is not enabled by
+default, even in UTF-8 locales.  Thus, some Emacs features, such as
+non-ASCII keyboard input, might appear to be broken in these locales.
+To solve these problems, you need to turn on some options in your
+`.emacs' file.  Specifically, the following customizations should make
+Emacs work correctly with UTF-8 input and text:
+
+    (setq locale-coding-system 'utf-8)
+    (set-terminal-coding-system 'utf-8)
+    (set-keyboard-coding-system 'utf-8)
+    (set-selection-coding-system 'utf-8)
+    (prefer-coding-system 'utf-8)
+
 * The `oc-unicode' package doesn't work with Emacs 21.
 
 This package tries to define more private charsets than there are free
@@ -879,6 +910,14 @@
 Any files encoded as emacs-mule using oc-unicode won't be read
 correctly by Emacs 21.
 
+* ps-print commands fail to find prologue files ps-prin*.ps.
+
+This can happen if you use an old version of X-Symbol package: it
+defines compatibility functions which trick ps-print into thinking it
+runs in XEmacs, and look for the prologue files in a wrong directory.
+
+The solution is to upgrade X-Symbol to a later version.
+
 * Using epop3.el package causes Emacs to signal an error.
 
 The error message might be something like this:
@@ -890,12 +929,22 @@
 for epop3 that fixes this, but perhaps a newer version of epop3
 corrects that.
 
+* The arrow indicating the current execution line in GUD is invisible.
+
+This was reported to happen when Emacs 21 is run on an xterm, and the
+python-mode package was loaded.  It appears that python-mode is
+incompatible with Emacs 21; newer versions of python-mode are likely
+to fix that.
+
 * On systems with shared libraries you might encounter run-time errors
 from the dynamic linker telling you that it is unable to find some
 shared libraries, for instance those for Xaw3d or image support.
 These errors mean Emacs has been linked with a library whose shared
 library is not in the default search path of the dynamic linker.
 
+Similar problems could prevent Emacs from building, since the build
+process invokes Emacs several times.
+
 On many systems, it is possible to set LD_LIBRARY_PATH in your
 environment to specify additional directories where shared libraries
 can be found.
@@ -904,6 +953,26 @@
 Emacs is linked.  With LD_RUN_PATH set, the linker will include a
 specified run-time search path in the executable.
 
+On some systems, Emacs could crash due to problems with dynamic
+linking.  Specifically, on SGI Irix 6.5, crashes were reported with
+backtraces like this:
+
+  (dbx) where
+   0 strcmp(0xf49239d, 0x4031184, 0x40302b4, 0x12, 0xf0000000, 0xf4923aa, 0x0, 0x492ddb2) ["/xlv22/ficus-jan23/work/irix/lib/libc/libc_n32_M3_ns/strings/strcmp.s":35, 0xfb7e480]
+   1 general_find_symbol(0xf49239d, 0x0, 0x0, 0x0, 0xf0000000, 0xf4923aa, 0x0, 0x492ddb2)
+ ["/comp2/mtibuild/v73/workarea/v7.3/rld/rld.c":2140, 0xfb65a98]
+   2 resolve_symbol(0xf49239d, 0x4031184, 0x0, 0xfbdd438, 0x0, 0xf4923aa, 0x0, 0x492ddb2)
+ ["/comp2/mtibuild/v73/workarea/v7.3/rld/rld.c":1947, 0xfb657e4]
+   3 lazy_text_resolve(0xd18, 0x1a3, 0x40302b4, 0x12, 0xf0000000, 0xf4923aa, 0x0, 0x492ddb2)
+ ["/comp2/mtibuild/v73/workarea/v7.3/rld/rld.c":997, 0xfb64d44]
+   4 _rld_text_resolve(0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0)
+ ["/comp2/mtibuild/v73/workarea/v7.3/rld/rld_bridge.s":175, 0xfb6032c]
+
+(`rld' is the dynamic linker.)  We don't know yet why this
+happens, but setting the environment variable LD_BIND_NOW to 1 (which
+forces the dynamic linker to bind all shared objects early on) seems
+to work around the problem.
+
 Please refer to the documentation of your dynamic linker for details.
 
 * On Solaris 2.7, building Emacs with WorkShop Compilers 5.0 98/12/15
@@ -972,6 +1041,32 @@
 The solution is to uncompress all .el files which don't have a .elc
 file.
 
+Another possible reason for such failures is stale *.elc files
+lurking somewhere on your load-path.  The following command will
+print any duplicate Lisp files that are present in load-path:
+
+    emacs -q -batch -f list-load-path-shadows
+
+If this command prints any file names, some of these files are stale,
+and should be deleted or their directories removed from your
+load-path.
+
+* Emacs prints an error at startup after upgrading from an earlier version.
+
+An example of such an error is:
+
+  x-complement-fontset-spec: "Wrong type argument: stringp, nil" 
+
+This can be another symptom of stale *.elc files in your classpath.
+The following command will print any duplicate Lisp files that are
+present in load-path:
+
+    emacs -q -batch -f list-load-path-shadows
+
+If this command prints any file names, some of these files are stale,
+and should be deleted or their directories removed from your
+load-path.
+
 * Attempting to visit remote files via ange-ftp fails.
 
 If the error message is "ange-ftp-file-modtime: Specified time is not
@@ -985,6 +1080,15 @@
 
 and then choose /usr/bin/netkit-ftp.
 
+* Emacs built on Windows 9x/ME crashes at startup on Windows XP,
+or Emacs built on XP crashes at startup on Windows 9x/ME.
+
+There appear to be general problems running programs compiled on
+Windows 9x/ME on Windows XP and vice-versa, at least when compilation
+is done with MSVC 6.0.  This affects other programs as well as Emacs.
+The compatibility options in the program properties on Windows XP may
+help in some cases.
+
 * Antivirus software interacts badly with the MS-Windows version of Emacs.
 
 The usual manifestation of these problems is that subprocesses don't
@@ -1003,6 +1107,14 @@
 cleanly before exiting Emacs. For more details, see the FAQ at
 ftp://ftp.gnu.org/gnu/windows/emacs/doc/index.html
 
+* Windows 95/98/ME crashes when Emacs invokes non-existent programs.
+
+When a program you are trying to run is not found on the PATH,
+Windows might respond by crashing or locking up your system.  In
+particular, this has been reported when trying to compile a Java
+program in JDEE when javac.exe is installed, but not on the system
+PATH.
+
 * Mail sent through Microsoft Exchange in some encodings appears to be
 mangled and is not seen correctly in Rmail or Gnus.  We don't know
 exactly what happens, but it isn't an Emacs problem in cases we've
@@ -1254,6 +1366,11 @@
 Emacs 21 needs version 10 or later of AUC TeX; upgrading should solve
 these problems.
 
+* No colors in AUC TeX with Emacs 21.
+
+Upgrade to AUC TeX version 10 or later, and make sure it is
+byte-compiled with Emacs 21.
+
 * Running TeX from AUC TeX package with Emacs 20.3 gives a Lisp error
 about a read-only tex output buffer.
 
@@ -1412,7 +1529,8 @@
 events with the modifiers Right-Alt and Left-Ctrl.  Since Emacs cannot
 distinguish AltGr from an explicit Right-Alt and Left-Ctrl
 combination, whenever it sees Right-Alt and Left-Ctrl it assumes that
-AltGr has been pressed.
+AltGr has been pressed.  The variable `w32-recognize-altgr' can be set
+to nil to tell Emacs that AltGr is really Ctrl and Alt.
 
 * Under some Windows X-servers, Emacs' display is incorrect 
 
@@ -1421,8 +1539,9 @@
 display or when killing a region).  M-x recenter will cause the screen
 to be completely redisplayed and the "extra" characters will disappear.
 
-This is known to occur under Exceed 6, and possibly earlier versions as
-well.  The problem lies in the X-server settings.
+This is known to occur under Exceed 6, and possibly earlier versions
+as well; it is reportedly solved in version 6.2.0.16 and later.  The
+problem lies in the X-server settings.
 
 There are reports that you can solve the problem with Exceed by
 running `Xconfig' from within NT, choosing "X selection", then
@@ -1465,6 +1584,13 @@
 if you link with the MIT X11 libraries instead of the Solaris X11
 libraries.
 
+* Frames may cover dialogs they created when using CDE.
+
+This can happen if you have "Allow Primary Windows On Top" enabled which
+seems to be the default in the Common Desktop Environment.
+To change, go in to "Desktop Controls" -> "Window Style Manager"
+and uncheck "Allow Primary Windows On Top".
+
 * Emacs does not know your host's fully-qualified domain name.
 
 You need to configure your machine with a fully qualified domain name,
@@ -1707,24 +1833,6 @@
       }
       else {
 
-* Problems running DOS programs on Windows NT versions earlier than 3.51.
-
-Some DOS programs, such as pkzip/pkunzip will not work at all, while
-others will only work if their stdin is redirected from a file or NUL.
-
-When a DOS program does not work, a new process is actually created, but
-hangs.  It cannot be interrupted from Emacs, and might need to be killed
-by an external program if Emacs is hung waiting for the process to
-finish.  If Emacs is not waiting for it, you should be able to kill the
-instance of ntvdm that is running the hung process from Emacs, if you
-can find out the process id.
-
-It is safe to run most DOS programs using call-process (eg. M-! and
-M-|) since stdin is then redirected from a file, but not with
-start-process since that redirects stdin to a pipe.  Also, running DOS
-programs in a shell buffer prompt without redirecting stdin does not
-work.
-
 * Problems on MS-DOG if DJGPP v2.0 is used to compile Emacs:
 
 There are two DJGPP library bugs which cause problems:
@@ -1801,11 +1909,13 @@
 This character seems to be trapped by the kernel in Windows 95.
 You can enter M-f6 by typing ESC f6.
 
-* Typing Alt-Shift has strange effects on Windows 95.
+* Typing Alt-Shift has strange effects on Windows.
 
 This combination of keys is a command to change keyboard layout.  If
 you proceed to type another non-modifier key before you let go of Alt
-and Shift, the Alt and Shift act as modifiers in the usual way.
+and Shift, the Alt and Shift act as modifiers in the usual way.  A
+more permanent work around is to change it to another key combination,
+or disable it in the keyboard control panel.
 
 * `tparam' reported as a multiply-defined symbol when linking with ncurses.
 
diff -ruN src-21.1/etc/SERVICE src-21.2/etc/SERVICE
--- src-21.1/etc/SERVICE	Thu Feb  8 20:59:50 2001
+++ src-21.2/etc/SERVICE	Fri Feb 22 11:51:21 2002
@@ -19,10 +19,10 @@
 that you agree informally to the following terms:
 
 1. You will not restrict (except by copyleft) the use or distribution
-of any software, documentation, or other information you supply anyone
-in the course of modifying, extending, or supporting GNU software.
-This includes any information specifically designed to ameliorate the
-use of GNU software.
+of any software, documentation, or other technical information you
+supply anyone in the course of modifying, extending, or supporting GNU
+software.  This includes any information specifically designed to
+ameliorate the use of GNU software.
 
 2. You will not take advantage of contact made through the Service
 Directory to advertise an unrelated business (e.g., sales of
@@ -38,7 +38,7 @@
 	service@gnu.org
 
 ** Please keep the entries in this file alphabetical **
-
+^_
 Aaronsen Group, Ltd.    <gnu@aaronsen.com>
 600 Grant St.
 Suite 5345
@@ -61,8 +61,8 @@
 client site, at our offices, or remote via Internet or telephone
 connection
 
-Updated: 2000-12-13
-
+Updated: 2001-05-08
+^_
 Alcôve
 ------
 
@@ -96,8 +96,36 @@
 
 Average daily rate, depending on the job : 1000 euros.
 
-Updated:  2000-12-14
-
+Updated:  2001-06-26
+^_
+Allegro Consultants, Inc.         <info@gccsupport.com>
+1072 De Anza Blvd., Suite B101
+San Jose, CA  95129-3532
+USA
++1 408 252-2330 voice
++1 408 252-2334 fax
+http://www.gccsupport.com
+
+Allegro Consultants, Inc, in association with DIS International, is
+now offering annual support contracts covering the GNU Compiler
+Collection and related tools, including the GCC C and C++ compilers
+for MPE/iX.
+
+The free GCC C and C++ compilers have been available on MPE/iX for
+several years now, and are used for mission-critical applications by
+many organizations including Hewlett-Packard. Until now, assistance
+was available only from Mark Klein of DIS on a limited, voluntary
+basis. Mark is the person who originally ported GCC to the HP e3000,
+and he continues to maintain the software and port new versions.
+
+Support contracts start at $1,995.00/year for an organization
+(unlimited number of HP e3000 computer systems) with two designated
+callers.  Additional options are available for large organizations who
+need to designate more than two authorized callers, or who want the
+additional security of 24x7 coverage.
+
+Updated: 2001-06-12
+^_
 Amazonia Computing
 
 <rick@viclink.com>
@@ -119,8 +147,8 @@
 if in involves working in either Brazil, Vietnam, Indonesia, or Cuba.
 I am also willing to work on fixed price contracts.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-08
+^_
 Dipl.-Inform. Gerd Aschemann                     <gerd@aschemann.net>
 Osannstr. 49
 D-64285 Darmstadt
@@ -141,8 +169,8 @@
 Rates are at 180,-- DM (~85 US$) per hour minimum, depending on the job.
 I am willing to travel for sufficiently large jobs.
 
-Updated: 2000-12-18
-
+Updated: 2001-05-09
+^_
 Baker Research, Ltd.
 P. O. Box 10036, Alexandria, VA   22310
 Phone:	(703) 960-9500 (Voice)
@@ -164,8 +192,8 @@
 	-MPI and Myrinet support
     --Data acquisition, management, visualization, and archival
 
-Updated:  2000-10-30
-
+Updated:  2001-05-11
+^_
 Don Barry, Ph.D.       <don@astro.cornell.edu>
 Ithaca, NY          
 
@@ -187,8 +215,8 @@
 Services: consulting, design, porting, lecturing, support, project definition,
 system implementation.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-09
+^_
 James Craig Burley
 97 Arrowhead Circle
 Ashland, MA 01721
@@ -215,8 +243,8 @@
 
 Rate: $180/hour
 
-Updated: 2000-12-19
-
+Updated: 2001-05-08
+^_
    C2V                          Michel Delval <mfd@c2v.com>
    82 bd Haussmann              Jean-Alain Le Borgne <jalb@c2v.com>
    75008 Paris
@@ -249,11 +277,11 @@
    Rates: from 5000 FF/day to 750 000 FF/year, 40% discount for
    educational institutions, add taxes and expenses.  Ask for list.
 
-Updated: 2000-12-14
-
+Updated: 2001-05-09
+^_
 Cendio Systems AB       <info@cendio.com>
 Teknikringen 3
-SE-583 30 Linkoping=20
+SE-583 30 Linkoping
 SWEDEN
 +46 13 21 46 00 voice
 +46 13 21 47 00 fax
@@ -276,7 +304,7 @@
 Cendio Systems have deep roots in Linkoping University, and was
 founded 1992 as Signum Support. Our headquarters resides in Mjardevi
 Science Park in Linkoping and we have an office in Stockholm. We are
-currently about fifty employees at both locations.=20
+currently about fifty employees at both locations.
 
 Cendio Systems won the Lotus 'Tux Award' at LotusSphere 2000 for "the
 partner who best exemplifies a unique dedication to Lotus and Linux
@@ -291,15 +319,32 @@
 IBM Value Added Reseller (Netfinity)
 IBM Solution Provider (RS/6000)
 SAIR GNU/Linux, Accredited Center for education
-SGI Systems Integrator=20
+SGI Systems Integrator
 
 Rates: Please request our price list.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-09
+^_
+Alex Cherepanov
+111 McDade Blvd, Apt. A-205, Folsom, PA 19033
+Phone: 610 529 3475
+email: <alexcher@erols.com>
+Web:   http://users.erols.com/alexcher/
+
+Services: Support and maintenance of free PostScript and PDF
+software including Ghostscript, ps2pdf, a2ps, tiff2ps, pdfopt.
+General imaging, font, and PDL consulting.
+
+Experience: 12 years experience in software engineering, 5 years
+in PostScript and digital color printing.
+
+Rates: $50-75/hour, depending on contract length.
+
+Updated: 2001-05-22
+^_
 CodeSourcery, LLC <info@codesourcery.com>
-3421 El Camino Real #35
-Atherton, CA 94027
+9978 Granite Point Ct
+Granite Bay, CA 95746
 (650) 364-5360
 http://www.codesourcery.com
 
@@ -317,8 +362,8 @@
 Please see our web page at www.codesourcery.com for more information
 about our products, services, and prices.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-16
+^_
 Stuart Cracraft         <cracraft@gnu.org>
 P.O. Box 6061
 Laguna Niguel, CA, 92607, USA
@@ -338,33 +383,7 @@
 administration or development.
 
 Updated: 2000-12-13
-
-Cygnus Solutions
-<info@cygnus.com>
-1325 Chesapeake Terrace
-Sunnyvale, CA 94089 USA
-+1 408 542 9600 voice
-+1 408 542 9699 fax
-
-Cygnus Solutions provides supported and maintained versions of gcc, g++, gdb
-with GUI, GNU linker and GNU macro assembler.  In addition, Cygnus provides
-these GNU software development tools for well over 100 host-target
-configurations.  Support includes bug fixes and semi-annual releases of the
-toolset.  Each release is regression tested and includes substantial
-improvements and additions to the current release.  Support is available for
-groups of 5 or 25 on a wide range of standard, special and vintage
-toolchains for native and embedded applications.  New target processors are
-being added regularly.  Rates for support for standard products start at $7495.
-
-Cygnus Solutions contact:
-
-	Kathy Powers
-	ph: +1-206-888-6002
-	fx: +1-206-888-6145
-	email: <kpowers@cygnus.com>
-
-Updated: 1999-04-12
-
+^_
 Bruce Dawson    -    <jbd@codemeta.com>
 CodeMeta, Inc.
 Manchester, NH  USA
@@ -384,8 +403,23 @@
 
 http://www.codemeta.com
 
-Updated: 2000-12-13
-
+Updated: 2001-05-09
+^_
+Martin Deen Consulting
+<sunra@mail.hypermart.net>
+426 Marietta St. #503
+Atlanta, GA 30313
+(V) 404-931-5392
+http://sunra.hypermart.net
+
+Consultant with many years supporting the GNU/Linux environment and
+working with Open Source solutions.  Available for hourly and per
+project work.  Hourly rates start at $100/hr.  Work can be done on
+client site, offsite, or remotely via Internet.  Can take engagements
+in Atlanta with little notice, call for arangements elsewhere.
+
+Updated: 2001-04-20
+^_
 DSS Distributed Systems Software, Inc.
 3253 Georgia St.                         <dss@dss.bc.ca>
 Richmond, British Columbia V7E 2R4       http://www.dss.bc.ca
@@ -414,8 +448,44 @@
   Consulting rates are $65-$200 USD per hour, plus
   applicable taxes.  Fixed-cost projects are also possible.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-10
+^_
+John W. Eaton
+<jwe@gnu.org>, <jwe@net66.com>
+
+Experience:   Original author and current maintainer of GNU Octave
+              (http://www.octave.org).
+
+              Derivatives of the Unix man utility that I wrote in 1990
+              are currently distributed with several GNU/Linux systems.
+
+              Improved GNU Make's support for VPATH and object
+              libraries on VMS systems.
+
+              Various other enhancements and bug fixes for other free
+              software tools.
+
+              I have more than 18 years experience programming various
+              languages and systems, more than 13 years as a user and
+              system mangler of Unix systems, including Ultrix, SunOS,
+              AIX, HP/UX, BSD, IRIX, Digital Unix, and GNU/Linux.
+              Long-time user of GNU tools on all these platforms.
+
+Programming:  Octave, Matlab, C++, C, Fortran, Emacs Lisp, TeX/LaTeX,
+              AWK, M4, Autoconf, Make, Lex & YACC, Unix shell
+              programming, etc.
+
+Services:     Anything related to programming and extending Octave.
+              Porting, installation, and customization of GNU/Linux and
+              GNU tools.  Unix system administration.
+
+Rates:        $100/hour + travel and expenses (if required).  Will
+              consider travel for short periods and/or sufficiently
+              interesting jobs, but prefer to work via the net or email.
+              Lower rates for non-profits.
+
+Updated: 2001-05-14
+^_
  Echo Labs                  <echo@iinet.net.au>
  29 Weld St,                 http://www.iinet.net.au/~echo/
  Nedlands, WA 6009
@@ -444,8 +514,8 @@
 
  Rates:      AUS $50-75/hr neg.
 
-Updated:    2000-12-14
-
+Updated:    2001-05-09
+^_
 Noah Friedman                   <friedman@splode.com>
 6114 La Salle Ave. #739
 Oakland, CA 94611-2802
@@ -466,13 +536,13 @@
 bay area or anywhere accessible on the Internet.  For larger jobs I may be
 willing to travel.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-08
+^_
 Brian Gough                         <bjg@network-theory.co.uk>
 Network Theory Limited              http://www.network-theory.co.uk/
 Bristol, United Kingdom
 
-Tel: 0117 9681086 (in UK), +44 117 9681086 (outside UK)
+Tel: 0117 3179309 (in UK), +44 117 3179309 (outside UK)
 
 I provide support and development of free software on a contract
 basis.  I can work at your site, over the internet, or by phone/email.
@@ -484,8 +554,8 @@
 
 Rate: 40-60 pounds/hour, depending on location.
 
-Updated: 2000-12-13
-
+Updated: 2001-09-05
+^_
 Ronald F. Guilmette    <rfg@monkeys.com>
 RG Consulting
 1751 East Roseville Pkwy. #1828
@@ -528,7 +598,7 @@
 Rates:         Variable depending upon contract duration.  Call for quote.
 
 Updated: 2000-12-13
-
+^_
 IDEALX
 15-17 avenue de ségur
 75007 Paris
@@ -549,7 +619,7 @@
 Rates - Variable
 
 Updated: 2000-12-13
-
+^_
 Ehud Karni     <kehud@iname.com>
 Israel
 
@@ -557,33 +627,33 @@
 
 Fee:  $75/hour.
 
-Updated: 2001-01-10
-
+Updated: 2001-05-09
+^_
 Bradley M. Kuhn
 <bkuhn@ebb.org>
 http://www.ebb.org/bkuhn
 
-I am available for part-time system administration, software development and
-training.  I have extensive experience with system administration of
-GNU/Linux systems, and free software software development.  I have also
-taught courses in C++ and Perl.  As an employee of the FSF, I have a unique
+I am available for part-time system administration, software development
+and training.  I have extensive experience with system administration of
+GNU/Linux systems, and Free Software development.  I have also taught
+courses in C++ and Perl.  As an employee of the FSF, I have a unique
 perspective on the free software community.
- 
+
 Please visit my homepage for more information on my background and skills.
 My resume is also available there.
- 
+
 I am available for both 1099 and W2 on-site contracting in the Boston, MA,
 USA metropolitan area, as well as remote consulting via dialup or Internet
 connection anywhere in the USA.  I am not interested in relocation.
 However, temporary (two week maximum) jobs with paid expenses at other
 locations will be considered.
- 
-My rate varies greatly (between $25-$48/hour) depending on the
+
+My rate varies greatly (between $25-$60/hour) depending on the
 circumstances.  Rates for non-profit organizations will be on the lower end
 of the spectrum, if I support your cause.
 
-Updated: 2000-12-17
-
+Updated: 2001-06-14
+^_
 Paul Gillingwater, CEO
 CSO Lanifex Unternehmensberatungs & Softwareentwicklung GmbH
 Praterstrasse 60
@@ -615,7 +685,7 @@
 Rates: ATS 1.500/hr neg.
 
 Updated: 2000-12-19
-
+^_
 Greg Lehey
 LEMIS
 PO Box 460
@@ -635,12 +705,12 @@
 "Porting UNIX Software" (O'Reilly), "Installing and Running FreeBSD"
 and "The Complete FreeBSD" (both Walnut Creek).
 
-Rates: Choice of AUD 240 per hour or hotline rates AUD 5 per minute.
-Outside Australia, $US 120 per hour or $US 2.50 per minute.  Quick,
+Rates: Choice of AUD 300 per hour or hotline rates AUD 6 per minute.
+Outside Australia, $US 180 per hour or $US 3.50 per minute.  Quick,
 well prepared questions by mail may be free.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-09
+^_
 Alan Lehotsky                                               <apl@alum.mit.edu>
 Quality Software Management
 634 West St
@@ -652,13 +722,14 @@
 Services:
                  -  Support for GNU compilers, including rehost/retarget
                  -  GNU Binutils rehost/retarget.
+                 -  cgen/sim
                  -  Perl internals hacking
                  -  General system software work (SW tools, O/S, device drivers)
                  -  runtime library (especially floating point)
                  -  project management
                  -  software process improvement
 
-Experience:     15+ years of design and implementation of optimizing
+Experience:     20+ years of design and implementation of optimizing
                 compilers.  "Mr. Bliss" at Digital in the 70's and early
                 80's.  Experience with Motorola 68k, PowerPC, SPARC, Intel
                 x86 and IA64 (Merced), MIPS, NS32K, ADI SHARC DSP, VAX, PDP-11,
@@ -666,18 +737,19 @@
                 FORTRAN, Pascal, Modula/2,  O/S experience includes Unix (OSF/1,
                 SunOS, Solaris, AIX, HP/UX), VAX/VMS, Windows/NT, MacOS.
 
-                6 years experience with GCC internals, including major
-                changes to support 8 bit bytes on word-address SHARC DSP and
-                general support of PowerPC code generation. Retargetted
-                gcc/binutils cross-tools to ASIC used in optical switch.
+                8 years experience with GCC internals, including major changes to
+		support 8 bit bytes on word-address Analog Devices SHARC DSP and
+                general support of PowerPC code generation. Retargetted gcc/binutils
+		cross-tools to ASIC used in optical switch.  Retargeted gcc to 8 bit "internet toaster"
+		micro-computer.
 
 References available
 
 Rates:          $110/hr.
                  fixed price possible for well-defined deliverables.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-08
+^_
 Reuven M. Lerner
 Lerner Communications Consulting Ltd.
 PO Box 518
@@ -708,8 +780,8 @@
 
 Consulting rates: $150/hour, or $100/hour for non-profits
 
-Updated: 2000-12-13
-
+Updated: 2001-05-09
+^_
 Richard Levitte             (in TeX: Richard Levitte
 Levitte Programming                  Levitte Programming
 Spannvagen 38, I                     Spannv\"agen 28, I
@@ -746,7 +818,7 @@
         are negotiable, depending on how interesting the project is to me.
 
 Updated: 2000-05-28
-
+^_
 Gordon Matzigkeit                 <gord@gnu.org>
 Box 325                           http://fig.org/~gord/
 Lumsden, Saskatchewan  S0G 3C0    Voice: (306) 731-3011
@@ -766,7 +838,7 @@
 (Canadian) per hour.  Flat rates preferred.
 
 Updated:  2000-12-19
-
+^_
  NetGuide Scandinavia AB <info@netg.se>
  Tankeg=E5ngen 4
  S-417 56 G=F6teborg, Sweden
@@ -802,7 +874,7 @@
  For consulting, $60-120/hour, depending on contract length.
 
 Updated: 2000-12-13
-
+^_
 Thien-Thi Nguyen
 ttn@glug.org
 San Diego, CA, USA
@@ -818,8 +890,8 @@
 
 Rate: $100/hr, possibly less
 
-Updated: 2000-12-13
-
+Updated: 2001-05-08
+^_
 David Nicol
 Post office box 45163
 Kansas City, Missouri 64171
@@ -837,8 +909,8 @@
 Rate: $60/hour, or fixed contract.  On-site support available in
 greater Kansas City area.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-08
+^_
 Jonas Oberg                  (TeX: Jonas \"Oberg
 Skalangsgatan 11B                  Sk\"al\"angsgatan 11B
 S-723 36  Vasteras                 S-723 36 V\"aster\.as
@@ -853,8 +925,8 @@
 understanding of automake, autoconf, flex, bison, guile,
 texinfo and much more. Rates around USD$100.
     
-Updated: 2000-12-13
-
+Updated: 2001-05-09
+^_
   Peter Olsen
   P.O. Box 410
   Simpsonville, MD 21150
@@ -895,7 +967,7 @@
  
 
 Updated: 2000-12-13
-
+^_
     Open Systems Computing AS       Open Systems Computing AS
     Kongensgate 9                   Rogaland Kunnskapspark, PB 8034
     N-0153 Oslo                     Prof. Olav Hanssensvei 11
@@ -914,8 +986,8 @@
 range.  Fixed-priced projects are also available.  Phone support is
 available only for customers with support contracts.
 
-Updated:  2000-12-19
-
+Updated:  2001-05-09
+^_
 Francesco Potortì <pot@gnu.org>
 Via S.Stefano, 8
 56123 Pisa, Italy
@@ -935,10 +1007,11 @@
 
 Qualifications: Electronic Engineering degree, Pisa.  Full time
 	researcher in CNUCE-CNR.
-	Familiar with elisp programming and porting of C programs.
+	Familiar with elisp programming, porting of C programs,
+	low-level TCP/IP programming for embedded systems.
 
-Updated:  2000-12-13
-
+Updated:  2001-05-09
+^_
 Quoll Systems Pty Ltd, see http://quoll.com.au 
 8 Brown St, Fannie Bay, Darwin, NT, Australia.
 Phone: +61 8 8941 7150 Fax: +61 8 8941 7151 Mobile: 0409 691 399 
@@ -967,7 +1040,42 @@
        us pick 100$US/hr as a starting point for senior staff.
  
 Updated: 2000-12-13
-
+^_
+Red Hat, Inc.
+<embedded-info@redhat.com>
+1325 Chesapeake Terrace
+Sunnyvale, CA 94089 USA
+Toll free: 866-2REDHAT ext. 3005
++1 408 542 9600 voice
++1 408 542 9699 fax
+
+GNUPro Tools 
+Red Hat provides supported and maintained versions of gcc, g++, gdb
+with GUI, GNU linker and GNU macro assembler.  In addition, Red Hat
+provides these GNU software development tools for well over many
+popular host-target configurations.  Support includes bug fixes and
+semi-annual releases of the toolset.  Each release is regression
+tested and includes substantial improvements and additions to the
+current release.  Support is available through Incident support
+packages, or Unlimited support for specific user groups.  GNUPro is
+available with standard, custom, and vintage toolchains for both
+native and embedded application development.  New target processors
+are being added regularly.  Rates for support for standard products
+start at $12,500.
+
+Embedded Linux
+Red Hat offers Red Hat Embedded Linux to companies looking for an open
+source and royalty-free runtime solution.  Red Hat Embedded Linux
+currently supports certain ARM, StrongARM, and MIPS families of
+processors.  Embedded Linux supports multiple graphics APIs, is
+compliant with POSIX APIs and thread support, can be configured as low
+as 512k memory footprint including TCP/IP and NFS built into the
+kernel, and supports journaling and transparent compression in
+filesystems.  Support for new processors is available via Red Hat
+Professional Services.
+
+Updated: 2001-05-16
+^_
 Relogic AB
 Pipersgatan 26
 Box 868
@@ -1009,13 +1117,13 @@
 References available.
 
 Updated: 2000-12-12
-
-SRA (Software Research Associates, Inc., Japan)      <osb-sales@sra.co.jp>
-3-12, Yotsuya, Shinjuku-ku,
-Tokyo 160-0004 Japan
+^_
+SRA (Software Research Associates, Inc., Japan)      <info-wingnut@sra.co.jp>
+1-1-1, Hirakawa-cho, Chiyoda-ku
+Tokyo 102-8605 Japan
 
-+81-3-3357-9361 voice
-+81-3-3351-0880 fax
++81-3-3234-5610 voice
++81-3-3234-5556 fax
 
 http://www.sra.co.jp/wingnut/
 http://www.sra.co.jp/wingnut/chirashi-e.html
@@ -1055,8 +1163,8 @@
 Rates:
    Determined by estimation.
 
-Updated: 2000-10-24
-
+Updated: 2001-05-21
+^_
 Andre Spiegel    <spiegel@gnu.org>
 Dipl.-Inform.
 Berlin, Germany
@@ -1073,8 +1181,8 @@
 
 Rates: 150 DM/hr (US$ 85)
 
-Updated: 2000-12-19
-
+Updated: 2001-05-09
+^_
 Name:           Julian Stacey <jhs@freebsd.org> <jhs@bim.bsn.com> <jhs@muc.de>
 Location:       Muenchen, Deutschland   (Munich, Germany).
 Qualifications: University Degree,  BSc Hons Computers & Cybernetics,  1980.
@@ -1108,8 +1216,8 @@
                 subsequent info/solutions I/friends/net come up with. I do not
                 pay phone charges to call strangers.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-09
+^_
 Richard M. Stallman	<rms@gnu.org>
 545 Tech Sq, Rm 430
 Cambridge, MA 02139
@@ -1122,7 +1230,7 @@
 Rates: $6/min or $250/hr.
 
 Updated: 2000-12-13
-
+^_
 Static Free Software
 4119 Alpine Road
 Portola Valley, Ca 94028
@@ -1137,7 +1245,27 @@
 about our products, services, and prices.
 
 Updated: 2000-12-12
-
+^_
+Swing Digital Ltd. <hello@swingdigital.com>
+15-17 Middle Street
+Brighton
+BN1 1AL
+United Kingdom
+Tel +44 (0) 1273 20 11 66
+Fax +44 (0) 1273 20 11 68
+http://www.swingdigital.com
+
+Swing Digital actively supports the development of the GNU.FREE 
+Internet Voting system. Through this support we have gained the 
+unique expertise to support, install and run GUN.FREE-based Internet 
+votes. We are also available in a consultancy basis to offer advice 
+for organisations wishing to run GNU.FREE themselves.
+
+Our consultancy fees start at 900 Euro (550 UK pounds) per day. We 
+are also able to securely host Internet Votes, prices on application.
+
+Updated: 2001-07-23
+^_
 Kayvan A. Sylvan <kayvan@sylvan.com>
 Sylvan Associates, Inc.
 879 Lewiston Drive
@@ -1162,8 +1290,8 @@
 
 Kernel hacking experience. Lots of porting experience.
 
-Updated:  2000-12-13
-
+Updated:  2001-05-08
+^_
 Alfredo Tomasini
 <alto555@earthlink.net>, <alfredo.tomasini@c-cube.com>
 
@@ -1176,27 +1304,26 @@
 Fee:  $50/hour.
 
 Updated: 2000-12-13
-
+^_
 Leonard H. Tower Jr.    <tower@ai.mit.edu>      <tower@art.net>
 36 Porter Street
-Somerville, MA  02143
+Somerville, MA  02143-2313
 USA
 +1-617-623-7739
-+1-617-629-5822
 
-Will work on most GNU software.
-Installation, handholding, trouble shooting, extensions, teaching.
+Will work on most GNU, GPLed, and Open Source software.
+Installation, handholding, trouble shooting, extensions, teaching, etc.
 
-Rates: $ 200.00/hour + travel expenses.  Fixed fee quotes available.
+Rates: $ 225.00/hour + travel expenses.  Fixed fee quotes available.
          Negotiable for non-profits.
 
 Experience: Have hacked on over a dozen architectures in many languages.  Have
 system mothered too many varieties of Unixes.  Assisted rms with the front end
-of gcc and its back-end support.  Installed and worked with many GNU
-programs including GNU Emacs. Resume available on request.
+of GCC and its back-end support.  Installed and worked with many GNU
+programs including GNU Emacs.  Resume available on request.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-10
+^_
 Jody Winston
 xprt Computer Consulting, Inc.
 731 Voyager
@@ -1211,8 +1338,8 @@
 extensions. Our consulting rate is $150.00 US dollars per hour,
 negotiable, plus a per diem for out of town work.
 
-Updated: 2000-12-13
-
+Updated: 2001-05-08
+^_
 The Written Word
 Web:   http://thewrittenword.com
 Email: info@thewrittenword.com
@@ -1229,7 +1356,7 @@
 a central bug tracking system for all packages.
 
 Updated:  2000-11-27
-
+^_
 
 For a current copy of this directory, or to have yourself listed, ask:
 	fsforder@gnu.org
@@ -1237,3 +1364,4 @@
 A current version should be available on our web site at http://www.gnu.org.
 
 ** Please keep the entries in this file alphabetical **
+
diff -ruN src-21.1/etc/cs-dired-ref.ps src-21.2/etc/cs-dired-ref.ps
--- src-21.1/etc/cs-dired-ref.ps	Wed Apr 18 15:59:16 2001
+++ src-21.2/etc/cs-dired-ref.ps	Fri Feb 22 11:51:21 2002
@@ -4,12 +4,11 @@
 %%Pages: 1
 %%PageOrder: Ascend
 %%BoundingBox: 0 0 596 842
-%%DocumentPaperSizes: a4
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips cs-dired-ref.dvi
 %DVIPSParameters: dpi=600, compressed
-%DVIPSSource:  TeX output 2001.03.16:2035
+%DVIPSSource:  TeX output 2002.02.13:1838
 %%BeginProcSet: texc.pro
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -429,8 +428,8 @@
 C8FCA23807E07E39FFE1FF8001E313E0EBE78F9038EF1FF0EA0FFE13FCA29038F80FE0EC
 07C091C7FC5BAFB57EA41C2D7DAC22>248 D E
 %EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fd csr8 8 55
-/Fd 55 254 df<9138FF807E01079038E1FF80903A1F807FC3C0D93E00EB87E049EBFF07
+%DVIPSBitmapFont: Fd csr8 8 54
+/Fd 54 254 df<9138FF807E01079038E1FF80903A1F807FC3C0D93E00EB87E049EBFF07
 4913FE485A00039138FC018049017CC7FCAAB712FCA22703E0007CC7FCB3A6486C13FE3A
 7FFF0FFFF0A22B2F7FAE29>11 D<14FF010713E090381F80F090383E003849137C4913FC
 485A1203491378153092C7FCA7157CB612FCA23803E000157CB3A5486C13FE3A7FFF0FFF
@@ -444,121 +443,119 @@
 031580A214071500A25C140EA2141E141CA2143C143814781470A214F05CA213015CA213
 035C130791C7FCA25B130EA2131E131CA2133C1338A21378137013F05BA212015BA21203
 5BA2120790C8FC5A120EA2121E121CA2123C1238A212781270A212F05AA21A437CB123>
-I<EB3FC0EBFFF03803E07C48487E48487E497E001EEB0780A2003E14C0A248EB03E0A500
-FC14F0B0007C14E0A3007E1307003E14C0A36CEB0F806C14006D5A3807C03E3803F0FC38
-00FFF0EB3FC01C2D7DAB23>I<130C133C137CEA03FC12FFEAFC7C1200B3B113FE387FFF
-FEA2172C7AAB23>I<EB7F803801FFF0380780FC380E003F48EB1F8048EB0FC05A0060EB
-07E012F000FC14F07E1403A3007C1307C7FCA215E0140F15C0141F1580EC3F00147E147C
-5C495A495A495A495A011EC7FC5B5B4913305B485A4848136048C7FC000E14E0001FB5FC
-5A4814C0B6FCA21C2C7DAB23>I<B612F815FF3A03F8001FE00001EC03F0ED00F8167E82
-EE1F80160F17C0EE07E0A2EE03F0A217F81601A317FCAA17F8A3EE03F0A217E0160717C0
-160FEE1F80EE3F00167E5EED03F00003EC1FE0B7128003F8C7FC2E2D7DAC36>68
-D<B712FEA23903F800010001EC003E828282A282A3178016011518A293C7FCA315381578
-15F890B5FCA2EBF800157815381518A21760A392C712C0A4160117801603A21607160F16
-3F0003913801FF00B8FCA22B2D7EAC30>I<DA1FF013C09138FFFE01903903F00F839039
-0F8001E3013FC71277017C143F4848141F4848140F48481407A248481403121F49140112
-3F90C8FC481500A300FE1600A992381FFFFEA2007F9138001FE0EE0FC0A27E7F121F7F12
-0F6C7EA26C7E6C6C141FEA007C013F143FD90F8013F3903903F007C10100B51200DA1FF8
-13002F2F7CAD37>71 D<D8FFF8903803FFFC7F00019138003FC06DEC0F006D1406EBBF80
-A2EB9FC0EB8FE0138780EB83F8138180EB80FE147E147FEC3F80EC1FC0140F15E0EC07F0
-140315F8EC01FC140015FE157FED3F86151F16C6ED0FE6150716F6ED03FE1501A2150016
-7E163EA2486C141ED80FF0140EB5FC16062E2D7DAC35>78 D<B612FCEDFF803A03F8000F
-E00001EC03F0ED00F882167E167F821780A617005E167E5E5EED03F0ED0FE090B6128003
-FCC7FC01F8C9FCB2487EB512F0A2292D7EAC30>80 D<B539F003FFFCA2D803FCC7EA3FC0
-6C48EC0F001606B3AB160E0000150C7F161C017C1418017E14386D5C6D146090390F8001
-E0903907E00380902601F80FC7FC9038007FFCEC0FF02E2E7DAC35>85
-D<13FF000713C0380F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF137F3801
-FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF8C391F
-83C7FC390FFF03F83901FC01E01F207D9E23>97 D<EA07C012FFA2120F1207AC14FE9038
-C7FF809038CF03E09038DC01F09038F8007C49137E49133E497F1680A2150F16C0A9ED1F
-80A216005D6D133E6D5B01B05B9038BC01F090380E07E0390607FF80260001FCC7FC222F
-7EAD27>I<EB1FE0EB7FFC3801F01E3803E0073907C01F80EA0F80EA1F005A003EEB0F00
-007E90C7FCA2127C12FCA9127EA215C07E6C130101801380380FC0033907E007003801F0
-3E38007FF8EB1FC01A207E9E1F>I<15F8141FA214011400ACEB0FE0EB7FF83801F81E38
-03E0073807C003380F8001EA1F00481300123E127EA25AA9127C127EA2003E13017EEB80
-03000F13073903E00EFC3A01F03CFFC038007FF090391FC0F800222F7EAD27>I<EB1F80
-EBFFF03803E0783807C03E380F801E381F001FEC0F80123E007E130715C0127C12FCA3B6
-FCA200FCC8FCA5127EA2003E14C0123F6C1301390F80038001C013003803E00F3801F03C
-38007FF8EB1FC01A207E9E1F>I<EB03F0EB0FFCEB3E1EEB7C3F13F8EA01F0A23803E00C
-1400AAB512E0A23803E000B3A6487E387FFF80A2182F7FAE16>I<013F13F89038FFC3FE
-3903E1FF1E3807807C000F140C391F003E00A2003E7FA76C133EA26C6C5A00071378380F
-E1F0380CFFC0D81C3FC7FC90C8FCA3121E121F380FFFF814FF6C14C04814F0391E0007F8
-48130048147C12F848143CA46C147C007C14F86CEB01F06CEB03E03907E01F803901FFFE
-0038003FF01F2D7E9D23>I<EA07C012FFA2120F1207AC14FE9038C3FF809038C703E090
-38DE01F013F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2222E7EAD27>I<EA0780EA
-0FC0EA1FE0A4EA0FC0EA0780C7FCA8EA07C012FFA2120F1207B3A5EA0FE0EAFFFCA20E2E
-7EAD14>I<130FEB1F80EB3FC0A4EB1F80EB0F0090C7FCA8EB07C013FFA2130F1307B3AD
-1230127838FC0F80A21400485AEA783EEA3FF8EA07E0123C83AD16>I<EA07C012FFA212
-0F1207ADEC1FFEA2EC0FF0EC07C05D020EC7FC5C5C5C5CEBC3C013C7EBCFE0EBDFF013F9
-EBF0F8497EEBC07E143E80816E7E14076E7E816E7E486C487E3AFFFE07FF80A2212E7EAD
-25>I<EA07C012FFA2120F1207B3B3A3EA0FE0EAFFFEA20F2E7EAD14>I<2607C07FEB07F0
-3BFFC3FFC03FFC903AC783F0783F3C0FCE01F8E01F803B07DC00F9C00F01F8D9FF8013C0
-4990387F000749137EA249137CB2486C01FEEB0FE03CFFFE0FFFE0FFFEA2371E7E9D3C>
-I<3807C0FE39FFC3FF809038C703E0390FDE01F0EA07F8496C7EA25BA25BB2486C487E3A
-FFFE1FFFC0A2221E7E9D27>I<EB1FE0EB7FF83801F03E3803C00F3907800780390F0003
-C04814E0003EEB01F0A248EB00F8A300FC14FCA9007C14F8A26CEB01F0A26CEB03E0A239
-0F8007C03907C00F803901F03E0038007FF8EB1FE01E207E9E23>I<3807C0FE39FFC7FF
-809038CF03E0390FDC01F03907F800FC49137E49133E49133FED1F80A3ED0FC0A8151F16
-80A2ED3F00A26D137E6D137C5D9038FC01F09038CE07E09038C7FF80D9C1FCC7FC01C0C8
-FCA9487EEAFFFEA2222B7E9D27>I<380781F838FF87FEEB8E3FEA0F9CEA07B813B0EBF0
-1EEBE000A45BB0487EB5FCA2181E7E9D1C>114 D<3801FE183807FFB8381E01F8EA3C00
-481378481338A21418A27E7EB41300EA7FF06CB4FC6C13C06C13F0000113F838001FFC13
-0138C0007E143EA26C131EA27EA26C133CA26C137838FF01F038E3FFC000C0130017207E
-9E1C>I<1360A413E0A312011203A21207121FB512F0A23803E000AF1418A714383801F0
-3014703800F860EB3FE0EB0F80152A7FA81B>I<D807C013F800FF131FA2000F13010007
-1300B21401A314033803E007EC0EFC3A01F81CFFC038007FF890391FE0F800221F7E9D27
->I<3AFFFC01FFC0A23A0FE0007E000007147C15380003143015706C6C1360A26C6C5BA3
-90387C0180A26D48C7FCA2EB3F07EB1F06A2EB0F8CA214DCEB07D8A2EB03F0A36D5AA26D
-5A221E7F9C25>I<3AFFFC07FF80A23A0FF003FC000003EB01F0000114C06D485A000091
-C7FCEB7C06EB3E0E6D5A14B8EB0FB0EB07E013036D7E497E1307EB067C497EEB1C1F0138
-7FEB700F496C7E6E7ED803C07F00076D7E391FE003FC3AFFF007FFC0A2221D7F9C25>
-120 D<3AFFFC01FFC0A23A0FE0007E000007147C1538000314306D137000011460A26C6C
-5BA2EBFC01017C5BEB7E03013E90C7FCA2EB1F06A2148EEB0F8CA2EB07D8A2EB03F0A36D
-5AA26D5AA2495AA2130391C8FC1278EAFC06A25B131CEA7838EA7070EA3FE0EA0F80222B
-7F9C25>I<003FB51280A2EB003F003C14000038137E00305BEA700100605B495A495A13
-0F00005B495A49C7FC5B137E9038FC0180EA01F8120313F03807E003EA0FC0001F140013
-8048485A007E5B00FE133FB6FCA2191D7E9C1F>I<38078008380FE01C381FF838383FFF
-F038707FE038E01FC03840078016077AAC23>126 D<0040130800F0133C007813786C13
-F0381F03E0380F87C03807CF803803FF006C5A6C5A1378133090C7FCA23801FE183807FF
-B8381E01F8EA3C00481378481338A21418A27E7EB41300EA7FF06CB4FC6C13C06C13F000
-0113F838001FFC130138C0007E143EA26C131EA27EA26C133CA26C137838FF01F038E3FF
-C000C01300172E7EAC1C>185 D<143C147E14FF1580A3147F143DEB6001140315005CEB
-E006140E5C000113780003136091C7FC120F121FB512F0A2D803E0C7FCAF1418A7143838
-01F03014703800F860EB3FE0EB0F8019327FB01B>187 D<00101302003C130F6C131E6C
-5B3807C0F83803E1F03801F3E06CB45A6D5A6DC7FC131E130C90C8FCA4003FB51280A2EB
-003F003C14000038137E00305BEA700100605B495A495A130F00005B495A49C7FC5B137E
-9038FC0180EA01F8120313F03807E003EA0FC0001F1400138048485A007E5B00FE133FB6
-FCA2192D7EAC1F>190 D<143C147C14FCA2495A495AEB07C0495A49C7FC131C5B131090
-C8FCA313FF000713C0380F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF137F
-3801FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF8C
-391F83C7FC390FFF03F83901FC01E01F2F7DAD23>225 D<00085B001EEB07806CEB0F00
-3807801E3803E07C6C6C5A3800F9F0EB7FE06D5A6D5A6DC7FC130690C8FCA2EB1FE0EB7F
-FC3801F01E3803E0073907C01F80EA0F80EA1F005A003EEB0F00007E90C7FCA2127C12FC
-A9127EA215C07E6C130101801380380FC0033907E007003801F03E38007FF8EB1FC01A2E
-7EAC1F>232 D<140F5C5CA2147E5CEB01F0495A495A91C7FC130E130490C8FCA3EB1F80
-EBFFF03803E0783807C03E380F801E381F001FEC0F80123E007E130715C0127C12FCA3B6
-FCA200FCC8FCA5127EA2003E14C0123F6C1301390F80038001C013003803E00F3801F03C
-38007FF8EB1FC01A2F7EAD1F>I<00085B001EEB07806CEB0F003807801E3803E07C6C6C
-5A3800F9F0EB7FE06D5A6D5A6DC7FC130690C8FCA2EB1F80EBFFF03803E0783807C03E38
-0F801E381F001FEC0F80123E007E130715C0127C12FCA3B6FCA200FCC8FCA5127EA2003E
-14C0123F6C1301390F80038001C013003803E00F3801F03C38007FF8EB1FC01A2E7EAC1F
->236 D<131E133E137EA213FCEA01F8EA03E0EA07C0EA0F80EA0E005A1208C7FCA4EA07
-C012FFA2120F1207B3A5EA0FE0EAFFFCA20F2E7EAD14>I<163C167E16FF03F81380141F
-A20201137F0200133D1601160317005E1606160E5E1678166093C7FCA2EB0FE0EB7FF838
-01F81E3803E0073807C003380F8001EA1F00481300123E127EA25AA9127C127EA2003E13
-017EEB8003000F13073903E00EFC3A01F03CFFC038007FF090261FC0F8C7FC29327EB027
->239 D<00085B001EEB07806C49C7FC3807801E3803E07C6C6C5A3800F9F0EB7FE06D5A
-6D5A6DC8FC130690C9FCA33807C0FE39FFC3FF809038C703E0390FDE01F0EA07F8496C7E
-A25BA25BB2486C487E3AFFFE1FFFC0A2222D7EAC27>242 D<00101302003C130F6C131E
-6C133C3807C0F83803E1F03801F3E03800FFC0EB7F80EB3F00131E130C90C7FCA3380781
-F838FF87FEEB8E3FEA0F9CEA07B813B0EBF01EEBE000A45BB0487EB5FCA2182D7EAC1C>
-248 D<EB03F0497EEB0E1CEB1806EB3807EB3003A4EB3807EB1806EB0E1CEB07F86D5A90
-C9FCA2D807C013F800FF131FA2000F130100071300B21401A314033803E007EC0EFC3A01
-F81CFFC038007FF890391FE0F800222F7EAD27>I<EC03C01407140FA24A5A4AC7FC147C
-5C495A14C0495A6DC8FC90C9FCA53AFFFC01FFC0A23A0FE0007E000007147C1538000314
-306D137000011460A26C6C5BA2EBFC01017C5BEB7E03013E90C7FCA2EB1F06A2148EEB0F
-8CA2EB07D8A2EB03F0A36D5AA26D5AA2495AA2130391C8FC1278EAFC06A25B131CEA7838
-EA7070EA3FE0EA0F80223C7FAD25>253 D E
+I<130C133C137CEA03FC12FFEAFC7C1200B3B113FE387FFFFEA2172C7AAB23>49
+D<EB7F803801FFF0380780FC380E003F48EB1F8048EB0FC05A0060EB07E012F000FC14F0
+7E1403A3007C1307C7FCA215E0140F15C0141F1580EC3F00147E147C5C495A495A495A49
+5A011EC7FC5B5B4913305B485A4848136048C7FC000E14E0001FB5FC5A4814C0B6FCA21C
+2C7DAB23>I<B612F815FF3A03F8001FE00001EC03F0ED00F8167E82EE1F80160F17C0EE
+07E0A2EE03F0A217F81601A317FCAA17F8A3EE03F0A217E0160717C0160FEE1F80EE3F00
+167E5EED03F00003EC1FE0B7128003F8C7FC2E2D7DAC36>68 D<B712FEA23903F8000100
+01EC003E828282A282A3178016011518A293C7FCA31538157815F890B5FCA2EBF8001578
+15381518A21760A392C712C0A4160117801603A21607160F163F0003913801FF00B8FCA2
+2B2D7EAC30>I<DA1FF013C09138FFFE01903903F00F8390390F8001E3013FC71277017C
+143F4848141F4848140F48481407A248481403121F491401123F90C8FC481500A300FE16
+00A992381FFFFEA2007F9138001FE0EE0FC0A27E7F121F7F120F6C7EA26C7E6C6C141FEA
+007C013F143FD90F8013F3903903F007C10100B51200DA1FF813002F2F7CAD37>71
+D<D8FFF8903803FFFC7F00019138003FC06DEC0F006D1406EBBF80A2EB9FC0EB8FE01387
+80EB83F8138180EB80FE147E147FEC3F80EC1FC0140F15E0EC07F0140315F8EC01FC1400
+15FE157FED3F86151F16C6ED0FE6150716F6ED03FE1501A21500167E163EA2486C141ED8
+0FF0140EB5FC16062E2D7DAC35>78 D<B612FCEDFF803A03F8000FE00001EC03F0ED00F8
+82167E167F821780A617005E167E5E5EED03F0ED0FE090B6128003FCC7FC01F8C9FCB248
+7EB512F0A2292D7EAC30>80 D<B539F003FFFCA2D803FCC7EA3FC06C48EC0F001606B3AB
+160E0000150C7F161C017C1418017E14386D5C6D146090390F8001E0903907E003809026
+01F80FC7FC9038007FFCEC0FF02E2E7DAC35>85 D<13FF000713C0380F01F0381C00F800
+3F137C80A2143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0EA3F80EA7F00127E
+00FE14065AA3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F83901FC01E01F207D
+9E23>97 D<EA07C012FFA2120F1207AC14FE9038C7FF809038CF03E09038DC01F09038F8
+007C49137E49133E497F1680A2150F16C0A9ED1F80A216005D6D133E6D5B01B05B9038BC
+01F090380E07E0390607FF80260001FCC7FC222F7EAD27>I<EB1FE0EB7FFC3801F01E38
+03E0073907C01F80EA0F80EA1F005A003EEB0F00007E90C7FCA2127C12FCA9127EA215C0
+7E6C130101801380380FC0033907E007003801F03E38007FF8EB1FC01A207E9E1F>I<15
+F8141FA214011400ACEB0FE0EB7FF83801F81E3803E0073807C003380F8001EA1F004813
+00123E127EA25AA9127C127EA2003E13017EEB8003000F13073903E00EFC3A01F03CFFC0
+38007FF090391FC0F800222F7EAD27>I<EB1F80EBFFF03803E0783807C03E380F801E38
+1F001FEC0F80123E007E130715C0127C12FCA3B6FCA200FCC8FCA5127EA2003E14C0123F
+6C1301390F80038001C013003803E00F3801F03C38007FF8EB1FC01A207E9E1F>I<EB03
+F0EB0FFCEB3E1EEB7C3F13F8EA01F0A23803E00C1400AAB512E0A23803E000B3A6487E38
+7FFF80A2182F7FAE16>I<013F13F89038FFC3FE3903E1FF1E3807807C000F140C391F00
+3E00A2003E7FA76C133EA26C6C5A00071378380FE1F0380CFFC0D81C3FC7FC90C8FCA312
+1E121F380FFFF814FF6C14C04814F0391E0007F848130048147C12F848143CA46C147C00
+7C14F86CEB01F06CEB03E03907E01F803901FFFE0038003FF01F2D7E9D23>I<EA07C012
+FFA2120F1207AC14FE9038C3FF809038C703E09038DE01F013F8496C7EA25BA25BB2486C
+487E3AFFFE1FFFC0A2222E7EAD27>I<EA0780EA0FC0EA1FE0A4EA0FC0EA0780C7FCA8EA
+07C012FFA2120F1207B3A5EA0FE0EAFFFCA20E2E7EAD14>I<130FEB1F80EB3FC0A4EB1F
+80EB0F0090C7FCA8EB07C013FFA2130F1307B3AD1230127838FC0F80A21400485AEA783E
+EA3FF8EA07E0123C83AD16>I<EA07C012FFA2120F1207ADEC1FFEA2EC0FF0EC07C05D02
+0EC7FC5C5C5C5CEBC3C013C7EBCFE0EBDFF013F9EBF0F8497EEBC07E143E80816E7E1407
+6E7E816E7E486C487E3AFFFE07FF80A2212E7EAD25>I<EA07C012FFA2120F1207B3B3A3
+EA0FE0EAFFFEA20F2E7EAD14>I<2607C07FEB07F03BFFC3FFC03FFC903AC783F0783F3C
+0FCE01F8E01F803B07DC00F9C00F01F8D9FF8013C04990387F000749137EA249137CB248
+6C01FEEB0FE03CFFFE0FFFE0FFFEA2371E7E9D3C>I<3807C0FE39FFC3FF809038C703E0
+390FDE01F0EA07F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2221E7E9D27>I<EB1F
+E0EB7FF83801F03E3803C00F3907800780390F0003C04814E0003EEB01F0A248EB00F8A3
+00FC14FCA9007C14F8A26CEB01F0A26CEB03E0A2390F8007C03907C00F803901F03E0038
+007FF8EB1FE01E207E9E23>I<3807C0FE39FFC7FF809038CF03E0390FDC01F03907F800
+FC49137E49133E49133FED1F80A3ED0FC0A8151F1680A2ED3F00A26D137E6D137C5D9038
+FC01F09038CE07E09038C7FF80D9C1FCC7FC01C0C8FCA9487EEAFFFEA2222B7E9D27>I<
+380781F838FF87FEEB8E3FEA0F9CEA07B813B0EBF01EEBE000A45BB0487EB5FCA2181E7E
+9D1C>114 D<3801FE183807FFB8381E01F8EA3C00481378481338A21418A27E7EB41300
+EA7FF06CB4FC6C13C06C13F0000113F838001FFC130138C0007E143EA26C131EA27EA26C
+133CA26C137838FF01F038E3FFC000C0130017207E9E1C>I<1360A413E0A312011203A2
+1207121FB512F0A23803E000AF1418A714383801F03014703800F860EB3FE0EB0F80152A
+7FA81B>I<D807C013F800FF131FA2000F130100071300B21401A314033803E007EC0EFC
+3A01F81CFFC038007FF890391FE0F800221F7E9D27>I<3AFFFC01FFC0A23A0FE0007E00
+0007147C15380003143015706C6C1360A26C6C5BA390387C0180A26D48C7FCA2EB3F07EB
+1F06A2EB0F8CA214DCEB07D8A2EB03F0A36D5AA26D5A221E7F9C25>I<3AFFFC07FF80A2
+3A0FF003FC000003EB01F0000114C06D485A000091C7FCEB7C06EB3E0E6D5A14B8EB0FB0
+EB07E013036D7E497E1307EB067C497EEB1C1F01387FEB700F496C7E6E7ED803C07F0007
+6D7E391FE003FC3AFFF007FFC0A2221D7F9C25>120 D<3AFFFC01FFC0A23A0FE0007E00
+0007147C1538000314306D137000011460A26C6C5BA2EBFC01017C5BEB7E03013E90C7FC
+A2EB1F06A2148EEB0F8CA2EB07D8A2EB03F0A36D5AA26D5AA2495AA2130391C8FC1278EA
+FC06A25B131CEA7838EA7070EA3FE0EA0F80222B7F9C25>I<003FB51280A2EB003F003C
+14000038137E00305BEA700100605B495A495A130F00005B495A49C7FC5B137E9038FC01
+80EA01F8120313F03807E003EA0FC0001F1400138048485A007E5B00FE133FB6FCA2191D
+7E9C1F>I<38078008380FE01C381FF838383FFFF038707FE038E01FC03840078016077A
+AC23>126 D<0040130800F0133C007813786C13F0381F03E0380F87C03807CF803803FF
+006C5A6C5A1378133090C7FCA23801FE183807FFB8381E01F8EA3C00481378481338A214
+18A27E7EB41300EA7FF06CB4FC6C13C06C13F0000113F838001FFC130138C0007E143EA2
+6C131EA27EA26C133CA26C137838FF01F038E3FFC000C01300172E7EAC1C>185
+D<143C147E14FF1580A3147F143DEB6001140315005CEBE006140E5C0001137800031360
+91C7FC120F121FB512F0A2D803E0C7FCAF1418A714383801F03014703800F860EB3FE0EB
+0F8019327FB01B>187 D<00101302003C130F6C131E6C5B3807C0F83803E1F03801F3E0
+6CB45A6D5A6DC7FC131E130C90C8FCA4003FB51280A2EB003F003C14000038137E00305B
+EA700100605B495A495A130F00005B495A49C7FC5B137E9038FC0180EA01F8120313F038
+07E003EA0FC0001F1400138048485A007E5B00FE133FB6FCA2192D7EAC1F>190
+D<143C147C14FCA2495A495AEB07C0495A49C7FC131C5B131090C8FCA313FF000713C038
+0F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0
+EA3F80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F8
+3901FC01E01F2F7DAD23>225 D<00085B001EEB07806CEB0F003807801E3803E07C6C6C
+5A3800F9F0EB7FE06D5A6D5A6DC7FC130690C8FCA2EB1FE0EB7FFC3801F01E3803E00739
+07C01F80EA0F80EA1F005A003EEB0F00007E90C7FCA2127C12FCA9127EA215C07E6C1301
+01801380380FC0033907E007003801F03E38007FF8EB1FC01A2E7EAC1F>232
+D<140F5C5CA2147E5CEB01F0495A495A91C7FC130E130490C8FCA3EB1F80EBFFF03803E0
+783807C03E380F801E381F001FEC0F80123E007E130715C0127C12FCA3B6FCA200FCC8FC
+A5127EA2003E14C0123F6C1301390F80038001C013003803E00F3801F03C38007FF8EB1F
+C01A2F7EAD1F>I<00085B001EEB07806CEB0F003807801E3803E07C6C6C5A3800F9F0EB
+7FE06D5A6D5A6DC7FC130690C8FCA2EB1F80EBFFF03803E0783807C03E380F801E381F00
+1FEC0F80123E007E130715C0127C12FCA3B6FCA200FCC8FCA5127EA2003E14C0123F6C13
+01390F80038001C013003803E00F3801F03C38007FF8EB1FC01A2E7EAC1F>236
+D<131E133E137EA213FCEA01F8EA03E0EA07C0EA0F80EA0E005A1208C7FCA4EA07C012FF
+A2120F1207B3A5EA0FE0EAFFFCA20F2E7EAD14>I<163C167E16FF03F81380141FA20201
+137F0200133D1601160317005E1606160E5E1678166093C7FCA2EB0FE0EB7FF83801F81E
+3803E0073807C003380F8001EA1F00481300123E127EA25AA9127C127EA2003E13017EEB
+8003000F13073903E00EFC3A01F03CFFC038007FF090261FC0F8C7FC29327EB027>239
+D<00085B001EEB07806C49C7FC3807801E3803E07C6C6C5A3800F9F0EB7FE06D5A6D5A6D
+C8FC130690C9FCA33807C0FE39FFC3FF809038C703E0390FDE01F0EA07F8496C7EA25BA2
+5BB2486C487E3AFFFE1FFFC0A2222D7EAC27>242 D<00101302003C130F6C131E6C133C
+3807C0F83803E1F03801F3E03800FFC0EB7F80EB3F00131E130C90C7FCA3380781F838FF
+87FEEB8E3FEA0F9CEA07B813B0EBF01EEBE000A45BB0487EB5FCA2182D7EAC1C>248
+D<EB03F0497EEB0E1CEB1806EB3807EB3003A4EB3807EB1806EB0E1CEB07F86D5A90C9FC
+A2D807C013F800FF131FA2000F130100071300B21401A314033803E007EC0EFC3A01F81C
+FFC038007FF890391FE0F800222F7EAD27>I<EC03C01407140FA24A5A4AC7FC147C5C49
+5A14C0495A6DC8FC90C9FCA53AFFFC01FFC0A23A0FE0007E000007147C1538000314306D
+137000011460A26C6C5BA2EBFC01017C5BEB7E03013E90C7FCA2EB1F06A2148EEB0F8CA2
+EB07D8A2EB03F0A36D5AA26D5AA2495AA2130391C8FC1278EAFC06A25B131CEA7838EA70
+70EA3FE0EA0F80223C7FAD25>253 D E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fe csbx10 14.4 15
 /Fe 15 238 df<BA12C019FEF1FFC01AF81AFE747ED8000701F8C7000F14E0060080071F
@@ -623,14 +620,12 @@
 %%BeginSetup
 %%Feature: *Resolution 600dpi
 TeXDict begin
-%%BeginPaperSize: a4
-a4
-%%EndPaperSize
+%%PaperSize: A4
 
 %%EndSetup
 %%Page: 1 1
 1 0 bop -247 -364 a Fe(Referen\350n\355)47 b(k)l(arta)e(pro)g(Dired)-50
--256 y Fd(\(ur\350eno)25 b(pro)f(Dired)f(v)g(GNU)h(Emacsu)f(20.x\))-63
+-256 y Fd(\(ur\350eno)25 b(pro)f(Dired)f(v)g(GNU)h(Emacsu)f(21.x\))-63
 -176 y(P\370\355k)n(azy)h(ozna\350en\351)i Fc(\(D)n(X\))d
 Fd(vy\276aduj\355)h(dired-x)-450 20 y Fb(Spu\271t\354n\355)36
 b(a)i(uk)m(on\350en\355)f(Dired)-450 177 y Fd(spu\271t\354n\355)24
diff -ruN src-21.1/etc/cs-dired-ref.tex src-21.2/etc/cs-dired-ref.tex
--- src-21.1/etc/cs-dired-ref.tex	Wed Apr 18 15:59:16 2001
+++ src-21.2/etc/cs-dired-ref.tex	Fri Feb 22 11:51:21 2002
@@ -58,7 +58,7 @@
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
 \centerline{designed by Stephen Gildea, \version}
-\centerline{for GNU Emacs version 19 on Unix systems}
+\centerline{for GNU Emacs version 21 on Unix systems}
 \centerline{Updated for Dired in May 2000 by Evgeny Roubinchtein}
 
 Permission is granted to make and distribute copies of
@@ -253,7 +253,7 @@
 
 \title{Referenèní karta pro Dired}
 
-\centerline{(urèeno pro Dired v GNU Emacsu 20.x)}
+\centerline{(urèeno pro Dired v GNU Emacsu 21.x)}
 \centerline{Pøíkazy oznaèené \dx{} vy¾adují dired-x}
 
 % trim this down to fit everything on one page
@@ -400,4 +400,3 @@
 %\copyrightnotice
 
 \bye
-
diff -ruN src-21.1/etc/cs-refcard.ps src-21.2/etc/cs-refcard.ps
--- src-21.1/etc/cs-refcard.ps	Sun Aug  5 11:04:05 2001
+++ src-21.2/etc/cs-refcard.ps	Fri Feb 22 11:51:21 2002
@@ -6,9 +6,9 @@
 %%BoundingBox: 0 0 596 842
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
-%DVIPSCommandLine: dvips cs-refcard
+%DVIPSCommandLine: dvips cs-refcard.dvi
 %DVIPSParameters: dpi=600, compressed
-%DVIPSSource:  TeX output 2001.08.05:0123
+%DVIPSSource:  TeX output 2002.02.13:1838
 %%BeginProcSet: texc.pro
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -81,8 +81,8 @@
 4B5A017C031FC7FC013F157E6D6C5CD907F0EB07F0D901FFEB7FC06D90B55A021F01FCC8
 FC020113C039357CA842>13 D E
 %EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fc csr7 7 46
-/Fc 46 122 df<1238127C12FE12FFA2127F123B1203A31206A3120C1218123812701220
+%DVIPSBitmapFont: Fc csr7 7 45
+/Fc 45 122 df<1238127C12FE12FFA2127F123B1203A31206A3120C1218123812701220
 08127B8613>44 D<B5FCA410047F8E16>I<1238127C12FEA3127C123807077B8613>I<EB
 3F803801FFF03803E0F83807803C48487E001E7F003E1480A2003C1307007C14C0A400FC
 14E0AE007C14C0A36CEB0F80A36CEB1F006C131E6C6C5A3803E0F86CB45A38003F801B27
@@ -118,43 +118,42 @@
 007E1506A2127C00FC92C7FCA792387FFFE0127C007E02001300167E123EA2123F7E6C7E
 6C7EA26C7ED801F814FEEA007C013FEB039E90390FE00F0E903903FFFC029026007FE0C7
 FC2B2A7DA833>I<B512C0A23807F8006C5AB3B0487EB512C0A212287EA718>73
-D<90B512C0A2903801FE006D5AB3A9123812FEA3130100FC5B387803F000705B383C0FC0
-D80FFFC7FCEA03FC1A297EA722>I<D8FFF0EDFFF06D5C0007EEFE0000035E017CEC037C
-A26D1406A26D140CA36D6C1318A26D6C1330A36D6C1360A26D6C13C0A3903900F80180A2
-91387C0300A2EC3E06A36E5AA2EC0F98A3EC07F0A26E5AEA0780D80FC015FE3CFFFC01C0
-1FFFF0A234287DA73C>77 D<D8FFF0903807FFE07FD803FC9038007E006D143C1618137F
-6D7E6D7EA26D7E6D7E6D7EA26D7E6D7E147FA2EC3F80EC1FC0EC0FE015F01407EC03F8EC
-01FCEC00FEA2157FED3F98ED1FD8A2ED0FF815071503A215011500486C1478487ED8FFFC
-143816182B287EA731>I<B612E015FC3907F0003F0003EC0FC0ED03E0ED01F016F81500
-16FCA616F8150116F0ED03E0ED0FC0ED3F0090B512FC15E001F0C8FCAF487EB512C0A226
-287EA72D>80 D<90387F80203903FFF06039078078E0380E000E48130748130300781301
-0070130012F0A21560A27E1500127C127FEA3FE013FF6C13F06C13FC000313FFC6148001
-0F13C0010013E0EC0FF014031401EC00F8A200C01478A46C1470A26C14F06C14E06CEB01
-C000EFEB078039E3E01F0038C0FFFC38801FF01D2A7DA825>83 D<007FB7FCA23A7E003F
-003F0078150F007081006081A200E01680481501A5C791C7FCB3A64A7E013FB5FCA22928
-7EA72F>I<B539C007FFE0A2D807F8C7EA7E006C48143C1618B3A816386C6C143016706C
-6C1460017C14E0017E495A6D495A90260F8007C7FC903807E03E903801FFF89038003FC0
-2B297EA731>I<13FE3807FFC0380F03E0381C00F0003E1378003F137C143C143E121EC7
-FCA3EB3FFEEA01FF3807F03EEA1FC0EA3F00127EA2481418A3147E127EECDF38393F838F
-F0390FFE0FE03903F807C01D1C7E9A21>97 D<EA0F8012FFA2121F120FAAEB81FCEB8FFF
-9038BC0FC09038F003E09038C001F0EB800015F815FC157CA2157EA7157CA215FC15F890
-38C001F015E090387003C0390E3C0F80390C0FFF00380003F81F297EA725>I<EB3FC0EB
-FFF83803E03C3807C00E380F801F381F003F123EA2007E131E007C1300A212FCA7127C12
-7E1403123E6C1306EA0F803807C00C3803F0383800FFE0EB3F80181C7E9A1E>I<EC03E0
-143FA214071403AAEB3F833801FFE33803E03B3807800F380F0007481303123E127E127C
-A212FCA7127CA2127E123E001E1307001F130F390F801FF03903E073FE3801FFE339007F
-03E01F297EA725>I<133F3801FFE03803E1F0380F80F8381F007C143E123E007E131E14
-1F127C12FCA2B6FCA200FCC7FCA4127C127E1403123E6C1307380F800E3807C01C3803E0
-783800FFE0EB3F80181C7E9A1E>I<EB07E0EB3FF0EB7C78EBF0FCEA01E01203EBC07800
-0713301400A8B51280A23807C000B3A2487EEA7FFEA216297FA815>I<90387E03E03901
-FF9FF03807C3FC380F00F048EBF800001E1378003E137CA6001E1378001F13F86C5BEBC3
-E0380DFF80D81C7EC7FC90C8FCA3121E380FFFF014FC6C13FF001F1480393E001FC00078
-1307EC03E0481301A40078EB03C0007C13076CEB0F80390FC07E003803FFF838007FC01C
-277E9921>I<EA0F8012FFA2121F120FAAEB81FCEB8FFF90389C0F809038B007C013E090
-38C003E0A31380AF391FC007F039FFF83FFEA21F287EA725>I<120EEA3F80A5EA0E00C7
-FCA7EA078012FFA2121F120FB3121FEAFFF8A20D287EA713>I<EA0F8012FFA2121F120F
-ABEC3FF8A2EC1FC01500143C5C14E0EB81C0EB8380018FC7FCEB9F8013BFEBF7C0EBC3E0
-EB81F0801380147C80143FEC1F80EC0FC0D81FC013E039FFF83FFCA21E287EA723>107
+D<D8FFF0EDFFF06D5C0007EEFE0000035E017CEC037CA26D1406A26D140CA36D6C1318A2
+6D6C1330A36D6C1360A26D6C13C0A3903900F80180A291387C0300A2EC3E06A36E5AA2EC
+0F98A3EC07F0A26E5AEA0780D80FC015FE3CFFFC01C01FFFF0A234287DA73C>77
+D<D8FFF0903807FFE07FD803FC9038007E006D143C1618137F6D7E6D7EA26D7E6D7E6D7E
+A26D7E6D7E147FA2EC3F80EC1FC0EC0FE015F01407EC03F8EC01FCEC00FEA2157FED3F98
+ED1FD8A2ED0FF815071503A215011500486C1478487ED8FFFC143816182B287EA731>I<
+B612E015FC3907F0003F0003EC0FC0ED03E0ED01F016F8150016FCA616F8150116F0ED03
+E0ED0FC0ED3F0090B512FC15E001F0C8FCAF487EB512C0A226287EA72D>80
+D<90387F80203903FFF06039078078E0380E000E481307481303007813010070130012F0
+A21560A27E1500127C127FEA3FE013FF6C13F06C13FC000313FFC61480010F13C0010013
+E0EC0FF014031401EC00F8A200C01478A46C1470A26C14F06C14E06CEB01C000EFEB0780
+39E3E01F0038C0FFFC38801FF01D2A7DA825>83 D<007FB7FCA23A7E003F003F0078150F
+007081006081A200E01680481501A5C791C7FCB3A64A7E013FB5FCA229287EA72F>I<B5
+39C007FFE0A2D807F8C7EA7E006C48143C1618B3A816386C6C143016706C6C1460017C14
+E0017E495A6D495A90260F8007C7FC903807E03E903801FFF89038003FC02B297EA731>
+I<13FE3807FFC0380F03E0381C00F0003E1378003F137C143C143E121EC7FCA3EB3FFEEA
+01FF3807F03EEA1FC0EA3F00127EA2481418A3147E127EECDF38393F838FF0390FFE0FE0
+3903F807C01D1C7E9A21>97 D<EA0F8012FFA2121F120FAAEB81FCEB8FFF9038BC0FC090
+38F003E09038C001F0EB800015F815FC157CA2157EA7157CA215FC15F89038C001F015E0
+90387003C0390E3C0F80390C0FFF00380003F81F297EA725>I<EB3FC0EBFFF83803E03C
+3807C00E380F801F381F003F123EA2007E131E007C1300A212FCA7127C127E1403123E6C
+1306EA0F803807C00C3803F0383800FFE0EB3F80181C7E9A1E>I<EC03E0143FA2140714
+03AAEB3F833801FFE33803E03B3807800F380F0007481303123E127E127CA212FCA7127C
+A2127E123E001E1307001F130F390F801FF03903E073FE3801FFE339007F03E01F297EA7
+25>I<133F3801FFE03803E1F0380F80F8381F007C143E123E007E131E141F127C12FCA2
+B6FCA200FCC7FCA4127C127E1403123E6C1307380F800E3807C01C3803E0783800FFE0EB
+3F80181C7E9A1E>I<EB07E0EB3FF0EB7C78EBF0FCEA01E01203EBC078000713301400A8
+B51280A23807C000B3A2487EEA7FFEA216297FA815>I<90387E03E03901FF9FF03807C3
+FC380F00F048EBF800001E1378003E137CA6001E1378001F13F86C5BEBC3E0380DFF80D8
+1C7EC7FC90C8FCA3121E380FFFF014FC6C13FF001F1480393E001FC000781307EC03E048
+1301A40078EB03C0007C13076CEB0F80390FC07E003803FFF838007FC01C277E9921>I<
+EA0F8012FFA2121F120FAAEB81FCEB8FFF90389C0F809038B007C013E09038C003E0A313
+80AF391FC007F039FFF83FFEA21F287EA725>I<120EEA3F80A5EA0E00C7FCA7EA078012
+FFA2121F120FB3121FEAFFF8A20D287EA713>I<EA0F8012FFA2121F120FABEC3FF8A2EC
+1FC01500143C5C14E0EB81C0EB8380018FC7FCEB9F8013BFEBF7C0EBC3E0EB81F0801380
+147C80143FEC1F80EC0FC0D81FC013E039FFF83FFCA21E287EA723>107
 D<EA0F8012FFA2121F120FB3AFEA1FC0EAFFF8A20D287EA713>I<260F81FC137F3BFF8F
 FF03FFC0903A9C0F8703E03B1FB007CC01F0D80FE013D8903AC003F000F8A301805BAF48
 6C486C487E3CFFF83FFE0FFF80A2311A7E9937>I<380F81FC38FF8FFF90389C0F80391F
@@ -748,8 +747,8 @@
 C06C48B45A90B5CBFC6C5B000713F86C13E0C66CCCFC426D7DD449>253
 D E
 %EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fh csr10 10 69
-/Fh 69 256 df<DA0FF813FC91397FFF07FF903B01F807DF83C0903A07E001FF0F903B1F
+%DVIPSBitmapFont: Fh csr10 10 68
+/Fh 68 256 df<DA0FF813FC91397FFF07FF903B01F807DF83C0903A07E001FF0F903B1F
 8007FE1FE090393F000FFC137E16F85B9338F007804848010790C7FC1503ACB812F8A328
 01F80003F0C7FCB3AB486C497E267FFFE0B512F0A3333B7FBA30>11
 D<EC0FF8EC7FFE903901F80780903907E001C090391F8000E090383F0007017E497EA25B
@@ -761,12 +760,9 @@
 A21480A3EB07C0A6EB03E0B2EB07C0A6EB0F80A31400A25B131EA2133E133C137C1378A2
 5BA2485A485AA2485A48C7FC120E5A5A5A5A5A13527CBD20>I<121C127FEAFF80A213C0
 A3127F121C1200A412011380A2120313005A1206120E5A5A5A12600A19798817>44
-D<B512FCA516057F941C>I<121C127FEAFF80A5EA7F00121C0909798817>I<EB03F8EB1F
-FF90387E0FC09038F803E03901E000F0484813780007147C48487FA248C77EA2481580A3
-007EEC0FC0A600FE15E0B3007E15C0A4007F141F6C1580A36C15006D5B000F143EA26C6C
-5B6C6C5B6C6C485A6C6C485A90387E0FC0D91FFFC7FCEB03F8233A7DB72A>48
-D<EB01C013031307131F13FFB5FCA2131F1200B3B3A8497E007FB512F0A31C3879B72A>
-I<EB0FF0EB7FFE48B57E3903E03FE0390F000FF0000E6D7E486D7E486D7E123000706D7E
+D<B512FCA516057F941C>I<121C127FEAFF80A5EA7F00121C0909798817>I<EB01C01303
+1307131F13FFB5FCA2131F1200B3B3A8497E007FB512F0A31C3879B72A>49
+D<EB0FF0EB7FFE48B57E3903E03FE0390F000FF0000E6D7E486D7E486D7E123000706D7E
 126012FCB4EC7F807FA56CC7FC121CC8FCEDFF00A34A5A5D14035D4A5A5D140F4A5A4A5A
 92C7FC147C5C495A495A495A495A91C8FC011EEB01805B5B49130348481400485A485A00
 0EC75A000FB6FC5A5A485CB6FCA321387CB72A>I<EB07F8EB3FFF4913C03901F80FF039
@@ -1041,9 +1037,9 @@
 %%EndSetup
 %%Page: 1 1
 1 0 bop 50 -320 a Fi(GNU)55 b(Emacs)h({)e(Referen\350n\355)h(k)-5
-b(arta)953 -185 y Fh(\(pro)27 b(v)n(erzi)g(20\))0 56
+b(arta)953 -185 y Fh(\(pro)27 b(v)n(erzi)g(21\))0 56
 y Fg(Spu\271t\354n\355)48 b(Emacsu)0 251 y Fh(Pro)26
-b(vstup)i(do)f(GNU)i(Emacsu)d(20)h(napi\271te)g(jeho)h(jm\351no:)g
+b(vstup)i(do)f(GNU)i(Emacsu)d(21)h(napi\271te)g(jeho)h(jm\351no:)g
 Ff(emacs)0 384 y Fh(Jak)f(na\350\355tat)g(a)g(edito)n(v)n(at)g(soub)r
 (ory)f(se)h(dozv\355te)h(n\355\276e)f(v)h(o)r(dd\355le)g(Soub)r(ory)-7
 b(.)0 612 y Fg(Opu\271t\354n\355)48 b(Emacsu)0 807 y
@@ -1400,9 +1396,9 @@
 b(.)0 4603 y(V\355ce)28 b(se)f(dozv\355te)g(p)r(o)h(pro)n(v)n(eden\355)
 e Ff(C-h)42 b(f)i(interactive)p Fh(.)476 4919 y Fc(Cop)n(yrigh)n(t)805
 4917 y(c)787 4919 y Fb(\015)22 b Fc(1997)h(F)-5 b(ree)21
-b(Soft)n(w)n(are)h(F)-5 b(oundation,)20 b(Inc.)574 4998
-y(v2.2)j(for)f(GNU)g(Emacs)g(v)n(ersion)g(20,)g(June)f(1997)798
-5078 y(designed)g(b)n(y)h(Stephen)e(Gildea)0 5194 y(P)n(ermission)f(is)
+b(Soft)n(w)n(are)h(F)-5 b(oundation,)20 b(Inc.)654 4998
+y(v2.2)i(for)g(GNU)h(Emacs)e(v)n(ersion)h(21,)h(1997)798
+5078 y(designed)e(b)n(y)h(Stephen)e(Gildea)0 5194 y(P)n(ermission)f(is)
 i(gran)n(ted)f(to)h(mak)n(e)e(and)i(distribute)d(copies)i(of)g(this)h
 (card)e(pro)n(vided)g(the)h(cop)n(y-)0 5273 y(righ)n(t)i(notice)f(and)h
 (this)g(p)r(ermission)f(notice)g(are)g(preserv)n(ed)g(on)h(all)g
diff -ruN src-21.1/etc/cs-refcard.tex src-21.2/etc/cs-refcard.tex
--- src-21.1/etc/cs-refcard.tex	Sun Sep 23 19:42:42 2001
+++ src-21.2/etc/cs-refcard.tex	Fri Feb 22 11:51:21 2002
@@ -1,4 +1,4 @@
-% Reference Card for GNU Emacs version 20 on Unix systems
+% Reference Card for GNU Emacs version 21 on Unix systems
 
 % Czech hyphenation rules applied
 \chyph
@@ -74,7 +74,7 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version 20, June \year}
+\centerline{v\versionnumber{} for GNU Emacs version 21, \year}
 \centerline{designed by Stephen Gildea}
 
 Permission is granted to make and distribute copies of
@@ -264,11 +264,11 @@
 
 \title{GNU Emacs -- Referenèní karta}
 
-\centerline{(pro verzi 20)}
+\centerline{(pro verzi 21)}
 
 \section{Spu¹tìní Emacsu}
 
-Pro vstup do GNU~Emacsu~20 napi¹te jeho jméno: \kbd{emacs}
+Pro vstup do GNU~Emacsu~21 napi¹te jeho jméno: \kbd{emacs}
 
 Jak naèítat a editovat soubory se dozvíte ní¾e v~oddíle Soubory.
 
diff -ruN src-21.1/etc/dired-ref.ps src-21.2/etc/dired-ref.ps
--- src-21.1/etc/dired-ref.ps	Mon Jan 29 14:03:30 2001
+++ src-21.2/etc/dired-ref.ps	Fri Feb 22 11:51:21 2002
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0
-%%Creator: dvips(k) 5.86 Copyright 1999 Radical Eye Software
+%%Creator: dvips(k) 5.86d Copyright 1999 Radical Eye Software
 %%Title: dired-ref.dvi
 %%Pages: 1
 %%PageOrder: Ascend
@@ -7,8 +7,8 @@
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips -o dired-ref.ps dired-ref.dvi
-%DVIPSParameters: dpi=360, compressed
-%DVIPSSource:  TeX output 2001.01.29:1402
+%DVIPSParameters: dpi=600, compressed
+%DVIPSSource:  TeX output 2002.02.12:1310
 %%BeginProcSet: texc.pro
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -67,414 +67,586 @@
 rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
 
 %%EndProcSet
-TeXDict begin 39158280 55380996 1000 360 360 (dired-ref.dvi)
+TeXDict begin 39158280 55380996 1000 600 600 (dired-ref.dvi)
 @start
 %DVIPSBitmapFont: Fa cmtt8 8 63
-/Fa 63 127 df<126012F0AF1200A4126012F0A212600418789715>33
-D<EA030CEA079EA4387FFF80B512C0A26C1380380F3C00A6387FFF80B512C0A26C138038
-1E7800A4EA0C3012187F9715>35 D<13C01201A3EA07E0EA1FF8EA3FFEEA79DEEAF1CF12
-E1A3EAF1C0127D123FEA1FF8EA03FCEA01FE13CF1261EAF1C7A212E1EAF1CFEA79DEEA7F
-FCEA1FF8EA07E0EA01C0A21200101F7E9B15>I<EA3806EA7C0FEAFE1FA2EAEE1E133EA2
-133CEAFE7CA2EA7CF81238C65A1201A25B1203A25B1207A2EA0F87EB8F80EB1FC0EA1F1D
-A2121E123E131F383C0F8038180700121F7F9B15>I<EA0780487E121FEA3DE01238A338
-39EFC013CF123F381F8E00131EEA1E1C123EEA7F3CEAF738EAE7F8EAE3F000E1138038E0
-E1C0EAF3F9EA7FFF383FBF80381E0F0012187F9715>I<EA01C01203EA0780EA0F00121E
-121C123C123812781270A212F05AA87E1270A212781238123C121C121E7EEA0780EA03C0
-12010A20799B15>40 D<120313801300A2EAE31CEAF33CEA7FF8EA1FE0EA0780EA1FE0EA
-7FF8EAF33CEAE31CEA0300A2138013000E117D9415>42 D<13C0487EA6387FFF80B512C0
-A26C13803801E000A66C5A12127F9415>I<EA7FFEB5FCA2EA7FFE10047E8D15>45
-D<127012F8A312700505788415>I<1306130F131FA2133EA2133C137CA213F8A2EA01F0
-A2EA03E0A213C01207A2EA0F80A2EA1F00A2123EA2123C127CA25AA25A1260101F7E9B15
->I<EA07E0EA1FF8EA7FFCEAF03E131E130F130712601200A2130F131E131C133C1378EA
-01F0EA03C0EA0780EA0F00EA1E07123CEA7FFFB5FC7E10187E9715>50
-D<EA07E0EA3FF8EA7FFCEA783E131E130E1200131EA2133CEA07F813F013F8EA001E130E
-130F130712F0130FA2131EEA7FFCEA3FF8EA0FE010187E9715>I<1306131F133F137EEA
-01FCEA03F8EA07E0EA1FC0EA3F80EA7E005AA2127EEA3F80EA1FC0EA07E0EA03F8EA01FC
-EA007E133F131F130610167E9615>60 D<387FFF80B512C0A26C1380C8FCA4387FFF80B5
-12C0A26C1380120C7F9115>I<126012F87E127EEA3F80EA1FC0EA07E0EA03F8EA01FCEA
-007E133FA2137EEA01FCEA03F8EA07E0EA1FC0EA3F80EA7E005A5A126010167E9615>I<
-EA0FF0EA3FFCEA7FFEEAF01F1307A2EA601FEA007E13F8EA01F0EA03C01380A5C7FCA412
-03EA0780A2EA030010187E9715>I<EA01F0EA07FC487EEA1F0FEA3C7FEA79FF1480EA73
-CFEAF78712E71303A4138712F73873CF00EA79FEA2EA3C78381F0780EA0FFF3807FE00EA
-01F811187E9715>I<EA01E0A3EA0330A4EA0738A4EA0618EA0E1CA3EA0FFC487EA2EA1C
-0EA3387E1F8038FF3FC0387E1F8012187F9715>I<EA7FFCB5FC6C1380EA1C07EB03C013
-01A31303EB0780381FFF005B7F381C07801303EB01C0A41303EB0780EA7FFFB51200EA7F
-FC1218809715>I<EA03E3EA0FFF5AEA3E1FEA3C0F1278EA7007A2EAF0005AA67EEA7007
-A21278EA3C0FEA3E1EEA1FFCEA0FF8EA03E010187E9715>I<EA03E3EA0FFF5AEA3E1FEA
-3C0F1278EA7007A200F0C7FC5AA3EB3F8014C0148038F0070012705B1278123CEA3E1F6C
-B4FC7EEA03E712187F9715>71 D<38FE1FC0A338380700A7EA3FFFA3EA3807A838FE1FC0
-A312187F9715>I<EA7FFCEAFFFEEA7FFCEA0380B2EA7FFCEAFFFEEA7FFC0F187D9715>I<
-EA7F80487E6C5A001CC7FCAEEB01C0A4EA7FFFB5FC7E12187F9715>76
-D<387C03E038FE07F0007E13E0383B0DC0A4139DEA3999A5EA38F1A213611301A5387C03
-E038FE07F0387C03E01418809715>I<EA1FF8EA3FFCEA7FFEEA781EEAF00FEAE007AEEA
-F00FEA781EEA7FFEEA3FFCEA1FF810187E9715>79 D<EA7FFC487E6C7E381C07801303EB
-01C0A5EB03801307381FFF005B5B001CC7FCA6127F487E6CC7FC1218809715>I<EA1FF8
-EA3FFCEA7FFEEA781EEAF00FEAE007ACEAE1C713E7EAF1EFEA78FE127FEA3FFCEA1FF8EA
-0038133C131C131E130EA2101E7E9715>I<EAFFE013F87FEA381E7F7FA35B131EEA3FFC
-5B7FEA383E130EA4144014E0A2EAFE0FEB07C0EB038013187F9715>I<EA0FC6EA3FFE12
-7FEA783EEAF01EEAE00EA213007E127CEA3FC0EA1FF8EA03FCEA003E130FA2130712E0A2
-EAF00FEAF81EEAFFFE13F8EAC7E010187E9715>I<387F0FE038FF9FF0387F0FE0381C03
-80AFEA1E07000E1300EA0F0FEA07FE6C5A6C5A1418809715>85 D<EA7E3F007F1380007E
-1300EA1E1CEA0E38120FEA07785B12035B12015B7F12037FEA07707F120E7F121EEA1C0E
-387E1F8038FF3FC0387E1F8012187F9715>88 D<38FE1FC0A3381C0F00130EEA0E1E131C
-12075BEA03B8A2EA01F0A26C5AA8EA03F8A312187F9715>I<EA7FFFB5FCA2EAE00E131E
-133C1338EA007813F013E01201EA03C0A2EA078013005A121EEA1C07123C12781270B5FC
-A310187E9715>I<EA0780EA1FE0EA7FF8EAFFFCEAF87CEA60180E067D9715>94
-D<EA7FFEB5FCA2EA7FFE10047E7F15>I<EA1FC0EA7FF87FEA783EEA301EEA000EEA01FE
-120FEA3FEEEAF80E12E0A2131EEAF03E387FFFC0EA3FEFEA1F8712117E9015>97
-D<EA03F0EA0FFC123FEA7C3CEA7818EAF0005AA47E130E1278EA7C1EEA3FFCEA0FF8EA03
-E00F117D9015>99 D<137EA3130EA4EA07CEEA1FFE123FEA7C3EEA781EEAF00E12E0A5EA
-F01E1278EA7C3E383FFFC0EA1FEFEA078F12187F9715>I<EA07F0EA0FF8EA1FFCEA3C1E
-EA780EEAF00FEAE007B5FCA3EAF000EA70071278EA3E1FEA1FFEEA0FFCEA03F010117E90
-15>I<133E13FF5AEA03CF13861380A2EA7FFFB5FCA2EA0380ABEA7FFCA310187F9715>I<
-3807C780381FFFC05A383C798038783C00EA701CA3EA783C6C5AEA3FF85BEA37C00030C7
-FCEA3FF813FF481380EA700738F003C0EAE001A3EAF003387C0F80383FFF006C5AEA03F0
-121B7F9015>I<12FCA3121CA413F8EA1FFC7F131EEA1E0E121CA938FF8FC0139F138F12
-187F9715>I<1203EA0780A2EA0300C7FCA4EA7F8012FF127F1203ABEAFFFCA30E197D98
-15>I<136013F0A213601300A4EA1FF0A3EA0070B2EA60F0EAF1E012FFEA7FC0EA3F000C
-227E9815>I<12FCA3121CA4EB7FC013FF137FEB3C005B5BEA1DE0121FA27FEA1E78EA1C
-3CA27F38FF1FC0A312187F9715>I<EAFF80A31203B2EAFFFEA30F187D9715>I<38F9C380
-38FFEFC0EBFFE0EA3C78A2EA3870A938FE7CF8A31511809015>I<EAFCF8B47E7FEA1F1E
-EA1E0E121CA938FF8FC0139F138F12117F9015>I<EA07E0EA1FF8EA3FFCEA3C3CEA700E
-A2EAE007A5EA700EEA781EEA3C3CEA3FFCEA1FF8EA07E010117E9015>I<EAFC78EAFDFE
-B5FC381F0F80EA1E07381C03C01301A51303381E0780EA1F0FEBFF005BEA1CF890C7FCA6
-B47EA3121A7F9015>I<EA03C7EA0FF7EA3FFFEA7C1FEA780F12F07F12E0A46C5A1278EA
-7C1FEA3FFFEA1FF7EA07C7EA0007A6EB3FE0A3131A7F9015>I<EAFE1EEB7F80B5FCEA0F
-C7EB830090C7FCA2120EA7EAFFF07F5B11117E9015>I<EA0FD8EA7FF812FFEAF078EAE0
-38A2EAF800EA7FC0EA1FF0EA00F8EAE03C131C12F0EAF83CEAFFF813F0EACFC00E117D90
-15>I<12035AA4EA7FFE12FFA2EA0700A613021307A3138FEA03FE13FCEA00F010167F95
-15>I<EAFC7EA3EA1C0EA9131EA2381FFFC07EEA07CF12117F9015>I<387F3F8000FF13C0
-007F1380381C0E00A2EA1E1EEA0E1CA36C5AA3EA0330A213F06C5AA212117F9015>I<38
-FF3FC0A338380700A4EA39E7A2EA19E6EA1B36A4EA1F3EEA0F3CEA0E1C12117F9015>I<
-387E3F80127F127E380F3C00EA073813F012036C5AA3487EEA0738120FEA0E1C387F3F80
-00FF13C0007F138012117F9015>I<131F137FEA01FF13E013C0A91207EAFF80EAFE00EA
-FF80EA07C01201A913E013FFEA007F131F101F7E9B15>123 D<12FCB4FC13C012031201
-A913F0EA00FF133F13FFEA01F013C0A9120312FF130012FC101F7E9B15>125
-D<EA1E18EA3F3CEAFFFCEAF3F0EA61E00E057D9715>I E
+/Fa 63 127 df<123812FEB3A8127C1200A7123812FEA51238072A72A923>33
+D<EB3C0F90387E1F80A6EBFE3F01FC1300A2007FB512F8B612FCA4003F14F83901F87E00
+AA003FB512F8B612FCA46C14F83903F0FC00EA07F1EBE1F8A63803C0F01E297EA823>35
+D<130E131FA4EB7FC03803FFF04813FC001F7F487FD87FDF1380EB1F1F00FEEB0FC012FC
+00F8131FA312FCEC0F8000FEEB0700007F90C7FCEA3FDF13FF000F13C06C13F0000113FC
+6C6C7EEB1FFFEC7F80141F15C0007C130F00FE1307A400FC130FA2007EEB1F80007F133F
+9038DFFF006CB45A6C5B00075B6C13E038007F80011FC7FCA5130E1A347CAD23>I<000F
+EB01C0391F8003E0383FC007EA7FE0140FD8F9F013C0141F00F01480A2143F150000F95B
+147EEA7FE014FE6C485AEA1F80EA0F0100005B13035CA213075C130F5CA2131F5C133F91
+C7FCA25B137E9038FE03C09038FC07E0EC0FF00001EB1FF813F8EC3E7C12039038F03C3C
+120713E0A2000FEB3E7C13C0001FEB1FF81380EC0FF0000FEB07E039070003C01E347EAD
+23>I<137CEA01FE487E487FA2EBCFC0EA0F87A21303A31307A290380FCFF8EC9FFC139F
+13BF3907FF0FF801FE138013FCA29038F81F00EA0FF0381FE01E383FF03E13F8007F5BEA
+7E7C00FC1378EB3EF812F86D5AA290380FE03C1307EAFC0F90381FF07C387E3FFC007FB5
+12FC393FFE7FF8EBFC3F390FF01FE03907E007C01E2B7EA923>I<EB0380EB0FC0131FEB
+3F80EBFF005BEA01F81203485A485A5B485AA248C7FCA2123E127EA2127CA212FCA25AA8
+7EA2127CA2127EA2123E123FA26C7EA26C7E7F6C7E6C7E1201EA00FE7FEB3F80EB1FC013
+0FEB0380123476AD23>40 D<131EA2131F131EA30070EB0380007C130F00FEEB1FC0397F
+9E7F8090B5FC001FEBFE00000713F8000113E038007F803801FFE0000713F8001F13FE00
+7FEBFF80EB9E7F39FE1E1FC0007CEB0F8000701303000090C7FCA3131F131EA21A1D7CA2
+23>42 D<EB0780497EAB007FB512F8B612FCA46C14F839000FC000AB6D5A1E1E7EA223>
+I<007FB51280B612C0A46C14801A067C9623>45 D<123E127FEAFF80A5EA7F00123E0909
+738823>I<EC0380EC07C0140FA2141F1580143F15005C147EA214FE5C13015C13035C13
+075CA2130F5C131F5C133F91C7FCA25B137E13FE5B12015BA212035B12075B120F5B121F
+5BA2123F90C8FC5A127E12FE5AA25A12781A347CAD23>I<EB7FC03803FFF04813FC001F
+7F48EBFF80EA7F80397E003FC000FEEB0FE04813076CEB03F0A31401127C1238C7FC1403
+A2EC07E0A2EC0FC0141FEC3F80150014FE1301EB03F8495A495AEB3FC0495A01FEC7FC48
+5A485AD80FF013E0391FE001F0EA3F8048B5FCB6FCA36C14E01C2A7DA923>50
+D<EB7FC03801FFF0000713FC487F487F393FE07F809038801FC0140F1407A3EA0E00C712
+0FA2EC1F80143F903801FF00EB7FFE495A5C806DB4FC9038007F80EC1FC0EC0FE01407EC
+03F0A21401A2127C12FE1403A2EC07E048130F6CEB1FC0387FC07F6CB512806C14006C13
+FC00035B38007FC01C2B7DA923>I<EC0380EC0FC0141F143F14FF491380903807FE0049
+5A495AEB7FE0495A4890C7FCEA07FE485AEA1FF0EA7FE0485A90C8FCA213C06C7EEA1FF0
+EA0FFC6C7EEA01FF6C13C06D7EEB1FF86D7E6D7E903801FF806D13C0143F141F140FEC03
+801A247CA523>60 D<007FB512F8B612FCA4003F14F8C9FCA6003FB512F8B612FCA46C14
+F81E127E9C23>I<127012FC7E7E13C06C7EEA1FF86C7E6C7E3801FF806C7FEB3FE0EB1F
+F86D7EEB03FE903801FF806D13C0143FA214FF491380903803FE00EB0FFC495AEB3FE0EB
+FFC0485BD807FEC7FC485A485AEA7FE0485A90C8FC5A5A12701A247CA523>I<3801FFC0
+000713F8001F13FE487F48148039FF007FC048130F1407A2140F007C131F0038EB7F80C7
+12FF01031300EB07FCEB0FF0495A5C495AA291C7FCA6133E90C8FCA7131C137FA5131C1A
+297CA823>I<EB07F0EB1FFCEB7FFE48B5FC4814803907FC1FC0380FE0079038C0FFE0EA
+1F83485AEA3E0FD87E1F13F0007C138FEB3F0738783E0338F87C01A212F0EB7800A5EB7C
+0112F8A239783E03E0387C3F0790381F8FC0007E13FFD83E0F1380D83F071300381F83FE
+390FC0F9E09038E007F03807FC0F6CB5FC6C14C06C6C138090381FFE00EB07F81C297DA8
+23>I<EB0FC0A2497EA4EB3CF0A5EB7CF8A3EB7878EBF87CA548487EA40003133F497EA2
+90B5FCA2481480A3EBC00F000F14C0EB8007A3397FF03FF800FF14FCA3007F14F81E2A7E
+A923>I<B512F014FE80158015C0390F800FE01407EC03F01401A5140315E01407EC1FC0
+90B5128015005C8015C09038800FE01407EC03F0140115F81400A5140115F01403EC0FE0
+B6FC15C01580150014FC1D297EA823>I<90380FE0E090383FF9F0EBFFFD4813FF5A3807
+FC3F380FF00F381FC007A2383F80031300481301127EA2007CEB00E000FC1400A25AA97E
+A2127C007E14E0EC01F0127F7EEB8003EA1FC0EC07E0380FF00F3907FC1FC06CB512806C
+14006C5BEB3FF8EB0FE01C2B7DA923>I<90381FC1C090387FF3E090B5FC12035AEBF83F
+380FE01F381FC00F1380003F13071300007E1303A3007CEB01C000FC90C7FCA25AA6EC7F
+F815FCA27E15F8007CEB03E0127E1407A27EEB800F121FEBC01FEA0FE03807F87F90B5FC
+7EC613FB90387FF1C090381FC0001E2B7EA923>71 D<397FF00FFE39FFF81FFFA3397FF0
+0FFE390F8001F0AC90B5FCA5EB8001AE397FF00FFE39FFF81FFFA3397FF00FFE20297FA8
+23>I<B512FEA538007C00B3ADB512FEA517297AA823>I<EA7FFEB5FCA36C5AEA07C0B3A6
+157CA7007FB512FCB6FCA36C14F81E297EA823>76 D<39FF8001FFA26D5AA3391EE00778
+A3EBF00FEB700EA2EB781EA2EB381CEB3C3CA2EB1C38EB1E78A2EB0E70A3EB07E0A3EB03
+C0A290C7FCA939FFC003FFA520297FA823>I<3803FFF0000F13FC487F487FA2397F807F
+80387E001F007C130FA200FC14C0481307B3A46C130FA2007C1480A2007E131F387F807F
+6CB51200A26C5B6C5B000313F01A2B7CA923>79 D<B512F014FE80158015C0390F801FE0
+EC07F01403140115F81400A5140115F014031407EC1FE090B512C0158015005C14F00180
+C7FCABEAFFF87FA35B1D297EA823>I<3803FFF0000F13FC487F487FA2397F807F80387E
+001F007C130FA200FC14C0481307B3A3131F148700FC138F397C0FCF80A2387E07FFEA7F
+876CB51200A26C5B6C5B1203C7FC147EA280A2EC1F80A2140F1A337CA923>I<387FFFC0
+B512F88014FF7E390F807F80EC1FC0140F6E7E1403A514074A5A141FEC7F8090B5C7FCA2
+14FC8080EB807F6E7E141F140FA61587ED8F80A215CFD87FF013DF39FFF807FF1600806C
+486C5AC812F8212A7FA823>I<9038FF83800003EBE3C04813FF121F5AEA7FC0EB003F00
+FE131F48130FA25A1407A26CEB038091C7FC127E127FEA3FF06CB4FC6C13F06C13FC0001
+7F39001FFF80010113C0EB001FEC0FE01407EC03F0A20070130112F8A36C1303A26CEB07
+E06C130F9038E03FC090B5FC15005C00F15B38703FE01C2B7DA923>I<39FFF81FFFA539
+0F8001F0B3A7EBC003A2000714E0EBE007EBF00F000314C0EBFC3F6CB512806C14006D5A
+EB1FF8EB07E0202A7FA823>85 D<397FF07FF0EBF8FFA3EBF07F3907E03F000003133EEB
+F07E0001137CEBF8FC00005B13FDEB7DF0137F6D5AA26D5AA26D5AA280131F80133F8013
+7DEB7CF813F8147CEA01F0801203497E12079038C00F80120F397FE03FF8D8FFF013FCA3
+D87FE013F81E297EA823>88 D<397FF00FFE39FFF81FFFA3397FF00FFE3907C003E0EBE0
+07000314C013F00001130F01F813800000131F01FC1300137C143E133E147EEB1F7CA26D
+5AA26D5AA25C1303ACEB1FFC497EA36D5A20297FA823>I<003FB512E04814F0A4397C00
+07E0140FEC1FC01580143F0038EB7F00C7127E14FE495A5C1303495A5C130F495A5C133F
+49C7FC137E13FE485A5B1203485A4913E0000FEB01F0EA1FC01380123FEA7F00127EB6FC
+A46C14E01C297DA823>I<133013FCEA03FF000F13C0003F13F0B512FC1387EAFE0138F8
+007C00601318160A7AA823>94 D<007FB51280B612C0A46C14801A067C7E23>I<3803FF
+80000F13E04813F8487F80EB80FFEC3F80381F001FC7FC140F14FF137F0003B5FC120F5A
+387FF00F130012FCA25A141F7E6C133F387F81FF90B512FC6C14FE7E000713C73901FE01
+FC1F1D7D9C23>97 D<EB3FF0EBFFFC000313FF5A5A381FE07FEA3F80387F003E007E90C7
+FCA25AA25AA57EA2007E1307007FEB0F80141FEA3FC0391FF07F006CB5FC6C5B6C5BC613
+F0EB3FC0191D7B9C23>99 D<ECFF8015C0A41407A7EB7F873801FFE74813F7000F13FF5A
+13E0383F803F387F001F007E130FA2481307A25AA56C130FA2127E141F007F133F383F80
+7FEBE0FF6CB512FE7E000313F76C13C738007F031F297EA823>I<EB3FC0EBFFF800037F
+4813FF481480381FF07F393F801FC0EB000F007E130715E05AB6FCA415C000F8C8FC7EA2
+007EEB01C0007FEB03E0383F800713E0391FF81FC06CB5FC6C14800001EBFE006C6C5AEB
+1FE01B1D7D9C23>I<147F903801FFC0010713E05B5BEB3FCF140F90383E07C091C7FCA4
+007FB51280B612C0A36C1480D8003EC7FCB3383FFFFE487FA36C5B1B297EA823>I<EC01
+F090383F07FC9038FFDFFE000313FF5A48147E381FE1FE9038807E18393F003F00A2003E
+7FA4003F5BA2381F807EEBE1FE6CB45A485B5C001E13C0013FC7FC90C8FC121F1340380F
+FFFCECFF804814C04814F0397E0007F8007C130048147CA248143CA36C147C6C14FC007F
+EB03F8EBE01F6CB512F0000F14C06C14800001EBFE0038003FF01F2E7E9D23>I<B47E7F
+A41207A7EBC1FCEBC7FF01DF138090B512C0A29038FE0FE0EBF807EBF00313E0A313C0AD
+39FFFE1FFF5CA38020297FA823>I<133813FEA5133890C7FCA6EA7FFC487EA3127FEA00
+3EB3387FFFFEB6FCA36C13FE182A7AA923>I<14E0EB03F8A5EB00E01400A63803FFF048
+13F8A37EC7FCB3AB13011238387C03F012FEEB0FE0B5FC14C06C13006C5AEA0FF815397D
+A923>I<EA7F80487EA3127F1203A7ECFFFC13C1A313C0EC3F00147E5CEBC1F8EBC3F0EB
+C7E0EBCFC0EBDFE0EBFFF0A2EBFCF8497EEBF07EEBE03E497E1580EC0FC01407EC03E039
+7FFE0FFFB55AA36C487E20297FA823>I<EA7FFEB5FCA37EEA001FB3AD007FB512C0B612
+E0A36C14C01B297CA823>I<397E1F01F039FF7FC7FC9038FFEFFE14FF6C80390FE1FE1F
+EBC1FC01C07FEB80F8A2EB00F0AE3A7FE3FE3FE026FFF3FF13F0A3267FE3FE13E0241D81
+9C23>I<38FF81FCEBC7FF01DF138090B512C0A23907FE0FE0EBF807EBF00313E0A313C0
+AD39FFFE1FFF5CA380201D7F9C23>I<133F3801FFE0487F487F487F381FC0FE383F807F
+383E001F007E1480007C130F00FC14C0481307A66C130FA2007C1480007E131F6CEB3F00
+6D5A381FE1FE6CB45A6C5B6C5B6C5BD8003FC7FC1A1D7C9C23>I<38FF81FCEBC7FF01DF
+13C090B512E015F03907FE0FF8EBF8039038F001FCEBE000A249137EA2153EA5157E7F15
+FC7F14019038F803F89038FE0FF090B5FC15E001DF138001CF1300EBC3F801C0C7FCAAEA
+FFFEA51F2C7F9C23>I<90383FC1C09038FFF3E0000313FB4813FF5A381FF07F383FC01F
+387F000F127E14075A14035AA57E1407127E140F007F131FEA3F80381FE07F90B5FC1207
+6C13FB6C13E338003F83EB0003AAEC7FFF91B51280A36E1300212C7E9C23>I<397FF00F
+E039FFF87FF8ECFFFC13FB6CB5FCC613F8ECC078EC800091C7FC5BA25BA35BAA387FFFFC
+B57EA36C5B1E1D7E9C23>I<3801FF9C000F13FE5A127FA2EAFF0000FC137E48133EA26C
+131C6C1300EA7FF0383FFF80000F13E06C13F838007FFCEB01FEEB007F0070133F00F813
+1F7E143F7E38FF80FFEBFFFE14FC14F814F000701380181D7B9C23>I<137013F8A7007F
+B51280B612C0A36C1480D800F8C7FCACEC01C0EC03E0A3EBFC07140F9038FE1FC0EB7FFF
+158090383FFE00EB0FFCEB07F01B257EA423>I<39FF807FC001C013E0A400071303B014
+07140FEBE03F90B6FC7EA2C613F3EB3FC1201D7F9C23>I<39FFF03FFCA5390F8007C000
+071480A2EBC00F00031400A26D5A0001131EA2EBF03E0000133CA2EBF87CEB7878A2EB7C
+F8EB3CF0A2133F6D5AA36D5A6D5A1E1D7E9C23>I<397FF00FFE39FFF81FFFA3397FF00F
+FE001FC712F86C14F0A57F390783E1E0EB87F1A3EB8FF90003EB79C013CFA2EBDF7BA2EB
+DE3B00011480EBFE3FA2EBFC1FA23900F80F00201D7F9C23>I<397FF07FF039FFF8FFF8
+A3397FF07FF03903E03E003801F03C3800F87CEB78F8EB7CF0EB3FE0131F6D5A5C130749
+7E497E133DEB3CF0EB7878EBF07C0001133C497E3803C01F397FF03FF839FFF87FFCA339
+7FF03FF81E1D7E9C23>I<EC1FE0ECFFF05B130715E090380FF00014C05CAE131F137FD8
+7FFFC7FC485A5BA27F6C7EC66C7E131F130FAE8014F0903807FFE015F013017FEC1FE01C
+347DAD23>123 D<EA7FC0EAFFF87F13FF7EC66C7E131F130FAE8014F0903807FFE06D13
+F07FA25B4913E090380FF00014C05CAE131F137FD87FFFC7FCB5FC13FC5BEA7FC01C347D
+AD23>125 D<3803C038380FF07C381FF8FCEA3FFF4813F8B512F038FC7FE038F83FC038
+700F0016097AA823>I E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fb cmbx10 12 37
-/Fb 37 122 df<903901FF81FE011F9038EFFF80903A7F80FF87C0D9FE00EB0FE03903FC
-01FE13F8D807F013FCEE07C093C7FCA7B712F8A32707F001FCC7FCB3A33A7FFF1FFFE0A3
-2B2A7FA928>11 D<49B4FC011F13C090387F80F09038FE00F83903FC01FCEBF803EA07F0
-A36E5A6E5A92C7FCA4B612FCA33807F001B3A33A7FFF1FFFC0A3222A7FA926>I<EC0380
-4A7EA24A7EA34A7EA24A7EA3EC73FCA2ECF3FE14E101017F14C0A2010380EC807F010780
-EC003FA2010E6D7EA2011E80011C130F011FB5FC4980A29039780007FC0170130301F080
-491301A2000181497F00031680D8FFFE011F13FEA32F297EA834>65
-D<B612FCEDFF80823A03F8001FF06F7E6F7E1503A2821501A315035EA24B5A4B5A4B5AED
-FFC090B548C7FCEDFFE09039F80007F0ED03FC6F7EA26F7EA21780A617005D4B5A4B5AED
-1FF8B75A16C04BC7FC29297DA831>I<91393FF00180903903FFFE03010FEBFF8F90393F
-F007DF9039FF8001FF4848C7FC4848143F4848141F485A001F150F491407123F5B007F15
-03A25B00FF92C7FCAB127F6DEC0380A2123F7F001F15076D1500000F5D6C6C141E6C6C14
-3E6C6C5C6C6C6C5B90393FF007E0010FB55A010349C7FC9038003FF0292B7CA932>I<B6
-12F8EDFF8016E03A03FC001FF8ED07FCED01FE6F7EEE7F80EE3FC0161F17E0A2EE0FF0A4
-17F8AA17F0A3EE1FE0A217C0163FEE7F801700ED01FE4B5AED1FF8B712E0168003FCC7FC
-2D297DA835>I<B712F0A33903FC000FED03F81501150016781638A3EDE03C161CA30201
-1300A2140790B5FCA3EBFC071401A202001307A3160E1500A2161EA2161C163C167C16FC
-1501150FB712F8A328297EA82D>I<B712E0A33903FC001FED07F01501A215001670A316
-78EDE038A316001401A2140790B5FCA3EBFC071401A21400A492C7FCA9B512FCA325297E
-A82B>I<91393FF00180903903FFFE03010FEBFF8F90393FF007DF9039FF8001FF4848C7
-FC4848143F4848141F485A001F150F491407123F5B007F1503A25B00FF92C7FCA992387F
-FFFCA26C7E9238007F80A2123F7F121F7F120F6C7E6C7E6CB414FF6C6D5A90393FF007DF
-010FB512870103EBFE019026003FF0C7FC2E2B7CA936>I<B539F01FFFFEA3D803FCC7EA
-7F80AF90B7FCA301FCC7127FB1B539F01FFFFEA32F297DA836>I<B512FCA33801FE00B3
-B1B512FCA316297EA81A>I<D8FFFE92381FFFC0A26D5D0003EFF000A2D9BF801477A2D9
-9FC014E7A2D98FE0EB01C7A2D987F0EB0387A3D983F8EB0707A2D981FC130EA2D980FE13
-1CA26E133880A291383F8070A291381FC0E0A291380FE1C0A3913807F380A2913803FF00
-A26E5AA26E5AA2D8FFFE4AB512C01578A23A297DA841>77 D<B612F815FF16C03A03FC00
-3FE0ED0FF0ED07F816FC150316FEA716FC150716F8ED0FF0ED3FE090B61280EDFE0001FC
-C8FCB0B512F0A327297DA82F>80 D<B612E015FE6F7E3A03FC007FE0ED0FF06F7E821503
-82A65E4B5AA2ED1FE0ED7FC090B500FEC7FC15F89038FC01FCEC007F6F7E82151F82A482
-A4170716F8A2030F130FB539F007FC0E923803FE1C923800FFF8C9EA1FE0302A7DA834>
-82 D<90387F80603903FFE0E0000F13F9381FC07F383F001F003E130F007E1307007C13
-0300FC1301A314007E7E6D13007FEA7FFEEBFFE06C13FC6C13FF1580000714C06C14E0C6
-7E010713F0EB007FEC0FF81407140312E01401A37E15F07E6C13036C14E06CEB07C0EBE0
-1F00F3B5120000E05B38C01FF01D2B7CA926>I<B539F001FFFCA3D803FCC7EA0700B3AA
-00015D6D140E161E0000151C017F143C6E5B6D6C5B90390FF007E06DB55A010091C7FCEC
-1FF82E2A7DA835>85 D<3803FF80000F13F0381F01FC383F80FE147FA2EC3F80EA1F00C7
-FCA3EB0FFF90B5FC3807FC3FEA1FE0EA3F80127F130012FEA3147F7E6CEBFFC0393F83DF
-FC380FFF8F3801FC031E1B7E9A21>97 D<EAFFE0A3120FACEBE1FE9038E7FF809038FE07
-E09038F803F8496C7E496C7EA281811680A916005D5D7F4A5A6D485A90389E0FE090380F
-FF80260E01FCC7FC212A7EA926>I<EB3FF8EBFFFE3803F01F390FE03F80EA1FC0EA3F80
-A2007FEB1F0090C8FC5AA97E7F003FEB01C013C0001F1303390FE007803903F01F003800
-FFFCEB3FE01A1B7E9A1F>I<EC3FF8A31403ACEB1FE3EBFFFB3803F83F380FE00F381FC0
-07383F8003A2127F13005AA97E1380123F1407381FC00F380FE01F3A03F03FFF803800FF
-F3EB3FC3212A7EA926>I<EB3FE03801FFF83803F07E380FE03F391FC01F80393F800FC0
-A2EA7F00EC07E05AA390B5FCA290C8FCA47E7F003F14E01401D81FC013C0380FE0033903
-F81F803900FFFE00EB1FF01B1B7E9A20>I<EB07F0EB3FFCEBFE3E3801FC7FEA03F8A2EA
-07F0143E1400A7B512C0A33807F000B3A3387FFF80A3182A7EA915>I<15F09038FF83F8
-0003EBEF7C380FC1FCEA1F80003F13FE9038007E1048EB7F00A66C137EEB80FE001F5B38
-0FC1F8381FFFE0001813800038C8FC123CA2123E383FFFF814FF6C14C06C14E06C14F012
-1F397E0007F8007C13015A1400A36C1301007EEB03F06CEB07E0390FC01F803903FFFE00
-38007FF01E297E9B22>I<EAFFE0A3120FAC147F9038E1FFC09038E787E09038EE07F090
-38FC03F813F813F0A313E0AF3AFFFE3FFF80A3212A7DA926>I<1207EA1FC0EA3FE0A5EA
-1FC0EA0700C7FCA7EAFFE0A3120FB3A3EAFFFEA30F2B7DAA14>I<EAFFE0A3120FACEC1F
-FCA3EC07C0EC0F80EC1E00147C5CEBE1F0EBE3E0EBE7C0EBEFE0EBFFF0A280EBF3FCEBE1
-FE13C080EC7F80143F15C0EC1FE0EC0FF039FFFC3FFEA31F2A7EA924>107
-D<EAFFE0A3120FB3B2EAFFFEA30F2A7DA914>I<3BFFC07F800FF0903AC1FFE03FFC903A
-C783F0F07E3B0FCE03F9C07F903ADC01FB803F01F8D9FF00138001F05BA301E05BAF3CFF
-FE1FFFC3FFF8A3351B7D9A3A>I<38FFC07F9038C1FFC09038C787E0390FCE07F09038DC
-03F813F813F0A313E0AF3AFFFE3FFF80A3211B7D9A26>I<EB3FE03801FFFC3803F07E39
-0FC01F80391F800FC0003F14E0EB00074814F0A34814F8A86C14F0A2393F800FE0A2001F
-14C0390FC01F803907F07F003801FFFC38003FE01D1B7E9A22>I<38FFE1FE9038E7FF80
-9038FE07E0390FF803F8496C7E01E07F140081A2ED7F80A9EDFF00A25DEBF0014A5A01F8
-5B9038FE0FE09038EFFF80D9E1FCC7FC01E0C8FCA9EAFFFEA321277E9A26>I<38FFC1F0
-EBC7FCEBCE3E380FDC7F13D813F813F0143E14005BAFB5FCA3181B7E9A1C>114
-D<3803FE30380FFFF0EA3E03EA7800127000F01370A27E00FE1300EAFFE013FE387FFFC0
-6C13E06C13F0000713F8C613FC1307EAE000147C6C133CA27E14787E38FF01F038F7FFC0
-00C11300161B7E9A1B>I<1370A413F0A312011203A21207381FFFF0B5FCA23807F000AD
-1438A73803F870000113F03800FFE0EB1F8015267FA51B>I<39FFE03FF8A3000F1303B1
-1407A2140F0007131F3A03F03BFF803801FFF338003FC3211B7D9A26>I<39FFFC0FFFA3
-3907F003C0D803F85B3801FC076C6C48C7FCEBFF1E6D5AEB3FF86D5AA2130F130780497E
-497E131EEB3C7F496C7E496C7ED801E07F3803C00F6E7E3AFFF01FFF80A3211B7F9A24>
-120 D<3AFFFE03FF80A33A0FF0007800000714706D13F000035CEBFC0100015CA26C6C48
-5AA2EBFF07017F90C7FC148FEB3F8E14CEEB1FDCA2EB0FF8A36D5AA26D5AA26D5AA2495A
-A2EA3807007C90C8FCEAFE0F130E5B133CEA7C78EA3FE0EA0F8021277F9A24>I
-E
+/Fb 37 122 df<923B1FFF8001FFC00203B5D8F01F13F0021FDAF87F13FC027F91B67E90
+2701FFF803ECC3FF49D9C001EBFE0790270FFE000349481380494815F84A4913F0494815
+E0495AA201FF4C6C13004A6D6E5A735A70EC00707092C7FCAABA12FCA5C601E0C701E0C8
+FCB3B0007F9026FFC07FEBFFF0A549467EC543>11 D<ED1FFF0203B512E0021F14F8027F
+80903A01FFF803FE499038C0007F010F90390001FF80D91FFC497F4A5B495A495AA201FF
+4A7F4A6D5BA3705B7090C7FC705A94C8FCA693387FFFE0B9FCA5C601E0C7FCB3B0007F90
+26FFC07FEBFFC0A53A467EC540>I<EE0FC04C7EA24C7EA34C7EA24C7EA24B7FA34B7FA2
+4B80A34B8016CF031F80168F1687033F801603037F80157E8203FE804B7E0201814B137F
+A20203814B7F0207824B7FA2020F824B7F021F824B7F023F82A292C77E4AB77EA291B87E
+A3D901FCC87F4A157F0103835C840107844A81010F844A81A2011F844A81013F84496C81
+B600C0010FB612FCA54E457CC457>65 D<B912C018FCF0FF8019E019F8D8001F90C70003
+7F9438007FFE727E7213807213C0841AE0A2841AF0A71AE0601AC0604E13801A004E5AF0
+FFFC050313F0053F5B92B7C7FC18FCF0FFC019F892C86C7EF01FFF7213807213C07213E0
+1AF07213F8A27213FCA31AFEA2197FA319FFA21AFCA2601AF8604E13F0A2061F13E04E13
+C04DB51280BAEAFE006119F0198006F0C7FC47447DC351>I<DCFFFC141C031FD9FFC013
+7C4AB600F813FC0207EDFE01021FEDFF03027FD9F00113C749B5C7EA3FEF4901F8EC0FFF
+010F01E01403490180804990C9FC4948167F4948163F4849161F4849160F5C4818074849
+1603A2485B19015A91CAFC19005AA3491800A212FFAC127FA27F1A7CA27EA2806C19FC1A
+F86C7F19016C7F6CF003F0806C6DEE07E06C6DEE0FC06D6C161F6D6CEE3F806D6DED7F00
+6D01E0EC01FE010301F8EC07FC6D01FFEC1FF86D6C9039F801FFE0021F90B65A020793C7
+FC020115FCDA001F14E0030049C8FC46467AC453>I<B97E18F818FF19E019F8D8001F90
+C7000F13FE05007F061F7F06077F7213F084727F737E737E737EA2731380A27313C0A21B
+E085A21BF0A51BF8A285A961A21BF0A41BE0A2611BC0A2611B801B00614F5A62197F4F5A
+06035B4E5B061F5B95B5C7FC050F5BBA12F819E0198006FCC8FC18804D447CC358>I<BA
+12FCA485D8001F9038800001EF003F180F180318011800A2197F85A385A2177CA2F10F80
+A405FC90C7FCA316011603161F92B5FCA5ED801F160316011600F101F0A2177CF103E0A5
+94C71207A21AC0A2190FA2191FA2193FF17F8019FF601807181F4DB5FCBBFC1A00A44443
+7DC24B>I<BA12E0A419F0D8001F903880000F1700183F181F180F1807180319F81801A3
+1800A3EE01F0197CA419001603A31607160F163F92B5FCA5ED803F160F16071603A31601
+A693C9FCAEB712FCA53E437CC248>I<DCFFFC1438033FD9FF8013F84AB6EAF001020FED
+FC03023FEDFF0791B5D8F003138F4991C7EA7FDF010701F8EC1FFF4901E0140749018080
+4990C9FCD97FFC167F495A48183F4849161F4A160F5A48491607A2485B19035A91CAFC19
+015AA34994C8FC12FFAC057FB612F8A2127F7FA2DD0001EBF8007EA2807EA26C7FA26C7F
+7E806C7F6C7F6D7E6D6C5D6D13C06D6D5C6D01F85C010101FF143F6D9139F801FFDF023F
+90B6128F020F16030201EDFC00DA003F02E01338030049C9FC4D467AC45A>I<B7D8F007
+B71280A5D8001F0180C801FCC7FCB3A792B8FCA50380C8FCB3AAB7D8F007B71280A55144
+7CC35A>I<B712F0A5D8001FEB8000B3B3B3A4B712F0A524447DC32B>I<B600C0051FB512
+F06F5FA26F5FA2D8001FF380006F17F7A2DABFFCEE01E7A2DA9FFEEE03C7A2DA8FFFEE07
+87A202876DED0F07A302836D151EA202816D153CA202806D1578A26F6C15F0A36F6CEC01
+E0A26F6CEC03C0A26F6CEC0780A26F6DEB0F00A36F6D131EA26F6D5BA26F6D5BA2706C5B
+A2706C485AA3706C485AA2706C485AA270018FC7FCA27013DEA37013FCA2705BA2715AA2
+715A497EB600F0043FB612F0715AA2715A71C7FC64447CC36D>77
+D<B812FEEFFFF018FE727E85D8001F90C7001F13F005037F05007F727E727E841A801AC0
+84A21AE0A91AC0A24E1380A21A00604E5A4E5A05035B051F13E092B75A96C7FC18F818C0
+0380CAFCB3A7B712F0A543447CC34E>80 D<B812F8EFFFC018F818FF19C0D8001F90C700
+3F7F050313F805007F727E727E84868684A286A762A24E5BA297C8FC4E5A4E5A4D485A05
+075B053F13C092B7C9FC18FC18F018FC92C77F94383FFF80050F7F717F717F85838583A6
+85A61B0773EB0F80A372141F1A8072EC3F00B700E06D13C072EBF0FE72EBFFFC06015C72
+6C13E0CC0003138051457CC356>82 D<DAFFF8130701079038FF800F013FECE01F49ECF8
+3F48B6EAFE7F48D9C00FB5FC3907FE00014848EB003FD81FF080160748488082484880A2
+8312FF83A27F837F7F7F01FF92C7FC6C13C014FEECFFE06C14FF16F06C15FC16FF6C16C0
+6C826C826C826C82013F81010F811303D9003F15801403DA001F14C01500163F040F13E0
+1603A200788100F881A3177F7EA218C07EA26CEEFF80A26D4A130013E06D4A5A01FE4A5A
+6D6CEB1FF802FCEBFFF0486CB65AD8FC1F5DD8F80792C7FC48C614FC48010713C033467A
+C440>I<B700F0011FB512FEA5D8001F0180C83807F800735AB3B3A71907A26D6D5EA219
+0F7F6F4B5A7F6F4B5A6D4DC7FC6D6D5D6E6C4A5A6E6CEC07FC91261FFFC0EB1FF8020790
+39F801FFF06E90B612C0020093C8FC033F5C030714F0DB003F90C9FC4F457CC358>85
+D<903801FFF8011FEBFF80017F14E090B612F8489038807FFC3A03FE001FFE486CEB07FF
+486E7F0280806F7FA36F7F6C90C7FCA26C5AEA00F890C8FCA2150F021FB5FC0103B6FC13
+1F017F13C03901FFFC004813E0000F13804890C7FC485A5B485AA2485AA45DA26C6C5BED
+07BF6C6C010F13FC6CB490391F3FFFE06C9026C0FE1F13F06CEBFFFC6CECF007C66CD9E0
+0113E0010790C9FC342F7DAD38>97 D<EB7FC0B5FCA512037EB1ED1FFC92B512C002C314
+F002CF14FC9139DFF01FFF9126FF800713809126FE000113C04A6D13E002F015F04A147F
+18F8173F18FCA2EF1FFEA318FFAB18FEA3173F18FCA218F8177F6E15F06EECFFE06E4913
+C06E49138091263F800F1300903AFE1FE03FFE496CB55AD9F80314F049C61480C8D81FF8
+C7FC38467DC440>I<EC3FFE49B512E0010F14F8013F8090397FF807FE9039FFE001FF48
+4948138048018014C048495A485A121FA2485A6F1380A2007F6E130049EB007C93C7FC12
+FFAC127F7FA2123FEE03E06C7E16076C6C15C06C150F6C6DEB1F806C6DEB3F006C01F013
+FE90397FFE03FC6DB55A010F5C010314C09026003FFCC7FC2B2F7CAD33>I<EFFF804BB5
+FCA5ED000782B1EC1FFC49B51283010F14E3013F14F390267FFC07B5FC9038FFF0004801
+C0133F48497F4890C77E484880121F5B123FA2127F5BA312FFAB127FA36C7EA2121F7F00
+0F5D6C6C5C5E6C6D90B512C06CD9E00114FF39007FF80F6DB512E7010F14C70103140790
+26003FF0EBFC0038467CC440>I<EC1FFE49B512C0010714F0011F14FC90397FFC0FFE90
+3AFFE003FF804849C613C0485B4890C7EA7FE048ED3FF0485AEE1FF8485AA2007F150F49
+15FCA212FFA390B7FCA317F801F8C9FCA5127FA27FA2003F1638177C6C6C15FCA26C6CEC
+01F86C6D13036CED07F06C6DEB0FE06C01F0EB3FC0903A3FFE01FF806DB5EAFE0001075C
+010014F0020F90C7FC2E2F7DAD35>I<913801FFC0021F13F0027F13FC49B57E49EBC3FF
+903807FE074948481380EB1FF8EB3FF0EB7FE0A349486C13006F5A6F5AED007093C7FCAA
+B612FCA5C601E0C8FCB3B0007FEBFFE0A529467DC523>I<902601FFF013FF010FD9FE03
+1380013FD9FF8F13C090B812E048D9C07F13BF489039001FF83F4848EB0FFC4848EB07FE
+001F9238FF1FC0496DEB0F8094C7FC003F82A7001F93C7FCA26D5B000F5D6C6C495A6C6C
+495A6C9038C07FF04890B55A1680D8078F49C8FC018113F0D80F80CAFCA47F7F13F890B6
+12E016FEEEFFC06C16F0836C826C82831207481780D81FF8C77ED83FE014074848020113
+C000FF8149157FA56D15FF007F17806D5C6C6C4A1300D81FFCEC0FFE6CB4EC3FFC6C9039
+E001FFF8000190B612E06C6C1580010F02FCC7FCD9007F138033427DAC39>I<EB7FC0B5
+FCA512037EB1923803FF80031F13F0037F7F92B57E9139C1FC1FFE9139C3E00FFF9126C7
+C0077FECCF0002DE7F02FC81A25C5CA35CB3A7B600C1B61280A539457CC440>I<13FCEA
+03FF4813804813C0A24813E0A66C13C0A26C13806C1300EA00FC90C7FCA9EB7FC0EA7FFF
+A512037EB3AFB6FCA518467CC520>I<EB7FC0B5FCA512037EB293387FFFF0A593380FF8
+004C5AEE3FC04C5A4B48C7FCED03FC4B5A4B5AED3FE0ED7F804BC8FCECC1FE14C7ECCFFF
+02DF7F91B57E82A202FD7F02F07F4A7F4A6C7E153F6F7E6F7F83816F7F6F7F6F7F83167F
+707E83B66CB512FCA536457DC43C>107 D<EB7FC0B5FCA512037EB3B3B3A3B61280A519
+457CC420>I<90287FC003FF80EB07FFB5011F01F0013F13E0037F6D90B57E92B56C4880
+913DC1FC1FFE03F83FFC913DC3E00FFF07C01FFE00039026C7C00790398F800FFF6CD9CF
+00EC9E0002DE6D01BC7F02FC03F81580A24A5D4A5DA34A5DB3A7B600C1B60083B6FCA558
+2D7CAC5F>I<903A7FC003FF80B5011F13F0037F7F92B57E9139C1FC1FFE9139C3E00FFF
+00039026C7C0077F6CEBCF0002DE7F02FC81A25C5CA35CB3A7B600C1B61280A5392D7CAC
+40>I<EC1FFE49B512E0010714F8011F14FE903A7FF807FF809026FFE0017F4890398000
+7FE04890C76C7E48486E7E000F8249140F001F82A2003F824980007F1780A400FF17C0AA
+007F1780A46C6C4A1300A2001F5EA26C6C4A5A00075E6D143F6C6D495AC69039E001FFC0
+90267FF8075B6DB6C7FC010F14FC010114E09026001FFEC8FC322F7DAD39>I<90397FC0
+1FFCB590B512C002C314F002CF14FC9139DFF03FFF9126FF800F138000039026FE000313
+C06C496D13E002F015F04A7FEF7FF8A218FC173F18FEA3EF1FFFAB18FE173FA318FC177F
+18F817FF6E15F06E4913E06E4913C06E4913806E6C4813009238E07FFE02EFB55A02E314
+F002E01480DB1FF8C7FC92C9FCADB612C0A538407DAC40>I<90397F803FC0B5EBFFF002
+8313F8028713FC91388FE7FE91389F8FFF0003EB9E0F6C13BCA214F8A29138F007FEED03
+FC9138E001F892C7FCA35CB3A5B612C0A5282D7DAC2F>114 D<90391FFE078090B512DF
+000314FF5A380FF803381FE000D83F80133F127F90C7121FA248140FA27FA201E090C7FC
+13F8EBFFC06C13FEECFFC06C14F015FC6C806C806C1580000115C07E011F14E01301D900
+0713F014000078147F00F8143F151F6C140FA37E6C15E0151F6D14C06D133F01F0EB7F80
+9039FC03FF0090B55A00FC5CD8F83F13F0D8F00790C7FC242F7CAD2D>I<EB01F0A51303
+A41307A2130FA2131FA2133F137F13FF1203000F90B512C0B7FCA4C601F0C7FCB3A3ED01
+F0AA017FEB03E014F81507D93FFC13C090391FFE1F806DB512006D5B01015B9038003FF0
+24407EBE2D>I<D93FE0EC7FC0B549B5FCA50003EC00076C81B3A85EA35E6C5DA26E013D
+7F017F02F9EBFF8090393FFC03F16DB512E16D14C1010314019026003FFC91C7FC392E7C
+AC40>I<007FB590387FFFF8A5C601F890380FF8006D6CEB07E0013F4A5A6D6C131F6E49
+5A6D6D48C7FC6DEBC0FE6DEBC1FC6DEBE1F8EDF3F06DEBFFE0806E5B6E5B93C8FC6E7F6E
+7F6E7FA24A7F4A7F4A7FEDBFFEEC3F1F91387E0FFF02FE8049486C7F49486C7F49487E49
+486C7F4A8049486D7E49C76C7ED9FF80131FB500F090B512FEA5372C7EAB3C>120
+D<007FB5398007FFFCA5000101F0C7EA7F806CEE3E006E147E017F157C8017FC013F5D6E
+1301011F5D6E13036D5DED80076D5DEDC00F6D5D15E0161F6D92C7FC6F5A6D143EEDF87E
+027F137CEDFCFC023F5B15FF6E5BA36E5BA26E5BA26E5BA26E90C8FCA26E5AA2157CA215
+FC5D1401000F5C383FC003D87FE05B1407D8FFF05B140F5D141F4AC9FC387FE07E495A38
+3F87F8EBFFF06C5B00071380D801FCCAFC36407EAB3C>I E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fc cmbx8 8 20
-/Fc 20 119 df<EB1FFC13FFEA03F0EA07C0EA0F80147CA5B512FCA2380F807CAE397FF3
-FF80A2191C809B1B>13 D<136013C0EA01801203EA0700120EA25AA2123C12381278A412
-F85AA97E1278A41238123C121CA27EA27EEA03801201EA00C013600B297C9D13>40
-D<12C012607E12387E7EA27EA21380120313C0A413E01201A9120313C0A4138012071300
-A2120EA25A5A12305A5A0B297D9D13>I<B512F814FF390FC01FC0EC07E0EC01F0EC00F8
-A2157CA3157EA8157CA215F8A2EC01F0EC03E0EC1FC0B6120014F81F1B7E9A25>68
-D<39FFFC03FFA2390FC00030B215706C6C136015E03903F001C03900FC078090387FFE00
-EB0FF8201B7E9A25>85 D<39FFFC1FFCA2390FE001C03907F003803903F807003801FC0E
-5C3800FE18EB7F30EB3FF06D5A5C6D7E6D7E80130FEB1DFCEB38FEEB307F13609038E03F
-803901C01FC03903800FE090380007F05A39FFE01FFFA2201B7E9A25>88
-D<EA1FF8EA3FFEEA7C1FEB0F80EB07C012381200A2EA07FFEA1F87EA7C07127812F8A3EA
-7C1B383FF3F8EA0FC015127E9118>97 D<EA03FEEA0FFF381E0F80123C127C3878070000
-F8C7FCA61278127C6C13C0381F0180380FFF00EA03FC12127E9116>99
-D<EB0FF0A21301A8EA03F1EA0FFFEA1F07EA3C01127C127812F8A61278A2EA3C03EA1E0F
-380FFDFEEA03F1171C7E9B1B>I<EA01FCEA0FFF381F0780383E03C0EA7C01007813E012
-F8A2B5FCA200F8C7FCA2127C14606C13E0381F01C03807FF803801FE0013127F9116>I<
-3803F0F0380FFFF8383C0F383838073000781380A400381300EA3C0FEA1FFCEA33F00020
-C7FC1230A2EA3FFF14C06C13E04813F0387801F838F00078A3007813F0383E03E0381FFF
-C03803FE00151B7F9118>103 D<B4FCA2121FA8EB01FEA2EB00F0EB01C0EB0780EB0E00
-5B137C13FE7FEB9F80EB0FC01307EB03E0EB01F0EB00F838FFE1FFA2181C7F9B1A>107
-D<B4FCA2121FB3A6EAFFE0A20B1C7F9B0E>I<3AFF0FE03F8090393FF0FFC03A1F60F983
-E09039C07F01F0EB807EEB007CAB3AFFE3FF8FFEA227127F912A>I<38FF0FC0EB3FE038
-1F61F0EBC0F813801300AB38FFE7FFA218127F911B>I<EA01FC380FFF80381F07C0383C
-01E0007C13F0EA780000F813F8A6007813F0EA7C01003C13E0381F07C0380FFF803801FC
-0015127F9118>I<EAFC7C13FEEA3D9F131FA2EA3F0EEA3E00AAEAFFC0A210127E9114>
-114 D<EA1FD8EA3FF8EA7038EAE018A2EAF000B4FCEA7FE013F0EA1FF8EA07FCEA003CEA
-C01CA212E0EAF038EAFFF0EACFC00E127E9113>I<1203A35AA25A123FEAFFFCA2EA1F00
-A9130CA4EA0F1813F8EA03E00E197F9813>I<38FFC0FEA2381F0030EB8070000F136013
-C0000713C013E03803E18013F13801F300A2EA00FEA2137CA21338A217127F911A>118
+/Fc 20 119 df<91383FFCF00103B5FC130F90383FF01F9038FF803F4813005B12034913
+1F150FA7B7FCA43903FC000FB3A4263FFFC0B5FCA4282E7FAD2D>13
+D<14E01301EB07C0EB0F80EB1F00133E137E5B5B1201485AA2485AA2485AA2121F5B123F
+A290C7FC5AA512FEAF127FA57E7FA2121F7F120FA26C7EA26C7EA26C7E12007F137E133E
+7FEB0F80EB07C0EB01E01300134378B120>40 D<12E07E127C7E7E6C7E7F6C7E12037F6C
+7EA26C7EA2137EA2137F7F1480A2131F14C0A5EB0FE0AFEB1FC0A51480133FA214005B13
+7EA25BA2485AA2485A5B1207485A5B48C7FC123E5A12F05A13437CB120>I<B712E016FE
+707E17E00001D9800013F8EE1FFCEE07FE707E7013807013C0EF7FE0173F18F0A2171F18
+F8A318FCAA18F8A4EF3FF0A218E0177FEFFFC018805E04071300EE1FFCEEFFF8B85A17C0
+4CC7FC16E0362E7DAD3E>68 D<B690380FFFFEA4000101809038001F00B3AC5F6C6D143E
+A2017F157E6E147C013F5D6D6C1303D90FFCEB0FF0903A07FF807FE06D90B51280010092
+C7FC023F13FC020313C0372F7DAD3E>85 D<007FB548B512E0A4C6903AE0000FE0006D6C
+5C6E495A6D6C49C7FC011F5C6D6C137E6E5B6DEB81F86D13836DEBC7F0EDE7E06DEBFFC0
+6E5B8093C8FC6E5A140F6E7E826E7F5C4A7F4A7F82EC3F3F91387E1FFC02FE7F4A6C7E49
+487E49486C7F0107814A6C7F49487E49486D7E013F8149C76C7E017E141F496E7EB5D8F0
+01B512FCA4362E7DAD3D>88 D<EB7FF80003B5FC000F14C0391FE01FF09038F007F86E7E
+A26E7EEA0FE0EA07C0C7FCA214FF133F48B5FC000713C1381FFC01EA3FE0EA7FC0EAFF80
+1300A3140313806C6C487E263FF03F13F8381FFFFE0007EBF87FC6EBC01F251E7E9D28>
+97 D<EB0FFE90387FFFC048B512F03907FC07F8380FF00FEA1FE0123F13C0007FEB07F0
+90388003E091C7FC12FFA8127F7FA26C6C133CA26C6C137C6C6C13F83907FE03F00001B5
+12E06C6C138090380FFC001E1E7D9D24>99 D<ED0FC0EC03FFA4EC003FABEB0FF8EB7FFF
+48B6FC3807FC07380FF001391FE0007F003F143F5B127F5BA212FFA9127F7F123F157F6C
+6C13FF380FF0032607FC0F13FC0001B512BF6CEBFE3FEB1FF0262E7DAD2D>I<EB0FFC90
+387FFF8048B512E03907FC0FF0390FF003F8391FE001FC1400484813FE007F147E5B157F
+12FFA290B6FCA30180C7FCA3127F7FA2003F140F6C7E6C6C131F6C6C137E3903FE01FC6C
+B512F86C6C13E001071300201E7E9D25>I<ED07C090391FF81FF090B5EA7FF8000314FD
+3907F81FF3380FE007001F14F99039C003F8F0003FECFC00A6001F5CEBE007000F5C3907
+F81FE090B55A4891C7FCEB1FF8001EC9FC121FA27F90B512C06C14F815FF6C158016C048
+15E0123F48C7EA3FF000FE140F4814071503A36C1407007FEC0FE06C6CEB1FC0D81FF0EB
+FF800007B5EAFE00000114F8D8001F1380252D7E9E29>103 D<EA03F012FFA4120FAB91
+3803FFF0A4913800FC00EC03F84A5AEC0FC0EC3F804AC7FC14FCEBF1F8EBF7FCEBFFFE80
+A2497F9038F87FC0496C7E496C7E6E7EA26E7E6E7E6E7E6E138026FFFE0313FCA4262E7D
+AD2B>107 D<EA03F012FFA4120FB3B3B5FCA4102E7CAD17>I<2707E00FF8EB1FF000FFD9
+7FFEEBFFFC01E1B5008313FF9028E7E07FCFC01380903BEF803FDF007F260FFE0013FC03
+1FEC3FC0495C495CA2495CB0B53B01FFFE03FFFCA43E1E7C9D45>I<3907E01FF000FFEB
+7FFC01E1B5FCD9E7E013809038EF807F260FFE0013C049133FA25BA25BB0B53803FFFCA4
+261E7C9D2D>I<EB07FE90387FFFE048B512F83903FC03FC3907F000FE4848137F4848EB
+3F80003F15C049131F007F15E0A200FF15F0A8007F15E0A26D133F003F15C0001F15806D
+137F6C6CEBFF003903FC03FC6CB55A6C6C13E0D907FEC7FC241E7E9D29>I<3807E07E39
+FFE1FF8001E313E0EBE78F9038EF1FF0EA0FFE13FCA29038F80FE0EC07C091C7FC5BAFB5
+7EA41C1E7D9D22>114 D<3801FF8E000713FE121FEA3F00007C137E0078133E00F8131E
+A27EB490C7FC13F0EBFF806C13E06C13F86C13FE7E00037FD8003F13801300143F00F013
+1F140F7EA26CEB1F007E38FF807EEBFFFC00FB13F000E01380191E7D9D20>I<133CA413
+7CA313FCA2120112031207001FB5FCB6FCA3D803FCC7FCAEEC03C0A61407D801FE1380EB
+FF0F6CEBFF00EB3FFCEB0FF01A2A7FA920>I<B5EB3FFCA4D80FF8EB07C0000715806D13
+0F000315006D5B0001141E6D133E6C143CEC807C017F1378ECC0F8013F5B14E1011F5B14
+F3010F5B14FF6D5BA26D90C7FCA26D5AA26D5AA21478261E7E9D2B>118
 D E
 %EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fd cmr8 8 43
-/Fd 43 127 df<90383F0F803901C0D8C0390381F1E0380701E1000EEBE0C001001300A6
-B512FE380E00E0AF387FC7FE1B1C809B19>11 D<133F3801C0C0EA0380380701E0120EEB
-00C01400A5B512E0EA0E00AF387FC7FC161C809B18>I<EB3FE0EA01C0EA0381EA0701EA
-0E00A7B5FCEA0E00AF387FC7FC161C809B18>I<1380EA0100120212065A12081218A25A
-A212701260A312E0AC1260A312701230A27EA21208120C7E12027EEA008009287C9D10>
-40 D<7E12407E12307E1208120CA27EA212077EA31380AC1300A35A1206A25AA2120812
-185A12205A5A09287E9D10>I<126012F0A212701210A41220A212401280040C7C830C>
-44 D<EAFFE0A20B0280890E>I<126012F0A2126004047C830C>I<1303A213071306A213
-0E130C131C1318A213381330A21370136013E013C0A212011380A212031300A25A120612
-0E120CA2121C1218A21238123012701260A212E05AA210287E9D15>I<EA07E0EA0C30EA
-1818EA381CEA300CEA700EA3EAF00FACEA700EA4EA381CEA1818EA0C30EA07E0101C7E9A
-15>I<12035A123F12C71207B3A4EAFFF80D1B7C9A15>I<EA07E0EA1830EA201CEA401E13
-0EEAF00F12F8A312201200131EA2133C1338137013E013C0EA0180EA0300EA0601120C12
-18EA1002EA3FFE127F12FF101B7E9A15>I<90381FC0409038F030C03801C00C38070003
-000E13015A14005A00781440A2127000F01400A7007014401278A212386C1480A26CEB01
-006C13023801C00C3800F030EB1FC01A1D7E9B1F>67 D<B512C0380F0070141C80801580
-140315C01401A215E0A715C0A214031580A2EC0700140E5C1470B512C01B1B7E9A20>I<
-B512FE380F001E14061402A21403801481A21480A2130113FF13011300A315801400EC01
-00A35CA21406141EB512FE191B7E9A1D>I<90381F8080EBE0613803801938070007000E
-13035A003C1301123800781300A2127000F01400A5ECFFF0EC078012701278A21238123C
-121C7E6C130B380380193800E06090381F80001C1D7E9B21>71 D<B4EB3FE0390F800700
-EBC002120BEA09E013F012081378133CA2131E130FA2EB0782EB03C214E21301EB00F214
-FA147A143E141EA2140E1406121C38FF80021B1B7E9A20>78 D<39FFF03FE0390F000700
-1402B36C5B138000035B12016C6C5AEB7060EB1F801B1C7E9A20>85
-D<EA0FE0EA3838EA3C1C7F12181200133EEA07EEEA1E0E1238127800F01320A3EA701E38
-382740381FC38013117F9015>97 D<12FC121CAA137E381D8380381E01C0381C00E014F0
-14701478A5147014F014E0381E01C03819838038107C00151C7F9B18>I<EA03F8EA0E0E
-EA1C1E1238EA780CEA700012F0A512701278EA3801EA1C02EA0E04EA03F810117F9013>
-I<EB0FC01301AAEA01F1EA0E0DEA1C03EA38011278127012F0A5127012781238EA1C03EA
-0E0D3803F1F8151C7F9B18>I<EA03F0EA0E18EA180CEA380EEA7007A212F0B5FCEAF000
-A31270A2EA3801EA1C02EA0E04EA03F810117F9013>I<13F8EA018CEA071E1206EA0E0C
-1300A6EAFFE0EA0E00AFEA7FE00F1C809B0D>I<EB03803807E4C0EA1C3838381C801400
-EA781EA3EA381CA26C5AEA37E00020C7FC1230A2EA3FF86CB4FC1480EA3003386001C0EA
-C000A33860018038300300EA1C0EEA07F8121B7F9115>I<12FC121CAA137EEB8380EA1D
-01001E13C0121CAC38FF8FF8151C7F9B18>I<1218123CA21218C7FCA712FC121CAFEAFF
-80091C7F9B0C>I<12FC121CAAEB0FE0EB0780EB060013085B5B1360EA1DE0EA1E70EA1C
-787F131C7F130FEB078014C038FF8FF0141C7F9B16>107 D<12FC121CB3A8EAFF80091C
-7F9B0C>I<39FC7E07E0391C838838391D019018001EEBE01C001C13C0AC3AFF8FF8FF80
-21117F9024>I<EAFC7E381C8380EA1D01001E13C0121CAC38FF8FF815117F9018>I<EA03
-F0EA0E1CEA1806EA380738700380A200F013C0A500701380A238380700EA1806EA0E1CEA
-03F012117F9015>I<EAFC7E381D8380381E01C0381C00E014F014701478A5147014F014
-E0381E01C0381D8780381C7C0090C7FCA7B47E15197F9018>I<3803E080EA0E19EA1C05
-EA3807EA7803127012F0A512701278EA3807121CEA0E1BEA03E3EA0003A7EB1FF014197F
-9016>I<EAFCF0EA1D1CEA1E3CA2EA1C181300ABEAFFC00E117F9011>I<EA1FC8EA3038EA
-4018EAC008A2EAE000127F13E0EA1FF0EA01F8EA003CEA800CA212C0EAE008EAD030EA8F
-C00E117F9011>I<1204A4120CA2121C123CEAFFE0EA1C00A91310A4120CEA0E20EA03C0
-0C197F9810>I<38FC0FC0EA1C01AC1303120CEA060D3803F1F815117F9018>I<38FF07E0
-383C0380381C0100A2EA0E02A2EA0F06EA0704A2EA0388A2EA01D0A213F06C5AA2134013
-117F9016>I<39FF3FC3F0393C0701C0001C130015801480000EEB81001309000713C213
-1014E2380390E4EBA064EBE07C00011378EBC03800001330EB80101C117F901F>I<38FF
-0FE0383C0700EA1C06EA0E046C5AEA039013E0120112007FEA0138EA023CEA061C487EEA
-08070038138038FC0FE013117F9016>I<38FF07E0383C0380381C0100A2EA0E02A2EA0F
-06EA0704A2EA0388A2EA01D0A213F06C5AA21340A25BA212F190C7FC12F2126612381319
-7F9016>I<EA1C04EA3F08EA43F0EA80E00E047D9A15>126 D E
+%DVIPSBitmapFont: Fd cmr8 8 42
+/Fd 42 127 df<9138FF807E01079038E1FF80903A1F807FC3C0D93E00EB87E049EBFF07
+4913FE485A00039138FC018049017CC7FCAAB712FCA22703E0007CC7FCB3A6486C13FE3A
+7FFF0FFFF0A22B2F7FAE29>11 D<14FF010713E090381F80F090383E003849137C4913FC
+485A1203491378153092C7FCA7157CB612FCA23803E000157CB3A5486C13FE3A7FFF0FFF
+E0A2232F7FAE27>I<ECFFC0010713FC90381F807C90383E00FC5B5B485A0003147C5BAA
+B612FCA23903E0007CB3A6486C13FE3A7FFF0FFFE0A2232F7FAE27>I<13031307130E13
+1C1338137013F0EA01E013C01203EA0780A2EA0F00A2121EA35AA45AA512F8A25AAB7EA2
+1278A57EA47EA37EA2EA0780A2EA03C0120113E0EA00F013701338131C130E1307130310
+437AB11B>40 D<12C07E12707E7E7E120FEA0780120313C0EA01E0A2EA00F0A21378A313
+3CA4131EA5131FA2130FAB131FA2131EA5133CA41378A313F0A2EA01E0A2EA03C0138012
+07EA0F00120E5A5A5A5A5A10437CB11B>I<123C127EB4FCA21380A2127F123D1201A312
+031300A25A1206120E5A5A5A126009157A8714>44 D<B512C0A412047F9018>I<123C12
+7E12FFA4127E123C08087A8714>I<15C0140114031580A214071500A25C140EA2141E14
+1CA2143C143814781470A214F05CA213015CA213035C130791C7FCA25B130EA2131E131C
+A2133C1338A21378137013F05BA212015BA212035BA2120790C8FC5A120EA2121E121CA2
+123C1238A212781270A212F05AA21A437CB123>I<130C133C137CEA03FC12FFEAFC7C12
+00B3B113FE387FFFFEA2172C7AAB23>49 D<EB7F803801FFF0380780FC380E003F48EB1F
+8048EB0FC05A0060EB07E012F000FC14F07E1403A3007C1307C7FCA215E0140F15C0141F
+1580EC3F00147E147C5C495A495A495A495A011EC7FC5B5B4913305B485A4848136048C7
+FC000E14E0001FB5FC5A4814C0B6FCA21C2C7DAB23>I<DA1FF013C09138FFFE01903903
+F00F8390390F8001E3013FC71277017C143F4848141F4848140F48481407A24848140312
+1F491401123F90C8FC481500A300FE1600AB127F17C0A27E7F001F15016D1580120F6C6C
+1403EE07006C6C14066C6C140ED8007C5C013F147890390F8001E0903903F00FC0902600
+FFFEC7FCEC1FF02A2F7CAD33>67 D<B612F815FF3A03F8001FE00001EC03F0ED00F8167E
+82EE1F80160F17C0EE07E0A2EE03F0A217F81601A317FCAA17F8A3EE03F0A217E0160717
+C0160FEE1F80EE3F00167E5EED03F00003EC1FE0B7128003F8C7FC2E2D7DAC36>I<B712
+FEA23903F800010001EC003E828282A282A3178016011518A293C7FCA31538157815F890
+B5FCA2EBF800157815381518A21760A392C712C0A4160117801603A21607160F163F0003
+913801FF00B8FCA22B2D7EAC30>I<DA1FF013C09138FFFE01903903F00F8390390F8001
+E3013FC71277017C143F4848141F4848140F48481407A248481403121F491401123F90C8
+FC481500A300FE1600A992381FFFFEA2007F9138001FE0EE0FC0A27E7F121F7F120F6C7E
+A26C7E6C6C141FEA007C013F143FD90F8013F3903903F007C10100B51200DA1FF813002F
+2F7CAD37>71 D<D8FFF8903803FFFC7F00019138003FC06DEC0F006D1406EBBF80A2EB9F
+C0EB8FE0138780EB83F8138180EB80FE147E147FEC3F80EC1FC0140F15E0EC07F0140315
+F8EC01FC140015FE157FED3F86151F16C6ED0FE6150716F6ED03FE1501A21500167E163E
+A2486C141ED80FF0140EB5FC16062E2D7DAC35>78 D<B539F003FFFCA2D803FCC7EA3FC0
+6C48EC0F001606B3AB160E0000150C7F161C017C1418017E14386D5C6D146090390F8001
+E0903907E00380902601F80FC7FC9038007FFCEC0FF02E2E7DAC35>85
+D<13FF000713C0380F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF137F3801
+FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF8C391F
+83C7FC390FFF03F83901FC01E01F207D9E23>97 D<EA07C012FFA2120F1207AC14FE9038
+C7FF809038CF03E09038DC01F09038F8007C49137E49133E497F1680A2150F16C0A9ED1F
+80A216005D6D133E6D5B01B05B9038BC01F090380E07E0390607FF80260001FCC7FC222F
+7EAD27>I<EB1FE0EB7FFC3801F01E3803E0073907C01F80EA0F80EA1F005A003EEB0F00
+007E90C7FCA2127C12FCA9127EA215C07E6C130101801380380FC0033907E007003801F0
+3E38007FF8EB1FC01A207E9E1F>I<15F8141FA214011400ACEB0FE0EB7FF83801F81E38
+03E0073807C003380F8001EA1F00481300123E127EA25AA9127C127EA2003E13017EEB80
+03000F13073903E00EFC3A01F03CFFC038007FF090391FC0F800222F7EAD27>I<EB1F80
+EBFFF03803E0783807C03E380F801E381F001FEC0F80123E007E130715C0127C12FCA3B6
+FCA200FCC8FCA5127EA2003E14C0123F6C1301390F80038001C013003803E00F3801F03C
+38007FF8EB1FC01A207E9E1F>I<EB03F0EB0FFCEB3E1EEB7C3F13F8EA01F0A23803E00C
+1400AAB512E0A23803E000B3A6487E387FFF80A2182F7FAE16>I<013F13F89038FFC3FE
+3903E1FF1E3807807C000F140C391F003E00A2003E7FA76C133EA26C6C5A00071378380F
+E1F0380CFFC0D81C3FC7FC90C8FCA3121E121F380FFFF814FF6C14C04814F0391E0007F8
+48130048147C12F848143CA46C147C007C14F86CEB01F06CEB03E03907E01F803901FFFE
+0038003FF01F2D7E9D23>I<EA07C012FFA2120F1207AC14FE9038C3FF809038C703E090
+38DE01F013F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2222E7EAD27>I<EA0780EA
+0FC0EA1FE0A4EA0FC0EA0780C7FCA8EA07C012FFA2120F1207B3A5EA0FE0EAFFFCA20E2E
+7EAD14>I<EA07C012FFA2120F1207ADEC1FFEA2EC0FF0EC07C05D020EC7FC5C5C5C5CEB
+C3C013C7EBCFE0EBDFF013F9EBF0F8497EEBC07E143E80816E7E14076E7E816E7E486C48
+7E3AFFFE07FF80A2212E7EAD25>107 D<EA07C012FFA2120F1207B3B3A3EA0FE0EAFFFE
+A20F2E7EAD14>I<2607C07FEB07F03BFFC3FFC03FFC903AC783F0783F3C0FCE01F8E01F
+803B07DC00F9C00F01F8D9FF8013C04990387F000749137EA249137CB2486C01FEEB0FE0
+3CFFFE0FFFE0FFFEA2371E7E9D3C>I<3807C0FE39FFC3FF809038C703E0390FDE01F0EA
+07F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2221E7E9D27>I<EB1FE0EB7FF83801
+F03E3803C00F3907800780390F0003C04814E0003EEB01F0A248EB00F8A300FC14FCA900
+7C14F8A26CEB01F0A26CEB03E0A2390F8007C03907C00F803901F03E0038007FF8EB1FE0
+1E207E9E23>I<3807C0FE39FFC7FF809038CF03E0390FDC01F03907F800FC49137E4913
+3E49133FED1F80A3ED0FC0A8151F1680A2ED3F00A26D137E6D137C5D9038FC01F09038CE
+07E09038C7FF80D9C1FCC7FC01C0C8FCA9487EEAFFFEA2222B7E9D27>I<90380FE01890
+387FF8383801F81C3903E00E783807C007390F8003F8001F1301EA3F00A2007E1300A212
+FE5AA8127EA36C13017EEB8003380FC0073803E00E3801F03C38007FF0EB1FC090C7FCA9
+4A7E91381FFFC0A2222B7E9D25>I<380781F838FF87FEEB8E3FEA0F9CEA07B813B0EBF0
+1EEBE000A45BB0487EB5FCA2181E7E9D1C>I<3801FE183807FFB8381E01F8EA3C004813
+78481338A21418A27E7EB41300EA7FF06CB4FC6C13C06C13F0000113F838001FFC130138
+C0007E143EA26C131EA27EA26C133CA26C137838FF01F038E3FFC000C0130017207E9E1C
+>I<1360A413E0A312011203A21207121FB512F0A23803E000AF1418A714383801F03014
+703800F860EB3FE0EB0F80152A7FA81B>I<D807C013F800FF131FA2000F130100071300
+B21401A314033803E007EC0EFC3A01F81CFFC038007FF890391FE0F800221F7E9D27>I<
+3AFFFC01FFC0A23A0FE0007E000007147C15380003143015706C6C1360A26C6C5BA39038
+7C0180A26D48C7FCA2EB3F07EB1F06A2EB0F8CA214DCEB07D8A2EB03F0A36D5AA26D5A22
+1E7F9C25>I<3BFFFC3FFE07FFA23B0FE003F001F801C09038E000F00007010114E08126
+03E00314C0A2913807F8012701F006781380A29039F80E7C030000D90C3C1300A290397C
+181E06A2151F6D486C5AA2168C90391F600798A216D890390FC003F0A36D486C5AA36DC7
+5A301E7F9C33>I<3AFFFC07FF80A23A0FF003FC000003EB01F0000114C06D485A000091
+C7FCEB7C06EB3E0E6D5A14B8EB0FB0EB07E013036D7E497E1307EB067C497EEB1C1F0138
+7FEB700F496C7E6E7ED803C07F00076D7E391FE003FC3AFFF007FFC0A2221D7F9C25>I<
+3AFFFC01FFC0A23A0FE0007E000007147C1538000314306D137000011460A26C6C5BA2EB
+FC01017C5BEB7E03013E90C7FCA2EB1F06A2148EEB0F8CA2EB07D8A2EB03F0A36D5AA26D
+5AA2495AA2130391C8FC1278EAFC06A25B131CEA7838EA7070EA3FE0EA0F80222B7F9C25
+>I<38078008380FE01C381FF838383FFFF038707FE038E01FC03840078016077AAC23>
+126 D E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fe cmbx10 14.4 11
-/Fe 11 115 df<913A03FF800380023FEBF00749B5EAFC0F01079038007F1FD91FF8EB0F
-BFD93FE0EB03FFD9FFC07F48497F4890C8127F4848153F485A171F485A170F485AA2007F
-1607A25B94C7FC12FFAB127FA26DED0380A2123FA26C6C150718006C7E5F6C6C151E6C6C
-151C6C6D143C6C6D14F8D93FE0495AD91FF8EB07C0903A07FF803F800101D9FFFEC7FCD9
-003F13F80203138031337BB13C>67 D<B712F016FF17C0C6D9C00013F0EE0FFC707EEE01
-FF701380EF7FC018E0173FEF1FF0A218F8170F18FCA418FEAB18FCA418F8171FA218F0EF
-3FE0A2EF7FC0EFFF804C13004C5AEE0FFCEE7FF0B85A94C7FC16F037317EB03F>I<B712
-C016FCEEFF80C6D9C00113E09238003FF0EE0FFC160783707EA284A695C7FCA24C5A5F16
-0FEE3FF04BB45A91B6128004FCC8FC829139C007FF8003007F707E163F83707EA583A419
-4019E083160F1801DC07FF13C0B6D8C003138770EBFF80706C1300CAEA0FFC3B327EB03E
->82 D<EB7FF80003B5FC000F14C0391FE01FF09038F007F88114036E7EEA0FE0EA07C0EA
-0100C7FCA2EB01FF133F3801FFF13807FE01EA1FF0EA3FE0EA7FC0138012FF1300A3EB80
-031407387FC00F393FF03EFF3A1FFFF87FF80007EBF03FC6EB801F25207E9F28>97
-D<EB07FF017F13E048B512F83903FC03FC3807F807EA0FF0EA1FE0EA3FC0EC03F8007FEB
-01F0903880004000FF1400AA6C7EA2003F140E7F001F141E6C6C133C6C6C13783903FF01
-F06CEBFFE06C6C1380903807FC001F207D9F25>99 D<ED07E0EC03FFA3EC003F151FADEB
-0FF8EB7FFF48B512DF3903FE03FF380FF80049137F4848133F4848131FA2127F5B12FFAA
-127F7FA2003F143F6C6C137F15FF6C6C5A3A07FC07DFF00001B5EA9FFF39007FFE1FEB0F
-F028327DB12E>I<EB0FFE90387FFFC048B57E3903FE0FF03907F801F848486C7E48487F
-4848137FA2007F80491480A212FFA290B6FCA30180C8FCA3127FA27F003FEC03807F001F
-14076C6CEB0F006C6C133E3903FF01FCC6EBFFF8013F13E0010790C7FC21207E9F26>I<
-14FF010713C0011F13F0EB7FC79038FF0FF85A13FE120313FCEC07F0EC01C091C7FCA7B5
-12FCA3D803FCC7FCB3A8387FFFF0A31D327EB119>I<EA03E0487E487E487EA56C5A6C5A
-6C5AC8FCA8EA01F812FFA31207B3A7B51280A311337DB217>105
-D<3903F007F800FFEB3FFF4A7F9039F1F03FC03A0FF3C01FE03807F7804A6C7E13FE5BA2
-5BB3B500C1B51280A329207D9F2E>110 D<3803F03F00FFEBFFC001F113F0EBF3C7390F
-F78FF80007130F13FEA29038FC07F0EC03E0EC008015005BB1B512E0A31D207E9F22>
-114 D E
+/Fe 11 115 df<932601FFFCEC03C0047FD9FFC013070307B600F8130F033F03FE131F92
+B8EA803F0203EFC0FF020FDAF00113F1023F49C7EA3FFB4A01F00207B5FC49B500C08049
+91C9FC4949824901F88249498249498249498290B5488292CAFC4885485B86485B481A7F
+A24849183FA3485B1B1FA25AA24A95C7FCA3B5FCAE7EA280A2F30FC07EA36C7FA21B1F6C
+6D1980A26C1A3F6C7F1C006C6D606C6E17FEA26D6D4C5A6D6D4C5A6D6D16076D6D4C5A6D
+01FE4C5A6D6D4C5A6D02C0EDFF806D6C01F8020390C7FC6E01FFEC1FFE020F02F0EBFFF8
+020391B65A020017C0033F93C8FC030715FCDB007F14E0040101FCC9FC525478D263>67
+D<BA12C019FEF1FFC01AF81AFE747ED8000701F8C7000F14E0060080071F13FC07077F07
+017F7380747F081F7F8886747F747FA2747FA288861D80A2871DC0A31DE0A4871DF0AF1D
+E063A41DC0A398B51280A31D0062646264505BA2505B505B505B505B4FB5C7FC4F5B070F
+5B077F5B0607B512E0BC128098C8FC1AF81AE04FC9FC19C05C527CD169>I<B912FCF0FF
+E019FEF1FFC01AF01AFCD8000701F8C7003F13FF060380060080073F7F737F737F87737F
+A2737FA388A899C8FCA263616361634F5B4F5B96B55A060391C9FC063F5B92B812F81AC0
+97CAFC19FC19FF9226F8000180DD003F13E0060F7F727F727F86727FA27280A2737FA587
+A587A575EB0780F50FC0A28773151FA2736D148075133FB800C06DEC807F739138C1FF00
+0701ECFFFE735D083F5C080714E0CE001F138062537CD167>82 D<91383FFFC00107B512
+FC011FECFF80017F15E090B77E48D9E0077F48D9800013FE486DEB3FFF82486D81707F82
+84A2707F6C5BA26C5BC648C7FC90C8FCA44BB5FC4AB6FC143F49B7FC130F013FEBFE0390
+B512E0000314004813FC4813F0485B485B5C4890C7FCA2B5FC5BA35EA27F6C5D5E6E497F
+6C6D017E13FE6C6D4848EBFFF86C9026FC0FF814FC6C90B5487E0001EDC03F6C6CEC800F
+011F9026FE000313F8010101E090C8FC3E387CB643>97 D<913803FFF0023FEBFF8091B6
+12E0010315F8010F81499038C01FFE903A7FFE0007FF4948491380485B48494913C05C5A
+485BA2485B7013805A70130048ED01FC91CAFCA3B5FCAD7E80A27EA2EF07E06C7F170F6C
+6D15C06C161F6E15806C6D143F6C6DEC7F006C6D14FE903A7FFF8003FC6D9038F01FF801
+0F90B55A6D5D01011580D9003F49C7FC020313E033387BB63D>99
+D<943801FFC00407B5FCA6EE001F1707B3A3913803FFC0023F13FC49B6FC010715C74915
+F7013FD9E03FB5FC49EB0007D9FFFC130148496D7E484980484980484980A25A5C5AA25A
+91C8FCA3B5FCAD7EA46C7FA27EA26C6D5CA26C6D5C6C5E6C6D49B5FC6C6D4914F0D97FFE
+010FECFFC0903A3FFF807FEF6D90B512CF0107158F6DECFE0FD9007F13F00207018049C7
+FC42547BD24C>I<913803FFE0023F13FE91B612C0010381010F15F84901C07F903A7FFE
+001FFE49486D7E48496D138048496D13C0484915E048814A15F048815C48EE7FF8A25A91
+C8FC18FC173FB5FCA391B7FCA418F891CAFCA57EA3807EA218786C6D15FC17016C7F6CEE
+03F86C6D14076E15F06C6DEC1FE06C6C6C143F6D6C6CEBFFC06DD9F0071300010790B55A
+010115F86D6C14E0021F1480020001F8C7FC36387CB63F>I<ED0FFF92B512C0020714F0
+021F14F8027F14FC9139FFFC1FFE49EBF03F4901C013FF49495A491300495AA2495AA201
+7FEC3FFE4AEB1FFCEE0FF8EE07F093C7FCADB712F0A626007FFCC8FCB3B3A5007FB6FCA6
+30547CD32A>I<137F3801FFC0487F487F487FA2487FA76C5BA26C5B6C5B6C5B6C6CC7FC
+90C8FCABEB1FF8B5FCA612017EB3B3A4B612F0A61C547BD326>105
+D<D93FF8EB1FFEB591B512E0030314F8030F804B8092393FE07FFF92267F001F7F000314
+FCC6D9F9F86D7FECFBE014FF4B6D7F5D92C7FCA35CA35CB3ABB6D8FC07B612E0A643367B
+B54C>110 D<90393FF001FFB5010F13E04B13F84B7F4B7F9238FF1FFFECF1FC00039026
+F3F03F1380C6EBF7E015C0ECFF80A215007013005C705AEE03F84A90C8FCA45CB3A9B612
+FEA631367CB539>114 D E
 %EndDVIPSBitmapFont
 end
 %%EndProlog
 %%BeginSetup
-%%Feature: *Resolution 360dpi
+%%Feature: *Resolution 600dpi
 TeXDict begin
 %%PaperSize: A4
 
 %%EndSetup
 %%Page: 1 1
-1 0 bop -55 -218 a Fe(Dired)28 b(Reference)e(Card)-7
--153 y Fd(\(based)13 b(on)h(Dired)f(in)h(GNU)f(Emacs)g(20.x\))-91
--106 y(Commands)e(mark)o(ed)i(with)g Fc(\(D)o(X\))h Fd(require)f
-(dired-x)-270 11 y Fb(En)n(tering)23 b(and)g(Exiting)f(Dired)-270
-105 y Fd(run)13 b(dired)744 b Fa(C-x)22 b(d)-270 153
-y Fd(dired)12 b(the)i(directory)f(of)h(the)g(\014le)g(y)o(ou)g(are)f
-(editing)89 b Fa(C-x)22 b(C-j)f Fc(\(D)o(X\))-270 200
-y Fd(quit)14 b(dired)734 b Fa(q)-270 316 y Fb(Motion)23
-b(Commands)-270 410 y Fd(mo)o(v)o(e)13 b(up)h(to)g(previous)f(line)460
-b Fa(p)-270 458 y Fd(mo)o(v)o(e)13 b(do)o(wn)g(to)i(next)f(line)483
-b Fa(n)-270 505 y Fd(mo)o(v)o(e)13 b(up)h(to)g(previous)f(directory)g
-(line)280 b Fa(<)-270 553 y Fd(mo)o(v)o(e)13 b(do)o(wn)g(to)i(next)f
-(directory)f(line)303 b Fa(>)-270 601 y Fd(mo)o(v)o(e)13
-b(to)i(next)f(mark)o(ed)f(\014le)456 b Fa(M-})-270 649
-y Fd(mo)o(v)o(e)13 b(to)i(previous)e(mark)o(ed)f(\014le)383
-b Fa(M-{)-270 697 y Fd(mo)o(v)o(e)13 b(up)h(to)g(previous)f(sub)q
-(directory)294 b Fa(M-C-p)-270 745 y Fd(mo)o(v)o(e)13
-b(do)o(wn)g(to)i(next)f(sub)q(directory)317 b Fa(M-C-n)-270
-792 y Fd(mo)o(v)o(e)13 b(to)i(paren)o(t)e(directory)457
-b Fa(^)-270 840 y Fd(mo)o(v)o(e)13 b(to)i(\014rst)e(c)o(hild)g(sub)q
-(directory)334 b Fa(M-C-d)-270 955 y Fb(Mouse)23 b(Commands)-270
-1048 y Fd(visit)14 b(\014le)685 b Fa(Mouse_Button_2)-270
-1096 y Fd(p)q(opup)13 b(men)o(u)525 b Fa(Control-Mouse_Button)q(_3)-270
-1211 y Fb(Immediate)20 b(Actions)i(on)h(Files)-270 1304
-y Fd(visit)14 b(curren)o(t)e(\014le)623 b Fa(f)-270 1352
-y Fd(view)14 b(curren)o(t)e(\014le)618 b Fa(v)-270 1400
-y Fd(visit)14 b(curren)o(t)e(\014le)h(in)h(other)f(windo)o(w)308
-b Fa(o)-270 1448 y Fd(visit)14 b(curren)o(t)e(\014le)h(in)h(other)f
-(frame)344 b Fa(w)-270 1496 y Fd(displa)o(y)13 b(curren)o(t)f(\014le)
-572 b Fa(C-u)22 b(o)-270 1544 y Fd(create)14 b(a)g(new)f(sub)q
-(directory)438 b Fa(+)-270 1591 y Fd(compare)12 b(\014le)i(at)g(p)q
-(oin)o(t)g(with)f(the)h(one)g(at)h(mark)123 b Fa(=)-270
-1706 y Fb(Marking)24 b(and)g(Unmarking)e(Files)-270 1800
-y Fd(mark)13 b(a)i(\014le)e(or)h(sub)q(directory)e(for)h(later)h
-(commands)47 b Fa(m)-270 1847 y Fd(unmark)12 b(a)j(\014le)e(or)h(all)g
-(\014les)e(of)j(a)f(sub)q(directory)146 b Fa(u)-270 1895
-y Fd(unmark)12 b(all)i(mark)o(ed)f(\014les)g(in)g(a)h(bu\013er)274
-b Fa(M-delete)-270 1943 y Fd(mark)13 b(\014les)g(with)h(a)g(giv)o(en)g
-(extension)307 b Fa(*)21 b(.)-270 1991 y Fd(mark)13 b(all)h
-(directories)557 b Fa(*)21 b(/)-270 2039 y Fd(mark)13
-b(all)h(symlinks)588 b Fa(*)21 b(@)-270 2086 y Fd(mark)13
-b(all)h(executables)538 b Fa(*)21 b(*)-270 2134 y Fd(in)o(v)o(ert)13
-b(marking)644 b Fa(*)21 b(t)-270 2182 y Fd(mark)13 b(all)h(\014les)f
-(in)h(the)f(curren)o(t)g(sub)q(dir)276 b Fa(*)21 b(s)-270
-2230 y Fd(mark)13 b(\014le)h(names)e(matc)o(hing)h(a)h(regular)f
-(expression)55 b Fa(*)21 b(\045)-270 2278 y Fd(c)o(hange)13
-b(the)h(marks)f(to)i(a)f(di\013eren)o(t)e(c)o(haracter)153
-b Fa(*)21 b(c)-270 2326 y Fd(mark)13 b(\014les)g(for)h(whic)o(h)e
-(Elisp)h(expression)f(returns)g(t)65 b Fa(*)21 b(\()h
-Fc(\(D)o(X\))-270 2442 y Fb(Getting)g(Help)-270 2536
-y Fd(dired)12 b(help)731 b Fa(h)-270 2584 y Fd(dired)12
-b(summary)g(\(short)i(help\))f(and)h(error)e(log)152
-b Fa(?)1120 -218 y Fb(Commands)22 b(on)i(Files)d(Mark)n(ed)j(or)f(Sp)r
-(eci\014ed)1120 -161 y(b)n(y)g(the)f(Pre\014x)1120 -91
-y Fd(cop)o(y)13 b(\014le\(s\))716 b Fa(C)1120 -43 y Fd(rename)12
-b(a)i(\014le)f(or)h(mo)o(v)o(e)g(\014les)e(to)j(another)e(directory)47
-b Fa(R)1120 4 y Fd(c)o(hange)13 b(o)o(wnership)e(of)j(\014le\(s\))427
-b Fa(O)1120 52 y Fd(c)o(hange)13 b(the)g(group)g(of)i(the)f
-(\014le\(s\))360 b Fa(G)1120 100 y Fd(c)o(hange)13 b(mo)q(de)g(of)h
-(\014le\(s\))512 b Fa(M)1120 148 y Fd(prin)o(t)12 b(\014le\(s\))710
-b Fa(P)1120 196 y Fd(con)o(v)o(ert)13 b(\014lename\(s\))g(to)h(lo)o(w)o
-(er)f(case)314 b Fa(\045)21 b(l)1120 244 y Fd(con)o(v)o(ert)13
-b(\014lename\(s\))g(to)h(upp)q(er)f(case)303 b Fa(\045)21
-b(u)1120 291 y Fd(delete)13 b(mark)o(ed)g(\(as)h(opp)q(osed)f(to)h
-(\015agged\))g(\014les)130 b Fa(X)1120 339 y Fd(uuenco)q(de)12
-b(or)h(uudeco)q(de)f(\014le\(s\))389 b Fa(U)1120 387
-y Fd(compress)11 b(or)j(uncompress)d(\014le\(s\))352
-b Fa(Z)1120 435 y Fd(run)12 b(info)i(on)g(\014le)643
-b Fa(I)21 b Fc(\(D)o(X\))1120 483 y Fd(mak)o(e)13 b(sym)o(b)q(olic)g
-(link\(s\))513 b Fa(S)1120 531 y Fd(mak)o(e)13 b(relativ)o(e)h(sym)o(b)
-q(olic)e(links)395 b Fa(Y)1120 578 y Fd(mak)o(e)13 b(hard)g(link\(s\))
-590 b Fa(H)1120 626 y Fd(searc)o(h)12 b(\014les)h(for)h(a)g(regular)f
-(expression)269 b Fa(A)1120 674 y Fd(query)13 b(replace)g(regular)f
-(expression)322 b Fa(Q)1120 722 y Fd(b)o(yte-compile)12
-b(\014les)597 b Fa(B)1120 770 y Fd(load)13 b(\014les)755
-b Fa(L)1120 817 y Fd(shell)12 b(command)g(on)i(\014le\(s\))466
-b Fa(!)1120 905 y Fb(Flagging)23 b(Files)e(for)i(Deletion)1120
-965 y Fc(Unmark)15 b(commands)f(remo)o(v)o(e)h(delete)i(\015ags)1120
-1023 y Fd(\015ag)d(\014le)f(for)h(deletion)558 b Fa(d)1120
-1071 y Fd(bac)o(kup)12 b(and)i(remo)o(v)o(e)e(deletion)h(\015ag)320
-b Fa(delete)1120 1119 y Fd(\015ag)14 b(all)f(bac)o(kup)g(\014les)g
-(\(\014le)h(names)e(ending)h(in)g(~\))112 b Fa(~)1120
-1166 y Fd(\015ag)14 b(all)f(auto-sa)o(v)o(e)i(\014les)520
-b Fa(#)1120 1214 y Fd(\015ag)14 b(v)n(arious)f(in)o(termediate)e
-(\014les)376 b Fa(&)1120 1262 y Fd(\015ag)11 b(n)o(umeric)e(bac)o(kups)
-h(\(ending)h(in)g(.~1~,)i(.~2~,)f(etc.\))43 b Fa(.)1120
-1310 y Fd(execute)13 b(the)h(deletions)f(requested)g(\(\015agged)g
-(\014les\))80 b Fa(x)1120 1358 y Fd(\015ag)14 b(\014les)e(matc)o(hing)h
-(a)h(regular)f(expression)198 b Fa(\045)21 b(d)1120 1443
-y Fb(Mo)r(difying)h(the)h(Dired)e(Bu\013er)1120 1513
-y Fd(insert)12 b(a)j(sub)q(directory)d(in)o(to)i(this)f(bu\013er)243
-b Fa(i)1120 1561 y Fd(remo)o(v)o(e)12 b(mark)o(ed)h(\014les)g(from)g
-(the)h(listing)251 b Fa(k)1120 1609 y Fd(remo)o(v)o(e)12
-b(a)j(sub)q(dir)c(listing)494 b Fa(C-u)21 b(k)1120 1657
-y Fd(re-read)12 b(all)i(directories)e(\(retains)h(all)h(marks\))168
-b Fa(g)1120 1704 y Fd(toggle)14 b(sorting)g(of)g(curren)o(t)e(sub)q
-(dir)g(b)o(y)i(name/date)66 b Fa(s)1120 1752 y Fd(edit)13
-b(ls)h(switc)o(hes)637 b Fa(C-u)21 b(s)1120 1800 y Fd(reco)o(v)o(er)12
-b(marks,)h(hidden)f(lines,)g(and)i(suc)o(h)223 b Fa(C-_)1120
-1848 y Fd(hide)12 b(all)i(sub)q(directories)509 b Fa(M-$)1120
-1896 y Fd(hide)12 b(or)i(unhide)e(sub)q(directory)403
-b Fa($)1120 1981 y Fb(Regular)22 b(Expression)h(Commands)1120
-2051 y Fd(mark)13 b(\014lenames)f(matc)o(hing)g(a)j(regular)d
-(expression)70 b Fa(\045)21 b(m)1120 2099 y Fd(cop)o(y)13
-b(mark)o(ed)g(\014les)g(b)o(y)h(regexp)403 b Fa(\045)21
-b(C)1120 2147 y Fd(rename)12 b(mark)o(ed)g(\014les)h(b)o(y)h(regexp)354
-b Fa(\045)21 b(R)1120 2195 y Fd(hardlink)762 b Fa(\045)21
-b(H)1120 2242 y Fd(symlink)773 b Fa(\045)21 b(S)1120
-2290 y Fd(symlink,)12 b(with)i(relativ)o(e)f(paths)400
-b Fa(\045)21 b(Y)1120 2338 y Fd(mark)13 b(for)h(deletion)597
-b Fa(\045)21 b(d)1120 2418 y Fb(Dired)g(and)j(Find)1120
-2488 y Fd(dired)12 b(\014le\(s\))i(whose)f(name)g(matc)o(hes)f(a)j
-(pattern)p Fa(M-x)22 b(find-names-dired)1120 2536 y Fd(dired)12
-b(\014le\(s\))i(that)g(con)o(tain)g(pattern)217 b Fa(M-x)22
-b(find-grep-dired)1120 2584 y Fd(dired)12 b(\014le\(s\))i(based)f(on)g
-Fa(find)i Fd(output)207 b Fa(M-x)22 b(find-dired)954
-3362 y Fd(1)p eop
+1 0 bop -91 -364 a Fe(Dired)47 b(Reference)f(Card)-12
+-256 y Fd(\(based)25 b(on)f(Dired)f(in)h(GNU)f(Emacs)g(21.x\))-152
+-176 y(Commands)f(mark)n(ed)h(with)h Fc(\(D)n(X\))f Fd(require)g
+(dired-x)-450 19 y Fb(En)m(tering)37 b(and)g(Exiting)h(Dired)-450
+175 y Fd(run)23 b(dired)1244 b Fa(C-x)36 b(d)-450 254
+y Fd(dired)23 b(the)i(directory)f(of)f(the)i(\014le)f(y)n(ou)g(are)g
+(editing)150 b Fa(C-x)36 b(C-j)g Fc(\(D)n(X\))-450 334
+y Fd(quit)24 b(dired)1226 b Fa(q)-450 527 y Fb(Motion)38
+b(Commands)-450 683 y Fd(mo)n(v)n(e)23 b(up)h(to)g(previous)g(line)769
+b Fa(p)-450 763 y Fd(mo)n(v)n(e)23 b(do)n(wn)i(to)f(next)h(line)806
+b Fa(n)-450 842 y Fd(mo)n(v)n(e)23 b(up)h(to)g(previous)g(directory)g
+(line)469 b Fa(<)-450 922 y Fd(mo)n(v)n(e)23 b(do)n(wn)i(to)f(next)h
+(directory)f(line)506 b Fa(>)-450 1002 y Fd(mo)n(v)n(e)23
+b(to)i(next)f(mark)n(ed)f(\014le)762 b Fa(M-})-450 1082
+y Fd(mo)n(v)n(e)23 b(to)i(previous)e(mark)n(ed)g(\014le)640
+b Fa(M-{)-450 1161 y Fd(mo)n(v)n(e)23 b(up)h(to)g(previous)g(sub)r
+(directory)495 b Fa(M-C-p)-450 1241 y Fd(mo)n(v)n(e)23
+b(do)n(wn)i(to)f(next)h(sub)r(directory)532 b Fa(M-C-n)-450
+1321 y Fd(mo)n(v)n(e)23 b(to)i(paren)n(t)f(directory)764
+b Fa(^)-450 1400 y Fd(mo)n(v)n(e)23 b(to)i(\014rst)e(c)n(hild)h(sub)r
+(directory)561 b Fa(M-C-d)-450 1591 y Fb(Mouse)38 b(Commands)-450
+1747 y Fd(visit)23 b(\014le)1144 b Fa(Mouse_Button_2)-450
+1827 y Fd(p)r(opup)25 b(men)n(u)879 b Fa(Control-Mouse_Button_3)-450
+2018 y Fb(Immediate)37 b(Actions)h(on)g(Files)-450 2174
+y Fd(visit)23 b(curren)n(t)h(\014le)1040 b Fa(f)-450
+2254 y Fd(view)24 b(curren)n(t)g(\014le)1032 b Fa(v)-450
+2333 y Fd(visit)23 b(curren)n(t)h(\014le)g(in)f(other)i(windo)n(w)516
+b Fa(o)-450 2413 y Fd(visit)23 b(curren)n(t)h(\014le)g(in)f(other)i
+(frame)573 b Fa(w)-450 2493 y Fd(displa)n(y)24 b(curren)n(t)g(\014le)
+955 b Fa(C-u)36 b(o)-450 2573 y Fd(create)25 b(a)f(new)g(sub)r
+(directory)734 b Fa(+)-450 2652 y Fd(compare)23 b(\014le)h(at)g(p)r
+(oin)n(t)h(with)e(the)i(one)f(at)g(mark)206 b Fa(=)-450
+2843 y Fb(Marking)38 b(and)f(Unmarking)i(Files)-450 2999
+y Fd(mark)22 b(a)i(\014le)g(or)f(sub)r(directory)h(for)f(later)h
+(commands)81 b Fa(m)-450 3079 y Fd(unmark)23 b(a)h(\014le)f(or)h(all)f
+(\014les)g(of)h(a)f(sub)r(directory)248 b Fa(u)-450 3159
+y Fd(unmark)23 b(all)g(mark)n(ed)g(\014les)g(in)h(a)f(bu\013er)460
+b Fa(M-delete)-450 3238 y Fd(mark)22 b(\014les)i(with)g(a)f(giv)n(en)i
+(extension)515 b Fa(*)36 b(.)-450 3318 y Fd(mark)22 b(all)h
+(directories)932 b Fa(*)36 b(/)-450 3398 y Fd(mark)22
+b(all)h(symlinks)981 b Fa(*)36 b(@)-450 3477 y Fd(mark)22
+b(all)h(executables)901 b Fa(*)36 b(*)-450 3557 y Fd(in)n(v)n(ert)24
+b(marking)1074 b Fa(*)36 b(t)-450 3637 y Fd(mark)22 b(all)h(\014les)h
+(in)f(the)i(curren)n(t)f(sub)r(dir)464 b Fa(*)36 b(s)-450
+3717 y Fd(mark)22 b(\014le)i(names)f(matc)n(hing)h(a)g(regular)f
+(expression)96 b Fa(*)36 b(\045)-450 3796 y Fd(c)n(hange)25
+b(the)g(marks)d(to)i(a)g(di\013eren)n(t)g(c)n(haracter)259
+b Fa(*)36 b(c)-450 3876 y Fd(mark)22 b(\014les)i(for)f(whic)n(h)h
+(Elisp)e(expression)i(returns)g(t)108 b Fa(*)36 b(\()f
+Fc(\(D)n(X\))-450 4071 y Fb(Getting)i(Help)-450 4227
+y Fd(dired)23 b(help)1221 b Fa(h)-450 4306 y Fd(dired)23
+b(summary)f(\(short)i(help\))g(and)g(error)f(log)253
+b Fa(?)1866 -364 y Fb(Commands)38 b(on)h(Files)e(Mark)m(ed)h(or)g(Sp)s
+(eci\014ed)1866 -269 y(b)m(y)g(the)f(Pre\014x)1866 -152
+y Fd(cop)n(y)25 b(\014le\(s\))1193 b Fa(C)1866 -72 y
+Fd(rename)23 b(a)h(\014le)g(or)f(mo)n(v)n(e)g(\014les)h(to)g(another)h
+(directory)79 b Fa(R)1866 7 y Fd(c)n(hange)25 b(o)n(wnership)f(of)f
+(\014le\(s\))713 b Fa(O)1866 87 y Fd(c)n(hange)25 b(the)g(group)f(of)f
+(the)i(\014le\(s\))601 b Fa(G)1866 167 y Fd(c)n(hange)25
+b(mo)r(de)e(of)h(\014le\(s\))854 b Fa(M)1866 247 y Fd(prin)n(t)24
+b(\014le\(s\))1183 b Fa(P)1866 326 y Fd(con)n(v)n(ert)25
+b(\014lename\(s\))f(to)g(lo)n(w)n(er)g(case)524 b Fa(\045)36
+b(l)1866 406 y Fd(con)n(v)n(ert)25 b(\014lename\(s\))f(to)g(upp)r(er)g
+(case)507 b Fa(\045)36 b(u)1866 486 y Fd(delete)25 b(mark)n(ed)e(\(as)h
+(opp)r(osed)h(to)f(\015agged\))i(\014les)217 b Fa(X)1866
+565 y Fd(uuenco)r(de)26 b(or)d(uudeco)r(de)j(\014le\(s\))648
+b Fa(U)1866 645 y Fd(compress)23 b(or)g(uncompress)g(\014le\(s\))588
+b Fa(Z)1866 725 y Fd(run)23 b(info)h(on)g(\014le)1073
+b Fa(I)36 b Fc(\(D)n(X\))1866 804 y Fd(mak)n(e)23 b(sym)n(b)r(olic)g
+(link\(s\))855 b Fa(S)1866 884 y Fd(mak)n(e)23 b(relativ)n(e)h(sym)n(b)
+r(olic)f(links)658 b Fa(Y)1866 964 y Fd(mak)n(e)23 b(hard)h(link\(s\))
+983 b Fa(H)1866 1044 y Fd(searc)n(h)24 b(\014les)g(for)f(a)g(regular)h
+(expression)452 b Fa(A)1866 1123 y Fd(query)24 b(replace)g(regular)g
+(expression)539 b Fa(Q)1866 1203 y Fd(b)n(yte-compile)24
+b(\014les)996 b Fa(B)1866 1283 y Fd(load)24 b(\014les)1259
+b Fa(L)1866 1362 y Fd(shell)23 b(command)g(on)h(\014le\(s\))777
+b Fa(!)1866 1508 y Fb(Flagging)38 b(Files)g(for)g(Deletion)1866
+1609 y Fc(Unmark)26 b(commands)e(remo)n(v)n(e)h(delete)j(\015ags)1866
+1705 y Fd(\015ag)c(\014le)g(for)f(deletion)933 b Fa(d)1866
+1785 y Fd(bac)n(kup)25 b(and)f(remo)n(v)n(e)f(deletion)i(\015ag)533
+b Fa(delete)1866 1864 y Fd(\015ag)24 b(all)f(bac)n(kup)i(\014les)f
+(\(\014le)g(names)f(ending)h(in)g(~\))185 b Fa(~)1866
+1944 y Fd(\015ag)24 b(all)f(auto-sa)n(v)n(e)i(\014les)869
+b Fa(#)1866 2024 y Fd(\015ag)24 b(v)l(arious)g(in)n(termediate)g
+(\014les)627 b Fa(&)1866 2103 y Fd(\015ag)21 b(n)n(umeric)d(bac)n(kups)
+j(\(ending)h(in)d(.~1~,)i(.~2~,)f(etc.\))72 b Fa(.)1866
+2183 y Fd(execute)26 b(the)e(deletions)h(requested)g(\(\015agged)g
+(\014les\))134 b Fa(x)1866 2263 y Fd(\015ag)24 b(\014les)g(matc)n(hing)
+g(a)f(regular)h(expression)333 b Fa(\045)36 b(d)1866
+2405 y Fb(Mo)s(difying)i(the)f(Dired)g(Bu\013er)1866
+2522 y Fd(insert)23 b(a)h(sub)r(directory)h(in)n(to)f(this)f(bu\013er)
+408 b Fa(i)1866 2602 y Fd(remo)n(v)n(e)23 b(mark)n(ed)g(\014les)h(from)
+d(the)k(listing)419 b Fa(k)1866 2681 y Fd(remo)n(v)n(e)23
+b(a)h(sub)r(dir)f(listing)823 b Fa(C-u)36 b(k)1866 2761
+y Fd(re-read)23 b(all)g(directories)h(\(retains)g(all)f(marks\))279
+b Fa(g)1866 2841 y Fd(toggle)25 b(sorting)e(of)h(curren)n(t)g(sub)r
+(dir)f(b)n(y)h(name/date)113 b Fa(s)1866 2920 y Fd(edit)24
+b(ls)f(switc)n(hes)1065 b Fa(C-u)36 b(s)1866 3000 y Fd(reco)n(v)n(er)24
+b(marks,)e(hidden)i(lines,)f(and)h(suc)n(h)375 b Fa(C-_)1866
+3080 y Fd(hide)24 b(all)f(sub)r(directories)853 b Fa(M-$)1866
+3160 y Fd(hide)24 b(or)f(unhide)i(sub)r(directory)675
+b Fa($)1866 3302 y Fb(Regular)37 b(Expression)i(Commands)1866
+3419 y Fd(mark)22 b(\014lenames)i(matc)n(hing)f(a)h(regular)f
+(expression)120 b Fa(\045)36 b(m)1866 3498 y Fd(cop)n(y)25
+b(mark)n(ed)e(\014les)g(b)n(y)h(regexp)674 b Fa(\045)36
+b(C)1866 3578 y Fd(rename)23 b(mark)n(ed)g(\014les)h(b)n(y)g(regexp)591
+b Fa(\045)36 b(R)1866 3658 y Fd(hardlink)1273 b Fa(\045)36
+b(H)1866 3737 y Fd(symlink)1289 b Fa(\045)36 b(S)1866
+3817 y Fd(symlink,)22 b(with)h(relativ)n(e)h(paths)668
+b Fa(\045)36 b(Y)1866 3897 y Fd(mark)22 b(for)h(deletion)998
+b Fa(\045)36 b(d)1866 4030 y Fb(Dired)h(and)g(Find)1866
+4147 y Fd(dired)23 b(\014le\(s\))i(whose)f(name)f(matc)n(hes)h(a)g
+(pattern)39 b Fa(M-x)d(find-name-dired)1866 4227 y Fd(dired)23
+b(\014le\(s\))i(that)g(con)n(tain)g(pattern)365 b Fa(M-x)36
+b(find-grep-dired)1866 4306 y Fd(dired)23 b(\014le\(s\))i(based)f(on)g
+Fa(find)h Fd(output)347 b Fa(M-x)36 b(find-dired)1590
+5603 y Fd(1)p eop
 %%Trailer
 end
 userdict /end-hook known{end-hook}if
diff -ruN src-21.1/etc/dired-ref.tex src-21.2/etc/dired-ref.tex
--- src-21.1/etc/dired-ref.tex	Mon Mar 19 13:51:13 2001
+++ src-21.2/etc/dired-ref.tex	Fri Feb 22 11:51:21 2002
@@ -246,7 +246,7 @@
 
 \title{Dired Reference Card}
 
-\centerline{(based on Dired in GNU Emacs 20.x)}
+\centerline{(based on Dired in GNU Emacs 21.x)}
 \centerline{Commands marked with \dx{} require dired-x}
 
 % trim this down to fit everything on one page
diff -ruN src-21.1/etc/fr-drdref.ps src-21.2/etc/fr-drdref.ps
--- src-21.1/etc/fr-drdref.ps	Fri Dec 29 14:26:33 2000
+++ src-21.2/etc/fr-drdref.ps	Fri Feb 22 11:51:22 2002
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0
-%%Creator: dvips(k) 5.86 Copyright 1999 Radical Eye Software
+%%Creator: dvips(k) 5.86d Copyright 1999 Radical Eye Software
 %%Title: fr-drdref.dvi
 %%Pages: 2
 %%PageOrder: Ascend
@@ -7,8 +7,8 @@
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips -o fr-drdref.ps fr-drdref.dvi
-%DVIPSParameters: dpi=360, compressed
-%DVIPSSource:  TeX output 2000.12.29:1421
+%DVIPSParameters: dpi=600, compressed
+%DVIPSSource:  TeX output 2002.02.12:1308
 %%BeginProcSet: texc.pro
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -67,542 +67,759 @@
 rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
 
 %%EndProcSet
-TeXDict begin 39158280 55380996 1000 360 360 (fr-drdref.dvi)
+TeXDict begin 39158280 55380996 1000 600 600 (fr-drdref.dvi)
 @start
 %DVIPSBitmapFont: Fa cmsy6 6 1
-/Fa 1 14 df<EB1FE0EB7FF83801E01E3907800780390E0001C048EB00E0481470003014
-30007014380060141800E0141C48140CA56C141C00601418007014380030143000381470
-6C14E06CEB01C039078007803901E01E0038007FF8EB1FE01E1B7D9425>13
+/Fa 1 14 df<EC0FFE91B512E0010314F890390FF803FE90391F80003F017EC7EA0FC001
+F8EC03E048486E7ED803C0EC007848488148C97E000E160E001E160F48EE078000381603
+007817C000701601A300F017E0481600A76C1601007017C0A30078160300381780003C16
+076CEE0F00000E160E000F161E6C6C5D6C6C5DD801F04A5A6C6C4A5A017EEC0FC0D91F80
+013FC7FC90390FF803FE0103B512F8010014E0DA0FFEC8FC332F7CA33D>13
 D E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fb cmr6 6 56
-/Fb 56 123 df<12C012E0126012301218120805067C9412>18 D<121812381230126012
-C012800506799412>I<121C1206A3127E128007067C7F10>24 D<126012F0A212701210
-A21220A21240A2040A7D940B>39 D<126012F0A212701210A21220A21240A2040A7D830B
->44 D<12FFA2080280860C>I<126012F0A2126004047D830B>I<120FEA30C0EA6060A2EA
-4020EAC030A9EA4020EA6060A2EA30C0EA0F000C137E9212>48 D<120C121C12EC120CAF
-EAFFC00A137D9212>I<121FEA60C01360EAF07013301260EA0070A2136013C012011380
-EA02005AEA08101210EA2020EA7FE012FF0C137E9212>I<EA0FC0EA3070EA7038131813
-381200133013E0EA0FC0EA007013381318131C126012F01318EAE038EA6070EA1FC00E13
-7F9212>I<EA6060EA7FC01380EA44001240A3124FEA70C0EA40E0EA00601370A212E0A2
-1360EA40E0EA21C0EA1F000C137E9212>53 D<EA07C0EA0C20EA10701220EA6000A25A12
-CFEAD0C0EAE060EAC0201330A31240EA6020EA2060EA10C0EA0F000C137E9212>I<1240
-EA7FFC13F8EA4010EA80301320EA00401380EA0100A25A12021206A2120EA512040E147E
-9312>I<120FEA3080EA6040EA4060EAC0201330A31240EA6070EA30B0EA0F3012001320
-1360EAE0401380EA4100123E0C137E9212>57 D<13101338A2137C135CA2138EA2EA0107
-A338020380A23807FFC0EA0401000813E01300A2003813F038FE03FE17147F931B>65
-D<EBFE10380301B0380C00704813305A00701310A2481300A600701310A212306C13206C
-1340380301803800FE0014147E931A>67 D<EAFFFE381C0380EB00E01470143014381418
-141CA6141814381430147014E0EB038038FFFE0016147F931B>I<B512C0EA1C01EB0040
-A21420A2130814001318EA1FF8EA1C18130814101300A214301420146014E0B5FC14147F
-9318>I<B512C0EA1C01EB0040A21420A2130814001318EA1FF8EA1C181308A290C7FCA6
-EAFFC013147F9317>I<EBFE10380301B0380C00704813305A00701310A2481300A4EB07
-FCEB00701270A212307E7E380301B03800FE1016147E931C>I<EAFF80EA1C00B2EAFF80
-09147F930D>73 D<EA07FCEA0070AE126012F01360EA60C0EA3F800E147F9313>I<00FE
-EB03F8001E14C000171305A238138009A23811C011A23810E021A3EB7041A2EB3881A2EB
-1D01A2130E123839FE040FF81D147F9321>77 D<00FC13FE001E133800171310EA138013
-C01211EA10E013701338131C131E130E1307EB0390EB01D0EB00F0A214700038133000FE
-131017147F931B>I<EAFFFE381C0380EB01C0130014E0A314C01301EB0380381FFE0000
-1CC7FCA8B47E13147F9318>80 D<EAFFFCEA1C07EB01C0EB00E0A4EB01C0EB0700EA1FFC
-EA1C07EB0380EB01C0A414C2A2EB00E638FF807C17147F931A>82
-D<EA0F88EA3078EA601812C01308A2EAE0001270127FEA1FE0EA07F0EA0078131C130C12
-80A21308EAC018EAF030EA8FC00E147E9314>I<387FFFF83860381800401308A2008013
-04A300001300AC3803FF8016147F931A>I<38FF80FE381C00381410AD120C000E13206C
-13403803818038007E0017147F931B>I<B4137E003C1338001C1310001E1330000E1320
-120F6C1340A238038080A23801C100A2EA00E2A213F61374137C1338A2131017147F931B
->I<127FEAE1C0EAE06012401200EA0FE0EA3860126012C01364A2EA61E4EA3E380E0D7E
-8C12>97 D<12F01230A7EA33E0EA3C30EA3008130C1306A5130CEA3808EA3C30EA23C00F
-157E9414>I<EA0FE0EA18701220EA6020EAC000A51260EA2010EA1820EA0FC00C0D7F8C
-10>I<13781318A7EA0798EA1878EA2018126012C0A51260EA2038EA1858EA0F9E0F157F
-9414>I<EA0F80EA1040EA2020EA6030EAC010EAFFF0EAC000A31260EA2010EA1820EA0F
-C00C0D7F8C10>I<EA03C0EA0CE01208EA18401300A4B4FC1218AB127E0B1580940B>I<EA
-0F3CEA30E6EA2040EA6060A3EA2040EA30C0EA2F001260A2EA3FE013F0EA6018EAC00CA3
-EA6018EA3030EA0FC00F147F8C12>I<12F01230A7EA33C0EA3420EA38301230A9EAFCFC
-0E157E9414>I<12301278A212301200A412F01230AB12FC06157F940A>I<1206120FA212
-061200A4120F1203AE124312E212E6127C081B82940B>I<12F01230B312FC06157F940A>
-108 D<38F3E1F03834321838381C0CEA3018A938FC7E3F180D7E8C1E>I<EAF3C0EA3420
-EA38301230A9EAFCFC0E0D7E8C14>I<EA0FC0EA1860EA2010EA6018EAC00CA5EA6018A2
-EA3870EA0FC00E0D7F8C12>I<EAF3E0EA3C30EA3008130C1306A5130CEA3818EA3C30EA
-33C0EA3000A512FC0F137E8C14>I<EA0788EA1858EA3038EA601812C0A51260EA2038EA
-1858EA0F98EA0018A5137E0F137F8C13>I<EAF3C0EA34E01238EA30401300A812FE0B0D
-7F8C0E>I<EA3F40EA40C0EA8040A2EAC000127EEA1F80EA00C0EA8020A212C0EAE040EA
-9F000B0D7F8C0F>I<1210A312301270EAFF80EA3000A71380A3EA1900120E09127F910E>
-I<EAF0F0EA3030A91370EA10F0EA0F3C0E0D7E8C14>I<EAFC3EEA300C1308EA1810A2EA
-0C20A2EA0E60EA0640A2EA0380A2EA01000F0D7F8C13>I<38F87C7C38303018EB3810A2
-38184820134C000C134013841386380702801303A238020100160D7F8C1A>I<EAF83EEA
-3038EA1820EA0C60EA06C0EA03801201EA03C01204EA0860EA1030EA3018EAF83E0F0D7F
-8C13>I<EAFC3EEA300C1308EA1810A2EA0C20A2EA0E60EA0640A2EA0380A2EA0100A212
-0212E212E412EC12700F137F8C13>I<EAFFF0EAC060EA80C012811380EA03001206EA0C
-101218EA3830EA3020EA6060EAFFE00C0D7F8C10>I E
+/Fb 56 123 df<12E07E7E127C7E7EEA0780EA03C0EA01E0EA00400B0A79A21E>18
+D<13E012011203EA07C0EA0F80EA1F00123C5A5A12400B0A74A21E>I<EA07C013F0EA00
+F8137C133C137C13F8EAFFF013800E09787E1B>24 D<127812FCA212FEA2127E1206A312
+0CA2121C121812301260124007107AA212>39 D<127812FCA212FEA2127E1206A3120CA2
+121C121812301260124007107A8512>44 D<EAFFFEA30F037E8B15>I<127812FCA41278
+06067A8512>I<13FF000313C0380781E0380F00F0001E137848133CA248131EA400F813
+1FAD0078131EA2007C133E003C133CA26C13786C13F0380781E03803FFC0C6130018227D
+A01E>48 D<13E01201120712FF12F91201B3A7487EB512C0A212217AA01E>I<EA01FC38
+07FF80381C0FC0383003E0386001F0EB00F812F86C13FCA2147C1278003013FCC7FC14F8
+A2EB01F0EB03E014C0EB0780EB0F00131E13385B5B3801C00CEA0380380600185A5A383F
+FFF85AB512F0A216217CA01E>I<13FF000313C0380F03E0381C00F014F8003E13FC147C
+A2001E13FC120CC712F8A2EB01F0EB03E0EB0FC03801FF00A2380003E0EB00F01478147C
+143E143F1230127812FCA2143E48137E0060137C003813F8381E03F0380FFFC000011300
+18227DA01E>I<00101330381E01F0381FFFE014C01480EBFE00EA1BF00018C7FCA513FE
+381BFF80381F03C0381C01E0381800F014F8C71278A2147CA21230127812F8A214784813
+F8006013F0387001E01238381E07803807FF00EA01F816227CA01E>53
+D<EB0FC0EB7FF03801F0383803C0183807803C380F007C121E001C1338003C1300A2127C
+1278EB7FC038F9FFE038FB80F038FE0038143C48131EA248131FA41278A36C131EA2001C
+133C001E13386C1370380781E03801FFC038007F0018227DA01E>I<1230123C003FB5FC
+A24813FE14FC3860001C143814704813E014C0EA0001EB0380EB07001306130E5BA25BA2
+1378A35BA41201A76C5A18237CA11E>I<13FE3803FFC0380781E0380E0070481378003C
+133848133CA200F8131EA3141FA40078133FA26C137F121C380F01DF3807FF9F3803FE1E
+C7FCA2143E143C001C1338003E13781470003C13E0381801C0381C0780380FFE00EA03F8
+18227DA01E>57 D<1438A2147CA314FEA2497E149FA29038030F80A201067F1407010E7F
+EB0C03A2496C7EA201387FEB3000A249137C90387FFFFC90B57E9038C0003EA248487FA2
+0003158090C7120F5A16C0D81F8014E0D8FFE0EB7FFEA227247DA32D>65
+D<49B41320010FEBC06090393F80F0E09038FC0019D801F0130D48481307484813034848
+130148C7FC481400123E127E1660127C12FC1600A7007C1560127EA2123E003F15C07E6C
+6CEB01806C7E6C6CEB03006C6C1306D800FC131C90383F807890380FFFE0010190C7FC23
+247CA22B>67 D<B67E15F0390FC001F80007EB007E151FED0F80ED07C0ED03E0ED01F0A2
+16F81500A216FCA816F8A2150116F0A2ED03E0ED07C0ED0F80ED1F00153E000FEB01FCB6
+12F0158026227CA12E>I<B612FEA2390FC0007E0007141F818181A39138060180A392C7
+FC140E141EEBFFFEA2EBC01E140E1406A216C0A291C7FCED0180A31503A21507150F000F
+EC7F00B7FCA222227CA129>I<B612FCA23807C000153E151E150E1506A31503140CA215
+00A2141C143CEBFFFCA2EBC03C141C140CA491C7FCA77FB5FCA220227CA127>I<02FF13
+10010FEBE03090393F80787090397C001CF0D801F0130648481303484813014848130048
+C8FC1670123E127E1630127C12FC1600A592B5FCA2007CEC03F0007E1401A2123E7EA26C
+7E6C7E6C7ED801F81303D8007EEB077090393FC03E3090390FFFF8100100EBC00028247C
+A22F>I<EAFFFEA2EA0FE0EA07C0B3AAEA0FE0EAFFFEA20F227CA116>73
+D<3801FFFEA2380007E01303B3A4123012FCA3130700F813C038700F8038381F00EA1FFC
+EA07F017237CA11F>I<D8FFC0EC0FFC6D141F00071680D806F01437A301781467A26D14
+C7A26DEB0187A26DEB0307A39038078006A2903803C00CA2903801E018A3903800F030A2
+EC7860A2EC3CC0A2EC1F80A2120F391F800F00D8FFF0ECFFFC14062E227CA136>77
+D<D8FFC0EB7FF87FD807F0EB0FC0ED07806DEB0300EA06FC137E7FA2EB1F80EB0FC0EB07
+E0130314F0EB01F8EB00FC147EA2143FEC1F83EC0FC3EC07E3A2EC03F3EC01FB6EB4FC81
+A28181000F80487ED8FFF07F8125227CA12D>I<B6FC15E0390FC003F80007EB00FC153E
+153F811680A516005D153E15FCEC03F890B512E092C7FC01C0C8FCAC487EEAFFFEA22122
+7CA129>80 D<B512FCECFF80390FC007E00007EB01F8EC007C157E153E153FA4153E157E
+157C4A5AEC07E090B5128092C7FC9038C00FC0EC03E06E7E811400A381A3160615FEA248
+6CEB7E0ED8FFFEEB3F1CED1FF8C8EA03E027237CA12C>82 D<EBFF01000713C3380F01F7
+381C003F00307F00707F00607F12E080A36C90C7FC1278127EEA3FC0EA1FFE380FFFE06C
+13F8C67FEB07FEEB007FEC0F801407EC03C0A200C01301A46C14806C13036CEB07006C13
+0E38EF803C38C3FFF038807FC01A247CA222>I<007FB612F0A2397C00F8010070EC0070
+A20060153000E01538A2481518A4C71400B3497E90387FFFF0A225227DA12B>I<D8FFFE
+EB7FF8A2D80FE0EB0FC06C48EB0780ED0300B3A35D6C6C1306A20001140E6D5B6C6C5B01
+7C5B90381F01E0903807FF80D901FEC7FC25237CA12D>I<D8FFFC903803FF80A2D80FE0
+903800FC000007157000031560A26C6C5CA26D130100005D6D1303017C91C7FC137E013E
+1306A26D5BA26D6C5AA2ECC03801071330ECE0700103136014F001015BA2903800F980A2
+14FF6EC8FCA2143EA2141CA229237EA12D>I<EA01FCEA0FFF381E0780486C7E383E01E0
+130080121CC7FC130113FF1207EA1FC0EA3F00127CA24814C0A31301387C0370393E0E79
+80391FFC3F003807F01E1A187D961E>97 D<120FB4FCA2121F7EA9EB07F0EB3FFCEB703F
+9038C00F8090388007C0EB000315E0140115F0A715E0140315C09038800780390EC00F00
+EB703E380C3FFC380007E01C247DA222>I<137F3803FFE03807C0F0380F0078001E13F8
+5AA2007C13700078130012F8A7127C1418123C6C13306C13603807C0E03803FF8038007E
+0015187D961B>I<140F14FFA2141F80A913FF000313CF3807C0FF380F003F001E7F487F
+127C127812F8A71278127C123C003E5B6CEB3F80390FC1EFF03803FF8F3900FE0F001C24
+7DA222>I<13FC3803FF80380F83C0381F01E0383E00F0123C127C14785AA2B512F8A200
+F8C7FCA4127C14187E001E1338001F1370380781E03803FF8038007E0015187D961B>I<
+EB0F80EB7FC0EBF1E0EA01E3EA03C3EBC1C038078000A9EAFFFEA2EA0780B1EA7FFCA213
+247EA313>I<3801F83F3907FEFF80381E07E3391C038300383801C000787FA500385B6C
+485AEA1E07D83FFEC7FCEA31F80030C8FC1238A2383FFF806C13F06C7F487F3838007E48
+130E48130F80A36C5B0070130E003C133C001F13F83807FFE0C690C7FC19227D951E>I<
+120FB4FCA2121F7EA9EB07F0EB1FFCEB703EEBC01E497EA21300AE39FFF0FFF0A21C237D
+A222>I<120C123FA4120CC7FCA7120FB4FCA2121F7EB0EAFFE0A20B237DA212>I<133013
+FCA413301300A7133CEA03FCA2EA007C133CB3A4127012F81378A2EA70F0EA3FE0EA0F80
+0E2E81A213>I<120FB4FCA2121F7EB3ABEAFFF0A20C237DA212>108
+D<3A0F07F007F03AFF1FFC1FFC9039703E703E3A1FC01EC01E6C486C487EA201001300AE
+3BFFF0FFF0FFF0A22C167D9532>I<380F07F038FF1FFCEB703E381FC01E6C487EA21300
+AE39FFF0FFF0A21C167D9522>I<137E3803FFC0380781E0380F00F0001E137848133CA2
+48131EA200F8131FA70078131E007C133E003C133C003E137C6C13F8380F81F03803FFC0
+C6130018187D961E>I<380F07F038FF3FFCEB703F391FC00F80390F8007C01300EC03E0
+A2EC01F0A7EC03E0A2EC07C0018013809038C01F00EB703EEB3FFCEB07E090C8FCA7EAFF
+F0A21C207D9522>I<EB7E033803FF873807C0E7380F8037381E001F123E487FA25AA712
+7CA26C5B001E5B001F5B3807C1EF3803FF8F3800FE0F1300A7ECFFF0A21C207D9520>I<
+380E0F8038FE3FC0EB73E0EA1EC3120FEB81C0EB800090C7FCADEAFFF8A213167D9518>
+I<3807F080EA1FFFEA380FEA700312E01301A212F06CC7FCEA7FC0EA3FF8EA1FFEEA07FF
+38001F80EB07C0EAC003130112E0A200F01380130338FC0F00EACFFEEA83F812187D9618
+>I<487EA41203A21207A2120F123FB51280A238078000AA14C0A63803C180EBE300EA01
+FEEA007C12207E9E18>I<000F130FB413FFA2001F131F6C7FAD5CA26CEB3F809038C0EF
+F03803FF8F3900FE0F001C177D9522>I<39FFE01FF0A2391F800F80000FEB0700000713
+06A26C6C5AA26C6C5AA26C6C5AA2EBF870EB7860EB7CE0EB3CC0133F6D5AA26DC7FCA213
+061C167E9420>I<3AFFE1FF83FEA23A1F003E00F86C013C13F0023E13E02607806E13C0
+A2EC6F012603C0C713801581D801E1EB8300148315C33900F301C6A201FF13EE90387E00
+EC15FC013C1378A30118133027167E942B>I<397FE07FE0A2390FC03F000007133C3803
+E0386C6C5A6C6C5AEB7DC0EB3F806DC7FC7F497EEB3BC0EB71E0EBE0F03801C078380380
+7C00077F001F133F39FFC07FF0A21C157E9420>I<39FFE01FF0A2391F800F80000FEB07
+0000071306EBC00E0003130CEBE01C00011318EBF0380000133013F8EB7860A26D5AA2EB
+1F80A26DC7FCA21306A25BA25B12F85B13701360EA61C0EA3F806CC8FC1C207E9420>I<
+387FFFF8A2387C01F0387003E0EA600738E00FC038C01F801400133EC65A5B3801F018EA
+03E0EA07C0000F1338EA1F80383F0030003E1370387C01F0B5FCA215157D941B>I
+E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fc cmtt8 8 63
-/Fc 63 127 df<126012F0AF1200A4126012F0A212600418789715>33
-D<EA030CEA079EA4387FFF80B512C0A26C1380380F3C00A6387FFF80B512C0A26C138038
-1E7800A4EA0C3012187F9715>35 D<13C01201A3EA07E0EA1FF8EA3FFEEA79DEEAF1CF12
-E1A3EAF1C0127D123FEA1FF8EA03FCEA01FE13CF1261EAF1C7A212E1EAF1CFEA79DEEA7F
-FCEA1FF8EA07E0EA01C0A21200101F7E9B15>I<EA3806EA7C0FEAFE1FA2EAEE1E133EA2
-133CEAFE7CA2EA7CF81238C65A1201A25B1203A25B1207A2EA0F87EB8F80EB1FC0EA1F1D
-A2121E123E131F383C0F8038180700121F7F9B15>I<EA0780487E121FEA3DE01238A338
-39EFC013CF123F381F8E00131EEA1E1C123EEA7F3CEAF738EAE7F8EAE3F000E1138038E0
-E1C0EAF3F9EA7FFF383FBF80381E0F0012187F9715>I<EA01C01203EA0780EA0F00121E
-121C123C123812781270A212F05AA87E1270A212781238123C121C121E7EEA0780EA03C0
-12010A20799B15>40 D<120313801300A2EAE31CEAF33CEA7FF8EA1FE0EA0780EA1FE0EA
-7FF8EAF33CEAE31CEA0300A2138013000E117D9415>42 D<13C0487EA6387FFF80B512C0
-A26C13803801E000A66C5A12127F9415>I<EA7FFEB5FCA2EA7FFE10047E8D15>45
-D<127012F8A312700505788415>I<1306130F131FA2133EA2133C137CA213F8A2EA01F0
-A2EA03E0A213C01207A2EA0F80A2EA1F00A2123EA2123C127CA25AA25A1260101F7E9B15
->I<EA07E0EA1FF8EA7FFCEAF03E131E130F130712601200A2130F131E131C133C1378EA
-01F0EA03C0EA0780EA0F00EA1E07123CEA7FFFB5FC7E10187E9715>50
-D<EA07E0EA3FF8EA7FFCEA783E131E130E1200131EA2133CEA07F813F013F8EA001E130E
-130F130712F0130FA2131EEA7FFCEA3FF8EA0FE010187E9715>I<1306131F133F137EEA
-01FCEA03F8EA07E0EA1FC0EA3F80EA7E005AA2127EEA3F80EA1FC0EA07E0EA03F8EA01FC
-EA007E133F131F130610167E9615>60 D<387FFF80B512C0A26C1380C8FCA4387FFF80B5
-12C0A26C1380120C7F9115>I<126012F87E127EEA3F80EA1FC0EA07E0EA03F8EA01FCEA
-007E133FA2137EEA01FCEA03F8EA07E0EA1FC0EA3F80EA7E005A5A126010167E9615>I<
-EA0FF0EA3FFCEA7FFEEAF01F1307A2EA601FEA007E13F8EA01F0EA03C01380A5C7FCA412
-03EA0780A2EA030010187E9715>I<EA01F0EA07FC487EEA1F0FEA3C7FEA79FF1480EA73
-CFEAF78712E71303A4138712F73873CF00EA79FEA2EA3C78381F0780EA0FFF3807FE00EA
-01F811187E9715>I<EA01E0A3EA0330A4EA0738A4EA0618EA0E1CA3EA0FFC487EA2EA1C
-0EA3387E1F8038FF3FC0387E1F8012187F9715>I<EA7FFCB5FC6C1380EA1C07EB03C013
-01A31303EB0780381FFF005B7F381C07801303EB01C0A41303EB0780EA7FFFB51200EA7F
-FC1218809715>I<EA03E3EA0FFF5AEA3E1FEA3C0F1278EA7007A2EAF0005AA67EEA7007
-A21278EA3C0FEA3E1EEA1FFCEA0FF8EA03E010187E9715>I<EA03E3EA0FFF5AEA3E1FEA
-3C0F1278EA7007A200F0C7FC5AA3EB3F8014C0148038F0070012705B1278123CEA3E1F6C
-B4FC7EEA03E712187F9715>71 D<38FE1FC0A338380700A7EA3FFFA3EA3807A838FE1FC0
-A312187F9715>I<EA7FFCEAFFFEEA7FFCEA0380B2EA7FFCEAFFFEEA7FFC0F187D9715>I<
-EA7F80487E6C5A001CC7FCAEEB01C0A4EA7FFFB5FC7E12187F9715>76
-D<387C03E038FE07F0007E13E0383B0DC0A4139DEA3999A5EA38F1A213611301A5387C03
-E038FE07F0387C03E01418809715>I<EA1FF8EA3FFCEA7FFEEA781EEAF00FEAE007AEEA
-F00FEA781EEA7FFEEA3FFCEA1FF810187E9715>79 D<EA7FFC487E6C7E381C07801303EB
-01C0A5EB03801307381FFF005B5B001CC7FCA6127F487E6CC7FC1218809715>I<EA1FF8
-EA3FFCEA7FFEEA781EEAF00FEAE007ACEAE1C713E7EAF1EFEA78FE127FEA3FFCEA1FF8EA
-0038133C131C131E130EA2101E7E9715>I<EAFFE013F87FEA381E7F7FA35B131EEA3FFC
-5B7FEA383E130EA4144014E0A2EAFE0FEB07C0EB038013187F9715>I<EA0FC6EA3FFE12
-7FEA783EEAF01EEAE00EA213007E127CEA3FC0EA1FF8EA03FCEA003E130FA2130712E0A2
-EAF00FEAF81EEAFFFE13F8EAC7E010187E9715>I<387F0FE038FF9FF0387F0FE0381C03
-80AFEA1E07000E1300EA0F0FEA07FE6C5A6C5A1418809715>85 D<EA7E3F007F1380007E
-1300EA1E1CEA0E38120FEA07785B12035B12015B7F12037FEA07707F120E7F121EEA1C0E
-387E1F8038FF3FC0387E1F8012187F9715>88 D<38FE1FC0A3381C0F00130EEA0E1E131C
-12075BEA03B8A2EA01F0A26C5AA8EA03F8A312187F9715>I<EA7FFFB5FCA2EAE00E131E
-133C1338EA007813F013E01201EA03C0A2EA078013005A121EEA1C07123C12781270B5FC
-A310187E9715>I<EA0780EA1FE0EA7FF8EAFFFCEAF87CEA60180E067D9715>94
-D<EA7FFEB5FCA2EA7FFE10047E7F15>I<EA1FC0EA7FF87FEA783EEA301EEA000EEA01FE
-120FEA3FEEEAF80E12E0A2131EEAF03E387FFFC0EA3FEFEA1F8712117E9015>97
-D<EA03F0EA0FFC123FEA7C3CEA7818EAF0005AA47E130E1278EA7C1EEA3FFCEA0FF8EA03
-E00F117D9015>99 D<137EA3130EA4EA07CEEA1FFE123FEA7C3EEA781EEAF00E12E0A5EA
-F01E1278EA7C3E383FFFC0EA1FEFEA078F12187F9715>I<EA07F0EA0FF8EA1FFCEA3C1E
-EA780EEAF00FEAE007B5FCA3EAF000EA70071278EA3E1FEA1FFEEA0FFCEA03F010117E90
-15>I<133E13FF5AEA03CF13861380A2EA7FFFB5FCA2EA0380ABEA7FFCA310187F9715>I<
-3807C780381FFFC05A383C798038783C00EA701CA3EA783C6C5AEA3FF85BEA37C00030C7
-FCEA3FF813FF481380EA700738F003C0EAE001A3EAF003387C0F80383FFF006C5AEA03F0
-121B7F9015>I<12FCA3121CA413F8EA1FFC7F131EEA1E0E121CA938FF8FC0139F138F12
-187F9715>I<1203EA0780A2EA0300C7FCA4EA7F8012FF127F1203ABEAFFFCA30E197D98
-15>I<136013F0A213601300A4EA1FF0A3EA0070B2EA60F0EAF1E012FFEA7FC0EA3F000C
-227E9815>I<12FCA3121CA4EB7FC013FF137FEB3C005B5BEA1DE0121FA27FEA1E78EA1C
-3CA27F38FF1FC0A312187F9715>I<EAFF80A31203B2EAFFFEA30F187D9715>I<38F9C380
-38FFEFC0EBFFE0EA3C78A2EA3870A938FE7CF8A31511809015>I<EAFCF8B47E7FEA1F1E
-EA1E0E121CA938FF8FC0139F138F12117F9015>I<EA07E0EA1FF8EA3FFCEA3C3CEA700E
-A2EAE007A5EA700EEA781EEA3C3CEA3FFCEA1FF8EA07E010117E9015>I<EAFC78EAFDFE
-B5FC381F0F80EA1E07381C03C01301A51303381E0780EA1F0FEBFF005BEA1CF890C7FCA6
-B47EA3121A7F9015>I<EA03C7EA0FF7EA3FFFEA7C1FEA780F12F07F12E0A46C5A1278EA
-7C1FEA3FFFEA1FF7EA07C7EA0007A6EB3FE0A3131A7F9015>I<EAFE1EEB7F80B5FCEA0F
-C7EB830090C7FCA2120EA7EAFFF07F5B11117E9015>I<EA0FD8EA7FF812FFEAF078EAE0
-38A2EAF800EA7FC0EA1FF0EA00F8EAE03C131C12F0EAF83CEAFFF813F0EACFC00E117D90
-15>I<12035AA4EA7FFE12FFA2EA0700A613021307A3138FEA03FE13FCEA00F010167F95
-15>I<EAFC7EA3EA1C0EA9131EA2381FFFC07EEA07CF12117F9015>I<387F3F8000FF13C0
-007F1380381C0E00A2EA1E1EEA0E1CA36C5AA3EA0330A213F06C5AA212117F9015>I<38
-FF3FC0A338380700A4EA39E7A2EA19E6EA1B36A4EA1F3EEA0F3CEA0E1C12117F9015>I<
-387E3F80127F127E380F3C00EA073813F012036C5AA3487EEA0738120FEA0E1C387F3F80
-00FF13C0007F138012117F9015>I<131F137FEA01FF13E013C0A91207EAFF80EAFE00EA
-FF80EA07C01201A913E013FFEA007F131F101F7E9B15>123 D<12FCB4FC13C012031201
-A913F0EA00FF133F13FFEA01F013C0A9120312FF130012FC101F7E9B15>125
-D<EA1E18EA3F3CEAFFFCEAF3F0EA61E00E057D9715>I E
+/Fc 63 127 df<123812FEB3A8127C1200A7123812FEA51238072A72A923>33
+D<EB3C0F90387E1F80A6EBFE3F01FC1300A2007FB512F8B612FCA4003F14F83901F87E00
+AA003FB512F8B612FCA46C14F83903F0FC00EA07F1EBE1F8A63803C0F01E297EA823>35
+D<130E131FA4EB7FC03803FFF04813FC001F7F487FD87FDF1380EB1F1F00FEEB0FC012FC
+00F8131FA312FCEC0F8000FEEB0700007F90C7FCEA3FDF13FF000F13C06C13F0000113FC
+6C6C7EEB1FFFEC7F80141F15C0007C130F00FE1307A400FC130FA2007EEB1F80007F133F
+9038DFFF006CB45A6C5B00075B6C13E038007F80011FC7FCA5130E1A347CAD23>I<000F
+EB01C0391F8003E0383FC007EA7FE0140FD8F9F013C0141F00F01480A2143F150000F95B
+147EEA7FE014FE6C485AEA1F80EA0F0100005B13035CA213075C130F5CA2131F5C133F91
+C7FCA25B137E9038FE03C09038FC07E0EC0FF00001EB1FF813F8EC3E7C12039038F03C3C
+120713E0A2000FEB3E7C13C0001FEB1FF81380EC0FF0000FEB07E039070003C01E347EAD
+23>I<137CEA01FE487E487FA2EBCFC0EA0F87A21303A31307A290380FCFF8EC9FFC139F
+13BF3907FF0FF801FE138013FCA29038F81F00EA0FF0381FE01E383FF03E13F8007F5BEA
+7E7C00FC1378EB3EF812F86D5AA290380FE03C1307EAFC0F90381FF07C387E3FFC007FB5
+12FC393FFE7FF8EBFC3F390FF01FE03907E007C01E2B7EA923>I<EB0380EB0FC0131FEB
+3F80EBFF005BEA01F81203485A485A5B485AA248C7FCA2123E127EA2127CA212FCA25AA8
+7EA2127CA2127EA2123E123FA26C7EA26C7E7F6C7E6C7E1201EA00FE7FEB3F80EB1FC013
+0FEB0380123476AD23>40 D<131EA2131F131EA30070EB0380007C130F00FEEB1FC0397F
+9E7F8090B5FC001FEBFE00000713F8000113E038007F803801FFE0000713F8001F13FE00
+7FEBFF80EB9E7F39FE1E1FC0007CEB0F8000701303000090C7FCA3131F131EA21A1D7CA2
+23>42 D<EB0780497EAB007FB512F8B612FCA46C14F839000FC000AB6D5A1E1E7EA223>
+I<007FB51280B612C0A46C14801A067C9623>45 D<123E127FEAFF80A5EA7F00123E0909
+738823>I<EC0380EC07C0140FA2141F1580143F15005C147EA214FE5C13015C13035C13
+075CA2130F5C131F5C133F91C7FCA25B137E13FE5B12015BA212035B12075B120F5B121F
+5BA2123F90C8FC5A127E12FE5AA25A12781A347CAD23>I<EB7FC03803FFF04813FC001F
+7F48EBFF80EA7F80397E003FC000FEEB0FE04813076CEB03F0A31401127C1238C7FC1403
+A2EC07E0A2EC0FC0141FEC3F80150014FE1301EB03F8495A495AEB3FC0495A01FEC7FC48
+5A485AD80FF013E0391FE001F0EA3F8048B5FCB6FCA36C14E01C2A7DA923>50
+D<EB7FC03801FFF0000713FC487F487F393FE07F809038801FC0140F1407A3EA0E00C712
+0FA2EC1F80143F903801FF00EB7FFE495A5C806DB4FC9038007F80EC1FC0EC0FE01407EC
+03F0A21401A2127C12FE1403A2EC07E048130F6CEB1FC0387FC07F6CB512806C14006C13
+FC00035B38007FC01C2B7DA923>I<EC0380EC0FC0141F143F14FF491380903807FE0049
+5A495AEB7FE0495A4890C7FCEA07FE485AEA1FF0EA7FE0485A90C8FCA213C06C7EEA1FF0
+EA0FFC6C7EEA01FF6C13C06D7EEB1FF86D7E6D7E903801FF806D13C0143F141F140FEC03
+801A247CA523>60 D<007FB512F8B612FCA4003F14F8C9FCA6003FB512F8B612FCA46C14
+F81E127E9C23>I<127012FC7E7E13C06C7EEA1FF86C7E6C7E3801FF806C7FEB3FE0EB1F
+F86D7EEB03FE903801FF806D13C0143FA214FF491380903803FE00EB0FFC495AEB3FE0EB
+FFC0485BD807FEC7FC485A485AEA7FE0485A90C8FC5A5A12701A247CA523>I<3801FFC0
+000713F8001F13FE487F48148039FF007FC048130F1407A2140F007C131F0038EB7F80C7
+12FF01031300EB07FCEB0FF0495A5C495AA291C7FCA6133E90C8FCA7131C137FA5131C1A
+297CA823>I<EB07F0EB1FFCEB7FFE48B5FC4814803907FC1FC0380FE0079038C0FFE0EA
+1F83485AEA3E0FD87E1F13F0007C138FEB3F0738783E0338F87C01A212F0EB7800A5EB7C
+0112F8A239783E03E0387C3F0790381F8FC0007E13FFD83E0F1380D83F071300381F83FE
+390FC0F9E09038E007F03807FC0F6CB5FC6C14C06C6C138090381FFE00EB07F81C297DA8
+23>I<EB0FC0A2497EA4EB3CF0A5EB7CF8A3EB7878EBF87CA548487EA40003133F497EA2
+90B5FCA2481480A3EBC00F000F14C0EB8007A3397FF03FF800FF14FCA3007F14F81E2A7E
+A923>I<B512F014FE80158015C0390F800FE01407EC03F01401A5140315E01407EC1FC0
+90B5128015005C8015C09038800FE01407EC03F0140115F81400A5140115F01403EC0FE0
+B6FC15C01580150014FC1D297EA823>I<90380FE0E090383FF9F0EBFFFD4813FF5A3807
+FC3F380FF00F381FC007A2383F80031300481301127EA2007CEB00E000FC1400A25AA97E
+A2127C007E14E0EC01F0127F7EEB8003EA1FC0EC07E0380FF00F3907FC1FC06CB512806C
+14006C5BEB3FF8EB0FE01C2B7DA923>I<90381FC1C090387FF3E090B5FC12035AEBF83F
+380FE01F381FC00F1380003F13071300007E1303A3007CEB01C000FC90C7FCA25AA6EC7F
+F815FCA27E15F8007CEB03E0127E1407A27EEB800F121FEBC01FEA0FE03807F87F90B5FC
+7EC613FB90387FF1C090381FC0001E2B7EA923>71 D<397FF00FFE39FFF81FFFA3397FF0
+0FFE390F8001F0AC90B5FCA5EB8001AE397FF00FFE39FFF81FFFA3397FF00FFE20297FA8
+23>I<B512FEA538007C00B3ADB512FEA517297AA823>I<EA7FFEB5FCA36C5AEA07C0B3A6
+157CA7007FB512FCB6FCA36C14F81E297EA823>76 D<39FF8001FFA26D5AA3391EE00778
+A3EBF00FEB700EA2EB781EA2EB381CEB3C3CA2EB1C38EB1E78A2EB0E70A3EB07E0A3EB03
+C0A290C7FCA939FFC003FFA520297FA823>I<3803FFF0000F13FC487F487FA2397F807F
+80387E001F007C130FA200FC14C0481307B3A46C130FA2007C1480A2007E131F387F807F
+6CB51200A26C5B6C5B000313F01A2B7CA923>79 D<B512F014FE80158015C0390F801FE0
+EC07F01403140115F81400A5140115F014031407EC1FE090B512C0158015005C14F00180
+C7FCABEAFFF87FA35B1D297EA823>I<3803FFF0000F13FC487F487FA2397F807F80387E
+001F007C130FA200FC14C0481307B3A3131F148700FC138F397C0FCF80A2387E07FFEA7F
+876CB51200A26C5B6C5B1203C7FC147EA280A2EC1F80A2140F1A337CA923>I<387FFFC0
+B512F88014FF7E390F807F80EC1FC0140F6E7E1403A514074A5A141FEC7F8090B5C7FCA2
+14FC8080EB807F6E7E141F140FA61587ED8F80A215CFD87FF013DF39FFF807FF1600806C
+486C5AC812F8212A7FA823>I<9038FF83800003EBE3C04813FF121F5AEA7FC0EB003F00
+FE131F48130FA25A1407A26CEB038091C7FC127E127FEA3FF06CB4FC6C13F06C13FC0001
+7F39001FFF80010113C0EB001FEC0FE01407EC03F0A20070130112F8A36C1303A26CEB07
+E06C130F9038E03FC090B5FC15005C00F15B38703FE01C2B7DA923>I<39FFF81FFFA539
+0F8001F0B3A7EBC003A2000714E0EBE007EBF00F000314C0EBFC3F6CB512806C14006D5A
+EB1FF8EB07E0202A7FA823>85 D<397FF07FF0EBF8FFA3EBF07F3907E03F000003133EEB
+F07E0001137CEBF8FC00005B13FDEB7DF0137F6D5AA26D5AA26D5AA280131F80133F8013
+7DEB7CF813F8147CEA01F0801203497E12079038C00F80120F397FE03FF8D8FFF013FCA3
+D87FE013F81E297EA823>88 D<397FF00FFE39FFF81FFFA3397FF00FFE3907C003E0EBE0
+07000314C013F00001130F01F813800000131F01FC1300137C143E133E147EEB1F7CA26D
+5AA26D5AA25C1303ACEB1FFC497EA36D5A20297FA823>I<003FB512E04814F0A4397C00
+07E0140FEC1FC01580143F0038EB7F00C7127E14FE495A5C1303495A5C130F495A5C133F
+49C7FC137E13FE485A5B1203485A4913E0000FEB01F0EA1FC01380123FEA7F00127EB6FC
+A46C14E01C297DA823>I<133013FCEA03FF000F13C0003F13F0B512FC1387EAFE0138F8
+007C00601318160A7AA823>94 D<007FB51280B612C0A46C14801A067C7E23>I<3803FF
+80000F13E04813F8487F80EB80FFEC3F80381F001FC7FC140F14FF137F0003B5FC120F5A
+387FF00F130012FCA25A141F7E6C133F387F81FF90B512FC6C14FE7E000713C73901FE01
+FC1F1D7D9C23>97 D<EB3FF0EBFFFC000313FF5A5A381FE07FEA3F80387F003E007E90C7
+FCA25AA25AA57EA2007E1307007FEB0F80141FEA3FC0391FF07F006CB5FC6C5B6C5BC613
+F0EB3FC0191D7B9C23>99 D<ECFF8015C0A41407A7EB7F873801FFE74813F7000F13FF5A
+13E0383F803F387F001F007E130FA2481307A25AA56C130FA2127E141F007F133F383F80
+7FEBE0FF6CB512FE7E000313F76C13C738007F031F297EA823>I<EB3FC0EBFFF800037F
+4813FF481480381FF07F393F801FC0EB000F007E130715E05AB6FCA415C000F8C8FC7EA2
+007EEB01C0007FEB03E0383F800713E0391FF81FC06CB5FC6C14800001EBFE006C6C5AEB
+1FE01B1D7D9C23>I<147F903801FFC0010713E05B5BEB3FCF140F90383E07C091C7FCA4
+007FB51280B612C0A36C1480D8003EC7FCB3383FFFFE487FA36C5B1B297EA823>I<EC01
+F090383F07FC9038FFDFFE000313FF5A48147E381FE1FE9038807E18393F003F00A2003E
+7FA4003F5BA2381F807EEBE1FE6CB45A485B5C001E13C0013FC7FC90C8FC121F1340380F
+FFFCECFF804814C04814F0397E0007F8007C130048147CA248143CA36C147C6C14FC007F
+EB03F8EBE01F6CB512F0000F14C06C14800001EBFE0038003FF01F2E7E9D23>I<B47E7F
+A41207A7EBC1FCEBC7FF01DF138090B512C0A29038FE0FE0EBF807EBF00313E0A313C0AD
+39FFFE1FFF5CA38020297FA823>I<133813FEA5133890C7FCA6EA7FFC487EA3127FEA00
+3EB3387FFFFEB6FCA36C13FE182A7AA923>I<14E0EB03F8A5EB00E01400A63803FFF048
+13F8A37EC7FCB3AB13011238387C03F012FEEB0FE0B5FC14C06C13006C5AEA0FF815397D
+A923>I<EA7F80487EA3127F1203A7ECFFFC13C1A313C0EC3F00147E5CEBC1F8EBC3F0EB
+C7E0EBCFC0EBDFE0EBFFF0A2EBFCF8497EEBF07EEBE03E497E1580EC0FC01407EC03E039
+7FFE0FFFB55AA36C487E20297FA823>I<EA7FFEB5FCA37EEA001FB3AD007FB512C0B612
+E0A36C14C01B297CA823>I<397E1F01F039FF7FC7FC9038FFEFFE14FF6C80390FE1FE1F
+EBC1FC01C07FEB80F8A2EB00F0AE3A7FE3FE3FE026FFF3FF13F0A3267FE3FE13E0241D81
+9C23>I<38FF81FCEBC7FF01DF138090B512C0A23907FE0FE0EBF807EBF00313E0A313C0
+AD39FFFE1FFF5CA380201D7F9C23>I<133F3801FFE0487F487F487F381FC0FE383F807F
+383E001F007E1480007C130F00FC14C0481307A66C130FA2007C1480007E131F6CEB3F00
+6D5A381FE1FE6CB45A6C5B6C5B6C5BD8003FC7FC1A1D7C9C23>I<38FF81FCEBC7FF01DF
+13C090B512E015F03907FE0FF8EBF8039038F001FCEBE000A249137EA2153EA5157E7F15
+FC7F14019038F803F89038FE0FF090B5FC15E001DF138001CF1300EBC3F801C0C7FCAAEA
+FFFEA51F2C7F9C23>I<90383FC1C09038FFF3E0000313FB4813FF5A381FF07F383FC01F
+387F000F127E14075A14035AA57E1407127E140F007F131FEA3F80381FE07F90B5FC1207
+6C13FB6C13E338003F83EB0003AAEC7FFF91B51280A36E1300212C7E9C23>I<397FF00F
+E039FFF87FF8ECFFFC13FB6CB5FCC613F8ECC078EC800091C7FC5BA25BA35BAA387FFFFC
+B57EA36C5B1E1D7E9C23>I<3801FF9C000F13FE5A127FA2EAFF0000FC137E48133EA26C
+131C6C1300EA7FF0383FFF80000F13E06C13F838007FFCEB01FEEB007F0070133F00F813
+1F7E143F7E38FF80FFEBFFFE14FC14F814F000701380181D7B9C23>I<137013F8A7007F
+B51280B612C0A36C1480D800F8C7FCACEC01C0EC03E0A3EBFC07140F9038FE1FC0EB7FFF
+158090383FFE00EB0FFCEB07F01B257EA423>I<39FF807FC001C013E0A400071303B014
+07140FEBE03F90B6FC7EA2C613F3EB3FC1201D7F9C23>I<39FFF03FFCA5390F8007C000
+071480A2EBC00F00031400A26D5A0001131EA2EBF03E0000133CA2EBF87CEB7878A2EB7C
+F8EB3CF0A2133F6D5AA36D5A6D5A1E1D7E9C23>I<397FF00FFE39FFF81FFFA3397FF00F
+FE001FC712F86C14F0A57F390783E1E0EB87F1A3EB8FF90003EB79C013CFA2EBDF7BA2EB
+DE3B00011480EBFE3FA2EBFC1FA23900F80F00201D7F9C23>I<397FF07FF039FFF8FFF8
+A3397FF07FF03903E03E003801F03C3800F87CEB78F8EB7CF0EB3FE0131F6D5A5C130749
+7E497E133DEB3CF0EB7878EBF07C0001133C497E3803C01F397FF03FF839FFF87FFCA339
+7FF03FF81E1D7E9C23>I<EC1FE0ECFFF05B130715E090380FF00014C05CAE131F137FD8
+7FFFC7FC485A5BA27F6C7EC66C7E131F130FAE8014F0903807FFE015F013017FEC1FE01C
+347DAD23>123 D<EA7FC0EAFFF87F13FF7EC66C7E131F130FAE8014F0903807FFE06D13
+F07FA25B4913E090380FF00014C05CAE131F137FD87FFFC7FCB5FC13FC5BEA7FC01C347D
+AD23>125 D<3803C038380FF07C381FF8FCEA3FFF4813F8B512F038FC7FE038F83FC038
+700F0016097AA823>I E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fd cmbx10 12 33
-/Fd 33 121 df<49B4FC011F13C090387F80F09038FE00F83903FC01FCEBF803EA07F0A3
-6E5A6E5A92C7FCA4B612FCA33807F001B3A33A7FFF1FFFC0A3222A7FA926>12
-D<903801FFFC131FEB7F813801FE01EA03FC13F8EA07F0A9B6FCA33807F001B3A33A7FFF
-1FFFC0A3222A7FA926>I<1218127C127EB4FC1380EA7FC013E0121FEA07F0EA01F81200
-13300D0C7AAA22>18 D<13C0EA01F01203EA07F8120FEA1FF0123F13C0EA7F0012FC5A12
-600D0C72AA22>I<121C127FEAFF80A213C0A3127F121C1200A212011380A21203EA0700
-1206120E5A5A12300A157BA913>39 D<EC03804A7EA24A7EA34A7EA24A7EA3EC73FCA2EC
-F3FE14E101017F14C0A2010380EC807F010780EC003FA2010E6D7EA2011E80011C130F01
-1FB5FC4980A29039780007FC0170130301F080491301A2000181497F00031680D8FFFE01
-1F13FEA32F297EA834>65 D<91393FF00180903903FFFE03010FEBFF8F90393FF007DF90
-39FF8001FF4848C7FC4848143F4848141F485A001F150F491407123F5B007F1503A25B00
-FF92C7FCAB127F6DEC0380A2123F7F001F15076D1500000F5D6C6C141E6C6C143E6C6C5C
-6C6C6C5B90393FF007E0010FB55A010349C7FC9038003FF0292B7CA932>67
-D<B612F8EDFF8016E03A03FC001FF8ED07FCED01FE6F7EEE7F80EE3FC0161F17E0A2EE0F
-F0A417F8AA17F0A3EE1FE0A217C0163FEE7F801700ED01FE4B5AED1FF8B712E0168003FC
-C7FC2D297DA835>I<B712E0A33903FC001FED07F01501A215001670A31678EDE038A316
-001401A2140790B5FCA3EBFC071401A21400A492C7FCA9B512FCA325297EA82B>70
-D<B512FCA3D803FCC8FCB3A316E0A4150116C0A21503A21507A2150F153FEDFF80B7FCA3
-23297EA829>76 D<D8FFFE92381FFFC0A26D5D0003EFF000A2D9BF801477A2D99FC014E7
-A2D98FE0EB01C7A2D987F0EB0387A3D983F8EB0707A2D981FC130EA2D980FE131CA26E13
-3880A291383F8070A291381FC0E0A291380FE1C0A3913807F380A2913803FF00A26E5AA2
-6E5AA2D8FFFE4AB512C01578A23A297DA841>I<ECFFE0010713FC90381FC07F90397F00
-1FC0D801FCEB07F048486D7E48486D7E000F81491300001F814980003F1680A2007F16C0
-49143FA200FF16E0AB007F16C0A26D147F003F1680A26D14FF001F1600000F5D6D13016C
-6C495A00035DD801FEEB0FF0D8007FEB1FC090393FC07F80902607FFFCC7FC010013E02B
-2B7CA934>79 D<134013E0EA03F8487E487EEA1FBF387E0FC038FC07E0387001C0382000
-80130A79A922>94 D<3803FF80000F13F0381F01FC383F80FE147FA2EC3F80EA1F00C7FC
-A3EB0FFF90B5FC3807FC3FEA1FE0EA3F80127F130012FEA3147F7E6CEBFFC0393F83DFFC
-380FFF8F3801FC031E1B7E9A21>97 D<EAFFE0A3120FACEBE1FE9038E7FF809038FE07E0
-9038F803F8496C7E496C7EA281811680A916005D5D7F4A5A6D485A90389E0FE090380FFF
-80260E01FCC7FC212A7EA926>I<EB3FF8EBFFFE3803F01F390FE03F80EA1FC0EA3F80A2
-007FEB1F0090C8FC5AA97E7F003FEB01C013C0001F1303390FE007803903F01F003800FF
-FCEB3FE01A1B7E9A1F>I<EC3FF8A31403ACEB1FE3EBFFFB3803F83F380FE00F381FC007
-383F8003A2127F13005AA97E1380123F1407381FC00F380FE01F3A03F03FFF803800FFF3
-EB3FC3212A7EA926>I<EB3FE03801FFF83803F07E380FE03F391FC01F80393F800FC0A2
-EA7F00EC07E05AA390B5FCA290C8FCA47E7F003F14E01401D81FC013C0380FE0033903F8
-1F803900FFFE00EB1FF01B1B7E9A20>I<15F09038FF83F80003EBEF7C380FC1FCEA1F80
-003F13FE9038007E1048EB7F00A66C137EEB80FE001F5B380FC1F8381FFFE00018138000
-38C8FC123CA2123E383FFFF814FF6C14C06C14E06C14F0121F397E0007F8007C13015A14
-00A36C1301007EEB03F06CEB07E0390FC01F803903FFFE0038007FF01E297E9B22>103
-D<EAFFE0A3120FAC147F9038E1FFC09038E787E09038EE07F09038FC03F813F813F0A313
-E0AF3AFFFE3FFF80A3212A7DA926>I<1207EA1FC0EA3FE0A5EA1FC0EA0700C7FCA7EAFF
-E0A3120FB3A3EAFFFEA30F2B7DAA14>I<EAFFE0A3120FB3B2EAFFFEA30F2A7DA914>108
-D<3BFFC07F800FF0903AC1FFE03FFC903AC783F0F07E3B0FCE03F9C07F903ADC01FB803F
-01F8D9FF00138001F05BA301E05BAF3CFFFE1FFFC3FFF8A3351B7D9A3A>I<38FFC07F90
-38C1FFC09038C787E0390FCE07F09038DC03F813F813F0A313E0AF3AFFFE3FFF80A3211B
-7D9A26>I<EB3FE03801FFFC3803F07E390FC01F80391F800FC0003F14E0EB00074814F0
-A34814F8A86C14F0A2393F800FE0A2001F14C0390FC01F803907F07F003801FFFC38003F
-E01D1B7E9A22>I<38FFE1FE9038E7FF809038FE07E0390FF803F8496C7E01E07F140081
-A2ED7F80A9EDFF00A25DEBF0014A5A01F85B9038FE0FE09038EFFF80D9E1FCC7FC01E0C8
-FCA9EAFFFEA321277E9A26>I<90381FC0389038FFF0783903F83CF8380FE01F001F130F
-383FC0071380007F1303A2EAFF00A9EA7F80A2123FEBC007001F130F380FE01F3803F03F
-3800FFF3EB3FC3EB0003A991383FFF80A321277E9A24>I<38FFC1F0EBC7FCEBCE3E380F
-DC7F13D813F813F0143E14005BAFB5FCA3181B7E9A1C>I<3803FE30380FFFF0EA3E03EA
-7800127000F01370A27E00FE1300EAFFE013FE387FFFC06C13E06C13F0000713F8C613FC
-1307EAE000147C6C133CA27E14787E38FF01F038F7FFC000C11300161B7E9A1B>I<1370
-A413F0A312011203A21207381FFFF0B5FCA23807F000AD1438A73803F870000113F03800
-FFE0EB1F8015267FA51B>I<39FFE03FF8A3000F1303B11407A2140F0007131F3A03F03B
-FF803801FFF338003FC3211B7D9A26>I<3AFFFE03FF80A33A0FF0007800000714706D13
-F000035CEBFC0100015CA26C6C485AA2EBFF07017F90C7FC148FEB3F8E14CEEB1FDCA2EB
-0FF8A36D5AA26D5AA26D5A211B7F9A24>I<39FFFC0FFFA33907F003C0D803F85B3801FC
-076C6C48C7FCEBFF1E6D5AEB3FF86D5AA2130F130780497E497E131EEB3C7F496C7E496C
-7ED801E07F3803C00F6E7E3AFFF01FFF80A3211B7F9A24>120 D
-E
+/Fd 33 121 df<ED1FFF0203B512E0021F14F8027F80903A01FFF803FE499038C0007F01
+0F90390001FF80D91FFC497F4A5B495A495AA201FF4A7F4A6D5BA3705B7090C7FC705A94
+C8FCA693387FFFE0B9FCA5C601E0C7FCB3B0007F9026FFC07FEBFFC0A53A467EC540>12
+D<92381FFF800203B5EAF3E0021F14FF147F903901FFF80149EBC00390390FFE0007495A
+5C495A495AA201FF804A7F82ACB9FCA5C601E0C7FCB3B0007F9026FFC07FEBFFC0A53A46
+7EC540>I<EA0F80EA3FC0487E7F487EA27F7F7F6C13806C13C07E000713E0000113F038
+007FF8EB1FFCEB07F8EB01F0EB0070161375C539>18 D<EB07C0EB0FF0EB1FF8133FEB7F
+FCA213FF5A5A4813F84813F014E0481380383FFE00EA7FF8EAFFE0EA7F80003EC7FC1238
+161369C539>I<EA07E0EA1FF8487E487E7FB5FC1480A214C0A37EA27EEA1FFBEA07E3EA
+000313071480A2130F1400A25B131E133E5B5BA2EA03F0485A485A485A90C7FC120C1223
+78C420>39 D<EE0FC04C7EA24C7EA34C7EA24C7EA24B7FA34B7FA24B80A34B8016CF031F
+80168F1687033F801603037F80157E8203FE804B7E0201814B137FA20203814B7F020782
+4B7FA2020F824B7F021F824B7F023F82A292C77E4AB77EA291B87EA3D901FCC87F4A157F
+0103835C840107844A81010F844A81A2011F844A81013F84496C81B600C0010FB612FCA5
+4E457CC457>65 D<DCFFFC141C031FD9FFC0137C4AB600F813FC0207EDFE01021FEDFF03
+027FD9F00113C749B5C7EA3FEF4901F8EC0FFF010F01E01403490180804990C9FC494816
+7F4948163F4849161F4849160F5C48180748491603A2485B19015A91CAFC19005AA34918
+00A212FFAC127FA27F1A7CA27EA2806C19FC1AF86C7F19016C7F6CF003F0806C6DEE07E0
+6C6DEE0FC06D6C161F6D6CEE3F806D6DED7F006D01E0EC01FE010301F8EC07FC6D01FFEC
+1FF86D6C9039F801FFE0021F90B65A020793C7FC020115FCDA001F14E0030049C8FC4646
+7AC453>67 D<B97E18F818FF19E019F8D8001F90C7000F13FE05007F061F7F06077F7213
+F084727F737E737E737EA2731380A27313C0A21BE085A21BF0A51BF8A285A961A21BF0A4
+1BE0A2611BC0A2611B801B00614F5A62197F4F5A06035B4E5B061F5B95B5C7FC050F5BBA
+12F819E0198006FCC8FC18804D447CC358>I<BA12E0A419F0D8001F903880000F170018
+3F181F180F1807180319F81801A31800A3EE01F0197CA419001603A31607160F163F92B5
+FCA5ED803F160F16071603A31601A693C9FCAEB712FCA53E437CC248>70
+D<B712FCA5D8001F0180C9FCB3B1F003E0A4180719C0A4180FA3181FA2F03F80A2187F18
+FF5F5F170F173F4CB5FCBA1200A53B447CC345>76 D<B600C0051FB512F06F5FA26F5FA2
+D8001FF380006F17F7A2DABFFCEE01E7A2DA9FFEEE03C7A2DA8FFFEE0787A202876DED0F
+07A302836D151EA202816D153CA202806D1578A26F6C15F0A36F6CEC01E0A26F6CEC03C0
+A26F6CEC0780A26F6DEB0F00A36F6D131EA26F6D5BA26F6D5BA2706C5BA2706C485AA370
+6C485AA2706C485AA270018FC7FCA27013DEA37013FCA2705BA2715AA2715A497EB600F0
+043FB612F0715AA2715A71C7FC64447CC36D>I<923803FFE0037F13FF0203B612E0021F
+15FC027F9038007FFF902601FFF8010F13C04901C001017F010F496D13F84948C8EA3FFC
+49486F7E49486F7E01FF8448496F7F4A81488548496F7FA248496F7FA2488591CA127F48
+85A348854983A400FF1A80AD007F1A006D5FA36C61A26E16FF6C61A36C6D4B5BA26C6D4B
+5B6C616E5D6C6D4B5B6C6D4B5B6D6C4B90C7FC6D6C4B5A6D6D4A5A6D01E001035B010301
+F8010F13E06D01FF017F5B6D6C90B6C8FC021F15FC020715F0DA007F91C9FC030713F049
+467AC456>79 D<1303497E497E497EEB7FF8497E487F487F481480391FF87FE0393FF03F
+F0397FC00FF839FF8007FC38FE0001007CEB00F800301430002014101E1173C439>94
+D<903801FFF8011FEBFF80017F14E090B612F8489038807FFC3A03FE001FFE486CEB07FF
+486E7F0280806F7FA36F7F6C90C7FCA26C5AEA00F890C8FCA2150F021FB5FC0103B6FC13
+1F017F13C03901FFFC004813E0000F13804890C7FC485A5B485AA2485AA45DA26C6C5BED
+07BF6C6C010F13FC6CB490391F3FFFE06C9026C0FE1F13F06CEBFFFC6CECF007C66CD9E0
+0113E0010790C9FC342F7DAD38>97 D<EB7FC0B5FCA512037EB1ED1FFC92B512C002C314
+F002CF14FC9139DFF01FFF9126FF800713809126FE000113C04A6D13E002F015F04A147F
+18F8173F18FCA2EF1FFEA318FFAB18FEA3173F18FCA218F8177F6E15F06EECFFE06E4913
+C06E49138091263F800F1300903AFE1FE03FFE496CB55AD9F80314F049C61480C8D81FF8
+C7FC38467DC440>I<EC3FFE49B512E0010F14F8013F8090397FF807FE9039FFE001FF48
+4948138048018014C048495A485A121FA2485A6F1380A2007F6E130049EB007C93C7FC12
+FFAC127F7FA2123FEE03E06C7E16076C6C15C06C150F6C6DEB1F806C6DEB3F006C01F013
+FE90397FFE03FC6DB55A010F5C010314C09026003FFCC7FC2B2F7CAD33>I<EFFF804BB5
+FCA5ED000782B1EC1FFC49B51283010F14E3013F14F390267FFC07B5FC9038FFF0004801
+C0133F48497F4890C77E484880121F5B123FA2127F5BA312FFAB127FA36C7EA2121F7F00
+0F5D6C6C5C5E6C6D90B512C06CD9E00114FF39007FF80F6DB512E7010F14C70103140790
+26003FF0EBFC0038467CC440>I<EC1FFE49B512C0010714F0011F14FC90397FFC0FFE90
+3AFFE003FF804849C613C0485B4890C7EA7FE048ED3FF0485AEE1FF8485AA2007F150F49
+15FCA212FFA390B7FCA317F801F8C9FCA5127FA27FA2003F1638177C6C6C15FCA26C6CEC
+01F86C6D13036CED07F06C6DEB0FE06C01F0EB3FC0903A3FFE01FF806DB5EAFE0001075C
+010014F0020F90C7FC2E2F7DAD35>I<902601FFF013FF010FD9FE031380013FD9FF8F13
+C090B812E048D9C07F13BF489039001FF83F4848EB0FFC4848EB07FE001F9238FF1FC049
+6DEB0F8094C7FC003F82A7001F93C7FCA26D5B000F5D6C6C495A6C6C495A6C9038C07FF0
+4890B55A1680D8078F49C8FC018113F0D80F80CAFCA47F7F13F890B612E016FEEEFFC06C
+16F0836C826C82831207481780D81FF8C77ED83FE014074848020113C000FF8149157FA5
+6D15FF007F17806D5C6C6C4A1300D81FFCEC0FFE6CB4EC3FFC6C9039E001FFF8000190B6
+12E06C6C1580010F02FCC7FCD9007F138033427DAC39>103 D<EB7FC0B5FCA512037EB1
+923803FF80031F13F0037F7F92B57E9139C1FC1FFE9139C3E00FFF9126C7C0077FECCF00
+02DE7F02FC81A25C5CA35CB3A7B600C1B61280A539457CC440>I<13FCEA03FF48138048
+13C0A24813E0A66C13C0A26C13806C1300EA00FC90C7FCA9EB7FC0EA7FFFA512037EB3AF
+B6FCA518467CC520>I<EB7FC0B5FCA512037EB3B3B3A3B61280A519457CC420>108
+D<90287FC003FF80EB07FFB5011F01F0013F13E0037F6D90B57E92B56C4880913DC1FC1F
+FE03F83FFC913DC3E00FFF07C01FFE00039026C7C00790398F800FFF6CD9CF00EC9E0002
+DE6D01BC7F02FC03F81580A24A5D4A5DA34A5DB3A7B600C1B60083B6FCA5582D7CAC5F>
+I<903A7FC003FF80B5011F13F0037F7F92B57E9139C1FC1FFE9139C3E00FFF00039026C7
+C0077F6CEBCF0002DE7F02FC81A25C5CA35CB3A7B600C1B61280A5392D7CAC40>I<EC1F
+FE49B512E0010714F8011F14FE903A7FF807FF809026FFE0017F48903980007FE04890C7
+6C7E48486E7E000F8249140F001F82A2003F824980007F1780A400FF17C0AA007F1780A4
+6C6C4A1300A2001F5EA26C6C4A5A00075E6D143F6C6D495AC69039E001FFC090267FF807
+5B6DB6C7FC010F14FC010114E09026001FFEC8FC322F7DAD39>I<90397FC01FFCB590B5
+12C002C314F002CF14FC9139DFF03FFF9126FF800F138000039026FE000313C06C496D13
+E002F015F04A7FEF7FF8A218FC173F18FEA3EF1FFFAB18FE173FA318FC177F18F817FF6E
+15F06E4913E06E4913C06E4913806E6C4813009238E07FFE02EFB55A02E314F002E01480
+DB1FF8C7FC92C9FCADB612C0A538407DAC40>I<DA3FF8130F902601FFFE5B010F6D6C5A
+013F6E5A90397FFC0FF0903AFFF003F8FF489038E000F94849137F48497F4890C7FC4881
+5B003F815B127F82A25B12FFAB6C7EA3123F6D5C121F5E6C6C5CA26C6D5B6C6D48B5FC6C
+6D5A6C9038F81FEF013FB512CF010F148F0103EBFE0F9038007FF091C7FCAD0307B512FE
+A537407CAC3C>I<90397F803FC0B5EBFFF0028313F8028713FC91388FE7FE91389F8FFF
+0003EB9E0F6C13BCA214F8A29138F007FEED03FC9138E001F892C7FCA35CB3A5B612C0A5
+282D7DAC2F>I<90391FFE078090B512DF000314FF5A380FF803381FE000D83F80133F12
+7F90C7121FA248140FA27FA201E090C7FC13F8EBFFC06C13FEECFFC06C14F015FC6C806C
+806C1580000115C07E011F14E01301D9000713F014000078147F00F8143F151F6C140FA3
+7E6C15E0151F6D14C06D133F01F0EB7F809039FC03FF0090B55A00FC5CD8F83F13F0D8F0
+0790C7FC242F7CAD2D>I<EB01F0A51303A41307A2130FA2131FA2133F137F13FF120300
+0F90B512C0B7FCA4C601F0C7FCB3A3ED01F0AA017FEB03E014F81507D93FFC13C090391F
+FE1F806DB512006D5B01015B9038003FF024407EBE2D>I<D93FE0EC7FC0B549B5FCA500
+03EC00076C81B3A85EA35E6C5DA26E013D7F017F02F9EBFF8090393FFC03F16DB512E16D
+14C1010314019026003FFC91C7FC392E7CAC40>I<B690380FFFF8A5000301E001001300
+6C167C6E14FC6C5E801601017F5D6E1303013F5D6E1307011F5D6E130F6D5DED801F6D92
+C7FC15C05E6D143EEDE07E6D147CEDF0FC6D5C15F9027F5B15FF6E5BA36E5BA26E5BA26E
+90C8FCA26E5AA26E5AA26E5A352C7DAB3C>I<007FB590387FFFF8A5C601F890380FF800
+6D6CEB07E0013F4A5A6D6C131F6E495A6D6D48C7FC6DEBC0FE6DEBC1FC6DEBE1F8EDF3F0
+6DEBFFE0806E5B6E5B93C8FC6E7F6E7F6E7FA24A7F4A7F4A7FEDBFFEEC3F1F91387E0FFF
+02FE8049486C7F49486C7F49487E49486C7F4A8049486D7E49C76C7ED9FF80131FB500F0
+90B512FEA5372C7EAB3C>120 D E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fe cmbx8 8 26
-/Fe 26 121 df<EB1FFC13FFEA03F0EA07C0EA0F80147CA5B512FCA2380F807CAE397FF3
-FF80A2191C809B1B>13 D<120F5AEA3F801300127E12F812E00907769B18>19
-D<136013C0EA01801203EA0700120EA25AA2123C12381278A412F85AA97E1278A4123812
-3C121CA27EA27EEA03801201EA00C013600B297C9D13>40 D<12C012607E12387E7EA27E
-A21380120313C0A413E01201A9120313C0A4138012071300A2120EA25A5A12305A5A0B29
-7D9D13>I<EAFFE0A40B047F8A10>45 D<B512F814FF390FC01FC0EC07E0EC01F0EC00F8
-A2157CA3157EA8157CA215F8A2EC01F0EC03E0EC1FC0B6120014F81F1B7E9A25>68
-D<EAFFFEA2EA0FC0AE1403A31407A3140E141E147EB512FEA2181B7E9A1D>76
-D<39FFFC1FFCA2390FE001C03907F003803903F807003801FC0E5C3800FE18EB7F30EB3F
-F06D5A5C6D7E6D7E80130FEB1DFCEB38FEEB307F13609038E03F803901C01FC03903800F
-E090380007F05A39FFE01FFFA2201B7E9A25>88 D<1204120EEA3F80EA7FC0EAF1E0EAC0
-60EA80200B077A9B18>94 D<EA1FF8EA3FFEEA7C1FEB0F80EB07C012381200A2EA07FFEA
-1F87EA7C07127812F8A3EA7C1B383FF3F8EA0FC015127E9118>97
-D<EA03FEEA0FFF381E0F80123C127C3878070000F8C7FCA61278127C6C13C0381F018038
-0FFF00EA03FC12127E9116>99 D<EB0FF0A21301A8EA03F1EA0FFFEA1F07EA3C01127C12
-7812F8A61278A2EA3C03EA1E0F380FFDFEEA03F1171C7E9B1B>I<EA01FCEA0FFF381F07
-80383E03C0EA7C01007813E012F8A2B5FCA200F8C7FCA2127C14606C13E0381F01C03807
-FF803801FE0013127F9116>I<3803F0F0380FFFF8383C0F383838073000781380A40038
-1300EA3C0FEA1FFCEA33F00020C7FC1230A2EA3FFF14C06C13E04813F0387801F838F000
-78A3007813F0383E03E0381FFFC03803FE00151B7F9118>103 D<120C123FA4120CC7FC
-A5127FA2121FAEEAFFC0A20A1D7F9C0E>105 D<B4FCA2121FB3A6EAFFE0A20B1C7F9B0E>
-108 D<3AFF0FE03F8090393FF0FFC03A1F60F983E09039C07F01F0EB807EEB007CAB3AFF
-E3FF8FFEA227127F912A>I<38FF0FC0EB3FE0381F61F0EBC0F813801300AB38FFE7FFA2
-18127F911B>I<EA01FC380FFF80381F07C0383C01E0007C13F0EA780000F813F8A60078
-13F0EA7C01003C13E0381F07C0380FFF803801FC0015127F9118>I<38FF1F80EB7FE038
-1FC1F0EB8078EB007C143C143EA6147CA2EB80F8EBC1F0EB7FE0EB1F8090C7FCA6EAFFE0
-A2171A7F911B>I<3803F030380FFC70381F0EF0EA3E03EA7C01A212F8A61278127CEA3C
-03EA1F0FEA0FFDEA03F1EA0001A6EB0FFEA2171A7E911A>I<EAFC7C13FEEA3D9F131FA2
-EA3F0EEA3E00AAEAFFC0A210127E9114>I<EA1FD8EA3FF8EA7038EAE018A2EAF000B4FC
-EA7FE013F0EA1FF8EA07FCEA003CEAC01CA212E0EAF038EAFFF0EACFC00E127E9113>I<
-1203A35AA25A123FEAFFFCA2EA1F00A9130CA4EA0F1813F8EA03E00E197F9813>I<38FF
-07F8A2EA1F00AC1301EA0F03EBFCFFEA03F818127F911B>I<38FFC3FCA2381F80E0380F
-C1C03807C3803803E700EA01FE6C5A137C137E13FFEA01DFEB8F80380307C0380603E038
-0E01F038FF03FEA217127F911A>120 D E
+/Fe 26 121 df<91383FFCF00103B5FC130F90383FF01F9038FF803F4813005B12034913
+1F150FA7B7FCA43903FC000FB3A4263FFFC0B5FCA4282E7FAD2D>13
+D<132013F8EA01FCEA03FE1207120FEA1FFCEA3FF8EA7FF0EAFFC01300127C12600F0D6F
+AE29>19 D<14E01301EB07C0EB0F80EB1F00133E137E5B5B1201485AA2485AA2485AA212
+1F5B123FA290C7FC5AA512FEAF127FA57E7FA2121F7F120FA26C7EA26C7EA26C7E12007F
+137E133E7FEB0F80EB07C0EB01E01300134378B120>40 D<12E07E127C7E7E6C7E7F6C7E
+12037F6C7EA26C7EA2137EA2137F7F1480A2131F14C0A5EB0FE0AFEB1FC0A51480133FA2
+14005B137EA25BA2485AA2485A5B1207485A5B48C7FC123E5A12F05A13437CB120>I<B5
+12F8A715077F921B>45 D<B712E016FE707E17E00001D9800013F8EE1FFCEE07FE707E70
+13807013C0EF7FE0173F18F0A2171F18F8A318FCAA18F8A4EF3FF0A218E0177FEFFFC018
+805E04071300EE1FFCEEFFF8B85A17C04CC7FC16E0362E7DAD3E>68
+D<B612C0A400010180C8FCB3A5EE03C0A416071780A2160FA2161FA2163F167FED01FF03
+0F1300B8FCA42A2E7DAD31>76 D<007FB548B512E0A4C6903AE0000FE0006D6C5C6E495A
+6D6C49C7FC011F5C6D6C137E6E5B6DEB81F86D13836DEBC7F0EDE7E06DEBFFC06E5B8093
+C8FC6E5A140F6E7E826E7F5C4A7F4A7F82EC3F3F91387E1FFC02FE7F4A6C7E49487E4948
+6C7F0107814A6C7F49487E49486D7E013F8149C76C7E017E141F496E7EB5D8F001B512FC
+A4362E7DAD3D>88 D<13301378EA01FE487E481380001F13E0383FCFF038FF03FCEAFE01
+3878007800201310160B77AD29>94 D<EB7FF80003B5FC000F14C0391FE01FF09038F007
+F86E7EA26E7EEA0FE0EA07C0C7FCA214FF133F48B5FC000713C1381FFC01EA3FE0EA7FC0
+EAFF801300A3140313806C6C487E263FF03F13F8381FFFFE0007EBF87FC6EBC01F251E7E
+9D28>97 D<EB0FFE90387FFFC048B512F03907FC07F8380FF00FEA1FE0123F13C0007FEB
+07F090388003E091C7FC12FFA8127F7FA26C6C133CA26C6C137C6C6C13F83907FE03F000
+01B512E06C6C138090380FFC001E1E7D9D24>99 D<ED0FC0EC03FFA4EC003FABEB0FF8EB
+7FFF48B6FC3807FC07380FF001391FE0007F003F143F5B127F5BA212FFA9127F7F123F15
+7F6C6C13FF380FF0032607FC0F13FC0001B512BF6CEBFE3FEB1FF0262E7DAD2D>I<EB0F
+FC90387FFF8048B512E03907FC0FF0390FF003F8391FE001FC1400484813FE007F147E5B
+157F12FFA290B6FCA30180C7FCA3127F7FA2003F140F6C7E6C6C131F6C6C137E3903FE01
+FC6CB512F86C6C13E001071300201E7E9D25>I<ED07C090391FF81FF090B5EA7FF80003
+14FD3907F81FF3380FE007001F14F99039C003F8F0003FECFC00A6001F5CEBE007000F5C
+3907F81FE090B55A4891C7FCEB1FF8001EC9FC121FA27F90B512C06C14F815FF6C158016
+C04815E0123F48C7EA3FF000FE140F4814071503A36C1407007FEC0FE06C6CEB1FC0D81F
+F0EBFF800007B5EAFE00000114F8D8001F1380252D7E9E29>103
+D<EA07C0EA0FE0EA1FF0EA3FF8A5EA1FF0EA0FE0EA07C0C7FCA6EA03F012FFA4120FB3A3
+B5FCA4102F7CAE17>105 D<EA03F012FFA4120FB3B3B5FCA4102E7CAD17>108
+D<2707E00FF8EB1FF000FFD97FFEEBFFFC01E1B5008313FF9028E7E07FCFC01380903BEF
+803FDF007F260FFE0013FC031FEC3FC0495C495CA2495CB0B53B01FFFE03FFFCA43E1E7C
+9D45>I<3907E01FF000FFEB7FFC01E1B5FCD9E7E013809038EF807F260FFE0013C04913
+3FA25BA25BB0B53803FFFCA4261E7C9D2D>I<EB07FE90387FFFE048B512F83903FC03FC
+3907F000FE4848137F4848EB3F80003F15C049131F007F15E0A200FF15F0A8007F15E0A2
+6D133F003F15C0001F15806D137F6C6CEBFF003903FC03FC6CB55A6C6C13E0D907FEC7FC
+241E7E9D29>I<3903F03FE039FFF1FFFC01F713FFD9FFC013809039FE007FC0D80FFCEB
+3FE049EB1FF05BED0FF8A216FC1507A8ED0FF8A3ED1FF07F6DEB3FE06DEB7FC09039FF81
+FF809039F7FFFE0001F113F89038F07FC091C8FCA9B5FCA4262B7D9D2D>I<90390FF003
+C090387FFE0748B512873907FE07CF390FF803FF48487E48487E157F4848133FA3485AA8
+7F127FA26C6C137F15FF6C7E380FF8033807FC0F0001B512BF39007FFE3FEB1FF090C7FC
+A9913803FFFCA4262B7D9D2B>I<3807E07E39FFE1FF8001E313E0EBE78F9038EF1FF0EA
+0FFE13FCA29038F80FE0EC07C091C7FC5BAFB57EA41C1E7D9D22>I<3801FF8E000713FE
+121FEA3F00007C137E0078133E00F8131EA27EB490C7FC13F0EBFF806C13E06C13F86C13
+FE7E00037FD8003F13801300143F00F0131F140F7EA26CEB1F007E38FF807EEBFFFC00FB
+13F000E01380191E7D9D20>I<133CA4137CA313FCA2120112031207001FB5FCB6FCA3D8
+03FCC7FCAEEC03C0A61407D801FE1380EBFF0F6CEBFF00EB3FFCEB0FF01A2A7FA920>I<
+D803F0EB0FC000FFEB03FFA4000FEB003FB1157FA215FF00075BD9F80713FC6CB512BFC6
+EBFE3FEB3FF0261E7C9D2D>I<D8FFFEEBFFF8A4D803FCEB7E006C6C5B6D485A6CEB81F0
+90387FC3E090383FE7C090381FEF806DB4C7FC6D5A6D5A6D7E80497F497F497FEB1F9FEC
+0FF090383E07F8496C7E496C7ED801F07F48486C138026FFF80113FCA4261E7E9D2B>
+120 D E
 %EndDVIPSBitmapFont
-%DVIPSBitmapFont: Ff cmr8 8 49
-/Ff 49 127 df<90383F0F803901C0D8C0390381F1E0380701E1000EEBE0C001001300A6
-B512FE380E00E0AF387FC7FE1B1C809B19>11 D<133F3801C0C0EA0380380701E0120EEB
-00C01400A5B512E0EA0E00AF387FC7FC161C809B18>I<EB3FE0EA01C0EA0381EA0701EA
-0E00A7B5FCEA0E00AF387FC7FC161C809B18>I<90383F07E03901C09C18380380F0D807
-01133C000E13E00100131892C7FCA5B612FC390E00E01CAF3A7FC7FCFF80211C809B23>
-I<12FC121CAFEAFF8009117F900C>16 D<12E0A212F01238121C120E120207077C9B15>
-18 D<120EA2121E1238127012E012800707779B15>I<126012F012F812681208A31210A2
-122012401280050C7C9B0C>39 D<1380EA0100120212065A12081218A25AA212701260A3
-12E0AC1260A312701230A27EA21208120C7E12027EEA008009287C9D10>I<7E12407E12
-307E1208120CA27EA212077EA31380AC1300A35A1206A25AA2120812185A12205A5A0928
-7E9D10>I<126012F0A212701210A41220A212401280040C7C830C>44
-D<EAFFE0A20B0280890E>I<126012F0A2126004047C830C>I<1303A213071306A2130E13
-0C131C1318A213381330A21370136013E013C0A212011380A212031300A25A1206120E12
-0CA2121C1218A21238123012701260A212E05AA210287E9D15>I<EA07E0EA0C30EA1818
-EA381CEA300CEA700EA3EAF00FACEA700EA4EA381CEA1818EA0C30EA07E0101C7E9A15>
-I<12035A123F12C71207B3A4EAFFF80D1B7C9A15>I<EA07E0EA1830EA201CEA401E130E
-EAF00F12F8A312201200131EA2133C1338137013E013C0EA0180EA0300EA0601120C1218
-EA1002EA3FFE127F12FF101B7E9A15>I<B512C0380F0070141C80801580140315C01401
-A215E0A715C0A214031580A2EC0700140E5C1470B512C01B1B7E9A20>68
-D<B512FE380F001E14061402A21403801481A21480A2130113FF13011300A315801400EC
-0100A35CA21406141EB512FE191B7E9A1D>I<90381F8080EBE061380380193807000700
-0E13035A003C1301123800781300A2127000F01400A5ECFFF0EC078012701278A2123812
-3C121C7E6C130B380380193800E06090381F80001C1D7E9B21>71
-D<EAFFF8000FC7FCB01408A4141814101430147014F0B5FC151B7E9A1A>76
-D<B4EB3FE0390F800700EBC002120BEA09E013F012081378133CA2131E130FA2EB0782EB
-03C214E21301EB00F214FA147A143E141EA2140E1406121C38FF80021B1B7E9A20>78
-D<39FFF03FE0390F0007001402B36C5B138000035B12016C6C5AEB7060EB1F801B1C7E9A
-20>85 D<120C121E1233EA6180EA80400A057B9A15>94 D<1208121012201240A21280A3
-12B012F812781230050C7D9B0C>96 D<EA0FE0EA3838EA3C1C7F12181200133EEA07EEEA
-1E0E1238127800F01320A3EA701E38382740381FC38013117F9015>I<12FC121CAA137E
-381D8380381E01C0381C00E014F014701478A5147014F014E0381E01C03819838038107C
-00151C7F9B18>I<EA03F8EA0E0EEA1C1E1238EA780CEA700012F0A512701278EA3801EA
-1C02EA0E04EA03F810117F9013>I<EB0FC01301AAEA01F1EA0E0DEA1C03EA3801127812
-7012F0A5127012781238EA1C03EA0E0D3803F1F8151C7F9B18>I<EA03F0EA0E18EA180C
-EA380EEA7007A212F0B5FCEAF000A31270A2EA3801EA1C02EA0E04EA03F810117F9013>
-I<13F8EA018CEA071E1206EA0E0C1300A6EAFFE0EA0E00AFEA7FE00F1C809B0D>I<EB03
-803807E4C0EA1C3838381C801400EA781EA3EA381CA26C5AEA37E00020C7FC1230A2EA3F
-F86CB4FC1480EA3003386001C0EAC000A33860018038300300EA1C0EEA07F8121B7F9115
->I<12FC121CAA137EEB8380EA1D01001E13C0121CAC38FF8FF8151C7F9B18>I<1218123C
-A21218C7FCA712FC121CAFEAFF80091C7F9B0C>I<13C0EA01E0A2EA00C01300A7EA07E0
-1200B31260EAF0C012F1EA6180EA3E000B24829B0D>I<12FC121CB3A8EAFF80091C7F9B
-0C>108 D<39FC7E07E0391C838838391D019018001EEBE01C001C13C0AC3AFF8FF8FF80
-21117F9024>I<EAFC7E381C8380EA1D01001E13C0121CAC38FF8FF815117F9018>I<EA03
-F0EA0E1CEA1806EA380738700380A200F013C0A500701380A238380700EA1806EA0E1CEA
-03F012117F9015>I<EAFC7E381D8380381E01C0381C00E014F014701478A5147014F014
-E0381E01C0381D8780381C7C0090C7FCA7B47E15197F9018>I<3803E080EA0E19EA1C05
-EA3807EA7803127012F0A512701278EA3807121CEA0E1BEA03E3EA0003A7EB1FF014197F
-9016>I<EAFCF0EA1D1CEA1E3CA2EA1C181300ABEAFFC00E117F9011>I<EA1FC8EA3038EA
-4018EAC008A2EAE000127F13E0EA1FF0EA01F8EA003CEA800CA212C0EAE008EAD030EA8F
-C00E117F9011>I<1204A4120CA2121C123CEAFFE0EA1C00A91310A4120CEA0E20EA03C0
-0C197F9810>I<38FC0FC0EA1C01AC1303120CEA060D3803F1F815117F9018>I<38FF07E0
-383C0380381C0100A2EA0E02A2EA0F06EA0704A2EA0388A2EA01D0A213F06C5AA2134013
-117F9016>I<38FF0FE0383C0700EA1C06EA0E046C5AEA039013E0120112007FEA0138EA
-023CEA061C487EEA08070038138038FC0FE013117F9016>120 D<38FF07E0383C038038
-1C0100A2EA0E02A2EA0F06EA0704A2EA0388A2EA01D0A213F06C5AA21340A25BA212F190
-C7FC12F21266123813197F9016>I<EA1C04EA3F08EA43F0EA80E00E047D9A15>126
-D E
+%DVIPSBitmapFont: Ff cmr8 8 48
+/Ff 48 127 df<9138FF807E01079038E1FF80903A1F807FC3C0D93E00EB87E049EBFF07
+4913FE485A00039138FC018049017CC7FCAAB712FCA22703E0007CC7FCB3A6486C13FE3A
+7FFF0FFFF0A22B2F7FAE29>11 D<14FF010713E090381F80F090383E003849137C4913FC
+485A1203491378153092C7FCA7157CB612FCA23803E000157CB3A5486C13FE3A7FFF0FFF
+E0A2232F7FAE27>I<ECFFC0010713FC90381F807C90383E00FC5B5B485A0003147C5BAA
+B612FCA23903E0007CB3A6486C13FE3A7FFF0FFFE0A2232F7FAE27>I<91397F800FF090
+3A03FFE07FFE903A1FC079F80F903B3E001FE003804990393FC007C04990387F800F4848
+1400A24848017EEB0780033EEB030094C7FCA7EF07C0B9FCA23B03E0003E000F1707B3A5
+486C017FEB0FE03C7FFF07FFF0FFFEA2372F7FAE3B>I<EA07C012FFA2120F1207B3A5EA
+0FE0EAFFFCA20E1E7E9D14>16 D<127012F87EA2127E7EEA0F801207EA03C0EA01E0EA00
+7013200C0C78AD23>18 D<13E0EA01F01203A2EA07E0EA0FC0EA1F00121E5A5A12E01240
+0C0C72AD23>I<123C127EB4FCA21380A2127F123D1201A312031300A25A1206120E5A5A
+5A126009157AAD14>39 D<13031307130E131C1338137013F0EA01E013C01203EA0780A2
+EA0F00A2121EA35AA45AA512F8A25AAB7EA21278A57EA47EA37EA2EA0780A2EA03C01201
+13E0EA00F013701338131C130E1307130310437AB11B>I<12C07E12707E7E7E120FEA07
+80120313C0EA01E0A2EA00F0A21378A3133CA4131EA5131FA2130FAB131FA2131EA5133C
+A41378A313F0A2EA01E0A2EA03C013801207EA0F00120E5A5A5A5A5A10437CB11B>I<12
+3C127EB4FCA21380A2127F123D1201A312031300A25A1206120E5A5A5A126009157A8714
+>44 D<B512C0A412047F9018>I<123C127E12FFA4127E123C08087A8714>I<15C0140114
+031580A214071500A25C140EA2141E141CA2143C143814781470A214F05CA213015CA213
+035C130791C7FCA25B130EA2131E131CA2133C1338A21378137013F05BA212015BA21203
+5BA2120790C8FC5A120EA2121E121CA2123C1238A212781270A212F05AA21A437CB123>
+I<130C133C137CEA03FC12FFEAFC7C1200B3B113FE387FFFFEA2172C7AAB23>49
+D<EB7F803801FFF0380780FC380E003F48EB1F8048EB0FC05A0060EB07E012F000FC14F0
+7E1403A3007C1307C7FCA215E0140F15C0141F1580EC3F00147E147C5C495A495A495A49
+5A011EC7FC5B5B4913305B485A4848136048C7FC000E14E0001FB5FC5A4814C0B6FCA21C
+2C7DAB23>I<B612F815FF3A03F8001FE00001EC03F0ED00F8167E82EE1F80160F17C0EE
+07E0A2EE03F0A217F81601A317FCAA17F8A3EE03F0A217E0160717C0160FEE1F80EE3F00
+167E5EED03F00003EC1FE0B7128003F8C7FC2E2D7DAC36>68 D<B712FEA23903F8000100
+01EC003E828282A282A3178016011518A293C7FCA31538157815F890B5FCA2EBF8001578
+15381518A21760A392C712C0A4160117801603A21607160F163F0003913801FF00B8FCA2
+2B2D7EAC30>I<DA1FF013C09138FFFE01903903F00F8390390F8001E3013FC71277017C
+143F4848141F4848140F48481407A248481403121F491401123F90C8FC481500A300FE16
+00A992381FFFFEA2007F9138001FE0EE0FC0A27E7F121F7F120F6C7EA26C7E6C6C141FEA
+007C013F143FD90F8013F3903903F007C10100B51200DA1FF813002F2F7CAD37>71
+D<B512F8A2D803FCC8FC6C5AB3A7160CA41618A41638A2167816F81501ED07F00003141F
+B7FCA2262D7EAC2C>76 D<D8FFF8903803FFFC7F00019138003FC06DEC0F006D1406EBBF
+80A2EB9FC0EB8FE0138780EB83F8138180EB80FE147E147FEC3F80EC1FC0140F15E0EC07
+F0140315F8EC01FC140015FE157FED3F86151F16C6ED0FE6150716F6ED03FE1501A21500
+167E163EA2486C141ED80FF0140EB5FC16062E2D7DAC35>78 D<B539F003FFFCA2D803FC
+C7EA3FC06C48EC0F001606B3AB160E0000150C7F161C017C1418017E14386D5C6D146090
+390F8001E0903907E00380902601F80FC7FC9038007FFCEC0FF02E2E7DAC35>85
+D<13C0487E487E487EEA0F3CEA1E1E487E3870038038E001C0EAC000120A78AD23>94
+D<12035A120E5A5A123012701260A212E05AA312DEB4FC1380A2127FA2EA3F00121E0915
+7BAD14>96 D<13FF000713C0380F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07
+FF137F3801FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE14065AA3143F7E007E137F007F
+EBEF8C391F83C7FC390FFF03F83901FC01E01F207D9E23>I<EA07C012FFA2120F1207AC
+14FE9038C7FF809038CF03E09038DC01F09038F8007C49137E49133E497F1680A2150F16
+C0A9ED1F80A216005D6D133E6D5B01B05B9038BC01F090380E07E0390607FF80260001FC
+C7FC222F7EAD27>I<EB1FE0EB7FFC3801F01E3803E0073907C01F80EA0F80EA1F005A00
+3EEB0F00007E90C7FCA2127C12FCA9127EA215C07E6C130101801380380FC0033907E007
+003801F03E38007FF8EB1FC01A207E9E1F>I<15F8141FA214011400ACEB0FE0EB7FF838
+01F81E3803E0073807C003380F8001EA1F00481300123E127EA25AA9127C127EA2003E13
+017EEB8003000F13073903E00EFC3A01F03CFFC038007FF090391FC0F800222F7EAD27>
+I<EB1F80EBFFF03803E0783807C03E380F801E381F001FEC0F80123E007E130715C0127C
+12FCA3B6FCA200FCC8FCA5127EA2003E14C0123F6C1301390F80038001C013003803E00F
+3801F03C38007FF8EB1FC01A207E9E1F>I<EB03F0EB0FFCEB3E1EEB7C3F13F8EA01F0A2
+3803E00C1400AAB512E0A23803E000B3A6487E387FFF80A2182F7FAE16>I<013F13F890
+38FFC3FE3903E1FF1E3807807C000F140C391F003E00A2003E7FA76C133EA26C6C5A0007
+1378380FE1F0380CFFC0D81C3FC7FC90C8FCA3121E121F380FFFF814FF6C14C04814F039
+1E0007F848130048147C12F848143CA46C147C007C14F86CEB01F06CEB03E03907E01F80
+3901FFFE0038003FF01F2D7E9D23>I<EA07C012FFA2120F1207AC14FE9038C3FF809038
+C703E09038DE01F013F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2222E7EAD27>I<
+EA0780EA0FC0EA1FE0A4EA0FC0EA0780C7FCA8EA07C012FFA2120F1207B3A5EA0FE0EAFF
+FCA20E2E7EAD14>I<130FEB1F80EB3FC0A4EB1F80EB0F0090C7FCA8EB07C013FFA2130F
+1307B3AD1230127838FC0F80A21400485AEA783EEA3FF8EA07E0123C83AD16>I<EA07C0
+12FFA2120F1207B3B3A3EA0FE0EAFFFEA20F2E7EAD14>108 D<2607C07FEB07F03BFFC3
+FFC03FFC903AC783F0783F3C0FCE01F8E01F803B07DC00F9C00F01F8D9FF8013C0499038
+7F000749137EA249137CB2486C01FEEB0FE03CFFFE0FFFE0FFFEA2371E7E9D3C>I<3807
+C0FE39FFC3FF809038C703E0390FDE01F0EA07F8496C7EA25BA25BB2486C487E3AFFFE1F
+FFC0A2221E7E9D27>I<EB1FE0EB7FF83801F03E3803C00F3907800780390F0003C04814
+E0003EEB01F0A248EB00F8A300FC14FCA9007C14F8A26CEB01F0A26CEB03E0A2390F8007
+C03907C00F803901F03E0038007FF8EB1FE01E207E9E23>I<3807C0FE39FFC7FF809038
+CF03E0390FDC01F03907F800FC49137E49133E49133FED1F80A3ED0FC0A8151F1680A2ED
+3F00A26D137E6D137C5D9038FC01F09038CE07E09038C7FF80D9C1FCC7FC01C0C8FCA948
+7EEAFFFEA2222B7E9D27>I<90380FE01890387FF8383801F81C3903E00E783807C00739
+0F8003F8001F1301EA3F00A2007E1300A212FE5AA8127EA36C13017EEB8003380FC00738
+03E00E3801F03C38007FF0EB1FC090C7FCA94A7E91381FFFC0A2222B7E9D25>I<380781
+F838FF87FEEB8E3FEA0F9CEA07B813B0EBF01EEBE000A45BB0487EB5FCA2181E7E9D1C>
+I<3801FE183807FFB8381E01F8EA3C00481378481338A21418A27E7EB41300EA7FF06CB4
+FC6C13C06C13F0000113F838001FFC130138C0007E143EA26C131EA27EA26C133CA26C13
+7838FF01F038E3FFC000C0130017207E9E1C>I<1360A413E0A312011203A21207121FB5
+12F0A23803E000AF1418A714383801F03014703800F860EB3FE0EB0F80152A7FA81B>I<
+D807C013F800FF131FA2000F130100071300B21401A314033803E007EC0EFC3A01F81CFF
+C038007FF890391FE0F800221F7E9D27>I<3AFFFC01FFC0A23A0FE0007E000007147C15
+380003143015706C6C1360A26C6C5BA390387C0180A26D48C7FCA2EB3F07EB1F06A2EB0F
+8CA214DCEB07D8A2EB03F0A36D5AA26D5A221E7F9C25>I<3AFFFC07FF80A23A0FF003FC
+000003EB01F0000114C06D485A000091C7FCEB7C06EB3E0E6D5A14B8EB0FB0EB07E01303
+6D7E497E1307EB067C497EEB1C1F01387FEB700F496C7E6E7ED803C07F00076D7E391FE0
+03FC3AFFF007FFC0A2221D7F9C25>120 D<3AFFFC01FFC0A23A0FE0007E000007147C15
+38000314306D137000011460A26C6C5BA2EBFC01017C5BEB7E03013E90C7FCA2EB1F06A2
+148EEB0F8CA2EB07D8A2EB03F0A36D5AA26D5AA2495AA2130391C8FC1278EAFC06A25B13
+1CEA7838EA7070EA3FE0EA0F80222B7F9C25>I<38078008380FE01C381FF838383FFFF0
+38707FE038E01FC03840078016077AAC23>126 D E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fg cmbx10 14.4 12
-/Fg 12 117 df<137013F8EA01FCEA03FE1207A2EA0FFCEA1FF8EA3FF013C0EA7F0012FC
-5A12600F0E6FB229>19 D<913A03FF800380023FEBF00749B5EAFC0F01079038007F1FD9
-1FF8EB0FBFD93FE0EB03FFD9FFC07F48497F4890C8127F4848153F485A171F485A170F48
-5AA2007F1607A25B94C7FC12FFAB127FA26DED0380A2123FA26C6C150718006C7E5F6C6C
-151E6C6C151C6C6D143C6C6D14F8D93FE0495AD91FF8EB07C0903A07FF803F800101D9FF
-FEC7FCD9003F13F80203138031337BB13C>67 D<B712F016FF17C0C6D9C00013F0EE0FFC
-707EEE01FF701380EF7FC018E0173FEF1FF0A218F8170F18FCA418FEAB18FCA418F8171F
-A218F0EF3FE0A2EF7FC0EFFF804C13004C5AEE0FFCEE7FF0B85A94C7FC16F037317EB03F
->I<EB7FF80003B5FC000F14C0391FE01FF09038F007F88114036E7EEA0FE0EA07C0EA01
-00C7FCA2EB01FF133F3801FFF13807FE01EA1FF0EA3FE0EA7FC0138012FF1300A3EB8003
-1407387FC00F393FF03EFF3A1FFFF87FF80007EBF03FC6EB801F25207E9F28>97
-D<EB07FF017F13E048B512F83903FC03FC3807F807EA0FF0EA1FE0EA3FC0EC03F8007FEB
-01F0903880004000FF1400AA6C7EA2003F140E7F001F141E6C6C133C6C6C13783903FF01
-F06CEBFFE06C6C1380903807FC001F207D9F25>99 D<ED07E0EC03FFA3EC003F151FADEB
-0FF8EB7FFF48B512DF3903FE03FF380FF80049137F4848133F4848131FA2127F5B12FFAA
-127F7FA2003F143F6C6C137F15FF6C6C5A3A07FC07DFF00001B5EA9FFF39007FFE1FEB0F
-F028327DB12E>I<EB0FFE90387FFFC048B57E3903FE0FF03907F801F848486C7E48487F
-4848137FA2007F80491480A212FFA290B6FCA30180C8FCA3127FA27F003FEC03807F001F
-14076C6CEB0F006C6C133E3903FF01FCC6EBFFF8013F13E0010790C7FC21207E9F26>I<
-14FF010713C0011F13F0EB7FC79038FF0FF85A13FE120313FCEC07F0EC01C091C7FCA7B5
-12FCA3D803FCC7FCB3A8387FFFF0A31D327EB119>I<EA03E0487E487E487EA56C5A6C5A
-6C5AC8FCA8EA01F812FFA31207B3A7B51280A311337DB217>105
-D<3903F007F800FFEB3FFF4A7F9039F1F03FC03A0FF3C01FE03807F7804A6C7E13FE5BA2
-5BB3B500C1B51280A329207D9F2E>110 D<3803F03F00FFEBFFC001F113F0EBF3C7390F
-F78FF80007130F13FEA29038FC07F0EC03E0EC008015005BB1B512E0A31D207E9F22>
-114 D<131CA4133CA3137CA213FC120112031207121FB6FCA3D803FCC7FCB0EC01C0A7EB
-FE030001EB0780EBFF0F39007FFF00EB3FFCEB07F01A2E7FAD20>116
-D E
+/Fg 12 117 df<14FC497E497E4913804913C05B5B5BA290B5FC5A4814804814004813FC
+14F0485B4813804848C7FCEAFFF8EA7FE0EA3F80003EC8FC12181A1764D345>19
+D<932601FFFCEC03C0047FD9FFC013070307B600F8130F033F03FE131F92B8EA803F0203
+EFC0FF020FDAF00113F1023F49C7EA3FFB4A01F00207B5FC49B500C0804991C9FC494982
+4901F88249498249498249498290B5488292CAFC4885485B86485B481A7FA24849183FA3
+485B1B1FA25AA24A95C7FCA3B5FCAE7EA280A2F30FC07EA36C7FA21B1F6C6D1980A26C1A
+3F6C7F1C006C6D606C6E17FEA26D6D4C5A6D6D4C5A6D6D16076D6D4C5A6D01FE4C5A6D6D
+4C5A6D02C0EDFF806D6C01F8020390C7FC6E01FFEC1FFE020F02F0EBFFF8020391B65A02
+0017C0033F93C8FC030715FCDB007F14E0040101FCC9FC525478D263>67
+D<BA12C019FEF1FFC01AF81AFE747ED8000701F8C7000F14E0060080071F13FC07077F07
+017F7380747F081F7F8886747F747FA2747FA288861D80A2871DC0A31DE0A4871DF0AF1D
+E063A41DC0A398B51280A31D0062646264505BA2505B505B505B505B4FB5C7FC4F5B070F
+5B077F5B0607B512E0BC128098C8FC1AF81AE04FC9FC19C05C527CD169>I<91383FFFC0
+0107B512FC011FECFF80017F15E090B77E48D9E0077F48D9800013FE486DEB3FFF82486D
+81707F8284A2707F6C5BA26C5BC648C7FC90C8FCA44BB5FC4AB6FC143F49B7FC130F013F
+EBFE0390B512E0000314004813FC4813F0485B485B5C4890C7FCA2B5FC5BA35EA27F6C5D
+5E6E497F6C6D017E13FE6C6D4848EBFFF86C9026FC0FF814FC6C90B5487E0001EDC03F6C
+6CEC800F011F9026FE000313F8010101E090C8FC3E387CB643>97
+D<913803FFF0023FEBFF8091B612E0010315F8010F81499038C01FFE903A7FFE0007FF49
+48491380485B48494913C05C5A485BA2485B7013805A70130048ED01FC91CAFCA3B5FCAD
+7E80A27EA2EF07E06C7F170F6C6D15C06C161F6E15806C6D143F6C6DEC7F006C6D14FE90
+3A7FFF8003FC6D9038F01FF8010F90B55A6D5D01011580D9003F49C7FC020313E033387B
+B63D>99 D<943801FFC00407B5FCA6EE001F1707B3A3913803FFC0023F13FC49B6FC0107
+15C74915F7013FD9E03FB5FC49EB0007D9FFFC130148496D7E484980484980484980A25A
+5C5AA25A91C8FCA3B5FCAD7EA46C7FA27EA26C6D5CA26C6D5C6C5E6C6D49B5FC6C6D4914
+F0D97FFE010FECFFC0903A3FFF807FEF6D90B512CF0107158F6DECFE0FD9007F13F00207
+018049C7FC42547BD24C>I<913803FFE0023F13FE91B612C0010381010F15F84901C07F
+903A7FFE001FFE49486D7E48496D138048496D13C0484915E048814A15F048815C48EE7F
+F8A25A91C8FC18FC173FB5FCA391B7FCA418F891CAFCA57EA3807EA218786C6D15FC1701
+6C7F6CEE03F86C6D14076E15F06C6DEC1FE06C6C6C143F6D6C6CEBFFC06DD9F007130001
+0790B55A010115F86D6C14E0021F1480020001F8C7FC36387CB63F>I<ED0FFF92B512C0
+020714F0021F14F8027F14FC9139FFFC1FFE49EBF03F4901C013FF49495A491300495AA2
+495AA2017FEC3FFE4AEB1FFCEE0FF8EE07F093C7FCADB712F0A626007FFCC8FCB3B3A500
+7FB6FCA630547CD32A>I<137F3801FFC0487F487F487FA2487FA76C5BA26C5B6C5B6C5B
+6C6CC7FC90C8FCABEB1FF8B5FCA612017EB3B3A4B612F0A61C547BD326>105
+D<D93FF8EB1FFEB591B512E0030314F8030F804B8092393FE07FFF92267F001F7F000314
+FCC6D9F9F86D7FECFBE014FF4B6D7F5D92C7FCA35CA35CB3ABB6D8FC07B612E0A643367B
+B54C>110 D<90393FF001FFB5010F13E04B13F84B7F4B7F9238FF1FFFECF1FC00039026
+F3F03F1380C6EBF7E015C0ECFF80A215007013005C705AEE03F84A90C8FCA45CB3A9B612
+FEA631367CB539>114 D<143FA65CA45CA25BA35B5BA25B5B5B90B5FC5A000F91B5FCB8
+FCA5D8003F90C8FCB3A8EE07E0AB6DEC0FC01580161F6D01C01380163F6D9038F07F006D
+EBFFFE6D5C6D6C5B021F13E0020313802B4D7ECB35>116 D E
 %EndDVIPSBitmapFont
 end
 %%EndProlog
 %%BeginSetup
-%%Feature: *Resolution 360dpi
+%%Feature: *Resolution 600dpi
 TeXDict begin
 %%PaperSize: A4
 
 %%EndSetup
 %%Page: 1 1
-1 0 bop -164 -218 a Fg(Carte)27 b(de)g(r)n(\023)-40 b(ef)n(\023)g
-(erence)29 b(de)e(Dired)-5 -153 y Ff(\(bas)o(\023)-20
-b(e)14 b(sur)f(Dired)g(de)g(GNU)h(Emacs)f(20.x\))-205
--106 y(Les)h(commandes)d(marqu)o(\023)-20 b(ees)13 b(par)g
-Fe(\(D)o(X\))j(n)o(\023)-23 b(ecessiten)o(t)17 b(dired-x)-270
-14 y Fd(Lancer)23 b(et)f(sortir)h(de)g(Dired)-270 110
-y Ff(lancer)13 b(dired)697 b Fc(C-x)22 b(d)-271 158 y
-Ff(\023)-20 b(edite)11 b(le)f(r)o(\023)-20 b(ep)q(ertoire)9
-b(du)i(\014c)o(hier)d(que)j(l'on)g(est)g(en)f(train)-270
-206 y(d')o(\023)-20 b(editer)648 158 y Fc(C-x)22 b(C-j)p
-Fe(\(D)o(X\))-270 238 y Ff(quitter)14 b(dired)682 b Fc(q)-270
-357 y Fd(Commandes)22 b(de)h(d)o(\023)-33 b(eplacemen)n(t)-270
-453 y Ff(ligne)13 b(pr)o(\023)-20 b(ec)o(\023)g(eden)o(te)618
-b Fc(p)-270 501 y Ff(ligne)13 b(suiv)n(an)o(te)665 b
-Fc(n)-270 548 y Ff(ligne)13 b(de)h(r)o(\023)-20 b(ep)q(ertoire)12
-b(pr)o(\023)-20 b(ec)o(\023)g(eden)o(te)367 b Fc(<)-270
-596 y Ff(ligne)13 b(de)h(r)o(\023)-20 b(ep)q(ertoire)12
-b(suiv)n(an)o(te)414 b Fc(>)-270 644 y Ff(\014c)o(hier)12
-b(marqu)o(\023)-20 b(e)13 b(suiv)n(an)o(t)507 b Fc(M-})-270
-692 y Ff(\014c)o(hier)12 b(marqu)o(\023)-20 b(e)13 b(pr)o(\023)-20
-b(ec)o(\023)g(eden)o(t)460 b Fc(M-{)-270 740 y Ff(sous-r)o(\023)-20
-b(ep)q(ertoire)11 b(pr)o(\023)-20 b(ec)o(\023)g(eden)o(t)452
-b Fc(M-C-p)-270 787 y Ff(sous-r)o(\023)-20 b(ep)q(ertoire)11
-b(suiv)n(an)o(t)499 b Fc(M-C-n)-270 835 y Ff(r)o(\023)-20
-b(ep)q(ertoire)12 b(p)o(\022)-20 b(ere)645 b Fc(^)-270
-883 y Ff(premier)11 b(sous-r)o(\023)-20 b(ep)q(ertoire)488
-b Fc(M-C-d)-270 1001 y Fd(Commandes)22 b(a)n(v)n(ec)h(la)f(souris)-270
-1097 y Ff(visiter)13 b(le)h(\014c)o(hier)546 b Fc(Mouse_Button_2)-270
-1145 y Ff(ouvrir)13 b(un)g(men)o(u)469 b Fc(Control-Mouse_Button)q(_3)
--270 1257 y Fd(Actions)22 b(immedi)o(ates)e(sur)k(les)d(\014c)n(hiers)
--270 1353 y Ff(visiter)13 b(le)h(\014c)o(hier)e(couran)o(t)478
-b Fc(f)-270 1401 y Ff(visualiser)12 b(le)i(\014c)o(hier)e(couran)o(t)
-421 b Fc(v)-270 1449 y Ff(visiter)13 b(le)h(\014c)o(hier)e(couran)o(t)h
-(dans)g(une)g(autre)h(fen)o(^)-20 b(etre)48 b Fc(o)-270
-1497 y Ff(visiter)13 b(le)h(\014c)o(hier)e(couran)o(t)h(dans)g(un)g
-(autre)h(cadre)94 b Fc(w)-270 1544 y Ff(a\016c)o(her)13
-b(le)h(\014c)o(hier)e(couran)o(t)459 b Fc(C-u)22 b(o)-270
-1592 y Ff(cr)o(\023)-20 b(eer)13 b(un)g(nouv)o(eau)g(sous-r)o(\023)-20
-b(ep)q(ertoire)311 b Fc(+)-270 1640 y Ff(comparer)12
-b(le)i(\014c)o(hier)e(sous)i(le)g(p)q(oin)o(t)f(a)o(v)o(ec)i(celui)e
-(sous)-270 1688 y(la)h(marque)648 1640 y Fc(=)-270 1806
-y Fd(Marquer)24 b(et)e(^)-34 b(oter)23 b(les)f(marques)h(des)g(\014c)n
-(hiers)-270 1902 y Ff(marquer)17 b(un)h(\014c)o(hier)e(ou)j(un)f
-(sous-r)o(\023)-20 b(ep)q(ertoire)16 b(p)q(our)-270 1950
-y(de)d(futures)g(commandes)648 1902 y Fc(m)-270 1981
-y Ff(^)-21 b(oter)11 b(la)g(marque)e(d'un)g(\014c)o(hier)g(ou)h(de)g
-(tous)h(les)f(\014c)o(hiers)-270 2029 y(d'un)i(sous-r)o(\023)-20
-b(ep)q(ertoire)648 1981 y Fc(u)-270 2068 y Ff(^)f(oter)14
-b(la)g(marque)e(de)i(tous)f(les)h(\014c)o(hiers)d(d'un)h(tamp)q(on)42
-b Fc(M-delete)-270 2116 y Ff(marquer)11 b(les)h(\014c)o(hiers)e(a)o(y)o
-(an)o(t)j(une)e(extension)h(donn)o(\023)-20 b(ee)41 b
-Fc(*)21 b(.)-270 2164 y Ff(marquer)12 b(tous)i(les)g(sous-r)o(\023)-20
-b(ep)q(ertoires)304 b Fc(*)21 b(/)-270 2212 y Ff(marquer)12
-b(tous)i(les)g(liens)e(sym)o(b)q(oliques)274 b Fc(*)21
-b(@)-270 2260 y Ff(marquer)12 b(tous)i(les)g(ex)o(\023)-20
-b(ecutables)384 b Fc(*)21 b(*)-270 2308 y Ff(in)o(v)o(erser)12
-b(le)h(marquage)536 b Fc(*)21 b(t)-270 2355 y Ff(marquer)8
-b(tous)h(les)g(\014c)o(hiers)d(du)j(sous-r)o(\023)-20
-b(ep)q(ertoire)7 b(couran)o(t)p 696 2363 25 36 v -7 w
-Fc(*)21 b(s)-270 2403 y Ff(marquer)8 b(les)h(\014c)o(hiers)f(don)o(t)h
-(les)g(noms)g(corresp)q(onden)n(t)-270 2451 y(\022)-21
-b(a)14 b(une)f(expression)f(rationnelle)648 2403 y Fc(*)21
-b(\045)-270 2490 y Ff(mo)q(di\014er)12 b(les)h(marques)g(par)g(un)g
-(caract)o(\022)-20 b(ere)13 b(di\013)o(\023)-20 b(eren)o(t)50
-b Fc(*)21 b(c)-270 2538 y Ff(marquer)9 b(les)h(\014c)o(hiers)e(p)q(our)
-h(lesquels)g(une)h(expression)-270 2586 y(Elisp)j(ren)o(v)o(oie)f(t)648
-2538 y Fc(*)21 b(\()p Fe(\(D)o(X\))1120 -218 y Fd(Obtenir)g(de)i
-(l'aide)1120 -119 y Ff(aide)13 b(sur)g(dired)662 b Fc(h)1120
--71 y Ff(r)o(\023)-20 b(esum)o(\023)g(e)9 b(de)i(dired)e(\(aide)j
-(succin)o(te\))e(et)i(trace)f(d'erreur)40 b Fc(?)1120
-53 y Fd(Commandes)29 b(sur)h(les)f(\014c)n(hiers)g(marqu)o(\023)-33
-b(es)30 b(ou)1120 110 y(sp)o(\023)-33 b(eci\014)o(\023)g(es)21
-b(par)j(le)d(pr)o(\023)-33 b(e\014xe)1120 209 y Ff(copier)12
-b(le\(s\))j(\014c)o(hier\(s\))536 b Fc(C)1120 257 y Ff(renommer)6
-b(un)i(\014c)o(hier)g(ou)h(d)o(\023)-20 b(eplacer)7 b(des)h(\014c)o
-(hiers)f(dans)p 2043 265 V 1120 305 a(un)13 b(autre)g(r)o(\023)-20
-b(ep)q(ertoire)2038 257 y Fc(R)1120 346 y Ff(c)o(hanger)12
-b(le)i(propri)o(\023)-20 b(etaire)11 b(d'un)i(\(des\))h(\014c)o
-(hier\(s\))121 b Fc(O)1120 394 y Ff(c)o(hanger)12 b(le)i(group)q(e)f
-(d'un)f(\(des\))i(\014c)o(hier\(s\))212 b Fc(G)1120 442
-y Ff(c)o(hanger)12 b(le)i(mo)q(de)f(d'un)f(\(des\))i(\014c)o(hier\(s\))
-238 b Fc(M)1120 490 y Ff(imprimer)10 b(le\(s\))k(\014c)o(hier\(s\))478
-b Fc(P)1120 538 y Ff(con)o(v)o(ertir)8 b(le\(s\))h(nom\(s\))g(de)g
-(\014c)o(hier\(s\))f(en)h(min)o(uscules)39 b Fc(\045)21
-b(l)1120 586 y Ff(con)o(v)o(ertir)f(le\(s\))i(nom\(s\))f(de)g(\014c)o
-(hier\(s\))f(en)h(ma)r(jus-)1120 633 y(cules)2038 586
-y Fc(\045)g(u)1120 667 y Ff(supprim)o(er)13 b(les)i(\014c)o(hiers)f
-(marqu)o(\023)-20 b(es)14 b(\(pas)i(ceux)g(a)o(y)o(an)o(t)1120
-715 y(un)d(`\015ag'\))2038 667 y Fc(X)1120 759 y Ff(uuenco)q(der)e(ou)j
-(uudeco)q(der)d(le\(s\))k(\014c)o(hier\(s\))195 b Fc(U)1120
-807 y Ff(compresser)11 b(ou)i(d)o(\023)-20 b(ecompacter)12
-b(le\(s\))j(\014c)o(hier\(s\))138 b Fc(Z)1120 855 y Ff(lancer)12
-b(info)i(sur)f(le)g(\014c)o(hier)481 b Fc(I)p Fe(\(D)o(X\))1120
-902 y Ff(cr)o(\023)-20 b(eer)12 b(un)h(\(des\))h(lien\(s\))g(sym)o(b)q
-(olique\(s\))260 b Fc(S)1120 950 y Ff(cr)o(\023)-20 b(eer)12
-b(des)h(liens)g(sym)o(b)q(oliques)f(relatifs)280 b Fc(Y)1120
-998 y Ff(cr)o(\023)-20 b(eer)12 b(un)h(\(des\))h(liens)f(ph)o
-(ysique\(s\))339 b Fc(H)1120 1046 y Ff(rec)o(herc)o(he)o(r)15
-b(une)j(expression)e(rationnelle)h(dans)g(des)1120 1094
-y(\014c)o(hiers)2038 1046 y Fc(A)1120 1125 y Ff(remplacer)6
-b(in)o(teractiv)o(emen)o(t)i(une)g(expression)f(rationnelle)p
-2119 1133 V -40 w Fc(Q)1120 1173 y Ff(b)o(yte-compiler)k(des)j(\014c)o
-(hiers)448 b Fc(B)1120 1221 y Ff(c)o(harger)12 b(le\(s\))i(\014c)o
-(hier\(s\))512 b Fc(L)1120 1269 y Ff(lancer)12 b(une)h(commande)f
-(shell)h(sur)g(le\(s\))h(\014c)o(hier\(s\))77 b Fc(!)1120
-1393 y Fd(Mettre)22 b(un)h(\015ag)h(sur)f(les)f(\014c)n(hiers)f(\022)
--34 b(a)24 b(d)o(\023)-33 b(etruire)1120 1475 y Fe(Les)17
-b(commandes)d(qui)i(^)-24 b(oten)o(t)17 b(les)f(marquen)o(t)f
-(supprimen)o(t)g(les)i(\015ags)g(de)f(suppression)1120
-1540 y Ff(placer)c(un)h(\015ag)h(de)g(suppression)c(sur)j(le)h(\014c)o
-(hier)140 b Fc(d)1120 1588 y Ff(sauv)o(egarder)12 b(et)i(supprimer)c
-(le)k(\015ag)f(de)h(suppression)39 b Fc(delete)1120 1636
-y Ff(placer)10 b(un)h(\015ag)h(sur)f(tous)h(les)g(\014c)o(hiers)d(de)j
-(sauv)o(egarde)1120 1683 y(\(don)o(t)i(les)f(noms)g(se)h(terminen)o(t)e
-(par)h(~\))2038 1636 y Fc(~)1120 1725 y Ff(placer)d(un)h(\015ag)h(sur)f
-(tous)h(les)g(\014c)o(hiers)d(de)j(sauv)o(egarde)1120
-1773 y(automatique)2038 1725 y Fc(#)1120 1812 y Ff(placer)c(un)g
-(\015ag)h(sur)f(les)h(di\013)o(\023)-20 b(eren)o(ts)7
-b(\014c)o(hiers)g(in)o(term)o(\023)-20 b(ediaires)p 2114
-1820 V -37 w Fc(&)1120 1860 y Ff(placer)18 b(un)h(\015ag)h(sur)f(les)g
-(sauv)o(egardes)g(n)o(um)o(\023)-20 b(erot)o(\023)g(ees)1120
-1908 y(\(\014nissan)o(t)12 b(par)i(.~1~,)g(.~2~,)g(etc.\))2038
-1860 y Fc(.)1120 1952 y Ff(ex)o(\023)-20 b(ecuter)8 b(les)h
-(suppression)o(s)d(demand)o(\023)-20 b(ees)7 b(\(\014c)o(hiers)g(a)o(y)
-o(an)o(t)p 2086 1962 25 40 v 1120 2000 a(un)13 b(\015ag\))2038
-1952 y Fc(x)1120 2041 y Ff(placer)18 b(un)g(\015ag)i(sur)e(les)h(\014c)
-o(hiers)e(corresp)q(ondan)o(t)g(\022)-21 b(a)1120 2089
-y(une)13 b(expression)f(rationnelle)2038 2041 y Fc(\045)21
-b(d)954 3362 y Ff(1)p eop
+1 0 bop -273 -364 a Fg(Carte)46 b(de)g(r)m(\023)-66 b(ef)m(\023)g
+(erence)46 b(de)g(Dired)-8 -256 y Ff(\(bas)n(\023)-33
+b(e)25 b(sur)e(Dired)g(de)h(GNU)f(Emacs)g(21.x\))-342
+-176 y(Les)h(commandes)e(marqu)n(\023)-33 b(ees)24 b(par)f
+Fe(\(D)n(X\))k(n)n(\023)-39 b(ecessiten)n(t)27 b(dired-x)-450
+24 y Fd(Lancer)37 b(et)g(sortir)i(de)e(Dired)-450 184
+y Ff(lancer)24 b(dired)1165 b Fc(C-x)36 b(d)-452 264
+y Ff(\023)-33 b(edite)20 b(le)e(r)n(\023)-33 b(ep)r(ertoire)19
+b(du)g(\014c)n(hier)f(que)i(l'on)e(est)h(en)g(train)-450
+344 y(d')n(\023)-33 b(editer)1080 264 y Fc(C-x)36 b(C-j)p
+Fe(\(D)n(X\))-450 396 y Ff(quitter)24 b(dired)1140 b
+Fc(q)-450 594 y Fd(Commandes)38 b(de)f(d)n(\023)-55 b(eplacemen)m(t)
+-450 755 y Ff(ligne)24 b(pr)n(\023)-33 b(ec)n(\023)g(eden)n(te)1036
+b Fc(p)-450 834 y Ff(ligne)24 b(suiv)l(an)n(te)1111 b
+Fc(n)-450 914 y Ff(ligne)24 b(de)g(r)n(\023)-33 b(ep)r(ertoire)23
+b(pr)n(\023)-33 b(ec)n(\023)g(eden)n(te)619 b Fc(<)-450
+994 y Ff(ligne)24 b(de)g(r)n(\023)-33 b(ep)r(ertoire)23
+b(suiv)l(an)n(te)694 b Fc(>)-450 1073 y Ff(\014c)n(hier)24
+b(marqu)n(\023)-33 b(e)23 b(suiv)l(an)n(t)848 b Fc(M-})-450
+1153 y Ff(\014c)n(hier)24 b(marqu)n(\023)-33 b(e)23 b(pr)n(\023)-33
+b(ec)n(\023)g(eden)n(t)773 b Fc(M-{)-450 1233 y Ff(sous-r)n(\023)-33
+b(ep)r(ertoire)23 b(pr)n(\023)-33 b(ec)n(\023)g(eden)n(t)759
+b Fc(M-C-p)-450 1312 y Ff(sous-r)n(\023)-33 b(ep)r(ertoire)23
+b(suiv)l(an)n(t)834 b Fc(M-C-n)-450 1392 y Ff(r)n(\023)-33
+b(ep)r(ertoire)24 b(p)n(\022)-33 b(ere)1077 b Fc(^)-450
+1472 y Ff(premier)22 b(sous-r)n(\023)-33 b(ep)r(ertoire)817
+b Fc(M-C-d)-450 1668 y Fd(Commandes)38 b(a)m(v)m(ec)f(la)h(souris)-450
+1828 y Ff(visiter)23 b(le)h(\014c)n(hier)914 b Fc(Mouse_Button_2)-450
+1908 y Ff(ouvrir)23 b(un)h(men)n(u)785 b Fc(Control-Mouse_Button_3)-450
+2095 y Fd(Actions)37 b(immediates)g(sur)h(les)g(\014c)m(hiers)-450
+2255 y Ff(visiter)23 b(le)h(\014c)n(hier)f(couran)n(t)800
+b Fc(f)-450 2335 y Ff(visualiser)23 b(le)g(\014c)n(hier)h(couran)n(t)
+705 b Fc(v)-450 2415 y Ff(visiter)23 b(le)h(\014c)n(hier)f(couran)n(t)i
+(dans)f(une)h(autre)f(fen)n(^)-33 b(etre)83 b Fc(o)-450
+2494 y Ff(visiter)23 b(le)h(\014c)n(hier)f(couran)n(t)i(dans)f(un)g
+(autre)h(cadre)159 b Fc(w)-450 2574 y Ff(a\016c)n(her)24
+b(le)g(\014c)n(hier)f(couran)n(t)769 b Fc(C-u)36 b(o)-450
+2654 y Ff(cr)n(\023)-33 b(eer)24 b(un)g(nouv)n(eau)h(sous-r)n(\023)-33
+b(ep)r(ertoire)523 b Fc(+)-450 2733 y Ff(comparer)23
+b(le)h(\014c)n(hier)g(sous)g(le)g(p)r(oin)n(t)h(a)n(v)n(ec)g(celui)f
+(sous)-450 2813 y(la)f(marque)1080 2733 y Fc(=)-450 3009
+y Fd(Marquer)38 b(et)f(^)-57 b(oter)38 b(les)f(marques)i(des)e(\014c)m
+(hiers)-450 3170 y Ff(marquer)30 b(un)i(\014c)n(hier)g(ou)f(un)h
+(sous-r)n(\023)-33 b(ep)r(ertoire)31 b(p)r(our)-450 3249
+y(de)24 b(futures)g(commandes)1080 3170 y Fc(m)-450 3302
+y Ff(^)-35 b(oter)19 b(la)f(marque)f(d'un)h(\014c)n(hier)h(ou)f(de)h
+(tous)f(les)g(\014c)n(hiers)-450 3382 y(d'un)24 b(sous-r)n(\023)-33
+b(ep)r(ertoire)1080 3302 y Fc(u)-450 3447 y Ff(^)e(oter)24
+b(la)f(marque)g(de)g(tous)h(les)f(\014c)n(hiers)h(d'un)f(tamp)r(on)71
+b Fc(M-delete)-450 3527 y Ff(marquer)20 b(les)h(\014c)n(hiers)g(a)n(y)n
+(an)n(t)i(une)f(extension)h(donn)n(\023)-33 b(ee)72 b
+Fc(*)36 b(.)-450 3607 y Ff(marquer)22 b(tous)j(les)e(sous-r)n(\023)-33
+b(ep)r(ertoires)512 b Fc(*)36 b(/)-450 3686 y Ff(marquer)22
+b(tous)j(les)e(liens)g(sym)n(b)r(oliques)459 b Fc(*)36
+b(@)-450 3766 y Ff(marquer)22 b(tous)j(les)e(ex)n(\023)-33
+b(ecutables)645 b Fc(*)36 b(*)-450 3846 y Ff(in)n(v)n(erser)23
+b(le)h(marquage)894 b Fc(*)36 b(t)-450 3926 y Ff(marquer)15
+b(tous)h(les)g(\014c)n(hiers)f(du)h(sous-r)n(\023)-33
+b(ep)r(ertoire)16 b(couran)n(t)p 1160 3939 42 60 v -8
+w Fc(*)36 b(s)-450 4005 y Ff(marquer)15 b(les)i(\014c)n(hiers)f(don)n
+(t)i(les)e(noms)g(corresp)r(onden)n(t)-450 4085 y(\022)-35
+b(a)24 b(une)g(expression)g(rationnelle)1080 4005 y Fc(*)36
+b(\045)-450 4151 y Ff(mo)r(di\014er)22 b(les)i(marques)f(par)g(un)h
+(caract)n(\022)-33 b(ere)25 b(di\013)n(\023)-33 b(eren)n(t)87
+b Fc(*)36 b(c)-450 4230 y Ff(marquer)17 b(les)g(\014c)n(hiers)h(p)r
+(our)g(lesquels)g(une)g(expression)-450 4310 y(Elisp)23
+b(ren)n(v)n(oie)h(t)1080 4230 y Fc(*)36 b(\()p Fe(\(D)n(X\))1866
+-364 y Fd(Obtenir)h(de)g(l'aide)1866 -198 y Ff(aide)24
+b(sur)f(dired)1106 b Fc(h)1866 -119 y Ff(r)n(\023)-33
+b(esum)n(\023)g(e)18 b(de)i(dired)f(\(aide)i(succin)n(te\))g(et)f
+(trace)g(d'erreur)70 b Fc(?)1866 88 y Fd(Commandes)50
+b(sur)g(les)f(\014c)m(hiers)g(marqu)n(\023)-55 b(es)50
+b(ou)1866 183 y(sp)n(\023)-55 b(eci\014)n(\023)g(es)37
+b(par)g(le)h(pr)n(\023)-55 b(e\014xe)1866 349 y Ff(copier)24
+b(le\(s\))g(\014c)n(hier\(s\))897 b Fc(C)1866 428 y Ff(renommer)14
+b(un)i(\014c)n(hier)g(ou)g(d)n(\023)-33 b(eplacer)16
+b(des)g(\014c)n(hiers)g(dans)p 3404 441 V 1866 508 a(un)24
+b(autre)g(r)n(\023)-33 b(ep)r(ertoire)3396 428 y Fc(R)1866
+577 y Ff(c)n(hanger)25 b(le)e(propri)n(\023)-33 b(etaire)24
+b(d'un)f(\(des\))i(\014c)n(hier\(s\))205 b Fc(O)1866
+657 y Ff(c)n(hanger)25 b(le)e(group)r(e)i(d'un)e(\(des\))i(\014c)n
+(hier\(s\))356 b Fc(G)1866 737 y Ff(c)n(hanger)25 b(le)e(mo)r(de)g
+(d'un)h(\(des\))h(\014c)n(hier\(s\))399 b Fc(M)1866 817
+y Ff(imprimer)20 b(le\(s\))k(\014c)n(hier\(s\))799 b
+Fc(P)1866 896 y Ff(con)n(v)n(ertir)16 b(le\(s\))h(nom\(s\))f(de)g
+(\014c)n(hier\(s\))h(en)f(min)n(uscules)70 b Fc(\045)36
+b(l)1866 976 y Ff(con)n(v)n(ertir)h(le\(s\))g(nom\(s\))f(de)g(\014c)n
+(hier\(s\))i(en)e(ma)t(jus-)1866 1056 y(cules)3396 976
+y Fc(\045)g(u)1866 1112 y Ff(supprimer)25 b(les)i(\014c)n(hiers)g
+(marqu)n(\023)-33 b(es)26 b(\(pas)i(ceux)g(a)n(y)n(an)n(t)1866
+1192 y(un)c(`\015ag'\))3396 1112 y Fc(X)1866 1265 y Ff(uuenco)r(der)h
+(ou)f(uudeco)r(der)h(le\(s\))g(\014c)n(hier\(s\))328
+b Fc(U)1866 1345 y Ff(compresser)23 b(ou)h(d)n(\023)-33
+b(ecompacter)24 b(le\(s\))h(\014c)n(hier\(s\))233 b Fc(Z)1866
+1424 y Ff(lancer)24 b(info)f(sur)g(le)h(\014c)n(hier)804
+b Fc(I)p Fe(\(D)n(X\))1866 1504 y Ff(cr)n(\023)-33 b(eer)24
+b(un)g(\(des\))g(lien\(s\))g(sym)n(b)r(olique\(s\))435
+b Fc(S)1866 1584 y Ff(cr)n(\023)-33 b(eer)24 b(des)g(liens)f(sym)n(b)r
+(oliques)f(relatifs)467 b Fc(Y)1866 1663 y Ff(cr)n(\023)-33
+b(eer)24 b(un)g(\(des\))g(liens)g(ph)n(ysique\(s\))567
+b Fc(H)1866 1743 y Ff(rec)n(herc)n(her)32 b(une)f(expression)g
+(rationnelle)h(dans)f(des)1866 1823 y(\014c)n(hiers)3396
+1743 y Fc(A)1866 1876 y Ff(remplacer)15 b(in)n(teractiv)n(emen)n(t)i
+(une)f(expression)g(rationnelle)p 3531 1889 V -64 w Fc(Q)1866
+1955 y Ff(b)n(yte-compiler)23 b(des)h(\014c)n(hiers)751
+b Fc(B)1866 2035 y Ff(c)n(harger)24 b(le\(s\))g(\014c)n(hier\(s\))856
+b Fc(L)1866 2115 y Ff(lancer)24 b(une)g(commande)f(shell)g(sur)g
+(le\(s\))h(\014c)n(hier\(s\))132 b Fc(!)1866 2322 y Fd(Mettre)36
+b(un)i(\015ag)g(sur)g(les)g(\014c)m(hiers)e(\022)-56
+b(a)37 b(d)n(\023)-55 b(etruire)1866 2458 y Fe(Les)27
+b(commandes)e(qui)i(^)-41 b(oten)n(t)26 b(les)h(marquen)n(t)e
+(supprimen)n(t)h(les)h(\015ags)g(de)h(suppression)1866
+2567 y Ff(placer)c(un)g(\015ag)g(de)g(suppression)g(sur)f(le)g(\014c)n
+(hier)237 b Fc(d)1866 2646 y Ff(sauv)n(egarder)24 b(et)h(supprimer)c
+(le)i(\015ag)h(de)g(suppression)71 b Fc(delete)1866 2726
+y Ff(placer)21 b(un)f(\015ag)h(sur)f(tous)h(les)f(\014c)n(hiers)g(de)h
+(sauv)n(egarde)1866 2806 y(\(don)n(t)k(les)e(noms)g(se)h(terminen)n(t)f
+(par)h(~\))3396 2726 y Fc(~)1866 2875 y Ff(placer)d(un)f(\015ag)h(sur)f
+(tous)h(les)f(\014c)n(hiers)g(de)h(sauv)n(egarde)1866
+2955 y(automatique)3396 2875 y Fc(#)1866 3021 y Ff(placer)16
+b(un)g(\015ag)h(sur)e(les)g(di\013)n(\023)-33 b(eren)n(ts)17
+b(\014c)n(hiers)e(in)n(term)n(\023)-33 b(ediaires)p 3523
+3034 V -57 w Fc(&)1866 3100 y Ff(placer)34 b(un)g(\015ag)g(sur)f(les)g
+(sauv)n(egardes)i(n)n(um)n(\023)-33 b(erot)n(\023)g(ees)1866
+3180 y(\(\014nissan)n(t)25 b(par)e(.~1~,)h(.~2~,)f(etc.\))3396
+3100 y Fc(.)1866 3253 y Ff(ex)n(\023)-33 b(ecuter)18
+b(les)d(suppressions)h(demand)n(\023)-33 b(ees)16 b(\(\014c)n(hiers)g
+(a)n(y)n(an)n(t)p 3476 3270 42 67 v 1866 3333 a(un)24
+b(\015ag\))3396 3253 y Fc(x)1866 3402 y Ff(placer)33
+b(un)g(\015ag)g(sur)g(les)f(\014c)n(hiers)h(corresp)r(ondan)n(t)h(\022)
+-35 b(a)1866 3482 y(une)24 b(expression)g(rationnelle)3396
+3402 y Fc(\045)36 b(d)1590 5603 y Ff(1)p eop
 %%Page: 2 2
-2 1 bop -270 -218 a Fd(Mo)r(di\014er)23 b(le)e(tamp)r(on)i(Dired)-270
--119 y Ff(ins)o(\023)-20 b(erer)12 b(un)h(sous-r)o(\023)-20
-b(ep)q(ertoire)11 b(dans)i(ce)h(tamp)q(on)140 b Fc(i)-270
--71 y Ff(supprimer)10 b(les)k(\014c)o(hiers)d(marqu)o(\023)-20
-b(es)13 b(de)g(la)h(liste)166 b Fc(k)-270 -23 y Ff(supprimer)10
-b(le)k(listing)f(d'un)g(sous-r)o(\023)-20 b(ep)q(ertoire)174
-b Fc(C-u)22 b(k)-270 24 y Ff(relire)d(tous)i(les)g(r)o(\023)-20
-b(ep)q(ertoires)19 b(\(conserv)o(e)h(toutes)h(les)-270
-72 y(marques\))648 24 y Fc(g)-270 116 y Ff(bascule)8
-b(le)h(tri)g(sur)f(le)h(nom/date)g(du)f(r)o(\023)-20
-b(ep)q(ertoire)7 b(couran)o(t)p 693 126 25 40 v -3 w
-Fc(s)-271 164 y Ff(\023)-20 b(edite)14 b(les)f(options)g(de)h(ls)519
-b Fc(C-u)22 b(s)-270 212 y Ff(r)o(\023)-20 b(ecup)o(\022)g(ere)11
-b(les)j(marques,)e(les)h(lignes)g(cac)o(h)o(\023)-20
-b(ees,)13 b(etc.)100 b Fc(C-_)-270 259 y Ff(cac)o(he)13
-b(tous)h(les)f(sous-r)o(\023)-20 b(ep)q(ertoires)359
-b Fc(M-$)-270 307 y Ff(cac)o(he)13 b(ou)h(fait)g(appara)-5
-b(^)-16 b(\020tre)13 b(le)h(sous-r)o(\023)-20 b(ep)q(ertoire)144
-b Fc($)-270 429 y Fd(Commandes)14 b(sur)i(les)e(expressions)h
-(rationnelles)p 1017 441 25 54 v -270 528 a Ff(marquer)k(les)h(noms)f
-(de)h(\014c)o(hiers)e(corresp)q(ondan)o(t)g(\022)-21
-b(a)-270 576 y(une)13 b(expression)f(rationnelle)648
-528 y Fc(\045)21 b(m)-270 616 y Ff(copier)d(les)h(\014c)o(hiers)e
-(marqu)o(\023)-20 b(es)18 b(par)h(une)g(expression)-270
-664 y(rationnelle)648 616 y Fc(\045)i(C)-270 695 y Ff(renommer)14
-b(les)i(\014c)o(hiers)f(marqu)o(\023)-20 b(es)15 b(par)h(une)g(expres-)
--270 743 y(sion)d(rationnelle)648 695 y Fc(\045)21 b(R)-270
-775 y Ff(lien)13 b(ph)o(ysique)675 b Fc(\045)21 b(H)-270
-822 y Ff(lien)13 b(sym)o(b)q(olique)629 b Fc(\045)21
-b(S)-270 870 y Ff(lien)13 b(sym)o(b)q(olique)f(a)o(v)o(ec)i(c)o(hemin)e
-(relatif)269 b Fc(\045)21 b(Y)-270 918 y Ff(marquer)12
-b(p)q(our)h(une)g(suppression)354 b Fc(\045)21 b(d)-270
-1040 y Fd(Dired)h(et)g(Find)-270 1139 y Ff(\014c)o(hier\(s\))11
-b(dired)g(don)o(t)h(le)g(nom)g(corresp)q(ond)e(\022)-21
-b(a)13 b(un)e(motif)-117 b Fc(M-x)21 b(find-names-dired)-270
-1187 y Ff(\014c)o(hier\(s\))13 b(dired)f(con)o(tenan)o(t)h(un)g(motif)
-184 b Fc(M-x)21 b(find-grep-dired)-270 1235 y Ff(\014c)o(hier\(s\))13
-b(dired)f(bas)o(\023)-20 b(es)13 b(sur)g(ce)g(que)h(pro)q(duit)f
-Fc(find)q(M-x)22 b(find-dired)-58 1903 y Fb(Cop)o(yrigh)o(t)124
-1902 y(c)114 1903 y Fa(\015)12 b Fb(2000)h(F)m(ree)h(Soft)o(w)o(are)h
-(F)m(oundation,)g(Inc.)-21 1941 y(conception)h(de)d(Stephen)h(Gildea,)g
-(Mai)f(2000)g(v0.1)-39 1980 y(p)q(our)h(GNU)e(Emacs)h(v)o(ersion)h(19)f
-(sur)g(syst)o(\022)-17 b(emes)12 b(Unix)-139 2018 y(Mis)g(\022)-18
-b(a)13 b(jour)h(p)q(our)f(Dired)i(en)d(Mai)h(200)h(par)f(Evgen)o(y)h
-(Roubinc)o(h)o(tei)q(n)46 2056 y(T)m(raduction)h(fran\030)-16
-b(caise)15 b(d')421 2048 y(\023)418 2056 y(Eric)f(Jacob)q(oni)-270
-2111 y(V)m(ous)g(p)q(ouv)o(ez)h(faire)h(et)e(distribuer)i(des)e(copies)
-h(de)f(cette)i(carte,)f(p)q(ourvu)g(que)g(la)f(no-)-270
-2150 y(tice)g(de)f(cop)o(yrigh)o(t)j(et)d(cette)h(note)g(de)f(p)q
-(ermission)h(soien)o(t)g(pr)o(\023)-17 b(eserv)o(\023)g(ees)14
-b(sur)f(toutes)h(les)-270 2188 y(copies.)-270 2243 y(P)o(our)e(obtenir)
-h(des)e(copies)g(du)g(man)o(uel)h(de)g(GNU)e(Emacs,)g(\023)-17
-b(ecriv)o(ez)13 b(\022)-18 b(a)11 b(la)g(F)m(ree)i(Soft)o(w)o(are)-270
-2282 y(F)m(oundation,)i(Inc.,)d(675)i(Massac)o(h)o(usetts)e(Av)o(e,)h
-(Cam)o(bridge)h(MA)e(02139.)954 3362 y Ff(2)p eop
+2 1 bop -450 -364 a Fd(Mo)s(di\014er)37 b(le)h(tamp)s(on)f(Dired)-450
+-198 y Ff(ins)n(\023)-33 b(erer)23 b(un)h(sous-r)n(\023)-33
+b(ep)r(ertoire)23 b(dans)h(ce)g(tamp)r(on)235 b Fc(i)-450
+-119 y Ff(supprimer)22 b(les)h(\014c)n(hiers)h(marqu)n(\023)-33
+b(es)22 b(de)j(la)e(liste)277 b Fc(k)-450 -39 y Ff(supprimer)22
+b(le)h(listing)g(d'un)h(sous-r)n(\023)-33 b(ep)r(ertoire)295
+b Fc(C-u)36 b(k)-450 41 y Ff(relire)e(tous)i(les)f(r)n(\023)-33
+b(ep)r(ertoires)36 b(\(conserv)n(e)h(toutes)g(les)-450
+120 y(marques\))1080 41 y Fc(g)-450 193 y Ff(bascule)17
+b(le)e(tri)g(sur)h(le)f(nom/date)i(du)f(r)n(\023)-33
+b(ep)r(ertoire)16 b(couran)n(t)p 1155 210 42 67 v -3
+w Fc(s)-452 273 y Ff(\023)-33 b(edite)25 b(les)e(options)h(de)g(ls)866
+b Fc(C-u)36 b(s)-450 353 y Ff(r)n(\023)-33 b(ecup)n(\022)g(ere)24
+b(les)g(marques,)e(les)h(lignes)h(cac)n(h)n(\023)-33
+b(ees,)25 b(etc.)168 b Fc(C-_)-450 432 y Ff(cac)n(he)25
+b(tous)f(les)g(sous-r)n(\023)-33 b(ep)r(ertoires)602
+b Fc(M-$)-450 512 y Ff(cac)n(he)25 b(ou)f(fait)g(appara)-8
+b(^)-27 b(\020tre)24 b(le)f(sous-r)n(\023)-33 b(ep)r(ertoire)245
+b Fc($)-450 715 y Fd(Commandes)25 b(sur)h(les)f(expressions)g
+(rationnelles)p 1694 735 42 89 v -450 881 a Ff(marquer)33
+b(les)i(noms)e(de)i(\014c)n(hiers)g(corresp)r(ondan)n(t)h(\022)-35
+b(a)-450 961 y(une)24 b(expression)g(rationnelle)1080
+881 y Fc(\045)36 b(m)-450 1026 y Ff(copier)d(les)g(\014c)n(hiers)g
+(marqu)n(\023)-33 b(es)32 b(par)g(une)i(expression)-450
+1106 y(rationnelle)1080 1026 y Fc(\045)i(C)-450 1159
+y Ff(renommer)26 b(les)i(\014c)n(hiers)h(marqu)n(\023)-33
+b(es)27 b(par)h(une)h(expres-)-450 1238 y(sion)23 b(rationnelle)1080
+1159 y Fc(\045)36 b(R)-450 1291 y Ff(lien)23 b(ph)n(ysique)1129
+b Fc(\045)36 b(H)-450 1371 y Ff(lien)23 b(sym)n(b)r(olique)1051
+b Fc(\045)36 b(S)-450 1451 y Ff(lien)23 b(sym)n(b)r(olique)g(a)n(v)n
+(ec)i(c)n(hemin)e(relatif)449 b Fc(\045)36 b(Y)-450 1530
+y Ff(marquer)22 b(p)r(our)i(une)g(suppression)596 b Fc(\045)36
+b(d)-450 1733 y Fd(Dired)h(et)g(Find)-450 1899 y Ff(\014c)n(hier\(s\))
+22 b(dired)f(don)n(t)h(le)f(nom)g(corresp)r(ond)g(\022)-35
+b(a)22 b(un)f(motif)-197 b Fc(M-x)36 b(find-names-dired)-450
+1979 y Ff(\014c)n(hier\(s\))25 b(dired)e(con)n(tenan)n(t)j(un)e(motif)
+306 b Fc(M-x)36 b(find-grep-dired)-450 2058 y Ff(\014c)n(hier\(s\))25
+b(dired)e(bas)n(\023)-33 b(es)24 b(sur)f(ce)h(que)h(pro)r(duit)f
+Fc(find)r(M-x)36 b(find-dired)-97 3172 y Fb(Cop)n(yrigh)n(t)206
+3170 y(c)189 3172 y Fa(\015)21 b Fb(2000)i(F)-5 b(ree)21
+b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 b(Inc.)-34 3235
+y(conception)g(de)h(Stephen)f(Gildea,)f(Mai)i(2000)i(v0.1)-64
+3299 y(p)r(our)d(GNU)g(Emacs)h(v)n(ersion)g(19)h(sur)f(syst)n(\022)-29
+b(emes)23 b(Unix)-231 3363 y(Mis)d(\022)-30 b(a)22 b(jour)f(p)r(our)f
+(Dired)g(en)g(Mai)h(200)h(par)f(Evgen)n(y)g(Roubinc)n(h)n(tein)77
+3427 y(T)-5 b(raduction)21 b(fran\030)-27 b(caise)22
+b(d')703 3414 y(\023)698 3427 y(Eric)d(Jacob)r(oni)-450
+3519 y(V)-5 b(ous)23 b(p)r(ouv)n(ez)g(faire)g(et)g(distribuer)f(des)h
+(copies)g(de)g(cette)g(carte,)h(p)r(ourvu)e(que)g(la)h(no-)-450
+3583 y(tice)e(de)g(cop)n(yrigh)n(t)g(et)g(cette)h(note)f(de)g(p)r
+(ermission)f(soien)n(t)h(pr)n(\023)-29 b(eserv)n(\023)g(ees)25
+b(sur)20 b(toutes)i(les)-450 3647 y(copies.)-450 3739
+y(P)n(our)c(obtenir)f(des)h(copies)g(du)f(man)n(uel)g(de)h(GNU)f
+(Emacs,)g(\023)-29 b(ecriv)n(ez)19 b(\022)-30 b(a)18
+b(la)g(F)-5 b(ree)18 b(Soft)n(w)n(are)-450 3803 y(F)-5
+b(oundation,)20 b(Inc.,)g(675)i(Massac)n(h)n(usetts)i(Av)n(e,)c(Cam)n
+(bridge)h(MA)g(02139.)1590 5603 y Ff(2)p eop
 %%Trailer
 end
 userdict /end-hook known{end-hook}if
diff -ruN src-21.1/etc/fr-drdref.tex src-21.2/etc/fr-drdref.tex
--- src-21.1/etc/fr-drdref.tex	Fri Dec 29 14:26:33 2000
+++ src-21.2/etc/fr-drdref.tex	Fri Feb 22 11:51:22 2002
@@ -248,7 +248,7 @@
 
 \title{Carte de r\'ef\'erence de Dired}
 
-\centerline{(bas\'e sur Dired de GNU Emacs 20.x)}
+\centerline{(bas\'e sur Dired de GNU Emacs 21.x)}
 \centerline{Les commandes marqu\'ees par \dx{} n\'ecessitent dired-x}
 
 % trim this down to fit everything on one page
diff -ruN src-21.1/etc/fr-refcard.ps src-21.2/etc/fr-refcard.ps
--- src-21.1/etc/fr-refcard.ps	Wed Jan 31 18:24:54 2001
+++ src-21.2/etc/fr-refcard.ps	Fri Feb 22 11:51:22 2002
@@ -1,14 +1,14 @@
 %!PS-Adobe-2.0
-%%Creator: dvips(k) 5.86 Copyright 1999 Radical Eye Software
+%%Creator: dvips(k) 5.86d Copyright 1999 Radical Eye Software
 %%Title: fr-refcard.dvi
 %%Pages: 8
 %%PageOrder: Ascend
 %%BoundingBox: 0 0 596 842
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
-%DVIPSCommandLine: dvips -o fr-refcard.ps fr-refcard
-%DVIPSParameters: dpi=360, compressed
-%DVIPSSource:  TeX output 2001.01.31:1821
+%DVIPSCommandLine: dvips -o fr-refcard.ps fr-refcard.dvi
+%DVIPSParameters: dpi=600, compressed
+%DVIPSSource:  TeX output 2002.02.12:1314
 %%BeginProcSet: texc.pro
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -67,969 +67,1320 @@
 rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
 
 %%EndProcSet
-TeXDict begin 39158280 55380996 1000 360 360 (fr-refcard.dvi)
+TeXDict begin 39158280 55380996 1000 600 600 (fr-refcard.dvi)
 @start
 %DVIPSBitmapFont: Fa cmmi10 10 1
-/Fa 1 59 df<127012F8A3127005057C840E>58 D E
+/Fa 1 59 df<121C127FEAFF80A5EA7F00121C0909798817>58 D
+E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fb cmti10 10 18
-/Fb 18 122 df<EAFFF0A213E00C037C8B12>45 D<EBF8C0EA018DEA0707000E13801303
-121C123C383807001278A3EAF00EA214201430EB1C601270133C38307CC013CC380F0780
-14157B9419>97 D<EA03C0EA1F80123F1203A2EA0700A4120EA45A13F8EA1D8CEA1E0EEA
-3C0613071238130F1270A4EAE01EA3133C1338A2EA607013E0EA31C0EA1F0010237BA217
->I<137EEA01C338030180EA0703EA0E07121C003CC7FC12381278A35AA45BEA70031306
-EA301CEA1870EA0FC011157B9417>I<143CEB01F81303EB0038A21470A414E0A4EB01C0
-13F9EA018DEA0707000E13801303121C123C383807001278A3EAF00EA214201430EB1C60
-1270133C38307CC013CC380F078016237BA219>I<13F8EA038CEA0E06121C123C1238EA
-780CEAF038EAFFE0EAF000A25AA413021306EA600CEA7038EA30E0EA0F800F157A9417>
-I<EB1F18EB31B8EBE0F83801C0F01470EA03801207EB00E05AA3381E01C0A4EB0380120E
-1307EA060FEB1F00EA01E7EA0007A2130EA3EA701CEAF0185BEA60E0EA3F80151F7E9417
->103 D<13E0A21201EA00C01300A9120E1233EA2380126312C3EAC700A21207120EA35A
-A21340EA386013C0A2EA70801231EA3300121E0B227CA10F>105
-D<EA01E0EA0FC0121F1201A2EA0380A4EA0700A4120EA45AA45AA45AA212711380EAE300
-A312E61266123C0B237CA20D>108 D<391E07C07C39331861863963B03303D9E03E1380
-38C3C03CA2EB803800079038780700EB0070A3000EEBE00EA21610ED1C18261C01C01330
-15381660ED1840263803801380D81801EB0F0025157C9429>I<381C07C0382618603867
-203038C740381380A21300000F1370120EA34813E0A214E2EB01C3003813C61486EB0384
-EB018C00701388383000F018157C941C>I<137CEA01C6EA030300061380000E13C0121C
-123C12381278A338F00780A3EB0F00130EEA701E131CEA3038EA1860EA0F8012157B9419
->I<3801C0F03802631C3806740EEA0C7CEB78071370140FEA00E0A43801C01EA3143C00
-031338A2147014E038072180EB1E0090C7FCA2120EA45AA2EAFFC05B181F809419>I<EA
-1C1F382630C0EA6741EAC7C31383EB018090C7FC120EA45AA45AA45A123012157C9415>
-114 D<13FCEA0106EA0203EA0407EA0C0FA21304EA0F0013E0EA07F8EA03FCEA007C131E
-130E1270EAF00CA2EAE008EA6010EA3060EA1F8010157D9414>I<13C01201A4EA0380A4
-EA0700EAFFF8A2EA0700120EA45AA45AA213101318EA7030A2136013C0EA3180EA1E000D
-1F7C9E11>I<000F133038118070EA21C0006113E012C1EAC380A2380381C0EA0701A338
-0E0380A214841486EB070C120C000E1308EB0F18380613103803E1E017157C941B>I<00
-0E133000331370EA638014E012C3EAC700A2380701C0120EA3381C0380A4EB0700A25BA2
-EA0C3EEA03CEEA000EA25B1260EAF0381330485A485AEA6180003EC7FC141F7C9418>
-121 D E
+/Fb 18 122 df<387FFFF8A2B5FCA214F0150579941E>45 D<14F8EB07FE90381F871C90
+383E03FE137CEBF801120148486C5A485A120FEBC001001F5CA2EA3F801403007F5C1300
+A21407485C5AA2140F5D48ECC1C0A2141F15831680143F1587007C017F1300ECFF076C48
+5B9038038F8E391F0F079E3907FE03FC3901F000F0222677A42A>97
+D<133FEA1FFFA3C67E137EA313FE5BA312015BA312035BA31207EBE0F8EBE7FE9038EF0F
+80390FFC07C013F89038F003E013E0D81FC013F0A21380A2123F1300A214075A127EA214
+0F12FE4814E0A2141F15C05AEC3F80A215005C147E5C387801F8007C5B383C03E0383E07
+C0381E1F80D80FFEC7FCEA01F01C3B77B926>I<147F903803FFC090380FC1E090381F00
+70017E13784913383901F801F83803F003120713E0120FD81FC013F091C7FC485AA2127F
+90C8FCA35A5AA45AA3153015381578007C14F0007EEB01E0003EEB03C0EC0F806CEB3E00
+380F81F83803FFE0C690C7FC1D2677A426>I<ED01F815FFA3150316F0A21507A216E0A2
+150FA216C0A2151FA21680A2153FA202F81300EB07FE90381F877F90383E03FF017C5BEB
+F80112013803F00048485B120FEBC001121F5DEA3F801403127F01005BA214075A485CA2
+140FA248ECC1C0A2141F15C3ED8380143F1587007C017F1300ECFF076C485B9038038F8E
+391F0F079E3907FE03FC3901F000F0253B77B92A>I<147F903803FFC090380FC1E09038
+3F00F0017E13785B485A485A485A120F4913F8001F14F0383F8001EC07E0EC1F80397F81
+FF00EBFFF891C7FC90C8FC5A5AA55AA21530007C14381578007E14F0003EEB01E0EC03C0
+6CEB0F806CEB3E00380781F83803FFE0C690C7FC1D2677A426>I<EC07C0EC3FF09138FC
+38E0903901F01FF0EB03E0903807C00FEB0F80011F1307D93F0013E05B017E130F13FE49
+14C01201151F1203491480A2153F1207491400A25DA249137EA215FEA25D000313011403
+14076C6C485A0000131FEB787BEB3FF390380FC3F0EB00031407A25DA2140F5D121C007E
+131F5D00FE49C7FC147E5C387801F8387C07E0381FFF80D803FEC8FC24367CA426>103
+D<EB01C0EB07E014F0130F14E01307EB038090C7FCAB13F0EA03FCEA071EEA0E1F121CA2
+12385B1270A25BEAF07E12E013FEC65AA212015B1203A25B12075BA2000F13E013C013C1
+001F13C01381A2EB83801303EB0700A2130E6C5AEA07F8EA01E0143879B619>105
+D<EB0FC0EA07FFA3EA001F1480A2133FA21400A25BA2137EA213FEA25BA21201A25BA212
+03A25BA21207A25BA2120FA25BA2121FA25BA2123FA290C7FCA25AA2EA7E0EA212FE131E
+EAFC1CA2133C133812F81378EA7870EA7CE0121FEA0F80123B79B915>108
+D<D801E001FEEB07F03C07F803FF801FFC3C0E3C0F07C0783E3C1E3E3C03E1E01F261C1F
+78D9F3C013803C383FF001F7800F02E01400007801C013FE007018C002805B4A4848EB1F
+80EAF07FD8E07E5CA200000207143F01FE1700495CA2030F5C0001177E495C18FE031F5C
+120349DA8001131C18F8033F153C00070403133849020013F0A24B1570000F17E049017E
+15F019E003FEECE1C0001FEE01E34949903800FF000007C70038143C3E2679A444>I<D8
+01E013FE3A07F803FF803A0E3C0F07C03A1E3E3C03E0261C1F787F39383FF00114E00078
+13C000708114804A485AEAF07FEAE07EA20000140701FE5C5BA2150F00015D5B151F5E12
+034990383F8380160316070007027F130049137EA2160E000F147C49141E161C5E001FEC
+3C7849EB1FE00007C7EA0780292679A42F>I<147F903803FFC090380FC1F090381F00F8
+017E137C5B4848137E4848133E0007143F5B120F485AA2485A157F127F90C7FCA215FF5A
+4814FEA2140115FC5AEC03F8A2EC07F015E0140F007C14C0007EEB1F80003EEB3F00147E
+6C13F8380F83F03803FFC0C648C7FC202677A42A>I<9039078007C090391FE03FF09039
+3CF0787C903938F8E03E9038787FC00170497EECFF00D9F0FE148013E05CEA01E113C15C
+A2D80003143FA25CA20107147FA24A1400A2010F5C5E5C4B5A131F5EEC80035E013F495A
+6E485A5E6E48C7FC017F133EEC70FC90387E3FF0EC0F8001FEC9FCA25BA21201A25BA212
+03A25B1207B512C0A3293580A42A>I<3903C003F0390FF01FFC391E783C0F381C7C703A
+3C3EE03F8038383FC0EB7F800078150000701300151CD8F07E90C7FCEAE0FE5BA2120012
+015BA312035BA312075BA3120F5BA3121F5BA3123F90C9FC120E212679A423>114
+D<14FE903807FF8090380F83C090383E00E04913F00178137001F813F00001130313F0A2
+15E00003EB01C06DC7FC7FEBFFC06C13F814FE6C7F6D13807F010F13C01300143F141F14
+0F123E127E00FE1480A348EB1F0012E06C133E00705B6C5B381E03E06CB45AD801FEC7FC
+1C267AA422>I<EB0380EB07C0130FA4131F1480A3133F1400A35B137E007FB5FCA2B6FC
+3800FC00A312015BA312035BA312075BA3120F5BA3121FEB801CA2143C003F1338EB0078
+147014F014E0EB01C0EA3E03381F0780380F0F00EA07FCEA01F0183579B31C>I<13F8D8
+03FEEB01C0D8078FEB03E0390E0F8007121E121C0038140F131F007815C01270013F131F
+00F0130000E015805BD8007E133FA201FE14005B5D120149137EA215FE120349EBFC0EA2
+0201131E161C15F813E0163CD9F003133814070001ECF07091381EF8F03A00F83C78E090
+393FF03FC090390FC00F00272679A42D>I<13F0D803FCEB01C0D8071EEB03E0D80E1F13
+07121C123C0038140F4914C01270A249131FD8F07E148012E013FEC648133F160012015B
+5D0003147E5BA215FE00075C5BA214015DA314035D14070003130FEBF01F3901F87FE038
+007FF7EB1FC7EB000F5DA2141F003F5C48133F92C7FC147E147C007E13FC387001F8EB03
+E06C485A383C1F80D80FFEC8FCEA03F0233679A428>121 D E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fc cmsy7 7 1
-/Fc 1 14 df<EB07F8EB3FFF9038F807C03903C000F048C71238000E8048804880003080
-0070158000601401A200E015C0481400A76C140100601580A2007014030030150000385C
-6C140E6C5C6C5CD803C013F03900F807C0D93FFFC7FCEB07F822217D9828>13
-D E
+/Fc 1 14 df<913801FFC0021F13FC91B67E499038007FC0D907F0EB07F0D91F80EB00FC
+49C8127E017C151F01F0ED078048486F7E48486F7E48486F7E90CA1270481778001E8300
+1C171C003C171E0038170E0078170F007083A200F01880481703A96C170700701800A200
+785F0038170E003C171E001C171C001E173C6C5F6C17706D16F06C6C4B5A6C6C4B5A6C6C
+4B5A017C031FC7FC013F157E6D6C5CD907F0EB07F0D901FFEB7FC06D90B55A021F01FCC8
+FC020113C039357CA842>13 D E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fd cmr7 7 50
-/Fd 50 123 df<121CA2123C127012E012800606789714>19 D<126012F0A212701210A3
-1220A21240A2040B7D970B>39 D<126012F0A212701210A31220A21240A2040B7D830B>
-44 D<EAFF80A2090280880D>I<126012F0A2126004047D830B>I<EA07E0EA1C38EA381C
-EA300CEA700EEA6006A2EAE007AAEA6006A2EA700EEA300CEA381CEA1C38EA07E010187F
-9614>48 D<12035AB4FC1207B3EAFFF00C177D9614>I<EA0F80EA1060EA2030EA4038EA
-803CEAC01C12E0A2EA003C1338A21370136013C0EA0180EA03001206EA04041208EA100C
-EA3FF8127F12FF0E177E9614>I<EA0F80EA10E0EA2070EA6078EA7038A2EA2078EA0070
-A2136013C0EA0F80EA00E013701338133C124012E0A21280EA40381370EA30E0EA0F800E
-187E9614>I<EA3018EA3FF013E01380EA2000A4EA27C0EA3860EA20301338EA0018131C
-A312E0A212C0EA8018EA4038EA2030EA10E0EA0F800E187E9614>53
-D<1240EA7FFE13FCA2EAC008EA80101320120013401380A21201A2EA0300A45AA612020F
-187E9614>55 D<EA0780EA1860EA30301270EA601812E0A2131CA41260EA703C1230EA18
-5CEA0F9CEA0018A21338EAE030136012C0EA6180EA1F000E187E9614>57
-D<1308131CA3132EA31347A2EBC7801383A2380101C0A3380200E0EA03FFEA0200481370
-A2000C137800081338A2001C133C39FF01FF8019197F981D>65 D<B5FC381C01C0EB00E0
-14701478A4147014F0EB03C0381FFF80381C01E0EB00701478143CA5147814F0EB01E0B5
-128016187E971C>I<EB7E043801C18C3807007C000E131C5A003C130C12380078130412
-7012F01400A614041270127800381308123C121C6C13106C13203801C0C038007F00161A
-7E981C>I<B512F0381C00701430141014181408A213041400A2130CEA1FFCEA1C0C1304
-A2140413001408A31418143814F0B5FC16187E971B>69 D<B512F0380E00701430141014
-181408A213021400A21306EA0FFEEA0E061302A390C7FCA7EAFFE015187F971A>I<EB3F
-023801C0C63803002E000E131E48130E14065A007813021270A200F090C7FCA4903801FF
-C09038000E001270A2127812387EA27E000313163801C06238003F801A1A7E981F>I<EA
-FFE0EA0E00B3A4EAFFE00B187F970E>73 D<EA0FFCEA00E0B1124012E0A2EAC0C01241EA
-2380EA1E000E197D9714>I<B414FF000F14F0390B800170A33809C002A23808E004A3EB
-7008A2EB3810A2EB1C20A3EB0E40A2EB0780A3381C030039FF8307FF20187F9724>77
-D<00FC13FE001E133814101217EA1380A2EA11C0EA10E01370A21338131CA2130E1307A2
-EB0390EB01D0EB00F0A214701430123800FE131017187E971D>I<B5FC381C03C0EB00E0
-14701478A5147014E0EB03C0381FFF00001CC7FCAAB47E15187E971B>80
-D<EA0FC2EA1836EA200EEA600612C01302A3EAE0001270127CEA3FC0EA1FF0EA03FCEA00
-3E130E130713031280A3EAC0021306EAE004EAD818EA87E0101A7E9816>83
-D<387FFFFE38701C0E00401302A200C0130300801301A300001300AF3803FFE018187F97
-1C>I<38FF80FE381C00381410B1000C1320120E000613406C13803801C100EA007E1719
-7E971D>I<39FF803F80391C000E0014046C5BA36C5BA2EB803000031320A26C6C5AA2EB
-E0C000005BA20171C7FCA3133AA2131CA3130819197F971D>I<EA3F80EA70C01360EA20
-701200A2EA0FF0EA3870127012E01371A213F1EA71FBEA1E3C100F7E8E14>97
-D<12F81238A8EA39F0EA3E1CEA380613077F1480A514005B130EEA3618EA21F011187E97
-16>I<EA07F8EA1C1C1230EA7008EA600012E0A51260EA7004EA3808EA1C18EA07E00E0F
-7F8E12>I<133E130EA8EA07CEEA0C3EEA380E1270126012E0A512601270EA301EEA1C2E
-3807CF8011187F9716>I<EA07C0EA1830EA30181270EA600C12E0EAFFFCEAE000A31260
-EA7004EA3008EA1C18EA07E00E0F7F8E12>I<EA03E0EA0670120EEA1C201300A5EAFF80
-EA1C00ADEA7F800C1880970C>I<130EEA0FD1EA1873EA3030EA7038A4EA3030EA1860EA
-2FC0EA20001230EA3FF013FCEA1FFEEA600FEAC003A4EA6006EA381CEA07E010187F8F14
->I<12F81238A8EA39F0EA3A18EA3C1C1238ABEAFE7F10187E9716>I<12301278A2123012
-00A512F81238AD12FE07187F970B>I<12F81238B3A412FE07187F970B>108
-D<38FC7C1F391D8E6380391E0781C0A2001C1301AA39FF9FE7F81D0F7F8E21>I<EAF9F0
-EA3A18EA3C1C1238ABEAFE7F100F7E8E16>I<EA07E0EA1C38EA300CEA700EEA6006EAE0
-07A5EA6006EA700EEA300CEA1C38EA07E0100F7F8E14>I<EAF9F0EA3E1CEA380E7FA2EB
-0380A5EB0700A2130EEA3E18EA39F00038C7FCA612FE11167E8E16>I<EA07C2EA0C26EA
-381EEA700EA212E0A51270A2EA381EEA1C2EEA07CEEA000EA6EB3F8011167F8E15>I<EA
-F9C0EA3AE0123C1340EA3800AAB4FC0B0F7E8E10>I<EA1F20EA60E0EAC020A212E0EAFC
-00EA7F80EA3FE01207EA8070133012C01320EAF060EA8F800C0F7F8E10>I<1204A3120C
-121C123CEAFFC0EA1C00A81320A4EA0E40EA07800B157F9410>I<EAF87CEA381CAB133C
-EA185CEA0F9F100F7E8E16>I<38FE0F8038380700EA3C06EA1C04A26C5AA26C5AA2EA03
-A0A213E06C5AA26C5A110F7F8E15>I<38FE7F1F38381C0E1404383C1E0C001C13081326
-380E27101367EB4390000713A0138114E0000313C013006C1380180F7F8E1C>I<38FE0F
-8038380700EA3C06EA1C04A26C5AA26C5AA2EA03A0A213E06C5AA26C5AA248C7FCA212E2
-A212E4127811167F8E15>121 D<EA7FF8EA6070EA40F013E0EA41C01243EA0380EA0700
-EA0E08121E121CEA38101278EA7030EAFFF00D0F7F8E12>I E
+/Fd 50 123 df<EA01E012031207120F13C0EA1F80EA3E005A12F05A12400B0B73A721>
+19 D<1238127C12FE12FFA2127F123B1203A31206A3120C121812381270122008127BA7
+13>39 D<1238127C12FE12FFA2127F123B1203A31206A3120C121812381270122008127B
+8613>44 D<B5FCA410047F8E16>I<1238127C12FEA3127C123807077B8613>I<EB3F8038
+01FFF03803E0F83807803C48487E001E7F003E1480A2003C1307007C14C0A400FC14E0AE
+007C14C0A36CEB0F80A36CEB1F006C131E6C6C5A3803E0F86CB45A38003F801B277EA521
+>48 D<13381378EA01F8121F12FE12E01200B3AB487EB512F8A215267BA521>I<13FF00
+0313E0380E03F0381800F848137C48137E00787F12FC6CEB1F80A4127CC7FC15005C143E
+147E147C5C495A495A5C495A010EC7FC5B5B903870018013E0EA0180390300030012065A
+001FB5FC5A485BB5FCA219267DA521>I<13FF000313E0380F01F8381C007C0030137E00
+3C133E007E133FA4123CC7123E147E147C5C495AEB07E03801FF8091C7FC380001E06D7E
+147C80143F801580A21238127C12FEA21500485B0078133E00705B6C5B381F01F03807FF
+C0C690C7FC19277DA521>I<0018130C001F137CEBFFF85C5C1480D819FCC7FC0018C8FC
+A7137F3819FFE0381F81F0381E0078001C7F0018133EC7FC80A21580A21230127C12FCA3
+150012F00060133E127000305B001C5B380F03E03803FFC0C648C7FC19277DA521>53
+D<1230123C003FB512E0A215C0481480A239700007000060130E140C48131C5C5CC75A5C
+1301495AA249C7FC5B130E131EA3133E133CA2137CA413FCA813781B287DA621>55
+D<137F3801FFC03807C1E0380F0070001E1378003E7F003C133E007C131EA200FC131FA4
+1580A4007C133FA2123C003E137F001E135F380F01DF3807FF9F3801FE1FD80010130013
+00A2143E123C007E133CA25C5C007C5B383003C0381C0780D80FFFC7FCEA03F819277DA5
+21>57 D<140EA2141FA34A7EA3EC6FC0A2ECEFE014C7A290380183F0A390380301F8A201
+067F1400A249137EA2011C137F01187FA24980013FB5FCA2903960000FC0A201E0804913
+07A248486D7EA200038115011207D81FC0497ED8FFF890383FFFE0A22B2A7EA931>65
+D<B612E015FC3907F0003F0003EC0FC0ED07E01503ED01F016F8A6ED03F016E01507ED1F
+C0ED7F0090B512FC819039F0003F80ED07E0ED03F0ED01F8ED00FCA2167EA616FCA2ED01
+F8ED03F0ED07E00007EC3FC0B7120015F827287EA72E>I<91387FC002903903FFF80690
+390FE01E0E90383F0007017CEB019ED801F0EB00FE4848147E4848143E5B000F151E48C8
+FC48150E123EA2007E1506A2127C00FC1500A8127C007E1506A2123EA2003F150C7E6C7E
+000715186D14386C6C14306C6C1460D8007CEB01C0013FEB038090390FE01E00903803FF
+F89038007FC0272A7DA82F>I<B712F0A23907F000070003EC00F816781638A21618A316
+0C1560A21600A215E0A2140390B5FCA2EBF0031400A21560A21606A2ED000CA4161C1618
+1638A21678ED01F80007EC07F0B7FCA227287EA72D>69 D<B712C0A23907F0001F0003EC
+03E015011500A21660A31630A215C01600A31401A2140790B5FCA2EBF0071401A21400A4
+92C7FCA9487EB512E0A224287EA72B>I<91387FC002903903FFF80690390FE01E0E9038
+3F0007017CEB019ED801F0EB00FE4848147E4848143E5B000F151E48C8FC48150E123EA2
+007E1506A2127C00FC92C7FCA792387FFFE0127C007E02001300167E123EA2123F7E6C7E
+6C7EA26C7ED801F814FEEA007C013FEB039E90390FE00F0E903903FFFC029026007FE0C7
+FC2B2A7DA833>I<B512C0A23807F8006C5AB3B0487EB512C0A212287EA718>73
+D<90B512C0A2903801FE006D5AB3A9123812FEA3130100FC5B387803F000705B383C0FC0
+D80FFFC7FCEA03FC1A297EA722>I<D8FFF0EDFFF06D5C0007EEFE0000035E017CEC037C
+A26D1406A26D140CA36D6C1318A26D6C1330A36D6C1360A26D6C13C0A3903900F80180A2
+91387C0300A2EC3E06A36E5AA2EC0F98A3EC07F0A26E5AEA0780D80FC015FE3CFFFC01C0
+1FFFF0A234287DA73C>77 D<D8FFF0903807FFE07FD803FC9038007E006D143C1618137F
+6D7E6D7EA26D7E6D7E6D7EA26D7E6D7E147FA2EC3F80EC1FC0EC0FE015F01407EC03F8EC
+01FCEC00FEA2157FED3F98ED1FD8A2ED0FF815071503A215011500486C1478487ED8FFFC
+143816182B287EA731>I<B612E015FC3907F0003F0003EC0FC0ED03E0ED01F016F81500
+16FCA616F8150116F0ED03E0ED0FC0ED3F0090B512FC15E001F0C8FCAF487EB512C0A226
+287EA72D>80 D<90387F80203903FFF06039078078E0380E000E48130748130300781301
+0070130012F0A21560A27E1500127C127FEA3FE013FF6C13F06C13FC000313FFC6148001
+0F13C0010013E0EC0FF014031401EC00F8A200C01478A46C1470A26C14F06C14E06CEB01
+C000EFEB078039E3E01F0038C0FFFC38801FF01D2A7DA825>83 D<007FB7FCA23A7E003F
+003F0078150F007081006081A200E01680481501A5C791C7FCB3A64A7E013FB5FCA22928
+7EA72F>I<B539C007FFE0A2D807F8C7EA7E006C48143C1618B3A816386C6C143016706C
+6C1460017C14E0017E495A6D495A90260F8007C7FC903807E03E903801FFF89038003FC0
+2B297EA731>I<B56CEBFFF8A2D807F8C7EA1FC06C48EC0F00160E6C7E160C6D141C0000
+1518A2017E5CA2017F14706D146080011F5CA26D6C485AA2ECE003010791C7FC14F00103
+1306A2ECF80E0101130CECFC1C01001318A2EC7E30A2EC7F70EC3F6015E06E5AA26E5AA3
+6EC8FCA22D297FA731>I<13FE3807FFC0380F03E0381C00F0003E1378003F137C143C14
+3E121EC7FCA3EB3FFEEA01FF3807F03EEA1FC0EA3F00127EA2481418A3147E127EECDF38
+393F838FF0390FFE0FE03903F807C01D1C7E9A21>97 D<EA0F8012FFA2121F120FAAEB81
+FCEB8FFF9038BC0FC09038F003E09038C001F0EB800015F815FC157CA2157EA7157CA215
+FC15F89038C001F015E090387003C0390E3C0F80390C0FFF00380003F81F297EA725>I<
+EB3FC0EBFFF83803E03C3807C00E380F801F381F003F123EA2007E131E007C1300A212FC
+A7127C127E1403123E6C1306EA0F803807C00C3803F0383800FFE0EB3F80181C7E9A1E>
+I<EC03E0143FA214071403AAEB3F833801FFE33803E03B3807800F380F0007481303123E
+127E127CA212FCA7127CA2127E123E001E1307001F130F390F801FF03903E073FE3801FF
+E339007F03E01F297EA725>I<133F3801FFE03803E1F0380F80F8381F007C143E123E00
+7E131E141F127C12FCA2B6FCA200FCC7FCA4127C127E1403123E6C1307380F800E3807C0
+1C3803E0783800FFE0EB3F80181C7E9A1E>I<EB07E0EB3FF0EB7C78EBF0FCEA01E01203
+EBC078000713301400A8B51280A23807C000B3A2487EEA7FFEA216297FA815>I<90387E
+03E03901FF9FF03807C3FC380F00F048EBF800001E1378003E137CA6001E1378001F13F8
+6C5BEBC3E0380DFF80D81C7EC7FC90C8FCA3121E380FFFF014FC6C13FF001F1480393E00
+1FC000781307EC03E0481301A40078EB03C0007C13076CEB0F80390FC07E003803FFF838
+007FC01C277E9921>I<EA0F8012FFA2121F120FAAEB81FCEB8FFF90389C0F809038B007
+C013E09038C003E0A31380AF391FC007F039FFF83FFEA21F287EA725>I<120EEA3F80A5
+EA0E00C7FCA7EA078012FFA2121F120FB3121FEAFFF8A20D287EA713>I<EA0F8012FFA2
+121F120FB3AFEA1FC0EAFFF8A20D287EA713>108 D<260F81FC137F3BFF8FFF03FFC090
+3A9C0F8703E03B1FB007CC01F0D80FE013D8903AC003F000F8A301805BAF486C486C487E
+3CFFF83FFE0FFF80A2311A7E9937>I<380F81FC38FF8FFF90389C0F80391FB007C0EA0F
+E09038C003E0A31380AF391FC007F039FFF83FFEA21F1A7E9925>I<EB3F80EBFFE03803
+E0F83807803C48487E001E7F003E1480A248EB07C0A300FC14E0A7007C14C0A2007E130F
+003E1480001E1400001F5B380F803E3803E0F86CB45A38003F801B1C7E9A21>I<380F81
+FC38FF8FFF9038BC0FC0391FF007E0390FC003F0EB800115F8EC00FCA2157C157EA7157C
+15FCA2EC01F801C013F0EC03E09038F007C09038BC1F8090388FFF00EB83F80180C7FCA7
+487EEAFFF8A21F257E9925>I<90383F80603901FFE0E03803F0703807C019380F800D38
+1F00075A007E1303A2127C12FCA7127C127EA27E6C1307EB800F380FC01B3803E0733801
+FFE338007F031300A7EC07F0EC3FFEA21F257E9923>I<380F07C038FF1FF0EB38F8EA1F
+71EA0F6113C1EBC0F014005BAF487EEAFFFCA2151A7E991A>I<3803F840380FFEC0EA3C
+07EA7803EA7001EAF000A37E6C1300EA7FC013FC6CB4FC6C1380000713C0C613E0130738
+C003F0130113007EA26C13E0130100F813C038EE078038C7FF00EA81FC141C7E9A1A>I<
+13C0A41201A312031207120F121FB512E0A23807C000AC1430A73803E060A23801F0C038
+00FF80EB3F0014257FA31A>I<390F8003E000FF133FA2001F1307000F1303B01407A200
+07130F9038C01BF03903E073FE3801FFE339007F83E01F1B7E9925>I<39FFF807FEA239
+0FE001F001C013E0000714C013E000031480EBF00300011400A23800F806A2EB7C0CA2EB
+7E1CEB3E18A26D5AA2EB0FE0A36D5AA26D5AA21F1A7F9823>I<3BFFF8FFF07FE0A23B1F
+C01FC01F80000F90390F800E00A20007150CEC1FC02603E01B5B15E0143B2601F0315B15
+F0D9F86013700000156015F89039FCC078E0017CEB7CC0137D90393F803D80153FEC001F
+6D91C7FCA2011E7F010E130EA22B1A7F982F>I<39FFF807FEA2390FE001F001C013E000
+0714C0EA03E01580EBF003000114006D5A0000130613FCEB7C0CA26D5AA26D5AA214F06D
+5AA26D5AA26D5AA291C7FCA213061230EA780EEAFC0C131C1318485AEA70E0EA3FC06CC8
+FC1F257F9823>121 D<383FFFFEA2383E00FCEA3801003013F8387003F0EB07E0EA600F
+14C0EB1F8038003F00137E13FE5B3801F806EA03F0EA07E0120FEBC00E381F800C383F00
+1C5A007E137CB512FCA217197E981E>I E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fe cmbx10 10 29
-/Fe 29 122 df<EB07F8EB7FFC3801FC0E3803F01F48485AEA0FC0A3141E140C91C7FCA2
-ECFF80B6FCA2380FC01FB2397FF8FFF0A21C237FA220>12 D<1210127C127E12FE7EEA7F
-80EA3FC0120FEA03E012000B0A7BA31D>18 D<5AEA07C0120F13E0121FEA3FC0EA7F80EA
-7E0012F812E00B0A74A31D>I<123C127EB4FCA21380A2127F123D1201A2EA0300A25A12
-065A121C5A122009127CA210>39 D<EAFFFCA50E057F8D13>45 D<EA07FE381FFF80383F
-07E06D7E130180121E1200A2133FEA03FDEA1F81EA3E01127C12F8A4EA7C02EA7E0C391F
-F8FF803807E03F19167E951C>97 D<B47EA2121FABEB87F0EBBFFCEBF03EEBC01F903880
-0F8015C0140715E0A715C0A2140F15809038C01F00381E707E381C3FFC38180FE01B237E
-A220>I<EBFF80000713E0380F83F0EA1F03123E127E387C01E090C7FC12FCA6127C127E
-A2003E13186C1330380FC0603807FFC0C6130015167E9519>I<49B4FCA2EB003FAB13FE
-3807FFBF380FC1FF48C67E003E7F127E127CA212FCA7127C127E123E6C5B380F81FF3907
-FF3FE0EA01FC1B237EA220>I<13FE3807FF80380F83E0EA1F01383E00F0127E007C13F8
-12FC1478B512F8A200FCC7FCA4127C007E1318003E13386C1330380F80F03803FFC0C613
-0015167E951A>I<EB1F80EBFFE03801F1F0EA03E31207EA0FC3EBC1E0EBC000A6EAFFFE
-A2EA0FC0B2EA7FFCA214237EA212>I<9038FE0F803903FF9FC0380F83E3381F01F3391E
-00F000003E7FA5001E5BEA1F01380F83E0380BFF80D808FEC7FC0018C8FCA2121C381FFF
-E014FC6C13FF7E001F1480397C001FC00078130F00F81307A3007CEB0F806CEB1F00381F
-807E6CB45A000113E01A217F951D>I<B47EA2121FABEB83F0EB8FFCEB987EEBA03EEBC0
-3FA21380AE39FFF1FFE0A21B237DA220>I<121E123FEA7F80A4EA3F00121EC7FCA6EAFF
-80A2121FB2EAFFF0A20C247EA30F>I<B47EA2121FABECFF80A2EC3C0014705CEB81C0EB
-8780018EC7FC139E13BF13FFEBDF80EB9FC0EB0FE013076D7E806D7E13008039FFE1FFC0
-A21A237EA21E>107 D<EAFF80A2121FB3ADEAFFF0A20C237EA20F>I<3AFF03F803F89039
-0FFE0FFE3A1F183F183F9039201F201F014001C01380A201801380AE3BFFF0FFF0FFF0A2
-2C167D9531>I<38FF03F0EB0FFC381F187EEB203EEB403FA21380AE39FFF1FFE0A21B16
-7D9520>I<13FF000713E0380F81F0381F00F8003E137C48133EA300FC133FA7007C133E
-007E137E003E137C6C13F8380F81F03807FFE0C6130018167E951D>I<38FF87F0EBBFFC
-381FF07EEBC01F9038800F8015C0A2EC07E0A715C0140FA2EC1F8001C01300EBF07EEBBF
-FCEB8FE00180C7FCA8EAFFF0A21B207E9520>I<EBFE033807FF07380FC1CF381F00DF48
-137F007E7FA2127C12FCA7127EA2003E5B6C5BEA0FC13807FF3FEA00FC1300A8903801FF
-E0A21B207E951E>I<38FF0F80EB1FE0381F33F013631343A2EBC1E0EB8000ADEAFFF8A2
-14167E9518>I<3807F980EA1FFFEA3807EA7003EAF001A26CC7FCB4FC13F8EA7FFE6C7E
-6C1380120738003FC0EAC007130312E0A200F0138038FC0F00EAEFFEEAC3F812167E9517
->I<13C0A41201A212031207120F121FB5FCA2EA0FC0ABEBC180A51207EBE300EA03FEC6
-5A11207F9F16>I<38FF81FFA2381F803FAF5C5C380FC1BF3907FF3FE0EA01FC1B167D95
-20>I<39FFF01FE0A2391FC00700000F1306EBE00E0007130C13F000035BA26C6C5AA26C
-6C5AA2EBFEE0EB7EC0137F6D5AA26DC7FCA2130EA21B167F951E>I<3AFFF3FF83FCA23A
-1F807C00E0D80FC014C08001E013010007017F1380A2D803F0EB0300ECCF8301F81387D8
-01F913C61487D800FD13ECEBFF0315FC017F5BEB7E01013E5BEB3C00A20118136026167F
-9529>I<39FFF07FC0A2390FC03C003807E0386D5A00035B6C6C5A3800FD80137F91C7FC
-7F6D7E497EEB37E0EB67F013C33801C1F8380380FC48487E48137F39FF81FFE0A21B167F
-951E>I<39FFF01FE0A2391FC00700000F1306EBE00E0007130C13F000035BA26C6C5AA2
-6C6C5AA2EBFEE0EB7EC0137F6D5AA26DC7FCA2130EA2130CA25B1278EAFC3813305BEA69
-C0EA7F80001FC8FC1B207F951E>I E
+/Fe 29 122 df<913803FFC0027F13F00103B512FC010FEB00FED93FF8133FD97FE0EBFF
+8049485A5A1480484A13C04A6C1380A36F1300167E93C7FCA592383FFFC0B8FCA4000390
+C7FCB3ABB5D8FC3F13FFA4303A7EB935>12 D<121EEA3F80127F487E7F7F7F7F127F6C7E
+EA0FFF00031380C613C0EB3FE0EB0FC0EB0380131077BA30>18 D<130FEB3F8014C0EB7F
+E013FF5A5A5A14C0481380381FFE00EA3FF8EA7FE0EAFF80007EC7FC123813106DBA30>
+I<EA0F80EA3FE0EA7FF0A2EAFFF8A213FCA3127FA2123FEA0F9CEA001C133C1338A31378
+137013F0EA01E0A2EA03C0EA0780EA0F005A121C12180E1D79B91B>39
+D<B61280A819087F9620>45 D<EB3FFE0003B512E0000F14F8391FF00FFE003FEB03FF6D
+6C7F6E7FA26F7EA26C5A6C5AEA0380C8FCA2EC3FFF010FB5FC137F3901FFF87F00071380
+380FFE00EA3FF85B485A12FF5BA415FF6D5A127F263FF00713F83B1FFC1FBFFFC0390FFF
+FE1F0003EBF80F39003FE0032A257DA42E>97 D<13FFB5FCA412077EAF4AB47E020F13F0
+023F13FC9138FE03FFDAF00013804AEB7FC00280EB3FE091C713F0EE1FF8A217FC160FA2
+17FEAA17FCA3EE1FF8A217F06E133F6EEB7FE06E14C0903AFDF001FF80903AF8FC07FE00
+9039F03FFFF8D9E00F13E0D9C00390C7FC2F3A7EB935>I<903801FFC0010F13FC017F13
+FFD9FF8013802603FE0013C048485AEA0FF8121F13F0123F6E13804848EB7F00151C92C7
+FC12FFA9127FA27F123FED01E06C7E15036C6CEB07C06C6C14806C6C131FC69038C07E00
+6DB45A010F13F00101138023257DA42A>I<EE7F80ED7FFFA4150381AF903801FF81010F
+13F1013F13FD9038FFC07F0003EB001FD807FC1307000F8048487F5B123FA2485AA312FF
+AA127FA27F123FA26C6C5B000F5C6C6C5B6C6C4913C02701FF80FD13FE39007FFFF9011F
+13E1010313012F3A7DB935>I<903803FF80011F13F0017F13FC3901FF83FE3A03FE007F
+804848133F484814C0001FEC1FE05B003FEC0FF0A2485A16F8150712FFA290B6FCA301E0
+C8FCA4127FA36C7E1678121F6C6C14F86D14F000071403D801FFEB0FE06C9038C07FC06D
+B51200010F13FC010113E025257DA42C>I<EC1FF0903801FFFC010713FF90391FF87F80
+90383FE0FFD9FFC113C0A2481381A24813016E1380A2ED3E0092C7FCA8B6FCA4000390C8
+FCB3ABB512FEA4223A7DB91D>I<161FD907FEEBFFC090387FFFE348B6EAEFE02607FE07
+138F260FF801131F48486C138F003F15CF4990387FC7C0EEC000007F81A6003F5DA26D13
+FF001F5D6C6C4890C7FC3907FE07FE48B512F86D13E0261E07FEC8FC90CAFCA2123E123F
+7F6C7E90B512F8EDFF8016E06C15F86C816C815A001F81393FC0000F48C8138048157F5A
+163FA36C157F6C16006D5C6C6C495AD81FF0EB07FCD807FEEB3FF00001B612C06C6C91C7
+FC010713F02B377DA530>I<13FFB5FCA412077EAFED7FC0913803FFF8020F13FE91381F
+03FFDA3C01138014784A7E4A14C05CA25CA291C7FCB3A3B5D8FC3F13FFA4303A7DB935>
+I<EA01F0EA07FC487EA2487EA56C5AA26C5AEA01F0C8FCA913FF127FA412077EB3A9B512
+F8A4153B7DBA1B>I<13FFB5FCA412077EAF92380FFFE0A4923803FC0016F0ED0FE0ED1F
+804BC7FC157E5DEC03F8EC07E04A5A141FEC7FE04A7E8181A2ECCFFEEC0FFF496C7F806E
+7F6E7F82157F6F7E6F7E82150F82B5D8F83F13F8A42D3A7EB932>107
+D<13FFB5FCA412077EB3B3ACB512FCA4163A7DB91B>I<01FED97FE0EB0FFC00FF902601
+FFFC90383FFF80020701FF90B512E0DA1F81903983F03FF0DA3C00903887801F000749DA
+CF007F00034914DE6D48D97FFC6D7E4A5CA24A5CA291C75BB3A3B5D8FC1FB50083B512F0
+A44C257DA451>I<01FEEB7FC000FF903803FFF8020F13FE91381F03FFDA3C0113800007
+13780003497E6D4814C05CA25CA291C7FCB3A3B5D8FC3F13FFA430257DA435>I<903801
+FFC0010F13F8017F13FFD9FF807F3A03FE003FE048486D7E48486D7E48486D7EA2003F81
+491303007F81A300FF1680A9007F1600A3003F5D6D1307001F5DA26C6C495A6C6C495A6C
+6C495A6C6C6CB45A6C6CB5C7FC011F13FC010113C029257DA430>I<9039FF01FF80B500
+0F13F0023F13FC9138FE07FFDAF00113800007496C13C06C0180EB7FE091C713F0EE3FF8
+A2EE1FFCA3EE0FFEAA17FC161FA217F8163F17F06E137F6E14E06EEBFFC0DAF003138091
+39FC07FE0091383FFFF8020F13E0020390C7FC91C9FCACB512FCA42F357EA435>I<49B4
+EB0780010FEBE00F013FEBF81F9039FFC07C3F0003EB803E3A07FE000F7F4848EB07FF12
+1F497F123F497F127FA25B12FFAA6C7EA36C7E5D6C7E000F5C6C6C5B6C6C133F6CEBC0FD
+39007FFFF1011F13C10101130190C7FCAC037F13FEA42F357DA432>I<9038FE03F000FF
+EB0FFEEC3FFF91387C7F809138F8FFC000075B6C6C5A5CA29138807F80ED3F00150C92C7
+FC91C8FCB3A2B512FEA422257EA427>I<90383FF0383903FFFEF8000F13FF381FC00F38
+3F0003007E1301007C130012FC15787E7E6D130013FCEBFFE06C13FCECFF806C14C06C14
+F06C14F81203C614FC131F9038007FFE140700F0130114007E157E7E157C6C14FC6C14F8
+EB80019038F007F090B512C000F8140038E01FF81F257DA426>I<130FA55BA45BA25B5B
+A25A1207001FEBFFE0B6FCA3000390C7FCB21578A815F86CEB80F014816CEBC3E090383F
+FFC06D1380903803FE001D357EB425>I<01FFEC3FC0B5EB3FFFA4000714016C80B3A35D
+A25DA26C5C6E4813E06CD9C03E13FF90387FFFFC011F13F00103138030257DA435>I<B5
+39F001FFF8A4000390C7EA3F00161E6E133E6C153C6E137C6C15786E13F8017F5CECF001
+013F5C14F8011F495AA2ECFC07010F5CECFE0F010791C7FC6E5A6D131E15BE6D13BC15FC
+6D5BA36E5AA26E5AA26E5AA26E5AA22D257EA432>I<B500F1B538803FFFA43D07FE000F
+F80003E06C6C010715C082028015076C6E6C148015076C01C0ED0F00826E485C017FED80
+1E5D90273FF01E7F5B17C0DAF83E147C011F90393C3FE078037C14F8903B0FFC781FF0F0
+A29139FEF00FF10107EDF9E002FF14FB6D496CB45AA24B7E6D5EA26D496C90C7FCA292C7
+FC6E5CA2023E147C023C143C40257EA445>I<B539F01FFFF0A4000390398003F8006C01
+C013E06C1407D97FE05B6D6C485A6E48C7FC90381FFC3E010F5B903807FEFC6D6C5A5D6D
+5B6D5B6E7E6E7E814A7EA24A7E903801F3FFD903E37FD907C17FEB0FC049486C7E4A6C7E
+013E80496D7E49130F00016E7EB590383FFFF8A42D257EA432>I<B539F001FFF8A40003
+90C7EA3F00161E6E133E6C153C6E137C6C15786E13F8017F5CECF001013F5C14F8011F49
+5AA2ECFC07010F5CECFE0F010791C7FC6E5A6D131E15BE6D13BC15FC6D5BA36E5AA26E5A
+A26E5AA26E5AA292C8FCA25C141E003F133E387F803C38FFC07C147814F8EBC1F0EBC3E0
+6C485A387D1F80D83FFFC9FCEA1FFCEA07F02D357EA432>I E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Ff cmtt10 10 74
-/Ff 74 126 df<127012F8B212701200A5127012F8A31270051E769D1A>33
-D<EA600CEAF01EAAEA701CA3EA600C0F0F7B9E1A>I<380181803803C3C0A6387FFFF0B5
-12F8A26C13F038078780A3EA0F8FA2EB0F00A3387FFFF0B512F8A26C13F0381E1E00A6EA
-0C0C151E7E9D1A>I<136013E0A4EA03FCEA0FFF481380383EE7C0EA78E100F013E0EAE0
-E013E1A2EBE0C000F013001278123FEA1FF8EA0FFEEA01FF3800EF80EBE3C013E1006013
-E0EAF0E0A3EAE0E100F013C0EA78E3383EEF80381FFF006C5AEA03F8EA00E0A313601327
-7DA21A>I<003C13C0387E01E0130312FF00E713C01307A21480130FA2EB1F0012FFEA7E
-1E133E123CEA003C137CA25BA25B1201A25B1203A2EBC1E03807C3F0A2380F87F8143813
-07121FA2121E003E13F8EB03F0123C381801E015277EA21A>I<121C123E123FA2121F12
-07A4120F120E121E123C127812F012600810789D1A>39 D<1338137813F8EA01E0EA03C0
-EA0780EA0F00121E121C123C123812781270A312F05AA87E1270A312781238123C121C12
-1E7EEA0780EA03C0EA01E0EA00F8137813380D2878A21A>I<126012F012787E7E7EEA07
-80EA03C0120113E0120013F01370A313781338A813781370A313F013E0120113C01203EA
-0780EA0F00121E5A5A5A12600D287CA21A>I<13E0A538F0E1E0EAFCE7387EEFC0381FFF
-00EA07FCEA01F0EA07FCEA1FFF387EEFC038FCE7E0EAF0E13800E000A513157D991A>I<
-13301378A8387FFFF0B512F8A26C13F038007800A8133015167E991A>I<123C127E127F
-A3123F1207120F120E123E12FC12F81260080D77851A>I<387FFFC0B512E0A26C13C013
-047D901A>I<127812FCA41278060676851A>I<14C0EB01E01303A214C01307A2EB0F80A2
-EB1F00A2131E133EA25BA25BA2485AA25B1203A2485AA2485AA290C7FC5AA2123EA25AA2
-127812F8A25A126013277DA21A>I<EA01F0EA07FC487EEA1F1FEA1C0738380380A23870
-01C0A338E000E0A9EAF001007013C0A2EA780300381380EA3C07001C1300EA1F1FEA0FFE
-6C5AEA01F0131E7D9D1A>I<13C012011203A21207120F127F12FD12791201B2EA7FFFA3
-101E7B9D1A>I<EA07F8EA0FFE487E383C0F80387803C0EAF00100E013E0EAF000A21260
-C7FCA2130114C01303EB0780EB0F00130E133E5B5BEA01E0485A485A48C7FC001E13E05A
-EA7FFFB5FC7E131E7D9D1A>I<EA07FE381FFF804813C0387C03E0387800F01470A21230
-C712F014E01301EB0FC03803FF80A214C0380007E0EB00F0147014781438A2126012F014
-784813706C13F0387E07E0383FFFC06C13803803FC00151E7E9D1A>I<EB0F80131F133F
-133B137B13F313E31201EA03C313831207EA0F03120E121E123C1238127812F0B512FEA3
-38000380A6EB3FF8EB7FFCEB3FF8171E7F9D1A>I<383FFFC05AA20070C7FCA8EA73F8EA
-7FFE7F387E0F80387803C0EA3001000013E01300A3126012F01301EB03C038700780EA7C
-1F383FFF00EA1FFCEA07F0131E7D9D1A>I<127812FCA412781200A9127812FCA4127806
-1576941A>58 D<14C0EB03E01307EB0FC0EB3F80EB7F00EA01FC485AEA07E0EA1FC0485A
-007EC7FC5AA2127E6C7E6C7EEA07E0EA03F86C7EEA007FEB3F80EB0FC0EB07E01303EB00
-C0131A7D9B1A>60 D<126012F87E127E6C7E6C7EEA07F06C7EC67E137FEB3F80EB0FC0EB
-07E0A2EB0FC0EB3F80EB7F0013FCEA03F8485AEA1FC0485A007EC7FC5A5A1260131A7D9B
-1A>62 D<EA0FFCEA3FFF48138038F807C038E001E0EAF000A2EA6003380007C0EB1F80EB
-3E005B13F012015BA55BC8FCA5EA01C0487EA36C5A131E7D9D1A>I<137E3801FF804813
-C03807C3E0EA0F00381E0FF0EA3C3FEA387F387879F8EA70F038F0E07812E1EBC038A6EB
-E07800F013703870F0F0387879E0EA387F383C3FC0381E0F00380F00383807C1F8EA03FF
-6C13E038007F80151E7E9D1A>I<1338137CA2136C13EEA313C6A2EA01C7A438038380A4
-380701C0A213FFA24813E0EA0E00A4481370387F01FC38FF83FE387F01FC171E7F9D1A>
-I<EAFFFEEBFF8014C0381C03E0130014F01470A414E01301EB07C0381FFF80A214C0381C
-01E0EB00F014701438A5147814F01301B512E014C01400151E7E9D1A>I<EBFE383803FF
-B84813F8EA0F83EA1E00001C1378123C4813381270A200F013005AA87E00701338A21278
-6C1378001C1370001E13F0380F83E03807FFC06C13803800FE00151E7E9D1A>I<EA7FFE
-B5FC6C1380381C07C0EB01E0EB00F0147014781438A2143C141CA8143C1438A214781470
-14F0EB01E0EB07C0EA7FFFB512006C5A161E7F9D1A>I<B512F8A3381C0038A51400A213
-0EA3EA1FFEA3EA1C0EA390C7FCA3141CA5B512FCA3161E7E9D1A>I<387FFFFCB5FC7E38
-0E001CA51400A2EB0380A3EA0FFFA3EA0E03A390C7FCA8EA7FE012FF127F161E7F9D1A>
-I<3801F8E0EA03FEEA07FFEA0F0FEA1E03EA3C011238EA78001270A200F013005AA5EB0F
-F8A338F000E01270130112781238EA3C03121EEA0F0FEA07FFEA03FEEA01F8151E7E9D1A
->I<EA7FE0487E6C5A000EC7FCB3141CA5387FFFFCB5FC7E161E7F9D1A>76
-D<007E133FB4EB7F806C1400381D80DCA313C1A2001C139CA213E3A2EB631C1377A21336
-A2133E131CA21300A7007F137F39FF80FF80397F007F00191E809D1A>I<EAFFFEEBFF80
-14C0381C03E0EB00F0147014781438A41478147014F0EB03E0381FFFC01480EBFE00001C
-C7FCA9B47EA3151E7E9D1A>80 D<EAFFFC13FF1480381C07C0EB01E0EB00F01470A414F0
-EB01E0EB07C0381FFF8014001480381C07C0EB01E01300A514E214E7A338FF80FF147E14
-3C181E7F9D1A>82 D<3807F1C0EA1FFDEA3FFFEA7C1FEA7007EAF003EAE001A390C7FC7E
-1278123FEA1FF8EA0FFEEA01FF38001F80EB03C0130114E01300126012E0A2EAF001EB03
-C038FE0780B5FCEBFE00EAE3FC131E7D9D1A>I<387FFFFEB5FCA238E0380EA500001300
-B33803FF80A3171E7F9D1A>I<00FE13FEA30070131CA26C1338A7137C00181330381CEE
-70A513C6A2380DC760A31383A3000F13E0A2380701C0171E7F9D1A>87
-D<EAFFFCA3EAE000B3AFEAFFFCA30E2776A21A>91 D<126012F07EA21278127CA27EA27E
-A27E7FA26C7EA26C7EA212017FA26C7EA2137CA27FA2131E131FA2EB0F80A2EB07C0A213
-0314E0A21301EB00C013277DA21A>I<EAFFFCA3EA001CB3AFEAFFFCA30E277FA21A>I<EA
-0380EA07C0EA1FF0EA7EFCEAFC7EEAF01EEA40040F077B9D1A>I<387FFFC0B512E0A26C
-13C013047D7E1A>I<1206120F121E123C1278127012F012E0A412F812FCA2127C123808
-1077A11A>I<EA1FF0EA3FFC487EEA781F38300780EA0003A2137FEA07FF121FEA3FC3EA
-7C0312F012E0A3EAF007EA7C1F383FFFFCEA1FFDEA07F016157D941A>I<12FEA3120EA6
-133FEBFFC0000F13E0EBE1F0EB8070EB00781438000E133C141CA5000F133C14381478EB
-80F0EBC3E0EBFFC0000E138038067E00161E7F9D1A>I<3801FF80000713C04813E0EA1F
-01383C00C0481300127012F05AA57E1270007813707E381F01F0380FFFE06C13C0000113
-0014157D941A>I<EB1FC0A31301A6EA01F9EA07FDEA0FFFEA1F0FEA3C07EA78031270EA
-F00112E0A5EAF00312701278EA3807EA3E1F381FFFFCEA0FFDEA03F1161E7E9D1A>I<EA
-01FCEA07FF481380381F07C0383C01E0EA7800007013F000F013705AB512F0A300E0C7FC
-7E1270007813707E381F01F0380FFFE06C13C00001130014157D941A>I<EB0FF0EB1FF8
-133FEB7878EBF030EBE000A4387FFFF0B5FCA23800E000AF383FFF804813C06C1380151E
-7F9D1A>I<3801F8FC3807FFFE5A381F0F8C381C0380003C13C0EA3801A3EA3C03001C13
-80EA1F0FEBFF00485AEA39F80038C7FC123C121C381FFF8014F04813F8387C00FC007013
-1C00F0131E48130EA36C131E0078133C383F01F8381FFFF06C13E00001130017217F941A
->I<12FEA3120EA6133FEBFF80000F13C0EBE1E013801300A2120EAB38FFE3FE13E713E3
-171E7F9D1A>I<EA01C0487EA36C5AC8FCA5EA7FE0A31200AF387FFF80B512C06C138012
-1F7C9E1A>I<131C133EA3131C1300A5EA0FFEA3EA000EB3A5131EEAF01C137CEAFFF8EA
-7FF0EA3FC00F2A7E9E1A>I<12FEA3120EA6EB0FFCEB1FFEEB0FFCEB03C0EB0780EB0F00
-131E5B5B13FC120F13DE138F380E0780EB03C0A2EB01E0EB00F038FFE3FE14FF14FE181E
-7F9D1A>I<EAFFE0A31200B3A6B512E0A3131E7D9D1A>I<387DF1F038FFFBF86CB47E381F
-1F1CEA1E1EA2EA1C1CAC387F1F1F39FF9F9F80397F1F1F00191580941A>I<EAFE3FEBFF
-80B512C0380FE1E013801300A2120EAB38FFE3FE13E713E317157F941A>I<EA01F0EA07
-FCEA1FFF383E0F80EA3C07387803C0EA700138E000E0A6EAF001007013C0EA7803383C07
-80EA3E0F381FFF00EA07FCEA01F013157D941A>I<EAFE3FEBFFC0B512E0380FE1F0EB80
-70EB00781438000E133C141CA5000F133C14381478EB80F0EBC3E0EBFFC0000E1380EB7E
-0090C7FCA8EAFFE0A316207F941A>I<3801F8E0EA07FEEA0FFFEA1F0FEA3C03EA780112
-70EAF0005AA5EAF0011270EA7803EA3C07EA1F0FEA0FFFEA07FCEA01F8C7FCA8EB0FFEA3
-17207E941A>I<387F83F838FF8FFEEA7FBF3803FE1EEBF80CEBE000A25BA25BA9EA7FFF
-B5FC7E17157F941A>I<380FFB80EA3FFF5AEAF80FEAE003A300F8C7FCEA7FC0EA3FFCEA
-0FFF38007F80EB07C0EA600112E012F0130338FC0F80B512005BEAE7F812157C941A>I<
-487E1203A6387FFFE0B5FCA238038000AA1470A314F0EBE1E0EA01FF6C13C0EB3F00141C
-7F9B1A>I<38FE0FE0A3EA0E00AC1301A2EA0F073807FFFE7EEA01FC17157F941A>I<387F
-C7FC00FF13FE007F13FC380E00E0A3380701C0A338038380A33801C700A3EA00EEA3137C
-A2133817157F941A>I<38FF83FE13C7138338380038A26C1370A31338137CA2380C6C60
-000E13E013EEA313C6000613C0EA07C7A2138317157F941A>I<387FC7F8EBCFFCEBC7F8
-380703C038038380EBC700EA01EFEA00FE137C13781338137C13EE120113C73803838000
-0713C01301387FC7FC00FF13FE007F13FC17157F941A>I<387FC7FC00FF13FE007F13FC
-380E00E0A27EEB01C013811203EB8380EA01C3A2EBC700EA00E7A213E61366136E133CA3
-1338A3137813701230EA78E01271EA7FC06C5A001EC7FC17207F941A>I<387FFFF0B5FC
-A238E001E0EB03C0EB078038000F00131E5B5B5B485A485A485A380F0038121E5A5AB512
-F8A315157E941A>I<EB07E0131F133FEB7C0013F05BAB1201EA07C0B45A90C7FC7FEA07
-C0EA01E01200AB7F137CEB3FE0131F130713277DA21A>I<126012F0B3B31260042775A2
-1A>I<127CB4FC7FEA07C0EA01E01200AB7F137CEB3FE0131F133FEB7C0013F05BAB1201
-EA07C0B45A90C7FC127C13277DA21A>I E
+/Ff 74 126 df<121C127FEAFF80B1EA7F00AF123EC7FCA8121C127FA2EAFF80A3EA7F00
+A2121C09346FB32C>33 D<003C131E007F137F481480A66C1400A6007E7FA6003E133EA3
+003C131E001C131C191977B32C>I<010F133C90381F807EA8013F13FE4A5AA4007FB612
+F0B712F8A4003F15F03A007E01F800A5EBFE0301FC5BA6003FB612F0B712F8A46C15F03A
+01F807E000A30003130F01F05BA86C486C5A25337DB22C>I<EB01C0497EA6EB0FFC9038
+7FFF8048B512E00007804880391FFBEFFC393FC3E1FE903803E07F007E80127C00FC1580
+12F8157FA300FCEC3F00A2007E91C7FC127FEA3FC313FBEA1FFF6C13FC6C13FF000114C0
+6C6C7F011F13F801037F14E7ECE1FEECE07F81001880007E1580150F12FFA312FE151F16
+00007E5C007F143ED83F8313FE9038C3E1FC391FFBEFF86CB55A6C5C6C5CC691C7FCEB1F
+F8EB03E0A66D5A21417BB92C>I<D807801307D81FE0EB0F80151F487E486C133F160000
+7C5CD8FCFC137EEAF87C15FE5D14015DA21403D8FCFC5BEA7CF8007F13075D383FF00FD8
+1FE05BA23807801FC75B143F92C7FCA25C147E14FE5CA213015CA213035C13075CA2130F
+5C131FEC800FED3FC0013FEB7FE0140049EBFFF0017E13F9A2D9FE0113F801FC13F0A212
+0113F8120313F015F90007010013F05B000F14FF49EB7FE0A20007EC3FC06C48EB0F0025
+417DB92C>I<EA0F80EA1FC0EA3FE013F0A213F8A2121F120F1200A4120113F0A2120313
+E01207EA0FC0121FEA3F80EA7F0012FE5A5A12700D1B71B22C>39
+D<143814FC13011303EB07F8EB0FF0EB1FC0EB3F80EB7F0013FE485A485A5B12075B120F
+5B485AA2123F90C7FCA25A127EA312FE5AAC7E127EA3127F7EA27F121FA26C7E7F12077F
+12037F6C7E6C7E137FEB3F80EB1FC0EB0FF0EB07F8EB03FC130113001438164272B92C>
+I<127012FC7E7E6C7E6C7EEA0FE06C7E6C7E6C7E6C7E137F7F1480131F14C0130FEB07E0
+A214F01303A214F81301A314FC1300AC130114F8A3130314F0A2130714E0A2EB0FC0131F
+1480133F14005B13FE485A485A485A485AEA3FC0485A48C7FC5A5A1270164279B92C>I<
+EB0380497EA60020140800F8143E00FE14FE00FF13C1EBC7C7EBE7CF003FB512F8000F14
+E0000314806C140038007FFCA248B5FC481480000F14E0003F14F839FFE7CFFEEBC7C7EB
+07C100FE13C000F8143E0020140800001400A66D5A1F247AAA2C>I<147814FCAF007FB6
+12F0B712F8A46C15F0C700FCC7FCAF147825267DAB2C>I<EA0F80EA1FE0EA3FF0EA7FF8
+A213FCA3123F121F120F120013F8A21201EA03F01207EA1FE0EA7FC0EAFF80130012FC12
+700E17718A2C>I<007FB6FCB71280A46C150021067B9B2C>I<121FEA3F80EA7FC0EAFFE0
+A5EA7FC0EA3F80EA1F000B0B708A2C>I<1507ED0F80151FA2153F16005D157E15FE5D14
+015D14035DA214075D140F5D141F5D143F92C7FC5C147E14FE5CA213015C13035C13075C
+130F5C131F5CA2133F91C8FC5B137E13FE5B12015B12035B12075BA2120F5B121F5B123F
+90C9FC5A127E12FE5AA25A127821417BB92C>I<EB03F8EB0FFE90383FFF80497F90B57E
+3901FE0FF03903F803F848486C7EEBE0004848137EA248487FA248C7EA1F80A2003E140F
+007E15C0A3007C140700FC15E0AC6C140F007E15C0A46CEC1F80A36C6CEB3F00A26C6C13
+7E6D13FE00075CEBF0016C6C485A3901FE0FF06CB55A6D5B6D5BD90FFEC7FCEB03F82335
+7CB32C>I<1307497EA2131FA2133F137F13FF5A1207127FB5FC13DF139FEA7C1F1200B3
+AE007FB512E0B612F0A36C14E01C3477B32C>I<EB0FF890387FFF8048B512E000078048
+14FC391FF80FFE393FE001FF903880007F48C7EA3F80007E141F00FE15C0150F6C15E015
+07A3127E123CC8FCA2150F16C0151F1680153F16005D15FE4A5A14034A5A4A5A4A5A4A5A
+ECFF804948C7FC495A495A495AEB3FE0EB7F8049C8FC485A4848EB03C04848EB07E0EA1F
+E0485A48B6FCB7FCA36C15C023347CB32C>I<EB0FFC90387FFF8048B512E0000714F848
+80391FF807FEEBC0004848137F6D7F1680151FA26C5A6CC7FCC8FC153F16005D15FE1401
+4A5AEC1FF890381FFFF0495BA215F86D7F90380007FEEC00FF81ED3F80ED1FC0150FA216
+E01507A2123C127EB4FC150F16C0A248141F007FEC3F806DEB7F006C6C5B391FF807FE6C
+B55A6C5C6C14E0C66C1380D90FFCC7FC23357CB32C>I<EC07F04A7E141F143FA2147EA2
+14FCEB01F8A2EB03F0EB07E0A2EB0FC0EB1F80A2EB3F00137EA25B485AA2485A5B120748
+5AA2485A48C7FCA2127E5AB712FC16FEA36C15FCC8EAF800AA91387FFFF091B512F8A36E
+13F027347EB32C>I<000FB512FE4880A35D0180C8FCADEB83FE90389FFF8090B512E015
+F8819038FE03FE9038F000FF01C07F49EB3F8090C7121F6C15C0C8120FA2ED07E0A4123C
+127EB4FC150F16C0A248141F007EEC3F80007FEC7F006C6C5B6D485A391FF80FFC6CB55A
+6C5C000114C06C6C90C7FCEB0FF823347CB22C>I<121FEA3F80EA7FC0EAFFE0A5EA7FC0
+EA3F80EA1F00C7FCAE121FEA3F80EA7FC0EAFFE0A5EA7FC0EA3F80EA1F000B2470A32C>
+58 D<1507ED1F80153F15FF14034A1300EC1FFC4A5AECFFE0491380010790C7FCEB0FFC
+EB3FF8EB7FE048485A4890C8FCEA0FFEEA1FF8EA7FF0EAFFC05BA27FEA7FF0EA1FF8EA0F
+FEEA03FF6C13C06C6C7EEB3FF8EB0FFC6DB4FC01017F6D13E0EC3FF86E7EEC07FF6E1380
+1400153F151FED0700212A7BAD2C>60 D<127012FC7E6C7E13E06C7EEA1FFC6C7E3803FF
+80C67FEB7FF0EB1FF8EB0FFEEB03FF6D13C06D6C7EEC3FF8EC0FFC6EB4FC0201138080A2
+5C02071300EC0FFCEC3FF8EC7FE049485A4990C7FCEB0FFEEB1FF8EB7FF0EBFFC000035B
+D80FFEC8FC485AEA7FF0485A138048C9FC5A1270212A7BAD2C>62
+D<EB3FFE0003B512C0000F14F04814FC4880397FE007FF90C7FC00FEEC3F806C141FA315
+3F007EEC7F00003C5CC7EA03FEEC0FFC4A5AEC3FE04A5A4AC7FC495A495A5C13075C130F
+5CA76D5A90C9FCA8EB0380EB0FE0A2497EA36D5AA2EB038021337BB22C>I<EC7F809038
+03FFE0010F7F013F7F497F9038FFC0FE3901FE007FD803F87F4848EB1F809038E00FCF39
+0FC03FFF48484813C091B5FCEA3F01393E03F87F903907F03FE0007EEBE01F397C0FC00F
+EC8007A2EAFC1F00F8EB0003A900FCEB8007D87C0F14C0A2ECC00F3A7E07E01F80003EEB
+F03F903903F87F00393F01FFFED81F805B6E5A6C6C6C5A3907E00FC09039F00007C06C6C
+EB0FE0D801FE131F3900FFC0FF6DB512C06D1480010FEBFE00010313F89038007FC02333
+7CB22C>I<14FE497EA4497FA214EFA2130781A214C7A2010F7FA314C390381F83F0A590
+383F01F8A490387E00FCA549137E90B512FEA34880A29038F8003FA34848EB1F80A40007
+15C049130FD87FFEEBFFFC6D5AB514FE6C15FC497E27347EB32C>I<007FB512E015F8B6
+12FE6C8016C03903F0003FED0FE0ED07F01503A2ED01F8A6ED03F0A21507ED0FE0ED1FC0
+EDFF8090B612005D5D15FF16C09039F0001FE0ED07F0ED03F81501ED00FCA216FE167EA6
+16FE16FC1501ED03F8150FED3FF0007FB612E016C0B712806CECFE0015F027337FB22C>
+I<02FF13700107EBE0F84913F9013F13FD4913FFEBFF813901FE007F4848131FD807F013
+0F1507485A491303485A150148C7FCA25A007EEC00F01600A212FE5AAB7E127EA3007F15
+F06CEC01F8A26C7EA26C6C13036D14F06C6C130716E0D803FC131F6C6CEB3FC03A00FF81
+FF806DB512006D5B010F5B6D13F00100138025357DB32C>I<007FB5FCB612C015F0816C
+803907E003FEEC00FFED7F80153FED1FC0ED0FE0A2150716F0150316F81501A4ED00FCAC
+ED01F8A3150316F0A2150716E0150FED1FC0153FED7F80EDFF00EC03FE007FB55AB65A5D
+15C06C91C7FC26337EB22C>I<007FB612F0B712F8A37E3903F00001A7ED00F01600A4EC
+01E04A7EA490B5FCA5EBF003A46E5A91C8FCA5163C167EA8007FB612FEB7FCA36C15FC27
+337EB22C>I<007FB612F8B712FCA37ED803F0C7FCA716781600A515F04A7EA490B5FCA5
+EBF001A46E5A92C7FCAD387FFFE0B5FC805C7E26337EB22C>I<903901FC038090390FFF
+87C04913EF017F13FF90B6FC4813073803FC01497E4848137F4848133F49131F121F5B00
+3F140F90C7FCA2127EED078092C7FCA212FE5AA8913803FFF84A13FCA27E007E6D13F891
+38000FC0A36C141FA27F121F6D133F120F6D137F6C7E6C6C13FF6D5A3801FF076C90B5FC
+6D13EF011F13CF6DEB0780D901FCC7FC26357DB32C>I<387FFFE0B57EA36C5BD803F0C8
+FCB3AE16F0ED01F8A8007FB6FCB7FCA36C15F025337DB22C>76 D<D87FE0EB0FFC486CEB
+1FFEA26D133F007F15FC000F15E001BC137BA4019E13F3A3EB9F01A2018F13E3A21483A2
+018713C314C7A201831383A214EFA201811303A214FFEB80FEA3147C14381400ACD87FF0
+EB1FFC486CEB3FFEA36C48EB1FFC27337EB22C>I<007FB512C0B612F88115FF6C158026
+03F00013C0153FED0FE0ED07F0A2150316F81501A6150316F01507A2ED0FE0ED3FC015FF
+90B61280160015FC5D15C001F0C8FCB0387FFF80B57EA36C5B25337EB22C>80
+D<387FFFFCB67E15E015F86C803907E007FE1401EC007F6F7E151FA26F7EA64B5AA2153F
+4BC7FCEC01FE140790B55A5D15E081819038E007FCEC01FE1400157F81A8160FEE1F80A5
+D87FFEEB1FBFB5ECFF00815E6C486D5AC8EA01F029347EB22C>82
+D<90381FF80790B5EA0F804814CF000714FF5A381FF01F383FC003497E48C7FC007E147F
+00FE143F5A151FA46CEC0F00007E91C7FC127F7FEA3FE0EA1FFCEBFFC06C13FC0003EBFF
+C06C14F06C6C7F01077F9038007FFEEC07FF02001380153FED1FC0A2ED0FE0A200781407
+12FCA56CEC0FC0A26CEC1F806D133F01E0EB7F009038FE01FF90B55A5D00F914F0D8F83F
+13C0D8700790C7FC23357CB32C>I<007FB612FCB712FEA43AFC007E007EA70078153CC7
+1400B3AF90383FFFFCA2497F6D5BA227337EB22C>I<D87FF0EB07FF486C491380A36C48
+6D1300001FC8127CA46C6C5CA76C6C495AA4143E147FA33A03E0FF83E0A214F7A201E113
+C3A3000101E35BA201F113C701F313E7A314C1A200005DA201F713F71480A301FF13FF01
+7F91C7FC4A7EA4013E133E29347FB22C>87 D<387FFFFCB512FEA314FC00FCC7FCB3B3B3
+B512FC14FEA36C13FC17416FB92C>91 D<127812F87EA27E127E127F7E7F121F7F120F7F
+1207A27F12037F12017F12007F137E137F7F80131FA280130F8013078013038013018013
+00A280147E147F8081141F81140F811407811403A281140181140081157E157F81168015
+1FA2150FED070021417BB92C>I<387FFFFCB512FEA37EC7127EB3B3B3387FFFFEB5FCA3
+6C13FC17417DB92C>I<130EEB3F80EBFFE0000313F8000F13FE487FD87FF113C0D8FFE0
+13E0EB803F38FE000F007CEB07C00030EB01801B0C78B22C>I<007FB6FCB71280A46C15
+0021067B7D2C>I<137013F812011203EA07F0EA0FE0EA1FC01380EA3F00123E127E127C
+A212FC5AA4EAFF8013C013E0A2127FA2123FEA1FC0EA0F800D1B71B82C>I<3801FFF000
+0713FE001F6D7E15E048809038C01FF81407EC01FC381F80000006C77EC8127EA3ECFFFE
+131F90B5FC1203120F48EB807E383FF800EA7FC090C7FC12FE5AA47E007F14FEEB800338
+3FE01F6CB612FC6C15FE6C14BF0001EBFE1F3A003FF007FC27247CA32C>I<EA7FF0487E
+A3127F1201AAEC1FE0ECFFF801FB13FE90B6FC16809138F07FC09138801FE091380007F0
+49EB03F85BED01FC491300A216FE167EA816FE6D14FCA2ED01F86D13036DEB07F0150F91
+38801FE09138E07FC091B51280160001FB5B01F813F83900F03FC027337FB22C>I<9038
+03FFE0011F13F8017F13FE48B5FC48804848C6FCEA0FF0485A49137E4848131890C9FC5A
+127EA25AA8127EA2127F6C140F6DEB1F806C7E6D133F6C6CEB7F003907FE03FF6CB55A6C
+5C6C6C5B011F13E0010390C7FC21247AA32C>I<EC0FFE4A7EA380EC003FAAEB07F8EB3F
+FE90B512BF4814FF5A3807FC0F380FF00348487E497E48487F90C7FC007E80A212FE5AA8
+7E007E5CA2007F5C6C7E5C6C6C5A380FF0073807FC1F6CB612FC6CECBFFE6C143FEB3FFC
+90390FF01FFC27337DB22C>I<EB03FE90381FFFC0017F13F048B57E48803907FE03FE39
+0FF800FFD81FE0EB3F805B4848EB1FC090C7120F5A007E15E015075AB7FCA416C000FCC9
+FC7E127EA2127F6CEC03C06DEB07E06C7ED80FF0130F6C6CEB3FC001FF13FF000190B512
+806C1500013F13FC010F13F00101138023247CA32C>I<EC0FF8EC3FFE91B5FC4914805B
+903807FC7F14F090390FE03F0014C092C7FCA6007FB512FEB7FCA36C5C26000FC0C7FCB3
+A8003FB512F04880A36C5C21337DB22C>I<ED03F8903907F80FFC90391FFE3FFE017FB6
+FC48B7FC48ECFE7F9038FC0FF82607F003133E3A0FE001FC1CD9C0001300001F8049137E
+A66D13FE000F5CEBE0016C6C485A3903FC0FF048B5FC5D481480D99FFEC7FCEB87F80180
+C8FCA37F6C7E90B512F06C14FE48ECFF804815E04815F03A3FC0001FF848C7EA03FC007E
+1400007C157C00FC157E48153EA46C157E007E15FCD87F801303D83FE0EB0FF8D81FFCEB
+7FF06CB612E0000315806C1500D8003F13F8010713C028387EA42C>I<EA7FF0487EA312
+7F1201AAEC1FE0EC7FFC9038F9FFFE01FB7F90B6FC9138F03F80ECC01F02807FEC000F5B
+5BA25BB3267FFFE0B5FCB500F11480A36C01E0140029337FB22C>I<1307EB1FC0A2497E
+A36D5AA20107C7FC90C8FCA7387FFFC080B5FC7EA2EA0007B3A8007FB512FCB612FEA36C
+14FC1F3479B32C>I<140EEC3F80A2EC7FC0A3EC3F80A2EC0E0091C7FCA748B512804814
+C0A37EC7120FB3B3A2141F003C1480007E133FB414005CEB01FEEBFFFC6C5B5C001F5B00
+0790C7FC1A467CB32C>I<EA7FE0487EA3127F1201AA91381FFFF04A13F8A36E13F09138
+00FE004A5A4A5A4A5A4A5A4A5A4A5A4AC7FC14FEEBF1FC13F3EBF7FE90B5FCA2EC9F80EC
+0FC001FE7FEBFC07496C7E496C7E811400157E811680151F3A7FFFC0FFFCB500E113FEA3
+6C01C013FC27337EB22C>I<387FFFE0B57EA37EEA0003B3B3A5007FB61280B712C0A36C
+158022337BB22C>I<3A7F83F007E09039CFFC1FF83AFFDFFE3FFCD87FFF13FF91B57E3A
+07FE1FFC3E01FCEBF83F496C487E01F013E001E013C0A301C01380B33B7FFC3FF87FF002
+7F13FFD8FFFE6D13F8D87FFC4913F0023F137F2D2481A32C>I<397FF01FE039FFF87FFC
+9038F9FFFE01FB7F6CB6FC00019038F03F80ECC01F02807FEC000F5B5BA25BB3267FFFE0
+B5FCB500F11480A36C01E0140029247FA32C>I<EB07FCEB1FFF017F13C048B512F04880
+3907FC07FC390FF001FE48486C7E0180133F003F158090C7121F007EEC0FC0A348EC07E0
+A76C140F007E15C0A2007F141F6C15806D133F6C6CEB7F006D5B6C6C485A3907FC07FC6C
+B55A6C5C6C6C13C0011F90C7FCEB07FC23247CA32C>I<397FF01FE039FFF8FFF801FB13
+FE90B6FC6C158000019038F07FC09138801FE091380007F049EB03F85BED01FC491300A2
+16FE167EA816FE6D14FCA2ED01F86D13036DEB07F0150F9138801FE09138E07FC091B512
+80160001FB5B01F813F8EC3FC091C8FCAD387FFFE0B57EA36C5B27367FA32C>I<903903
+FC078090391FFF0FC0017F13CF48B512EF4814FF3807FE07380FF00148487E49137F4848
+133F90C7FC48141F127E150F5AA87E007E141FA26C143F7F6C6C137F6D13FF380FF00338
+07FC0F6CB6FC6C14EF6C6C138F6D130FEB07F890C7FCAD0203B5FC4A1480A36E14002936
+7DA32C>I<D87FFEEB3FC0B53801FFF0020713F8021F13FC6C5B39003F7FE1ECFF019138
+FC00F84A13704A13005CA25C5CA391C8FCAF007FB512E0B67EA36C5C26247EA32C>I<90
+387FF8700003B512F8120F5A5A387FC00F387E00034813015AA36CEB00F0007F140013F0
+383FFFC06C13FE6CEBFF80000314E0C66C13F8010113FCEB0007EC00FE0078147F00FC14
+3F151F7EA26C143F6D133E6D13FE9038F007FC90B5FC15F815E000F8148039701FFC0020
+247AA32C>I<131E133FA9007FB6FCB71280A36C1500D8003FC8FCB1ED03C0ED07E0A5EC
+800F011FEB1FC0ECE07F6DB51280160001035B6D13F89038003FE0232E7EAD2C>I<3A7F
+F003FF80486C487FA3007F7F0001EB000FB3A3151FA2153F6D137F3900FE03FF90B7FC6D
+15807F6D13CF902603FE07130029247FA32C>I<3A7FFF01FFFCB514FE148314016C15FC
+3A03E0000F80A26D131F00011500A26D5B0000143EA26D137E017C137CA2017E13FC013E
+5BA2EB3F01011F5BA21483010F5BA214C701075BA214EF01035BA214FF6D90C7FCA26D5A
+147C27247EA32C>I<D87FFFEB7FFF6EB5FCB515806C16004A7ED807C0EB01F0A66C6C49
+5AA3143E147FA2D801F0495AECFF87A214F7A201F113C700005D9038F9E3CFA201FB13EF
+A3D97BC190C7FC017F13FFA21480A2013F5B90381F007C29247FA32C>I<3A3FFF03FFF0
+48018713F8A36C010313F03A00FC007E005D90387E01F8013F5BEB1F83EC87E090380FCF
+C0903807EF80EB03FF6D90C7FC5C6D5A147C14FE130180903803EF80903807CFC0EB0FC7
+EC83E090381F01F0013F7FEB7E00017C137C49137E0001803A7FFF01FFFC1483B514FE6C
+15FC140127247EA32C>I<3A7FFF01FFFCB5008113FE148314816C010113FC3A03E0000F
+806C7E151F6D140012005D6D133E137C017E137E013E137CA2013F13FC6D5BA2EB0F815D
+A2EB07C1ECC3E0A2EB03E3ECE7C0130114F75DEB00FFA292C7FC80A2143EA2147E147CA2
+14FC5CA2EA0C01003F5BEA7F83EB87E0EA7E0F495A387FFF806C90C8FC6C5A6C5AEA07E0
+27367EA32C>I<003FB612E04815F0A4007EC7EA1FE0ED3FC0ED7F80EDFF004A5A003C49
+5AC7485A4A5A4A5A4A5A4A5A4AC7FCEB01FC495AEB0FF0495A495A495A49C8FC4848EB01
+E04848EB03F0485A485A485A485A485AB7FCA46C15E024247DA32C>I<15FF0207138014
+1F147F91B512004913C04AC7FCEB03F85CB31307EB1FE013FF007F5BB55A49C8FC6D7E6C
+7FC67F131FEB07F01303B380EB01FEECFFC06D13FF6E1380141F14070200130021417BB9
+2C>I<127812FCB3B3B3A9127806416DB92C>I<EA7FC0EAFFF813FE6D7E6C7FC67F131FEB
+07F01303B380EB01FEECFFC06D13FF6E1380141F147F91B512004913C04AC7FCEB03F85C
+B31307EB1FE013FF007F5BB55A49C8FC13F8EA7FC021417BB92C>I
+E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fg cmbx10 14.4 43
-/Fg 43 121 df<EC1FFC49B5FC010714C090391FF807E0D97FC07F9038FF000F5A5B4848
-497E6F5AA26F5AED018092C8FCA4EDFFF8B7FCA33903FC0007B3A8267FFFE0B512C0A32A
-327FB12E>12 D<121C123E127FEAFF8013C0A2EA7FE0EA3FF0EA1FF81207EA01FCEA007E
-133E130C0F0E78B229>18 D<137013F8EA01FCEA03FE1207A2EA0FFCEA1FF8EA3FF013C0
-EA7F0012FC5A12600F0E6FB229>I<121FEA3F80EA7FC0EAFFE0A213F0A3127F123FEA1F
-701200A213F013E0A2120113C01203EA0780EA0F005A123E123C12180C197AB117>39
-D<B512F8A715077F921B>45 D<157CA215FEA34A7EA24A7FA24A7FA34A7F157F021F7FEC
-1E3FA2023E7FEC3C1F027C7FEC780FA202F87FECF0070101804A7EA2D903C08081010781
-4A7EA249B67EA24981011EC7123FA2496E7EA2017C810178140F01F881491407A2000182
-486C80B5D8C001B512FEA337317DB03E>65 D<913A03FF800380023FEBF00749B5EAFC0F
-01079038007F1FD91FF8EB0FBFD93FE0EB03FFD9FFC07F48497F4890C8127F4848153F48
-5A171F485A170F485AA2007F1607A25B94C7FC12FFAB127FA26DED0380A2123FA26C6C15
-0718006C7E5F6C6C151E6C6C151C6C6D143C6C6D14F8D93FE0495AD91FF8EB07C0903A07
-FF803F800101D9FFFEC7FCD9003F13F80203138031337BB13C>67
-D<B712F016FF17C0C6D9C00013F0EE0FFC707EEE01FF701380EF7FC018E0173FEF1FF0A2
-18F8170F18FCA418FEAB18FCA418F8171FA218F0EF3FE0A2EF7FC0EFFF804C13004C5AEE
-0FFCEE7FF0B85A94C7FC16F037317EB03F>I<B812F0A3C69038C0003FEE07F816031600
-A21778A21738A383ED0380A394C7FC1507A2150F153F91B5FCA3ECC03F150F1507A21503
-EF0380A392C7EA0700A45FA2171EA2173E177E17FE1603161FB85AA331317EB036>I<B8
-12F0A3C69038C0003FEE07F816031600A21778A21738A3171CA21507A21700A35D5D5D91
-B5FCA3ECC03F818181A592C8FCACB612F0A32E317EB034>I<B612C0A3C6EBC000B3B3A7
-B612C0A31A317EB01F>73 D<013FB512F0A39039000FFC00B3AE120EEA3F80EA7FC0EAFF
-E0A44A5A13C0007F495AD83F805B6C6CB45A6CB55A6C49C7FCC613E024327EB02B>I<B6
-12F0A3C601C0C8FCB3A91770A317F0A217E0A21601A21603A21607160F161FEE7FC0ED03
-FFB8FCA32C317EB032>76 D<B56C4BB512806E5D6E5DC6F18000D9EFF0150EA3D9E7F85D
-A2D9E3FC5DA2D9E1FE5DA2D9E0FF5DA26E6C495AA26E6C495AA36E6C495AA26E6C130EA2
-6E6C5BA26E6C5BA26E6C5BA26E6C5BA392387F81C0A292383FC380A2DB1FE7C7FCA2ED0F
-FEA26F5AA36F5A487EB526E001F090B61280A26F5A49317EB04E>I<EC0FFE91B512E001
-0714FC90390FFC07FE903A3FE000FF8049486D7E49C7EA1FE048486E7E00038248486E7E
-48486E7EA2001F824980003F1780A2007F17C04980A300FF17E0AB007F17C0A26D5CA200
-3F1780A26D5C001F1700A26C6C4A5A00075E6D140F6C6C4A5A6C6D495A6C6D495A903A3F
-F001FF8090261FFC0790C7FC0107B512FC010014E0DA0FFEC8FC33337BB13E>79
-D<B712E016FEEEFF80C6D9C00113E09238003FF0EE1FF8EE0FFCA2EE07FEA217FFA717FE
-A2EE0FFCA2EE1FF8EE3FF0923801FFE091B61280EEFE0016E002C0C8FCB3B612C0A33031
-7EB038>I<EC0FFE91B512E0010714FC90390FFC07FE903A3FE000FF8049486D7E49486D
-7E4890C76C7E48486E7E48486E7E000F82491403001F824980003F1780A2007F17C04980
-A300FF17E0AB007F17C0A36D5C003F1780A36C6C4A1300EC03F83B0FFC0FFC07FE0007D9
-1FFE5B9039FE1E0F0F3B03FF3C079FF86C90393803DFF06C01F8EBFFE090263FFC011380
-90261FFE0790C7FC0107B500FC134001004A13E091380FFEFC91C7EAFE01EEFF0717FF82
-18C0A3701380A2701300705A705A705A33407BB13E>I<B712C016FCEEFF80C6D9C00113
-E09238003FF0EE0FFC160783707EA284A695C7FCA24C5A5F160FEE3FF04BB45A91B61280
-04FCC8FC829139C007FF8003007F707E163F83707EA583A4194019E083160F1801DC07FF
-13C0B6D8C003138770EBFF80706C1300CAEA0FFC3B327EB03E>I<90391FF003809038FF
-FE070003EBFF8F3907F00FFF380FC001391F80007F48C7123F48141F007E140FA200FE14
-07A36C1403A27F6D90C7FC7F13FC387FFFE014FE6CEBFFC015F06C806C14FE7E0001806C
-6C1480130F010014C01407020013E0157F153F151F12E0A2150FA27E16C0A26C141F6C15
-807E6CEC3F0001C0137E9038FC01FC00F8B55AD8F03F13E0D8E00390C7FC23337BB12E>
-I<007FB81280A39039C00FFC00D87E00151F007C160F00781607A20070160300F017C0A3
-481601A5C792C7FCB3AA017FB67EA332307DAF39>I<B691B51280A30003018091380FF0
-006CEE03C06E14076C5F6E140F017F93C7FC805F013F151E6E143E011F153C6E147C010F
-15788001075DA26E13016D5DED80036D5DEDC0076D5D15E0160F027F91C8FC6F5A023F13
-1EEDF83E021F133C15FC020F5BA2EDFEF802075B15FF6E5BA26E5BA36E5BA26FC9FCA215
-3EA239317EB03E>86 D<1330137813FC487E487E481380381FCFE0383F87F0387E01F838
-F8007C00701338160B77B129>94 D<EB7FF80003B5FC000F14C0391FE01FF09038F007F8
-8114036E7EEA0FE0EA07C0EA0100C7FCA2EB01FF133F3801FFF13807FE01EA1FF0EA3FE0
-EA7FC0138012FF1300A3EB80031407387FC00F393FF03EFF3A1FFFF87FF80007EBF03FC6
-EB801F25207E9F28>97 D<EA01F812FFA3120F1207ADEC0FF0EC7FFE01F9B512809039FF
-E03FE09138000FF049EB07F85B49EB03FC16FEA2150116FFAA16FE150316FCA26DEB07F8
-6DEB0FF09039FF801FE09039E7E07FC001C1B512809039807FFE009038001FE028327EB1
-2E>I<EB07FF017F13E048B512F83903FC03FC3807F807EA0FF0EA1FE0EA3FC0EC03F800
-7FEB01F0903880004000FF1400AA6C7EA2003F140E7F001F141E6C6C133C6C6C13783903
-FF01F06CEBFFE06C6C1380903807FC001F207D9F25>I<ED07E0EC03FFA3EC003F151FAD
-EB0FF8EB7FFF48B512DF3903FE03FF380FF80049137F4848133F4848131FA2127F5B12FF
-AA127F7FA2003F143F6C6C137F15FF6C6C5A3A07FC07DFF00001B5EA9FFF39007FFE1FEB
-0FF028327DB12E>I<EB0FFE90387FFFC048B57E3903FE0FF03907F801F848486C7E4848
-7F4848137FA2007F80491480A212FFA290B6FCA30180C8FCA3127FA27F003FEC03807F00
-1F14076C6CEB0F006C6C133E3903FF01FCC6EBFFF8013F13E0010790C7FC21207E9F26>
-I<14FF010713C0011F13F0EB7FC79038FF0FF85A13FE120313FCEC07F0EC01C091C7FCA7
-B512FCA3D803FCC7FCB3A8387FFFF0A31D327EB119>I<ED03E090391FF80FF090B5EA3F
-F8000314FD3907F81FE1390FF00FF1391FE007F99039C003F860003FECFC00A7001F5CEB
-E0076C6C485A6C6C485A90B55A000E91C7FCEB1FF890C9FC121EA2121F7F90B512C06C14
-F815FE6CECFF8016C016E0121F48C7127F007EEC0FF000FE1407481403A36C1407007E15
-E0007F140FD83FC0EB3FC03A1FF801FF800007B5EAFE00C614F0011F138025307EA029>
-I<EA01F812FFA3120F1207ADEC07F8EC3FFF4A7F9039F9F03FC09039FBC01FE0EBFF804A
-6C7E5B5BA25BB3B500C1B51280A329327DB12E>I<EA03E0487E487E487EA56C5A6C5A6C
-5AC8FCA8EA01F812FFA31207B3A7B51280A311337DB217>I<EA01F812FFA3120F1207B3
-B3A6B512C0A312327DB117>108 D<2703F007F8EB0FF000FFD93FFFEB7FFE4A6DB5FC90
-3CF1F03FC3E07F803D0FF3C01FE7803FC02607F780EBEF009126000FFEEB1FE001FE5C49
-5CA2495CB3B500C1B50083B5FCA340207D9F45>I<3903F007F800FFEB3FFF4A7F9039F1
-F03FC03A0FF3C01FE03807F7804A6C7E13FE5BA25BB3B500C1B51280A329207D9F2E>I<
-EB07FE90383FFFC090B512F03903FC03FC3907F000FE4848137F4848EB3F80003F15C0A2
-4848EB1FE0A300FF15F0A8007F15E0A36C6CEB3FC0A26C6CEB7F80000F15003907F801FE
-3903FE07FC6CB55AD8003F13C0D907FEC7FC24207E9F29>I<3901F80FF000FFEB7FFE01
-F9B512809039FFE07FE0000F9038001FF06C48EB0FF84913074914FCED03FEA3ED01FFA9
-5D16FEA2ED07FCA26DEB0FF86D14F09039FF803FE09138E07FC001F9B512809039F87FFE
-00EC1FE091C8FCABB512C0A3282E7E9F2E>I<D907F813E090387FFE0148B512833903FE
-07C33907FC01E7390FF000FF001F147F4848133FA24848131FA212FF5BA96C7EA36C6C13
-3F001F147F6D13FF6C6C5A3907FE07DF0001B5129F39007FFE1FEB0FF090C7FCAB0203B5
-FCA3282E7D9F2C>I<3803F03F00FFEBFFC001F113F0EBF3C7390FF78FF80007130F13FE
-A29038FC07F0EC03E0EC008015005BB1B512E0A31D207E9F22>I<EBFF87000713EF001F
-13FF48C67E007C131F805A807EA2B490C7FC13F8387FFFC014F06C13FC6C7F00077F0001
-1480EA001F010013C0141F00E0130FA26C1307A27E6CEB0F806C131F39FF803F00EBFFFE
-00F313F838E07FC01A207D9F21>I<131CA4133CA3137CA213FC120112031207121FB6FC
-A3D803FCC7FCB0EC01C0A7EBFE030001EB0780EBFF0F39007FFF00EB3FFCEB07F01A2E7F
-AD20>I<D801F8EB03F000FFEB01FFA3000FEB001F0007140FB2151FA2153F157F6C6C13
-FF9039FE03EFF86CB538CFFF806C6C130FEB0FFC29207D9F2E>I<B538801FFEA33A0FF8
-0003E00007EC01C06D1303000315806D1307000115006D5B6C140EEC801E017F131C14C0
-013F5BA26D6C5AA26D6C5AA214F901075B14FF6D5BA26D90C7FCA26D5AA2147CA2143827
-207E9F2C>I<B5EBFFFCA3D807F8EB1F806C6CEB1E006C6C5B6C6C5B6E5AEB7FC1013F5B
-90381FE3C090380FF7806DB4C7FC5C130313016D7E497F81497F9038079FF090380F0FF8
-EB1E07496C7E496C7E496C7E48481480ED7FC00007143F3AFFF801FFFEA327207E9F2C>
-120 D E
+/Fg 43 121 df<EE3FFF030FB512E092B612F8020781021F814A9038E007FFDAFFFEC77F
+4901F8497F4901E05B490180497F4990C75A495A133F5C4D7F49486E5BA3715BA2715BDD
+00FEC7FC95C8FCA84CB512F0BAFCA626007FFCC7120383B3B3A4007FB5D8FC01B612F0A6
+44547DD34C>12 D<EA0FC0487E487E487E487E7F7F80A280806C7F6C7F000F7F12036C7F
+6C6C7E011F1380010713C0010113809038007F00141F14061A1772D345>18
+D<14FC497E497E4913804913C05B5B5BA290B5FC5A4814804814004813FC14F0485B4813
+804848C7FCEAFFF8EA7FE0EA3F80003EC8FC12181A1764D345>I<EA03F8EA0FFE487E48
+13804813C014E0B5FC14F0A314F8A37EA27E7EEA0FFEEA03F8C7FC130114F0A3130314E0
+1307A2EB0FC0A2EB1F80A2EB3F00137E13FE485A485A485A485A5B6C5A6CC7FC152A77D2
+26>39 D<B712F0AC240C7FA02E>45 D<EF1FC04D7EA24D7EA24D7EA34C7FA24C7FA34C7F
+A24C80A34C80A24C80A217BF047F80171F04FF80A24C7E0301814C7E030381A24C7E0307
+814C7E030F82A24C7E031F824C7F033F825E84037F8293C77E4B825D840201834B800203
+835D02076F7FA292B9FC4A84A24A84A3DA3FC0C86C7F4B81027F84A292C97E4A844A8201
+0185A24A820103854A82010785A24A82010F86496C82B600FC0207B712F8A65D537BD268
+>65 D<932601FFFCEC03C0047FD9FFC013070307B600F8130F033F03FE131F92B8EA803F
+0203EFC0FF020FDAF00113F1023F49C7EA3FFB4A01F00207B5FC49B500C0804991C9FC49
+49824901F88249498249498249498290B5488292CAFC4885485B86485B481A7FA2484918
+3FA3485B1B1FA25AA24A95C7FCA3B5FCAE7EA280A2F30FC07EA36C7FA21B1F6C6D1980A2
+6C1A3F6C7F1C006C6D606C6E17FEA26D6D4C5A6D6D4C5A6D6D16076D6D4C5A6D01FE4C5A
+6D6D4C5A6D02C0EDFF806D6C01F8020390C7FC6E01FFEC1FFE020F02F0EBFFF8020391B6
+5A020017C0033F93C8FC030715FCDB007F14E0040101FCC9FC525478D263>67
+D<BA12C019FEF1FFC01AF81AFE747ED8000701F8C7000F14E0060080071F13FC07077F07
+017F7380747F081F7F8886747F747FA2747FA288861D80A2871DC0A31DE0A4871DF0AF1D
+E063A41DC0A398B51280A31D0062646264505BA2505B505B505B505B4FB5C7FC4F5B070F
+5B077F5B0607B512E0BC128098C8FC1AF81AE04FC9FC19C05C527CD169>I<BC7EA487A2
+D8000701FCC71203F0003F1907851900747E1A3FA21A1F1A0FA3747EA31A03187EA3871A
+01A306FE90C8FCA3170117031707173F92B6FCA69238FC003F1707170317011700A2F31F
+80187EA2F33F00A595C85AA21B7EA21BFEA31A01631A031A07A21A0F1A1F1A3FF2FFF819
+03190F4EB5FCBCFCA363A351517CD05A>I<BCFCA41B80A2D8000701FCC71207F0007F19
+0F1903857313C01A7FA21A3F1A1FA21A0F1BE0A31A07A2187EA21BF01A03A397C7FC18FE
+A3170117031707173F92B6FCA69238FC003F1707170317011700A3187EA795C9FCB2B812
+FCA64C517CD057>I<B812E0A6D8000701FCC7FCB3B3B3B0B812E0A62B527CD134>73
+D<027FB712F0A691C7003FEBC000B3B3B1EA01E0EA0FFC487E487E487FA2B57EA35E60A3
+4A90B5C7FC6C4A5B14006C48495B6C48495B270FFFC03F13E0000390B65A6C93C8FC6C6C
+14FC010F14E0010049C9FC3C537DD147>I<B812FCA6D8000701FCCAFCB3B3A71A3FA41A
+7EA51AFEA3F101FCA31903A21907190F191FA2F13FF819FF601807181F4DB5FCBBFCA21A
+F0A448527CD153>76 D<B600FC070FB612C06F616F61A27060A2D800070BF8C7FC7018FB
+A202F76DEF01F3A202F36DEF03E3A202F16DEF07C3A202F06DEF0F83A26F6CEF1F03A36F
+6C173EA26F6D167CA26F6D16F8A26F6DED01F0A26F6DED03E0A36F6DED07C0A26F6DED0F
+80A2706CED1F00A2706C153EA2706D5CA3706D5CA2706D495AA2706D495AA2706D495AA2
+706D495AA2716C49C7FCA3716C133EA2716D5AA2716D5AA271EBE1F0A271EBF3E0A371EB
+FFC0A2715CA27290C8FCA2725AA2725A497EB76C057FB712C0725AA2725AA2725A7A527C
+D183>I<93380FFFC00303B6FC031F15E092B712FC020316FF020FD9FC0014C0023F01E0
+011F13F04A018001077F494848C7000113FE4901F86E6C7E49496F7F49496F7F49496F7F
+49496F7F498590B5C96C7F4A8248864849707FA2481B804A83481BC0A248497113E0A348
+1BF0A348497113F8A5B51AFCAF6C1BF8A26E5FA36C1BF0A36C6D4D13E0A36C6D94B512C0
+A26C1B806E5E6C1B006C6D4C5BA26C6E4B5B6D6D4B5B6D6D4B5B6D616D6D4B5B6D01FC92
+B55A6D6D4A91C7FC6D6D6C01075B6D02E0011F5B023F01FC90B512F0020F90B712C00203
+94C8FC020016FC031F15E0030392C9FCDB001F13E0565478D267>79
+D<BA7E19FCF1FF801AE01AF81AFED8000701F8C7001F7F060114C0726C7F737F737F8573
+7FA2878587A31C80A91C00A3636163A24F5B4F5B4F5B4F5B4EB55A061F91C7FC92B812FC
+621AC097C8FC19F003FCCCFCB3ACB812E0A651527CD15E>I<93380FFFC00303B6FC031F
+15E092B712FC020316FF020FD9FC0014C0023F01E0011F13F04A90C700037F4948486E13
+FE4901F86E6C7E49496F7F49496F7F49496F7F49496F7F4990C96C7F90B5844A82488648
+49707FA24849711380A248497113C0A2481BE0A24A83481BF0A3481BF8A24A83A3B51AFC
+AF6C1BF8A36E5FA26C1BF0A36C1BE06E5FA26C1BC06E5F6C1B80EE01FE6C6D902607FF80
+90B512006C031F01E05C6E496D5A6C4B01F85C6D6C9027FF03FC035B6D902881FC00FE07
+5B6DD9C1F8D97F0F5B6D01E1DA3F9F5B6DD9F1F06DB55A6D01F994C7FC6DD9FFF86D5B6D
+60023F6D4913F0020F01FF90B512C0020391B6C8FC020016FC031F6F140C03036F141EDB
+001F01E37F93C700016D133E869738F801FE97B5FCA2841CFCA285A21CF8A2851CF07314
+E0A27314C0731480731400735B9638007FF8F21FE0576A78D267>I<B912FCF0FFE019FE
+F1FFC01AF01AFCD8000701F8C7003F13FF060380060080073F7F737F737F87737FA2737F
+A388A899C8FCA263616361634F5B4F5B96B55A060391C9FC063F5B92B812F81AC097CAFC
+19FC19FF9226F8000180DD003F13E0060F7F727F727F86727FA27280A2737FA587A587A5
+75EB0780F50FC0A28773151FA2736D148075133FB800C06DEC807F739138C1FF000701EC
+FFFE735D083F5C080714E0CE001F138062537CD167>I<91261FFF80130F91B500F85B01
+0702FF5B011FEDC07F49EDF0FF90B712F948D9FC0190B5FC489038E0000F480180130348
+48C8FC173F4848814981003F8283485A838312FFA2847FA26D82A27F7F6E92C7FC14E06C
+13FCECFFC015FE6CECFFE016FF6C16E017F86C16FE6C82846C17E06C836C837F011F826D
+82010382EB007F020F1680EC007F1503DB003F14C016031600053F13E0838383127C00FC
+82A383A27E19C0A27EA26D4B1380A27F6D4B130001F85E6D150F01FF4B5A02C04A5A02F8
+ECFFF09126FFC0075B019F90B65A010F5ED8FE034BC7FC48C66C5C48010F14E048902600
+7FFEC8FC3B5478D24C>I<001FBC12C0A5481BE09126F0003F9038E0007F91C7160701FC
+1801498401E0193FA249191F49190FA248C8EF07F0A4007E1A03A500FE1BF8481A01A4C9
+94C7FCB3B3AA91B912F8A655517BD060>I<B8031FB61280A6D8001F01F8CAD80FFEC7FC
+6D6DEF03F81B076D6D601B0F6D626F171FA26D6E4C5AA26D6E5F1B7F6E96C8FC705E6E60
+701501A26E6D5E1A036E607015076E6070150FA26E6D5E1A1F6E6E5D1A3F6E6071147FA2
+6F6D4AC9FCA26F6D5C19016F5E7113036F5E711307A26F6D5C190F6F5E71131F6F5EF080
+3FA26F02C05B197F7001E090CAFC61705C18F1A270EBFBFCA270EBFFF8A2705CA2705CA3
+705CA2705CA27190CBFCA3715AA2715AA2715AA2715A61537DD168>86
+D<1430147814FC497E903807FF80497F497F497F497F48B512FE48804801871380480103
+13C0263FFC0013F04848EB7FF8D8FFE0EB1FFCD87F80EB07F86CC7EA03F0001CEC00E000
+181560261471D245>94 D<91383FFFC00107B512FC011FECFF80017F15E090B77E48D9E0
+077F48D9800013FE486DEB3FFF82486D81707F8284A2707F6C5BA26C5BC648C7FC90C8FC
+A44BB5FC4AB6FC143F49B7FC130F013FEBFE0390B512E0000314004813FC4813F0485B48
+5B5C4890C7FCA2B5FC5BA35EA27F6C5D5E6E497F6C6D017E13FE6C6D4848EBFFF86C9026
+FC0FF814FC6C90B5487E0001EDC03F6C6CEC800F011F9026FE000313F8010101E090C8FC
+3E387CB643>97 D<EB3FF8B5FCA61203C6FCB3A3EE7FF80307B57E031F14F0037F14FC02
+F9B67E02FB9038807FFF9127FFFC001F13C003F001077F03C06D7F4B7F4AC780717F5C72
+7EA285A2721380A41AC0AD1A80A34E1300A36118FF61806E4A5B6F495B6F495B6F495BDA
+E7F8013F5B9126C3FF01B5C7FC028190B512FCDA007F5C496D14E049010791C8FC90C813
+F042547CD24C>I<913803FFF0023FEBFF8091B612E0010315F8010F81499038C01FFE90
+3A7FFE0007FF4948491380485B48494913C05C5A485BA2485B7013805A70130048ED01FC
+91CAFCA3B5FCAD7E80A27EA2EF07E06C7F170F6C6D15C06C161F6E15806C6D143F6C6DEC
+7F006C6D14FE903A7FFF8003FC6D9038F01FF8010F90B55A6D5D01011580D9003F49C7FC
+020313E033387BB63D>I<943801FFC00407B5FCA6EE001F1707B3A3913803FFC0023F13
+FC49B6FC010715C74915F7013FD9E03FB5FC49EB0007D9FFFC130148496D7E4849804849
+80484980A25A5C5AA25A91C8FCA3B5FCAD7EA46C7FA27EA26C6D5CA26C6D5C6C5E6C6D49
+B5FC6C6D4914F0D97FFE010FECFFC0903A3FFF807FEF6D90B512CF0107158F6DECFE0FD9
+007F13F00207018049C7FC42547BD24C>I<913803FFE0023F13FE91B612C0010381010F
+15F84901C07F903A7FFE001FFE49486D7E48496D138048496D13C0484915E048814A15F0
+48815C48EE7FF8A25A91C8FC18FC173FB5FCA391B7FCA418F891CAFCA57EA3807EA21878
+6C6D15FC17016C7F6CEE03F86C6D14076E15F06C6DEC1FE06C6C6C143F6D6C6CEBFFC06D
+D9F0071300010790B55A010115F86D6C14E0021F1480020001F8C7FC36387CB63F>I<ED
+0FFF92B512C0020714F0021F14F8027F14FC9139FFFC1FFE49EBF03F4901C013FF49495A
+491300495AA2495AA2017FEC3FFE4AEB1FFCEE0FF8EE07F093C7FCADB712F0A626007FFC
+C8FCB3B3A5007FB6FCA630547CD32A>I<91261FFF80EB3FC049B539F803FFE00107DAFE
+0F13F0011FDAFFBF13F8017F92B512FC9026FFFC0314CF48D9F000EBFC1F4801C0013F13
+0F4816FE4849D91FFF13F8F007F04890C76CEB81E0F08000A24883A86C5FA36C6D4990C7
+FCA26C6D495A6C5E6C01F0EBFFF86CD9FC035B4890B65A1780D803E74AC8FC01E114F826
+07E01F138091CBFC120FA37FA27F13FE90B712C06C16FCEFFF8018E06C17F8846C836C83
+6D178048B912C012074818E04848C8FCD83FF8150F4848030313F01700485A187FA56D16
+FF007F18E06D5D6C6C4B13C06C6C4B13806C6C6C021F13006C01F0ECFFFE6C01FF010F5B
+C691B612F0013F16C0010F93C7FC010115F8D9000749C8FC3E4F7CB545>I<EB3FF8B5FC
+A61203C6FCB3A3EE1FFE93B512E0030314F8030F804B8092393FE07FFF92267F001F7F15
+FCDAF9F86D7FECFBE014FF4B6D7F5D92C7FCA35CA35CB3ABB6D8FC07B612E0A643537BD2
+4C>I<137F3801FFC0487F487F487FA2487FA76C5BA26C5B6C5B6C5B6C6CC7FC90C8FCAB
+EB1FF8B5FCA612017EB3B3A4B612F0A61C547BD326>I<EB3FF8B5FCA612017EB3B3B3AF
+B612F8A61D537BD226>108 D<D93FF8D90FFFED3FFCB5027F01E049B57E0303B500F801
+0F14E04B02FE4914F8031F6E017F8092263FE03F902680FF807F4BC66C903AC1FC007FFF
+000302FC6DD9C3F07FC6D9F9F86DD9E7E06D7FDAFBF0EDEFC04B5EDAFFC06D01FFC76C7F
+4B5DA292C75CA24A5EA34A5EB3ABB6D8FC03B6D8F00FB612C0A66A367BB573>I<D93FF8
+EB1FFEB591B512E0030314F8030F804B8092393FE07FFF92267F001F7F000314FCC6D9F9
+F86D7FECFBE014FF4B6D7F5D92C7FCA35CA35CB3ABB6D8FC07B612E0A643367BB54C>I<
+EDFFF0021FEBFF80027F14E00103B612FC4981011F9039C03FFF8090273FFE00077FD97F
+F801017F49486D7F48496E7E488348496E7E48834A80481880A24818C091C87EA24818E0
+A4B517F0AB6C18E0A46C18C06E5CA26C1880A26C6D4A13006C5F6E147F6C5F6C6D4A5A6C
+01FC01035B6D6C495B90271FFFC03F13806D90B6C7FC010315FC010015F0021F14800201
+01F8C8FC3C387CB645>I<D93FF8EB7FF8B50107B57E031F14F0037F14FC02F9B67E02FB
+01807F9127FFFC003F13C0000302F0010F7FC602C06D7F5D4AC76C7F717F5C717FA28584
+1A80A47213C0AD4E1380A31A0095B5FCA2615F616E5C6E5E6F495B6F495B6F495B03F801
+7F5BDBFF01B5C7FC02FD90B512FCDAFC7F5C6F14E0030791C8FC030013F093CAFCB0B612
+FCA6424D7CB54C>I<912601FFC0EB07C0023F01F8130F91B500FE131F0103ECFF80010F
+EDC03F013F9039F03FE07F4990388007F0903BFFFE0003F8FF4849EB01FD48496DB5FC48
+498083485B48825C4882A24A805AA3B5C8FCAD6C7FA47E806C5E5F6C7F5F6C6D5C6C6D91
+B5FC6C6D5B6C6D5B6D6C130F6D9038C07FEF6D90B512CF0107150F010114FC6D6C13F002
+07138091C8FCB0040FB612C0A6424D7BB549>I<90393FF001FFB5010F13E04B13F84B7F
+4B7F9238FF1FFFECF1FC00039026F3F03F1380C6EBF7E015C0ECFF80A215007013005C70
+5AEE03F84A90C8FCA45CB3A9B612FEA631367CB539>I<903A01FFF00780011FEBFF1F90
+B7FC5A120748EB001FD81FF8130701E0130148487F007F157F49143FA200FF151FA27FA2
+7F01F891C7FC13FF14F06CEBFFC015FE6F7E6C15E06C15F86C816C816C816C16806C6C15
+C0011F15E01303D9001F14F01400030713F81501007CEC007F00FC153F161F7E160F7EA2
+6D15F0A26D141F6D15E06D143F6DEC7FC001FE903801FF809026FFC00F130091B55A01BF
+5CD8FE1F14F0D8FC0714C027F0007FFCC7FC2D387CB636>I<143FA65CA45CA25BA35B5B
+A25B5B5B90B5FC5A000F91B5FCB8FCA5D8003F90C8FCB3A8EE07E0AB6DEC0FC01580161F
+6D01C01380163F6D9038F07F006DEBFFFE6D5C6D6C5B021F13E0020313802B4D7ECB35>
+I<D91FFCEDFFE0B50207B5FCA60003ED001FC61607B3AD5FA35FA25F017F5D6E91B5FC01
+3FDA01FB13F86ED907F3EBFFE06D9038C01FE36D90B512C36D15830101ECFE036D6C13F8
+020701C0EC800043377BB54C>I<B600F80107B512C0A6C649C8383FE000017FEE1F806E
+153FA26D6D4AC7FCA26D6D147E18FE6D6D5C17016D5E6F13036D5E6F13076D5E6F130F6D
+5E6F131FA26E6C495AA26E018090C8FC5F6E147EEEC0FE6E5C16E16E5C16F36E5C16FFA2
+6E5CA26E5CA26F5BA26F90C9FCA26F5AA26F5AA26F5AA26F5A42357DB449>I<007FB500
+F8013FB51280A6D8003F0180D907FEC7FC6D6D6D5A6D6D495A6D6D495A6D4B5A6D6D495A
+6F495A6D6D49C8FC6E6C485A6E13816EEB83FC6EEBC7F8EEEFF06EEBFFE06E5C6E5C6E91
+C9FC81A26F7F6F7F6F7F5D4B7F4B7F92B57E834A486C7E4A487EDA07F8804A486C7F4A48
+6C7F4A486C7F4A486C7F82DAFF008049486D7F49486E7E49486E7F49486E7F013F81B691
+B612F0A644357EB449>120 D E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fh cmr10 10 68
-/Fh 68 124 df<90380FC0F890387833869038E03F0F3901807E1F12033907007C0EEC3C
-00141CA7B612E0A23907001C00B1397FF1FFE0A2202380A21D>11
-D<EB0FC0EB7830EBE0083801803C0003137CEA0700A2143891C7FCA6B512FCA23807003C
-141CB0397FF1FFC0A21A2380A21C>I<90380FC03F90397031E0C09039E00B80203A0180
-3E00F00003EB7E013807007CA291383C00E0021C1300A6B712F0A23907001C001670B03A
-7FF1FFC7FFA2282380A22A>14 D<120E127EA2121E120EAFEAFFC0A20A157F940E>16
-D<12E0A27E12387E120C7E7EEA01801200090A7BA219>18 D<EA0380A21207EA0E005A12
-185A5A5A5A090A76A219>I<01FC137E3A07070183803A0E018301C03A1C00C600E04813
-6C0078017C13700070133812F091383FFFF00238C7FCA50070137C007815100038136C6C
-01C61320260E018313403A070701C1803A00FC007E0024157F9427>27
-D<EA7038EAF87CEAFC7EA2EA743AEA0402A4EA0804A2EA1008A2EA2010EA40200F0F7EA2
-19>34 D<127012F812FCA212741204A41208A21210A212201240060F7CA20E>39
-D<132013401380EA01005A12061204120CA25AA25AA312701260A312E0AE1260A3127012
-30A37EA27EA2120412067E7EEA0080134013200B327CA413>I<7E12407E7E12187E1204
-1206A27EA2EA0180A313C01200A313E0AE13C0A312011380A3EA0300A21206A21204120C
-5A12105A5A5A0B327DA413>I<127012F812FCA212741204A41208A21210A21220124006
-0F7C840E>44 D<EAFFF0A20C027F8B11>I<127012F8A3127005057C840E>I<EA01F8EA07
-0EEA0E07381C0380383801C0A2007813E0EA7000A300F013F0AE007013E0A3EA78010038
-13C0A2381C0380380E0700EA070EEA01F814227EA019>48 D<13801203120F12FF12F312
-03B3A8EAFFFEA20F217BA019>I<EA03F8EA0FFE38181F80383007C0EA4003EB01E012F8
-00FC13F01300A21278EA3001000013E0A2130314C0EB07801400130E5B5B5B5B138048C7
-FC000213105A5A481330481320387FFFE0B5FCA214217EA019>I<EA01F8EA0FFE381C0F
-80383003C01238007C13E01301A2EA3C031218000013C014801307EB0E005BEA03F8EA00
-0EEB0780EB03C014E0130114F0A21230127812FCA214E0EAF803004013C038200780381C
-0F00EA0FFEEA03F814227EA019>I<EB0180A213031307A2130B13131333132313431383
-A2EA010312021206120412081210A21220124012C0B512FCA238000380A7EB7FFCA21621
-7FA019>I<00101340381E0380381FFF005B5BEA13F00010C7FCA613F8EA1306EA140338
-180180001013C0000013E0130014F0A3127012F8A314E0EAC001004013C0EA6003003013
-80381C0F00EA0FFEEA03F014227EA019>I<133EEBFF803803C0C0380700E0EA0E01EA1C
-03A2383801C090C7FC12781270A2EAF0F8EAF306EAF403EB018000F813C0EB00E05A14F0
-A51270A2007813E012381301001C13C0EB0380380F0700EA03FEEA01F814227EA019>I<
-12401260387FFFF0A214E03840002000C01340481380EB0100A2EA00025BA25B5BA21330
-5BA213E0A2485AA31203A41207A66C5A14237DA119>I<EA01F8EA07FE380E0780381801
-C0EA3000481360A41270007C13C06C1380381F8100EA0FC6EA07FC6C5AEA01FEEA067F38
-0C1F8038100FC0383003E0EA6001EB00705A1430A400601360007013406C13C0381E0780
-380FFE00EA01F814227EA019>I<EA01F8EA07FEEA0E0F381C03801238387801C0127014
-E0EAF000A214F0A5127013011238EA1802120CEA060CEA01F0C712E0A2130114C0123838
-7C0380A238780700EA300EEA383CEA1FF8EA07E014227EA019>I<127012F8A312701200
-AB127012F8A3127005157C940E>I<497EA3497EA3EB05E0A2EB0DF01308A2497E1478A2
-497EA3497EA3497EA290B5FC481480EB0007A20002EB03C0A2000614E000041301A2000C
-14F0121E39FF800FFFA220237EA225>65 D<903807F00890383FFC18EBFC063901F00138
-3903C000F84848137848C71238121E15185AA2007C1408A2127800F81400A81278007C14
-08A2123CA26C1410A26C14206C7E6C6C13403901F001803900FC0700EB3FFCEB07F01D24
-7DA224>67 D<B512F814FE3907800F80EC03C0EC01E0EC00F01578A2153CA2153E151EA2
-151FA9151EA2153E153CA2157815F0EC01E0EC03C0EC0F80B6120014F820227EA126>I<
-B612E0A2380780031400156015201530A215101410A3150014301470EBFFF0A2EB807014
-301410A21504A214001508A31518A215381578EC01F0B6FCA21E227EA122>I<B612E0A2
-380780031400156015201530A21510A21410A21500A214301470EBFFF0A2EB8070143014
-10A491C7FCA8EAFFFEA21C227EA121>I<903807F80490381FFE0CEB7E073901F0009CD8
-03C0137C4848133C48C7121C5A001E140C123E123C007C1404A2127800F891C7FCA79138
-0FFF801278007C9038003C00A2123C123E121E121F7E6C7ED803E0135C6C6C13DC39007E
-038C90381FFE04D907F8C7FC21247DA227>I<EAFFFCA2EA0780B3ACEAFFFCA20E227EA1
-12>73 D<EAFFFEA2EA0780B31540A415C0A21580140114031407141FB6FCA21A227EA11F
->76 D<39FF8007FF13C00007EB00F8D805E01320EA04F0A21378137C133C7FA27FEB0780
-A2EB03C0EB01E0A2EB00F014F81478143CA2141E140FA2EC07A0EC03E0A21401A2140000
-1F1460EAFFE0152020227EA125>78 D<B512F814FE3807801FEC07C0140315E0140115F0
-A515E0140315C0EC0780EC1F00EBFFFC0180C7FCAEEAFFFCA21C227EA122>80
-D<B512E014FC3807801FEC07806E7E81140181A45D14035D4AC7FC143EEBFFF0EB803880
-80140F8081A481A3164015E0140326FFFC011380913800F100C8123E22237EA125>82
-D<3803F810380FFE30EA1E07383801F0EA70001470481330A21410A36C13001270127C12
-7FEA3FF0EA1FFE380FFF80000313C038003FE0EB03F013001470147814387EA46C133014
-706C136000F813E038CF03C038C7FF00EA80FE15247DA21C>I<39FFFC07FFA239078000
-F81520B3A5000314407FA2000114803800E0019038700300EB3C0EEB1FF8EB03F020237E
-A125>85 D<397FF807FFA23907E001F00003EB00C000015C6C6C48C7FC6D5AEB78026D5A
-EB3E0CEB1E08EB1F10EB0FB0EB07A014C06D7E130180497EEB0278EB047CEB0C3EEB081E
-EB101FEB300F903820078001407FEBC003496C7ED801007F481300D80F807F3AFFE007FF
-C0A222227FA125>88 D<EA0804EA1008EA2010A2EA4020A2EA8040A4EAB85CEAFC7EA2EA
-7C3EEA381C0F0F79A219>92 D<1206120FEA1980EA30C0EA6060EAC030EA80100C077AA1
-19>94 D<EA1FF0EA381CEA7C061307EB038012381200A2137FEA07C3EA1E03123C1278A2
-00F01384A31307EA780B383C11C8380FE0F016157E9419>97 D<120E12FEA2121E120EAA
-EB1F80EB60E0EB8030380F0038000E131C141E140E140FA7140E141E141C000F1338380C
-8070EB60E038081F0018237FA21C>I<EA01FEEA0707380C0F80121C1238387807000070
-C7FC12F0A712700078134012386C1380380C0100EA0706EA01F812157E9416>I<1470EB
-07F0A213001470AA13F8EA0706EA0E01381C00F04813701278127012F0A7127012781238
-6C13F0380C01783807067FEA01F818237EA21C>I<EA01FCEA0707380C0380381C01C012
-38387800E0127012F0B5FC00F0C7FCA512700078132012386C13406C138038070300EA00
-FC13157F9416>I<133EEBE1803801C3C0EA0387A23807038090C7FCA8EAFFF8A20007C7
-FCB1EA7FF0A2122380A20F>I<14383801F8CC38070F1CEA0E07381C0380A2003C13C0A4
-001C1380A2380E0700EA0F0EEA19F80010C7FCA21218121CEA1FFF6C13E014F0383800F8
-006013180040131C00C0130CA300601318A200381370380E01C03801FE0016217F9519>
-I<120E12FEA2121E120EAAEB1F80EB60E0EB8070380F0038A2120EAE39FFE3FF80A21923
-7FA21C>I<121C123EA3121CC7FCA8120E127EA2121E120EAFEAFFC0A20A227FA10E>I<13
-7013F8A313701300A81338EA03F8A2EA00781338B3A31270EAF83013701360EA70C0EA1F
-000D2C83A10F>I<120E12FEA2121E120EAAEB03FCA2EB01E01480EB02005B5B5B133813
-F8EA0F1CEA0E1E130E7F1480EB03C0130114E014F038FFE3FEA217237FA21A>I<120E12
-FEA2121E120EB3ABEAFFE0A20B237FA20E>I<390E1FC07F3AFE60E183809039807201C0
-3A1F003C00E07E000E1338AE3AFFE3FF8FFEA227157F942A>I<380E1F8038FE60E0EB80
-70381F00387E120EAE39FFE3FF80A219157F941C>I<13FC38070380380E01C0381C00E0
-481370007813780070133800F0133CA70070133800781378003813706C13E0380E01C038
-0703803800FC0016157F9419>I<380E1F8038FE60E0EB8070381F0038000E131C141EA2
-140FA7141EA2141C000F1338380E8070EB60E0EB1F0090C7FCA8EAFFE0A2181F7F941C>
-I<3801F82038070460EA0E02EA1C01003813E0EA7800A25AA71278A2EA3801121CEA0C02
-EA070CEA01F0C7FCA8EB0FFEA2171F7E941A>I<EA0E1EEAFE63EB8780121E380F030090
-C7FC120EADEAFFF0A211157F9414>I<EA0FC4EA303CEA600C12C01304A212E0EAF800EA
-7F80EA3FF0EA0FF8EA00FC131EEA800E130612C0A21304EAE00CEAD818EA87E00F157E94
-14>I<1202A51206A3120E121EEA3FFC12FFEA0E00AA1304A6EA07081203EA01F00E1F7F
-9E13>I<000E133838FE03F8A2381E0078000E1338AC1478A26C13BC3903833F80EA00FC
-19157F941C>I<38FF80FEA2381E0078000E1320A26C1340A2EB80C000031380A23801C1
-00A2EA00E2A31374A21338A3131017157F941A>I<3AFF8FF87F80A23A1E01E01E00390E
-00C00CECE008EB01600007EB7010A2EB02303903823820A2EB84183901C41C4013CC9038
-E80CC00000EB0E80EBF006D97007C7FCA2EB6003EB200221157F9424>I<38FF81FEA238
-0F00E06C1380138138038300EA01C2EA00E41378A21338133C134E138EEA018738030380
-380201C0000413E0EA1E0038FF03FEA217157F941A>I<38FF80FEA2381E0078000E1320
-A26C1340A2EB80C000031380A23801C100A2EA00E2A31374A21338A31310A25BA3EAF840
-A25B12F90063C7FC123C171F7F941A>I<383FFFC038380380EA300700201300EA600EEA
-401C133C1338C65A5B12015B38038040EA07005A000E13C04813805AEA7801EA7007B5FC
-12157F9416>I<B6FC1801808C19>I E
+/Fh 68 124 df<DA0FF813FC91397FFF07FF903B01F807DF83C0903A07E001FF0F903B1F
+8007FE1FE090393F000FFC137E16F85B9338F007804848010790C7FC1503ACB812F8A328
+01F80003F0C7FCB3AB486C497E267FFFE0B512F0A3333B7FBA30>11
+D<EC0FF8EC7FFE903901F80780903907E001C090391F8000E090383F0007017E497EA25B
+A2485A6F5AED018092C8FCA9ED03F0B7FCA33901F8000F1503B3AA486C497E267FFFE0B5
+12C0A32A3B7FBA2E>I<DA0FF0EB1FF0DA7FFEEBFFFC903B01F80F83F00F903C07E001CF
+C00380903C1F8000FF0001C090273F0007FE130F017E4948497EA2495CA248485C03076E
+5A03030203C7FC95C8FCA9F007E0BAFCA33C01F80003F0001F1807B3AA486C496C497E26
+7FFFE0B500C1B51280A3413B7FBA45>14 D<EA03F012FFA312071203B3AA487EB512C0A3
+12257EA417>16 D<127812FCA27E7EEA7F80121FEA0FC0EA07E0EA03F012001378133C13
+1E13060F0F77B92A>18 D<133C137EA213FE1201EA03FC13F0EA07E0EA0FC0EA1F80EA1E
+005A5A5A12C00F0F6FB92A>I<D903F8EC3F80D91FFFECFFF0903B7E07C003E0FC903BF8
+01F00F803E3C03F000F81F001F4848D97C3E148048486D48EB0FC04914FC001F6E48EB07
+E0123F90C76C5A5AF003F0127E00FE6E5AA393B6FCA204E0C8FCA6007E4A7E127FA26C6F
+14306D131F001F18706C6CD93E7C1460047E14E06C6C496CEB01C06C6C903AF81F800380
+3D00F801F007C00700903B7E07C003F03ED91FFFC7EAFFF8D903F8EC1FC03C277EA541>
+27 D<001C131C007F137F39FF80FF80A26D13C0A3007F137F001C131C00001300A40001
+130101801380A20003130301001300485B00061306000E130E485B485B485B006013601A
+197DB92A>34 D<121C127FEAFF80A213C0A3127F121C1200A412011380A2120313005A12
+06120E5A5A5A12600A1979B917>39 D<146014E0EB01C0EB0380EB0700130E131E5B5BA2
+5B485AA2485AA212075B120F90C7FCA25A121EA2123EA35AA65AB2127CA67EA3121EA212
+1F7EA27F12077F1203A26C7EA26C7E1378A27F7F130E7FEB0380EB01C0EB00E014601352
+78BD20>I<12C07E12707E7E7E120F6C7E6C7EA26C7E6C7EA21378A2137C133C133E131E
+A2131F7FA21480A3EB07C0A6EB03E0B2EB07C0A6EB0F80A31400A25B131EA2133E133C13
+7C1378A25BA2485A485AA2485A48C7FC120E5A5A5A5A5A13527CBD20>I<121C127FEAFF
+80A213C0A3127F121C1200A412011380A2120313005A1206120E5A5A5A12600A19798817
+>44 D<B512FCA516057F941C>I<121C127FEAFF80A5EA7F00121C0909798817>I<EB03F8
+EB1FFF90387E0FC09038F803E03901E000F0484813780007147C48487FA248C77EA24815
+80A3007EEC0FC0A600FE15E0B3007E15C0A4007F141F6C1580A36C15006D5B000F143EA2
+6C6C5B6C6C5B6C6C485A6C6C485A90387E0FC0D91FFFC7FCEB03F8233A7DB72A>48
+D<EB01C013031307131F13FFB5FCA2131F1200B3B3A8497E007FB512F0A31C3879B72A>
+I<EB0FF0EB7FFE48B57E3903E03FE0390F000FF0000E6D7E486D7E486D7E123000706D7E
+126012FCB4EC7F807FA56CC7FC121CC8FCEDFF00A34A5A5D14035D4A5A5D140F4A5A4A5A
+92C7FC147C5C495A495A495A495A91C8FC011EEB01805B5B49130348481400485A485A00
+0EC75A000FB6FC5A5A485CB6FCA321387CB72A>I<EB07F8EB3FFF4913C03901F80FF039
+03C007F848486C7E380E0001000F80381FE0006D7FA56C5A6C5AC85A1401A25D4A5AA24A
+5A5DEC0F80027EC7FCEB1FFCECFF809038000FE06E7EEC01FC816E7EED7F80A216C0A215
+3F16E0A2121EEA7F80487EA416C049137F007F1580007EC7FC0070ECFF006C495A121E39
+0F8003F83907F00FF00001B512C06C6C90C7FCEB0FF8233A7DB72A>I<1538A2157815F8
+A2140114031407A2140F141F141B14331473146314C313011483EB030313071306130C13
+1C131813301370136013C01201EA038013005A120E120C5A123812305A12E0B712F8A3C7
+3803F800AB4A7E0103B512F8A325397EB82A>I<0006140CD80780133C9038F003F890B5
+FC5D5D158092C7FC14FC38067FE090C9FCABEB07F8EB3FFE9038780F803907E007E09038
+8003F0496C7E12066E7EC87EA28181A21680A4123E127F487EA490C71300485C12E00060
+5C12700030495A00385C6C1303001E495A6C6C485A3907E03F800001B5C7FC38007FFCEB
+1FE0213A7CB72A>I<EC3FC0903801FFF0010713FC90380FE03E90383F800790387E001F
+49EB3F804848137F485AA2485A000FEC3F0049131E001F91C7FCA2485AA3127F90C9FCEB
+01FC903807FF8039FF1E07E090383801F0496C7E01607F01E0137E497FA249148016C015
+1FA290C713E0A57EA56C7E16C0A2121FED3F807F000F15006C6C5B15FE6C6C5B6C6C485A
+3900FE07F090383FFFC06D90C7FCEB03FC233A7DB72A>I<12301238123E003FB612E0A3
+16C05A168016000070C712060060140E5D151800E01438485C5D5DC712014A5A92C7FC5C
+140E140C141C5CA25CA214F0495AA21303A25C1307A2130FA3495AA3133FA5137FA96DC8
+FC131E233B7BB82A>I<EB03F8EB1FFF017F13C09038FC07F03901E001F848486C7E4848
+137C90C77E48141E000E141F001E80A3121FA27F5D01E0131E6C6C133E01FC133C6D5B6C
+6C6C5AECC1E06CEBF3C06C01FFC7FC6C5BEB3FFF6D13C081017F13F801F07F3903E07FFE
+3907801FFF48486C1380481303003E6D13C0003CEB007F007C143F0078EC0FE000F81407
+5A1503A21501A36C15C012781503007C15806CEC07006C5C6C6C131ED807E0137C3903F8
+03F0C6B55A013F1380D907FCC7FC233A7DB72A>I<EB03F8EB1FFF017F13C09038FC07E0
+3903F803F048486C7E48486C7E49137E121F48487FA2007F158090C7FCA248EC1FC0A616
+E0A56C143FA27F123F001F147FA26C6C13FF3907E001DF0003149F3801F0033900FC0F1F
+D93FFC13C0EB07F090C7FC153F1680A316005D000F147E487E486C5BA24A5A4A5A49485A
+6C48485A001C495A260F807FC7FC3807FFFC000113F038003FC0233A7DB72A>I<121C12
+7FEAFF80A5EA7F00121CC7FCB2121C127FEAFF80A5EA7F00121C092479A317>I<1538A3
+157CA315FEA34A7EA34A6C7EA202077FEC063FA2020E7FEC0C1FA2021C7FEC180FA20238
+7FEC3007A202707FEC6003A202C07F1501A2D901807F81A249C77F167FA20106810107B6
+FCA24981010CC7121FA2496E7EA3496E7EA3496E7EA213E0707E1201486C81D80FFC0207
+1380B56C90B512FEA3373C7DBB3E>65 D<913A01FF800180020FEBE003027F13F8903A01
+FF807E07903A03FC000F0FD90FF0EB039F4948EB01DFD93F80EB00FF49C8127F01FE153F
+12014848151F4848150FA248481507A2485A1703123F5B007F1601A35B00FF93C7FCAD12
+7F6DED0180A3123F7F001F160318006C7E5F6C7E17066C6C150E6C6C5D00001618017F15
+386D6C5CD91FE05C6D6CEB03C0D903FCEB0F80902701FF803FC7FC9039007FFFFC020F13
+F002011380313D7BBA3C>67 D<B712C016F816FE000190398001FF806C90C7EA3FE0EE0F
+F0EE03F8707E707E177FA2EF3F8018C0171F18E0170F18F0A3EF07F8A418FCAC18F8A4EF
+0FF0A218E0A2171F18C0EF3F80A2EF7F0017FE4C5A4C5AEE0FF0EE3FE0486DEBFF80B8C7
+FC16F816C036397DB83F>I<B812FCA30001903880000F6C90C71201EE007E173E171E17
+0EA31706A317078316C0A394C7FCA31501A21503150F91B5FCA3EC000F15031501A21500
+A21860A318E093C712C0A41701A3EF0380A21707A2170F173F177F486D903807FF00B9FC
+A333397DB839>I<B812F8A30001903880001F6C90C71201EE00FC177C173C171CA2170C
+A4170E1706A2ED0180A21700A41503A21507151F91B5FCA3EC001F15071503A21501A692
+C8FCAD4813C0B612C0A32F397DB836>I<DBFF8013C0020FEBF001023F13FC9139FF803F
+03903A03FC000787D90FF0EB03CF4948EB00EF4948147F4948143F49C8121F485A484815
+0F48481507A248481503A2485A1701123F5B007F1600A448481600AB93B6FCA26C7E9338
+007FE0EF3FC0A2123F7F121FA26C7EA26C7EA26C7E6C7E6C6C157F6D7E6D6C14FF6D6C14
+EFD90FF8EB03C7D903FEEB0783903A00FFC03F0191393FFFFC00020F01F0130002001380
+383D7CBA41>I<B612C0A3C6EBC0006D5AB3B3AD497EB612C0A31A397EB81E>73
+D<B612E0A3000101C0C8FC6C90C9FCB3AD1718A517381730A31770A317F0A21601160316
+0FEE1FE0486D13FFB8FCA32D397DB834>76 D<B5913807FFFE8080C69238007FE06EEC1F
+80D9DFF0EC0F001706EBCFF8EBC7FCA2EBC3FEEBC1FFA201C07F6E7EA26E7E6E7E81140F
+6E7E8114036E7E168080ED7FC016E0153FED1FF0ED0FF8A2ED07FCED03FEA2ED01FF6F13
+86A2EE7FC6EE3FE6A2EE1FF6EE0FFEA216071603A216011600A2177E486C153E487ED80F
+FC151EB500C0140EA2170637397DB83E>78 D<B712C016F816FE000190398001FF806C90
+C7EA3FC0EE0FE0EE07F0EE03F817FC17FE1601A217FFA717FEA2EE03FCA2EE07F817F0EE
+0FE0EE3FC0923801FF0091B512FC16F091C9FCB3A5487FB6FCA330397DB839>80
+D<B612FEEDFFE016F8000190388007FE6C90C76C7EEE3FC0707E707E707EA2707EA283A6
+5FA24C5AA24C5A4C5AEE3F8004FFC8FCED07FC91B512E05E9138000FF0ED03F8ED00FE82
+707E707EA2161F83A583A6F00180A217F8160F1803486D01071400B66D6C5A0401130693
+3800FE0ECAEA3FFCEF07F0393B7DB83D>82 D<D90FF813C090383FFE0190B512813903F8
+07E33907E000F74848137F4848133F48C7121F003E140F007E1407A2007C140312FC1501
+A36C1400A37E6D14006C7E7F13F86CB47E6C13F8ECFF806C14E06C14F86C14FEC680013F
+1480010714C0EB007F020713E0EC007FED3FF0151F150FED07F8A200C01403A21501A37E
+A216F07E15036C15E06C14076C15C06C140F6DEB1F80D8FBF0EB3F00D8F0FE13FE39E03F
+FFF8010F13E0D8C00190C7FC253D7CBA2E>I<B6903807FFFEA3000101809038007FE06C
+90C8EA1F80EF0F001706B3B2170E6D150C80171C133F17186D6C14385F6D6C14F06D6C5C
+6D6C495A6D6CEB07806D6C49C7FC91387F807E91381FFFF8020713E09138007F80373B7D
+B83E>85 D<007FB590383FFFFCA3C601F801071380D97FE0D903FCC7FC013FEC01F06D6C
+5C5F6D6C5C6D6C13034CC8FC6D6C1306160E6D6C5B6DEB8018163891387FC0306E6C5A16
+E06E6C5A91380FF18015FB6EB4C9FC5D14036E7EA26E7F6F7EA24B7E15DF9138019FF091
+38038FF8150F91380607FC91380E03FE140C4A6C7EEC38000230804A6D7E14E04A6D7E49
+486D7E130391C76C7E01066E7E130E010C6E7E011C1401013C8101FE822607FF80010713
+E0B500E0013FEBFF80A339397EB83E>88 D<3901800180000313033907000700000E130E
+485B0018131800381338003013300070137000601360A200E013E0485BA400CE13CE39FF
+80FF806D13C0A3007F137FA2393F803F80390E000E001A1974B92A>92
+D<13101338137C13FE487E3803C780380783C0380F01E0381E00F04813780070131C4813
+0E00401304170D77B92A>94 D<EB1FE0EBFFFC3803E03F3907000F80390F8007E0486C6C
+7E13E06E7EA26E7E6C5A6C5AC8FCA4147FEB07FFEB3FE0EBFE00EA03F8EA0FF0EA1FC012
+3F485A90C7FC160C12FEA31401A26C13036CEB077C903980063E18383FC01E3A0FE0781F
+F03A03FFF00FE03A007F8007C026277DA52A>97 D<EA03F012FFA3120F1203B0EC1FE0EC
+7FF89038F1E03E9039F3801F809039F7000FC001FEEB07E049EB03F049EB01F85BED00FC
+A216FEA2167E167FAA167E16FEA216FC15016D14F8ED03F07F01EEEB07E001C6EB0FC090
+39C7801F00903881E07E903800FFF8C7EA1FC0283B7EB92E>I<EB03FC90381FFF809038
+7E03E03901F80070484813F83907E001FC380FC003A2EA1F80123F90380001F848EB00F0
+1500A2127E12FEAA127E127FA26C14067F001F140E6D130C000F141C6C6C13386C6C1370
+6C6C13E039007C07C090381FFF00EB07F81F277DA525>I<ED0FC0EC03FFA3EC003F150F
+B0EB03F8EB1FFF90387E078F9038F801EF3903F0007F4848133F4848131FA24848130F12
+3F90C7FC5AA2127E12FEAA127E127FA27EA26C6C131FA26C6C133F6C6C137F6C6CEBEFF0
+3A01F801CFFF39007C078F90381FFE0FD907F813C0283B7DB92E>I<EB07F8EB1FFF9038
+7C0FC03901F803E03903F001F0D807E013F8380FC0004848137CA248C7127E153E5A153F
+127E12FEA3B7FCA248C8FCA5127EA2127FA26C14037F001F14076C6C13060007140E6D13
+1CD801F013386C6C137090387E03E090381FFF80903803FC0020277EA525>I<147E9038
+03FF8090380FC1E0EB1F8790383F0FF0137EA213FCA23901F803C091C7FCADB512FCA3D8
+01F8C7FCB3AB487E387FFFF8A31C3B7FBA19>I<ED03F090390FF00FF890393FFC3C3C90
+39F81F707C3901F00FE03903E007C03A07C003E010000FECF000A248486C7EA86C6C485A
+A200075C6C6C485A6D485A6D48C7FC38073FFC38060FF0000EC9FCA4120FA213C06CB512
+C015F86C14FE6CECFF804815C03A0F80007FE048C7EA0FF0003E140348140116F8481400
+A56C1401007C15F06CEC03E0003F1407D80F80EB0F80D807E0EB3F003901FC01FC39007F
+FFF0010790C7FC26387EA52A>I<EA03F012FFA3120F1203B0EC0FF0EC3FFCECF03F9039
+F1C01F809039F3800FC0EBF70013FE496D7EA25BA35BB3A3486C497EB500C1B51280A329
+3A7EB92E>I<EA0380EA0FE0487EA56C5AEA0380C8FCAAEA03F012FFA312071203B3AA48
+7EB512C0A312387EB717>I<EB01C0EB07F0EB0FF8A5EB07F0EB01C090C7FCAAEB01F813
+FFA313071301B3B3A2123C127E00FF13F01303A214E038FE07C0127C383C0F00EA0FFEEA
+03F8154984B719>I<EA03F012FFA3120F1203B1913801FFFCA39138007FC01600157C15
+705D4A5A4A5A4AC7FC141E1438147814FC13F1EBF3FEEBF73F01FE7FEBF81F496C7E8114
+076E7E6E7E811400157E157F811680ED1FC0486CEB3FF0B500C0B5FCA3283A7EB92C>I<
+EA03F012FFA3120F1203B3B3AD487EB512C0A3123A7EB917>I<2703F00FF0EB1FE000FF
+D93FFCEB7FF8913AF03F01E07E903BF1C01F83803F3D0FF3800FC7001F802603F70013CE
+01FE14DC49D907F8EB0FC0A2495CA3495CB3A3486C496CEB1FE0B500C1B50083B5FCA340
+257EA445>I<3903F00FF000FFEB3FFCECF03F9039F1C01F803A0FF3800FC03803F70013
+FE496D7EA25BA35BB3A3486C497EB500C1B51280A329257EA42E>I<EB03FE90380FFF80
+90383E03E09038F800F84848137C48487F48487F4848EB0F80001F15C090C712074815E0
+A2007EEC03F0A400FE15F8A9007E15F0A2007F14076C15E0A26C6CEB0FC0000F15806D13
+1F6C6CEB3F006C6C137EC66C13F890387E03F090381FFFC0D903FEC7FC25277EA52A>I<
+3903F01FE000FFEB7FF89038F1E07E9039F3801F803A0FF7000FC0D803FEEB07E049EB03
+F04914F849130116FC150016FEA3167FAA16FEA3ED01FCA26DEB03F816F06D13076DEB0F
+E001F614C09039F7803F009038F1E07E9038F0FFF8EC1FC091C8FCAB487EB512C0A32835
+7EA42E>I<D903F813C090381FFE0190387E07819038FC01C33903F000E3000714774848
+133749133F001F141F485A150F48C7FCA312FEAA127FA37E6D131F121F6D133F120F6C6C
+137F6C6C13EF3901F801CF39007E078F90381FFE0FEB07F890C7FCABED1FE00203B5FCA3
+28357DA42C>I<3807E01F00FFEB7FC09038E1E3E09038E387F0380FE707EA03E613EE90
+38EC03E09038FC0080491300A45BB3A2487EB512F0A31C257EA421>I<EBFF03000313E7
+380F80FF381E003F487F487F00707F12F0A2807EA27EB490C7FCEA7FE013FF6C13E06C13
+F86C7F00037FC67F01071380EB007F141F00C0EB0FC01407A26C1303A37E15806C13077E
+EC0F00B4131E38F3C07C38E1FFF038C03F801A277DA521>I<1318A51338A31378A313F8
+120112031207001FB5FCB6FCA2D801F8C7FCB215C0A93800FC011580EB7C03017E13006D
+5AEB0FFEEB01F81A347FB220>I<D803F0EB07E000FFEB01FFA3000FEB001F00031407B3
+A4150FA3151F12016D133F0000EC77F86D9038E7FF8090383F03C790381FFF87903A03FC
+07E00029267EA42E>I<B538803FFEA33A0FF8000FF06C48EB07E00003EC03C06D148000
+011500A26C6C1306A26D130E017E130CA26D5BA2EC8038011F1330A26D6C5AA214E00107
+5BA2903803F180A3D901FBC7FCA214FF6D5AA2147CA31438A227257EA32C>I<B53A1FFF
+E03FFEA3260FF8009038000FF86C48017EEB03E018C00003023EEB0180A26C6C013FEB03
+00A36C6CEC8006156FA2017E9038EFC00C15C7A2D93F016D5A15830281EBF038D91F8314
+30150102C3EBF87090260FC6001360A2D907E66D5A02EC137CA2D903FCEB7F804A133FA2
+010192C7FC4A7FA20100141E4A130E0260130C37257EA33C>I<B538807FFFA33A03FE00
+3FF00001EC1F80000092C7FC017E131C6D13186D6C5AECC070010F5B6D6C5AECF180EB03
+FB6DB4C8FC6D5AA2147F804A7E8114CF903801C7E090380383F090380703F8EB0601496C
+7E011C137E49137F01787F496D7E486C80000FEC3FF0D8FFFE90B51280A329247FA32C>
+I<B538803FFEA33A0FF8000FF06C48EB07C00003EC03806C7E16007F00001406A2017E5B
+A2137F6D5BA26D6C5AA2ECC070010F1360A26D6C5AA214F101035BA2D901FBC7FCA214FF
+6D5AA2147CA31438A21430A214701460A25CA2EA7C0100FE5B130391C8FC1306EAFC0EEA
+701C6C5AEA1FF0EA0FC027357EA32C>I<003FB512FCA2EB8003D83E0013F8003CEB07F0
+0038EB0FE012300070EB1FC0EC3F800060137F150014FE495AA2C6485A495AA2495A495A
+495AA290387F000613FEA2485A485A0007140E5B4848130C4848131CA24848133C48C712
+7C48EB03FC90B5FCA21F247EA325>I<B81280A2290280962A>I E
 %EndDVIPSBitmapFont
 %DVIPSBitmapFont: Fi cmbx10 17.28 16
-/Fi 16 117 df<131E137FEBFF8014C05A5AA25A48138048130013FCEA3FF0485AEAFF80
-48C7FC1278123012116CBC31>19 D<DB1FFF14704AB500E013F0020FECFC01027FECFF03
-903B01FFFE007F87010701E0EB0FEF4990C7EA03FFD93FFE80D97FF8804948157F484915
-3F4849151F5C48170F4890C91207A2485A1803485AA2007F1701A34993C7FC12FFAD127F
-7F19F0A2123FA26C7E18016C6C17E018036C7F6CEF07C0806C6DED0F806C6DED1F006D6C
-153ED93FFE5DD90FFF4A5A6D01E0EB07F0010101FEEB3FC06D6CB65A020F02FCC7FC0201
-14F0DA001F90C8FC3C3D7BBB47>67 D<B912F0A428007FF800017FEE001F170717031701
-1700A2187CA3183CA2163CA284A395C7FC167CA216FC150391B5FCA4ECF8031500167CA2
-163CF00780A3F00F00A293C7FCA260A2181E183EA3187E18FE4D5A17031707171FEE01FF
-B9FC60A3393B7CBA41>69 D<DB1FFF14704AB500E013F0020FECFC01027FECFF03903B01
-FFFE007F87010701E0EB0FEF4990C7EA03FFD93FFE80D97FF8804948157F4849153F4849
-151F5C48170F4890C91207A2485A1803485AA2007F1701A34993C8FC12FFAB040FB612E0
-A2127F7F93C7EBF000A2123F7F121FA26C7EA26C7F7E806C7F6C7F6D6C5CEB3FFE90260F
-FF805B6D01E0130F010101FEEB7FCF6D6CB61283020FECFE00020102F81330DA001F0180
-90C7FC433D7BBB4E>71 D<B500F80203B512F0808080C66C6D90390003F000725A81017B
-7F8101797F01787F147F6E7E816E7F6E7F6E7F806E7F826E7F6F7E153F6F7E17806F13C0
-6F13E06F13F0816F13F817FCEE7FFEEE3FFF827013817013C118E17013F17013F982EF7F
-FD18FF8383838383A28383187F183FA2181F01FC160FB500FC150718031801A2443B7CBA
-4D>78 D<B600FC010FB512E0A426007FF8C8380FE000725AB3B3A3013F4C5AA280011F16
-1F96C7FC6D6C5D0107167E6E157C6D6D495A6D6D13036D01F0EB0FF0DA3FFEEBFFC06EB6
-5A02074AC8FC020014F8030F1380433C7CBA4C>85 D<90381FFF8048B512F0000714FC39
-0FF803FF001F010013C06D6D7EA26F7EA26F7E6C5A6C5AEA01C0C8FCA391B5FC130F9038
-7FFC1F3801FFC03807FE00EA1FFC485A5B485A12FF5BA3153FA26D137F6C6C13EF263FF8
-0113FE3B1FFC07CFFFF06CB512070001EBFC0339003FF0002C267DA530>97
-D<ECFFF0010F13FF013F14C09039FFC03FE048010013F0D807FE137F485A5B121F485AED
-3FE0007FEC1FC049EB070092C7FC12FFAA127F7FA2123F6D1478121F6C6C14F86DEB01F0
-6C6CEB03E0000190388007C06C9038E01F80013FB51200010F13FC010013C025267DA52C
->99 D<EE3FC0ED3FFFA4150181B0ECFFC0010F13F8013F13FE9038FFE03F48EB000FD807
-FE130348487F497F121F485AA2127F5BA212FFAA127FA27F123FA2121F6D5B6C6C5B6C6C
-5B6C6C011F13E0C6D9C07E13FF90383FFFFC010F13F001011380303C7DBB37>I<903801
-FFC0011F13F8017F13FE9038FFC1FF00039038007F80D807FCEB1FC0484814E0ED0FF048
-5A003FEC07F8A2485AED03FCA212FFA290B6FCA301E0C8FCA5127FA27F003F153CA26C6C
-147C000F15786C6C14F86C6CEB01F06C6CEB07E06C9038E03FC0013FB51200010F13FC01
-0013E026267DA52D>I<EC1FF8ECFFFE0107EBFF8090391FF83FC090383FF07F90397FE0
-FFE0495A485BA2485BED7FC0A2ED1F0092C7FCA9B67EA4000390C8FCB3ACB512FEA4233C
-7DBB1E>I<01FED93FE0EB07FC00FF902601FFFC90383FFF8002076D90B57E913C0F81FF
-81F03FF0DA3C00903887801F00070138DAC7007F00034914CE4AD97FFC6D7E4A5C13FF4A
-5CA291C75BB3A4B5D8FC1FB50083B512F0A44C267CA553>109 D<01FEEB7FC000FF9038
-01FFF8020713FE91381F03FFEC3C010007017814800003EB70004A14C06D5AA25CA291C7
-FCB3A4B5D8FC3F13FFA430267CA537>I<9038FE01FC00FFEB07FF021F13C091383E3FE0
-147800079038707FF0000313E0A2EBFFC0A29138803FE0ED1FC0ED070092C7FC91C8FCB3
-A2B512FEA424267EA529>114 D<90383FF8383901FFFEF8000713FF381FC00F383F0003
-007E1301007C1300A200FC14787EA26C6C130013F0EBFF806C13FC14FF6C14C06C14F06C
-14F86C14FC000114FEEA003F010113FFEB000F140100F07F157F6C143FA27E153E6C147E
-6C147C6D13FC9038F007F090B512E000F8148039E01FFC0020267DA527>I<130FA55BA4
-5BA25BA25B5A5A5A001FEBFFF0B6FCA3000390C7FCB3153CA86CEB8078A26CEBC0F014E1
-90383FFFE0010F1380903801FE001E377EB626>I E
+/Fi 16 117 df<1403EC1FE0EC3FF0EC7FF8ECFFFC4913FE5B5B4913FF5BA25B4913FE90
+B5FC4814FC4814F815F04814C04814004813FC4813F04813C091C7FCEAFFFC6C5AEA3FE0
+EA1F80001EC8FC1208201D5EE553>19 D<95B56C15E0053F02FCEC03F00407B76C130704
+3F04E0130F4BB800F8131F030705FE133F031F9438FF807F037F9126FC003FEBC1FF4AB6
+0080010313F34A02F8C86CB5FC020F02C0151F4A91C91207027F01FC8291B548824902E0
+707E494A83494A834991CB7E495B49498449865D90B5488448875D481C7F5D481C3F5D5A
+1D1F4891CDFCA3481C0F5CA248F407E09AC7FCA35CA2B5FCB07EA280A47EF503E06EF207
+F07EA36C801D0F7E6F1AE07E6F191F7E6FF13FC07E6D6DF17F80816DF3FF006D6D606D6D
+4E5A6D6E17076D6E4D5A6D02F04D5A6D6E4D5A6E6D4D5A021F01FF4C485A6E02E003075B
+020302F8DB1FFEC7FC6EDAFF80ECFFFC6E6C02FC011F13F0031F91B75A0307188003014D
+C8FCDB003F16F8040716C0DC003F4AC9FC05001480646677E377>67
+D<BEFCA41D80A3D8000102F0C8FC1A071A001B3F871B077513C087A2871C7FA21C3FA3F4
+1FE0A31C0FF13F80A5F407F0A3197F99C7FCA219FFA26060180F187F93B7FCA79338F000
+7F180F18038484A2197F1D7FA2193F1DFEA61C0196C813FCA31C03A31C071DF8A21C0FA2
+1C1F1C3F1DF01C7F1CFF63631B0F6398B512E01A0797B6FCBEFCA41DC0A360617AE06C>
+69 D<95B56C1570053F02FCEC01F80403B76C1303043F04F0130793B800FC130F030705
+FF131F031FF0C03F037F9126FC001FEBE0FF92B60080010113F9020302FCC8003FB5FC02
+0F02E0150F4A028015034A49C97E91B500F882494A834902C0171F495C4991CB7E494984
+49864B84495B90B54884481C7F5D481C3F5D481C1F5D5A1D0F4891CDFCA3481C075CA277
+5A4899C8FCA35CA2B5FCB07E6E041FB9FCA47EA36E93C8ECF8007EA36C80A26C80A27E81
+7E816C807F6D7F816D7F6D806D6E5E6D806D806D6E5E023F01FE5E6E6D6C5D6E02E05D02
+0302FC157F0200DAFFC0903801FFF36F02FE011F13E1031F91B7EAC07F0307F0001F0300
+4D1307043F04F81301040304C0EB0070DC003F4ACAFC050014C0706677E382>71
+D<B700F80403B712F08282A2828383D800016F92C7003F90C7FC71EF07F8A2838383834A
+81816F806F806F80846F80816F806F807080708085827080708070807080857081837180
+718071808671808371807180728087728084728072807280877280847314807314C07314
+E07314F01CF8857314FC7314FE7314FF7414871DC77414E7867414F77414FF86A2868687
+8787A28787878787A2888888888888A28890260FFFC084B700FC187F1D3F1D1FA21D0F1D
+07775A74627AE181>78 D<B900E0020FB712C0A7D8000102F0CB01FCC7FCF51FE0B3B3B3
+A96D1B3F66A2826E1A7F66A26E1AFF7096C8FC6E61656E6D17036E6D4D5A1C0F6E6E4C5A
+6E6E4C5A6E6E4C5A6F6D4B485A6F01FC03075B6F01FF031F90C9FC030702C0ECFFFE6F02
+FE011F5B030091B712F0043F5F040F178004034CCAFCDC007F15F005071580DD001F01F0
+CBFC72647AE17F>85 D<913803FFFE027FEBFFF00103B612FE010F6F7E013F16E049D900
+1F13F8D9FFE001077F486D01017F4801FC6D6D7E717F486D8085717FA2717FA3856C4980
+A26C5B38007FE0EB1F8090C9FCA5040FB5FC030FB6FC4AB7FC141F91B8FC0103ECF80701
+0F1400013F13F890B512E04814804891C7FC4813FC485B5A485B5C5A5CB5FCA25CA25FA3
+6E5CA26C5E6E5C6C6D02FD7F0401ECFFC06C6DD903F9ECFF806C01FED90FF015C0000390
+39FFC07FE06C91B5EA807F6C6C4B7E011F02FC130F010302F001011480D9001F018090C9
+FC4A437BC150>97 D<92380FFFF092B67E020715F0023F15FC91B8FC4917800107DA001F
+13C04901F8010313E04901E0010F13F0017F5B90B5484913F84891C7FC5C5A485BA2485B
+5A7113F05C487013E005011380489338007E0095C7FC5CA3B5FCAE7E80A37EA2806C18F8
+F001FC6C6D1503A26C6DED07F86C7FF00FF06C6E141F6C6E15E06D6DEC7FC06D01F814FF
+6D01FE010313800107903AFFC01FFE006D91B55A01005E023F15E0020F1580020102FCC7
+FCDA000F13C03E437BC149>99 D<F13FFE0507B5FCA7EF00078484B3A7923807FFE092B5
+12FC0207ECFF81021F15E1027F15F149B538C03FFD01079026FC0007B5FC4901F0130149
+496D7E017F01808090B5814891C87E4A814849815A485BA25A5C5AA35A5CA3B5FCAE7EA4
+6C7FA37EA26C7FA26C6D5D6C5F806C5F6C6D5D6D6D4A7F6D6D49B67E6D6D49EDFF800107
+01F8130F6D01FFEBFFF3010091B512E3023F1583020FECFE03020114F8DA000F018002E0
+C7FC51657BE35C>I<92380FFFC04AB512FC020FECFF80023F15E091B712F80103D9FE03
+7F499039F0007FFE011F49EB1FFF4901806D7F4990C76C7F90B56E7F48496E7F5C48707F
+485B8548177F4A825A183F4884A2485BA21A8084A2B5FCA391B9FCA41A0002E0CBFCA57E
+A3807EA36C181F6EEE3F807E197F6C6D17006C606E5E6C6D15016C6E4A5A6D6D14076D6D
+EC1FF86D01F8EC7FF06D01FE49485A01039026FFC01F5B6D91B6C7FC6D6C5D021F15F802
+0315E0DA007F91C8FC030713F041437BC14C>I<EE3FFE0307B512C0033F14F092B67E02
+0381020F9038F80FFF4AEBC03F027FD9007F13804A5A494990B512C0495BA2495BA2495B
+A349496D1380711300715A715AEF01E094C8FCAFB812E0A7D8001F01E0C9FCB3B3AE007F
+B612FEA73A657BE432>I<902607FF80902607FFC0ED1FFFB6027F01FC4AB512F04CB602
+0714FC040703C0011F14FF041F6F017F8193263FF81F6D9026FFE07F7F9326FF80079028
+F803FE001F7F922781FE00039026FC07F86D7FC6DA83F89226FE0FE0816DD987F04C5A6D
+D98FE06D6D48486D7F4C94C7FCDB9F80167E03BFC84A8003BE4D8215FE4B5FA24B5FA24B
+5FA34B5FB3B1B7D8F803B7D8E00FB71280A781417AC08A>109 D<902607FF80903807FF
+C0B6027F13FC4CB6FC040715C0041F8193263FF81F7F9326FF80077F922781FE00037FC6
+DA83F8816DEB87F06DD98FE06D7F5EED9F8003BFC8FC03BE8315FE5DA25DA25DA35DB3B1
+B7D8F803B712E0A753417AC05C>I<903A07FF8007FEB690381FFFC0047F13F093B57E03
+8314FE923987FC1FFFDCF07F1380ED8FC0C6DA9F80B512C07F6DEBBF0015BE15FE5DA25D
+7113805D711300EF0FFCEF03F04B90C8FCA55DB3AEB712FCA73A417BC044>114
+D<913A3FFFC007800103B538FC1FC0011FECFF3F017F15FF9038FFF000000390C7121FD8
+07FC1407484880484880484880177F485A173FA212FF6D151FA27F7F6DED0F8001FF92C7
+FC14E014FF15F86CECFFE016FC6C15FF17C06C16F06C826C16FE6C826C17806C6C16C06D
+16E0130F010116F0EB003F020115F8EC0007DB003F13FC16071601007C8100FE167F173F
+6C161FA36D150FA26D16F8A26D151F7F18F06D153F6DED7FE06D16C06D6C903801FF8002
+E00107130002FCEB7FFE01DFB65A018715F0D8FE0315C048C66C91C7FC0070010713E036
+437BC141>I<EC07F0A6140FA5141FA3143FA2147FA214FFA25B5BA25B5B133F5B48B8FC
+120FB9FCA5D8001F01F0C8FCB3AEEF0FE0AC171F6D6D14C0A2173F6D6D14806F137F6DED
+FF006D9038FF83FE6D14FF6E5C021F14F06E5C020114809126001FFEC7FC335C7DDA40>
+I E
 %EndDVIPSBitmapFont
 end
 %%EndProlog
 %%BeginSetup
-%%Feature: *Resolution 360dpi
+%%Feature: *Resolution 600dpi
 TeXDict begin
 %%PaperSize: A4
 
 %%EndSetup
 %%Page: 1 1
-1 0 bop -36 -192 a Fi(Carte)34 b(de)f(r)n(\023)-47 b(ef)n(\023)g
-(erence)35 b(de)e(GNU)g(Emacs)505 -111 y Fh(\(p)q(our)16
-b(la)g(v)o(ersion)f(20\))0 42 y Fg(Lancemen)n(t)26 b(d'Emacs)0
-166 y Fh(P)o(our)15 b(lancer)h(GNU)h(Emacs)f(20,)g(il)h(su\016t)e(de)i
-(tap)q(er)f(son)g(nom)g(:)22 b Ff(emacs)0 247 y Fh(P)o(our)15
-b(c)o(harger)g(un)h(\014c)o(hier)31 b(\023)-24 b(editer,)16
-b(v)o(oir)g(Fic)o(hiers,)e(ci-dessous.)0 393 y Fg(Quitter)27
-b(Emacs)0 517 y Fh(susp)q(end)15 b(Emacs)h(\(ou)g(l'iconi\014e)g(sous)f
-(X\))334 b Ff(C-z)0 577 y Fh(quitter)17 b(d)o(\023)-24
-b(e\014nitiv)o(emen)o(t)15 b(Emacs)499 b Ff(C-x)27 b(C-c)0
-735 y Fg(Fic)n(hiers)0 859 y Fe(lire)18 b Fh(un)e(\014c)o(hier)f(dans)h
-(Emacs)554 b Ff(C-x)27 b(C-f)0 919 y Fe(sauv)n(egarder)16
-b Fh(un)f(\014c)o(hier)h(sur)f(disque)375 b Ff(C-x)27
-b(C-s)0 979 y Fh(sauv)o(egarder)15 b Fe(tous)g Fh(les)i(\014c)o(hiers)
-510 b Ff(C-x)27 b(s)0 1043 y Fe(ins)o(\023)-27 b(erer)16
-b Fh(le)g(con)o(ten)o(u)g(d'un)f(autre)h(\014c)o(hier)f(dans)h(ce)50
-1103 y(tamp)q(on)914 b Ff(C-x)27 b(i)0 1163 y Fh(remplacer)15
-b(ce)i(\014c)o(hier)e(par)h(le)g(\014c)o(hier)g(v)o(oulu)283
-b Ff(C-x)27 b(C-v)-1 1223 y Fh(\023)-24 b(ecrire)16 b(le)g(tamp)q(on)g
-(dans)g(un)g(\014c)o(hier)f(donn)o(\023)-24 b(e)292 b
-Ff(C-x)27 b(C-w)0 1282 y Fh(con)o(trle)16 b(de)g(v)o(ersion)747
-b Ff(C-x)27 b(C-q)0 1440 y Fg(Obtenir)g(de)g(l'aide)0
-1565 y Fh(Le)e(syst)o(\022)-24 b(eme)25 b(d'aide)e(est)i(simple.)46
-b(F)l(aites)24 b Ff(C-h)h Fh(\(ou)g Ff(F1)p Fh(\))g(et)g(suiv)o(ez)f
-(les)0 1624 y(instructions.)f(Si)17 b(v)o(ous)g(d)o(\023)-24
-b(ebutez,)18 b(faites)f Ff(C-h)27 b(t)18 b Fh(p)q(our)e(suivre)h(un)g
-Fe(didac-)0 1684 y(ticiel)q Fh(.)0 1765 y(supprimer)d(la)i(fen)o(^)-24
-b(etre)17 b(d'aide)545 b Ff(C-x)27 b(1)0 1825 y Fh(faire)16
-b(d)o(\023)-24 b(e\014ler)16 b(la)g(fen)o(^)-24 b(etre)17
-b(d'aide)519 b Ff(C-M-v)0 1911 y Fh(aprop)q(os)15 b(:)25
-b(mon)o(trer)15 b(les)h(commandes)f(con)o(tenan)o(t)g(une)50
-1971 y(certaine)h(c)o(ha)-6 b(^)-19 b(\020ne)756 b Ff(C-h)27
-b(a)0 2031 y Fh(mon)o(trer)15 b(la)h(fonction)h(lanc)o(\023)-24
-b(ee)16 b(par)g(une)g(touc)o(he)219 b Ff(C-h)27 b(c)0
-2091 y Fh(d)o(\023)-24 b(ecrire)16 b(une)g(fonction)698
-b Ff(C-h)27 b(f)0 2150 y Fh(obtenir)16 b(des)g(informations)e(sp)o
-(\023)-24 b(eci\014ques)16 b(au)g(mo)q(de)152 b Ff(C-h)27
-b(m)0 2308 y Fg(R)n(\023)-40 b(ecup)n(\023)g(eration)28
-b(des)f(erreurs)0 2434 y Fe(a)n(v)n(orter)17 b Fh(une)f(commande)f
-(partiellemen)o(t)g(tap)o(\023)-24 b(ee)17 b(ou)50 2494
-y(ex)o(\023)-24 b(ecut)o(\023)g(ee)899 b Ff(C-g)0 2559
-y Fe(r)o(\023)-27 b(ecup)o(\023)g(erer)14 b Fh(un)i(\014c)o(hier)f(p)q
-(erdu)h(par)g(un)g(crash)f(du)50 2618 y(syst)o(\022)-24
-b(eme)845 b Ff(M-x)26 b(recover-file)0 2678 y Fe(ann)n(uler)17
-b Fh(une)f(mo)q(di\014cation)g(non)f(souhait)o(\023)-24
-b(ee)248 b Ff(C-x)27 b(u)f Fh(ou)g Ff(C-_)0 2738 y Fh(restaurer)15
-b(un)h(tamp)q(on)g(a)o(v)o(ec)g(son)g(con)o(ten)o(u)g(initial)87
-b Ff(M-x)26 b(revert-buffer)0 2798 y Fh(r)o(\023)-24
-b(ea\016c)o(her)15 b(un)f(\023)-24 b(ecran)17 b(p)q(erturb)o(\023)-24
-b(e)524 b Ff(C-l)2315 3398 y Fh(1)p eop
+1 0 bop -60 -320 a Fi(Carte)55 b(de)f(r)m(\023)-79 b(ef)m(\023)g
+(erence)52 b(de)i(GNU)h(Emacs)841 -185 y Fh(\(p)r(our)27
+b(la)h(v)n(ersion)e(21\))0 70 y Fg(Lancemen)l(t)46 b(d'Emacs)0
+277 y Fh(P)n(our)26 b(lancer)h(GNU)h(Emacs)f(20,)f(il)i(su\016t)g(de)g
+(tap)r(er)f(son)g(nom)h(:)37 b Ff(emacs)0 412 y Fh(P)n(our)26
+b(c)n(harger)f(un)j(\014c)n(hier)53 b(\023)-39 b(editer,)26
+b(v)n(oir)h(Fic)n(hiers,)g(ci-dessous.)0 655 y Fg(Quitter)47
+b(Emacs)0 862 y Fh(susp)r(end)28 b(Emacs)e(\(ou)i(l'iconi\014e)f(sous)g
+(X\))556 b Ff(C-z)0 961 y Fh(quitter)28 b(d)n(\023)-39
+b(e\014nitiv)n(emen)n(t)27 b(Emacs)832 b Ff(C-x)43 b(C-c)0
+1225 y Fg(Fic)l(hiers)0 1432 y Fe(lire)27 b Fh(un)h(\014c)n(hier)f
+(dans)g(Emacs)924 b Ff(C-x)43 b(C-f)0 1531 y Fe(sauv)m(egarder)29
+b Fh(un)f(\014c)n(hier)f(sur)g(disque)626 b Ff(C-x)43
+b(C-s)0 1631 y Fh(sauv)n(egarder)25 b Fe(tous)i Fh(les)g(\014c)n(hiers)
+853 b Ff(C-x)43 b(s)0 1739 y Fe(ins)n(\023)-46 b(erer)27
+b Fh(le)h(con)n(ten)n(u)f(d'un)h(autre)f(\014c)n(hier)g(dans)g(ce)83
+1838 y(tamp)r(on)1525 b Ff(C-x)43 b(i)0 1938 y Fh(remplacer)26
+b(ce)i(\014c)n(hier)f(par)g(le)g(\014c)n(hier)g(v)n(oulu)474
+b Ff(C-x)43 b(C-v)-2 2038 y Fh(\023)-39 b(ecrire)25 b(le)j(tamp)r(on)g
+(dans)f(un)h(\014c)n(hier)f(donn)n(\023)-39 b(e)487 b
+Ff(C-x)43 b(C-w)0 2137 y Fh(con)n(trle)27 b(de)g(v)n(ersion)1246
+b Ff(C-x)43 b(C-q)0 2401 y Fg(Obtenir)k(de)f(l'aide)0
+2608 y Fh(Le)41 b(syst)n(\022)-39 b(eme)40 b(d'aide)h(est)g(simple.)78
+b(F)-7 b(aites)41 b Ff(C-h)f Fh(\(ou)i Ff(F1)p Fh(\))e(et)i(suiv)n(ez)e
+(les)0 2707 y(instructions.)h(Si)30 b(v)n(ous)e(d)n(\023)-39
+b(ebutez,)29 b(faites)g Ff(C-h)43 b(t)29 b Fh(p)r(our)g(suivre)f(un)i
+Fe(didac-)0 2807 y(ticiel)p Fh(.)0 2942 y(supprimer)d(la)g(fen)n(^)-39
+b(etre)27 b(d'aide)910 b Ff(C-x)43 b(1)0 3042 y Fh(faire)27
+b(d)n(\023)-39 b(e\014ler)26 b(la)i(fen)n(^)-39 b(etre)26
+b(d'aide)867 b Ff(C-M-v)0 3185 y Fh(aprop)r(os)26 b(:)42
+b(mon)n(trer)26 b(les)h(commandes)g(con)n(tenan)n(t)g(une)83
+3285 y(certaine)g(c)n(ha)-9 b(^)-32 b(\020ne)1260 b Ff(C-h)43
+b(a)0 3385 y Fh(mon)n(trer)26 b(la)i(fonction)f(lanc)n(\023)-39
+b(ee)26 b(par)h(une)h(touc)n(he)366 b Ff(C-h)43 b(c)0
+3484 y Fh(d)n(\023)-39 b(ecrire)26 b(une)h(fonction)1165
+b Ff(C-h)43 b(f)0 3584 y Fh(obtenir)27 b(des)h(informations)e(sp)n
+(\023)-39 b(eci\014ques)26 b(au)i(mo)r(de)254 b Ff(C-h)43
+b(m)0 3847 y Fg(R)m(\023)-66 b(ecup)m(\023)g(eration)47
+b(des)g(erreurs)0 4057 y Fe(a)m(v)m(orter)29 b Fh(une)f(commande)f
+(partiellemen)n(t)h(tap)n(\023)-39 b(ee)26 b(ou)83 4156
+y(ex)n(\023)-39 b(ecut)n(\023)g(ee)1495 b Ff(C-g)0 4264
+y Fe(r)n(\023)-46 b(ecup)n(\023)g(erer)28 b Fh(un)g(\014c)n(hier)f(p)r
+(erdu)h(par)f(un)h(crash)e(du)83 4364 y(syst)n(\022)-39
+b(eme)1407 b Ff(M-x)42 b(recover-file)0 4463 y Fe(ann)m(uler)28
+b Fh(une)g(mo)r(di\014cation)f(non)h(souhait)n(\023)-39
+b(ee)412 b Ff(C-x)43 b(u)g Fh(ou)g Ff(C-_)0 4563 y Fh(restaurer)26
+b(un)i(tamp)r(on)f(a)n(v)n(ec)g(son)g(con)n(ten)n(u)g(initial)146
+b Ff(M-x)42 b(revert-buffer)0 4663 y Fh(r)n(\023)-39
+b(ea\016c)n(her)25 b(un)h(\023)-39 b(ecran)25 b(p)r(erturb)n(\023)-39
+b(e)875 b Ff(C-l)3858 5663 y Fh(1)p eop
 %%Page: 2 2
-2 1 bop 0 -202 a Fg(Rec)n(herc)n(he)25 b(incr)n(\023)-40
-b(emen)n(tale)0 -78 y Fh(rec)o(herc)o(her)14 b(v)o(ers)i(l'a)o(v)m(an)o
-(t)645 b Ff(C-s)0 -18 y Fh(rec)o(herc)o(her)14 b(v)o(ers)i(l'arri)o
-(\022)-24 b(ere)620 b Ff(C-r)0 41 y Fh(rec)o(herc)o(her)14
-b(v)o(ers)i(l'a)o(v)m(an)o(t)g(par)g(expression)f(rationnelle)69
-b Ff(C-M-s)0 106 y Fh(rec)o(herc)o(her)14 b(v)o(ers)i(l'arri)o(\022)-24
-b(ere)15 b(par)h(expression)50 166 y(rationnelle)851
-b Ff(C-M-r)0 247 y Fh(s)o(\023)-24 b(electionner)16 b(la)g(c)o(ha)-6
-b(^)-19 b(\020ne)16 b(de)g(rec)o(herc)o(he)f(pr)o(\023)-24
-b(ec)o(\023)g(eden)o(te)134 b Ff(M-p)0 307 y Fh(s)o(\023)-24
-b(electionner)16 b(la)g(c)o(ha)-6 b(^)-19 b(\020ne)16
-b(de)g(rec)o(herc)o(he)f(suiv)m(an)o(te)188 b Ff(M-n)0
-367 y Fh(sortir)15 b(de)i(la)f(rec)o(herc)o(he)f(incr)o(\023)-24
-b(emen)o(tale)381 b Ff(RET)0 427 y Fh(ann)o(uler)15 b(l'e\013et)i(du)f
-(dernier)f(caract)o(\022)-24 b(ere)378 b Ff(DEL)0 486
-y Fh(ann)o(uler)15 b(la)h(rec)o(herc)o(he)f(en)h(cours)498
-b Ff(C-g)0 568 y Fh(Refaites)19 b Ff(C-s)h Fh(ou)f Ff(C-r)h
-Fh(p)q(our)e(r)o(\023)-24 b(ep)o(\023)g(eter)19 b(la)g(rec)o(herc)o(he)
-f(dans)g(une)h(direction)0 627 y(quelconque.)i(Si)12
-b(Emacs)h(est)g(encore)g(en)g(train)f(de)h(c)o(herc)o(her,)f
-Ff(C-g)i Fh(n'ann)o(ule)0 687 y(que)j(ce)g(qui)f(n'a)g(pas)e(\023)-24
-b(et)o(\023)g(e)18 b(fait.)166 1154 y Fd(c)155 1155 y
-Fc(\015)13 b Fd(1997)g(F)m(ree)e(Soft)o(w)o(are)i(F)m(oundation,)g
-(Inc.)18 b(P)o(ermissions)12 b(au)h(dos.)18 b(v2.2)0
-1301 y Fg(D)n(\023)-40 b(eplacemen)n(ts)0 1425 y Fe(en)n(tit)n(y)22
-b(to)d(mo)n(v)n(e)f(o)n(v)n(er)423 b(bac)n(kw)n(ard)50
-b(forw)n(ard)0 1485 y Fh(caract)o(\022)-24 b(ere)714
-b Ff(C-b)208 b(C-f)0 1544 y Fh(mot)825 b Ff(M-b)208 b(M-f)0
-1604 y Fh(ligne)808 b Ff(C-p)208 b(C-n)0 1664 y Fh(aller)16
-b(au)g(d)o(\023)-24 b(ebut)16 b(\(ou)33 b(la)17 b(\014n\))f(de)g(la)h
-(ligne)113 b Ff(C-a)208 b(C-e)0 1724 y Fh(phrase)768
-b Ff(M-a)208 b(M-e)0 1784 y Fh(paragraphe)665 b Ff(M-{)208
-b(M-})0 1843 y Fh(page)811 b Ff(C-x)26 b([)156 b(C-x)27
-b(])0 1903 y Fh(s-expression)649 b Ff(C-M-b)156 b(C-M-f)0
-1963 y Fh(fonction)735 b Ff(C-M-a)156 b(C-M-e)0 2023
-y Fh(aller)16 b(au)g(d)o(\023)-24 b(ebut)16 b(\(ou)33
-b(la)17 b(\014n\))f(du)g(tamp)q(on)98 b Ff(M-<)208 b(M->)0
-2104 y Fh(passer)32 b(l')o(\023)-24 b(ecran)15 b(suiv)m(an)o(t)649
-b Ff(C-v)0 2164 y Fh(passer)32 b(l')o(\023)-24 b(ecran)15
-b(pr)o(\023)-24 b(ec)o(\023)g(eden)o(t)595 b Ff(M-v)0
-2223 y Fh(d)o(\023)-24 b(e\014ler)16 b(l')o(\023)-24
-b(ecran)15 b(v)o(ers)h(la)g(droite)536 b Ff(C-x)27 b(<)0
-2283 y Fh(d)o(\023)-24 b(e\014ler)16 b(l')o(\023)-24
-b(ecran)15 b(v)o(ers)h(la)g(gauc)o(he)515 b Ff(C-x)27
-b(>)0 2343 y Fh(placer)16 b(la)g(ligne)g(couran)o(te)g(au)g(cen)o(tre)g
-(de)g(l')o(\023)-24 b(ecran)179 b Ff(C-u)27 b(C-l)0 2501
-y Fg(D)n(\023)-40 b(etruire)28 b(et)g(supprimer)0 2625
-y Fe(en)n(tit)n(y)22 b(to)d(kill)605 b(bac)n(kw)n(ard)51
-b(forw)n(ard)0 2685 y Fh(caract)o(\022)-24 b(ere)16 b(\(suppression,)e
-(pas)i(destruction\))49 b Ff(DEL)209 b(C-d)0 2745 y Fh(mot)829
-b Ff(M-DEL)157 b(M-d)0 2804 y Fh(ligne)16 b(\(jusqu')g(la)h(\014n\))499
-b Ff(M-0)27 b(C-k)104 b(C-k)0 2864 y Fh(phrase)772 b
-Ff(C-x)27 b(DEL)104 b(M-k)0 2924 y Fh(s-expression)653
-b Ff(M--)27 b(C-M-k)52 b(C-M-k)0 3005 y Fh(d)o(\023)-24
-b(etruire)15 b(une)i Fe(r)o(\023)-27 b(egion)693 b Ff(C-w)0
-3065 y Fh(copier)16 b(une)g(r)o(\023)-24 b(egion)15 b(dans)h(le)h(kill)
-f(ring)401 b Ff(M-w)0 3125 y Fh(d)o(\023)-24 b(etruire)15
-b(jusqu')h(l'o)q(ccurrence)g(suiv)m(an)o(te)g(de)g Fb(c)m(ar)195
-b Ff(M-z)27 b Fb(c)m(ar)0 3206 y Fh(r)o(\023)-24 b(ecup)o(\023)g(erer)
-15 b(la)h(derni)o(\022)-24 b(ere)16 b(c)o(hose)f(d)o(\023)-24
-b(etruite)363 b Ff(C-y)0 3271 y Fh(remplacer)15 b(la)h(derni)o(\022)-24
-b(ere)16 b(r)o(\023)-24 b(ecup)o(\023)g(eration)15 b(par)g(ce)i(qui)g
-(a)48 3331 y(\023)-24 b(et)o(\023)g(e)18 b(d)o(\023)-24
-b(etruit)16 b(a)o(v)m(an)o(t)718 b Ff(M-y)2315 3398 y
-Fh(2)p eop
+2 1 bop 0 -337 a Fg(Rec)l(herc)l(he)47 b(incr)m(\023)-66
+b(emen)l(tale)0 -130 y Fh(rec)n(herc)n(her)25 b(v)n(ers)i(l'a)n(v)-5
+b(an)n(t)1075 b Ff(C-s)0 -30 y Fh(rec)n(herc)n(her)25
+b(v)n(ers)i(l'arri)n(\022)-39 b(ere)1033 b Ff(C-r)0 69
+y Fh(rec)n(herc)n(her)25 b(v)n(ers)i(l'a)n(v)-5 b(an)n(t)27
+b(par)f(expression)g(rationnelle)117 b Ff(C-M-s)0 177
+y Fh(rec)n(herc)n(her)25 b(v)n(ers)i(l'arri)n(\022)-39
+b(ere)24 b(par)j(expression)83 277 y(rationnelle)1420
+b Ff(C-M-r)0 412 y Fh(s)n(\023)-39 b(electionner)26 b(la)h(c)n(ha)-9
+b(^)-32 b(\020ne)26 b(de)i(rec)n(herc)n(he)d(pr)n(\023)-39
+b(ec)n(\023)g(eden)n(te)223 b Ff(M-p)0 512 y Fh(s)n(\023)-39
+b(electionner)26 b(la)h(c)n(ha)-9 b(^)-32 b(\020ne)26
+b(de)i(rec)n(herc)n(he)d(suiv)-5 b(an)n(te)315 b Ff(M-n)0
+611 y Fh(sortir)26 b(de)i(la)f(rec)n(herc)n(he)f(incr)n(\023)-39
+b(emen)n(tale)636 b Ff(RET)0 711 y Fh(ann)n(uler)27 b(l'e\013et)h(du)g
+(dernier)f(caract)n(\022)-39 b(ere)628 b Ff(DEL)0 811
+y Fh(ann)n(uler)27 b(la)g(rec)n(herc)n(he)f(en)h(cours)831
+b Ff(C-g)0 946 y Fh(Refaites)32 b Ff(C-s)f Fh(ou)h Ff(C-r)f
+Fh(p)r(our)h(r)n(\023)-39 b(ep)n(\023)g(eter)29 b(la)j(rec)n(herc)n(he)
+e(dans)i(une)h(direction)0 1046 y(quelconque.)h(Si)23
+b(Emacs)d(est)i(encore)f(en)h(train)g(de)g(c)n(herc)n(her,)f
+Ff(C-g)g Fh(n'ann)n(ule)0 1145 y(que)28 b(ce)f(qui)h(n'a)f(pas)e(\023)
+-39 b(et)n(\023)g(e)26 b(fait.)276 1923 y Fd(c)258 1925
+y Fc(\015)c Fd(1997)h(F)-5 b(ree)21 b(Soft)n(w)n(are)h(F)-5
+b(oundation,)20 b(Inc.)29 b(P)n(ermissions)21 b(au)h(dos.)30
+b(v2.2)0 2168 y Fg(D)m(\023)-66 b(eplacemen)l(ts)0 2375
+y Fe(en)m(tit)m(y)32 b(to)g(mo)m(v)m(e)f(o)m(v)m(er)704
+b(bac)m(kw)m(ard)86 b(forw)m(ard)0 2475 y Fh(caract)n(\022)-39
+b(ere)1187 b Ff(C-b)346 b(C-f)0 2574 y Fh(mot)1375 b
+Ff(M-b)346 b(M-f)0 2674 y Fh(ligne)1347 b Ff(C-p)346
+b(C-n)0 2773 y Fh(aller)27 b(au)g(d)n(\023)-39 b(ebut)27
+b(\(ou)56 b(la)27 b(\014n\))h(de)g(la)f(ligne)189 b Ff(C-a)346
+b(C-e)0 2873 y Fh(phrase)1281 b Ff(M-a)346 b(M-e)0 2973
+y Fh(paragraphe)1109 b Ff(M-{)346 b(M-})0 3072 y Fh(page)1351
+b Ff(C-x)42 b([)260 b(C-x)42 b(])0 3172 y Fh(s-expression)1083
+b Ff(C-M-b)258 b(C-M-f)0 3272 y Fh(fonction)1225 b Ff(C-M-a)258
+b(C-M-e)0 3371 y Fh(aller)27 b(au)g(d)n(\023)-39 b(ebut)27
+b(\(ou)56 b(la)27 b(\014n\))h(du)g(tamp)r(on)164 b Ff(M-<)346
+b(M->)0 3507 y Fh(passer)54 b(l')n(\023)-39 b(ecran)26
+b(suiv)-5 b(an)n(t)1082 b Ff(C-v)0 3606 y Fh(passer)54
+b(l')n(\023)-39 b(ecran)26 b(pr)n(\023)-39 b(ec)n(\023)g(eden)n(t)990
+b Ff(M-v)0 3706 y Fh(d)n(\023)-39 b(e\014ler)26 b(l')n(\023)-39
+b(ecran)26 b(v)n(ers)g(la)i(droite)893 b Ff(C-x)43 b(<)0
+3805 y Fh(d)n(\023)-39 b(e\014ler)26 b(l')n(\023)-39
+b(ecran)26 b(v)n(ers)g(la)i(gauc)n(he)858 b Ff(C-x)43
+b(>)0 3905 y Fh(placer)27 b(la)g(ligne)g(couran)n(te)f(au)i(cen)n(tre)f
+(de)g(l')n(\023)-39 b(ecran)298 b Ff(C-u)43 b(C-l)0 4168
+y Fg(D)m(\023)-66 b(etruire)47 b(et)f(supprimer)0 4375
+y Fe(en)m(tit)m(y)32 b(to)g(kill)1003 b(bac)m(kw)m(ard)86
+b(forw)m(ard)0 4475 y Fh(caract)n(\022)-39 b(ere)25 b(\(suppression,)h
+(pas)h(destruction\))83 b Ff(DEL)346 b(C-d)0 4575 y Fh(mot)1382
+b Ff(M-DEL)258 b(M-d)0 4674 y Fh(ligne)27 b(\(jusqu')i(la)e(\014n\))833
+b Ff(M-0)43 b(C-k)171 b(C-k)0 4774 y Fh(phrase)1288 b
+Ff(C-x)43 b(DEL)171 b(M-k)0 4873 y Fh(s-expression)1090
+b Ff(M--)43 b(C-M-k)83 b(C-M-k)0 5009 y Fh(d)n(\023)-39
+b(etruire)26 b(une)i Fe(r)n(\023)-46 b(egion)1157 b Ff(C-w)0
+5108 y Fh(copier)27 b(une)g(r)n(\023)-39 b(egion)26 b(dans)h(le)h(kill)
+f(ring)670 b Ff(M-w)0 5208 y Fh(d)n(\023)-39 b(etruire)26
+b(jusqu')i(l'o)r(ccurrence)e(suiv)-5 b(an)n(te)28 b(de)f
+Fb(c)l(ar)324 b Ff(M-z)43 b Fb(c)l(ar)0 5343 y Fh(r)n(\023)-39
+b(ecup)n(\023)g(erer)24 b(la)j(derni)n(\022)-39 b(ere)26
+b(c)n(hose)h(d)n(\023)-39 b(etruite)604 b Ff(C-y)0 5451
+y Fh(remplacer)26 b(la)i(derni)n(\022)-39 b(ere)25 b(r)n(\023)-39
+b(ecup)n(\023)g(eration)24 b(par)j(ce)h(qui)f(a)81 5551
+y(\023)-39 b(et)n(\023)g(e)26 b(d)n(\023)-39 b(etruit)27
+b(a)n(v)-5 b(an)n(t)1196 b Ff(M-y)3858 5663 y Fh(2)p
+eop
 %%Page: 3 3
-3 2 bop 0 -202 a Fg(Marquer)0 -78 y Fh(placer)16 b(la)g(marque)g(ici)
-701 b Ff(C-@)27 b Fh(ou)f Ff(C-SPC)-1 -18 y Fh(\023)-24
-b(ec)o(hanger)15 b(le)i(p)q(oin)o(t)f(et)h(la)f(marque)467
-b Ff(C-x)27 b(C-x)0 63 y Fh(placer)16 b(la)g(marque)g
-Fb(ar)m(g)22 b Fe(mots)14 b Fh(plus)i(loin)339 b Ff(M-@)0
-123 y Fh(marquer)15 b(le)i Fe(paragraphe)598 b Ff(M-h)0
-182 y Fh(marquer)15 b(la)h Fe(page)764 b Ff(C-x)27 b(C-p)0
-242 y Fh(marquer)15 b(la)h Fe(s-expression)577 b Ff(C-M-@)0
-302 y Fh(marquer)15 b(la)h Fe(fonction)677 b Ff(C-M-h)0
-362 y Fh(marquer)15 b(tout)i(le)g Fe(tamp)r(on)579 b
-Ff(C-x)27 b(h)0 520 y Fg(Remplacemen)n(t)e(in)n(teractif)0
-644 y Fh(remplacer)15 b(in)o(teractiv)o(emen)o(t)g(une)h(c)o(ha)-6
-b(^)-19 b(\020ne)16 b(de)g(texte)126 b Ff(M-\045)0 704
-y Fh(en)16 b(utilisan)o(t)g(les)g(expressions)f(rationnelles)221
-b Ff(M-x)26 b(query-replace-regexp)0 785 y Fh(Les)13
-b(r)o(\023)-24 b(ep)q(onses)12 b(admises)g(dans)g(le)h(mo)q(de)g(de)g
-(remplacemen)o(t)f(in)o(teractif)h(son)o(t)0 845 y(:)0
-926 y Fe(remplacer)j Fh(celle-l,)g(passer)32 b(la)16
-b(suiv)m(an)o(te)312 b Ff(SPC)0 986 y Fh(remplacer)15
-b(celle-l,)h(rester)g(l)594 b Ff(,)0 1045 y Fe(passer)32
-b Fh(la)16 b(suiv)m(an)o(te)g(sans)g(remplacer)371 b
-Ff(DEL)0 1105 y Fh(remplacer)15 b(toutes)i(les)f(corresp)q(ondances)e
-(suiv)m(an)o(tes)112 b Ff(!)0 1165 y Fe(rev)n(enir)34
-b Fh(la)17 b(corresp)q(ondance)d(pr)o(\023)-24 b(ec)o(\023)g(eden)o(te)
-285 b Ff(^)0 1225 y Fe(sortir)16 b Fh(du)g(remplacemen)o(t)f(in)o
-(teractif)390 b Ff(RET)0 1290 y Fh(en)o(trer)16 b(dans)f(l')o(\023)-24
-b(edition)16 b(r)o(\023)-24 b(ecursiv)o(e)15 b(\()p Ff(C-M-c)j
-Fh(p)q(our)50 1349 y(sortir\))945 b Ff(C-r)0 1507 y Fg(F)-7
-b(en)n(^)-40 b(etres)27 b(m)n(ultiples)0 1631 y Fh(Lorsqu'il)13
-b(y)h(a)g(deux)f(commandes,)g(la)g(seconde)h(est)g(p)q(our)f(l'"autre)g
-(cadre".)0 1713 y(supprimer)h(toutes)i(les)h(autres)f(fen)o(^)-24
-b(etres)356 b Ff(C-x)27 b(1)0 1794 y Fh(diviser)16 b(la)g(fen)o(^)-24
-b(etre)17 b(horizon)o(talemen)o(t)191 b Ff(C-x)27 b(2)154
-b(C-x)27 b(5)f(2)0 1854 y Fh(supprimer)14 b(cette)k(fen)o(^)-24
-b(etre)416 b Ff(C-x)27 b(0)154 b(C-x)27 b(5)f(0)0 1935
-y Fh(diviser)16 b(la)g(fen)o(^)-24 b(etre)17 b(v)o(erticalemen)o(t)459
-b Ff(C-x)27 b(3)0 2016 y Fh(faire)16 b(d)o(\023)-24 b(e\014ler)16
-b(l'autre)g(fen)o(^)-24 b(etre)564 b Ff(C-M-v)0 2097
-y Fh(switc)o(h)16 b(cursor)f(to)i(another)f(windo)o(w)506
-b Ff(C-x)27 b(o)155 b(C-x)26 b(5)h(o)0 2157 y Fh(s)o(\023)-24
-b(electionner)16 b(le)g(tamp)q(on)g(dans)g(l'autre)g(fen)o(^)-24
-b(etre)289 b Ff(C-x)27 b(4)f(b)103 b(C-x)26 b(5)h(b)0
-2217 y Fh(a\016c)o(her)15 b(le)i(tamp)q(on)f(dans)f(l'autre)h(fen)o(^)
--24 b(etre)388 b Ff(C-x)27 b(4)f(C-o)51 b(C-x)26 b(5)h(C-o)0
-2277 y Fh(c)o(harger)15 b(un)h(\014c)o(hier)f(dans)h(l'autre)g(fen)o(^)
--24 b(etre)401 b Ff(C-x)27 b(4)f(f)103 b(C-x)26 b(5)h(f)0
-2336 y Fh(c)o(harger)15 b(un)h(\014c)o(hier)f(en)i(lecture)f(seule)g
-(dans)g(l'autre)f(fen)o(^)-24 b(etre)50 b Ff(C-x)27 b(4)f(r)103
-b(C-x)26 b(5)h(r)0 2396 y Fh(lancer)16 b(Dired)g(dans)f(l'autre)h(fen)o
-(^)-24 b(etre)513 b Ff(C-x)27 b(4)f(d)103 b(C-x)26 b(5)h(d)0
-2456 y Fh(trouv)o(er)16 b(un)g(tag)g(dans)g(l'autre)g(fen)o(^)-24
-b(etre)465 b Ff(C-x)27 b(4)f(.)103 b(C-x)26 b(5)h(.)0
-2537 y Fh(agrandir)15 b(la)h(fen)o(^)-24 b(etre)729 b
-Ff(C-x)27 b(^)0 2597 y Fh(rap)q(etisser)15 b(la)i(fen)o(^)-24
-b(etre)702 b Ff(C-x)27 b({)-1 2657 y Fh(\023)-24 b(elargir)15
-b(la)i(fen)o(^)-24 b(etre)773 b Ff(C-x)27 b(})2315 3398
+3 2 bop 0 -337 a Fg(Marquer)0 -130 y Fh(placer)27 b(la)g(marque)g(ici)
+1169 b Ff(C-@)43 b Fh(ou)g Ff(C-SPC)-2 -30 y Fh(\023)-39
+b(ec)n(hanger)25 b(le)i(p)r(oin)n(t)h(et)g(la)f(marque)779
+b Ff(C-x)43 b(C-x)0 105 y Fh(placer)27 b(la)g(marque)g
+Fb(ar)l(g)35 b Fe(mots)26 b Fh(plus)i(loin)566 b Ff(M-@)0
+205 y Fh(marquer)26 b(le)i Fe(paragraphe)1002 b Ff(M-h)0
+304 y Fh(marquer)26 b(la)h Fe(page)1274 b Ff(C-x)43 b(C-p)0
+404 y Fh(marquer)26 b(la)h Fe(s-expression)961 b Ff(C-M-@)0
+503 y Fh(marquer)26 b(la)h Fe(fonction)1128 b Ff(C-M-h)0
+603 y Fh(marquer)26 b(tout)i(le)g Fe(tamp)s(on)968 b
+Ff(C-x)43 b(h)0 866 y Fg(Remplacemen)l(t)k(in)l(teractif)0
+1073 y Fh(remplacer)26 b(in)n(teractiv)n(emen)n(t)h(une)h(c)n(ha)-9
+b(^)-32 b(\020ne)26 b(de)h(texte)208 b Ff(M-\045)0 1173
+y Fh(en)28 b(utilisan)n(t)f(les)h(expressions)e(rationnelles)369
+b Ff(M-x)42 b(query-replace-reg)o(ex)o(p)0 1308 y Fh(Les)22
+b(r)n(\023)-39 b(ep)r(onses)20 b(admises)h(dans)h(le)g(mo)r(de)g(de)g
+(remplacemen)n(t)g(in)n(teractif)g(son)n(t)0 1408 y(:)0
+1543 y Fe(remplacer)27 b Fh(celle-l,)g(passer)54 b(la)27
+b(suiv)-5 b(an)n(te)521 b Ff(SPC)0 1643 y Fh(remplacer)26
+b(celle-l,)i(rester)e(l)991 b Ff(,)0 1742 y Fe(passer)55
+b Fh(la)27 b(suiv)-5 b(an)n(te)28 b(sans)f(remplacer)620
+b Ff(DEL)0 1842 y Fh(remplacer)26 b(toutes)i(les)f(corresp)r(ondances)e
+(suiv)-5 b(an)n(tes)188 b Ff(!)0 1942 y Fe(rev)m(enir)56
+b Fh(la)27 b(corresp)r(ondance)e(pr)n(\023)-39 b(ec)n(\023)g(eden)n(te)
+474 b Ff(^)0 2041 y Fe(sortir)27 b Fh(du)h(remplacemen)n(t)f(in)n
+(teractif)651 b Ff(RET)0 2149 y Fh(en)n(trer)27 b(dans)g(l')n(\023)-39
+b(edition)27 b(r)n(\023)-39 b(ecursiv)n(e)24 b(\()p Ff(C-M-c)i
+Fh(p)r(our)83 2249 y(sortir\))1576 b Ff(C-r)0 2512 y
+Fg(F)-11 b(en)m(^)-66 b(etres)46 b(m)l(ultiples)0 2719
+y Fh(Lorsqu'il)22 b(y)h(a)g(deux)g(commandes,)g(la)g(seconde)f(est)i(p)
+r(our)e(l'"autre)g(cadre".)0 2855 y(supprimer)27 b(toutes)g(les)h
+(autres)f(fen)n(^)-39 b(etres)593 b Ff(C-x)43 b(1)0 2990
+y Fh(diviser)27 b(la)g(fen)n(^)-39 b(etre)27 b(horizon)n(talemen)n(t)
+321 b Ff(C-x)42 b(2)257 b(C-x)42 b(5)h(2)0 3090 y Fh(supprimer)27
+b(cette)h(fen)n(^)-39 b(etre)693 b Ff(C-x)42 b(0)257
+b(C-x)42 b(5)h(0)0 3225 y Fh(diviser)27 b(la)g(fen)n(^)-39
+b(etre)27 b(v)n(erticalemen)n(t)766 b Ff(C-x)43 b(3)0
+3360 y Fh(faire)27 b(d)n(\023)-39 b(e\014ler)26 b(l'autre)h(fen)n(^)-39
+b(etre)940 b Ff(C-M-v)0 3496 y Fh(switc)n(h)27 b(cursor)f(to)i(another)
+f(windo)n(w)846 b Ff(C-x)42 b(o)257 b(C-x)43 b(5)g(o)0
+3595 y Fh(s)n(\023)-39 b(electionner)26 b(le)h(tamp)r(on)h(dans)f
+(l'autre)g(fen)n(^)-39 b(etre)482 b Ff(C-x)42 b(4)i(b)169
+b(C-x)43 b(5)g(b)0 3695 y Fh(a\016c)n(her)27 b(le)g(tamp)r(on)h(dans)f
+(l'autre)g(fen)n(^)-39 b(etre)646 b Ff(C-x)42 b(4)i(C-o)81
+b(C-x)43 b(5)g(C-o)0 3795 y Fh(c)n(harger)25 b(un)j(\014c)n(hier)f
+(dans)g(l'autre)h(fen)n(^)-39 b(etre)668 b Ff(C-x)42
+b(4)i(f)169 b(C-x)43 b(5)g(f)0 3894 y Fh(c)n(harger)25
+b(un)j(\014c)n(hier)f(en)h(lecture)f(seule)h(dans)f(l'autre)g(fen)n(^)
+-39 b(etre)82 b Ff(C-x)42 b(4)i(r)169 b(C-x)43 b(5)g(r)0
+3994 y Fh(lancer)27 b(Dired)g(dans)h(l'autre)f(fen)n(^)-39
+b(etre)854 b Ff(C-x)42 b(4)i(d)169 b(C-x)43 b(5)g(d)0
+4093 y Fh(trouv)n(er)26 b(un)i(tag)f(dans)g(l'autre)g(fen)n(^)-39
+b(etre)775 b Ff(C-x)42 b(4)i(.)169 b(C-x)43 b(5)g(.)0
+4229 y Fh(agrandir)26 b(la)h(fen)n(^)-39 b(etre)1214
+b Ff(C-x)43 b(^)0 4328 y Fh(rap)r(etisser)26 b(la)i(fen)n(^)-39
+b(etre)1169 b Ff(C-x)43 b({)-2 4428 y Fh(\023)-39 b(elargir)25
+b(la)i(fen)n(^)-39 b(etre)1288 b Ff(C-x)43 b(})3858 5663
 y Fh(3)p eop
 %%Page: 4 4
-4 3 bop 0 -202 a Fg(F)-7 b(ormater)0 -78 y Fh(inden)o(ter)15
-b(la)i Fe(ligne)h Fh(couran)o(te)d(\(d)o(\023)-24 b(ep)q(end)17
-b(du)f(mo)q(de\))141 b Ff(TAB)0 -18 y Fh(inden)o(ter)15
-b(la)i Fe(r)o(\023)-27 b(egion)15 b Fh(couran)o(te)h(\(d)o(\023)-24
-b(ep)q(end)16 b(du)g(mo)q(de\))105 b Ff(C-M-\\)0 46 y
-Fh(inden)o(ter)15 b(la)i Fe(s-expression)f Fh(couran)o(te)f(\(d)o(\023)
--24 b(ep)q(end)16 b(du)50 106 y(mo)q(de\))945 b Ff(C-M-q)0
-166 y Fh(inden)o(ter)15 b(la)i(r)o(\023)-24 b(egion)15
-b(sur)h Fb(ar)m(g)21 b Fh(colonnes)377 b Ff(C-x)27 b(TAB)0
-247 y Fh(ins)o(\023)-24 b(erer)15 b(un)h(newline)g(apr)o(\022)-24
-b(es)15 b(le)i(p)q(oin)o(t)422 b Ff(C-o)0 307 y Fh(d)o(\023)-24
-b(eplacer)16 b(le)g(reste)h(de)f(la)g(ligne)g(v)o(ers)g(le)h(bas)294
-b Ff(C-M-o)0 367 y Fh(supprimer)14 b(les)i(lignes)g(blanc)o(hes)f
-(autour)g(du)h(p)q(oin)o(t)138 b Ff(C-x)27 b(C-o)0 432
-y Fh(joindre)16 b(la)g(ligne)33 b(la)16 b(pr)o(\023)-24
-b(ec)o(\023)g(eden)o(te)16 b(\()h(la)f(suiv)m(an)o(t)g(a)o(v)o(ec)50
-491 y(arg\))993 b Ff(M-^)0 551 y Fh(supprimer)14 b(tous)i(les)g
-(espaces)g(autour)g(du)g(p)q(oin)o(t)194 b Ff(M-\\)0
-616 y Fh(mettre)17 b(exactemen)o(t)g(un)e(espace)33 b(l'emplacemen)o(t)
-15 b(du)50 676 y(p)q(oin)o(t)968 b Ff(M-SPC)0 757 y Fh(remplir)15
-b(le)h(paragraphe)659 b Ff(M-q)0 817 y Fh(placer)16 b(la)g(marge)g
-(droite)652 b Ff(C-x)27 b(f)0 881 y Fh(d)o(\023)-24 b(e\014nir)15
-b(le)i(pr)o(\023)-24 b(e\014xe)16 b(par)f(lequel)i(commencera)e(c)o
-(haque)50 941 y(ligne)979 b Ff(C-x)27 b(.)0 1022 y Fh(d)o(\023)-24
-b(e\014nir)15 b(la)h(fon)o(te)814 b Ff(M-g)0 1180 y Fg(Mo)r(di\014er)28
-b(la)f(casse)0 1305 y Fh(mettre)17 b(le)f(mot)h(en)f(ma)s(juscules)511
-b Ff(M-u)0 1364 y Fh(mettre)17 b(le)f(mot)h(en)f(min)o(uscules)513
-b Ff(M-l)0 1424 y Fh(mettre)17 b(le)f(mot)h(en)f(capitales)561
-b Ff(M-c)0 1505 y Fh(mettre)17 b(la)f(r)o(\023)-24 b(egion)16
-b(en)g(ma)s(juscules)461 b Ff(C-x)27 b(C-u)0 1565 y Fh(mettre)17
-b(la)f(r)o(\023)-24 b(egion)16 b(en)g(min)o(uscules)463
-b Ff(C-x)27 b(C-l)0 1723 y Fg(Le)g(mini-tamp)r(on)0 1847
-y Fh(Les)17 b(touc)o(hes)e(suiv)m(an)o(tes)h(son)o(t)g(utilisables)f
-(dans)g(le)i(mini-tamp)q(on)d(:)0 1928 y(compl)o(\023)-24
-b(eter)16 b(autan)o(t)g(que)h(p)q(ossible)478 b Ff(TAB)0
-1988 y Fh(compl)o(\023)-24 b(eter)16 b(un)g(mot)744 b
-Ff(SPC)0 2048 y Fh(completer)16 b(et)h(ex)o(\023)-24
-b(ecuter)663 b Ff(RET)0 2108 y Fh(mon)o(trer)15 b(les)h(compl)o(\023)
--24 b(etions)15 b(p)q(ossibles)404 b Ff(?)0 2168 y Fh(rec)o(herc)o(her)
-14 b(l'en)o(tr)o(\023)-24 b(ee)16 b(pr)o(\023)-24 b(ec)o(\023)g(eden)o
-(te)16 b(du)g(mini-tamp)q(on)115 b Ff(M-p)0 2232 y Fh(rec)o(herc)o(her)
-14 b(l'en)o(tr)o(\023)-24 b(ee)16 b(suiv)m(an)o(te)g(du)g(mini-tamp)q
-(on)f(ou)50 2292 y(le)h(d)o(\023)-24 b(efaut)893 b Ff(M-n)0
-2357 y Fh(rec)o(herc)o(her)31 b(reb)q(ours)15 b(par)h(expr.)24
-b(rationnelle)16 b(dans)50 2417 y(l'historique)838 b
-Ff(M-r)0 2481 y Fh(rec)o(herc)o(her)14 b(v)o(ers)i(l'a)o(v)m(an)o(t)g
-(par)g(expr.)24 b(rationnelle)16 b(dans)50 2541 y(l'historique)838
-b Ff(M-s)0 2601 y Fh(ann)o(uler)15 b(la)h(commande)664
-b Ff(C-g)0 2682 y Fh(F)l(aites)19 b Ff(C-x)27 b(ESC)f(ESC)21
-b Fh(p)q(our)c(\023)-24 b(editer)20 b(et)g(r)o(\023)-24
-b(ep)o(\023)g(eter)20 b(la)f(derni)o(\022)-24 b(ere)19
-b(commande)0 2742 y(a)o(y)o(an)o(t)h(utilis)o(\023)-24
-b(e)20 b(le)g(minitamp)q(on.)32 b(F)l(aites)20 b Ff(F10)h
-Fh(p)q(our)f(activ)o(er)g(la)h(barre)e(de)0 2802 y(men)o(u)c(utilisan)o
-(t)h(le)g(minitamp)q(on.)2315 3398 y(4)p eop
+4 3 bop 0 -337 a Fg(F)-11 b(ormater)0 -130 y Fh(inden)n(ter)27
+b(la)h Fe(ligne)e Fh(couran)n(te)g(\(d)n(\023)-39 b(ep)r(end)28
+b(du)g(mo)r(de\))236 b Ff(TAB)0 -30 y Fh(inden)n(ter)27
+b(la)h Fe(r)n(\023)-46 b(egion)26 b Fh(couran)n(te)h(\(d)n(\023)-39
+b(ep)r(end)27 b(du)h(mo)r(de\))176 b Ff(C-M-\\)0 77 y
+Fh(inden)n(ter)27 b(la)h Fe(s-expression)e Fh(couran)n(te)g(\(d)n(\023)
+-39 b(ep)r(end)27 b(du)83 177 y(mo)r(de\))1576 b Ff(C-M-q)0
+277 y Fh(inden)n(ter)27 b(la)h(r)n(\023)-39 b(egion)25
+b(sur)i Fb(ar)l(g)35 b Fh(colonnes)629 b Ff(C-x)43 b(TAB)0
+412 y Fh(ins)n(\023)-39 b(erer)25 b(un)j(newline)g(apr)n(\022)-39
+b(es)26 b(le)h(p)r(oin)n(t)705 b Ff(C-o)0 512 y Fh(d)n(\023)-39
+b(eplacer)26 b(le)h(reste)g(de)h(la)f(ligne)h(v)n(ers)e(le)i(bas)491
+b Ff(C-M-o)0 611 y Fh(supprimer)27 b(les)g(lignes)g(blanc)n(hes)g
+(autour)g(du)h(p)r(oin)n(t)231 b Ff(C-x)43 b(C-o)0 719
+y Fh(joindre)27 b(la)h(ligne)55 b(la)27 b(pr)n(\023)-39
+b(ec)n(\023)g(eden)n(te)25 b(\()j(la)f(suiv)-5 b(an)n(t)27
+b(a)n(v)n(ec)83 819 y(arg\))1655 b Ff(M-^)0 919 y Fh(supprimer)27
+b(tous)g(les)h(espaces)e(autour)h(du)h(p)r(oin)n(t)325
+b Ff(M-\\)0 1026 y Fh(mettre)28 b(exactemen)n(t)f(un)h(espace)54
+b(l'emplacemen)n(t)28 b(du)83 1126 y(p)r(oin)n(t)1615
+b Ff(M-SPC)0 1261 y Fh(remplir)27 b(le)h(paragraphe)1099
+b Ff(M-q)0 1361 y Fh(placer)27 b(la)g(marge)f(droite)1088
+b Ff(C-x)43 b(f)0 1469 y Fh(d)n(\023)-39 b(e\014nir)27
+b(le)g(pr)n(\023)-39 b(e\014xe)26 b(par)h(lequel)h(commencera)e(c)n
+(haque)83 1569 y(ligne)1633 b Ff(C-x)43 b(.)0 1704 y
+Fh(d)n(\023)-39 b(e\014nir)27 b(la)g(fon)n(te)1356 b
+Ff(M-g)0 1967 y Fg(Mo)t(di\014er)45 b(la)h(casse)0 2174
+y Fh(mettre)28 b(le)f(mot)h(en)g(ma)5 b(juscules)854
+b Ff(M-u)0 2274 y Fh(mettre)28 b(le)f(mot)h(en)g(min)n(uscules)859
+b Ff(M-l)0 2373 y Fh(mettre)28 b(le)f(mot)h(en)g(capitales)935
+b Ff(M-c)0 2509 y Fh(mettre)28 b(la)f(r)n(\023)-39 b(egion)25
+b(en)j(ma)5 b(juscules)771 b Ff(C-x)43 b(C-u)0 2608 y
+Fh(mettre)28 b(la)f(r)n(\023)-39 b(egion)25 b(en)j(min)n(uscules)776
+b Ff(C-x)43 b(C-l)0 2872 y Fg(Le)j(mini-tamp)t(on)0 3079
+y Fh(Les)27 b(touc)n(hes)g(suiv)-5 b(an)n(tes)27 b(son)n(t)g
+(utilisables)h(dans)f(le)g(mini-tamp)r(on)h(:)0 3214
+y(compl)n(\023)-39 b(eter)26 b(autan)n(t)h(que)h(p)r(ossible)799
+b Ff(TAB)0 3314 y Fh(compl)n(\023)-39 b(eter)26 b(un)i(mot)1241
+b Ff(SPC)0 3413 y Fh(completer)27 b(et)h(ex)n(\023)-39
+b(ecuter)1103 b Ff(RET)0 3513 y Fh(mon)n(trer)26 b(les)i(compl)n(\023)
+-39 b(etions)26 b(p)r(ossibles)675 b Ff(?)0 3613 y Fh(rec)n(herc)n(her)
+25 b(l'en)n(tr)n(\023)-39 b(ee)26 b(pr)n(\023)-39 b(ec)n(\023)g(eden)n
+(te)25 b(du)j(mini-tamp)r(on)196 b Ff(M-p)0 3720 y Fh(rec)n(herc)n(her)
+25 b(l'en)n(tr)n(\023)-39 b(ee)26 b(suiv)-5 b(an)n(te)28
+b(du)g(mini-tamp)r(on)g(ou)83 3820 y(le)g(d)n(\023)-39
+b(efaut)1487 b Ff(M-n)0 3928 y Fh(rec)n(herc)n(her)53
+b(reb)r(ours)26 b(par)h(expr.)41 b(rationnelle)27 b(dans)83
+4028 y(l'historique)1399 b Ff(M-r)0 4136 y Fh(rec)n(herc)n(her)25
+b(v)n(ers)i(l'a)n(v)-5 b(an)n(t)27 b(par)f(expr.)41 b(rationnelle)27
+b(dans)83 4235 y(l'historique)1399 b Ff(M-s)0 4335 y
+Fh(ann)n(uler)27 b(la)g(commande)1109 b Ff(C-g)0 4470
+y Fh(F)-7 b(aites)33 b Ff(C-x)42 b(ESC)g(ESC)32 b Fh(p)r(our)f(\023)-39
+b(editer)32 b(et)h(r)n(\023)-39 b(ep)n(\023)g(eter)30
+b(la)j(derni)n(\022)-39 b(ere)31 b(commande)0 4570 y(a)n(y)n(an)n(t)i
+(utilis)n(\023)-39 b(e)33 b(le)i(minitamp)r(on.)57 b(F)-7
+b(aites)34 b Ff(F10)f Fh(p)r(our)h(activ)n(er)f(la)h(barre)f(de)0
+4669 y(men)n(u)28 b(utilisan)n(t)f(le)h(minitamp)r(on.)3858
+5663 y(4)p eop
 %%Page: 5 5
-5 4 bop -36 -192 a Fi(Carte)34 b(de)f(r)n(\023)-47 b(ef)n(\023)g
-(erence)35 b(de)e(GNU)g(Emacs)0 -25 y Fg(T)-7 b(amp)r(ons)0
-99 y Fh(s)o(\023)-24 b(electionner)16 b(un)g(autre)g(tamp)q(on)490
-b Ff(C-x)27 b(b)-1 159 y Fh(\023)-24 b(en)o(um)o(\023)g(erer)15
-b(tous)h(les)g(tamp)q(ons)546 b Ff(C-x)27 b(C-b)0 218
-y Fh(supprimer)14 b(un)i(tamp)q(on)656 b Ff(C-x)27 b(k)0
-376 y Fg(T)-7 b(ransp)r(oser)0 500 y Fh(transp)q(oser)15
-b(des)h Fe(caract)o(\022)-27 b(eres)551 b Ff(C-t)0 560
-y Fh(transp)q(oser)15 b(des)h Fe(mots)680 b Ff(M-t)0
-620 y Fh(transp)q(oser)15 b(des)h Fe(lignes)663 b Ff(C-x)27
-b(C-t)0 679 y Fh(transp)q(oser)15 b(des)h Fe(s-expressions)478
-b Ff(C-M-t)0 837 y Fg(V)n(\023)-40 b(eri\014er)28 b(l'orthographe)0
-961 y Fh(v)o(\023)-24 b(eri\014er)16 b(l'orthographe)e(du)i(mot)h
-(couran)o(t)316 b Ff(M-$)0 1026 y Fh(v)o(\023)-24 b(eri\014er)16
-b(l'orthographe)e(de)j(tous)f(les)g(mots)g(d'une)50 1086
-y(r)o(\023)-24 b(egion)882 b Ff(M-x)26 b(ispell-region)0
-1146 y Fh(v)o(\023)-24 b(eri\014er)16 b(l'orthographe)e(de)j(tout)g(le)
-f(tamp)q(on)196 b Ff(M-x)26 b(ispell-buffer)0 1303 y
-Fg(T)-7 b(ags)0 1427 y Fh(trouv)o(er)16 b(un)g(tag)g(\(une)h(d)o(\023)
--24 b(e\014nition\))461 b Ff(M-.)0 1487 y Fh(trouv)o(er)16
-b(l'o)q(ccurrence)f(suiv)m(an)o(te)h(du)g(tag)347 b Ff(C-u)27
-b(M-.)0 1547 y Fh(sp)o(\023)-24 b(eci\014er)15 b(un)h(nouv)o(eau)g
-(\014c)o(hier)f(de)h(tags)303 b Ff(M-x)26 b(visit-tags-table)0
-1633 y Fh(rec)o(herc)o(her)14 b(par)i(expr.)24 b(rationnelles)16
-b(dans)f(tous)h(les)50 1693 y(\014c)o(hiers)f(du)h(tableau)g(de)g(tags)
-444 b Ff(M-x)26 b(tags-search)0 1758 y Fh(lancer)16 b(un)g(remplacemen)
-o(t)f(in)o(teractif)h(sur)f(tous)h(les)50 1817 y(\014c)o(hiers)863
-b Ff(M-x)26 b(tags-query-replace)0 1882 y Fh(con)o(tin)o(uer)15
-b(la)h(derni)o(\022)-24 b(ere)15 b(rec)o(herc)o(he)g(de)i(tags)f(ou)g
-(le)h(rem-)50 1942 y(placemen)o(t)e(in)o(teractif)649
-b Ff(M-,)0 2100 y Fg(Shells)0 2224 y Fh(ex)o(\023)-24
-b(ecuter)17 b(une)f(commande)f(shell)493 b Ff(M-!)0 2284
-y Fh(lancer)16 b(une)g(commande)f(shell)h(sur)f(la)h(r)o(\023)-24
-b(egion)256 b Ff(M-|)0 2344 y Fh(\014ltrer)16 b(la)g(r)o(\023)-24
-b(egion)16 b(a)o(v)o(ec)g(une)g(commande)f(shell)238
-b Ff(C-u)27 b(M-|)0 2403 y Fh(lancer)16 b(un)g(shell)f(dans)h(la)g(fen)
-o(^)-24 b(etre)17 b Ff(*shell*)281 b(M-x)27 b(shell)0
-2561 y Fg(Rectangles)0 2686 y Fh(copier)16 b(le)g(rectangle)h(dans)e
-(le)i(registre)388 b Ff(C-x)27 b(r)f(r)0 2745 y Fh(d)o(\023)-24
-b(etruire)15 b(le)i(rectangle)694 b Ff(C-x)27 b(r)f(k)0
-2805 y Fh(r)o(\023)-24 b(ecup)o(\023)g(erer)15 b(le)i(rectangle)663
-b Ff(C-x)27 b(r)f(y)0 2865 y Fh(ouvrir)15 b(le)i(rectangle,)f(en)g(d)o
-(\023)-24 b(ecalan)o(t)16 b(le)h(texte)34 b(droite)117
-b Ff(C-x)27 b(r)f(o)0 2925 y Fh(vider)16 b(le)h(rectangle)756
-b Ff(C-x)27 b(r)f(c)0 2984 y Fh(pr)o(\023)-24 b(e\014xer)16
-b(c)o(haque)g(ligne)g(a)o(v)o(ec)g(une)g(c)o(ha)-6 b(^)-19
-b(\020ne)324 b Ff(C-x)27 b(r)f(t)2315 3398 y Fh(5)p eop
+5 4 bop -60 -320 a Fi(Carte)55 b(de)f(r)m(\023)-79 b(ef)m(\023)g
+(erence)52 b(de)i(GNU)h(Emacs)0 -42 y Fg(T)-11 b(amp)t(ons)0
+165 y Fh(s)n(\023)-39 b(electionner)26 b(un)i(autre)f(tamp)r(on)818
+b Ff(C-x)43 b(b)-2 264 y Fh(\023)-39 b(en)n(um)n(\023)g(erer)25
+b(tous)i(les)g(tamp)r(ons)912 b Ff(C-x)43 b(C-b)0 364
+y Fh(supprimer)27 b(un)h(tamp)r(on)1095 b Ff(C-x)43 b(k)0
+626 y Fg(T)-11 b(ransp)t(oser)0 833 y Fh(transp)r(oser)26
+b(des)h Fe(caract)n(\022)-46 b(eres)922 b Ff(C-t)0 933
+y Fh(transp)r(oser)26 b(des)h Fe(mots)1135 b Ff(M-t)0
+1033 y Fh(transp)r(oser)26 b(des)h Fe(lignes)1102 b Ff(C-x)43
+b(C-t)0 1132 y Fh(transp)r(oser)26 b(des)h Fe(s-expressions)797
+b Ff(C-M-t)0 1396 y Fg(V)m(\023)-66 b(eri\014er)46 b(l'orthographe)0
+1602 y Fh(v)n(\023)-39 b(eri\014er)26 b(l'orthographe)f(du)j(mot)g
+(couran)n(t)528 b Ff(M-$)0 1710 y Fh(v)n(\023)-39 b(eri\014er)26
+b(l'orthographe)f(de)j(tous)f(les)g(mots)h(d'une)83 1810
+y(r)n(\023)-39 b(egion)1469 b Ff(M-x)42 b(ispell-region)0
+1910 y Fh(v)n(\023)-39 b(eri\014er)26 b(l'orthographe)f(de)j(tout)g(le)
+f(tamp)r(on)327 b Ff(M-x)42 b(ispell-buffer)0 2172 y
+Fg(T)-11 b(ags)0 2379 y Fh(trouv)n(er)26 b(un)i(tag)f(\(une)h(d)n(\023)
+-39 b(e\014nition\))770 b Ff(M-.)0 2478 y Fh(trouv)n(er)26
+b(l'o)r(ccurrence)g(suiv)-5 b(an)n(te)28 b(du)g(tag)577
+b Ff(C-u)43 b(M-.)0 2578 y Fh(sp)n(\023)-39 b(eci\014er)26
+b(un)i(nouv)n(eau)e(\014c)n(hier)h(de)h(tags)503 b Ff(M-x)42
+b(visit-tags-table)0 2722 y Fh(rec)n(herc)n(her)25 b(par)i(expr.)41
+b(rationnelles)27 b(dans)g(tous)g(les)83 2821 y(\014c)n(hiers)g(du)h
+(tableau)f(de)h(tags)738 b Ff(M-x)42 b(tags-search)0
+2929 y Fh(lancer)27 b(un)h(remplacemen)n(t)f(in)n(teractif)g(sur)g
+(tous)g(les)83 3029 y(\014c)n(hiers)1440 b Ff(M-x)42
+b(tags-query-replac)o(e)0 3137 y Fh(con)n(tin)n(uer)27
+b(la)g(derni)n(\022)-39 b(ere)26 b(rec)n(herc)n(he)f(de)j(tags)f(ou)g
+(le)h(rem-)83 3237 y(placemen)n(t)f(in)n(teractif)1082
+b Ff(M-,)0 3500 y Fg(Shells)0 3707 y Fh(ex)n(\023)-39
+b(ecuter)26 b(une)i(commande)f(shell)823 b Ff(M-!)0 3806
+y Fh(lancer)27 b(une)g(commande)h(shell)f(sur)g(la)g(r)n(\023)-39
+b(egion)426 b Ff(M-|)0 3906 y Fh(\014ltrer)27 b(la)g(r)n(\023)-39
+b(egion)26 b(a)n(v)n(ec)g(une)i(commande)f(shell)398
+b Ff(C-u)43 b(M-|)0 4006 y Fh(lancer)27 b(un)h(shell)f(dans)g(la)h(fen)
+n(^)-39 b(etre)26 b Ff(*shell*)464 b(M-x)43 b(shell)0
+4269 y Fg(Rectangles)0 4476 y Fh(copier)27 b(le)g(rectangle)g(dans)g
+(le)g(registre)648 b Ff(C-x)43 b(r)g(r)0 4575 y Fh(d)n(\023)-39
+b(etruire)26 b(le)i(rectangle)1156 b Ff(C-x)43 b(r)g(k)0
+4675 y Fh(r)n(\023)-39 b(ecup)n(\023)g(erer)24 b(le)k(rectangle)1105
+b Ff(C-x)43 b(r)g(y)0 4775 y Fh(ouvrir)26 b(le)i(rectangle,)e(en)i(d)n
+(\023)-39 b(ecalan)n(t)26 b(le)h(texte)56 b(droite)195
+b Ff(C-x)43 b(r)g(o)0 4874 y Fh(vider)27 b(le)h(rectangle)1260
+b Ff(C-x)43 b(r)g(c)0 4974 y Fh(pr)n(\023)-39 b(e\014xer)26
+b(c)n(haque)g(ligne)i(a)n(v)n(ec)e(une)i(c)n(ha)-9 b(^)-32
+b(\020ne)540 b Ff(C-x)43 b(r)g(t)3858 5663 y Fh(5)p eop
 %%Page: 6 6
-6 5 bop 0 -202 a Fg(Abr)n(\023)-40 b(eviations)0 -78
-y Fh(a)s(jouter)16 b(une)g(abr)o(\023)-24 b(eviation)16
-b(globale)450 b Ff(C-x)27 b(a)f(g)0 -18 y Fh(a)s(jouter)16
-b(une)g(abr)o(\023)-24 b(eviation)16 b(lo)q(cale)h(au)f(mo)q(de)276
-b Ff(C-x)27 b(a)f(l)0 46 y Fh(a)s(jouter)16 b(une)g(expansion)g
-(globale)f(p)q(our)h(cette)50 106 y(abr)o(\023)-24 b(eviation)836
-b Ff(C-x)27 b(a)f(i)h(g)0 171 y Fh(a)s(jouter)16 b(une)g(expansion)g
-(lo)q(cale)g(au)g(mo)q(de)h(p)q(our)e(cette)50 231 y(abr)o(\023)-24
-b(eviation)836 b Ff(C-x)27 b(a)f(i)h(l)0 291 y Fh(faire)16
-b(une)g(expansion)g(explicite)h(de)f(cette)i(abr)o(\023)-24
-b(eviation)62 b Ff(C-x)27 b(a)f(e)0 372 y Fh(faire)16
-b(une)g(expansion)g(dynamique)f(du)h(mot)h(pr)o(\023)-24
-b(ec)o(\023)g(eden)o(t)55 b Ff(M-/)0 530 y Fg(Expressions)25
-b(rationnelles)0 655 y Fh(un)16 b(unique)g(caract)o(\022)-24
-b(ere)16 b(quelconque,)g(sauf)g(une)h(\014n)f(de)50 715
-y(ligne)979 b Ff(.)53 b Fh(\(p)q(oin)o(t\))0 775 y(z)o(\023)-24
-b(ero)16 b(r)o(\023)-24 b(ep)o(\023)g(etition)16 b(ou)h(plus)640
-b Ff(*)0 835 y Fh(une)16 b(r)o(\023)-24 b(ep)o(\023)g(etition)16
-b(ou)g(plus)652 b Ff(+)0 895 y Fh(z)o(\023)-24 b(ero)16
-b(ou)g(une)h(r)o(\023)-24 b(ep)o(\023)g(etition)652 b
-Ff(?)0 959 y Fh(caract)o(\022)-24 b(ere)16 b(sp)o(\023)-24
-b(ecial)16 b(p)q(our)g(quoter)g(l'expression)f(ra-)50
-1019 y(tionnelle)h Fb(c)857 b Ff(\\)p Fb(c)0 1079 y Fh(alternativ)o(e)
-16 b(\(\\ou"\))742 b Ff(\\|)0 1139 y Fh(regroup)q(emen)o(t)831
-b Ff(\\\()27 b Fa(:)8 b(:)g(:)26 b Ff(\\\))0 1198 y Fh(le)17
-b(m)o(^)-24 b(eme)15 b(texte)j(que)f(dans)f(le)g Fb(n)t
-Fh(i)o(\022)-24 b(eme)16 b(group)q(e)251 b Ff(\\)p Fb(n)0
-1258 y Fh(limite)16 b(de)h(mot)838 b Ff(\\b)0 1318 y
-Fh(non)16 b(limite)g(de)g(mot)742 b Ff(\\B)0 1399 y Fe(en)n(tit)o(\023)
--27 b(e)490 b(d)o(\023)-27 b(ebut)181 b(\014n)0 1459
-y Fh(ligne)529 b Ff(^)300 b($)0 1519 y Fh(mot)546 b Ff(\\<)274
-b(\\>)0 1578 y Fh(tamp)q(on)464 b Ff(\\`)274 b(\\')0
-1638 y Fe(classe)20 b(de)f(caract)o(\022)-27 b(ere)166
-b(corresp)r(ond)48 b(corresp)r(ond)36 b(d'autres)0 1698
-y Fh(ensem)o(ble)15 b(explicite)239 b Ff([)27 b Fa(:)8
-b(:)g(:)26 b Ff(])163 b([^)26 b Fa(:)8 b(:)g(:)27 b Ff(])0
-1758 y Fh(caract)o(\022)-24 b(ere)16 b(de)h(mot)266 b
-Ff(\\w)274 b(\\W)0 1818 y Fh(caract)o(\022)-24 b(ere)16
-b(a)o(v)o(ec)h(la)f(syn)o(taxe)h Fb(c)49 b Ff(\\s)p Fb(c)251
-b Ff(\\S)p Fb(c)0 1963 y Fg(Jeux)26 b(de)h(caract)n(\022)-40
-b(eres)28 b(in)n(ternationaux)0 2087 y Fh(indiquer)15
-b(la)i(langue)e(principale)443 b Ff(M-x)26 b(set-language-environme)q
-(nt)0 2147 y Fh(mon)o(trer)15 b(toutes)i(les)f(m)o(\023)-24
-b(etho)q(des)16 b(de)g(saisie)250 b Ff(M-x)26 b(list-input-methods)0
-2207 y Fh(activ)o(er)16 b(ou)h(d)o(\023)-24 b(esactiv)o(er)15
-b(la)i(m)o(\023)-24 b(etho)q(de)16 b(de)h(saisie)226
-b Ff(C-\\)0 2272 y Fh(c)o(hoisir)15 b(le)h(syst)o(\022)-24
-b(eme)17 b(de)f(co)q(dage)h(p)q(our)f(la)g(commande)50
-2331 y(suiv)m(an)o(te)904 b Ff(C-x)27 b(RET)g(c)0 2391
-y Fh(mon)o(trer)15 b(tous)h(les)g(syst)o(\022)-24 b(emes)16
-b(de)h(co)q(dage)274 b Ff(M-x)26 b(list-coding-systems)0
-2451 y Fh(c)o(hoisir)15 b(le)h(syst)o(\022)-24 b(eme)17
-b(de)f(co)q(dage)h(pr)o(\023)-24 b(ef)o(\023)g(er)o(\023)g(e)289
-b Ff(M-x)26 b(prefer-coding-system)2315 3398 y Fh(6)p
-eop
+6 5 bop 0 -337 a Fg(Abr)m(\023)-66 b(eviations)0 -130
+y Fh(a)5 b(jouter)26 b(une)i(abr)n(\023)-39 b(eviation)25
+b(globale)751 b Ff(C-x)43 b(a)g(g)0 -30 y Fh(a)5 b(jouter)26
+b(une)i(abr)n(\023)-39 b(eviation)25 b(lo)r(cale)i(au)h(mo)r(de)461
+b Ff(C-x)43 b(a)g(l)0 77 y Fh(a)5 b(jouter)26 b(une)i(expansion)f
+(globale)f(p)r(our)i(cette)83 177 y(abr)n(\023)-39 b(eviation)1393
+b Ff(C-x)43 b(a)g(i)g(g)0 285 y Fh(a)5 b(jouter)26 b(une)i(expansion)f
+(lo)r(cale)g(au)g(mo)r(de)h(p)r(our)f(cette)83 385 y(abr)n(\023)-39
+b(eviation)1393 b Ff(C-x)43 b(a)g(i)g(l)0 484 y Fh(faire)27
+b(une)h(expansion)e(explicite)i(de)g(cette)g(abr)n(\023)-39
+b(eviation)103 b Ff(C-x)43 b(a)g(e)0 620 y Fh(faire)27
+b(une)h(expansion)e(dynamique)i(du)g(mot)f(pr)n(\023)-39
+b(ec)n(\023)g(eden)n(t)92 b Ff(M-/)0 883 y Fg(Expressions)47
+b(rationnelles)0 1092 y Fh(un)28 b(unique)g(caract)n(\022)-39
+b(ere)24 b(quelconque,)j(sauf)h(une)g(\014n)g(de)83 1192
+y(ligne)1633 b Ff(.)87 b Fh(\(p)r(oin)n(t\))0 1292 y(z)n(\023)-39
+b(ero)25 b(r)n(\023)-39 b(ep)n(\023)g(etition)26 b(ou)h(plus)1070
+b Ff(*)0 1391 y Fh(une)28 b(r)n(\023)-39 b(ep)n(\023)g(etition)25
+b(ou)j(plus)1088 b Ff(+)0 1491 y Fh(z)n(\023)-39 b(ero)25
+b(ou)j(une)g(r)n(\023)-39 b(ep)n(\023)g(etition)1086
+b Ff(?)0 1599 y Fh(caract)n(\022)-39 b(ere)25 b(sp)n(\023)-39
+b(ecial)26 b(p)r(our)h(quoter)g(l'expression)f(ra-)83
+1698 y(tionnelle)i Fb(c)1429 b Ff(\\)p Fb(c)0 1798 y
+Fh(alternativ)n(e)26 b(\(\\ou"\))1236 b Ff(\\|)0 1898
+y Fh(regroup)r(emen)n(t)1387 b Ff(\\\()43 b Fa(:)14 b(:)g(:)43
+b Ff(\\\))0 1997 y Fh(le)28 b(m)n(^)-39 b(eme)26 b(texte)i(que)g(dans)f
+(le)h Fb(n)6 b Fh(i)n(\022)-39 b(eme)26 b(group)r(e)419
+b Ff(\\)p Fb(n)0 2097 y Fh(limite)28 b(de)g(mot)1398
+b Ff(\\b)0 2197 y Fh(non)27 b(limite)i(de)e(mot)1237
+b Ff(\\B)0 2332 y Fe(en)m(tit)n(\023)-46 b(e)815 b(d)n(\023)-46
+b(ebut)303 b(\014n)0 2432 y Fh(ligne)883 b Ff(^)499 b($)0
+2531 y Fh(mot)911 b Ff(\\<)455 b(\\>)0 2631 y Fh(tamp)r(on)775
+b Ff(\\`)455 b(\\')0 2730 y Fe(classe)31 b(de)h(caract)n(\022)-46
+b(ere)280 b(corresp)s(ond)83 b(corresp)s(ond)63 b(d'autres)0
+2830 y Fh(ensem)n(ble)27 b(explicite)399 b Ff([)43 b
+Fa(:)14 b(:)g(:)43 b Ff(])272 b([^)42 b Fa(:)14 b(:)g(:)44
+b Ff(])0 2930 y Fh(caract)n(\022)-39 b(ere)25 b(de)i(mot)445
+b Ff(\\w)455 b(\\W)0 3029 y Fh(caract)n(\022)-39 b(ere)25
+b(a)n(v)n(ec)h(la)h(syn)n(taxe)g Fb(c)83 b Ff(\\s)p Fb(c)417
+b Ff(\\S)p Fb(c)0 3272 y Fg(Jeux)46 b(de)g(caract)m(\022)-66
+b(eres)46 b(in)l(ternationaux)0 3479 y Fh(indiquer)27
+b(la)h(langue)f(principale)739 b Ff(M-x)42 b(set-language-envi)o(ro)o
+(nme)o(nt)0 3578 y Fh(mon)n(trer)26 b(toutes)i(les)f(m)n(\023)-39
+b(etho)r(des)27 b(de)h(saisie)416 b Ff(M-x)42 b(list-input-method)o(s)0
+3678 y Fh(activ)n(er)26 b(ou)i(d)n(\023)-39 b(esactiv)n(er)25
+b(la)i(m)n(\023)-39 b(etho)r(de)27 b(de)h(saisie)378
+b Ff(C-\\)0 3786 y Fh(c)n(hoisir)26 b(le)i(syst)n(\022)-39
+b(eme)26 b(de)i(co)r(dage)e(p)r(our)i(la)f(commande)83
+3886 y(suiv)-5 b(an)n(te)1508 b Ff(C-x)43 b(RET)f(c)0
+3985 y Fh(mon)n(trer)26 b(tous)i(les)f(syst)n(\022)-39
+b(emes)26 b(de)i(co)r(dage)455 b Ff(M-x)42 b(list-coding-syste)o(ms)0
+4085 y Fh(c)n(hoisir)26 b(le)i(syst)n(\022)-39 b(eme)26
+b(de)i(co)r(dage)e(pr)n(\023)-39 b(ef)n(\023)g(er)n(\023)g(e)479
+b Ff(M-x)42 b(prefer-coding-sys)o(te)o(m)3858 5663 y
+Fh(6)p eop
 %%Page: 7 7
-7 6 bop 0 -202 a Fg(Info)0 -91 y Fh(en)o(trer)16 b(dans)f(le)i
-(visualisateur)e(de)h(la)g(do)q(cumen)o(tation)50 -31
-y(Info)996 b Ff(C-h)27 b(i)0 34 y Fh(c)o(herc)o(her)15
-b(une)h(fonction)g(ou)g(une)g(v)m(ariable)g(pr)o(\023)-24
-b(ecise)50 94 y(dans)15 b(Info)880 b Ff(C-h)27 b(C-i)0
-175 y Fh(Se)16 b(d)o(\023)-24 b(eplacer)16 b(dans)g(un)g(n\033ud)f(:)50
-256 y(une)h(page)g(plus)g(bas)693 b Ff(SPC)50 316 y Fh(une)16
-b(page)g(plus)g(haut)666 b Ff(DEL)50 376 y Fh(d)o(\023)-24
-b(ebut)16 b(du)g(n\033ud)746 b Ff(.)53 b Fh(\(p)q(oin)o(t\))0
-457 y(P)o(asser)15 b(de)h(n\033ud)g(en)g(n\033ud)g(:)50
-538 y(n\033ud)f Fe(suiv)m(an)n(t)767 b Ff(n)50 598 y
-Fh(n\033ud)15 b Fe(pr)o(\023)-27 b(ec)o(\023)g(eden)n(t)699
-b Ff(p)50 658 y Fh(aller)16 b Fe(plus)g(haut)739 b Ff(u)50
-718 y Fh(c)o(hoisir)15 b(un)h(sujet)g(de)h(men)o(u)e(par)h(son)f(nom)
-260 b Ff(m)50 782 y Fh(c)o(hoisir)15 b(le)h Fb(n)t Fh(i)o(\022)-24
-b(eme)16 b(sujet)h(de)f(men)o(u)g(par)f(son)h(n)o(um)o(\023)-24
-b(ero)50 842 y(\(1{9\))969 b Fb(n)50 902 y Fh(suivre)16
-b(une)g(r)o(\023)-24 b(ef)o(\023)g(erence)16 b(crois)o(\023)-24
-b(ee)16 b(\(on)g(revien)o(t)g(a)o(v)o(ec)h Ff(l)p Fh(\))63
-b Ff(f)50 962 y Fh(rev)o(enir)15 b(au)h(dernier)f(n\033ud)h(visit)o
-(\023)-24 b(e)424 b Ff(l)50 1021 y Fh(rev)o(enir)15 b(au)h(n\033ud)g
-(du)g(r)o(\023)-24 b(ep)q(ertoire)423 b Ff(d)50 1081
-y Fh(aller)16 b(sur)f(n'imp)q(orte)h(quel)g(n\033ud)f(par)h(son)g(nom)
-142 b Ff(g)0 1162 y Fh(Autres)16 b(:)50 1244 y(lancer)g(le)g
-Fe(didactici)q(el)k Fh(Info)526 b Ff(h)50 1303 y Fe(quitter)18
-b Fh(Info)807 b Ff(q)50 1368 y Fh(rec)o(herc)o(her)14
-b(les)i(n\033uds)f(a)o(v)o(ec)i(une)f(expression)50 1428
-y(rationnelle)851 b Ff(M-s)0 1586 y Fg(Registres)0 1710
-y Fh(sauv)o(er)15 b(la)i(r)o(\023)-24 b(egion)15 b(dans)h(un)g
-(registre)421 b Ff(C-x)27 b(r)f(s)0 1770 y Fh(ins)o(\023)-24
-b(erer)15 b(le)i(con)o(ten)o(u)e(du)h(registre)g(dans)f(le)i(tamp)q(on)
-146 b Ff(C-x)27 b(r)f(i)0 1851 y Fh(sauv)o(er)15 b(la)i(v)m(aleur)f(du)
-g(p)q(oin)o(t)g(dans)f(un)h(registre)221 b Ff(C-x)27
-b(r)f(SPC)0 1911 y Fh(sauter)16 b(au)g(p)q(oin)o(t)g(sauv)o(\023)-24
-b(e)16 b(dans)g(le)g(registre)315 b Ff(C-x)27 b(r)f(j)0
-2069 y Fg(Macros)h(cla)n(vier)0 2193 y Fe(lancer)17 b
-Fh(la)g(d)o(\023)-24 b(e\014nition)15 b(d'une)h(macro)f(cla)o(vier)261
-b Ff(C-x)27 b(\()0 2253 y Fe(terminer)16 b Fh(la)g(d)o(\023)-24
-b(e\014nition)16 b(d'une)f(macro)h(cla)o(vier)194 b Ff(C-x)27
-b(\))0 2313 y Fe(ex)o(\023)-27 b(ecuter)17 b Fh(la)f(derni)o(\022)-24
-b(ere)15 b(macro)h(cla)o(vier)g(d)o(\023)-24 b(e\014nie)207
-b Ff(C-x)27 b(e)0 2372 y Fh(a)s(jouter)33 b(la)16 b(derni)o(\022)-24
-b(ere)15 b(macro)h(cla)o(vier)404 b Ff(C-u)27 b(C-x)g(\()0
-2432 y Fh(donner)15 b(un)h(nom)32 b(la)17 b(derni)o(\022)-24
-b(ere)15 b(macro)h(cla)o(vier)162 b Ff(M-x)26 b(name-last-kbd-macro)0
-2492 y Fh(ins)o(\023)-24 b(erer)15 b(une)h(d)o(\023)-24
-b(e\014nition)16 b(Lisp)f(dans)h(le)h(tamp)q(on)143 b
-Ff(M-x)26 b(insert-kbd-macro)0 2650 y Fg(Commandes)g(de)h(gestion)g
-(d'Emacs)g(Lisp)-1 2774 y Fh(\023)-24 b(ev)m(aluer)16
-b(la)h Fe(s-expression)f Fh(situ)o(\023)-24 b(ee)16 b(a)o(v)m(an)o(t)g
-(le)h(p)q(oin)o(t)146 b Ff(C-x)27 b(C-e)-1 2834 y Fh(\023)-24
-b(ev)m(aluer)16 b(la)h Fe(defun)f Fh(couran)o(te)562
-b Ff(C-M-x)-1 2894 y Fh(\023)-24 b(ev)m(aluer)16 b(la)h
-Fe(r)o(\023)-27 b(egion)684 b Ff(M-x)26 b(eval-region)0
-2953 y Fh(lire)16 b(et)g(\023)-24 b(ev)m(aluer)16 b(le)h(mini-tamp)q
-(on)482 b Ff(M-:)0 3013 y Fh(c)o(harger)32 b(partir)15
-b(du)h(r)o(\023)-24 b(ep)q(ertoire)16 b(syst)o(\022)-24
-b(eme)16 b(standard)51 b Ff(M-x)26 b(load-library)2315
-3398 y Fh(7)p eop
+7 6 bop 0 -337 a Fg(Info)0 -151 y Fh(en)n(trer)27 b(dans)g(le)g
+(visualisateur)g(de)g(la)g(do)r(cumen)n(tation)83 -51
+y(Info)1661 b Ff(C-h)43 b(i)0 57 y Fh(c)n(herc)n(her)26
+b(une)i(fonction)f(ou)h(une)f(v)-5 b(ariable)27 b(pr)n(\023)-39
+b(ecise)83 156 y(dans)27 b(Info)1467 b Ff(C-h)43 b(C-i)0
+292 y Fh(Se)28 b(d)n(\023)-39 b(eplacer)25 b(dans)j(un)g(n\033ud)f(:)83
+427 y(une)h(page)f(plus)g(bas)1157 b Ff(SPC)83 527 y
+Fh(une)28 b(page)f(plus)g(haut)1112 b Ff(DEL)83 626 y
+Fh(d)n(\023)-39 b(ebut)27 b(du)h(n\033ud)1246 b Ff(.)87
+b Fh(\(p)r(oin)n(t\))0 762 y(P)n(asser)25 b(de)j(n\033ud)g(en)f
+(n\033ud)h(:)83 897 y(n\033ud)g Fe(suiv)-5 b(an)m(t)1277
+b Ff(n)83 997 y Fh(n\033ud)28 b Fe(pr)n(\023)-46 b(ec)n(\023)g(eden)m
+(t)1167 b Ff(p)83 1096 y Fh(aller)27 b Fe(plus)g(haut)1232
+b Ff(u)83 1196 y Fh(c)n(hoisir)26 b(un)i(sujet)g(de)g(men)n(u)g(par)f
+(son)g(nom)434 b Ff(m)83 1304 y Fh(c)n(hoisir)26 b(le)i
+Fb(n)6 b Fh(i)n(\022)-39 b(eme)27 b(sujet)h(de)f(men)n(u)h(par)f(son)g
+(n)n(um)n(\023)-39 b(ero)83 1403 y(\(1{9\))1614 b Fb(n)83
+1503 y Fh(suivre)27 b(une)h(r)n(\023)-39 b(ef)n(\023)g(erence)24
+b(crois)n(\023)-39 b(ee)26 b(\(on)h(revien)n(t)g(a)n(v)n(ec)f
+Ff(l)p Fh(\))105 b Ff(f)83 1603 y Fh(rev)n(enir)26 b(au)i(dernier)e
+(n\033ud)i(visit)n(\023)-39 b(e)706 b Ff(l)83 1702 y
+Fh(rev)n(enir)26 b(au)i(n\033ud)f(du)h(r)n(\023)-39 b(ep)r(ertoire)705
+b Ff(d)83 1802 y Fh(aller)27 b(sur)g(n'imp)r(orte)h(quel)f(n\033ud)h
+(par)f(son)g(nom)238 b Ff(g)0 1937 y Fh(Autres)28 b(:)83
+2073 y(lancer)f(le)g Fe(didacticiel)g Fh(Info)877 b Ff(h)83
+2172 y Fe(quitter)28 b Fh(Info)1346 b Ff(q)83 2280 y
+Fh(rec)n(herc)n(her)25 b(les)j(n\033uds)f(a)n(v)n(ec)f(une)i
+(expression)83 2380 y(rationnelle)1420 b Ff(M-s)0 2643
+y Fg(Registres)0 2850 y Fh(sauv)n(er)26 b(la)h(r)n(\023)-39
+b(egion)26 b(dans)h(un)h(registre)702 b Ff(C-x)43 b(r)g(s)0
+2950 y Fh(ins)n(\023)-39 b(erer)25 b(le)j(con)n(ten)n(u)f(du)h
+(registre)e(dans)h(le)h(tamp)r(on)245 b Ff(C-x)43 b(r)g(i)0
+3085 y Fh(sauv)n(er)26 b(la)h(v)-5 b(aleur)27 b(du)h(p)r(oin)n(t)g
+(dans)f(un)h(registre)368 b Ff(C-x)43 b(r)g(SPC)0 3185
+y Fh(sauter)27 b(au)g(p)r(oin)n(t)h(sauv)n(\023)-39 b(e)26
+b(dans)h(le)g(registre)525 b Ff(C-x)43 b(r)g(j)0 3448
+y Fg(Macros)i(cla)l(vier)0 3655 y Fe(lancer)28 b Fh(la)f(d)n(\023)-39
+b(e\014nition)27 b(d'une)h(macro)f(cla)n(vier)434 b Ff(C-x)43
+b(\()0 3755 y Fe(terminer)26 b Fh(la)h(d)n(\023)-39 b(e\014nition)27
+b(d'une)h(macro)f(cla)n(vier)323 b Ff(C-x)43 b(\))0 3854
+y Fe(ex)n(\023)-46 b(ecuter)28 b Fh(la)g(derni)n(\022)-39
+b(ere)25 b(macro)i(cla)n(vier)f(d)n(\023)-39 b(e\014nie)346
+b Ff(C-x)43 b(e)0 3954 y Fh(a)5 b(jouter)54 b(la)27 b(derni)n(\022)-39
+b(ere)26 b(macro)g(cla)n(vier)674 b Ff(C-u)43 b(C-x)f(\()0
+4054 y Fh(donner)27 b(un)h(nom)55 b(la)27 b(derni)n(\022)-39
+b(ere)26 b(macro)g(cla)n(vier)270 b Ff(M-x)42 b(name-last-kbd-mac)o(ro)
+0 4153 y Fh(ins)n(\023)-39 b(erer)25 b(une)j(d)n(\023)-39
+b(e\014nition)27 b(Lisp)h(dans)f(le)h(tamp)r(on)239 b
+Ff(M-x)42 b(insert-kbd-macro)0 4416 y Fg(Commandes)k(de)g(gestion)h
+(d'Emacs)f(Lisp)-2 4623 y Fh(\023)-39 b(ev)-5 b(aluer)26
+b(la)h Fe(s-expression)f Fh(situ)n(\023)-39 b(ee)27 b(a)n(v)-5
+b(an)n(t)27 b(le)g(p)r(oin)n(t)245 b Ff(C-x)43 b(C-e)-2
+4723 y Fh(\023)-39 b(ev)-5 b(aluer)26 b(la)h Fe(defun)h
+Fh(couran)n(te)938 b Ff(C-M-x)-2 4823 y Fh(\023)-39 b(ev)-5
+b(aluer)26 b(la)h Fe(r)n(\023)-46 b(egion)1141 b Ff(M-x)42
+b(eval-region)0 4922 y Fh(lire)27 b(et)f(\023)-39 b(ev)-5
+b(aluer)26 b(le)i(mini-tamp)r(on)807 b Ff(M-:)0 5022
+y Fh(c)n(harger)53 b(partir)27 b(du)h(r)n(\023)-39 b(ep)r(ertoire)25
+b(syst)n(\022)-39 b(eme)26 b(standard)86 b Ff(M-x)42
+b(load-library)3858 5663 y Fh(7)p eop
 %%Page: 8 8
-8 7 bop 0 -202 a Fg(P)n(ersonnalisation)26 b(simple)0
--78 y Fh(p)q(ersonnaliser)14 b(les)i(v)m(ariables)g(et)h(les)f(fon)o
-(tes)228 b Ff(M-x)26 b(customize)0 3 y Fh(Cr)o(\023)-24
-b(eation)13 b(de)h(liaisons)f(de)h(touc)o(hes)f(globales)g(en)h(Emacs)g
-(Lisp)f(\(exemples\):)0 84 y Ff(\(global-set-key)28 b("\\C-cg")g
-('goto-line\))0 144 y(\(global-set-key)g("\\M-#")f
-('query-replace-regex)q(p\))6 296 y Fg(\023)0 313 y(Ecriture)g(de)g
-(commandes)0 437 y Ff(\(defun)g Fb(nom-c)m(ommande)k
-Ff(\()p Fb(ar)m(gs)t Ff(\))52 497 y(")p Fb(do)m(cumentation)t
-Ff(")d(\(interactive)g(")p Fb(template)t Ff("\))52 557
-y Fb(b)m(o)m(dy)t Ff(\))0 638 y Fh(Exemple)16 b(:)0 719
-y Ff(\(defun)27 b(cette-ligne-en-haut-de-)q(la-fene)q(tre)i(\(line\))52
-779 y("Repositionne)f(la)f(ligne)g(du)f(point)h(en)g(haut)f(de)h(la)0
-839 y(fenetre.)0 899 y(Avec)g(ARG,)g(place)f(le)h(point)g(sur)f(la)h
-(ligne)g(ARG.")52 958 y(\(interactive)h("P"\))52 1018
-y(\(recenter)g(\(if)e(\(null)h(line\))418 1078 y(0)366
-1138 y(\(prefix-numeric-value)i(line\)\)\)\))0 1219 y
-Fh(La)e(sp)o(\023)-24 b(eci\014cation)25 b Ff(interactive)j
-Fh(indique)e(commen)o(t)f(lire)h(in)o(teractiv)o(e-)0
-1279 y(men)o(t)f(les)h(param)o(\022)-24 b(etres.)49 b(F)l(aites)25
-b Ff(C-h)i(f)f(interactive)i Fh(p)q(our)d(plus)g(de)0
-1338 y(pr)o(\023)-24 b(ecisions.)285 2445 y Fd(Cop)o(yrigh)o(t)483
-2444 y(c)472 2445 y Fc(\015)13 b Fd(1997)g(F)m(ree)f(Soft)o(w)o(are)h
-(F)m(oundation,)f(Inc.)332 2493 y(v2.2)h(p)q(our)g(GNU)h(Emacs)e(v)o
-(ersion)h(20,)g(Juin)h(1997)461 2541 y(conception)e(de)h(Stephen)g
-(Gildea)404 2588 y(traduction)f(francaise)g(d')800 2579
-y(\023)797 2588 y(Eric)h(Jacob)q(oni)0 2658 y(V)m(ous)k(p)q(ouv)o(ez)g
-(faire)g(et)g(distribuer)f(des)h(copies)g(de)g(cette)f(carte,)h(p)q
-(ourvu)g(que)g(la)h(note)e(de)0 2706 y(cop)o(yrigh)o(t)c(et)h(cette)e
-(note)i(de)g(p)q(ermission)g(soien)o(t)f(conserv)o(\023)-19
-b(ees)11 b(sur)i(toutes)f(les)h(copies.)0 2775 y(P)o(our)f(les)h
-(copies)f(du)h(man)o(uel)g(GNU)g(Emacs,)f(\023)-19 b(ecriv)o(ez)24
-b(la)13 b(F)m(ree)f(Soft)o(w)o(are)g(F)m(oundation,)g(Inc.,)0
-2823 y(59)h(T)m(emple)g(Place,)g(Suite)g(330,)g(Boston,)g(MA)h
-(02111-1307)e(USA)2315 3398 y Fh(8)p eop
+8 7 bop 0 -337 a Fg(P)l(ersonnalisation)47 b(simple)0
+-130 y Fh(p)r(ersonnaliser)26 b(les)h(v)-5 b(ariables)27
+b(et)g(les)h(fon)n(tes)379 b Ff(M-x)42 b(customize)0
+5 y Fh(Cr)n(\023)-39 b(eation)21 b(de)j(liaisons)f(de)g(touc)n(hes)g
+(globales)f(en)i(Emacs)e(Lisp)i(\(exemples\):)0 141 y
+Ff(\(global-set-key)37 b("\\C-cg")k('goto-line\))0 240
+y(\(global-set-key)c("\\M-#")k('query-replace-re)o(gex)o(p\))11
+493 y Fg(\023)0 522 y(Ecriture)47 b(de)f(commandes)0
+729 y Ff(\(defun)41 b Fb(nom-c)l(ommande)51 b Ff(\()p
+Fb(ar)l(gs)7 b Ff(\))87 828 y(")p Fb(do)l(cumentation)f
+Ff(")44 b(\(interactive)38 b(")p Fb(template)6 b Ff("\))87
+928 y Fb(b)l(o)l(dy)h Ff(\))0 1063 y Fh(Exemple)27 b(:)0
+1199 y Ff(\(defun)41 b(cette-ligne-en-h)o(aut)o(-d)o(e-l)o(a-)o(fen)o
+(et)o(re)c(\(line\))87 1298 y("Repositionne)h(la)43 b(ligne)f(du)g
+(point)g(en)h(haut)f(de)g(la)0 1398 y(fenetre.)0 1498
+y(Avec)g(ARG,)g(place)f(le)i(point)f(sur)g(la)h(ligne)e(ARG.")87
+1597 y(\(interactive)e("P"\))87 1697 y(\(recenter)h(\(if)i(\(null)g
+(line\))697 1797 y(0)610 1896 y(\(prefix-numeric-v)o(al)o(ue)37
+b(line\)\)\)\))0 2032 y Fh(La)44 b(sp)n(\023)-39 b(eci\014cation)42
+b Ff(interactive)e Fh(indique)k(commen)n(t)g(lire)g(in)n(teractiv)n(e-)
+0 2131 y(men)n(t)g(les)f(param)n(\022)-39 b(etres.)82
+b(F)-7 b(aites)43 b Ff(C-h)f(f)h(interactive)c Fh(p)r(our)k(plus)h(de)0
+2231 y(pr)n(\023)-39 b(ecisions.)476 4075 y Fd(Cop)n(yrigh)n(t)805
+4073 y(c)787 4075 y Fc(\015)22 b Fd(1997)h(F)-5 b(ree)21
+b(Soft)n(w)n(are)h(F)-5 b(oundation,)20 b(Inc.)553 4155
+y(v2.2)i(p)r(our)f(GNU)i(Emacs)f(v)n(ersion)f(21,)i(Juin)e(1997)769
+4234 y(conception)f(de)h(Stephen)f(Gildea)673 4314 y(traduction)h
+(francaise)g(d')1336 4299 y(\023)1330 4314 y(Eric)f(Jacob)r(oni)0
+4429 y(V)-5 b(ous)29 b(p)r(ouv)n(ez)e(faire)h(et)h(distribuer)e(des)i
+(copies)f(de)g(cette)g(carte,)h(p)r(ourvu)f(que)g(la)h(note)g(de)0
+4509 y(cop)n(yrigh)n(t)21 b(et)h(cette)f(note)h(de)f(p)r(ermission)g
+(soien)n(t)h(conserv)n(\023)-31 b(ees)21 b(sur)h(toutes)g(les)g
+(copies.)0 4625 y(P)n(our)f(les)h(copies)e(du)h(man)n(uel)f(GNU)i
+(Emacs,)d(\023)-31 b(ecriv)n(ez)41 b(la)22 b(F)-5 b(ree)20
+b(Soft)n(w)n(are)h(F)-5 b(oundation,)20 b(Inc.,)0 4704
+y(59)j(T)-5 b(emple)20 b(Place,)h(Suite)g(330,)h(Boston,)h(MA)f
+(02111-1307)h(USA)3858 5663 y Fh(8)p eop
 %%Trailer
 end
 userdict /end-hook known{end-hook}if
diff -ruN src-21.1/etc/fr-refcard.tex src-21.2/etc/fr-refcard.tex
--- src-21.1/etc/fr-refcard.tex	Sun Sep 23 19:44:19 2001
+++ src-21.2/etc/fr-refcard.tex	Fri Feb 22 11:51:22 2002
@@ -1,5 +1,5 @@
 
-% Reference Card for GNU Emacs version 20 on Unix systems
+% Reference Card for GNU Emacs version 21 on Unix systems
 %**start of header
 \newcount\columnsperpage
 
@@ -62,7 +62,7 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} pour GNU Emacs version 20, Juin \year}
+\centerline{v\versionnumber{} pour GNU Emacs version 21, Juin \year}
 \centerline{conception de Stephen Gildea}
 \centerline{traduction francaise d'\'Eric Jacoboni}
 
@@ -256,7 +256,7 @@
 
 \title{Carte de r\'ef\'erence de GNU Emacs}
 
-\centerline{(pour la version 20)}
+\centerline{(pour la version 21)}
 
 \section{Lancement d'Emacs}
 
@@ -660,5 +660,5 @@
 \bye
 
 % Local variables:
-% compile-command: "tex refcard"
+% compile-command: "tex fr-refcard"
 % End:
diff -ruN src-21.1/etc/gfdl.1 src-21.2/etc/gfdl.1
--- src-21.1/etc/gfdl.1	Wed Apr 25 15:47:19 2001
+++ src-21.2/etc/gfdl.1	Mon Nov 19 20:02:04 2001
@@ -1,22 +1,3 @@
-.\" Copyright (C) 2001  Free Software Foundation, Inc.
-.\"
-.\" This file is part of GNU Emacs.
-.\"
-.\" GNU Emacs is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 2, or (at your option)
-.\" any later version.
-.\"
-.\" GNU Emacs is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with GNU Emacs; see the file COPYING.  If not, write to the
-.\" Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-.\" Boston, MA 02111-1307, USA.
-.\"
 .TH GFDL 1 "2001 April 23"
 .UC 4
 .SH NAME
diff -ruN src-21.1/etc/refcard.ps src-21.2/etc/refcard.ps
--- src-21.1/etc/refcard.ps	Tue Apr  4 17:00:45 2000
+++ src-21.2/etc/refcard.ps	Fri Feb 22 11:51:22 2002
@@ -1,2122 +1,1265 @@
 %!PS-Adobe-2.0
-%%Creator: dvipsk 5.58f Copyright 1986, 1994 Radical Eye Software
+%%Creator: dvips(k) 5.86d Copyright 1999 Radical Eye Software
 %%Title: refcard.dvi
 %%Pages: 6
 %%PageOrder: Ascend
 %%BoundingBox: 0 0 596 842
 %%EndComments
-%DVIPSCommandLine: dvips -mode linoone -Z -s -D1270 refcard.dvi
-%DVIPSParameters: dpi=1270, compressed, comments removed
-%DVIPSSource:  TeX output 1997.06.18:1535
-/SafetyEnclosure save def
+%DVIPSWebPage: (www.radicaleye.com)
+%DVIPSCommandLine: dvips -o refcard.ps refcard.dvi
+%DVIPSParameters: dpi=600, compressed
+%DVIPSSource:  TeX output 2002.02.12:1312
 %%BeginProcSet: texc.pro
-/TeXDict 250 dict def TeXDict begin /N{def}def /B{bind def}N /S{exch}N
-/X{S N}B /TR{translate}N /isls false N /vsize 11 72 mul N /hsize 8.5 72
-mul N /landplus90{false}def /@rigin{isls{[0 landplus90{1 -1}{-1 1}
-ifelse 0 0 0]concat}if 72 Resolution div 72 VResolution div neg scale
-isls{landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div
-hsize mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul
-TR[matrix currentmatrix{dup dup round sub abs 0.00001 lt{round}if}
-forall round exch round exch]setmatrix}N /@landscape{/isls true N}B
-/@manualfeed{statusdict /manualfeed true put}B /@copies{/#copies X}B
-/FMat[1 0 0 -1 0 0]N /FBB[0 0 0 0]N /nn 0 N /IE 0 N /ctr 0 N /df-tail{
-/nn 8 dict N nn begin /FontType 3 N /FontMatrix fntrx N /FontBBox FBB N
-string /base X array /BitMaps X /BuildChar{CharBuilder}N /Encoding IE N
-end dup{/foo setfont}2 array copy cvx N load 0 nn put /ctr 0 N[}B /df{
-/sf 1 N /fntrx FMat N df-tail}B /dfs{div /sf X /fntrx[sf 0 0 sf neg 0 0]
-N df-tail}B /E{pop nn dup definefont setfont}B /ch-width{ch-data dup
-length 5 sub get}B /ch-height{ch-data dup length 4 sub get}B /ch-xoff{
-128 ch-data dup length 3 sub get sub}B /ch-yoff{ch-data dup length 2 sub
-get 127 sub}B /ch-dx{ch-data dup length 1 sub get}B /ch-image{ch-data
-dup type /stringtype ne{ctr get /ctr ctr 1 add N}if}B /id 0 N /rw 0 N
-/rc 0 N /gp 0 N /cp 0 N /G 0 N /sf 0 N /CharBuilder{save 3 1 roll S dup
-/base get 2 index get S /BitMaps get S get /ch-data X pop /ctr 0 N ch-dx
-0 ch-xoff ch-yoff ch-height sub ch-xoff ch-width add ch-yoff
-setcachedevice ch-width ch-height true[1 0 0 -1 -.1 ch-xoff sub ch-yoff
-.1 sub]/id ch-image N /rw ch-width 7 add 8 idiv string N /rc 0 N /gp 0 N
-/cp 0 N{rc 0 ne{rc 1 sub /rc X rw}{G}ifelse}imagemask restore}B /G{{id
-gp get /gp gp 1 add N dup 18 mod S 18 idiv pl S get exec}loop}B /adv{cp
-add /cp X}B /chg{rw cp id gp 4 index getinterval putinterval dup gp add
-/gp X adv}B /nd{/cp 0 N rw exit}B /lsh{rw cp 2 copy get dup 0 eq{pop 1}{
-dup 255 eq{pop 254}{dup dup add 255 and S 1 and or}ifelse}ifelse put 1
-adv}B /rsh{rw cp 2 copy get dup 0 eq{pop 128}{dup 255 eq{pop 127}{dup 2
-idiv S 128 and or}ifelse}ifelse put 1 adv}B /clr{rw cp 2 index string
-putinterval adv}B /set{rw cp fillstr 0 4 index getinterval putinterval
-adv}B /fillstr 18 string 0 1 17{2 copy 255 put pop}for N /pl[{adv 1 chg}
-{adv 1 chg nd}{1 add chg}{1 add chg nd}{adv lsh}{adv lsh nd}{adv rsh}{
-adv rsh nd}{1 add adv}{/rc X nd}{1 add set}{1 add clr}{adv 2 chg}{adv 2
-chg nd}{pop nd}]dup{bind pop}forall N /D{/cc X dup type /stringtype ne{]
-}if nn /base get cc ctr put nn /BitMaps get S ctr S sf 1 ne{dup dup
-length 1 sub dup 2 index S get sf div put}if put /ctr ctr 1 add N}B /I{
-cc 1 add D}B /bop{userdict /bop-hook known{bop-hook}if /SI save N @rigin
-0 0 moveto /V matrix currentmatrix dup 1 get dup mul exch 0 get dup mul
-add .99 lt{/QV}{/RV}ifelse load def pop pop}N /eop{SI restore userdict
-/eop-hook known{eop-hook}if showpage}N /@start{userdict /start-hook
-known{start-hook}if pop /VResolution X /Resolution X 1000 div /DVImag X
-/IE 256 array N 0 1 255{IE S 1 string dup 0 3 index put cvn put}for
-65781.76 div /vsize X 65781.76 div /hsize X}N /p{show}N /RMat[1 0 0 -1 0
-0]N /BDot 260 string N /rulex 0 N /ruley 0 N /v{/ruley X /rulex X V}B /V
-{}B /RV statusdict begin /product where{pop product dup length 7 ge{0 7
-getinterval dup(Display)eq exch 0 4 getinterval(NeXT)eq or}{pop false}
-ifelse}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale rulex ruley false
-RMat{BDot}imagemask grestore}}{{gsave TR -.1 .1 TR rulex ruley scale 1 1
-false RMat{BDot}imagemask grestore}}ifelse B /QV{gsave newpath transform
-round exch round exch itransform moveto rulex 0 rlineto 0 ruley neg
-rlineto rulex neg 0 rlineto fill grestore}B /a{moveto}B /delta 0 N /tail
-{dup /delta X 0 rmoveto}B /M{S p delta add tail}B /b{S p tail}B /c{-4 M}
-B /d{-3 M}B /e{-2 M}B /f{-1 M}B /g{0 M}B /h{1 M}B /i{2 M}B /j{3 M}B /k{
-4 M}B /w{0 rmoveto}B /l{p -4 w}B /m{p -3 w}B /n{p -2 w}B /o{p -1 w}B /q{
-p 1 w}B /r{p 2 w}B /s{p 3 w}B /t{p 4 w}B /x{0 S rmoveto}B /y{3 2 roll p
-a}B /bos{/SS save N}B /eos{SS restore}B end
+%!
+/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
+N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72
+mul N/landplus90{false}def/@rigin{isls{[0 landplus90{1 -1}{-1 1}ifelse 0
+0 0]concat}if 72 Resolution div 72 VResolution div neg scale isls{
+landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div hsize
+mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul TR[
+matrix currentmatrix{A A round sub abs 0.00001 lt{round}if}forall round
+exch round exch]setmatrix}N/@landscape{/isls true N}B/@manualfeed{
+statusdict/manualfeed true put}B/@copies{/#copies X}B/FMat[1 0 0 -1 0 0]
+N/FBB[0 0 0 0]N/nn 0 N/IEn 0 N/ctr 0 N/df-tail{/nn 8 dict N nn begin
+/FontType 3 N/FontMatrix fntrx N/FontBBox FBB N string/base X array
+/BitMaps X/BuildChar{CharBuilder}N/Encoding IEn N end A{/foo setfont}2
+array copy cvx N load 0 nn put/ctr 0 N[}B/sf 0 N/df{/sf 1 N/fntrx FMat N
+df-tail}B/dfs{div/sf X/fntrx[sf 0 0 sf neg 0 0]N df-tail}B/E{pop nn A
+definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get
+}B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub}
+B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr
+1 add N}if}B/id 0 N/rw 0 N/rc 0 N/gp 0 N/cp 0 N/G 0 N/CharBuilder{save 3
+1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx
+0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx
+sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{
+rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp
+gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B
+/chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{
+/cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{
+A A add 255 and S 1 and or}ifelse}ifelse put 1 adv}B/rsh{rw cp 2 copy
+get A 0 eq{pop 128}{A 255 eq{pop 127}{A 2 idiv S 128 and or}ifelse}
+ifelse put 1 adv}B/clr{rw cp 2 index string putinterval adv}B/set{rw cp
+fillstr 0 4 index getinterval putinterval adv}B/fillstr 18 string 0 1 17
+{2 copy 255 put pop}for N/pl[{adv 1 chg}{adv 1 chg nd}{1 add chg}{1 add
+chg nd}{adv lsh}{adv lsh nd}{adv rsh}{adv rsh nd}{1 add adv}{/rc X nd}{
+1 add set}{1 add clr}{adv 2 chg}{adv 2 chg nd}{pop nd}]A{bind pop}
+forall N/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn
+/BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put
+}if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{
+bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A
+mul exch 0 get A mul add .99 lt{/QV}{/RV}ifelse load def pop pop}N/eop{
+SI restore userdict/eop-hook known{eop-hook}if showpage}N/@start{
+userdict/start-hook known{start-hook}if pop/VResolution X/Resolution X
+1000 div/DVImag X/IEn 256 array N 2 string 0 1 255{IEn S A 360 add 36 4
+index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N
+/p{show}N/RMat[1 0 0 -1 0 0]N/BDot 260 string N/Rx 0 N/Ry 0 N/V{}B/RV/v{
+/Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT)
+(LaserWriter 16/600)]{A length product length le{A length product exch 0
+exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse
+end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask
+grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot}
+imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round
+exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto
+fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p
+delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M}
+B/h{1 M}B/i{2 M}B/j{3 M}B/k{4 M}B/w{0 rmoveto}B/l{p -4 w}B/m{p -3 w}B/n{
+p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S
+rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
+
 %%EndProcSet
-TeXDict begin 39158280 55380996 1000 1270 1270 (refcard.dvi)
-@start /Fa 1 59 df<EA03F8EA0FFE487E4813804813C0A2B512E0A76C13C0A26C1380
-6C13006C5AEA03F81313719231>58 D E /Fb 19 122 df<003FB712E05AA3B8FCA217C0
-A317806C16002B0B71AA3F>45 D<EE0FF8EEFFFE03036D7E030F80033F9138E01F80923B
-FFF81FF03FC04A903AE007F87FE04A90398001FCFFDA0FFEC712FD4A4891B5FC4A48804A
-48804A485E495B49825D4990C85C4982495AA2494894C7FC137F5C01FF5E48495EA25A4A
-153F4860A2485B187F61485BA218FF486091C9FCA25F48605BA25F00FF605BA25F615BA2
-4DEC03E0F10007A3495D4E130F1BC0A2053F141F007F047F15806017FF4C153F003F1A00
-6D5C4C495B001F4B157E6DDA1FDF14FE000FDB3F9F5C93397F1FFC016C6C902601FE0F5C
-6C6CD903FC14036C9027800FF807495A6C9026E07FF09038FF0FE06DB5D8C003EBFFC06D
-4A6C5C010F49C76C90C7FC010301F86E5A9026007FC0EC07F84B506ECD5A>97
-D<ED3FC00103B5FC90B6FC5AA25EA3C77E021F90C9FCA45DA2143FA25DA2147FA25DA214
-FFA25DA25BA25DA25BA25DA25BA25DA25BA292CAFCA25BEE1FF04AEBFFFE03036D7E013F
-010F14E04B80913AFC7FF03FF89239FF800FFC903B7FFDFE0007FEDAFFFC6D7E03F06D13
-805D90B54815C04B7F92C813E05C4849157F19F05C5C5A4A16F85CA25AA24A15FFA25AA2
-91C9FCA2485EA25BA2003F5E19F05BA25F127F4917E0A25F00FF18C05BA24D1380A25B4D
-1300A260177F60A24D5A495E5E604C5B6C7E4C5B95C7FC4C5A003F151F5F6C6C4A5A4C5A
-6D4A5A000F4A5B6C6C495B6C6CD90FFEC8FC6DEB3FFC6C9038C0FFF86C90B512E0013F14
-806D49C9FC010713F8010013803D7C6DF951>I<933801FFC0041F13FC93B6FC03031580
-030F15C04B018013E0923A7FFC001FF0912601FFF0EB07F84A01C0EB03FC4A90C712014A
-48EC00FE4A4814034A48140F4A48141F4A48143F4949147F494914FF5B4990C8FC495A01
-3F17FC5C017F17F8494816F0F07FE04849ED3FC095C7FC485BA25A5C5AA2485BA35A91CB
-FCA35A5BA4485AA55BA7007F1830197819FCA21801003FEF03F8F007F06C6C160FF01FE0
-000FEF7FC06DEEFF8000074C13006DED07FC6C6DEC1FF86CEE7FF06C01E0903801FFC06D
-6C010F5BD93FFED9FFFEC7FC6DB612F8010715E06D92C8FCD9007F13F8020F13803F506E
-CD51>I<1BFF070FB5FC0603B6FC60A21BFEA3F000019638007FFCA41BF8A21AFFA21BF0
-A261A21BE0A261A21BC0A261A21B80A261A21B00A261A262A2193FA262A2197FEE0FF8DC
-FFFE5C0303EBFF80030FECC0FF033F809227FFF81FF05B4A9038E007F84A90388001FDDA
-0FFEC7FC4A4891B55A4A48804A48804A5A49495E49825D4990C8FC49705B495AA2495A01
-7F95C7FC5C01FF5E485B615A4A153F5A61485B187FA248495EA218FF5A91C95BA25F5A49
-5FA25F12FF495FA25FA2495FA24DEC03E01A071900A2495D1A0F4E14C0A2053F141F007F
-047F15806017FF4C153F003F1A006D5C4C495B001F4B157E6DDA1FDF14FE000FDB3F9F5C
-93397F1FFC016C6C902601FE0F5C6C6CD903FC14036C9027800FF807495A6C9026E07FF0
-9038FF0FE06DB5D8C003EBFFC06D4A6C5C010F49C76C90C7FC010301F86E5A9026007FC0
-EC07F8507C6EF95A>I<933803FF80043F13F04BB512FC030F80033FECFF804B010113C0
-913A01FFF0007F020701C0EB1FE04A90C7EA0FF04A481407DA3FF815F8DAFFF01403495B
-495B495B4990C8FC5B5C495A017F1607494816F0A24849150F4818E04A151F48EF3FC04A
-ED7F8048933801FF004D5A4849EC1FFCEF7FF893380FFFF0480203B512C091B7C7FC17FC
-17C04803FCC8FC4BC9FC49CBFCA3485AA45BA75BA5007F186019F0F001F87F003F1703F0
-07F0F00FE0001F171F6DEE3FC0000FEFFF804D13006C6C4B5A6DED0FF86CEE3FF06C6DEC
-FFE06C6D01031380D97FF0011F90C7FC903A3FFC01FFFC6DB612F06D15C001034AC8FC01
-0014F0020F90C9FC3D506DCD51>I<EF07FE94383FFF804CB512E00407804C9138F807E0
-933B3FFE07FC0FF0933B7FF801FE1FF8923B01FFE0007F3F4B0180EB3FFF4B90C7FC4B48
-804B48804B5A4B486E13F015FF4A5B4C804A18E04A5B4A90C8FCA24A4817C0143F614A5A
-1B804A5A615B4B17005B61A249495EA2193F5B4B5EA2197F5B4B5EA219FFA24990C95BA2
-60A24A5FA260A262A260A26D485F606E5DA2010F4C90C7FC6095B5FC13076E4A5B6D5D17
-0F6D6D5B4D5B6D6DEBFFBF913A7FF003FE7F91393FFC0FFC6EB500F85B6E14E00203ECC0
-FF020049C6FCDB1FF05C92C8FC5FA261A25FA261A25FA261A25F96C8FCA2D803F04B5AEA
-0FF8486C4B5A486C157F007F5F4D5A00FF5D4C5B60040F5B494A90C9FC494A5A49ECFFF8
-6C4801035B01FC011F13C06CB75A6C4BCAFC000715F0C61580010701F8CBFC4D7278CD51
->103 D<EE7F800207B5FC49B6FC5BA294CBFCA390C7FCED3FFEA45EA2157FA25EA215FF
-A25EA25CA25EA25CA25EA25CA25EA25CA293CCFCA25CA25DA2143F943807FF804B017F13
-F04CB512FC027F010780041F809227F83FFC077F93267FE0017F9128FFF9FF80007FDBFB
-FEC76C7EEDF7F8DBFFF081494A143F5E5E93C87F495B5DA25D495BA25D5D494D5A5DA292
-C9FC4917FF625CA2013F5E625CA2017F5E625C6001FF60A24A5D97C8FC5A604A5EA24817
-3F615C187F484EEB0F801B1F4A15FF61481A3F4D160091C85CA2484C157E614919FE4D5D
-003F60505A5B4F485A127F505A496F140F6300FF4F5A714AC7FC4971B4FC71EB83FE72B4
-5A497013F0725B6C48701380001FCAD801FEC8FC517C74F95A>I<163FEEFF804B13C05D
-4B13E05DA417C0A217806F13006F5AED01F892C8FCB3A5EC3FE0ECFFF801037F497F497F
-D91FE07F90393F807FC0EB7E004980485A12034980485AA2484813FFA2485A4A5B123F13
-005C007E5DA25C00FE5D5A5C93C7FC5AC75A5D143F5DA2147F5DA214FF5D5BA25D5B5DA2
-5B5DA25B92C8FC5B4AEB03E01607133F5C160F017F15C05CA201FFEC1F805C163F170048
-5B167EA24A5BA24B5A6C14035E4B5A017F495AED3F806D6CB4C7FC6DB45A6D5B6D5B6D13
-E0010013802B7672F336>I<ED03FCEC3FFF010FB5FC5BA216F8A3EB0007020113F0A416
-E0A25CA216C0A25CA21680A25CA21600A25CA25DA2143FA25DA2147FA25DA214FFA25DA2
-5BA25DA25BA25DA25BA25DA25BA292C7FCA25BA25CA2133FA25CA2137FA25CA213FFA25C
-A25AA25CA25AA25CA25AA25CA25AA291C8FCA25AA25BA2003FEC0F80151F5BA2007F143F
-16005BA25D00FF147E5BA25DA2140101E05BA21403007F5C140701F05B003F130F001F49
-5A9038F87F806CB5C7FC6C5B6C5BC65BEB1FE0267C71F92D>108
-D<D903FCDB0FFFEE7FF890260FFF8091B500E00207B5FC496D010302F8021F14C04901F0
-010F6E027F80496D013F6E49B67E9026FE1FFC90277FF80FFF499038C07FF82601FC0F91
-26FFC003903B8007FE001FFC2803F807FE03D900019026C01FF86D7E01F0DA07FC6D9026
-E03FE06D7E00079126FF0FF0EE7F80496C49486F48C780000F4B4891267FF1FE8001C0DA
-BF805E001F03FFC8EBF3F8494849DCFFF0824C5F003F4B5F13004C5F4A4994C8FC5A007E
-4B5E4C5E00FE4905FF4C5B4892C95BA24B5F023F4C5F485094C7FCC75BA2027F4C5F684B
-5FA202FF4C173F684B5F1F7F494D60A24B94C912FF68495F664B4C5FA249053F5E684B5E
-6649057F4E13F8210192C9495D20004905FF19035415F04A4D5EA2013F4C053FEC07E067
-4A4D180F544814C0017F5EF91F804A5F55EB3F0001FF5E217E4A4D033F14FE69484D4F5A
-0C1F495A4A94C9EBF80F0C0FEB3FE078B55A4A4C7091C7FC4A4C705B6C90C96C487013F8
-017E7048EF1FE0855072CD90>I<D903FCED0FFF90260FFF8091B512E0496D010314F849
-01F0010F80496D013F809026FE1FFC90397FF80FFF2601FC079126FFC0037FD803F8D9FE
-03D900017F01F0DA07FC6D7F00079138FF0FF0496C494881000F4B48147F01C0ECBF8000
-1F03FFC8FC494849825E003F5D13005E4A5B5A007E5D5E00FE494D5A4892C9FCA25D023F
-5E4862C75BA2027F5E635DA202FF5E635D614996C7FCA24B5D625B193F4B5EA249177F62
-5D19FF494E131F1C3F92C85A62491A7F4E157E4A5FA2013F4C15FC624A18014E15F8017F
-1800F303F05C4FEB07E013FFF30FC04A0307141F1C8048F23F000603147E4A9338FF01FE
-72EB07FC72EBFFF84A7013E04A705B6C90CA6C90C7FC017EEF03FC585072CD63>I<9338
-01FFE0041F13FC047F13FF0303B612C0030F15F04B01807F923A7FFC001FFC912601FFF0
-6D7E4A01C0EB03FF4A90C714804A486E13C04A48804A4816E04A48157F4A4816F0495B49
-49ED3FF85B4990C913FC495A133F5C137F494817FEA2485BA2485BA25A4A167F5AA2485B
-A2F1FFFC5A91CAFCA2605A4918F8A2601AF0485AA24E13E0A21AC0495E1A80A24E1300A2
-4E5AA2007F4D5A6118FF614D5B003F4C5B616C6C4B90C7FC4D5A000F4C5A6D4B5A00074C
-5A6D4B5A6C6D495B6C03075B6C01E0011F90C8FC6D6CEB7FFC903A3FFE03FFF06DB65A01
-071580010102FCC9FC6D6C13F0020F90CAFC47506ECD5A>I<DB1FE0EC03FEDB7FFC9138
-1FFFC04B6C027F13F04A6D6C48B512FC4A6E4880DA07F0903AE00FFE07FF91260FE03F90
-261FF0011380DA1FC09027F03FC00013C003804A48EB7FE0023FDAF8FEC7EA3FF0923900
-1FF9FC4ADAFBF815F8027EDAFFF0141F02FE4B15FC4A495B4E140F01011AFE4A92C8FC5F
-167F01034B16FF4A5CA2010714FF5C4D5DA25D14C090C75CA24B5FA25FA24B5F1CFE5FA2
-4B17FFA294C913FCA24B5E1CF85EA2033F4C13F0A25E5013E0157F1CC04C5D1C8015FF50
-13004C5E1A3F4A60505AA2505A4A6D5E4F5B61705E4A4C90C7FC4F5A704A5A704A5A4A01
-BF4A5A94398001FFC093261FE0075B93260FF81F90C8FC4A6DB512FC7014F04B6C14C070
-6C90C9FC023FEC1FF094CBFC5DA2147FA25DA214FFA25DA25BA25DA25BA25DA25BA25DA2
-5B5B017F13E0007FB612F882B7FCA25E7E58707FCD5A>I<D903FCEDFFE090260FFF8001
-0713FC4901E0011F13FF496D017F14C0496D90B612E09027FF1FFC019038807FF02601FC
-07903A03FC000FF8D803F86D4848130701F09026FF0FE0EB1FFC00076D4948133F01E04A
-48137F000F03FFC712FF01C04A5B5E4848485BA2003F4B15F801005C1AF04A496D13E048
-F07FC0007E4BEC3F0096C7FC4A90CAFC12FE485CA2143F5AC75BA2147FA25DA214FFA25D
-A25BA25DA25BA25DA25BA25DA25BA292CBFCA25BA25CA2133FA25CA2137FA25CA213FFA2
-5CA25AA25CA35C5C6C90CCFC137E465072CD4A>114 D<EE0FFE93B512E0030314F8030F
-80033F8092397FFC07FF9226FFE00013804A0180EB3FC04A48C7EA1FE04A48140F020FED
-07F04A5A4B140F023F153F4B147F027F15FFA24A485BA34917E0A219C0711380496DEC7E
-0095C7FC8181816DEBFF8016FCEEFFC017F86D15FE836E15C0846E81806E816E8114016E
-6C80150FDB007F7F16071601707E8383A2014081EA03F8D80FFE81121F487E605AA2170F
-48485EA2495E49151F495E49153F007EC9485A007F5F4D5A6C6C4A90C7FC6D5C6C6CEC0F
-FED80FF8EC1FF8D807FEECFFF02703FFE00F5B6C90B612806C4BC8FC013F14F8010714C0
-9026007FFCC9FC3C5074CD48>I<ED03F04B7E4B7E151F153FA4157F5EA315FF5EA35C5E
-A35C5EA35C5EA35C93C8FCA35C5D007FB8FC1880B9FC1800A3C7D87FFCC8FC5DA314FF5D
-A35B5DA35B5DA35B5DA35B92C9FCA35B5CA3133F5CA3137F5CA313FF5CA35A5CA2177C48
-16FC5C16015F5A4A13035F1607485E91C7120F5F4C5A163F94C7FC495C16FE4B5A00075D
-4B5A6D130F6C4A5A6CEC7FC0DA81FFC8FC6CEBFFFE6D5B6D13F0010F13C0D901FEC9FC31
-7071ED3A>I<EC3FC0ECFFF801036DEE0F80496DEE3FC0011F6D4C7ED93FE06D4B7E9138
-807FC0D97E005E49804848611203496E5C485A63484813FF61485A4A60003F5D01005F5C
-007E4B93C7FCA24A5E00FE5D48615C93C8123F5AC7485F5D023F167F5D62147F4B15FFA2
-02FF5F5D605B4B5EA2605B4B5EA2605B4B5EA24EEC03E049190792C81400A24E140F1CC0
-61A21B1F4A033F158061A26E037F143F1C0018FF6D4B49137EA24D15FE6D6D495DDD0FDF
-13016D6D90263F9FFC5BDD7F0F13036D9027F001FE07495A91277FFC0FFC9038FF0FE06E
-B5486CEBFFC06E4A6C5C02079126C0007F90C7FC020191C76C5A9126003FF8EC07F85350
-72CD5E>I<EC3FE0ECFFF801036DEE0F80496DEE3FC0496DEE7FE0D91FE06DEDFFF09039
-3F807FC0D97E005E4980484819E01203496E5C484819C0A2484813FF61484819805C003F
-5D01005F4A1800007E5DA24A5E00FE4B5D5A5C93C8123F4861C75A5D023F167F4B5EA214
-7F4B15FF6214FF5D6049605DA26049605DA26049605DA2604995C7FC92C8FCA26061A318
-3F4A5EA36E157F6118FF6D5DA24D5B6D6D5B5F6D6D133F4D5B6DD9F001B5FC91397FFC0F
-FD6EB55A6E02F35B020714C3020114039139003FF80792C75CA34D90C8FCA25F60131001
-FE4B5A3803FF80484C5A487F4D5A485F5E604849495B5E91C791C9FC494A5A494A5A494A
-5AD81F804A5A4C5A6D495B6C6C495B6DD90FFECAFC6C6CEB3FFC6CB448B45A6C90B512E0
-6C15806D49CBFC011F13F0010313804C7272CD55>121 D E /Fc
-1 14 df<95380FFFF80503B612E0053F15FE4CB812C0040F17F8043F17FE93B526F8000F
-6D7E030349C8003F13E0030F01E0030313F8033F90CAEA7FFEDB7FFCEF1FFF912601FFF0
-050713C04A01C005017F020F90CCEA7FF8DA1FFCF11FFC4A48737EDA7FE0F103FF4A4873
-7F4990CE6C7E4948757E4948757E4948757E4A1B074948757E4948757E4A1B0049D0127F
-498A491D3F4848777E00038B491D0F4848777EA24848777EA2491D01001F8BA2491D0000
-3F8BA290D2127E481F7FA2007E8BA300FE2080A2481F1FAD6C1F3FA2007E2000A3007F67
-A26C1F7E6D1EFEA2001F676D1D01A2000F676D1D03A26C6C535AA26C6C535A6D1D1F0001
-676C6C535A6D1D7F6D9BC7FC6D6C1CFE6E1B016D6C515A6D6C515A6E1B0F6D6C515A6D6C
-515A6D6C515A6D01C04F485A6E6C4F90C8FCDA3FF8F10FFE6E6C4F5A6EB4F17FF8020301
-C0943801FFE06E01F005075B9126007FFC051F90C9FC6FB4EF7FFE030F01E0923803FFF8
-030301FE033F13E00300D9FFF8010FB51280043F90B748CAFC040F17F8040117C0DC003F
-4BCBFC050315E0DD000F01F8CCFC797177D68C>13 D E /Fd 46
-122 df<EA0FC0EA1FF0EA3FF8EA7FFC12FF13FEA313FFA37E7E7EEA0FEFEA000FA4131F
-131EA3133E133CA2137C137813F8EA01F0A2EA03E0EA07C0A2EA0F80EA1F00123E123C12
-181027748E28>44 D<B712F0A924097E9E2F>I<EA07C0EA1FF0EA3FF8EA7FFCA2EAFFFE
-A5EA7FFCA2EA3FF8EA1FF0EA07C00F0F748E28>I<913801FFC0021F13FC027F13FF49B6
-12C00107018013F0903A0FFC001FF8D91FF0EB07FC49486D7E49486D7E49486D7F4890C8
-6C7E49153F00038348486F7EA2000F8349150FA2001F83A3003F83A2491507007F83A700
-FF1880B3A4007F1800A66C6C4B5AA4001F5FA36C6C4B5AA200075F6D153F00035F6D157F
-6C5F6C6D4A5A6D6C4990C7FC6D6C495A6D6C495AD90FFCEB1FF86DB46CB45A010190B512
-C06D6C91C8FC021F13FC020113C039537AD046>48 D<15F014011407140F143FEB01FF13
-0F48B5FCB6FCA2EBFE7F13F0EAFE00C7FCB3B3B3A74A7E010313FEB812F8A52D5173D046
->I<EC1FFE49B512F0010714FC011F14FF4915C09026FFE01F13F048D900037FD803F801
-007F48486E7E4848EC1FFFD81F806E1380A248C86C13C0003E6F13E0127E007F6F13F013
-C0487E6D806D16F8A66C5A6C5A6C5ACAFC4C13F0A318E05E18C05E18804C1300A24C5A4C
-5A5F4C5A4C5A4B5B5F4B90C7FC4B5AED0FF84B5A4B5A4B5A4BC8FC4A5A4A5A4A5A4A5AEC
-1FC04A4814F84AC8FC14FE4948EC01F0495A495A495AD91F80140349C8FC017E16E04915
-074848150F48B8FC5A4817C05A5A5AB9FCA21880A3355178D046>I<91380FFF8091B512
-FC010714FF011F15C090263FFC0313F0903AFFC0007FFC4848C7EA1FFED803F86E7E496E
-1380484816C0486C8001FC16E0486C8018F07FA56C5AA26C4816E0D801F05CC9FC18C05E
-1880A24C13004C5A5F4C5A4C5A4B485A0307138092B5C7FC91B512FC16E016F816FFDA00
-0313C0030013F0EE3FF8EE0FFE707E18807013C07013E018F0A27013F8A218FC177FA218
-FEA2EA0780EA1FE0487E487E487EA318FC17FFA24916F8A26C484A13F013C06CC84813E0
-6D4A13C06C6C1680D80FF04A1300D807FCEC3FFE6CB46C495A6C9039F803FFF86C6CB612
-E06D5D01074AC7FC010114F8D9000F1380375379D046>I<486C1507D803F0153F01FF4A
-B4FC02F8133F91B65A5F5F5F17C05F94C7FC16FC16F016C001E701FCC8FC01E0CAFCAF91
-3803FF80023F13F091B512FE01E3809026E7FE0113C0903AEFE0007FE0D9FF80EB1FF049
-C76C7E496E7E496E7E4981496E13806C5AC914C08218E0A218F0177FA318F8A4EA1F80EA
-3FE0487E12FF7FA318F04915FFA24916E06C5A90C84813C0127E003E4B1380123F6C6C4A
-13006D5D6C6C4A5A6C6CEC3FF8D803FC4A5A6CB449485A6CD9F00F5B6DB6C7FC011F14FC
-010714F0010114C09026003FFCC8FC355378D046>53 D<EA07C0120F7F13FF91B812C0A3
-5AA21980190060605A600180C8EA03F090C9485A003E5F007E160F4D5A007C4CC7FC177E
-177C17FC484B5A4C5A4C5AC95B160F4C5A4CC8FC163E167E5E4B5AA24B5A15075E150F5E
-151F4B5AA2157F93C9FC5DA24A5AA31403A24A5AA3140FA4141F5DA3143FA6147FAC6E5A
-6E5A6E5A3A5578D246>55 D<913803FF80023F13F891B512FE01036E7E010F01017F903A
-1FF8003FE0D93FE06D7E49486D7E49486D7E4890C76C7E486F7E485A000F6F1380484816
-C0A2003FEE7FE0A2485A18F0A218F812FF173FA218FCA618FEA2177F127FA46C6C15FFA2
-121F5E6C7E00075D6C7E6C5D6C6DEB0FBF6D6CEB1F3F6D6C137E90391FF801FC6DB500F8
-13FC010314F06D14C0D9003F1300EC006092C7EA7FF8A418F0A2EFFFE0A3D803F016C048
-6C4A1380487E486C4A1300A24C5A5F160F4C5A494A5A6C484A5A494A5A6C4801035B01F8
-010F90C7FC3A03FF803FFC6C90B55A6C15E0013F1480010F49C8FC010013E0375379D046
->57 D<EF0F804D7EA24D7EA34D7EA24D7EA34C7FA34C7FA24C7F17CFA2040F801787041F
-801703A2043F80EE3E01047E80EE7C00A204FC804C137F0301815E183F0303814C131FA2
-4B488084030F824C7FA2031F8293C77E4B82033E80A2037E82037C8003FC824B157FA202
-01834B153F02038392B8FCA24A83A3DA0F80C8000F7F85021F8492C97EA24A84023E8202
-7E84027C82A202FC844A177F0101854A173FA20103851A1F010785010F84497ED97FFC4D
-7F0003B5057F13E0B600F0033FB612F8A55D577BD668>65 D<B912FCF0FFC019F819FF1A
-C0D8003F90C8001F7F6D48030313F8010F04007FF13FFE737E737F737FA2737FA2737FA2
-8785A66163A24F5BA24F5BA24F5B4F90C7FC4F5AF1FFF84E5B060713C0063F5B91B800FC
-C8FC19E08519FF4AC8000F13C0060113F09538003FFC73B4FC07077F737F737F87737F74
-7EA2747E8786A21C80A81C00A262631A7F505AA24F5B4F5B4F5B071F5B4F5B011F4CB5C7
-FC496C030F5BBB12F81AE01A8007FCC8FC1980515478D362>I<DDFFFC15E0041FD9FFC0
-13014BB600F81303030703FE1307033FEDFF8092B5D8F003EBC00F020349C7383FF01F4A
-01F091380FF83F021F01C0EC03FC4A90C9EAFE7FDA7FFCEE7FFFDAFFF0161F0103498249
-49824949824990CA7E495A4A834948187F495A481A3F5C481A1F485B1B0F485BA2481A07
-91CCFCA25A491903A2127FA298C7FC5B12FFAE6C7EA4003FF203E0A27F7EA2806C1A071C
-C06C7FA26C6D180F6C1B806E181F6C1B006D6C606D6C183E6E187E6D6C606D6D4C5A6D7F
-6D6DEE07F001006D4C5ADA7FFC4C5A6EB4EE7F806E01C04BC7FC020701F0EC07FE6E01FE
-EC1FF80200903AFFF001FFF0033F90B612C0030793C8FC030115FCDB001F14E0040001FC
-C9FC535878D564>I<BC12C0A487D8003F0180C712016D90C9120F6D1701851A3F1A1F74
-7EA21A07A21A03A21A0187A21A00A4183E871B7CA398C7FCA2187EA318FE17011703173F
-92B6FCA592C7123F170317011700187EA3183EF30F80A3F31F00A395C8FCA3631B3EA31B
-7EA21BFE63A21A011A03A21A071A0F505A1A7FF101FF491707496D92B5FCBCFCA263A351
-5479D35E>69 D<BC1280A41BC0D8001F01C0C712016D49EC001F6D170319001A7F1A3FF2
-1FE0A21A0F1A07A31A031BF0A21A01A5061F14F81A00A31B00A360A360605F171F92B7FC
-A5923880001F1701838484A384A795C9FCB3497F4913F0B87EA54D547AD35B>I<DDFFFC
-15E0041FD9FFC013014BB600F81303030703FE1307033FEDFF8092B5D8F003EBC00F0203
-49C7383FF01F4A01F091380FF83F021F01C0EC03FC4A90C9EAFE7FDA7FFCEE7FFFDAFFF0
-161F010349824949824949824990CA7E495A4A834948187F495A481A3F5C481A1F485B1B
-0F485BA2481A0791CCFCA25A491903A2127FA298C8FC5B12FFAE6C6C0403B712F0A4123F
-95C7000FEBF8006D060313E06C85A2807EA26C7FA26C7F7E806C7F137F6D7E806D7E6D7F
-6D6D5E6D7F010001F85E6E6C5E6EB45E6E01C0ED3FBF020701F8EDFF1F6E01FF913807FE
-0F020002F890387FFC07033F90B6EAF0030307EEE001030193C7FCDB001F02F891C7FC04
-0091CAFC5C5878D56D>I<B712FCA5D8001FEBE0006D5B6D5BB3B3B3B0497F497FB712FC
-A526547AD333>73 D<023FB612FEA5DA000114009238007FFC163FB3B3B3A2EA0FC0487E
-487E487E487EA3167F5FA2495D6C4814FF495D6C48495B90C75AD81FC0495B6C6C4990C7
-FCD807F8EB1FFC6CB46CB45AC690B512E06D5C010F49C8FC010113E0375679D348>I<B6
-070FB512F86F606F60A3D8003F6D4EEBE0006D6490260FBFF006FB5BA3DA9FF8EF01F3A2
-DA8FFCEF03E3A3DA87FEEF07C3A2DA83FFEF0F83A202816DEE1F03A302806D163EA26F6C
-167CA36F6C16F8A26F6CED01F0A36F6CED03E0A26F6CED07C0A36F6CED0F80A26F6DEC1F
-00A26F6D143EA3706C5CA2706C5CA3706C495AA2706C495AA3706C495AA2706C495AA270
-6D48C7FCA370EBC03EA2716C5AA3716C5AA294381FF9F0A371B45AA2715BA2496C6E5B49
-7E496C4F7F2603FFFE6E90C8487FB600F8053FB612F8715AA3187C6D5478D37E>77
-D<B66C030FB612E08181A281D800076DDB001FEBF0006F040313807490C7FC6F705ADADF
-FF177C8214CF02C77F02C37F8214C102C07F826F7E153F6F7E83816F7F6F7F83816F7F70
-7E83163F707E707F8482707F707F8482717E717E8483717F85717F83717F8583727E727E
-85847213807213C01AE0847213F07213F81AFC197FF13FFEF11FFF1BFC858585A28585A2
-1A7F1A3F1A1F497E496C170F496C170748B51703B612FE1A011A001B7CA25B547AD368>
-I<B912F8F0FF8019F819FE737ED8003F0180C7003F13E06D90C800037F6D04007FF13FFE
-737E7313807313C0851BE07313F0A21BF885A21BFCA91BF8A24F13F0A21BE0611BC04F13
-804F13004F5A4F5AF1FFF806075B067F13C092B8C7FC19FC19E096C8FC92CCFCB3AD497F
-497FB712F0A54E5479D35E>80 D<912607FF80EB0380027F01FC13070103B6130F4915C0
-011FEDF01F90267FFC00EBF83FD9FFE090380FFE7F480180EB01FF4848C8EA7FFFD807F8
-814848150F4981001F824848815B007F82187F90CAFC183F5AA2181FA27FA2180F7F7F12
-7F6D93C7FC7FEA3FFE6D7E6C13E014FC6CEBFFE06C14FE6CECFFF06C15FF6C16F06D15FC
-6D15FF010F16C06D82010182D9003F81020181DA001F80030180DB000F14801600051F13
-C0050713E083050013F0187FA2183FF01FF8127800F8170FA31807A27EA319F07E180F6C
-18E0A26D161F6D17C06DEE3F806D167F6DEEFF0001FE4B5A6D6C4A5AD97FE0EC0FF8D93F
-FCEC3FF03CFE0FFFE003FFE0486C90B65AD8F80193C7FCD9003F14FC48010714F048D900
-3F90C8FC3D5878D54E>83 D<001FBC12F0A5489026E000079026E0000F13F849C76C4913
-0001F8193F01E0190F491907491903A290C81701A21B00007E1BFCA3007C1B7CA6481B3E
-A5C91800B3B3AB4C7F041F13F8020FB812F0A557537AD264>I<B700FC020FB612E0A5D8
-001F01E0C9001FEBF0006D49040313806D497090C7FC745A1B7CB3B3B06D19FC6F5FA36D
-1801636D6D1603636E6C1607636E6C160F021F4D5A6F4CC8FC6E6C167E6E6C16FE6E6DEC
-03FC6E01E04A5A9126007FF8EC1FF0DB3FFEECFFC092271FFFE00F5B030790B6C9FC0301
-15FC6F6C14F0040F14809326007FF8CAFC5B567AD368>I<ECFFFE010FEBFFE0013F14F8
-90B612FE489038C00FFF2703FE000113C06D6D7F48ED3FF06E6D7EA2707E707EA26C90C7
-FC6C486E7E6C5A90C8FCA6030FB5FC0203B6FC143F49B7FC010FEBFE03013F13C09038FF
-FE004813F84813E04813804890C7FC485A485A5B485A19F812FF5BA35EA25E7F007F5D6D
-5C6C6C027DEB81F06C6C14FC280FFF8003F8EBE7E06C903AF01FE07FFF6C90B500C014C0
-C6DB003F1300011F01FCEB0FFE010101E0EB07F03D387AB646>97
-D<EB7FE0B5FCA51203C6FCA2137FB3A4923801FFE0030F13FE037F6D7E02E1B612E002E7
-010013F8DAEFF0EB1FFCDAFFC0EB07FE92C76C7E4A6E7F4A6E7F4A6F7E4A6F7E4A82181F
-85A2727EA285A284A21A80AB1A0060A261A34E5AA24E5A6E5E6E157F616E4B5A6E4A5B02
-BF020790C7FCDA9FC0495ADA0FF0EB3FF8913A03FE01FFF0D97E01B612C06E6C91C8FC01
-7C011F13FC90C7000313C041567AD44E>I<913801FFFC020FEBFFE0027F14F849B612FE
-01079038C007FF4948C71380D91FF85B494815C0D97FC05B13FF485B4890C7FC485A000F
-6F1380496E1300001F167E94C7FC485AA2127FA35B12FFAB6C7EA3123FA27F001FEE03E0
-7F000F16076C6C16C0A26C6D140F6C6DEC1F806C6DEC3F006D6C147ED93FFC5CD90FFFEB
-03F86D9038E01FF0010190B55A6D6C1480021F49C7FC020113E033387BB63E>I<EF03FF
-0407B5FCA5EE001F1707A283B3A4913801FFE0021F13FC027FEBFF8349B612E301079038
-C03FF3903A0FFE0007FBD93FF80101B5FC49486D7ED9FFC0804849140F4890C8FC488249
-81120F485AA2485AA3127FA25B12FFAB127FA27FA2123FA26C7EA2000F5E7F00075E6C6C
-5D6C6D5C6C6D4A7F6D6C91B5FC6D6CD903FB13E0D91FFCD90FF3EBFF80903A0FFF807FE3
-010390B512830100ECFE03023F13F80203018091C7FC41567AD44E>I<913803FF80023F
-13F891B512FE01036E7E010F01017F903A1FF8007FE04948EB1FF0D97FC06D7E49486D7E
-4890C76C7E48824848801880484880121F4916C0003F167FA3007F17E05BA200FF163F90
-B8FCA401F0CAFCA7127F7FA2123FA26C7EEF03E0120F6D1507000717C06C6C150F6E1580
-6C161F6C01E0EC3F006D6C147ED91FF8495A6DB4EB07F86D9038E03FF0010190B55A6D6C
-1480021F01FCC7FC020113E033387BB63E>I<ED0FF892B5FC02031480020F14C091391F
-FC1FE091393FF03FF0DA7FC013F89138FF807F4913005B495AA24948EB3FF0EE1FE0EE0F
-C0494890C7FCB2B712F0A526001FF8C8FCB3B3A580EB7FFE003FB6FCA52D567BD52C>I<
-F07F80DA0FFF903803FFC0027FD9E00F13E049B5D8F83F13F001079139FE7FC7F8903B1F
-FE07FFFE0790263FF000EBF80F494890387FE0074948EB3FF0484990391FF803F091C700
-0FEB01C04870C7FC4882491407A2000F82A800075EA26D140F6C5E6C5E6E131F6C6D495A
-6D6C495A6E495ADAFE075B90B648C8FC01F914F82601F07F13E0020F90C9FC000390CBFC
-A57FA27F6CB4FC91B6FC17F86C16FF6D16C018F06D828490B87E0003834890C700011480
-D80FF8EC001F4848030313C0D83FC01500007F177F49EE3FE012FF90CA121FA56D163F00
-7F18C06D167F6C6CEEFF806C6C4B13006C6C4B5AD807FEED0FFC6C6C6CEC3FF86C01E0EC
-FFF06C6CB4011F13C0011F90B6C7FC010715FCD9007F14C0020701FCC8FC3D517BB646>
-I<EB7FE0B5FCA51203C6FCA2137FB3A4EEFFF0030713FE031F6D7E037F14E0DBFF807F91
-3AE3FC003FF8DAE7F06D7EDAEFC0130F4B6D7E02FFC7FC5C4A6E7EA25CA25CA35CB3AC26
-01FFF8020F13C0B6D8F007B61280A5415579D44E>I<133EEBFF80487F487FA2487FA56C
-5BA26C5B6C5B013EC7FC90C8FCAFEB3FE0B5FCA51203C6FC137FB3B3A43801FFF8B612E0
-A51B547AD327>I<EB7FE0B5FCA51203C6FCA2137FB3A5040FB512F0A50403140018F018
-C095C7FCEE07FC5F4C5AEE3FC04C5A4CC8FC4B5AED07F84B5A4B5A4B5A15FF02E17F02E3
-7F02E77F14EF9138FFDFFCED8FFEED0FFF4A6C7FECF8034A6C7F4A6C7F4A80167F707E70
-7E83707E82707F707F8482717E8484842601FFF0EDFFC0B6D8E003B512FEA53F557AD44A
->107 D<EB7FE0B5FCA51203C6FCA2137FB3B3B3B03801FFF8B612F0A51C557AD427>I<D9
-7FC0D9FFF0913807FF80B5010701FE023F13F0031F6D6C90B512FC037FDAE00314FFDBFF
-809027F007FC077F912BC3FC003FF81FE0017F0003D9C7F090281FFC3F80007FC6D9CFC0
-010F017EC7127F4B902607FE7C6E7ED97FDFC75C02FE6F5A4A6E496E7EA24A5EA24A5EA3
-4A93C8FCB3AC2601FFF8020F01C0EC7FFEB6D8F007B6D8803FB512FCA5663679B573>I<
-D97FC0EBFFF0B5010713FE031F6D7E037F14E0DBFF807F913AC3FC003FF80003D9C7F06D
-7EC6D9CFC0130F4B6D7ED97FDFC7FC14FE4A6E7EA25CA25CA35CB3AC2601FFF8020F13C0
-B6D8F007B61280A5413679B54E>I<EDFFE0020F13FE027FEBFFC049B612F0499038803F
-F8903A0FFC0007FED91FF0EB01FF49486D7FD97F80EC3FC049C86C7E488348486F7E4848
-6F7EA2000F8348486F7EA2003F1880A24981007F18C0A400FF18E0AA007F18C0A36C6C4B
-1380A3001F18006D5D000F5F6C6C4B5AA26C6C4B5A6C6D4A5A6C6D4A5A6D6C4A5A6D6C49
-5BD90FFCD907FEC7FC903A07FF803FFC010190B512F06D6C14C0020F49C8FC020013E03B
-387BB646>I<903A7FE001FFE0B5010F13FE037F6D7E02E1B612E002E7010113F8913AEF
-F0003FFC0001D9FFC0EB0FFE6C91C76C7E6D486E7F4A6E7F4A6E7F4A824A6F7E183F8518
-1F85A2727EA4721380AB4E1300A361181FA24E5AA24E5A6E5E6E15FF4D5B6E5E6E4A5B6E
-020F90C7FC03C0495ADAEFF0EB7FF8913AE3FE03FFF002E1B612C0DAE07F91C8FC031F13
-FC030313C092CBFCB13801FFF8B612F0A5414E7AB54E>I<90397FC007F8B5EB3FFF4B13
-8092B512C09139C1FC7FE0DAC3F013F000039038C7C0FFC6EBCF80ECDF00EB7FDE14FE4A
-EB7FE0EE3FC04AEB1F8093C7FCA25CA45CB3A98048487EB612FCA52C367AB537>114
-D<903A01FFF00380011FEBFE07017FEBFF9F48B7FC0007EB001FD80FF81307D81FE01301
-0180EB007F48C8FC48153F007E151FA212FE160F7EA27F7F01F091C7FCEA7FFEEBFFF0EC
-FF806C14FC6CECFF806C15E06C15F86C81C615FF013F1580010F15C01301D9000714E0DA
-001F13F01503ED007F0078ED3FF800F8150FA26C1507A216037EA26C16F0A26D14076D15
-E06D140F6DEC1FC06DEC3F8001FEECFF003AFEFFC00FFED8FC3FB55A486C14F0D8F00314
-8027E0007FFCC7FC2D387BB638>I<147CA614FCA41301A31303A21307A2130F131F133F
-137F13FF1203000F90B6FCB8FCA426000FFCC8FCB3A8EE03E0AB16076D6C14C0A2160F6D
-6C14806DEC1F00EDC03F6DEBF0FE6EB45A021F5B020713E0020013802B4D7DCB37>I<D9
-7FE0EC03FFB50207B5FCA50003ED001FC61607A2017F81B3AB5FA35FA25F133F6E5C4D7F
-011F15FB6D6CD901F313E06ED907E3EBFF80903A07FF803FC3010190B512836DECFE0302
-3F13F8020301C091C7FC413779B54E>I<B600C0010FB51280A5000101F8C70001EBF800
-6C496E13E0017FEE7F80013F94C7FC187E80011F167C6E15FC010F5E6E140101075E6E14
-036D5EA26F13076D5E6F130F6D5E6F131F027F92C8FC6F5B023F143EA26F137E021F147C
-6F13FC020F5CEDFE0102075CEDFF036E5CA216876E5C16CF6E5C16FF6F90C9FCA26F5AA3
-6F5AA26F5AA26F5AA26F5A41367CB44A>I<B6D8803FB5D8C003B512E0A5000301F0C701
-F8C76C13006C496E48EC1FF86C70485D051F6F5A017F705D173F6D6C6F5DA26E027F151F
-011F7092C7FC05FF5D6D6C02FB153E846E0101167E0107DBF1FF147C16036E02E015FC6D
-715B040715016D01809026C07FC05BA2DBC00F15036D9226803FE05B161F03E0D9001F13
-07027F04F05B4C150F91263FF03ED90FF85BA2DBF87E151F021F017CD907FC90C8FC16FC
-6E6C480103133E19FE03FF167E6E49903801FF7CA24C6D13FC6E5FA26E496E5AA36E496E
-5AA293C8121F6F5EA2033E6F5A5B367CB464>I<B600C0010FB51280A5000101FCC70001
-EBF8006C01F06E13E0017FEE7F80013F94C7FC6E157EA2011F5E80010F5E6E140101075E
-6E14036D5E6F13076D5E6F130FA26D5E6F131F027F92C8FC6F5B023F143E6F137E021F14
-7C6F13FC020F5CEDFE01A202075CEDFF036E5C16876E5C16CF6E5C16FF6F90C9FCA36F5A
-A26F5AA26F5AA26F5AA26F5AA215075E150F5E151F93CAFC5D153E000E147ED83F80137C
-486C13FC486C5B14015D14034A5A49485A007F495AD9807FCBFC383F81FE6CB45A6C5B00
-0313E0C690CCFC414E7CB44A>121 D E /Fe 25 122 df<95261FFFF892381FFF80051F
-B600C00107B512F04CB700F0017F14FC041FDCFC01B7FC047FDCFF0716800303B9009F16
-C0030F95B812E0033F9126F8003FDBFC0F13F092B6C70003DBC01F13F84A02F84AED003F
-4A02E04A4A4913FC020F02804A5C4A49C8484A90B512FE4A49604A49604C5D91B548605B
-4C605B4C7413FCA2497291C76C13F893C97113F0747013E07913C0740401130074EE0010
-9DC7FCB1C012F0A9D800070280C800070280C9FCB3B3B3A6007FB700F8017FB8FCA97F7B
-7BFA76>11 D<030FB5FC0203B612F8023FEDFF8091B812F0010317FC010F17FF49844990
-26FC001F14E049018001038090B56C0100806F6E7F486E021F7F727F486E8372808487A2
-7280A36C4A80876C5CA26D5B011F90C9FC6D5AEB01F090CBFCA40507B6FC040FB7FC0303
-B8FC153F4AB9FC140F027F5D49B6EAFC0001071580011F02FCC7FC4914E090B6C8FC4814
-FC485C485C4814C05D5A4891C9FC5C5A5CA2B5FC5CA460A36E5D6C5F806C5F6E4B806C6E
-DA3FDF7F6FDAFF9FEBFFC06C6E0103011FECFFC06C02F8D90FFE16E06C02FF9038FFFC0F
-C692B5487E6D16F0011FEEC003010793C7FC010003FC143F021F02F0020314C09126007F
-FECCFC5B517ACF62>97 D<91B5FCB7FCA9C67E131F7FB3AD95383FFF800507B512FC053F
-ECFF8094B712E0040316FC040F82043F707E4CD9C01F14E09327FFFC00018005E06D6C7F
-05806E7F94C8000F7F04FC6F7F4C6F804C844C6F804C814C84757FA289A2757FA389A287
-1E80A51EC0AE1E80A5511400A365A2656365A298B55A82505C704B5C7060705D704B91C7
-FC704B5B706C027F5B03F901E091B512F003F001F801075C4B6CB4013F5C4B6C90B7C8FC
-DB800F16FC4B6C16F04A010116C04AD9003F4AC9FC4A020F14F090CA49CAFC627B7AF970
->I<93381FFFF80303B612C0031F15FC92B8FC020317C0020F17F0023F8391B97E499126
-FE000F7F4902F001037F4902C05B4991C7481480495B49494A14C0495B90B55A5A5D485C
-5AA2484A6E1480A24871140092C8FC725B48050013F8735AF10F80484993C8FCA5B5FCAE
-7EA280A37EA2817EA26C6EEE0FE0F21FF07E6F163F6C1AE06F167F6C806C6EEEFFC06F4B
-13806D6D5D6D6E4A13006D6E4A5A6D02F0143F6D02FEECFFFC01019126FFC00F5B6D92B6
-12E0023F5F6E5F02074CC7FC020016F8033F15E003034AC8FCDB001F13E04C5179CF5A>
-I<973803FFFC0603B6FCA9F00001737E86B3AD93381FFFC00303B512FC033FECFF8092B7
-12E0020316F8020F16FE023FEEFFBF91B6D8003F90B5FC4902F813034902C01300010F4A
-143F4949C87E494915074949814B8190B582484A82485CA2485CA25A92CAFC5AA25AA348
-5BA5B5FCAE7EA57E80A27EA36C80A27E97B5FC6C806C606F5D6C6E5D6D5F6D6D5D6D6D03
-7F806D01FF92B77E6D6E0103EEFFC06D02E0130F6D02FE90B57E6D6C90B612FE021F16F8
-020716E0020116806E6CECFE00030F14F0DB007F90C702C0C7FC627B79F970>I<93381F
-FFE00303B6FC033F15E04AB712F8020716FF021F83027F17E091B5D8FE018001039126F0
-003F7F4902C0010F7F4991C76C7F494902017F49496E148049498190B54817C04B6F13E0
-4884484A17F085484A17F85A7313FC4891C9FCA3487213FEA3485BA21BFF85A2B5FCA291
-BBFCA61BFE4ACCFCA67EA280A27EA37E811BFE6CF101FF816C616C80F207FE6C806C6EEE
-0FFC6F161F6D6DEE3FF86D6D167F6D6EEDFFF06D02E0020313E06D02F8020F13C06D02FE
-023F13806D9126FFE003B512006D6C91B65A021F17F86E5F020117C06E6C93C7FC030F15
-F8030015C0040701F8C8FC50517ACF5D>I<94381FFF800407B512F0047F14FC4BB7FC03
-071680031F16C0037F16E04AB5D8FC0F13F04ADAC01F13F84AEC003F4A494913FC4A5B4A
-4990B512FE4A5B5E91B5FC495CA25E5B7213FCA24991C76C13F87213F07213E07213C006
-011300F0001096C7FCB1B912F0A9D800070280C9FCB3B3B3A6007FB8FCA9477B79FA3E>
-I<F33FF0922603FFFC913801FFFC037FD9FFE0010F7F0207B600FE013F7F021F6F6CB612
-80027F04E315C049BCFC010707EF13E049DA801FECFE1F499026FC000314F04901F00100
-14C049496E13E090B5486E13F0484A6E13F87513C04891C86C13FC75138048736C1300F3
-007848496F6D90C7FCA34886AA6C97C8FCA36C6D4B5BA26C61A26C6E4A5BA26C6E4A5B6D
-6D4A5B6D6D91B55A6D01FC01035C9226FF801F91C9FC93B65A4917F84917E0029F1680D9
-FF074BCAFCDA007F14E048020301FCCBFC4990CEFCA2487EA480A280808014FE91B812E0
-F1FF806C19F81AFF1BC06C1AF0876D19FE876D866D86886D86A2013F8690BCFC0003875A
-4849C96C804801F016014AEE003F4849170F4849717F8686B5CBFC86A56E5F6C63A26E5F
-6C6D4D5BA26C01F8051F5B6C6D4D5B6C6D4D5B6C6D6C4BB55A6C02F0030F5C6C02FE037F
-91C7FC013FD9FFF0010FB512FC6D91B85A010719E0010096C8FC023F17FC020717E0DA00
-3F03FCC9FC030092CAFC5B747ACF65>I<91B5FCB7FCA9C67E131F7FB3AD953801FFFC06
-1FEBFFC095B612F8050315FE050F81053F16C04D82932701FFFC03804CD9C000804C90C7
-7EDC0FFC6E7FEE1FF04C486E7F5F4C48824CC8FC4C815E4C84A25EA25EA25EA45EB3B3A6
-B800F890B812F8A9657A79F970>I<14FF010713E0497F013F13FCA2497F90B6FC4881A3
-4881A86C5DA36C92C7FC6D5B6D5BA2010F13F06D5B010090C8FC91C9FCB091B5FC007FB6
-FCA9C67E131F7FB3B3B3A4B812E0A92B7B78FA39>I<91B5FCB7FCA9C67E131F7FB3AE07
-7FB612F0A90703EC80007301FCC7FC070713F04F5B4F5B4F5BDFFFFEC8FC4E5B4E5B4E5B
-061F13C04E5B4E90C9FC4E5A050313F84D5B4D5B4D5B057F90CAFC4D5A4C5B4C7F040F7F
-4C805E4C8093B67E8585A285854C6C7F04FC81EEF03F4C6C804C6C800480814B487E7180
-718071808684728072807280A27280728072808784737F738073808885738088B800E090
-B8FCA9607A7AF96B>107 D<91B5FCB7FCA9C67E131F7FB3B3B3B3B3ABB812F0A92C7A78
-F939>I<902601FFFE912601FFFC933801FFFCB6031FD9FFC0031FEBFFC095B600F892B6
-12F8050303FE020315FE050F6F020F81053F04C0013F16C04D704982932701FFFC039128
-F001FFFC03804CD9C0006E48D9C000804C90C76C4A90C77EC66CDA0FFC6E9026FC0FFC6E
-7F011FDA1FF0EF1FF06D4A486E6D48486E7F4D604C48704848824CC84BC8FC4C6F4A816F
-48604C4E84A24C60A24C60A24C60A44C60B3B3A6B800F890B800F890B812F8A99D4F79CE
-A8>I<902601FFFE913801FFFCB6031FEBFFC095B612F8050315FE050F81053F16C04D82
-932701FFFC03804CD9C000804C90C77EC66CDA0FFC6E7F011FEC1FF06D4A486E7F5F4C48
-824CC8FC4C816F5A4C84A25EA25EA25EA45EB3B3A6B800F890B812F8A9654F79CE70>I<
-93380FFFF04BB67E031F15F892B8FC020317C0020F17F0023F17FC4A49C66C7F49B500E0
-01076D7E4902800101804949C86C7F49496F7F49496F7F49496F7F49496F7F90B5844B81
-484A6F1480481BC0A24891CA14E0A2481BF0A2481BF8A248497113FCA4481BFEA5B51AFF
-AD6C1BFEA56C1BFC6E94B5FCA26C1BF8A36C6E4B14F0A26C1BE06C6E4B14C0A26C6E4B14
-806C1B006F5D6D6D4B5B6D6D4B5B6D6D4B5B6D6D6C49B55A6D02E001075C010102FE017F
-14806D91B8C7FC023F17FC020F17F0020317C0020094C8FC031F15F8030315C0DB000F01
-F0C9FC58517ACF65>I<91B591381FFFC0B70103B512FC051FECFFC094B712F0040316FC
-040F16FF043F17C04C8393B5D8C01F809426FC000314FCC66C03E06D80011F03806D6C7F
-6D4AC86C804C814C6F8004E06F804C84864C6F80A27480A28987A28987A21E80A4871EC0
-AE1E8063A41E0063A265A298B55AA2505CA265705D505C7060704B5C705D704B91C7FC70
-4B5B706C91B55A71010314F005F8010F5C05FF017F5C04BF90B7C8FC048F16FC048716F0
-048116C0DC807F4AC9FC050F14F0050049CAFC95CCFCB3A6B812F8A962717ACE70>I<93
-261FFF80EC01FE0303B500F81403033F02FF140792B712C0020304F0130F020F70131F02
-3F16FE91B9133F49DB803FEB807F499126FC000713C0010F02F00101EBE0FF4902C09038
-007FF1494AEC3FF94991C86CB5FC4B8190B54881484A8148845D484A8186485C865A5D48
-85A292CAFC5AA45CB5FCAE7E80A47EA2817EA2816C61A26C6E5E6C96B5FC816C606F5D6C
-6E5D6D5F6D6D5D6D6D157F6D6E91B6FC6D02E013036D02F8010F13BF010002FF90B5123F
-6E91B512FE021F16F8020716E002011680DA003FECFE00030714F0DB003F90C7FC93C9FC
-B3A60603B812E0A9637179CE6B>I<902601FFFC903803FF80B6021F13F0057F13FE94B6
-FC040315C04C15E04C15F093261FFE1F13F817F893263FE03F13FCC66CEC7FC0011F4B48
-13FE6DECFF00EDFDFE5EA2EDFFF85E7213FCA24C6D13F8A27213F04C6D13E00601138095
-38003C004C91C7FCA693CAFCB3B3A2B812FEA9474F7ACE53>I<4AB5EB03E0023F9138F0
-07F049B6EAFE1F010792B5FC131F137F90B5EA8003000301F0C77E02C0140F4890C87E48
-481501001F825B003F177F49163F127FA2181F12FF7FA27F7F6E6F5A02E092C8FC14F8EC
-FF8015FC6CECFFF0EEFF8017F86C16FEEFFFC06C836C17F818FE6C836C846C846C84013F
-836D831307010183EB003F020782EC007F030181ED0007EE007F050F14801703007F8248
-6C8184846D82A2847FA26D1800A27F616D161F7F6D4C5A806E4B5A6E4B5A02F8140302FE
-020F5BDAFFE090B55A92B7C7FC6001F15ED9C07F15F0D9801F158026FE000702FCC8FC00
-7CD9003F1380415179CF50>I<ED7FC0A715FFA65CA35CA35CA25CA25CA25C5CA291B5FC
-5B5B5B131F5B90B912F01207BAFCA7D8000702C0C8FCB3B3A2F003FEAE18076D17FC82A2
-F00FF86D6E131F19F06D6E133F6E6DEB7FE09338FF81FF6E91B512C06E16806E16000203
-5D020015F8033F5C030F14809226007FFCC7FC3F717CEF4F>I<91B56C93B57EB792B7FC
-A9C66CEF007F011F181F6D84B3B3A862A362A3627F97B6FC61616D6E5CDF0FF7806D051F
-15F06D6EDA7FE7ECFFF804F8903801FFC76E01FF010F13876E91B612076E16FC020716F8
-020116E06E6C1580030FECFE00DB003F01E003F8C7FC655079CE70>I<B800E0021FB612
-C0A9D8000F02C0C9003F90C7FC6D6EEE1FF8A26D6E4C5AA26D6E5F1B7FA26D6E4C5AA26E
-6D4B5BA26E6D4B90C8FCA26E6E4A5AA26E6E5D1A0FA26E6E4A5AA26E6E4A5AA26E6E4A5A
-A26E6E4A5AA26F6D5D616F6D92C9FC61A26F6E485AA26F6E485AA26F6E485AA26F6E485A
-A26F02F85B197FA26F6E485AA27090B55AA27092CAFCA2705CA2705CA3705CA2705CA270
-5CA2705CA2715BA27190CBFCA3715A715A715A624F7CCD6B>I<B8D8C03FB76C013FB612
-80A9D8001F0280C7000749C9003F90C7FC75EE0FFC6D714E5A826D745E706E183F886D71
-4E5A705C6D745E704A18FF886D535B705C6E7393C8FC70624F806E525A705C6E735D7102
-F7160F073F806E05E34C5A71137F6E745C7102C1163F07FF816E05804C5A715A6E745C05
-F84A6C15FF4E826E4C6D4A5BEFFC076F07F891C9FC05FE496D5C060F16FC6F4B6D4A5AEF
-FF1F6F07FE5BDE9FF06D140F06BF16FF6F4B6D4A5A18FF6FF29FF04F6D14BF1EFF6F4B6D
-5DA26F6396C87EA26F4A6F5CA27097CAFC4E81A270496F5BA270614E81A270496F5BA270
-614E81A270496F5B70617048CAEA3F80894F7CCD92>I<B800C0010FB612FEA9D8000302
-F0C86C01C0C7FC6D6EDB3FFCC8FC6D6E4B5A6E7F704B5A6E4C5B6E6E495B6E6E495B6E6E
-4990C9FC6E6E495A71495A806E6E495A6F6D495A6F6D485B06835B6F02875B6F02CF90CA
-FC6FECFFFE816F5D616F5D705C705C705C708085827080708070804C804C805E864C814C
-814C81DC7FFB80EEFFF14B01E0804B496C7F4B496C7F874B497E4B486D804B486D804B48
-6D804B486D804A49824A497F737F4A496E7F4A90C86C804A486F804A48844A48814A486F
-80010701FC6F80B700E0027F91B512E0A9634E7CCD6B>I<B800E0021FB612C0A9D8000F
-02C0C9D83FFEC7FC6D6EEE1FF8A26D6E4C5AA26D6E4C5AA26D6E5F1BFF826E4D5BA26E6D
-4B90C8FCA26E6E4A5AA26E6E4A5AA26E6E4A5AA26E6E5D1A3F836E4D5AA26E6E4A5AA26F
-6D495BA26F6D4990C9FCA26F6E485AA26F6E485AA26F02E05B191F18F06F4B5AA26F6E48
-5AA26F6E485AA27090B55AA27092CAFCA2705CA3705CA2705CA2705CA2705CA2705CA271
-5BA37190CBFCA2715AA2715AA24D5AA24D5AA24D5AA260D801FC15FFEA07FF001F01C049
-5B487F4C90CCFC487F4C5AB57E4C5AA24C5A4C5A167F4C5A6C49485B4B5B4A4890CDFC6C
-9038C01FFE9039FB807FFC3A1FFE03FFF86CB65A6C5D6C15806C92CEFC6C6C13FC011F13
-E0D903FECFFC62717CCD6B>I E /Ff 74 126 df<EA03F0EA0FFC487E487E481380B512
-C0B3A36C1380B3AD6C1300B06C5A6C5A6C5AC8FCAFEA03F0EA0FFC487E487E481380A2B5
-12C0A66C1380A26C13006C5A6C5AEA03F0126D5BEC5C>33 D<D803C0EC01E0D80FF0EC07
-F8D83FFCEC1FFE6D143F007F826D5CB51680A96C1700A44980AB003F5EA449141FAB001F
-5EA349140F000F5E6C486E5AD803C0EC01E031346BEC5C>I<DB0F80143EDB3FE0ECFF80
-4B6C497FA24B6C497FA64A5DA24C5DA74A5DA24C5DA7000FBB12E0003F1AF8481AFCA2BC
-12FEA56C1AFCA26C1AF8000F1AE0C7001F90C7D87FFCC7FCA74A15FFA24B5DA7027F5CA2
-4B5DA7000FBB12E0003F1AF8481AFCA2BC12FEA56C1AFCA26C1AF8000F1AE0D800039026
-E0000F0180C7FCA7495DA24B92C8FCA7495DA24B5CA66D90C76C5AA26D486E5AD900F8EC
-03E04F6B7AEA5C>I<167C16FF5D4B7FAB4B13E092B6FC020715F0023F15FE91B87E0103
-17E04983011F834983498390BAFC4804BF14804802C3018314C0480203018014E002FC15
-3F4801F0030F13F04801C06F13F8028081480100814918FC007F835B49EF7FFE12FF19FF
-5B60A57F7213FCA26DEF7FF8007FF03FF06DEF0FC06D94C7FC6C138014C06C13F014FC6C
-13FF6C14C392B5FC7E7E6C16F06D15FF6D16E06D16F8010716FE6D707E010083023F8202
-0782020082030F810303818505BF1480058714C01781DD807F13E0061F13F0847213F884
-7213FC84D807E0177FEA1FF8486C18FE486C173FA2B5FC191FA55B193F5B1AFC007F187F
-7FF1FFF87F6C5F02804B13F06C01C04B13E002E05D6C01F0033F13C002FC4B13806C01FF
-0281B5FC6C02C3018F14006C91B75A6C606D5F6D5F6D5F6D17806D94C7FC010116FC6D6C
-15F0020F15C0020102FCC8FCDA000F13C003035BAB6F90C9FC81167C478976F95C>I<D9
-0FC0EE07C0D97FF8EE1FF0496C4C7E487F486D4C7E4880A2486E15FF48804E5B488013FC
-007F6E4A5BEBF87F4E5BEBF03F00FF804E5BA2D9E01F4B5BA34E90C7FCA261187FA24E5A
-A2EBF03F4D5BA2007F4A495BEBF87FA2D9FCFF4A5B003F5C90B55E6C4A5BA26C4A495B6C
-5CA26C91C74890C8FC6C5B6C494A5A6D5AEB0FC090C9485AA24C5BA34C5BA2605EA24C5B
-A34C5BA24C90C9FCA34C5AA25F16FFA24B5BA34B5BA24B5BA34B5BA24B5BA34B90CAFCA2
-5E157FA24B5AF107E0F13FFC4A494A7E96B5FC4A494914804E14C04E14E04A5B4E14F05E
-4A4B14F8F1FE7F4A49013F14FCF1FC3FA24A90C7EBF81F067F14FE4A5AA2F1F00F4A5AA2
-495BA3495BA25D49EFF81FA2495B063F14FCF1FC3F495BF1FE7F4990C8001F14F896B5FC
-7214F0495A7214E05C7214C07214806D486F1400735A6D48705AD907C0EE07E04F897AF9
-5C>I<EB1F80EB7FF0497E487F487F487F158015C0A315E0A36C14F07E7E7F131FEB007F
-A614FFA315E05BA34913C0A25B15805B4913005B5C13FF485B485B000F5B5A007F5BB55A
-5C91C7FC5B5B5BEA7FE06C5A6CC8FC1C3660EA5C>39 D<EE07F0EE0FF8163FEE7FFC16FF
-15035D4B13F85D4B13E04B13C092B512804AEBFE004A5B4A5B4A5B4A13C04A5B4A90C7FC
-4A5A5D5B495B5D495B5B5D495B4990C8FCA2495AA2495AA2485BA2485BA2485BA3485BA2
-5C5AA291C9FCA25AA25BA2127FA25BA412FFA35BAF7FA3127FA47FA2123FA27FA27EA280
-A27E80A26C7FA36C7FA26C7FA26C7FA26D7EA26D7EA26D7F6D7F817F6D7F816D7F7F816E
-7E6E7F6E7F6E13F06E7F6E7F6E7F6EEBFF806F13C06F13F06F13F8816F13FC811500167F
-EE3FF8160FEE07F02E8962F95C>I<EA1F80487EEA7FF0487E7F13FF806C7F6C7F6C7F6C
-7F6C7F00017F6C7F6D7F6D7F010F7F6D7F6D7F6D7F7F816E7E806E7F82806E7F6E7FA26E
-7FA26E7FA26F7EA26F7EA26F1380A36F13C0A28117E0A281A217F0A281A217F8A281A417
-FCA3167FAF16FFA317F8A45DA217F0A25DA217E0A25DA217C05DA24B1380A34B1300A24B
-5AA24B5AA24A5BA24A5BA24A5B4A5B5C5E4A90C7FC5C4A5A5D5B495B495B495B013F5B49
-5B90B5C8FC485B00075B485B485B485B485BB55A91C9FC13FC5B6C5AEA3FC06C5A2E8971
-F95C>I<ED01F04B7E4B7E4B7EAD001F181FD83FC0EF7F80D87FF0933801FFC0486C4C13
-E001FE160FD9FF80153F02C05D02F04AB5FC02FC14076C01FE4A14C06CD9FF8F013F1480
-6C02EF90B61200000791B712FC000118F06C6C17C0011F94C7FC6D5E010316F8010016E0
-023F1580020F4AC8FC6E5CA24A80023F6E7E91B712E0010316F8010F16FE4982017F17C0
-48B912F0000718FC001FDAEFFE14FF48028F013F148048D9FE0F010F14C0B500FC6E14E0
-02F0140102C06E7E028081D9FE00150F01F816036C487013C0D83FC09338007F806CC7EE
-1F00C893C7FCAD6F5A6F5A6F5A434C74DB5C>I<EE0F80EE3FE04C7EA24C7EB3AB000FBB
-1280003F1AE0481AF0A2BC12F8A56C1AF0A26C1AE0000F1A80C901F8C9FCB3AB705AA270
-5AEE0F804D4F79DC5C>I<EB1FC0EBFFF84813FE487F48148015C04814E05A15F0A215F8
-A215FCA47E7EA27E7E7E131FEB003FEC7FF8A314FF15F05B4913E05B4913C0013F13805B
-48B51200000F5B003F5B485BB55A5C5C5C6C48C7FC5BEA3FE06CC8FC1E2F61965C>I<00
-0FBA12E0003F19F84819FCA2BB12FEA56C19FCA26C19F8000F19E0470D76BB5C>I<13FE
-3803FF80000F13E04813F04813F8A24813FCB512FEA96C13FC6C13F8A26C13F06C13E000
-0313803800FE0017175E965C>I<F103E0F10FF8F11FFCA2F13FFEA2197FA219FF1AFC60
-1AF8A24E13F0A24E13E0A2601AC0601A80601A00606118FF61A24D5BA24D5BA25F615F61
-5F615F96C7FC5F6017FF60A24C5BA24C5BA25E605E605E605E95C8FC5E5FA24C5AA24B5B
-A25D5F5D5F5D5F5D5F5D94C9FCA24B5AA24B5AA25C5E5C5E5C5E5C5E5C5EA24A90CAFCA2
-4A5AA214FF5D5B5D5B5D5B5D5B5D5B5DA24990CBFCA2495AA213FF5C5A5C5A5C5A5C5A5C
-A2485BA24890CCFCA25A5B12FF5BA25BA26C5AA26C5AEA0F80478976F95C>I<EEFFE003
-0713FC033FEBFF8092B612E04A81020715FC4A814A814A824A8291B87E49DAC07F7F4990
-26FE000F7F4901F801037F49496D7F03C0EB007F49496E7E4990C86C7FA249486F7F4948
-6F7F4A8148854A8148854A8148854A167FA24849707EA291CA121F4885A24983003F1A80
-A34983A2007F1AC0A44983A200FF1AE0B16D5FA2007F1AC0A56D5F003F1A80A36D5FA26C
-1A00A26E5E6C616E167FA26C616E16FFA26C6D4B5BA26C6D4B5BA26C6D4B5B6E5D017F60
-6D6C4B5B6F5C6D6D4A90C7FC6D6D4A5A6F5B6D6D495B6D01FE010F5B6D9026FFC07F5B6D
-91B65A6E5E6E5E6E93C8FC6E5D6E5D020115F06E5D033F1480030701FCC9FC030013E04B
-6F78EC5C>I<ED07C0ED1FF0153F82157FA215FFA25CA25CA25C5C5C5C5C91B5FC5B1307
-131F000FB6FC123F5AA2B7FC5C14F85C6C13C01400EA1FF8C8FCB3B3B3AC000FB9128048
-18C04818E0A24818F0A36C18E0A26C18C06C18803C6D6EEC5C>I<92380FFF804AB512FC
-020FECFFC0023F15F091B712FE010382010F17C049834917F8498390B97E48DAF0018048
-912680001F804849C70003804A0200804801F0153F48496F7F4A6F7F4849150391C96C7F
-5A49707F197F484884857F7F731380A385A36C5A6C5A6C5A6C5AEA03C0CC5AA31B0061A3
-4F5AA219FF6260626062604E5B4E5B60624E90C7FC95B5FC4D5B4D5B4D5B4D5B4D5B057F
-5B94B55A4C91C8FC4C5B4C5B4C5B4C5B047F5B93B55A4B5C4B49C9FC4B5B4B5B033F5B4B
-5B92B512804A91CAFC4A5B4A5B021F5B4A5B4A13C091B55A4991CBFC495B010F49ED01FC
-4901F0ED07FF495B49494B138090B55A4891C9FC00075B4813F84890BAFC5A5ABCFCA56C
-1A007E6C19FC496D77EC5C>I<923807FFF892B67E020F15F0027F15FE49B87E4983010F
-17F049834983498390BAFC9226FE001F804802E00103804891C86C7F02FC814A030F7F48
-49816E6F7F848684A2197FA26C5BA26C5B6C5B011ECA12FF90CBFCA26260A26062606260
-4E5B6095B55A4D91C7FC05075B173F043FB55A92B75A4A5E614A168096C8FC8519E019F8
-6E82856E8292C7001F14C0050380EF007F061F7F727F06037F727F84737E85731380A273
-13C0A37313E0A385A2EA07E0EA1FF8487E487EA2B55FA34F13C0A3494D1380A261007F4E
-13006D4D5A6C6D5D6E4B5B6C01F0150F02FC4B5B6C01FF037F5B6C02E00103B55A6C02FE
-011F5C6C91B85A6C96C7FC6D5F6D5F6D17F001075F010117806D6C4BC8FC020F15F00200
-1580030301F8C9FC4B6F78EC5C>I<94380FFFC0053F7F854D7F94B5FCA25E5EA25E5E18
-BF4C133FA2EE3FFEEE7FFCA2EEFFF84B13F0A24B13E0A24B13C04B1380A24B13004B5AA2
-4B5A4B5AA24A5BA24A5B4A5BA24A5B4A90C7FCA24A5A4A5AA24A5AA2495B495BA2495B49
-5BA24990C8FC5B5C495AA2495A485BA2485B485BA2485B5A91C9FC485AA2485A485A90BB
-12FC1BFFA21C80A56C1B00A2001F1AFCCBD83FF8C8FCB3041FB712F04C824C82A293B87E
-A3705EA2705E705E516D7BEC5C>I<017FB9FC48BA12C0A24885A562A297C7FC02E0CCFC
-B3AA923801FFF8033FEBFF8002E1B612F002EF15FC91B8FC19C08585858585DC800F7F92
-26F000038003800100804AC8003F7F4A8102F06F7F4A6F7F4A816C496F7F91CAFCD8007E
-8490CB127FA2737EA3851B80A385A3EA03C0EA1FF8487E487EA2B55FA34F1300A34F5A5B
-4917FF6C6C4C5BA26D4C5B6C4D5B6E5D6C6D033F5B02F04B5B6C6D4AB5FC6C01FE02075C
-6E6C011F91C7FC6CDAF801B55A6C91B75A6C606D5F6D17C0010F5F6D4CC8FC010116F86D
-6C15E0021F1580020102F8C9FCDA001F1380496D77EA5C>I<13FE3803FF80000F13E048
-13F04813F8A24813FCB512FEA96C13FC6C13F8A26C13F06C13E0000313803800FE0090C7
-FCB3AC13FE3803FF80000F13E04813F04813F8A24813FCB512FEA96C13FC6C13F8A26C13
-F06C13E0000313803800FE00174C5ECB5C>58 D<F103E0F10FF8F11FFC197FF1FFFE1803
-60181F6095B512FC17034D14F8051F14E04D14C094B612004C5C040714F84C5C043F14C0
-4C5C4BB548C7FC4B14F8030F5C4B14C0037F5C92B548C8FC02035C4A14F0021F5C027F14
-8091B6C9FC010314FC495C011F14E0495C90B6CAFC485C000714F8485C003F14C04891CB
-FC5CB512F85C14C014F0806C13FE806C14C0000F14F06C80000114FE6C80013F14C06D80
-010714F86D80010014FF6E80021F14E00207806E14FC0200806F6D7E031F806F14F00303
-806F14FE6F6C6D7E7080040F14F07080040114FE7080053F14C07114E0050714F87114FC
-1700063F13FE841807841800F17FFC191FF10FF8F103E0475976E15C>60
-D<EA0F80EA3FE0487E13FC487E6D7E8014F0806C13FE6E7E6C80000F14F06C80000114FE
-6C80013F14C06D80010714F86D80010014FF023F806E14E00207806E14FC0200806F6D7E
-031F806F14F0030314FC6F806F6C6D7E7080040F14F07080040114FE7080053F14C07114
-E0050714F8050114FC83063F13FE841807181F6095B512FC5F050714F8051F14E04D14C0
-94B612004C5C040714F84C5C043F14C04C5C4BB548C7FC4B5C030F14F04B14C0037F5C92
-B548C8FC02035C4A14F0021F5C4A148091B6C9FC010314FC495C011F14E0495C90B6CAFC
-485C000714F8485C003F14C0485C4ACBFCB512F85C14C05C49CCFC6C5A13F06C5AEA0F80
-475976E15C>62 D<92B512E0021F14FF91B712F0010716FE011F707E017F17E090B912F8
-488448844884481980489126C0007F14C04801FCC7120302F0DA007F13E04801C0031F13
-F091C97E484816037213F87FA284A360A26C5A6C484C13F06C485E6C48161FD80180047F
-13E0CBB512C01703050F14804D14004D5B94B55A4C5C4C5C4C14C04C91C7FC4C13FC4C5B
-4C13E093B55A604B91C8FC4B5B5F4B5B4B5B5F5D5F5D5FA294C9FC5DA35EAC6F5A6F5A6F
-5A92CBFCAFED07E0ED1FF84B7E4B7E92B5FCA24A80A66E91C9FCA26F5A6F5A6F5AED07E0
-456C75EB5C>I<933801FFC0041F13FC4BB6FC030715C0031F15F0037F814AB77E4A824A
-824A83023F834AEC007F91B500F0011F7F4902C001077F4991C77E03FC02007F495B4901
-E06F7E4949153F49498292C73807FC1F494891383FFF9F494891B5EAEFFF4A010391B5FC
-48495B4C168048495B4A5B485D4A90B812C0485C4A48EBFE0FEFF803484849EBE0004D7F
-4B497F48484990C77E1BE04C804848133F4C80A24B48805BA200FF4B8015FFA25B4C80AB
-705C7FA2037F17C0007F6F5CA27F6F6C4A1380A2705C6C6C011F1700705CA26C6C6D6D49
-5A6F6D495A7113FF6C6C6DD9F8035BEFFE0F6E6C90B65A6C6E5E6E6D5D6C6F5D6E6D92C7
-FC6C6D6D5C705C6C6D6D5C6E010014E06D6C023F13806D6CDA07FCC8FC6F90C8EAFF806D
-6D4B13C06D6D5D6D01F84B13E06D6D151F03FF5D6D02C091B5FC6D02F0010714C06E01FF
-133F6E91B71200020F5F6E5F6E5F6E17E06E6C5E031F93C7FC030715FC030115E0DB001F
-91C8FC040113F04B6D78EB5C>I<EE1FFCEE7FFF93B57EA24B80A34B80A54B80A3177F4B
-80A4EEFE3F031F80A4033F80A2EEFC1FA3037F80A24C7EA203FF81A34C7E4A82A44C7E4A
-82A44A496C7FA54A496C7FA44A8293C7127FA44A486E7EA4027F824B80A302FF8392B8FC
-A44984A44984A303E0C71203A249844B80A34984A24B80A3498492C9127FA349844A163F
-001FB500FC021FB512FC007F02FF027F14FFA2B76C90B71280A56C92C76C1500A2001F02
-FC021F14FC516D7BEC5C>I<001FB812F848EFFF804818F019FCBBFC861AE06C85866C85
-6C85D8000F0180C7000F7F18017280073F7F85737F85A2737FA2858785A94F5BA2616361
-A24F5B614F5B4F90C7FC4F5A06035B180F95B512F092B85A6297C8FC6119F019FC19FF1A
-C01AF0861AFE0380C700037FDE007F7F071F7F737F737F85737F737F1A7F871A3FA2747E
-A31C8086A9621C0062A262631AFF4F5B614F5B61073F5B96B5FC060F5C001FBB5A486248
-97C7FC62BB5A621AE06C19804FC8FC6C18F86C1880516B7DEA5C>I<DC0FFFEC07E093B5
-00F0EB0FF0030702FE131F031F9139FF803FF8037F15E04AB7EAF87F4AEEFCFF4A82021F
-93B5FC5C5C91B5EAFC01499138E0003F490280130F93C77E4901FC14014949804901E081
-4B814949814990C9FC85495A484982A24849825C48845CA2485B85485BA34890CBEA7FF0
-A2F23FE04995C7FC127FA35BA312FFA35BAF7FA3127FA37FA3123F7FA2F23FE06C6DEF7F
-F0A2F2FFF86C7FA26C7FA26E5E7E806C6D18F0616C7F6D6C5E1BE06D6D5D6D6D4B13C06F
-5D6D01F84B13806D6D92B512006D01FF140370495B6D02F0011F5B6DDAFC01B55A6E90B7
-5A6E5F6E5F02075F6E94C7FC6E16FC6E6C15F0031F15C0030792C8FC030014F8040F90C9
-FC4D6F79EC5C>I<001FB87E4817F84817FEBA7E19E08519FC856C846C856C85D8001F90
-C7000780050080183F060F7F727F727F84727F85737F737FA2737F85A2737FA2737FA285
-87A21A7F87A21A3FA38786A51C8086B1501300A562A263A21A7FA2631AFFA24F5BA34F5B
-61636163614F5B6196B5C7FC604E5B4E5B60063F5B95B55A05075C001FBA5A48614896C8
-FCBA5A616119E019806C4DC9FC6C17F86C1780516B7DEA5C>I<001FBB12F0007F1AFCA2
-BC7EA57EA2121FD8000F0180C9123FAE745AA2F207F097C8FCA8F03F80F0FFE0A24D7FA7
-92B7FCAB9238800001A7715BA2F03F8095CAFCAA1B7F973801FFC0A25013E0B0001FBCFC
-127FA2BDFCA56C1BC0A2001F1B00536B7CEA5C>I<001FBB12FC481AFF5A1C80BDFCA37E
-A27E7ED8000701C0C9120FAE741300A2F201FC97C8FCAAF00FE0F03FF8A24E7EA792B7FC
-AB03C0C7127FA7725AA2F00FE095CAFCB3A9001FB612FE486F7E5A83B8FCA37E5F7E6C4B
-CBFC516B7CEA5C>I<DC7FF0EB01F80307B5497E031FECE007037F9138F80FFE4AB612FE
-0207EDFF1F4A16BF4A16FF5C5C91B9FC49ECF01F49EC8007499038FE00014901F86D7E4B
-804949804949804B804990C8FC494881A24849815C48835C5A4A167FA2485BA24849163F
-A391CAFC48725AA249715A96C8FC127FA35BA312FFA35BAC0503B612F04D15FC5F6D19FE
-5FA2127F831BFC836D6F15F094C7383FFE00123F197F7FA27E80A219FF6C7FA26C7F6080
-7E6E5D7E806C5F806D6C5D6D7F6F5C6D6D5C6D6D5C6F91B5FC6D01FE5B6D9038FF80076D
-ECE01F6D91B7FC80806E16BF6E163F6E15FE020115FC6E6C9138F01FFC031F9138C00FF8
-030791C9FC9238007FF04F6F79EC5C>I<001FB7FC007F82B87EA283A35FA26C5E001F93
-CAFCD8000701C0CBFCB3B3B3ACF207FCF20FFEA2F21FFFB0001FBCFC127FBDFCA61BFE7E
-001F1AF8506B7BEA5C>76 D<261FFFFC4CB512C0007F01FF040714F06F5DB66C4B14F86F
-5DA26F5DA26C1BF06F92B6FC001F1BC0C66CF1F000A2DAF7FC4A137FA36F5C02F316FEA2
-6F1407A302F16DEB0FFCA370131F02F016F8A370133F037F15F0A270137FA2033F15E070
-13FFA2031F15C0A2705A030F1580A2705AA203071500A2705A6F5CA36FEB8FFCA46FEBDF
-F8A3047F5B17FFA2705BA3705BA3705BA27090C7FC705AEE00F894C8FCB3A7001FB500C0
-031FB512C0007F02F0037F14F0A2B66C92B612F8A56C4A6F14F0A2001F02C0031F14C055
-6B7DEA5C>I<001FB812F8007FEFFF8019F0BA12FC85737E861AF06C8586001F85D8000F
-0180C76C7F180F06031480060014C0193F7313E07313F085851BF8857313FCA21A7FA21B
-FEA21A3FA81A7FA21BFCA21AFFA24F13F8611BF061614F13E04F13C096B5FC0603148006
-0F1400187F92B85A6262621AC0624FC7FC6119F0198006F8C8FC0380CBFCB3AE001FB612
-C0007F15F0A2B77EA56C5DA2001F15C04F6B7CEA5C>80 D<001FB712F0007F16FFB912E0
-18FC18FF8519E085856C84001F84D8001F90C76C7F050780050180717E061F7F727F8472
-7F84A2727FA2197F86A2193FA7197FA26219FFA24E5BA2604E5B604E5B067F5B4DB5FC05
-075C057F91C8FC92B75A616161611980A28585858592C7003F7F05077F1701717F84727F
-84A2848684AFF307F0F31FFCA2F33FFEA51AE0841B7F1CFC001FB66E13F0007F03C0EDF8
-FFB76C92B512F8841CF0851CE07314C0856C4B6E1480001F92C80003EBFE00CD5BF23FE0
-576D7CEA5C>82 D<DB3FFEEC0FC00203B500F0497E021F02FE133F91B738C07FF04916F0
-0107EEF8FF4916FE013F93B5FC5B90BAFC5A48ECE00392C77E4801FC141F4801F014074A
-1401480180804890C97E4982A2484882845B00FF83A25B84A4847FA36D705B127F6D715A
-96C8FC6C7E8014E06C7F6C13FC14FF6C14E06C14FEEDFFF06C15FF6C16F06D15FF6D16F0
-010F16FE6D707E0101836D17F0021F82020382DA003F81030381DB003F81040181DC001F
-80050180717E061F7F06077F84727F84197F737EA2851B80D81FE083487E127F487E85A5
-7F61A21B007F617F4F5A806E4C5A6E16FF6E4B5B02FC5D02FF030F5B03C04A5B03F891B5
-FC9226FFC0035C93B75A97C7FC616101F35F01F117E0D9E07F5E020F93C8FC267FC00115
-FC902680001F14E06CC849C9FC496F77EC5C>I<001FBB12FC481AFF5ABD1280A801F8C7
-D83FFEC7120FAE6C48721300A2D81FC0F001FCC993C8FCB3B3B3AE0207B712F0021F16FC
-A24A82A56E5EA2020716F0516B7BEA5C>I<001FB500C00307B512F04802F0031F14F848
-1BFCB66C4B14FEA56C4A6F14FC6C1BF86C02C0030714F0000101C0CA00071300A76E5F6C
-62A76D6C4D5AA86D6C4D5AA86D6C4D5A4CB4FC040713C04C7FA24C7FA2010F616E496D13
-FFA44C7FA217EF0107616E5E04FF13FEA217C7A36D4902FF5CA3038101835BA203831583
-A36D030192C7FCA3038715C3A29226C7FE0013C7A26D60A3DBCFFCEB7FE7A44C133F027F
-5FA303EF15EF4C131FA3DA3FFFEDFFF8A24C7FA44C7FA26E5FA24C7F6E5F6E48C85B6E48
-6F5A576C7EEA5C>87 D<001FB712F0007F16FCA2B812FEA517FCA217F001F8C9FCB3B3B3
-B3B3B3A790B712F017FCA217FEA56C16FCA2001F16F02F895BF95C>91
-D<EA0F80EA3FE0487EA2487EA27FA27F127F7F7EA26C7FA26C7FA2807E807E807E807E80
-137FA26D7EA26D7FA2817F817F817F817F817F81147FA26E7EA26E7FA282808280828082
-808280A26F7EA26F7EA283818381838183818381A26F7FA2707EA2838284828482848284
-82A2707FA2707FA284177F84838583858385838583A2717FA2717FA285187F85841A8084
-1AC0841AE084A27213F0A27213F8A21AFC841AFE197FA2193FA2F11FFCA2F10FF8F103E0
-478976F95C>I<001FB712F0007F16FCA2B812FEA57EA2121FC9123FB3B3B3B3B3B3A700
-1FB7FC127FA2B8FCA56C16FCA2001F16F02F8979F95C>I<153EEDFF80020313E0020F13
-F8023F13FE91B67E010315E0010F15F84981017F15FF48B812C0000717F0001F17FC007F
-02F714FFB600C11580ED007F02FC131F4A7F02E013030280130049C8123F6C486F130001
-F01507D83FC0ED01FE000FCA127839196FEA5C>I<000FBA12E0003F19F84819FCA2BB12
-FEA56C19FCA26C19F8000F19E0470D767B5C>I<EC0F80EC3FC0EC7FE0903801FFF05B5B
-5B5B5B4913E090B5128015004813FC485B485B14C05A5C4890C7FC5B123F5BA2485AA35B
-12FFA35BA6EBFF8014E08080806C7FA37EA37E7E6C5B6C5B6C5B6C5BEB1F801C3660F65C
->I<91380FFFFE49B612E0010F15FE013F6F7E4916E090B812F848838448834884859126
-FC0003804AD9007F7F051F7F1707717F717F6C49806C496F7E846C5B011EC96C7F90CAFC
-A284A5057FB5FC047FB6FC030FB7FC92B8FC1407143F49B9FC1307131F5B90BAFC48EEE0
-0F48EDE0004802FCC7FC4814E092C8FC4813FC4813F014C0485B91C9FC485A5BA25BA47F
-60A27F007F5F6D5E6C6D92B5FC02E014036C6D140F02FC027F14F06C9026FF8007B712FE
-6C91BA12807E6C1BC07E7F6D16F96D16E00107DC803F148001019238FC000FD9003F02C0
-0100EBFE00020101F8CBFC524F77CD5C>I<001FB57E4814E05A81B6FCA37EA27E7EEA00
-01B3EF0FFE94B512E0040714FC041F14FF047F15C003F1B712F003F38203F78292B87E86
-87DDF00780DD8000804CC7003F7F4C8004F002077F4C6E7F4C804C6E7F93C96C7E5D7413
-804B82A24B7013C0A25D7413E0A3861CF0A386AA62A31CE06F5EA36F4C13C0A2626F1880
-626F180062704B5A61704A5B704A5B705C70023F5B04FE4A5B706C48B55ADDE00F5C94B7
-C7FC626203F75E03F35E03F15EDBF07F15806D496C4AC8FC027F010F14F891263F800114
-C091C8D81FFCC9FC546C7FEA5C>I<93B512F0030F14FF037F15F00203B77E020F16FE4A
-82027F178091B9FC4918C05B4918E0499138C0007F4949C7121F4913F84913E090B51280
-4891C8FC02FC6F13C048496F1380485B7213004849ED00784A93C7FC5A5C5A91CCFCA248
-5AA35B12FFA35BA97FA3127F7FA37F7E807E6EEE3FE0F17FF06C7F6EEEFFF86C7F6C6D5D
-806C6D5D6C02C04A13F06D6D5C03F8023F13E06D01FF91B512C06DECE0076D91B712806D
-18006D5F01005F6E5E021F5E6E16C0020393C7FCDA007F14FC030F14E0030001FCC8FC45
-4F74CD5C>I<050FB512C04D14F05F865FA383A2838394C7FCB3923803FF80033F13FC4A
-B6FC020715C0021F15F0027F15FC91B77E4993B5FC13075B5B49EC007F03F8130F4901E0
-130390B5487F4891C87E4A814849814849814A81485B4A815A4A815A91C9FC84485AA35B
-12FFA35BAA7FA3127F6D5EA36C6C5EA2606C7F60806C6D5DA26C6D5D6C6D5D6E92B5FC6C
-6D5C6C6D6C13076F5B6D01F0133F6DD9FE01B812806D90BA12C06D1AE06D5E6D4C15F06D
-5E6D5E023F03C015E0020F4B7E0203DAFE0015C0DA007F01F0011F1480030790CBFC546C
-7AEA5C>I<EEFFF8030FEBFF80037F14F00203B612FC020F15FF4A82027F16E091B87E01
-03834983498349DAC03F7F499026FC000314804901F0130090B500C0023F13C04B6E13E0
-4891C87E4801FC6F13F04A81484917F884485B4A6F13FC485B197F4890CA13FEA249173F
-127FA25B1AFF8512FF90BBFCA81AFEA21AF801FCCCFC127FA37F123F7FA26C7FF103F86E
-EE0FFE6C7FF11FFF6C7F6C6D5E806C6D5E6C6D6CEDFFFE6F5C6D01F04A13FC6D01FC140F
-6D01FF023F13F86DDAF003B512F06D91B7FC6D18E06D18C06D6C17806EEEFE00020F5E02
-0316F0020016C0033F92C7FC030714F8DB003F90C8FC484F77CD5C>I<943803FFE0057F
-13FE0403B61280040F15C04C15E0167F93B712F04B16F85D5D5D4BEBFE0317F04B13C04B
-496C13F094C713E04CEC7FC04B48EC3F8096C7FCA25EAC001FB912FE48F0FF805ABB12C0
-A56C1980A2001FF0FE00C801F8C9FCB3B3B2001FB912C0007F18F0BA7EA76C60001F18C0
-456C79EB5C>I<F27FC0922603FF80903807FFFC033F01F8013F7F4AB690B6FC020703C3
-1580021F03F715C04A92B7FC4A19E091BBFC5B5B4918CF490201ECFE07499026F8003F01
-F814C04901E0010F804B6D6E13804990C700016D6C13004A6E92C7FC01FF834A157F4849
-6F7EA348496F7FA34A81A76E5DA36C6D4B90C8FCA36C6D4B5A6E15FF017F5F6E5C6D01C0
-01075B6F5B6D01F8013F5BDBFF01B55A93B65A495F96C9FC495E6090B85A6002F715C002
-E192CAFCDAE03F13F80303138092CDFCA380A36D7E8014FF6D90B612F8F0FFE06D17FE6D
-EFFFC04918F04918FC498490BB7E488648865A4849C8000F8002F0DB007F7F4801C0040F
-7F4A16014848CB7F49183F007F737E4984A24848721380A34984A56D60A26D60007F1B00
-6D606D606C6C6CEFFFFE6C6D4C5B02F016076C01FC041F5B6CD9FF8092B55A6C02F00207
-5C6CDAFF8090B65A6C92B85A6D96C7FC6D60010F18F86D60010118C06D6C94C8FC020F16
-F8020116C0DA001F02FCC9FC0300148053777BCD5C>I<001FB57E4814E05A81B6FCA37E
-A27E7EEA0001B3943807FF80057F13F80403B512FE040F6E7E043F8193B77E03F18203F3
-8292B87EA286DDF8037FEFC00094C7123F4C6E7F16F85E4C6E7F5E5E93C87EA25DA25DA2
-5DA45DB3B2001FB7011FB612FC4870488148704881A2B86CB81280A36C4C6C1600A26C4C
-6C5D6C4C6C5D596B7FEA5C>I<ED07E0ED1FF84B7E4B7E92B5FCA24A80A66E91C9FCA26F
-5A6F5A6F5AED07E092CBFCAE000FB612FC4815FF5A835AA37EA27E7EC8120FB3B3B2001F
-B912FE007FF0FF801AC0BBFCA57E1A80001FF0FE00426C73EB5C>I<EF0FC0EF3FF0EF7F
-F8EFFFFC4C13FEA24C13FFA67013FEA27013FCEF7FF8EF3FF0EF0FC094C7FCAE027FB612
-F849B712FE5B18FFA67F6D7E91C8121FB3B3B3B3A55FA218FEA3177FD803C016FCD80FF0
-15FFEA3FFC486C4A13F8A2B54A13F05E4C13E05E047F13C0DAC001B5128091B7FC6C1700
-5F6C5E5F6C5E6C16C000035E6C4BC7FCD8003F14F001011480389478EB5C>I<001FB5FC
-4814C05A81B6FCA37EA27E7EC7FCB3A2051FB612FE4DEDFF805F1CC094B8FCA3831C8083
-71EDFE00DD000701F8C7FC4E5B4E5B4E5B4E5B95B5C8FC4D5B4D5B050F5B4D5B4D5B4D5B
-94B55A4C91C9FC4C5B4C5B4C13F04C5B4C5B4C5B93B5FC15E103E38003E78003EF8092B6
-FC8484717E04FE7F4C7E4C6C7F4C6C7F04C0804C7E4C6C7F4B6D7F4B6D7F5D4B6E7E4B6E
-7E727F8684727F727F8684727F737E737EA2737F737F001FB70107B612E048704815F848
-705A1CFCB86C5AA36C4C7E1CF86C4C7E6C4C6C15E0566B7EEA5C>I<001FB612FE007F6F
-7EB8FC83A67E121FC81207B3B3B3B3AD001FBA12F0007F19FCBB12FEA76C19FC001F19F0
-476B76EA5C>I<04FFEC01FE271FFFC00F01E090381FFFC048D9F03F01F8017F13F04891
-B56C48B57E02F96E4880B500FB5D91B74880069F806C17BF95B77E7E6C0387030F7FD800
-3FD9FC01ECF80303F815F003F015E04B6C4A6C7F4B15804B1500A292C76C487FA24A5DA3
-4A5DA54A5DB3B3001FB5D8F003B5D8E007EBFFC048DAF80FDAF01F14E04802FC03F815F0
-4C5DB600FE03FC15F8A36C02FC03F815F070816C02F803F015E06CDAF003DAE00714C05D
-4D81CC5C>I<943807FF80001FB56C017F13F848DAE003B512FE48030F6E7EDBF03F81B6
-90B77E03F18203F3826C91B87EA26C856CDCF8037FD80001EDC00094C7123F4C6E7F16F8
-5E4C6E7F5E5E93C87EA25DA25DA25DA45DB3B2001FB7011FB612FC4870488148704881A2
-B86CB81280A36C4C6C1600A26C4C6C5D6C4C6C5D594D7FCC5C>I<923803FF80033F13F8
-4AB6FC020715C0021F15F04A8191B712FE49824983498349834949C6804901F0011F7F49
-01C001077F90B5486D7F4849C87F4A8148496F13804A8148496F13C048496F13E0A24A81
-4819F091C97E4819F84982A2007F19FC49177FA44848EF3FFEAC6D177FA2007F19FCA26D
-17FFA2003F19F86D5EA26C6D4B13F0A26E5D6C19E06E5D6C6D4B13C06E5D6C19806E5D6C
-01FF4AB512006C6E495B6D6D495B03F0131F6D01FE90B55A6D90B75A6D5F6D5F010194C7
-FC6D5E6E5D021F15F0020715C0020192C8FCDA003F13F803031380474F76CD5C>I<EF0F
-FE001FB56C90B512E048DAE00714FC48031F14FFDBF07F15C0B600F1B712F003F38203F7
-826C91B87E866C866CDCF00780D80001DB8000804CC7003F7F4C8004F002077F4C6E7F4C
-804C6E7F93C96C7E5D7413804B82A24B7013C0A25D7413E0A3861CF0A386AA62A31CE06F
-5EA36F4C13C0A2626F1880626F180062704B5A61704A5B704A5B705C70023F5B04FE4A5B
-706C48B55ADDE00F5C94B7C7FC626203F75E03F35E03F15EDBF07F1580704AC8FC040F14
-F8040114C09326001FFCC9FC94CBFCB3A9001FB7FC48824882A2B87EA36C5EA26C5E6C93
-CBFC54747FCC5C>I<DCFFF0EB03F8030F01FFEB0FFE037F14C00203B638F01FFF020F15
-FC023F15FE4AEDFF9F91B812DF010394B5FC5B5B49ECC01F499038FE00034901F8130003
-E08090B50080804891C8120F4813FC4A8148498148835C4849815C854890CAFCA248845B
-A25B8512FFA35BA97FA3127F6D5FA36C6C5FA26E93B5FC7E6E5D7E6E5D6C7F6E5D6C6D5D
-6C6D5D6E5D6C02C091B6FC6D01F013036D01FC130F6D9038FF803F6D91B8FC7F6D17DF6D
-179F6D171F023F15FC6E15F8020715E002011580DA003FEBFC00030113C092C9FCB3A905
-03B712F84D16FC4D16FEA24D16FFA37116FEA27116FC7116F858747ACC5C>I<F17FF800
-1FB500FE0207B51280007F6E6C017F14E04DB612F0B7D8C00715F8051F15FC4D15FE94B7
-FC04C116FF6C15C316C7001F03CFECC07FC7000701DFEBFE0093B512F006C0EB3FFE604D
-C7EA1FFC4DEC0FF84DEC01C005E091C7FCA25F5F94CAFCA25E5EA25EA35EA35EA55EB3A9
-001FB97E007F18E0A2BA7EA56C60A2001F1880504D7BCC5C>I<92B5EB07E0021F9138F8
-0FF049B7121F010FEEFFF8133F5B48B9FC5A5A5AA248EC00034801F0EB007F0280141F48
-48C8120749814848815BA24981A47F725A7FD87FFE705A6D6C92C8FC6C13E014FC6CEBFF
-E06CECFF806C15FE6CEDFFF06C16FF6C17E06D16F8011F16FE010782010017C0021F8202
-0082030381DB001F80EE007F050F7F05017F717ED81FE0701380486C160F007F7113C048
-6C82A27F84A27FA26D5EA2804E13806E5D02F05D6E4B130002FE92B5FC6E6C01075B03F0
-017F5B92B7FC6161616101F794C7FC01E35E01E016F8267FC03F15C0D980034AC8FC6CC7
-003F13C0424F73CD5C>I<157FEDFFC05C4A7FB2001FBA12E04819F85ABB7EA56C61A200
-1F19E0C7000301E0CAFCB3B21AFE963803FF80A24F13C0A7705CA24F13806E7F61704A13
-006E6D91B5FC9326FF80035B6FEBE00F94B65A6F5E6F5E626F5E6F5E03014BC7FC6F5D04
-3F14F0040714809326007FF8C8FC4A627CE05C>I<001FB56C91387FFFFE4802E091B67E
-485E6F83B65CA36C82A26C826C83D80001EE0007B3B3A661A361A26181614EB5FC6F5C6D
-6D140F6F6C133F6ED9F001B712FC93B97E6E85A26E1A80806E16F76E04E7150002001683
-033FDAFE035C030FDAE0005C9226007FFECBFC594D7FCB5C>I<001FB66C013FB6FC486F
-491580486F90B712C0705AB718E0A36C1BC04C7E6C4B6D15806C4B6D1500D8000790C9D8
-1FFCC7FCA26F153FA26D606F157FA26D606F15FFA26D606F5CA2027F5F6F5CA2023F5F6F
-5CA2021F94C8FC6F5CA2020F5EA26F141F6E5EA270133F6E5EA270137F6E5EA27013FFA2
-6E5E705AA2037F5D705AA2033F5D705AA2031F92C9FC705AA2030F5CEEFF1FA26F5C17BF
-A26F5CA217FF6F5CA36F5CA3705B705B7090CAFCEE07FC534D7CCB5C>I<001FB66C010F
-B612C0007F6F4915F0705BB718F8705BA34C7F6C1BF04C7F001F4B6D15C026007FF0CA38
-7FF000A56E17FF013F61A56E5E011F61A56E5E010F61EE01FCEE07FF4C13804C13C0A26D
-6C496D4890C7FCA34C13F0A36D01804B5A93B512F817DFA3038114FC6D038F5C03C1151F
-A203C314FEA217076D6003C714FF03E7153F4C7EA3027F5F9226EFFC0113BFA303FF15FF
-4C7E6E5FA34C7FA36E5F4C7FA26E496D5B6E496D90C8FCDA01FEC7EA03FC554D7DCB5C>
-I<000FB6D8C003B612E048DBE00F15F8486F5A04F8825AA37E04F05E6C4B7E6CDBC00315
-E0D8000101F8C7001F90C8FC6D4C5A6E7E6E6C4A5A4E5A6E7E6E6D485B6E6D485B616E6D
-5A6E6D485B6E6D4890C9FC6092387FFC3F6F6C485ADB1FFF5B6F495AA26F5C6F5C6F5CA2
-6F91CAFC705A705AA34C7E8393B5FC4B804B80845D4B486C7E031F804C6C7E92383FF81F
-037F6D7EDBFFF07F4C6C7F4A804A01C0804C6C7F4A6E7F4A90C7FC4A486E7E727E4A4881
-4A486E7E02FF814B8249496E7F49707F001FB66C90B612FC48DBC003814803E082B76C5A
-1C80A31C006C4B7E6C03C05E6C4BC65D514C7BCB5C>I<001FB6027FB512FE007FDBC001
-B7FC04E01780B75B1CC0A31C806C8204C01700001F92C76C5CD8000F90C9D83FF8C7FC7F
-6F157F627F6F15FF626D7F607F6F5E60147F6F5E023F5D8197C8FC021F5D8161140F6F14
-1F6E5E82183F6E5E82187F6E5E826E15FF6182157F70485B153FA270485B151FA2704890
-C9FC150FA2DB07FF5B170FA26F5C178F179F6F5C17DF81EFFFF0A2826082A26082A3705B
-A28295CAFC5EA25F161FA25F163FA25F167FA25F16FFA25F5D13F0D807FE495B487E486D
-485BA2486D4890CBFC5D4B5A9038FE007F4B5A02035BEBFF0F6C90B55A5E5E6C5D6C92CC
-FC5D6C5C6C14F06C5C013F90CDFCEB07F852747BCB5C>I<0003BB1280481AC0481AE048
-1AF0A71BE091CA14C04E14804E14004E5B4E5B4E5B4E5B4E5B95B55A6C484B5C4D91C7FC
-D803F84B5BCA485B4D5B4D5B4D5B94B55A4C5C4C91C8FC4C5B4C5B4C5B4C5B4C5B93B55A
-4B5C4B91C9FC030F13FC4B5B4B5B4B5B92B55A4A5C4A91CAFC4A5B4A5B4A5B4A5B4A5B91
-B55A494AED3F804991C9EAFFE0495B49494B13F0495B495B495B90B55A485C4891C9FC48
-5B485B485B485B4890BAFCBCFCA76C1AE07E6C1A804C4C7ACB5C>I<953801FFF8067F13
-FC0507B5FC053F14FE4CB6FC5E160F5E4C15FC5E93B712F8F180004B02E0C7FC4B148005
-FCC8FC5F4B13E0A35FB3B15DA34B5B157F92B5FC020791C9FC021F5B0107B5FC003FB65A
-485D5EB75A5E93CAFC16C0826C81826C81D8000780EB001F02077F02008081151F6F7FA3
-81B3B183A36F13F883EFFF806F14E06FECFF80F1FFF87015FC827015FE82160382EE003F
-050714FCEF007F060113F8478976F95C>I<EA0F80EA3FE0EA7FF0A2EAFFF8B3B3B3B3B3
-B3B3A3EA7FF0A2EA3FE0EA0F800D8959F95C>I<EA1FFF4813FC48EBFFC0B612F815FF82
-16E0826C81826C81EA0003D9000F7F020380EC007F81030F7FA381B3B183A36F7F17FC83
-6FEBFFC06F14F0F0FFC070ECFFF87015FC827015FE82160116075E4C15FC5E4C15F893B6
-EAC00006F0C7FC4B14C04B49C8FC5F17F04B5BA35FB3B15DA3033F5B5D0203B5FC020F91
-C9FC0103B55A003FB6FC485D5EB75A5E168093CAFC15F86C14C06C01FCCBFC6C90CCFC47
-8976F95C>I E /Fg 42 123 df[<090FB500C094B5FC081FB600FE047F14F00707B800E0
-020FB612FE077F05F8027F6F7E0607BA0103B812E0063FDFC00F834DBBD8E07F17FC050F
-08F9B97E053F97BBFC94C4128004039326FC0007F0E01F040F93C8001F4CC64814C04C03
-F0030704F84914E0047F03804B04E090B6FC93B648C948048016F04B03F84C4C5A030703
-E04C5D4B03805017F84B92CAB7485B4B4A63604B4A4C5E92B648634A5D4E635C4E7715F0
-4A9CC7FC95CAFC4A7B15E04D83A16D14C0784A6F14804A4A79140078725BA16D5B780600
-13E0780704C7FCA191C8FCB3A9C5B412F8ADC7001F4ACB000F92CCFCB3B3B3B3AE003FBA
-021FBA12FCAC91C9003F0580C81207>181 177 121 304 170 11
-D[<9A3803FF800B0F13E0537FA2537FA2537FA29AB57EA35280A25281A35281A25281A3
-5281A25281A35281A299B77EA35182A25183A25183A35183A25183A35183A2518389A2E1
-FFFE82895001FC8289A25001F883895001F08389A250496C82A25001C083895085527EA2
-5090C7828A97B5845180A24F49848A4F875180A24F49858A4F49858AA24F49858A4F4985
-8AA24F90C96C81A24F48868B4E885082A24E49878B4E895082A24E49878B4E895082A24E
-49878B4E90CB828CA24E48888C4D49888CA24D497282A24D49898C4D90BF7EA34D8BA24D
-8BA34D8BA294C17EA34C01FCCD003F818D4C498B8DA24C498B8D4C498B8DA24C497482A2
-4C498B8D4C8D95CF7EA24C488C8E4B8E4D88A24B498D8E4B8F4D88A24B498D8E4B498D8E
-A24B498D4B6D88021FB66C8CBB067FBC12FEAC01FCC90AFCCA120F>199
-177 118 304 220 65 D[<C112FEF8FFFEF9FFF022FF23E023FC23FFA112E0A112F8A17E
-A112FFA113C0A17FC8001F03F0CB6C820E0716FC0E00820F3F817B820F07827B827B828D
-7C817C81A27C817C81A27C82A28EA181A37C82A4A1818EAA6AA15DA4585EA2A15DA26AA1
-92C7FC585DA2585DA2585D585D9FB75AA15C575E5793C8FC0F0F5D575D5715F09EB75A0E
-0316800E0F93C9FC0E7F15FC0D03B712F00C07B812C096BD48CAFC23F0238010F8CBFC22
-FEFAFFF023FFA112E0A112FCA112FF07F0CB000116C0E6003F15F00F0715FC0F0115FF7B
-16C0103F817C817C15FC7C817C817C82A1817C828FA1817D81A1818FA181A27D81A2A116
-808FA116C0A37D16E0A4A116F0ADA116E0A26BA3A116C06BA2A116806BA116006BA15D6B
-A0B75AA2585E6A585E585E585E107F5E9FB8FC0F0394C7FC0F0F5E0F3F5E56B812F00E3F
-5FC5B55AA191C8FCA15BA113F8A113E0A11380A148C9FCA112F8A112C059CAFC23E010FC
-CBFC57CCFC>180 174 118 301 207 I[<9A267FFFFE197F0A7FB600F8F0FF80091FB800
-C05E0803B900F85E083F06FF5E4FBB00E05D070F08F85D077F08FE5D0603BD6C5C060F0A
-E091B5FC063F0AF8130395BE00FE5B0503775B050F9526E0001FEDC01F053F05E0C86C6E
-5A94B800FCC9000F6E5A4C05E0040102FCB6FC04074CCB6C90B7FC4C04F8181F043F04C0
-18074C93CC120193B700FC8503034C1A3F4B04E0864B0480864B93CE12034B03FC874B4B
-8792B748884A4C884A4C884A4C884A93D0FC4A4B894A4B894E894A4B8991B7FC494C8A60
-498F494C8A95D2FC498F5F498F5F498F5F498FA290B75AA17F5A5F48A17FA25F48A17FA3
-485EA2A1805AA394D4FC5AA16E1300A191C8FCA35AA35EA4B7FCB3A27EA482A37EA57E71
-F807FFA14A1380A27EA36C82A37E7168A116007E837EA15C6D81A15D7F71207F6DA15B71
-20FF7F71555B7F72666D70686D6B72686D70666E585B6E8172545B6E6F666E6F9BB5C7FC
-6E70525B6E826E70525B6E70525B6F6F0A1F5B6F03FE525B6F6F646F7098B55A6F04E008
-035C6F04F85091C8FC030004FE081F5B706F505B7004E096B55A040F04F8060314E07004
-FF061F5C040105E0057F5C7005FE0403B6C9FC053FDCFFF0033F14FC050FDDFFE0010FB6
-5A050395B912E0050066063F9ACAFC060F1CFC06031CF0DE007F1BC0070F98CBFC07011A
-F8DF003F19C008034ECCFCE0001F17E0E1007F4BCDFCE2007F91CEFC>177
-180 112 304 210 I[<C112FCF8FFFCF9FFE022FEFAFFE023FC23FFA112E0A112F8A112
-FEA16C7EA113E0A113F8C8001F03FCCA001F83E5003F16FF0E0383E6003F16E00F0F820F
-0116FC7B6C81101F811007827C821000827D81111F817D817D817D817D827D82A17EA16C
-81A182A17EA16C81A16C81A2A16C81A182A17EA183A17EA183A17FA183A2A16D81A2A183
-A17FA2A183A17FA183A4A16D81A3A11880A4A16D16C0A5A118E0A8A118F0B3A3A118E0A7
-A118C0A5A1491680A4A11800A3A1495DA3A15FA15BA2A15FA2A1495DA3A1495DA2A190B7
-5AA2A1485EA194C7FCA15AA15EA15AA15EA1485DA15AA1485DA15EA1485DA1B7FC595E59
-93C8FC595D111F5D595D595D58B75A585E100F5E103F93C9FC9FB712FC0F075E0F3F5E56
-B812C00E3F5F0D0FB848CAFCC5B45AA113F0A113C0A190CBFCA112FCA112F0A1128011FC
-CCFC23E0A0CDFC22E00FFCCEFC0EFCCFFC>196 174 118 301 223
-I[<C5B412F0A4A17FA8A17FC8001F4BCA1201F70003F8003F21072100223F7C8022078E
-22008F8F8F8FA17F8F8FA28F8FA2A17EA180A2A17EA2A17EA4A16C7FA49B2601FFF081A3
-A180A2A17EA6A16C7F66A3A1C9FC66A366A266A2666653B5FC651D0F1D3F0A07B6FC96BA
-FCAD4FC71207F4003F1D0F1D0389777E8A8AA28AA28AA2A1903801FFF08AA2A14913E0A2
-8AA3A15BA115C0A4A15BA2A11580A29BCCFCA15BA2A11500A2A15BA3A15BA15CA2A113FF
-A2A15AA2A1485BA2A15AA2A15AA2A1485BA15AA2A15AA1B5FC6B595C6B6B233F6B58B6FC
-585D220F227F57B7FC211F56B85A55B9FCC5B5FCA4A15CA6A191C7FCA3>172
-173 118 300 191 I[<C5B4FCA4A11380A8A113C0C8001F4BCA121FF7001F2001F8003F
-210F21030F0015E08E221F8E8E8E8E8E7D13F0A28F8FA28FA28FA113F88FA38FA38FA113
-FCA3A1127FA49B2607FFC016FEA1123FA7A1EA1FFFA45494C7FCA566A266A266A29BB5FC
-65651D0F1D3F9AB6FC1C1F96BAFCAD4FC7121F1C001D3F1D0F1D0389898AA28AA28AA28A
-A58AAC9BCDFCB3B3BF7EAC02F8CB7E>160 173 118 300 183 I[<0B3FB5F13F800A7FB6
-00FC4E7E091FB800C017FF50B900FC5E081FDEFF805D4FBB00E05D070F08FC5D077F08FF
-5D4EBD00C05C060F0AF05C063F0AFC49B5FC95BE6C5B0503776C5A050F9526E0000F6F5A
-053F05F0C86CECF01F94B848C900076E5A4C05E004016E5A040794CB003F90B7FC4C04F8
-180F043F04E018034C04808493B748CD7E030304F8864B04E01A0F4B4C864B93CE7E4B4B
-1B004B03F88892B748884A4C884A4C884A4C884A93D0FC4A4B894E894A4B894A5D91B78B
-4E8A495E498F4E8A4993D2FC498F5F498F5F498F5F498FA290B75AA1805A5F48A17FA25F
-48A17FA35A5FA1805AA394D4FC5AA16E5BA191CAFCA35AA35EA4B7FCB3A27EA482A36C0C
-3FB500E0943807FFFC9FBBFCA46C82A47EA2837E9CC9000304C0C7FCA26C82A37E837EA2
-6D81A26D81A26D81A26D81A26D827F846D827F846E816E8180846E816E826E826E826E04
-F8636F816F816F6F6C626F70626F16F06F04FC6203007062706F6C96B8FC7004F0180304
-0F04FC6070DCFF80171F040105F0177F7005FF4CB512FD053F05F8031F14F8050FDDFFF8
-0103B6487E050395B9EAE01F0500547E063FF50003060F52130006010AF8143F726C09E0
-140F070F09801403070150C9FCDF001F07F0163F08010780EE0780E0001F05F8CEFCE100
-7F1680E2003F02C0CFFC>198 180 112 304 229 I[<B500F80507B500C00207B500C094
-383FFFFE91BC95BBFCACC8001F4BCF04F0C8FCB3B3B3AA96C2FCAD4FCFFCB3B3B3B1BE00
-C00207BD12FEAC02F8CA000708C0CA123F>207 174 118 301 228
-I[<B500F84DB512F091BCFCACC8000F93C9FCB3B3B3B3B3B3B3B3A4BE12F0AC02F8CA12
-01>92 174 119 301 110 I[<B500F80507B500C094267FFFF0923803FF8091BC97B9FC
-ACC8001F4BCF000F4BC8FCA1D8003F91C9FCA15DA14913F8A190B55AA1485CA100075CA1
-485CA14849CAFCA1485BA1485B59B55A595C595C5991CBFC595B117F5BA0B55A585C5814
-C0585C5891CCFC103F5B585B9FB512F0575C575C0F0F5C5791CDFC575B5713F89EB55A0E
-035C565C565C5649CEFC565B565B55B55A555C5514805591CFFC555B0D7F5B9CB55A545C
-5414C0545C0C1F91D0FC545B545B9BB512F0535C535C0B0F5C53806553809AB67E0A0381
-6452815281528199B8FC518351835183518363097F8398B97E5084625084081F6E825001
-FE8350497E97B5D8F01F8296B6486C820AC083527E526C8209FC6D825184517F516E8251
-6E8298C86C8262506F82506F82506F826208806F8297CA824F7182A17E8B79827982A17E
-8B79827982A17E8B7A827A82A17F8C7A827A82A17F8C7A827A827B82A27B827B827B82A2
-7B827B827B82A1808D7C827C82A1818E7C827C82A1818E7C827C82A1828F7D827D827D82
-A27D827D82A182113FEEFFC0BE00C0030FBC12F8AC02F8CA00070980C91207>205
-174 118 301 228 75 D[<B500F8067FB57E91BDFCACC8001F4BD0FCB3B3B3B3B3FB1FFF
-A4FB3FFEA7237FA2A112FCA323FFA46AA2A112F8A26AA36AA26AA112F06AA26AA26AA29F
-B5FC69A112E06969696969699EB6FC680E0715C068203F9DB7FC1F031F0F1F7F0C03B8FC
-9BB9FCC51280A9A11200A4>152 174 118 301 175 I[<BA00FC9FBA12FE07FF21037468
-A27468A27468A27468A27468A2749DBBFCC8001FA106F0C8FC745513EFA305BF6E5513CF
-A2059F6F54138FA2058F6F54130FA205876FF61FFEA305836FF63FFCA205816FF67FF8A2
-05806FF6FFF0A2726E5313E0A3726E5313C0A2726F521380A2726F521300A2726F525AA2
-726F525AA3726F525AA2726F525AA2736E515BA2736E515BA3736F505BA2736F5090C7FC
-A2736F505AA2736F505AA3736F505AA2736F505AA2746E4F5BA2746E4F5BA2784E5B86A2
-746F4E90C8FCA2746F4E5AA2746F4E5AA2746F4E5AA3746F4E5AA2756E4D5BA2756E4D5B
-A2756F4C5BA3756F4C90C9FCA2756F4C5AA2756F4C5AA2756F4C5AA2A1485A7581A2766E
-4B5BA2766E4B5BA2766F4A5BA2766F4A90CAFCA3766F4A5AA2766F4A5AA2766F4A5AA276
-6F4A5AA3776E495BA2776E495BA2776F485BA2776F4890CBFCA2585A7715E0A2776F485A
-A2776F485AA2776F485AA27891B55AA3785EA2785EA27893CCFCA2785DA3785DA2785DA2
-785DA2795CA26A020FB685BB00F00C7FBC12FE795CA27991CAFCA2795BA2795BA2795BA2
-795B91C9000FDF3FC007F8CA121F>255 174 118 301 276 I[<0A3FB5FC093FB7FC0807
-B812F897BA12C0070719F8073F19FF4EBC12E0060F1BFC063F1BFF95BE12C005031DF005
-0F9326FC000F16FC053F93C8003F15FF94B700F8030716C0040304C0030016F04C93CA00
-3F81041F03FC050F15FE4C03F00503814C03C00500824BB7CC003F15E04B4B73814B4B73
-814B03F00703814B4B73814B4B73814B4B748192B7CE6C814A4B75814A4B75814A4B7581
-4A8F4A4B75814E874A4B75814AA17E91B7487681A24993D06C8149A17F4D8949A17F494B
-7781A2494B7781A2494B7781A249A1804D8990B78FA24D8948A181A248A1814D8AA248A1
-81A294D27E48A181A348A181A24C8BA348A181A548A11680A24C8BA5B7A113C0B3A36CA1
-1680A67067A26CA11600A56CA15DA27067A26CA15DA36CA15D7166A26CA15DA2719BB7FC
-6CA15DA36C70535EA26DA15C71656DA191C7FCA26D6F535D993801FFE06D6F041F01FE4C
-5D6D087F6D6C61714BB600E05D6D070703F861714B6F5D6D4F03FF616D704A704A5D5182
-6E6F91B86C91B75A6E6F49DA807F6D4993C8FC6E9626FC00076D5F6E6F4901F001016D49
-5D7203C06D6D5B6E6F4949DA3FFF495D6E6F92C86C4A5D6E6F494871485D6E0480716D48
-5D6F03C0716DB75A6F03E0496F01E193C9FC6F03F007F35D6F03F87190B75A030303FE1D
-F06F03FF715F6FDCCFFE637003EF715E041F92B550CAFC70716104037192B712F0040071
-020716C07170023F5E051F04FE010FB748CBFC050793BA12F805011DE0716C1C80060F09
-FCCAEA0380060375EF0FE0DE007F86070FF81FF0070087080F86E0003F040380E1003F02
-006F163F99C9817D167F7A6E16FF7D6C5CA16C1407A100F0143F7A03FE010FB5FCA1B812
-E0A38DA3A117C08DA3A117808DA2A117008DA15E8DA2A15E8DA15E8DA15E7B60A27C5F7C
-5FA27C94C7FC7C5E7C5E7C5E7C5E7C16C07D5D111F4AC8FC110714F8110114E0A026001F
-FEC9FC>188 226 112 304 219 81 D[<C012E0F7FFF0F8FFC021FCF9FFC022F822FF23
-E023F823FE7D7EA112E0A112F8C8001F03FCC9000317FEE4000F820D0017C00E1F820E03
-820E00827B810F1F817B817B827B827B827B82A27C81A1808EA180A27C81A2A181A37C82
-A5A181ABA15DA4585EA3A192CAFCA2A15C6AA15CA15C6AA15C9FB75A575EA2575E5793CB
-FC575D0F3F15F8575D56B75A0E0716800E1F93CCFC9DB712FC0D0F5E0C07B812E096BE12
-8011FCCDFC23F0238058CEFC22E0A222F822FE7C7E07FCC9003F16E00C0382E4007F15FC
-79810D0F8179820D018279827A817A817A81A17E8C7A817A82A27A82A2A17F8CA2A17FA2
-8DA17FA7A17FA7A17FA7A17FA7A16EED0FE0A1F03FF8A2A1F07FFCA27B82A47B7015FFA2
-7B1BF8A1807B61A16E16F07B61A180BE6C6F704A13E07B705C7C704913C07C704913807C
-7090B5FC7CDCFE031400100393B65A7C617C6C60111F6011076011006002F0CA0007091F
-94C7FCD7000316FCA1D8001F15F0A1D9000F91C8FC>206 177 118
-301 218 I[<4DB500C0177F057FDAFF804C7E0407B700F85D043F04FF5D4BB900E05C03
-0F06FC5C033F06FF5C92BB00C05B4A08F05B020708FC90B5FC4A745A023FF2FF834A9226
-C0007F15C791B600F8C7000192B6FC4903C0EC001F494AC912034902F81600494A171F49
-02C083494A170393CCFC49498590B54885481C0F4B85484A8589484A858A485C8A8A4889
-5D8A5A8A8A5AA28AA28BB67EA28B81A28B8181A2816F87818282826C8104FC7490C7FC04
-FF97C9FC8317F06C16FEEFFFE018FF6C18F8F1FF801AFC6CF1FFC01BFE6CF2FFF01CFF1D
-E06C1CFC6C1CFF1EC06C1DF06D1CFC1EFF6D896D1DE06D896D898B6D896D896D6C896E89
-6E896E896E890201896E89153F030F880303891500041F881603DC007F87050787EF003F
-1803DE001F851900080F84F2007F1B03E1003F821C071C01767E77811D0F898989771680
-8AD83FF088486C8812FF8A8AA28AA38A7FA38A22007FA46D67A280A26E515CA2806E66A2
-6E636E666E636E666F626F656F6203F8505C8103FF5091C7FC7096B55A04E04E5C04F860
-04FE060F5CDCFFC04D5C05F8057F5CDDFF804BB65A06FC030F5DDEFFFC49B7C8FC02F193
-B95A02E064DAC03F1BF0DA800F63DA00031B8049010098C9FC49023F19FC49020719F049
-0200198049031F05FCCAFC49030117E049DB00074BCBFC6CCB00071480>129
-180 112 304 162 I[<0007C5B6FCA648A11580A705F8C86C03F8C8FC4CC91A0304F0F6
-003F04801F0F4BCA1B0303F820004802E00F3F14C04B8D4B8D92CB884A8E4A8E4A8EA24A
-8FA24A8FA248497D13E0A2A1805CA391CC89A449A17EA2007FA115F0A449A17EA94848A1
-6C13F8A6CE9BC7FCB3B3B3B3B3A6041FC012E0AC07F8CC7E>181
-171 118 298 202 I[<B56C0403B500E091263FFFE094B500F893267FFFC0ED0FFF91BB
-94BB96B9FCACC7000304E0CD04F8CE003F4AC7FC6E70A1DC001F13C07C6F66A26E70746F
-5290C8FCA26F6FA1607C6F1C7FA26F6F79515A8E856F7870505BA26F70A14B5B7C82A26F
-707370505BA26F70A15F7C7062A26F70A14B5B7D81A26F7097B76C5090C9FCA2706FA15E
-58701A7FA2706F794F5A6A867053714E5BA27070A1495B5883A27070784E5B6A7070A15D
-587160A27070A1495B58486C81A270704F6C6F4E90CAFC22FF716FA15C57496C6F187FA2
-716F794D5A57497EA2716F4D496C704C5BA27170595B57496C82A271704E6C704C5B6971
-70A15B5790C7705EA27170595B57486E81A271704D6E6F4C90CBFC21FF726FA15A56496E
-6F167FA2726F794B5A564980A2726F4B496E704A5BA27270575B56496E82A272704C6E70
-4A5B6872706B5690C9705CA27270575B56487081A272704B706F4A90CCFC20FF736F6A55
-49706F147FA2736F79495A554982A2736F49497070485BA2730480555B55497016E0A273
-04C04A7070485B670CE069734D90CB705AA27304F0555B55487215FCA27304F849726F48
-90CDFC1FFF746F680CFD4972EDFF7FA27492B5545A5684A2744D725FA274A15A5684A274
-4D725FA37494CD5FA274A15A5586A2744C7493CEFCA2756A5586A2756A5586A2754B745D
-A2756A5586A2754B745DA37592CF5DA2756A5488A2754A7691CFFCA276685488A2766854
-88A27649765B76687649765B7690D15B>288 176 122 301 301
-87 D<053FB512E0043FB712C00303B812FE033FEFFFC092BA12F8020719FF021F1AC04A
-1AF04A1AFC91BC7E499226F000036F7E4902F8C8003F81496E030F81496E030381700300
-81497380716F8075807581496F6F81A27581878B878BA2886D4B85A36D92CA6C806D5CA2
-6D5C6D5C6D6C13E06E5BDA07FECBFC91CDFCA84FB8FC0603B9FC95BAFC171F4CBBFC161F
-93BCFC1507033FEFFE3F4AB8EAF80002074CC7FC021F16E0027F4BC8FC91B712F0010316
-C0494BC9FC011F15F84915E0495D90B7CAFC485D485D5E485D485D5E5A485DA293CBFC5A
-5DA2B6FC5DA564A399B6FC816C6263816C6F5E636C6F5E70DC3FFB806C6F047F82709226
-01FFF315E06C6F030701E315FF6C03FF4B01C3EEFFC06C70027F018117E06C04F049B500
-0117F06D03FE013F13FE6D92B7487E010F07F07F0103616D07807FD9003F95C7120F020F
-05FC1403020105E01400DA001F93C9003F15E0030103F8040115C0DB000391CFFC847378
-F18D>97 D[<EE3FF8011FB6FCB8FCADEA001F13017FA280B3B3A898383FFFF0080FB612
-C097B712FC0707EEFF80073F17F096B912FE0607727E061F19E0067F19F895BB7E05FBDB
-800715FF94B600F0C76C810880020F8107FCC8000315F007F06F8107C06F6C8096CA6C80
-4E71804E718106F071814E834E71814E8795CC815F4D7380A27980A28E8B2380A223C08B
-A223E0A323F0A28BA223F8A523FCB123F8A623F067A323E0A323C0672380A3551500A26A
-555C839CB65A83724D5D724D5D7263725F724D5D724D92C7FC724D5C724D5C07C04BB65A
-05BF01F04B5D051F6D030F15C04C6C01FF033F5DDCFC0302C049B7C8FC4C6C02FE013F15
-FC7191B95A4C013F19E04C6D19804C01074EC9FC060118F84C6D6C17C093C8000F4CCAFC
-4B030116F04BDB003F4ACBFC91CB00011480>142 177 119 303
-162 I<060FB512E00503B712E0053F16FE4CB912E0040F18F8047F18FF4BBB12C0030786
-031F86037F8692BC7E0203932680001F804A03F8C70001804A03E04A1580023F03805C4A
-4AC816C091B6485D4915F0495D494B4B15E0A2495D4992C9FC495CA2495C90B6FC5E4874
-15C05E5A751580484B701500A248745C755C4C053F13F048755B0A0390C7FC99C9FC5AA3
-5E5AA6B7FCB07EA382A37EA46C81A37E827EF63FF870F17FFC7E826C1DFF826C5213F86D
-805313F06D816D6F4D13E0715F6D6F4D13C06D6F5F6D6F4D13806D6F94B512006D6F6C4B
-5B6E6F15076E03F0031F5B6E03FC037F5B0207DBFF8049B55A6E04FC013F5C6E93B81280
-6E6C97C7FC031F616F19F8030319E0DB007F1880041F4DC8FC040317F0DC003F16800503
-03F8C9FCDD000F49CAFC6E7376F181>I[<F83FF80B1FB6FC51B8FCAD98C7121F1D0189A2
-8AB3B3A8953807FFFE0503B612F0053F15FF4CB812E0040F17FC047F17FF4BBA12C00307
-19F0031F19FC037F19FE92B7D8F00091B7FC02034BC7120F4A03F01401021F03C0EC003F
-4A92C9120F4A4A8291B600F81601494B82494B173F494B83494B8394CB7E4987494A8449
-4A84A290B65A5A5E5AA2485DA35A5E5AA35AA35E5AA6B7FCB17EA57EA282A27EA37EA282
-7EA27E827E656C81656D6E606D6370606D636D6E606D6F94B7FC715E6D6F0407826D6F5E
-6D6F043F826E02FE4CEEFFE0021F6E4BBA12FE6E03C0140F6E03F8027F5B6E9226FF8007
-B55A020093B712F0033F616F198003074E5A030118F8DB003F17E0040794C7FC040016F8
-050F1580DD003F01F0C84AC8FC>143 177 118 303 162 I<060FB5FC0503B612FC057F
-EDFFC00403B812FC041F17FF047F18C04BBA12F0030719FC031F19FF037F864AB7D8801F
-15E04A9226F80001814A03C0D9003F80021F92C8000F804A4A0303804A02F86F8091B648
-6F81494B7080494B82494B70804992CA6C80A2494A7180494A8349894C8390B6875E4875
-80A25A4C7214805AA2487614C05E5AA220E05A89A25E5A20F0A4B7FCA293BDFCA720E020
-C00480CFFCA77EA4827EA47EA2827EA27E70F27FC06CF6FFE05413F06C81A26C65826D6E
-4F13E0666D6E1BC06D6F606D6F4E1380666D6F95B512006D03F84D5B6D6F5F6D6F050F5B
-6E6E6C4C5B6E6F047F5B6E03F04BB55A020703FE030F5C6EDBFFC0027F5C020004FE010F
-B6C7FC6F92B85A031F1AF803076203011AC06F6C96C8FC041F18FC040318F00400188005
-0F04FCC9FC050016C0060102F0CAFC747378F185>I[<4FB5FC96B612F0060F15FE95B87E
-050717E0051F83057F17FC4CB97E040784041F19804CEDC01F93B626FC003F14C04B03F0
-4914E04B03C090B6FC4B4B16F04B4A485A4B5C4B5C4E4915F84B5C92B6FC605C4A5DA295
-C7FC4A7115F05F5C7415E0A27514C04A4A6F1480751400755B755B090013E00A04C7FC99
-C8FCB3A9BC12F0ADC7001F4ACCFCB3B3B3B3AE003FBA12F8AC91C9120F>101
-177 118 304 89 I<55B47E0D3F13F00503B500E04BB512FC94B76C020F80040F04F802
-3F80047F04FF91B712800303B9D8E00116C0030FDEF80716E0033FF0FE0F92BB00BF16F0
-020397B55A4A1CE1021FDBE003DCFE0114F84A4AC7003F15F84A02F8020F15E091B600E0
-0203ED8003494B6E6F7E4992C96C14E0494A7014F022F0494A7014F8494A706E7E22E049
-766D13C0494A706E6D13800E0F1300F803F890B675C8FCA24C82488AA4488AAB6C66A46C
-66705EA26D9AC9FCA36D6E4C5C6D64A26D6E4C5C6D6E4C5CA26D6E4C5C6D03C04AB65A6D
-6F4A5D6E02F8020F92CAFC6E02FE023F5C9426FFE003B65A95B812F04A6291BC128052CB
-FC4901CF18F849018318E0DB807F94CCFC49D9000F16F804001680050302E0CDFC4992D1
-FCA35BA381A281A28181A215FC816F7E16E093B912F0F4FFF06DF3FF801EF81EFF6D1DC0
-1FF81FFE6D777E8C6D1EF08C6D8A6E898C6E8A6E8A6E8AA2027F8A0103C0FC010F8B133F
-498B90C1FC4803C0CA003F82484ACC123F4802F819034802E0DF007F80484A1A0F484A86
-1E0192CFFC4849761480A28BB55A8BA66E646C2100A26E64A26C6E98B55A6F626C6E505C
-6F626C6E505C6C6E505C6C6E505C6C6E6C96B65A6C03E006035D6D02F8060F92C7FC6D02
-FF067F5C6D03E00403B65A010703FE043F15F06DDBFFFC021FB75A010093BB1280023F52
-C8FC020F1CF802031CE0DA007F98C9FC030F1AF803001A80040F06F8CAFCDC007F94CBFC
-DD003F4ACCFC85A678F292>I[<EE3FF8011FB6FCB8FCADEA001F13017FA280B3B3A851B5
-7E093F14FE50B712C0080F16F8087F16FE4FB97E0707844F84073F18F84F8496B5D8F801
-81060391C77E4E01FC021F804E01E06E814E0180804E90C86C81F07FFC4E486F8119E005
-F9498505FB498194B5CAFC4E8660A24E83608D6060A260A295CBFCA35FA55FB3B3B3A5BB
-49BBFCAC01FCC96C04FCC97E>144 176 116 303 162 I[<4AB47E020F13F0023F13FC4A
-7F49B67E498149814981A249814981A24981A390B8FCAA6D5DA36D5DA26D5D6D5DA26D5D
-6D5D6D5D6D6C49C8FC6E5B020F13F00201138091CBFCB3A6EE3FF8010FB6FCB8FCADEA00
-0F13017FA280B3B3B3B3A9BA12F8AC01FCC81201>61 177 116 304
-81 I[<EE1FFC010FB6FCB8FCADEA000F130080A280B3B3A999261FFFC0EC07FC9BB7FCAC
-E2007F4AC8FC0B1F14C09DC9FC0B7F5B9AB512F8525C525C0A0F5C5291CAFC525B525B51
-B55A5114E0515C091F5C5191CBFC5113FC98B55A08035C5014C0505C5091CCFC087F5B97
-B512F84F5C07075C4F5C4F91CDFC4F5B96B5FC4E804E8160061F814E814E8195B77E94B8
-FC88888889A28989079F81070F814E7E4E6C81DEF0018106E0824E6C824E7F4DC76C814D
-6E814D844D6E81748186748174818B758187758175818B758187758175818C7681887681
-76818C7681887681768177818D7781890B7F15FCBA00FC021FB912F8AC49C8000106C0C8
-127F>141 176 120 303 154 107 D[<EE3FF8011FB6FCB8FCADEA001F13017FA280B3B3
-B3B3B3B3B3B2BA12FCAC01FCC9FC>62 176 116 303 81 I<DC7FF093B500E096387FFF
-F0011FB6041F02FF060FB67EB893B700F0057F15F8080704FE0403B8FC081F706C030F17
-C097B900E0037F17F04F7292B97E070772020384071F06FE020F18FF4F724A854FD9FC00
-704949C66C814EB500C0011F94B500E0130F4E49C700076F4891C70003814E01F86E6F48
-01FC6E814E01E06E4C01F080D8000F4C0180724801C08401004C48C94C90C97E6E4C7002
-F84970804E48505A6EDBFFE09626FC7FF08505F149704B48824F6305F390CA92B5488517
-F74E99CAFCDDFFFC714B834E63A1864E634E63A24E63A34E63A295CB5EA54D99CBFCB3B3
-B3A5BB6C017FBA00C0013FBA12E0AC49C9003F94C9001F0580C8120FE37175F0F4>I<DC
-FFE04BB57E013FB6043F14FEB84BB712C0080F16F8087F16FE4FB97E0707844F84073F18
-F84F8496B5D8F80181060391C77E4E01FC021F804E01E06E814E018080D8001F4C90C86C
-810101EE7FFC6D4C486F8119E06E02E1498505E3498105E790CAFC4E86EFEFFCA2DDFFF8
-83608D6060A260A295CBFCA35FA55FB3B3B3A5BB49BBFCAC01FCC96C04FCC97E907174F0
-A2>I<4EB512C095B77E050F16F894B97E040718F0043F18FE93BB7E03031AE0030F1AF8
-033F1AFE4BDBC001814AB600F8C7000F15C04A03C00201814A92C96C80021F02FC041F14
-FC4A4A70804A02E004038091B6487081494B70814992CB6C80494A7280A2494A7280494A
-7280498AA2494A728090B6894C84488CA2488C4C84488CA2488CA3488C4C84A2488CA448
-8CA6B71E80B06C2100A56C687060A36C68A36C68A270606C68A26C6870606C68A26C6F4E
-5D6D9CC7FC70606D666D6E4E5C6D6E4E5C7194B6FC6D666D6F4C5D6D03F004075D6D6F4C
-5D6E02FE043F92C8FC6E6E4C5C020F03E00203B612F86E03FC021F5D6E9226FFC001B75A
-020093B91280033F50C9FC6F6203071AF003011AC0DB003F4ECAFC040F18F8040118C0DC
-001F04FCCBFC05001680060102C0CCFC817378F192>I<DC3FF892381FFFF8011FB60307
-B612E0B8037F15FE0703B812C0071F17F896B912FE0603F0FFC0060F85063F19F895BB12
-FE05FB8694B7D8800F16C008F0C78297C8003F8107FC030F81D8000F05F06F81010105C0
-0301816D94CA816E4B718106F871814E7181600680718195CB6C81A24D72814D7281A278
-81A2791580A37915C0A37915E0A323F08BA323F8A48B23FCB123F867A523F0A267A223E0
-A26723C0A2238067A29CB71200A2545D6A71606A7160724D5D7263724D5D6606F84D5D72
-94B7C7FC724C5D724C5D07C04B5D73031F5D07F84B15C007FE92B75ADFFFC0010793C8FC
-05FD02FE017F15FC05FC91B95A063F19E072198006074EC9FC060118F8726C17C0070F4C
-CAFC070116F0DF003F4ACBFC0801148097CFFCB3B1BBFCAC01FCC97E8EA277F0A2>I<92
-2601FFC0EC0FFF013FB692B512F8B8020314FF070F15C0073F15F096B77E4E16FE4E824E
-17804E17C04ED9F83F14E04EEBC07F4E0100B612F019FC4E484815F8D8001F03C113E001
-0117C06D03C3494815FC05C7130080EFCFFE6017DF606017FF4E6D15F8A2607415F04E6E
-14E0A27514C095C86C14800907EBFE00755B9838007FE04D93C8FCA45FA75FB3B3B0BB12
-E0AC01FCC9123F667177F078>114 D<041FB5EC01FC0307B600FCEB07FE037F9238FF80
-1F0203B8EAF07F021FEFFEFF027F94B5FC49BBFC13075B013F9138F000034949C8123F90
-B500F015074802C0150192CA7E4849834849170F4849834A83485B8648855C1B7F5AA31B
-3FB57EA280A2808002FF725A6F94C8FC15E015FCEDFF8016F86CEDFFE017FF18FC6CEFFF
-F019FEF1FFC06C19F81AFE6CF1FFC06C861BF86C1AFE6C866C876D866D866D860107866D
-860100866E85021F1A80140302001AC0151F030319E0ED001FDC007F17F01703EF000FDE
-007F15F819071901736C14FC1A1FD83FF01807486C8400FF8586876D85A2877F877F1DF8
-A280801DF080636E1AE0806E606E1AC06E606F94B512806F5E6F4C140003F84C5B03FE04
-1F5B6F6C037F5B04F00203B55ADCFF8090B65A94B85A6499C7FC028718FCD9FE0318F049
-C66C17C001F0011F4CC8FC49010316F00180D9007F92C9FC6CC8000114C05E7376F173>
-I[<93380FFF80A95EA75EA45EA393B5FCA35DA35DA25DA25DA25D5DA25D92B6FC5CA25C
-5C5C143F5C91B7FC1303010F93B712FC137F0003BCFCBDFCAAC7000F0380CAFCB3B3B298
-3803FFE0B3A2636E1AC084A2636E1A80725C1D006E6F5CA26E6F4A5A724A5A6F6E5B6F91
-26FF80075BDFE01F5B6F92B65A816F600301606F4DC7FC043F5E040F5E040316E0DC007F
-1580050F02FCC8FCDD003F13C0>91 162 123 288 113 I<DC3FFCF23FFC011FB6061FB6
-FCB84CB8FCADD8001F96C7121F01011B016D87A26E87B3B3B3A69BB6FCA465A265A3656E
-62A2656580715F9AB7FC6E4F820A0713BF6E6E4C013F80724B17F06E6FDB7FFE93B5FC6E
-6F913801FFFC06F8020713F86EDBFF80017F13F06F92B712E06F1980030F19006F600301
-18F86F6C17E0040F178004014CC7FCDC001F15E0DD007F49C80380C7FC907274F0A2>I<
-D8FFF0922607FFF0922601FFE0EC3FE090B995B7FCACC74BCC4AC7FC6E0A1F13C0836E66
-72606E9BC8FC846E525AA26E6F4E5AA2725F6E65725F6E65725F6E65725F6F64846F505B
-A26F6F4C90C9FCA2735E6F637316FF6F63735D6F63735D6F63856F4F5BA2706E4B5BA273
-5D7062745C7097CAFC745C70617414FF706186704D5BA2706F495BA2745B7061745B7160
-745B7160755A7195CBFC1BC0714C5AA2716F485AA21BF1715F1BFB715F98B5FC715FA272
-5EA2725EA27293CCFCA3725DA2725DA2725DA2725DA2725DA2735CA3735CA27391CDFCA2
-735BA2735B735B735B9638007FC08B7179EF9A>I<D8FFF892260FFFE0D9FFE0DBFFFCDB
-FFF0EC0FF890B992B894B7FCACC703F8C9000192CB003FEC800071706F050301F8C7FCA2
-6E6E7461896E595B7171806E595B7285896E595B72856E5990C8FC7285656E595A724C80
-6E595A72859AB7FC6E585B724B826F575B7286646F6E545B52826F575B73855213DF6F6F
-535B52018F806F5790C9FC73855213076F6F535A52486C806F575A738552487E6F6F525B
-51496C8170555B738651497F706E525B51496D8070555B744884537F7003C073495B5149
-7F705590CAFC744890C76C80A27003F073495A51488070555A7448486E80A2706F08815B
-08FD4980710B835B97B5486F14C3A2710BE75B5281710BEF5B526F91B5FCA27167528171
-9CCBFC99C97EA27166518271665182A271665182726551837265A25183726551837265A2
-5183729ACCFC98CB7E7264A250847249725B7249725BDF3FF0F17FE0C5717AEFD2>I<D8
-7FF8922607FFE0912603FFE0913803FF8090B994B8FCACC7000F03E0C9000F92C8FC6E6F
-040014C06E505C6E6F4C91C9FC6E6F60724C5B6F6E4C5B6F6F4B5B6F4F5B6F6F4B5B6F6F
-92B5FC734A5C6F6F4A91CAFC6F6F5E6F6F4A5B704D5B706E4A5B74495B706F5B706F90B5
-5A706F485C704C91CBFC7003F85C706F485B74485B716E485B7103BF5B7192B5FC715F71
-5F9ACCFC715E715E715E725D725D84647281728184728172818873808996B77E60894E82
-4E824E824E82604E8295B500DF814D029F81080F814D496C814D496C814D497E4D496C81
-4D49824D6F8094B5486D814C4A6D8196C77E4C496E814C496E814C49844C496E814C496E
-814C718093B548814B4A6F8195C9824B4970814B4970814B4970814B49824B72814B4971
-8092B548864A4A71814A748191B600F083B900C0031FB912FCAC01C0C7000707C0C8127F
-8E707AEF9A>I<D87FF8922603FFF8DCFFF0EC1FF090B995B7FCACC76C92CC6C91C7FC6E
-0A0F13E0846E6672606E6672606E9BC8FC72606E65846E525AA26E6F4D5BA2725F6F6472
-5F6F64735E6F64735E6F64735E6F99C9FC856F505AA27316FF6F63735D6F63735D706273
-5D7062745C706286704E5B86704E90CAFCA2745C70617414FF7061745B7061745B716074
-5B71601B80714C5B1BC0714C5BA2755A7195CBFC755A715FF3F8FF715F1BFD715F98B5FC
-725EA2725EA2725EA3725EA27293CCFCA2725DA2725DA2725DA2735CA2735CA3735CA273
-5CA27391CDFCA2735BA2735BA263A261636163616361636198CEFCEB3FF02601FFFE4C5A
-487F486E4B5A4880486E5C486E5E60486E5E60B66C5E60624E5B604E90CFFC6118FF4D5B
-6C4A495B4D5B5F4B013F5B6C4A495B4CB55A6CDAC00791D0FC6C9026F7801F5BDAFE01B5
-5A6C90B712F06C5F6C5F6C94D1FC6D15FC011F5D6D15E0010392D2FCD9007F13F8020790
-D3FC8CA27AEF9A>I<48BF12801FC01FE0A65A1FC005C0C70001168004F8C85A04804B16
-004BC95E03F84C5D4B5E4B4C5D4B624B4C5D92CAB75A4A5E4A634F93C7FC48494C5D614A
-4C5D654F5D4A5E96B75A654E5E4A4B93C8FC60644E5D4E5D60484D5D4A6195B75A5F4D5E
-99C9FC4D5DCA5A4D5D634D5D4D5D94B7FC4C5E634C93CAFC5E4C5D624C5D5E4C5D509138
-01FFF093B75A4B5E5D97C8FC4B4B4B13E04B5D5D4B5D614B5D92B7FC4A4C5D614A93C9FC
-4A5D4A1CC04E5E4A5D4A5D5C91B7485E60495E49634993CAFC4D4D1380495D4998B5FC49
-4B5E4D5E495D90B7485E4863484C163F94CA5A484B4CB61200481A07484B161F4C4BB7FC
-484B157F4892BCFCC0FCA566A37E7E6C7078EF81>I E /Fh 62 124
-df<942603FFF0913803FF8094B500FE023F13E004076E6C48B512F8043FDBE0078093B7
-6C488003039028FE007FFC3FEB03FF030F01E0902707FE7FF81480033F01800101494848
-13C04B48C70007B5EAC00FDBFFF84A028014E04A494A4A5A4A13C04A494A5B4A90C85C5C
-4A485F4A487313C0A24A486F496D138077130049496FED00FC7393C7FC735B495BB3A7BE
-12FEA6D8000301E0C8000301E0C9FCB3B3B3A7496D4B7F87013F01FE033F13FFB86CB812
-F0A66B7C7CFB67>11 D<943803FFE0057F13FE0407B67E043F8193B712F0030349C66C7E
-030F01E0EB0FFC4B0180EB03FEDB7FFEC8FCDBFFF8157F4A49913803FF804A01C05C4A49
-4A7F4A90C85A4A5E4A5A4A5AA24A484B7F735B495BA2735B495B7390C8FCF103FCF100F0
-97C9FCB3963803FFE095B6FCBCFCA6D8000301E0C8121F8585A285B3B3B3A3496D4B7FA2
-013F01FE033F13FEB86CB81280A6597C7CFB62>I<D803F815FED80FFE913803FF80486C
-4A13C0486D4913E0486D4913F0A2B56C4913F8A26E15FCA46E15FE6C81A26C816C81D80F
-FE6E13BED803F8913800FE3EC71500A60101167E4A157CA3010316FCA24A15F8A2010715
-014A15F0010F1503A24948EC07E0A249C8EA0FC0A2017EED1F8001FE153F491600484815
-7E000316FE48484A5A495D48484A5A48484A5A48C8485A001E6F5A000C6FC7FC37357AF9
-58>34 D<EA03F8EA0FFE487E4813804813C0A2B512E0A214F0A414F87EA27E7EEA0FFEEA
-03F8C7FCA6130114F0A31303A214E0A2130714C0130FA2EB1F80A2EB3F00A2137EA25B48
-5A1203485A5B485A485A48C7FC121E120C153571F931>39 D[<EE0F80161F163FEE7E00
-16FE4B5A4B5A4B5A4B5A4B5A4B5A157F4BC7FC4A5A5D14034A5A4A5AA24A5A143F5D4A5A
-14FF92C8FC5B5C1303495AA2130F5C131F5CA2495AA2137F5C13FFA25C5AA34890C9FCA3
-485AA4120F5BA3121FA25BA2123FA45BA2127FA85B12FFB3A8127F7FA8123FA27FA4121F
-A27FA2120FA37F1207A46C7EA36C7FA37E80A2137F80133FA26D7EA280130F801307A26D
-7E1301807F81147F6E7E81141F6E7EA26E7E6E7E1401816E7E6F7E153F6F7E6F7E6F7E6F
-7E6F7E6F7E167EEE3F80161F160F>41 176 112 259 68 I[<127812FC127E7E7F6C7E6C
-7E6C7E6C7E6C7E6C7E7F6D7E6D7E131F806D7E6D7EA26D7E8013016D7E81147F81143F81
-6E7EA281140F811407A26E7EA2818082A28082A36F7EA36F7EA482151FA382A2150FA282
-A41507A282A8811780B3A817005DA85EA2150FA45EA2151FA25EA3153F5EA44B5AA34B5A
-A35E5CA293C7FC5C5DA24A5AA2140F5D141F5DA24A5A5D147F5D14FF92C8FC495A13035C
-495AA2495A495A5C133F495A49C9FC5B485A485A485A485A485A485A90CAFC127E5A1278
->41 176 118 259 68 I<EA03F8EA0FFE487E4813804813C0A2B512E0A214F0A414F87E
-A27E7EEA0FFEEA03F8C7FCA6130114F0A31303A214E0A2130714C0130FA2EB1F80A2EB3F
-00A2137EA25B485A1203485A5B485A485A48C7FC121E120C1535719231>44
-D<B812FCAB2E0B7EAB3B>I<EA03F8EA0FFE487E4813804813C0A2B512E0A76C13C0A26C
-13806C13006C5AEA03F81313719231>I[<F10780F10FE0191FA2193FA3F17FC0A21A8019
-FFA21A0060A2611803A2611807A24E5AA34E5AA261183FA261187FA26118FFA296C7FC5F
-A2601703A24D5AA34D5AA260171FA260173FA260177FA26017FFA24C90C8FCA34C5AA25F
-1607A25F160FA25F161FA25F163FA25F167FA24C5AA34B90C9FCA25E1503A25E1507A25E
-150FA25E151FA24B5AA34B5AA25E15FFA293CAFC5CA25D1403A25D1407A25D140FA24A5A
-A34A5AA25D147FA25D14FFA292CBFC5BA25C1303A2495AA3495AA25C131FA25C133FA25C
-137FA25C13FFA291CCFC5AA2485AA3485AA25B120FA25B121FA25B123FA25B127FA2485A
-A390CDFCA25A123C>67 176 118 259 88 I<923801FFC0031F13FC92B67E020315E002
-0F15F84A9038007FFCDA7FF8EB0FFFDAFFE001037F49496D7F49496D7F4948C8EA3FF001
-0F8349486F7E49486F7E4A1507017F834A8101FF8448496F7FA348496F7FA24885A34890
-CA6C7EA34885A44885A249173FA3007F85A800FF1A80B3AC007F1A00A76D5F6C61A56C61
-A46C6D4C5AA36C61A26C616E5DA26C616E5D6C616E5D017F95C7FC6D6C4B5AA26D6C4B5A
-6D6C4B5A6D6C4B5A6D6D4A5A6D6D495B6D01F001075BDA7FFC011F90C8FC6EB4EB7FFE02
-0F90B512F8020315E002001580031F01FCC9FC030113C0497979F458>I<16F815011503
-1507151F153F15FF1403141F91B5FC131FB7FCA214FD14E1140113E0C7FCB3B3B3B3B24A
-7FA24A7F027FEBFFE0007FB912E0A63B7571F458>I<ED3FFE0203B512F0021F14FE027F
-6E7E91B712E0010316F849D9803F13FE90270FFC00077FD93FE001008049486E7F49C800
-1F7F496F7F48486F7F48486F7F4848834981000F707F4848188049821AC0003F8390CA14
-E05A01FC826D18F07FB56C81801AF880A76C5BA26C5B6C90C9FCEA07FCD801F018F0CBFC
-60A21AE060A21AC0601A80A295B51200615F614D5B615F4D5B614D5B4D90C7FC604D5A4D
-5A4C5B604C5B4C5B4C90C8FC4C5A5F4C5A4C5AEEFFC04B5B4B90C9FC4B5A5E4B5A4B5A4B
-5A4B5A4B5A4A90CAFC4A4816F85D4A5A4A48ED01F04A5A4A5A4A5A4AC9FC4948160302F8
-17E0495A495A49481607495A49CAFC017EEF0FC049173F48BAFCA25A5A5A4819805A5ABB
-FCA31A00A3457577F458>I<923807FFE0037F13FE0203B612C0021F15F84A15FE9126FF
-FC017F499026C0003F13C0D907FEC7000F7FD90FF86E7FD91FE002017F49488249C97F01
-7E707E4984484882D9FF80834813E06E836E816E83487FA4805CA37E5C6C495F6C495D6D
-5AEB1F8090CA5CA24E5BA297C7FC95B5FC614D5BA24D5B614D5B4D5B4D5B4D90C8FCEF7F
-FC4C485A04075B0307B512C00203B6C9FC17FC17E017FEEFFFC091C7000113F89338003F
-FE94380FFF80717F7113F0717F717F727E727E86727F86727FA286727FA286A28684A31B
-80A2EA01F8EA07FE381FFF80487FA2487FB57EA31B00A360625C7E4A5F4A5D91C95CEA3F
-FC01804C5B6C7E6D4C5B6C6C606C6C4C5B6C6C93B5C7FC6CB44B5B6C6D4A5BD97FE04A5B
-D93FFC4A5B6DB46C013F5B6DD9F801B51280010390B7C8FC010016FC023F15F0020F15C0
-02004AC9FC030F13C0497979F458>I<F003E04E7E180FA2181F183FA2187F18FFA25FA2
-5F5FA25F5FA25F5FA217FDEE01F9A2EE03F1EE07E1A2EE0FC1EE1F81A2EE3F01163E167E
-16FCA2ED01F8ED03F0A2ED07E0ED0FC0A2ED1F80ED3F00A2157E5DA24A5A4A5AA24A5A5D
-140F4A5AA24AC7FC147EA25C495AA2495A495AA2495A495AA249C8FC137EA25B485AA248
-5A5B1207485AA2485A48C9FCA2127E5ABC12F8A6CA000301F0C7FCB3A34D7F4D7F057FEB
-FF800307B812F8A64D777BF658>I<0160170E01FC173E01FFEE01FE02E0150F02FE15FF
-DAFFF8011F5B92B75A6161616196C7FC6018F86018C095C8FC17FC17F001FD1580D9FC1F
-01F8C9FC91CCFCB3A4923803FFC0033F13F84AB6FC020715C04A15F091263FFE017F913A
-7FE0003FFCDAFF80EB0FFFD9FDFEC76C7FD9FFF86E7F4A6E7F4A804A824A6F7E91C97F49
-163F8549707E137890CA1480841AC0A31AE0A2841AF0A51AF8A413C0EA07F8EA1FFE487E
-487FA2B57EA31AF0A44A5D1AE091C9FC6C5A01F818C0D87EC05E90CA1480123E003F1900
-606C6C5F6D167F000F606D4C5A6C6C4B5B6C7E6C6C4B5B6D4B5B6C6C4B5BD97FC0023F90
-C7FCD93FF0ECFFFED91FFC010313F890270FFFC01F5B010390B612C06D5E6D6C4AC8FC02
-1F14F0020714C09126007FF8C9FC457977F458>I<EFFFF0040F13FF047F14C04BB612F0
-030781031F9038C01FFC923A7FFC0003FEDBFFF0EB00FF4A01C0EC3F80020749141F4A48
-C86C7E4A4815174A484AB47E4A485C4A485C49494A7F495B604990C8FC495A131F5C133F
-49486F5BA249486F5B725B487190C7FC4A92C9FC5AA25A5CA25AA25C5AA35AEE3FF80303
-B57E030F14F048494814FC037F809239FFC03FFF912701FE000713C0DA03F801017FDA07
-E06D7F4A48EC3FF8B5496E7E4AC87F023E6F7E023C81027C8302786F7F02F8834A81864A
-8384865CA286A24A167F86A591CA14807EA87EA280A37EA21B00A27EA36C6D4C5AA36C61
-A26C6D5F606C616E5F017F5E6E5F013F4C5B80011F4C90C7FC6D6C4B5A6D6C4B5A6D6D4A
-5A6D6D4A5A6D01F0495BDA7FFC01075B91273FFF807F5B6E90B548C8FC02075D6E15F002
-0015C0031F91C9FC030113E0497979F458>I<923803FFE0033F13FE4AB67E020715E04A
-15F8023F9038807FFC913A7FF8000FFF902601FFE001037F49496D7F4990C87F49486F7E
-49486F7E013F161F4948824A6F7E01FF707E485B48854A81488548834A835A865A848648
-90CAFCA286A3B5FC86A2197FA386A81B80A26C95B5FCA57E6E5DA27EA26C5FA26C7F607E
-6E5D6C846C6D151F017F161E6E153E6D6C157C011F16F86D6C020115006D6C6CEB03F06D
-6DEB0FE06D01F0EB3FC0903B007FFE01FF806EB61200020F14FC6E4A5C020002E013FFDB
-0FFEC7FC92C9FC62A44E5BA362A24E5BA262D97FC05D497E486D5F486D4B90C7FCA2486D
-4B5AA24E5A61187F614A4B5A4D5B6C495C4A5E4A4A90C8FCD801FCC8EA1FFE4D5A6C6C4B
-5AD97F8049485A02E0010713C06DB4017F5B6D90B548C9FC01075D6D15F0010015C0021F
-49CAFC020113E0497979F458>57 D<EA03F8EA0FFE487E4813804813C0A2B512E0A76C13
-C0A26C13806C13006C5AEA03F8C8FCB3B3A2EA03F8EA0FFE487E4813804813C0A2B512E0
-A76C13C0A26C13806C13006C5AEA03F8134C71CB31>I<197C19FE4E7EA34E7FA34E7FA3
-4E7FA34E7FA34E7FA34E7FA395B57E18FDA205018018F8A20503814E7EA20507814E7EA2
-050F814E7EA2051F814E7EA2053F814E7E4D81177E8505FE815F850401824D7FA2040383
-4D80A20407834D80A2040F834D80A2041F834D80A2043F8394C87EA24C83047E81A204FE
-834C81A20301844C81A20303854C82A20307854C8293BAFC4B85A34B85A2DB3F80C9000F
-7F93CAFC874B85157E8703FE854B83A20201864B83A20203874B84A20207874B84A2020F
-874B84A2021F874B84A2023F87027F85A24A6C86497F4988010F01F84E7F013F01FE4E80
-0003B600C04CB612F0B700FC4BB812FEA6777E7AFD84>65 D<BCFC1BF81BFF1CE01CF81C
-FED8000702F8C8003F6D7E010002E00301806E49DB003F13F06E060F7F090313FE09007F
-767F0A1F7F767F767F767F767F767F777E777FA2777F777FA2777F8B898B898B898BA278
-1380A220C0A28A20E0A320F0A28AA320F8A620FCB020F8A620F0A36620E0A320C066A220
-80A29BB51200A267656765676567535BA2535B535B5390C7FCA2535A525B525B0A0F5B52
-5B525B99B5C8FC09035B090F5B4A063F13F091B56C4BB55A010702F8033F1480BD48C9FC
-1CF81CE099CAFC1BF898CBFC76787BF786>68 D<BF12E0A48AA2D8000702F8C9123F0100
-02E016006E49171F6E19071C0188F53FF81D1FA21D0F1D07A21D03A2777EA21D00A31E7C
-A31E7EA21E3EA4F207C0A28AA49BC7FCA31A0FA41A1FA21A3FA21A7FF101FF1907197F93
-B8FCA604C0C77E19071901F1007F1A3FA21A1FA21A0FA41A071FF8A3F601F0A597C9FC1E
-031FE0A41E07A21FC0A21E0FA31E1FA21F801E3FA21E7FA21EFF651F0065651D1F659AB5
-FC525B4A190F91B56C177F010702F8041FB5FCBFFCA366A36D787BF778>I<BF1280A41E
-C0A2D8000702F8C9FC010002E016036E49EE007F6E191F1C071C017613E01D7F1D3FA21D
-1F1D0FA3F507F0A21D03A31D01A31EF8A21D00A6E00F80147CA41E00A61A1FA31A3FA21A
-7FA21AFF1903190F197F93B8FCA604C0C77E190F190319001A7FA21A3FA21A1FA31A0FAA
-97CAFCB3A8825C91B57E010714FFBA7EA666787BF773>I<952607FFF016E095B66C1401
-050F03F01403057F03FC14074CB8FC040F05C0130F043FDAC0076D131F4C01F8C7D87FF8
-133F4BB500C0EC0FFC030749C8D803FE137F4B01F8923900FF80FF033F01E0EE3FC14B49
-EE1FE192B5CAEA0FF34A4971B5FC020701F817014A49834A5B4A49844A498491B5CC7E5D
-4949854987495B494985A2494985495B89495B90B51B7F92CEFC481D3FA2485B1E1F5A5C
-A2481D0F5C5AA31E07485BA4489AC8FCA35CA2B5FCB27EA26E0507B812FEA37EA397C700
-07ECFC006C6DDF007F13F08967896C7FA27EA2807EA26C7FA26C80A26D7F7F817F6D7FA2
-6D7F6D7F6D7F6D63816E7F6E6D606E7F6E6D95B5FC6E13FC02016D5F6E6D6CEE03F96F6D
-EE07F86F01F093380FF07F030F01FC93383FE03F6F01FF9338FFC01F030102E00203EB80
-0F6F6C01FC91391FFE0007709028FFE001FFFC1303040F91B600F0130104014D1300706C
-93CAFC050F15FC050015C0060701F8CBFC778076FB8A>I<B912FCA6D8000392C7FCD900
-7F13F86E5B6E5BB3B3B3B3B3AC4A7F4A7F0103B6FCB912FCA636787CF73F>73
-D<BAFCA6D8000792CDFC010014F06E5B805EB3B3B3AAF50F80A5F51F00A765A21D3EA21D
-7EA41DFEA21C0165A21C031C07A21C0F1C1FA21C3FF4FFF863631B0F1B3F4A95B5FC91B5
-6C1507010702F892B6FCBEFC65A561787BF76E>76 D<B700C0097FB612F07098B7FCA270
-62A27062D8000756C7FC010020F0027E6DE007DF5B023E676F6CF20F9FA36F6CF21F1FA3
-6F6D193EA26F6D197CA36F6D19F8A26F6DF001F0A36F6DF003E0A36F6DF007C0A2706CF0
-0F80A3706CF01F00A3706D173EA2706D5FA3706D5FA2706D4C5AA3706D4C5AA3706D4C5A
-A2716C4C5AA3716C4CC7FCA2716D153EA3716D5DA3716D5DA2716D4A5AA3716D4A5AA271
-6D4A5AA3726C4A5AA3726C4AC8FCA2726D133EA3726D5BA2726D5BA3726D485AA3726D48
-5AA2726D485AA3736C485AA3736C48C9FCA27313BEA37313FCA2735BA2147F735B4A7EA2
-496D6F5B010701F0527F011F01FC6F494C7F48B600C00803B512FEB86C067FB812F0745A
-A274C8FCA21A1E94787AF7A1>I<B700C094B812808282A28282D800010801EDC000D900
-3F6DDD001F01FCC7FC70060713F071050113C0775B023E806F6D72C8FCA26F6D183E6F7F
-A26F7F6F7F81836F808184707F707FA2707F707FA2707F707FA2708070808385717F717F
-A2717F717FA2717F7180A27180727F8486727F8486727F727FA272807280A2737F737FA2
-737F737F8587737F7380A27380747FA2747F747FA2747F747F8688741480861DC07513E0
-7513F0A27513F87513FCA27513FE7513FFA27514BE7514FE88A28888A28888A28888A288
-1D7F027F1A3FA24A6C191F1D0F497F010701F01907011F01FC190348B612C0B86C17011D
-00A21E7E1E3EA279787BF784>I<95381FFF800503B512FC053FECFFC04CB712F8040716
-FE041FD9F8016D7E047F902680001F13E0922601FFFCC7000313F8030701F0020013FE4B
-01C0ED3FFF033F90C9000F13C04B48707F4B48707F4A01F004007F020749EF7FFE4A4971
-7E4A49717F4A90CB6C7F4A48727F02FF874B844949727F49884949727F4949737EA24949
-737F49894B85498992CD7E90B588A24849747FA2488A4A86488AA24A86488AA2481F80A2
-4A86A2481FC0A4481FE04A87A5B51EF0B16C6D98B512E0A66C1FC0A26E62A26C1F80A36C
-6D501400A36C666E62A26C666E626C666F616C66A26D6D4F5B6D656F616D656D6D96B5C7
-FC6F606D646D6D4E5B6F606D646D6D4E5B6E6D4D5B6E6D4D5B6E6D4D5B6E6D94B5C8FC6E
-6D4C5B6E6D4C5B6E6D4C5B6E6C6C6C031F13E06F6D4B5B030F01F092B5C9FC6F01FC0203
-5B0301D9FF80011F13F86FDAF801B55A043F90B712C004074CCAFC040116F8DC003F15C0
-050302FCCBFCDD001F1380748076FB89>I<001FBF12FEA692C7000302F0C7123F4801F0
-020002C002037F02806F49EC007F49C9181F498801F01C034988A249884989A390CA85A2
-481F80007E1E1FA5007C1E0FA700FC1FC0481E07A6CB96C7FCB3B3B3AF95B57EA2050314
-F0053F14FF92BB12C0A672777AF67F>84 D<B900F04AB81280A6D800074ACA0003EDC000
-010002F0DD003F01FCC7FC6E49060F13F06E49060313C0775BA27790C8FCA21E7EB3B3B3
-B21EFE6E63A282A26E1A0166A36E6D1803666E1A0770616E1A0F666E6D181F666F6C183F
-033F4FC9FC70606F6D5F6F6D4C5A6F1803714C5A6F6D4C5A6F6DEE3FE06F01FE4C5ADC3F
-FF4B485A7001C04A90CAFC7001F0EC1FFE040301FCEC7FF870903AFFC00FFFF0706C90B6
-12C0051F5E05074BCBFC050015F0061F14C0060001F8CCFC797C7BF784>I<B94CB712F8
-A6D8001F92CB000FECFE00010302F0060114E06D4A7214806D4ADF3FFEC7FC6E64785A6E
-6470735AA26E6470191F6E64A270193F6E99C8FC82666E1B7E7019FE6E63A27018016E63
-831D036F627117076F62A271170F6F62831D1F6F6271173FA26F97C9FC715F6F197E831D
-FE6F61711601A26F617215037060841C077060841C0F706072151F7060841C3F7095CAFC
-846470177E7215FE705F841B01705F851B03715E731307715EA273130F715E851B1F715E
-73133F7193CBFCA2735B71157E851BFE715DF1FF01715DA21A83725C1AC31AC7725C1AEF
-725CA21AFF725CA37291CCFCA2725BA3725BA3725BA3735AA2735AA3735A735A7D7C7DF7
-84>I<B800FE027FB892B712FCA6D8003F02FCC9001F4AC900031500010702E0040302E0
-DC007F13F86D0280704A051F13E06D5271138093CB080390C7FC6D6B76190170686E7560
-88826E756088701F036E756088701F076E7560A2701F0F6E6A527F701F1F6E9FC8FC527F
-70676E213E527F70177C6E690AFC80714C7E6F68090181527E711D016F05036F5E527E71
-1D036F05076F5E527E711D076F050F6F5E527E711D0F6F051F6F5E527E711D1F6F7593C9
-FC093E7F71656F1F3E516D7F711D7E6F1F7C09FC82724A6E16FC7066080183724A807053
-5A080383724A8070535A0807835180721B0770030F715C5180721B0F70031F715C98C87E
-721B1F704B7191CAFC083E81726370037E71133E087C81721B7E70F4807C508207801AFC
-7164DF81F07013C007C119C1716407C319E1DFE3E07013E3716407E719F3DFF7C08271F3
-F7C007FF19FF50827164A297CA7EA27199CBFC4F83A271634F83A271634F187FA2067F62
-4F183FA2063F624F181FA2061F624F180FA2060F627248725AAE7C7DF7B5>I<001FB800
-E0027FB712E0A6D800034BC8000703F0C7FCD9003F02F0030192C8FC6E02C06F6C13F86E
-4A7013C06E91CA6C5B6E50C9FC6E6E705A656E6E5F6F6D5F1C1F6F6D5F6F6D4C5A52CAFC
-6F7F6F18FE714B5A6F7F515A6F6E4A5A6F80515A706D4A5A707F515A706D4ACBFC707F1B
-FE706D495A707F505A706E485A7014C0505A716D485A7113F0505A716D48CCFC7113FC1A
-FE71EBFFFC8362715C836284A2727F727FA2727F727FA2727F4E80A24E804E80A2DE3FBF
-7FDE7F1F7FA2DEFE0F7F4D486C7FA24D486C7F4D486C80A24D486C804D486D7FA24D486D
-7F4DC77E8805FE6E7F4C5A747F4C486E7F4C5A74804C486E804C5A757F4C486F7F4CC9FC
-757F04FE707F4B5A757F4B48707F4B5A75804B4870804B5A767F4B48717F157F4BCB6C7F
-767F5C4A737F020F874A7F027F6D8649B56C4D80010F6E053F14F090B600FE4CB612FEB8
-00E0033F92B512E0A67B787CF784>I<496C1560496C15F0496CEC01F84948EC03F04948
-EC07E049C8EA0FC049151F01FEED3F804916004848157E000316FE495D48484A5AA24848
-4A5AA248484A5AA290C85B48150F003E5EA2007E151FA2007C93C7FCA300FC5D48153EA6
-01FEED3F8026FBFF80ECFFE0B56C013F13F06E15F86E15FCA26E15FE6C81A46C81A26C49
-6D13FCA26C496D13F86C496D13F06C496D13E0C648C8EA3F80373566F958>92
-D<EDFFFC021FEBFFC091B612F8010715FE496F7E013FD9001F13E0D97FF001037FD9FF80
-01007F486D6E7E6EEC1FFE486D6E7E6E8248707F6E6E7FA2717FA2717FA26C5B856C4915
-7F6C5B6D5A010EC9FC90CAFCA894B5FC93B6FC150F92B7FC0207ECFE7F023FEBFE0091B5
-12E0010391C7FC4913F8011F13E04913804948C8FC495A485B485B485B485B485BA24890
-C9FCA24848193EA312FF5BA218FFA35FA26D5D127F5F6D71137E6C6DDA0F9F147C6CEE1F
-1F6E023E6D13F86C6DDAFC0F13816C01F8D901F8ECFFF06C01FE902607F00714E0C69028
-FFC07FE00314C06D90B5486C1480011F92C7140001074AEC3FFC010002F0EC0FE0020F01
-8091C8FC4F5179CE58>97 D<EC0FE048B5FCB6FCA6C67E130F7FA27FB3AE943807FF8005
-7F13F80403B6FC040F15C0043F15F093267FF8077F923BE1FF80007FFEDBE3FEC7EA1FFF
-DBE7F86E7FDBEFE002037FDBFFC06E7F93C97F4B707E4B707E874B707E4B821C804B821C
-C01CE0861CF0A2861CF8A31CFCA286A31CFEAE1CFCA262A21CF8A45013F0A21CE0621CC0
-A25013806F18006F5E636F4C5A6F4C5A03BE16FF033F4B5B6F6C4A5B9126FE0FE04A5B6F
-6C021F90C7FC9126FC03FC4A5A6FB449B45A4A6CD9E00F13F04A013FB65A7015804A0107
-02FCC8FC90C914F0DD1FFEC9FC577C7CF962>I<923801FFF8031FEBFFC092B612F80203
-15FF020F824AD9C00713E0DA7FFEC76C7EDAFFF8EC0FF84901E04A7E4949143F010F90C8
-487E494815FF8549485C495A13FF485B5C5A48705B5C48715A4A6F5A48715AF0038095C8
-FC4890CCFCA35AA35BA212FFAE127F7FA47E80A27EF107C06C7FA26C6D160F1A806C6D16
-1F1A006C7F6C606D6C167E6E167C6D6C16FC6D4C5A6D01C04A5A6D6D4A5A6D6D4A5A0100
-01FCEC3F806EB402FFC7FC6E9038F00FFE020F90B55A020315F0020015C0031F49C8FC03
-0113F042517ACE4E>I<F23F800607B5FC0503B6FCA6EF0001F0003F85A285B3AE923801
-FFF0031F13FE92B612C0020315F0020F15FC4A9038E00FFE027F90380001FFDAFFF89038
-003FCF4949EC1FEF010701C00207B5FC4949804990C87E4948814A824948824948825A48
-4982A2485BA25A5C5AA24890CAFCA45AA25BA212FFAE127FA37FA27EA37E807EA2807E6C
-60806C606E5E6C7F017F94B5FC6D6C5D6D6C4B806D6CED07EF6D6DDA1FCF7F6D01E0DA3F
-8F13FC6D6DDAFF0FEBFFFE6D01FCEB03FE913A3FFFC03FFC6E90B512F0020715C0020115
-00DA003F01FC1600030301C002E0C7FC577C7AF962>I<923803FFC0033F13FC4AB67E02
-0715E0021F15F84A01007FDAFFF8EB3FFF4901E0010F7F494901037F49496D7F4990C87F
-4948157F49488249486F7E4948151F854849150F48845C48831A80485BA2487113C091C9
-FC5AA31AE048835BA312FF90BAFCA549CCFCA8127FA37FA27EA36C7FA2F103E07E806C18
-076E17C07E6C6D160FF11F806C7F6D6CEE3F00013F177E6E16FE6D6C4B5A6D6D4A5A6D01
-E04A5A01016D140F6D01FCEC3FC06EB4ECFF80021FD9E00F90C7FC020790B512FC02015D
-6E6C14C0030F91C8FC030013F043517BCE4E>I<EE07FF043F13C04BB512F0030780031F
-8092393FFE03FE9239FFF807FF4AD9E00F13804A495A4A018014C04A495AA24A5A4A5A14
-7F5D02FF6E1380A24B6D1300496F5AEF01F894C8FC495BB3A8B812FCA6D8000301E0C9FC
-B3B3B3A7497F81013F13FF007FB712F0A63A7C7BFB36>I<F23FC0963803FFF0DB0FFE02
-0F13F892B500E0013F13FC020702FC90B512FE021FDAFF0113E3027F9239C3FE03FF9126
-FFFC079038E7F80749D9E000EBFFE0490180013F13804990C76C130049486E5A49486E6C
-EB03FE013F94388001FC49486E9038C0007001FF7113004A804884A248844A80A34884AA
-6C60A36E5C6C60A26C606E5C017F5F6D6C4A5B011F94C8FC6D6C4A5A6D6C4A5A6F495A49
-01E0EBFFF049D9FC075B6EB65AD93E1F92C9FC020714FC49C614E0DB0FFECAFC92CCFC13
-FCA67FA27FA28014E0EB7FF891B712C06D16FF19F06D17FE737E6D846D18F06D84498401
-1F84017F84D9FFF8C86C14804801C015034890CA003F13C04848050F13E0484817034848
-83003F7213F049187F485AF23FF8A2485A1A1FA66D183F007F1AF0A26D187F6C6CF0FFE0
-001F1AC06D5F6C6C4D13806C6C6C040F13006C6D4C5A6C01F0EE7FFC26007FFC923801FF
-F06DB403075B6D01E0023F5B010701FF0107B5C7FC010191B612FCD9003F16E0020F1680
-020003F8C8FC030349C9FC50757BCF58>I<EC0FE048B5FCB6FCA6C67E130F7FA27FB3AE
-943803FFC0053F13FC94B6FC040315C0040F8193261FF80713F893263FC0017F4CC7127F
-04FC6E7EDBE1F86E7EEDE3E0DBE7C06E7FA2DBEF806E7F03FFC8FC5DA24B6F7FA25DA35D
-A45DB3B3A7496D4B7FA2013F01FE033F13FEB86CB81280A6597A7BF962>I<EB07F0EB1F
-FC497E497E90B57EA24880A76C5CA26D90C7FC6D5A6D5AEB07F090C9FCB3A3EC0FC048B5
-FCB6FCA6C6FC131F7FA27FB3B3B3A3497FA2017F13F8B712FCA626767BF530>I<16FE92
-3803FF804B13C04B13E04B13F0A24B13F8A76F13F0A26F13E06F13C06F1380923800FE00
-93C7FCB3A3EE03F892B5FC147FA6EC003F15071501A281B3B3B3B3A7EA07F0EA1FFC486C
-15F0486C5BA2B5128017E0A24B13C0A217805D6C010014004B5A6C48495A01F8495A6C48
-495A3A0FFE01FFE06CB65A6C92C7FCC614FC011F13F0010313802D9A88F536>I<EC0FE0
-48B5FCB6FCA6C67E130F7FA27FB3B0067FB61280A6061FECF0007291C7FC7213FC1AF01A
-C097C8FC6161F00FF04E5A4E5A4E5A4EC9FC4D5AEF03F8EF0FF04D5A4D5A4D5A4DCAFC4C
-5A4C5A1607EE1FFE4C7E5E93B57E03E18015E303E780DBEFE77FEDFFC304837F04017F4B
-7E4B804B6D7E4B6D7F15C0717F717FA2717F717F8385717F187F85727F8486727F727FA2
-727F727FA286727F87496D834E14F0013F01FC020714FEB8013FECFFF8A6557A7CF95D>
-I<EC1FC00003B5FCB6FCA6C6FC131F7FA27FB3B3B3B3B3AB497FA2017F13FCB712FEA627
-7A7BF930>I<DA0FC0902603FFC0923803FFC048B5023F01FC033F13FCB691B692B6FC04
-0303C0010315C0040F6F010F8193261FF80701F890261FF80713F893263FC0016D90263F
-C0017F4CC7007F4AC7127FC66C02FC6E6C01FC6E7E010FD9C1F86E6C48486E7E6DD9C3E0
-EE03E0DBC7C06ED987C06E7F7FDBCF806ED9CF806E7F03DFC802DFC8FC03DE17DE03FE17
-FE4B6F496F7FA24B5FA34B5FA44B5FB3B3A7496D4B6D4B7FA2013F01FE033F01FE033F13
-FEB86CB86CB81280A6894E7BCD92>I<DA0FC0903803FFC048B5023F13FCB691B6FC0403
-15C0040F8193261FF80713F893263FC0017F4CC7127FC66C02FC6E7E010FD9C1F86E7E6D
-EBC3E0DBC7C06E7F7FDBCF806E7F03DFC8FC15DE15FE4B6F7FA25DA35DA45DB3B3A7496D
-4B7FA2013F01FE033F13FEB86CB81280A6594E7BCD62>I<EE7FF0030FB57E037F14F04A
-B612FC020715FF021FD9C01F13C091273FFC00017FDAFFF09038007FF84901C0EC1FFC49
-496E7E4990C86C7E49486F7F49486F7F49486F7F4948707E01FF844A163F4849707E4885
-A24849707EA2481A8091CA7E481AC0A3481AE04983A2007F1AF0A500FF1AF8AD007F1AF0
-A46C6C4D13E0A46C1AC06E5E6C1A80A26C1A006E5E6C616C6D4C5AA26C6D4C5A017F606D
-6C4C5A6E5D6D6C4B5B6D6C4B5B6D6D4A90C7FC010101E0EC3FFC6D6D4A5ADA7FFE903803
-FFF091271FFFC01F13C0020790B6C8FC020115FC6E6C14F0030F1480030001F8C9FC4D51
-7BCE58>I<DA0FE0903807FF8048B5027F13F8B60103B6FC040F15C0043F15F093267FF8
-077F9227E1FF800013FEDBE3FEC7EA3FFFC66CD9E7F86E7F010FD9EFE06E7F6DD9FFC002
-037F6D91C86C7F4B834B6F7F747E4B834B827413805D7413C01CE0861CF0A2861CF8A374
-13FCA57413FEAE5013FCA41CF862A35013F0A21CE0621CC0621C806F4C130081505A6F4C
-5A6F4B5BA26F4B5B704A5BDBEFE0021F5BDBE7F04A90C7FCDBE3FCECFFFEDBE1FF01035B
-03E0D9E01F13F0043FB65A701580040702FCC8FC040014F0DD1FFEC9FC94CBFCB3A5497F
-A2013F13FEB87EA657707CCD62>I<DCFFE0EC0F80030F01FE141F037F6D7E0203B612E0
-020F6F133F4A9038F00FFC027F90268001FE137F4A48C7127F4901F891383F80FF4949EC
-0FC0010F01C06E7E4949EC03E192C813F149EE01FB49481500494893B5FC48498285485B
-5A4A825A4A825AA2485BA391CAFC5AA4485AAE6C7EA56C7FA37E807EA26E5E7E6C6D5EA2
-6C6D5E6C7F96B5FC6D6C5D6D6C5D6DEE07EF6D6DEC0FCF6D01E0EC1F8F6D6DEC7F0F6D6D
-14FE6D01FEEB07FC913A3FFFC03FF86E90B512F0020715C002011500DA003F13FC030313
-C092C9FCB3A54F7FA296B512F80503B712FEA657707ACD5D>I<DA0FC0EB7FC048B59038
-03FFF8B6010F13FE4C7F4C1480DC7FC313C0DCFE0313E09238C1F807C66C9026C3F00F13
-F0010FEBC7E06D14C0EDCF807FEDDF00A203FE6D13E07113C04B6D138071130095C7FC5D
-A45DA55DB3B3A4497F81013F13FFB812F0A63C4E7CCD45>I<91260FFFC0137091B538FC
-01F00107ECFF03011F15C7017F15EF903AFFFC007FFF4801C0130F4890C71203D807FC14
-004848157F4848153F171F4848150FA248481507A2170312FFA317017FA27F7F7F6D92C7
-FC6C6C7E14E014F86CEBFFC015FE6CECFFF06C15FE6C6F7E17E06C16F8C6826D816D8101
-0F1680010316C0010016E0021F15F0020015F81507DB003F13FC160F040313FE16000078
-167F00F8EE3FFF836C82A283A27E83A27EA218FE7FA26D15076D16FCA26DED0FF87F6DED
-1FF06DED3FE06DED7FC002C0EB01FFD99FF001071380D90FFE90387FFE00486CB65AD8FC
-0115F0486C15C048011F91C7FC48010313E038517ACE45>I<EC03E0A71407A6140FA314
-1FA3143FA2147FA214FF5BA25B5B5B5B137F48B5FC000F91B612F0B9FCA5D8000301E0C8
-FCB3B3A2187CB018FC6D6D14F8A317016D6D14F0A26E6CEB03E0A26E6CEB07C06E6C130F
-6E9038801F806E9038E07F006EEBFFFE6E5C6E6C5B031F13E003011380366E7DEB44>I<
-DA0FE0EE0FE048B54BB5FCB692B6FCA6C66CEE007F010F170F6D83A26D83B3B3A761A461
-A3617F61A26F5D6D17FB876E6CEC01F3DE03E37F6E6CDA0FC313FF6E6CDA1F83ECFF806E
-6C6CEB7F036E9038F003FE6E90B512FC6E15F86E6C14E0030F0280EDC0000300D9FC0001
-F8C8FC59507BCD62>I<B700F8027FB512FCA6C66C49C8000F1480011F01F80303EBFC00
-6D496F13F06D715B6D49705A6F5F6D96C7FC1A7E816D187C6F16FCA2027F5F6F1501023F
-5F8119036E5F7014076E5FA270140F6E5F70141F6E94C8FCA2705C6E163E70147E6E167C
-A27014FC037F5D701301033F5DA27013036F5D17806F4A5AA2EFC00F6F5D17E0181F6F92
-C9FC715A6F143E17F8187E6F147CEFFCFC047F5BA217FF705BA2705BA3705BA2705BA370
-90CAFCA2705AA3705A1778564E7DCB5D>I<B7D8F03FB600F8013FB6FCA6C602FCC7003F
-49C7000314E0013F01F0020F01F0020014806D496E4992383FFE006D496E715A6D4E5E72
-6D6F5A6F636D82745E816D057F5F866F1A1F6D9AC7FC866E6C03FF163EA274157E6E6C4A
-177CA26F7015FC6E4B5F07E77F7018016EDB07C35E8770010F16036E04815E8770011F16
-076E04005E877049160F6E033E017F5D75131F6E6D017E94C8FC067C133F70705B037F02
-FC163E4E6D7E70187E033F4948010F147C87DCFF0317FC6F4A6D5C1C80058716816F4A6D
-5C1CC105CF16C36F4A6D5C1CE36F01FFEEE7C095C8FC1CFF6F614D81A26F496F90C9FCA3
-70486F5AA370486F5AA370486F5AA2040F5F4D150370486F5A784E7DCB7F>I<007FB600
-F80107B612F8A6D8003F02E00101ECFE00010702806D6C13E0010191C814806D496F48C7
-FC027F17F86E6C5E1AC06E6D5D6E6D4AC8FC6E6D147E19FE6E6D495A6E6D5C6E6D495A4E
-5A6F6C130F6F6C495A6F01805B4EC9FC6FEBC07E6FEBE0FE6F6D5AEFF1F86FEBFBF06F13
-FF705B60705B82707FA2707F707F845E844C7F93381FBFFF163F051F7FDC7E0F7F4C7E03
-01814B486C7F4C6C7F4B487E4B4880031F6E7E4B486D7E93C77E037E824B6E7F02016F7F
-4A48804B8202076F7F4A486E7F021F167F027F8302FF707E010385010F6D4B7F013F6D92
-B512F00003B56C020314FEB7021F91B5FCA6584C7ECB5D>I<B700F8027FB512FCA6C66C
-49C8000F1480011F01F80303EBFC006D496F13F06D715B6D61745A6D96C7FC6F167EA26D
-187C6F16FC027F5F811901023F5F6F15036E5F8219076E5F70140F6E5F826E4CC8FCA270
-5C6E163E70147E6E167CA27014FC037F5D701301033F5DA27013036F5DEF80076F5DA2EF
-C00F6F5DEFE01F6F92C9FCA2715A6F143EEFF87E6F147C17FC18FC047F5B17FF705BA370
-5BA2705BA3705BA27090CAFCA3705AA2705AA25FA216015F16035FA216075F160F5FA216
-1FD807E092CBFCD81FF85C486C143E487E167EB5147C16FC5E4B5A15034B5A5B007F4A5A
-49495A6C4849CCFC01E013FF6C48485A390FF80FFC6CB512F06C5C6C5C6C6C90CDFCEB0F
-F856707DCB5D>I<000FB912FE85A402FCC85B02C04A5B4848C85A495F494B5B494B5B49
-5D495F4D5B495D96C7FC4D5A90C8485B5E604C5B5E485F003E4B5B4C5B5E95C8FC4C5A4B
-5BC85A5F4B5B5D5F4B5B4B5B5D94C9FC4B5A5C5E4A5B4A5B4AEE0F805E4A5B5C5E4A90C8
-EA1F004A5A5B5D495B495B5B4B5D495B5B5D4990C9127E495A4818FE5C484915015A4A15
-03484915074849151F48177F4AEC01FF4890C8001F5BBAFCA47E414C7BCB4E>I<BD12FE
-A5570580B058>I E /Fi 15 116 df[<0D07B500F8F20FE00C1FB700F0F11FF80B07B96C
-183F9ABA00F0187F0A1F07FFEF01FF51BC00E05E090F09F85E097F09FF5E0803BE00C05D
-081F0BF05D97BF00FC5D07030CFF92B5FC070F0DC01303073F0DF05B96C16C5B06034FC7
-003F03FE5B060F4EC96F5B063F06C0040FEDC07F95B900FCCA00016FB6FC4D06C0716C14
-F105074DCC000F91B7FC4D05F01903053F05C019004D94CE7E4CB800FC1B1F4C05F01B07
-4C05C087041F94CF7E4C4C767E4C04F88993B848894B4D894B0580894B94D17E4B4C8A4B
-4C8A4B4C8B4B4C8B92B8488B4A4D8B4A5F97D37E4AA17F4A4C8C4A5E4F8C4AA1804A5E4F
-8D91B8FC494D8DA2494D8D5B96D57E5B4E8E5B4E8E5BA183495EA24E8F90B8FCA248A183
-60A25A4E8FA25AA3484D8FA45AA295D7000313E0A195C8FC5AA55AA35FA5B8FCB3A47EA4
-83A47EA57E84A37EA1F1FFE0A1060313F8A26C83A37EA2847EA2726B6CA119F0A26D82A3
-6D706BA11AE07F726B7F72A113C06DA15E856DA14C13806D83A195B5FC6D71A112006E70
-69A26E70575B6E7069A1616E70696E70575B6E83A14D5B6E71565B6E719DB5FC6F70555C
-6F706A6F70676F705591C7FC6F70555B6F05C00C3F5B6F71666F719BB55A7070535C7004
-FE535C70706C0A0F5C040771525C7005F00A7F91C8FC7005FC51B55A706C04FF515C7105
-C0080F14F0050F05F8083F5C7105FE4FB65A0501DDFFE006075D7106FC063F4AC9FC063F
-DDFFC00403B65A060F06FF043F15F0060307FF021FB75A060097BA1280073F55CAFC070F
-6707031FF007001FC0081F9BCBFC08031DF8E0007F1CE0090F99CCFC09011BF8E1001F1A
-C00A004FCDFC0B0718E0E3001F04F8CEFCE4000702FCCFFC>213
-214 109 338 252 67 D[<C5B812F0A4A183A8A183A3C96C04F8CB1207FA0007FB003FA1
-1207A11200A1133FA1010781A17FA11300A180A1141FA180A180A180A16E80A180A181A1
-81A2A181A181A2A16F80A2A181A2A181A2A181A2A184A182A3A182A4A1707FA49E260FFF
-E082A5A184A182A757727FA4A193C9FC69A369A29EB5FCA26868A268201F689DB6FC1F03
-1F1F0C03B7FC98BBFCAF09F8C71203F6001F1F031F00203F8C20078CA28C8CA28DA28DA1
-943801FFFCA28DA14D13F8A48DA2A14D13F0A5A15FA119E0A4A15F9ECDFCA119C0A2A15F
-A4A14D1380A3A194B5FCA3A14C1400A3A15EA2A15EA160A15EA2A15EA2A15EA14C5BA2A1
-93B5FCA15DA2A15DA14B5CA15DA15DA15DA15DA192B6FCA14A5DA11407A15CA1143FA191
-B7FCA11303A1010F5EA1137FA10003B8FCA1123F1107B9FC100FBAFCC5B95AA6A160A6A1
-95C7FCA3>206 206 116 333 229 69 D[<0D07B500F8F20FE00C1FB700F0F11FF80B07
-B96C183F9ABA00F0187F0A1F07FFEF01FF51BC00E05E090F09F85E097F09FF5E0803BE00
-C05D081F0BF05D97BF00FC5D07030CFF92B5FC070F0DC01303073F0DF05B96C16C5B0603
-4FC7003F03FE5B060F4EC96F5B063F06C0040FEDC07F95B900FCCA00016FB6FC4D06C071
-6C14F105074DCC000F91B7FC4D05F01903053F05C019004D94CE7E4CB800FC1B1F4C05F0
-1B074C05C087041F94CF7E4C4C767E4C04F88993B848894B4D894B0580894B94D17E4B4C
-8A4B4C8A4B4C8B4B4C8B92B8488B4A4D8B4A5F97D37E4AA17F4A4C8C4A5E4F8C4AA1804A
-5E4F8D91B8FC494D8DA2494D8D5B96D57E5B4E8E5B4E8E5BA183495EA24E8F90B8FCA248
-A18360A25A4E8FA25AA3484D8FA45AA295D7000313E0A195CBFC5AA55AA35FA5B8FCB3A4
-7EA483A46C0E07B500F897380FFFF8A1BEFCA47E84A37EA3847EA29ECB6C04F8C8FC7E84
-A27EA2847EA26D82A36D82A26D82A26D82A27F857F6D83857F6E82A26E826E8285806E82
-6E83866E836E836F826F826F826F709BB8FC6F836F836F71646F17F87070647016FF7071
-63040705E0637005F8637005FE63706C706C627105E097B9FC050F05FC19037105FF6105
-0106F0181F7106FE95BAFC063FDDFFF0040315CF060FDEFF80033F15830603DFFF80010F
-B71201060097B9486C7E073F0DF87F070F55130F070355130307000D801300081F53C812
-3F08030BF8150FE0007F0AE01503090F0A801500090109FCCA123FE1001F08E017070A00
-97CBEA01E00B0706F095CAFCE3001F4CD1FCE400074AD2FC>237
-214 109 338 275 71 D[<BC00F8992607FFF0F07FFF09FE9BBCFC8788A28888888888A2
-88888989C96C7297C8003F04E0C7FC77E3001F02C0C8FCA1060349C9FC898989898AA28A
-8A8A8A8A18DF06CF8306C78306C38406C1848B18C073837383738373838B857384738473
-8474838C8674837483748374847484A2748475837583758375838D877584758475847683
-8E8876837683768376848F8876847783778377838F897783778477847784A17E8A788378
-83788378837884A278847884798379837983A17F8B7983798479847984A1808C7A837A83
-7A837A83A1818C7A847A847B837B83A1818D7B837B837B847B84A1828D7C837C837C837C
-83A1828E7C18807C18C07C18E07D17F07D17F8A117FC8F7D17FE7D17FF7D18837D18C3A1
-18E38FA16C17F3A16C17FBA16C94B5FCA17EA2A17EA17EA17EA17EA17FA2A17FA17FA17F
-A17FA17FA2A17FA17FA180A180A180A2A180A180A180A180A180A181A2A181A181A181A1
-81A181A2A181A181A182A182A182A2A182A182A182A182A182A2A183A1830303B500F88E
-0207B700FC8DBD00E08AA2A183A183A183A184A184A2A184A184A184A184A1725BA249CB
-000F9E38007FF0>248 208 116 335 273 78 D[<C212FE9EB512C023FFA112F8A1EAFF
-C0A113F8A113FFA114E0A114FCA1ECFF80A115E0A115F8A115FEA16F7EA116E0C96C04E0
-CA6C84E7007F17FC100717FFE8007F83111F83110317F0110083A16C82A1001F82A16C82
-A1000383A16C83A16C83A16D82A2A16D82A16D82A184A17FA184A2A16D83A2A185A17FA1
-85A2A185A3A16D83A5A185ADA161A4A161A15BA2A161A2A161A15BA161A2A196CBFCA15B
-A160A1495EA2A1495EA160A1495EA190B85AA1485FA14894CCFCA1485EA1485EA1485EA1
-007F5E59B812C011075F111F4CCDFCA0B85A100717F09FB912C09EBACEFC98BF12FCA115
-F0A115C0A14ACFFCA114F8A114C0A101FCD0FCA2A1EBFF80A114E0A114F8A114FE09E0C9
-000783E6003F17C00F07830F0117F87B6C82101F827C707E7C837C837C838E7D827D827D
-828F7D82A1838FA1838FA1838FA183A2A17EA183A3A17EA183A8A183A9A183A8A184A8A1
-72EE07F0A1F51FFCA1F53FFEA1F57FFFA2A17EA184A3A17EA17293B5FCA2A16C1DFEA184
-A164A16C83A15213FCA16C83A16C63A17217F8A16D715CC000F071714A13F0A16D715CA1
-6D714A13E0A16D7149B512C0A16D05FE5BA16D9426FFE01F1480A16D95B71200A1023F62
-A1020F62A16E62A1020162A1DA003F61A1030F1980A1030196C7FC02F0CDE2001F17FCD7
-C9000117F0A1DC00071680A1DD000102F8C8FC>248 211 116 335
-262 82 D[<B500F097263FFFFCDE7FFF953807FFF091BE98BBFCAEC96C04F8D100034CC8
-FCA1DC000102FCC9FCA1DD003F13E0B3B3B3B3B3B3B3A3A16082A162A387A270A190B5FC
-A162A370A15AA197CAFC8770A15AA2A16170A15A8770A1485BA27071545BA2716B766871
-6B769BB55A716A717068A14C5C717065715891CBFC76657170535B7170535B727099B55A
-7270637709075C7270515C7270515C7204FE097F5C06017050B6FC7205C0070792CCFC73
-70071F5C7304F8077F14F87304FF0603B65A070705C0051F5D7305FC4CB75A0700DDFFC0
-033F5E7405FF021FB748CDFC081F95BA5A08071FF0746708001F80093F53CEFC09071DF8
-09011DE0E1003F1C800A0709FCCFFC0A001BF00B1F1A800B0107F8D0FCE3000F1880E400
-3F04F0D1FCE5001F02F8D2FC>244 211 116 335 269 85 D[<060FB512FE051FB712FE
-0403B912F0043F18FF4BBB12E0030F1AFC033F1AFF92BD12E002031CF84A1CFE021F884A
-1DC04A03FCC76C8291B600F8C8000316F8494B03008271043F81496F040F81496F040316
-C07170828849707081778177818D4970827781A27782A27782A27782A36D4C838EA26D93
-CBFCA26D4B7281A26D5D6D5D6E5C6E5C020F1480020349CCFC9138007FF092CEFCAA0907
-B9FC080FBAFC0707BBFC4EBCFC183F0503BDFC171F4CBEFC160F167F4BB938FE003F030F
-95C7FC033F17C092B800FCC8FC020317E0020F94C9FC4A16F8027F16E091B8CAFC010316
-FC4916F0495E4916804993CBFC495D90B75A485E485E485E5F5A5F4893CCFCA2485DA25E
-5A5EA3B75AA566A39BB7FCA270607E6582656C6F606570606C70EF7FFD7105FF826C5101
-F981714C01F1816C704C01E116E06C04FC041FF0FF806C70047F01C1EFFFF06C706C4AB5
-008018FC6D04E002075C6D04F8023F496D17FE6D9326FF8007B55A010794B700F07F6D51
-7F01001B806E97C71207021F07FC8002034F80020007E06E7E031F95C9000F16FC030305
-FC1601DB003F04E0DC000715F004014BD0FCDC000314C0>159 140
-118 265 170 97 D[<97B6FC077FEDFF800607B812FC067FEFFFC00503BA12F8051F19FF
-94BC12C004031BF0040F1BFC043F8793BE7E4B89030789031F04F8C7824B04800200814B
-03FCC85A4AB700F04B814A04C04B814A93C95A4A5D4A4B4C814A5D4A5D91B75A494C4C16
-80495E95CAFC5B495D495DA2495DA2495D90B77216005F5A775D5F48765DA2484C715D77
-5D775D48775C0C1F91C7FC94CC000713FC480B0013E09CC9FCA25AA45E5AA6B7FCB37EA3
-82A37EA47E83A37E83A27EA271973801FFC06C0D0713F0837E686C82A26D6F5013E0836D
-5413C06D6F62A26D7096B512806D7060721B006D704E5B6D70606D704E5B6E6F606E6F4E
-5B6E704D5B6E7094B55A6E04F004035C6E04FC040F5C6E04FF5E6E05E092B548C7FC033F
-04FC02075C6FDCFFE090B65A030794B85A6F1CC0030064043F50C8FC040F6204031AF004
-001AC0051F96C9FC050718F8DD007F17C0060F4CCAFCDE007F15E0070002F0CBFC>132
-140 116 265 155 99 D[<FB0FF80F3FB5FC9CB8FC53B9FCAF9AC7120FF7007F8C8CA28C
-B3B3AF97B512E0077FECFF80060FB712F8067F16FF0503B912E0051F18FC94BBFC04031A
-C0040F1AF0043F1AFC93BC12FE0303F3FF8F4BDD000715CF031F04E0D9003F91B7FC4B93
-C8120792B700F815004A04E0163F4A0480160F4A93CA12034A4B834A03F8834A4B183F4A
-4B8491B74884494C8449894993CC7E4D85495D498A4D865B495DA290B75AA2485EA25AA2
-485EA35A94CEFCA25AA45AA25EA25AA6B7FCB37EA67EA382A27EA47EA2837EA27EA2837E
-A26C82687F7197B7FC6D656D6F61A26D6F616D6F61676D6F616D70606D7095B8FC6E6F05
-03836E6F5F6E6F4D836E6F053F836E03FF94BA12F86E70030396B512C06E04E0150F6E6C
-03F8153F6F03FF0203B6123F6F04F8017F14FE030793B812F86F1BF003001BC0043F1A00
-040F19FC040319F0DC007F18C0051F95C7FC050117F8DD003F16C0060103FCC805F0C7FC
-DE000791C991CBFC>170 213 116 338 194 I[<4FB512F8077FECFFF0060FB87E95B912
-F0050718FE053FF0FFC094BB12F004031AFC041F1AFF4C8793BD12E00303884BDCF80016
-FC031F93C70007814B03FC02018192B700E0DA003F814A4C030F814A93C96C814A4B0401
-814A03F870814A4B71804A4B71804A4B8391B74871804993CB8249884D7281495D497681
-4D884988495D7980495D90B77480A2485E79805A5F79805AA248228094CDFC8B5AA223C0
-A25AA25E8B5A23E0A5B7FC93C0FCA823C0A223004CD2FCA77EA5827EA47EA3837EA27EA2
-836C56B4FC0F0713C07E715113E07E836D67836D5513C0836D676D6F98B51280A26D6F50
-14006D70616D704F5B724F5B6D70616E6F4F5B6E6F4F5B6E6F4EB5FC6E6F4E5C6E04C005
-0F5C6E04F0053F5C020004FC94B6C7FC6F03FF04035C6F04E0031F5C030F04FC4AB65A6F
-DCFFF0017F15E0030194B95A6F65043F51C8FC040F6304031BF004001BC0053F97C9FC05
-0719F8050019E0061F95CAFC060117F0DE000F93CBFCDF000F1480>139
-140 118 265 160 I[<0907B5FC0803B612F0087F15FE0707B87E073F17E04EB912F806
-0F84063F18FF95BB7E050386050F864D86057FDC007F8094B700E090B6FC0403DC000181
-4C03FC5B4C03F049814C5D4C4B49814C5D93B7C7FC4B5D4F4A16804B5D4B5DA24B5D4B5D
-A24B5DA34B92C86C1600A26092B6705DA2765DA24E6F5D4A735D775C0B1F14800B0749C7
-FC0B0113F89A38003FC09BC9FCB3AEBE12E0AFC7000193CEFCB3B3B3B3B3AF003FBC12C0
-AE91CB121F>121 213 116 340 107 I[<DD0FF894267FFFF098383FFFF8033FB5051FB6
-00E0070FB612F0017FB794B700FE077F15FFB90407DCFFC00503B812E00A3F05F0051F17
-F899B900FC057F17FE090306FF4CBA7E090F07C0030719E0093F73031F855107F84B19FC
-50BB6C92BB7E50744A86080F9126FC007F6F02079126FE003F82500280010F704902C001
-07825001FCC70003704949C70001825001E06E4E01F08097B500806E704901C06F814F49
-C96C6F90B5C96C81D800074D49515BD9003F4C01F0706F4801F870816E4C49515B6E4C49
-704C49824F90CA70480180866E4D7195CA7E4F48525A4F487548488750714D8306F94952
-5A06FB9AB5FC50538895B5486597CB6C4D83A24F9BCBFC4F5389A24F65A24F65A24F65A3
-4F65A34F65A596CC5FB3B3B3B1BC00F8027FBB00FC023FBB12FEAE01FCCA00014DCB95CB
-127F>271 137 115 264 292 109 D[<DD0FF894B512F0031FB5051FECFFC0017FB74CB7
-12FCB9040FEEFF800A3F17F099B912FC090384090F727E093F855119F050BB7E5086080F
-DAFC0082500280011F815001FCC70007825001E08097B500806E824F49C982D800074D13
-F8D9003F4C4970816E4C49826E4C13804F90CA826E4D834F5A4F4887508306F95B06FB5B
-A17E95B55A97CB7EA2614F88A261A261A261A361A361A596CCFCB3B3B3B1BC00F891BC12
-F8AE01FCCA000105FCCA1201>173 137 115 264 194 I[<DD3FE0ED1FFF033FB54BB512
-F8017FB7030F14FFB9033F15E098B712F8080316FE080F825017C0508350834FB97E4F84
-E2F07F804F0200B7FC4F13FC4FD9F00116804F13C0514816C0D800074D1300D9003F4C5A
-6E5F6E03E1494916E0626E03E35B6218E76206EF90C7FCA26106FF6F16C061A261761680
-617616004F6F5C775C775C4F6F5C0B0314C0775C4F9226003FFCC7FC9BC9FCA396CEFCA5
-60A760B3B3B3A9BDFCAE01FCCB7E>123 137 117 264 144 114
-D[<050FB500C015FE040FB7913803FF8093B800F05B030F05FF131F037FF0C07F4ABA00
-F9B5FC020796B6FC141F147F49BEFC5B4903F8C7FC011F4AC812074902E0ED007F490280
-161F90B548CA120703F81701484A83484A84484A844B84488792CC7E484985A288485B88
-A24888A38980B5FC80A2818181816FDF0FFEC7FC03FE96C9FC6F7E16E016FC6CEDFF8017
-FCEFFFF0F0FFC019FE6CF0FFF8F2FFC06C1AF81BFF1CE06C1BF86C1BFE767E6C1CE06C88
-1DFC6C886D757E6D886D886D880103886D886D6C876E87020F886E8814016E6C87030F87
-1503DB007F861607DC007F851703DD000F84F0003F19001A070800821B1F1B071B01756C
-1580D83FF886D87FFE8600FF1B0788A26D8688898089A280896E1D00A280A2806780656E
-64806F61676F96B5FC816F4E5C6F606F6303FF4E5C705F70053F5C04F04D91C7FC04FC4C
-B55ADCFF80030F5C05F0037F5CDDFF80011FB65A95B95A669BC8FC02F862DAE03F19F8DA
-C00F19E0DA0003198049010006FCC9FC01F8021F17E049020394CAFC01C0DA003F15F0D8
-3F80030102F8CBFC>113 140 116 265 138 I E end
+TeXDict begin 39158280 55380996 1000 600 600 (refcard.dvi)
+@start
+%DVIPSBitmapFont: Fa cmmi10 10 1
+/Fa 1 59 df<121C127FEAFF80A5EA7F00121C0909798817>58 D
+E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Fb cmti10 10 19
+/Fb 19 122 df<387FFFF8A2B5FCA214F0150579941E>45 D<14F8EB07FE90381F871C90
+383E03FE137CEBF801120148486C5A485A120FEBC001001F5CA2EA3F801403007F5C1300
+A21407485C5AA2140F5D48ECC1C0A2141F15831680143F1587007C017F1300ECFF076C48
+5B9038038F8E391F0F079E3907FE03FC3901F000F0222677A42A>97
+D<133FEA1FFFA3C67E137EA313FE5BA312015BA312035BA31207EBE0F8EBE7FE9038EF0F
+80390FFC07C013F89038F003E013E0D81FC013F0A21380A2123F1300A214075A127EA214
+0F12FE4814E0A2141F15C05AEC3F80A215005C147E5C387801F8007C5B383C03E0383E07
+C0381E1F80D80FFEC7FCEA01F01C3B77B926>I<147F903803FFC090380FC1E090381F00
+70017E13784913383901F801F83803F003120713E0120FD81FC013F091C7FC485AA2127F
+90C8FCA35A5AA45AA3153015381578007C14F0007EEB01E0003EEB03C0EC0F806CEB3E00
+380F81F83803FFE0C690C7FC1D2677A426>I<ED01F815FFA3150316F0A21507A216E0A2
+150FA216C0A2151FA21680A2153FA202F81300EB07FE90381F877F90383E03FF017C5BEB
+F80112013803F00048485B120FEBC001121F5DEA3F801403127F01005BA214075A485CA2
+140FA248ECC1C0A2141F15C3ED8380143F1587007C017F1300ECFF076C485B9038038F8E
+391F0F079E3907FE03FC3901F000F0253B77B92A>I<147F903803FFC090380FC1E09038
+3F00F0017E13785B485A485A485A120F4913F8001F14F0383F8001EC07E0EC1F80397F81
+FF00EBFFF891C7FC90C8FC5A5AA55AA21530007C14381578007E14F0003EEB01E0EC03C0
+6CEB0F806CEB3E00380781F83803FFE0C690C7FC1D2677A426>I<EC07C0EC3FF09138FC
+38E0903901F01FF0EB03E0903807C00FEB0F80011F1307D93F0013E05B017E130F13FE49
+14C01201151F1203491480A2153F1207491400A25DA249137EA215FEA25D000313011403
+14076C6C485A0000131FEB787BEB3FF390380FC3F0EB00031407A25DA2140F5D121C007E
+131F5D00FE49C7FC147E5C387801F8387C07E0381FFF80D803FEC8FC24367CA426>103
+D<EB03F0EA01FFA3EA00075CA3130F5CA3131F5CA3133F91C8FCA35B90387E07F0EC1FFC
+EC783E9038FFE01F02C01380EC800F1400485A16C05B49EB1F8012035BA2153F00071500
+5BA25D000F147E5B15FE5D121FD98001131C15F8163C003F01031338010013F0A2167048
+14E0007E15F016E0EDE1C000FE903801E38048903800FF000038143C263B7BB92A>I<EB
+01C0EB07E014F0130F14E01307EB038090C7FCAB13F0EA03FCEA071EEA0E1F121CA21238
+5B1270A25BEAF07E12E013FEC65AA212015B1203A25B12075BA2000F13E013C013C1001F
+13C01381A2EB83801303EB0700A2130E6C5AEA07F8EA01E0143879B619>I<EB0FC0EA07
+FFA3EA001F1480A2133FA21400A25BA2137EA213FEA25BA21201A25BA21203A25BA21207
+A25BA2120FA25BA2121FA25BA2123FA290C7FCA25AA2EA7E0EA212FE131EEAFC1CA2133C
+133812F81378EA7870EA7CE0121FEA0F80123B79B915>108 D<D801E001FEEB07F03C07
+F803FF801FFC3C0E3C0F07C0783E3C1E3E3C03E1E01F261C1F78D9F3C013803C383FF001
+F7800F02E01400007801C013FE007018C002805B4A4848EB1F80EAF07FD8E07E5CA20000
+0207143F01FE1700495CA2030F5C0001177E495C18FE031F5C120349DA8001131C18F803
+3F153C00070403133849020013F0A24B1570000F17E049017E15F019E003FEECE1C0001F
+EE01E34949903800FF000007C70038143C3E2679A444>I<D801E013FE3A07F803FF803A
+0E3C0F07C03A1E3E3C03E0261C1F787F39383FF00114E0007813C000708114804A485AEA
+F07FEAE07EA20000140701FE5C5BA2150F00015D5B151F5E12034990383F838016031607
+0007027F130049137EA2160E000F147C49141E161C5E001FEC3C7849EB1FE00007C7EA07
+80292679A42F>I<147F903803FFC090380FC1F090381F00F8017E137C5B4848137E4848
+133E0007143F5B120F485AA2485A157F127F90C7FCA215FF5A4814FEA2140115FC5AEC03
+F8A2EC07F015E0140F007C14C0007EEB1F80003EEB3F00147E6C13F8380F83F03803FFC0
+C648C7FC202677A42A>I<9039078007C090391FE03FF090393CF0787C903938F8E03E90
+38787FC00170497EECFF00D9F0FE148013E05CEA01E113C15CA2D80003143FA25CA20107
+147FA24A1400A2010F5C5E5C4B5A131F5EEC80035E013F495A6E485A5E6E48C7FC017F13
+3EEC70FC90387E3FF0EC0F8001FEC9FCA25BA21201A25BA21203A25B1207B512C0A32935
+80A42A>I<3903C003F0390FF01FFC391E783C0F381C7C703A3C3EE03F8038383FC0EB7F
+800078150000701300151CD8F07E90C7FCEAE0FE5BA2120012015BA312035BA312075BA3
+120F5BA3121F5BA3123F90C9FC120E212679A423>114 D<14FE903807FF8090380F83C0
+90383E00E04913F00178137001F813F00001130313F0A215E00003EB01C06DC7FC7FEBFF
+C06C13F814FE6C7F6D13807F010F13C01300143F141F140F123E127E00FE1480A348EB1F
+0012E06C133E00705B6C5B381E03E06CB45AD801FEC7FC1C267AA422>I<EB0380EB07C0
+130FA4131F1480A3133F1400A35B137E007FB5FCA2B6FC3800FC00A312015BA312035BA3
+12075BA3120F5BA3121FEB801CA2143C003F1338EB0078147014F014E0EB01C0EA3E0338
+1F0780380F0F00EA07FCEA01F0183579B31C>I<13F8D803FEEB01C0D8078FEB03E0390E
+0F8007121E121C0038140F131F007815C01270013F131F00F0130000E015805BD8007E13
+3FA201FE14005B5D120149137EA215FE120349EBFC0EA20201131E161C15F813E0163CD9
+F003133814070001ECF07091381EF8F03A00F83C78E090393FF03FC090390FC00F002726
+79A42D>I<13F0D803FCEB01C0D8071EEB03E0D80E1F1307121C123C0038140F4914C012
+70A249131FD8F07E148012E013FEC648133F160012015B5D0003147E5BA215FE00075C5B
+A214015DA314035D14070003130FEBF01F3901F87FE038007FF7EB1FC7EB000F5DA2141F
+003F5C48133F92C7FC147E147C007E13FC387001F8EB03E06C485A383C1F80D80FFEC8FC
+EA03F0233679A428>121 D E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Fc cmsy7 7 1
+/Fc 1 14 df<913801FFC0021F13FC91B67E499038007FC0D907F0EB07F0D91F80EB00FC
+49C8127E017C151F01F0ED078048486F7E48486F7E48486F7E90CA1270481778001E8300
+1C171C003C171E0038170E0078170F007083A200F01880481703A96C170700701800A200
+785F0038170E003C171E001C171C001E173C6C5F6C17706D16F06C6C4B5A6C6C4B5A6C6C
+4B5A017C031FC7FC013F157E6D6C5CD907F0EB07F0D901FFEB7FC06D90B55A021F01FCC8
+FC020113C039357CA842>13 D E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Fd cmr7 7 45
+/Fd 45 122 df<1238127C12FE12FFA2127F123B1203A31206A3120C1218123812701220
+08127B8613>44 D<B5FCA410047F8E16>I<1238127C12FEA3127C123807077B8613>I<EB
+3F803801FFF03803E0F83807803C48487E001E7F003E1480A2003C1307007C14C0A400FC
+14E0AE007C14C0A36CEB0F80A36CEB1F006C131E6C6C5A3803E0F86CB45A38003F801B27
+7EA521>48 D<13381378EA01F8121F12FE12E01200B3AB487EB512F8A215267BA521>I<
+13FF000313E0380E03F0381800F848137C48137E00787F12FC6CEB1F80A4127CC7FC1500
+5C143E147E147C5C495A495A5C495A010EC7FC5B5B903870018013E0EA01803903000300
+12065A001FB5FC5A485BB5FCA219267DA521>I<13FF000313E0380F01F8381C007C0030
+137E003C133E007E133FA4123CC7123E147E147C5C495AEB07E03801FF8091C7FC380001
+E06D7E147C80143F801580A21238127C12FEA21500485B0078133E00705B6C5B381F01F0
+3807FFC0C690C7FC19277DA521>I<0018130C001F137CEBFFF85C5C1480D819FCC7FC00
+18C8FCA7137F3819FFE0381F81F0381E0078001C7F0018133EC7FC80A21580A21230127C
+12FCA3150012F00060133E127000305B001C5B380F03E03803FFC0C648C7FC19277DA521
+>53 D<1230123C003FB512E0A215C0481480A239700007000060130E140C48131C5C5CC7
+5A5C1301495AA249C7FC5B130E131EA3133E133CA2137CA413FCA813781B287DA621>55
+D<137F3801FFC03807C1E0380F0070001E1378003E7F003C133E007C131EA200FC131FA4
+1580A4007C133FA2123C003E137F001E135F380F01DF3807FF9F3801FE1FD80010130013
+00A2143E123C007E133CA25C5C007C5B383003C0381C0780D80FFFC7FCEA03F819277DA5
+21>57 D<140EA2141FA34A7EA3EC6FC0A2ECEFE014C7A290380183F0A390380301F8A201
+067F1400A249137EA2011C137F01187FA24980013FB5FCA2903960000FC0A201E0804913
+07A248486D7EA200038115011207D81FC0497ED8FFF890383FFFE0A22B2A7EA931>65
+D<B612E015FC3907F0003F0003EC0FC0ED07E01503ED01F016F8A6ED03F016E01507ED1F
+C0ED7F0090B512FC819039F0003F80ED07E0ED03F0ED01F8ED00FCA2167EA616FCA2ED01
+F8ED03F0ED07E00007EC3FC0B7120015F827287EA72E>I<91387FC002903903FFF80690
+390FE01E0E90383F0007017CEB019ED801F0EB00FE4848147E4848143E5B000F151E48C8
+FC48150E123EA2007E1506A2127C00FC1500A8127C007E1506A2123EA2003F150C7E6C7E
+000715186D14386C6C14306C6C1460D8007CEB01C0013FEB038090390FE01E00903803FF
+F89038007FC0272A7DA82F>I<B712F0A23907F000070003EC00F816781638A21618A316
+0C1560A21600A215E0A2140390B5FCA2EBF0031400A21560A21606A2ED000CA4161C1618
+1638A21678ED01F80007EC07F0B7FCA227287EA72D>69 D<B712C0A23907F0001F0003EC
+03E015011500A21660A31630A215C01600A31401A2140790B5FCA2EBF0071401A21400A4
+92C7FCA9487EB512E0A224287EA72B>I<91387FC002903903FFF80690390FE01E0E9038
+3F0007017CEB019ED801F0EB00FE4848147E4848143E5B000F151E48C8FC48150E123EA2
+007E1506A2127C00FC92C7FCA792387FFFE0127C007E02001300167E123EA2123F7E6C7E
+6C7EA26C7ED801F814FEEA007C013FEB039E90390FE00F0E903903FFFC029026007FE0C7
+FC2B2A7DA833>I<B512C0A23807F8006C5AB3B0487EB512C0A212287EA718>73
+D<D8FFF0EDFFF06D5C0007EEFE0000035E017CEC037CA26D1406A26D140CA36D6C1318A2
+6D6C1330A36D6C1360A26D6C13C0A3903900F80180A291387C0300A2EC3E06A36E5AA2EC
+0F98A3EC07F0A26E5AEA0780D80FC015FE3CFFFC01C01FFFF0A234287DA73C>77
+D<D8FFF0903807FFE07FD803FC9038007E006D143C1618137F6D7E6D7EA26D7E6D7E6D7E
+A26D7E6D7E147FA2EC3F80EC1FC0EC0FE015F01407EC03F8EC01FCEC00FEA2157FED3F98
+ED1FD8A2ED0FF815071503A215011500486C1478487ED8FFFC143816182B287EA731>I<
+B612E015FC3907F0003F0003EC0FC0ED03E0ED01F016F8150016FCA616F8150116F0ED03
+E0ED0FC0ED3F0090B512FC15E001F0C8FCAF487EB512C0A226287EA72D>80
+D<90387F80203903FFF06039078078E0380E000E481307481303007813010070130012F0
+A21560A27E1500127C127FEA3FE013FF6C13F06C13FC000313FFC61480010F13C0010013
+E0EC0FF014031401EC00F8A200C01478A46C1470A26C14F06C14E06CEB01C000EFEB0780
+39E3E01F0038C0FFFC38801FF01D2A7DA825>83 D<007FB7FCA23A7E003F003F0078150F
+007081006081A200E01680481501A5C791C7FCB3A64A7E013FB5FCA229287EA72F>I<B5
+39C007FFE0A2D807F8C7EA7E006C48143C1618B3A816386C6C143016706C6C1460017C14
+E0017E495A6D495A90260F8007C7FC903807E03E903801FFF89038003FC02B297EA731>
+I<13FE3807FFC0380F03E0381C00F0003E1378003F137C143C143E121EC7FCA3EB3FFEEA
+01FF3807F03EEA1FC0EA3F00127EA2481418A3147E127EECDF38393F838FF0390FFE0FE0
+3903F807C01D1C7E9A21>97 D<EA0F8012FFA2121F120FAAEB81FCEB8FFF9038BC0FC090
+38F003E09038C001F0EB800015F815FC157CA2157EA7157CA215FC15F89038C001F015E0
+90387003C0390E3C0F80390C0FFF00380003F81F297EA725>I<EB3FC0EBFFF83803E03C
+3807C00E380F801F381F003F123EA2007E131E007C1300A212FCA7127C127E1403123E6C
+1306EA0F803807C00C3803F0383800FFE0EB3F80181C7E9A1E>I<EC03E0143FA2140714
+03AAEB3F833801FFE33803E03B3807800F380F0007481303123E127E127CA212FCA7127C
+A2127E123E001E1307001F130F390F801FF03903E073FE3801FFE339007F03E01F297EA7
+25>I<133F3801FFE03803E1F0380F80F8381F007C143E123E007E131E141F127C12FCA2
+B6FCA200FCC7FCA4127C127E1403123E6C1307380F800E3807C01C3803E0783800FFE0EB
+3F80181C7E9A1E>I<EB07E0EB3FF0EB7C78EBF0FCEA01E01203EBC078000713301400A8
+B51280A23807C000B3A2487EEA7FFEA216297FA815>I<90387E03E03901FF9FF03807C3
+FC380F00F048EBF800001E1378003E137CA6001E1378001F13F86C5BEBC3E0380DFF80D8
+1C7EC7FC90C8FCA3121E380FFFF014FC6C13FF001F1480393E001FC000781307EC03E048
+1301A40078EB03C0007C13076CEB0F80390FC07E003803FFF838007FC01C277E9921>I<
+EA0F8012FFA2121F120FAAEB81FCEB8FFF90389C0F809038B007C013E09038C003E0A313
+80AF391FC007F039FFF83FFEA21F287EA725>I<120EEA3F80A5EA0E00C7FCA7EA078012
+FFA2121F120FB3121FEAFFF8A20D287EA713>I<EA0F8012FFA2121F120FABEC3FF8A2EC
+1FC01500143C5C14E0EB81C0EB8380018FC7FCEB9F8013BFEBF7C0EBC3E0EB81F0801380
+147C80143FEC1F80EC0FC0D81FC013E039FFF83FFCA21E287EA723>107
+D<EA0F8012FFA2121F120FB3AFEA1FC0EAFFF8A20D287EA713>I<260F81FC137F3BFF8F
+FF03FFC0903A9C0F8703E03B1FB007CC01F0D80FE013D8903AC003F000F8A301805BAF48
+6C486C487E3CFFF83FFE0FFF80A2311A7E9937>I<380F81FC38FF8FFF90389C0F80391F
+B007C0EA0FE09038C003E0A31380AF391FC007F039FFF83FFEA21F1A7E9925>I<EB3F80
+EBFFE03803E0F83807803C48487E001E7F003E1480A248EB07C0A300FC14E0A7007C14C0
+A2007E130F003E1480001E1400001F5B380F803E3803E0F86CB45A38003F801B1C7E9A21
+>I<380F81FC38FF8FFF9038BC0FC0391FF007E0390FC003F0EB800115F8EC00FCA2157C
+157EA7157C15FCA2EC01F801C013F0EC03E09038F007C09038BC1F8090388FFF00EB83F8
+0180C7FCA7487EEAFFF8A21F257E9925>I<380F07C038FF1FF0EB38F8EA1F71EA0F6113
+C1EBC0F014005BAF487EEAFFFCA2151A7E991A>114 D<3803F840380FFEC0EA3C07EA78
+03EA7001EAF000A37E6C1300EA7FC013FC6CB4FC6C1380000713C0C613E0130738C003F0
+130113007EA26C13E0130100F813C038EE078038C7FF00EA81FC141C7E9A1A>I<13C0A4
+1201A312031207120F121FB512E0A23807C000AC1430A73803E060A23801F0C03800FF80
+EB3F0014257FA31A>I<390F8003E000FF133FA2001F1307000F1303B01407A20007130F
+9038C01BF03903E073FE3801FFE339007F83E01F1B7E9925>I<39FFF807FEA2390FE001
+F001C013E0000714C013E000031480EBF00300011400A23800F806A2EB7C0CA2EB7E1CEB
+3E18A26D5AA2EB0FE0A36D5AA26D5AA21F1A7F9823>I<3BFFF8FFF07FE0A23B1FC01FC0
+1F80000F90390F800E00A20007150CEC1FC02603E01B5B15E0143B2601F0315B15F0D9F8
+6013700000156015F89039FCC078E0017CEB7CC0137D90393F803D80153FEC001F6D91C7
+FCA2011E7F010E130EA22B1A7F982F>I<39FFF807FEA2390FE001F001C013E0000714C0
+EA03E01580EBF003000114006D5A0000130613FCEB7C0CA26D5AA26D5AA214F06D5AA26D
+5AA26D5AA291C7FCA213061230EA780EEAFC0C131C1318485AEA70E0EA3FC06CC8FC1F25
+7F9823>121 D E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Fe cmbx10 10 25
+/Fe 25 122 df<913A03FF8007FE027F9039F07FFF800103B500FDB512E0010F903A00FF
+FE0FF0D93FF8ECF81F90267FE0019038F03FF849485A4816E014804816C00200ED1FF081
+F007C06F91C7FCA8B912E0A4000390C701C0C7FCB3ABB5D8FC3FEBFF80A43D3A7EB938>
+11 D<EB3FFE0003B512E0000F14F8391FF00FFE003FEB03FF6D6C7F6E7FA26F7EA26C5A
+6C5AEA0380C8FCA2EC3FFF010FB5FC137F3901FFF87F00071380380FFE00EA3FF85B485A
+12FF5BA415FF6D5A127F263FF00713F83B1FFC1FBFFFC0390FFFFE1F0003EBF80F39003F
+E0032A257DA42E>97 D<13FFB5FCA412077EAF4AB47E020F13F0023F13FC9138FE03FFDA
+F00013804AEB7FC00280EB3FE091C713F0EE1FF8A217FC160FA217FEAA17FCA3EE1FF8A2
+17F06E133F6EEB7FE06E14C0903AFDF001FF80903AF8FC07FE009039F03FFFF8D9E00F13
+E0D9C00390C7FC2F3A7EB935>I<903801FFC0010F13FC017F13FFD9FF8013802603FE00
+13C048485AEA0FF8121F13F0123F6E13804848EB7F00151C92C7FC12FFA9127FA27F123F
+ED01E06C7E15036C6CEB07C06C6C14806C6C131FC69038C07E006DB45A010F13F0010113
+8023257DA42A>I<EE7F80ED7FFFA4150381AF903801FF81010F13F1013F13FD9038FFC0
+7F0003EB001FD807FC1307000F8048487F5B123FA2485AA312FFAA127FA27F123FA26C6C
+5B000F5C6C6C5B6C6C4913C02701FF80FD13FE39007FFFF9011F13E1010313012F3A7DB9
+35>I<903803FF80011F13F0017F13FC3901FF83FE3A03FE007F804848133F484814C000
+1FEC1FE05B003FEC0FF0A2485A16F8150712FFA290B6FCA301E0C8FCA4127FA36C7E1678
+121F6C6C14F86D14F000071403D801FFEB0FE06C9038C07FC06DB51200010F13FC010113
+E025257DA42C>I<EC1FF0903801FFFC010713FF90391FF87F8090383FE0FFD9FFC113C0
+A2481381A24813016E1380A2ED3E0092C7FCA8B6FCA4000390C8FCB3ABB512FEA4223A7D
+B91D>I<161FD907FEEBFFC090387FFFE348B6EAEFE02607FE07138F260FF801131F4848
+6C138F003F15CF4990387FC7C0EEC000007F81A6003F5DA26D13FF001F5D6C6C4890C7FC
+3907FE07FE48B512F86D13E0261E07FEC8FC90CAFCA2123E123F7F6C7E90B512F8EDFF80
+16E06C15F86C816C815A001F81393FC0000F48C8138048157F5A163FA36C157F6C16006D
+5C6C6C495AD81FF0EB07FCD807FEEB3FF00001B612C06C6C91C7FC010713F02B377DA530
+>I<13FFB5FCA412077EAFED7FC0913803FFF8020F13FE91381F03FFDA3C01138014784A
+7E4A14C05CA25CA291C7FCB3A3B5D8FC3F13FFA4303A7DB935>I<EA01F0EA07FC487EA2
+487EA56C5AA26C5AEA01F0C8FCA913FF127FA412077EB3A9B512F8A4153B7DBA1B>I<13
+FFB5FCA412077EAF92380FFFE0A4923803FC0016F0ED0FE0ED1F804BC7FC157E5DEC03F8
+EC07E04A5A141FEC7FE04A7E8181A2ECCFFEEC0FFF496C7F806E7F6E7F82157F6F7E6F7E
+82150F82B5D8F83F13F8A42D3A7EB932>107 D<13FFB5FCA412077EB3B3ACB512FCA416
+3A7DB91B>I<01FED97FE0EB0FFC00FF902601FFFC90383FFF80020701FF90B512E0DA1F
+81903983F03FF0DA3C00903887801F000749DACF007F00034914DE6D48D97FFC6D7E4A5C
+A24A5CA291C75BB3A3B5D8FC1FB50083B512F0A44C257DA451>I<01FEEB7FC000FF9038
+03FFF8020F13FE91381F03FFDA3C011380000713780003497E6D4814C05CA25CA291C7FC
+B3A3B5D8FC3F13FFA430257DA435>I<903801FFC0010F13F8017F13FFD9FF807F3A03FE
+003FE048486D7E48486D7E48486D7EA2003F81491303007F81A300FF1680A9007F1600A3
+003F5D6D1307001F5DA26C6C495A6C6C495A6C6C495A6C6C6CB45A6C6CB5C7FC011F13FC
+010113C029257DA430>I<9039FF01FF80B5000F13F0023F13FC9138FE07FFDAF0011380
+0007496C13C06C0180EB7FE091C713F0EE3FF8A2EE1FFCA3EE0FFEAA17FC161FA217F816
+3F17F06E137F6E14E06EEBFFC0DAF00313809139FC07FE0091383FFFF8020F13E0020390
+C7FC91C9FCACB512FCA42F357EA435>I<49B4EB0780010FEBE00F013FEBF81F9039FFC0
+7C3F0003EB803E3A07FE000F7F4848EB07FF121F497F123F497F127FA25B12FFAA6C7EA3
+6C7E5D6C7E000F5C6C6C5B6C6C133F6CEBC0FD39007FFFF1011F13C10101130190C7FCAC
+037F13FEA42F357DA432>I<9038FE03F000FFEB0FFEEC3FFF91387C7F809138F8FFC000
+075B6C6C5A5CA29138807F80ED3F00150C92C7FC91C8FCB3A2B512FEA422257EA427>I<
+90383FF0383903FFFEF8000F13FF381FC00F383F0003007E1301007C130012FC15787E7E
+6D130013FCEBFFE06C13FCECFF806C14C06C14F06C14F81203C614FC131F9038007FFE14
+0700F0130114007E157E7E157C6C14FC6C14F8EB80019038F007F090B512C000F8140038
+E01FF81F257DA426>I<130FA55BA45BA25B5BA25A1207001FEBFFE0B6FCA3000390C7FC
+B21578A815F86CEB80F014816CEBC3E090383FFFC06D1380903803FE001D357EB425>I<
+01FFEC3FC0B5EB3FFFA4000714016C80B3A35DA25DA26C5C6E4813E06CD9C03E13FF9038
+7FFFFC011F13F00103138030257DA435>I<B539F001FFF8A4000390C7EA3F00161E6E13
+3E6C153C6E137C6C15786E13F8017F5CECF001013F5C14F8011F495AA2ECFC07010F5CEC
+FE0F010791C7FC6E5A6D131E15BE6D13BC15FC6D5BA36E5AA26E5AA26E5AA26E5AA22D25
+7EA432>I<B500F1B538803FFFA43D07FE000FF80003E06C6C010715C082028015076C6E
+6C148015076C01C0ED0F00826E485C017FED801E5D90273FF01E7F5B17C0DAF83E147C01
+1F90393C3FE078037C14F8903B0FFC781FF0F0A29139FEF00FF10107EDF9E002FF14FB6D
+496CB45AA24B7E6D5EA26D496C90C7FCA292C7FC6E5CA2023E147C023C143C40257EA445
+>I<B539F01FFFF0A4000390398003F8006C01C013E06C1407D97FE05B6D6C485A6E48C7
+FC90381FFC3E010F5B903807FEFC6D6C5A5D6D5B6D5B6E7E6E7E814A7EA24A7E903801F3
+FFD903E37FD907C17FEB0FC049486C7E4A6C7E013E80496D7E49130F00016E7EB590383F
+FFF8A42D257EA432>I<B539F001FFF8A4000390C7EA3F00161E6E133E6C153C6E137C6C
+15786E13F8017F5CECF001013F5C14F8011F495AA2ECFC07010F5CECFE0F010791C7FC6E
+5A6D131E15BE6D13BC15FC6D5BA36E5AA26E5AA26E5AA26E5AA292C8FCA25C141E003F13
+3E387F803C38FFC07C147814F8EBC1F0EBC3E06C485A387D1F80D83FFFC9FCEA1FFCEA07
+F02D357EA432>I E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Ff cmtt10 10 74
+/Ff 74 126 df<121C127FEAFF80B1EA7F00AF123EC7FCA8121C127FA2EAFF80A3EA7F00
+A2121C09346FB32C>33 D<003C131E007F137F481480A66C1400A6007E7FA6003E133EA3
+003C131E001C131C191977B32C>I<010F133C90381F807EA8013F13FE4A5AA4007FB612
+F0B712F8A4003F15F03A007E01F800A5EBFE0301FC5BA6003FB612F0B712F8A46C15F03A
+01F807E000A30003130F01F05BA86C486C5A25337DB22C>I<EB01C0497EA6EB0FFC9038
+7FFF8048B512E00007804880391FFBEFFC393FC3E1FE903803E07F007E80127C00FC1580
+12F8157FA300FCEC3F00A2007E91C7FC127FEA3FC313FBEA1FFF6C13FC6C13FF000114C0
+6C6C7F011F13F801037F14E7ECE1FEECE07F81001880007E1580150F12FFA312FE151F16
+00007E5C007F143ED83F8313FE9038C3E1FC391FFBEFF86CB55A6C5C6C5CC691C7FCEB1F
+F8EB03E0A66D5A21417BB92C>I<D807801307D81FE0EB0F80151F487E486C133F160000
+7C5CD8FCFC137EEAF87C15FE5D14015DA21403D8FCFC5BEA7CF8007F13075D383FF00FD8
+1FE05BA23807801FC75B143F92C7FCA25C147E14FE5CA213015CA213035C13075CA2130F
+5C131FEC800FED3FC0013FEB7FE0140049EBFFF0017E13F9A2D9FE0113F801FC13F0A212
+0113F8120313F015F90007010013F05B000F14FF49EB7FE0A20007EC3FC06C48EB0F0025
+417DB92C>I<EA0F80EA1FC0EA3FE013F0A213F8A2121F120F1200A4120113F0A2120313
+E01207EA0FC0121FEA3F80EA7F0012FE5A5A12700D1B71B22C>39
+D<143814FC13011303EB07F8EB0FF0EB1FC0EB3F80EB7F0013FE485A485A5B12075B120F
+5B485AA2123F90C7FCA25A127EA312FE5AAC7E127EA3127F7EA27F121FA26C7E7F12077F
+12037F6C7E6C7E137FEB3F80EB1FC0EB0FF0EB07F8EB03FC130113001438164272B92C>
+I<127012FC7E7E6C7E6C7EEA0FE06C7E6C7E6C7E6C7E137F7F1480131F14C0130FEB07E0
+A214F01303A214F81301A314FC1300AC130114F8A3130314F0A2130714E0A2EB0FC0131F
+1480133F14005B13FE485A485A485A485AEA3FC0485A48C7FC5A5A1270164279B92C>I<
+EB0380497EA60020140800F8143E00FE14FE00FF13C1EBC7C7EBE7CF003FB512F8000F14
+E0000314806C140038007FFCA248B5FC481480000F14E0003F14F839FFE7CFFEEBC7C7EB
+07C100FE13C000F8143E0020140800001400A66D5A1F247AAA2C>I<147814FCAF007FB6
+12F0B712F8A46C15F0C700FCC7FCAF147825267DAB2C>I<EA0F80EA1FE0EA3FF0EA7FF8
+A213FCA3123F121F120F120013F8A21201EA03F01207EA1FE0EA7FC0EAFF80130012FC12
+700E17718A2C>I<007FB6FCB71280A46C150021067B9B2C>I<121FEA3F80EA7FC0EAFFE0
+A5EA7FC0EA3F80EA1F000B0B708A2C>I<1507ED0F80151FA2153F16005D157E15FE5D14
+015D14035DA214075D140F5D141F5D143F92C7FC5C147E14FE5CA213015C13035C13075C
+130F5C131F5CA2133F91C8FC5B137E13FE5B12015B12035B12075BA2120F5B121F5B123F
+90C9FC5A127E12FE5AA25A127821417BB92C>I<EB03F8EB0FFE90383FFF80497F90B57E
+3901FE0FF03903F803F848486C7EEBE0004848137EA248487FA248C7EA1F80A2003E140F
+007E15C0A3007C140700FC15E0AC6C140F007E15C0A46CEC1F80A36C6CEB3F00A26C6C13
+7E6D13FE00075CEBF0016C6C485A3901FE0FF06CB55A6D5B6D5BD90FFEC7FCEB03F82335
+7CB32C>I<1307497EA2131FA2133F137F13FF5A1207127FB5FC13DF139FEA7C1F1200B3
+AE007FB512E0B612F0A36C14E01C3477B32C>I<EB0FF890387FFF8048B512E000078048
+14FC391FF80FFE393FE001FF903880007F48C7EA3F80007E141F00FE15C0150F6C15E015
+07A3127E123CC8FCA2150F16C0151F1680153F16005D15FE4A5A14034A5A4A5A4A5A4A5A
+ECFF804948C7FC495A495A495AEB3FE0EB7F8049C8FC485A4848EB03C04848EB07E0EA1F
+E0485A48B6FCB7FCA36C15C023347CB32C>I<EB0FFC90387FFF8048B512E0000714F848
+80391FF807FEEBC0004848137F6D7F1680151FA26C5A6CC7FCC8FC153F16005D15FE1401
+4A5AEC1FF890381FFFF0495BA215F86D7F90380007FEEC00FF81ED3F80ED1FC0150FA216
+E01507A2123C127EB4FC150F16C0A248141F007FEC3F806DEB7F006C6C5B391FF807FE6C
+B55A6C5C6C14E0C66C1380D90FFCC7FC23357CB32C>I<EC07F04A7E141F143FA2147EA2
+14FCEB01F8A2EB03F0EB07E0A2EB0FC0EB1F80A2EB3F00137EA25B485AA2485A5B120748
+5AA2485A48C7FCA2127E5AB712FC16FEA36C15FCC8EAF800AA91387FFFF091B512F8A36E
+13F027347EB32C>I<000FB512FE4880A35D0180C8FCADEB83FE90389FFF8090B512E015
+F8819038FE03FE9038F000FF01C07F49EB3F8090C7121F6C15C0C8120FA2ED07E0A4123C
+127EB4FC150F16C0A248141F007EEC3F80007FEC7F006C6C5B6D485A391FF80FFC6CB55A
+6C5C000114C06C6C90C7FCEB0FF823347CB22C>I<121FEA3F80EA7FC0EAFFE0A5EA7FC0
+EA3F80EA1F00C7FCAE121FEA3F80EA7FC0EAFFE0A5EA7FC0EA3F80EA1F000B2470A32C>
+58 D<1507ED1F80153F15FF14034A1300EC1FFC4A5AECFFE0491380010790C7FCEB0FFC
+EB3FF8EB7FE048485A4890C8FCEA0FFEEA1FF8EA7FF0EAFFC05BA27FEA7FF0EA1FF8EA0F
+FEEA03FF6C13C06C6C7EEB3FF8EB0FFC6DB4FC01017F6D13E0EC3FF86E7EEC07FF6E1380
+1400153F151FED0700212A7BAD2C>60 D<127012FC7E6C7E13E06C7EEA1FFC6C7E3803FF
+80C67FEB7FF0EB1FF8EB0FFEEB03FF6D13C06D6C7EEC3FF8EC0FFC6EB4FC0201138080A2
+5C02071300EC0FFCEC3FF8EC7FE049485A4990C7FCEB0FFEEB1FF8EB7FF0EBFFC000035B
+D80FFEC8FC485AEA7FF0485A138048C9FC5A1270212A7BAD2C>62
+D<EB3FFE0003B512C0000F14F04814FC4880397FE007FF90C7FC00FEEC3F806C141FA315
+3F007EEC7F00003C5CC7EA03FEEC0FFC4A5AEC3FE04A5A4AC7FC495A495A5C13075C130F
+5CA76D5A90C9FCA8EB0380EB0FE0A2497EA36D5AA2EB038021337BB22C>I<EC7F809038
+03FFE0010F7F013F7F497F9038FFC0FE3901FE007FD803F87F4848EB1F809038E00FCF39
+0FC03FFF48484813C091B5FCEA3F01393E03F87F903907F03FE0007EEBE01F397C0FC00F
+EC8007A2EAFC1F00F8EB0003A900FCEB8007D87C0F14C0A2ECC00F3A7E07E01F80003EEB
+F03F903903F87F00393F01FFFED81F805B6E5A6C6C6C5A3907E00FC09039F00007C06C6C
+EB0FE0D801FE131F3900FFC0FF6DB512C06D1480010FEBFE00010313F89038007FC02333
+7CB22C>I<14FE497EA4497FA214EFA2130781A214C7A2010F7FA314C390381F83F0A590
+383F01F8A490387E00FCA549137E90B512FEA34880A29038F8003FA34848EB1F80A40007
+15C049130FD87FFEEBFFFC6D5AB514FE6C15FC497E27347EB32C>I<007FB512E015F8B6
+12FE6C8016C03903F0003FED0FE0ED07F01503A2ED01F8A6ED03F0A21507ED0FE0ED1FC0
+EDFF8090B612005D5D15FF16C09039F0001FE0ED07F0ED03F81501ED00FCA216FE167EA6
+16FE16FC1501ED03F8150FED3FF0007FB612E016C0B712806CECFE0015F027337FB22C>
+I<02FF13700107EBE0F84913F9013F13FD4913FFEBFF813901FE007F4848131FD807F013
+0F1507485A491303485A150148C7FCA25A007EEC00F01600A212FE5AAB7E127EA3007F15
+F06CEC01F8A26C7EA26C6C13036D14F06C6C130716E0D803FC131F6C6CEB3FC03A00FF81
+FF806DB512006D5B010F5B6D13F00100138025357DB32C>I<007FB5FCB612C015F0816C
+803907E003FEEC00FFED7F80153FED1FC0ED0FE0A2150716F0150316F81501A4ED00FCAC
+ED01F8A3150316F0A2150716E0150FED1FC0153FED7F80EDFF00EC03FE007FB55AB65A5D
+15C06C91C7FC26337EB22C>I<007FB612F0B712F8A37E3903F00001A7ED00F01600A4EC
+01E04A7EA490B5FCA5EBF003A46E5A91C8FCA5163C167EA8007FB612FEB7FCA36C15FC27
+337EB22C>I<007FB612F8B712FCA37ED803F0C7FCA716781600A515F04A7EA490B5FCA5
+EBF001A46E5A92C7FCAD387FFFE0B5FC805C7E26337EB22C>I<903901FC038090390FFF
+87C04913EF017F13FF90B6FC4813073803FC01497E4848137F4848133F49131F121F5B00
+3F140F90C7FCA2127EED078092C7FCA212FE5AA8913803FFF84A13FCA27E007E6D13F891
+38000FC0A36C141FA27F121F6D133F120F6D137F6C7E6C6C13FF6D5A3801FF076C90B5FC
+6D13EF011F13CF6DEB0780D901FCC7FC26357DB32C>I<387FFFE0B57EA36C5BD803F0C8
+FCB3AE16F0ED01F8A8007FB6FCB7FCA36C15F025337DB22C>76 D<D87FE0EB0FFC486CEB
+1FFEA26D133F007F15FC000F15E001BC137BA4019E13F3A3EB9F01A2018F13E3A21483A2
+018713C314C7A201831383A214EFA201811303A214FFEB80FEA3147C14381400ACD87FF0
+EB1FFC486CEB3FFEA36C48EB1FFC27337EB22C>I<007FB512C0B612F88115FF6C158026
+03F00013C0153FED0FE0ED07F0A2150316F81501A6150316F01507A2ED0FE0ED3FC015FF
+90B61280160015FC5D15C001F0C8FCB0387FFF80B57EA36C5B25337EB22C>80
+D<387FFFFCB67E15E015F86C803907E007FE1401EC007F6F7E151FA26F7EA64B5AA2153F
+4BC7FCEC01FE140790B55A5D15E081819038E007FCEC01FE1400157F81A8160FEE1F80A5
+D87FFEEB1FBFB5ECFF00815E6C486D5AC8EA01F029347EB22C>82
+D<90381FF80790B5EA0F804814CF000714FF5A381FF01F383FC003497E48C7FC007E147F
+00FE143F5A151FA46CEC0F00007E91C7FC127F7FEA3FE0EA1FFCEBFFC06C13FC0003EBFF
+C06C14F06C6C7F01077F9038007FFEEC07FF02001380153FED1FC0A2ED0FE0A200781407
+12FCA56CEC0FC0A26CEC1F806D133F01E0EB7F009038FE01FF90B55A5D00F914F0D8F83F
+13C0D8700790C7FC23357CB32C>I<007FB612FCB712FEA43AFC007E007EA70078153CC7
+1400B3AF90383FFFFCA2497F6D5BA227337EB22C>I<D87FF0EB07FF486C491380A36C48
+6D1300001FC8127CA46C6C5CA76C6C495AA4143E147FA33A03E0FF83E0A214F7A201E113
+C3A3000101E35BA201F113C701F313E7A314C1A200005DA201F713F71480A301FF13FF01
+7F91C7FC4A7EA4013E133E29347FB22C>87 D<387FFFFCB512FEA314FC00FCC7FCB3B3B3
+B512FC14FEA36C13FC17416FB92C>91 D<127812F87EA27E127E127F7E7F121F7F120F7F
+1207A27F12037F12017F12007F137E137F7F80131FA280130F8013078013038013018013
+00A280147E147F8081141F81140F811407811403A281140181140081157E157F81168015
+1FA2150FED070021417BB92C>I<387FFFFCB512FEA37EC7127EB3B3B3387FFFFEB5FCA3
+6C13FC17417DB92C>I<130EEB3F80EBFFE0000313F8000F13FE487FD87FF113C0D8FFE0
+13E0EB803F38FE000F007CEB07C00030EB01801B0C78B22C>I<007FB6FCB71280A46C15
+0021067B7D2C>I<137013F812011203EA07F0EA0FE0EA1FC01380EA3F00123E127E127C
+A212FC5AA4EAFF8013C013E0A2127FA2123FEA1FC0EA0F800D1B71B82C>I<3801FFF000
+0713FE001F6D7E15E048809038C01FF81407EC01FC381F80000006C77EC8127EA3ECFFFE
+131F90B5FC1203120F48EB807E383FF800EA7FC090C7FC12FE5AA47E007F14FEEB800338
+3FE01F6CB612FC6C15FE6C14BF0001EBFE1F3A003FF007FC27247CA32C>I<EA7FF0487E
+A3127F1201AAEC1FE0ECFFF801FB13FE90B6FC16809138F07FC09138801FE091380007F0
+49EB03F85BED01FC491300A216FE167EA816FE6D14FCA2ED01F86D13036DEB07F0150F91
+38801FE09138E07FC091B51280160001FB5B01F813F83900F03FC027337FB22C>I<9038
+03FFE0011F13F8017F13FE48B5FC48804848C6FCEA0FF0485A49137E4848131890C9FC5A
+127EA25AA8127EA2127F6C140F6DEB1F806C7E6D133F6C6CEB7F003907FE03FF6CB55A6C
+5C6C6C5B011F13E0010390C7FC21247AA32C>I<EC0FFE4A7EA380EC003FAAEB07F8EB3F
+FE90B512BF4814FF5A3807FC0F380FF00348487E497E48487F90C7FC007E80A212FE5AA8
+7E007E5CA2007F5C6C7E5C6C6C5A380FF0073807FC1F6CB612FC6CECBFFE6C143FEB3FFC
+90390FF01FFC27337DB22C>I<EB03FE90381FFFC0017F13F048B57E48803907FE03FE39
+0FF800FFD81FE0EB3F805B4848EB1FC090C7120F5A007E15E015075AB7FCA416C000FCC9
+FC7E127EA2127F6CEC03C06DEB07E06C7ED80FF0130F6C6CEB3FC001FF13FF000190B512
+806C1500013F13FC010F13F00101138023247CA32C>I<EC0FF8EC3FFE91B5FC4914805B
+903807FC7F14F090390FE03F0014C092C7FCA6007FB512FEB7FCA36C5C26000FC0C7FCB3
+A8003FB512F04880A36C5C21337DB22C>I<ED03F8903907F80FFC90391FFE3FFE017FB6
+FC48B7FC48ECFE7F9038FC0FF82607F003133E3A0FE001FC1CD9C0001300001F8049137E
+A66D13FE000F5CEBE0016C6C485A3903FC0FF048B5FC5D481480D99FFEC7FCEB87F80180
+C8FCA37F6C7E90B512F06C14FE48ECFF804815E04815F03A3FC0001FF848C7EA03FC007E
+1400007C157C00FC157E48153EA46C157E007E15FCD87F801303D83FE0EB0FF8D81FFCEB
+7FF06CB612E0000315806C1500D8003F13F8010713C028387EA42C>I<EA7FF0487EA312
+7F1201AAEC1FE0EC7FFC9038F9FFFE01FB7F90B6FC9138F03F80ECC01F02807FEC000F5B
+5BA25BB3267FFFE0B5FCB500F11480A36C01E0140029337FB22C>I<1307EB1FC0A2497E
+A36D5AA20107C7FC90C8FCA7387FFFC080B5FC7EA2EA0007B3A8007FB512FCB612FEA36C
+14FC1F3479B32C>I<140EEC3F80A2EC7FC0A3EC3F80A2EC0E0091C7FCA748B512804814
+C0A37EC7120FB3B3A2141F003C1480007E133FB414005CEB01FEEBFFFC6C5B5C001F5B00
+0790C7FC1A467CB32C>I<EA7FE0487EA3127F1201AA91381FFFF04A13F8A36E13F09138
+00FE004A5A4A5A4A5A4A5A4A5A4A5A4AC7FC14FEEBF1FC13F3EBF7FE90B5FCA2EC9F80EC
+0FC001FE7FEBFC07496C7E496C7E811400157E811680151F3A7FFFC0FFFCB500E113FEA3
+6C01C013FC27337EB22C>I<387FFFE0B57EA37EEA0003B3B3A5007FB61280B712C0A36C
+158022337BB22C>I<3A7F83F007E09039CFFC1FF83AFFDFFE3FFCD87FFF13FF91B57E3A
+07FE1FFC3E01FCEBF83F496C487E01F013E001E013C0A301C01380B33B7FFC3FF87FF002
+7F13FFD8FFFE6D13F8D87FFC4913F0023F137F2D2481A32C>I<397FF01FE039FFF87FFC
+9038F9FFFE01FB7F6CB6FC00019038F03F80ECC01F02807FEC000F5B5BA25BB3267FFFE0
+B5FCB500F11480A36C01E0140029247FA32C>I<EB07FCEB1FFF017F13C048B512F04880
+3907FC07FC390FF001FE48486C7E0180133F003F158090C7121F007EEC0FC0A348EC07E0
+A76C140F007E15C0A2007F141F6C15806D133F6C6CEB7F006D5B6C6C485A3907FC07FC6C
+B55A6C5C6C6C13C0011F90C7FCEB07FC23247CA32C>I<397FF01FE039FFF8FFF801FB13
+FE90B6FC6C158000019038F07FC09138801FE091380007F049EB03F85BED01FC491300A2
+16FE167EA816FE6D14FCA2ED01F86D13036DEB07F0150F9138801FE09138E07FC091B512
+80160001FB5B01F813F8EC3FC091C8FCAD387FFFE0B57EA36C5B27367FA32C>I<903903
+FC078090391FFF0FC0017F13CF48B512EF4814FF3807FE07380FF00148487E49137F4848
+133F90C7FC48141F127E150F5AA87E007E141FA26C143F7F6C6C137F6D13FF380FF00338
+07FC0F6CB6FC6C14EF6C6C138F6D130FEB07F890C7FCAD0203B5FC4A1480A36E14002936
+7DA32C>I<D87FFEEB3FC0B53801FFF0020713F8021F13FC6C5B39003F7FE1ECFF019138
+FC00F84A13704A13005CA25C5CA391C8FCAF007FB512E0B67EA36C5C26247EA32C>I<90
+387FF8700003B512F8120F5A5A387FC00F387E00034813015AA36CEB00F0007F140013F0
+383FFFC06C13FE6CEBFF80000314E0C66C13F8010113FCEB0007EC00FE0078147F00FC14
+3F151F7EA26C143F6D133E6D13FE9038F007FC90B5FC15F815E000F8148039701FFC0020
+247AA32C>I<131E133FA9007FB6FCB71280A36C1500D8003FC8FCB1ED03C0ED07E0A5EC
+800F011FEB1FC0ECE07F6DB51280160001035B6D13F89038003FE0232E7EAD2C>I<3A7F
+F003FF80486C487FA3007F7F0001EB000FB3A3151FA2153F6D137F3900FE03FF90B7FC6D
+15807F6D13CF902603FE07130029247FA32C>I<3A7FFF01FFFCB514FE148314016C15FC
+3A03E0000F80A26D131F00011500A26D5B0000143EA26D137E017C137CA2017E13FC013E
+5BA2EB3F01011F5BA21483010F5BA214C701075BA214EF01035BA214FF6D90C7FCA26D5A
+147C27247EA32C>I<D87FFFEB7FFF6EB5FCB515806C16004A7ED807C0EB01F0A66C6C49
+5AA3143E147FA2D801F0495AECFF87A214F7A201F113C700005D9038F9E3CFA201FB13EF
+A3D97BC190C7FC017F13FFA21480A2013F5B90381F007C29247FA32C>I<3A3FFF03FFF0
+48018713F8A36C010313F03A00FC007E005D90387E01F8013F5BEB1F83EC87E090380FCF
+C0903807EF80EB03FF6D90C7FC5C6D5A147C14FE130180903803EF80903807CFC0EB0FC7
+EC83E090381F01F0013F7FEB7E00017C137C49137E0001803A7FFF01FFFC1483B514FE6C
+15FC140127247EA32C>I<3A7FFF01FFFCB5008113FE148314816C010113FC3A03E0000F
+806C7E151F6D140012005D6D133E137C017E137E013E137CA2013F13FC6D5BA2EB0F815D
+A2EB07C1ECC3E0A2EB03E3ECE7C0130114F75DEB00FFA292C7FC80A2143EA2147E147CA2
+14FC5CA2EA0C01003F5BEA7F83EB87E0EA7E0F495A387FFF806C90C8FC6C5A6C5AEA07E0
+27367EA32C>I<003FB612E04815F0A4007EC7EA1FE0ED3FC0ED7F80EDFF004A5A003C49
+5AC7485A4A5A4A5A4A5A4A5A4AC7FCEB01FC495AEB0FF0495A495A495A49C8FC4848EB01
+E04848EB03F0485A485A485A485A485AB7FCA46C15E024247DA32C>I<15FF0207138014
+1F147F91B512004913C04AC7FCEB03F85CB31307EB1FE013FF007F5BB55A49C8FC6D7E6C
+7FC67F131FEB07F01303B380EB01FEECFFC06D13FF6E1380141F14070200130021417BB9
+2C>I<127812FCB3B3B3A9127806416DB92C>I<EA7FC0EAFFF813FE6D7E6C7FC67F131FEB
+07F01303B380EB01FEECFFC06D13FF6E1380141F147F91B512004913C04AC7FCEB03F85C
+B31307EB1FE013FF007F5BB55A49C8FC13F8EA7FC021417BB92C>I
+E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Fg cmbx10 14.4 42
+/Fg 42 123 df<DC7FFFEC3FFC030FB5D8E003B5FC92B6D8F81F14C00207DBFE7F14E002
+1F92B712F0027FD9E0079138F07FF89127FFFE0001ECC0FF4901F049020013FC49494949
+5A4901804913FC4990C714F8495A013F17F05C7413F849486E49EB7FF0F33FE071ED1FC0
+7192C7FCADBC7EA626007FFCC7000101F0C8FCB3B3A5007FB5D8FC01B612FCA656547DD3
+50>11 D<EF1FC04D7EA24D7EA24D7EA34C7FA24C7FA34C7FA24C80A34C80A24C80A217BF
+047F80171F04FF80A24C7E0301814C7E030381A24C7E0307814C7E030F82A24C7E031F82
+4C7F033F825E84037F8293C77E4B825D840201834B800203835D02076F7FA292B9FC4A84
+A24A84A3DA3FC0C86C7F4B81027F84A292C97E4A844A82010185A24A820103854A820107
+85A24A82010F86496C82B600FC0207B712F8A65D537BD268>65 D<BA12E019FF1AE01AFC
+1AFF87D8000701F8C7000114E0DE003F7F737F737F737F8587851C8085A21CC0A81C8061
+1C00A24F5B61634F5B4F5B077F13C04EB55A060F49C7FC92B812F81AC0A21AFC1AFF03F8
+C86C13C0071F13F007077F7313FE737F731480A27413C01CE0A27413F0A31CF886A662A2
+1CF0A35013E0A297B512C0614F14804F14004F5B073F5B4EB55ABC5A1BC06308FCC7FC1A
+E007FCC8FC55527CD162>I<932601FFFCEC03C0047FD9FFC013070307B600F8130F033F
+03FE131F92B8EA803F0203EFC0FF020FDAF00113F1023F49C7EA3FFB4A01F00207B5FC49
+B500C0804991C9FC4949824901F88249498249498249498290B5488292CAFC4885485B86
+485B481A7FA24849183FA3485B1B1FA25AA24A95C7FCA3B5FCAE7EA280A2F30FC07EA36C
+7FA21B1F6C6D1980A26C1A3F6C7F1C006C6D606C6E17FEA26D6D4C5A6D6D4C5A6D6D1607
+6D6D4C5A6D01FE4C5A6D6D4C5A6D02C0EDFF806D6C01F8020390C7FC6E01FFEC1FFE020F
+02F0EBFFF8020391B65A020017C0033F93C8FC030715FCDB007F14E0040101FCC9FC5254
+78D263>I<BA12C019FEF1FFC01AF81AFE747ED8000701F8C7000F14E0060080071F13FC
+07077F07017F7380747F081F7F8886747F747FA2747FA288861D80A2871DC0A31DE0A487
+1DF0AF1DE063A41DC0A398B51280A31D0062646264505BA2505B505B505B505B4FB5C7FC
+4F5B070F5B077F5B0607B512E0BC128098C8FC1AF81AE04FC9FC19C05C527CD169>I<BC
+7EA487A2D8000701FCC71203F0003F1907851900747E1A3FA21A1F1A0FA3747EA31A0318
+7EA3871A01A306FE90C8FCA3170117031707173F92B6FCA69238FC003F17071703170117
+00A2F31F80187EA2F33F00A595C85AA21B7EA21BFEA31A01631A031A07A21A0F1A1F1A3F
+F2FFF81903190F4EB5FCBCFCA363A351517CD05A>I<BCFCA41B80A2D8000701FCC71207
+F0007F190F1903857313C01A7FA21A3F1A1FA21A0F1BE0A31A07A2187EA21BF01A03A397
+C7FC18FEA3170117031707173F92B6FCA69238FC003F1707170317011700A3187EA795C9
+FCB2B812FCA64C517CD057>I<932601FFFCEC01E0047FD9FFE013030307B600F8130703
+1F03FF130F92B8EAC01F0203EFE07F020FDAF801EBF8FF023F91C7EA1FFD4A01F80207B5
+FC91B500C01401010391C97E4949824901F88249498249498249498290B54882A24891CB
+FC485B1B7F485B1B3F5A4A181F5AA2485B1B0FA25AA298C8FC5CA2B5FCAE6C057FB712F0
+A280A37E95C7003FEBE000A26C7FA27E807EA26C7FA26C7F6C80A26D7F6D7F6D7F6D01FC
+5E6D7F6D6D6C92B5FC010002E05C6E01F85C6E01FF140F020F02F8EBFFF9020391B612F0
+0200EFE03F031FEE800F03079238FE0003DB007F02F01300040191CAFC5C5478D26C>I<
+B800E090B812E0A6D8000701FCC9000701FCC7FCB3AC92BAFCA603FCC91207B3B0B800E0
+90B812E0A663527CD16C>I<B812E0A6D8000701FCC7FCB3B3B3B0B812E0A62B527CD134>
+I<B800E0027FB6FCA6D8000701FCCAD87FF8C7FC1CE0F3FF805090C8FC505AF20FFC505A
+F23FE0505A505A070390C9FC4F5AF10FF84F5A4F5AF1FFC04E5B4E90CAFCF007FC4E5AF0
+3FF04E5A4E5A4D90CBFC4D5AEF0FFC171F4D7E4D7E94B57E0403805E4C804C804C8093B6
+FC03FD019F7F92B5000F7F04FC804C7E4C6C804C6C8004C08193C7FC4B6E7F4B6E7F8672
+7F84727F87728084728087737F85737F737F87857380738088738086747F88747F88B800
+E0011FB712C0A662527CD16C>75 D<B812FCA6D8000701FCCAFCB3B3A71A3FA41A7EA51A
+FEA3F101FCA31903A21907190F191FA2F13FF819FF601807181F4DB5FCBBFCA21AF0A448
+527CD153>I<B600FC070FB612C06F616F61A27060A2D800070BF8C7FC7018FBA202F76D
+EF01F3A202F36DEF03E3A202F16DEF07C3A202F06DEF0F83A26F6CEF1F03A36F6C173EA2
+6F6D167CA26F6D16F8A26F6DED01F0A26F6DED03E0A36F6DED07C0A26F6DED0F80A2706C
+ED1F00A2706C153EA2706D5CA3706D5CA2706D495AA2706D495AA2706D495AA2706D495A
+A2716C49C7FCA3716C133EA2716D5AA2716D5AA271EBE1F0A271EBF3E0A371EBFFC0A271
+5CA27290C8FCA2725AA2725A497EB76C057FB712C0725AA2725AA2725A7A527CD183>I<
+93380FFFC00303B6FC031F15E092B712FC020316FF020FD9FC0014C0023F01E0011F13F0
+4A90C700037F4948486E13FE4901F86E6C7E49496F7F49496F7F49496F7F49496F7F4990
+C96C7F90B5844A8248864849707FA24849711380A248497113C0A2481BE0A24A83481BF0
+A3481BF8A24A83A3B51AFCAF6C1BF8A36E5FA26C1BF0A36C1BE06E5FA26C1BC06E5F6C1B
+80EE01FE6C6D902607FF8090B512006C031F01E05C6E496D5A6C4B01F85C6D6C9027FF03
+FC035B6D902881FC00FE075B6DD9C1F8D97F0F5B6D01E1DA3F9F5B6DD9F1F06DB55A6D01
+F994C7FC6DD9FFF86D5B6D60023F6D4913F0020F01FF90B512C0020391B6C8FC020016FC
+031F6F140C03036F141EDB001F01E37F93C700016D133E869738F801FE97B5FCA2841CFC
+A285A21CF8A2851CF07314E0A27314C0731480731400735B9638007FF8F21FE0576A78D2
+67>81 D<B912FCF0FFE019FEF1FFC01AF01AFCD8000701F8C7003F13FF06038006008007
+3F7F737F737F87737FA2737FA388A899C8FCA263616361634F5B4F5B96B55A060391C9FC
+063F5B92B812F81AC097CAFC19FC19FF9226F8000180DD003F13E0060F7F727F727F8672
+7FA27280A2737FA587A587A575EB0780F50FC0A28773151FA2736D148075133FB800C06D
+EC807F739138C1FF000701ECFFFE735D083F5C080714E0CE001F138062537CD167>I<91
+261FFF80130F91B500F85B010702FF5B011FEDC07F49EDF0FF90B712F948D9FC0190B5FC
+489038E0000F48018013034848C8FC173F4848814981003F8283485A838312FFA2847FA2
+6D82A27F7F6E92C7FC14E06C13FCECFFC015FE6CECFFE016FF6C16E017F86C16FE6C8284
+6C17E06C836C837F011F826D82010382EB007F020F1680EC007F1503DB003F14C0160316
+00053F13E0838383127C00FC82A383A27E19C0A27EA26D4B1380A27F6D4B130001F85E6D
+150F01FF4B5A02C04A5A02F8ECFFF09126FFC0075B019F90B65A010F5ED8FE034BC7FC48
+C66C5C48010F14E0489026007FFEC8FC3B5478D24C>I<001FBC12C0A5481BE09126F000
+3F9038E0007F91C7160701FC1801498401E0193FA249191F49190FA248C8EF07F0A4007E
+1A03A500FE1BF8481A01A4C994C7FCB3B3AA91B912F8A655517BD060>I<B700FE013FB7
+6C013FB512FEA6D8003F01F0C8000F01FCC9380FFC006DF603F06F6F18076D735F856F1C
+0F6D735F6F8176151F6D71616F1C3F6D7493C7FCA270715D6D4D187E701BFE4F806E6570
+1A016E4C6E5D1AEF707114036E040F607003C716076E041F6E5D1A83701A0F6E043F6E5D
+701501077F6F131F6E6570DA7E00163F6E04FE6F91C8FC4F7F71616E030170137E05C049
+7F06037013FE6F4B6D5D05E018016F020704F85B4F7F05F0EFFC036F020F6005F8496D14
+07061F16FE6F4B6D5D05FC180F6F023F04FF5B96C77E7148179F6F63DDFF7E6E14BF6F02
+FE05FFC9FC4E81A26F624E81A270496F5BA270614E81A270614E81A270496F5BA2706195
+C97EA270614D82A2704871CAFC7048173E87537DD18E>87 D<91383FFFC00107B512FC01
+1FECFF80017F15E090B77E48D9E0077F48D9800013FE486DEB3FFF82486D81707F8284A2
+707F6C5BA26C5BC648C7FC90C8FCA44BB5FC4AB6FC143F49B7FC130F013FEBFE0390B512
+E0000314004813FC4813F0485B485B5C4890C7FCA2B5FC5BA35EA27F6C5D5E6E497F6C6D
+017E13FE6C6D4848EBFFF86C9026FC0FF814FC6C90B5487E0001EDC03F6C6CEC800F011F
+9026FE000313F8010101E090C8FC3E387CB643>97 D<EB3FF8B5FCA61203C6FCB3A3EE7F
+F80307B57E031F14F0037F14FC02F9B67E02FB9038807FFF9127FFFC001F13C003F00107
+7F03C06D7F4B7F4AC780717F5C727EA285A2721380A41AC0AD1A80A34E1300A36118FF61
+806E4A5B6F495B6F495B6F495BDAE7F8013F5B9126C3FF01B5C7FC028190B512FCDA007F
+5C496D14E049010791C8FC90C813F042547CD24C>I<913803FFF0023FEBFF8091B612E0
+010315F8010F81499038C01FFE903A7FFE0007FF4948491380485B48494913C05C5A485B
+A2485B7013805A70130048ED01FC91CAFCA3B5FCAD7E80A27EA2EF07E06C7F170F6C6D15
+C06C161F6E15806C6D143F6C6DEC7F006C6D14FE903A7FFF8003FC6D9038F01FF8010F90
+B55A6D5D01011580D9003F49C7FC020313E033387BB63D>I<943801FFC00407B5FCA6EE
+001F1707B3A3913803FFC0023F13FC49B6FC010715C74915F7013FD9E03FB5FC49EB0007
+D9FFFC130148496D7E484980484980484980A25A5C5AA25A91C8FCA3B5FCAD7EA46C7FA2
+7EA26C6D5CA26C6D5C6C5E6C6D49B5FC6C6D4914F0D97FFE010FECFFC0903A3FFF807FEF
+6D90B512CF0107158F6DECFE0FD9007F13F00207018049C7FC42547BD24C>I<913803FF
+E0023F13FE91B612C0010381010F15F84901C07F903A7FFE001FFE49486D7E48496D1380
+48496D13C0484915E048814A15F048815C48EE7FF8A25A91C8FC18FC173FB5FCA391B7FC
+A418F891CAFCA57EA3807EA218786C6D15FC17016C7F6CEE03F86C6D14076E15F06C6DEC
+1FE06C6C6C143F6D6C6CEBFFC06DD9F0071300010790B55A010115F86D6C14E0021F1480
+020001F8C7FC36387CB63F>I<ED0FFF92B512C0020714F0021F14F8027F14FC9139FFFC
+1FFE49EBF03F4901C013FF49495A491300495AA2495AA2017FEC3FFE4AEB1FFCEE0FF8EE
+07F093C7FCADB712F0A626007FFCC8FCB3B3A5007FB6FCA630547CD32A>I<91261FFF80
+EB3FC049B539F803FFE00107DAFE0F13F0011FDAFFBF13F8017F92B512FC9026FFFC0314
+CF48D9F000EBFC1F4801C0013F130F4816FE4849D91FFF13F8F007F04890C76CEB81E0F0
+8000A24883A86C5FA36C6D4990C7FCA26C6D495A6C5E6C01F0EBFFF86CD9FC035B4890B6
+5A1780D803E74AC8FC01E114F82607E01F138091CBFC120FA37FA27F13FE90B712C06C16
+FCEFFF8018E06C17F8846C836C836D178048B912C012074818E04848C8FCD83FF8150F48
+48030313F01700485A187FA56D16FF007F18E06D5D6C6C4B13C06C6C4B13806C6C6C021F
+13006C01F0ECFFFE6C01FF010F5BC691B612F0013F16C0010F93C7FC010115F8D9000749
+C8FC3E4F7CB545>I<EB3FF8B5FCA61203C6FCB3A3EE1FFE93B512E0030314F8030F804B
+8092393FE07FFF92267F001F7F15FCDAF9F86D7FECFBE014FF4B6D7F5D92C7FCA35CA35C
+B3ABB6D8FC07B612E0A643537BD24C>I<137F3801FFC0487F487F487FA2487FA76C5BA2
+6C5B6C5B6C5B6C6CC7FC90C8FCABEB1FF8B5FCA612017EB3B3A4B612F0A61C547BD326>
+I<EB3FF8B5FCA61203C6FCB3A44CB512FEA69326001FFCC7FCEF3FF04D5A4D5A4C90C8FC
+EE07FE4C5A4C5AEE3FE0EEFFC04B5B4B48C9FCED0FFC4B5A153F4B7E9138F9FFFE02FB7F
+91B67EA28383038F7F03077F14FE4A6C7F4A6C7F6F7F707FA2707F707F707F707FA2707F
+707F707F717F8385B6D8F803B612C0A642537CD249>107 D<EB3FF8B5FCA612017EB3B3
+B3AFB612F8A61D537BD226>I<D93FF8D90FFFED3FFCB5027F01E049B57E0303B500F801
+0F14E04B02FE4914F8031F6E017F8092263FE03F902680FF807F4BC66C903AC1FC007FFF
+000302FC6DD9C3F07FC6D9F9F86DD9E7E06D7FDAFBF0EDEFC04B5EDAFFC06D01FFC76C7F
+4B5DA292C75CA24A5EA34A5EB3ABB6D8FC03B6D8F00FB612C0A66A367BB573>I<D93FF8
+EB1FFEB591B512E0030314F8030F804B8092393FE07FFF92267F001F7F000314FCC6D9F9
+F86D7FECFBE014FF4B6D7F5D92C7FCA35CA35CB3ABB6D8FC07B612E0A643367BB54C>I<
+EDFFF0021FEBFF80027F14E00103B612FC4981011F9039C03FFF8090273FFE00077FD97F
+F801017F49486D7F48496E7E488348496E7E48834A80481880A24818C091C87EA24818E0
+A4B517F0AB6C18E0A46C18C06E5CA26C1880A26C6D4A13006C5F6E147F6C5F6C6D4A5A6C
+01FC01035B6D6C495B90271FFFC03F13806D90B6C7FC010315FC010015F0021F14800201
+01F8C8FC3C387CB645>I<D93FF8EB7FF8B50107B57E031F14F0037F14FC02F9B67E02FB
+01807F9127FFFC003F13C0000302F0010F7FC602C06D7F5D4AC76C7F717F5C717FA28584
+1A80A47213C0AD4E1380A31A0095B5FCA2615F616E5C6E5E6F495B6F495B6F495B03F801
+7F5BDBFF01B5C7FC02FD90B512FCDAFC7F5C6F14E0030791C8FC030013F093CAFCB0B612
+FCA6424D7CB54C>I<90393FF001FFB5010F13E04B13F84B7F4B7F9238FF1FFFECF1FC00
+039026F3F03F1380C6EBF7E015C0ECFF80A215007013005C705AEE03F84A90C8FCA45CB3
+A9B612FEA631367CB539>114 D<903A01FFF00780011FEBFF1F90B7FC5A120748EB001F
+D81FF8130701E0130148487F007F157F49143FA200FF151FA27FA27F01F891C7FC13FF14
+F06CEBFFC015FE6F7E6C15E06C15F86C816C816C816C16806C6C15C0011F15E01303D900
+1F14F01400030713F81501007CEC007F00FC153F161F7E160F7EA26D15F0A26D141F6D15
+E06D143F6DEC7FC001FE903801FF809026FFC00F130091B55A01BF5CD8FE1F14F0D8FC07
+14C027F0007FFCC7FC2D387CB636>I<143FA65CA45CA25BA35B5BA25B5B5B90B5FC5A00
+0F91B5FCB8FCA5D8003F90C8FCB3A8EE07E0AB6DEC0FC01580161F6D01C01380163F6D90
+38F07F006DEBFFFE6D5C6D6C5B021F13E0020313802B4D7ECB35>I<D91FFCEDFFE0B502
+07B5FCA60003ED001FC61607B3AD5FA35FA25F017F5D6E91B5FC013FDA01FB13F86ED907
+F3EBFFE06D9038C01FE36D90B512C36D15830101ECFE036D6C13F8020701C0EC80004337
+7BB54C>I<B600F80107B512C0A6C649C8383FE000017FEE1F806E153FA26D6D4AC7FCA2
+6D6D147E18FE6D6D5C17016D5E6F13036D5E6F13076D5E6F130F6D5E6F131FA26E6C495A
+A26E018090C8FC5F6E147EEEC0FE6E5C16E16E5C16F36E5C16FFA26E5CA26E5CA26F5BA2
+6F90C9FCA26F5AA26F5AA26F5AA26F5A42357DB449>I<B6D8F07FB5D8E001B512F0A600
+0101FCC7D87FF8C73807F8006C745A7214076E143F017F626E6E6C140F6D624D6C141F6D
+6D605F6F6F133F6D97C7FC6F90B56C5B6D197E5E03F001F96D13FE6D02035E03F8EDF001
+6D03F05D160703FC9039E07FF8036D020F5E03FEEDFC07027FDAC03F5C041F14FE03FFD9
+801F130F6E013F5E04BFECFF1F6E4A6C5C04FF159F4C6D13BF6E95C8FC4C6D13FF6E5FA2
+4C7F6E5F4C7F6E5FA24C147F6E5F4C143F037F5EA26F486E5A6FC86C5A5C357DB463>I<
+007FB500F8013FB51280A6D8003F0180D907FEC7FC6D6D6D5A6D6D495A6D6D495A6D4B5A
+6D6D495A6F495A6D6D49C8FC6E6C485A6E13816EEB83FC6EEBC7F8EEEFF06EEBFFE06E5C
+6E5C6E91C9FC81A26F7F6F7F6F7F5D4B7F4B7F92B57E834A486C7E4A487EDA07F8804A48
+6C7F4A486C7F4A486C7F4A486C7F82DAFF008049486D7F49486E7E49486E7F49486E7F01
+3F81B691B612F0A644357EB449>I<B600F80107B512C0A6C649C8383FE000017FEE1F80
+6E153FA26D6D4AC7FCA26D6D147E18FE6D6D5C17016D5E6F13036D5E6F13076D5E6F130F
+6D5E6F131FA26E6C495AA26E018090C8FC5F6E147EEEC0FE6E5C16E16E5C16F36E5C16FF
+A26E5CA26E5CA26F5BA26F90C9FCA26F5AA26F5AA26F5AA35EA25E150F5E151FD81FE05C
+486C133F486C91CAFC5D486C137E15FE4A5AA24A5A49485A007F495A9038F03FC06C48B4
+5A90B5CBFC6C5B000713F86C13E0C66CCCFC424D7DB449>I<001FB8128018C0A4DAC000
+148049C7140001F85B49495B49495B495D003F5C49495B4B5B5F5D90C7B55A4A91C7FC5E
+5C4A5B4A5BC75C5C4A5B4A5B5E91B5FC4991C8FC4949EB0FC05D5B495B495B4B131F4916
+80495B90B55A92C7FC48163F485B4849147F5C4816FF48495B48495B4A130F4892B51200
+B9FCA47E32357CB43D>I E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Fh cmr10 10 61
+/Fh 61 124 df<DA0FF813FC91397FFF07FF903B01F807DF83C0903A07E001FF0F903B1F
+8007FE1FE090393F000FFC137E16F85B9338F007804848010790C7FC1503ACB812F8A328
+01F80003F0C7FCB3AB486C497E267FFFE0B512F0A3333B7FBA30>11
+D<EC0FF8EC7FFE903901F80780903907E001C090391F8000E090383F0007017E497EA25B
+A2485A6F5AED018092C8FCA9ED03F0B7FCA33901F8000F1503B3AA486C497E267FFFE0B5
+12C0A32A3B7FBA2E>I<001C131C007F137F39FF80FF80A26D13C0A3007F137F001C131C
+00001300A40001130101801380A20003130301001300485B00061306000E130E485B485B
+485B006013601A197DB92A>34 D<121C127FEAFF80A213C0A3127F121C1200A412011380
+A2120313005A1206120E5A5A5A12600A1979B917>39 D<146014E0EB01C0EB0380EB0700
+130E131E5B5BA25B485AA2485AA212075B120F90C7FCA25A121EA2123EA35AA65AB2127C
+A67EA3121EA2121F7EA27F12077F1203A26C7EA26C7E1378A27F7F130E7FEB0380EB01C0
+EB00E01460135278BD20>I<12C07E12707E7E7E120F6C7E6C7EA26C7E6C7EA21378A213
+7C133C133E131EA2131F7FA21480A3EB07C0A6EB03E0B2EB07C0A6EB0F80A31400A25B13
+1EA2133E133C137C1378A25BA2485A485AA2485A48C7FC120E5A5A5A5A5A13527CBD20>
+I<121C127FEAFF80A213C0A3127F121C1200A412011380A2120313005A1206120E5A5A5A
+12600A19798817>44 D<B512FCA516057F941C>I<121C127FEAFF80A5EA7F00121C0909
+798817>I<150C151E153EA2153C157CA2157815F8A215F01401A215E01403A215C01407
+A21580140FA215005CA2141E143EA2143C147CA2147814F8A25C1301A25C1303A2495AA2
+5C130FA291C7FC5BA2131E133EA2133C137CA2137813F8A25B1201A25B1203A25B1207A2
+5B120FA290C8FC5AA2121E123EA2123C127CA2127812F8A25A12601F537BBD2A>I<EB01
+C013031307131F13FFB5FCA2131F1200B3B3A8497E007FB512F0A31C3879B72A>49
+D<EB0FF0EB7FFE48B57E3903E03FE0390F000FF0000E6D7E486D7E486D7E123000706D7E
+126012FCB4EC7F807FA56CC7FC121CC8FCEDFF00A34A5A5D14035D4A5A5D140F4A5A4A5A
+92C7FC147C5C495A495A495A495A91C8FC011EEB01805B5B49130348481400485A485A00
+0EC75A000FB6FC5A5A485CB6FCA321387CB72A>I<EB07F8EB3FFF4913C03901F80FF039
+03C007F848486C7E380E0001000F80381FE0006D7FA56C5A6C5AC85A1401A25D4A5AA24A
+5A5DEC0F80027EC7FCEB1FFCECFF809038000FE06E7EEC01FC816E7EED7F80A216C0A215
+3F16E0A2121EEA7F80487EA416C049137F007F1580007EC7FC0070ECFF006C495A121E39
+0F8003F83907F00FF00001B512C06C6C90C7FCEB0FF8233A7DB72A>I<1538A2157815F8
+A2140114031407A2140F141F141B14331473146314C313011483EB030313071306130C13
+1C131813301370136013C01201EA038013005A120E120C5A123812305A12E0B712F8A3C7
+3803F800AB4A7E0103B512F8A325397EB82A>I<0006140CD80780133C9038F003F890B5
+FC5D5D158092C7FC14FC38067FE090C9FCABEB07F8EB3FFE9038780F803907E007E09038
+8003F0496C7E12066E7EC87EA28181A21680A4123E127F487EA490C71300485C12E00060
+5C12700030495A00385C6C1303001E495A6C6C485A3907E03F800001B5C7FC38007FFCEB
+1FE0213A7CB72A>I<EC3FC0903801FFF0010713FC90380FE03E90383F800790387E001F
+49EB3F804848137F485AA2485A000FEC3F0049131E001F91C7FCA2485AA3127F90C9FCEB
+01FC903807FF8039FF1E07E090383801F0496C7E01607F01E0137E497FA249148016C015
+1FA290C713E0A57EA56C7E16C0A2121FED3F807F000F15006C6C5B15FE6C6C5B6C6C485A
+3900FE07F090383FFFC06D90C7FCEB03FC233A7DB72A>I<EB03F8EB1FFF017F13C09038
+FC07E03903F803F048486C7E48486C7E49137E121F48487FA2007F158090C7FCA248EC1F
+C0A616E0A56C143FA27F123F001F147FA26C6C13FF3907E001DF0003149F3801F0033900
+FC0F1FD93FFC13C0EB07F090C7FC153F1680A316005D000F147E487E486C5BA24A5A4A5A
+49485A6C48485A001C495A260F807FC7FC3807FFFC000113F038003FC0233A7DB72A>57
+D<121C127FEAFF80A5EA7F00121CC7FCB2121C127FEAFF80A5EA7F00121C092479A317>
+I<1538A3157CA315FEA34A7EA34A6C7EA202077FEC063FA2020E7FEC0C1FA2021C7FEC18
+0FA202387FEC3007A202707FEC6003A202C07F1501A2D901807F81A249C77F167FA20106
+810107B6FCA24981010CC7121FA2496E7EA3496E7EA3496E7EA213E0707E1201486C81D8
+0FFC02071380B56C90B512FEA3373C7DBB3E>65 D<B712C016F816FE000190398001FF80
+6C90C7EA3FE0EE0FF0EE03F8707E707E177FA2EF3F8018C0171F18E0170F18F0A3EF07F8
+A418FCAC18F8A4EF0FF0A218E0A2171F18C0EF3F80A2EF7F0017FE4C5A4C5AEE0FF0EE3F
+E0486DEBFF80B8C7FC16F816C036397DB83F>68 D<B812FCA30001903880000F6C90C712
+01EE007E173E171E170EA31706A317078316C0A394C7FCA31501A21503150F91B5FCA3EC
+000F15031501A21500A21860A318E093C712C0A41701A3EF0380A21707A2170F173F177F
+486D903807FF00B9FCA333397DB839>I<B812F8A30001903880001F6C90C71201EE00FC
+177C173C171CA2170CA4170E1706A2ED0180A21700A41503A21507151F91B5FCA3EC001F
+15071503A21501A692C8FCAD4813C0B612C0A32F397DB836>I<DBFF8013C0020FEBF001
+023F13FC9139FF803F03903A03FC000787D90FF0EB03CF4948EB00EF4948147F4948143F
+49C8121F485A4848150F48481507A248481503A2485A1701123F5B007F1600A448481600
+AB93B6FCA26C7E9338007FE0EF3FC0A2123F7F121FA26C7EA26C7EA26C7E6C7E6C6C157F
+6D7E6D6C14FF6D6C14EFD90FF8EB03C7D903FEEB0783903A00FFC03F0191393FFFFC0002
+0F01F0130002001380383D7CBA41>I<B612C0A3C6EBC0006D5AB3B3AD497EB612C0A31A
+397EB81E>73 D<B612E0A3000101C0C8FC6C90C9FCB3AD1718A517381730A31770A317F0
+A216011603160FEE1FE0486D13FFB8FCA32D397DB834>76 D<B5933807FFF86E5DA20001
+F0FC002600DFC0ED1BF8A2D9CFE01533A3D9C7F01563A3D9C3F815C3A2D9C1FCEC0183A3
+D9C0FEEC0303A2027F1406A36E6C130CA36E6C1318A26E6C1330A36E6C1360A26E6C13C0
+A3913901FC0180A3913900FE0300A2ED7F06A3ED3F8CA2ED1FD8A3ED0FF0A3486C6D5A48
+7ED80FFC6D48497EB500C00203B512F8A2ED018045397DB84C>I<B5913807FFFE8080C6
+9238007FE06EEC1F80D9DFF0EC0F001706EBCFF8EBC7FCA2EBC3FEEBC1FFA201C07F6E7E
+A26E7E6E7E81140F6E7E8114036E7E168080ED7FC016E0153FED1FF0ED0FF8A2ED07FCED
+03FEA2ED01FF6F1386A2EE7FC6EE3FE6A2EE1FF6EE0FFEA216071603A216011600A2177E
+486C153E487ED80FFC151EB500C0140EA2170637397DB83E>I<EC03FF021F13E09138FE
+01FC903901F8007ED907E0EB1F8049486D7ED93F80EB07F049C76C7E01FE6E7E48486E7E
+49157E0003167F4848ED3F80A24848ED1FC0A2001F17E049150F003F17F0A3007F17F849
+1507A300FF17FCAC007F17F86D150FA3003F17F0A26C6CED1FE0A36C6CED3FC000071780
+6D157F000317006C6C15FEA26C6C4A5A017F4A5A6D6C495A6D6C495AD907E0EB1F80D903
+F8017FC7FC903900FE01FC91381FFFE0020390C8FC363D7BBA41>I<003FB812E0A3D9C0
+03EB001F273E0001FE130348EE01F00078160000701770A300601730A400E01738481718
+A4C71600B3B0913807FF80011FB612E0A335397DB83C>84 D<B6903807FFFEA300010180
+9038007FE06C90C8EA1F80EF0F001706B3B2170E6D150C80171C133F17186D6C14385F6D
+6C14F06D6C5C6D6C495A6D6CEB07806D6C49C7FC91387F807E91381FFFF8020713E09138
+007F80373B7DB83E>I<B500FC91387FFF80A30003018091380FFC006C90C8EA07E0715A
+6C705A6E1403017F93C7FCA280013F1506A26E140E011F150C80010F5DA28001075DA26E
+147001031560A26D6C5CA2806D4A5AA2ED8003027F91C8FCA291383FC006A215E0021F5B
+A2EDF01C020F1318A26E6C5AA215FC02035BA2EDFEE002015BA26E6C5AA36FC9FCA3153E
+A2151CA3393B7EB83E>I<B5D8FC07B5D8F001B5FCA30007902780001FFEC7EA1FF86C48
+C7D80FF8EC07E000010307ED03C01B807F6C6F6C1500A26E5F017F6E6C1406A280013F4A
+6C5CA280011F4A6D5BEE067FA26D6C010E6D5BEE0C3FA26D6C011C6D5BEE181FA26D6C6F
+5BEE300FA26D6C6F485AEE6007A26D6C4CC7FC9338C003FCA203805D913B7F818001FE06
+A203C1150EDA3FC3C7EAFF0CA203E3151CDA1FE6EC7F98A215F6DA0FFCEC3FF0A302075E
+4B141FA202035E4B140FA202015E4B1407A2020093C8FC4B80503B7EB855>I<007FB590
+383FFFFCA3C601F801071380D97FE0D903FCC7FC013FEC01F06D6C5C5F6D6C5C6D6C1303
+4CC8FC6D6C1306160E6D6C5B6DEB8018163891387FC0306E6C5A16E06E6C5A91380FF180
+15FB6EB4C9FC5D14036E7EA26E7F6F7EA24B7E15DF9138019FF09138038FF8150F913806
+07FC91380E03FE140C4A6C7EEC38000230804A6D7E14E04A6D7E49486D7E130391C76C7E
+01066E7E130E010C6E7E011C1401013C8101FE822607FF80010713E0B500E0013FEBFF80
+A339397EB83E>I<3901800180000313033907000700000E130E485B0018131800381338
+003013300070137000601360A200E013E0485BA400CE13CE39FF80FF806D13C0A3007F13
+7FA2393F803F80390E000E001A1974B92A>92 D<EB1FE0EBFFFC3803E03F3907000F8039
+0F8007E0486C6C7E13E06E7EA26E7E6C5A6C5AC8FCA4147FEB07FFEB3FE0EBFE00EA03F8
+EA0FF0EA1FC0123F485A90C7FC160C12FEA31401A26C13036CEB077C903980063E18383F
+C01E3A0FE0781FF03A03FFF00FE03A007F8007C026277DA52A>97
+D<EA03F012FFA3120F1203B0EC1FE0EC7FF89038F1E03E9039F3801F809039F7000FC001
+FEEB07E049EB03F049EB01F85BED00FCA216FEA2167E167FAA167E16FEA216FC15016D14
+F8ED03F07F01EEEB07E001C6EB0FC09039C7801F00903881E07E903800FFF8C7EA1FC028
+3B7EB92E>I<EB03FC90381FFF8090387E03E03901F80070484813F83907E001FC380FC0
+03A2EA1F80123F90380001F848EB00F01500A2127E12FEAA127E127FA26C14067F001F14
+0E6D130C000F141C6C6C13386C6C13706C6C13E039007C07C090381FFF00EB07F81F277D
+A525>I<ED0FC0EC03FFA3EC003F150FB0EB03F8EB1FFF90387E078F9038F801EF3903F0
+007F4848133F4848131FA24848130F123F90C7FC5AA2127E12FEAA127E127FA27EA26C6C
+131FA26C6C133F6C6C137F6C6CEBEFF03A01F801CFFF39007C078F90381FFE0FD907F813
+C0283B7DB92E>I<EB07F8EB1FFF90387C0FC03901F803E03903F001F0D807E013F8380F
+C0004848137CA248C7127E153E5A153F127E12FEA3B7FCA248C8FCA5127EA2127FA26C14
+037F001F14076C6C13060007140E6D131CD801F013386C6C137090387E03E090381FFF80
+903803FC0020277EA525>I<147E903803FF8090380FC1E0EB1F8790383F0FF0137EA213
+FCA23901F803C091C7FCADB512FCA3D801F8C7FCB3AB487E387FFFF8A31C3B7FBA19>I<
+ED03F090390FF00FF890393FFC3C3C9039F81F707C3901F00FE03903E007C03A07C003E0
+10000FECF000A248486C7EA86C6C485AA200075C6C6C485A6D485A6D48C7FC38073FFC38
+060FF0000EC9FCA4120FA213C06CB512C015F86C14FE6CECFF804815C03A0F80007FE048
+C7EA0FF0003E140348140116F8481400A56C1401007C15F06CEC03E0003F1407D80F80EB
+0F80D807E0EB3F003901FC01FC39007FFFF0010790C7FC26387EA52A>I<EA03F012FFA3
+120F1203B0EC0FF0EC3FFCECF03F9039F1C01F809039F3800FC0EBF70013FE496D7EA25B
+A35BB3A3486C497EB500C1B51280A3293A7EB92E>I<EA0380EA0FE0487EA56C5AEA0380
+C8FCAAEA03F012FFA312071203B3AA487EB512C0A312387EB717>I<EB01C0EB07F0EB0F
+F8A5EB07F0EB01C090C7FCAAEB01F813FFA313071301B3B3A2123C127E00FF13F01303A2
+14E038FE07C0127C383C0F00EA0FFEEA03F8154984B719>I<EA03F012FFA3120F1203B1
+913801FFFCA39138007FC01600157C15705D4A5A4A5A4AC7FC141E1438147814FC13F1EB
+F3FEEBF73F01FE7FEBF81F496C7E8114076E7E6E7E811400157E157F811680ED1FC0486C
+EB3FF0B500C0B5FCA3283A7EB92C>I<EA03F012FFA3120F1203B3B3AD487EB512C0A312
+3A7EB917>I<2703F00FF0EB1FE000FFD93FFCEB7FF8913AF03F01E07E903BF1C01F8380
+3F3D0FF3800FC7001F802603F70013CE01FE14DC49D907F8EB0FC0A2495CA3495CB3A348
+6C496CEB1FE0B500C1B50083B5FCA340257EA445>I<3903F00FF000FFEB3FFCECF03F90
+39F1C01F803A0FF3800FC03803F70013FE496D7EA25BA35BB3A3486C497EB500C1B51280
+A329257EA42E>I<EB03FE90380FFF8090383E03E09038F800F84848137C48487F48487F
+4848EB0F80001F15C090C712074815E0A2007EEC03F0A400FE15F8A9007E15F0A2007F14
+076C15E0A26C6CEB0FC0000F15806D131F6C6CEB3F006C6C137EC66C13F890387E03F090
+381FFFC0D903FEC7FC25277EA52A>I<3903F01FE000FFEB7FF89038F1E07E9039F3801F
+803A0FF7000FC0D803FEEB07E049EB03F04914F849130116FC150016FEA3167FAA16FEA3
+ED01FCA26DEB03F816F06D13076DEB0FE001F614C09039F7803F009038F1E07E9038F0FF
+F8EC1FC091C8FCAB487EB512C0A328357EA42E>I<D903F813C090381FFE0190387E0781
+9038FC01C33903F000E3000714774848133749133F001F141F485A150F48C7FCA312FEAA
+127FA37E6D131F121F6D133F120F6C6C137F6C6C13EF3901F801CF39007E078F90381FFE
+0FEB07F890C7FCABED1FE00203B5FCA328357DA42C>I<3807E01F00FFEB7FC09038E1E3
+E09038E387F0380FE707EA03E613EE9038EC03E09038FC0080491300A45BB3A2487EB512
+F0A31C257EA421>I<EBFF03000313E7380F80FF381E003F487F487F00707F12F0A2807E
+A27EB490C7FCEA7FE013FF6C13E06C13F86C7F00037FC67F01071380EB007F141F00C0EB
+0FC01407A26C1303A37E15806C13077EEC0F00B4131E38F3C07C38E1FFF038C03F801A27
+7DA521>I<1318A51338A31378A313F8120112031207001FB5FCB6FCA2D801F8C7FCB215
+C0A93800FC011580EB7C03017E13006D5AEB0FFEEB01F81A347FB220>I<D803F0EB07E0
+00FFEB01FFA3000FEB001F00031407B3A4150FA3151F12016D133F0000EC77F86D9038E7
+FF8090383F03C790381FFF87903A03FC07E00029267EA42E>I<B538803FFEA33A0FF800
+0FF06C48EB07E00003EC03C06D148000011500A26C6C1306A26D130E017E130CA26D5BA2
+EC8038011F1330A26D6C5AA214E001075BA2903803F180A3D901FBC7FCA214FF6D5AA214
+7CA31438A227257EA32C>I<B53A1FFFE03FFEA3260FF8009038000FF86C48017EEB03E0
+18C00003023EEB0180A26C6C013FEB0300A36C6CEC8006156FA2017E9038EFC00C15C7A2
+D93F016D5A15830281EBF038D91F831430150102C3EBF87090260FC6001360A2D907E66D
+5A02EC137CA2D903FCEB7F804A133FA2010192C7FC4A7FA20100141E4A130E0260130C37
+257EA33C>I<B538807FFFA33A03FE003FF00001EC1F80000092C7FC017E131C6D13186D
+6C5AECC070010F5B6D6C5AECF180EB03FB6DB4C8FC6D5AA2147F804A7E8114CF903801C7
+E090380383F090380703F8EB0601496C7E011C137E49137F01787F496D7E486C80000FEC
+3FF0D8FFFE90B51280A329247FA32C>I<B538803FFEA33A0FF8000FF06C48EB07C00003
+EC03806C7E16007F00001406A2017E5BA2137F6D5BA26D6C5AA2ECC070010F1360A26D6C
+5AA214F101035BA2D901FBC7FCA214FF6D5AA2147CA31438A21430A214701460A25CA2EA
+7C0100FE5B130391C8FC1306EAFC0EEA701C6C5AEA1FF0EA0FC027357EA32C>I<003FB5
+12FCA2EB8003D83E0013F8003CEB07F00038EB0FE012300070EB1FC0EC3F800060137F15
+0014FE495AA2C6485A495AA2495A495A495AA290387F000613FEA2485A485A0007140E5B
+4848130C4848131CA24848133C48C7127C48EB03FC90B5FCA21F247EA325>I<B81280A2
+290280962A>I E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Fi cmbx10 17.28 15
+/Fi 15 116 df<95B56C15E0053F02FCEC03F00407B76C1307043F04E0130F4BB800F813
+1F030705FE133F031F9438FF807F037F9126FC003FEBC1FF4AB60080010313F34A02F8C8
+6CB5FC020F02C0151F4A91C91207027F01FC8291B548824902E0707E494A83494A834991
+CB7E495B49498449865D90B5488448875D481C7F5D481C3F5D5A1D1F4891CDFCA3481C0F
+5CA248F407E09AC7FCA35CA2B5FCB07EA280A47EF503E06EF207F07EA36C801D0F7E6F1A
+E07E6F191F7E6FF13FC07E6D6DF17F80816DF3FF006D6D606D6D4E5A6D6E17076D6E4D5A
+6D02F04D5A6D6E4D5A6E6D4D5A021F01FF4C485A6E02E003075B020302F8DB1FFEC7FC6E
+DAFF80ECFFFC6E6C02FC011F13F0031F91B75A0307188003014DC8FCDB003F16F8040716
+C0DC003F4AC9FC05001480646677E377>67 D<BEFCA41D80A3D8000102F0C8FC1A071A00
+1B3F871B077513C087A2871C7FA21C3FA3F41FE0A31C0FF13F80A5F407F0A3197F99C7FC
+A219FFA26060180F187F93B7FCA79338F0007F180F18038484A2197F1D7FA2193F1DFEA6
+1C0196C813FCA31C03A31C071DF8A21C0FA21C1F1C3F1DF01C7F1CFF63631B0F6398B512
+E01A0797B6FCBEFCA41DC0A360617AE06C>69 D<95B56C1570053F02FCEC01F80403B76C
+1303043F04F0130793B800FC130F030705FF131F031FF0C03F037F9126FC001FEBE0FF92
+B60080010113F9020302FCC8003FB5FC020F02E0150F4A028015034A49C97E91B500F882
+494A834902C0171F495C4991CB7E49498449864B84495B90B54884481C7F5D481C3F5D48
+1C1F5D5A1D0F4891CDFCA3481C075CA2775A4899C8FCA35CA2B5FCB07E6E041FB9FCA47E
+A36E93C8ECF8007EA36C80A26C80A27E817E816C807F6D7F816D7F6D806D6E5E6D806D80
+6D6E5E023F01FE5E6E6D6C5D6E02E05D020302FC157F0200DAFFC0903801FFF36F02FE01
+1F13E1031F91B7EAC07F0307F0001F03004D1307043F04F81301040304C0EB0070DC003F
+4ACAFC050014C0706677E382>71 D<B700F80403B712F08282A2828383D800016F92C700
+3F90C7FC71EF07F8A2838383834A81816F806F806F80846F80816F806F80708070808582
+708070807080708085708183718071807180867180837180718072808772808472807280
+7280877280847314807314C07314E07314F01CF8857314FC7314FE7314FF7414871DC774
+14E7867414F77414FF86A28686878787A28787878787A2888888888888A28890260FFFC0
+84B700FC187F1D3F1D1FA21D0F1D07775A74627AE181>78 D<BA12FEF1FFF8F2FFC01BF8
+1BFEF3FFC01CF0D8000102E0C7001F80070014FE081F7F748008038074807480757F8987
+89A28987A28AA99BC8FCA2515BA265A2515B6598B55A505C505C080F91C9FC083F13FC4F
+B55A071F14E093B9CAFC1BFC1BC0871BF804E0C714FE071F6D7E070780070114F0738074
+7F8688747F8689A28689A989A8F701F0F703F889A286A21F07746E14F08677130FB900C0
+6E16E0756D131F756DEB3FC0759138C0FF80090391B5120009005D0A3F5CCF000314F0E2
+001F13C075647AE17C>82 D<B900E0020FB712C0A7D8000102F0CB01FCC7FCF51FE0B3B3
+B3A96D1B3F66A2826E1A7F66A26E1AFF7096C8FC6E61656E6D17036E6D4D5A1C0F6E6E4C
+5A6E6E4C5A6E6E4C5A6F6D4B485A6F01FC03075B6F01FF031F90C9FC030702C0ECFFFE6F
+02FE011F5B030091B712F0043F5F040F178004034CCAFCDC007F15F005071580DD001F01
+F0CBFC72647AE17F>85 D<913803FFFE027FEBFFF00103B612FE010F6F7E013F16E049D9
+001F13F8D9FFE001077F486D01017F4801FC6D6D7E717F486D8085717FA2717FA3856C49
+80A26C5B38007FE0EB1F8090C9FCA5040FB5FC030FB6FC4AB7FC141F91B8FC0103ECF807
+010F1400013F13F890B512E04814804891C7FC4813FC485B5A485B5C5A5CB5FCA25CA25F
+A36E5CA26C5E6E5C6C6D02FD7F0401ECFFC06C6DD903F9ECFF806C01FED90FF015C00003
+9039FFC07FE06C91B5EA807F6C6C4B7E011F02FC130F010302F001011480D9001F018090
+C9FC4A437BC150>97 D<92380FFFF092B67E020715F0023F15FC91B8FC4917800107DA00
+1F13C04901F8010313E04901E0010F13F0017F5B90B5484913F84891C7FC5C5A485BA248
+5B5A7113F05C487013E005011380489338007E0095C7FC5CA3B5FCAE7E80A37EA2806C18
+F8F001FC6C6D1503A26C6DED07F86C7FF00FF06C6E141F6C6E15E06D6DEC7FC06D01F814
+FF6D01FE010313800107903AFFC01FFE006D91B55A01005E023F15E0020F1580020102FC
+C7FCDA000F13C03E437BC149>99 D<F13FFE0507B5FCA7EF00078484B3A7923807FFE092
+B512FC0207ECFF81021F15E1027F15F149B538C03FFD01079026FC0007B5FC4901F01301
+49496D7E017F01808090B5814891C87E4A814849815A485BA25A5C5AA35A5CA3B5FCAE7E
+A46C7FA37EA26C7FA26C6D5D6C5F806C5F6C6D5D6D6D4A7F6D6D49B67E6D6D49EDFF8001
+0701F8130F6D01FFEBFFF3010091B512E3023F1583020FECFE03020114F8DA000F018002
+E0C7FC51657BE35C>I<92380FFFC04AB512FC020FECFF80023F15E091B712F80103D9FE
+037F499039F0007FFE011F49EB1FFF4901806D7F4990C76C7F90B56E7F48496E7F5C4870
+7F485B8548177F4A825A183F4884A2485BA21A8084A2B5FCA391B9FCA41A0002E0CBFCA5
+7EA3807EA36C181F6EEE3F807E197F6C6D17006C606E5E6C6D15016C6E4A5A6D6D14076D
+6DEC1FF86D01F8EC7FF06D01FE49485A01039026FFC01F5B6D91B6C7FC6D6C5D021F15F8
+020315E0DA007F91C8FC030713F041437BC14C>I<EE3FFE0307B512C0033F14F092B67E
+020381020F9038F80FFF4AEBC03F027FD9007F13804A5A494990B512C0495BA2495BA249
+5BA349496D1380711300715A715AEF01E094C8FCAFB812E0A7D8001F01E0C9FCB3B3AE00
+7FB612FEA73A657BE432>I<902607FF80902607FFC0ED1FFFB6027F01FC4AB512F04CB6
+020714FC040703C0011F14FF041F6F017F8193263FF81F6D9026FFE07F7F9326FF800790
+28F803FE001F7F922781FE00039026FC07F86D7FC6DA83F89226FE0FE0816DD987F04C5A
+6DD98FE06D6D48486D7F4C94C7FCDB9F80167E03BFC84A8003BE4D8215FE4B5FA24B5FA2
+4B5FA34B5FB3B1B7D8F803B7D8E00FB71280A781417AC08A>109
+D<902607FF80903807FFC0B6027F13FC4CB6FC040715C0041F8193263FF81F7F9326FF80
+077F922781FE00037FC6DA83F8816DEB87F06DD98FE06D7F5EED9F8003BFC8FC03BE8315
+FE5DA25DA25DA35DB3B1B7D8F803B712E0A753417AC05C>I<903A07FF8007FEB690381F
+FFC0047F13F093B57E038314FE923987FC1FFFDCF07F1380ED8FC0C6DA9F80B512C07F6D
+EBBF0015BE15FE5DA25D7113805D711300EF0FFCEF03F04B90C8FCA55DB3AEB712FCA73A
+417BC044>114 D<913A3FFFC007800103B538FC1FC0011FECFF3F017F15FF9038FFF000
+000390C7121FD807FC1407484880484880484880177F485A173FA212FF6D151FA27F7F6D
+ED0F8001FF92C7FC14E014FF15F86CECFFE016FC6C15FF17C06C16F06C826C16FE6C826C
+17806C6C16C06D16E0130F010116F0EB003F020115F8EC0007DB003F13FC16071601007C
+8100FE167F173F6C161FA36D150FA26D16F8A26D151F7F18F06D153F6DED7FE06D16C06D
+6C903801FF8002E00107130002FCEB7FFE01DFB65A018715F0D8FE0315C048C66C91C7FC
+0070010713E036437BC141>I E
+%EndDVIPSBitmapFont
+end
 %%EndProlog
 %%BeginSetup
-%%Feature: *Resolution 1270dpi
+%%Feature: *Resolution 600dpi
 TeXDict begin
-%%PaperSize: a4
+%%PaperSize: A4
 
 %%EndSetup
 %%Page: 1 1
-1 0 bop 335 201 a Fi(GNU)116 b(Emacs)f(Reference)h(Card)1951
-487 y Fh(\(for)58 b(v)-5 b(ersion)59 b(20\))0 996 y Fg(Starting)96
-b(Emacs)0 1409 y Fh(T)-15 b(o)59 b(en)-5 b(ter)58 b(GNU)g(Emacs)h(20,)f
-(just)h(t)-5 b(yp)5 b(e)58 b(its)i(name:)78 b Ff(emacs)0
-1690 y Fh(T)-15 b(o)59 b(read)f(in)h(a)f(\014le)h(to)g(edit,)g(see)g
-(Files,)i(b)5 b(elo)-5 b(w.)0 2173 y Fg(Lea)d(ving)96
-b(Emacs)0 2586 y Fh(susp)5 b(end)58 b(Emacs)h(\(or)f(iconify)h(it)h
-(under)e(X\))855 b Ff(C-z)0 2797 y Fh(exit)60 b(Emacs)e(p)5
-b(ermanen)-5 b(tly)1942 b Ff(C-x)93 b(C-c)0 3280 y Fg(Files)0
-3693 y Fe(read)59 b Fh(a)f(\014le)h(in)-5 b(to)60 b(Emacs)2078
-b Ff(C-x)93 b(C-f)0 3904 y Fe(sa)-6 b(v)g(e)59 b Fh(a)f(\014le)h(bac)-5
-b(k)58 b(to)h(disk)2023 b Ff(C-x)93 b(C-s)0 4115 y Fh(sa)-5
-b(v)g(e)59 b Fe(all)e Fh(\014les)2871 b Ff(C-x)93 b(s)0
-4326 y Fe(insert)57 b Fh(con)-5 b(ten)g(ts)59 b(of)f(another)g(\014le)h
-(in)-5 b(to)60 b(this)f(bu\013er)282 b Ff(C-x)93 b(i)0
-4536 y Fh(replace)59 b(this)h(\014le)f(with)g(the)g(\014le)g(y)-5
-b(ou)58 b(really)i(w)-5 b(an)g(t)415 b Ff(C-x)93 b(C-v)0
-4747 y Fh(write)60 b(bu\013er)d(to)i(a)f(sp)5 b(eci\014ed)59
-b(\014le)1563 b Ff(C-x)93 b(C-w)0 4958 y Fh(v)-5 b(ersion)59
-b(con)-5 b(trol)59 b(c)-5 b(hec)g(kin/c)g(hec)g(k)g(out)1309
-b Ff(C-x)93 b(C-q)0 5467 y Fg(Getting)k(Help)0 5881 y
-Fh(The)58 b(help)g(system)i(is)f(simple.)80 b(T)-5 b(yp)5
-b(e)58 b Ff(C-h)h Fh(\(or)f Ff(F1)p Fh(\))h(and)e(follo)-5
-b(w)60 b(the)e(direc-)0 6091 y(tions.)79 b(If)59 b(y)-5
-b(ou)58 b(are)g(a)g(\014rst-time)i(user,)f(t)-5 b(yp)5
-b(e)58 b Ff(C-h)93 b(t)59 b Fh(for)f(a)g Fe(tutorial)p
-Fh(.)0 6372 y(remo)-5 b(v)g(e)59 b(help)g(windo)-5 b(w)2247
-b Ff(C-x)93 b(1)0 6583 y Fh(scroll)60 b(help)f(windo)-5
-b(w)2388 b Ff(C-M-v)0 6863 y Fh(aprop)5 b(os:)77 b(sho)-5
-b(w)58 b(commands)h(matc)-5 b(hing)59 b(a)g(string)423
-b Ff(C-h)93 b(a)0 7074 y Fh(sho)-5 b(w)58 b(the)h(function)f(a)h(k)-5
-b(ey)58 b(runs)1586 b Ff(C-h)93 b(c)0 7285 y Fh(describ)5
-b(e)59 b(a)f(function)2354 b Ff(C-h)93 b(f)0 7496 y Fh(get)59
-b(mo)5 b(de-sp)g(eci\014c)59 b(information)1539 b Ff(C-h)93
-b(m)0 7979 y Fg(Error)j(Reco)-8 b(v)g(ery)0 8392 y Fe(ab)6
-b(ort)59 b Fh(partially)h(t)-5 b(yp)5 b(ed)58 b(or)g(executing)h
-(command)328 b Ff(C-g)0 8603 y Fe(reco)-6 b(v)g(er)59
-b Fh(a)f(\014le)h(lost)h(b)-5 b(y)58 b(a)h(system)g(crash)607
-b Ff(M-x)93 b(recover-file)0 8814 y Fe(undo)59 b Fh(an)g(un)-5
-b(w)g(an)g(ted)57 b(c)-5 b(hange)1751 b Ff(C-x)93 b(u)g
-Fh(or)e Ff(C-_)0 9024 y Fh(restore)59 b(a)f(bu\013er)g(to)g(its)i
-(original)h(con)-5 b(ten)g(ts)483 b Ff(M-x)93 b(revert-buffer)0
-9235 y Fh(redra)-5 b(w)58 b(garbaged)f(screen)2006 b
-Ff(C-l)0 9718 y Fg(Incremen)-8 b(tal)97 b(Searc)-8 b(h)0
-10131 y Fh(searc)j(h)59 b(forw)-5 b(ard)2688 b Ff(C-s)0
-10342 y Fh(searc)-5 b(h)59 b(bac)-5 b(kw)g(ard)2547 b
-Ff(C-r)0 10553 y Fh(regular)59 b(expression)f(searc)-5
-b(h)1892 b Ff(C-M-s)0 10764 y Fh(rev)-5 b(erse)59 b(regular)f
-(expression)h(searc)-5 b(h)1304 b Ff(C-M-r)0 11044 y
-Fh(select)60 b(previous)f(searc)-5 b(h)58 b(string)1658
-b Ff(M-p)0 11255 y Fh(select)60 b(next)f(later)g(searc)-5
-b(h)59 b(string)1551 b Ff(M-n)0 11466 y Fh(exit)60 b(incremen)-5
-b(tal)60 b(searc)-5 b(h)2036 b Ff(RET)0 11677 y Fh(undo)57
-b(e\013ect)i(of)f(last)i(c)-5 b(haracter)1665 b Ff(DEL)0
-11888 y Fh(ab)5 b(ort)58 b(curren)-5 b(t)58 b(searc)-5
-b(h)2250 b Ff(C-g)0 12168 y Fh(Use)71 b Ff(C-s)h Fh(or)e
-Ff(C-r)i Fh(again)f(to)g(rep)5 b(eat)71 b(the)g(searc)-5
-b(h)71 b(in)g(either)h(direction.)116 b(If)0 12379 y(Emacs)59
-b(is)h(still)h(searc)-5 b(hing,)59 b Ff(C-g)g Fh(cancels)h(only)e(the)h
-(part)f(not)h(done.)546 12662 y Fd(c)507 12666 y Fc(\015)47
-b Fd(1997)h(F)-11 b(ree)47 b(Soft)l(w)l(are)h(F)-11 b(oundation,)46
-b(Inc.)62 b(P)l(ermissions)49 b(on)e(bac)l(k.)62 b(v2.2)8167
-12865 y Fh(1)p eop
+1 0 bop 158 -320 a Fi(GNU)55 b(Emacs)g(Reference)f(Card)922
+-185 y Fh(\(for)27 b(v)n(ersion)f(21\))0 56 y Fg(Starting)47
+b(Emacs)0 251 y Fh(T)-7 b(o)27 b(en)n(ter)g(GNU)i(Emacs)d(21,)h(just)h
+(t)n(yp)r(e)g(its)g(name:)36 b Ff(emacs)0 383 y Fh(T)-7
+b(o)27 b(read)g(in)h(a)f(\014le)h(to)f(edit,)h(see)g(Files,)f(b)r(elo)n
+(w.)0 611 y Fg(Lea)l(ving)45 b(Emacs)0 807 y Fh(susp)r(end)28
+b(Emacs)e(\(or)h(iconify)h(it)g(under)f(X\))405 b Ff(C-z)0
+906 y Fh(exit)28 b(Emacs)e(p)r(ermanen)n(tly)917 b Ff(C-x)42
+b(C-c)0 1134 y Fg(Files)0 1330 y Fe(read)28 b Fh(a)f(\014le)h(in)n(to)f
+(Emacs)981 b Ff(C-x)42 b(C-f)0 1429 y Fe(sa)m(v)m(e)29
+b Fh(a)e(\014le)h(bac)n(k)e(to)i(disk)955 b Ff(C-x)42
+b(C-s)0 1529 y Fh(sa)n(v)n(e)26 b Fe(all)h Fh(\014les)1356
+b Ff(C-x)42 b(s)0 1628 y Fe(insert)27 b Fh(con)n(ten)n(ts)g(of)h
+(another)e(\014le)i(in)n(to)f(this)h(bu\013er)134 b Ff(C-x)42
+b(i)0 1728 y Fh(replace)27 b(this)g(\014le)h(with)g(the)g(\014le)g(y)n
+(ou)f(really)f(w)n(an)n(t)196 b Ff(C-x)42 b(C-v)0 1828
+y Fh(write)27 b(bu\013er)h(to)g(a)f(sp)r(eci\014ed)h(\014le)738
+b Ff(C-x)42 b(C-w)0 1927 y Fh(v)n(ersion)26 b(con)n(trol)g(c)n(hec)n
+(kin/c)n(hec)n(k)n(out)616 b Ff(C-x)42 b(C-q)0 2168 y
+Fg(Getting)47 b(Help)0 2363 y Fh(The)27 b(help)h(system)f(is)h(simple.)
+37 b(T)n(yp)r(e)27 b Ff(C-h)f Fh(\(or)h Ff(F1)p Fh(\))g(and)g(follo)n
+(w)g(the)h(direc-)0 2463 y(tions.)37 b(If)28 b(y)n(ou)f(are)f(a)h
+(\014rst-time)h(user,)f(t)n(yp)r(e)h Ff(C-h)42 b(t)27
+b Fh(for)g(a)g Fe(tutorial)p Fh(.)0 2595 y(remo)n(v)n(e)f(help)i(windo)
+n(w)1061 b Ff(C-x)42 b(1)0 2695 y Fh(scroll)26 b(help)i(windo)n(w)1128
+b Ff(C-M-v)0 2827 y Fh(aprop)r(os:)35 b(sho)n(w)27 b(commands)g(matc)n
+(hing)g(a)g(string)199 b Ff(C-h)42 b(a)0 2927 y Fh(sho)n(w)27
+b(the)h(function)g(a)f(k)n(ey)g(runs)749 b Ff(C-h)42
+b(c)0 3027 y Fh(describ)r(e)27 b(a)g(function)1113 b
+Ff(C-h)42 b(f)0 3126 y Fh(get)27 b(mo)r(de-sp)r(eci\014c)h(information)
+726 b Ff(C-h)42 b(m)0 3354 y Fg(Error)j(Reco)l(v)l(ery)0
+3550 y Fe(ab)s(ort)28 b Fh(partially)f(t)n(yp)r(ed)h(or)e(executing)i
+(command)154 b Ff(C-g)0 3649 y Fe(reco)m(v)m(er)29 b
+Fh(a)e(\014le)h(lost)f(b)n(y)h(a)f(system)g(crash)286
+b Ff(M-x)42 b(recover-file)0 3749 y Fe(undo)28 b Fh(an)f(un)n(w)n(an)n
+(ted)g(c)n(hange)826 b Ff(C-x)42 b(u)i Fh(or)e Ff(C-_)0
+3848 y Fh(restore)26 b(a)h(bu\013er)h(to)f(its)h(original)e(con)n(ten)n
+(ts)228 b Ff(M-x)42 b(revert-buffer)0 3948 y Fh(redra)n(w)26
+b(garbaged)f(screen)947 b Ff(C-l)0 4176 y Fg(Incremen)l(tal)47
+b(Searc)l(h)0 4371 y Fh(searc)n(h)26 b(forw)n(ard)1269
+b Ff(C-s)0 4471 y Fh(searc)n(h)26 b(bac)n(kw)n(ard)1202
+b Ff(C-r)0 4571 y Fh(regular)26 b(expression)g(searc)n(h)892
+b Ff(C-M-s)0 4670 y Fh(rev)n(erse)26 b(regular)f(expression)i(searc)n
+(h)614 b Ff(C-M-r)0 4803 y Fh(select)27 b(previous)g(searc)n(h)f
+(string)782 b Ff(M-p)0 4902 y Fh(select)27 b(next)h(later)f(searc)n(h)f
+(string)732 b Ff(M-n)0 5002 y Fh(exit)28 b(incremen)n(tal)f(searc)n(h)
+960 b Ff(RET)0 5102 y Fh(undo)28 b(e\013ect)g(of)f(last)g(c)n(haracter)
+785 b Ff(DEL)0 5201 y Fh(ab)r(ort)27 b(curren)n(t)g(searc)n(h)1061
+b Ff(C-g)0 5334 y Fh(Use)33 b Ff(C-s)g Fh(or)f Ff(C-r)g
+Fh(again)h(to)g(rep)r(eat)g(the)h(searc)n(h)e(in)h(either)h(direction.)
+54 b(If)0 5433 y(Emacs)27 b(is)g(still)h(searc)n(hing,)e
+Ff(C-g)g Fh(cancels)h(only)g(the)h(part)f(not)h(done.)258
+5567 y Fd(c)239 5569 y Fc(\015)23 b Fd(1997)g(F)-5 b(ree)21
+b(Soft)n(w)n(are)h(F)-5 b(oundation,)20 b(Inc.)28 b(P)n(ermissions)22
+b(on)g(bac)n(k.)29 b(v2.2)3858 5663 y Fh(1)p eop
 %%Page: 2 2
-2 1 bop 0 165 a Fg(Motion)0 603 y Fe(en)-6 b(tit)g(y)66
-b(to)h(mo)-6 b(v)g(e)68 b(o)-6 b(v)g(er)1488 b(bac)-6
-b(kw)g(ard)177 b(forw)-6 b(ard)0 814 y Fh(c)h(haracter)2504
-b Ff(C-b)735 b(C-f)0 1025 y Fh(w)-5 b(ord)2836 b Ff(M-b)735
-b(M-f)0 1236 y Fh(line)2941 b Ff(C-p)735 b(C-n)0 1447
-y Fh(go)58 b(to)h(line)h(b)5 b(eginning)58 b(\(or)h(end\))1001
-b Ff(C-a)735 b(C-e)0 1658 y Fh(sen)-5 b(tence)2573 b
-Ff(M-a)735 b(M-e)0 1868 y Fh(paragraph)2429 b Ff(M-{)735
-b(M-})0 2079 y Fh(page)2861 b Ff(C-x)93 b([)550 b(C-x)93
-b(])0 2290 y Fh(sexp)2875 b Ff(C-M-b)551 b(C-M-f)0 2501
-y Fh(function)2583 b Ff(C-M-a)551 b(C-M-e)0 2712 y Fh(go)58
-b(to)h(bu\013er)e(b)5 b(eginning)59 b(\(or)f(end\))830
-b Ff(M-<)735 b(M->)0 2999 y Fh(scroll)60 b(to)f(next)f(screen)2270
-b Ff(C-v)0 3209 y Fh(scroll)60 b(to)f(previous)g(screen)1965
-b Ff(M-v)0 3420 y Fh(scroll)60 b(left)3102 b Ff(C-x)93
-b(<)0 3631 y Fh(scroll)60 b(righ)-5 b(t)2984 b Ff(C-x)93
-b(>)0 3842 y Fh(scroll)60 b(curren)-5 b(t)58 b(line)i(to)f(cen)-5
-b(ter)59 b(of)f(screen)999 b Ff(C-u)93 b(C-l)0 4356 y
-Fg(Killing)j(and)g(Deleting)0 4793 y Fe(en)-6 b(tit)g(y)66
-b(to)h(kill)2107 b(bac)-6 b(kw)g(ard)177 b(forw)-6 b(ard)0
-5004 y Fh(c)h(haracter)58 b(\(delete,)i(not)f(kill\))1203
-b Ff(DEL)735 b(C-d)0 5215 y Fh(w)-5 b(ord)2836 b Ff(M-DEL)551
-b(M-d)0 5426 y Fh(line)60 b(\(to)f(end)f(of)14 b(\))2042
-b Ff(M-0)93 b(C-k)366 b(C-k)0 5637 y Fh(sen)-5 b(tence)2573
-b Ff(C-x)93 b(DEL)366 b(M-k)0 5848 y Fh(sexp)2875 b Ff(M--)93
-b(C-M-k)182 b(C-M-k)0 6134 y Fh(kill)61 b Fe(region)2965
-b Ff(C-w)0 6345 y Fh(cop)-5 b(y)58 b(region)h(to)f(kill)j(ring)2057
-b Ff(M-w)0 6556 y Fh(kill)61 b(through)c(next)i(o)5 b(ccurrence)57
-b(of)h Fb(char)1043 b Ff(M-z)93 b Fb(char)0 6843 y Fh(y)-5
-b(ank)58 b(bac)-5 b(k)58 b(last)i(thing)e(killed)1771
-b Ff(C-y)0 7054 y Fh(replace)59 b(last)h(y)-5 b(ank)58
-b(with)h(previous)f(kill)1120 b Ff(M-y)0 7589 y Fg(Marking)0
-8026 y Fh(set)59 b(mark)g(here)2758 b Ff(C-@)93 b Fh(or)f
-Ff(C-SPC)0 8237 y Fh(exc)-5 b(hange)58 b(p)5 b(oin)-5
-b(t)59 b(and)e(mark)1862 b Ff(C-x)93 b(C-x)0 8524 y Fh(set)59
-b(mark)g Fb(ar)-9 b(g)74 b Fe(w)-6 b(ords)59 b Fh(a)-5
-b(w)g(a)g(y)1815 b Ff(M-@)0 8735 y Fh(mark)58 b Fe(paragraph)2459
-b Ff(M-h)0 8946 y Fh(mark)58 b Fe(page)2952 b Ff(C-x)93
-b(C-p)0 9156 y Fh(mark)58 b Fe(sexp)2964 b Ff(C-M-@)0
-9367 y Fh(mark)58 b Fe(function)2631 b Ff(C-M-h)0 9578
-y Fh(mark)58 b(en)-5 b(tire)60 b Fe(bu\013er)2344 b Ff(C-x)93
-b(h)0 10092 y Fg(Query)j(Replace)0 10530 y Fh(in)-5 b(teractiv)g(ely)61
-b(replace)e(a)g(text)g(string)1255 b Ff(M-\045)0 10740
-y Fh(using)59 b(regular)f(expressions)953 b Ff(M-x)93
-b(query-replace-regexp)0 11027 y Fh(V)-15 b(alid)60 b(resp)5
-b(onses)58 b(in)h(query-replace)f(mo)5 b(de)59 b(are)0
-11313 y Fe(replace)f Fh(this)h(one,)f(go)g(on)h(to)f(next)1383
-b Ff(SPC)0 11524 y Fh(replace)59 b(this)h(one,)e(don't)g(mo)-5
-b(v)g(e)1646 b Ff(,)0 11735 y Fe(skip)57 b Fh(to)i(next)g(without)g
-(replacing)1439 b Ff(DEL)0 11946 y Fh(replace)59 b(all)h(remaining)g
-(matc)-5 b(hes)1529 b Ff(!)0 12157 y Fe(bac)-6 b(k)68
-b(up)59 b Fh(to)g(the)f(previous)h(matc)-5 b(h)1368 b
-Ff(^)0 12368 y Fe(exit)57 b Fh(query-replace)2390 b Ff(RET)0
-12579 y Fh(en)-5 b(ter)59 b(recursiv)-5 b(e)59 b(edit)g(\()p
-Ff(C-M-c)i Fh(to)d(exit\))1122 b Ff(C-r)8167 12865 y
-Fh(2)p eop
+2 1 bop 0 -337 a Fg(Motion)0 -130 y Fe(en)m(tit)m(y)32
+b(to)g(mo)m(v)m(e)f(o)m(v)m(er)704 b(bac)m(kw)m(ard)86
+b(forw)m(ard)0 -30 y Fh(c)n(haracter)1181 b Ff(C-b)346
+b(C-f)0 69 y Fh(w)n(ord)1339 b Ff(M-b)346 b(M-f)0 169
+y Fh(line)1389 b Ff(C-p)346 b(C-n)0 268 y Fh(go)27 b(to)g(line)h(b)r
+(eginning)g(\(or)e(end\))474 b Ff(C-a)346 b(C-e)0 368
+y Fh(sen)n(tence)1215 b Ff(M-a)346 b(M-e)0 468 y Fh(paragraph)1146
+b Ff(M-{)346 b(M-})0 567 y Fh(page)1351 b Ff(C-x)42 b([)260
+b(C-x)42 b(])0 667 y Fh(sexp)1358 b Ff(C-M-b)258 b(C-M-f)0
+767 y Fh(function)1221 b Ff(C-M-a)258 b(C-M-e)0 866 y
+Fh(go)27 b(to)g(bu\013er)h(b)r(eginning)f(\(or)g(end\))393
+b Ff(M-<)346 b(M->)0 1002 y Fh(scroll)26 b(to)i(next)g(screen)1071
+b Ff(C-v)0 1101 y Fh(scroll)26 b(to)i(previous)e(screen)928
+b Ff(M-v)0 1201 y Fh(scroll)26 b(left)1466 b Ff(C-x)42
+b(<)0 1300 y Fh(scroll)26 b(righ)n(t)1409 b Ff(C-x)42
+b(>)0 1400 y Fh(scroll)26 b(curren)n(t)h(line)h(to)f(cen)n(ter)g(of)h
+(screen)471 b Ff(C-u)42 b(C-l)0 1643 y Fg(Killing)k(and)h(Deleting)0
+1849 y Fe(en)m(tit)m(y)32 b(to)g(kill)996 b(bac)m(kw)m(ard)86
+b(forw)m(ard)0 1949 y Fh(c)n(haracter)26 b(\(delete,)i(not)f(kill\))568
+b Ff(DEL)346 b(C-d)0 2049 y Fh(w)n(ord)1339 b Ff(M-DEL)258
+b(M-d)0 2148 y Fh(line)28 b(\(to)g(end)f(of)6 b(\))966
+b Ff(M-0)42 b(C-k)172 b(C-k)0 2248 y Fh(sen)n(tence)1215
+b Ff(C-x)42 b(DEL)172 b(M-k)0 2348 y Fh(sexp)1358 b Ff(M--)42
+b(C-M-k)84 b(C-M-k)0 2483 y Fh(kill)28 b Fe(region)1400
+b Ff(C-w)0 2583 y Fh(cop)n(y)27 b(region)f(to)h(kill)h(ring)971
+b Ff(M-w)0 2682 y Fh(kill)28 b(through)f(next)g(o)r(ccurrence)g(of)g
+Fb(char)494 b Ff(M-z)42 b Fb(char)0 2818 y Fh(y)n(ank)27
+b(bac)n(k)f(last)i(thing)f(killed)836 b Ff(C-y)0 2917
+y Fh(replace)27 b(last)g(y)n(ank)g(with)h(previous)e(kill)528
+b Ff(M-y)0 3170 y Fg(Marking)0 3377 y Fh(set)28 b(mark)e(here)1303
+b Ff(C-@)42 b Fh(or)h Ff(C-SPC)0 3476 y Fh(exc)n(hange)26
+b(p)r(oin)n(t)i(and)f(mark)879 b Ff(C-x)42 b(C-x)0 3612
+y Fh(set)28 b(mark)e Fb(ar)l(g)36 b Fe(w)m(ords)27 b
+Fh(a)n(w)n(a)n(y)856 b Ff(M-@)0 3711 y Fh(mark)27 b Fe(paragraph)1162
+b Ff(M-h)0 3811 y Fh(mark)27 b Fe(page)1394 b Ff(C-x)42
+b(C-p)0 3911 y Fh(mark)27 b Fe(sexp)1400 b Ff(C-M-@)0
+4010 y Fh(mark)27 b Fe(function)1243 b Ff(C-M-h)0 4110
+y Fh(mark)27 b(en)n(tire)g Fe(bu\013er)1107 b Ff(C-x)42
+b(h)0 4353 y Fg(Query)k(Replace)0 4559 y Fh(in)n(teractiv)n(ely)26
+b(replace)h(a)g(text)h(string)592 b Ff(M-\045)0 4659
+y Fh(using)27 b(regular)f(expressions)448 b Ff(M-x)42
+b(query-replace-reg)o(ex)o(p)0 4794 y Fh(V)-7 b(alid)28
+b(resp)r(onses)e(in)i(query-replace)d(mo)r(de)j(are)0
+4930 y Fe(replace)g Fh(this)g(one,)f(go)g(on)g(to)h(next)653
+b Ff(SPC)0 5029 y Fh(replace)27 b(this)g(one,)h(don't)g(mo)n(v)n(e)776
+b Ff(,)0 5129 y Fe(skip)27 b Fh(to)h(next)g(without)g(replacing)678
+b Ff(DEL)0 5229 y Fh(replace)27 b(all)g(remaining)g(matc)n(hes)721
+b Ff(!)0 5328 y Fe(bac)m(k)33 b(up)28 b Fh(to)g(the)g(previous)e(matc)n
+(h)646 b Ff(^)0 5428 y Fe(exit)27 b Fh(query-replace)1128
+b Ff(RET)0 5528 y Fh(en)n(ter)27 b(recursiv)n(e)f(edit)i(\()p
+Ff(C-M-c)e Fh(to)h(exit\))530 b Ff(C-r)3858 5663 y Fh(2)p
+eop
 %%Page: 3 3
-3 2 bop 0 165 a Fg(Multiple)97 b(Windo)-8 b(ws)0 512
-y Fh(When)58 b(t)-5 b(w)g(o)58 b(commands)h(are)g(sho)-5
-b(wn,)58 b(the)g(second)g(is)i(for)e(\\other)g(frame.")0
-776 y(delete)i(all)g(other)e(windo)-5 b(ws)1949 b Ff(C-x)93
-b(1)0 1040 y Fh(split)60 b(windo)-5 b(w,)59 b(ab)5 b(o)-5
-b(v)g(e)58 b(and)f(b)5 b(elo)-5 b(w)894 b Ff(C-x)93 b(2)545
-b(C-x)93 b(5)g(2)0 1251 y Fh(delete)60 b(this)f(windo)-5
-b(w)1821 b Ff(C-x)93 b(0)545 b(C-x)93 b(5)g(0)0 1515
-y Fh(split)60 b(windo)-5 b(w,)59 b(side)g(b)-5 b(y)58
-b(side)1841 b Ff(C-x)93 b(3)0 1779 y Fh(scroll)60 b(other)f(windo)-5
-b(w)2309 b Ff(C-M-v)0 2043 y Fh(switc)-5 b(h)60 b(cursor)e(to)h
-(another)f(windo)-5 b(w)739 b Ff(C-x)93 b(o)545 b(C-x)93
-b(5)g(o)0 2253 y Fh(select)60 b(bu\013er)e(in)h(other)f(windo)-5
-b(w)1024 b Ff(C-x)93 b(4)g(b)360 b(C-x)93 b(5)g(b)0 2464
-y Fh(displa)-5 b(y)60 b(bu\013er)d(in)i(other)f(windo)-5
-b(w)907 b Ff(C-x)93 b(4)g(C-o)176 b(C-x)93 b(5)g(C-o)0
-2675 y Fh(\014nd)57 b(\014le)j(in)f(other)f(windo)-5
-b(w)1372 b Ff(C-x)93 b(4)g(f)360 b(C-x)93 b(5)g(f)0 2886
-y Fh(\014nd)57 b(\014le)j(read-only)d(in)i(other)g(windo)-5
-b(w)595 b Ff(C-x)93 b(4)g(r)360 b(C-x)93 b(5)g(r)0 3097
-y Fh(run)58 b(Dired)h(in)g(other)f(windo)-5 b(w)1198
-b Ff(C-x)93 b(4)g(d)360 b(C-x)93 b(5)g(d)0 3308 y Fh(\014nd)57
-b(tag)i(in)g(other)f(windo)-5 b(w)1353 b Ff(C-x)93 b(4)g(.)360
-b(C-x)93 b(5)g(.)0 3572 y Fh(gro)-5 b(w)58 b(windo)-5
-b(w)59 b(taller)2346 b Ff(C-x)93 b(^)0 3783 y Fh(shrink)59
-b(windo)-5 b(w)58 b(narro)-5 b(w)g(er)1961 b Ff(C-x)93
-b({)0 3993 y Fh(gro)-5 b(w)58 b(windo)-5 b(w)59 b(wider)2325
-b Ff(C-x)93 b(})0 4394 y Fg(F)-24 b(ormatting)0 4741
-y Fh(inden)-5 b(t)59 b(curren)-5 b(t)58 b Fe(line)f Fh(\(mo)5
-b(de-dep)g(enden)-5 b(t\))879 b Ff(TAB)0 4951 y Fh(inden)-5
-b(t)59 b Fe(region)f Fh(\(mo)5 b(de-dep)g(enden)-5 b(t\))1261
-b Ff(C-M-\\)0 5162 y Fh(inden)-5 b(t)59 b Fe(sexp)f Fh(\(mo)5
-b(de-dep)g(enden)-5 b(t\))1416 b Ff(C-M-q)0 5373 y Fh(inden)-5
-b(t)59 b(region)g(rigidly)h Fb(ar)-9 b(g)73 b Fh(columns)1254
-b Ff(C-x)93 b(TAB)0 5637 y Fh(insert)60 b(newline)f(after)g(p)5
-b(oin)-5 b(t)1870 b Ff(C-o)0 5848 y Fh(mo)-5 b(v)g(e)59
-b(rest)g(of)f(line)i(v)-5 b(ertically)61 b(do)-5 b(wn)1308
-b Ff(C-M-o)0 6059 y Fh(delete)60 b(blank)e(lines)i(around)d(p)5
-b(oin)-5 b(t)1422 b Ff(C-x)93 b(C-o)0 6270 y Fh(join)59
-b(line)h(with)f(previous)f(\(with)i(arg,)e(next\))806
-b Ff(M-^)0 6481 y Fh(delete)60 b(all)g(white)f(space)g(around)e(p)5
-b(oin)-5 b(t)1114 b Ff(M-\\)0 6691 y Fh(put)58 b(exactly)h(one)g(space)
-f(at)h(p)5 b(oin)-5 b(t)1476 b Ff(M-SPC)0 6955 y Fh(\014ll)60
-b(paragraph)2772 b Ff(M-q)0 7166 y Fh(set)59 b(\014ll)h(column)2726
-b Ff(C-x)93 b(f)0 7377 y Fh(set)59 b(pre\014x)f(eac)-5
-b(h)58 b(line)i(starts)g(with)1483 b Ff(C-x)93 b(.)0
-7641 y Fh(set)59 b(face)3238 b Ff(M-g)0 8062 y Fg(Case)98
-b(Change)0 8410 y Fh(upp)5 b(ercase)58 b(w)-5 b(ord)2616
-b Ff(M-u)0 8620 y Fh(lo)-5 b(w)g(ercase)60 b(w)-5 b(ord)2660
-b Ff(M-l)0 8831 y Fh(capitalize)61 b(w)-5 b(ord)2652
-b Ff(M-c)0 9095 y Fh(upp)5 b(ercase)58 b(region)2524
-b Ff(C-x)93 b(C-u)0 9306 y Fh(lo)-5 b(w)g(ercase)60 b(region)2568
-b Ff(C-x)93 b(C-l)0 9706 y Fg(The)k(Minibu\013er)0 10053
-y Fh(The)58 b(follo)-5 b(wing)60 b(k)-5 b(eys)59 b(are)f(de\014ned)f
-(in)i(the)g(minibu\013er.)0 10317 y(complete)h(as)f(m)-5
-b(uc)g(h)58 b(as)h(p)5 b(ossible)1567 b Ff(TAB)0 10528
-y Fh(complete)60 b(up)e(to)h(one)f(w)-5 b(ord)1900 b
-Ff(SPC)0 10739 y Fh(complete)60 b(and)e(execute)2155
-b Ff(RET)0 10950 y Fh(sho)-5 b(w)58 b(p)5 b(ossible)60
-b(completions)1807 b Ff(?)0 11161 y Fh(fetc)-5 b(h)59
-b(previous)f(minibu\013er)h(input)1426 b Ff(M-p)0 11371
-y Fh(fetc)-5 b(h)59 b(later)g(minibu\013er)g(input)g(or)f(default)909
-b Ff(M-n)0 11582 y Fh(regexp)58 b(searc)-5 b(h)58 b(bac)-5
-b(kw)g(ard)58 b(through)f(history)731 b Ff(M-r)0 11793
-y Fh(regexp)58 b(searc)-5 b(h)58 b(forw)-5 b(ard)58 b(through)f
-(history)872 b Ff(M-s)0 12004 y Fh(ab)5 b(ort)58 b(command)2594
-b Ff(C-g)0 12268 y Fh(T)-5 b(yp)5 b(e)52 b Ff(C-x)93
-b(ESC)g(ESC)54 b Fh(to)f(edit)h(and)e(rep)5 b(eat)52
-b(the)h(last)h(command)f(that)g(used)0 12479 y(the)h(minibu\013er.)76
-b(T)-5 b(yp)5 b(e)53 b Ff(F10)i Fh(to)f(activ)-10 b(ate)55
-b(the)f(men)-5 b(u)53 b(bar)g(using)h(the)g(mini-)0 12690
-y(bu\013er.)8167 12865 y(3)p eop
+3 2 bop 0 -337 a Fg(Multiple)47 b(Windo)l(ws)0 -173 y
+Fh(When)28 b(t)n(w)n(o)f(commands)g(are)g(sho)n(wn,)f(the)i(second)f
+(is)h(for)f(\\other)f(frame.")0 -48 y(delete)i(all)f(other)g(windo)n
+(ws)920 b Ff(C-x)42 b(1)0 76 y Fh(split)28 b(windo)n(w,)f(ab)r(o)n(v)n
+(e)f(and)i(b)r(elo)n(w)422 b Ff(C-x)42 b(2)257 b(C-x)42
+b(5)h(2)0 176 y Fh(delete)28 b(this)g(windo)n(w)860 b
+Ff(C-x)42 b(0)257 b(C-x)42 b(5)h(0)0 301 y Fh(split)28
+b(windo)n(w,)f(side)h(b)n(y)f(side)869 b Ff(C-x)42 b(3)0
+425 y Fh(scroll)26 b(other)h(windo)n(w)1091 b Ff(C-M-v)0
+550 y Fh(switc)n(h)27 b(cursor)f(to)i(another)f(windo)n(w)349
+b Ff(C-x)42 b(o)257 b(C-x)42 b(5)h(o)0 650 y Fh(select)27
+b(bu\013er)h(in)g(other)f(windo)n(w)484 b Ff(C-x)42 b(4)h(b)170
+b(C-x)42 b(5)h(b)0 749 y Fh(displa)n(y)27 b(bu\013er)h(in)f(other)g
+(windo)n(w)429 b Ff(C-x)42 b(4)h(C-o)82 b(C-x)42 b(5)h(C-o)0
+849 y Fh(\014nd)28 b(\014le)g(in)g(other)f(windo)n(w)648
+b Ff(C-x)42 b(4)h(f)170 b(C-x)42 b(5)h(f)0 948 y Fh(\014nd)28
+b(\014le)g(read-only)e(in)i(other)f(windo)n(w)281 b Ff(C-x)42
+b(4)h(r)170 b(C-x)42 b(5)h(r)0 1048 y Fh(run)27 b(Dired)h(in)g(other)f
+(windo)n(w)566 b Ff(C-x)42 b(4)h(d)170 b(C-x)42 b(5)h(d)0
+1148 y Fh(\014nd)28 b(tag)f(in)h(other)f(windo)n(w)639
+b Ff(C-x)42 b(4)h(.)170 b(C-x)42 b(5)h(.)0 1272 y Fh(gro)n(w)26
+b(windo)n(w)h(taller)1107 b Ff(C-x)42 b(^)0 1372 y Fh(shrink)27
+b(windo)n(w)g(narro)n(w)n(er)924 b Ff(C-x)42 b({)0 1472
+y Fh(gro)n(w)26 b(windo)n(w)h(wider)1098 b Ff(C-x)42
+b(})0 1661 y Fg(F)-11 b(ormatting)0 1825 y Fh(inden)n(t)28
+b(curren)n(t)f Fe(line)f Fh(\(mo)r(de-dep)r(enden)n(t\))417
+b Ff(TAB)0 1924 y Fh(inden)n(t)28 b Fe(region)f Fh(\(mo)r(de-dep)r
+(enden)n(t\))597 b Ff(C-M-\\)0 2024 y Fh(inden)n(t)28
+b Fe(sexp)g Fh(\(mo)r(de-dep)r(enden)n(t\))670 b Ff(C-M-q)0
+2123 y Fh(inden)n(t)28 b(region)e(rigidly)h Fb(ar)l(g)36
+b Fh(columns)591 b Ff(C-x)42 b(TAB)0 2248 y Fh(insert)27
+b(newline)h(after)f(p)r(oin)n(t)884 b Ff(C-o)0 2348 y
+Fh(mo)n(v)n(e)26 b(rest)i(of)f(line)h(v)n(ertically)e(do)n(wn)618
+b Ff(C-M-o)0 2447 y Fh(delete)28 b(blank)f(lines)h(around)e(p)r(oin)n
+(t)672 b Ff(C-x)42 b(C-o)0 2547 y Fh(join)28 b(line)g(with)g(previous)e
+(\(with)j(arg,)d(next\))381 b Ff(M-^)0 2647 y Fh(delete)28
+b(all)f(white)h(space)f(around)g(p)r(oin)n(t)526 b Ff(M-\\)0
+2746 y Fh(put)28 b(exactly)f(one)g(space)g(at)h(p)r(oin)n(t)697
+b Ff(M-SPC)0 2871 y Fh(\014ll)28 b(paragraph)1308 b Ff(M-q)0
+2970 y Fh(set)28 b(\014ll)g(column)1287 b Ff(C-x)42 b(f)0
+3070 y Fh(set)28 b(pre\014x)f(eac)n(h)g(line)g(starts)g(with)701
+b Ff(C-x)42 b(.)0 3195 y Fh(set)28 b(face)1529 b Ff(M-g)0
+3394 y Fg(Case)46 b(Change)0 3558 y Fh(upp)r(ercase)27
+b(w)n(ord)1235 b Ff(M-u)0 3658 y Fh(lo)n(w)n(ercase)25
+b(w)n(ord)1256 b Ff(M-l)0 3757 y Fh(capitalize)27 b(w)n(ord)1252
+b Ff(M-c)0 3882 y Fh(upp)r(ercase)27 b(region)1191 b
+Ff(C-x)42 b(C-u)0 3981 y Fh(lo)n(w)n(ercase)25 b(region)1212
+b Ff(C-x)42 b(C-l)0 4170 y Fg(The)k(Minibu\013er)0 4334
+y Fh(The)28 b(follo)n(wing)e(k)n(eys)h(are)f(de\014ned)i(in)g(the)g
+(minibu\013er.)0 4459 y(complete)g(as)e(m)n(uc)n(h)i(as)f(p)r(ossible)
+739 b Ff(TAB)0 4559 y Fh(complete)28 b(up)f(to)h(one)f(w)n(ord)897
+b Ff(SPC)0 4658 y Fh(complete)28 b(and)f(execute)1018
+b Ff(RET)0 4758 y Fh(sho)n(w)27 b(p)r(ossible)g(completions)852
+b Ff(?)0 4858 y Fh(fetc)n(h)28 b(previous)e(minibu\013er)j(input)674
+b Ff(M-p)0 4957 y Fh(fetc)n(h)28 b(later)f(minibu\013er)h(input)g(or)f
+(default)430 b Ff(M-n)0 5057 y Fh(regexp)26 b(searc)n(h)h(bac)n(kw)n
+(ard)e(through)i(history)344 b Ff(M-r)0 5156 y Fh(regexp)26
+b(searc)n(h)h(forw)n(ard)e(through)i(history)411 b Ff(M-s)0
+5256 y Fh(ab)r(ort)27 b(command)1225 b Ff(C-g)0 5381
+y Fh(T)n(yp)r(e)25 b Ff(C-x)42 b(ESC)g(ESC)24 b Fh(to)h(edit)g(and)g
+(rep)r(eat)g(the)g(last)f(command)h(that)g(used)0 5480
+y(the)h(minibu\013er.)36 b(T)n(yp)r(e)26 b Ff(F10)e Fh(to)h(activ)-5
+b(ate)25 b(the)g(men)n(u)h(bar)e(using)h(the)h(mini-)0
+5580 y(bu\013er.)3858 5663 y(3)p eop
 %%Page: 4 4
-4 3 bop 335 201 a Fi(GNU)116 b(Emacs)f(Reference)h(Card)0
-790 y Fg(Bu\013ers)0 1228 y Fh(select)60 b(another)e(bu\013er)2240
-b Ff(C-x)93 b(b)0 1438 y Fh(list)61 b(all)f(bu\013ers)2757
-b Ff(C-x)93 b(C-b)0 1649 y Fh(kill)61 b(a)d(bu\013er)2920
-b Ff(C-x)93 b(k)0 2163 y Fg(T)-24 b(ransp)8 b(osing)0
-2601 y Fh(transp)d(ose)58 b Fe(c)-6 b(haracters)2122
-b Ff(C-t)0 2812 y Fh(transp)5 b(ose)58 b Fe(w)-6 b(ords)2506
-b Ff(M-t)0 3022 y Fh(transp)5 b(ose)58 b Fe(lines)2623
-b Ff(C-x)93 b(C-t)0 3233 y Fh(transp)5 b(ose)58 b Fe(sexps)2550
-b Ff(C-M-t)0 3747 y Fg(Sp)8 b(elling)95 b(Chec)-8 b(k)0
-4185 y Fh(c)j(hec)g(k)58 b(sp)5 b(elling)61 b(of)d(curren)-5
-b(t)58 b(w)-5 b(ord)1508 b Ff(M-$)0 4396 y Fh(c)-5 b(hec)g(k)58
-b(sp)5 b(elling)61 b(of)d(all)i(w)-5 b(ords)58 b(in)h(region)705
-b Ff(M-x)93 b(ispell-region)0 4606 y Fh(c)-5 b(hec)g(k)58
-b(sp)5 b(elling)61 b(of)d(en)-5 b(tire)60 b(bu\013er)1187
-b Ff(M-x)93 b(ispell-buffer)0 5139 y Fg(T)-24 b(ags)0
-5577 y Fh(\014nd)57 b(a)i(tag)g(\(a)f(de\014nition\))2005
-b Ff(M-.)0 5788 y Fh(\014nd)57 b(next)i(o)5 b(ccurrence)58
-b(of)g(tag)1744 b Ff(C-u)93 b(M-.)0 5999 y Fh(sp)5 b(ecify)59
-b(a)f(new)h(tags)f(\014le)1550 b Ff(M-x)93 b(visit-tags-table)0
-6286 y Fh(regexp)58 b(searc)-5 b(h)58 b(on)g(all)j(\014les)e(in)g(tags)
-g(table)548 b Ff(M-x)93 b(tags-search)0 6496 y Fh(run)58
-b(query-replace)f(on)h(all)i(the)f(\014les)559 b Ff(M-x)93
-b(tags-query-replace)0 6707 y Fh(con)-5 b(tin)g(ue)59
-b(last)h(tags)f(searc)-5 b(h)58 b(or)h(query-replace)626
-b Ff(M-,)0 7221 y Fg(Shells)0 7659 y Fh(execute)59 b(a)f(shell)i
-(command)1891 b Ff(M-!)0 7870 y Fh(run)58 b(a)g(shell)i(command)f(on)f
-(the)h(region)1123 b Ff(M-|)0 8080 y Fh(\014lter)59 b(region)g(through)
-e(a)i(shell)h(command)908 b Ff(C-u)93 b(M-|)0 8291 y
-Fh(start)59 b(a)g(shell)h(in)f(windo)-5 b(w)58 b Ff(*shell*)1353
-b(M-x)93 b(shell)0 8805 y Fg(Rectangles)0 9243 y Fh(cop)-5
-b(y)58 b(rectangle)h(to)g(register)1866 b Ff(C-x)93 b(r)g(r)0
-9454 y Fh(kill)61 b(rectangle)2819 b Ff(C-x)93 b(r)g(k)0
-9664 y Fh(y)-5 b(ank)58 b(rectangle)2692 b Ff(C-x)93
-b(r)g(y)0 9875 y Fh(op)5 b(en)58 b(rectangle,)h(shifting)g(text)g(righ)
--5 b(t)1222 b Ff(C-x)93 b(r)g(o)0 10086 y Fh(blank)58
-b(out)h(rectangle)2321 b Ff(C-x)93 b(r)g(c)0 10297 y
-Fh(pre\014x)58 b(eac)-5 b(h)58 b(line)i(with)f(a)g(string)1602
-b Ff(C-x)93 b(r)g(t)0 10811 y Fg(Abbrevs)0 11248 y Fh(add)58
-b(global)h(abbrev)2427 b Ff(C-x)93 b(a)g(g)0 11459 y
-Fh(add)58 b(mo)5 b(de-lo)g(cal)59 b(abbrev)2056 b Ff(C-x)93
-b(a)g(l)0 11670 y Fh(add)58 b(global)h(expansion)f(for)g(this)i(abbrev)
-999 b Ff(C-x)93 b(a)g(i)f(g)0 11881 y Fh(add)58 b(mo)5
-b(de-lo)g(cal)59 b(expansion)f(for)g(this)i(abbrev)628
-b Ff(C-x)93 b(a)g(i)f(l)0 12092 y Fh(explicitly)61 b(expand)d(abbrev)
-1914 b Ff(C-x)93 b(a)g(e)0 12378 y Fh(expand)57 b(previous)i(w)-5
-b(ord)58 b(dynamically)1139 b Ff(M-/)8167 12865 y Fh(4)p
-eop
+4 3 bop 158 -320 a Fi(GNU)55 b(Emacs)g(Reference)f(Card)0
+-42 y Fg(Bu\013ers)0 165 y Fh(select)27 b(another)g(bu\013er)1059
+b Ff(C-x)42 b(b)0 264 y Fh(list)28 b(all)f(bu\013ers)1303
+b Ff(C-x)42 b(C-b)0 364 y Fh(kill)28 b(a)f(bu\013er)1380
+b Ff(C-x)42 b(k)0 607 y Fg(T)-11 b(ransp)t(osing)0 814
+y Fh(transp)r(ose)26 b Fe(c)m(haracters)1005 b Ff(C-t)0
+913 y Fh(transp)r(ose)26 b Fe(w)m(ords)1184 b Ff(M-t)0
+1013 y Fh(transp)r(ose)26 b Fe(lines)1239 b Ff(C-x)42
+b(C-t)0 1112 y Fh(transp)r(ose)26 b Fe(sexps)1205 b Ff(C-M-t)0
+1355 y Fg(Sp)t(elling)47 b(Chec)l(k)0 1562 y Fh(c)n(hec)n(k)27
+b(sp)r(elling)g(of)h(curren)n(t)f(w)n(ord)711 b Ff(M-$)0
+1662 y Fh(c)n(hec)n(k)27 b(sp)r(elling)g(of)h(all)f(w)n(ords)f(in)i
+(region)332 b Ff(M-x)42 b(ispell-region)0 1761 y Fh(c)n(hec)n(k)27
+b(sp)r(elling)g(of)h(en)n(tire)f(bu\013er)562 b Ff(M-x)42
+b(ispell-buffer)0 2013 y Fg(T)-11 b(ags)0 2220 y Fh(\014nd)28
+b(a)f(tag)g(\(a)h(de\014nition\))947 b Ff(M-.)0 2319
+y Fh(\014nd)28 b(next)g(o)r(ccurrence)e(of)i(tag)823
+b Ff(C-u)42 b(M-.)0 2419 y Fh(sp)r(ecify)28 b(a)f(new)h(tags)e(\014le)
+732 b Ff(M-x)43 b(visit-tags-tabl)o(e)0 2554 y Fh(regexp)26
+b(searc)n(h)h(on)g(all)g(\014les)h(in)f(tags)g(table)259
+b Ff(M-x)42 b(tags-search)0 2654 y Fh(run)27 b(query-replace)f(on)h
+(all)g(the)h(\014les)264 b Ff(M-x)42 b(tags-query-replac)o(e)0
+2754 y Fh(con)n(tin)n(ue)27 b(last)g(tags)g(searc)n(h)f(or)h
+(query-replace)294 b Ff(M-,)0 2996 y Fg(Shells)0 3203
+y Fh(execute)27 b(a)h(shell)f(command)893 b Ff(M-!)0
+3303 y Fh(run)27 b(a)h(shell)f(command)g(on)h(the)g(region)529
+b Ff(M-|)0 3402 y Fh(\014lter)28 b(region)e(through)h(a)g(shell)g
+(command)429 b Ff(C-u)42 b(M-|)0 3502 y Fh(start)27 b(a)g(shell)h(in)g
+(windo)n(w)f Ff(*shell*)635 b(M-x)42 b(shell)0 3745 y
+Fg(Rectangles)0 3951 y Fh(cop)n(y)27 b(rectangle)f(to)i(register)879
+b Ff(C-x)42 b(r)i(r)0 4051 y Fh(kill)28 b(rectangle)1330
+b Ff(C-x)42 b(r)i(k)0 4151 y Fh(y)n(ank)27 b(rectangle)1270
+b Ff(C-x)42 b(r)i(y)0 4250 y Fh(op)r(en)28 b(rectangle,)e(shifting)i
+(text)g(righ)n(t)576 b Ff(C-x)42 b(r)i(o)0 4350 y Fh(blank)27
+b(out)h(rectangle)1095 b Ff(C-x)42 b(r)i(c)0 4450 y Fh(pre\014x)27
+b(eac)n(h)g(line)h(with)g(a)f(string)756 b Ff(C-x)42
+b(r)i(t)0 4692 y Fg(Abbrevs)0 4899 y Fh(add)27 b(global)g(abbrev)1146
+b Ff(C-x)42 b(a)i(g)0 4999 y Fh(add)27 b(mo)r(de-lo)r(cal)g(abbrev)971
+b Ff(C-x)42 b(a)i(l)0 5098 y Fh(add)27 b(global)g(expansion)f(for)i
+(this)f(abbrev)472 b Ff(C-x)42 b(a)i(i)f(g)0 5198 y Fh(add)27
+b(mo)r(de-lo)r(cal)g(expansion)g(for)g(this)h(abbrev)296
+b Ff(C-x)42 b(a)i(i)f(l)0 5298 y Fh(explicitly)28 b(expand)f(abbrev)904
+b Ff(C-x)42 b(a)i(e)0 5433 y Fh(expand)27 b(previous)g(w)n(ord)f
+(dynamically)537 b Ff(M-/)3858 5663 y Fh(4)p eop
 %%Page: 5 5
-5 4 bop 0 165 a Fg(Regular)97 b(Expressions)0 603 y Fh(an)-5
-b(y)58 b(single)i(c)-5 b(haracter)58 b(except)h(a)f(newline)949
-b Ff(.)185 b Fh(\(dot\))0 814 y(zero)58 b(or)h(more)g(rep)5
-b(eats)2230 b Ff(*)0 1025 y Fh(one)58 b(or)g(more)h(rep)5
-b(eats)2280 b Ff(+)0 1236 y Fh(zero)58 b(or)h(one)f(rep)5
-b(eat)2417 b Ff(?)0 1447 y Fh(quote)58 b(regular)h(expression)g(sp)5
-b(ecial)60 b(c)-5 b(haracter)58 b Fb(c)463 b Ff(\\)p
-Fb(c)0 1658 y Fh(alternativ)-5 b(e)60 b(\(\\or"\))2462
-b Ff(\\|)0 1868 y Fh(grouping)3135 b Ff(\\\()93 b Fa(:)29
-b(:)g(:)92 b Ff(\\\))0 2079 y Fh(same)59 b(text)g(as)g
-Fb(n)13 b Fh(th)59 b(group)2010 b Ff(\\)p Fb(n)0 2290
-y Fh(at)59 b(w)-5 b(ord)58 b(break)2734 b Ff(\\b)0 2501
-y Fh(not)58 b(at)h(w)-5 b(ord)58 b(break)2422 b Ff(\\B)0
-2788 y Fe(en)-6 b(tit)g(y)1992 b(matc)-6 b(h)68 b(start)213
-b(matc)-6 b(h)68 b(end)0 2999 y Fh(line)2235 b Ff(^)1149
-b($)0 3209 y Fh(w)-5 b(ord)2130 b Ff(\\<)1057 b(\\>)0
-3420 y Fh(bu\013er)2061 b Ff(\\`)1057 b(\\')0 3631 y
-Fe(class)66 b(of)h(c)-6 b(haracters)906 b(matc)-6 b(h)68
-b(these)175 b(matc)-6 b(h)68 b(others)0 3842 y Fh(explicit)61
-b(set)1672 b Ff([)93 b Fa(:)29 b(:)g(:)92 b Ff(])667
-b([^)93 b Fa(:)29 b(:)g(:)92 b Ff(])0 4053 y Fh(w)-5
-b(ord-syn)g(tax)57 b(c)-5 b(haracter)801 b Ff(\\w)1057
-b(\\W)0 4264 y Fh(c)-5 b(haracter)58 b(with)i(syn)-5
-b(tax)58 b Fb(c)696 b Ff(\\s)p Fb(c)976 b Ff(\\S)p Fb(c)0
-4777 y Fg(In)-8 b(ternational)97 b(Character)h(Sets)0
-5215 y Fh(sp)5 b(ecify)59 b(principal)h(language)508
-b Ff(M-x)93 b(set-language-environment)0 5426 y Fh(sho)-5
-b(w)58 b(all)i(input)f(metho)5 b(ds)1252 b Ff(M-x)93
-b(list-input-methods)0 5637 y Fh(enable)59 b(or)f(disable)i(input)e
-(metho)5 b(d)1412 b Ff(C-\\)0 5848 y Fh(set)59 b(co)5
-b(ding)59 b(system)h(for)d(next)i(command)985 b Ff(C-x)93
-b(RET)g(c)0 6059 y Fh(sho)-5 b(w)58 b(all)i(co)5 b(ding)59
-b(systems)1125 b Ff(M-x)93 b(list-coding-systems)0 6270
-y Fh(c)-5 b(ho)5 b(ose)58 b(preferred)g(co)5 b(ding)58
-b(system)476 b Ff(M-x)93 b(prefer-coding-system)0 6805
-y Fg(Info)0 7242 y Fh(en)-5 b(ter)59 b(the)f(Info)h(do)5
-b(cumen)-5 b(tation)58 b(reader)1021 b Ff(C-h)93 b(i)0
-7453 y Fh(\014nd)57 b(sp)5 b(eci\014ed)59 b(function)g(or)f(v)-10
-b(ariable)59 b(in)g(Info)679 b Ff(C-h)93 b(C-i)0 7740
-y Fh(Mo)-5 b(ving)59 b(within)g(a)g(no)5 b(de:)176 8026
-y(scroll)60 b(forw)-5 b(ard)2586 b Ff(SPC)176 8237 y
-Fh(scroll)60 b(rev)-5 b(erse)2645 b Ff(DEL)176 8448 y
-Fh(b)5 b(eginning)58 b(of)g(no)5 b(de)2262 b Ff(.)185
-b Fh(\(dot\))0 8735 y(Mo)-5 b(ving)59 b(b)5 b(et)-5 b(w)g(een)58
-b(no)5 b(des:)176 9021 y Fe(next)57 b Fh(no)5 b(de)2819
-b Ff(n)176 9232 y Fe(previous)57 b Fh(no)5 b(de)2465
-b Ff(p)176 9443 y Fh(mo)-5 b(v)g(e)59 b Fe(up)2956 b
-Ff(u)176 9654 y Fh(select)60 b(men)-5 b(u)59 b(item)h(b)-5
-b(y)58 b(name)1627 b Ff(m)176 9865 y Fh(select)60 b Fb(n)13
-b Fh(th)59 b(men)-5 b(u)58 b(item)j(b)-5 b(y)58 b(n)-5
-b(um)g(b)5 b(er)58 b(\(1{9\))660 b Fb(n)176 10076 y Fh(follo)-5
-b(w)59 b(cross)g(reference)f(\(return)h(with)g Ff(l)p
-Fh(\))790 b Ff(f)176 10286 y Fh(return)58 b(to)g(last)i(no)5
-b(de)58 b(y)-5 b(ou)58 b(sa)-5 b(w)1513 b Ff(l)176 10497
-y Fh(return)58 b(to)g(directory)h(no)5 b(de)1767 b Ff(d)176
-10708 y Fh(go)58 b(to)h(an)-5 b(y)58 b(no)5 b(de)57 b(b)-5
-b(y)59 b(name)1774 b Ff(g)0 10995 y Fh(Other:)176 11281
-y(run)57 b(Info)i Fe(tutorial)2284 b Ff(h)176 11492 y
-Fe(quit)57 b Fh(Info)2919 b Ff(q)176 11703 y Fh(searc)-5
-b(h)58 b(no)5 b(des)58 b(for)g(regexp)1834 b Ff(M-s)8167
-12865 y Fh(5)p eop
+5 4 bop 0 -337 a Fg(Regular)46 b(Expressions)0 -130 y
+Fh(an)n(y)27 b(single)g(c)n(haracter)e(except)j(a)f(newline)448
+b Ff(.)87 b Fh(\(dot\))0 -30 y(zero)26 b(or)h(more)g(rep)r(eats)1053
+b Ff(*)0 69 y Fh(one)27 b(or)g(more)g(rep)r(eats)1076
+b Ff(+)0 169 y Fh(zero)26 b(or)h(one)g(rep)r(eat)1142
+b Ff(?)0 268 y Fh(quote)27 b(regular)f(expression)g(sp)r(ecial)i(c)n
+(haracter)d Fb(c)219 b Ff(\\)p Fb(c)0 368 y Fh(alternativ)n(e)26
+b(\(\\or"\))1162 b Ff(\\|)0 468 y Fh(grouping)1480 b
+Ff(\\\()43 b Fa(:)14 b(:)g(:)43 b Ff(\\\))0 567 y Fh(same)27
+b(text)h(as)f Fb(n)6 b Fh(th)28 b(group)949 b Ff(\\)p
+Fb(n)0 667 y Fh(at)27 b(w)n(ord)g(break)1291 b Ff(\\b)0
+767 y Fh(not)28 b(at)f(w)n(ord)g(break)1143 b Ff(\\B)0
+902 y Fe(en)m(tit)m(y)942 b(matc)m(h)32 b(start)102 b(matc)m(h)31
+b(end)0 1002 y Fh(line)1055 b Ff(^)543 b($)0 1101 y Fh(w)n(ord)1005
+b Ff(\\<)499 b(\\>)0 1201 y Fh(bu\013er)974 b Ff(\\`)499
+b(\\')0 1300 y Fe(class)32 b(of)f(c)m(haracters)430 b(matc)m(h)32
+b(these)83 b(matc)m(h)31 b(others)0 1400 y Fh(explicit)d(set)789
+b Ff([)44 b Fa(:)14 b(:)g(:)43 b Ff(])315 b([^)42 b Fa(:)14
+b(:)g(:)44 b Ff(])0 1500 y Fh(w)n(ord-syn)n(tax)25 b(c)n(haracter)376
+b Ff(\\w)499 b(\\W)0 1599 y Fh(c)n(haracter)26 b(with)i(syn)n(tax)e
+Fb(c)329 b Ff(\\s)p Fb(c)461 b Ff(\\S)p Fb(c)0 1842 y
+Fg(In)l(ternational)48 b(Character)e(Sets)0 2049 y Fh(sp)r(ecify)28
+b(principal)f(language)239 b Ff(M-x)42 b(set-language-env)o(ir)o(onm)o
+(en)o(t)0 2148 y Fh(sho)n(w)27 b(all)g(input)h(metho)r(ds)592
+b Ff(M-x)42 b(list-input-method)o(s)0 2248 y Fh(enable)27
+b(or)g(disable)g(input)i(metho)r(d)667 b Ff(C-\\)0 2348
+y Fh(set)28 b(co)r(ding)f(system)g(for)g(next)h(command)465
+b Ff(C-x)42 b(RET)h(c)0 2447 y Fh(sho)n(w)27 b(all)g(co)r(ding)g
+(systems)531 b Ff(M-x)42 b(list-coding-syst)o(em)o(s)0
+2547 y Fh(c)n(ho)r(ose)26 b(preferred)h(co)r(ding)g(system)224
+b Ff(M-x)42 b(prefer-coding-sys)o(te)o(m)0 2800 y Fg(Info)0
+3007 y Fh(en)n(ter)27 b(the)h(Info)g(do)r(cumen)n(tation)f(reader)481
+b Ff(C-h)42 b(i)0 3106 y Fh(\014nd)28 b(sp)r(eci\014ed)g(function)g(or)
+f(v)-5 b(ariable)26 b(in)i(Info)321 b Ff(C-h)42 b(C-i)0
+3242 y Fh(Mo)n(ving)26 b(within)j(a)e(no)r(de:)83 3377
+y(scroll)f(forw)n(ard)1221 b Ff(SPC)83 3476 y Fh(scroll)26
+b(rev)n(erse)1248 b Ff(DEL)83 3576 y Fh(b)r(eginning)28
+b(of)f(no)r(de)1069 b Ff(.)87 b Fh(\(dot\))0 3711 y(Mo)n(ving)26
+b(b)r(et)n(w)n(een)i(no)r(des:)83 3847 y Fe(next)g Fh(no)r(de)1332
+b Ff(n)83 3946 y Fe(previous)27 b Fh(no)r(de)1165 b Ff(p)83
+4046 y Fh(mo)n(v)n(e)26 b Fe(up)1397 b Ff(u)83 4146 y
+Fh(select)27 b(men)n(u)h(item)g(b)n(y)g(name)768 b Ff(m)83
+4245 y Fh(select)27 b Fb(n)6 b Fh(th)29 b(men)n(u)e(item)h(b)n(y)g(n)n
+(um)n(b)r(er)f(\(1{9\))311 b Fb(n)83 4345 y Fh(follo)n(w)27
+b(cross)f(reference)h(\(return)g(with)h Ff(l)p Fh(\))373
+b Ff(f)83 4445 y Fh(return)27 b(to)h(last)f(no)r(de)h(y)n(ou)e(sa)n(w)
+714 b Ff(l)83 4544 y Fh(return)27 b(to)h(directory)e(no)r(de)835
+b Ff(d)83 4644 y Fh(go)27 b(to)g(an)n(y)g(no)r(de)h(b)n(y)f(name)838
+b Ff(g)0 4779 y Fh(Other:)83 4915 y(run)27 b(Info)h Fe(tutorial)1080
+b Ff(h)83 5014 y Fe(quit)28 b Fh(Info)1379 b Ff(q)83
+5114 y Fh(searc)n(h)26 b(no)r(des)h(for)h(regexp)865
+b Ff(M-s)3858 5663 y Fh(5)p eop
 %%Page: 6 6
-6 5 bop 0 165 a Fg(Registers)0 603 y Fh(sa)-5 b(v)g(e)59
-b(region)g(in)g(register)2133 b Ff(C-x)93 b(r)g(s)0 814
-y Fh(insert)60 b(register)f(con)-5 b(ten)g(ts)60 b(in)-5
-b(to)59 b(bu\013er)1197 b Ff(C-x)93 b(r)g(i)0 1101 y
-Fh(sa)-5 b(v)g(e)59 b(v)-10 b(alue)59 b(of)f(p)5 b(oin)-5
-b(t)59 b(in)g(register)1548 b Ff(C-x)93 b(r)g(SPC)0 1312
-y Fh(jump)58 b(to)h(p)5 b(oin)-5 b(t)59 b(sa)-5 b(v)g(ed)58
-b(in)h(register)1436 b Ff(C-x)93 b(r)g(j)0 1847 y Fg(Keyb)8
-b(oard)96 b(Macros)0 2284 y Fe(start)58 b Fh(de\014ning)g(a)g(k)-5
-b(eyb)5 b(oard)57 b(macro)1292 b Ff(C-x)93 b(\()0 2495
-y Fe(end)59 b Fh(k)-5 b(eyb)5 b(oard)57 b(macro)h(de\014nition)1423
-b Ff(C-x)93 b(\))0 2706 y Fe(execute)57 b Fh(last-de\014ned)h(k)-5
-b(eyb)5 b(oard)57 b(macro)917 b Ff(C-x)93 b(e)0 2917
-y Fh(app)5 b(end)57 b(to)i(last)h(k)-5 b(eyb)5 b(oard)57
-b(macro)1411 b Ff(C-u)93 b(C-x)g(\()0 3128 y Fh(name)59
-b(last)h(k)-5 b(eyb)5 b(oard)57 b(macro)925 b Ff(M-x)93
-b(name-last-kbd-macro)0 3339 y Fh(insert)60 b(Lisp)f(de\014nition)g(in)
-g(bu\013er)929 b Ff(M-x)93 b(insert-kbd-macro)0 3852
-y Fg(Commands)g(Dealing)k(with)g(Emacs)f(Lisp)0 4290
-y Fh(ev)-10 b(al)59 b Fe(sexp)f Fh(b)5 b(efore)58 b(p)5
-b(oin)-5 b(t)2076 b Ff(C-x)93 b(C-e)0 4501 y Fh(ev)-10
-b(al)59 b(curren)-5 b(t)58 b Fe(defun)2352 b Ff(C-M-x)0
-4712 y Fh(ev)-10 b(al)59 b Fe(region)2538 b Ff(M-x)93
-b(eval-region)0 4923 y Fh(read)58 b(and)g(ev)-10 b(al)59
-b(minibu\013er)1935 b Ff(M-:)0 5134 y Fh(load)59 b(from)f(standard)g
-(system)i(directory)639 b Ff(M-x)93 b(load-library)0
-5669 y Fg(Simple)i(Customization)0 6107 y Fh(customize)60
-b(v)-10 b(ariables)60 b(and)e(faces)1192 b Ff(M-x)93
-b(customize)0 6393 y Fh(Making)59 b(global)g(k)-5 b(ey)58
-b(bindings)h(in)g(Emacs)g(Lisp)g(\(examples\):)0 6680
-y Ff(\(global-set-key)96 b("\\C-cg")e('goto-line\))0
-6890 y(\(global-set-key)i("\\M-#")e('query-replace-regexp\))0
-7425 y Fg(W)-24 b(riting)95 b(Commands)0 7863 y Ff(\(defun)f
-Fb(c)-9 b(ommand-name)103 b Ff(\()p Fb(ar)-9 b(gs)14
-b Ff(\))185 8074 y(")p Fb(do)-9 b(cumentation)13 b Ff(")92
-b(\(interactive)j(")p Fb(template)13 b Ff("\))185 8285
-y Fb(b)-9 b(o)g(dy)16 b Ff(\))0 8572 y Fh(An)58 b(example:)0
-8858 y Ff(\(defun)94 b(this-line-to-top-of-window)99
-b(\(line\))185 9069 y("Reposition)c(line)e(point)g(is)g(on)g(to)g(top)g
-(of)g(window.)0 9280 y(With)g(ARG,)h(put)f(point)g(on)g(line)g(ARG.")
-185 9491 y(\(interactive)i("P"\))185 9702 y(\(recenter)f(\(if)f(\(null)
-h(line\))1476 9913 y(0)1292 10123 y(\(prefix-numeric-value)j
-(line\)\)\)\))0 10410 y Fh(The)68 b Ff(interactive)j
-Fh(sp)5 b(ec)68 b(sa)-5 b(ys)68 b(ho)-5 b(w)68 b(to)g(read)g(argumen)-5
-b(ts)68 b(in)-5 b(teractiv)g(ely)-15 b(.)0 10621 y(T)-5
-b(yp)5 b(e)58 b Ff(C-h)93 b(f)g(interactive)61 b Fh(for)d(more)h
-(details.)1007 11290 y Fd(Cop)l(yrigh)l(t)1704 11286
-y(c)1666 11290 y Fc(\015)47 b Fd(1997)h(F)-11 b(ree)47
-b(Soft)l(w)l(are)h(F)-11 b(oundation,)46 b(Inc.)1216
-11459 y(v2.2)h(for)g(GNU)f(Emacs)j(v)l(ersion)f(20,)f(June)g(1997)1689
-11627 y(designed)h(b)l(y)f(Stephen)f(Gildea)0 11872 y(P)l(ermission)g
-(is)e(gran)l(ted)f(to)h(mak)l(e)h(and)e(distribute)h(copies)g(of)g
-(this)f(card)h(pro)l(vided)g(the)f(cop)l(y-)0 12040 y(righ)l(t)48
-b(notice)h(and)d(this)h(p)t(ermission)i(notice)f(are)g(preserv)l(ed)g
-(on)f(all)i(copies.)0 12285 y(F)-11 b(or)43 b(copies)j(of)d(the)i(GNU)e
-(Emacs)i(man)l(ual,)h(write)f(to)f(the)g(F)-11 b(ree)45
-b(Soft)l(w)l(are)f(F)-11 b(oundation,)44 b(Inc.,)0 12453
-y(59)j(T)-11 b(emple)50 b(Place,)f(Suite)f(330,)f(Boston,)g(MA)g
-(02111-1307)h(USA)8167 12865 y Fh(6)p eop
+6 5 bop 0 -337 a Fg(Registers)0 -130 y Fh(sa)n(v)n(e)26
+b(region)g(in)i(register)1006 b Ff(C-x)42 b(r)i(s)0 -30
+y Fh(insert)27 b(register)f(con)n(ten)n(ts)h(in)n(to)h(bu\013er)566
+b Ff(C-x)42 b(r)i(i)0 105 y Fh(sa)n(v)n(e)26 b(v)-5 b(alue)28
+b(of)f(p)r(oin)n(t)h(in)g(register)729 b Ff(C-x)42 b(r)i(SPC)0
+205 y Fh(jump)28 b(to)g(p)r(oin)n(t)g(sa)n(v)n(ed)e(in)i(register)676
+b Ff(C-x)42 b(r)i(j)0 457 y Fg(Keyb)t(oard)h(Macros)0
+664 y Fe(start)28 b Fh(de\014ning)g(a)f(k)n(eyb)r(oard)f(macro)609
+b Ff(C-x)42 b(\()0 764 y Fe(end)28 b Fh(k)n(eyb)r(oard)e(macro)g
+(de\014nition)672 b Ff(C-x)42 b(\))0 863 y Fe(execute)28
+b Fh(last-de\014ned)f(k)n(eyb)r(oard)f(macro)432 b Ff(C-x)42
+b(e)0 963 y Fh(app)r(end)28 b(to)f(last)h(k)n(eyb)r(oard)e(macro)665
+b Ff(C-u)42 b(C-x)h(\()0 1063 y Fh(name)27 b(last)h(k)n(eyb)r(oard)e
+(macro)436 b Ff(M-x)42 b(name-last-kbd-ma)o(cr)o(o)0
+1162 y Fh(insert)27 b(Lisp)h(de\014nition)g(in)g(bu\013er)439
+b Ff(M-x)43 b(insert-kbd-macr)o(o)0 1405 y Fg(Commands)j(Dealing)g
+(with)i(Emacs)d(Lisp)0 1612 y Fh(ev)-5 b(al)27 b Fe(sexp)h
+Fh(b)r(efore)f(p)r(oin)n(t)981 b Ff(C-x)42 b(C-e)0 1711
+y Fh(ev)-5 b(al)27 b(curren)n(t)g Fe(defun)1111 b Ff(C-M-x)0
+1811 y Fh(ev)-5 b(al)27 b Fe(region)1199 b Ff(M-x)42
+b(eval-region)0 1911 y Fh(read)27 b(and)g(ev)-5 b(al)28
+b(minibu\013er)914 b Ff(M-:)0 2010 y Fh(load)27 b(from)g(standard)g
+(system)g(directory)301 b Ff(M-x)42 b(load-library)0
+2263 y Fg(Simple)47 b(Customization)0 2470 y Fh(customize)27
+b(v)-5 b(ariables)27 b(and)g(faces)563 b Ff(M-x)42 b(customize)0
+2605 y Fh(Making)27 b(global)f(k)n(ey)h(bindings)h(in)g(Emacs)e(Lisp)i
+(\(examples\):)0 2741 y Ff(\(global-set-key)37 b("\\C-cg")k
+('goto-line\))0 2840 y(\(global-set-key)c("\\M-#")k('query-replace-re)o
+(gex)o(p\))0 3093 y Fg(W)-11 b(riting)46 b(Commands)0
+3300 y Ff(\(defun)41 b Fb(c)l(ommand-name)51 b Ff(\()p
+Fb(ar)l(gs)7 b Ff(\))87 3399 y(")p Fb(do)l(cumentation)f
+Ff(")44 b(\(interactive)38 b(")p Fb(template)6 b Ff("\))87
+3499 y Fb(b)l(o)l(dy)h Ff(\))0 3634 y Fh(An)28 b(example:)0
+3770 y Ff(\(defun)41 b(this-line-to-top)o(-of)o(-w)o(ind)o(ow)c
+(\(line\))87 3869 y("Reposition)i(line)j(point)g(is)g(on)h(to)g(top)f
+(of)h(window.)0 3969 y(With)f(ARG,)g(put)g(point)g(on)g(line)g(ARG.")87
+4069 y(\(interactive)d("P"\))87 4168 y(\(recenter)h(\(if)i(\(null)g
+(line\))697 4268 y(0)610 4368 y(\(prefix-numeric-v)o(al)o(ue)37
+b(line\)\)\)\))0 4503 y Fh(The)32 b Ff(interactive)c
+Fh(sp)r(ec)k(sa)n(ys)f(ho)n(w)g(to)h(read)f(argumen)n(ts)g(in)n
+(teractiv)n(ely)-7 b(.)0 4603 y(T)n(yp)r(e)27 b Ff(C-h)43
+b(f)g(interactive)23 b Fh(for)k(more)g(details.)476 4919
+y Fd(Cop)n(yrigh)n(t)805 4917 y(c)787 4919 y Fc(\015)22
+b Fd(1997)h(F)-5 b(ree)21 b(Soft)n(w)n(are)h(F)-5 b(oundation,)20
+b(Inc.)654 4998 y(v2.2)i(for)g(GNU)h(Emacs)e(v)n(ersion)h(21,)h(1997)
+798 5078 y(designed)e(b)n(y)h(Stephen)e(Gildea)0 5194
+y(P)n(ermission)f(is)i(gran)n(ted)f(to)h(mak)n(e)e(and)i(distribute)d
+(copies)i(of)g(this)h(card)e(pro)n(vided)g(the)h(cop)n(y-)0
+5273 y(righ)n(t)i(notice)f(and)h(this)g(p)r(ermission)f(notice)g(are)g
+(preserv)n(ed)g(on)h(all)g(copies.)0 5389 y(F)-5 b(or)20
+b(copies)g(of)h(the)f(GNU)h(Emacs)f(man)n(ual,)g(write)g(to)h(the)f(F)
+-5 b(ree)20 b(Soft)n(w)n(are)g(F)-5 b(oundation,)19 b(Inc.,)0
+5468 y(59)k(T)-5 b(emple)20 b(Place,)h(Suite)g(330,)h(Boston,)h(MA)f
+(02111-1307)h(USA)3858 5663 y Fh(6)p eop
 %%Trailer
 end
 userdict /end-hook known{end-hook}if
-SafetyEnclosure restore
 %%EOF
diff -ruN src-21.1/etc/refcard.tex src-21.2/etc/refcard.tex
--- src-21.1/etc/refcard.tex	Sun Sep 23 19:47:30 2001
+++ src-21.2/etc/refcard.tex	Fri Feb 22 11:51:22 2002
@@ -1,4 +1,4 @@
-% Reference Card for GNU Emacs version 20 on Unix systems
+% Reference Card for GNU Emacs version 21 on Unix systems
 %**start of header
 \newcount\columnsperpage
 
@@ -61,7 +61,7 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version 20, June \year}
+\centerline{v\versionnumber{} for GNU Emacs version 21, \year}
 \centerline{designed by Stephen Gildea}
 
 Permission is granted to make and distribute copies of
@@ -251,11 +251,11 @@
 
 \title{GNU Emacs Reference Card}
 
-\centerline{(for version 20)}
+\centerline{(for version 21)}
 
 \section{Starting Emacs}
 
-To enter GNU Emacs 20, just type its name: \kbd{emacs}
+To enter GNU Emacs 21, just type its name: \kbd{emacs}
 
 To read in a file to edit, see Files, below.
 
diff -ruN src-21.1/etc/sk-dired-ref.ps src-21.2/etc/sk-dired-ref.ps
--- src-21.1/etc/sk-dired-ref.ps	Wed Apr 18 15:58:29 2001
+++ src-21.2/etc/sk-dired-ref.ps	Fri Feb 22 11:51:22 2002
@@ -4,12 +4,11 @@
 %%Pages: 1
 %%PageOrder: Ascend
 %%BoundingBox: 0 0 596 842
-%%DocumentPaperSizes: a4
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips sk-dired-ref.dvi
 %DVIPSParameters: dpi=600, compressed
-%DVIPSSource:  TeX output 2001.03.23:1136
+%DVIPSSource:  TeX output 2002.02.13:1838
 %%BeginProcSet: texc.pro
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -410,8 +409,8 @@
 C9FCA4D803F0EB0FC000FFEB03FFA4000FEB003FB1157FA215FF00075BD9F80713FC6CB5
 12BFC6EBFE3FEB3FF0262F7CAE2D>250 D E
 %EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fd csr8 8 57
-/Fd 57 254 df<9138FF807E01079038E1FF80903A1F807FC3C0D93E00EB87E049EBFF07
+%DVIPSBitmapFont: Fd csr8 8 56
+/Fd 56 254 df<9138FF807E01079038E1FF80903A1F807FC3C0D93E00EB87E049EBFF07
 4913FE485A00039138FC018049017CC7FCAAB712FCA22703E0007CC7FCB3A6486C13FE3A
 7FFF0FFFF0A22B2F7FAE29>11 D<14FF010713E090381F80F090383E003849137C4913FC
 485A1203491378153092C7FCA7157CB612FCA23803E000157CB3A5486C13FE3A7FFF0FFF
@@ -425,108 +424,105 @@
 031580A214071500A25C140EA2141E141CA2143C143814781470A214F05CA213015CA213
 035C130791C7FCA25B130EA2131E131CA2133C1338A21378137013F05BA212015BA21203
 5BA2120790C8FC5A120EA2121E121CA2123C1238A212781270A212F05AA21A437CB123>
-I<EB3FC0EBFFF03803E07C48487E48487E497E001EEB0780A2003E14C0A248EB03E0A500
-FC14F0B0007C14E0A3007E1307003E14C0A36CEB0F806C14006D5A3807C03E3803F0FC38
-00FFF0EB3FC01C2D7DAB23>I<130C133C137CEA03FC12FFEAFC7C1200B3B113FE387FFF
-FEA2172C7AAB23>I<EB7F803801FFF0380780FC380E003F48EB1F8048EB0FC05A0060EB
-07E012F000FC14F07E1403A3007C1307C7FCA215E0140F15C0141F1580EC3F00147E147C
-5C495A495A495A495A011EC7FC5B5B4913305B485A4848136048C7FC000E14E0001FB5FC
-5A4814C0B6FCA21C2C7DAB23>I<B612F815FF3A03F8001FE00001EC03F0ED00F8167E82
-EE1F80160F17C0EE07E0A2EE03F0A217F81601A317FCAA17F8A3EE03F0A217E0160717C0
-160FEE1F80EE3F00167E5EED03F00003EC1FE0B7128003F8C7FC2E2D7DAC36>68
-D<B712FEA23903F800010001EC003E828282A282A3178016011518A293C7FCA315381578
-15F890B5FCA2EBF800157815381518A21760A392C712C0A4160117801603A21607160F16
-3F0003913801FF00B8FCA22B2D7EAC30>I<DA1FF013C09138FFFE01903903F00F839039
-0F8001E3013FC71277017C143F4848141F4848140F48481407A248481403121F49140112
-3F90C8FC481500A300FE1600A992381FFFFEA2007F9138001FE0EE0FC0A27E7F121F7F12
-0F6C7EA26C7E6C6C141FEA007C013F143FD90F8013F3903903F007C10100B51200DA1FF8
-13002F2F7CAD37>71 D<D8FFF8903803FFFC7F00019138003FC06DEC0F006D1406EBBF80
-A2EB9FC0EB8FE0138780EB83F8138180EB80FE147E147FEC3F80EC1FC0140F15E0EC07F0
-140315F8EC01FC140015FE157FED3F86151F16C6ED0FE6150716F6ED03FE1501A2150016
-7E163EA2486C141ED80FF0140EB5FC16062E2D7DAC35>78 D<B612FCEDFF803A03F8000F
-E00001EC03F0ED00F882167E167F821780A617005E167E5E5EED03F0ED0FE090B6128003
-FCC7FC01F8C9FCB2487EB512F0A2292D7EAC30>80 D<B539F003FFFCA2D803FCC7EA3FC0
-6C48EC0F001606B3AB160E0000150C7F161C017C1418017E14386D5C6D146090390F8001
-E0903907E00380902601F80FC7FC9038007FFCEC0FF02E2E7DAC35>85
-D<13FF000713C0380F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF137F3801
-FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF8C391F
-83C7FC390FFF03F83901FC01E01F207D9E23>97 D<EA07C012FFA2120F1207AC14FE9038
-C7FF809038CF03E09038DC01F09038F8007C49137E49133E497F1680A2150F16C0A9ED1F
-80A216005D6D133E6D5B01B05B9038BC01F090380E07E0390607FF80260001FCC7FC222F
-7EAD27>I<EB1FE0EB7FFC3801F01E3803E0073907C01F80EA0F80EA1F005A003EEB0F00
-007E90C7FCA2127C12FCA9127EA215C07E6C130101801380380FC0033907E007003801F0
-3E38007FF8EB1FC01A207E9E1F>I<15F8141FA214011400ACEB0FE0EB7FF83801F81E38
-03E0073807C003380F8001EA1F00481300123E127EA25AA9127C127EA2003E13017EEB80
-03000F13073903E00EFC3A01F03CFFC038007FF090391FC0F800222F7EAD27>I<EB1F80
-EBFFF03803E0783807C03E380F801E381F001FEC0F80123E007E130715C0127C12FCA3B6
-FCA200FCC8FCA5127EA2003E14C0123F6C1301390F80038001C013003803E00F3801F03C
-38007FF8EB1FC01A207E9E1F>I<EB03F0EB0FFCEB3E1EEB7C3F13F8EA01F0A23803E00C
-1400AAB512E0A23803E000B3A6487E387FFF80A2182F7FAE16>I<013F13F89038FFC3FE
-3903E1FF1E3807807C000F140C391F003E00A2003E7FA76C133EA26C6C5A00071378380F
-E1F0380CFFC0D81C3FC7FC90C8FCA3121E121F380FFFF814FF6C14C04814F0391E0007F8
-48130048147C12F848143CA46C147C007C14F86CEB01F06CEB03E03907E01F803901FFFE
-0038003FF01F2D7E9D23>I<EA07C012FFA2120F1207AC14FE9038C3FF809038C703E090
-38DE01F013F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2222E7EAD27>I<EA0780EA
-0FC0EA1FE0A4EA0FC0EA0780C7FCA8EA07C012FFA2120F1207B3A5EA0FE0EAFFFCA20E2E
-7EAD14>I<130FEB1F80EB3FC0A4EB1F80EB0F0090C7FCA8EB07C013FFA2130F1307B3AD
-1230127838FC0F80A21400485AEA783EEA3FF8EA07E0123C83AD16>I<EA07C012FFA212
-0F1207ADEC1FFEA2EC0FF0EC07C05D020EC7FC5C5C5C5CEBC3C013C7EBCFE0EBDFF013F9
-EBF0F8497EEBC07E143E80816E7E14076E7E816E7E486C487E3AFFFE07FF80A2212E7EAD
-25>I<EA07C012FFA2120F1207B3B3A3EA0FE0EAFFFEA20F2E7EAD14>I<2607C07FEB07F0
-3BFFC3FFC03FFC903AC783F0783F3C0FCE01F8E01F803B07DC00F9C00F01F8D9FF8013C0
-4990387F000749137EA249137CB2486C01FEEB0FE03CFFFE0FFFE0FFFEA2371E7E9D3C>
-I<3807C0FE39FFC3FF809038C703E0390FDE01F0EA07F8496C7EA25BA25BB2486C487E3A
-FFFE1FFFC0A2221E7E9D27>I<EB1FE0EB7FF83801F03E3803C00F3907800780390F0003
-C04814E0003EEB01F0A248EB00F8A300FC14FCA9007C14F8A26CEB01F0A26CEB03E0A239
-0F8007C03907C00F803901F03E0038007FF8EB1FE01E207E9E23>I<3807C0FE39FFC7FF
-809038CF03E0390FDC01F03907F800FC49137E49133E49133FED1F80A3ED0FC0A8151F16
-80A2ED3F00A26D137E6D137C5D9038FC01F09038CE07E09038C7FF80D9C1FCC7FC01C0C8
-FCA9487EEAFFFEA2222B7E9D27>I<380781F838FF87FEEB8E3FEA0F9CEA07B813B0EBF0
-1EEBE000A45BB0487EB5FCA2181E7E9D1C>114 D<3801FE183807FFB8381E01F8EA3C00
-481378481338A21418A27E7EB41300EA7FF06CB4FC6C13C06C13F0000113F838001FFC13
-0138C0007E143EA26C131EA27EA26C133CA26C137838FF01F038E3FFC000C0130017207E
-9E1C>I<1360A413E0A312011203A21207121FB512F0A23803E000AF1418A714383801F0
-3014703800F860EB3FE0EB0F80152A7FA81B>I<D807C013F800FF131FA2000F13010007
-1300B21401A314033803E007EC0EFC3A01F81CFFC038007FF890391FE0F800221F7E9D27
->I<3AFFFC01FFC0A23A0FE0007E000007147C15380003143015706C6C1360A26C6C5BA3
-90387C0180A26D48C7FCA2EB3F07EB1F06A2EB0F8CA214DCEB07D8A2EB03F0A36D5AA26D
-5A221E7F9C25>I<3AFFFC07FF80A23A0FF003FC000003EB01F0000114C06D485A000091
-C7FCEB7C06EB3E0E6D5A14B8EB0FB0EB07E013036D7E497E1307EB067C497EEB1C1F0138
-7FEB700F496C7E6E7ED803C07F00076D7E391FE003FC3AFFF007FFC0A2221D7F9C25>
-120 D<3AFFFC01FFC0A23A0FE0007E000007147C1538000314306D137000011460A26C6C
-5BA2EBFC01017C5BEB7E03013E90C7FCA2EB1F06A2148EEB0F8CA2EB07D8A2EB03F0A36D
-5AA26D5AA2495AA2130391C8FC1278EAFC06A25B131CEA7838EA7070EA3FE0EA0F80222B
-7F9C25>I<003FB51280A2EB003F003C14000038137E00305BEA700100605B495A495A13
-0F00005B495A49C7FC5B137E9038FC0180EA01F8120313F03807E003EA0FC0001F140013
-8048485A007E5B00FE133FB6FCA2191D7E9C1F>I<B712C0A22202809223>I<3807800838
-0FE01C381FF838383FFFF038707FE038E01FC03840078016077AAC23>126
-D<EB01E0EB03F0EB07F83807C7FC12FFA2EA0FC33807C1ECEBC00C141C14181438143014
-7014E0EBC3C0140013C0B3AB487EEAFFFEA216317EB014>181 D<0040130800F0133C00
-7813786C13F0381F03E0380F87C03807CF803803FF006C5A6C5A1378133090C7FCA23801
-FE183807FFB8381E01F8EA3C00481378481338A21418A27E7EB41300EA7FF06CB4FC6C13
-C06C13F0000113F838001FFC130138C0007E143EA26C131EA27EA26C133CA26C137838FF
-01F038E3FFC000C01300172E7EAC1C>185 D<143C147E14FF1580A3147F143DEB600114
-0315005CEBE006140E5C000113780003136091C7FC120F121FB512F0A2D803E0C7FCAF14
-18A714383801F03014703800F860EB3FE0EB0F8019327FB01B>187
-D<00101302003C130F6C131E6C5B3807C0F83803E1F03801F3E06CB45A6D5A6DC7FC131E
-130C90C8FCA4003FB51280A2EB003F003C14000038137E00305BEA700100605B495A495A
-130F00005B495A49C7FC5B137E9038FC0180EA01F8120313F03807E003EA0FC0001F1400
-138048485A007E5B00FE133FB6FCA2192D7EAC1F>190 D<143C147C14FCA2495A495AEB
-07C0495A49C7FC131C5B131090C8FCA313FF000713C0380F01F0381C00F8003F137C80A2
-143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE14065A
-A3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F83901FC01E01F2F7DAD23>225
-D<000F131E381F803F393FC07F80A4391F803F00380F001EC9FCA213FF000713C0380F01
-F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0EA3F
-80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F83901
-FC01E01F2A7DA823>228 D<00085B001EEB07806CEB0F003807801E3803E07C6C6C5A38
-00F9F0EB7FE06D5A6D5A6DC7FC130690C8FCA2EB1FE0EB7FFC3801F01E3803E0073907C0
-1F80EA0F80EA1F005A003EEB0F00007E90C7FCA2127C12FCA9127EA215C07E6C13010180
-1380380FC0033907E007003801F03E38007FF8EB1FC01A2E7EAC1F>232
-D<140F5C5CA2147E5CEB01F0495A495A91C7FC130E130490C8FCA3EB1F80EBFFF03803E0
-783807C03E380F801E381F001FEC0F80123E007E130715C0127C12FCA3B6FCA200FCC8FC
-A5127EA2003E14C0123F6C1301390F80038001C013003803E00F3801F03C38007FF8EB1F
-C01A2F7EAD1F>I<131E133E137EA213FCEA01F8EA03E0EA07C0EA0F80EA0E005A1208C7
-FCA4EA07C012FFA2120F1207B3A5EA0FE0EAFFFCA20F2E7EAD14>237
+I<130C133C137CEA03FC12FFEAFC7C1200B3B113FE387FFFFEA2172C7AAB23>49
+D<EB7F803801FFF0380780FC380E003F48EB1F8048EB0FC05A0060EB07E012F000FC14F0
+7E1403A3007C1307C7FCA215E0140F15C0141F1580EC3F00147E147C5C495A495A495A49
+5A011EC7FC5B5B4913305B485A4848136048C7FC000E14E0001FB5FC5A4814C0B6FCA21C
+2C7DAB23>I<B612F815FF3A03F8001FE00001EC03F0ED00F8167E82EE1F80160F17C0EE
+07E0A2EE03F0A217F81601A317FCAA17F8A3EE03F0A217E0160717C0160FEE1F80EE3F00
+167E5EED03F00003EC1FE0B7128003F8C7FC2E2D7DAC36>68 D<B712FEA23903F8000100
+01EC003E828282A282A3178016011518A293C7FCA31538157815F890B5FCA2EBF8001578
+15381518A21760A392C712C0A4160117801603A21607160F163F0003913801FF00B8FCA2
+2B2D7EAC30>I<DA1FF013C09138FFFE01903903F00F8390390F8001E3013FC71277017C
+143F4848141F4848140F48481407A248481403121F491401123F90C8FC481500A300FE16
+00A992381FFFFEA2007F9138001FE0EE0FC0A27E7F121F7F120F6C7EA26C7E6C6C141FEA
+007C013F143FD90F8013F3903903F007C10100B51200DA1FF813002F2F7CAD37>71
+D<D8FFF8903803FFFC7F00019138003FC06DEC0F006D1406EBBF80A2EB9FC0EB8FE01387
+80EB83F8138180EB80FE147E147FEC3F80EC1FC0140F15E0EC07F0140315F8EC01FC1400
+15FE157FED3F86151F16C6ED0FE6150716F6ED03FE1501A21500167E163EA2486C141ED8
+0FF0140EB5FC16062E2D7DAC35>78 D<B612FCEDFF803A03F8000FE00001EC03F0ED00F8
+82167E167F821780A617005E167E5E5EED03F0ED0FE090B6128003FCC7FC01F8C9FCB248
+7EB512F0A2292D7EAC30>80 D<B539F003FFFCA2D803FCC7EA3FC06C48EC0F001606B3AB
+160E0000150C7F161C017C1418017E14386D5C6D146090390F8001E0903907E003809026
+01F80FC7FC9038007FFCEC0FF02E2E7DAC35>85 D<13FF000713C0380F01F0381C00F800
+3F137C80A2143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0EA3F80EA7F00127E
+00FE14065AA3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F83901FC01E01F207D
+9E23>97 D<EA07C012FFA2120F1207AC14FE9038C7FF809038CF03E09038DC01F09038F8
+007C49137E49133E497F1680A2150F16C0A9ED1F80A216005D6D133E6D5B01B05B9038BC
+01F090380E07E0390607FF80260001FCC7FC222F7EAD27>I<EB1FE0EB7FFC3801F01E38
+03E0073907C01F80EA0F80EA1F005A003EEB0F00007E90C7FCA2127C12FCA9127EA215C0
+7E6C130101801380380FC0033907E007003801F03E38007FF8EB1FC01A207E9E1F>I<15
+F8141FA214011400ACEB0FE0EB7FF83801F81E3803E0073807C003380F8001EA1F004813
+00123E127EA25AA9127C127EA2003E13017EEB8003000F13073903E00EFC3A01F03CFFC0
+38007FF090391FC0F800222F7EAD27>I<EB1F80EBFFF03803E0783807C03E380F801E38
+1F001FEC0F80123E007E130715C0127C12FCA3B6FCA200FCC8FCA5127EA2003E14C0123F
+6C1301390F80038001C013003803E00F3801F03C38007FF8EB1FC01A207E9E1F>I<EB03
+F0EB0FFCEB3E1EEB7C3F13F8EA01F0A23803E00C1400AAB512E0A23803E000B3A6487E38
+7FFF80A2182F7FAE16>I<013F13F89038FFC3FE3903E1FF1E3807807C000F140C391F00
+3E00A2003E7FA76C133EA26C6C5A00071378380FE1F0380CFFC0D81C3FC7FC90C8FCA312
+1E121F380FFFF814FF6C14C04814F0391E0007F848130048147C12F848143CA46C147C00
+7C14F86CEB01F06CEB03E03907E01F803901FFFE0038003FF01F2D7E9D23>I<EA07C012
+FFA2120F1207AC14FE9038C3FF809038C703E09038DE01F013F8496C7EA25BA25BB2486C
+487E3AFFFE1FFFC0A2222E7EAD27>I<EA0780EA0FC0EA1FE0A4EA0FC0EA0780C7FCA8EA
+07C012FFA2120F1207B3A5EA0FE0EAFFFCA20E2E7EAD14>I<130FEB1F80EB3FC0A4EB1F
+80EB0F0090C7FCA8EB07C013FFA2130F1307B3AD1230127838FC0F80A21400485AEA783E
+EA3FF8EA07E0123C83AD16>I<EA07C012FFA2120F1207ADEC1FFEA2EC0FF0EC07C05D02
+0EC7FC5C5C5C5CEBC3C013C7EBCFE0EBDFF013F9EBF0F8497EEBC07E143E80816E7E1407
+6E7E816E7E486C487E3AFFFE07FF80A2212E7EAD25>I<EA07C012FFA2120F1207B3B3A3
+EA0FE0EAFFFEA20F2E7EAD14>I<2607C07FEB07F03BFFC3FFC03FFC903AC783F0783F3C
+0FCE01F8E01F803B07DC00F9C00F01F8D9FF8013C04990387F000749137EA249137CB248
+6C01FEEB0FE03CFFFE0FFFE0FFFEA2371E7E9D3C>I<3807C0FE39FFC3FF809038C703E0
+390FDE01F0EA07F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2221E7E9D27>I<EB1F
+E0EB7FF83801F03E3803C00F3907800780390F0003C04814E0003EEB01F0A248EB00F8A3
+00FC14FCA9007C14F8A26CEB01F0A26CEB03E0A2390F8007C03907C00F803901F03E0038
+007FF8EB1FE01E207E9E23>I<3807C0FE39FFC7FF809038CF03E0390FDC01F03907F800
+FC49137E49133E49133FED1F80A3ED0FC0A8151F1680A2ED3F00A26D137E6D137C5D9038
+FC01F09038CE07E09038C7FF80D9C1FCC7FC01C0C8FCA9487EEAFFFEA2222B7E9D27>I<
+380781F838FF87FEEB8E3FEA0F9CEA07B813B0EBF01EEBE000A45BB0487EB5FCA2181E7E
+9D1C>114 D<3801FE183807FFB8381E01F8EA3C00481378481338A21418A27E7EB41300
+EA7FF06CB4FC6C13C06C13F0000113F838001FFC130138C0007E143EA26C131EA27EA26C
+133CA26C137838FF01F038E3FFC000C0130017207E9E1C>I<1360A413E0A312011203A2
+1207121FB512F0A23803E000AF1418A714383801F03014703800F860EB3FE0EB0F80152A
+7FA81B>I<D807C013F800FF131FA2000F130100071300B21401A314033803E007EC0EFC
+3A01F81CFFC038007FF890391FE0F800221F7E9D27>I<3AFFFC01FFC0A23A0FE0007E00
+0007147C15380003143015706C6C1360A26C6C5BA390387C0180A26D48C7FCA2EB3F07EB
+1F06A2EB0F8CA214DCEB07D8A2EB03F0A36D5AA26D5A221E7F9C25>I<3AFFFC07FF80A2
+3A0FF003FC000003EB01F0000114C06D485A000091C7FCEB7C06EB3E0E6D5A14B8EB0FB0
+EB07E013036D7E497E1307EB067C497EEB1C1F01387FEB700F496C7E6E7ED803C07F0007
+6D7E391FE003FC3AFFF007FFC0A2221D7F9C25>120 D<3AFFFC01FFC0A23A0FE0007E00
+0007147C1538000314306D137000011460A26C6C5BA2EBFC01017C5BEB7E03013E90C7FC
+A2EB1F06A2148EEB0F8CA2EB07D8A2EB03F0A36D5AA26D5AA2495AA2130391C8FC1278EA
+FC06A25B131CEA7838EA7070EA3FE0EA0F80222B7F9C25>I<003FB51280A2EB003F003C
+14000038137E00305BEA700100605B495A495A130F00005B495A49C7FC5B137E9038FC01
+80EA01F8120313F03807E003EA0FC0001F1400138048485A007E5B00FE133FB6FCA2191D
+7E9C1F>I<B712C0A22202809223>I<38078008380FE01C381FF838383FFFF038707FE038
+E01FC03840078016077AAC23>126 D<EB01E0EB03F0EB07F83807C7FC12FFA2EA0FC338
+07C1ECEBC00C141C141814381430147014E0EBC3C0140013C0B3AB487EEAFFFEA216317E
+B014>181 D<0040130800F0133C007813786C13F0381F03E0380F87C03807CF803803FF
+006C5A6C5A1378133090C7FCA23801FE183807FFB8381E01F8EA3C00481378481338A214
+18A27E7EB41300EA7FF06CB4FC6C13C06C13F0000113F838001FFC130138C0007E143EA2
+6C131EA27EA26C133CA26C137838FF01F038E3FFC000C01300172E7EAC1C>185
+D<143C147E14FF1580A3147F143DEB6001140315005CEBE006140E5C0001137800031360
+91C7FC120F121FB512F0A2D803E0C7FCAF1418A714383801F03014703800F860EB3FE0EB
+0F8019327FB01B>187 D<00101302003C130F6C131E6C5B3807C0F83803E1F03801F3E0
+6CB45A6D5A6DC7FC131E130C90C8FCA4003FB51280A2EB003F003C14000038137E00305B
+EA700100605B495A495A130F00005B495A49C7FC5B137E9038FC0180EA01F8120313F038
+07E003EA0FC0001F1400138048485A007E5B00FE133FB6FCA2192D7EAC1F>190
+D<143C147C14FCA2495A495AEB07C0495A49C7FC131C5B131090C8FCA313FF000713C038
+0F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0
+EA3F80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F8
+3901FC01E01F2F7DAD23>225 D<000F131E381F803F393FC07F80A4391F803F00380F00
+1EC9FCA213FF000713C0380F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF13
+7F3801FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF
+8C391F83C7FC390FFF03F83901FC01E01F2A7DA823>228 D<00085B001EEB07806CEB0F
+003807801E3803E07C6C6C5A3800F9F0EB7FE06D5A6D5A6DC7FC130690C8FCA2EB1FE0EB
+7FFC3801F01E3803E0073907C01F80EA0F80EA1F005A003EEB0F00007E90C7FCA2127C12
+FCA9127EA215C07E6C130101801380380FC0033907E007003801F03E38007FF8EB1FC01A
+2E7EAC1F>232 D<140F5C5CA2147E5CEB01F0495A495A91C7FC130E130490C8FCA3EB1F
+80EBFFF03803E0783807C03E380F801E381F001FEC0F80123E007E130715C0127C12FCA3
+B6FCA200FCC8FCA5127EA2003E14C0123F6C1301390F80038001C013003803E00F3801F0
+3C38007FF8EB1FC01A2F7EAD1F>I<131E133E137EA213FCEA01F8EA03E0EA07C0EA0F80
+EA0E005A1208C7FCA4EA07C012FFA2120F1207B3A5EA0FE0EAFFFCA20F2E7EAD14>237
 D<163C167E16FF03F81380141FA20201137F0200133D1601160317005E1606160E5E1678
 166093C7FCA2EB0FE0EB7FF83801F81E3803E0073807C003380F8001EA1F00481300123E
 127EA25AA9127C127EA2003E13017EEB8003000F13073903E00EFC3A01F03CFFC038007F
@@ -607,14 +603,12 @@
 %%BeginSetup
 %%Feature: *Resolution 600dpi
 TeXDict begin
-%%BeginPaperSize: a4
-a4
-%%EndPaperSize
+%%PaperSize: A4
 
 %%EndSetup
 %%Page: 1 1
 1 0 bop -259 -364 a Fe(Referen\350n\341)47 b(k)l(arta)e(pre)h(Dired)-42
--256 y Fd(\(ur\350en\351)25 b(pre)f(Dired)f(v)g(GNU)h(Emacse)f(20.x\))
+-256 y Fd(\(ur\350en\351)25 b(pre)f(Dired)f(v)g(GNU)h(Emacse)f(21.x\))
 -73 -176 y(Pr\355k)n(azy)h(ozna\350en\351)i Fc(\(D)n(X\))d
 Fd(vy\276aduj\372)i(dired-x)-450 20 y Fb(Spustenie)35
 b(a)j(uk)m(on\350enie)f(Dired)-450 177 y Fd(spustenie)25
diff -ruN src-21.1/etc/sk-dired-ref.tex src-21.2/etc/sk-dired-ref.tex
--- src-21.1/etc/sk-dired-ref.tex	Wed Apr 18 15:58:29 2001
+++ src-21.2/etc/sk-dired-ref.tex	Fri Feb 22 11:51:22 2002
@@ -59,7 +59,7 @@
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
 \centerline{designed by Stephen Gildea, \version}
-\centerline{for GNU Emacs version 19 on Unix systems}
+\centerline{for GNU Emacs version 21 on Unix systems}
 \centerline{Updated for Dired in May 2000 by Evgeny Roubinchtein}
 
 Permission is granted to make and distribute copies of
@@ -254,7 +254,7 @@
 
 \title{Referenèná karta pre Dired}
 
-\centerline{(urèené pre Dired v GNU Emacse 20.x)}
+\centerline{(urèené pre Dired v GNU Emacse 21.x)}
 \centerline{Príkazy oznaèené \dx{} vy¾adujú dired-x}
 
 % trim this down to fit everything on one page
diff -ruN src-21.1/etc/sk-refcard.ps src-21.2/etc/sk-refcard.ps
--- src-21.1/etc/sk-refcard.ps	Sun Aug  5 11:04:05 2001
+++ src-21.2/etc/sk-refcard.ps	Fri Feb 22 11:51:22 2002
@@ -6,9 +6,9 @@
 %%BoundingBox: 0 0 596 842
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
-%DVIPSCommandLine: dvips sk-refcard
+%DVIPSCommandLine: dvips sk-refcard.dvi
 %DVIPSParameters: dpi=600, compressed
-%DVIPSSource:  TeX output 2001.08.05:0123
+%DVIPSSource:  TeX output 2002.02.13:1838
 %%BeginProcSet: texc.pro
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -81,8 +81,8 @@
 4B5A017C031FC7FC013F157E6D6C5CD907F0EB07F0D901FFEB7FC06D90B55A021F01FCC8
 FC020113C039357CA842>13 D E
 %EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fc csr7 7 46
-/Fc 46 122 df<1238127C12FE12FFA2127F123B1203A31206A3120C1218123812701220
+%DVIPSBitmapFont: Fc csr7 7 45
+/Fc 45 122 df<1238127C12FE12FFA2127F123B1203A31206A3120C1218123812701220
 08127B8613>44 D<B5FCA410047F8E16>I<1238127C12FEA3127C123807077B8613>I<EB
 3F803801FFF03803E0F83807803C48487E001E7F003E1480A2003C1307007C14C0A400FC
 14E0AE007C14C0A36CEB0F80A36CEB1F006C131E6C6C5A3803E0F86CB45A38003F801B27
@@ -118,43 +118,42 @@
 007E1506A2127C00FC92C7FCA792387FFFE0127C007E02001300167E123EA2123F7E6C7E
 6C7EA26C7ED801F814FEEA007C013FEB039E90390FE00F0E903903FFFC029026007FE0C7
 FC2B2A7DA833>I<B512C0A23807F8006C5AB3B0487EB512C0A212287EA718>73
-D<90B512C0A2903801FE006D5AB3A9123812FEA3130100FC5B387803F000705B383C0FC0
-D80FFFC7FCEA03FC1A297EA722>I<D8FFF0EDFFF06D5C0007EEFE0000035E017CEC037C
-A26D1406A26D140CA36D6C1318A26D6C1330A36D6C1360A26D6C13C0A3903900F80180A2
-91387C0300A2EC3E06A36E5AA2EC0F98A3EC07F0A26E5AEA0780D80FC015FE3CFFFC01C0
-1FFFF0A234287DA73C>77 D<D8FFF0903807FFE07FD803FC9038007E006D143C1618137F
-6D7E6D7EA26D7E6D7E6D7EA26D7E6D7E147FA2EC3F80EC1FC0EC0FE015F01407EC03F8EC
-01FCEC00FEA2157FED3F98ED1FD8A2ED0FF815071503A215011500486C1478487ED8FFFC
-143816182B287EA731>I<B612E015FC3907F0003F0003EC0FC0ED03E0ED01F016F81500
-16FCA616F8150116F0ED03E0ED0FC0ED3F0090B512FC15E001F0C8FCAF487EB512C0A226
-287EA72D>80 D<90387F80203903FFF06039078078E0380E000E48130748130300781301
-0070130012F0A21560A27E1500127C127FEA3FE013FF6C13F06C13FC000313FFC6148001
-0F13C0010013E0EC0FF014031401EC00F8A200C01478A46C1470A26C14F06C14E06CEB01
-C000EFEB078039E3E01F0038C0FFFC38801FF01D2A7DA825>83 D<007FB7FCA23A7E003F
-003F0078150F007081006081A200E01680481501A5C791C7FCB3A64A7E013FB5FCA22928
-7EA72F>I<B539C007FFE0A2D807F8C7EA7E006C48143C1618B3A816386C6C143016706C
-6C1460017C14E0017E495A6D495A90260F8007C7FC903807E03E903801FFF89038003FC0
-2B297EA731>I<13FE3807FFC0380F03E0381C00F0003E1378003F137C143C143E121EC7
-FCA3EB3FFEEA01FF3807F03EEA1FC0EA3F00127EA2481418A3147E127EECDF38393F838F
-F0390FFE0FE03903F807C01D1C7E9A21>97 D<EA0F8012FFA2121F120FAAEB81FCEB8FFF
-9038BC0FC09038F003E09038C001F0EB800015F815FC157CA2157EA7157CA215FC15F890
-38C001F015E090387003C0390E3C0F80390C0FFF00380003F81F297EA725>I<EB3FC0EB
-FFF83803E03C3807C00E380F801F381F003F123EA2007E131E007C1300A212FCA7127C12
-7E1403123E6C1306EA0F803807C00C3803F0383800FFE0EB3F80181C7E9A1E>I<EC03E0
-143FA214071403AAEB3F833801FFE33803E03B3807800F380F0007481303123E127E127C
-A212FCA7127CA2127E123E001E1307001F130F390F801FF03903E073FE3801FFE339007F
-03E01F297EA725>I<133F3801FFE03803E1F0380F80F8381F007C143E123E007E131E14
-1F127C12FCA2B6FCA200FCC7FCA4127C127E1403123E6C1307380F800E3807C01C3803E0
-783800FFE0EB3F80181C7E9A1E>I<EB07E0EB3FF0EB7C78EBF0FCEA01E01203EBC07800
-0713301400A8B51280A23807C000B3A2487EEA7FFEA216297FA815>I<90387E03E03901
-FF9FF03807C3FC380F00F048EBF800001E1378003E137CA6001E1378001F13F86C5BEBC3
-E0380DFF80D81C7EC7FC90C8FCA3121E380FFFF014FC6C13FF001F1480393E001FC00078
-1307EC03E0481301A40078EB03C0007C13076CEB0F80390FC07E003803FFF838007FC01C
-277E9921>I<EA0F8012FFA2121F120FAAEB81FCEB8FFF90389C0F809038B007C013E090
-38C003E0A31380AF391FC007F039FFF83FFEA21F287EA725>I<120EEA3F80A5EA0E00C7
-FCA7EA078012FFA2121F120FB3121FEAFFF8A20D287EA713>I<EA0F8012FFA2121F120F
-ABEC3FF8A2EC1FC01500143C5C14E0EB81C0EB8380018FC7FCEB9F8013BFEBF7C0EBC3E0
-EB81F0801380147C80143FEC1F80EC0FC0D81FC013E039FFF83FFCA21E287EA723>107
+D<D8FFF0EDFFF06D5C0007EEFE0000035E017CEC037CA26D1406A26D140CA36D6C1318A2
+6D6C1330A36D6C1360A26D6C13C0A3903900F80180A291387C0300A2EC3E06A36E5AA2EC
+0F98A3EC07F0A26E5AEA0780D80FC015FE3CFFFC01C01FFFF0A234287DA73C>77
+D<D8FFF0903807FFE07FD803FC9038007E006D143C1618137F6D7E6D7EA26D7E6D7E6D7E
+A26D7E6D7E147FA2EC3F80EC1FC0EC0FE015F01407EC03F8EC01FCEC00FEA2157FED3F98
+ED1FD8A2ED0FF815071503A215011500486C1478487ED8FFFC143816182B287EA731>I<
+B612E015FC3907F0003F0003EC0FC0ED03E0ED01F016F8150016FCA616F8150116F0ED03
+E0ED0FC0ED3F0090B512FC15E001F0C8FCAF487EB512C0A226287EA72D>80
+D<90387F80203903FFF06039078078E0380E000E481307481303007813010070130012F0
+A21560A27E1500127C127FEA3FE013FF6C13F06C13FC000313FFC61480010F13C0010013
+E0EC0FF014031401EC00F8A200C01478A46C1470A26C14F06C14E06CEB01C000EFEB0780
+39E3E01F0038C0FFFC38801FF01D2A7DA825>83 D<007FB7FCA23A7E003F003F0078150F
+007081006081A200E01680481501A5C791C7FCB3A64A7E013FB5FCA229287EA72F>I<B5
+39C007FFE0A2D807F8C7EA7E006C48143C1618B3A816386C6C143016706C6C1460017C14
+E0017E495A6D495A90260F8007C7FC903807E03E903801FFF89038003FC02B297EA731>
+I<13FE3807FFC0380F03E0381C00F0003E1378003F137C143C143E121EC7FCA3EB3FFEEA
+01FF3807F03EEA1FC0EA3F00127EA2481418A3147E127EECDF38393F838FF0390FFE0FE0
+3903F807C01D1C7E9A21>97 D<EA0F8012FFA2121F120FAAEB81FCEB8FFF9038BC0FC090
+38F003E09038C001F0EB800015F815FC157CA2157EA7157CA215FC15F89038C001F015E0
+90387003C0390E3C0F80390C0FFF00380003F81F297EA725>I<EB3FC0EBFFF83803E03C
+3807C00E380F801F381F003F123EA2007E131E007C1300A212FCA7127C127E1403123E6C
+1306EA0F803807C00C3803F0383800FFE0EB3F80181C7E9A1E>I<EC03E0143FA2140714
+03AAEB3F833801FFE33803E03B3807800F380F0007481303123E127E127CA212FCA7127C
+A2127E123E001E1307001F130F390F801FF03903E073FE3801FFE339007F03E01F297EA7
+25>I<133F3801FFE03803E1F0380F80F8381F007C143E123E007E131E141F127C12FCA2
+B6FCA200FCC7FCA4127C127E1403123E6C1307380F800E3807C01C3803E0783800FFE0EB
+3F80181C7E9A1E>I<EB07E0EB3FF0EB7C78EBF0FCEA01E01203EBC078000713301400A8
+B51280A23807C000B3A2487EEA7FFEA216297FA815>I<90387E03E03901FF9FF03807C3
+FC380F00F048EBF800001E1378003E137CA6001E1378001F13F86C5BEBC3E0380DFF80D8
+1C7EC7FC90C8FCA3121E380FFFF014FC6C13FF001F1480393E001FC000781307EC03E048
+1301A40078EB03C0007C13076CEB0F80390FC07E003803FFF838007FC01C277E9921>I<
+EA0F8012FFA2121F120FAAEB81FCEB8FFF90389C0F809038B007C013E09038C003E0A313
+80AF391FC007F039FFF83FFEA21F287EA725>I<120EEA3F80A5EA0E00C7FCA7EA078012
+FFA2121F120FB3121FEAFFF8A20D287EA713>I<EA0F8012FFA2121F120FABEC3FF8A2EC
+1FC01500143C5C14E0EB81C0EB8380018FC7FCEB9F8013BFEBF7C0EBC3E0EB81F0801380
+147C80143FEC1F80EC0FC0D81FC013E039FFF83FFCA21E287EA723>107
 D<EA0F8012FFA2121F120FB3AFEA1FC0EAFFF8A20D287EA713>I<260F81FC137F3BFF8F
 FF03FFC0903A9C0F8703E03B1FB007CC01F0D80FE013D8903AC003F000F8A301805BAF48
 6C486C487E3CFFF83FFE0FFF80A2311A7E9937>I<380F81FC38FF8FFF90389C0F80391F
@@ -751,8 +750,8 @@
 C06C48B45A90B5CBFC6C5B000713F86C13E0C66CCCFC426D7DD449>253
 D E
 %EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fh csr10 10 74
-/Fh 74 256 df<DA0FF813FC91397FFF07FF903B01F807DF83C0903A07E001FF0F903B1F
+%DVIPSBitmapFont: Fh csr10 10 73
+/Fh 73 256 df<DA0FF813FC91397FFF07FF903B01F807DF83C0903A07E001FF0F903B1F
 8007FE1FE090393F000FFC137E16F85B9338F007804848010790C7FC1503ACB812F8A328
 01F80003F0C7FCB3AB486C497E267FFFE0B512F0A3333B7FBA30>11
 D<EC0FF8EC7FFE903901F80780903907E001C090391F8000E090383F0007017E497EA25B
@@ -764,12 +763,9 @@
 A21480A3EB07C0A6EB03E0B2EB07C0A6EB0F80A31400A25B131EA2133E133C137C1378A2
 5BA2485A485AA2485A48C7FC120E5A5A5A5A5A13527CBD20>I<121C127FEAFF80A213C0
 A3127F121C1200A412011380A2120313005A1206120E5A5A5A12600A19798817>44
-D<B512FCA516057F941C>I<121C127FEAFF80A5EA7F00121C0909798817>I<EB03F8EB1F
-FF90387E0FC09038F803E03901E000F0484813780007147C48487FA248C77EA2481580A3
-007EEC0FC0A600FE15E0B3007E15C0A4007F141F6C1580A36C15006D5B000F143EA26C6C
-5B6C6C5B6C6C485A6C6C485A90387E0FC0D91FFFC7FCEB03F8233A7DB72A>48
-D<EB01C013031307131F13FFB5FCA2131F1200B3B3A8497E007FB512F0A31C3879B72A>
-I<EB0FF0EB7FFE48B57E3903E03FE0390F000FF0000E6D7E486D7E486D7E123000706D7E
+D<B512FCA516057F941C>I<121C127FEAFF80A5EA7F00121C0909798817>I<EB01C01303
+1307131F13FFB5FCA2131F1200B3B3A8497E007FB512F0A31C3879B72A>49
+D<EB0FF0EB7FFE48B57E3903E03FE0390F000FF0000E6D7E486D7E486D7E123000706D7E
 126012FCB4EC7F807FA56CC7FC121CC8FCEDFF00A34A5A5D14035D4A5A5D140F4A5A4A5A
 92C7FC147C5C495A495A495A495A91C8FC011EEB01805B5B49130348481400485A485A00
 0EC75A000FB6FC5A5A485CB6FCA321387CB72A>I<EB07F8EB3FFF4913C03901F80FF039
@@ -1071,9 +1067,9 @@
 %%EndSetup
 %%Page: 1 1
 1 0 bop 33 -320 a Fi(GNU)55 b(Emacs)g({)g(Referen\350n\341)f(k)-5
-b(arta)932 -185 y Fh(\(pre)28 b(v)n(erziu)e(20\))0 56
+b(arta)932 -185 y Fh(\(pre)28 b(v)n(erziu)e(21\))0 56
 y Fg(Spustenie)48 b(Emacsu)0 252 y Fh(Pre)27 b(spustenie)g(GNU)i
-(Emacsu)d(20)h(nap\355\271te)g(jeho)h(meno:)f Ff(emacs)0
+(Emacsu)d(21)h(nap\355\271te)g(jeho)h(meno:)f Ff(emacs)0
 385 y Fh(Ak)n(o)g(na\350\355ta\273)g(a)g(edito)n(v)n(a\273)g(s\372b)r
 (ory)g(sa)g(dozviete)g(ni\276\271ie)g(v)h(o)r(ddiele)f(S\372b)r(ory)-7
 b(.)0 614 y Fg(Uk)l(on\350enie)46 b(Emacsu)0 810 y Fh(p)r(ozasta)n(v)n
@@ -1434,9 +1430,9 @@
 b(Viac)f(sa)g(dozviete)g(p)r(o)h(vyk)n(onan\355)e Ff(C-h)42
 b(f)h(interactive)p Fh(.)476 4919 y Fc(Cop)n(yrigh)n(t)805
 4917 y(c)787 4919 y Fb(\015)22 b Fc(1997)h(F)-5 b(ree)21
-b(Soft)n(w)n(are)h(F)-5 b(oundation,)20 b(Inc.)574 4998
-y(v2.2)j(for)f(GNU)g(Emacs)g(v)n(ersion)g(20,)g(June)f(1997)798
-5078 y(designed)g(b)n(y)h(Stephen)e(Gildea)0 5194 y(P)n(ermission)f(is)
+b(Soft)n(w)n(are)h(F)-5 b(oundation,)20 b(Inc.)654 4998
+y(v2.2)i(for)g(GNU)h(Emacs)e(v)n(ersion)h(21,)h(1997)798
+5078 y(designed)e(b)n(y)h(Stephen)e(Gildea)0 5194 y(P)n(ermission)f(is)
 i(gran)n(ted)f(to)h(mak)n(e)e(and)i(distribute)d(copies)i(of)g(this)h
 (card)e(pro)n(vided)g(the)h(cop)n(y-)0 5273 y(righ)n(t)i(notice)f(and)h
 (this)g(p)r(ermission)f(notice)g(are)g(preserv)n(ed)g(on)h(all)g
diff -ruN src-21.1/etc/sk-refcard.tex src-21.2/etc/sk-refcard.tex
--- src-21.1/etc/sk-refcard.tex	Sun Sep 23 19:46:38 2001
+++ src-21.2/etc/sk-refcard.tex	Fri Feb 22 11:51:22 2002
@@ -1,4 +1,4 @@
-% Reference Card for GNU Emacs version 20 on Unix systems
+% Reference Card for GNU Emacs version 21 on Unix systems
 
 % Slovak hyphenation rules applied
 \shyph
@@ -76,7 +76,7 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version 20, June \year}
+\centerline{v\versionnumber{} for GNU Emacs version 21, \year}
 \centerline{designed by Stephen Gildea}
 
 Permission is granted to make and distribute copies of
@@ -266,11 +266,11 @@
 
 \title{GNU Emacs -- Referenèná karta}
 
-\centerline{(pre verziu 20)}
+\centerline{(pre verziu 21)}
 
 \section{Spustenie Emacsu}
 
-Pre spustenie GNU~Emacsu~20 napí¹te jeho meno: \kbd{emacs}
+Pre spustenie GNU~Emacsu~21 napí¹te jeho meno: \kbd{emacs}
 
 Ako naèíta» a editova» súbory sa dozviete ni¾¹ie v~oddiele Súbory.
 
diff -ruN src-21.1/info/ccmode-4 src-21.2/info/ccmode-4
--- src-21.1/info/ccmode-4	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/ccmode-4	Fri Jan 11 09:35:31 2002
@@ -104,21 +104,21 @@
 * arglist-intro syntactic symbol:        Syntactic Symbols.
 * auto fill mode:                        Text Filling and Line Breaking.
 * auto-newline insertion:                Auto-newline Insertion.
-* block-close syntactic symbol <1>:      Hanging Braces.
-* block-close syntactic symbol:          Syntactic Symbols.
+* block-close syntactic symbol <1>:      Syntactic Symbols.
+* block-close syntactic symbol:          Hanging Braces.
 * block-open syntactic symbol <1>:       Syntactic Symbols.
 * block-open syntactic symbol:           Hanging Braces.
 * BOCM:                                  Introduction.
 * brace lists:                           Syntactic Symbols.
-* brace-entry-open syntactic symbol <1>: Hanging Braces.
-* brace-entry-open syntactic symbol:     Syntactic Symbols.
-* brace-list-close syntactic symbol <1>: Hanging Braces.
-* brace-list-close syntactic symbol:     Syntactic Symbols.
+* brace-entry-open syntactic symbol <1>: Syntactic Symbols.
+* brace-entry-open syntactic symbol:     Hanging Braces.
+* brace-list-close syntactic symbol <1>: Syntactic Symbols.
+* brace-list-close syntactic symbol:     Hanging Braces.
 * brace-list-entry syntactic symbol:     Syntactic Symbols.
 * brace-list-intro syntactic symbol <1>: Syntactic Symbols.
 * brace-list-intro syntactic symbol:     Hanging Braces.
-* brace-list-open syntactic symbol <1>:  Hanging Braces.
-* brace-list-open syntactic symbol:      Syntactic Symbols.
+* brace-list-open syntactic symbol <1>:  Syntactic Symbols.
+* brace-list-open syntactic symbol:      Hanging Braces.
 * BSD style:                             Built-in Styles.
 * bug report mailing list:               Mailing Lists and Submitting Bug Reports.
 * bugs:                                  Limitations and Known Bugs.
@@ -156,8 +156,8 @@
 * else-clause syntactic symbol:          Syntactic Symbols.
 * extern-lang-close syntactic symbol <1>: Syntactic Symbols.
 * extern-lang-close syntactic symbol:    Hanging Braces.
-* extern-lang-open syntactic symbol <1>: Hanging Braces.
-* extern-lang-open syntactic symbol:     Syntactic Symbols.
+* extern-lang-open syntactic symbol <1>: Syntactic Symbols.
+* extern-lang-open syntactic symbol:     Hanging Braces.
 * FAQ:                                   Frequently Asked Questions.
 * file styles:                           File Styles.
 * Filladapt mode:                        Text Filling and Line Breaking.
@@ -187,10 +187,10 @@
 * inher-cont syntactic symbol:           Syntactic Symbols.
 * inher-intro syntactic symbol:          Syntactic Symbols.
 * inlambda syntactic symbol:             Syntactic Symbols.
-* inline-close syntactic symbol <1>:     Hanging Braces.
-* inline-close syntactic symbol:         Syntactic Symbols.
-* inline-open syntactic symbol <1>:      Hanging Braces.
-* inline-open syntactic symbol:          Syntactic Symbols.
+* inline-close syntactic symbol <1>:     Syntactic Symbols.
+* inline-close syntactic symbol:         Hanging Braces.
+* inline-open syntactic symbol <1>:      Syntactic Symbols.
+* inline-open syntactic symbol:          Hanging Braces.
 * innamespace syntactic symbol:          Syntactic Symbols.
 * interactive customization:             Interactive Customization.
 * Java style:                            Built-in Styles.
@@ -203,18 +203,18 @@
 * limitations:                           Limitations and Known Bugs.
 * line-up functions:                     Indentation Functions.
 * Linux style:                           Built-in Styles.
-* literal <1>:                           Hungry-deletion of Whitespace.
-* literal <2>:                           Indentation Commands.
-* literal <3>:                           Auto-newline Insertion.
-* literal:                               Clean-ups.
+* literal <1>:                           Indentation Commands.
+* literal <2>:                           Hungry-deletion of Whitespace.
+* literal <3>:                           Clean-ups.
+* literal:                               Auto-newline Insertion.
 * local variables:                       File Styles.
 * mailing lists:                         Mailing Lists and Submitting Bug Reports.
 * member-init-cont syntactic symbol:     Syntactic Symbols.
 * member-init-intro syntactic symbol:    Syntactic Symbols.
 * movement commands:                     Movement Commands.
 * multi-line macros:                     Syntactic Symbols.
-* namespace-close syntactic symbol <1>:  Hanging Braces.
-* namespace-close syntactic symbol:      Syntactic Symbols.
+* namespace-close syntactic symbol <1>:  Syntactic Symbols.
+* namespace-close syntactic symbol:      Hanging Braces.
 * namespace-open syntactic symbol <1>:   Syntactic Symbols.
 * namespace-open syntactic symbol:       Hanging Braces.
 * objc-method-args-cont syntactic symbol: Syntactic Symbols.
@@ -229,8 +229,8 @@
 * reporting bugs:                        Mailing Lists and Submitting Bug Reports.
 * statement syntactic symbol:            Syntactic Symbols.
 * statement-case-intro syntactic symbol: Syntactic Symbols.
-* statement-case-open syntactic symbol <1>: Hanging Braces.
-* statement-case-open syntactic symbol:  Syntactic Symbols.
+* statement-case-open syntactic symbol <1>: Syntactic Symbols.
+* statement-case-open syntactic symbol:  Hanging Braces.
 * statement-cont syntactic symbol:       Syntactic Symbols.
 * stream-op syntactic symbol <1>:        Syntactic Symbols.
 * stream-op syntactic symbol:            Custom Indentation Functions.
@@ -242,8 +242,8 @@
 * substatement block:                    Syntactic Analysis.
 * substatement syntactic symbol:         Syntactic Symbols.
 * substatement-block-intro syntactic symbol: Syntactic Symbols.
-* substatement-open syntactic symbol <1>: Hanging Braces.
-* substatement-open syntactic symbol:    Syntactic Symbols.
+* substatement-open syntactic symbol <1>: Syntactic Symbols.
+* substatement-open syntactic symbol:    Hanging Braces.
 * syntactic analysis:                    Syntactic Analysis.
 * syntactic component:                   Syntactic Analysis.
 * syntactic component list:              Syntactic Analysis.
@@ -273,8 +273,8 @@
 * backward-conditional (c-):             Movement Commands.
 * backward-delete-char-untabify:         Hungry-deletion of Whitespace.
 * backward-into-nomenclature (c-):       Movement Commands.
-* beginning-of-defun <1>:                Movement Commands.
-* beginning-of-defun:                    Performance Issues.
+* beginning-of-defun <1>:                Performance Issues.
+* beginning-of-defun:                    Movement Commands.
 * beginning-of-defun (c-):               Movement Commands.
 * beginning-of-statement (c-):           Movement Commands.
 * c++-mode:                              Introduction.
@@ -323,8 +323,8 @@
 * c-lineup-ObjC-method-args-2:           Indentation Functions.
 * c-lineup-ObjC-method-call:             Indentation Functions.
 * c-lineup-runin-statements:             Indentation Functions.
-* c-lineup-streamop <1>:                 Custom Indentation Functions.
-* c-lineup-streamop:                     Indentation Functions.
+* c-lineup-streamop <1>:                 Indentation Functions.
+* c-lineup-streamop:                     Custom Indentation Functions.
 * c-lineup-template-args:                Indentation Functions.
 * c-lineup-whitesmith-in-block:          Indentation Functions.
 * c-mark-function:                       Indentation Commands.
@@ -375,8 +375,8 @@
 * indent-new-comment-line (c-):          Text Filling and Line Breaking.
 * indent-one-line-block (c-):            Indentation Functions.
 * indent-region:                         Indentation Commands.
-* java-mode <1>:                         Introduction.
-* java-mode:                             Built-in Styles.
+* java-mode <1>:                         Built-in Styles.
+* java-mode:                             Introduction.
 * lineup-arglist (c-):                   Indentation Functions.
 * lineup-arglist-close-under-paren (c-): Indentation Functions.
 * lineup-arglist-intro-after-paren (c-): Indentation Functions.
@@ -393,8 +393,8 @@
 * lineup-ObjC-method-args-2 (c-):        Indentation Functions.
 * lineup-ObjC-method-call (c-):          Indentation Functions.
 * lineup-runin-statements (c-):          Indentation Functions.
-* lineup-streamop (c-) <1>:              Custom Indentation Functions.
-* lineup-streamop (c-):                  Indentation Functions.
+* lineup-streamop (c-) <1>:              Indentation Functions.
+* lineup-streamop (c-):                  Custom Indentation Functions.
 * lineup-template-args (c-):             Indentation Functions.
 * lineup-whitesmith-in-block (c-):       Indentation Functions.
 * mark-function (c-):                    Indentation Commands.
@@ -498,8 +498,8 @@
 * c-enable-xemacs-performance-kludge-p:  Performance Issues.
 * c-file-offsets:                        File Styles.
 * c-file-style:                          File Styles.
-* c-hanging-braces-alist <1>:            Hanging Braces.
-* c-hanging-braces-alist:                Custom Brace and Colon Hanging.
+* c-hanging-braces-alist <1>:            Custom Brace and Colon Hanging.
+* c-hanging-braces-alist:                Hanging Braces.
 * c-hanging-colon-alist:                 Custom Brace and Colon Hanging.
 * c-hanging-colons-alist:                Hanging Colons.
 * c-hanging-semi&comma-criteria:         Customizing Semi-colons and Commas.
@@ -510,8 +510,8 @@
 * c-insert-tab-function:                 Indentation Commands.
 * c-Java-defun-prompt-regexp:            Performance Issues.
 * c-label-minimum-indentation:           Other Special Indentations.
-* c-mode-common-hook <1>:                Hooks.
-* c-mode-common-hook:                    Built-in Styles.
+* c-mode-common-hook <1>:                Built-in Styles.
+* c-mode-common-hook:                    Hooks.
 * c-mode-hook:                           Hooks.
 * c-offsets-alist <1>:                   Syntactic Symbols.
 * c-offsets-alist:                       Customizing Indentation.
@@ -520,9 +520,9 @@
 * c-recognize-knr-p:                     Performance Issues.
 * c-special-indent-hook:                 Other Special Indentations.
 * c-strict-syntax-p:                     Customizing Indentation.
-* c-style-alist <1>:                     Built-in Styles.
-* c-style-alist <2>:                     Advanced Customizations.
-* c-style-alist:                         Adding Styles.
+* c-style-alist <1>:                     Advanced Customizations.
+* c-style-alist <2>:                     Adding Styles.
+* c-style-alist:                         Built-in Styles.
 * c-style-variables-are-local-p:         Permanent Customization.
 * c-syntactic-context:                   Custom Brace and Colon Hanging.
 * c-tab-always-indent:                   Indentation Commands.
@@ -535,8 +535,8 @@
 * comment-only-line-offset (c-):         Indentation Functions.
 * comment-prefix-regexp (c-):            Text Filling and Line Breaking.
 * comment-start:                         Text Filling and Line Breaking.
-* comment-start-skip <1>:                Text Filling and Line Breaking.
-* comment-start-skip:                    Indentation Functions.
+* comment-start-skip <1>:                Indentation Functions.
+* comment-start-skip:                    Text Filling and Line Breaking.
 * default-style (c-):                    Built-in Styles.
 * delete-function (c-):                  Hungry-deletion of Whitespace.
 * delete-key-deletes-forward:            Hungry-deletion of Whitespace.
@@ -576,9 +576,9 @@
 * signal-error-on-buffer-boundary:       Limitations and Known Bugs.
 * special-indent-hook (c-):              Other Special Indentations.
 * strict-syntax-p (c-):                  Customizing Indentation.
-* style-alist (c-) <1>:                  Built-in Styles.
-* style-alist (c-) <2>:                  Advanced Customizations.
-* style-alist (c-):                      Adding Styles.
+* style-alist (c-) <1>:                  Advanced Customizations.
+* style-alist (c-) <2>:                  Adding Styles.
+* style-alist (c-):                      Built-in Styles.
 * style-variables-are-local-p (c-):      Permanent Customization.
 * syntactic-context (c-):                Custom Brace and Colon Hanging.
 * tab-always-indent (c-):                Indentation Commands.
diff -ruN src-21.1/info/ediff-3 src-21.2/info/ediff-3
--- src-21.1/info/ediff-3	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/ediff-3	Fri Jan 11 09:35:32 2002
@@ -52,8 +52,8 @@
 * >:                                     Quick Help Commands.
 * ?:                                     Quick Help Commands.
 * @:                                     Quick Help Commands.
-* a:                                     Quick Help Commands.
 * A:                                     Quick Help Commands.
+* a:                                     Quick Help Commands.
 * ab:                                    Quick Help Commands.
 * ac:                                    Quick Help Commands.
 * B:                                     Quick Help Commands.
@@ -76,9 +76,9 @@
 * ediff-after-setup-windows-hook:        Hooks.
 * ediff-auto-refine:                     Refinement of Difference Regions.
 * ediff-auto-refine-limit:               Refinement of Difference Regions.
-* ediff-autostore-merges <1>:            Session Groups.
+* ediff-autostore-merges <1>:            Merging and diff3.
 * ediff-autostore-merges <2>:            Hooks.
-* ediff-autostore-merges:                Merging and diff3.
+* ediff-autostore-merges:                Session Groups.
 * ediff-before-flag-bol:                 Highlighting Difference Regions.
 * ediff-before-flag-mol:                 Highlighting Difference Regions.
 * ediff-before-session-group-setup-hook: Hooks.
@@ -171,8 +171,8 @@
 * ediff-prepare-buffer-hook:             Hooks.
 * ediff-profile:                         Other Session Commands.
 * ediff-quit-hook:                       Hooks.
-* ediff-quit-merge-hook <1>:             Hooks.
-* ediff-quit-merge-hook:                 Merging and diff3.
+* ediff-quit-merge-hook <1>:             Merging and diff3.
+* ediff-quit-merge-hook:                 Hooks.
 * ediff-quit-session-group-hook:         Hooks.
 * ediff-quit-widened:                    Narrowing.
 * ediff-regions-linewise:                Major Entry Points.
@@ -190,16 +190,16 @@
 * ediff-show-registry:                   Other Session Commands.
 * ediff-split-window-function:           Miscellaneous.
 * ediff-start-narrowed:                  Narrowing.
-* ediff-startup-hook <1>:                Quick Help Customization.
-* ediff-startup-hook <2>:                Hooks.
-* ediff-startup-hook:                    Notes on Heavy-duty Customization.
+* ediff-startup-hook <1>:                Notes on Heavy-duty Customization.
+* ediff-startup-hook <2>:                Quick Help Customization.
+* ediff-startup-hook:                    Hooks.
 * ediff-suspend-hook:                    Hooks.
-* ediff-toggle-multiframe <1>:           Other Session Commands.
-* ediff-toggle-multiframe:               Window and Frame Configuration.
+* ediff-toggle-multiframe <1>:           Window and Frame Configuration.
+* ediff-toggle-multiframe:               Other Session Commands.
 * ediff-toggle-read-only-function:       Miscellaneous.
 * ediff-unselect-hook:                   Hooks.
-* ediff-use-last-dir <1>:                Major Entry Points.
-* ediff-use-last-dir:                    Miscellaneous.
+* ediff-use-last-dir <1>:                Miscellaneous.
+* ediff-use-last-dir:                    Major Entry Points.
 * ediff-use-long-help-message:           Quick Help Customization.
 * ediff-version-control-package:         Support for Version Control.
 * ediff-wide-control-frame-rightward-shift: Window and Frame Configuration.
@@ -231,8 +231,8 @@
 * h:                                     Quick Help Commands.
 * i:                                     Quick Help Commands.
 * j:                                     Quick Help Commands.
-* m:                                     Quick Help Commands.
 * M:                                     Quick Help Commands.
+* m:                                     Quick Help Commands.
 * Merging files and buffers:             Introduction.
 * mode-line.el:                          Customizing the Mode Line.
 * Multi-file patches:                    Session Groups.
@@ -241,8 +241,8 @@
 * Patching files and buffers:            Introduction.
 * pcl-cvs.el:                            Support for Version Control.
 * q:                                     Quick Help Commands.
-* r:                                     Quick Help Commands.
 * R:                                     Quick Help Commands.
+* r:                                     Quick Help Commands.
 * ra:                                    Quick Help Commands.
 * rb:                                    Quick Help Commands.
 * rc:                                    Quick Help Commands.
@@ -250,8 +250,8 @@
 * s:                                     Quick Help Commands.
 * SPC:                                   Quick Help Commands.
 * uniquify.el:                           Customizing the Mode Line.
-* v:                                     Quick Help Commands.
 * V:                                     Quick Help Commands.
+* v:                                     Quick Help Commands.
 * vc.el:                                 Support for Version Control.
 * wa:                                    Quick Help Commands.
 * wb:                                    Quick Help Commands.
diff -ruN src-21.1/info/efaq src-21.2/info/efaq
--- src-21.1/info/efaq	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/efaq	Sat Mar 16 12:34:03 2002
@@ -1,4 +1,4 @@
-This is ../info/efaq, produced by makeinfo version 4.0 from faq.texi.
+This is ../info/efaq, produced by makeinfo version 4.0f from faq.texi.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -29,15 +29,15 @@
 
 
 Indirect:
-efaq-1: 1256
-efaq-2: 51014
-efaq-3: 100656
-efaq-4: 149596
-efaq-5: 190346
+efaq-1: 1257
+efaq-2: 51021
+efaq-3: 100663
+efaq-4: 149565
+efaq-5: 190315
 
 Tag Table:
 (Indirect)
-Node: Top1256
+Node: Top1257
 Node: FAQ notation2032
 Node: Basic keys2490
 Ref: Basic keys-Footnote-14449
@@ -72,151 +72,151 @@
 Node: Common requests38216
 Node: Setting up a customization file39934
 Node: Colors on a TTY41105
-Node: Debugging a customization file42120
-Node: Displaying the current line or column43022
-Node: Displaying the current file name in the titlebar44589
-Node: Turning on abbrevs by default45748
-Node: Turning on auto-fill by default46259
-Node: Associating modes with files46960
-Node: Working with unprintable characters48005
-Node: Highlighting a region49757
-Node: Controlling case sensitivity50189
-Node: Wrapping words automatically51014
-Node: Spell-checkers51465
-Node: Checking TeX and *roff documents51742
-Node: Changing load-path52039
-Node: Using an already running Emacs process52524
-Node: Compiler error messages56054
-Node: Indenting switch statements57165
-Node: Customizing C and C++ indentation58077
-Node: Horizontal scrolling60665
-Node: Overwrite mode61799
-Node: Turning off beeping62280
-Node: Turning the volume down62839
-Node: Automatic indentation63527
-Node: Matching parentheses65410
-Node: Hiding #ifdef lines67438
-Node: Repeating commands67949
-Node: Valid X resources69024
-Node: Evaluating Emacs Lisp code69505
-Node: Changing the length of a Tab70975
-Node: Inserting > at the beginning of each line71670
-Node: Underlining paragraphs72695
-Node: Repeating a command as many times as possible73107
-Node: Forcing the cursor to remain in the same column73684
-Node: Forcing Emacs to iconify itself74161
-Node: Using regular expressions74513
-Node: Replacing text across multiple files75482
-Node: Documentation for etags76136
-Node: Disabling backups76523
-Node: Disabling auto-save-mode77985
-Node: Going to a line by number78908
-Node: Modifying pull-down menus80422
-Node: Deleting menus and menu options83543
-Node: Turning on syntax highlighting84249
-Node: Scrolling only one line88577
-Node: Replacing highlighted text89021
-Node: Editing MS-DOS files89797
-Node: Filling paragraphs with a single space90931
-Node: Escape sequences in shell output91454
-Node: Bugs and problems92275
-Node: Problems with very large files93474
-Node: ^M in the shell buffer95368
-Node: Shell process exits abnormally97057
-Node: Problems with Shell Mode on MS-Windows98401
-Node: Termcap/Terminfo entries for Emacs99424
-Node: Spontaneous entry into isearch-mode100656
-Node: Problems talking to certain hosts101306
-Node: Errors with init files102912
-Node: Emacs ignores X resources103721
-Node: Emacs ignores frame parameters105522
-Node: Emacs takes a long time to visit files106366
-Node: Editing files with $ in the name107110
-Node: Shell mode loses the current directory107552
-Node: Security risks with Emacs108509
-Node: Dired claims that no file is on this line112470
-Node: Compiling and installing Emacs113537
-Node: Installing Emacs113839
-Node: Updating Emacs117689
-Node: Problems building Emacs118327
-Node: Linking with -lX11 fails119214
-Node: Finding Emacs and related packages120480
-Node: Finding Emacs on the Internet121207
-Node: Finding a package with particular functionality121942
-Node: Packages that do not come with Emacs124658
-Node: Submitting to the Emacs Lisp Archive126174
-Node: Current GNU distributions126933
-Node: Difference between Emacs and XEmacs127467
-Node: Emacs for MS-DOS129695
-Node: Emacs for Windows132663
-Node: Emacs for OS/2133445
-Node: Emacs for Atari ST134070
-Node: Emacs for the Amiga134439
-Node: Emacs for NeXTSTEP134944
-Node: Emacs for Apple computers135371
-Node: Emacs for VMS and DECwindows136204
-Node: Modes for various languages136590
-Ref: Modes for various languages-Footnote-1137603
-Node: Translating names to IP addresses137817
-Node: Major packages and programs138709
-Node: VM139024
-Node: Supercite140034
-Node: Calc140566
-Node: VIPER141241
-Node: AUC-TeX141990
-Node: BBDB142611
-Node: Ispell143158
-Node: w3-mode143784
-Node: EDB144318
-Node: Mailcrypt144682
-Node: JDE145216
-Node: Patch145579
-Node: Key bindings145907
-Node: Binding keys to commands146641
-Node: Invalid prefix characters148759
-Node: Terminal setup code works after Emacs has begun149596
-Node: Using function keys under X150962
-Node: Working with function and arrow keys151324
-Node: X key translations for Emacs151842
-Node: Handling C-s and C-q with flow control152647
-Node: Binding C-s and C-q157715
-Node: Backspace invokes help158645
-Node: stty and Backspace key162449
-Node: Swapping keys162738
-Node: Producing C-XXX with the keyboard163858
-Node: No Meta key164469
-Node: No Escape key164997
-Node: Compose Character165550
-Node: Binding combinations of modifiers and function keys166034
-Node: Meta key does not work in xterm167259
-Node: ExtendChar key does not work as Meta169440
-Node: Alternate character sets170298
-Node: Emacs does not display 8-bit characters170599
-Node: Inputting eight-bit characters171423
-Node: Kanji and Chinese characters171896
-Node: Right-to-left alphabets172435
-Node: Mail and news173354
-Node: Changing the included text prefix174270
-Node: Saving a copy of outgoing mail174925
-Node: Expanding aliases when sending mail175950
-Node: Rmail thinks all messages are one big one177347
-Node: Sorting the messages in an Rmail folder178023
-Node: Rmail writes to /usr/spool/mail178384
-Node: Recovering mail files when Rmail munges them179176
-Node: Replying to the sender of a message180226
-Node: MIME with Emacs mail packages181305
-Node: Automatically starting a mail or news reader181959
-Node: Reading news with Emacs182680
-Node: Gnus does not work with NNTP182987
-Node: Viewing articles with embedded underlining183887
-Node: Saving a multi-part Gnus posting185905
-Node: Starting Gnus faster186286
-Node: Catching up in all newsgroups187050
-Node: Killing based on nonstandard headers187463
-Node: Removing flashing messages188229
-Node: Catch-up is slow in Gnus188549
-Node: Gnus hangs for a long time188863
-Node: Learning more about Gnus190075
-Node: Concept index190346
+Node: Debugging a customization file42127
+Node: Displaying the current line or column43029
+Node: Displaying the current file name in the titlebar44596
+Node: Turning on abbrevs by default45755
+Node: Turning on auto-fill by default46266
+Node: Associating modes with files46967
+Node: Working with unprintable characters48012
+Node: Highlighting a region49764
+Node: Controlling case sensitivity50196
+Node: Wrapping words automatically51021
+Node: Spell-checkers51472
+Node: Checking TeX and *roff documents51749
+Node: Changing load-path52046
+Node: Using an already running Emacs process52531
+Node: Compiler error messages56061
+Node: Indenting switch statements57172
+Node: Customizing C and C++ indentation58084
+Node: Horizontal scrolling60672
+Node: Overwrite mode61806
+Node: Turning off beeping62287
+Node: Turning the volume down62846
+Node: Automatic indentation63534
+Node: Matching parentheses65417
+Node: Hiding #ifdef lines67445
+Node: Repeating commands67956
+Node: Valid X resources69031
+Node: Evaluating Emacs Lisp code69512
+Node: Changing the length of a Tab70982
+Node: Inserting > at the beginning of each line71677
+Node: Underlining paragraphs72702
+Node: Repeating a command as many times as possible73114
+Node: Forcing the cursor to remain in the same column73691
+Node: Forcing Emacs to iconify itself74168
+Node: Using regular expressions74520
+Node: Replacing text across multiple files75489
+Node: Documentation for etags76143
+Node: Disabling backups76530
+Node: Disabling auto-save-mode77992
+Node: Going to a line by number78915
+Node: Modifying pull-down menus80429
+Node: Deleting menus and menu options83550
+Node: Turning on syntax highlighting84256
+Node: Scrolling only one line88584
+Node: Replacing highlighted text89028
+Node: Editing MS-DOS files89804
+Node: Filling paragraphs with a single space90938
+Node: Escape sequences in shell output91461
+Node: Bugs and problems92282
+Node: Problems with very large files93481
+Node: ^M in the shell buffer95375
+Node: Shell process exits abnormally97064
+Node: Problems with Shell Mode on MS-Windows98408
+Node: Termcap/Terminfo entries for Emacs99431
+Node: Spontaneous entry into isearch-mode100663
+Node: Problems talking to certain hosts101313
+Node: Errors with init files102919
+Node: Emacs ignores X resources103728
+Node: Emacs ignores frame parameters105529
+Node: Emacs takes a long time to visit files106373
+Node: Editing files with $ in the name107117
+Node: Shell mode loses the current directory107559
+Node: Security risks with Emacs108516
+Node: Dired claims that no file is on this line112477
+Node: Compiling and installing Emacs113544
+Node: Installing Emacs113846
+Node: Updating Emacs117696
+Node: Problems building Emacs118334
+Node: Linking with -lX11 fails119221
+Node: Finding Emacs and related packages120487
+Node: Finding Emacs on the Internet121214
+Node: Finding a package with particular functionality121949
+Node: Packages that do not come with Emacs124665
+Node: Submitting to the Emacs Lisp Archive126181
+Node: Current GNU distributions126940
+Node: Difference between Emacs and XEmacs127474
+Node: Emacs for MS-DOS129709
+Node: Emacs for Windows132632
+Node: Emacs for OS/2133414
+Node: Emacs for Atari ST134039
+Node: Emacs for the Amiga134408
+Node: Emacs for NeXTSTEP134913
+Node: Emacs for Apple computers135340
+Node: Emacs for VMS and DECwindows136173
+Node: Modes for various languages136559
+Ref: Modes for various languages-Footnote-1137572
+Node: Translating names to IP addresses137786
+Node: Major packages and programs138678
+Node: VM138993
+Node: Supercite140003
+Node: Calc140535
+Node: VIPER141210
+Node: AUC-TeX141959
+Node: BBDB142580
+Node: Ispell143127
+Node: w3-mode143753
+Node: EDB144287
+Node: Mailcrypt144651
+Node: JDE145185
+Node: Patch145548
+Node: Key bindings145876
+Node: Binding keys to commands146610
+Node: Invalid prefix characters148728
+Node: Terminal setup code works after Emacs has begun149565
+Node: Using function keys under X150931
+Node: Working with function and arrow keys151293
+Node: X key translations for Emacs151811
+Node: Handling C-s and C-q with flow control152616
+Node: Binding C-s and C-q157684
+Node: Backspace invokes help158614
+Node: stty and Backspace key162418
+Node: Swapping keys162707
+Node: Producing C-XXX with the keyboard163827
+Node: No Meta key164438
+Node: No Escape key164966
+Node: Compose Character165519
+Node: Binding combinations of modifiers and function keys166003
+Node: Meta key does not work in xterm167228
+Node: ExtendChar key does not work as Meta169409
+Node: Alternate character sets170267
+Node: Emacs does not display 8-bit characters170568
+Node: Inputting eight-bit characters171392
+Node: Kanji and Chinese characters171865
+Node: Right-to-left alphabets172404
+Node: Mail and news173323
+Node: Changing the included text prefix174239
+Node: Saving a copy of outgoing mail174894
+Node: Expanding aliases when sending mail175919
+Node: Rmail thinks all messages are one big one177316
+Node: Sorting the messages in an Rmail folder177992
+Node: Rmail writes to /usr/spool/mail178353
+Node: Recovering mail files when Rmail munges them179145
+Node: Replying to the sender of a message180195
+Node: MIME with Emacs mail packages181274
+Node: Automatically starting a mail or news reader181928
+Node: Reading news with Emacs182649
+Node: Gnus does not work with NNTP182956
+Node: Viewing articles with embedded underlining183856
+Node: Saving a multi-part Gnus posting185874
+Node: Starting Gnus faster186255
+Node: Catching up in all newsgroups187019
+Node: Killing based on nonstandard headers187432
+Node: Removing flashing messages188198
+Node: Catch-up is slow in Gnus188518
+Node: Gnus hangs for a long time188832
+Node: Learning more about Gnus190044
+Node: Concept index190315
 
 End Tag Table
diff -ruN src-21.1/info/efaq-1 src-21.2/info/efaq-1
--- src-21.1/info/efaq-1	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/efaq-1	Sat Mar 16 12:34:03 2002
@@ -1,4 +1,4 @@
-This is ../info/efaq, produced by makeinfo version 4.0 from faq.texi.
+This is ../info/efaq, produced by makeinfo version 4.0f from faq.texi.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -30,7 +30,7 @@
 
 File: efaq,  Node: Top,  Next: FAQ notation,  Prev: (dir),  Up: (dir)
 
-   This is the GNU Emacs FAQ, last updated on 5 October 2001.
+   This is the GNU Emacs FAQ, last updated on 16 March 2002.
 
    The FAQ is maintained as a Texinfo document, allowing us to create
 HTML, Info, and TeX documents from a single source file, and is slowly
@@ -936,7 +936,7 @@
 What is the latest version of Emacs?
 ====================================
 
-   Emacs 21.1 is the current version as of this writing.
+   Emacs 21.2 is the current version as of this writing.
 
 
 File: efaq,  Node: New in Emacs 20,  Next: New in Emacs 21,  Prev: Latest version of Emacs,  Up: Status of Emacs
@@ -1071,13 +1071,14 @@
 How do I get colors and syntax highlighting on a TTY?
 =====================================================
 
-   As of Emacs 21.1, colors and faces are supported in non-windowed
-mode, i.e. on Unix and GNU/Linux text-only terminals and consoles, and
-when invoked as `emacs -nw' on X and MS-Windows.  (Colors and faces were
-supported in the MS-DOS port since Emacs 19.29.)  Emacs automatically
-detects color support at startup and uses it if available.  If you think
-that your terminal supports colors, but Emacs won't use them, check the
-`termcap' entry for your display type for color-related capabilities.
+   In Emacs 21.1 and later, colors and faces are supported in
+non-windowed mode, i.e. on Unix and GNU/Linux text-only terminals and
+consoles, and when invoked as `emacs -nw' on X and MS-Windows.  (Colors
+and faces were supported in the MS-DOS port since Emacs 19.29.)  Emacs
+automatically detects color support at startup and uses it if
+available.  If you think that your terminal supports colors, but Emacs
+won't use them, check the `termcap' entry for your display type for
+color-related capabilities.
 
    The command `M-x list-colors-display' pops up a window which
 exhibits all the colors Emacs knows about on the current display.
diff -ruN src-21.1/info/efaq-2 src-21.2/info/efaq-2
--- src-21.1/info/efaq-2	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/efaq-2	Sat Mar 16 12:34:03 2002
@@ -1,4 +1,4 @@
-This is ../info/efaq, produced by makeinfo version 4.0 from faq.texi.
+This is ../info/efaq, produced by makeinfo version 4.0f from faq.texi.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
diff -ruN src-21.1/info/efaq-3 src-21.2/info/efaq-3
--- src-21.1/info/efaq-3	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/efaq-3	Sat Mar 16 12:34:03 2002
@@ -1,4 +1,4 @@
-This is ../info/efaq, produced by makeinfo version 4.0 from faq.texi.
+This is ../info/efaq, produced by makeinfo version 4.0f from faq.texi.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -364,7 +364,7 @@
      ftp sites that make them available.  On `ftp.gnu.org', the main GNU
      distribution site, sources are available as
 
-     `ftp://ftp.gnu.org/pub/gnu/emacs/emacs-21.1.tar.gz'
+     `ftp://ftp.gnu.org/pub/gnu/emacs/emacs-21.2.tar.gz'
 
      The above will obviously change as new versions of Emacs come out.
      For instance, when Emacs 21.42 is released, it will most probably
@@ -382,10 +382,10 @@
      retrieved the Emacs sources, you will probably be able to
      uncompress them with the command
 
-          gunzip --verbose emacs-21.1.tar.gz
+          gunzip --verbose emacs-21.2.tar.gz
 
-     changing the Emacs version (21.1), as necessary.  Once `gunzip'
-     has finished doing its job, a file by the name of `emacs-21.1.tar'
+     changing the Emacs version (21.2), as necessary.  Once `gunzip'
+     has finished doing its job, a file by the name of `emacs-21.2.tar'
      should be in your build directory.
 
    * `tar', the "tape archiving" program, which moves multiple files
@@ -394,7 +394,7 @@
      extracted using `tar' before you can build Emacs.  Typically, the
      extraction command would look like
 
-          tar -xvvf emacs-21.1.tar
+          tar -xvvf emacs-21.2.tar
 
      The `x' indicates that we want to extract files from this tarfile,
      the two `v's force verbose output, and the `f' tells `tar' to use
@@ -403,7 +403,7 @@
      If you're using GNU `tar' (available at mirrors of `ftp.gnu.org'),
      you can combine this step and the previous one by using the command
 
-          tar -zxvvf emacs-21.1.tar.gz
+          tar -zxvvf emacs-21.2.tar.gz
 
      The additional `z' at the beginning of the options list tells GNU
      `tar' to uncompress the file with `gunzip' before extracting the
@@ -411,11 +411,11 @@
 
 
    At this point, the Emacs sources (all 70+ megabytes of them) should
-be sitting in a directory called `emacs-21.1'.  On most common Unix and
+be sitting in a directory called `emacs-21.2'.  On most common Unix and
 Unix-like systems, you should be able to compile Emacs (with X Window
 system support) with the following commands:
 
-     cd emacs-21.1       # change directory to emacs-21.1
+     cd emacs-21.2       # change directory to emacs-21.2
      ./configure         # configure Emacs for your particular system
      make                # use Makefile to build components, then Emacs
 
@@ -428,7 +428,7 @@
 `/usr/local/bin'
      binaries.
 
-`/usr/local/share/emacs/21.1'
+`/usr/local/share/emacs/21.2'
      Lisp code and support files.
 
 `/usr/local/info'
@@ -454,8 +454,8 @@
    *Note Installing Emacs::, and follow the instructions there for
 installation.
 
-   Most files are placed in version-specific directories.  Emacs 21.1,
-for instance, places files in `/usr/local/share/emacs/21.1'.
+   Most files are placed in version-specific directories.  Emacs 21.2,
+for instance, places files in `/usr/local/share/emacs/21.2'.
 
    Upgrading should overwrite only, `/usr/local/bin/emacs' (the Emacs
 binary) and documentation in `/usr/local/info'.  Back up these files
@@ -709,10 +709,10 @@
 Emacs, and more features can be expected in the future, but there are
 still many differences between the two.
 
-   The latest stable version of XEmacs as of this writing is 21.1; you
-can get it at
+   The latest stable version of XEmacs as of this writing is 21.1.14;
+you can get it at
 
-   `ftp://ftp.xemacs.org/pub/xemacs/current/xemacs-21.1.13.tar.gz'
+   `ftp://ftp.xemacs.org/pub/xemacs/xemacs-21.1/xemacs-21.1.14.tar.gz'
 
    More information about XEmacs, including a list of frequently asked
 questions (FAQ), is available at
@@ -731,12 +731,12 @@
 Windows 9X, Windows ME, and Windows 2000.  More information is available
 from
 
-   `ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/emacs.README'
+   `http://www.simtel.net/pub/gnu/djgpp/v2gnu/emacs.README'
 
    The binary itself is available in the files `em*.zip' in the
 directory
 
-   `ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/'
+   `http://www.simtel.net/pub/gnu/djgpp/v2gnu/'
 
    If you prefer to compile Emacs for yourself, you can do so with the
 current distribution directly.  You will need a 386 (or better)
@@ -752,7 +752,7 @@
      You can get the latest release of DJGPP by retrieving all of the
      files in
 
-     `ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2*'
+     `http://www.simtel.net/pub/gnu/djgpp/v2*'
 
 _Unpacking program_
      The easiest way is to use `djtar' which comes with DJGPP v2.x,
@@ -771,11 +771,11 @@
 _make, mv, sed, and rm_
      All of these utilities are available at
 
-     `ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu'
+     `http://www.simtel.net/pub/gnu/djgpp/v2gnu'
 
      16-bit utilities can be found in GNUish, at
 
-     `ftp://ftp.simtel.net/pub/simtelnet/gnu/gnuish'
+     `http://www.simtel.net/pub/gnu/gnuish'
 
      (`mv' and `rm' are in the Fileutils package, `sed' and `make' are
      each one in a separate package named after them.)
diff -ruN src-21.1/info/efaq-4 src-21.2/info/efaq-4
--- src-21.1/info/efaq-4	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/efaq-4	Sat Mar 16 12:34:03 2002
@@ -1,4 +1,4 @@
-This is ../info/efaq, produced by makeinfo version 4.0 from faq.texi.
+This is ../info/efaq, produced by makeinfo version 4.0f from faq.texi.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
diff -ruN src-21.1/info/efaq-5 src-21.2/info/efaq-5
--- src-21.1/info/efaq-5	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/efaq-5	Sat Mar 16 12:34:03 2002
@@ -1,4 +1,4 @@
-This is ../info/efaq, produced by makeinfo version 4.0 from faq.texi.
+This is ../info/efaq, produced by makeinfo version 4.0f from faq.texi.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
diff -ruN src-21.1/info/emacs src-21.2/info/emacs
--- src-21.1/info/emacs	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -30,638 +31,637 @@
 
 
 Indirect:
-emacs-1: 1201
-emacs-2: 37175
-emacs-3: 86989
-emacs-4: 134759
-emacs-5: 183892
-emacs-6: 232774
-emacs-7: 281064
-emacs-8: 328861
-emacs-9: 377098
-emacs-10: 426660
-emacs-11: 474208
-emacs-12: 522787
-emacs-13: 569657
-emacs-14: 618379
-emacs-15: 666337
-emacs-16: 715181
-emacs-17: 764233
-emacs-18: 810771
-emacs-19: 860264
-emacs-20: 908424
-emacs-21: 958261
-emacs-22: 1007888
-emacs-23: 1057641
-emacs-24: 1103965
-emacs-25: 1153670
-emacs-26: 1201128
-emacs-27: 1250914
-emacs-28: 1296536
-emacs-29: 1346113
-emacs-30: 1392467
-emacs-31: 1418466
-emacs-32: 1470167
-emacs-33: 1511489
-emacs-34: 1553979
-emacs-35: 1615381
-emacs-36: 1643970
+emacs-1: 1203
+emacs-2: 37118
+emacs-3: 86929
+emacs-4: 134699
+emacs-5: 183832
+emacs-6: 232714
+emacs-7: 281773
+emacs-8: 329698
+emacs-9: 377935
+emacs-10: 427497
+emacs-11: 475045
+emacs-12: 523624
+emacs-13: 570761
+emacs-14: 619573
+emacs-15: 667531
+emacs-16: 716536
+emacs-17: 765588
+emacs-18: 812126
+emacs-19: 861360
+emacs-20: 910875
+emacs-21: 959910
+emacs-22: 1009907
+emacs-23: 1059065
+emacs-24: 1104197
+emacs-25: 1153902
+emacs-26: 1201360
+emacs-27: 1251146
+emacs-28: 1296768
+emacs-29: 1346345
+emacs-30: 1392699
+emacs-31: 1418698
+emacs-32: 1470399
+emacs-33: 1511723
+emacs-34: 1554213
+emacs-35: 1615665
+emacs-36: 1644254
 
 Tag Table:
 (Indirect)
-Node: Top1201
-Node: Distrib34480
-Node: Copying37175
-Node: GNU Free Documentation License56381
-Node: Intro76083
-Node: Screen79195
-Node: Point81756
-Node: Echo Area83999
-Node: Mode Line86989
-Node: Menu Bar93328
-Node: User Input94934
-Node: Keys99528
-Node: Commands102339
-Node: Text Characters105072
-Node: Entering Emacs106548
-Node: Exiting109233
-Node: Basic113245
-Node: Inserting Text114428
-Node: Moving Point119089
-Node: Erasing122980
-Node: Undo124433
-Node: Basic Files128890
-Node: Basic Help130563
-Node: Blank Lines131152
-Node: Continuation Lines132722
-Node: Position Info134759
-Ref: Position Info-Footnote-1139392
-Node: Arguments139537
-Node: Repeating143541
-Node: Minibuffer144791
-Node: Minibuffer File147396
-Node: Minibuffer Edit149179
-Node: Completion151931
-Node: Completion Example153587
-Node: Completion Commands154662
-Node: Strict Completion157152
-Node: Completion Options158927
-Node: Minibuffer History161197
-Node: Repetition164910
-Node: M-x167142
-Node: Help170074
-Node: Help Summary174060
-Node: Key Help177116
-Node: Name Help177921
-Node: Apropos180729
-Node: Library Keywords183892
-Node: Language Help186078
-Node: Help Mode187138
-Node: Misc Help188353
-Node: Help Echo192461
-Node: Mark192977
-Node: Setting Mark195025
-Node: Transient Mark198223
-Node: Using Region202146
-Node: Marking Objects203005
-Node: Mark Ring205079
-Node: Global Mark Ring207072
-Node: Killing207994
-Node: Deletion210267
-Node: Killing by Lines214074
-Node: Other Kill Commands215600
-Node: Yanking217372
-Node: Kill Ring218173
-Node: Appending Kills219369
-Node: Earlier Kills221751
-Node: Accumulating Text224571
-Node: Rectangles227731
-Node: Registers232774
-Node: RegPos234066
-Node: RegText235172
-Node: RegRect236179
-Node: RegConfig237026
-Node: RegNumbers237924
-Node: RegFiles238760
-Node: Bookmarks239415
-Node: Display242655
-Node: Faces243917
-Node: Font Lock250602
-Node: Highlight Changes255295
-Node: Highlight Interactively255609
-Node: Trailing Whitespace257772
-Node: Scrolling259265
-Node: Horizontal Scrolling265426
-Node: Follow Mode267432
-Node: Selective Display268238
-Node: Optional Mode Line269652
-Node: Text Display272599
-Node: Display Custom273919
-Node: Cursor Display278777
-Node: Search279912
-Node: Incremental Search281064
-Node: Nonincremental Search291236
-Node: Word Search292703
-Node: Regexp Search294328
-Node: Regexps296579
-Node: Search Case310922
-Node: Replace312416
-Node: Unconditional Replace313514
-Node: Regexp Replace314808
-Node: Replacement and Case315740
-Node: Query Replace316999
-Node: Other Repeating Search321139
-Node: Fixit323242
-Node: Kill Errors324260
-Node: Transpose325669
-Node: Fixing Case328204
-Node: Spelling328861
-Node: Files334763
-Node: File Names336581
-Node: Visiting341166
-Node: Saving350170
-Node: Backup355518
-Node: Backup Names358001
-Node: Backup Deletion360767
-Node: Backup Copying362077
-Node: Interlocking364696
-Node: File Shadowing368560
-Node: Time Stamps370595
-Node: Reverting371481
-Node: Auto Save373753
-Node: Auto Save Files374893
-Node: Auto Save Control377098
-Node: Recover378963
-Node: File Aliases381043
-Node: Version Control382765
-Node: Introduction to VC384280
-Node: Version Systems385081
-Node: VC Concepts386398
-Node: VC Mode Line388826
-Node: Basic VC Editing389588
-Node: VC with Locking390875
-Node: Without Locking392033
-Node: Advanced C-x C-q394109
-Node: Log Buffer395314
-Node: Old Versions396532
-Node: Secondary VC Commands400243
-Node: Registering400825
-Node: VC Status402722
-Node: VC Undo403166
-Node: VC Dired Mode405385
-Node: VC Dired Commands408550
-Node: Branches410018
-Node: Switching Branches411703
-Node: Creating Branches412490
-Node: Merging414181
-Node: Multi-User Branching417552
-Node: Remote Repositories418664
-Node: Version Backups419505
-Node: Local Version Control421912
-Node: Snapshots426660
-Node: Making Snapshots427160
-Node: Snapshot Caveats428425
-Node: Miscellaneous VC430229
-Node: Change Logs and VC430756
-Node: Renaming and VC434457
-Node: Version Headers435146
-Node: Customizing VC438560
-Node: General VC Options439465
-Node: RCS and SCCS441696
-Node: CVS Options443802
-Node: Directories446398
-Node: Comparing Files448288
-Node: Misc File Ops450730
-Node: Compressed Files454015
-Node: File Archives454981
-Node: Remote Files457870
-Node: Quoted File Names460259
-Node: File Name Cache461628
-Node: File Conveniences463198
-Node: Buffers464251
-Node: Select Buffer466988
-Node: List Buffers469738
-Node: Misc Buffer471386
-Node: Kill Buffer474208
-Node: Several Buffers476721
-Node: Indirect Buffers481233
-Node: Buffer Convenience483651
-Node: Uniquify484161
-Node: Iswitchb485900
-Node: Buffer Menus487255
-Node: Windows488086
-Node: Basic Window489038
-Node: Split Window491140
-Node: Other Window493788
-Node: Pop Up Window495780
-Node: Force Same Window497261
-Node: Change Window499075
-Node: Window Convenience502891
-Node: Frames504419
-Node: Mouse Commands507290
-Node: Secondary Selection513464
-Node: Clipboard515184
-Node: Mouse References516019
-Node: Menu Mouse Clicks516966
-Ref: Menu Mouse Clicks-Footnote-1518083
-Node: Mode Line Mouse518304
-Node: Creating Frames519619
-Node: Frame Commands521925
-Node: Speedbar522787
-Node: Multiple Displays524513
-Node: Special Buffer Frames525849
-Node: Frame Parameters528314
-Node: Scroll Bars531562
-Ref: Scroll Bars-Footnote-1533781
-Node: Wheeled Mice533898
-Node: Menu Bars534655
-Node: Tool Bars535560
-Node: Dialog Boxes536306
-Node: Tooltips536859
-Node: Mouse Avoidance537655
-Node: Non-Window Terminals538703
-Node: XTerm Mouse539900
-Node: International540525
-Node: International Chars544160
-Node: Enabling Multibyte545641
-Node: Language Environments549192
-Ref: Language Environments-Footnote-1554229
-Ref: Language Environments-Footnote-2554435
-Node: Input Methods554548
-Node: Select Input Method559713
-Node: Multibyte Conversion562955
-Node: Coding Systems564136
-Ref: Coding Systems-Footnote-1569445
-Node: Recognize Coding569657
-Node: Specify Coding579041
-Node: Fontsets586287
-Ref: Fontsets-Footnote-1588446
-Node: Defining Fontsets588535
-Node: Undisplayable Characters592632
-Node: Single-Byte Character Support593833
-Node: Major Modes598073
-Node: Choosing Modes600537
-Node: Indentation604692
-Node: Indentation Commands607096
-Node: Tab Stops610248
-Node: Just Spaces612030
-Node: Text612838
-Node: Words615330
-Node: Sentences618379
-Node: Paragraphs621191
-Node: Pages623764
-Node: Filling626501
-Node: Auto Fill627410
-Node: Refill629745
-Node: Fill Commands630549
-Node: Fill Prefix633802
-Node: Adaptive Fill637639
-Node: Case640208
-Node: Text Mode642512
-Node: Outline Mode645268
-Node: Outline Format647409
-Node: Outline Motion650013
-Node: Outline Visibility651586
-Node: Outline Views655478
-Node: Foldout656367
-Node: TeX Mode660075
-Ref: TeX Mode-Footnote-1661679
-Node: TeX Editing661764
-Node: LaTeX Editing664986
-Node: TeX Print666337
-Node: TeX Misc673002
-Node: Nroff Mode673674
-Node: Formatted Text675401
-Node: Requesting Formatted Text677350
-Node: Hard and Soft Newlines679324
-Node: Editing Format Info680643
-Node: Format Faces681835
-Node: Format Colors684624
-Node: Format Indentation686033
-Node: Format Justification688820
-Node: Format Properties691269
-Node: Forcing Enriched Mode692190
-Node: Programs693915
-Node: Program Modes695444
-Node: Defuns698288
-Node: Left Margin Paren699539
-Node: Moving by Defuns701412
-Node: Imenu703489
-Node: Which Function705426
-Node: Program Indent706128
-Node: Basic Indent706986
-Node: Multi-line Indent709468
-Node: Lisp Indent711758
-Node: C Indent715181
-Node: Custom C Indent716649
-Node: Parentheses719154
-Node: Expressions720192
-Ref: Expressions-Footnote-1724436
-Node: Moving by Parens724503
-Node: Matching726223
-Node: Comments728525
-Node: Comment Commands729005
-Node: Multi-Line Comments732926
-Node: Options for Comments734436
-Node: Documentation737638
-Node: Info Lookup738181
-Node: Man Page739047
-Ref: Man Page-Footnote-1744222
-Ref: Man Page-Footnote-2744466
-Node: Lisp Doc744587
-Node: Hideshow745733
-Node: Symbol Completion747578
-Node: Glasses749562
-Node: Misc for Programs750314
-Node: C Modes751778
-Node: Motion in C752572
-Node: Electric C755030
-Node: Hungry Delete760084
-Node: Other C Commands760901
-Node: Comments in C764233
-Node: Fortran765610
-Node: Fortran Motion767058
-Node: Fortran Indent767557
-Node: ForIndent Commands768317
-Node: ForIndent Cont769599
-Node: ForIndent Num772028
-Node: ForIndent Conv772997
-Node: ForIndent Vars774044
-Node: Fortran Comments775861
-Node: Fortran Autofill779785
-Node: Fortran Columns781461
-Node: Fortran Abbrev783879
-Node: Asm Mode784785
-Node: Building785329
-Node: Compilation786585
-Node: Grep Searching790058
-Node: Compilation Mode791381
-Node: Compilation Shell794615
-Node: Debuggers795963
-Node: Starting GUD796889
-Node: Debugger Operation798817
-Ref: Debugger Operation-Footnote-1800157
-Node: Commands of GUD800252
-Node: GUD Customization803593
-Node: GUD Tooltips805629
-Node: Executing Lisp806051
-Node: Lisp Libraries807471
-Node: Lisp Eval810771
-Node: Lisp Interaction814617
-Node: External Lisp816051
-Node: Maintaining818356
-Node: Change Log818981
-Node: Authors823222
-Node: Tags824282
-Node: Tag Syntax826028
-Node: Create Tags Table830752
-Node: Etags Regexps834638
-Node: Select Tags Table839270
-Node: Find Tag841342
-Node: Tags Search844585
-Node: List Tags847781
-Node: Emerge849292
-Node: Overview of Emerge850265
-Node: Submodes of Emerge853529
-Node: State of Difference855233
-Node: Merge Commands857743
-Node: Exiting Emerge860264
-Node: Combining in Emerge861124
-Node: Fine Points of Emerge862005
-Node: Abbrevs862947
-Node: Abbrev Concepts864285
-Node: Defining Abbrevs865910
-Node: Expanding Abbrevs868420
-Node: Editing Abbrevs871624
-Node: Saving Abbrevs873482
-Node: Dynamic Abbrevs875602
-Node: Dabbrev Customization878437
-Node: Picture880859
-Node: Basic Picture883207
-Node: Insert in Picture885641
-Node: Tabs in Picture887051
-Node: Rectangles in Picture888908
-Node: Sending Mail890762
-Node: Mail Format893302
-Node: Mail Headers894630
-Node: Mail Aliases900104
-Node: Mail Mode903779
-Node: Mail Sending904810
-Node: Header Editing906424
-Node: Citing Mail908424
-Node: Mail Mode Misc910639
-Node: Mail Amusements913506
-Ref: Mail Amusements-Footnote-1914682
-Node: Mail Methods914723
-Node: Rmail915825
-Node: Rmail Basics917736
-Node: Rmail Scrolling919939
-Node: Rmail Motion920950
-Node: Rmail Deletion924087
-Node: Rmail Inbox927145
-Node: Rmail Files929516
-Node: Rmail Output932554
-Node: Rmail Labels936436
-Node: Rmail Attributes938746
-Node: Rmail Reply940222
-Node: Rmail Summary945819
-Node: Rmail Make Summary946815
-Node: Rmail Summary Edit949192
-Node: Rmail Sorting951776
-Node: Rmail Display953399
-Node: Rmail Coding955907
-Node: Rmail Editing958261
-Node: Rmail Digest959674
-Node: Out of Rmail960777
-Node: Rmail Rot13961982
-Node: Movemail962618
-Node: Dired966152
-Node: Dired Enter968057
-Node: Dired Navigation968997
-Node: Dired Deletion969829
-Node: Flagging Many Files971855
-Node: Dired Visiting974516
-Node: Marks vs Flags976337
-Node: Operating on Files980957
-Node: Shell Commands in Dired986125
-Node: Transforming File Names988157
-Node: Comparison in Dired991369
-Node: Subdirectories in Dired992378
-Node: Subdirectory Motion993982
-Node: Hiding Subdirectories995184
-Node: Dired Updating996405
-Node: Dired and Find998985
-Node: Calendar/Diary1000870
-Node: Calendar Motion1002758
-Node: Calendar Unit Motion1003610
-Node: Move to Beginning or End1005881
-Node: Specified Dates1007008
-Node: Scroll Calendar1007888
-Node: Counting Days1009675
-Node: General Calendar1010105
-Node: LaTeX Calendar1011436
-Node: Holidays1013585
-Node: Sunrise/Sunset1016682
-Node: Lunar Phases1019719
-Node: Other Calendars1021098
-Node: Calendar Systems1022276
-Node: To Other Calendar1025357
-Node: From Other Calendar1027390
-Node: Mayan Calendar1029694
-Node: Diary1032876
-Node: Diary Commands1034550
-Node: Format of Diary File1037880
-Node: Date Formats1040744
-Node: Adding to Diary1043312
-Node: Special Diary Entries1044940
-Node: Appointments1049171
-Node: Daylight Savings1051286
-Node: Time Intervals1053896
-Node: Gnus1055735
-Node: Buffers of Gnus1056387
-Node: Gnus Startup1057641
-Node: Summary of Gnus1058833
-Node: Shell1061899
-Node: Single Shell1063686
-Node: Interactive Shell1067086
-Node: Shell Mode1069890
-Ref: Shell Mode-Footnote-11076745
-Node: Shell History1076965
-Node: Shell Ring1077754
-Node: Shell History Copying1080312
-Node: History References1081364
-Node: Directory Tracking1082890
-Node: Shell Options1084225
-Node: Terminal emulator1086713
-Node: Term Mode1088642
-Node: Paging in Term1089544
-Node: Remote Host1090271
-Node: Emacs Server1091108
-Node: Invoking emacsclient1094863
-Node: Hardcopy1096392
-Node: PostScript1098111
-Node: PostScript Variables1100332
-Node: Sorting1103965
-Node: Narrowing1109520
-Node: Two-Column1111966
-Node: Editing Binary Files1115068
-Node: Saving Emacs Sessions1116554
-Node: Recursive Edit1118754
-Node: Emulation1122148
-Node: Hyperlinking1126531
-Node: Browse-URL1127718
-Node: Goto-address1128934
-Node: FFAP1129854
-Node: Find-func1131517
-Node: Dissociated Press1132857
-Ref: Dissociated Press-Footnote-11135476
-Node: Amusements1135573
-Node: Customization1137662
-Node: Minor Modes1139170
-Node: Variables1145185
-Node: Examining1147344
-Node: Easy Customization1149165
-Node: Customization Groups1150344
-Node: Changing an Option1153670
-Node: Face Customization1161364
-Node: Specific Customization1163930
-Node: Hooks1167122
-Node: Locals1170375
-Node: File Variables1174130
-Node: Keyboard Macros1180422
-Node: Basic Kbd Macro1182793
-Node: Save Kbd Macro1186622
-Node: Kbd Macro Query1188296
-Node: Key Bindings1190458
-Node: Keymaps1191843
-Node: Prefix Keymaps1195711
-Node: Local Keymaps1197334
-Node: Minibuffer Maps1200506
-Node: Rebinding1201128
-Node: Init Rebinding1204522
-Node: Function Keys1207822
-Node: Named ASCII Chars1210641
-Node: Non-ASCII Rebinding1212018
-Ref: Non-ASCII Rebinding-Footnote-11213545
-Node: Mouse Buttons1213725
-Node: Disabling1218881
-Node: Keyboard Translations1220693
-Node: Syntax1222717
-Node: Init File1224054
-Node: Init Syntax1226344
-Node: Init Examples1229077
-Node: Terminal Init1234128
-Node: Find Init1236020
-Node: Quitting1236904
-Node: Lossage1241631
-Node: DEL Does Not Delete1242744
-Node: Stuck Recursive1245847
-Node: Screen Garbled1246559
-Node: Text Garbled1247718
-Node: Unasked-for Search1248381
-Node: Memory Full1249860
-Node: After a Crash1250914
-Node: Emergency Escape1252116
-Node: Total Frustration1254182
-Node: Bugs1254807
-Node: Bug Criteria1255998
-Node: Understanding Bug Reporting1258704
-Node: Checklist1261365
-Node: Sending Patches1277443
-Node: Contributing1282756
-Node: Service1283538
-Node: Command Arguments1284185
-Node: Action Arguments1287537
-Node: Initial Options1288968
-Node: Command Example1292244
-Node: Resume Arguments1293074
-Node: Environment1294861
-Node: General Variables1296536
-Ref: General Variables-Footnote-11302356
-Node: Misc Variables1302632
-Node: Display X1304455
-Node: Font X1306765
-Node: Colors X1310436
-Node: Window Size X1312320
-Node: Borders X1315295
-Node: Title X1316475
-Node: Icons X1317236
-Node: Resources X1318276
-Node: Lucid Resources1327118
-Node: LessTif Resources1328998
-Node: Antinews1332409
-Node: Mac OS1344734
-Node: Mac Input1346113
-Node: Mac International1347902
-Node: Mac Environment Variables1350336
-Node: Mac Directories1351007
-Node: Mac Font Specs1352028
-Node: Mac Functions1353235
-Node: MS-DOS1353765
-Node: MS-DOS Input1355402
-Node: MS-DOS Display1359914
-Node: MS-DOS File Names1363891
-Node: Text and Binary1366850
-Node: MS-DOS Printing1372066
-Ref: MS-DOS Printing-Footnote-11378893
-Node: MS-DOS and MULE1379091
-Ref: MS-DOS and MULE-Footnote-11385971
-Ref: MS-DOS and MULE-Footnote-21386316
-Node: MS-DOS Processes1386662
-Node: Windows Processes1389093
-Node: Windows System Menu1391753
-Node: Manifesto1392467
-Ref: Manifesto-Footnote-11416636
-Ref: Manifesto-Footnote-21417525
-Ref: Manifesto-Footnote-31417798
-Ref: Manifesto-Footnote-41417840
-Ref: Manifesto-Footnote-51418360
-Node: Glossary1418466
-Node: Acknowledgments1470167
-Node: Key Index1511489
-Node: Option Index1550870
-Node: Command Index1553979
-Node: Variable Index1615381
-Node: Concept Index1643970
+Node: Top1203
+Node: Distrib34423
+Node: Copying37118
+Node: GNU Free Documentation License56322
+Node: Intro76023
+Node: Screen79135
+Node: Point81696
+Node: Echo Area83939
+Node: Mode Line86929
+Node: Menu Bar93268
+Node: User Input94874
+Node: Keys99468
+Node: Commands102279
+Node: Text Characters105012
+Node: Entering Emacs106488
+Node: Exiting109173
+Node: Basic113185
+Node: Inserting Text114368
+Node: Moving Point119029
+Node: Erasing122920
+Node: Undo124373
+Node: Basic Files128830
+Node: Basic Help130503
+Node: Blank Lines131092
+Node: Continuation Lines132662
+Node: Position Info134699
+Ref: Position Info-Footnote-1139332
+Node: Arguments139477
+Node: Repeating143481
+Node: Minibuffer144731
+Node: Minibuffer File147336
+Node: Minibuffer Edit149119
+Node: Completion151871
+Node: Completion Example153527
+Node: Completion Commands154602
+Node: Strict Completion157092
+Node: Completion Options158867
+Node: Minibuffer History161137
+Node: Repetition164850
+Node: M-x167082
+Node: Help170014
+Node: Help Summary174000
+Node: Key Help177056
+Node: Name Help177861
+Node: Apropos180669
+Node: Library Keywords183832
+Node: Language Help186018
+Node: Help Mode187078
+Node: Misc Help188293
+Node: Help Echo192401
+Node: Mark192917
+Node: Setting Mark194965
+Node: Transient Mark198163
+Node: Using Region202086
+Node: Marking Objects202945
+Node: Mark Ring205019
+Node: Global Mark Ring207012
+Node: Killing207934
+Node: Deletion210207
+Node: Killing by Lines214014
+Node: Other Kill Commands215540
+Node: Yanking217312
+Node: Kill Ring218113
+Node: Appending Kills219309
+Node: Earlier Kills221691
+Node: Accumulating Text224511
+Node: Rectangles227671
+Node: Registers232714
+Node: RegPos234006
+Node: RegText235112
+Node: RegRect236656
+Node: RegConfig237503
+Node: RegNumbers238401
+Node: RegFiles239237
+Node: Bookmarks239892
+Node: Display243132
+Node: Faces244394
+Node: Font Lock251311
+Node: Highlight Changes256004
+Node: Highlight Interactively256318
+Node: Trailing Whitespace258481
+Node: Scrolling259974
+Node: Horizontal Scrolling266135
+Node: Follow Mode268141
+Node: Selective Display268947
+Node: Optional Mode Line270361
+Node: Text Display273308
+Node: Display Custom274628
+Node: Cursor Display279486
+Node: Search280621
+Node: Incremental Search281773
+Node: Nonincremental Search291945
+Node: Word Search293412
+Node: Regexp Search295037
+Node: Regexps297288
+Node: Search Case311759
+Node: Replace313253
+Node: Unconditional Replace314351
+Node: Regexp Replace315645
+Node: Replacement and Case316577
+Node: Query Replace317836
+Node: Other Repeating Search321976
+Node: Fixit324079
+Node: Kill Errors325097
+Node: Transpose326506
+Node: Fixing Case329041
+Node: Spelling329698
+Node: Files335600
+Node: File Names337418
+Node: Visiting342003
+Node: Saving351007
+Node: Backup356355
+Node: Backup Names358838
+Node: Backup Deletion361604
+Node: Backup Copying362914
+Node: Interlocking365533
+Node: File Shadowing369397
+Node: Time Stamps371432
+Node: Reverting372318
+Node: Auto Save374590
+Node: Auto Save Files375730
+Node: Auto Save Control377935
+Node: Recover379800
+Node: File Aliases381880
+Node: Version Control383602
+Node: Introduction to VC385117
+Node: Version Systems385918
+Node: VC Concepts387235
+Node: VC Mode Line389663
+Node: Basic VC Editing390425
+Node: VC with Locking391712
+Node: Without Locking392870
+Node: Advanced C-x C-q394946
+Node: Log Buffer396151
+Node: Old Versions397369
+Node: Secondary VC Commands401080
+Node: Registering401662
+Node: VC Status403559
+Node: VC Undo404003
+Node: VC Dired Mode406222
+Node: VC Dired Commands409387
+Node: Branches410855
+Node: Switching Branches412540
+Node: Creating Branches413327
+Node: Merging415018
+Node: Multi-User Branching418389
+Node: Remote Repositories419501
+Node: Version Backups420342
+Node: Local Version Control422749
+Node: Snapshots427497
+Node: Making Snapshots427997
+Node: Snapshot Caveats429262
+Node: Miscellaneous VC431066
+Node: Change Logs and VC431593
+Node: Renaming and VC435294
+Node: Version Headers435983
+Node: Customizing VC439397
+Node: General VC Options440302
+Node: RCS and SCCS442533
+Node: CVS Options444639
+Node: Directories447235
+Node: Comparing Files449125
+Node: Misc File Ops451567
+Node: Compressed Files454852
+Node: File Archives455818
+Node: Remote Files458707
+Node: Quoted File Names461096
+Node: File Name Cache462465
+Node: File Conveniences464035
+Node: Buffers465088
+Node: Select Buffer467825
+Node: List Buffers470575
+Node: Misc Buffer472223
+Node: Kill Buffer475045
+Node: Several Buffers477558
+Node: Indirect Buffers482070
+Node: Buffer Convenience484488
+Node: Uniquify484998
+Node: Iswitchb486737
+Node: Buffer Menus488092
+Node: Windows488923
+Node: Basic Window489875
+Node: Split Window491977
+Node: Other Window494625
+Node: Pop Up Window496617
+Node: Force Same Window498098
+Node: Change Window499912
+Node: Window Convenience503728
+Node: Frames505256
+Node: Mouse Commands508127
+Node: Secondary Selection514301
+Node: Clipboard516021
+Node: Mouse References516856
+Node: Menu Mouse Clicks517803
+Ref: Menu Mouse Clicks-Footnote-1518920
+Node: Mode Line Mouse519141
+Node: Creating Frames520456
+Node: Frame Commands522762
+Node: Speedbar523624
+Node: Multiple Displays525350
+Node: Special Buffer Frames526686
+Node: Frame Parameters529151
+Node: Scroll Bars532399
+Ref: Scroll Bars-Footnote-1534618
+Node: Wheeled Mice534735
+Node: Menu Bars535492
+Node: Tool Bars536397
+Node: Dialog Boxes537143
+Node: Tooltips537696
+Node: Mouse Avoidance538492
+Node: Non-Window Terminals539540
+Node: XTerm Mouse540737
+Node: International541362
+Node: International Chars545177
+Node: Enabling Multibyte546658
+Node: Language Environments550209
+Ref: Language Environments-Footnote-1555333
+Ref: Language Environments-Footnote-2555539
+Node: Input Methods555652
+Node: Select Input Method560817
+Node: Multibyte Conversion564059
+Node: Coding Systems565240
+Ref: Coding Systems-Footnote-1570549
+Node: Recognize Coding570761
+Node: Specify Coding580145
+Node: Fontsets587481
+Ref: Fontsets-Footnote-1589640
+Node: Defining Fontsets589729
+Node: Undisplayable Characters593826
+Node: Single-Byte Character Support595027
+Node: Major Modes599267
+Node: Choosing Modes601731
+Node: Indentation605886
+Node: Indentation Commands608290
+Node: Tab Stops611442
+Node: Just Spaces613224
+Node: Text614032
+Node: Words616524
+Node: Sentences619573
+Node: Paragraphs622385
+Node: Pages624958
+Node: Filling627695
+Node: Auto Fill628604
+Node: Refill630939
+Node: Fill Commands631743
+Node: Fill Prefix634996
+Node: Adaptive Fill638833
+Node: Case641402
+Node: Text Mode643706
+Node: Outline Mode646462
+Node: Outline Format648603
+Node: Outline Motion651207
+Node: Outline Visibility652780
+Node: Outline Views656672
+Node: Foldout657561
+Node: TeX Mode661269
+Ref: TeX Mode-Footnote-1662873
+Node: TeX Editing662958
+Node: LaTeX Editing666180
+Node: TeX Print667531
+Node: TeX Misc674196
+Node: Nroff Mode674868
+Node: Formatted Text676595
+Node: Requesting Formatted Text678544
+Node: Hard and Soft Newlines680518
+Node: Editing Format Info681837
+Node: Format Faces683190
+Node: Format Colors685979
+Node: Format Indentation687388
+Node: Format Justification690175
+Node: Format Properties692624
+Node: Forcing Enriched Mode693545
+Node: Programs695270
+Node: Program Modes696799
+Node: Defuns699643
+Node: Left Margin Paren700894
+Node: Moving by Defuns702767
+Node: Imenu704844
+Node: Which Function706781
+Node: Program Indent707483
+Node: Basic Indent708341
+Node: Multi-line Indent710823
+Node: Lisp Indent713113
+Node: C Indent716536
+Node: Custom C Indent718004
+Node: Parentheses720509
+Node: Expressions721547
+Ref: Expressions-Footnote-1725791
+Node: Moving by Parens725858
+Node: Matching727578
+Node: Comments729880
+Node: Comment Commands730360
+Node: Multi-Line Comments734281
+Node: Options for Comments735791
+Node: Documentation738993
+Node: Info Lookup739536
+Node: Man Page740402
+Ref: Man Page-Footnote-1745577
+Ref: Man Page-Footnote-2745821
+Node: Lisp Doc745942
+Node: Hideshow747088
+Node: Symbol Completion748933
+Node: Glasses750917
+Node: Misc for Programs751669
+Node: C Modes753133
+Node: Motion in C753927
+Node: Electric C756385
+Node: Hungry Delete761439
+Node: Other C Commands762256
+Node: Comments in C765588
+Node: Fortran766965
+Node: Fortran Motion768413
+Node: Fortran Indent768912
+Node: ForIndent Commands769672
+Node: ForIndent Cont770954
+Node: ForIndent Num773383
+Node: ForIndent Conv774352
+Node: ForIndent Vars775399
+Node: Fortran Comments777216
+Node: Fortran Autofill781140
+Node: Fortran Columns782816
+Node: Fortran Abbrev785234
+Node: Asm Mode786140
+Node: Building786684
+Node: Compilation787940
+Node: Grep Searching791413
+Node: Compilation Mode792736
+Node: Compilation Shell795970
+Node: Debuggers797318
+Node: Starting GUD798244
+Node: Debugger Operation800172
+Ref: Debugger Operation-Footnote-1801512
+Node: Commands of GUD801607
+Node: GUD Customization804948
+Node: GUD Tooltips806984
+Node: Executing Lisp807406
+Node: Lisp Libraries808826
+Node: Lisp Eval812126
+Node: Lisp Interaction815972
+Node: External Lisp817406
+Node: Maintaining819711
+Node: Change Log820274
+Node: Tags824512
+Node: Tag Syntax826261
+Node: Create Tags Table830985
+Node: Etags Regexps834871
+Node: Select Tags Table839503
+Node: Find Tag841575
+Node: Tags Search844818
+Node: List Tags848014
+Node: Emerge849525
+Node: Overview of Emerge850501
+Node: Submodes of Emerge853765
+Node: State of Difference855469
+Node: Merge Commands857979
+Node: Exiting Emerge860500
+Node: Combining in Emerge861360
+Node: Fine Points of Emerge862241
+Node: Abbrevs863183
+Node: Abbrev Concepts864521
+Node: Defining Abbrevs866146
+Node: Expanding Abbrevs868656
+Node: Editing Abbrevs871860
+Node: Saving Abbrevs873718
+Node: Dynamic Abbrevs875838
+Node: Dabbrev Customization878673
+Node: Picture881095
+Node: Basic Picture883443
+Node: Insert in Picture885877
+Node: Tabs in Picture887287
+Node: Rectangles in Picture889144
+Node: Sending Mail890998
+Node: Mail Format893538
+Node: Mail Headers894866
+Node: Mail Aliases900340
+Node: Mail Mode904015
+Node: Mail Sending905046
+Node: Header Editing906660
+Node: Citing Mail908660
+Node: Mail Mode Misc910875
+Node: Mail Amusements913742
+Ref: Mail Amusements-Footnote-1914918
+Node: Mail Methods914959
+Node: Rmail916061
+Node: Rmail Basics917972
+Node: Rmail Scrolling920175
+Node: Rmail Motion921186
+Node: Rmail Deletion924323
+Node: Rmail Inbox927381
+Node: Rmail Files929752
+Node: Rmail Output932790
+Node: Rmail Labels936672
+Node: Rmail Attributes938982
+Node: Rmail Reply940458
+Node: Rmail Summary946055
+Node: Rmail Make Summary947051
+Node: Rmail Summary Edit949428
+Node: Rmail Sorting952012
+Node: Rmail Display953635
+Node: Rmail Coding956143
+Node: Rmail Editing958497
+Node: Rmail Digest959910
+Node: Out of Rmail961013
+Node: Rmail Rot13962218
+Node: Movemail962854
+Node: Dired966388
+Node: Dired Enter968289
+Node: Dired Navigation969229
+Node: Dired Deletion970061
+Node: Flagging Many Files972087
+Node: Dired Visiting974748
+Node: Marks vs Flags976569
+Node: Operating on Files981189
+Node: Shell Commands in Dired986357
+Node: Transforming File Names988389
+Node: Comparison in Dired991601
+Node: Subdirectories in Dired992610
+Node: Subdirectory Motion994214
+Node: Hiding Subdirectories995416
+Node: Dired Updating996637
+Node: Dired and Find999217
+Node: Calendar/Diary1001102
+Node: Calendar Motion1002990
+Node: Calendar Unit Motion1003842
+Node: Move to Beginning or End1006113
+Node: Specified Dates1007240
+Node: Scroll Calendar1008120
+Node: Counting Days1009907
+Node: General Calendar1010337
+Node: LaTeX Calendar1011668
+Node: Holidays1013817
+Node: Sunrise/Sunset1016914
+Node: Lunar Phases1019951
+Node: Other Calendars1021330
+Node: Calendar Systems1022508
+Node: To Other Calendar1025589
+Node: From Other Calendar1027622
+Node: Mayan Calendar1029926
+Node: Diary1033108
+Node: Diary Commands1034782
+Node: Format of Diary File1038112
+Node: Date Formats1040976
+Node: Adding to Diary1043544
+Node: Special Diary Entries1045172
+Node: Appointments1049403
+Node: Daylight Savings1051518
+Node: Time Intervals1054128
+Node: Gnus1055967
+Node: Buffers of Gnus1056619
+Node: Gnus Startup1057873
+Node: Summary of Gnus1059065
+Node: Shell1062131
+Node: Single Shell1063918
+Node: Interactive Shell1067318
+Node: Shell Mode1070122
+Ref: Shell Mode-Footnote-11076977
+Node: Shell History1077197
+Node: Shell Ring1077986
+Node: Shell History Copying1080544
+Node: History References1081596
+Node: Directory Tracking1083122
+Node: Shell Options1084457
+Node: Terminal emulator1086945
+Node: Term Mode1088874
+Node: Paging in Term1089776
+Node: Remote Host1090503
+Node: Emacs Server1091340
+Node: Invoking emacsclient1095095
+Node: Hardcopy1096624
+Node: PostScript1098343
+Node: PostScript Variables1100564
+Node: Sorting1104197
+Node: Narrowing1109752
+Node: Two-Column1112198
+Node: Editing Binary Files1115300
+Node: Saving Emacs Sessions1116786
+Node: Recursive Edit1118986
+Node: Emulation1122380
+Node: Hyperlinking1126763
+Node: Browse-URL1127950
+Node: Goto-address1129166
+Node: FFAP1130086
+Node: Find-func1131749
+Node: Dissociated Press1133089
+Ref: Dissociated Press-Footnote-11135708
+Node: Amusements1135805
+Node: Customization1137894
+Node: Minor Modes1139402
+Node: Variables1145417
+Node: Examining1147576
+Node: Easy Customization1149397
+Node: Customization Groups1150576
+Node: Changing an Option1153902
+Node: Face Customization1161596
+Node: Specific Customization1164162
+Node: Hooks1167354
+Node: Locals1170607
+Node: File Variables1174362
+Node: Keyboard Macros1180654
+Node: Basic Kbd Macro1183025
+Node: Save Kbd Macro1186854
+Node: Kbd Macro Query1188528
+Node: Key Bindings1190690
+Node: Keymaps1192075
+Node: Prefix Keymaps1195943
+Node: Local Keymaps1197566
+Node: Minibuffer Maps1200738
+Node: Rebinding1201360
+Node: Init Rebinding1204754
+Node: Function Keys1208054
+Node: Named ASCII Chars1210873
+Node: Non-ASCII Rebinding1212250
+Ref: Non-ASCII Rebinding-Footnote-11213777
+Node: Mouse Buttons1213957
+Node: Disabling1219113
+Node: Keyboard Translations1220925
+Node: Syntax1222949
+Node: Init File1224286
+Node: Init Syntax1226576
+Node: Init Examples1229309
+Node: Terminal Init1234360
+Node: Find Init1236252
+Node: Quitting1237136
+Node: Lossage1241863
+Node: DEL Does Not Delete1242976
+Node: Stuck Recursive1246079
+Node: Screen Garbled1246791
+Node: Text Garbled1247950
+Node: Unasked-for Search1248613
+Node: Memory Full1250092
+Node: After a Crash1251146
+Node: Emergency Escape1252348
+Node: Total Frustration1254414
+Node: Bugs1255039
+Node: Bug Criteria1256230
+Node: Understanding Bug Reporting1258936
+Node: Checklist1261597
+Node: Sending Patches1277675
+Node: Contributing1282988
+Node: Service1283770
+Node: Command Arguments1284417
+Node: Action Arguments1287769
+Node: Initial Options1289200
+Node: Command Example1292476
+Node: Resume Arguments1293306
+Node: Environment1295093
+Node: General Variables1296768
+Ref: General Variables-Footnote-11302588
+Node: Misc Variables1302864
+Node: Display X1304687
+Node: Font X1306997
+Node: Colors X1310668
+Node: Window Size X1312552
+Node: Borders X1315527
+Node: Title X1316707
+Node: Icons X1317468
+Node: Resources X1318508
+Node: Lucid Resources1327350
+Node: LessTif Resources1329230
+Node: Antinews1332641
+Node: Mac OS1344966
+Node: Mac Input1346345
+Node: Mac International1348134
+Node: Mac Environment Variables1350568
+Node: Mac Directories1351239
+Node: Mac Font Specs1352260
+Node: Mac Functions1353467
+Node: MS-DOS1353997
+Node: MS-DOS Input1355634
+Node: MS-DOS Display1360146
+Node: MS-DOS File Names1364123
+Node: Text and Binary1367082
+Node: MS-DOS Printing1372298
+Ref: MS-DOS Printing-Footnote-11379125
+Node: MS-DOS and MULE1379323
+Ref: MS-DOS and MULE-Footnote-11386203
+Ref: MS-DOS and MULE-Footnote-21386548
+Node: MS-DOS Processes1386894
+Node: Windows Processes1389325
+Node: Windows System Menu1391985
+Node: Manifesto1392699
+Ref: Manifesto-Footnote-11416868
+Ref: Manifesto-Footnote-21417757
+Ref: Manifesto-Footnote-31418030
+Ref: Manifesto-Footnote-41418072
+Ref: Manifesto-Footnote-51418592
+Node: Glossary1418698
+Node: Acknowledgments1470399
+Node: Key Index1511723
+Node: Option Index1551104
+Node: Command Index1554213
+Node: Variable Index1615665
+Node: Concept Index1644254
 
 End Tag Table
diff -ruN src-21.1/info/emacs-1 src-21.2/info/emacs-1
--- src-21.1/info/emacs-1	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-1	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -37,8 +38,8 @@
    Emacs is the extensible, customizable, self-documenting real-time
 display editor.  This Info file describes how to edit with Emacs and
 some of how to customize it; it corresponds to GNU Emacs version
-21.1.  For information on extending Emacs, see *Note Emacs Lisp:
-(elisp).
+21.2.  For information on extending Emacs, see *Note Emacs Lisp:
+(elisp)Top.
 
 * Menu:
 
@@ -491,7 +492,6 @@
 Maintaining Programs
 
 * Change Log::	        Maintaining a change history for your program.
-* Authors::             Maintaining the Emacs `AUTHORS' file.
 * Tags::	        Go direct to any function in your program in one
 			  command.  Tags remembers which file it is in.
 * Emerge::	        A convenient way of merging two versions of a program.
diff -ruN src-21.1/info/emacs-10 src-21.2/info/emacs-10
--- src-21.1/info/emacs-10	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-10	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-11 src-21.2/info/emacs-11
--- src-21.1/info/emacs-11	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-11	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-12 src-21.2/info/emacs-12
--- src-21.1/info/emacs-12	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-12	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -493,7 +494,9 @@
      keyboard coding system (*note Specify Coding::), and Emacs will
      accept those characters.  Latin-1 characters can also be input by
      using the `C-x 8' prefix, see *Note C-x 8: Single-Byte Character
-     Support.
+     Support.  On X Window systems, your locale should be set to an
+     appropriate value to make sure Emacs interprets keyboard input
+     correctly, see *Note locales: Language Environments.
 
    The rest of this chapter describes these issues in detail.
 
@@ -663,8 +666,9 @@
 `locale-charset-language-names' and `locale-language-names', and
 selects the corresponding language environment if a match is found.
 (The former variable overrides the latter.)  It also adjusts the display
-table and terminal coding system, the locale coding system, and the
-preferred coding system as needed for the locale.
+table and terminal coding system, the locale coding system, the
+preferred coding system as needed for the locale, and--last but not
+least--the way Emacs decodes non-ASCII characters sent by your keyboard.
 
    If you modify the `LC_ALL', `LC_CTYPE', or `LANG' environment
 variables while running Emacs, you may want to invoke the
diff -ruN src-21.1/info/emacs-13 src-21.2/info/emacs-13
--- src-21.1/info/emacs-13	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-13	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -341,12 +342,13 @@
 
    The variable `locale-coding-system' specifies a coding system to use
 when encoding and decoding system strings such as system error messages
-and `format-time-string' formats and time stamps.  You should choose a
-coding system that is compatible with the underlying system's text
-representation, which is normally specified by one of the environment
-variables `LC_ALL', `LC_CTYPE', and `LANG'.  (The first one, in the
-order specified above, whose value is nonempty is the one that
-determines the text representation.)
+and `format-time-string' formats and time stamps.  That coding system
+is also used for decoding non-ASCII keyboard input on X Window systems.
+You should choose a coding system that is compatible with the
+underlying system's text representation, which is normally specified by
+one of the environment variables `LC_ALL', `LC_CTYPE', and `LANG'.
+(The first one, in the order specified above, whose value is nonempty
+is the one that determines the text representation.)
 
 
 File: emacs,  Node: Fontsets,  Next: Defining Fontsets,  Prev: Specify Coding,  Up: International
diff -ruN src-21.1/info/emacs-14 src-21.2/info/emacs-14
--- src-21.1/info/emacs-14	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-14	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-15 src-21.2/info/emacs-15
--- src-21.1/info/emacs-15	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-15	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -354,18 +355,19 @@
    There are two ways to alter the formatting information for a
 formatted text file: with keyboard commands, and with the mouse.
 
-   The easiest way to add properties to your document is by using the
-Text Properties menu.  You can get to this menu in two ways: from the
-Edit menu in the menu bar, or with `C-Mouse-2' (hold the <CTRL> key and
-press the middle mouse button).
+   The easiest way to add properties to your document is with the Text
+Properties menu.  You can get to this menu in two ways: from the Edit
+menu in the menu bar (use `<F10> e t' if you have no mouse), or with
+`C-Mouse-2' (hold the <CTRL> key and press the middle mouse button).
+There are also keyboard commands described in the following section.
 
    Most of the items in the Text Properties menu lead to other submenus.
 These are described in the sections that follow.  Some items run
 commands directly:
 
-`Remove Properties'
+`Remove Face Properties'
      Delete from the region all the text properties that the Text
-     Properties menu works with (`facemenu-remove-props').
+     Properties menu works with (`facemenu-remove-face-props').
 
 `Remove All'
      Delete _all_ text properties from the region
@@ -376,10 +378,10 @@
      (`list-text-properties-at').
 
 `Display Faces'
-     Display a list of all the defined faces.
+     Display a list of all the defined faces (`list-faces-display').
 
 `Display Colors'
-     Display a list of all the defined colors.
+     Display a list of all the defined colors (`list-colors-display').
 
 
 File: emacs,  Node: Format Faces,  Next: Format Colors,  Prev: Editing Format Info,  Up: Formatted Text
diff -ruN src-21.1/info/emacs-16 src-21.2/info/emacs-16
--- src-21.1/info/emacs-16	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-16	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-17 src-21.2/info/emacs-17
--- src-21.1/info/emacs-17	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-17	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-18 src-21.2/info/emacs-18
--- src-21.1/info/emacs-18	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-18	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -199,13 +200,12 @@
 * Menu:
 
 * Change Log::	        Maintaining a change history for your program.
-* Authors::             Maintaining the Emacs `AUTHORS' file.
 * Tags::	        Go direct to any function in your program in one
 			  command.  Tags remembers which file it is in.
 * Emerge::	        A convenient way of merging two versions of a program.
 
 
-File: emacs,  Node: Change Log,  Next: Authors,  Up: Maintaining
+File: emacs,  Node: Change Log,  Next: Tags,  Up: Maintaining
 
 Change Logs
 ===========
@@ -299,31 +299,7 @@
 your program and keep a change log.  *Note Log Buffer::.
 
 
-File: emacs,  Node: Authors,  Next: Tags,  Prev: Change Log,  Up: Maintaining
-
-`AUTHORS' files
-===============
-
-   Programs which have many contributors usually include a file named
-`AUTHORS' in their distribution, which lists the individual
-contributions.  Emacs has a special command for maintaining the
-`AUTHORS' file that is part of the Emacs distribution.
-
-   The `M-x authors' command prompts for the name of the root of the
-Emacs source directory.  It then scans `ChangeLog' files and Lisp
-source files under that directory for information about authors of
-individual packages, and people who made changes in source files, and
-puts the information it gleans into a buffer named `*Authors*'.  You
-can then edit the contents of that buffer and merge it with the
-existing `AUTHORS' file.
-
-   Do not assume that this command finds all the contributors; don't
-assume that a person not listed in the output was not a contributor.
-If you merged in someone's contribution and did not put his name in the
-change log, he won't show up in `M-x authors' either.
-
-
-File: emacs,  Node: Tags,  Next: Emerge,  Prev: Authors,  Up: Maintaining
+File: emacs,  Node: Tags,  Next: Emerge,  Prev: Change Log,  Up: Maintaining
 
 Tags Tables
 ===========
@@ -920,7 +896,7 @@
 modify the same program in two different directions.  To recover from
 this confusion, you need to merge the two versions.  Emerge makes this
 easier.  See also *Note Comparing Files::, for commands to compare in a
-more manual fashion, and *Note Ediff: (ediff).
+more manual fashion, and *Note Ediff: (ediff)Top.
 
 * Menu:
 
@@ -1222,4 +1198,24 @@
      Trim identical lines off the top and bottom of the difference.
      Such lines occur when the A and B versions are identical but
      differ from the ancestor version.
+
+
+File: emacs,  Node: Exiting Emerge,  Next: Combining in Emerge,  Prev: Merge Commands,  Up: Emerge
+
+Exiting Emerge
+--------------
+
+   The `q' command (`emerge-quit') finishes the merge, storing the
+results into the output file if you specified one.  It restores the A
+and B buffers to their proper contents, or kills them if they were
+created by Emerge and you haven't changed them.  It also disables the
+Emerge commands in the merge buffer, since executing them later could
+damage the contents of the various buffers.
+
+   `C-]' aborts the merge.  This means exiting without writing the
+output file.  If you didn't specify an output file, then there is no
+real difference between aborting and finishing the merge.
+
+   If the Emerge command was called from another Lisp program, then its
+return value is `t' for successful completion, or `nil' if you abort.
 
diff -ruN src-21.1/info/emacs-19 src-21.2/info/emacs-19
--- src-21.1/info/emacs-19	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-19	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -29,26 +30,6 @@
 Software Foundation raise funds for GNU development."
 
 
-File: emacs,  Node: Exiting Emerge,  Next: Combining in Emerge,  Prev: Merge Commands,  Up: Emerge
-
-Exiting Emerge
---------------
-
-   The `q' command (`emerge-quit') finishes the merge, storing the
-results into the output file if you specified one.  It restores the A
-and B buffers to their proper contents, or kills them if they were
-created by Emerge and you haven't changed them.  It also disables the
-Emerge commands in the merge buffer, since executing them later could
-damage the contents of the various buffers.
-
-   `C-]' aborts the merge.  This means exiting without writing the
-output file.  If you didn't specify an output file, then there is no
-real difference between aborting and finishing the merge.
-
-   If the Emerge command was called from another Lisp program, then its
-return value is `t' for successful completion, or `nil' if you abort.
-
-
 File: emacs,  Node: Combining in Emerge,  Next: Fine Points of Emerge,  Prev: Exiting Emerge,  Up: Emerge
 
 Combining the Two Versions
@@ -1155,4 +1136,53 @@
 
    If you type `M-<TAB>' in the body of the message, `mail-complete'
 invokes `ispell-complete-word', as in Text mode.
+
+
+File: emacs,  Node: Citing Mail,  Next: Mail Mode Misc,  Prev: Header Editing,  Up: Mail Mode
+
+Citing Mail
+-----------
+
+   Mail mode also has commands for yanking or "citing" all or part of a
+message that you are replying to.  These commands are active only when
+you started sending a message using an Rmail command.
+
+`C-c C-y'
+     Yank the selected message from Rmail (`mail-yank-original').
+
+`C-c C-r'
+     Yank the region from the Rmail buffer (`mail-yank-region').
+
+`C-c C-q'
+     Fill each paragraph cited from another message
+     (`mail-fill-yanked-message').
+
+   When mail sending is invoked from the Rmail mail reader using an
+Rmail command, `C-c C-y' can be used inside the mail buffer to insert
+the text of the message you are replying to.  Normally it indents each
+line of that message three spaces and eliminates most header fields.  A
+numeric argument specifies the number of spaces to indent.  An argument
+of just `C-u' says not to indent at all and not to eliminate anything.
+`C-c C-y' always uses the current message from the Rmail buffer, so you
+can insert several old messages by selecting one in Rmail, switching to
+`*mail*' and yanking it, then switching back to Rmail to select another.
+
+   You can specify the text for `C-c C-y' to insert at the beginning of
+each line: set `mail-yank-prefix' to the desired string.  (A value of
+`nil' means to use indentation; this is the default.)  However, `C-u
+C-c C-y' never adds anything at the beginning of the inserted lines,
+regardless of the value of `mail-yank-prefix'.
+
+   To yank just a part of an incoming message, set the region in Rmail
+to the part you want; then go to the `*Mail*' message and type `C-c
+C-r' (`mail-yank-region').  Each line that is copied is indented or
+prefixed according to `mail-yank-prefix'.
+
+   After using `C-c C-y' or `C-c C-r', you can type `C-c C-q'
+(`mail-fill-yanked-message') to fill the paragraphs of the yanked old
+message or messages.  One use of `C-c C-q' fills all such paragraphs,
+each one individually.  To fill a single paragraph of the quoted
+message, use `M-q'.  If filling does not automatically handle the type
+of citation prefix you use, try setting the fill prefix explicitly.
+*Note Filling::.
 
diff -ruN src-21.1/info/emacs-2 src-21.2/info/emacs-2
--- src-21.1/info/emacs-2	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-2	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -35,7 +36,6 @@
 **************************
 
                          Version 2, June 1991
-
      Copyright (C) 1989, 1991 Free Software Foundation, Inc.
      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
      
@@ -94,7 +94,6 @@
 modification follow.
 
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
   0. This License applies to any program or other work which contains a
      notice placed by the copyright holder saying it may be distributed
      under the terms of this General Public License.  The "Program,"
@@ -399,7 +398,6 @@
 ******************************
 
                         Version 1.1, March 2000
-
      Copyright (C) 2000  Free Software Foundation, Inc.
      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
      
diff -ruN src-21.1/info/emacs-20 src-21.2/info/emacs-20
--- src-21.1/info/emacs-20	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-20	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -29,55 +30,6 @@
 Software Foundation raise funds for GNU development."
 
 
-File: emacs,  Node: Citing Mail,  Next: Mail Mode Misc,  Prev: Header Editing,  Up: Mail Mode
-
-Citing Mail
------------
-
-   Mail mode also has commands for yanking or "citing" all or part of a
-message that you are replying to.  These commands are active only when
-you started sending a message using an Rmail command.
-
-`C-c C-y'
-     Yank the selected message from Rmail (`mail-yank-original').
-
-`C-c C-r'
-     Yank the region from the Rmail buffer (`mail-yank-region').
-
-`C-c C-q'
-     Fill each paragraph cited from another message
-     (`mail-fill-yanked-message').
-
-   When mail sending is invoked from the Rmail mail reader using an
-Rmail command, `C-c C-y' can be used inside the mail buffer to insert
-the text of the message you are replying to.  Normally it indents each
-line of that message three spaces and eliminates most header fields.  A
-numeric argument specifies the number of spaces to indent.  An argument
-of just `C-u' says not to indent at all and not to eliminate anything.
-`C-c C-y' always uses the current message from the Rmail buffer, so you
-can insert several old messages by selecting one in Rmail, switching to
-`*mail*' and yanking it, then switching back to Rmail to select another.
-
-   You can specify the text for `C-c C-y' to insert at the beginning of
-each line: set `mail-yank-prefix' to the desired string.  (A value of
-`nil' means to use indentation; this is the default.)  However, `C-u
-C-c C-y' never adds anything at the beginning of the inserted lines,
-regardless of the value of `mail-yank-prefix'.
-
-   To yank just a part of an incoming message, set the region in Rmail
-to the part you want; then go to the `*Mail*' message and type `C-c
-C-r' (`mail-yank-region').  Each line that is copied is indented or
-prefixed according to `mail-yank-prefix'.
-
-   After using `C-c C-y' or `C-c C-r', you can type `C-c C-q'
-(`mail-fill-yanked-message') to fill the paragraphs of the yanked old
-message or messages.  One use of `C-c C-q' fills all such paragraphs,
-each one individually.  To fill a single paragraph of the quoted
-message, use `M-q'.  If filling does not automatically handle the type
-of citation prefix you use, try setting the fill prefix explicitly.
-*Note Filling::.
-
-
 File: emacs,  Node: Mail Mode Misc,  Prev: Citing Mail,  Up: Mail Mode
 
 Mail Mode Miscellany
@@ -1164,4 +1116,35 @@
 `rmail-redecode-body' cannot work.  However, the problems that call for
 use of `rmail-redecode-body' rarely occur with those coding systems.
 So in practice the command works when you need it.
+
+
+File: emacs,  Node: Rmail Editing,  Next: Rmail Digest,  Prev: Rmail Coding,  Up: Rmail
+
+Editing Within a Message
+========================
+
+   Most of the usual Emacs commands are available in Rmail mode, though
+a few, such as `C-M-n' and `C-M-h', are redefined by Rmail for other
+purposes.  However, the Rmail buffer is normally read only, and most of
+the letters are redefined as Rmail commands.  If you want to edit the
+text of a message, you must use the Rmail command `e'.
+
+`e'
+     Edit the current message as ordinary text.
+
+   The `e' command (`rmail-edit-current-message') switches from Rmail
+mode into Rmail Edit mode, another major mode which is nearly the same
+as Text mode.  The mode line indicates this change.
+
+   In Rmail Edit mode, letters insert themselves as usual and the Rmail
+commands are not available.  When you are finished editing the message
+and are ready to go back to Rmail, type `C-c C-c', which switches back
+to Rmail mode.  Alternatively, you can return to Rmail mode but cancel
+all the editing that you have done, by typing `C-c C-]'.
+
+   Entering Rmail Edit mode runs the hook `text-mode-hook'; then it
+runs the hook `rmail-edit-mode-hook' (*note Hooks::).  It adds the
+attribute `edited' to the message.  It also displays the full headers
+of the message, so that you can edit the headers as well as the body of
+the message, and your changes in the headers will be permanent.
 
diff -ruN src-21.1/info/emacs-21 src-21.2/info/emacs-21
--- src-21.1/info/emacs-21	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-21	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -29,37 +30,6 @@
 Software Foundation raise funds for GNU development."
 
 
-File: emacs,  Node: Rmail Editing,  Next: Rmail Digest,  Prev: Rmail Coding,  Up: Rmail
-
-Editing Within a Message
-========================
-
-   Most of the usual Emacs commands are available in Rmail mode, though
-a few, such as `C-M-n' and `C-M-h', are redefined by Rmail for other
-purposes.  However, the Rmail buffer is normally read only, and most of
-the letters are redefined as Rmail commands.  If you want to edit the
-text of a message, you must use the Rmail command `e'.
-
-`e'
-     Edit the current message as ordinary text.
-
-   The `e' command (`rmail-edit-current-message') switches from Rmail
-mode into Rmail Edit mode, another major mode which is nearly the same
-as Text mode.  The mode line indicates this change.
-
-   In Rmail Edit mode, letters insert themselves as usual and the Rmail
-commands are not available.  When you are finished editing the message
-and are ready to go back to Rmail, type `C-c C-c', which switches back
-to Rmail mode.  Alternatively, you can return to Rmail mode but cancel
-all the editing that you have done, by typing `C-c C-]'.
-
-   Entering Rmail Edit mode runs the hook `text-mode-hook'; then it
-runs the hook `rmail-edit-mode-hook' (*note Hooks::).  It adds the
-attribute `edited' to the message.  It also displays the full headers
-of the message, so that you can edit the headers as well as the body of
-the message, and your changes in the headers will be permanent.
-
-
 File: emacs,  Node: Rmail Digest,  Next: Out of Rmail,  Prev: Rmail Editing,  Up: Rmail
 
 Digest Messages
@@ -212,7 +182,7 @@
 operate on the marked files or on the flagged files.
 
    The Dired-X package provides various extra features for Dired mode.
-*Note Dired-X: (dired-x)Dired-X.
+*Note Dired-X: (dired-x)Top.
 
 * Menu:
 
@@ -1240,4 +1210,50 @@
 centers the three-month calendar around that month.
 
    You can return to today's date with `.' (`calendar-goto-today').
+
+
+File: emacs,  Node: Scroll Calendar,  Next: Counting Days,  Prev: Calendar Motion,  Up: Calendar/Diary
+
+Scrolling in the Calendar
+=========================
+
+   The calendar display scrolls automatically through time when you
+move out of the visible portion.  You can also scroll it manually.
+Imagine that the calendar window contains a long strip of paper with
+the months on it.  Scrolling the calendar means moving the strip
+horizontally, so that new months become visible in the window.
+
+`C-x <'
+     Scroll calendar one month forward (`scroll-calendar-left').
+
+`C-x >'
+     Scroll calendar one month backward (`scroll-calendar-right').
+
+`C-v'
+`<NEXT>'
+     Scroll calendar three months forward
+     (`scroll-calendar-left-three-months').
+
+`M-v'
+`<PRIOR>'
+     Scroll calendar three months backward
+     (`scroll-calendar-right-three-months').
+
+   The most basic calendar scroll commands scroll by one month at a
+time.  This means that there are two months of overlap between the
+display before the command and the display after.  `C-x <' scrolls the
+calendar contents one month to the left; that is, it moves the display
+forward in time.  `C-x >' scrolls the contents to the right, which
+moves backwards in time.
+
+   The commands `C-v' and `M-v' scroll the calendar by an entire
+"screenful"--three months--in analogy with the usual meaning of these
+commands.  `C-v' makes later dates visible and `M-v' makes earlier
+dates visible.  These commands take a numeric argument as a repeat
+count; in particular, since `C-u' multiplies the next command by four,
+typing `C-u C-v' scrolls the calendar forward by a year and typing `C-u
+M-v' scrolls the calendar backward by a year.
+
+   The function keys <NEXT> and <PRIOR> are equivalent to `C-v' and
+`M-v', just as they are in other modes.
 
diff -ruN src-21.1/info/emacs-22 src-21.2/info/emacs-22
--- src-21.1/info/emacs-22	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-22	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -29,52 +30,6 @@
 Software Foundation raise funds for GNU development."
 
 
-File: emacs,  Node: Scroll Calendar,  Next: Counting Days,  Prev: Calendar Motion,  Up: Calendar/Diary
-
-Scrolling in the Calendar
-=========================
-
-   The calendar display scrolls automatically through time when you
-move out of the visible portion.  You can also scroll it manually.
-Imagine that the calendar window contains a long strip of paper with
-the months on it.  Scrolling the calendar means moving the strip
-horizontally, so that new months become visible in the window.
-
-`C-x <'
-     Scroll calendar one month forward (`scroll-calendar-left').
-
-`C-x >'
-     Scroll calendar one month backward (`scroll-calendar-right').
-
-`C-v'
-`<NEXT>'
-     Scroll calendar three months forward
-     (`scroll-calendar-left-three-months').
-
-`M-v'
-`<PRIOR>'
-     Scroll calendar three months backward
-     (`scroll-calendar-right-three-months').
-
-   The most basic calendar scroll commands scroll by one month at a
-time.  This means that there are two months of overlap between the
-display before the command and the display after.  `C-x <' scrolls the
-calendar contents one month to the left; that is, it moves the display
-forward in time.  `C-x >' scrolls the contents to the right, which
-moves backwards in time.
-
-   The commands `C-v' and `M-v' scroll the calendar by an entire
-"screenful"--three months--in analogy with the usual meaning of these
-commands.  `C-v' makes later dates visible and `M-v' makes earlier
-dates visible.  These commands take a numeric argument as a repeat
-count; in particular, since `C-u' multiplies the next command by four,
-typing `C-u C-v' scrolls the calendar forward by a year and typing `C-u
-M-v' scrolls the calendar backward by a year.
-
-   The function keys <NEXT> and <PRIOR> are equivalent to `C-v' and
-`M-v', just as they are in other modes.
-
-
 File: emacs,  Node: Counting Days,  Next: General Calendar,  Prev: Scroll Calendar,  Up: Calendar/Diary
 
 Counting Days
@@ -1254,4 +1209,32 @@
 you don't select this buffer--all useful article-oriented commands work
 in the summary buffer.  But you can select the article buffer, and
 execute all Gnus commands from that buffer, if you want to.
+
+
+File: emacs,  Node: Gnus Startup,  Next: Summary of Gnus,  Prev: Buffers of Gnus,  Up: Gnus
+
+When Gnus Starts Up
+-------------------
+
+   At startup, Gnus reads your `.newsrc' news initialization file and
+attempts to communicate with the local news server, which is a
+repository of news articles.  The news server need not be the same
+computer you are logged in on.
+
+   If you start Gnus and connect to the server, but do not see any
+newsgroups listed in the group buffer, type `L' or `A k' to get a
+listing of all the groups.  Then type `u' to toggle subscription to
+groups.
+
+   The first time you start Gnus, Gnus subscribes you to a few selected
+groups.  All other groups start out as "killed groups" for you; you can
+list them with `A k'.  All new groups that subsequently come to exist
+at the news server become "zombie groups" for you; type `A z' to list
+them.  You can subscribe to a group shown in these lists using the `u'
+command.
+
+   When you quit Gnus with `q', it automatically records in your
+`.newsrc' and `.newsrc.eld' initialization files the subscribed or
+unsubscribed status of all groups.  You should normally not edit these
+files manually, but you may if you know how.
 
diff -ruN src-21.1/info/emacs-23 src-21.2/info/emacs-23
--- src-21.1/info/emacs-23	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-23	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -27,34 +28,6 @@
    (a) The FSF's Back-Cover Text is: "You have freedom to copy and
 modify this GNU Manual, like GNU software.  Copies published by the Free
 Software Foundation raise funds for GNU development."
-
-
-File: emacs,  Node: Gnus Startup,  Next: Summary of Gnus,  Prev: Buffers of Gnus,  Up: Gnus
-
-When Gnus Starts Up
--------------------
-
-   At startup, Gnus reads your `.newsrc' news initialization file and
-attempts to communicate with the local news server, which is a
-repository of news articles.  The news server need not be the same
-computer you are logged in on.
-
-   If you start Gnus and connect to the server, but do not see any
-newsgroups listed in the group buffer, type `L' or `A k' to get a
-listing of all the groups.  Then type `u' to toggle subscription to
-groups.
-
-   The first time you start Gnus, Gnus subscribes you to a few selected
-groups.  All other groups start out as "killed groups" for you; you can
-list them with `A k'.  All new groups that subsequently come to exist
-at the news server become "zombie groups" for you; type `A z' to list
-them.  You can subscribe to a group shown in these lists using the `u'
-command.
-
-   When you quit Gnus with `q', it automatically records in your
-`.newsrc' and `.newsrc.eld' initialization files the subscribed or
-unsubscribed status of all groups.  You should normally not edit these
-files manually, but you may if you know how.
 
 
 File: emacs,  Node: Summary of Gnus,  Prev: Gnus Startup,  Up: Gnus
diff -ruN src-21.1/info/emacs-24 src-21.2/info/emacs-24
--- src-21.1/info/emacs-24	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-24	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-25 src-21.2/info/emacs-25
--- src-21.1/info/emacs-25	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-25	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-26 src-21.2/info/emacs-26
--- src-21.1/info/emacs-26	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-26	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-27 src-21.2/info/emacs-27
--- src-21.1/info/emacs-27	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-27	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-28 src-21.2/info/emacs-28
--- src-21.1/info/emacs-28	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-28	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-29 src-21.2/info/emacs-29
--- src-21.1/info/emacs-29	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-29	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-3 src-21.2/info/emacs-3
--- src-21.1/info/emacs-3	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-3	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-30 src-21.2/info/emacs-30
--- src-21.1/info/emacs-30	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-30	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-31 src-21.2/info/emacs-31
--- src-21.1/info/emacs-31	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-31	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-32 src-21.2/info/emacs-32
--- src-21.1/info/emacs-32	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-32	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -923,7 +924,7 @@
    * Olaf Sylvester wrote `bs.el', a package for manipulating Emacs
      buffers.
 
-   * Tibor S<imko and Milan Zamzal wrote `slovak.el', support for
+   * Tibor S<imko and Milan Zamazal wrote `slovak.el', support for
      editing text in Slovak language.
 
    * Naoto Takahashi wrote `utf-8.el', support for encoding and
@@ -1080,7 +1081,7 @@
      mode for editing Perl code.  Ilya Zakharevich also wrote `tmm.el',
      a mode for accessing the Emacs menu bar on a text-mode terminal.
 
-   * Milan Zamzal wrote `czech.el', support for editing Czech text,
+   * Milan Zamazal wrote `czech.el', support for editing Czech text,
      `glasses.el', a package for easier reading of source code which
      uses illegible identifier names such as `cantReadThisVariable', and
      `tildify.el', commands for adding hard spaces to text, TeX, and
diff -ruN src-21.1/info/emacs-33 src-21.2/info/emacs-33
--- src-21.1/info/emacs-33	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-33	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -76,8 +77,8 @@
 * > (Rmail):                             Rmail Motion.
 * ^ (Dired):                             Dired Visiting.
 * a (Calendar mode):                     Holidays.
-* a (Dired):                             Dired Visiting.
 * A (Dired):                             Operating on Files.
+* a (Dired):                             Dired Visiting.
 * a (Rmail):                             Rmail Labels.
 * B (Dired):                             Operating on Files.
 * b (Rmail):                             Rmail Basics.
@@ -100,10 +101,10 @@
 * C-c ' (Picture mode):                  Insert in Picture.
 * C-c . (Picture mode):                  Insert in Picture.
 * C-c / (Picture mode):                  Insert in Picture.
-* C-c : (C mode):                        Electric C.
 * C-c ; (Fortran mode):                  Fortran Comments.
 * C-c < (GUD):                           Commands of GUD.
 * C-c < (Picture mode):                  Insert in Picture.
+* C-c <colon> (C mode):                  Electric C.
 * C-c > (GUD):                           Commands of GUD.
 * C-c > (Picture mode):                  Insert in Picture.
 * C-c @ (Outline minor mode):            Outline Mode.
@@ -238,14 +239,14 @@
 * C-h C-k:                               Misc Help.
 * C-h C-p:                               Misc Help.
 * C-h C-w:                               Misc Help.
-* C-h f:                                 Name Help.
 * C-h F:                                 Misc Help.
+* C-h f:                                 Name Help.
 * C-h h:                                 International Chars.
-* C-h i:                                 Misc Help.
 * C-h I:                                 Select Input Method.
+* C-h i:                                 Misc Help.
 * C-h k:                                 Key Help.
-* C-h l:                                 Misc Help.
 * C-h L:                                 Language Environments.
+* C-h l:                                 Misc Help.
 * C-h m:                                 Misc Help.
 * C-h n:                                 Misc Help.
 * C-h P:                                 Misc Help.
@@ -306,8 +307,8 @@
 * C-Mouse-1:                             Menu Mouse Clicks.
 * C-Mouse-2:                             Menu Mouse Clicks.
 * C-mouse-2 (mode line):                 Mode Line Mouse.
-* C-Mouse-2 (scroll bar) <1>:            Split Window.
-* C-Mouse-2 (scroll bar):                Mode Line Mouse.
+* C-Mouse-2 (scroll bar) <1>:            Mode Line Mouse.
+* C-Mouse-2 (scroll bar):                Split Window.
 * C-Mouse-3:                             Menu Mouse Clicks.
 * C-Mouse-3 (when menu bar is disabled): Menu Bars.
 * C-n:                                   Moving Point.
@@ -464,8 +465,8 @@
 * C-x RET k:                             Specify Coding.
 * C-x RET p:                             Specify Coding.
 * C-x RET t:                             Specify Coding.
-* C-x RET x:                             Specify Coding.
 * C-x RET X:                             Specify Coding.
+* C-x RET x:                             Specify Coding.
 * C-x s:                                 Saving.
 * C-x SPC:                               Commands of GUD.
 * C-x TAB:                               Indentation Commands.
@@ -525,8 +526,8 @@
 * F2 d:                                  Two-Column.
 * F2 RET:                                Two-Column.
 * F2 s:                                  Two-Column.
-* G (Dired):                             Operating on Files.
 * g (Dired):                             Dired Updating.
+* G (Dired):                             Operating on Files.
 * g (Rmail):                             Rmail Files.
 * g CHAR (Calendar mode):                From Other Calendar.
 * g d (Calendar mode):                   Specified Dates.
@@ -548,14 +549,14 @@
 * j (Rmail):                             Rmail Motion.
 * k (Dired):                             Dired Updating.
 * k (Rmail):                             Rmail Labels.
-* L (Dired):                             Operating on Files.
 * l (Dired):                             Dired Updating.
-* L (Gnus Group mode):                   Summary of Gnus.
+* L (Dired):                             Operating on Files.
 * l (Gnus Group mode):                   Summary of Gnus.
+* L (Gnus Group mode):                   Summary of Gnus.
 * l (Rmail):                             Rmail Make Summary.
 * LEFT:                                  Moving Point.
-* M (Calendar mode):                     Lunar Phases.
 * m (Calendar mode):                     Diary Commands.
+* M (Calendar mode):                     Lunar Phases.
 * M (Dired):                             Operating on Files.
 * m (Dired):                             Marks vs Flags.
 * m (Rmail):                             Rmail Reply.
@@ -573,10 +574,10 @@
 * M-.:                                   Find Tag.
 * M-/:                                   Dynamic Abbrevs.
 * M-1:                                   Arguments.
-* M-::                                   Lisp Eval.
 * M-;:                                   Comment Commands.
 * M-<:                                   Moving Point.
 * M-< (Calendar mode):                   Move to Beginning or End.
+* M-<colon>:                             Lisp Eval.
 * M-=:                                   Position Info.
 * M-= (Calendar mode):                   Counting Days.
 * M-= (Dired):                           Comparison in Dired.
@@ -670,8 +671,8 @@
 * n (Rmail):                             Rmail Motion.
 * NEXT:                                  Scrolling.
 * o (Calendar mode):                     Specified Dates.
-* o (Dired):                             Dired Visiting.
 * O (Dired):                             Operating on Files.
+* o (Dired):                             Dired Visiting.
 * o (Rmail):                             Rmail Output.
 * p (Calendar mode):                     To Other Calendar.
 * P (Dired):                             Operating on Files.
@@ -694,10 +695,10 @@
 * RET (Occur mode):                      Other Repeating Search.
 * RET (Shell mode):                      Shell Mode.
 * RIGHT:                                 Moving Point.
-* S (Calendar mode):                     Sunrise/Sunset.
 * s (Calendar mode):                     Diary Commands.
-* S (Dired):                             Operating on Files.
+* S (Calendar mode):                     Sunrise/Sunset.
 * s (Dired):                             Dired Updating.
+* S (Dired):                             Operating on Files.
 * s (Gnus Summary mode):                 Summary of Gnus.
 * s (Rmail):                             Rmail Basics.
 * S-<TAB> (Help mode):                   Help Mode.
@@ -794,7 +795,7 @@
 * -q:                                    Initial Options.
 * -r:                                    Colors X.
 * -rv:                                   Colors X.
-* -t:                                    Initial Options.
 * -T:                                    Title X.
+* -t:                                    Initial Options.
 * -u:                                    Initial Options.
 
diff -ruN src-21.1/info/emacs-34 src-21.2/info/emacs-34
--- src-21.1/info/emacs-34	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-34	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -55,6 +56,7 @@
 * append-next-kill:                      Appending Kills.
 * append-to-buffer:                      Accumulating Text.
 * append-to-file:                        Accumulating Text.
+* append-to-register:                    RegText.
 * apply-macro-to-region-lines:           Basic Kbd Macro.
 * appt-add:                              Appointments.
 * appt-delete:                           Appointments.
@@ -65,7 +67,6 @@
 * apropos-value:                         Apropos.
 * apropos-variable:                      Apropos.
 * ask-user-about-lock:                   Interlocking.
-* authors:                               Authors.
 * auto-compression-mode:                 Compressed Files.
 * auto-fill-mode:                        Auto Fill.
 * auto-image-file-mode:                  File Conveniences.
@@ -430,7 +431,7 @@
 * expand-region-abbrevs:                 Expanding Abbrevs.
 * f90-mode:                              Fortran.
 * facemenu-remove-all:                   Editing Format Info.
-* facemenu-remove-props:                 Editing Format Info.
+* facemenu-remove-face-props:            Editing Format Info.
 * facemenu-set-background:               Format Colors.
 * facemenu-set-bold:                     Format Faces.
 * facemenu-set-bold-italic:              Format Faces.
@@ -749,8 +750,8 @@
 * next-history-element:                  Minibuffer History.
 * next-line:                             Moving Point.
 * next-matching-history-element:         Minibuffer History.
-* normal-erase-is-backspace-mode <1>:    Deletion.
-* normal-erase-is-backspace-mode:        DEL Does Not Delete.
+* normal-erase-is-backspace-mode <1>:    DEL Does Not Delete.
+* normal-erase-is-backspace-mode:        Deletion.
 * normal-mode:                           Choosing Modes.
 * not-modified:                          Saving.
 * nroff-mode:                            Nroff Mode.
@@ -812,6 +813,7 @@
 * posix-file-name-to-mac:                Mac Functions.
 * prefer-coding-system:                  Recognize Coding.
 * prepend-to-buffer:                     Accumulating Text.
+* prepend-to-register:                   RegText.
 * previous-completion:                   Completion Commands.
 * previous-history-element:              Minibuffer History.
 * previous-line:                         Moving Point.
diff -ruN src-21.1/info/emacs-35 src-21.2/info/emacs-35
--- src-21.1/info/emacs-35	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-35	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -518,8 +519,8 @@
 * vc-initial-comment:                    Registering.
 * vc-keep-workfiles:                     General VC Options.
 * vc-log-mode-hook:                      Log Buffer.
-* vc-make-backup-files <1>:              Backup.
-* vc-make-backup-files:                  General VC Options.
+* vc-make-backup-files <1>:              General VC Options.
+* vc-make-backup-files:                  Backup.
 * vc-mistrust-permissions:               RCS and SCCS.
 * vc-path:                               General VC Options.
 * vc-rcs-diff-switches:                  Old Versions.
diff -ruN src-21.1/info/emacs-36 src-21.2/info/emacs-36
--- src-21.1/info/emacs-36	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-36	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -81,7 +82,6 @@
 * astronomical day numbers:              Calendar Systems.
 * attribute (Rmail):                     Rmail Labels.
 * attributes of mode line, changing:     Optional Mode Line.
-* AUTHORS file:                          Authors.
 * Auto Compression mode:                 Compressed Files.
 * Auto Fill mode:                        Auto Fill.
 * Auto Save mode:                        Auto Save.
@@ -105,8 +105,8 @@
 * backup, and user-id:                   Backup Copying.
 * backups for remote files:              Remote Files.
 * balanced expression:                   Expressions.
-* balloon help <1>:                      Help Echo.
-* balloon help:                          Tooltips.
+* balloon help <1>:                      Tooltips.
+* balloon help:                          Help Echo.
 * base buffer:                           Indirect Buffers.
 * batch mode:                            Initial Options.
 * binary files, on MS-DOS/MS-Windows:    Text and Binary.
@@ -139,8 +139,8 @@
 * bypassing init and site-start file:    Initial Options.
 * byte code:                             Lisp Libraries.
 * byte-compiling several files (in Dired): Operating on Files.
-* C editing <1>:                         Programs.
-* C editing:                             Maintaining.
+* C editing <1>:                         Maintaining.
+* C editing:                             Programs.
 * C mode:                                C Modes.
 * C++ class browser, tags:               Tags.
 * C++ mode:                              C Modes.
@@ -233,6 +233,7 @@
 * CRiSP mode:                            Emulation.
 * cryptanalysis:                         Amusements.
 * current buffer:                        Buffers.
+* current function name in mode line:    Which Function.
 * cursor:                                Point.
 * cursor color, command-line argument:   Colors X.
 * cursor in non-selected windows:        Cursor Display.
@@ -268,6 +269,7 @@
 * debugging Emacs, tricks and techniques: Checklist.
 * debugging X problems:                  Resources X.
 * decoding mail messages (Rmail):        Rmail Coding.
+* decoding non-ASCII keyboard input on X: Specify Coding.
 * default argument:                      Minibuffer.
 * default-frame-alist:                   Creating Frames.
 * default.el file, not loading:          Initial Options.
@@ -917,6 +919,8 @@
 * rebinding non-ASCII keys:              Non-ASCII Rebinding.
 * rectangle:                             Rectangles.
 * rectangles and Picture mode:           Rectangles in Picture.
+* recursive copying:                     Operating on Files.
+* recursive deletion:                    Dired Deletion.
 * recursive editing level:               Recursive Edit.
 * redefining keys, this session:         Rebinding.
 * references, LaTeX:                     TeX Misc.
@@ -966,9 +970,15 @@
 * saved echo area messages:              Echo Area.
 * Saveplace:                             Saving Emacs Sessions.
 * saving files:                          Visiting.
+* saving fuile name in a register:       RegFiles.
 * saving keyboard macros:                Save Kbd Macro.
+* saving number in a register:           RegNumbers.
 * saving option value:                   Changing an Option.
+* saving position in a register:         RegPos.
+* saving rectangle in a register:        RegRect.
 * saving sessions:                       Saving Emacs Sessions.
+* saving text in a register:             RegText.
+* saving window configuration in a register: RegConfig.
 * SCCS:                                  Version Systems.
 * screen:                                Screen.
 * Scroll Bar mode:                       Scroll Bars.
diff -ruN src-21.1/info/emacs-4 src-21.2/info/emacs-4
--- src-21.1/info/emacs-4	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-4	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-5 src-21.2/info/emacs-5
--- src-21.1/info/emacs-5	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-5	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-6 src-21.2/info/emacs-6
--- src-21.1/info/emacs-6	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-6	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -106,11 +107,24 @@
 `C-x r i R'
      Insert text from register R (`insert-register').
 
+`M-x append-to-register <RET> R'
+     Append region to text in register R.
+
+`M-x prepend-to-register <RET> R'
+     Prepend region to text in register R.
+
    `C-x r s R' stores a copy of the text of the region into the
 register named R.  `C-u C-x r s R', the same command with a numeric
 argument, deletes the text from the buffer as well; you can think of
 this as "moving" the region text into the register.
 
+   `M-x append-to-register <RET> R' appends the copy of the text in the
+region to the text already stored in the register named R.  If invoked
+with a numeric argument, it deletes the region after appending it to
+the register.  A similar command `prepend-to-register' works the same,
+except that it _prepends_ the region text to the text in the register,
+rather than _appending_ it.
+
    `C-x r i R' inserts in the buffer the text from register R.
 Normally it leaves point before the text and places the mark after, but
 with a numeric argument (`C-u') it puts point after the text and the
@@ -330,6 +344,11 @@
 face can specify various attributes, such as the height, weight and
 slant of the characters, the foreground and background color, and
 underlining.  But it does not have to specify all of them.
+
+   Emacs on a character terminal supports only part of face attributes.
+Which attributes are supported depends on your display type, but many
+displays support inverse video, bold, and underline attributes, and
+some support colors.
 
    Features which rely on text in multiple faces (such as Font Lock
 mode) will also work on non-windowed terminals that can display more
diff -ruN src-21.1/info/emacs-7 src-21.2/info/emacs-7
--- src-21.1/info/emacs-7	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-7	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -666,8 +667,10 @@
 matching whitespace characters, repeated any number of times.
 
    To enter the same regexp interactively, you would type <TAB> to
-enter a tab, and `C-j' to enter a newline.  You would also type single
-backslashes as themselves, instead of doubling them for Lisp syntax.
+enter a tab, and `C-j' to enter a newline.  (When typed interactively,
+`C-j' should be preceded by a `C-q', to prevent Emacs from running the
+command bound to a newline.)  You would also type single backslashes as
+themselves, instead of doubling them for Lisp syntax.
 
 
 File: emacs,  Node: Search Case,  Next: Replace,  Prev: Regexps,  Up: Search
diff -ruN src-21.1/info/emacs-8 src-21.2/info/emacs-8
--- src-21.1/info/emacs-8	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-8	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/emacs-9 src-21.2/info/emacs-9
--- src-21.1/info/emacs-9	Sat Oct 20 18:27:18 2001
+++ src-21.2/info/emacs-9	Sat Mar 16 12:34:03 2002
@@ -1,7 +1,8 @@
-This is ../info/emacs, produced by makeinfo version 4.0 from emacs.texi.
+This is ../info/emacs, produced by makeinfo version 4.0f from
+emacs.texi.
 
    This is the Fourteenth edition of the `GNU Emacs Manual', updated
-for Emacs version 21.1.
+for Emacs version 21.2.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
@@ -11,9 +12,9 @@
    Published by the Free Software Foundation 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-   Copyright (C) 1985,
-1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001    Free Software
-Foundation, Inc.
+   Copyright (C)
+1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
+Free Software Foundation, Inc.
 
    Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
diff -ruN src-21.1/info/eshell src-21.2/info/eshell
--- src-21.1/info/eshell	Fri Oct  5 12:20:34 2001
+++ src-21.2/info/eshell	Sat Mar 16 12:34:04 2002
@@ -1,4 +1,4 @@
-This is ../info/eshell, produced by makeinfo version 4.0 from
+This is ../info/eshell, produced by makeinfo version 4.0f from
 eshell.texi.
 
 INFO-DIR-SECTION Emacs
@@ -608,8 +608,8 @@
 Known problems
 ==============
 
-   Below is complete list of known problems with Eshell version 2.4.1,
-which is the version included with Emacs 21.1.
+   Below is complete list of known problems with Eshell version 2.4.2,
+which is the version included with Emacs 21.2.
 
 Differentiate between aliases and functions
      Allow for a bash-compatible syntax, such as:
@@ -1027,43 +1027,43 @@
 
 
 Tag Table:
-Node: Top1185
-Node: What is Eshell?2090
-Ref: What is Eshell?-Footnote-14807
-Ref: What is Eshell?-Footnote-24897
-Node: Contributors to Eshell5090
-Node: Installation6263
-Node: Command basics11700
-Node: Commands verbs12251
-Node: Command arguments14033
-Node: Commands15279
-Node: Invocation15644
-Ref: Invocation-Footnote-116282
-Node: Completion16375
-Node: Aliases16483
-Node: History16582
-Node: Scripts16678
-Node: Arguments16758
-Node: The Parser16945
-Node: Variables17055
-Node: Substitution17166
-Node: Globbing17281
-Node: Predicates17389
-Node: Input/Output17480
-Node: Process control17596
-Node: Extension modules17726
-Node: Writing a module18027
-Node: Module testing18176
-Node: Directory handling18322
-Node: Key rebinding18473
-Node: Smart scrolling18615
-Node: Terminal emulation18761
-Node: Built-in UNIX commands18922
-Node: Extras and Goodies19067
-Node: Bugs and ideas19208
-Node: Known problems19785
-Node: Concept Index34923
-Node: Function and Variable Index35936
-Node: Key Index36103
+Node: Top1186
+Node: What is Eshell?2091
+Ref: What is Eshell?-Footnote-14808
+Ref: What is Eshell?-Footnote-24898
+Node: Contributors to Eshell5091
+Node: Installation6264
+Node: Command basics11701
+Node: Commands verbs12252
+Node: Command arguments14034
+Node: Commands15280
+Node: Invocation15645
+Ref: Invocation-Footnote-116283
+Node: Completion16376
+Node: Aliases16484
+Node: History16583
+Node: Scripts16679
+Node: Arguments16759
+Node: The Parser16946
+Node: Variables17056
+Node: Substitution17167
+Node: Globbing17282
+Node: Predicates17390
+Node: Input/Output17481
+Node: Process control17597
+Node: Extension modules17727
+Node: Writing a module18028
+Node: Module testing18177
+Node: Directory handling18323
+Node: Key rebinding18474
+Node: Smart scrolling18616
+Node: Terminal emulation18762
+Node: Built-in UNIX commands18923
+Node: Extras and Goodies19068
+Node: Bugs and ideas19209
+Node: Known problems19786
+Node: Concept Index34924
+Node: Function and Variable Index35937
+Node: Key Index36104
 
 End Tag Table
diff -ruN src-21.1/info/forms src-21.2/info/forms
--- src-21.1/info/forms	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/forms	Fri Jan 11 09:35:32 2002
@@ -814,15 +814,15 @@
 * forms-check-number-of-fields:          Control File Format.
 * forms-delete-record:                   Forms Commands.
 * forms-enumerate:                       Miscellaneous.
-* forms-field-sep <1>:                   Data File Format.
-* forms-field-sep:                       Control File Format.
+* forms-field-sep <1>:                   Control File Format.
+* forms-field-sep:                       Data File Format.
 * forms-fields:                          Format Description.
 * forms-file:                            Control File Format.
 * forms-find-file:                       Entering and Exiting Forms Mode.
 * forms-find-file-other-window:          Entering and Exiting Forms Mode.
 * forms-first-record:                    Forms Commands.
-* forms-format-list <1>:                 Control File Format.
-* forms-format-list:                     Format Description.
+* forms-format-list <1>:                 Format Description.
+* forms-format-list:                     Control File Format.
 * forms-insert-after:                    Control File Format.
 * forms-insert-record:                   Forms Commands.
 * forms-jump-record:                     Forms Commands.
@@ -830,8 +830,8 @@
 * forms-mode:                            Miscellaneous.
 * forms-mode-hooks:                      Entering and Exiting Forms Mode.
 * forms-modified-record-filter:          Control File Format.
-* forms-multi-line <1>:                  Data File Format.
-* forms-multi-line:                      Control File Format.
+* forms-multi-line <1>:                  Control File Format.
+* forms-multi-line:                      Data File Format.
 * forms-new-record-filter:               Control File Format.
 * forms-next-field:                      Forms Commands.
 * forms-next-record:                     Forms Commands.
@@ -839,8 +839,8 @@
 * forms-prev-field:                      Forms Commands.
 * forms-prev-record:                     Forms Commands.
 * forms-print:                           Forms Commands.
-* forms-read-file-filter <1>:            Data File Format.
-* forms-read-file-filter:                Control File Format.
+* forms-read-file-filter <1>:            Control File Format.
+* forms-read-file-filter:                Data File Format.
 * forms-read-only:                       Control File Format.
 * forms-save-buffer:                     Forms Commands.
 * forms-search-backward:                 Forms Commands.
diff -ruN src-21.1/info/gnus src-21.2/info/gnus
--- src-21.1/info/gnus	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/gnus	Fri Jan 11 09:35:32 2002
@@ -45,7 +45,7 @@
 gnus-14: 636484
 gnus-15: 685230
 gnus-16: 710780
-gnus-17: 814236
+gnus-17: 814352
 
 Tag Table:
 (Indirect)
@@ -371,6 +371,6 @@
 Node: Reading News FAQ705082
 Node: Reading Mail FAQ708407
 Node: Index710780
-Node: Key Index814236
+Node: Key Index814352
 
 End Tag Table
diff -ruN src-21.1/info/gnus-16 src-21.2/info/gnus-16
--- src-21.1/info/gnus-16	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/gnus-16	Fri Jan 11 09:35:32 2002
@@ -46,10 +46,10 @@
 * <:                                     Loose Threads.
 * >:                                     Loose Threads.
 * Access Control Lists:                  Editing IMAP ACLs.
-* activating groups <1>:                 Scanning New Messages.
-* activating groups:                     Terminology.
-* active file <1>:                       The Active File.
-* active file:                           Terminology.
+* activating groups <1>:                 Terminology.
+* activating groups:                     Scanning New Messages.
+* active file <1>:                       Terminology.
+* active file:                           The Active File.
 * adapt file group parameter:            Group Parameters.
 * adaptive scoring:                      Adaptive Scoring.
 * adopting articles:                     Loose Threads.
@@ -96,8 +96,8 @@
 * bbb-summary-rate-article:              Rating Articles.
 * binary groups:                         Binary Groups.
 * body:                                  Terminology.
-* bogus groups <1>:                      Group Maintenance.
-* bogus groups:                          Terminology.
+* bogus groups <1>:                      Terminology.
+* bogus groups:                          Group Maintenance.
 * bookmarks:                             Other Marks.
 * bouncing mail:                         Summary Mail Commands.
 * broken-reply-to:                       Group Parameters.
@@ -155,8 +155,8 @@
 * drafts:                                Drafts.
 * dribble file:                          Auto Save.
 * duplicate mails:                       Duplicates.
-* editing imap acls:                     Editing IMAP ACLs.
 * Editing IMAP ACLs:                     Editing IMAP ACLs.
+* editing imap acls:                     Editing IMAP ACLs.
 * Emacs:                                 Emacsen.
 * Emacs 21:                              Emacs Enhancements.
 * Emacsen <1>:                           Emacs/XEmacs Code.
@@ -188,8 +188,8 @@
 * followup:                              Composing Messages.
 * fonts:                                 Faces and Fonts.
 * foreign:                               Terminology.
-* foreign groups <1>:                    Foreign Groups.
-* foreign groups:                        Select Methods.
+* foreign groups <1>:                    Select Methods.
+* foreign groups:                        Foreign Groups.
 * foreign servers:                       Browse Foreign Server.
 * format-time-string:                    Article Date.
 * formatting variables:                  Formatting Variables.
@@ -240,8 +240,8 @@
 * gnus-agent-remove-group:               Group Agent Commands.
 * gnus-agent-remove-server:              Server Agent Commands.
 * gnus-agent-short-article:              Category Variables.
-* gnus-agent-synchronize-flags <1>:      Group Agent Commands.
-* gnus-agent-synchronize-flags:          Agent and IMAP.
+* gnus-agent-synchronize-flags <1>:      Agent and IMAP.
+* gnus-agent-synchronize-flags:          Group Agent Commands.
 * gnus-agent-toggle-mark:                Summary Agent Commands.
 * gnus-agent-unmark-article:             Summary Agent Commands.
 * gnus-agent-unplugged-hook:             Agent Variables.
@@ -471,6 +471,7 @@
 * gnus-fetch-old-headers:                Filling In Threads.
 * gnus-file-save-name:                   Saving Articles.
 * gnus-find-method-for-group:            Gnus Utility Functions.
+* gnus-folder-save-name:                 Saving Articles.
 * gnus-Folder-save-name:                 Saving Articles.
 * gnus-folder-save-name:                 Saving Articles.
 * gnus-gather-threads-by-references:     Loose Threads.
@@ -495,8 +496,8 @@
 * gnus-group-charset-alist:              Charsets.
 * gnus-group-check-bogus-groups:         Group Maintenance.
 * gnus-group-clear-data:                 Group Data.
-* gnus-group-clear-data-on-native-groups <1>: Changing Servers.
-* gnus-group-clear-data-on-native-groups: Group Data.
+* gnus-group-clear-data-on-native-groups <1>: Group Data.
+* gnus-group-clear-data-on-native-groups: Changing Servers.
 * gnus-group-customize:                  Foreign Groups.
 * gnus-group-default-list-level:         Group Levels.
 * gnus-group-delete-group:               Foreign Groups.
@@ -564,8 +565,8 @@
 * gnus-group-name-charset-group-alist:   Misc Group Stuff.
 * gnus-group-name-charset-method-alist:  Misc Group Stuff.
 * gnus-group-native-p:                   Gnus Utility Functions.
-* gnus-group-next-group <1>:             Group Maneuvering.
-* gnus-group-next-group:                 Browse Foreign Server.
+* gnus-group-next-group <1>:             Browse Foreign Server.
+* gnus-group-next-group:                 Group Maneuvering.
 * gnus-group-next-unread-group:          Group Maneuvering.
 * gnus-group-next-unread-group-same-level: Group Maneuvering.
 * gnus-group-nnimap-edit-acl:            Editing IMAP ACLs.
@@ -647,8 +648,8 @@
 * gnus-ignored-headers:                  Hiding Headers.
 * gnus-ignored-mime-types:               MIME Commands.
 * gnus-ignored-newsgroups:               The Active File.
-* gnus-info-find-node <1>:               Group Information.
-* gnus-info-find-node:                   Summary Group Information.
+* gnus-info-find-node <1>:               Summary Group Information.
+* gnus-info-find-node:                   Group Information.
 * gnus-info-group:                       Group Info.
 * gnus-info-level:                       Group Info.
 * gnus-info-marks:                       Group Info.
@@ -698,8 +699,8 @@
 * gnus-low-score-mark:                   Read Articles.
 * gnus-mail-save-name:                   Saving Articles.
 * gnus-mailing-list-groups:              Mail and Post.
-* gnus-mark-article-hook <1>:            Choosing Variables.
-* gnus-mark-article-hook:                Expiring Mail.
+* gnus-mark-article-hook <1>:            Expiring Mail.
+* gnus-mark-article-hook:                Choosing Variables.
 * gnus-mark-unpicked-articles-as-read:   Pick and Read.
 * gnus-message-archive-group:            Archived Messages.
 * gnus-message-archive-method:           Archived Messages.
@@ -732,6 +733,7 @@
 * gnus-not-empty-thread-mark:            Other Marks.
 * gnus-nov-is-evil:                      Crosspost Handling.
 * gnus-novice-user:                      Interactive.
+* gnus-numeric-save-name:                Saving Articles.
 * gnus-Numeric-save-name:                Saving Articles.
 * gnus-numeric-save-name:                Saving Articles.
 * gnus-options-not-subscribe:            Filtering New Groups.
@@ -742,8 +744,8 @@
 * gnus-parse-headers-hook <1>:           Various Various.
 * gnus-parse-headers-hook:               Low-Level Threading.
 * gnus-part-display-hook:                Customizing Articles.
-* gnus-permanently-visible-groups <1>:   Listing Groups.
-* gnus-permanently-visible-groups:       Misc Group Stuff.
+* gnus-permanently-visible-groups <1>:   Misc Group Stuff.
+* gnus-permanently-visible-groups:       Listing Groups.
 * gnus-pick-article-or-thread:           Pick and Read.
 * gnus-pick-display-summary:             Pick and Read.
 * gnus-pick-mode:                        Pick and Read.
@@ -817,8 +819,8 @@
 * gnus-score-find-score-files-function:  Score Variables.
 * gnus-score-find-single:                Score Variables.
 * gnus-score-find-trace:                 Summary Score Commands.
-* gnus-score-flush-cache <1>:            Summary Score Commands.
-* gnus-score-flush-cache:                Group Score Commands.
+* gnus-score-flush-cache <1>:            Group Score Commands.
+* gnus-score-flush-cache:                Summary Score Commands.
 * gnus-score-followup-article:           Followups To Yourself.
 * gnus-score-followup-thread:            Followups To Yourself.
 * gnus-score-interactive-default-score:  Score Variables.
@@ -867,8 +869,8 @@
 * gnus-show-threads:                     More Threading.
 * gnus-signature-face:                   Article Highlighting.
 * gnus-signature-limit:                  Article Signature.
-* gnus-signature-separator <1>:          Article Highlighting.
-* gnus-signature-separator:              Article Signature.
+* gnus-signature-separator <1>:          Article Signature.
+* gnus-signature-separator:              Article Highlighting.
 * gnus-simplify-ignored-prefixes:        Loose Threads.
 * gnus-simplify-subject-functions:       Loose Threads.
 * gnus-simplify-subject-fuzzy:           Loose Threads.
@@ -1016,8 +1018,8 @@
 * gnus-summary-move-article:             Mail Group Commands.
 * gnus-summary-next-article:             Choosing Commands.
 * gnus-summary-next-group:               Exiting the Summary Buffer.
-* gnus-summary-next-page <1>:            Choosing Commands.
-* gnus-summary-next-page:                Paging the Article.
+* gnus-summary-next-page <1>:            Paging the Article.
+* gnus-summary-next-page:                Choosing Commands.
 * gnus-summary-next-same-subject:        Choosing Commands.
 * gnus-summary-next-thread:              Thread Commands.
 * gnus-summary-next-unread-article:      Choosing Commands.
@@ -1186,8 +1188,8 @@
 * gnus-undo:                             Undo.
 * gnus-undo-mode:                        Undo.
 * gnus-unload:                           Exiting Gnus.
-* gnus-unread-mark <1>:                  Choosing Variables.
-* gnus-unread-mark:                      Unread Articles.
+* gnus-unread-mark <1>:                  Unread Articles.
+* gnus-unread-mark:                      Choosing Variables.
 * gnus-update-format:                    Formatting Variables.
 * gnus-update-score-entry-dates:         Score Variables.
 * gnus-updated-mode-lines:               Mode Lines.
@@ -1309,10 +1311,10 @@
 * help group <1>:                        Document Groups.
 * help group:                            Foreign Groups.
 * hiding headers:                        Hiding Headers.
-* highlighting <1>:                      Highlighting and Menus.
-* highlighting <2>:                      Compatibility.
-* highlighting <3>:                      Group Highlighting.
-* highlighting:                          Article Highlighting.
+* highlighting <1>:                      Compatibility.
+* highlighting <2>:                      Highlighting and Menus.
+* highlighting <3>:                      Article Highlighting.
+* highlighting:                          Group Highlighting.
 * highlights:                            Various Various.
 * hilit19:                               Compatibility.
 * history <1>:                           History.
@@ -1342,8 +1344,8 @@
 * ispell:                                Mail and Post.
 * ispell-message:                        Mail and Post.
 * kibozing:                              Kibozed Groups.
-* kill files <1>:                        Kill Files.
-* kill files:                            Converting Kill Files.
+* kill files <1>:                        Converting Kill Files.
+* kill files:                            Kill Files.
 * killed groups:                         Terminology.
 * koi8-r:                                Charsets.
 * koi8-u:                                Charsets.
@@ -1359,8 +1361,8 @@
 * M******** sm*rtq**t*s:                 Article Washing.
 * mail <1>:                              Terminology.
 * mail <2>:                              Getting Mail.
-* mail <3>:                              Summary Mail Commands.
-* mail:                                  Composing Messages.
+* mail <3>:                              Composing Messages.
+* mail:                                  Summary Mail Commands.
 * mail folders:                          Mail Folders.
 * mail group commands:                   Mail Group Commands.
 * mail message:                          Terminology.
@@ -1375,8 +1377,8 @@
 * mail-extract-address-components:       Summary Buffer Format.
 * mail-source-crash-box:                 Mail Source Customization.
 * mail-source-default-file-modes:        Mail Source Customization.
-* mail-source-delete-incoming <1>:       Mail Source Customization.
-* mail-source-delete-incoming:           Gnus Development.
+* mail-source-delete-incoming <1>:       Gnus Development.
+* mail-source-delete-incoming:           Mail Source Customization.
 * mail-source-directory:                 Mail Source Customization.
 * mail-source-incoming-file-prefix:      Mail Source Customization.
 * mail-sources:                          Fetching Mail.
@@ -1404,12 +1406,12 @@
 * metamail:                              Other Decode Variables.
 * MH folders:                            Saving Articles.
 * mh-e mail spool:                       MH Spool.
-* MIME <1>:                              Using MIME.
-* MIME:                                  Misc Article.
+* MIME <1>:                              Misc Article.
+* MIME:                                  Using MIME.
 * MIME decoding:                         MIME Commands.
 * MMDF mail box:                         Document Groups.
-* mode lines <1>:                        Mode Lines.
-* mode lines:                            Various Various.
+* mode lines <1>:                        Various Various.
+* mode lines:                            Mode Lines.
 * MODE READER:                           NNTP.
 * moderation:                            Moderation.
 * mouse:                                 Buttons.
@@ -1432,10 +1434,10 @@
 * nnbabyl-get-new-mail:                  Not Reading Mail.
 * nnbabyl-mbox-file:                     Rmail Babyl.
 * nnchoke:                               Back End Interface.
-* nndir <1>:                             Foreign Groups.
-* nndir:                                 Directory Groups.
-* nndoc <1>:                             Foreign Groups.
-* nndoc:                                 Document Groups.
+* nndir <1>:                             Directory Groups.
+* nndir:                                 Foreign Groups.
+* nndoc <1>:                             Document Groups.
+* nndoc:                                 Foreign Groups.
 * nndoc-article-type:                    Document Groups.
 * nndoc-post-type:                       Document Groups.
 * nndraft:                               Drafts.
@@ -1451,8 +1453,8 @@
 * nnfolder-delete-mail-hook:             Mail Folders.
 * nnfolder-directory:                    Mail Folders.
 * nnfolder-generate-active-file:         Mail Folders.
-* nnfolder-get-new-mail <1>:             Not Reading Mail.
-* nnfolder-get-new-mail:                 Mail Folders.
+* nnfolder-get-new-mail <1>:             Mail Folders.
+* nnfolder-get-new-mail:                 Not Reading Mail.
 * nnfolder-newsgroups-file:              Mail Folders.
 * nnfolder-save-buffer-hook:             Mail Folders.
 * nngateway-address:                     Mail-To-News Gateways.
@@ -1478,8 +1480,8 @@
 * nnimap-split-predicate:                Splitting in IMAP.
 * nnimap-split-rule:                     Splitting in IMAP.
 * nnimap-stream:                         IMAP.
-* nnkiboze <1>:                          Foreign Groups.
-* nnkiboze:                              Kibozed Groups.
+* nnkiboze <1>:                          Kibozed Groups.
+* nnkiboze:                              Foreign Groups.
 * nnkiboze-directory:                    Kibozed Groups.
 * nnkiboze-generate-groups:              Kibozed Groups.
 * nnmail-cache-accepted-message-ids <1>: Fancy Mail Splitting.
@@ -1516,20 +1518,20 @@
 * nnmail-use-long-file-names:            Mail Back End Variables.
 * nnmbox:                                Unix Mail Box.
 * nnmbox-active-file:                    Unix Mail Box.
-* nnmbox-get-new-mail <1>:               Not Reading Mail.
-* nnmbox-get-new-mail:                   Unix Mail Box.
+* nnmbox-get-new-mail <1>:               Unix Mail Box.
+* nnmbox-get-new-mail:                   Not Reading Mail.
 * nnmbox-mbox-file:                      Unix Mail Box.
 * nnmh:                                  MH Spool.
 * nnmh-be-safe:                          MH Spool.
 * nnmh-directory:                        MH Spool.
-* nnmh-get-new-mail <1>:                 Not Reading Mail.
-* nnmh-get-new-mail:                     MH Spool.
+* nnmh-get-new-mail <1>:                 MH Spool.
+* nnmh-get-new-mail:                     Not Reading Mail.
 * nnml:                                  Mail Spool.
 * nnml-active-file:                      Mail Spool.
 * nnml-directory:                        Mail Spool.
 * nnml-generate-nov-databases:           Mail Spool.
-* nnml-get-new-mail <1>:                 Not Reading Mail.
-* nnml-get-new-mail:                     Mail Spool.
+* nnml-get-new-mail <1>:                 Mail Spool.
+* nnml-get-new-mail:                     Not Reading Mail.
 * nnml-newsgroups-file:                  Mail Spool.
 * nnml-nov-file-name:                    Mail Spool.
 * nnml-nov-is-evil:                      Mail Spool.
@@ -1615,8 +1617,8 @@
 * nnwarchive-directory:                  Web Archive.
 * nnwarchive-login:                      Web Archive.
 * nnwarchive-passwd:                     Web Archive.
-* nnweb <1>:                             Foreign Groups.
-* nnweb:                                 Web Searches.
+* nnweb <1>:                             Web Searches.
+* nnweb:                                 Foreign Groups.
 * nnweb-max-hits:                        Web Searches.
 * nnweb-search:                          Web Searches.
 * nnweb-type:                            Web Searches.
@@ -1625,8 +1627,8 @@
 * nov <1>:                               Terminology.
 * nov:                                   NNTP.
 * NOV:                                   Crosspost Handling.
-* offline <1>:                           SOUP.
-* offline:                               Gnus Unplugged.
+* offline <1>:                           Gnus Unplugged.
+* offline:                               SOUP.
 * OneList:                               Article Hiding.
 * overview.fmt:                          Crosspost Handling.
 * parameters:                            Topic Commands.
@@ -1638,8 +1640,8 @@
 * post <1>:                              Composing Messages.
 * post:                                  Summary Post Commands.
 * posting styles:                        Posting Styles.
-* PostScript <1>:                        PostScript Files.
-* PostScript:                            Article Commands.
+* PostScript <1>:                        Article Commands.
+* PostScript:                            PostScript Files.
 * pre-fetch:                             Asynchronous Fetching.
 * preferred charset:                     Charsets.
 * printing:                              Article Commands.
@@ -1660,16 +1662,16 @@
 * renaming groups:                       Foreign Groups.
 * reply <1>:                             Terminology.
 * reply:                                 Composing Messages.
-* reporting bugs <1>:                    Compatibility.
-* reporting bugs:                        Troubleshooting.
+* reporting bugs <1>:                    Troubleshooting.
+* reporting bugs:                        Compatibility.
 * restarting:                            Scanning New Messages.
 * reverse scoring:                       Reverse Scoring.
 * RFC 1036:                              Conformity.
 * RFC 1522 decoding:                     Mail Back End Variables.
 * RFC 2047 decoding:                     Mail Back End Variables.
 * RFC 822:                               Conformity.
-* rmail mbox <1>:                        Rmail Babyl.
-* rmail mbox:                            Document Groups.
+* rmail mbox <1>:                        Document Groups.
+* rmail mbox:                            Rmail Babyl.
 * rnews batch files:                     Document Groups.
 * root:                                  Terminology.
 * rule variables:                        Rule Variables.
@@ -1754,16 +1756,16 @@
 * terminology:                           Terminology.
 * thread commands:                       Thread Commands.
 * thread root:                           Terminology.
-* threading <1>:                         Threading.
-* threading:                             Terminology.
+* threading <1>:                         Terminology.
+* threading:                             Threading.
 * timestamps:                            Group Timestamp.
 * To:                                    To From Newsgroups.
 * to-address:                            Group Parameters.
 * to-group:                              Group Parameters.
 * to-list:                               Group Parameters.
 * topic commands:                        Topic Commands.
-* topic parameters <1>:                  Topic Commands.
-* topic parameters:                      Topic Parameters.
+* topic parameters <1>:                  Topic Parameters.
+* topic parameters:                      Topic Commands.
 * topic sorting:                         Topic Sorting.
 * topic topology:                        Topic Topology.
 * topic variables:                       Topic Variables.
@@ -1808,8 +1810,8 @@
 * windows configuration:                 Windows Configuration.
 * www:                                   Browsing the Web.
 * x-face:                                Article Washing.
-* XEmacs <1>:                            Emacsen.
-* XEmacs <2>:                            Emacs/XEmacs Code.
+* XEmacs <1>:                            Emacs/XEmacs Code.
+* XEmacs <2>:                            Emacsen.
 * XEmacs:                                XEmacs Enhancements.
 * XOVER:                                 NNTP.
 * Xref:                                  Crosspost Handling.
diff -ruN src-21.1/info/gnus-17 src-21.2/info/gnus-17
--- src-21.1/info/gnus-17	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/gnus-17	Fri Jan 11 09:35:32 2002
@@ -51,14 +51,14 @@
 * / a (Summary):                         Limiting.
 * / C (Summary):                         Limiting.
 * / c (Summary):                         Limiting.
-* / D (Summary):                         Limiting.
 * / d (Summary):                         Limiting.
+* / D (Summary):                         Limiting.
 * / E (Summary):                         Limiting.
 * / M (Summary):                         Limiting.
 * / m (Summary):                         Limiting.
 * / n (Summary):                         Limiting.
-* / t (Summary):                         Limiting.
 * / T (Summary):                         Limiting.
+* / t (Summary):                         Limiting.
 * / u (Summary):                         Limiting.
 * / v (Summary):                         Limiting.
 * / w (Summary):                         Limiting.
@@ -77,8 +77,8 @@
 * <SPC> (Group):                         Selecting a Group.
 * <SPC> (Pick):                          Pick and Read.
 * <SPC> (Server):                        Server Commands.
-* <SPC> (Summary) <1>:                   Choosing Commands.
-* <SPC> (Summary):                       Paging the Article.
+* <SPC> (Summary) <1>:                   Paging the Article.
+* <SPC> (Summary):                       Choosing Commands.
 * = (Summary):                           Really Various Summary Commands.
 * > (Summary):                           Paging the Article.
 * ? (Article):                           Article Keymap.
@@ -95,8 +95,8 @@
 * A < (Summary):                         Paging the Article.
 * A > (Summary):                         Paging the Article.
 * A ? (Group):                           Listing Groups.
-* A A (Group):                           Listing Groups.
 * A a (Group):                           Listing Groups.
+* A A (Group):                           Listing Groups.
 * A c (Group):                           Listing Groups.
 * A d (Group):                           Listing Groups.
 * A D (Summary):                         Really Various Summary Commands.
@@ -109,14 +109,14 @@
 * A R (Summary):                         Finding the Parent.
 * A s (Group):                           Listing Groups.
 * A s (Summary):                         Paging the Article.
-* A t (Summary):                         Article Miscellania.
 * A T (Summary):                         Finding the Parent.
+* A t (Summary):                         Article Miscellania.
 * A T (Topic):                           Topic Commands.
 * A u (Group):                           Listing Groups.
 * A z (Group):                           Listing Groups.
-* b (Group):                             Group Maintenance.
-* B (Group) <1>:                         Finding the News.
 * B (Group):                             Browse Foreign Server.
+* b (Group):                             Group Maintenance.
+* B (Group):                             Finding the News.
 * b (Summary):                           MIME Commands.
 * B <DEL> (Summary):                     Mail Group Commands.
 * B B (Summary):                         Mail Group Commands.
@@ -177,8 +177,8 @@
 * e (Summary):                           Mail Group Commands.
 * E (Summary):                           Setting Marks.
 * F (Group):                             Group Maintenance.
-* f (Summary):                           Summary Post Commands.
 * F (Summary):                           Summary Post Commands.
+* f (Summary):                           Summary Post Commands.
 * g (Binary):                            Binary Groups.
 * g (Category):                          The Category Buffer.
 * g (Group):                             Scanning New Messages.
@@ -206,8 +206,8 @@
 * G m (Group):                           Foreign Groups.
 * G M-n (Summary):                       Summary Maneuvering.
 * G M-p (Summary):                       Summary Maneuvering.
-* G n (Summary):                         Choosing Commands.
 * G N (Summary):                         Choosing Commands.
+* G n (Summary):                         Choosing Commands.
 * G o (Summary):                         Choosing Commands.
 * G p (Group):                           Foreign Groups.
 * G P (Summary):                         Choosing Commands.
@@ -224,15 +224,15 @@
 * G S l (Group):                         Sorting Groups.
 * G S m (Group):                         Sorting Groups.
 * G s p (Group):                         SOUP Commands.
-* G S r (Group):                         Sorting Groups.
 * G s r (Group):                         SOUP Commands.
+* G S r (Group):                         Sorting Groups.
 * G s s (Group):                         SOUP Commands.
 * G S u (Group):                         Sorting Groups.
 * G S v (Group):                         Sorting Groups.
 * G s w (Group):                         SOUP Commands.
 * G u (Group):                           Foreign Groups.
-* G V (Group):                           Foreign Groups.
 * G v (Group):                           Foreign Groups.
+* G V (Group):                           Foreign Groups.
 * G w (Group):                           Foreign Groups.
 * G x:                                   Expunging mailboxes.
 * h (Summary):                           Paging the Article.
@@ -253,8 +253,8 @@
 * J M-# (Agent Summary):                 Summary Agent Commands.
 * J r (Agent Group):                     Group Agent Commands.
 * J r (Agent Server):                    Server Agent Commands.
-* J s (Agent Group):                     Group Agent Commands.
 * J S (Agent Group):                     Group Agent Commands.
+* J s (Agent Group):                     Group Agent Commands.
 * J u (Agent Group):                     Group Agent Commands.
 * J Y (Agent Group):                     Group Agent Commands.
 * k (Category):                          The Category Buffer.
@@ -271,8 +271,8 @@
 * K | (Summary):                         MIME Commands.
 * l (Browse):                            Browse Foreign Server.
 * l (Category):                          The Category Buffer.
-* l (Group):                             Listing Groups.
 * L (Group):                             Listing Groups.
+* l (Group):                             Listing Groups.
 * l (Server):                            Server Commands.
 * l (Summary):                           Choosing Commands.
 * m (Group):                             Misc Group Stuff.
@@ -300,8 +300,8 @@
 * M P R (Summary):                       Setting Process Marks.
 * M P S (Summary):                       Setting Process Marks.
 * M P s (Summary):                       Setting Process Marks.
-* M P t (Summary):                       Setting Process Marks.
 * M P T (Summary):                       Setting Process Marks.
+* M P t (Summary):                       Setting Process Marks.
 * M P U (Summary):                       Setting Process Marks.
 * M P u (Summary):                       Setting Process Marks.
 * M P v (Summary):                       Setting Process Marks.
@@ -310,8 +310,8 @@
 * M r (Group):                           Marking Groups.
 * M S (Summary):                         Limiting.
 * M t (Summary):                         Setting Marks.
-* M u (Group):                           Marking Groups.
 * M U (Group):                           Marking Groups.
+* M u (Group):                           Marking Groups.
 * M V c (Summary):                       Setting Marks.
 * M V k (Summary):                       Setting Marks.
 * M V m (Summary):                       Setting Marks.
@@ -340,10 +340,10 @@
 * M-g (Group):                           Scanning New Messages.
 * M-g (Summary):                         Exiting the Summary Buffer.
 * M-i (Summary):                         Symbolic Prefixes.
-* M-k (Group):                           Kill Files.
 * M-K (Group):                           Kill Files.
-* M-k (Summary):                         Kill Files.
+* M-k (Group):                           Kill Files.
 * M-K (Summary):                         Kill Files.
+* M-k (Summary):                         Kill Files.
 * M-n (Group):                           Group Maneuvering.
 * M-n (Summary):                         Summary Maneuvering.
 * M-o (Server):                          Unavailable Servers.
@@ -373,8 +373,8 @@
 * M-x nnkiboze-generate-groups:          Kibozed Groups.
 * M-x nnmail-split-history:              Splitting Mail.
 * n (Browse):                            Browse Foreign Server.
-* n (Group):                             Group Maneuvering.
 * N (Group):                             Group Maneuvering.
+* n (Group):                             Group Maneuvering.
 * n (GroupLens):                         Rating Articles.
 * N (Summary):                           Choosing Commands.
 * n (Summary):                           Choosing Commands.
@@ -382,8 +382,8 @@
 * O (Server):                            Unavailable Servers.
 * o (Summary):                           Saving Articles.
 * O b (Summary):                         Saving Articles.
-* O f (Summary):                         Saving Articles.
 * O F (Summary):                         Saving Articles.
+* O f (Summary):                         Saving Articles.
 * O h (Summary):                         Saving Articles.
 * O m (Summary):                         Saving Articles.
 * O o (Summary):                         Saving Articles.
@@ -395,27 +395,27 @@
 * p (Category):                          The Category Buffer.
 * P (Group):                             Group Maneuvering.
 * p (Group):                             Group Maneuvering.
-* p (Summary):                           Choosing Commands.
 * P (Summary):                           Choosing Commands.
+* p (Summary):                           Choosing Commands.
 * q (Browse):                            Browse Foreign Server.
 * q (Category):                          The Category Buffer.
 * Q (Group):                             Exiting Gnus.
 * q (Group):                             Exiting Gnus.
 * q (Server):                            Server Commands.
-* q (Summary):                           Exiting the Summary Buffer.
 * Q (Summary):                           Exiting the Summary Buffer.
+* q (Summary):                           Exiting the Summary Buffer.
 * r (Group):                             File Commands.
 * R (Group):                             Scanning New Messages.
 * r (GroupLens):                         Rating Articles.
 * R (Server):                            Unavailable Servers.
-* r (Summary):                           Summary Mail Commands.
 * R (Summary):                           Summary Mail Commands.
+* r (Summary):                           Summary Mail Commands.
 * s (Article):                           Article Keymap.
 * s (Category):                          The Category Buffer.
 * s (Group):                             File Commands.
 * s (Server):                            Server Commands.
-* s (Summary):                           Paging the Article.
 * S (Summary):                           Canceling and Superseding.
+* s (Summary):                           Paging the Article.
 * S C-k (Group):                         Subscription Commands.
 * S D b (Summary):                       Summary Mail Commands.
 * S D r (Summary):                       Summary Mail Commands.
@@ -425,15 +425,15 @@
 * S l (Group):                           Group Levels.
 * S m (Summary):                         Summary Mail Commands.
 * S M-c (Summary):                       Summary Mail Commands.
-* S n (Summary):                         Summary Post Commands.
 * S N (Summary):                         Summary Post Commands.
-* S o m (Summary):                       Summary Mail Commands.
+* S n (Summary):                         Summary Post Commands.
 * S O m (Summary):                       Summary Mail Commands.
+* S o m (Summary):                       Summary Mail Commands.
 * S O p (Summary):                       Summary Post Commands.
 * S o p (Summary):                       Summary Post Commands.
 * S p (Summary):                         Summary Post Commands.
-* S r (Summary):                         Summary Mail Commands.
 * S R (Summary):                         Summary Mail Commands.
+* S r (Summary):                         Summary Mail Commands.
 * S s (Group):                           Subscription Commands.
 * S t (Group):                           Subscription Commands.
 * S u (Summary):                         Summary Post Commands.
@@ -470,8 +470,8 @@
 * T o (Summary):                         Thread Commands.
 * T p (Summary):                         Thread Commands.
 * T r (Topic):                           Topic Commands.
-* T s (Summary):                         Thread Commands.
 * T S (Summary):                         Thread Commands.
+* T s (Summary):                         Thread Commands.
 * T s (Topic):                           Topic Commands.
 * T S a (Topic):                         Topic Sorting.
 * T S l (Topic):                         Topic Sorting.
@@ -493,8 +493,8 @@
 * V C (Summary):                         Summary Score Commands.
 * V c (Summary):                         Summary Score Commands.
 * V e (Summary):                         Summary Score Commands.
-* V f (Summary):                         Summary Score Commands.
 * V F (Summary):                         Summary Score Commands.
+* V f (Summary):                         Summary Score Commands.
 * V m (Summary):                         Summary Score Commands.
 * V R (Summary):                         Summary Score Commands.
 * V S (Summary):                         Summary Score Commands.
@@ -502,14 +502,14 @@
 * V t (Summary):                         Summary Score Commands.
 * V x (Summary):                         Summary Score Commands.
 * W 6 (Summary):                         Article Washing.
-* W b (Summary):                         Article Washing.
 * W B (Summary):                         Article Washing.
+* W b (Summary):                         Article Washing.
 * W c (Summary):                         Article Washing.
 * W C (Summary):                         Article Washing.
 * W d (Summary):                         Article Washing.
 * W e (Summary):                         Article Fontisizing.
-* W E a (Summary):                       Article Washing.
 * W E A (Summary):                       Article Washing.
+* W E a (Summary):                       Article Washing.
 * W E e (Summary):                       Article Washing.
 * W E l (Summary):                       Article Washing.
 * W E m (Summary):                       Article Washing.
@@ -527,8 +527,8 @@
 * W M v (Summary):                       MIME Commands.
 * W M w (Summary):                       MIME Commands.
 * W o (Summary):                         Article Washing.
-* W Q (Summary):                         Article Washing.
 * W q (Summary):                         Article Washing.
+* W Q (Summary):                         Article Washing.
 * W r (Summary):                         Article Washing.
 * W t (Summary):                         Article Washing.
 * W T e (Summary):                       Article Date.
@@ -540,10 +540,10 @@
 * W v (Summary):                         Article Washing.
 * W w (Summary):                         Article Washing.
 * W W a (Summary):                       Article Hiding.
-* W W b (Summary):                       Article Hiding.
 * W W B (Summary):                       Article Hiding.
-* W W c (Summary):                       Article Hiding.
+* W W b (Summary):                       Article Hiding.
 * W W C (Summary):                       Article Hiding.
+* W W c (Summary):                       Article Hiding.
 * W W C-c (Summary):                     Article Hiding.
 * W W H (Summary):                       Article Washing.
 * W W h (Summary):                       Article Hiding.
@@ -558,10 +558,10 @@
 * X o (Summary):                         Other Files.
 * X P (Summary):                         PostScript Files.
 * X p (Summary):                         PostScript Files.
-* X s (Summary):                         Shell Archives.
 * X S (Summary):                         Shell Archives.
-* X u (Summary):                         Uuencoded Articles.
+* X s (Summary):                         Shell Archives.
 * X U (Summary):                         Uuencoded Articles.
+* X u (Summary):                         Uuencoded Articles.
 * X v P (Summary):                       PostScript Files.
 * X v p (Summary):                       PostScript Files.
 * X v S (Summary):                       Shell Archives.
@@ -576,8 +576,8 @@
 * Z c (Summary):                         Exiting the Summary Buffer.
 * Z E (Summary):                         Exiting the Summary Buffer.
 * Z G (Summary):                         Exiting the Summary Buffer.
-* Z n (Summary):                         Exiting the Summary Buffer.
 * Z N (Summary):                         Exiting the Summary Buffer.
+* Z n (Summary):                         Exiting the Summary Buffer.
 * Z P (Summary):                         Exiting the Summary Buffer.
 * Z R (Summary):                         Exiting the Summary Buffer.
 * Z s (Summary):                         Exiting the Summary Buffer.
diff -ruN src-21.1/info/idlwave src-21.2/info/idlwave
--- src-21.1/info/idlwave	Fri Oct  5 12:20:34 2001
+++ src-21.2/info/idlwave	Fri Jan 11 09:35:35 2002
@@ -1809,13 +1809,15 @@
      wrote `idl.el' and `idl-shell.el' and maintained them for several
      years.
 
-   - Carsten Dominik (mailto:dominik@astro.uva.nl), current author and
-     maintainer.  I have been in charge of the package since version
-     3.0. I am also responsible for the manual.
-
-   - J.D. Smith (mailto:jdsmith@astrosun.tn.cornell.edu) has shaped
-     Object method completion and most new features in version 4.0 with
-     his ideas, bug reports, and patient explanations of IDL internals.
+   - Carsten Dominik (mailto:dominik@astro.uva.nl), who have been in
+     charge of the package since version 3.0, and also wrote this
+     manual.
+
+   - John-David Smith (mailto: jdsmith@astro.cornell.edu), current
+     maintainer, who is also responsible for this manual's maintenance.
+     John-David has also shaped Object method completion and most new
+     features in version 4.0 with his ideas, bug reports, and patient
+     explanations of IDL internals.
 
 The following people have also contributed to the development of IDLWAVE
 with patches, ideas, bug reports and suggestions.
@@ -2181,9 +2183,9 @@
 
 * Menu:
 
-* !DIR, IDL variable <1>:                Routine Info.
-* !DIR, IDL variable <2>:                Load-Path Shadows.
-* !DIR, IDL variable:                    Library Catalog.
+* !DIR, IDL variable <1>:                Load-Path Shadows.
+* !DIR, IDL variable <2>:                Library Catalog.
+* !DIR, IDL variable:                    Routine Info.
 * !PATH, IDL variable <1>:               Routine Definitions.
 * !PATH, IDL variable:                   Routine Info.
 * .emacs:                                Configuration Examples.
@@ -2200,8 +2202,8 @@
 * Breakpoints:                           Breakpoints and Stepping.
 * Buffer, testing for shadowing:         Load-Path Shadows.
 * Buffers, killing:                      Routine Source.
-* Buffers, scanning for routine info <1>: Routine Info.
-* Buffers, scanning for routine info:    Routine Information Sources.
+* Buffers, scanning for routine info <1>: Routine Information Sources.
+* Buffers, scanning for routine info:    Routine Info.
 * Builtin list of routines:              Routine Information Sources.
 * C-c ?:                                 Routine Info.
 * C-c C-d:                               Debugging IDL Programs.
@@ -2274,8 +2276,8 @@
 * Flags, in routine info:                Routine Info.
 * Font lock:                             Syntax Highlighting.
 * Forcing class query.:                  Completion.
-* Foreign code, adapting <1>:            Code Indentation.
-* Foreign code, adapting:                Actions.
+* Foreign code, adapting <1>:            Actions.
+* Foreign code, adapting:                Code Indentation.
 * Formatting, of code:                   Code Formatting.
 * Frame, for shell buffer:               Starting the Shell.
 * FTP site:                              Installing IDLWAVE.
@@ -2284,8 +2286,8 @@
 * Function name completion:              Completion.
 * get_rinfo:                             Documentation Scan.
 * Getting Started:                       Getting Started.
-* Hanging paragraphs <1>:                Comment Indentation.
-* Hanging paragraphs:                    Continuation Lines.
+* Hanging paragraphs <1>:                Continuation Lines.
+* Hanging paragraphs:                    Comment Indentation.
 * Header, for file documentation:        Doc Header.
 * Help application, key bindings:        Online Help.
 * HELP, on expressions:                  Examining Variables.
@@ -2296,17 +2298,17 @@
 * IDL library routine info:              Library Catalog.
 * IDL manual, ASCII version:             Online Help.
 * IDL variable !DIR <1>:                 Load-Path Shadows.
-* IDL variable !DIR <2>:                 Routine Info.
-* IDL variable !DIR:                     Library Catalog.
-* IDL variable !PATH <1>:                Routine Info.
-* IDL variable !PATH:                    Routine Definitions.
+* IDL variable !DIR <2>:                 Library Catalog.
+* IDL variable !DIR:                     Routine Info.
+* IDL variable !PATH <1>:                Routine Definitions.
+* IDL variable !PATH:                    Routine Info.
 * IDL, as Emacs subprocess:              The IDLWAVE Shell.
 * idl-shell.el:                          Introduction.
 * idl.el:                                Introduction.
 * idlw-help.el <1>:                      Documentation Scan.
 * idlw-help.el:                          Online Help.
-* idlw-help.txt <1>:                     Online Help.
-* idlw-help.txt:                         Documentation Scan.
+* idlw-help.txt <1>:                     Documentation Scan.
+* idlw-help.txt:                         Online Help.
 * idlw-rinfo.el:                         Documentation Scan.
 * IDLWAVE in a Nutshell:                 IDLWAVE in a Nutshell.
 * IDLWAVE major mode:                    The IDLWAVE Major Mode.
@@ -2393,8 +2395,8 @@
 * idlwave-shell-use-input-mode-magic:    Using the Shell.
 * idlwave-shell-use-toolbar:             Debugging IDL Programs.
 * idlwave-show-block:                    Block Boundary Check.
-* idlwave-special-lib-alist <1>:         Routine Info.
-* idlwave-special-lib-alist:             Library Catalog.
+* idlwave-special-lib-alist <1>:         Library Catalog.
+* idlwave-special-lib-alist:             Routine Info.
 * idlwave-split-line-string:             Continuation Lines.
 * idlwave-startup-message:               Misc Options.
 * idlwave-store-inquired-class:          Completion.
@@ -2433,9 +2435,9 @@
 * M-?:                                   Online Help.
 * M-C-\:                                 Code Indentation.
 * M-q:                                   Continuation Lines.
-* MacOS <1>:                             The IDLWAVE Shell.
+* MacOS <1>:                             Load-Path Shadows.
 * MacOS <2>:                             Library Catalog.
-* MacOS:                                 Load-Path Shadows.
+* MacOS:                                 The IDLWAVE Shell.
 * Magic spells, for input mode:          Using the Shell.
 * Maintainer, of IDLWAVE:                Acknowledgement.
 * Major mode, idlwave-mode:              The IDLWAVE Major Mode.
@@ -2446,8 +2448,8 @@
 * Module source file:                    Routine Source.
 * Motion commands:                       Motion Commands.
 * Mouse binding to print expressions:    Examining Variables.
-* Multiply defined routines <1>:         Routine Info.
-* Multiply defined routines:             Load-Path Shadows.
+* Multiply defined routines <1>:         Load-Path Shadows.
+* Multiply defined routines:             Routine Info.
 * Nutshell, IDLWAVE in a:                IDLWAVE in a Nutshell.
 * OBJ_NEW, special online help:          Online Help.
 * Object method completion:              Completion.
@@ -2457,8 +2459,8 @@
 * Online Help from the routine info buffer: Routine Info.
 * Online Help in *Completions* buffer:   Completion.
 * Online Help, in the shell:             Using the Shell.
-* Online Help, Installation <1>:         Online Help.
-* Online Help, Installation:             Installing Online Help.
+* Online Help, Installation <1>:         Installing Online Help.
+* Online Help, Installation:             Online Help.
 * Operators, padding with spaces:        Padding Operators.
 * Padding operators with spaces:         Padding Operators.
 * Paragraphs, filling:                   Comment Indentation.
@@ -2490,8 +2492,8 @@
 * Screenshots:                           Introduction.
 * Scrolling the *Completions* window:    Completion.
 * self object, default class:            Completion.
-* Shadows, load-path <1>:                Routine Info.
-* Shadows, load-path:                    Load-Path Shadows.
+* Shadows, load-path <1>:                Load-Path Shadows.
+* Shadows, load-path:                    Routine Info.
 * Shell, basic commands:                 Using the Shell.
 * Shell, querying for routine info <1>:  Routine Information Sources.
 * Shell, querying for routine info:      Routine Info.
@@ -2507,8 +2509,8 @@
 * Starting the shell:                    Starting the Shell.
 * Stepping:                              Breakpoints and Stepping.
 * String splitting:                      Continuation Lines.
-* Subprocess of Emacs, IDL <1>:          The IDLWAVE Shell.
-* Subprocess of Emacs, IDL:              Starting the Shell.
+* Subprocess of Emacs, IDL <1>:          Starting the Shell.
+* Subprocess of Emacs, IDL:              The IDLWAVE Shell.
 * Summary of important commands:         IDLWAVE in a Nutshell.
 * Syntax highlighting:                   Syntax Highlighting.
 * Templates:                             Code Templates.
@@ -2522,8 +2524,8 @@
 * Upgrading from old idl.el:             Upgrading from idl.el.
 * URL, homepage for IDLWAVE:             Installing IDLWAVE.
 * Windows <1>:                           Load-Path Shadows.
-* Windows <2>:                           The IDLWAVE Shell.
-* Windows:                               Library Catalog.
+* Windows <2>:                           Library Catalog.
+* Windows:                               The IDLWAVE Shell.
 * XEmacs package IDLWAVE:                Installing IDLWAVE.
 
 
@@ -2569,13 +2571,13 @@
 Node: Installing Online Help75042
 Node: Upgrading from idl.el75639
 Node: Acknowledgement76781
-Node: Sources of Routine Info78281
-Node: Routine Definitions79040
-Node: Routine Information Sources80138
-Node: Library Catalog82342
-Node: Load-Path Shadows84887
-Node: Documentation Scan87450
-Node: Configuration Examples88386
-Node: Index93165
+Node: Sources of Routine Info78344
+Node: Routine Definitions79103
+Node: Routine Information Sources80201
+Node: Library Catalog82405
+Node: Load-Path Shadows84950
+Node: Documentation Scan87513
+Node: Configuration Examples88449
+Node: Index93228
 
 End Tag Table
diff -ruN src-21.1/info/mh-e-3 src-21.2/info/mh-e-3
--- src-21.1/info/mh-e-3	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/mh-e-3	Fri Jan 11 09:35:33 2002
@@ -803,9 +803,9 @@
 * mh-do-pick-search:                     Searching.
 * mh-edit-again:                         Old Drafts.
 * mh-edit-mhn:                           Sending MIME.
-* mh-execute-commands <1>:               Customizing Incorporating.
-* mh-execute-commands <2>:               Finishing Up.
-* mh-execute-commands:                   Customizing Finishing Up.
+* mh-execute-commands <1>:               Customizing Finishing Up.
+* mh-execute-commands <2>:               Customizing Incorporating.
+* mh-execute-commands:                   Finishing Up.
 * mh-extract-rejected-mail:              Old Drafts.
 * mh-first-msg:                          Moving Around.
 * mh-forward:                            Forwarding.
@@ -816,8 +816,8 @@
 * mh-insert-letter:                      Inserting Messages.
 * mh-insert-signature:                   Signature.
 * mh-insert-signature, example:          Customizing Sending.
-* mh-kill-folder <1>:                    Organizing.
-* mh-kill-folder:                        Customizing Reading.
+* mh-kill-folder <1>:                    Customizing Reading.
+* mh-kill-folder:                        Organizing.
 * mh-last-msg:                           Moving Around.
 * mh-list-folders:                       Organizing.
 * mh-list-sequences:                     Sequences.
@@ -839,31 +839,31 @@
 * mh-put-msg-in-seq:                     Sequences.
 * mh-quit:                               Finishing Up.
 * mh-redistribute:                       Redistributing.
-* mh-refile-msg <1>:                     Organizing.
-* mh-refile-msg:                         Customizing Organizing.
+* mh-refile-msg <1>:                     Customizing Organizing.
+* mh-refile-msg:                         Organizing.
 * mh-refile-or-write-again:              Organizing.
 * mh-reply:                              Replying.
 * mh-rescan-folder:                      Organizing.
 * mh-rescan-folder, example:             Customizing Incorporating.
 * mh-revert-mhn-edit:                    Sending MIME.
 * mh-rmail <1>:                          Finishing Up.
-* mh-rmail <2>:                          Reading Mail Tour.
-* mh-rmail:                              Reading Mail.
+* mh-rmail <2>:                          Reading Mail.
+* mh-rmail:                              Reading Mail Tour.
 * mh-rmail, example:                     Customizing Reading.
 * mh-search-folder:                      Searching.
 * mh-send:                               Sending Mail.
 * mh-send-letter:                        Sending Message.
 * mh-show:                               Viewing.
 * mh-show, example:                      Customizing Incorporating.
-* mh-smail <1>:                          Sending Mail Tour.
-* mh-smail <2>:                          Sending Mail.
-* mh-smail:                              Processing Mail Tour.
+* mh-smail <1>:                          Sending Mail.
+* mh-smail <2>:                          Processing Mail Tour.
+* mh-smail:                              Sending Mail Tour.
 * mh-smail-other-window:                 Sending Mail.
-* mh-sort-folder <1>:                    Organizing.
-* mh-sort-folder:                        Customizing Organizing.
+* mh-sort-folder <1>:                    Customizing Organizing.
+* mh-sort-folder:                        Organizing.
 * mh-store-buffer:                       Customizing Files and Pipes.
-* mh-store-msg <1>:                      Files and Pipes.
-* mh-store-msg:                          Customizing Files and Pipes.
+* mh-store-msg <1>:                      Customizing Files and Pipes.
+* mh-store-msg:                          Files and Pipes.
 * mh-to-fcc <1>:                         Customizing Organizing.
 * mh-to-fcc:                             Header.
 * mh-to-field <1>:                       Searching.
@@ -937,9 +937,9 @@
 * mh-partial-folder-mode-line-annotation: Customizing Searching.
 * mh-pick-mode-hook:                     Customizing Searching.
 * mh-print-background:                   Customizing Printing.
-* mh-progs <1>:                          Customizing Incorporating.
-* mh-progs <2>:                          Customizing Reading.
-* mh-progs:                              Customizing Scan Line Formats.
+* mh-progs <1>:                          Customizing Scan Line Formats.
+* mh-progs <2>:                          Customizing Incorporating.
+* mh-progs:                              Customizing Reading.
 * mh-progs, example:                     Getting Started.
 * mh-quit-hook:                          Customizing Finishing Up.
 * mh-recenter-summary-p:                 Customizing Moving Around.
@@ -949,8 +949,8 @@
 * mh-refiled-msg-regexp:                 Customizing Scan Line Formats.
 * mh-repl-formfile:                      Customizing Sending.
 * mh-reply-default-reply-to:             Customizing Replying.
-* mh-scan-prog <1>:                      Customizing Incorporating.
-* mh-scan-prog:                          Customizing Scan Line Formats.
+* mh-scan-prog <1>:                      Customizing Scan Line Formats.
+* mh-scan-prog:                          Customizing Incorporating.
 * mh-send-prog:                          Customizing Sending Message.
 * mh-show-buffer-mode-line-buffer-id:    Customizing Viewing.
 * mh-show-hook:                          Customizing Viewing.
diff -ruN src-21.1/info/mh-e-4 src-21.2/info/mh-e-4
--- src-21.1/info/mh-e-4	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/mh-e-4	Fri Jan 11 09:35:33 2002
@@ -35,15 +35,15 @@
 
 * Menu:
 
-* .emacs <1>:                            Getting Started.
-* .emacs <2>:                            Customizing mh-e.
-* .emacs <3>:                            Customizing Organizing.
-* .emacs <4>:                            Getting mh-e.
-* .emacs <5>:                            Customizing Reading.
-* .emacs:                                Incorporating.
+* .emacs <1>:                            Getting mh-e.
+* .emacs <2>:                            Customizing Organizing.
+* .emacs <3>:                            Customizing Reading.
+* .emacs <4>:                            Customizing mh-e.
+* .emacs <5>:                            Incorporating.
+* .emacs:                                Getting Started.
 * .mh_profile:                           Customizing Organizing.
-* .signature <1>:                        Signature.
-* .signature:                            Customizing Signature.
+* .signature <1>:                        Customizing Signature.
+* .signature:                            Signature.
 * bugs:                                  Bug Reports.
 * burst:                                 Reading Digests.
 * checking recipients:                   Recipients.
@@ -56,11 +56,11 @@
 * digests:                               Reading Digests.
 * dist:                                  Customizing Redistributing.
 * draft:                                 Old Drafts.
-* editing draft <1>:                     Draft Editing.
-* editing draft:                         Customizing Draft Editing.
+* editing draft <1>:                     Customizing Draft Editing.
+* editing draft:                         Draft Editing.
 * editing header:                        Header.
-* Emacs <1>:                             Preface.
-* Emacs:                                 Conventions.
+* Emacs <1>:                             Conventions.
+* Emacs:                                 Preface.
 * Emacs, Emacs Lisp manual:              Customizing mh-e.
 * Emacs, file completion:                Conventions.
 * Emacs, functions; describe-mode:       Using mh-e.
@@ -70,27 +70,27 @@
 * Emacs, mark:                           Conventions.
 * Emacs, minibuffer:                     Conventions.
 * Emacs, notification of new mail:       Incorporating.
-* Emacs, online help <1>:                Using mh-e.
-* Emacs, online help:                    Customizing mh-e.
+* Emacs, online help <1>:                Customizing mh-e.
+* Emacs, online help:                    Using mh-e.
 * Emacs, packages, supercite:            Customizing Inserting Letter.
 * Emacs, point <1>:                      Inserting Letter.
 * Emacs, point:                          Conventions.
 * Emacs, prefix argument:                Conventions.
 * Emacs, quitting <1>:                   Leaving mh-e.
 * Emacs, quitting:                       Conventions.
-* Emacs, region <1>:                     Conventions.
-* Emacs, region:                         Inserting Letter.
+* Emacs, region <1>:                     Inserting Letter.
+* Emacs, region:                         Conventions.
 * Emacs, setting variables:              Customizing mh-e.
 * Emacs, terms and conventions:          Conventions.
 * expunging refiles and deletes:         Finishing Up.
 * FAQ:                                   MH FAQ.
 * file completion:                       Conventions.
-* files, .emacs <1>:                     Customizing Reading.
-* files, .emacs <2>:                     Getting mh-e.
-* files, .emacs <3>:                     Getting Started.
-* files, .emacs <4>:                     Incorporating.
-* files, .emacs <5>:                     Customizing Organizing.
-* files, .emacs:                         Customizing mh-e.
+* files, .emacs <1>:                     Getting mh-e.
+* files, .emacs <2>:                     Customizing Organizing.
+* files, .emacs <3>:                     Customizing Reading.
+* files, .emacs <4>:                     Customizing mh-e.
+* files, .emacs <5>:                     Incorporating.
+* files, .emacs:                         Getting Started.
 * files, .mh_profile:                    Customizing Organizing.
 * files, .signature <1>:                 Customizing Signature.
 * files, .signature:                     Signature.
@@ -102,24 +102,24 @@
 * folder <1>:                            Organizing.
 * folder:                                Processing Mail Tour.
 * forw:                                  Forwarding.
-* forwarding <1>:                        Forwarding.
-* forwarding:                            Customizing Forwarding.
-* ftp <1>:                               FTP.
-* ftp:                                   Tar.
+* forwarding <1>:                        Customizing Forwarding.
+* forwarding:                            Forwarding.
+* ftp <1>:                               Tar.
+* ftp:                                   FTP.
 * Gildea, Stephen <1>:                   From Stephen Gildea.
 * Gildea, Stephen:                       History.
 * history:                               Preface.
 * history of mh-e:                       History.
 * images:                                Other MIME Objects.
-* inc <1>:                               Reading Mail Tour.
-* inc <2>:                               Customizing Scan Line Formats.
-* inc:                                   Customizing Incorporating.
-* incorporating <1>:                     Incorporating.
-* incorporating:                         Customizing Incorporating.
+* inc <1>:                               Customizing Scan Line Formats.
+* inc <2>:                               Customizing Incorporating.
+* inc:                                   Reading Mail Tour.
+* incorporating <1>:                     Customizing Incorporating.
+* incorporating:                         Incorporating.
 * info:                                  Customizing mh-e.
-* inserting messages <1>:                Inserting Letter.
+* inserting messages <1>:                Customizing Inserting Letter.
 * inserting messages <2>:                Inserting Messages.
-* inserting messages:                    Customizing Inserting Letter.
+* inserting messages:                    Inserting Letter.
 * inserting signature <1>:               Customizing Signature.
 * inserting signature:                   Signature.
 * install-mh:                            Getting Started.
@@ -128,35 +128,34 @@
 * killing draft:                         Killing Draft.
 * Larus, Jim <1>:                        From Jim Larus.
 * Larus, Jim:                            History.
-* lpr <1>:                               Printing.
-* lpr:                                   Customizing Printing.
+* lpr <1>:                               Customizing Printing.
+* lpr:                                   Printing.
 * Mailer-Daemon:                         Old Drafts.
 * mailing list:                          Mailing List.
 * mark <1>:                              Sequences.
-* mark <2>:                              Conventions.
-* mark:                                  Inserting Letter.
+* mark <2>:                              Inserting Letter.
+* mark:                                  Conventions.
 * MH commands, burst:                    Reading Digests.
 * MH commands, comp:                     Customizing Sending.
 * MH commands, dist:                     Customizing Redistributing.
 * MH commands, folder:                   Organizing.
 * MH commands, forw:                     Forwarding.
-* MH commands, inc <1>:                  Reading Mail Tour.
+* MH commands, inc <1>:                  Customizing Scan Line Formats.
 * MH commands, inc <2>:                  Customizing Incorporating.
-* MH commands, inc:                      Customizing Scan Line Formats.
+* MH commands, inc:                      Reading Mail Tour.
 * MH commands, install-mh:               Getting Started.
 * MH commands, mark:                     Sequences.
-* MH commands, mhl <1>:                  Printing.
-* MH commands, mhl <2>:                  Replying.
-* MH commands, mhl:                      Customizing Viewing.
-* MH commands, mhn <1>:                  Editing MIME.
-* MH commands, mhn:                      Sending MIME.
+* MH commands, mhl <1>:                  Customizing Viewing.
+* MH commands, mhl <2>:                  Printing.
+* MH commands, mhl:                      Replying.
+* MH commands, mhn <1>:                  Sending MIME.
+* MH commands, mhn:                      Editing MIME.
 * MH commands, mhshow:                   Reading MIME.
 * MH commands, pick <1>:                 Sequences.
 * MH commands, pick:                     Searching.
 * MH commands, refile:                   Organizing.
 * MH commands, repl <1>:                 Customizing Sending.
-* MH commands, repl <2>:                 Replying.
-* MH commands, repl:                     Customizing Sending.
+* MH commands, repl:                     Replying.
 * MH commands, scan <1>:                 Customizing Scan Line Formats.
 * MH commands, scan:                     Reading Mail Tour.
 * MH commands, send <1>:                 Customizing Sending Message.
@@ -166,36 +165,33 @@
 * MH commands, whom:                     Recipients.
 * MH FAQ:                                MH FAQ.
 * MH profile components, sortm:          Customizing Organizing.
-* MH-Folder mode <1>:                    Reading Mail Tour.
+* MH-Folder mode <1>:                    Customizing Moving Around.
 * MH-Folder mode <2>:                    Customizing Reading.
-* MH-Folder mode <3>:                    Reading Mail.
-* MH-Folder mode <4>:                    Customizing Reading.
-* MH-Folder mode <5>:                    Sequences.
-* MH-Folder mode <6>:                    Customizing Moving Around.
-* MH-Folder mode <7>:                    Moving Around.
-* MH-Folder mode <8>:                    Sending Mail.
-* MH-Folder mode <9>:                    Searching.
-* MH-Folder mode <10>:                   Processing Mail Tour.
-* MH-Folder mode:                        Customizing Reading.
+* MH-Folder mode <3>:                    Sequences.
+* MH-Folder mode <4>:                    Searching.
+* MH-Folder mode <5>:                    Sending Mail.
+* MH-Folder mode <6>:                    Moving Around.
+* MH-Folder mode <7>:                    Reading Mail.
+* MH-Folder mode <8>:                    Processing Mail Tour.
+* MH-Folder mode:                        Reading Mail Tour.
 * MH-Folder Show mode <1>:               Moving Around.
 * MH-Folder Show mode:                   Reading Digests.
 * MH-Letter mode <1>:                    Draft Editing.
-* MH-Letter mode <2>:                    Sending Mail.
-* MH-Letter mode <3>:                    Sending Mail Tour.
-* MH-Letter mode <4>:                    Replying.
+* MH-Letter mode <2>:                    Replying.
+* MH-Letter mode <3>:                    Sending Mail.
 * MH-Letter mode:                        Sending Mail Tour.
-* MH-Show mode <1>:                      Customizing Viewing.
-* MH-Show mode:                          Customizing Moving Around.
+* MH-Show mode <1>:                      Customizing Moving Around.
+* MH-Show mode:                          Customizing Viewing.
 * mhl <1>:                               Customizing Viewing.
 * mhl <2>:                               Printing.
 * mhl:                                   Replying.
 * mhl.reply:                             Replying.
-* mhn <1>:                               Editing MIME.
-* mhn:                                   Sending MIME.
+* mhn <1>:                               Sending MIME.
+* mhn:                                   Editing MIME.
 * mhshow:                                Reading MIME.
 * MIME <1>:                              Customizing Editing MIME.
-* MIME <2>:                              Reading MIME.
-* MIME:                                  Editing MIME.
+* MIME <2>:                              Editing MIME.
+* MIME:                                  Reading MIME.
 * MIME, content description:             Editing MIME.
 * MIME, content types:                   Editing MIME.
 * MIME, ftp <1>:                         Tar.
@@ -206,76 +202,75 @@
 * MIME, video:                           Other MIME Objects.
 * minibuffer:                            Conventions.
 * mode:                                  Sending Mail Tour.
-* modes, MH-Folder <1>:                  Processing Mail Tour.
-* modes, MH-Folder <2>:                  Searching.
+* modes, MH-Folder <1>:                  Customizing Moving Around.
+* modes, MH-Folder <2>:                  Customizing Reading.
 * modes, MH-Folder <3>:                  Sequences.
-* modes, MH-Folder <4>:                  Customizing Reading.
-* modes, MH-Folder <5>:                  Customizing Moving Around.
-* modes, MH-Folder <6>:                  Sending Mail.
-* modes, MH-Folder <7>:                  Moving Around.
-* modes, MH-Folder <8>:                  Reading Mail.
+* modes, MH-Folder <4>:                  Searching.
+* modes, MH-Folder <5>:                  Sending Mail.
+* modes, MH-Folder <6>:                  Moving Around.
+* modes, MH-Folder <7>:                  Reading Mail.
+* modes, MH-Folder <8>:                  Processing Mail Tour.
 * modes, MH-Folder:                      Reading Mail Tour.
-* modes, MH-Folder Show <1>:             Reading Digests.
-* modes, MH-Folder Show:                 Moving Around.
-* modes, MH-Letter <1>:                  Sending Mail.
-* modes, MH-Letter <2>:                  Sending Mail Tour.
-* modes, MH-Letter <3>:                  Draft Editing.
-* modes, MH-Letter <4>:                  Sending Mail Tour.
-* modes, MH-Letter:                      Replying.
-* modes, MH-Show <1>:                    Customizing Viewing.
-* modes, MH-Show:                        Customizing Moving Around.
-* moving between messages <1>:           Moving Around.
-* moving between messages:               Customizing Moving Around.
-* multimedia mail <1>:                   Reading MIME.
-* multimedia mail <2>:                   Customizing Editing MIME.
-* multimedia mail:                       Editing MIME.
+* modes, MH-Folder Show <1>:             Moving Around.
+* modes, MH-Folder Show:                 Reading Digests.
+* modes, MH-Letter <1>:                  Draft Editing.
+* modes, MH-Letter <2>:                  Replying.
+* modes, MH-Letter <3>:                  Sending Mail.
+* modes, MH-Letter:                      Sending Mail Tour.
+* modes, MH-Show <1>:                    Customizing Moving Around.
+* modes, MH-Show:                        Customizing Viewing.
+* moving between messages <1>:           Customizing Moving Around.
+* moving between messages:               Moving Around.
+* multimedia mail <1>:                   Customizing Editing MIME.
+* multimedia mail <2>:                   Editing MIME.
+* multimedia mail:                       Reading MIME.
 * new mail:                              Incorporating.
 * news:                                  Getting mh-e.
 * notification of new mail:              Incorporating.
 * obtaining mh-e:                        Getting mh-e.
 * online help <1>:                       Customizing mh-e.
 * online help:                           Using mh-e.
-* pick <1>:                              Searching.
-* pick:                                  Sequences.
+* pick <1>:                              Sequences.
+* pick:                                  Searching.
 * point <1>:                             Inserting Letter.
 * point:                                 Conventions.
 * prefix argument:                       Conventions.
-* printing <1>:                          Printing.
-* printing:                              Customizing Printing.
-* processing mail <1>:                   Processing Mail Tour.
+* printing <1>:                          Customizing Printing.
+* printing:                              Printing.
+* processing mail <1>:                   Customizing Moving Mail.
 * processing mail <2>:                   Moving Mail.
-* processing mail:                       Customizing Moving Mail.
+* processing mail:                       Processing Mail Tour.
 * quitting <1>:                          Customizing Finishing Up.
-* quitting <2>:                          Conventions.
-* quitting:                              Leaving mh-e.
+* quitting <2>:                          Leaving mh-e.
+* quitting:                              Conventions.
 * re-editing drafts <1>:                 Customizing Old Drafts.
 * re-editing drafts:                     Old Drafts.
 * reading mail <1>:                      Customizing Reading.
-* reading mail <2>:                      Reading Mail Tour.
-* reading mail:                          Reading Mail.
-* redistributing <1>:                    Redistributing.
-* redistributing:                        Customizing Redistributing.
+* reading mail <2>:                      Reading Mail.
+* reading mail:                          Reading Mail Tour.
+* redistributing <1>:                    Customizing Redistributing.
+* redistributing:                        Redistributing.
 * refile:                                Organizing.
-* region <1>:                            Conventions.
-* region:                                Inserting Letter.
+* region <1>:                            Inserting Letter.
+* region:                                Conventions.
 * regular expressions:                   Customizing Old Drafts.
-* Reid, Brian <1>:                       History.
-* Reid, Brian:                           From Brian Reid.
-* repl <1>:                              Replying.
-* repl:                                  Customizing Sending.
+* Reid, Brian <1>:                       From Brian Reid.
+* Reid, Brian:                           History.
+* repl <1>:                              Customizing Sending.
+* repl:                                  Replying.
 * replcomps:                             Customizing Sending.
 * replying <1>:                          Customizing Replying.
 * replying:                              Replying.
-* scan <1>:                              Reading Mail Tour.
-* scan:                                  Customizing Scan Line Formats.
-* searching <1>:                         Searching.
-* searching:                             Customizing Searching.
-* send <1>:                              Customizing Redistributing.
-* send:                                  Customizing Sending Message.
-* sending mail <1>:                      Sending Message.
+* scan <1>:                              Customizing Scan Line Formats.
+* scan:                                  Reading Mail Tour.
+* searching <1>:                         Customizing Searching.
+* searching:                             Searching.
+* send <1>:                              Customizing Sending Message.
+* send:                                  Customizing Redistributing.
+* sending mail <1>:                      Customizing Sending Message.
 * sending mail <2>:                      Customizing Sending.
-* sending mail <3>:                      Sending Mail.
-* sending mail <4>:                      Customizing Sending Message.
+* sending mail <3>:                      Sending Message.
+* sending mail <4>:                      Sending Mail.
 * sending mail:                          Sending Mail Tour.
 * sequences:                             Sequences.
 * setting variables:                     Customizing mh-e.
@@ -286,31 +281,31 @@
 * signature:                             Signature.
 * sortm:                                 Customizing Organizing.
 * sound:                                 Other MIME Objects.
-* SourceForge <1>:                       Mailing List.
-* SourceForge <2>:                       History.
+* SourceForge <1>:                       History.
+* SourceForge <2>:                       Mailing List.
 * SourceForge:                           Bug Reports.
 * spell check:                           Customizing Sending Message.
 * starting from command line:            Sending Mail.
 * tar:                                   Tar.
-* Unix commands, Emacs <1>:              Preface.
-* Unix commands, Emacs:                  Conventions.
+* Unix commands, Emacs <1>:              Conventions.
+* Unix commands, Emacs:                  Preface.
 * Unix commands, ftp <1>:                Tar.
 * Unix commands, ftp:                    FTP.
 * Unix commands, lpr <1>:                Customizing Printing.
 * Unix commands, lpr:                    Printing.
-* Unix commands, shar <1>:               Files and Pipes.
-* Unix commands, shar:                   Customizing Files and Pipes.
+* Unix commands, shar <1>:               Customizing Files and Pipes.
+* Unix commands, shar:                   Files and Pipes.
 * Unix commands, tar:                    Tar.
 * Unix commands, uuencode <1>:           Customizing Files and Pipes.
 * Unix commands, uuencode:               Files and Pipes.
-* using files <1>:                       Files and Pipes.
-* using files:                           Customizing Files and Pipes.
+* using files <1>:                       Customizing Files and Pipes.
+* using files:                           Files and Pipes.
 * using folders <1>:                     Customizing Organizing.
 * using folders:                         Organizing.
-* using pipes <1>:                       Files and Pipes.
-* using pipes:                           Customizing Files and Pipes.
-* uuencode <1>:                          Files and Pipes.
-* uuencode:                              Customizing Files and Pipes.
+* using pipes <1>:                       Customizing Files and Pipes.
+* using pipes:                           Files and Pipes.
+* uuencode <1>:                          Customizing Files and Pipes.
+* uuencode:                              Files and Pipes.
 * video:                                 Other MIME Objects.
 * whom:                                  Recipients.
 * Wohler, Bill:                          Bug Reports.
diff -ruN src-21.1/info/pcl-cvs src-21.2/info/pcl-cvs
--- src-21.1/info/pcl-cvs	Fri Oct  5 12:20:34 2001
+++ src-21.2/info/pcl-cvs	Fri Jan 11 09:35:35 2002
@@ -1141,22 +1141,22 @@
 * cvs-allow-dir-commit:                  Selected files.
 * cvs-auto-remove-directories (variable): Customization.
 * cvs-auto-remove-handled (variable):    Customization.
-* cvs-auto-revert (variable) <1>:        Committing changes.
-* cvs-auto-revert (variable):            Customization.
+* cvs-auto-revert (variable) <1>:        Customization.
+* cvs-auto-revert (variable):            Committing changes.
 * cvs-checkout:                          Entering PCL-CVS.
 * cvs-cvsroot (variable):                Customization.
 * cvs-dired-action:                      Entering PCL-CVS.
 * cvs-dired-use-hook:                    Entering PCL-CVS.
-* cvs-examine <1>:                       Entering PCL-CVS.
-* cvs-examine:                           Updating the buffer.
+* cvs-examine <1>:                       Updating the buffer.
+* cvs-examine:                           Entering PCL-CVS.
 * cvs-filename-face (face):              Customizing Faces.
 * cvs-force-dir-tag (variable):          Tagging files.
 * cvs-handled-face (face):               Customizing Faces.
 * cvs-header-face (face):                Customizing Faces.
 * cvs-help:                              Miscellaneous commands.
 * cvs-idiff-imerge-handlers (variable):  Invoking Ediff.
-* cvs-invert-ignore-marks (variable) <1>: Viewing differences.
-* cvs-invert-ignore-marks (variable):    Tagging files.
+* cvs-invert-ignore-marks (variable) <1>: Tagging files.
+* cvs-invert-ignore-marks (variable):    Viewing differences.
 * cvs-marked-face (face):                Customizing Faces.
 * cvs-mode-acknowledge:                  Removing handled entries.
 * cvs-mode-add:                          Adding and removing files.
@@ -1175,8 +1175,8 @@
 * cvs-mode-find-file-other-window:       Editing files.
 * cvs-mode-force-command:                Selected files.
 * cvs-mode-idiff:                        Invoking Ediff.
-* cvs-mode-ignore <1>:                   Removing handled entries.
-* cvs-mode-ignore:                       Ignoring files.
+* cvs-mode-ignore <1>:                   Ignoring files.
+* cvs-mode-ignore:                       Removing handled entries.
 * cvs-mode-ignore, and .cvsignore sorting: Customization.
 * cvs-mode-imerge:                       Invoking Ediff.
 * cvs-mode-log <1>:                      Log View Mode.
@@ -1190,8 +1190,8 @@
 * cvs-mode-remove-file:                  Adding and removing files.
 * cvs-mode-remove-handled:               Removing handled entries.
 * cvs-mode-remove-handled (variable):    Removing handled entries.
-* cvs-mode-status <1>:                   Updating the buffer.
-* cvs-mode-status:                       Getting info about files.
+* cvs-mode-status <1>:                   Getting info about files.
+* cvs-mode-status:                       Updating the buffer.
 * cvs-mode-tag:                          Tagging files.
 * cvs-mode-toggle-marks:                 Marking files.
 * cvs-mode-undo-local-changes:           Undoing changes.
@@ -1205,8 +1205,8 @@
 * cvs-quickdir:                          Entering PCL-CVS.
 * cvs-rtag:                              Tagging files.
 * cvs-sort-ignore-file (variable):       Customization.
-* cvs-status <1>:                        Entering PCL-CVS.
-* cvs-status:                            Updating the buffer.
+* cvs-status <1>:                        Updating the buffer.
+* cvs-status:                            Entering PCL-CVS.
 * cvs-status-mode:                       Updating the buffer.
 * cvs-unknown-face (face):               Customizing Faces.
 * cvs-update <1>:                        Updating the buffer.
@@ -1249,8 +1249,8 @@
 * Commit buffer:                         Committing changes.
 * Commit message, inserting newline:     Customization.
 * Committing changes:                    Committing changes.
-* Conflicts, how to resolve them <1>:    Viewing differences.
-* Conflicts, how to resolve them:        Invoking Ediff.
+* Conflicts, how to resolve them <1>:    Invoking Ediff.
+* Conflicts, how to resolve them:        Viewing differences.
 * Context diff, how to get:              Customization.
 * Contributors:                          Contributors.
 * Creating the *cvs* buffer:             Entering PCL-CVS.
diff -ruN src-21.1/info/reftex-5 src-21.2/info/reftex-5
--- src-21.1/info/reftex-5	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/reftex-5	Fri Jan 11 09:35:33 2002
@@ -40,10 +40,10 @@
 * Menu:
 
 * *toc* buffer:                          Table of Contents.
-* ? <1>:                                 Creating Citations.
-* ? <2>:                                 Table of Contents.
+* ? <1>:                                 Displaying and Editing the Index.
+* ? <2>:                                 Creating Citations.
 * ? <3>:                                 Referencing Labels.
-* ?:                                     Displaying and Editing the Index.
+* ?:                                     Table of Contents.
 * \bibitem:                              Viewing Cross-References.
 * \bibliography:                         Creating Citations.
 * \cite <1>:                             Viewing Cross-References.
@@ -52,24 +52,24 @@
 * \eqref, AMS-LaTeX macro:               Using \eqref.
 * \externaldocument:                     xr (LaTeX package).
 * \footnote, LaTeX macro:                Builtin Label Environments.
-* \Fref <1>:                             Referencing Labels.
 * \Fref:                                 fancyref (LaTeX package).
-* \fref <1>:                             fancyref (LaTeX package).
+* \fref:                                 fancyref (LaTeX package).
+* \Fref:                                 Referencing Labels.
 * \fref:                                 Referencing Labels.
 * \index <1>:                            Viewing Cross-References.
 * \index:                                Index Support.
-* \label <1>:                            Labels and References.
-* \label:                                Viewing Cross-References.
+* \label <1>:                            Viewing Cross-References.
+* \label:                                Labels and References.
 * \newtheorem:                           Theorem and Axiom.
 * \ref <1>:                              Viewing Cross-References.
 * \ref:                                  Referencing Labels.
-* \vref <1>:                             Referencing Labels.
-* \vref:                                 varioref (LaTeX package).
+* \vref <1>:                             varioref (LaTeX package).
+* \vref:                                 Referencing Labels.
 * Acknowledgments:                       Imprint.
 * align, AMS-LaTeX environment:          Builtin Label Environments.
 * alignat, AMS-LaTeX environment:        Builtin Label Environments.
-* AMS-LaTeX <1>:                         Builtin Label Environments.
-* AMS-LaTeX:                             Using \eqref.
+* AMS-LaTeX <1>:                         Using \eqref.
+* AMS-LaTeX:                             Builtin Label Environments.
 * amsmath, LaTeX package:                Builtin Label Environments.
 * AUCTeX, Emacs package:                 AUCTeX.
 * Automatic document scans:              Optimizations.
@@ -87,24 +87,24 @@
 * Builtin index macros:                  Builtin Index Macros.
 * Builtin label environments:            Builtin Label Environments.
 * C-c & <1>:                             Key Bindings.
-* C-c & <2>:                             Citation Info.
-* C-c & <3>:                             Reference Info.
-* C-c &:                                 Viewing Cross-References.
-* C-c ( <1>:                             Creating Labels.
-* C-c (:                                 Key Bindings.
+* C-c & <2>:                             Viewing Cross-References.
+* C-c & <3>:                             Citation Info.
+* C-c &:                                 Reference Info.
+* C-c ( <1>:                             Key Bindings.
+* C-c (:                                 Creating Labels.
 * C-c ) <1>:                             Key Bindings.
 * C-c ):                                 Referencing Labels.
-* C-c / <1>:                             Creating Index Entries.
-* C-c /:                                 Key Bindings.
+* C-c / <1>:                             Key Bindings.
+* C-c /:                                 Creating Index Entries.
 * C-c < <1>:                             Key Bindings.
 * C-c <:                                 Creating Index Entries.
 * C-c <RET>:                             AUCTeX-RefTeX Interface.
 * C-c = <1>:                             Key Bindings.
 * C-c =:                                 Table of Contents.
-* C-c > <1>:                             Displaying and Editing the Index.
-* C-c >:                                 Key Bindings.
-* C-c [ <1>:                             Creating Citations.
-* C-c [:                                 Key Bindings.
+* C-c > <1>:                             Key Bindings.
+* C-c >:                                 Displaying and Editing the Index.
+* C-c [ <1>:                             Key Bindings.
+* C-c [:                                 Creating Citations.
 * C-c \:                                 Key Bindings.
 * C-c c:                                 Key Bindings.
 * C-c C-e:                               AUCTeX-RefTeX Interface.
@@ -165,14 +165,14 @@
 * External documents:                    xr (LaTeX package).
 * Faces:                                 Faces.
 * fancybox, LaTeX package:               Builtin Label Environments.
-* fancyref, LaTeX package <1>:           Referencing Labels.
-* fancyref, LaTeX package:               fancyref (LaTeX package).
+* fancyref, LaTeX package <1>:           fancyref (LaTeX package).
+* fancyref, LaTeX package:               Referencing Labels.
 * Figure wrapping macro:                 Figure Wrapper.
 * figure*, LaTeX environment:            Builtin Label Environments.
 * figure, LaTeX environment:             Builtin Label Environments.
 * figwindow, LaTeX environment:          Builtin Label Environments.
-* Finding files <1>:                     Installation.
-* Finding files:                         Finding Files.
+* Finding files <1>:                     Finding Files.
+* Finding files:                         Installation.
 * Finding files, options:                Options (Finding Files).
 * flalign, AMS-LaTeX environment:        Builtin Label Environments.
 * floatfig, LaTeX package:               Builtin Label Environments.
@@ -187,8 +187,8 @@
 * http, RefTeX home page:                Imprint.
 * Idle timer restart:                    Problems and Work-Arounds.
 * Imprint:                               Imprint.
-* Index entries, creating <1>:           Creating Index Entries.
-* Index entries, creating:               Displaying and Editing the Index.
+* Index entries, creating <1>:           Displaying and Editing the Index.
+* Index entries, creating:               Creating Index Entries.
 * Index macros, builtin:                 Builtin Index Macros.
 * Index macros, defining:                Defining Index Macros.
 * Index phrase file:                     The Index Phrases File.
@@ -209,9 +209,9 @@
 * Key Bindings, summary:                 Key Bindings.
 * Keymaps:                               Keymaps and Hooks.
 * KOMA-Script, LaTeX classes:            Table of Contents.
-* Label category <1>:                    Labels and References.
-* Label category <2>:                    Using \eqref.
-* Label category:                        Adding Magic Words.
+* Label category <1>:                    Using \eqref.
+* Label category <2>:                    Adding Magic Words.
+* Label category:                        Labels and References.
 * Label environment:                     Labels and References.
 * Label environments, builtin:           Builtin Label Environments.
 * Label environments, defining:          Defining Label Environments.
@@ -229,8 +229,8 @@
 * LaTeX packages, amsmath:               Builtin Label Environments.
 * LaTeX packages, endnote:               Builtin Label Environments.
 * LaTeX packages, fancybox:              Builtin Label Environments.
-* LaTeX packages, fancyref <1>:          Referencing Labels.
-* LaTeX packages, fancyref:              fancyref (LaTeX package).
+* LaTeX packages, fancyref <1>:          fancyref (LaTeX package).
+* LaTeX packages, fancyref:              Referencing Labels.
 * LaTeX packages, floatfig:              Builtin Label Environments.
 * LaTeX packages, index:                 Builtin Index Macros.
 * LaTeX packages, linguex:               Non-Standard Environments.
@@ -243,21 +243,21 @@
 * LaTeX packages, sidecap:               Builtin Label Environments.
 * LaTeX packages, subfigure:             Builtin Label Environments.
 * LaTeX packages, supertab:              Builtin Label Environments.
-* LaTeX packages, varioref <1>:          Referencing Labels.
-* LaTeX packages, varioref:              varioref (LaTeX package).
+* LaTeX packages, varioref <1>:          varioref (LaTeX package).
+* LaTeX packages, varioref:              Referencing Labels.
 * LaTeX packages, wrapfig:               Builtin Label Environments.
 * LaTeX packages, xr:                    xr (LaTeX package).
 * LaTeX-add-environments, AUCTeX:        Style Files.
 * LaTeX-label-function, AUCTeX:          AUCTeX-RefTeX Interface.
-* LaTeX-mode-hook:                       Installation.
 * latex-mode-hook:                       Installation.
+* LaTeX-mode-hook:                       Installation.
 * LaTeX-section, AUCTeX:                 AUCTeX-RefTeX Interface.
 * linguex, LaTeX package:                Non-Standard Environments.
 * longtable, LaTeX environment:          Builtin Label Environments.
 * longtable, LaTeX package:              Builtin Label Environments.
 * Macro definition lines, in phrase buffer: The Index Phrases File.
-* Macros as environment wrappers <1>:    Quick Equation.
-* Macros as environment wrappers:        Figure Wrapper.
+* Macros as environment wrappers <1>:    Figure Wrapper.
+* Macros as environment wrappers:        Quick Equation.
 * Magic words:                           Adding Magic Words.
 * Maintainer:                            Imprint.
 * Menu, in the menu bar:                 RefTeXs Menu.
@@ -299,17 +299,17 @@
 * Referencing labels:                    Referencing Labels.
 * Referencing labels, options:           Options (Referencing Labels).
 * RefTeX in a Nutshell:                  RefTeX in a Nutshell.
-* reftex-abbrev-parameters <1>:          Language Support.
-* reftex-abbrev-parameters <2>:          Options (Creating Labels).
+* reftex-abbrev-parameters <1>:          Options (Creating Labels).
+* reftex-abbrev-parameters <2>:          Language Support.
 * reftex-abbrev-parameters:              Creating Labels.
 * reftex-add-index-macros:               Style Files.
-* reftex-add-label-environments <1>:     Style Files.
-* reftex-add-label-environments:         Problems and Work-Arounds.
-* reftex-add-section-levels <1>:         Style Files.
-* reftex-add-section-levels:             Problems and Work-Arounds.
+* reftex-add-label-environments <1>:     Problems and Work-Arounds.
+* reftex-add-label-environments:         Style Files.
+* reftex-add-section-levels <1>:         Problems and Work-Arounds.
+* reftex-add-section-levels:             Style Files.
 * reftex-add-to-label-alist:             Style Files.
-* reftex-allow-automatic-rescan <1>:     Optimizations.
-* reftex-allow-automatic-rescan:         Options (Optimizations).
+* reftex-allow-automatic-rescan <1>:     Options (Optimizations).
+* reftex-allow-automatic-rescan:         Optimizations.
 * reftex-allow-detached-macro-args:      Options (Misc).
 * reftex-arg-cite:                       AUCTeX-RefTeX Interface.
 * reftex-arg-index:                      AUCTeX-RefTeX Interface.
@@ -326,11 +326,11 @@
 * reftex-bibpath-environment-variables:  Options (Finding Files).
 * reftex-cache-cite-echo:                Options (Viewing Cross-References).
 * reftex-change-label:                   Commands.
-* reftex-citation <1>:                   Creating Citations.
-* reftex-citation:                       Commands.
+* reftex-citation <1>:                   Commands.
+* reftex-citation:                       Creating Citations.
 * reftex-cite-comment-format:            Options (Creating Citations).
-* reftex-cite-format <1>:                Citation Styles.
-* reftex-cite-format:                    Options (Creating Citations).
+* reftex-cite-format <1>:                Options (Creating Citations).
+* reftex-cite-format:                    Citation Styles.
 * reftex-cite-punctuation <1>:           Options (Creating Citations).
 * reftex-cite-punctuation:               Language Support.
 * reftex-cite-view-format:               Options (Viewing Cross-References).
@@ -338,8 +338,8 @@
 * reftex-create-tags-file:               Commands.
 * reftex-cursor-selected-face:           Options (Fontification).
 * reftex-customize:                      Commands.
-* reftex-default-bibliography <1>:       Citations Outside LaTeX.
-* reftex-default-bibliography:           Options (Creating Citations).
+* reftex-default-bibliography <1>:       Options (Creating Citations).
+* reftex-default-bibliography:           Citations Outside LaTeX.
 * reftex-default-context-regexps:        Options (Defining Label Environments).
 * reftex-default-label-alist-entries:    Options (Defining Label Environments).
 * reftex-derive-label-parameters <1>:    Options (Creating Labels).
@@ -348,28 +348,28 @@
 * reftex-display-copied-context-hook:    Options (Referencing Labels).
 * reftex-display-index <1>:              Commands.
 * reftex-display-index:                  Displaying and Editing the Index.
-* reftex-enable-partial-scans <1>:       Problems and Work-Arounds.
-* reftex-enable-partial-scans <2>:       Optimizations.
-* reftex-enable-partial-scans <3>:       Table of Contents.
+* reftex-enable-partial-scans <1>:       Options (Optimizations).
+* reftex-enable-partial-scans <2>:       Problems and Work-Arounds.
+* reftex-enable-partial-scans <3>:       Optimizations.
 * reftex-enable-partial-scans <4>:       Displaying and Editing the Index.
-* reftex-enable-partial-scans <5>:       Options (Optimizations).
-* reftex-enable-partial-scans:           Referencing Labels.
+* reftex-enable-partial-scans <5>:       Referencing Labels.
+* reftex-enable-partial-scans:           Table of Contents.
 * reftex-external-file-finders:          Options (Finding Files).
-* reftex-extra-bindings <1>:             Key Bindings.
-* reftex-extra-bindings:                 Options (Misc).
+* reftex-extra-bindings <1>:             Options (Misc).
+* reftex-extra-bindings:                 Key Bindings.
 * reftex-file-boundary-face:             Options (Fontification).
 * reftex-file-extensions:                Options (Finding Files).
 * reftex-find-duplicate-labels:          Commands.
 * reftex-format-cite-function:           Options (Creating Citations).
 * reftex-format-label-function:          Options (Creating Labels).
 * reftex-format-ref-function:            Options (Referencing Labels).
-* reftex-fref-is-default <1>:            fancyref (LaTeX package).
-* reftex-fref-is-default:                Options (Referencing Labels).
+* reftex-fref-is-default <1>:            Options (Referencing Labels).
+* reftex-fref-is-default:                fancyref (LaTeX package).
 * reftex-grep-document:                  Commands.
 * reftex-guess-label-type:               Options (Referencing Labels).
-* reftex-highlight-selection <1>:        Referencing Labels.
+* reftex-highlight-selection <1>:        Options (Fontification).
 * reftex-highlight-selection <2>:        Creating Citations.
-* reftex-highlight-selection <3>:        Options (Fontification).
+* reftex-highlight-selection <3>:        Referencing Labels.
 * reftex-highlight-selection:            Table of Contents.
 * reftex-idle-time:                      Options (Viewing Cross-References).
 * reftex-index <1>:                      Commands.
@@ -377,14 +377,14 @@
 * reftex-index-default-macro:            Options (Index Support).
 * reftex-index-default-tag:              Options (Index Support).
 * reftex-index-face:                     Options (Fontification).
-* reftex-index-follow-mode <1>:          Displaying and Editing the Index.
-* reftex-index-follow-mode:              Options (Index Support).
+* reftex-index-follow-mode <1>:          Options (Index Support).
+* reftex-index-follow-mode:              Displaying and Editing the Index.
 * reftex-index-header-face:              Options (Fontification).
 * reftex-index-include-context <1>:      Options (Index Support).
 * reftex-index-include-context:          Displaying and Editing the Index.
-* reftex-index-macros <1>:               Builtin Index Macros.
+* reftex-index-macros <1>:               Options (Index Support).
 * reftex-index-macros <2>:               Defining Index Macros.
-* reftex-index-macros:                   Options (Index Support).
+* reftex-index-macros:                   Builtin Index Macros.
 * reftex-index-map:                      Options (Index Support).
 * reftex-index-math-format:              Options (Index Support).
 * reftex-index-phrase-file-extension:    Options (Index Support).
@@ -402,8 +402,8 @@
 * reftex-index-phrases-wrap-long-lines:  Options (Index Support).
 * reftex-index-section-face:             Options (Fontification).
 * reftex-index-section-letters:          Options (Index Support).
-* reftex-index-selection-or-word <1>:    Creating Index Entries.
-* reftex-index-selection-or-word:        Commands.
+* reftex-index-selection-or-word <1>:    Commands.
+* reftex-index-selection-or-word:        Creating Index Entries.
 * reftex-index-special-chars:            Options (Index Support).
 * reftex-index-tag-face:                 Options (Fontification).
 * reftex-index-visit-phrases-buffer <1>: Commands.
@@ -411,28 +411,28 @@
 * reftex-info:                           Commands.
 * reftex-initialize-temporary-buffers <1>: Options (Optimizations).
 * reftex-initialize-temporary-buffers:   Problems and Work-Arounds.
-* reftex-insert-label-flags <1>:         Theorem and Axiom.
-* reftex-insert-label-flags <2>:         Options (Creating Labels).
+* reftex-insert-label-flags <1>:         Options (Creating Labels).
+* reftex-insert-label-flags <2>:         Theorem and Axiom.
 * reftex-insert-label-flags:             Creating Labels.
 * reftex-keep-temporary-buffers <1>:     Options (Optimizations).
-* reftex-keep-temporary-buffers <2>:     Optimizations.
-* reftex-keep-temporary-buffers:         Problems and Work-Arounds.
-* reftex-label <1>:                      AUCTeX-RefTeX Interface.
-* reftex-label <2>:                      Creating Labels.
-* reftex-label:                          Commands.
-* reftex-label-alist <1>:                Builtin Label Environments.
-* reftex-label-alist <2>:                Defining Label Environments.
-* reftex-label-alist <3>:                Options (Defining Label Environments).
-* reftex-label-alist:                    Viewing Cross-References.
+* reftex-keep-temporary-buffers <2>:     Problems and Work-Arounds.
+* reftex-keep-temporary-buffers:         Optimizations.
+* reftex-label <1>:                      Commands.
+* reftex-label <2>:                      AUCTeX-RefTeX Interface.
+* reftex-label:                          Creating Labels.
+* reftex-label-alist <1>:                Options (Defining Label Environments).
+* reftex-label-alist <2>:                Viewing Cross-References.
+* reftex-label-alist <3>:                Defining Label Environments.
+* reftex-label-alist:                    Builtin Label Environments.
 * reftex-label-alist-builtin <1>:        Defining Label Environments.
 * reftex-label-alist-builtin:            Builtin Label Environments.
 * reftex-label-face:                     Options (Fontification).
 * reftex-label-illegal-re <1>:           Options (Creating Labels).
-* reftex-label-illegal-re <2>:           Creating Labels.
-* reftex-label-illegal-re:               Language Support.
-* reftex-label-menu-flags <1>:           Referencing Labels.
+* reftex-label-illegal-re <2>:           Language Support.
+* reftex-label-illegal-re:               Creating Labels.
+* reftex-label-menu-flags <1>:           Options (Referencing Labels).
 * reftex-label-menu-flags <2>:           Theorem and Axiom.
-* reftex-label-menu-flags:               Options (Referencing Labels).
+* reftex-label-menu-flags:               Referencing Labels.
 * reftex-level-indent:                   Options (Referencing Labels).
 * reftex-load-hook <1>:                  Keymaps and Hooks.
 * reftex-load-hook:                      Key Bindings.
@@ -444,9 +444,9 @@
 * reftex-mouse-view-crossref <1>:        Viewing Cross-References.
 * reftex-mouse-view-crossref <2>:        Citation Info.
 * reftex-mouse-view-crossref:            Reference Info.
-* reftex-multiref-punctuation <1>:       Referencing Labels.
+* reftex-multiref-punctuation <1>:       Options (Referencing Labels).
 * reftex-multiref-punctuation <2>:       Language Support.
-* reftex-multiref-punctuation:           Options (Referencing Labels).
+* reftex-multiref-punctuation:           Referencing Labels.
 * reftex-no-include-regexps:             Options (Optimizations).
 * reftex-parse-document:                 Commands.
 * reftex-parse-file-extension <1>:       Options (Optimizations).
@@ -454,27 +454,27 @@
 * reftex-plug-into-AUCTeX:               Options (Misc).
 * reftex-pre-refontification-functions:  Options (Referencing Labels).
 * reftex-query-replace-document:         Commands.
-* reftex-reference <1>:                  Referencing Labels.
-* reftex-reference:                      Commands.
+* reftex-reference <1>:                  Commands.
+* reftex-reference:                      Referencing Labels.
 * reftex-refontify-context <1>:          Options (Fontification).
 * reftex-refontify-context:              Problems and Work-Arounds.
 * reftex-renumber-simple-labels:         Commands.
 * reftex-reset-mode:                     Commands.
 * reftex-revisit-to-echo:                Options (Viewing Cross-References).
-* reftex-revisit-to-follow <1>:          Displaying and Editing the Index.
-* reftex-revisit-to-follow <2>:          Table of Contents.
-* reftex-revisit-to-follow <3>:          Options (Misc).
-* reftex-revisit-to-follow:              Referencing Labels.
-* reftex-save-parse-info <1>:            Optimizations.
-* reftex-save-parse-info:                Options (Optimizations).
+* reftex-revisit-to-follow <1>:          Options (Misc).
+* reftex-revisit-to-follow <2>:          Displaying and Editing the Index.
+* reftex-revisit-to-follow <3>:          Referencing Labels.
+* reftex-revisit-to-follow:              Table of Contents.
+* reftex-save-parse-info <1>:            Options (Optimizations).
+* reftex-save-parse-info:                Optimizations.
 * reftex-search-document:                Commands.
 * reftex-search-unrecursed-path-first:   Options (Finding Files).
 * reftex-section-heading-face:           Options (Fontification).
 * reftex-section-levels <1>:             Options (Defining Label Environments).
 * reftex-section-levels:                 Table of Contents.
 * reftex-section-prefixes:               Options (Defining Label Environments).
-* reftex-select-bib-map <1>:             Creating Citations.
-* reftex-select-bib-map:                 Options (Creating Citations).
+* reftex-select-bib-map <1>:             Options (Creating Citations).
+* reftex-select-bib-map:                 Creating Citations.
 * reftex-select-bib-mode-hook:           Options (Creating Citations).
 * reftex-select-label-map <1>:           Options (Referencing Labels).
 * reftex-select-label-map:               Referencing Labels.
@@ -487,39 +487,39 @@
 * reftex-string-to-label-function:       Options (Creating Labels).
 * reftex-support-index:                  Options (Index Support).
 * reftex-texpath-environment-variables:  Options (Finding Files).
-* reftex-toc <1>:                        Table of Contents.
-* reftex-toc:                            Commands.
-* reftex-toc-follow-mode <1>:            Table of Contents.
-* reftex-toc-follow-mode:                Options (Table of Contents).
+* reftex-toc <1>:                        Commands.
+* reftex-toc:                            Table of Contents.
+* reftex-toc-follow-mode <1>:            Options (Table of Contents).
+* reftex-toc-follow-mode:                Table of Contents.
 * reftex-toc-header-face:                Options (Fontification).
 * reftex-toc-include-context <1>:        Options (Table of Contents).
 * reftex-toc-include-context:            Table of Contents.
-* reftex-toc-include-file-boundaries <1>: Table of Contents.
-* reftex-toc-include-file-boundaries:    Options (Table of Contents).
+* reftex-toc-include-file-boundaries <1>: Options (Table of Contents).
+* reftex-toc-include-file-boundaries:    Table of Contents.
 * reftex-toc-include-index-entries <1>:  Options (Table of Contents).
 * reftex-toc-include-index-entries:      Table of Contents.
 * reftex-toc-include-labels <1>:         Options (Table of Contents).
 * reftex-toc-include-labels:             Table of Contents.
 * reftex-toc-keep-other-windows:         Options (Table of Contents).
-* reftex-toc-map <1>:                    Table of Contents.
-* reftex-toc-map:                        Options (Table of Contents).
-* reftex-toc-max-level <1>:              Table of Contents.
-* reftex-toc-max-level:                  Options (Table of Contents).
+* reftex-toc-map <1>:                    Options (Table of Contents).
+* reftex-toc-map:                        Table of Contents.
+* reftex-toc-max-level <1>:              Options (Table of Contents).
+* reftex-toc-max-level:                  Table of Contents.
 * reftex-toc-mode-hook:                  Options (Table of Contents).
-* reftex-translate-to-ascii-function <1>: Language Support.
-* reftex-translate-to-ascii-function <2>: Options (Creating Labels).
+* reftex-translate-to-ascii-function <1>: Options (Creating Labels).
+* reftex-translate-to-ascii-function <2>: Language Support.
 * reftex-translate-to-ascii-function:    Creating Labels.
 * reftex-use-external-file-finders:      Options (Finding Files).
 * reftex-use-fonts:                      Options (Fontification).
 * reftex-use-itimer-in-xemacs:           Problems and Work-Arounds.
 * reftex-use-multiple-selection-buffers <1>: Options (Optimizations).
 * reftex-use-multiple-selection-buffers: Optimizations.
-* reftex-view-crossref <1>:              Citation Info.
-* reftex-view-crossref <2>:              Commands.
-* reftex-view-crossref <3>:              Reference Info.
-* reftex-view-crossref:                  Viewing Cross-References.
-* reftex-view-crossref-extra <1>:        Viewing Cross-References.
-* reftex-view-crossref-extra:            Options (Viewing Cross-References).
+* reftex-view-crossref <1>:              Commands.
+* reftex-view-crossref <2>:              Viewing Cross-References.
+* reftex-view-crossref <3>:              Citation Info.
+* reftex-view-crossref:                  Reference Info.
+* reftex-view-crossref-extra <1>:        Options (Viewing Cross-References).
+* reftex-view-crossref-extra:            Viewing Cross-References.
 * reftex-view-crossref-from-bibtex:      Commands.
 * reftex-vref-is-default <1>:            Options (Referencing Labels).
 * reftex-vref-is-default:                varioref (LaTeX package).
@@ -527,8 +527,8 @@
 * Removing lookup buffers:               Optimizations.
 * rotating, LaTeX package:               Builtin Label Environments.
 * S-mouse-2 <1>:                         Key Bindings.
-* S-mouse-2 <2>:                         Citation Info.
-* S-mouse-2 <3>:                         Viewing Cross-References.
+* S-mouse-2 <2>:                         Viewing Cross-References.
+* S-mouse-2 <3>:                         Citation Info.
 * S-mouse-2:                             Reference Info.
 * saferef, LaTeX package:                Referencing Labels.
 * Saving parser information:             Optimizations.
@@ -540,8 +540,8 @@
 * Selection buffer, labels:              Referencing Labels.
 * Selection buffers, multiple:           Optimizations.
 * Selection buffers, updating:           Optimizations.
-* Selection process <1>:                 Referencing Labels.
-* Selection process:                     Creating Citations.
+* Selection process <1>:                 Creating Citations.
+* Selection process:                     Referencing Labels.
 * Settings, local:                       Problems and Work-Arounds.
 * sidecap, LaTeX package:                Builtin Label Environments.
 * sidewaysfigure, LaTeX environment:     Builtin Label Environments.
diff -ruN src-21.1/info/sc-2 src-21.2/info/sc-2
--- src-21.1/info/sc-2	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/sc-2	Fri Jan 11 09:35:33 2002
@@ -877,12 +877,12 @@
 
 * Menu:
 
-* .emacs file <1>:                       MH-E with any Emacsen.
-* .emacs file <2>:                       Getting Connected.
-* .emacs file <3>:                       Emacs 19 MUAs.
+* .emacs file <1>:                       Overloading for Non-conforming MUAs.
+* .emacs file <2>:                       VM with any Emacsen.
+* .emacs file <3>:                       MH-E with any Emacsen.
 * .emacs file <4>:                       Emacs 18 MUAs.
-* .emacs file <5>:                       Overloading for Non-conforming MUAs.
-* .emacs file:                           VM with any Emacsen.
+* .emacs file <5>:                       Emacs 19 MUAs.
+* .emacs file:                           Getting Connected.
 * add-hook substitute:                   Emacs 18 MUAs.
 * attribute, attributing:                Usage Overview.
 * attribution info field (sc-):          Information Keys and the Info Alist.
@@ -908,8 +908,8 @@
 * firstname info field (sc-):            Information Keys and the Info Alist.
 * frames (Regi):                         Configuring the Citation Engine.
 * from-address info field (sc-):         Information Keys and the Info Alist.
-* gin-mode <1>:                          What Supercite Does.
-* gin-mode:                              Filling Cited Text.
+* gin-mode <1>:                          Filling Cited Text.
+* gin-mode:                              What Supercite Does.
 * header rewrite functions:              Reference Headers.
 * header rewrite functions, built-in:    The Built-in Header Rewrite Functions.
 * Hyperbole:                             Overloading for Non-conforming MUAs.
@@ -924,8 +924,8 @@
 * mailing list address:                  The Supercite Mailing List.
 * mark:                                  Getting Connected.
 * middlename-1 info field (sc-):         Information Keys and the Info Alist.
-* modeline <1>:                          What Supercite Does.
-* modeline:                              Reply Buffer Initialization.
+* modeline <1>:                          Reply Buffer Initialization.
+* modeline:                              What Supercite Does.
 * MUA:                                   Introduction.
 * nested citations:                      Citations.
 * non-nested citations:                  Citations.
@@ -954,8 +954,8 @@
 * sc-oloads.el:                          Overloading for Non-conforming MUAs.
 * sc-reply-address info field:           Information Keys and the Info Alist.
 * sc-sender-address info field:          Information Keys and the Info Alist.
-* sc-unsupp.el file <1>:                 Emacs 18 MUAs.
-* sc-unsupp.el file:                     Version 3 Changes.
+* sc-unsupp.el file <1>:                 Version 3 Changes.
+* sc-unsupp.el file:                     Emacs 18 MUAs.
 * sc.el from version 2:                  Version 3 Changes.
 * sender-address info field (sc-):       Information Keys and the Info Alist.
 * sendmail.el:                           Hints to MUA Authors.
@@ -1016,8 +1016,8 @@
 * perform-overloads (sc-):               GNEWS with any Emacsen.
 * recite-region (sc-):                   Citing Commands.
 * regi-interpret:                        Using Regi.
-* sc-cite-original <1>:                  Getting Connected.
-* sc-cite-original <2>:                  Reply Buffer Initialization.
+* sc-cite-original <1>:                  Reply Buffer Initialization.
+* sc-cite-original <2>:                  Getting Connected.
 * sc-cite-original:                      What Supercite Does.
 * sc-cite-region:                        Citing Commands.
 * sc-describe:                           Miscellaneous Commands.
@@ -1043,20 +1043,20 @@
 * sc-no-blank-line-or-header:            The Built-in Header Rewrite Functions.
 * sc-no-header:                          The Built-in Header Rewrite Functions.
 * sc-open-line:                          Miscellaneous Commands.
-* sc-perform-overloads <1>:              GNEWS with any Emacsen.
-* sc-perform-overloads:                  Overloading for Non-conforming MUAs.
+* sc-perform-overloads <1>:              Overloading for Non-conforming MUAs.
+* sc-perform-overloads:                  GNEWS with any Emacsen.
 * sc-recite-region:                      Citing Commands.
 * sc-setup-filladapt:                    Filling Cited Text.
-* sc-submit-bug-report <1>:              Getting Connected.
-* sc-submit-bug-report:                  Miscellaneous Commands.
+* sc-submit-bug-report <1>:              Miscellaneous Commands.
+* sc-submit-bug-report:                  Getting Connected.
 * sc-uncite-region:                      Citing Commands.
 * sc-version:                            Miscellaneous Commands.
 * set-variable:                          Variable Toggling Shortcuts.
 * setq:                                  Emacs 18 MUAs.
 * setup-filladapt (sc-):                 Filling Cited Text.
 * string-match:                          Frames You Can Customize.
-* submit-bug-report (sc-) <1>:           Getting Connected.
-* submit-bug-report (sc-):               Miscellaneous Commands.
+* submit-bug-report (sc-) <1>:           Miscellaneous Commands.
+* submit-bug-report (sc-):               Getting Connected.
 * uncite-region (sc-):                   Citing Commands.
 * version (sc-):                         Miscellaneous Commands.
 
diff -ruN src-21.1/info/sc-3 src-21.2/info/sc-3
--- src-21.1/info/sc-3	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/sc-3	Fri Jan 11 09:35:33 2002
@@ -37,8 +37,8 @@
 
 * Menu:
 
-* C-c C-p <1>:                           Reply Buffer Initialization.
-* C-c C-p:                               Post-yank Formatting Commands.
+* C-c C-p <1>:                           Post-yank Formatting Commands.
+* C-c C-p:                               Reply Buffer Initialization.
 * C-c C-p ?:                             Miscellaneous Commands.
 * C-c C-p c:                             Citing Commands.
 * C-c C-p C-b:                           Miscellaneous Commands.
@@ -97,8 +97,8 @@
 * cite-region-limit:                     Version 3 Changes.
 * cite-region-limit (sc-)b:              Reply Buffer Initialization.
 * confirm-always-p:                      Citing Commands.
-* confirm-always-p (sc-) <1>:            Anonymous Attributions.
-* confirm-always-p (sc-) <2>:            Citing Commands.
+* confirm-always-p (sc-) <1>:            Citing Commands.
+* confirm-always-p (sc-) <2>:            Anonymous Attributions.
 * confirm-always-p (sc-):                Reply Buffer Initialization.
 * default-attribution (sc-):             Anonymous Attributions.
 * default-author-name (sc-):             Anonymous Attributions.
@@ -113,9 +113,9 @@
 * hyperb:version:                        Overloading for Non-conforming MUAs.
 * load-hook (sc-) <1>:                   Filling Cited Text.
 * load-hook (sc-):                       Getting Connected.
-* mail-citation-hook <1>:                VM with any Emacsen.
-* mail-citation-hook <2>:                Hints to MUA Authors.
-* mail-citation-hook <3>:                Overloading for Non-conforming MUAs.
+* mail-citation-hook <1>:                Hints to MUA Authors.
+* mail-citation-hook <2>:                Overloading for Non-conforming MUAs.
+* mail-citation-hook <3>:                VM with any Emacsen.
 * mail-citation-hook <4>:                Emacs 18 MUAs.
 * mail-citation-hook:                    Emacs 19 MUAs.
 * mail-header-separator:                 What Supercite Does Not Do.
@@ -124,22 +124,22 @@
 * mail-yank-hooks:                       VM with any Emacsen.
 * mh-yank-from-start-of-msg:             MH-E with any Emacsen.
 * mh-yank-hooks:                         MH-E with any Emacsen.
-* mode-map-prefix (sc-) <1>:             Reply Buffer Initialization.
-* mode-map-prefix (sc-):                 Post-yank Formatting Commands.
+* mode-map-prefix (sc-) <1>:             Post-yank Formatting Commands.
+* mode-map-prefix (sc-):                 Reply Buffer Initialization.
 * mumble (sc-):                          Information Keys and the Info Alist.
 * name-filter-alist (sc-):               Author Names.
 * nested-citation-p (sc-):               Citations.
-* news-reply-mode-hook <1>:              GNEWS with any Emacsen.
-* news-reply-mode-hook:                  Overloading for Non-conforming MUAs.
+* news-reply-mode-hook <1>:              Overloading for Non-conforming MUAs.
+* news-reply-mode-hook:                  GNEWS with any Emacsen.
 * nuke-mail-header-list (sc-):           Reply Buffer Initialization.
 * nuke-mail-headers (sc-):               Reply Buffer Initialization.
 * post-hook (sc-):                       Reply Buffer Initialization.
 * pre-cite-hook (sc-):                   Citing Commands.
-* pre-hook (sc-) <1>:                    Getting Connected.
-* pre-hook (sc-):                        Reply Buffer Initialization.
+* pre-hook (sc-) <1>:                    Reply Buffer Initialization.
+* pre-hook (sc-):                        Getting Connected.
 * preferred-attribution-list (sc-):      Selecting an Attribution.
-* preferred-header-style (sc-) <1>:      Reference Headers.
-* preferred-header-style (sc-):          Insertion Commands.
+* preferred-header-style (sc-) <1>:      Insertion Commands.
+* preferred-header-style (sc-):          Reference Headers.
 * reference-tag-string (sc-):            The Built-in Header Rewrite Functions.
 * rewrite-header-list (sc-):             Reference Headers.
 * sc-attrib-selection-list <1>:          Version 3 Changes.
@@ -158,13 +158,12 @@
 * sc-citation-separator-regexp:          Recognizing Citations.
 * sc-cite-blank-lines-p:                 Reply Buffer Initialization.
 * sc-cite-frame-alist:                   Frames You Can Customize.
-* sc-cite-region-limit <1>:              Citing Commands.
-* sc-cite-region-limit <2>:              Reply Buffer Initialization.
-* sc-cite-region-limit:                  Version 3 Changes.
+* sc-cite-region-limit <1>:              Version 3 Changes.
+* sc-cite-region-limit <2>:              Citing Commands.
+* sc-cite-region-limit:                  Reply Buffer Initialization.
 * sc-confirm-always-p <1>:               Citing Commands.
 * sc-confirm-always-p <2>:               Anonymous Attributions.
-* sc-confirm-always-p <3>:               Reply Buffer Initialization.
-* sc-confirm-always-p:                   Citing Commands.
+* sc-confirm-always-p:                   Reply Buffer Initialization.
 * sc-default-attribution:                Anonymous Attributions.
 * sc-default-author-name:                Anonymous Attributions.
 * sc-default-cite-frame:                 Frames You Can Customize.
@@ -175,12 +174,12 @@
 * sc-electric-mode-hook:                 Electric References.
 * sc-electric-references-p:              Electric References.
 * sc-fixup-whitespace-p:                 Filling Cited Text.
-* sc-load-hook <1>:                      Getting Connected.
-* sc-load-hook:                          Filling Cited Text.
+* sc-load-hook <1>:                      Filling Cited Text.
+* sc-load-hook:                          Getting Connected.
 * sc-mail-field:                         Frames You Can Customize.
 * sc-mail-warn-if-non-rfc822-p:          Reply Buffer Initialization.
-* sc-mode-map-prefix <1>:                Reply Buffer Initialization.
-* sc-mode-map-prefix:                    Post-yank Formatting Commands.
+* sc-mode-map-prefix <1>:                Post-yank Formatting Commands.
+* sc-mode-map-prefix:                    Reply Buffer Initialization.
 * sc-mumble:                             Information Keys and the Info Alist.
 * sc-name-filter-alist:                  Author Names.
 * sc-nested-citation-p:                  Citations.
@@ -192,8 +191,8 @@
 * sc-pre-hook <1>:                       Reply Buffer Initialization.
 * sc-pre-hook:                           Getting Connected.
 * sc-preferred-attribution-list:         Selecting an Attribution.
-* sc-preferred-header-style <1>:         Reference Headers.
-* sc-preferred-header-style:             Insertion Commands.
+* sc-preferred-header-style <1>:         Insertion Commands.
+* sc-preferred-header-style:             Reference Headers.
 * sc-recite-frame-alist:                 Frames You Can Customize.
 * sc-reference-tag-string:               The Built-in Header Rewrite Functions.
 * sc-rewrite-header-list:                Reference Headers.
diff -ruN src-21.1/info/vip-2 src-21.2/info/vip-2
--- src-21.1/info/vip-2	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/vip-2	Fri Jan 11 09:35:33 2002
@@ -390,31 +390,31 @@
 * 004 C-d (vip-scroll-up):               Viewing the Buffer.
 * 005 C-e (vip-scroll-up-one):           Viewing the Buffer.
 * 006 C-f (vip-scroll-back):             Viewing the Buffer.
-* 007 C-g (vip-keyboard-quit) <1>:       Changing.
-* 007 C-g (vip-keyboard-quit) <2>:       Important Keys.
-* 007 C-g (vip-keyboard-quit):           New Bindings.
+* 007 C-g (vip-keyboard-quit) <1>:       Important Keys.
+* 007 C-g (vip-keyboard-quit) <2>:       New Bindings.
+* 007 C-g (vip-keyboard-quit):           Changing.
 * 010 C-h (delete-backward-char) (insert mode): Commands in Insert Mode.
 * 010 C-h (vip-delete-backward-char) (insert mode): Insert Mode.
 * 011 TAB (indent-for-tab-command):      Other Vi Commands.
 * 012 C-j (newline-and-indent):          Other Vi Commands.
 * 013 C-k (kill-line):                   Other Vi Commands.
-* 014 C-l (recenter) <1>:                Important Keys.
-* 014 C-l (recenter):                    Other Vi Commands.
+* 014 C-l (recenter) <1>:                Other Vi Commands.
+* 014 C-l (recenter):                    Important Keys.
 * 015 RET (vip-scroll-back) <1>:         Viewing the Buffer.
 * 015 RET (vip-scroll-back):             New Bindings.
-* 016 C-n (vip-next-window) <1>:         Window Commands.
-* 016 C-n (vip-next-window) <2>:         New Commands.
-* 016 C-n (vip-next-window):             Buffers and Windows.
-* 017 C-o (vip-open-line-at-point) <1>:  New Commands.
-* 017 C-o (vip-open-line-at-point):      Commands in Insert Mode.
+* 016 C-n (vip-next-window) <1>:         Buffers and Windows.
+* 016 C-n (vip-next-window) <2>:         Window Commands.
+* 016 C-n (vip-next-window):             New Commands.
+* 017 C-o (vip-open-line-at-point) <1>:  Commands in Insert Mode.
+* 017 C-o (vip-open-line-at-point):      New Commands.
 * 020 C-p (previous-line):               Other Vi Commands.
 * 021 C-q (quoted-insert):               Other Vi Commands.
-* 022 C-r (isearch-backward) <1>:        Searching and Replacing.
-* 022 C-r (isearch-backward) <2>:        New Commands.
-* 022 C-r (isearch-backward):            Other Vi Commands.
-* 023 C-s (isearch-forward) <1>:         New Commands.
-* 023 C-s (isearch-forward) <2>:         Other Vi Commands.
-* 023 C-s (isearch-forward):             Searching and Replacing.
+* 022 C-r (isearch-backward) <1>:        Other Vi Commands.
+* 022 C-r (isearch-backward) <2>:        Searching and Replacing.
+* 022 C-r (isearch-backward):            New Commands.
+* 023 C-s (isearch-forward) <1>:         Other Vi Commands.
+* 023 C-s (isearch-forward) <2>:         Searching and Replacing.
+* 023 C-s (isearch-forward):             New Commands.
 * 024 C-t (transpose-chars):             Other Vi Commands.
 * 025 C-u (vip-scroll-down):             Viewing the Buffer.
 * 026 C-v (scroll-up):                   Other Vi Commands.
@@ -425,16 +425,16 @@
 * 0300 C-x (vip-ctl-x):                  New Commands.
 * 0301 C-x C-z (suspend-emacs):          Modes in VIP.
 * 031 C-y (vip-scroll-down-one):         Viewing the Buffer.
-* 032 C-z (vip-change-mode-to-vi) <1>:   Modes in VIP.
-* 032 C-z (vip-change-mode-to-vi):       Emacs Mode.
-* 032 C-z (vip-ESC) (insert mode) <1>:   Insert Mode.
-* 032 C-z (vip-ESC) (insert mode):       Commands in Insert Mode.
-* 033 ESC (vip-change-mode-to-vi) (insert mode) <1>: Insert Mode.
-* 033 ESC (vip-change-mode-to-vi) (insert mode): Commands in Insert Mode.
-* 033 ESC (vip-ESC) <1>:                 New Commands.
-* 033 ESC (vip-ESC):                     Important Keys.
-* 040 SPC (vip-scroll) <1>:              New Bindings.
-* 040 SPC (vip-scroll):                  Viewing the Buffer.
+* 032 C-z (vip-change-mode-to-vi) <1>:   Emacs Mode.
+* 032 C-z (vip-change-mode-to-vi):       Modes in VIP.
+* 032 C-z (vip-ESC) (insert mode) <1>:   Commands in Insert Mode.
+* 032 C-z (vip-ESC) (insert mode):       Insert Mode.
+* 033 ESC (vip-change-mode-to-vi) (insert mode) <1>: Commands in Insert Mode.
+* 033 ESC (vip-change-mode-to-vi) (insert mode): Insert Mode.
+* 033 ESC (vip-ESC) <1>:                 Important Keys.
+* 033 ESC (vip-ESC):                     New Commands.
+* 040 SPC (vip-scroll) <1>:              Viewing the Buffer.
+* 040 SPC (vip-scroll):                  New Bindings.
 * 041 ! (vip-command-argument):          Other Vi Commands.
 * 042 " (vip-command-argument):          Delete Commands.
 * 0430 # (vip-command-argument):         New Commands.
@@ -449,17 +449,17 @@
 * 047 ' (vip-goto-mark-and-skip-white):  Motion Commands.
 * 050 ( (vip-backward-sentence):         Motion Commands.
 * 051 ) (vip-forward-sentence):          Motion Commands.
-* 052 * (vip-call-last-kbd-macro) <1>:   Misc Commands.
-* 052 * (vip-call-last-kbd-macro) <2>:   Other Vi Commands.
+* 052 * (vip-call-last-kbd-macro) <1>:   Other Vi Commands.
+* 052 * (vip-call-last-kbd-macro) <2>:   Misc Commands.
 * 052 * (vip-call-last-kbd-macro):       New Commands.
 * 053 + (vip-next-line-at-bol):          Motion Commands.
 * 054 , (vip-repeat-find-opposite):      Motion Commands.
 * 055 - (vip-previous-line-at-bol):      Motion Commands.
 * 056 . (vip-repeat) <1>:                Repeating and Undoing Modifications.
 * 056 . (vip-repeat):                    Undoing.
-* 057 / (vip-search-forward) <1>:        Searching.
-* 057 / (vip-search-forward) <2>:        Searching and Replacing.
-* 057 / (vip-search-forward):            Counts.
+* 057 / (vip-search-forward) <1>:        Searching and Replacing.
+* 057 / (vip-search-forward) <2>:        Counts.
+* 057 / (vip-search-forward):            Searching.
 * 060 0 (vip-beginning-of-line):         Motion Commands.
 * 061 1 (numeric argument):              Numeric Arguments.
 * 062 2 (numeric argument):              Numeric Arguments.
@@ -475,9 +475,9 @@
 * 074 < (vip-command-argument):          Other Vi Commands.
 * 075 = (vip-command-argument):          Other Vi Commands.
 * 076 > (vip-command-argument):          Other Vi Commands.
-* 077 ? (vip-search-backward) <1>:       Counts.
-* 077 ? (vip-search-backward) <2>:       Searching.
-* 077 ? (vip-search-backward):           Searching and Replacing.
+* 077 ? (vip-search-backward) <1>:       Searching and Replacing.
+* 077 ? (vip-search-backward) <2>:       Counts.
+* 077 ? (vip-search-backward):           Searching.
 * 100 @ (vip-nil):                       Other Vi Commands.
 * 101 A (vip-Append):                    Commands in Insert Mode.
 * 102 B (vip-backward-Word):             Motion Commands.
@@ -490,9 +490,9 @@
 * 110 H (vip-window-top):                Motion Commands.
 * 111 I (vip-Insert):                    Commands in Insert Mode.
 * 112 J (vip-join-lines):                Other Vi Commands.
-* 113 K (vip-kill-buffer) <1>:           New Commands.
+* 113 K (vip-kill-buffer) <1>:           Buffers and Windows.
 * 113 K (vip-kill-buffer) <2>:           Buffer Commands.
-* 113 K (vip-kill-buffer):               Buffers and Windows.
+* 113 K (vip-kill-buffer):               New Commands.
 * 114 L (vip-window-bottom):             Motion Commands.
 * 115 M (vip-window-middle):             Motion Commands.
 * 116 N (vip-search-Next):               Searching and Replacing.
@@ -500,8 +500,8 @@
 * 117 O (vip-Open-line):                 Counts.
 * 120 P (vip-Put-back) <1>:              Put Back Commands.
 * 120 P (vip-Put-back):                  Counts.
-* 121 Q (vip-query-replace) <1>:         New Commands.
-* 121 Q (vip-query-replace):             Searching and Replacing.
+* 121 Q (vip-query-replace) <1>:         Searching and Replacing.
+* 121 Q (vip-query-replace):             New Commands.
 * 122 R (vip-replace-string) <1>:        Searching and Replacing.
 * 122 R (vip-replace-string):            New Commands.
 * 123 S (vip-switch-to-buffer-other-window) <1>: Buffers and Windows.
@@ -509,34 +509,34 @@
 * 123 S (vip-switch-to-buffer-other-window): New Bindings.
 * 124 T (vip-goto-char-backward):        Motion Commands.
 * 125 U (vip-nil):                       Other Vi Commands.
-* 126 V (vip-find-file-other-window) <1>: New Commands.
+* 126 V (vip-find-file-other-window) <1>: Files.
 * 126 V (vip-find-file-other-window) <2>: File Commands.
-* 126 V (vip-find-file-other-window):    Files.
+* 126 V (vip-find-file-other-window):    New Commands.
 * 127 W (vip-forward-Word):              Motion Commands.
 * 1300 X (vip-ctl-x-equivalent) <1>:     Important Keys.
 * 1300 X (vip-ctl-x-equivalent):         New Bindings.
 * 1301 X ( (start-kbd-macro):            Misc Commands.
 * 1301 X ) (end-kbd-macro):              Misc Commands.
-* 1301 X 1 (delete-other-windows) <1>:   Window Commands.
-* 1301 X 1 (delete-other-windows):       Buffers and Windows.
+* 1301 X 1 (delete-other-windows) <1>:   Buffers and Windows.
+* 1301 X 1 (delete-other-windows):       Window Commands.
 * 1301 X 2 (split-window-vertically) <1>: Buffers and Windows.
 * 1301 X 2 (split-window-vertically):    Window Commands.
-* 1301 X 3 (vip-buffer-in-two-windows) <1>: Window Commands.
-* 1301 X 3 (vip-buffer-in-two-windows) <2>: New Bindings.
-* 1301 X 3 (vip-buffer-in-two-windows):  Buffers and Windows.
+* 1301 X 3 (vip-buffer-in-two-windows) <1>: Buffers and Windows.
+* 1301 X 3 (vip-buffer-in-two-windows) <2>: Window Commands.
+* 1301 X 3 (vip-buffer-in-two-windows):  New Bindings.
 * 1302 X B (list-buffers):               Buffers and Windows.
-* 1302 X I (insert-file) <1>:            File Commands.
-* 1302 X I (insert-file):                Files.
+* 1302 X I (insert-file) <1>:            Files.
+* 1302 X I (insert-file):                File Commands.
 * 1302 X S (save-buffer) <1>:            Files.
 * 1302 X S (save-buffer):                Buffer Commands.
-* 1302 X W (write-file) <1>:             File Commands.
-* 1302 X W (write-file):                 Files.
+* 1302 X W (write-file) <1>:             Files.
+* 1302 X W (write-file):                 File Commands.
 * 1302 X Z (suspend-emacs):              Misc Commands.
 * 131 Y (vip-yank-line):                 Yank Commands.
 * 132 Z Z (save-buffers-kill-emacs):     Other Vi Commands.
 * 133 [ (vip-nil):                       Other Vi Commands.
-* 134 \ (vip-escape-to-emacs) <1>:       New Commands.
-* 134 \ (vip-escape-to-emacs):           Important Keys.
+* 134 \ (vip-escape-to-emacs) <1>:       Important Keys.
+* 134 \ (vip-escape-to-emacs):           New Commands.
 * 135 ] (vip-nil):                       Other Vi Commands.
 * 136 ^ (vip-bol-and-skip-white):        Motion Commands.
 * 137 _ (vip-nil):                       Other Vi Commands.
@@ -553,8 +553,8 @@
 * 1442 d r:                              Delete Commands.
 * 145 e (vip-end-of-word):               Motion Commands.
 * 146 f (vip-find-char-forward):         Motion Commands.
-* 147 g (vip-info-on-file) <1>:          New Bindings.
-* 147 g (vip-info-on-file):              Files.
+* 147 g (vip-info-on-file) <1>:          Files.
+* 147 g (vip-info-on-file):              New Bindings.
 * 150 h (vip-backward-char):             Motion Commands.
 * 151 i (vip-insert):                    Commands in Insert Mode.
 * 152 j (vip-next-line):                 Motion Commands.
@@ -570,14 +570,14 @@
 * 161 q (vip-nil):                       Other Vi Commands.
 * 162 r (vip-replace-char):              Searching and Replacing.
 * 163 s (vip-switch-to-buffer) <1>:      Buffers and Windows.
-* 163 s (vip-switch-to-buffer) <2>:      New Bindings.
-* 163 s (vip-switch-to-buffer):          Buffer Commands.
+* 163 s (vip-switch-to-buffer) <2>:      Buffer Commands.
+* 163 s (vip-switch-to-buffer):          New Bindings.
 * 164 t (vip-goto-char-forward):         Motion Commands.
-* 165 u (vip-undo) <1>:                  Undoing.
-* 165 u (vip-undo):                      Repeating and Undoing Modifications.
-* 166 v (vip-find-file) <1>:             New Commands.
-* 166 v (vip-find-file) <2>:             Files.
-* 166 v (vip-find-file):                 File Commands.
+* 165 u (vip-undo) <1>:                  Repeating and Undoing Modifications.
+* 165 u (vip-undo):                      Undoing.
+* 166 v (vip-find-file) <1>:             Files.
+* 166 v (vip-find-file) <2>:             File Commands.
+* 166 v (vip-find-file):                 New Commands.
 * 167 w (vip-forward-word):              Motion Commands.
 * 170 x (vip-delete-char):               Delete Commands.
 * 1710 y (vip-command-argument):         Yank Commands.
@@ -586,16 +586,16 @@
 * 1712 y y (vip-yank-line):              Yank Commands.
 * 1721 z RET (vip-line-to-top) <1>:      Viewing the Buffer.
 * 1721 z RET (vip-line-to-top):          z Command.
-* 1722 z - (vip-line-to-bottom) <1>:     z Command.
-* 1722 z - (vip-line-to-bottom):         Viewing the Buffer.
-* 1722 z . (vip-line-to-middle) <1>:     z Command.
-* 1722 z . (vip-line-to-middle):         Viewing the Buffer.
+* 1722 z - (vip-line-to-bottom) <1>:     Viewing the Buffer.
+* 1722 z - (vip-line-to-bottom):         z Command.
+* 1722 z . (vip-line-to-middle) <1>:     Viewing the Buffer.
+* 1722 z . (vip-line-to-middle):         z Command.
 * 1723 z H (vip-line-to-top) <1>:        Viewing the Buffer.
 * 1723 z H (vip-line-to-top):            z Command.
-* 1723 z L (vip-line-to-bottom) <1>:     z Command.
-* 1723 z L (vip-line-to-bottom):         Viewing the Buffer.
-* 1723 z M (vip-line-to-middle) <1>:     z Command.
-* 1723 z M (vip-line-to-middle):         Viewing the Buffer.
+* 1723 z L (vip-line-to-bottom) <1>:     Viewing the Buffer.
+* 1723 z L (vip-line-to-bottom):         z Command.
+* 1723 z M (vip-line-to-middle) <1>:     Viewing the Buffer.
+* 1723 z M (vip-line-to-middle):         z Command.
 * 173 { (vip-backward-paragraph):        Motion Commands.
 * 174 | (vip-goto-col):                  Motion Commands.
 * 175 } (vip-forward-paragraph):         Motion Commands.
diff -ruN src-21.1/info/viper-4 src-21.2/info/viper-4
--- src-21.1/info/viper-4	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/viper-4	Fri Jan 11 09:35:34 2002
@@ -826,19 +826,19 @@
 
 * Menu:
 
-* "<a-z1-9>p:                            Appending Text.
-* "<a-z1-9>P:                            Appending Text.
-* "<a-z1-9>p:                            Yanking.
 * "<a-z1-9>P:                            Yanking.
-* "<A-Z>y<move>:                         Yanking.
+* "<a-z1-9>p:                            Yanking.
+* "<a-z1-9>P:                            Appending Text.
+* "<a-z1-9>p:                            Appending Text.
 * "<a-z>y<move>:                         Yanking.
+* "<A-Z>y<move>:                         Yanking.
 * #:                                     New Commands.
-* #c<move>:                              New Commands.
-* #C<move> <1>:                          New Commands.
-* #C<move>:                              Changing Text.
 * #c<move>:                              Changing Text.
-* #g<move> <1>:                          Search and Replace.
-* #g<move> <2>:                          Mapping.
+* #C<move> <1>:                          Changing Text.
+* #C<move>:                              New Commands.
+* #c<move>:                              New Commands.
+* #g<move> <1>:                          Mapping.
+* #g<move> <2>:                          Search and Replace.
 * #g<move>:                              New Commands.
 * #q<move>:                              New Commands.
 * #q<move> :                             Changing Text.
@@ -848,22 +848,22 @@
 * %:                                     Move Commands.
 * & <1>:                                 Search and Replace.
 * &:                                     Changing Text.
-* '' <1>:                                Move Commands.
-* '':                                    Marking.
-* '<a-z> <1>:                            Move Commands.
-* '<a-z>:                                Marking.
+* '' <1>:                                Marking.
+* '':                                    Move Commands.
+* '<a-z> <1>:                            Marking.
+* '<a-z>:                                Move Commands.
 * (:                                     Move Commands.
 * ):                                     Move Commands.
-* * <1>:                                 New Commands.
-* *:                                     Mapping.
+* * <1>:                                 Mapping.
+* *:                                     New Commands.
 * +:                                     Move Commands.
 * ,:                                     Move Commands.
 * -:                                     Move Commands.
-* . <1>:                                 Appending Text.
-* .:                                     Undoing.
+* . <1>:                                 Undoing.
+* .:                                     Appending Text.
 * /<cr>:                                 Move Commands.
-* /<string> <1>:                         Move Commands.
-* /<string>:                             Search and Replace.
+* /<string> <1>:                         Search and Replace.
+* /<string>:                             Move Commands.
 * 0:                                     Move Commands.
 * ;:                                     Move Commands.
 * <<:                                    Deleting Text.
@@ -881,30 +881,30 @@
 * ><move>:                               Appending Text.
 * >>:                                    Appending Text.
 * ?<cr>:                                 Move Commands.
-* ?<string> <1>:                         Move Commands.
-* ?<string>:                             Search and Replace.
+* ?<string> <1>:                         Search and Replace.
+* ?<string>:                             Move Commands.
 * @!:                                    New Commands.
 * @!<a-z>:                               Mapping.
 * @# <1>:                                Mapping.
 * @#:                                    New Commands.
-* @<a-z> <1>:                            New Commands.
-* @<a-z>:                                Mapping.
+* @<a-z> <1>:                            Mapping.
+* @<a-z>:                                New Commands.
 * @@:                                    Mapping.
 * [<a-z> <1>:                            Mapping.
-* [<a-z> <2>:                            New Commands.
-* [<a-z> <3>:                            Yanking.
-* [<a-z> <4>:                            Appending Text.
-* [<a-z>:                                Move Commands.
+* [<a-z> <2>:                            Yanking.
+* [<a-z> <3>:                            Appending Text.
+* [<a-z> <4>:                            Move Commands.
+* [<a-z>:                                New Commands.
 * [[:                                    Move Commands.
-* [] <1>:                                New Commands.
-* []:                                    Move Commands.
+* [] <1>:                                Move Commands.
+* []:                                    New Commands.
 * \:                                     New Commands.
 * \&:                                    Changing Text.
-* ]<a-z> <1>:                            New Commands.
-* ]<a-z> <2>:                            Mapping.
+* ]<a-z> <1>:                            Mapping.
+* ]<a-z> <2>:                            Yanking.
 * ]<a-z> <3>:                            Appending Text.
-* ]<a-z> <4>:                            Yanking.
-* ]<a-z>:                                Move Commands.
+* ]<a-z> <4>:                            Move Commands.
+* ]<a-z>:                                New Commands.
 * ]]:                                    Move Commands.
 * ^:                                     Move Commands.
 * `<a-z> <1>:                            Marking.
@@ -916,24 +916,24 @@
 * b:                                     Move Commands.
 * B:                                     Move Commands.
 * C:                                     Changing Text.
-* C-\ <1>:                               Vi State.
-* C-\:                                   Emacs Related Commands.
-* C-] <1>:                               Vi State.
-* C-]:                                   New Commands.
+* C-\ <1>:                               Emacs Related Commands.
+* C-\:                                   Vi State.
+* C-] <1>:                               New Commands.
+* C-]:                                   Vi State.
 * C-^:                                   File and Buffer Handling.
 * C-b:                                   Display.
-* C-c <1>:                               Vi State.
-* C-c:                                   New Commands.
-* C-c / <1>:                             New Commands.
-* C-c / <2>:                             Vi State.
-* C-c /:                                 Move Commands.
+* C-c <1>:                               New Commands.
+* C-c:                                   Vi State.
+* C-c / <1>:                             Move Commands.
+* C-c / <2>:                             New Commands.
+* C-c /:                                 Vi State.
 * C-c C-g:                               New Commands.
 * C-c M-n <1>:                           Changing Text.
-* C-c M-n <2>:                           New Commands.
-* C-c M-n:                               Appending Text.
+* C-c M-n <2>:                           Appending Text.
+* C-c M-n:                               New Commands.
 * C-c M-p <1>:                           Changing Text.
-* C-c M-p <2>:                           New Commands.
-* C-c M-p:                               Appending Text.
+* C-c M-p <2>:                           Appending Text.
+* C-c M-p:                               New Commands.
 * C-c\:                                  Emacs Related Commands.
 * C-d:                                   Display.
 * C-e:                                   Display.
@@ -947,8 +947,8 @@
 * C-p:                                   Move Commands.
 * C-u <1>:                               Display.
 * C-u:                                   Editing in Insert State.
-* C-v <1>:                               New Commands.
-* C-v:                                   Editing in Insert State.
+* C-v <1>:                               Editing in Insert State.
+* C-v:                                   New Commands.
 * C-w:                                   Editing in Insert State.
 * C-x <1>:                               New Commands.
 * C-x:                                   Vi State.
@@ -969,19 +969,19 @@
 * dd:                                    Deleting Text.
 * e:                                     Move Commands.
 * E:                                     Move Commands.
-* F<char>:                               Move Commands.
 * f<char>:                               Move Commands.
+* F<char>:                               Move Commands.
 * G:                                     Move Commands.
 * g<move>:                               Search and Replace.
 * h:                                     Move Commands.
 * H:                                     Move Commands.
-* i <1>:                                 States in Viper.
-* i:                                     Appending Text.
-* j:                                     Move Commands.
+* i <1>:                                 Appending Text.
+* i:                                     States in Viper.
 * J:                                     Changing Text.
+* j:                                     Move Commands.
 * k:                                     Move Commands.
-* L:                                     Move Commands.
 * l:                                     Move Commands.
+* L:                                     Move Commands.
 * M:                                     Move Commands.
 * m,:                                    Marking.
 * M-n:                                   New Commands.
@@ -989,48 +989,48 @@
 * M-y:                                   Emacs Related Commands.
 * m.:                                    Marking.
 * m<:                                    Marking.
-* m<a-z> <1>:                            Marking.
-* m<a-z> <2>:                            Move Commands.
-* m<a-z>:                                Yanking.
+* m<a-z> <1>:                            Yanking.
+* m<a-z> <2>:                            Marking.
+* m<a-z>:                                Move Commands.
 * m>:                                    Marking.
 * m^:                                    Marking.
 * meta button1up:                        Mouse-bound Commands.
 * meta button2up:                        Mouse-bound Commands.
 * meta shift button1up:                  Viper Specials.
 * meta shift button2up:                  Viper Specials.
-* n:                                     Move Commands.
-* N:                                     Search and Replace.
 * n:                                     Search and Replace.
+* N:                                     Search and Replace.
+* n:                                     Move Commands.
 * N:                                     Move Commands.
 * o:                                     Appending Text.
 * O:                                     Appending Text.
 * p:                                     Yanking.
-* P:                                     Appending Text.
-* p:                                     Appending Text.
 * P:                                     Yanking.
+* p:                                     Appending Text.
+* P:                                     Appending Text.
 * Q <1>:                                 Search and Replace.
 * Q:                                     New Commands.
 * R:                                     Changing Text.
 * r<char>:                               Changing Text.
-* S:                                     Changing Text.
 * s:                                     Changing Text.
+* S:                                     Changing Text.
 * S-Mouse-1 <1>:                         Mouse-bound Commands.
 * S-Mouse-1:                             Viper Specials.
-* S-Mouse-2 <1>:                         Viper Specials.
-* S-Mouse-2:                             Mouse-bound Commands.
+* S-Mouse-2 <1>:                         Mouse-bound Commands.
+* S-Mouse-2:                             Viper Specials.
 * t<char>:                               Move Commands.
 * T<char>:                               Move Commands.
+* u:                                     Undoing.
 * U:                                     Undoing.
-* u <1>:                                 Undoing.
 * u:                                     Vi State.
+* V:                                     File and Buffer Handling.
 * v:                                     File and Buffer Handling.
-* V <1>:                                 File and Buffer Handling.
 * V:                                     New Commands.
 * v:                                     New Commands.
-* W:                                     Move Commands.
 * w:                                     Move Commands.
-* X:                                     Deleting Text.
+* W:                                     Move Commands.
 * x:                                     Deleting Text.
+* X:                                     Deleting Text.
 * Y:                                     Yanking.
 * y<move>:                               Yanking.
 * yank:                                  Yanking.
@@ -1083,23 +1083,23 @@
 * :move [z]:                             Changing Text.
 * :n:                                    New Commands.
 * :n [<count> | <file>]:                 File and Buffer Handling.
-* :pre <1>:                              New Commands.
-* :pre:                                  File and Buffer Handling.
+* :pre <1>:                              File and Buffer Handling.
+* :pre:                                  New Commands.
 * :PreviousRelatedFile <1>:              Viper Specials.
 * :PreviousRelatedFile:                  New Commands.
-* :pwd <1>:                              New Commands.
-* :pwd:                                  File and Buffer Handling.
+* :pwd <1>:                              File and Buffer Handling.
+* :pwd:                                  New Commands.
 * :q:                                    File and Buffer Handling.
-* :q! <1>:                               Undoing.
-* :q!:                                   File and Buffer Handling.
+* :q! <1>:                               File and Buffer Handling.
+* :q!:                                   Undoing.
 * :quit:                                 File and Buffer Handling.
 * :quit!:                                File and Buffer Handling.
 * :r:                                    File and Buffer Handling.
 * :read:                                 File and Buffer Handling.
-* :rec <1>:                              Undoing.
-* :rec:                                  File and Buffer Handling.
-* :RelatedFile <1>:                      New Commands.
-* :RelatedFile:                          Viper Specials.
+* :rec <1>:                              File and Buffer Handling.
+* :rec:                                  Undoing.
+* :RelatedFile <1>:                      Viper Specials.
+* :RelatedFile:                          New Commands.
 * :rew:                                  File and Buffer Handling.
 * :s/<pat>/<repl>/<f>:                   Changing Text.
 * :set:                                  Rudimentary Changes.
@@ -1161,8 +1161,8 @@
 * viper-buffer-search-enable:            Viper Specials.
 * viper-describe-kbd-macros:             Vi Macros.
 * viper-glob-function:                   Rudimentary Changes.
-* viper-go-away <1>:                     States in Viper.
-* viper-go-away:                         Viper Specials.
+* viper-go-away <1>:                     Viper Specials.
+* viper-go-away:                         States in Viper.
 * viper-harness-minor-mode:              Packages that Change Keymaps.
 * viper-mode:                            Packages that Change Keymaps.
 * viper-modify-major-mode:               Key Bindings.
@@ -1194,8 +1194,8 @@
 * viper-always <1>:                      Packages that Change Keymaps.
 * viper-always:                          Rudimentary Changes.
 * viper-auto-indent:                     Rudimentary Changes.
-* viper-buffer-search-char <1>:          Rudimentary Changes.
-* viper-buffer-search-char:              Viper Specials.
+* viper-buffer-search-char <1>:          Viper Specials.
+* viper-buffer-search-char:              Rudimentary Changes.
 * viper-case-fold-search:                Rudimentary Changes.
 * viper-command-ring-size:               Viper Specials.
 * viper-custom-file-name:                Rudimentary Changes.
@@ -1231,15 +1231,15 @@
 * viper-replace-region-end-symbol:       Rudimentary Changes.
 * viper-replace-region-start-symbol:     Rudimentary Changes.
 * viper-replace-state-hook:              Rudimentary Changes.
-* viper-search-face <1>:                 Improved Search.
-* viper-search-face:                     Rudimentary Changes.
+* viper-search-face <1>:                 Rudimentary Changes.
+* viper-search-face:                     Improved Search.
 * viper-search-scroll-threshold:         Rudimentary Changes.
 * viper-search-wrap-around:              Rudimentary Changes.
 * viper-shift-width:                     Rudimentary Changes.
 * viper-slash-and-colon-map:             Viper Specials.
 * viper-smart-suffix-list:               Viper Specials.
-* viper-spell-function <1>:              New Commands.
-* viper-spell-function:                  Rudimentary Changes.
+* viper-spell-function <1>:              Rudimentary Changes.
+* viper-spell-function:                  New Commands.
 * viper-surrounding-word-function:       Rudimentary Changes.
 * viper-syntax-preference <1>:           Groundwork.
 * viper-syntax-preference:               Movement and Markers.
@@ -1250,8 +1250,8 @@
 * viper-vi-state-mode-list:              Packages that Change Keymaps.
 * viper-vi-style-in-minibuffer:          Rudimentary Changes.
 * viper-want-ctl-h-help:                 Rudimentary Changes.
-* viper-want-emacs-keys-in-insert <1>:   Rudimentary Changes.
-* viper-want-emacs-keys-in-insert:       Packages that Change Keymaps.
+* viper-want-emacs-keys-in-insert <1>:   Packages that Change Keymaps.
+* viper-want-emacs-keys-in-insert:       Rudimentary Changes.
 * viper-want-emacs-keys-in-vi <1>:       Packages that Change Keymaps.
 * viper-want-emacs-keys-in-vi:           Rudimentary Changes.
 
diff -ruN src-21.1/info/viper-5 src-21.2/info/viper-5
--- src-21.1/info/viper-5	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/viper-5	Fri Jan 11 09:35:34 2002
@@ -37,8 +37,8 @@
 
 * Menu:
 
-* # (Previous file) <1>:                 Groundwork.
-* # (Previous file):                     Shell Commands.
+* # (Previous file) <1>:                 Shell Commands.
+* # (Previous file):                     Groundwork.
 * % (Current file) <1>:                  Shell Commands.
 * % (Current file):                      Groundwork.
 * % (Ex address) <1>:                    Shell Commands.
@@ -69,17 +69,17 @@
 * buffer search:                         Improved Search.
 * C-c and Viper:                         Packages that Change Keymaps.
 * case and searching:                    Options.
-* case-insensitive search <1>:           Vi State.
-* case-insensitive search <2>:           Move Commands.
-* case-insensitive search:               New Commands.
-* case-sensitive search <1>:             Vi State.
+* case-insensitive search <1>:           Move Commands.
+* case-insensitive search <2>:           New Commands.
+* case-insensitive search:               Vi State.
+* case-sensitive search <1>:             Move Commands.
 * case-sensitive search <2>:             New Commands.
-* case-sensitive search:                 Move Commands.
+* case-sensitive search:                 Vi State.
 * changing case <1>:                     Changing Text.
 * changing case:                         New Commands.
 * changing tab width:                    Options.
-* char:                                  Groundwork.
 * CHAR:                                  Groundwork.
+* char:                                  Groundwork.
 * column movement:                       Move Commands.
 * Command history:                       New Commands.
 * command line:                          Emacs Preliminaries.
@@ -96,27 +96,27 @@
 * dired:                                 Useful Packages.
 * dynamic abbrevs:                       Abbreviation Facilities.
 * ediff:                                 Useful Packages.
-* Emacs state <1>:                       States in Viper.
-* Emacs state:                           Emacs State.
+* Emacs state <1>:                       Emacs State.
+* Emacs state:                           States in Viper.
 * email:                                 Useful Packages.
 * end (of buffer):                       Emacs Preliminaries.
 * end (of line):                         Emacs Preliminaries.
 * Ex addresses:                          Groundwork.
-* Ex commands <1>:                       States in Viper.
+* Ex commands <1>:                       Groundwork.
 * Ex commands <2>:                       Vi State.
-* Ex commands:                           Groundwork.
+* Ex commands:                           States in Viper.
 * Ex style motion:                       Movement and Markers.
 * expanding (region):                    Basics.
 * font-lock:                             Useful Packages.
 * global keymap:                         Emacs Preliminaries.
-* headings <1>:                          Viper Specials.
-* headings:                              Move Commands.
+* headings <1>:                          Move Commands.
+* headings:                              Viper Specials.
 * history:                               History.
 * incremental search:                    Improved Search.
 * initialization:                        Customization.
 * Insert state <1>:                      Editing in Insert State.
-* Insert state <2>:                      States in Viper.
-* Insert state:                          Insert State.
+* Insert state <2>:                      Insert State.
+* Insert state:                          States in Viper.
 * inserting:                             Appending Text.
 * Insertion history:                     New Commands.
 * Insertion ring <1>:                    Viper Specials.
@@ -127,8 +127,8 @@
 * key bindings <1>:                      Mapping.
 * key bindings:                          Key Bindings.
 * key mapping:                           Mapping.
-* keyboard macros <1>:                   Macros and Registers.
-* keyboard macros:                       New Commands.
+* keyboard macros <1>:                   New Commands.
+* keyboard macros:                       Macros and Registers.
 * keymap:                                Emacs Preliminaries.
 * keymaps:                               Key Bindings.
 * last keyboard macro:                   Macros and Registers.
@@ -145,18 +145,18 @@
 * make:                                  Useful Packages.
 * managing multiple files:               Multiple Files in Viper.
 * mark:                                  Emacs Preliminaries.
-* markers <1>:                           Multiple Files in Viper.
+* markers <1>:                           Move Commands.
 * markers <2>:                           Undo and Backups.
-* markers:                               Move Commands.
+* markers:                               Multiple Files in Viper.
 * marking:                               Marking.
 * matching parens <1>:                   Options.
 * matching parens:                       Move Commands.
-* Meta key <1>:                          Vi State.
-* Meta key <2>:                          Insert State.
+* Meta key <1>:                          Insert State.
+* Meta key <2>:                          Vi State.
 * Meta key:                              Emacs Preliminaries.
-* Minibuffer <1>:                        The Minibuffer.
-* Minibuffer <2>:                        Emacs Preliminaries.
-* Minibuffer:                            History.
+* Minibuffer <1>:                        History.
+* Minibuffer <2>:                        The Minibuffer.
+* Minibuffer:                            Emacs Preliminaries.
 * minor mode:                            Emacs Preliminaries.
 * mode:                                  Emacs Preliminaries.
 * mode line <1>:                         States in Viper.
@@ -172,12 +172,12 @@
 * multiple files <1>:                    File and Buffer Handling.
 * multiple files:                        Multiple Files in Viper.
 * multiple undo:                         Vi State.
-* paragraphs <1>:                        Viper Specials.
-* paragraphs:                            Move Commands.
-* paren matching <1>:                    Move Commands.
-* paren matching:                        Options.
-* paste <1>:                             Appending Text.
-* paste:                                 Yanking.
+* paragraphs <1>:                        Move Commands.
+* paragraphs:                            Viper Specials.
+* paren matching <1>:                    Options.
+* paren matching:                        Move Commands.
+* paste <1>:                             Yanking.
+* paste:                                 Appending Text.
 * point:                                 Emacs Preliminaries.
 * point commands <1>:                    Groundwork.
 * point commands:                        Basics.
@@ -194,17 +194,17 @@
 * region specification:                  Basics.
 * register execution <1>:                New Commands.
 * register execution:                    Macros and Registers.
-* registers <1>:                         Multiple Files in Viper.
-* registers <2>:                         Macros and Registers.
-* registers:                             Undo and Backups.
+* registers <1>:                         Macros and Registers.
+* registers <2>:                         Undo and Backups.
+* registers:                             Multiple Files in Viper.
 * regular expressions:                   Vi State.
 * Replace state <1>:                     Replace State.
 * Replace state:                         States in Viper.
 * scrolling:                             Display.
-* searching <1>:                         Move Commands.
-* searching:                             Options.
-* sections <1>:                          Viper Specials.
-* sections:                              Move Commands.
+* searching <1>:                         Options.
+* searching:                             Move Commands.
+* sections <1>:                          Move Commands.
+* sections:                              Viper Specials.
 * sentences <1>:                         Move Commands.
 * sentences:                             Viper Specials.
 * setting variables:                     Rudimentary Changes.
@@ -214,36 +214,36 @@
 * shifting text <1>:                     Options.
 * shifting text:                         Deleting Text.
 * substitution:                          Changing Text.
-* syntax table <1>:                      Movement and Markers.
-* syntax table:                          Groundwork.
+* syntax table <1>:                      Groundwork.
+* syntax table:                          Movement and Markers.
 * tabbing:                               Options.
 * text:                                  Emacs Preliminaries.
 * text processing:                       Search and Replace.
-* textmarkers <1>:                       Movement and Markers.
-* textmarkers <2>:                       Multiple Files in Viper.
-* textmarkers <3>:                       Move Commands.
-* textmarkers:                           Undo and Backups.
+* textmarkers <1>:                       Move Commands.
+* textmarkers <2>:                       Movement and Markers.
+* textmarkers <3>:                       Undo and Backups.
+* textmarkers:                           Multiple Files in Viper.
 * transparent ftp:                       Useful Packages.
-* undo <1>:                              Vi State.
+* undo <1>:                              Undoing.
 * undo <2>:                              Undo and Backups.
-* undo:                                  Undoing.
-* vanilla search <1>:                    New Commands.
-* vanilla search <2>:                    Vi State.
-* vanilla search:                        Move Commands.
+* undo:                                  Vi State.
+* vanilla search <1>:                    Move Commands.
+* vanilla search <2>:                    New Commands.
+* vanilla search:                        Vi State.
 * variables for customization:           Rudimentary Changes.
 * version maintenance:                   Useful Packages.
 * Vi macros:                             Vi Macros.
 * Vi options:                            Options.
 * Vi state <1>:                          Vi State.
 * Vi state:                              States in Viper.
-* viewing registers and markers <1>:     Undo and Backups.
-* viewing registers and markers:         Macros and Registers.
+* viewing registers and markers <1>:     Macros and Registers.
+* viewing registers and markers:         Undo and Backups.
 * Viper and C-c:                         Packages that Change Keymaps.
 * Viper as minor mode:                   Emacs Preliminaries.
 * window:                                Emacs Preliminaries.
 * word search:                           Improved Search.
 * word wrap:                             Options.
-* words:                                 Groundwork.
 * WORDS:                                 Groundwork.
+* words:                                 Groundwork.
 
 
diff -ruN src-21.1/info/widget src-21.2/info/widget
--- src-21.1/info/widget	Fri Oct  5 12:20:33 2001
+++ src-21.2/info/widget	Fri Jan 11 09:35:34 2002
@@ -1544,10 +1544,10 @@
 * activate a widget:                     Widget Properties.
 * active widget:                         Widget Properties.
 * append-button-args keyword:            editable-list.
-* args keyword <1>:                      checklist.
-* args keyword <2>:                      editable-list.
-* args keyword <3>:                      menu-choice.
-* args keyword:                          radio-button-choice.
+* args keyword <1>:                      editable-list.
+* args keyword <2>:                      checklist.
+* args keyword <3>:                      radio-button-choice.
+* args keyword:                          menu-choice.
 * atomic sexp widget:                    atoms.
 * basic widgets:                         Introduction.
 * boolean:                               atoms.
@@ -1558,20 +1558,20 @@
 * button-face keyword:                   Basic Types.
 * button-prefix keyword:                 Basic Types.
 * button-suffix keyword:                 Basic Types.
-* buttons keyword <1>:                   checklist.
-* buttons keyword <2>:                   editable-list.
+* buttons keyword <1>:                   editable-list.
+* buttons keyword <2>:                   checklist.
 * buttons keyword:                       radio-button-choice.
 * case-fold keyword:                     menu-choice.
 * character:                             atoms.
 * checkbox widget:                       checkbox.
 * checklist widget:                      checklist.
-* children keyword <1>:                  menu-choice.
-* children keyword <2>:                  editable-list.
-* children keyword <3>:                  checklist.
-* children keyword:                      radio-button-choice.
+* children keyword <1>:                  editable-list.
+* children keyword <2>:                  checklist.
+* children keyword <3>:                  radio-button-choice.
+* children keyword:                      menu-choice.
 * choice:                                composite.
-* choice keyword <1>:                    menu-choice.
-* choice keyword:                        radio-button-choice.
+* choice keyword <1>:                    radio-button-choice.
+* choice keyword:                        menu-choice.
 * choice-item widget:                    choice-item.
 * composite sexp widgets:                composite.
 * cons:                                  composite.
@@ -1590,9 +1590,9 @@
 * editable-field widget:                 editable-field.
 * editable-list widget:                  editable-list.
 * embedded buttons:                      User Interface.
-* entry-format keyword <1>:              radio-button-choice.
+* entry-format keyword <1>:              editable-list.
 * entry-format keyword <2>:              checklist.
-* entry-format keyword:                  editable-list.
+* entry-format keyword:                  radio-button-choice.
 * example of using widgets:              Programming Example.
 * extra-offset keyword:                  Basic Types.
 * file:                                  atoms.
@@ -1673,8 +1673,8 @@
 * widget-browse:                         Widget Browser.
 * widget-browse-at:                      Widget Browser.
 * widget-browse-other-window:            Widget Browser.
-* widget-button-click <1>:               User Interface.
-* widget-button-click:                   Setting Up the Buffer.
+* widget-button-click <1>:               Setting Up the Buffer.
+* widget-button-click:                   User Interface.
 * widget-button-face:                    User Interface.
 * widget-button-prefix:                  Basic Types.
 * widget-button-press <1>:               Setting Up the Buffer.
diff -ruN src-21.1/info/woman src-21.2/info/woman
--- src-21.1/info/woman	Fri Oct  5 12:20:34 2001
+++ src-21.2/info/woman	Fri Jan 11 09:35:35 2002
@@ -1493,8 +1493,8 @@
 * n:                                     Navigation.
 * p:                                     Navigation.
 * q:                                     Changing.
-* r:                                     References.
 * R:                                     Changing.
+* r:                                     References.
 * RET:                                   References.
 * s:                                     Navigation.
 * SPC:                                   Navigation.
diff -ruN src-21.1/leim/ChangeLog src-21.2/leim/ChangeLog
--- src-21.1/leim/ChangeLog	Sat Oct 20 18:15:41 2001
+++ src-21.2/leim/ChangeLog	Sat Mar 16 11:47:53 2002
@@ -1,3 +1,11 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
+2001-11-29  Dave Love  <fx@gnu.org>
+
+	* quail/latin-ltx.el: Fix some Latin-4 characters.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
Binary files src-21.1/leim/ja-dic/ja-dic.elc and src-21.2/leim/ja-dic/ja-dic.elc differ
Binary files src-21.1/leim/quail/cyril-jis.elc and src-21.2/leim/quail/cyril-jis.elc differ
Binary files src-21.1/leim/quail/cyrillic.elc and src-21.2/leim/quail/cyrillic.elc differ
Binary files src-21.1/leim/quail/czech.elc and src-21.2/leim/quail/czech.elc differ
Binary files src-21.1/leim/quail/devanagari.elc and src-21.2/leim/quail/devanagari.elc differ
Binary files src-21.1/leim/quail/ethiopic.elc and src-21.2/leim/quail/ethiopic.elc differ
Binary files src-21.1/leim/quail/greek.elc and src-21.2/leim/quail/greek.elc differ
Binary files src-21.1/leim/quail/hangul.elc and src-21.2/leim/quail/hangul.elc differ
Binary files src-21.1/leim/quail/hangul3.elc and src-21.2/leim/quail/hangul3.elc differ
Binary files src-21.1/leim/quail/hanja-jis.elc and src-21.2/leim/quail/hanja-jis.elc differ
Binary files src-21.1/leim/quail/hanja.elc and src-21.2/leim/quail/hanja.elc differ
Binary files src-21.1/leim/quail/hanja3.elc and src-21.2/leim/quail/hanja3.elc differ
Binary files src-21.1/leim/quail/hebrew.elc and src-21.2/leim/quail/hebrew.elc differ
Binary files src-21.1/leim/quail/ipa.elc and src-21.2/leim/quail/ipa.elc differ
Binary files src-21.1/leim/quail/japanese.elc and src-21.2/leim/quail/japanese.elc differ
Binary files src-21.1/leim/quail/lao.elc and src-21.2/leim/quail/lao.elc differ
Binary files src-21.1/leim/quail/latin-alt.elc and src-21.2/leim/quail/latin-alt.elc differ
diff -ruN src-21.1/leim/quail/latin-ltx.el src-21.2/leim/quail/latin-ltx.el
--- src-21.1/leim/quail/latin-ltx.el	Mon Jul 16 22:22:24 2001
+++ src-21.2/leim/quail/latin-ltx.el	Thu Nov 29 20:58:36 2001
@@ -4,6 +4,8 @@
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 2001  Free Software Foundation, Inc.
 
+;; Author: TAKAHASHI Naoto <ntakahas@m17n.org>
+;;         Dave Love <fx@gnu.org>
 ;; Keywords: multilingual, input, Greek, i18n
 
 ;; This file is part of GNU Emacs.
@@ -68,7 +70,7 @@
  ("\\^{A}" ?,AB(B)  ("\\^A" ?,AB(B)
  ("\\~{A}" ?,AC(B)  ("\\~A" ?,AC(B)
  ("\\\"{A}" ?,AD(B)  ("\\\"A" ?,AD(B)
- ("\\\k{A}" ?,B!(B)
+ ("\\\k{A}" ?$,1 $(B)
  ("{\\AA}" ?,AE(B) ("\\AA" ?,AE(B)
  ("{\\AE}" ?,AF(B) ("\\AE" ?,AF(B)
  ("\\c{C}" ?,AG(B)  ("\\cC" ?,AG(B)
@@ -76,12 +78,12 @@
  ("\\'{E}" ?,AI(B)  ("\\'E" ?,AI(B)
  ("\\^{E}" ?,AJ(B)  ("\\^E" ?,AJ(B)
  ("\\\"{E}" ?,AK(B)  ("\\\"E" ?,AK(B)
- ("\\\k{E}" ?,BJ(B)
+ ("\\\k{E}" ?$,1 8(B)
  ("\\`{I}" ?,AL(B)  ("\\`I" ?,AL(B)
  ("\\'{I}" ?,AM(B)  ("\\'I" ?,AM(B)
  ("\\^{I}" ?,AN(B)  ("\\^I" ?,AN(B)
  ("\\\"{I}" ?,AO(B)  ("\\\"I" ?,AO(B)
- ("\\\k{I}" ?,DG(B)
+ ("\\\k{I}" ?$,1 N(B)
 
  ("\\~{N}" ?,AQ(B)  ("\\~N" ?,AQ(B)
  ("\\`{O}" ?,AR(B)  ("\\`O" ?,AR(B)
@@ -96,7 +98,7 @@
  ("\\'{U}" ?,AZ(B) ("\\'U" ?,AZ(B)
  ("\\^{U}" ?,A[(B) ("\\^U" ?,A[(B)
  ("\\\"{U}" ?,A\(B) ("\\\"U" ?,A\(B)
- ("\\\k{U}" ?,DY(B)
+ ("\\\k{U}" ?$,1!2(B)
  ("\\'{Y}" ?,A](B) ("\\'Y" ?,A](B)
  ("{\\ss}" ?,A_(B) ("\\ss" ?,A_(B)
 
@@ -105,7 +107,7 @@
  ("\\^{a}" ?,Ab(B) ("\\^a" ?,Ab(B)
  ("\\~{a}" ?,Ac(B) ("\\~a" ?,Ac(B)
  ("\\\"{a}" ?,Ad(B) ("\\\"a" ?,Ad(B)
- ("\\\k{a}" ?,B1(B)
+ ("\\\k{a}" ?$,1 %(B)
  ("{\\aa}" ?,Ae(B) ("\\aa" ?,Ae(B)
  ("{\\ae}" ?,Af(B) ("\\ae" ?,Af(B)
  ("\\c{c}" ?,Ag(B) ("\\cc" ?,Ag(B)
@@ -113,12 +115,12 @@
  ("\\'{e}" ?,Ai(B) ("\\'e" ?,Ai(B)
  ("\\^{e}" ?,Aj(B) ("\\^e" ?,Aj(B)
  ("\\\"{e}" ?,Ak(B) ("\\\"e" ?,Ak(B)
- ("\\\k{e}" ?,Bj(B)
+ ("\\\k{e}" ?$,1 9(B)
  ("\\`{\\i}" ?,Al(B)  ("\\`i" ?,Al(B)
  ("\\'{\\i}" ?,Am(B)  ("\\'i" ?,Am(B)
  ("\\^{\\i}" ?,An(B) ("\\^i" ?,An(B)
  ("\\\"{\\i}" ?,Ao(B) ("\\\"i" ?,Ao(B)
- ("\\\k{i}" ?,Dg(B)
+ ("\\\k{i}" ?$,1 O(B)
 
  ("\\~{n}" ?,Aq(B) ("\\~n" ?,Aq(B)
  ("\\`{o}" ?,Ar(B) ("\\`o" ?,Ar(B)
@@ -133,7 +135,7 @@
  ("\\'{u}" ?,Az(B) ("\\'u" ?,Az(B)
  ("\\^{u}" ?,A{(B) ("\\^u" ?,A{(B)
  ("\\\"{u}" ?,A|(B) ("\\\"u" ?,A|(B)
- ("\\\k{u}" ?,Dy(B)
+ ("\\\k{u}" ?$,1!3(B)
  ("\\'{y}" ?,A}(B) ("\\'y" ?,A}(B)
  ("\\\"{y}" ?,A(B) ("\\\"y" ?,A(B)
 
Binary files src-21.1/leim/quail/latin-ltx.elc and src-21.2/leim/quail/latin-ltx.elc differ
Binary files src-21.1/leim/quail/latin-post.elc and src-21.2/leim/quail/latin-post.elc differ
Binary files src-21.1/leim/quail/latin-pre.elc and src-21.2/leim/quail/latin-pre.elc differ
Binary files src-21.1/leim/quail/lrt.elc and src-21.2/leim/quail/lrt.elc differ
Binary files src-21.1/leim/quail/py-punct.elc and src-21.2/leim/quail/py-punct.elc differ
Binary files src-21.1/leim/quail/pypunct-b5.elc and src-21.2/leim/quail/pypunct-b5.elc differ
Binary files src-21.1/leim/quail/slovak.elc and src-21.2/leim/quail/slovak.elc differ
Binary files src-21.1/leim/quail/symbol-ksc.elc and src-21.2/leim/quail/symbol-ksc.elc differ
Binary files src-21.1/leim/quail/thai.elc and src-21.2/leim/quail/thai.elc differ
Binary files src-21.1/leim/quail/tibetan.elc and src-21.2/leim/quail/tibetan.elc differ
Binary files src-21.1/leim/quail/viqr.elc and src-21.2/leim/quail/viqr.elc differ
diff -ruN src-21.1/lib-src/ChangeLog src-21.2/lib-src/ChangeLog
--- src-21.1/lib-src/ChangeLog	Sat Oct 20 18:15:26 2001
+++ src-21.2/lib-src/ChangeLog	Sat Mar 16 11:48:21 2002
@@ -1,3 +1,41 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
+2002-03-12  Francesco Potorti`  <pot@gnu.org>
+
+	* etags.c (Python_functions): Skip spaces at beginning of lines.
+
+2002-02-15  Richard M. Stallman  <rms@gnu.org>
+
+	* cvtmail.c (xrealloc): Always pass two args to `fatal'.
+
+	* movemail.c (popmail): Always pass two args to `error'.
+
+2002-02-15  Gerd Moellmann  <gerd@gnu.org>
+
+	* emacsserver.c (main): Cast geteuid in sprintf to int.
+
+	* emacsclient.c (main): Cast isdigit argument to unsigned char.
+
+2002-02-10  Paul Eggert  <eggert@twinsun.com>
+
+	* rcs-checkin: Use `sort -k 2', not `sort +1', as POSIX 1003.1-2001
+	disallows the old syntax.
+
+2002-02-03  Paul Eggert  <eggert@twinsun.com>
+
+	* rcs2log (Copyright): Update to 2002.
+	Add '(C)' as per coding guidelines.
+	(AWK, TMPDIR): Work around portability problem in broken shells that
+	don't understand `: ${VAR=val}'.
+	(SORT_K_OPTIONS): New var, for hosts that conform to POSIX 1003.1-2001.
+	Prefer the new -k option to the traditional +M -N option.
+
+2001-11-16  Gerd Moellmann  <gerd@gnu.org>
+
+	* ebrowse.c (matching_regexp): Escape '\\'.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
diff -ruN src-21.1/lib-src/cvtmail.c src-21.2/lib-src/cvtmail.c
--- src-21.1/lib-src/cvtmail.c	Wed Jul 17 00:08:43 1996
+++ src-21.2/lib-src/cvtmail.c	Fri Feb 22 11:51:23 2002
@@ -174,6 +174,6 @@
 {
   char *result = realloc (ptr, size);
   if (!result)
-    fatal ("virtual memory exhausted");
+    fatal ("virtual memory exhausted", 0);
   return result;
 }
diff -ruN src-21.1/lib-src/ebrowse.c src-21.2/lib-src/ebrowse.c
--- src-21.1/lib-src/ebrowse.c	Mon Oct  1 09:25:14 2001
+++ src-21.2/lib-src/ebrowse.c	Fri Nov 16 11:49:37 2001
@@ -2050,7 +2050,7 @@
     {
       *--s = *--t;
 
-      if (*s == '"')
+      if (*s == '"' || *s == '\\')
         *--s = '\\';
     }
 
diff -ruN src-21.1/lib-src/emacsclient.c src-21.2/lib-src/emacsclient.c
--- src-21.1/lib-src/emacsclient.c	Tue Jul 17 12:57:25 2001
+++ src-21.2/lib-src/emacsclient.c	Fri Feb 22 11:51:23 2002
@@ -425,7 +425,7 @@
       if (*argv[i] == '+')
 	{
 	  char *p = argv[i] + 1;
-	  while (isdigit (*p) || *p == ':') p++;
+	  while (isdigit ((unsigned char) *p) || *p == ':') p++;
 	  if (*p != 0)
 	    fprintf (out, "%s/", quote_file_name (cwd));
 	}
diff -ruN src-21.1/lib-src/emacsserver.c src-21.2/lib-src/emacsserver.c
--- src-21.1/lib-src/emacsserver.c	Tue Jan  2 14:52:04 2001
+++ src-21.2/lib-src/emacsserver.c	Fri Feb 22 11:51:23 2002
@@ -267,7 +267,7 @@
     }
 
 #ifndef SERVER_HOME_DIR
-  sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
+  sprintf (server.sun_path, "/tmp/esrv%d-%s", (int) geteuid (), system_name);
 
   if (unlink (server.sun_path) == -1 && errno != ENOENT)
     {
diff -ruN src-21.1/lib-src/etags.c src-21.2/lib-src/etags.c
--- src-21.1/lib-src/etags.c	Mon Sep 17 17:47:23 2001
+++ src-21.2/lib-src/etags.c	Wed Mar 13 20:51:30 2002
@@ -4028,8 +4028,9 @@
 
 /*
  * Python support
- * Look for /^def[ \t\n]+[^ \t\n(:]+/ or /^class[ \t\n]+[^ \t\n(:]+/
+ * Look for /^[\t]*def[ \t\n]+[^ \t\n(:]+/ or /^class[ \t\n]+[^ \t\n(:]+/
  * Eric S. Raymond <esr@thyrsus.com> (1997)
+ * More ideas by seb bacon <seb@jamkit.com> (2002)
  */
 static void
 Python_functions (inf)
@@ -4039,6 +4040,7 @@
 
   LOOP_ON_INPUT_LINES (inf, lb, cp)
     {
+      cp = skip_spaces (cp);
       if (*cp++ == 'd'
 	  && *cp++ == 'e'
 	  && *cp++ == 'f' && iswhite (*cp++))
@@ -4050,7 +4052,7 @@
 		  lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
 	}
 
-      cp = lb.buffer;
+      cp = skip_spaces (lb.buffer);
       if (*cp++ == 'c'
 	  && *cp++ == 'l'
 	  && *cp++ == 'a'
diff -ruN src-21.1/lib-src/movemail.c src-21.2/lib-src/movemail.c
--- src-21.1/lib-src/movemail.c	Mon Sep  4 17:24:54 2000
+++ src-21.2/lib-src/movemail.c	Fri Feb 22 11:51:23 2002
@@ -811,7 +811,7 @@
 #ifdef BSD_SYSTEM
   if (fsync (mbfi) < 0)
     {
-      error ("Error in fsync: %s", strerror (errno));
+      error ("Error in fsync: %s", strerror (errno), 0);
       return (1);
     }
 #endif
diff -ruN src-21.1/lib-src/rcs-checkin src-21.2/lib-src/rcs-checkin
--- src-21.1/lib-src/rcs-checkin	Tue Feb 20 14:29:09 2001
+++ src-21.2/lib-src/rcs-checkin	Fri Feb 22 11:51:23 2002
@@ -2,7 +2,7 @@
 
 # This script accepts any number of file arguments and checks them into RCS.
 
-# Copyright (C) 1993, 1994, 1995,2001 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1995, 2001, 2002 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -73,7 +73,7 @@
 	# Get list of old files.
 	oldfiles=`
 		ls $file.~[0-9]*~ 2>/dev/null |
-		sort -t~ -n +1
+		sort -t~ -n -k 2
 	`
 
 	# Check that they are properly sorted by date.
diff -ruN src-21.1/lib-src/rcs2log src-21.2/lib-src/rcs2log
--- src-21.1/lib-src/rcs2log	Thu Sep  6 01:07:46 2001
+++ src-21.2/lib-src/rcs2log	Wed Feb  6 12:47:22 2002
@@ -29,9 +29,9 @@
 
 Report bugs to <bug-gnu-emacs@gnu.org>.'
 
-Id='$Id: rcs2log,v 1.48 2001/09/05 23:07:46 eggert Exp $'
+Id='$Id: rcs2log,v 1.48.4.1 2002/02/03 17:45:30 eggert Exp $'
 
-# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002
 #  Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-Copyright='Copyright 2001 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2002 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
@@ -79,8 +79,8 @@
 # Parse options.
 
 # defaults
-: ${AWK=awk}
-: ${TMPDIR=/tmp}
+AWK=${AWK-awk}
+TMPDIR=${TMPDIR-/tmp}
 changelog=ChangeLog # change log file name
 datearg= # rlog date option
 hostname= # name of local host (if empty, will deduce it later)
@@ -354,6 +354,12 @@
 esac
 
 
+# Prefer the POSIX-style -k options, since POSIX 1003.1-2001 prohibits
+# support for the traditional-style +M -N options.
+SORT_K_OPTIONS='-k 3,4r -k 5 -k 1'
+sort $SORT_K_OPTIONS </dev/null 2>/dev/null || SORT_K_OPTIONS='+2 -4r +4 +0'
+
+
 # Get the full name of each author the logs mention, and set initialize_fullname
 # to awk code that initializes the `fullname' awk associative array.
 # Warning: foreign authors (i.e. not known in the passwd file) are mishandled;
@@ -615,7 +621,7 @@
 # Sort the log entries, first by date+time (in reverse order),
 # then by author, then by log entry, and finally by file name and revision
 # (just in case).
-sort -t"$SOH" +2 -4r +4 +0 |
+sort -t"$SOH" $SORT_K_OPTIONS |
 
 # Finally, reformat the sorted log entries.
 $AWK -F"$SOH" '
diff -ruN src-21.1/lisp/ChangeLog src-21.2/lisp/ChangeLog
--- src-21.1/lisp/ChangeLog	Sat Oct 20 18:15:00 2001
+++ src-21.2/lisp/ChangeLog	Sat Mar 16 11:41:34 2002
@@ -1,3 +1,690 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
+2002-03-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+	* calendar/cal-french.el (calendar-goto-french-date): Fix prompt
+	to match the actual code.
+
+2002-03-11  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+	* image.el (image-type-from-file-header): Make temporary buffer
+	unibyte.
+
+2002-03-09  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* simple.el (shell-command-on-region): Call push-mark with
+	non-nil second arg, to suppress the "Mark set" message.
+
+2002-03-07  Gerd Moellmann  <gerd@gnu.org>
+
+	* progmodes/ebrowse.el (ebrowse-view/find-file-and-search-pattern): 
+	Use the other-window instead of the other-frame functions when
+	the window is dedicated.
+
+2002-03-05  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* language/european.el (mac-roman): Fix the safe-chars property.
+
+2002-03-05  Andre Spiegel  <spiegel@gnu.org>
+
+	* vc.el (vc-revert-buffer): If the buffer is not saved, prompt
+	the user to do that first.
+
+2002-03-03  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* textmodes/tex-mode.el (tex-guess-main-file): Handle the case
+	where one of the buffers is narrowed.
+
+	* newcomment.el (comment-forward): Use forward-comment to skip
+	over whitespace (or comments) even when comment-use-syntax is nil.
+
+2002-03-02  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+	* textmodes/tildify.el (tildify-string-alist): Entry for xml-mode
+	added.  From Milan Zamazal <pdm@zamazal.org>.
+
+2002-03-01  Andreas Schwab  <schwab@suse.de>
+
+	* textmodes/texnfo-upd.el (texinfo-start-menu-description): Remove
+	extra paren in regexp.  From Michael Scholz <scholz-micha@gmx.de>.
+
+2002-02-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* international/mule-conf.el (ctext-no-compositions): Remove the
+	mime-charset property.
+
+	* language/european.el ("Dutch"): Doc fix.
+
+2002-02-25  Jason Rumney  <jasonr@gnu.org>
+
+	* language/japanese.el (iso-2022-jp-2): Add init-bol flag.
+
+2002-02-24  Jason Rumney  <jasonr@gnu.org>
+
+	* w32-fns.el (w32-charset-info-alist): Use ansi fonts for
+	iso10646-1 if unicode is not available.
+
+2002-02-22  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* diff-mode.el (diff-end-of-hunk): Watch out for ambiguous headers.
+
+2002-02-22  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* progmodes/etags.el (find-tag-noselect, find-tag)
+	(find-tag-other-window, find-tag-other-frame, find-tag-regexp):
+	Fix a typo in doc strings.
+
+2002-02-22  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	Support for ICCCM  Extended Segments in X selections:
+
+	* international/mule-conf.el (ctext-no-compositions)
+	(compound-text-with-extensions): New coding systems.
+	(x-ctext-with-extensions, ctext-with-extensions): Aliases for
+	compound-text-with-extensions.
+	(non-standard-icccm-encodings-alist)
+	(non-standard-designations-alist): New variables.
+	(ctext-post-read-conversion, ctext-pre-write-conversion):
+	New functions.
+
+2002-02-18  Andreas Schwab  <schwab@suse.de>
+
+	* replace.el (query-replace-regexp-eval): Doc fix.
+
+2002-02-15  Andreas Schwab  <schwab@suse.de>
+
+	* textmodes/tex-mode.el (tex-font-lock-keywords-2):
+	Require non-letter after specials.
+
+2002-02-12  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* window.el (save-selected-window): If the saved window has
+	become dead while macro body was running, refrain from switching
+	to it.
+
+	* progmodes/pascal.el (pascal-imenu-generic-expression):
+	Add menu-title and fix parentheses.
+
+2002-02-08  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* ffap.el (ffap-newsgroup-p): Test for non-nil symbol-value of htb.
+
+	* calendar/cal-menu.el (calendar-mode-map): Change the menu item's
+	name to "Insert Diary Entry".
+
+2002-02-08  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* net/ange-ftp.el (ange-ftp-process-handle-line)
+	(ange-ftp-set-xfer-size): If the file's size is a float, divide
+	by 1024 instead of using ash.
+
+2002-02-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mail/rmail.el (rmail-enable-mime-composing): New. A lightweight
+	version of rmail-enable-mime.
+	(rmail-forward): Use it.
+
+2002-02-06  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
+
+	* textmodes/sgml-mode.el (sgml-start-tag-regex)
+	(sgml-font-lock-keywords-1, sgml-mode-common): Allow underscore,
+	colon, non-ASCII letters.
+	(sgml-name-char): Don't assume anything about charsets handled by
+	encode-char.
+	(sgml-name-8bit-mode): Doc fix.
+	(sgml-font-lock-keywords-1): Remove comment pattern.
+	(sgml-mode-common): Set font-lock-syntactic-keywords.
+	From Dave Love <fx@gnu.org>.
+
+2002-02-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* play/pong.el (pong-height): Don't use height that exceeds the
+	frame height.
+	(pong-border-options): Make the border colors slightly more bright.
+
+	* play/gamegrid.el (gamegrid-display-type): Treat any
+	color-capable display as color-x, if display-color-p is fboundp.
+	(gamegrid-make-color-x-face): Don't call gamegrid-color twice.
+	(gamegrid-make-color-tty-face): Use the value of color, not the
+	symbol itself.  Don't call gamegrid-color.
+
+2002-02-05  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* gud.el (gud-refresh): Call recenter only after we are sure we
+	are in the right window.
+
+2002-02-03  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* mail/rmail.el (rmail): Use find-buffer-visiting instead of
+	get-file-buffer to check for rmail buffer existence.
+
+	* term.el (term-emulate-terminal): Extract proper command string
+	which is supplied to term-command-hook.
+
+2002-02-02  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* mail/uce.el (uce-reply-to-uce): Prune the headers before copying
+	the message text into the *mail* buffer, and restore the pruned
+	state after that.
+
+	* mail/rmail.el (rmail-redecode-body): Prune the headers before
+	looking for X-Coding-System header, and restore the pruned state
+	before returning.
+
+2002-02-02  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
+
+	* cus-edit.el (customize-save-variable): Fix typo in prompt.
+
+2002-02-02  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* novice.el (disable-command, enable-command): If user-init-file
+	is nil or does not exist, default to "~/.emacs" (~/_emacs on DOS
+	and, maybe, Windows).  But don't alter the init file if Emacs was
+	invoked as "emacs -q"
+
+2002-02-01  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* mail/sendmail.el (mail-mode) <adaptive-fill-first-line-regexp>:
+	Undo half of last change.
+
+	* hi-lock.el (hi-lock-find-patterns): Save restriction.
+
+2002-01-29  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
+
+	* tmm.el (tmm-get-keymap): Honour :visible in `menu-item'.
+	Add Keywords header.  Update Commentary section.
+	Update copyright notice.
+
+2002-01-28  Richard Stallman  <rms@gnu.org>
+
+	* cus-edit.el (custom-save-all): Bind file-precious-flag to t
+	for saving .emacs.
+
+	* files.el (basic-save-buffer-2): Ignore file-error in delete-file.
+
+2002-01-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* eshell/esh-cmd.el (eshell-eval-command): If eshell-resume-eval
+	returns t, don't treat that as an error.
+
+2002-01-25  Jason Rumney  <jasonr@gnu.org>
+
+	* faces.el (face-font-registry-alternatives) [windows-nt]:
+	Add ms-oemlatin as an alternative for iso8859-1.
+
+2002-01-25  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* emacs-lisp/cl-seq.el (mismatch): Doc fix.
+
+2002-01-22  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* mail/sendmail.el (mail-mode): ">" is not a supercite-style prefix
+	and is already matched by adaptive-fill-regexp.
+
+2002-01-22  Richard M. Stallman  <rms@gnu.org>
+
+	* net/ange-ftp.el (ange-ftp-canonize-filename): Avoid duplicate
+	slash if DIR is just slash.
+
+	* textmodes/ispell.el (ispell-help): Clean up echo area if user quits.
+
+2002-01-20  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* international/quail.el (quail-start-translation)
+	(quail-start-conversion): Bind last-command-event, last-command,
+	and this-command in the first let.  This fixes the change from
+	2000-08-30.
+
+2002-01-18  Juanma Barranquero  <lektu@terra.es>
+
+	* files.el (save-abbrevs, save-some-buffers): Don't ask the user
+	before saving abbrevs if `save-abbrevs' has the value `silently'.
+
+2002-01-16  Richard M. Stallman  <rms@gnu.org>
+
+	* net/net-utils.el (network-connection-service-abbrev-alist):
+	New variable.
+	(network-connection-mode-setup): Use it.
+
+	* delsel.el (delete-selection-pre-hook): Handle and resignal
+	file-supersession errors to interact properly with userlock.el.
+
+2002-01-16  Andreas Schwab  <schwab@suse.de>
+
+	* mail/feedmail.el (feedmail): Fix :link spec.
+
+2002-01-15  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* calendar/calendar.el (diary-date-forms): Doc fix.
+
+2002-01-14  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* net/ange-ftp.el (ange-ftp-get-process, ange-ftp-send-cmd)
+	(ange-ftp-file-name-all-completions, ange-ftp-file-name-completion)
+	(ange-ftp-insert-directory): Preserve match-data.
+	(ange-ftp-shell-command): Strip port number from the host if present.
+
+2002-01-13  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* files.el (find-file-noselect): Don't consider a buffer as
+	visiting a file literally if it is in hexl-mode.
+
+2001-12-29  Richard M. Stallman  <rms@gnu.org>
+
+	* net/ange-ftp.el (ange-ftp-allow-child-lookup): Always return nil.
+	This fixes a bug that treated all files as directories.
+	(ange-ftp-insert-directory): Explicitly follow symlinks.
+
+2001-12-28  Simon Josefsson  <jas@extundo.com>
+
+	* mail/sendmail.el (mail-envelope-from): Fix :type.
+	(sendmail-send-it): Copy `mail-envelope-from' from calling buffer.
+
+2001-12-28  Richard M. Stallman  <rms@gnu.org>
+
+	* net/ldap.el (ldap-search-internal): Handle <file://...> in results.
+
+2001-12-26  Markus Rost  <rost@math.ohio-state.edu>
+
+	* find-dired.el (find-dired-sentinel): Precede exit message by
+	two spaces, to match the regexp in dired-between-files.
+
+2001-12-26  Richard M. Stallman  <rms@gnu.org>
+
+	* progmodes/compile.el (compile-internal):
+	Set TERM variable in process-environment.
+
+2001-12-21  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info.el (Info-select-node): If Info-use-header-line is nil, set
+	header-line-format to nil.
+	(Info-fontify-node): Don't put a keymap text property on the
+	heading if we are not going to display the header line.  Remove
+	any such text properties left over from past visits to this node.
+
+2001-12-21  Richard M. Stallman  <rms@gnu.org>
+
+	* net/ange-ftp.el (ange-ftp-file-modtime): Use save-match-data.
+
+	* emacs-lisp/easy-mmode.el (define-minor-mode):
+	Make no arg by default in an interactive call,
+	so that repeating the command toggles again.
+
+	* emacs-lisp/lisp-mode.el (eval-defun-1): Cope with atoms as args.
+
+2001-12-18  Dave Love  <fx@gnu.org>
+
+	* progmodes/f90.el (f90-break-line): Avoid infinite recursion
+	calling `newline'.
+
+2001-12-14  Andre Spiegel  <spiegel@gnu.org>
+
+	* vc-hooks.el (vc-checkout-model, vc-state, vc-workfile-version):
+	Return nil if FILE is not registered.
+	(vc-check-master-templates, vc-default-make-version-backups-p):
+	Doc fix.
+
+2001-12-13  Richard M. Stallman  <rms@gnu.org>
+
+	* font-lock.el (font-lock-mode):
+	Put our function at the end of after-change-functions.
+
+	* emacs-lisp/advice.el (ad-compile-function):
+	Byte compile the function under another (uninterned) name.
+
+2001-12-10  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* mail/smtpmail.el (smtpmail-send-queued-mail): Insert the
+	enqueued messages literally.
+
+2001-12-01  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* indent.el (tab-to-tab-stop): Use delete-horizontal-space.
+
+2001-12-01  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* progmodes/idlwave.el, progmodes/idlw-rinfo.el:
+	* progmodes/idlw-shell.el, progmodes/idlw-toolbar.el:
+	Update maintainer.
+
+2001-11-30  Andre Spiegel  <spiegel@gnu.org>
+
+	* vc-cvs.el (vc-cvs-parse-status): Store file state in property,
+	don't just return it.
+
+2001-11-29  Dave Love  <fx@gnu.org>
+
+	* progmodes/fortran.el: Fontify rewind, backspace.  Doc fixes.
+	(fortran-beginning-do, fortran-beginning-if): Fix regexp typos.
+
+	* international/mule.el (map-charset-chars): New function.
+	(register-char-codings): Use it to cope with generic chars in
+	safe-chars.
+
+2001-11-27  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* emacs-lisp/regexp-opt.el (regexp-opt-depth): Fix off-by-two error.
+
+2001-11-21  Richard M. Stallman  <rms@gnu.org>
+
+	* files.el (temporary-file-directory, null-device)
+	(small-temporary-file-directory): Definitions moved up.
+
+	* international/encoded-kb.el: Don't alter minor-mode-alist.
+
+2001-11-20  Kai Grossjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+	* files.el (auto-save-file-name-transforms): Put remote files in
+	temporary-file-directory rather than /tmp.
+
+2001-11-20  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* progmodes/tcl.el (tcl-indent-for-comment): Handle the case where
+	`comment-indent-function' returns nil.
+
+2001-11-20  Jason Rumney  <jasonr@gnu.org>
+
+	* w32-fns.el (w32-system-coding-system): Initialize from
+	locale-coding-system.
+
+2001-11-20  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* play/landmark.el: Mark lm-mode as special.
+
+	* play/gomoku.el: Mark gomoku-mode as special.
+
+2001-11-20  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* progmodes/cperl-mode.el (cperl-perldoc): Require man before binding
+	`manual-program'.
+
+2001-11-19  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* progmodes/cc-engine.el (c-parse-state): Typo. From Martin Stjernholm.
+
+	* newcomment.el (comment-padding): Add :type and :group.
+
+2001-11-18  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* newcomment.el (comment-indent):
+	Fix misindentation for comment-only lines.
+
+2001-11-16  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* rect.el (delete-rectangle-line): Fix pos/column confusion.
+
+2001-11-15  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* menu-bar.el (menu-bar-edit-menu) <copy>: Put an explicit key binding.
+
+2001-11-15  Andreas Schwab  <schwab@suse.de>
+
+	* progmodes/ada-mode.el (ada-add-extensions): Quote regexp special
+	characters and append anchor to pattern added to auto-mode-alist.
+
+2001-11-15  Andre Spiegel  <spiegel@gnu.org>
+
+	* vc.el: Documentation fixes.
+
+2001-11-14  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* smerge-mode.el (smerge-match-conflict): Fix typo.
+	(smerge-diff): Be careful to read match-data early enough.
+
+2001-11-14  Andre Spiegel  <spiegel@gnu.org>
+
+	* vc.el (vc-diff-internal, vc-coding-system-for-diff)
+	(vc-default-diff-tree): New functions.
+	(vc-version-diff): Use them.  As a result, coding systems are now
+	set up properly for all sorts of diffs, and tree diffs can now
+	also be done locally.
+	(vc-diff): With a prefix argument, don't require that it's called
+	from a buffer under version control.
+
+	* vc-cvs.el (vc-cvs-diff-tree): New function.
+
+2001-11-13  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* newcomment.el (comment-normalize-vars): Handle a nil comment-padding.
+
+	* progmodes/ada-mode.el (ada-fill-comment-prefix): GNAT wants 2 spaces.
+	From Emmanuel Briot <briot@act-europe.fr>.
+
+2001-11-12  Richard M. Stallman  <rms@gnu.org>
+
+	* calendar/todo-mode.el (todo-save): Add save-excursion
+	and save-restriction.
+
+2001-11-12  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* menu-bar.el (menu-bar-edit-menu): Don't use x-selection-exists-p if
+	it is not fboundp.
+	(clipboard-yank): Ditto.
+
+2001-11-10  Jason Rumney  <jasonr@gnu.org>
+
+	* term/w32-win.el (redisplay-dont-pause): Don't set.
+
+2001-11-09  Andre Spiegel  <spiegel@gnu.org>
+
+	Suggested by Kalle Olavi Niemitalo <kon@iki.fi>:
+
+	* vc-hooks.el (vc-error-occured): Backquotified.
+	(vc-file-prop-obarray): Use prime length for better efficiency.
+
+	* vc.el (vc-clear-context): Fill obarray with 0, not nil.
+	(vc-annotate-color-map): Doc fix.
+
+2001-11-08  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* international/mule.el (make-translation-table): Doc fix.
+	Suggested by Alex Schroeder <alex@gnu.org>.
+
+2001-11-05  Richard M. Stallman  <rms@gnu.org>
+
+	* emacs-lisp/lisp-mode.el (eval-last-sexp-1): Return the value
+	of the evaluated form.
+
+2001-11-03  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* term.el (all faces): Don't (copy-face 'default <foo>).
+
+2001-11-03  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* tooltip.el (tooltip-delay): Decrease to 0.7.
+	(tooltip-hide-delay): Enlarge to 10.
+
+2001-11-03  Richard M. Stallman  <rms@gnu.org>
+
+	* mouse.el (popup-menu): If the user refuses to select
+	from a menu, don't try to invoke the menu.
+
+2001-11-03  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* frame.el (set-background-color, set-foreground-color):
+	Call face-set-after-frame-default, to propagate the new colors to
+	the frame's parameters alist.
+
+	* calendar/timeclock.el (timeclock-out): Signal an error if
+	timeclock-last-event is nil.
+
+2001-11-01  Richard M. Stallman  <rms@gnu.org>
+
+	* files.el (find-backup-file-name): Use make-backup-file-name.
+
+2001-11-01  Gerd Moellmann  <gerd@gnu.org>
+
+	* startup.el (command-line): If the terminal Emacs is running on
+	has erase char set to ^H, use the Backspace key for deleting
+	backward, and the Delete key for deleting forward.
+
+2001-10-31  Jason Rumney  <jasonr@gnu.org>
+
+	* international/mule-cmds.el (locale-language-names): Add chs and
+	cht as aliases for Chinese-GB and Chinese-BIG5.
+
+2001-10-30  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* progmodes/perl-mode.el (perl-indent-line): Use `eq' to compare
+	output of `char-after'.
+
+	* progmodes/autoconf.el (autoconf-mode): Fix comment-start-skip.
+
+2001-10-30  Gerd Moellmann  <gerd@gnu.org>
+
+	* international/iso-acc.el (iso-accents-compose): Remove a
+	superfluous setq.
+
+2001-10-29  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* faces.el (invert-face): Check for 'unspecified, not for nil,
+	when testing whether face colors are not specified.
+	From David.Kastrup@t-online.de (David Kastrup).
+
+2001-10-29  Gerd Moellmann  <gerd@gnu.org>
+
+	* international/iso-acc.el (iso-accents-compose): Push SECOND-CHAR
+	as is on unread-command-events instead of `(SECOND-CHAR)'.
+
+	* enriched.el (enriched-face-ans): Handle face attributes
+	of the form `(FACE1 FACE2 ...)'.
+
+	* dired-x.el (dired-omit-startup): Show ``Omit'' only in Dired buffers.
+
+2001-10-29  Alex Schroeder  <kensanata@yahoo.com>
+
+	* progmodes/sql.el (sql-mysql): Doc change by RMS.
+
+	* progmodes/sql.el (sql-db2): Doc change.
+	(sql-help): Doc change by Christian Egli <christian.egli@stest.ch>.
+	(sql-mysql): Doc change by Christian Egli <christian.egli@stest.ch>.
+
+2001-10-29  Richard M. Stallman  <rms@gnu.org>
+
+	* mail/supercite.el (sc-emacs-features): Test for "Emacs 19"
+	by really checking that it is not version 18.
+
+	* emacs-lisp/lisp-mode.el (eval-defun): Doc fix.
+
+2001-10-28  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+	* cus-start.el (recursive-load-depth-limit): Added.
+
+2001-10-28  Masayuki Ataka  <ataka@milk.freemail.ne.jp>
+
+	* textmodes/texinfmt.el (texinfo-format-ifnotinfo): New function.
+	(ifnothtml): New alias.
+
+2001-10-27  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* mail/sendmail.el (mail-mode): Fix ordering in adaptive-fill-regexp.
+
+2001-10-27  Gerd Moellmann  <gerd.moellmann@t-online.de>
+
+	* net/ange-ftp.el (ange-ftp-send-cmd): Call fix-name-func for
+	`mdtm'.  From "Forrest Cahoon" <forrest.cahoon@merrillcorp.com>.
+
+2001-10-26  Tomas Abrahamsson  <tab@lysator.liu.se>
+
+	* textmodes/artist.el (artist-version): 1.2.4.
+	(artist-butlast-fn): New variable.
+	(artist-butlast): New function.
+	(artist-ellipse-mirror-quadrant): Use it.
+	(artist-mouse-draw-poly): Use nil for `point-list'.
+	(artist-mouse-draw-poly): Check for point-list being nil.
+
+2001-10-26  Peter Kleiweg  <kleiweg@let.rug.nl>
+
+	* progmodes/ps-mode.el (ps-mode-print-function): Remove quote for
+	lambda expression.
+	(ps-mode-menu-main): Submenu with options on/off was replaced with
+	a toggle button.
+	(ps-mode, ps-run-mode): Define with `define-derived-mode'
+	(ps-mode): Autoload cookie added on same line as comment
+	(ps-mode-tabkey, ps-mode-backward-delete-char):
+	(ps-mode-r-balance): Replace `delete-horizontal-space' and
+	`indent-to' with `indent-line-to'
+	(ps-mode-print-buffer, ps-mode-print-region): Use `funcall'
+	instead of `eval'.
+	(ps-mode-print-region): Use `with-temp-buffer'.
+	(ps-run-start): Use of `mapconcat'.  Use `apply' instead of	`eval'.
+	(numerous places): Add back-tick and tick around names in
+	docstrings, fix punctuation in docstrings, remove trailing spaces.
+
+2001-10-25  Gerd Moellmann  <gerd@gnu.org>
+
+	* startup.el (normal-top-level): Check for frame-initial-frame
+	only if it's really used.
+
+	* mail/mh-utils.el (mh-recenter): Call recenter with arg `(4)'.
+
+	* progmodes/compile.el (compilation-parse-errors-filename-function):
+	New variable.
+	(compilation-parse-errors): Use it.
+
+2001-10-24  Martin Stjernholm  <bug-cc-mode@gnu.org>
+
+	* progmodes/cc-engine.el (c-beginning-of-member-init-list):
+	Better handling of C++ template args to avoid confusion with `<'
+	and `>' used as operators in member init expressions.
+
+2001-10-24  Gerd Moellmann  <gerd@gnu.org>
+
+	* replace.el (perform-replace): Move START and END parameters
+	to the end of the argument list and make them optional.
+
+	* progmodes/ebrowse.el, progmodes/etags.el: Adapt to change in
+	perform-replace.
+
+	* international/fontset.el (x-must-resolve-font-name): New function.
+	(x-complement-fontset-spec): Use it.
+
+2001-10-23  Gerd Moellmann  <gerd@gnu.org>
+
+	* info.el (Info-fontify-node): Bind down-mouse-{1,2} instead
+	of mouse-{1,2} since dragging is on the down event.
+
+	* play/doctor.el (make-doctor-variables): Remove a '($ please)'.
+
+	* mail/mh-utils.el (mh-recenter): Call `recenter' with arg t
+	if ARG is nil.
+
+	* desktop.el (desktop-last-buffer): New variable.
+	(desktop-create-buffer): Set it.
+	(desktop-read): Bind it and switch to that buffer.
+
+2001-10-22  Gerd Moellmann  <gerd@gnu.org>
+
+	* progmodes/compile.el (compilation-set-window-height):
+	Select old window only if it's still live.
+
+2001-10-22  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* textmodes/sgml-mode.el (sgml-mode-map): Bind 8-bit codes above
+	127 to sgml-maybe-name-self.
+	(sgml-name-8bit-mode): Doc fix.
+	(sgml-char-names-table): New variable.
+	(sgml-name-char): Support non-ASCII and mule-unicode-*
+	characters.  Doc fix.
+	(sgml-maybe-name-self): Convert unibyte characters to multibyte.
+
+	* tooltip.el (tooltip-x-offset, tooltip-y-offset): Mention in the
+	doc string the effect of `left' and `top' parameters in
+	tooltip-frame-parameters, the default values, and the units.
+	(tooltip-frame-parameters): Mention `top' and `left' in the doc string.
+	(tooltip-show): Mention in the doc string the `top' and `left'
+	parameters in tooltip-frame-parameters, and x-max-tooltip-size.
+	(tooltip-set-param): Doc fix.
+
+2001-10-22  Gerd Moellmann  <gerd@gnu.org>
+
+	* saveplace.el (save-place): Require `saveplace'.
+
+	* progmodes/cwarn.el (cwarn-font-lock-feature-keywords-alist):
+	Use `sexp' for :value-type instead of `face'.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
@@ -5,8 +692,7 @@
 2001-10-19  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* files.el (auto-mode-alist): Associate .indent.pro with
-	Fundamental mode.  Suggested by Samuel Padgett
-	<spadgett1@nc.rr.com>.
+	Fundamental mode.  Suggested by Samuel Padgett <spadgett1@nc.rr.com>.
 
 2001-10-18  Eli Zaretskii  <eliz@is.elta.co.il>
 
@@ -100,7 +786,7 @@
 
 	* pcvs-util.el (cvs-prefix-define): Typo cons->concat.
 
-2001-10-03  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-03  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* emulation/tpu-edt.el: Make messages match original TPU/edt
 	editor.  From riepel@Stanford.EDU (Rob Riepel).
@@ -486,7 +1172,7 @@
 	* comint.el (comint-send-input): Handle comint-process-echoes
 	differently.
 
-2001-09-07  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-09-07  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* locate.el (locate-insert-header): Remove unnecessary whitespace.
 
@@ -597,7 +1283,7 @@
 
 	* menu-bar.el (menu-bar-edit-menu) <yank-menu, yank>:
 	Mention "yank" in the help-echo text.
-	Suggested by Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+	Suggested by Pavel Jan,Am(Bk <Pavel@Janik.cz>.
 
 2001-09-01  Stefan Monnier  <monnier@cs.yale.edu>
 
@@ -657,7 +1343,7 @@
 	* startup.el (fancy-splash-screens): Temporarily set
 	minor-mode-map-alist to nil while displaying splash screens.
 
-2001-08-29  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-08-29  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* buff-menu.el: Add Keywords header.
 	Doc fix (C-x C-b is bound to list-buffers).
@@ -741,19 +1427,19 @@
 2001-08-26  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* textmodes/texnfo-upd.el: Remove dots and exclams at end of error
-	messages.  From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+	messages.  From Pavel Jan,Am(Bk <Pavel@Janik.cz>.
 
 	* emacs-lisp/levents.el: Specify FSF as Maintainer.  From Pavel
-	Jan,Bm(Bk <Pavel@Janik.cz>.
+	Jan,Am(Bk <Pavel@Janik.cz>.
 
 	* emacs-lisp/lselect.el: Ditto.
 
 	* hexl.el (hexl-insert-multibyte-char, hexl-insert-char):
 	Remove periods from the end of error message strings.
-	From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+	From Pavel Jan,Am(Bk <Pavel@Janik.cz>.
 
 	* progmodes/antlr-mode.el: Add Keywords header.  From Pavel
-	Jan,Bm(Bk <Pavel@Janik.cz>.
+	Jan,Am(Bk <Pavel@Janik.cz>.
 
 	* net/telnet.el: Ditto.
 
@@ -873,7 +1559,7 @@
 2001-08-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* textmodes/texnfo-upd.el (texinfo-every-node-update): Remove
-	some spaces from a message.  From Pavel Jan,Bm(Bk  <Pavel@Janik.cz>.
+	some spaces from a message.  From Pavel Jan,Am(Bk  <Pavel@Janik.cz>.
 
 	* whitespace.el (whitespace-global-mode): Add autoload cookie.
 
@@ -1047,7 +1733,7 @@
 	text files.
 	(image-jpeg-p): Correct calculation of next field offset.
 
-2001-08-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-08-08  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* battery.el: Fix typo.
 
@@ -1084,7 +1770,7 @@
 	* image.el (image-type-regexps): Use `\`' instead of `^' in
 	most regular expressions.
 
-2001-08-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-08-06  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* play/animate.el: Re-insert a reference to re-inserted function.
 
@@ -1098,7 +1784,7 @@
 	* toolbar/tool-bar.el (tool-bar-add-item-from-menu):
 	Handle old-style menu definitions.
 
-2001-08-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-08-06  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/page.el,
 	* textmodes/text-mode.el, textmodes/two-column.el: Keywords added.
@@ -1107,7 +1793,7 @@
 	* emulation/pc-mode.el, diff.el, textmodes/fill.el, abbrev.el,
 	* add-log.el, faces.el, mail/sc.el: Specify FSF as Maintainer.
 
-2001-08-05  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-08-05  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* textmodes/tildify.el: Milan Zamazal has new address.
 
@@ -1445,7 +2131,7 @@
 	* mail/mh-utils.el (mh-find-progs): Also search in `lib'.
 	From Mats Bengtsson <mats.bengtsson@s3.kth.se>,
 
-2001-07-17  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-17  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* international/iso-transl.el: Fix typo in the header of the file.
 
@@ -1477,7 +2163,7 @@
 	* server.el (server-process-filter, server-visit-files):
 	Add support for +LINE:COLUMN style emacsclient calls.
 
-2001-07-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-16  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* emacs-lisp/easy-mmode.el: Add Keywords header.
 
@@ -1530,7 +2216,7 @@
 
 	* progmodes/ada-xref.el (ada-xref-initialize): Fix call to add-hook.
 
-2001-07-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-16  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* ps-print.el: Fix Author: header.
 
@@ -1543,7 +2229,7 @@
 	send-invisible, which is already defined in Comint.
 	(eshell-watch-for-password-prompt): Use it.
 
-2001-07-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-16  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* which-func.el (which-func-mode): Doc fix.
 
@@ -1602,7 +2288,7 @@
 	* simple.el (set-variable): Require 'cus-edit' instead of
 	`wid-edit', so that the Custom widgets get defined.
 
-2001-07-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-16  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* allout.el: A fix to follow coding conventions.
 
@@ -1628,7 +2314,7 @@
 	* dired.el (dired-insert-set-properties): Fix invalid mouse-face
 	property.
 
-2001-07-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-16  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* play/5x5.el, play/decipher.el, play/dunnet.el, play/fortune.el,
 	* play/gamegrid.el, play/handwrite.el, play/landmark.el,
@@ -1650,7 +2336,7 @@
 	* mail/reporter.el (reporter-submit-bug-report):
 	Don't abuse make-variable-buffer-local.  Fix call to add-hook.
 
-2001-07-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-15  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* calendar/cal-china.el, calendar/cal-coptic.el,
 	* calendar/cal-dst.el, calendar/cal-french.el,
@@ -1777,7 +2463,7 @@
 	* vt100-led.el, window.el: Some fixes to follow coding conventions in
 	files maintained by FSF.
 
-2001-07-13  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-13  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* arc-mode.el: A fix to follow coding conventions.
 
@@ -1808,7 +2494,7 @@
 
 	* play/fortune.el: Add types to defcustoms.
 
-2001-07-12  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-12  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
 	* language/czech.el: A fix to follow coding conventions.
 
@@ -1837,7 +2523,7 @@
 2001-07-11  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* progmodes/ada-prj.el: Say that the file _is_ part of Emacs.
-	From Pavel Jan,Bm(Bk <Pavel@Janik.cz>
+	From Pavel Jan,Am(Bk <Pavel@Janik.cz>
 
 	* progmodes/ada-mode.el: Ditto.
 
@@ -1945,10 +2631,10 @@
 	* calendar/todo-mode.el (todo-top-priorities): Use delete-region
 	instead of kill-line.
 
-	* play/pong.el: Fix first line.  From Pavel Jan,Bm(Bk
+	* play/pong.el: Fix first line.  From Pavel Jan,Am(Bk
 	<Pavel@Janik.cz>.
 
-	* battery.el (battery-update): Add help-echo.  From Pavel Jan,Bm(Bk
+	* battery.el (battery-update): Add help-echo.  From Pavel Jan,Am(Bk
 	<Pavel@Janik.cz>.
 
 2001-07-04  Gerd Moellmann  <gerd@gnu.org>
@@ -1986,10 +2672,10 @@
 2001-07-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* allout.el: Fix the header line, so that finder.el recognizes it.
-	From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+	From Pavel Jan,Am(Bk <Pavel@Janik.cz>.
 
 	* emacs-lisp/lisp-mnt.el (lm-header-prefix): Doc fix.
-	From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+	From Pavel Jan,Am(Bk <Pavel@Janik.cz>.
 
 2001-06-29  Eli Zaretskii  <eliz@is.elta.co.il>
 
@@ -2299,7 +2985,7 @@
 2001-06-10  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* server.el (server-process, server-buffer-clients): Doc fix.
-	From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+	From Pavel Jan,Am(Bk <Pavel@Janik.cz>.
 
 2001-06-09  John Wiegley  <johnw@gnu.org>
 
@@ -2557,16 +3243,16 @@
 2001-05-20  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* international/ccl.el (define-ccl-program): Fix a typo.
-	From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+	From Pavel Jan,Am(Bk <Pavel@Janik.cz>.
 
 	* international/mule.el (decode-char): Fix a typo.  From Pavel
-	Jan,Bm(Bk <Pavel@Janik.cz>.
+	Jan,Am(Bk <Pavel@Janik.cz>.
 
 	* textmodes/artist.el (artist-mode): Fix a typo.  From Pavel
-	Jan,Bm(Bk <Pavel@Janik.cz>.
+	Jan,Am(Bk <Pavel@Janik.cz>.
 
 	* frame.el (automatic-hscrolling): Fix a typo.  From Pavel
-	Jan,Bm(Bk <Pavel@Janik.cz>.
+	Jan,Am(Bk <Pavel@Janik.cz>.
 
 2001-05-18  Sam Steingold  <sds@gnu.org>
 
@@ -2798,7 +3484,7 @@
 	coding-system-for-read, if it is non-nil.
 
 	* calendar/holidays.el (holidays): Add an autoload cookie.
-	From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+	From Pavel Jan,Am(Bk <Pavel@Janik.cz>.
 
 2001-05-08  John Wiegley  <johnw@gnu.org>
 
@@ -3496,10 +4182,10 @@
 	Add an antry for ``converts''.
 
 	* language/slovak.el ("Slovak"): Add documentation string.
-	From Pavel@Janik.cz (Pavel Jan,Bm(Bk ml.).
+	From Pavel@Janik.cz (Pavel Jan,Am(Bk ml.).
 
 	* language/czech.el ("Czech"): Add documentation string.
-	From Pavel@Janik.cz (Pavel Jan,Bm(Bk ml.).
+	From Pavel@Janik.cz (Pavel Jan,Am(Bk ml.).
 
 	* ps-mule.el (ps-mule-font-info-database-bdf): Change `isci24-etl.bdf'
 	to `isci24-mule.bdf'.  From: Kenichi Handa <handa@etl.go.jp>.
@@ -4210,7 +4896,7 @@
 2001-03-15  Gerd Moellmann  <gerd@gnu.org>
 
 	* textmodes/ispell.el (ispell-dictionary-alist-6): Add support
-	for Slovak.  From Pavel.Janik@suse.cz (Pavel Jan,Bm(Bk ml.).
+	for Slovak.  From Pavel.Janik@suse.cz (Pavel Jan,Am(Bk ml.).
 
 2001-03-14  Gerd Moellmann  <gerd@gnu.org>
 
Binary files src-21.1/lisp/abbrev.elc and src-21.2/lisp/abbrev.elc differ
Binary files src-21.1/lisp/abbrevlist.elc and src-21.2/lisp/abbrevlist.elc differ
Binary files src-21.1/lisp/add-log.elc and src-21.2/lisp/add-log.elc differ
Binary files src-21.1/lisp/align.elc and src-21.2/lisp/align.elc differ
Binary files src-21.1/lisp/allout.elc and src-21.2/lisp/allout.elc differ
Binary files src-21.1/lisp/ansi-color.elc and src-21.2/lisp/ansi-color.elc differ
Binary files src-21.1/lisp/apropos.elc and src-21.2/lisp/apropos.elc differ
Binary files src-21.1/lisp/arc-mode.elc and src-21.2/lisp/arc-mode.elc differ
Binary files src-21.1/lisp/array.elc and src-21.2/lisp/array.elc differ
Binary files src-21.1/lisp/autoarg.elc and src-21.2/lisp/autoarg.elc differ
Binary files src-21.1/lisp/autoinsert.elc and src-21.2/lisp/autoinsert.elc differ
Binary files src-21.1/lisp/autorevert.elc and src-21.2/lisp/autorevert.elc differ
Binary files src-21.1/lisp/avoid.elc and src-21.2/lisp/avoid.elc differ
Binary files src-21.1/lisp/battery.elc and src-21.2/lisp/battery.elc differ
Binary files src-21.1/lisp/bindings.elc and src-21.2/lisp/bindings.elc differ
Binary files src-21.1/lisp/bookmark.elc and src-21.2/lisp/bookmark.elc differ
Binary files src-21.1/lisp/bs.elc and src-21.2/lisp/bs.elc differ
Binary files src-21.1/lisp/buff-menu.elc and src-21.2/lisp/buff-menu.elc differ
Binary files src-21.1/lisp/byte-run.elc and src-21.2/lisp/byte-run.elc differ
Binary files src-21.1/lisp/calculator.elc and src-21.2/lisp/calculator.elc differ
Binary files src-21.1/lisp/calendar/appt.elc and src-21.2/lisp/calendar/appt.elc differ
Binary files src-21.1/lisp/calendar/cal-china.elc and src-21.2/lisp/calendar/cal-china.elc differ
Binary files src-21.1/lisp/calendar/cal-coptic.elc and src-21.2/lisp/calendar/cal-coptic.elc differ
Binary files src-21.1/lisp/calendar/cal-dst.elc and src-21.2/lisp/calendar/cal-dst.elc differ
diff -ruN src-21.1/lisp/calendar/cal-french.el src-21.2/lisp/calendar/cal-french.el
--- src-21.1/lisp/calendar/cal-french.el	Mon Jul 16 09:46:48 2001
+++ src-21.2/lisp/calendar/cal-french.el	Sat Mar 16 11:34:45 2002
@@ -237,7 +237,7 @@
 	    (day (if (> month 12)
 		     (- month 12)
 		   (calendar-read
-		    "Jour (1-10): "
+		    "Jour (1-30): "
 		    '(lambda (x) (and (<= 1 x) (<= x 30))))))
 	    (month (if (> month 12) 13 month)))
        (list (list month day year)))))
Binary files src-21.1/lisp/calendar/cal-french.elc and src-21.2/lisp/calendar/cal-french.elc differ
Binary files src-21.1/lisp/calendar/cal-hebrew.elc and src-21.2/lisp/calendar/cal-hebrew.elc differ
Binary files src-21.1/lisp/calendar/cal-islam.elc and src-21.2/lisp/calendar/cal-islam.elc differ
Binary files src-21.1/lisp/calendar/cal-iso.elc and src-21.2/lisp/calendar/cal-iso.elc differ
Binary files src-21.1/lisp/calendar/cal-julian.elc and src-21.2/lisp/calendar/cal-julian.elc differ
Binary files src-21.1/lisp/calendar/cal-mayan.elc and src-21.2/lisp/calendar/cal-mayan.elc differ
diff -ruN src-21.1/lisp/calendar/cal-menu.el src-21.2/lisp/calendar/cal-menu.el
--- src-21.1/lisp/calendar/cal-menu.el	Mon Oct  1 13:05:50 2001
+++ src-21.2/lisp/calendar/cal-menu.el	Fri Feb 22 11:51:34 2002
@@ -76,7 +76,7 @@
 (define-key calendar-mode-map [menu-bar diary wk]
   '("Insert Weekly" . insert-weekly-diary-entry))
 (define-key calendar-mode-map [menu-bar diary ent]
-  '("Insert Daily". insert-diary-entry))
+  '("Insert Diary Entry". insert-diary-entry))
 (define-key calendar-mode-map [menu-bar diary all]
   '("Show All" . show-all-diary-entries))
 (define-key calendar-mode-map [menu-bar diary mark]
Binary files src-21.1/lisp/calendar/cal-menu.elc and src-21.2/lisp/calendar/cal-menu.elc differ
Binary files src-21.1/lisp/calendar/cal-move.elc and src-21.2/lisp/calendar/cal-move.elc differ
Binary files src-21.1/lisp/calendar/cal-persia.elc and src-21.2/lisp/calendar/cal-persia.elc differ
Binary files src-21.1/lisp/calendar/cal-tex.elc and src-21.2/lisp/calendar/cal-tex.elc differ
Binary files src-21.1/lisp/calendar/cal-x.elc and src-21.2/lisp/calendar/cal-x.elc differ
diff -ruN src-21.1/lisp/calendar/calendar.el src-21.2/lisp/calendar/calendar.el
--- src-21.1/lisp/calendar/calendar.el	Mon Oct  1 13:05:18 2001
+++ src-21.2/lisp/calendar/calendar.el	Mon Jan 28 17:32:43 2002
@@ -569,7 +569,7 @@
       european-date-diary-pattern
     american-date-diary-pattern)
   "*List of pseudo-patterns describing the forms of date used in the diary.
-The patterns on the list must be MUTUALLY EXCLUSIVE and must should not match
+The patterns on the list must be MUTUALLY EXCLUSIVE and must not match
 any portion of the diary entry itself, just the date component.
 
 A pseudo-pattern is a list of regular expressions and the keywords `month',
Binary files src-21.1/lisp/calendar/calendar.elc and src-21.2/lisp/calendar/calendar.elc differ
Binary files src-21.1/lisp/calendar/diary-lib.elc and src-21.2/lisp/calendar/diary-lib.elc differ
Binary files src-21.1/lisp/calendar/holidays.elc and src-21.2/lisp/calendar/holidays.elc differ
Binary files src-21.1/lisp/calendar/lunar.elc and src-21.2/lisp/calendar/lunar.elc differ
Binary files src-21.1/lisp/calendar/solar.elc and src-21.2/lisp/calendar/solar.elc differ
diff -ruN src-21.1/lisp/calendar/timeclock.el src-21.2/lisp/calendar/timeclock.el
--- src-21.1/lisp/calendar/timeclock.el	Thu May 10 04:46:38 2001
+++ src-21.2/lisp/calendar/timeclock.el	Sat Nov  3 16:43:08 2001
@@ -370,6 +370,8 @@
 interactively -- call the function `timeclock-get-reason-function' to
 discover the reason."
   (interactive "P")
+  (or timeclock-last-event
+      (error "You haven't clocked in!"))
   (if (equal (downcase (car timeclock-last-event)) "o")
       (error "You've already clocked out!")
     (timeclock-log
Binary files src-21.1/lisp/calendar/timeclock.elc and src-21.2/lisp/calendar/timeclock.elc differ
diff -ruN src-21.1/lisp/calendar/todo-mode.el src-21.2/lisp/calendar/todo-mode.el
--- src-21.1/lisp/calendar/todo-mode.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/calendar/todo-mode.el	Tue Nov 13 05:12:45 2001
@@ -5,7 +5,7 @@
 ;; Author: Oliver Seidel <os10000@seidel-space.de>
 ;;   [Not clear the above works, July 2000]
 ;; Created: 2 Aug 1997
-;; Version: $Id: todo-mode.el,v 1.47 2001/07/16 12:22:59 pj Exp $
+;; Version: $Id: todo-mode.el,v 1.47.4.1 2001/11/13 04:12:45 rms Exp $
 ;; Keywords: calendar, todo
 
 ;; This file is part of GNU Emacs.
@@ -97,7 +97,7 @@
 ;;
 ;;      Which version of todo-mode.el does this documentation refer to?
 ;;
-;;      $Id: todo-mode.el,v 1.47 2001/07/16 12:22:59 pj Exp $
+;;      $Id: todo-mode.el,v 1.47.4.1 2001/11/13 04:12:45 rms Exp $
 ;;
 ;;  Pre-Requisites
 ;;
@@ -494,9 +494,11 @@
 (defun todo-save ()
   "Save the TODO list."
   (interactive)
-  (save-buffer)
-  (if todo-save-top-priorities-too (todo-save-top-priorities))
-  )
+  (save-excursion
+    (save-restriction
+      (save-buffer)
+      (if todo-save-top-priorities-too (todo-save-top-priorities))
+      )))
 (defalias 'todo-cmd-save 'todo-save)
 
 (defun todo-quit ()
Binary files src-21.1/lisp/calendar/todo-mode.elc and src-21.2/lisp/calendar/todo-mode.elc differ
Binary files src-21.1/lisp/case-table.elc and src-21.2/lisp/case-table.elc differ
Binary files src-21.1/lisp/cdl.elc and src-21.2/lisp/cdl.elc differ
Binary files src-21.1/lisp/chistory.elc and src-21.2/lisp/chistory.elc differ
Binary files src-21.1/lisp/cmuscheme.elc and src-21.2/lisp/cmuscheme.elc differ
Binary files src-21.1/lisp/comint.elc and src-21.2/lisp/comint.elc differ
Binary files src-21.1/lisp/compare-w.elc and src-21.2/lisp/compare-w.elc differ
Binary files src-21.1/lisp/complete.elc and src-21.2/lisp/complete.elc differ
Binary files src-21.1/lisp/completion.elc and src-21.2/lisp/completion.elc differ
Binary files src-21.1/lisp/composite.elc and src-21.2/lisp/composite.elc differ
Binary files src-21.1/lisp/cus-dep.elc and src-21.2/lisp/cus-dep.elc differ
diff -ruN src-21.1/lisp/cus-edit.el src-21.2/lisp/cus-edit.el
--- src-21.1/lisp/cus-edit.el	Thu Sep  6 10:25:31 2001
+++ src-21.2/lisp/cus-edit.el	Sun Feb  3 12:56:52 2002
@@ -812,7 +812,7 @@
 `:prompt-value' property of that widget will be used for reading the value.
 
 If given a prefix (or a COMMENT argument), also prompt for a comment."
-  (interactive (custom-prompt-variable "Set and ave variable: "
+  (interactive (custom-prompt-variable "Set and save variable: "
 				       "Set and save value for %s as: "
 				       current-prefix-arg))
   (funcall (or (get var 'custom-set) 'set-default) var value)
@@ -3653,7 +3653,8 @@
     (save-excursion
       (let ((default-major-mode nil))
 	(set-buffer (find-file-noselect (custom-file))))
-      (save-buffer))))
+      (let ((file-precious-flag t))
+	(save-buffer)))))
 
 ;;; The Customize Menu.
 
Binary files src-21.1/lisp/cus-edit.elc and src-21.2/lisp/cus-edit.elc differ
Binary files src-21.1/lisp/cus-face.elc and src-21.2/lisp/cus-face.elc differ
diff -ruN src-21.1/lisp/cus-load.el src-21.2/lisp/cus-load.el
--- src-21.1/lisp/cus-load.el	Sat Oct 20 18:50:15 2001
+++ src-21.2/lisp/cus-load.el	Sat Mar 16 12:38:41 2002
@@ -37,8 +37,8 @@
 (put 'ps-print-vertical 'custom-loads '("ps-print"))
 (put 'supercite-hooks 'custom-loads '("supercite"))
 (put 'vhdl-menu 'custom-loads '("vhdl-mode"))
-(put 'gnus-newsrc 'custom-loads '("gnus-start"))
 (put 'chinese-calendar 'custom-loads '("cal-china"))
+(put 'gnus-newsrc 'custom-loads '("gnus-start"))
 (put 'expand 'custom-loads '("expand"))
 (put 'bookmark 'custom-loads '("bookmark"))
 (put 'icon 'custom-loads '("icon"))
@@ -203,7 +203,7 @@
 (put 'idlwave-shell-initial-commands 'custom-loads '("idlw-shell"))
 (put 'tildify 'custom-loads '("tildify"))
 (put 'cperl-autoinsert-details 'custom-loads '("cperl-mode"))
-(put 'help 'custom-loads '("help-macro" "help" "apropos" "cus-edit" "ehelp" "info-look" "info" "man" "tooltip" "woman"))
+(put 'help 'custom-loads '("help" "apropos" "cus-edit" "ehelp" "help-macro" "info-look" "info" "man" "tooltip" "woman"))
 (put 'forms 'custom-loads '("forms"))
 (put 'widget-documentation 'custom-loads '("wid-edit"))
 (put 'eshell-banner 'custom-loads '("em-banner"))
@@ -217,8 +217,8 @@
 (put 'font-lock 'custom-loads '("frame" "faces" "font-lock"))
 (put 'auto-save 'custom-loads '("files" "startup"))
 (put 'tpu 'custom-loads '("tpu-edt" "tpu-extras"))
-(put 'gnus-cite 'custom-loads '("gnus-cite"))
 (put 'viper-hooks 'custom-loads '("viper-init"))
+(put 'gnus-cite 'custom-loads '("gnus-cite"))
 (put 'gnus-demon 'custom-loads '("gnus-demon"))
 (put 'reftex-optimizations-for-large-documents 'custom-loads '("reftex-vars"))
 (put 'viper-misc 'custom-loads '("viper-cmd" "viper-init" "viper"))
@@ -272,7 +272,7 @@
 (put 'generic-x 'custom-loads '("generic-x"))
 (put 'partial-completion 'custom-loads '("complete"))
 (put 'whitespace 'custom-loads '("whitespace"))
-(put 'maint 'custom-loads '("gulp" "lisp-mnt" "emacsbug"))
+(put 'maint 'custom-loads '("emacsbug" "gulp" "lisp-mnt"))
 (put 'pages 'custom-loads '("page-ext"))
 (put 'message-interface 'custom-loads '("message"))
 (put 'diary 'custom-loads '("calendar" "diary-lib"))
@@ -298,7 +298,7 @@
 (put 'apropos 'custom-loads '("apropos"))
 (put 'gomoku 'custom-loads '("gomoku"))
 (put 'eshell-pred 'custom-loads '("em-pred"))
-(put 'tools 'custom-loads '("add-log" "calculator" "compare-w" "diff-mode" "diff" "ediff" "elide-head" "emerge" "gud" "pcvs-defs" "smerge-mode" "speedbar" "tempo" "tooltip" "vc" "which-func" "rcompile" "copyright" "compile" "ebrowse" "etags" "glasses" "make-mode"))
+(put 'tools 'custom-loads '("add-log" "calculator" "compare-w" "diff-mode" "diff" "ediff" "elide-head" "emerge" "gud" "pcvs-defs" "smerge-mode" "speedbar" "tempo" "tooltip" "vc" "which-func" "copyright" "rcompile" "compile" "ebrowse" "etags" "glasses" "make-mode"))
 (put 'gnus-topic 'custom-loads '("gnus-topic"))
 (put 'sgml 'custom-loads '("sgml-mode"))
 (put 'keyboard 'custom-loads '("mule" "chistory" "type-break"))
@@ -314,7 +314,7 @@
 (put 'metamail 'custom-loads '("metamail"))
 (put 'winner 'custom-loads '("winner"))
 (put 'ebrowse-faces 'custom-loads '("ebrowse"))
-(put 'wp 'custom-loads '("view" "cus-edit" "enriched" "lpr" "ps-print" "ebnf2ps" "bib-mode" "nroff-mode" "refbib" "refer" "scribe" "tildify"))
+(put 'wp 'custom-loads '("cus-edit" "enriched" "lpr" "ps-print" "view" "ebnf2ps" "bib-mode" "nroff-mode" "refbib" "refer" "scribe" "tildify"))
 (put 'reftex-citation-support 'custom-loads '("reftex-vars"))
 (put 'gnus-summary-choose 'custom-loads '("gnus-sum"))
 (put 'widget-browse 'custom-loads '("wid-browse"))
@@ -326,7 +326,7 @@
 (put 'vhdl-highlight-faces 'custom-loads '("vhdl-mode"))
 (put 'which-func 'custom-loads '("which-func"))
 (put 'pc-select 'custom-loads '("pc-select"))
-(put 'i18n 'custom-loads '("ccl" "cus-edit" "double" "iso-acc" "iso-ascii" "latin1-disp" "ogonek"))
+(put 'i18n 'custom-loads '("cus-edit" "double" "ccl" "iso-acc" "iso-ascii" "latin1-disp" "ogonek"))
 (put 'sh 'custom-loads '("sh-script"))
 (put 'message-headers 'custom-loads '("message"))
 (put 'idlwave-code-formatting 'custom-loads '("idlwave"))
@@ -366,10 +366,10 @@
 (put 'log-view 'custom-loads '("log-view"))
 (put 'PostScript 'custom-loads '("ps-mode"))
 (put 'abbrev-mode 'custom-loads '("abbrev" "cus-edit" "mailabbrev"))
-(put 'earcon 'custom-loads '("earcon"))
 (put 'eshell-term 'custom-loads '("em-term"))
+(put 'earcon 'custom-loads '("earcon"))
 (put 'feedmail-headers 'custom-loads '("feedmail"))
-(put 'hypermedia 'custom-loads '("wid-edit" "browse-url" "goto-addr" "metamail"))
+(put 'hypermedia 'custom-loads '("wid-edit" "metamail" "browse-url" "goto-addr"))
 (put 'image 'custom-loads '("image-file"))
 (put 'ff 'custom-loads '("find-file"))
 (put 'prolog 'custom-loads '("prolog"))
@@ -475,7 +475,7 @@
 (put 'message-sending 'custom-loads '("message"))
 (put 'archive-arc 'custom-loads '("arc-mode"))
 (put 'rmail-output 'custom-loads '("rmailout"))
-(put 'editing 'custom-loads '("simple" "view" "indent" "paragraphs" "cus-edit" "faces" "outline" "hl-line" "vcursor" "whitespace" "auto-show" "hscroll" "picture"))
+(put 'editing 'custom-loads '("simple" "indent" "paragraphs" "cus-edit" "faces" "outline" "hl-line" "vcursor" "view" "whitespace" "auto-show" "hscroll" "picture"))
 (put 'crisp 'custom-loads '("crisp"))
 (put 'nroff 'custom-loads '("nroff-mode"))
 (put 'gnus-group-icons 'custom-loads '("gnus-group"))
@@ -492,7 +492,7 @@
 (put 'pascal 'custom-loads '("pascal"))
 (put 'rmail-retrieve 'custom-loads '("rmail" "rmailsum"))
 (put 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" "saveplace" "sort" "tar-mode" "time-stamp" "timeclock" "snmp-mode"))
-(put 'mail 'custom-loads '("simple" "startup" "time" "eudc-vars" "gnus" "mail-utils" "mm-decode" "message" "imap" "starttls" "emacsbug" "feedmail" "mail-extr" "mail-hist" "mailalias" "metamail" "mh-e" "mspools" "rmail" "sendmail" "smtpmail" "supercite" "uce" "fortune"))
+(put 'mail 'custom-loads '("simple" "startup" "time" "gnus" "mail-utils" "mm-decode" "message" "imap" "starttls" "emacsbug" "feedmail" "mail-extr" "mail-hist" "mailalias" "metamail" "mh-e" "mspools" "rmail" "sendmail" "smtpmail" "supercite" "uce" "eudc-vars" "fortune"))
 (put 'paren-blinking 'custom-loads '("simple"))
 (put 'gnus-summary-sort 'custom-loads '("gnus-sum"))
 (put 'fast-lock 'custom-loads '("fast-lock"))
@@ -569,7 +569,7 @@
 (put 'tempo 'custom-loads '("tempo"))
 (put 'c 'custom-loads '("cc-vars" "cmacexp" "cpp" "hideif"))
 (put 'nnmail-prepare 'custom-loads '("nnmail"))
-(put 'processes 'custom-loads '("ansi-color" "comint" "cus-edit" "executable" "pcomplete" "shell" "term" "rcompile" "rlogin" "metamail" "compile" "sql" "flyspell"))
+(put 'processes 'custom-loads '("ansi-color" "comint" "cus-edit" "executable" "pcomplete" "shell" "term" "metamail" "rcompile" "rlogin" "compile" "sql" "flyspell"))
 (put 'ebnf2ps 'custom-loads '("ebnf2ps"))
 (put 'sendmail 'custom-loads '("sendmail"))
 (put 'gnus-article-signature 'custom-loads '("gnus-art"))
@@ -930,10 +930,10 @@
 (custom-put-if-not 'sgml-validate-command 'standard-value t)
 (custom-put-if-not 'jit-lock 'custom-version "21.1")
 (custom-put-if-not 'jit-lock 'group-documentation "Font Lock support mode to fontify just-in-time.")
-(custom-put-if-not 'rmail-file-name 'custom-version "21.1")
-(custom-put-if-not 'rmail-file-name 'standard-value t)
 (custom-put-if-not 'bs 'custom-version "21.1")
 (custom-put-if-not 'bs 'group-documentation "Buffer Selection: Maintaining buffers by buffer menu.")
+(custom-put-if-not 'rmail-file-name 'custom-version "21.1")
+(custom-put-if-not 'rmail-file-name 'standard-value t)
 (custom-put-if-not 'cperl 'custom-version "20.3")
 (custom-put-if-not 'cperl 'group-documentation "Major mode for editing Perl code.")
 (custom-put-if-not 'focus-follows-mouse 'custom-version "20.3")
diff -ruN src-21.1/lisp/cus-start.el src-21.2/lisp/cus-start.el
--- src-21.1/lisp/cus-start.el	Sat Jul 14 13:21:08 2001
+++ src-21.2/lisp/cus-start.el	Sun Oct 28 17:24:54 2001
@@ -1,6 +1,6 @@
 ;;; cus-start.el --- define customization properties of builtins
 ;;
-;; Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -143,7 +143,9 @@
 						    (integer :tag "time" 2)
 						    (other :tag "on")))
 	     ;; lread.c
-
+	     (recursive-load-depth-limit limits (choice (const :tag "off" nil)
+							integer))
+						 
 ;; This is not good news because it will use the wrong
 ;; version-specific directories when you upgrade.  We need
 ;; customization of the front of the list, maintaining the standard
Binary files src-21.1/lisp/custom.elc and src-21.2/lisp/custom.elc differ
Binary files src-21.1/lisp/cvs-status.elc and src-21.2/lisp/cvs-status.elc differ
Binary files src-21.1/lisp/dabbrev.elc and src-21.2/lisp/dabbrev.elc differ
Binary files src-21.1/lisp/delim-col.elc and src-21.2/lisp/delim-col.elc differ
diff -ruN src-21.1/lisp/delsel.el src-21.2/lisp/delsel.el
--- src-21.1/lisp/delsel.el	Tue Jul 31 13:36:09 2001
+++ src-21.2/lisp/delsel.el	Mon Jan 28 17:32:35 2002
@@ -84,24 +84,31 @@
 	     (not buffer-read-only))
     (let ((type (and (symbolp this-command)
 		     (get this-command 'delete-selection))))
-      (cond ((eq type 'kill)
-	     (delete-active-region t))
-	    ((eq type 'yank)
-	     ;; Before a yank command,
-	     ;; make sure we don't yank the same region
-	     ;; that we are going to delete.
-	     ;; That would make yank a no-op.
-	     (when (string= (buffer-substring-no-properties (point) (mark))
-			    (car kill-ring))
-	       (current-kill 1))
-	     (delete-active-region))
-	    ((eq type 'supersede)
-	     (let ((empty-region (= (point) (mark))))
-	       (delete-active-region)
-	       (unless empty-region
-		 (setq this-command 'ignore))))
-	    (type
-	     (delete-active-region))))))
+      (condition-case data
+	  (cond ((eq type 'kill)
+		 (delete-active-region t))
+		((eq type 'yank)
+		 ;; Before a yank command,
+		 ;; make sure we don't yank the same region
+		 ;; that we are going to delete.
+		 ;; That would make yank a no-op.
+		 (when (string= (buffer-substring-no-properties (point) (mark))
+				(car kill-ring))
+		   (current-kill 1))
+		 (delete-active-region))
+		((eq type 'supersede)
+		 (let ((empty-region (= (point) (mark))))
+		   (delete-active-region)
+		   (unless empty-region
+		     (setq this-command 'ignore))))
+		(type
+		 (delete-active-region)))
+	(file-supersession
+	 ;; If ask-user-about-supersession-threat signals an error,
+	 ;; stop safe_run_hooks from clearing out pre-command-hook.
+	 (and (eq inhibit-quit 'pre-command-hook)
+	      (setq inhibit-quit 'delete-selection-dummy))
+	 (signal 'file-supersession (cdr data)))))))
 
 (put 'self-insert-command 'delete-selection t)
 (put 'self-insert-iso 'delete-selection t)
Binary files src-21.1/lisp/delsel.elc and src-21.2/lisp/delsel.elc differ
Binary files src-21.1/lisp/derived.elc and src-21.2/lisp/derived.elc differ
diff -ruN src-21.1/lisp/desktop.el src-21.2/lisp/desktop.el
--- src-21.1/lisp/desktop.el	Mon Aug 13 12:37:02 2001
+++ src-21.2/lisp/desktop.el	Tue Oct 23 15:54:11 2001
@@ -576,9 +576,17 @@
 	(setq dirs (cdr dirs)))
       (setq desktop-dirname (and dirs (expand-file-name (car dirs))))
       (if desktop-dirname
-	  (progn
+	  (let ((desktop-last-buffer nil))
+	    ;; `load-with-code-conversion' calls `eval-buffer' which
+	    ;; contains a `save-excursion', so we end up with the same
+	    ;; buffer before and after the load.  This is a problem
+	    ;; when the desktop is read initially when Emacs starts up
+	    ;; because, if we still are in *scratch* after running
+	    ;; `after-init-hook', the splash screen will be displayed.
 	    (load (expand-file-name desktop-basefilename desktop-dirname)
 		  t t t)
+	    (when desktop-last-buffer
+	      (switch-to-buffer desktop-last-buffer))
 	    (run-hooks 'desktop-delay-hook)
 	    (setq desktop-delay-hook nil)
 	    (message "Desktop loaded."))
@@ -666,6 +674,10 @@
 ;; ----------------------------------------------------------------------------
 ;; Create a buffer, load its file, set is mode, ...;  called from Desktop file
 ;; only.
+
+(defvar desktop-last-buffer nil
+  "Last buffer read.  Dynamically bound in `desktop-read'.")
+
 (defun desktop-create-buffer (ver desktop-buffer-file-name desktop-buffer-name
 				  desktop-buffer-major-mode
 				  mim pt mk ro desktop-buffer-misc
@@ -678,6 +690,7 @@
       (setq result (funcall handler))
       (setq hlist (cdr hlist)))
     (when (bufferp result)
+      (setq desktop-last-buffer result)
       (set-buffer result)
       (if (not (equal (buffer-name) desktop-buffer-name))
 	  (rename-buffer desktop-buffer-name))
Binary files src-21.1/lisp/desktop.elc and src-21.2/lisp/desktop.elc differ
diff -ruN src-21.1/lisp/diff-mode.el src-21.2/lisp/diff-mode.el
--- src-21.1/lisp/diff-mode.el	Sat Sep 22 21:11:09 2001
+++ src-21.2/lisp/diff-mode.el	Sat Feb 23 10:01:56 2002
@@ -313,7 +313,9 @@
 (defun diff-end-of-hunk (&optional style)
   (if (looking-at diff-hunk-header-re) (goto-char (match-end 0)))
   (let ((end (and (re-search-forward (case style
-				       (unified "^[^-+# \\]")
+				       ;; A `unified' header is ambiguous.
+				       (unified (concat "^[^-+# \\]\\|"
+							diff-file-header-re))
 				       (context "^[^-+#! \\]")
 				       (normal "^[^<>#\\]")
 				       (t "^[^-+#!<> \\]"))
Binary files src-21.1/lisp/diff-mode.elc and src-21.2/lisp/diff-mode.elc differ
Binary files src-21.1/lisp/diff.elc and src-21.2/lisp/diff.elc differ
Binary files src-21.1/lisp/dired-aux.elc and src-21.2/lisp/dired-aux.elc differ
diff -ruN src-21.1/lisp/dired-x.el src-21.2/lisp/dired-x.el
--- src-21.1/lisp/dired-x.el	Wed Aug 29 17:00:34 2001
+++ src-21.2/lisp/dired-x.el	Mon Oct 29 12:40:33 2001
@@ -510,7 +510,10 @@
 (defun dired-omit-startup ()
   (or (assq 'dired-omit-files-p minor-mode-alist)
       (setq minor-mode-alist
-            (append '((dired-omit-files-p " Omit")) minor-mode-alist))))
+            (append '((dired-omit-files-p
+		       (:eval (if (eq major-mode 'dired-mode)
+				  " Omit" ""))))
+		    minor-mode-alist))))
 
 (defun dired-omit-toggle (&optional flag)
   "Toggle omitting files matching `dired-omit-files' and `dired-omit-extensions'.
Binary files src-21.1/lisp/dired-x.elc and src-21.2/lisp/dired-x.elc differ
Binary files src-21.1/lisp/dired.elc and src-21.2/lisp/dired.elc differ
Binary files src-21.1/lisp/dirtrack.elc and src-21.2/lisp/dirtrack.elc differ
Binary files src-21.1/lisp/disp-table.elc and src-21.2/lisp/disp-table.elc differ
Binary files src-21.1/lisp/dos-fns.elc and src-21.2/lisp/dos-fns.elc differ
Binary files src-21.1/lisp/dos-vars.elc and src-21.2/lisp/dos-vars.elc differ
Binary files src-21.1/lisp/dos-w32.elc and src-21.2/lisp/dos-w32.elc differ
Binary files src-21.1/lisp/double.elc and src-21.2/lisp/double.elc differ
Binary files src-21.1/lisp/ebuff-menu.elc and src-21.2/lisp/ebuff-menu.elc differ
Binary files src-21.1/lisp/echistory.elc and src-21.2/lisp/echistory.elc differ
Binary files src-21.1/lisp/ediff-diff.elc and src-21.2/lisp/ediff-diff.elc differ
Binary files src-21.1/lisp/ediff-help.elc and src-21.2/lisp/ediff-help.elc differ
Binary files src-21.1/lisp/ediff-hook.elc and src-21.2/lisp/ediff-hook.elc differ
Binary files src-21.1/lisp/ediff-init.elc and src-21.2/lisp/ediff-init.elc differ
Binary files src-21.1/lisp/ediff-merg.elc and src-21.2/lisp/ediff-merg.elc differ
Binary files src-21.1/lisp/ediff-mult.elc and src-21.2/lisp/ediff-mult.elc differ
Binary files src-21.1/lisp/ediff-ptch.elc and src-21.2/lisp/ediff-ptch.elc differ
Binary files src-21.1/lisp/ediff-util.elc and src-21.2/lisp/ediff-util.elc differ
Binary files src-21.1/lisp/ediff-vers.elc and src-21.2/lisp/ediff-vers.elc differ
Binary files src-21.1/lisp/ediff-wind.elc and src-21.2/lisp/ediff-wind.elc differ
Binary files src-21.1/lisp/ediff.elc and src-21.2/lisp/ediff.elc differ
Binary files src-21.1/lisp/edmacro.elc and src-21.2/lisp/edmacro.elc differ
Binary files src-21.1/lisp/ehelp.elc and src-21.2/lisp/ehelp.elc differ
Binary files src-21.1/lisp/electric.elc and src-21.2/lisp/electric.elc differ
Binary files src-21.1/lisp/elide-head.elc and src-21.2/lisp/elide-head.elc differ
diff -ruN src-21.1/lisp/emacs-lisp/advice.el src-21.2/lisp/emacs-lisp/advice.el
--- src-21.1/lisp/emacs-lisp/advice.el	Mon Jul  9 15:06:11 2001
+++ src-21.2/lisp/emacs-lisp/advice.el	Thu Dec 13 08:33:56 2001
@@ -2698,7 +2698,10 @@
       ;; Need to turn off auto-activation
       ;; because `byte-compile' uses `fset':
       (ad-with-auto-activation-disabled
-       (byte-compile function))))
+       (let ((symbol (make-symbol "advice-compilation")))
+	 (fset symbol (symbol-function function))
+	 (byte-compile symbol)
+	 (fset function (symbol-function symbol))))))
 
 
 ;; @@ Constructing advised definitions:
Binary files src-21.1/lisp/emacs-lisp/advice.elc and src-21.2/lisp/emacs-lisp/advice.elc differ
Binary files src-21.1/lisp/emacs-lisp/assoc.elc and src-21.2/lisp/emacs-lisp/assoc.elc differ
Binary files src-21.1/lisp/emacs-lisp/authors.elc and src-21.2/lisp/emacs-lisp/authors.elc differ
Binary files src-21.1/lisp/emacs-lisp/autoload.elc and src-21.2/lisp/emacs-lisp/autoload.elc differ
Binary files src-21.1/lisp/emacs-lisp/backquote.elc and src-21.2/lisp/emacs-lisp/backquote.elc differ
Binary files src-21.1/lisp/emacs-lisp/byte-opt.elc and src-21.2/lisp/emacs-lisp/byte-opt.elc differ
Binary files src-21.1/lisp/emacs-lisp/bytecomp.elc and src-21.2/lisp/emacs-lisp/bytecomp.elc differ
Binary files src-21.1/lisp/emacs-lisp/checkdoc.elc and src-21.2/lisp/emacs-lisp/checkdoc.elc differ
Binary files src-21.1/lisp/emacs-lisp/cl-compat.elc and src-21.2/lisp/emacs-lisp/cl-compat.elc differ
Binary files src-21.1/lisp/emacs-lisp/cl-extra.elc and src-21.2/lisp/emacs-lisp/cl-extra.elc differ
Binary files src-21.1/lisp/emacs-lisp/cl-indent.elc and src-21.2/lisp/emacs-lisp/cl-indent.elc differ
Binary files src-21.1/lisp/emacs-lisp/cl-macs.elc and src-21.2/lisp/emacs-lisp/cl-macs.elc differ
diff -ruN src-21.1/lisp/emacs-lisp/cl-seq.el src-21.2/lisp/emacs-lisp/cl-seq.el
--- src-21.1/lisp/emacs-lisp/cl-seq.el	Fri Jan  5 17:39:40 2001
+++ src-21.2/lisp/emacs-lisp/cl-seq.el	Mon Jan 28 17:32:44 2002
@@ -536,7 +536,7 @@
 (defun mismatch (cl-seq1 cl-seq2 &rest cl-keys)
   "Compare SEQ1 with SEQ2, return index of first mismatching element.
 Return nil if the sequences match.  If one sequence is a prefix of the
-other, the return value indicates the end of the shorted sequence.
+other, the return value indicates the end of the shorter sequence.
 Keywords supported:  :test :test-not :key :start1 :end1 :start2 :end2 :from-end"
   (cl-parsing-keywords (:test :test-not :key :from-end
 			(:start1 0) :end1 (:start2 0) :end2) ()
Binary files src-21.1/lisp/emacs-lisp/cl-seq.elc and src-21.2/lisp/emacs-lisp/cl-seq.elc differ
Binary files src-21.1/lisp/emacs-lisp/cl.elc and src-21.2/lisp/emacs-lisp/cl.elc differ
Binary files src-21.1/lisp/emacs-lisp/copyright.elc and src-21.2/lisp/emacs-lisp/copyright.elc differ
Binary files src-21.1/lisp/emacs-lisp/crm.elc and src-21.2/lisp/emacs-lisp/crm.elc differ
Binary files src-21.1/lisp/emacs-lisp/cust-print.elc and src-21.2/lisp/emacs-lisp/cust-print.elc differ
Binary files src-21.1/lisp/emacs-lisp/debug.elc and src-21.2/lisp/emacs-lisp/debug.elc differ
Binary files src-21.1/lisp/emacs-lisp/disass.elc and src-21.2/lisp/emacs-lisp/disass.elc differ
diff -ruN src-21.1/lisp/emacs-lisp/easy-mmode.el src-21.2/lisp/emacs-lisp/easy-mmode.el
--- src-21.1/lisp/emacs-lisp/easy-mmode.el	Thu Aug  9 16:52:52 2001
+++ src-21.2/lisp/emacs-lisp/easy-mmode.el	Fri Dec 21 15:12:13 2001
@@ -175,7 +175,9 @@
 With universal prefix ARG " (unless togglep "(or if ARG is nil) ") "turn mode on.
 With zero or negative ARG turn mode off.
 \\{%s}") pretty-name keymap-sym))
-	 (interactive (list (or current-prefix-arg (if ,mode 0 1))))
+	 ;; Make no arg by default in an interactive call,
+	 ;; so that repeating the command toggles again.
+	 (interactive)
 	 (setq ,mode
 	       (if arg
 		   (> (prefix-numeric-value arg) 0)
Binary files src-21.1/lisp/emacs-lisp/easy-mmode.elc and src-21.2/lisp/emacs-lisp/easy-mmode.elc differ
Binary files src-21.1/lisp/emacs-lisp/easymenu.elc and src-21.2/lisp/emacs-lisp/easymenu.elc differ
Binary files src-21.1/lisp/emacs-lisp/edebug.elc and src-21.2/lisp/emacs-lisp/edebug.elc differ
Binary files src-21.1/lisp/emacs-lisp/eldoc.elc and src-21.2/lisp/emacs-lisp/eldoc.elc differ
Binary files src-21.1/lisp/emacs-lisp/elint.elc and src-21.2/lisp/emacs-lisp/elint.elc differ
Binary files src-21.1/lisp/emacs-lisp/elp.elc and src-21.2/lisp/emacs-lisp/elp.elc differ
Binary files src-21.1/lisp/emacs-lisp/ewoc.elc and src-21.2/lisp/emacs-lisp/ewoc.elc differ
Binary files src-21.1/lisp/emacs-lisp/find-func.elc and src-21.2/lisp/emacs-lisp/find-func.elc differ
Binary files src-21.1/lisp/emacs-lisp/find-gc.elc and src-21.2/lisp/emacs-lisp/find-gc.elc differ
Binary files src-21.1/lisp/emacs-lisp/float.elc and src-21.2/lisp/emacs-lisp/float.elc differ
Binary files src-21.1/lisp/emacs-lisp/gulp.elc and src-21.2/lisp/emacs-lisp/gulp.elc differ
Binary files src-21.1/lisp/emacs-lisp/helper.elc and src-21.2/lisp/emacs-lisp/helper.elc differ
Binary files src-21.1/lisp/emacs-lisp/levents.elc and src-21.2/lisp/emacs-lisp/levents.elc differ
Binary files src-21.1/lisp/emacs-lisp/lisp-mnt.elc and src-21.2/lisp/emacs-lisp/lisp-mnt.elc differ
diff -ruN src-21.1/lisp/emacs-lisp/lisp-mode.el src-21.2/lisp/emacs-lisp/lisp-mode.el
--- src-21.1/lisp/emacs-lisp/lisp-mode.el	Fri Jul 27 17:26:53 2001
+++ src-21.2/lisp/emacs-lisp/lisp-mode.el	Fri Dec 21 15:13:37 2001
@@ -420,17 +420,18 @@
 	    (print-level eval-expression-print-level)
 	    (beg (point))
 	    end)
-	(prin1 value)
-	(setq end (point))
-	(when (and (bufferp standard-output)
-		   (or (not (null print-length))
-		       (not (null print-level)))
-		   (not (string= unabbreviated
-				 (buffer-substring-no-properties beg end))))
-	  (last-sexp-setup-props beg end value 
-				 unabbreviated
-				 (buffer-substring-no-properties beg end))
-	  )))))
+	(prog1
+	    (prin1 value)
+	  (setq end (point))
+	  (when (and (bufferp standard-output)
+		     (or (not (null print-length))
+			 (not (null print-level)))
+		     (not (string= unabbreviated
+				   (buffer-substring-no-properties beg end))))
+	    (last-sexp-setup-props beg end value 
+				   unabbreviated
+				   (buffer-substring-no-properties beg end))
+	    ))))))
 
 
 (defun eval-last-sexp (eval-last-sexp-arg-internal)
@@ -452,7 +453,9 @@
 Likewise for other constructs as necessary."
   ;; The code in edebug-defun should be consistent with this, but not
   ;; the same, since this gets a macroexpended form.
-  (cond ((and (eq (car form) 'defvar)
+  (cond ((not (listp form))
+	 form)
+	((and (eq (car form) 'defvar)
 	      (cdr-safe (cdr-safe form)))
 	 ;; Force variable to be bound.
 	 (cons 'defconst (cdr form)))
@@ -512,10 +515,11 @@
 (defun eval-defun (edebug-it)
   "Evaluate the top-level form containing point, or after point.
 
-If the current defun is actually a call to `defvar', then reset the
-variable using its initial value expression even if the variable
-already has some other value.  (Normally `defvar' does not change the
-variable's value if it already has a value.)
+If the current defun is actually a call to `defvar' or `defcustom',
+evaluating it this way resets the variable using its initial value
+expression even if the variable already has some other value.
+\(Normally `defvar' and `defcustom' do not alter the value if there
+already is one.)
 
 With a prefix argument, instrument the code for Edebug.
 
Binary files src-21.1/lisp/emacs-lisp/lisp-mode.elc and src-21.2/lisp/emacs-lisp/lisp-mode.elc differ
Binary files src-21.1/lisp/emacs-lisp/lisp.elc and src-21.2/lisp/emacs-lisp/lisp.elc differ
Binary files src-21.1/lisp/emacs-lisp/lmenu.elc and src-21.2/lisp/emacs-lisp/lmenu.elc differ
Binary files src-21.1/lisp/emacs-lisp/lselect.elc and src-21.2/lisp/emacs-lisp/lselect.elc differ
Binary files src-21.1/lisp/emacs-lisp/lucid.elc and src-21.2/lisp/emacs-lisp/lucid.elc differ
Binary files src-21.1/lisp/emacs-lisp/pp.elc and src-21.2/lisp/emacs-lisp/pp.elc differ
Binary files src-21.1/lisp/emacs-lisp/re-builder.elc and src-21.2/lisp/emacs-lisp/re-builder.elc differ
diff -ruN src-21.1/lisp/emacs-lisp/regexp-opt.el src-21.2/lisp/emacs-lisp/regexp-opt.el
--- src-21.1/lisp/emacs-lisp/regexp-opt.el	Sun Jul 15 18:15:34 2001
+++ src-21.2/lisp/emacs-lisp/regexp-opt.el	Wed Nov 28 04:07:09 2001
@@ -120,7 +120,9 @@
     (let ((count 0) start)
       (while (string-match "\\(\\`\\|[^\\]\\)\\\\\\(\\\\\\\\\\)*([^?]"
 			   regexp start)
-	(setq count (1+ count) start (match-end 0)))
+	(setq count (1+ count)
+	      ;; Go back 2 chars (one for [^?] and one for [^\\]).
+	      start (- (match-end 0) 2)))
       count)))
 
 ;;; Workhorse functions.
Binary files src-21.1/lisp/emacs-lisp/regexp-opt.elc and src-21.2/lisp/emacs-lisp/regexp-opt.elc differ
Binary files src-21.1/lisp/emacs-lisp/ring.elc and src-21.2/lisp/emacs-lisp/ring.elc differ
Binary files src-21.1/lisp/emacs-lisp/rx.elc and src-21.2/lisp/emacs-lisp/rx.elc differ
Binary files src-21.1/lisp/emacs-lisp/shadow.elc and src-21.2/lisp/emacs-lisp/shadow.elc differ
Binary files src-21.1/lisp/emacs-lisp/sregex.elc and src-21.2/lisp/emacs-lisp/sregex.elc differ
Binary files src-21.1/lisp/emacs-lisp/tq.elc and src-21.2/lisp/emacs-lisp/tq.elc differ
Binary files src-21.1/lisp/emacs-lisp/trace.elc and src-21.2/lisp/emacs-lisp/trace.elc differ
Binary files src-21.1/lisp/emacs-lock.elc and src-21.2/lisp/emacs-lock.elc differ
Binary files src-21.1/lisp/emerge.elc and src-21.2/lisp/emerge.elc differ
Binary files src-21.1/lisp/emulation/crisp.elc and src-21.2/lisp/emulation/crisp.elc differ
Binary files src-21.1/lisp/emulation/edt-lk201.elc and src-21.2/lisp/emulation/edt-lk201.elc differ
Binary files src-21.1/lisp/emulation/edt-mapper.elc and src-21.2/lisp/emulation/edt-mapper.elc differ
Binary files src-21.1/lisp/emulation/edt-pc.elc and src-21.2/lisp/emulation/edt-pc.elc differ
Binary files src-21.1/lisp/emulation/edt-vt100.elc and src-21.2/lisp/emulation/edt-vt100.elc differ
Binary files src-21.1/lisp/emulation/edt.elc and src-21.2/lisp/emulation/edt.elc differ
Binary files src-21.1/lisp/emulation/mlconvert.elc and src-21.2/lisp/emulation/mlconvert.elc differ
Binary files src-21.1/lisp/emulation/mlsupport.elc and src-21.2/lisp/emulation/mlsupport.elc differ
Binary files src-21.1/lisp/emulation/pc-mode.elc and src-21.2/lisp/emulation/pc-mode.elc differ
Binary files src-21.1/lisp/emulation/pc-select.elc and src-21.2/lisp/emulation/pc-select.elc differ
Binary files src-21.1/lisp/emulation/tpu-edt.elc and src-21.2/lisp/emulation/tpu-edt.elc differ
Binary files src-21.1/lisp/emulation/tpu-extras.elc and src-21.2/lisp/emulation/tpu-extras.elc differ
Binary files src-21.1/lisp/emulation/tpu-mapper.elc and src-21.2/lisp/emulation/tpu-mapper.elc differ
Binary files src-21.1/lisp/emulation/vi.elc and src-21.2/lisp/emulation/vi.elc differ
Binary files src-21.1/lisp/emulation/vip.elc and src-21.2/lisp/emulation/vip.elc differ
Binary files src-21.1/lisp/emulation/viper-cmd.elc and src-21.2/lisp/emulation/viper-cmd.elc differ
Binary files src-21.1/lisp/emulation/viper-ex.elc and src-21.2/lisp/emulation/viper-ex.elc differ
Binary files src-21.1/lisp/emulation/viper-init.elc and src-21.2/lisp/emulation/viper-init.elc differ
Binary files src-21.1/lisp/emulation/viper-keym.elc and src-21.2/lisp/emulation/viper-keym.elc differ
Binary files src-21.1/lisp/emulation/viper-macs.elc and src-21.2/lisp/emulation/viper-macs.elc differ
Binary files src-21.1/lisp/emulation/viper-mous.elc and src-21.2/lisp/emulation/viper-mous.elc differ
Binary files src-21.1/lisp/emulation/viper-util.elc and src-21.2/lisp/emulation/viper-util.elc differ
Binary files src-21.1/lisp/emulation/viper.elc and src-21.2/lisp/emulation/viper.elc differ
Binary files src-21.1/lisp/emulation/ws-mode.elc and src-21.2/lisp/emulation/ws-mode.elc differ
diff -ruN src-21.1/lisp/enriched.el src-21.2/lisp/enriched.el
--- src-21.1/lisp/enriched.el	Wed Nov 29 20:22:18 2000
+++ src-21.2/lisp/enriched.el	Mon Oct 29 13:26:42 2001
@@ -352,6 +352,12 @@
 	 (list (list "x-color" (cdr face))))
 	((and (consp face) (eq (car face) 'background-color))
 	 (list (list "x-bg-color" (cdr face))))
+	((and (consp face) (symbolp (car face)) (not (keywordp (car face))))
+	 ;; List of faces `(face1 face2 ...)'.
+	 (let ((ans nil))
+	   (dolist (elt face)
+	     (setq ans (append ans (enriched-face-ans elt))))
+	   ans))
 	((string-match "^fg:" (symbol-name face))
 	 (list (list "x-color" (substring (symbol-name face) 3))))
 	((string-match "^bg:" (symbol-name face))
Binary files src-21.1/lisp/enriched.elc and src-21.2/lisp/enriched.elc differ
Binary files src-21.1/lisp/env.elc and src-21.2/lisp/env.elc differ
Binary files src-21.1/lisp/eshell/em-alias.elc and src-21.2/lisp/eshell/em-alias.elc differ
Binary files src-21.1/lisp/eshell/em-banner.elc and src-21.2/lisp/eshell/em-banner.elc differ
Binary files src-21.1/lisp/eshell/em-basic.elc and src-21.2/lisp/eshell/em-basic.elc differ
Binary files src-21.1/lisp/eshell/em-cmpl.elc and src-21.2/lisp/eshell/em-cmpl.elc differ
Binary files src-21.1/lisp/eshell/em-dirs.elc and src-21.2/lisp/eshell/em-dirs.elc differ
Binary files src-21.1/lisp/eshell/em-glob.elc and src-21.2/lisp/eshell/em-glob.elc differ
Binary files src-21.1/lisp/eshell/em-hist.elc and src-21.2/lisp/eshell/em-hist.elc differ
Binary files src-21.1/lisp/eshell/em-ls.elc and src-21.2/lisp/eshell/em-ls.elc differ
Binary files src-21.1/lisp/eshell/em-pred.elc and src-21.2/lisp/eshell/em-pred.elc differ
Binary files src-21.1/lisp/eshell/em-prompt.elc and src-21.2/lisp/eshell/em-prompt.elc differ
Binary files src-21.1/lisp/eshell/em-rebind.elc and src-21.2/lisp/eshell/em-rebind.elc differ
Binary files src-21.1/lisp/eshell/em-script.elc and src-21.2/lisp/eshell/em-script.elc differ
Binary files src-21.1/lisp/eshell/em-smart.elc and src-21.2/lisp/eshell/em-smart.elc differ
Binary files src-21.1/lisp/eshell/em-term.elc and src-21.2/lisp/eshell/em-term.elc differ
Binary files src-21.1/lisp/eshell/em-unix.elc and src-21.2/lisp/eshell/em-unix.elc differ
Binary files src-21.1/lisp/eshell/em-xtra.elc and src-21.2/lisp/eshell/em-xtra.elc differ
Binary files src-21.1/lisp/eshell/esh-arg.elc and src-21.2/lisp/eshell/esh-arg.elc differ
diff -ruN src-21.1/lisp/eshell/esh-cmd.el src-21.2/lisp/eshell/esh-cmd.el
--- src-21.1/lisp/eshell/esh-cmd.el	Sun Jul 15 21:53:53 2001
+++ src-21.2/lisp/eshell/esh-cmd.el	Mon Jan 28 17:32:46 2002
@@ -1008,7 +1008,9 @@
     (setq eshell-current-command command)
     (let ((delim (catch 'eshell-incomplete
 		   (eshell-resume-eval))))
-      (if delim
+      ;; On systems that don't support async subprocesses, eshell-resume
+      ;; can return t.  Don't treat that as an error.
+      (if (and delim (not (eq delim t)))
 	  (error "Unmatched delimiter: %c"
 		 (if (listp delim)
 		     (car delim)
Binary files src-21.1/lisp/eshell/esh-cmd.elc and src-21.2/lisp/eshell/esh-cmd.elc differ
Binary files src-21.1/lisp/eshell/esh-ext.elc and src-21.2/lisp/eshell/esh-ext.elc differ
Binary files src-21.1/lisp/eshell/esh-io.elc and src-21.2/lisp/eshell/esh-io.elc differ
Binary files src-21.1/lisp/eshell/esh-mode.elc and src-21.2/lisp/eshell/esh-mode.elc differ
Binary files src-21.1/lisp/eshell/esh-module.elc and src-21.2/lisp/eshell/esh-module.elc differ
Binary files src-21.1/lisp/eshell/esh-opt.elc and src-21.2/lisp/eshell/esh-opt.elc differ
Binary files src-21.1/lisp/eshell/esh-proc.elc and src-21.2/lisp/eshell/esh-proc.elc differ
Binary files src-21.1/lisp/eshell/esh-test.elc and src-21.2/lisp/eshell/esh-test.elc differ
Binary files src-21.1/lisp/eshell/esh-util.elc and src-21.2/lisp/eshell/esh-util.elc differ
Binary files src-21.1/lisp/eshell/esh-var.elc and src-21.2/lisp/eshell/esh-var.elc differ
Binary files src-21.1/lisp/eshell/eshell.elc and src-21.2/lisp/eshell/eshell.elc differ
Binary files src-21.1/lisp/expand.elc and src-21.2/lisp/expand.elc differ
Binary files src-21.1/lisp/facemenu.elc and src-21.2/lisp/facemenu.elc differ
diff -ruN src-21.1/lisp/faces.el src-21.2/lisp/faces.el
--- src-21.1/lisp/faces.el	Thu Oct  4 19:14:53 2001
+++ src-21.2/lisp/faces.el	Mon Jan 28 17:32:36 2002
@@ -80,7 +80,8 @@
 ;; This is defined originally in xfaces.c.
 (defcustom face-font-registry-alternatives
   (if (eq system-type 'windows-nt)
-      '(("gb2312.1980" "gb2312")
+      '(("iso8859-1" "ms-oemlatin")
+	("gb2312.1980" "gb2312")
 	("jisx0208.1990" "jisx0208.1983" "jisx0208.1978")
 	("ksc5601.1989" "ksx1001.1992" "ksc5601.1987")
 	("muletibetan-2" "muletibetan-0"))
@@ -744,14 +745,14 @@
 
 (defun invert-face (face &optional frame)
   "Swap the foreground and background colors of FACE.
-FRAME nil or not specified means change face on all frames.
+If FRAME is omitted or nil, it means change face on all frames.
 If FACE specifies neither foreground nor background color,
 set its foreground and background to the background and foreground
 of the default face.  Value is FACE."
   (interactive (list (read-face-name "Invert face ")))
   (let ((fg (face-attribute face :foreground frame))
 	(bg (face-attribute face :background frame)))
-    (if (or fg bg)
+    (if (not (and (eq fg 'unspecified) (eq bg 'unspecified)))
 	(set-face-attribute face frame :foreground bg :background fg)
       (set-face-attribute face frame
 			  :foreground
Binary files src-21.1/lisp/faces.elc and src-21.2/lisp/faces.elc differ
Binary files src-21.1/lisp/fast-lock.elc and src-21.2/lisp/fast-lock.elc differ
diff -ruN src-21.1/lisp/ffap.el src-21.2/lisp/ffap.el
--- src-21.1/lisp/ffap.el	Sun Jun 17 12:43:19 2001
+++ src-21.2/lisp/ffap.el	Fri Feb 22 11:51:28 2002
@@ -549,7 +549,8 @@
 	   (progn
 	     ;; errs: htb symbol may be unbound, or not a hash-table.
 	     ;; gnus-gethash is just a macro for intern-soft.
-	     (and (intern-soft string (symbol-value htb))
+	     (and (symbol-value htb)
+		  (intern-soft string (symbol-value htb))
 		  (setq ret string htbs nil))
 	     ;; If we made it this far, gnus is running, so ignore "heads":
 	     (setq heads nil))
Binary files src-21.1/lisp/ffap.elc and src-21.2/lisp/ffap.elc differ
Binary files src-21.1/lisp/filecache.elc and src-21.2/lisp/filecache.elc differ
diff -ruN src-21.1/lisp/files.el src-21.2/lisp/files.el
--- src-21.1/lisp/files.el	Sat Oct 20 10:51:26 2001
+++ src-21.2/lisp/files.el	Mon Jan 28 17:49:53 2002
@@ -197,6 +197,26 @@
 (defvar buffer-file-numbers-unique (not (memq system-type '(windows-nt)))
   "Non-nil means that buffer-file-number uniquely identifies files.")
 
+(defvar temporary-file-directory
+  (file-name-as-directory
+   (cond ((memq system-type '(ms-dos windows-nt))
+	  (or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp"))
+	 ((memq system-type '(vax-vms axp-vms))
+	  (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "SYS$SCRATCH:"))
+	 (t
+	  (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp"))))
+  "The directory for writing temporary files.")
+
+(defvar small-temporary-file-directory
+  (if (eq system-type 'ms-dos) (getenv "TMPDIR"))
+  "The directory for writing small temporary files.
+If non-nil, this directory is used instead of `temporary-file-directory'
+by programs that create small temporary files.  This is for systems that
+have fast storage with limited space, such as a RAM disk.")
+
+;; The system null device. (Should reference NULL_DEVICE from C.)
+(defvar null-device "/dev/null" "The system null device.")
+
 (defvar file-name-invalid-regexp
   (cond ((and (eq system-type 'ms-dos) (not (msdos-long-file-names)))
 	 (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive
@@ -282,7 +302,8 @@
   :group 'auto-save)
 
 (defcustom auto-save-file-name-transforms
-  '(("\\`/[^/]*:\\(.+/\\)*\\(.*\\)" "/tmp/\\2"))
+  `(("\\`/[^/]*:\\(.+/\\)*\\(.*\\)"
+     ,(expand-file-name "\\2" temporary-file-directory)))
   "*Transforms to apply to buffer file name before making auto-save file name.
 Each transform is a list (REGEXP REPLACEMENT):
 REGEXP is a regular expression to match against the file name.
@@ -292,16 +313,18 @@
 When one transform applies, its result is final;
 no further transforms are tried.
 
-The default value is set up to put the auto-save file into `/tmp'
-for editing a remote file."
+The default value is set up to put the auto-save file into the
+temporary directory (see the variable `temporary-file-directory') for
+editing a remote file."
   :group 'auto-save
   :type '(repeat (list (string :tag "Regexp") (string :tag "Replacement")))
   :version "21.1")
 
 (defcustom save-abbrevs nil
   "*Non-nil means save word abbrevs too when files are saved.
+If `silently', don't ask the user before saving.
 Loading an abbrev file sets this to t."
-  :type 'boolean
+  :type '(choice (const t) (const nil) (const silently))
   :group 'abbrev)
 
 (defcustom find-file-run-dired t
@@ -423,26 +446,6 @@
 (defvar view-read-only nil
   "*Non-nil means buffers visiting files read-only, do it in view mode.")
 
-(defvar temporary-file-directory
-  (file-name-as-directory
-   (cond ((memq system-type '(ms-dos windows-nt))
-	  (or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp"))
-	 ((memq system-type '(vax-vms axp-vms))
-	  (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "SYS$SCRATCH:"))
-	 (t
-	  (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp"))))
-  "The directory for writing temporary files.")
-
-(defvar small-temporary-file-directory
-  (if (eq system-type 'ms-dos) (getenv "TMPDIR"))
-  "The directory for writing small temporary files.
-If non-nil, this directory is used instead of `temporary-file-directory'
-by programs that create small temporary files.  This is for systems that
-have fast storage with limited space, such as a RAM disk.")
-
-;; The system null device. (Should reference NULL_DEVICE from C.)
-(defvar null-device "/dev/null" "The system null device.")
-
 (defun ange-ftp-completion-hook-function (op &rest args)
   "Provides support for ange-ftp host name completion.
 Runs the usual ange-ftp hook, but only for completion operations."
@@ -1069,8 +1072,12 @@
 			 (with-current-buffer buf
 			   (revert-buffer t t)))))
 	      (with-current-buffer buf
-		(when (not (eq (not (null rawfile))
-			       (not (null find-file-literally))))
+		(when (and (not (eq (not (null rawfile))
+				    (not (null find-file-literally))))
+			   ;; It is confusing to ask whether to visit
+			   ;; non-literally if they have the file in
+			   ;; hexl-mode.
+			   (not (eq major-mode 'hexl-mode)))
 		  (if (buffer-modified-p)
 		      (if (y-or-n-p (if rawfile
 					"Save file and revisit literally? "
@@ -2422,7 +2429,7 @@
 					-1))
 	    (file-error (setq possibilities nil)))
 	  (if (not deserve-versions-p)
-	      (list (concat basic-name "~"))
+	      (list (make-backup-file-name fn))
 	    (cons (format "%s.~%d~" basic-name (1+ high-water-mark))
 		  (if (and (> number-to-delete 0)
 			   ;; Delete nothing if there is overflow
@@ -2702,7 +2709,9 @@
 	      ;; delete the temp file.
 	      (or succeed
 		  (progn
-		    (delete-file tempname)
+		    (condition-case nil
+			(delete-file tempname)
+		      (file-error nil))
 		    (set-visited-file-modtime old-modtime))))
 	    ;; Since we have created an entirely new file
 	    ;; and renamed it, make sure it gets the
@@ -2775,6 +2784,7 @@
 	    (and save-abbrevs abbrevs-changed
 		 (progn
 		   (if (or arg
+			   (eq save-abbrevs 'silently)
 			   (y-or-n-p (format "Save abbrevs in %s? "
 					     abbrev-file-name)))
 		       (write-abbrev-file nil))
Binary files src-21.1/lisp/files.elc and src-21.2/lisp/files.elc differ
diff -ruN src-21.1/lisp/find-dired.el src-21.2/lisp/find-dired.el
--- src-21.1/lisp/find-dired.el	Sun Jul 15 18:15:34 2001
+++ src-21.2/lisp/find-dired.el	Fri Dec 28 03:13:31 2001
@@ -232,7 +232,7 @@
 	  (let ((buffer-read-only nil))
 	    (save-excursion
 	      (goto-char (point-max))
-	      (insert "\nfind " state)
+	      (insert "\n  find " state)
 	      (forward-char -1)		;Back up before \n at end of STATE.
 	      (insert " at " (substring (current-time-string) 0 19))
 	      (forward-char 1)
Binary files src-21.1/lisp/find-dired.elc and src-21.2/lisp/find-dired.elc differ
Binary files src-21.1/lisp/find-file.elc and src-21.2/lisp/find-file.elc differ
Binary files src-21.1/lisp/find-lisp.elc and src-21.2/lisp/find-lisp.elc differ
diff -ruN src-21.1/lisp/finder-inf.el src-21.2/lisp/finder-inf.el
--- src-21.1/lisp/finder-inf.el	Sat Oct 20 18:43:37 2001
+++ src-21.2/lisp/finder-inf.el	Sat Mar 16 12:38:33 2002
@@ -618,7 +618,7 @@
         (news))
     ("tmm.el"
         "text mode access to menu-bar"
-        nil)
+        (convenience))
     ("tooltip.el"
         "Show tooltip windows"
         (help c mouse tools))
@@ -709,443 +709,11 @@
     ("xt-mouse.el"
         "support the mouse when emacs run in an xterm"
         (mouse  terminals))
-    ("appt.el"
-        "appointment notification functions"
-        (calendar))
-    ("cal-china.el"
-        "calendar functions for the Chinese calendar"
-        (calendar))
-    ("cal-coptic.el"
-        "calendar functions for the Coptic/Ethiopic calendars"
-        (calendar))
-    ("cal-dst.el"
-        "calendar functions for daylight savings rules"
-        (calendar))
-    ("cal-french.el"
-        "calendar functions for the French Revolutionary calendar"
-        (calendar))
-    ("cal-hebrew.el"
-        "calendar functions for the Hebrew calendar"
-        (calendar))
-    ("cal-islam.el"
-        "calendar functions for the Islamic calendar"
-        (calendar))
-    ("cal-iso.el"
-        "calendar functions for the ISO calendar"
-        (calendar))
-    ("cal-julian.el"
-        "calendar functions for the Julian calendar"
-        (calendar))
-    ("cal-mayan.el"
-        "calendar functions for the Mayan calendars"
-        (calendar))
-    ("cal-menu.el"
-        "calendar functions for menu bar and popup menu support"
-        (calendar))
-    ("cal-move.el"
-        "calendar functions for movement in the calendar"
-        (calendar))
-    ("cal-persia.el"
-        "calendar functions for the Persian calendar"
-        (calendar))
-    ("cal-tex.el"
-        "calendar functions for printing calendars with LaTeX"
-        (calendar))
-    ("cal-x.el"
-        "calendar windows in dedicated frames in X"
-        (calendar))
-    ("calendar.el"
-        "calendar functions"
-        (calendar))
-    ("diary-lib.el"
-        "diary functions"
-        (calendar))
-    ("holidays.el"
-        "holiday functions for the calendar package"
-        (holidays  calendar))
-    ("lunar.el"
-        "calendar functions for phases of the moon"
-        (calendar))
-    ("solar.el"
-        "calendar functions for solar events"
-        (calendar))
-    ("timeclock.el"
-        "mode for keeping track of how much you work"
-        (calendar data))
-    ("todo-mode.el"
-        "major mode for editing TODO list files"
-        (calendar  todo))
-    ("ange-ftp.el"
-        "transparent FTP support for GNU Emacs"
-        (comm))
-    ("browse-url.el"
-        "pass a URL to a WWW browser"
-        (hypertext  hypermedia  mouse))
-    ("eudc-bob.el"
-        "Binary Objects Support for EUDC"
-        (help))
-    ("eudc-export.el"
-        "functions to export EUDC query results"
-        (help))
-    ("eudc-hotlist.el"
-        "hotlist management for EUDC"
-        (help))
-    ("eudc-vars.el"
-        "Emacs Unified Directory Client"
-        (help))
-    ("eudc.el"
-        "Emacs Unified Directory Client"
-        (help))
-    ("eudcb-bbdb.el"
-        "Emacs Unified Directory Client - BBDB Backend"
-        (help))
-    ("eudcb-ldap.el"
-        "Emacs Unified Directory Client - LDAP Backend"
-        (help))
-    ("eudcb-ph.el"
-        "Emacs Unified Directory Client - CCSO PH/QI Backend"
-        (help))
-    ("goto-addr.el"
-        "click to browse URL or to send to e-mail address"
-        (mh-e  www  mouse  mail))
-    ("ldap.el"
-        "client interface to LDAP for Emacs"
-        (comm))
-    ("net-utils.el"
-        "network functions"
-        (network communications))
-    ("quickurl.el"
-        "insert an URL based on text at point in buffer"
-        (hypermedia))
-    ("rcompile.el"
-        "run a compilation on a remote machine"
-        (tools  processes))
-    ("rlogin.el"
-        "remote login interface"
-        (unix  comm))
-    ("snmp-mode.el"
-        "SNMP & SNMPv2 MIB major mode"
-        (data))
-    ("telnet.el"
-        "run a telnet session from within an Emacs buffer"
-        (unix  comm))
-    ("webjump.el"
-        "programmable Web hotlist"
-        (comm www))
-    ("zone-mode.el"
-        "major mode for editing DNS zone files"
-        (dns  languages))
-    ("advice.el"
-        "an overloading mechanism for Emacs Lisp functions"
-        (extensions  lisp  tools))
-    ("assoc.el"
-        "insert/delete/sort functions on association lists"
-        (extensions))
-    ("authors.el"
-        "utility for maintaining Emacs' AUTHORS file"
-        (maint))
-    ("autoload.el"
-        "maintain autoloads in loaddefs.el"
-        (maint))
-    ("backquote.el"
-        "implement the ` Lisp construct"
-        (extensions  internal))
-    ("byte-opt.el"
-        "the optimization passes of the emacs-lisp byte compiler"
-        (internal))
-    ("bytecomp.el"
-        "compilation of Lisp code into byte code"
-        (lisp))
-    ("checkdoc.el"
-        "check documentation strings for style requirements"
-        (docs  maint  lisp))
-    ("cl-compat.el"
-        "Common Lisp extensions for GNU Emacs Lisp (compatibility)"
-        (extensions))
-    ("cl-extra.el"
-        "Common Lisp features, part 2"
-        (extensions))
-    ("cl-indent.el"
-        "enhanced lisp-indent mode"
-        (lisp  tools))
-    ("cl-macs.el"
-        "Common Lisp macros"
-        (extensions))
-    ("cl-seq.el"
-        "Common Lisp features, part 3"
-        (extensions))
-    ("cl-specs.el"
-        "Edebug specs for cl.el"
-        (lisp  tools  maint))
-    ("cl.el"
-        "Common Lisp extensions for Emacs"
-        (extensions))
-    ("copyright.el"
-        "update the copyright notice in current buffer"
-        (maint  tools))
-    ("crm.el"
-        "read multiple strings with completion"
-        (completion  minibuffer  multiple elements))
-    ("cust-print.el"
-        "handles print-level and print-circle"
-        (extensions))
-    ("debug.el"
-        "debuggers and related commands for Emacs"
-        (lisp  tools  maint))
-    ("disass.el"
-        "disassembler for compiled Emacs Lisp code"
-        (internal))
-    ("easy-mmode.el"
-        "easy definition for major and minor modes"
-        (extensions lisp))
-    ("easymenu.el"
-        "support the easymenu interface for defining a menu"
-        (emulations))
-    ("edebug.el"
-        "a source-level debugger for Emacs Lisp"
-        (lisp  tools  maint))
-    ("eldoc.el"
-        "show function arglist or variable docstring in echo area"
-        (extensions))
-    ("elint.el"
-        "Lint Emacs Lisp"
-        (lisp))
-    ("elp.el"
-        "Emacs Lisp Profiler"
-        (debugging lisp tools))
-    ("ewoc.el"
-        "utility to maintain a view of a list of objects in a buffer"
-        (extensions  lisp))
-    ("find-func.el"
-        "find the definition of the Emacs Lisp function near point"
-        (emacs-lisp  functions  variables))
-    ("find-gc.el"
-        "detect functions that call the garbage collector"
-        nil)
-    ("float.el"
-        "obsolete floating point arithmetic package"
-        (extensions))
-    ("gulp.el"
-        "ask for updates for Lisp packages"
-        (maintenance))
-    ("helper.el"
-        "utility help package supporting help in electric modes"
-        (help))
-    ("levents.el"
-        "emulate the Lucid event data type and associated functions"
-        (emulations))
-    ("lisp-mnt.el"
-        "minor mode for Emacs Lisp maintainers"
-        (docs))
-    ("lisp-mode.el"
-        "Lisp mode, and its idiosyncratic commands"
-        (lisp  languages))
-    ("lisp.el"
-        "Lisp editing commands for Emacs"
-        (lisp  languages))
-    ("lmenu.el"
-        "emulate Lucid's menubar support"
-        (emulations obsolete))
-    ("lselect.el"
-        "Lucid interface to X Selections"
-        (emulations))
-    ("lucid.el"
-        "emulate some Lucid Emacs functions"
-        (emulations))
-    ("pp.el"
-        "pretty printer for Emacs Lisp"
-        (lisp))
-    ("re-builder.el"
-        "building Regexps with visual feedback"
-        (matching  lisp  tools))
-    ("regexp-opt.el"
-        "generate efficient regexps to match strings"
-        (strings  regexps  extensions))
-    ("ring.el"
-        "handle rings of items"
-        (extensions))
-    ("rx.el"
-        "sexp notation for regular expressions"
-        (strings  regexps  extensions))
-    ("shadow.el"
-        "locate Emacs Lisp file shadowings"
-        (lisp))
-    ("sregex.el"
-        "symbolic regular expressions"
-        (extensions))
-    ("tq.el"
-        "utility to maintain a transaction queue"
-        (extensions))
-    ("trace.el"
-        "tracing facility for Emacs Lisp functions"
-        (tools  lisp))
-    ("crisp.el"
-        "CRiSP/Brief Emacs emulator"
-        (emulations brief crisp))
-    ("edt-lk201.el"
-        "enhanced EDT keypad mode emulation for LK-201 keyboards"
-        (emulations))
-    ("edt-mapper.el"
-        "create an EDT LK-201 map file for X-Windows Emacs"
-        (emulations))
-    ("edt-pc.el"
-        "enhanced EDT keypad mode emulation for PC 101 keyboards"
-        (emulations))
-    ("edt-vt100.el"
-        "enhanced EDT keypad mode emulation for VT series terminals"
-        (emulations))
-    ("edt.el"
-        "enhanced EDT keypad mode emulation for GNU Emacs 19"
-        (emulations))
-    ("mlconvert.el"
-        "convert buffer of Mocklisp code to real lisp"
-        (emulations))
-    ("mlsupport.el"
-        "run-time support for mocklisp code"
-        (extensions))
-    ("pc-mode.el"
-        "emulate certain key bindings used on PCs"
-        (emulations))
-    ("pc-select.el"
-        "emulate mark, cut, copy and paste from Motif"
-        (convenience emulation))
-    ("tpu-edt.el"
-        "Emacs emulating TPU emulating EDT"
-        (emulations))
-    ("tpu-extras.el"
-        "scroll margins and free cursor mode for TPU-edt"
-        (emulations))
-    ("tpu-mapper.el"
-        "create a TPU-edt X-windows keymap file"
-        (emulations))
-    ("vi.el"
-        "major mode for emulating \"vi\" editor under GNU Emacs"
-        (emulations))
-    ("vip.el"
-        "a VI Package for GNU Emacs"
-        (emulations))
-    ("viper-cmd.el"
-        "Vi command support for Viper"
-        nil)
-    ("viper-ex.el"
-        "functions implementing the Ex commands for Viper"
-        nil)
-    ("viper-init.el"
-        "some common definitions for Viper"
-        nil)
-    ("viper-keym.el"
-        "Viper keymaps"
-        nil)
-    ("viper-macs.el"
-        "functions implementing keyboard macros for Viper"
-        nil)
-    ("viper-mous.el"
-        "mouse support for Viper"
-        nil)
-    ("viper-util.el"
-        "Utilities used by viper.el"
-        nil)
-    ("viper.el"
-        "A full-featured Vi emulator for GNU Emacs and XEmacs,"
-        (emulations))
-    ("ws-mode.el"
-        "WordStar emulation mode for GNU Emacs"
-        (emulations))
-    ("em-alias.el"
-        "creation and management of command aliases"
-        nil)
-    ("em-banner.el"
-        "sample module that displays a login banner"
-        nil)
-    ("em-basic.el"
-        "basic shell builtin commands"
-        nil)
-    ("em-cmpl.el"
-        "completion using the TAB key"
-        nil)
-    ("em-dirs.el"
-        "directory navigation commands"
-        nil)
-    ("em-glob.el"
-        "extended file name globbing"
-        nil)
-    ("em-hist.el"
-        "history list management"
-        nil)
-    ("em-ls.el"
-        "implementation of ls in Lisp"
-        nil)
-    ("em-pred.el"
-        "argument predicates and modifiers (ala zsh)"
-        nil)
-    ("em-prompt.el"
-        "command prompts"
-        nil)
-    ("em-rebind.el"
-        "rebind keys when point is at current input"
-        nil)
-    ("em-script.el"
-        "Eshell script files"
-        nil)
-    ("em-smart.el"
-        "smart display of output"
-        nil)
-    ("em-term.el"
-        "running visual commands"
-        nil)
-    ("em-unix.el"
-        "UNIX command aliases"
-        nil)
-    ("em-xtra.el"
-        "extra alias functions"
-        nil)
-    ("esh-arg.el"
-        "argument processing"
-        nil)
-    ("esh-cmd.el"
-        "command invocation"
-        nil)
-    ("esh-ext.el"
-        "commands external to Eshell"
-        nil)
-    ("esh-groups.el"
-        nil
-        nil)
-    ("esh-io.el"
-        "I/O management"
-        nil)
-    ("esh-maint.el"
-        "init code for building eshell"
-        nil)
-    ("esh-mode.el"
-        "user interface"
-        nil)
-    ("esh-module.el"
-        "Eshell modules"
-        (processes))
-    ("esh-opt.el"
-        "command options processing"
-        nil)
-    ("esh-proc.el"
-        "process management"
-        nil)
-    ("esh-test.el"
-        "Eshell test suite"
-        nil)
-    ("esh-util.el"
-        "general utilities"
-        nil)
-    ("esh-var.el"
-        "handling of variables"
-        nil)
-    ("eshell.el"
-        "the Emacs command shell"
-        (processes))
-    ("binhex.el"
-        "elisp native binhex decode"
-        (binhex news))
-    ("earcon.el"
-        "sound effects for messages"
+    ("binhex.el"
+        "elisp native binhex decode"
+        (binhex news))
+    ("earcon.el"
+        "sound effects for messages"
         nil)
     ("flow-fill.el"
         "interprete RFC2646 \"flowed\" text"
@@ -1313,7 +881,7 @@
         "showing message/partial"
         (message partial))
     ("mm-util.el"
-        "utility functions for MIME things"
+        "Utility functions for Mule and low level things"
         nil)
     ("mm-uu.el"
         "return uu stuff as mm handles"
@@ -1414,36 +982,519 @@
     ("rfc2045.el"
         "functions for decoding rfc2045 headers"
         nil)
-    ("rfc2047.el"
-        "functions for encoding and decoding rfc2047 messages"
+    ("rfc2047.el"
+        "functions for encoding and decoding rfc2047 messages"
+        nil)
+    ("rfc2104.el"
+        "RFC2104 Hashed Message Authentication Codes"
+        (mail))
+    ("rfc2231.el"
+        "functions for decoding rfc2231 headers"
+        nil)
+    ("score-mode.el"
+        "mode for editing Gnus score files"
+        (news  mail))
+    ("smiley-ems.el"
+        "displaying smiley faces"
+        (news mail multimedia))
+    ("starttls.el"
+        "STARTTLS functions"
+        (tls  ssl  openssl  mail  news))
+    ("time-date.el"
+        "date and time handling functions"
+        (mail news util))
+    ("utf7.el"
+        "UTF-7 encoding/decoding for Emacs"
+        (mail))
+    ("uudecode.el"
+        "elisp native uudecode"
+        (uudecode news))
+    ("webmail.el"
+        "interface of web mail"
+        (hotmail netaddress my-deja netscape))
+    ("blessmail.el"
+        "decide whether movemail needs special privileges"
+        (internal))
+    ("emacsbug.el"
+        "command to report Emacs bugs to appropriate mailing list"
+        (maint mail))
+    ("feedmail.el"
+        "assist other email packages to massage outgoing messages"
+        (email  queue  mail  sendmail  message  spray  smtp  draft))
+    ("footnote.el"
+        "footnote support for message mode"
+        (mail  news))
+    ("mail-extr.el"
+        "extract full name and address from RFC 822 mail header"
+        (mail))
+    ("mail-hist.el"
+        "headers and message body history for outgoing mail"
+        (mail  history))
+    ("mail-utils.el"
+        "utility functions used both by rmail and rnews"
+        (mail  news))
+    ("mailabbrev.el"
+        "abbrev-expansion of mail aliases"
+        (mail))
+    ("mailalias.el"
+        "expand and complete mailing address aliases"
+        (mail))
+    ("mailheader.el"
+        "mail header parsing, merging, formatting"
+        (tools  mail  news))
+    ("mailpost.el"
+        "RMAIL coupler to /usr/uci/post mailer"
+        (mail))
+    ("metamail.el"
+        "Metamail interface for GNU Emacs"
+        (mail  news  mime  multimedia))
+    ("mh-comp.el"
+        "mh-e functions for composing messages"
+        (mail))
+    ("mh-e.el"
+        "GNU Emacs interface to the MH mail system"
+        (mail))
+    ("mh-funcs.el"
+        "mh-e functions not everyone will use right away"
+        nil)
+    ("mh-mime.el"
+        "mh-e support for composing MIME messages"
+        nil)
+    ("mh-pick.el"
+        "make a search pattern and search for a message in mh-e"
+        nil)
+    ("mh-seq.el"
+        "mh-e sequences support"
+        nil)
+    ("mh-utils.el"
+        "mh-e code needed for both sending and reading"
+        nil)
+    ("mspools.el"
+        "show mail spools waiting to be read"
+        (mail))
+    ("reporter.el"
+        "customizable bug reporting of lisp programs"
+        (maint mail tools))
+    ("rfc2368.el"
+        "support for rfc2368"
+        (mail))
+    ("rfc822.el"
+        "hairy rfc822 parser for mail and news and suchlike"
+        (mail))
+    ("rmail.el"
+        "main code of \"RMAIL\" mail reader for Emacs"
+        (mail))
+    ("rmailedit.el"
+        "\"RMAIL edit mode\"  Edit the current message"
+        (mail))
+    ("rmailkwd.el"
+        "part of the \"RMAIL\" mail reader for Emacs"
+        (mail))
+    ("rmailmsc.el"
+        "miscellaneous support functions for the RMAIL mail reader"
+        (mail))
+    ("rmailout.el"
+        "\"RMAIL\" mail reader for Emacs: output message to a file"
+        (mail))
+    ("rmailsort.el"
+        "Rmail: sort messages"
+        (mail))
+    ("rmailsum.el"
+        "make summary buffers for the mail reader"
+        (mail))
+    ("sendmail.el"
+        "mail sending commands for Emacs."
+        (mail))
+    ("smtpmail.el"
+        "simple SMTP protocol (RFC 821) for sending mail"
+        (mail))
+    ("supercite.el"
+        "minor mode for citing mail and news replies"
+        (mail  news))
+    ("uce.el"
+        "facilitate reply to unsolicited commercial email"
+        (uce  unsolicited commercial email))
+    ("undigest.el"
+        "digest-cracking support for the RMAIL mail reader"
+        (mail))
+    ("unrmail.el"
+        "convert Rmail files to mailbox files"
+        (mail))
+    ("vms-pmail.el"
+        "use Emacs as the editor within VMS mail"
+        (vms))
+    ("appt.el"
+        "appointment notification functions"
+        (calendar))
+    ("cal-china.el"
+        "calendar functions for the Chinese calendar"
+        (calendar))
+    ("cal-coptic.el"
+        "calendar functions for the Coptic/Ethiopic calendars"
+        (calendar))
+    ("cal-dst.el"
+        "calendar functions for daylight savings rules"
+        (calendar))
+    ("cal-french.el"
+        "calendar functions for the French Revolutionary calendar"
+        (calendar))
+    ("cal-hebrew.el"
+        "calendar functions for the Hebrew calendar"
+        (calendar))
+    ("cal-islam.el"
+        "calendar functions for the Islamic calendar"
+        (calendar))
+    ("cal-iso.el"
+        "calendar functions for the ISO calendar"
+        (calendar))
+    ("cal-julian.el"
+        "calendar functions for the Julian calendar"
+        (calendar))
+    ("cal-mayan.el"
+        "calendar functions for the Mayan calendars"
+        (calendar))
+    ("cal-menu.el"
+        "calendar functions for menu bar and popup menu support"
+        (calendar))
+    ("cal-move.el"
+        "calendar functions for movement in the calendar"
+        (calendar))
+    ("cal-persia.el"
+        "calendar functions for the Persian calendar"
+        (calendar))
+    ("cal-tex.el"
+        "calendar functions for printing calendars with LaTeX"
+        (calendar))
+    ("cal-x.el"
+        "calendar windows in dedicated frames in X"
+        (calendar))
+    ("calendar.el"
+        "calendar functions"
+        (calendar))
+    ("diary-lib.el"
+        "diary functions"
+        (calendar))
+    ("holidays.el"
+        "holiday functions for the calendar package"
+        (holidays  calendar))
+    ("lunar.el"
+        "calendar functions for phases of the moon"
+        (calendar))
+    ("solar.el"
+        "calendar functions for solar events"
+        (calendar))
+    ("timeclock.el"
+        "mode for keeping track of how much you work"
+        (calendar data))
+    ("todo-mode.el"
+        "major mode for editing TODO list files"
+        (calendar  todo))
+    ("advice.el"
+        "an overloading mechanism for Emacs Lisp functions"
+        (extensions  lisp  tools))
+    ("assoc.el"
+        "insert/delete/sort functions on association lists"
+        (extensions))
+    ("authors.el"
+        "utility for maintaining Emacs' AUTHORS file"
+        (maint))
+    ("autoload.el"
+        "maintain autoloads in loaddefs.el"
+        (maint))
+    ("backquote.el"
+        "implement the ` Lisp construct"
+        (extensions  internal))
+    ("byte-opt.el"
+        "the optimization passes of the emacs-lisp byte compiler"
+        (internal))
+    ("bytecomp.el"
+        "compilation of Lisp code into byte code"
+        (lisp))
+    ("checkdoc.el"
+        "check documentation strings for style requirements"
+        (docs  maint  lisp))
+    ("cl-compat.el"
+        "Common Lisp extensions for GNU Emacs Lisp (compatibility)"
+        (extensions))
+    ("cl-extra.el"
+        "Common Lisp features, part 2"
+        (extensions))
+    ("cl-indent.el"
+        "enhanced lisp-indent mode"
+        (lisp  tools))
+    ("cl-macs.el"
+        "Common Lisp macros"
+        (extensions))
+    ("cl-seq.el"
+        "Common Lisp features, part 3"
+        (extensions))
+    ("cl-specs.el"
+        "Edebug specs for cl.el"
+        (lisp  tools  maint))
+    ("cl.el"
+        "Common Lisp extensions for Emacs"
+        (extensions))
+    ("copyright.el"
+        "update the copyright notice in current buffer"
+        (maint  tools))
+    ("crm.el"
+        "read multiple strings with completion"
+        (completion  minibuffer  multiple elements))
+    ("cust-print.el"
+        "handles print-level and print-circle"
+        (extensions))
+    ("debug.el"
+        "debuggers and related commands for Emacs"
+        (lisp  tools  maint))
+    ("disass.el"
+        "disassembler for compiled Emacs Lisp code"
+        (internal))
+    ("easy-mmode.el"
+        "easy definition for major and minor modes"
+        (extensions lisp))
+    ("easymenu.el"
+        "support the easymenu interface for defining a menu"
+        (emulations))
+    ("edebug.el"
+        "a source-level debugger for Emacs Lisp"
+        (lisp  tools  maint))
+    ("eldoc.el"
+        "show function arglist or variable docstring in echo area"
+        (extensions))
+    ("elint.el"
+        "Lint Emacs Lisp"
+        (lisp))
+    ("elp.el"
+        "Emacs Lisp Profiler"
+        (debugging lisp tools))
+    ("ewoc.el"
+        "utility to maintain a view of a list of objects in a buffer"
+        (extensions  lisp))
+    ("find-func.el"
+        "find the definition of the Emacs Lisp function near point"
+        (emacs-lisp  functions  variables))
+    ("find-gc.el"
+        "detect functions that call the garbage collector"
+        nil)
+    ("float.el"
+        "obsolete floating point arithmetic package"
+        (extensions))
+    ("gulp.el"
+        "ask for updates for Lisp packages"
+        (maintenance))
+    ("helper.el"
+        "utility help package supporting help in electric modes"
+        (help))
+    ("levents.el"
+        "emulate the Lucid event data type and associated functions"
+        (emulations))
+    ("lisp-mnt.el"
+        "minor mode for Emacs Lisp maintainers"
+        (docs))
+    ("lisp-mode.el"
+        "Lisp mode, and its idiosyncratic commands"
+        (lisp  languages))
+    ("lisp.el"
+        "Lisp editing commands for Emacs"
+        (lisp  languages))
+    ("lmenu.el"
+        "emulate Lucid's menubar support"
+        (emulations obsolete))
+    ("lselect.el"
+        "Lucid interface to X Selections"
+        (emulations))
+    ("lucid.el"
+        "emulate some Lucid Emacs functions"
+        (emulations))
+    ("pp.el"
+        "pretty printer for Emacs Lisp"
+        (lisp))
+    ("re-builder.el"
+        "building Regexps with visual feedback"
+        (matching  lisp  tools))
+    ("regexp-opt.el"
+        "generate efficient regexps to match strings"
+        (strings  regexps  extensions))
+    ("ring.el"
+        "handle rings of items"
+        (extensions))
+    ("rx.el"
+        "sexp notation for regular expressions"
+        (strings  regexps  extensions))
+    ("shadow.el"
+        "locate Emacs Lisp file shadowings"
+        (lisp))
+    ("sregex.el"
+        "symbolic regular expressions"
+        (extensions))
+    ("tq.el"
+        "utility to maintain a transaction queue"
+        (extensions))
+    ("trace.el"
+        "tracing facility for Emacs Lisp functions"
+        (tools  lisp))
+    ("crisp.el"
+        "CRiSP/Brief Emacs emulator"
+        (emulations brief crisp))
+    ("edt-lk201.el"
+        "enhanced EDT keypad mode emulation for LK-201 keyboards"
+        (emulations))
+    ("edt-mapper.el"
+        "create an EDT LK-201 map file for X-Windows Emacs"
+        (emulations))
+    ("edt-pc.el"
+        "enhanced EDT keypad mode emulation for PC 101 keyboards"
+        (emulations))
+    ("edt-vt100.el"
+        "enhanced EDT keypad mode emulation for VT series terminals"
+        (emulations))
+    ("edt.el"
+        "enhanced EDT keypad mode emulation for GNU Emacs 19"
+        (emulations))
+    ("mlconvert.el"
+        "convert buffer of Mocklisp code to real lisp"
+        (emulations))
+    ("mlsupport.el"
+        "run-time support for mocklisp code"
+        (extensions))
+    ("pc-mode.el"
+        "emulate certain key bindings used on PCs"
+        (emulations))
+    ("pc-select.el"
+        "emulate mark, cut, copy and paste from Motif"
+        (convenience emulation))
+    ("tpu-edt.el"
+        "Emacs emulating TPU emulating EDT"
+        (emulations))
+    ("tpu-extras.el"
+        "scroll margins and free cursor mode for TPU-edt"
+        (emulations))
+    ("tpu-mapper.el"
+        "create a TPU-edt X-windows keymap file"
+        (emulations))
+    ("vi.el"
+        "major mode for emulating \"vi\" editor under GNU Emacs"
+        (emulations))
+    ("vip.el"
+        "a VI Package for GNU Emacs"
+        (emulations))
+    ("viper-cmd.el"
+        "Vi command support for Viper"
+        nil)
+    ("viper-ex.el"
+        "functions implementing the Ex commands for Viper"
+        nil)
+    ("viper-init.el"
+        "some common definitions for Viper"
+        nil)
+    ("viper-keym.el"
+        "Viper keymaps"
+        nil)
+    ("viper-macs.el"
+        "functions implementing keyboard macros for Viper"
+        nil)
+    ("viper-mous.el"
+        "mouse support for Viper"
+        nil)
+    ("viper-util.el"
+        "Utilities used by viper.el"
+        nil)
+    ("viper.el"
+        "A full-featured Vi emulator for GNU Emacs and XEmacs,"
+        (emulations))
+    ("ws-mode.el"
+        "WordStar emulation mode for GNU Emacs"
+        (emulations))
+    ("em-alias.el"
+        "creation and management of command aliases"
+        nil)
+    ("em-banner.el"
+        "sample module that displays a login banner"
+        nil)
+    ("em-basic.el"
+        "basic shell builtin commands"
+        nil)
+    ("em-cmpl.el"
+        "completion using the TAB key"
+        nil)
+    ("em-dirs.el"
+        "directory navigation commands"
+        nil)
+    ("em-glob.el"
+        "extended file name globbing"
+        nil)
+    ("em-hist.el"
+        "history list management"
+        nil)
+    ("em-ls.el"
+        "implementation of ls in Lisp"
+        nil)
+    ("em-pred.el"
+        "argument predicates and modifiers (ala zsh)"
+        nil)
+    ("em-prompt.el"
+        "command prompts"
+        nil)
+    ("em-rebind.el"
+        "rebind keys when point is at current input"
+        nil)
+    ("em-script.el"
+        "Eshell script files"
         nil)
-    ("rfc2104.el"
-        "RFC2104 Hashed Message Authentication Codes"
-        (mail))
-    ("rfc2231.el"
-        "functions for decoding rfc2231 headers"
+    ("em-smart.el"
+        "smart display of output"
         nil)
-    ("score-mode.el"
-        "mode for editing Gnus score files"
-        (news  mail))
-    ("smiley-ems.el"
-        "displaying smiley faces"
-        (news mail multimedia))
-    ("starttls.el"
-        "STARTTLS functions"
-        (tls  ssl  openssl  mail  news))
-    ("time-date.el"
-        "date and time handling functions"
-        (mail news util))
-    ("utf7.el"
-        "UTF-7 encoding/decoding for Emacs"
-        (mail))
-    ("uudecode.el"
-        "elisp native uudecode"
-        (uudecode news))
-    ("webmail.el"
-        "interface of web mail"
-        (hotmail netaddress my-deja netscape))
+    ("em-term.el"
+        "running visual commands"
+        nil)
+    ("em-unix.el"
+        "UNIX command aliases"
+        nil)
+    ("em-xtra.el"
+        "extra alias functions"
+        nil)
+    ("esh-arg.el"
+        "argument processing"
+        nil)
+    ("esh-cmd.el"
+        "command invocation"
+        nil)
+    ("esh-ext.el"
+        "commands external to Eshell"
+        nil)
+    ("esh-groups.el"
+        nil
+        nil)
+    ("esh-io.el"
+        "I/O management"
+        nil)
+    ("esh-maint.el"
+        "init code for building eshell"
+        nil)
+    ("esh-mode.el"
+        "user interface"
+        nil)
+    ("esh-module.el"
+        "Eshell modules"
+        (processes))
+    ("esh-opt.el"
+        "command options processing"
+        nil)
+    ("esh-proc.el"
+        "process management"
+        nil)
+    ("esh-test.el"
+        "Eshell test suite"
+        nil)
+    ("esh-util.el"
+        "general utilities"
+        nil)
+    ("esh-var.el"
+        "handling of variables"
+        nil)
+    ("eshell.el"
+        "the Emacs command shell"
+        (processes))
     ("ccl.el"
         "CCL (Code Conversion Language) compiler"
         (ccl  mule  multilingual  character set  coding-system))
@@ -1633,117 +1684,66 @@
     ("vietnamese.el"
         "support for Vietnamese"
         (multilingual  vietnamese))
-    ("blessmail.el"
-        "decide whether movemail needs special privileges"
-        (internal))
-    ("emacsbug.el"
-        "command to report Emacs bugs to appropriate mailing list"
-        (maint mail))
-    ("feedmail.el"
-        "assist other email packages to massage outgoing messages"
-        (email  queue  mail  sendmail  message  spray  smtp  draft))
-    ("footnote.el"
-        "footnote support for message mode"
-        (mail  news))
-    ("mail-extr.el"
-        "extract full name and address from RFC 822 mail header"
-        (mail))
-    ("mail-hist.el"
-        "headers and message body history for outgoing mail"
-        (mail  history))
-    ("mail-utils.el"
-        "utility functions used both by rmail and rnews"
-        (mail  news))
-    ("mailabbrev.el"
-        "abbrev-expansion of mail aliases"
-        (mail))
-    ("mailalias.el"
-        "expand and complete mailing address aliases"
-        (mail))
-    ("mailheader.el"
-        "mail header parsing, merging, formatting"
-        (tools  mail  news))
-    ("mailpost.el"
-        "RMAIL coupler to /usr/uci/post mailer"
-        (mail))
-    ("metamail.el"
-        "Metamail interface for GNU Emacs"
-        (mail  news  mime  multimedia))
-    ("mh-comp.el"
-        "mh-e functions for composing messages"
-        (mail))
-    ("mh-e.el"
-        "GNU Emacs interface to the MH mail system"
-        (mail))
-    ("mh-funcs.el"
-        "mh-e functions not everyone will use right away"
-        nil)
-    ("mh-mime.el"
-        "mh-e support for composing MIME messages"
-        nil)
-    ("mh-pick.el"
-        "make a search pattern and search for a message in mh-e"
-        nil)
-    ("mh-seq.el"
-        "mh-e sequences support"
-        nil)
-    ("mh-utils.el"
-        "mh-e code needed for both sending and reading"
-        nil)
-    ("mspools.el"
-        "show mail spools waiting to be read"
-        (mail))
-    ("reporter.el"
-        "customizable bug reporting of lisp programs"
-        (maint mail tools))
-    ("rfc2368.el"
-        "support for rfc2368"
-        (mail))
-    ("rfc822.el"
-        "hairy rfc822 parser for mail and news and suchlike"
-        (mail))
-    ("rmail.el"
-        "main code of \"RMAIL\" mail reader for Emacs"
-        (mail))
-    ("rmailedit.el"
-        "\"RMAIL edit mode\"  Edit the current message"
-        (mail))
-    ("rmailkwd.el"
-        "part of the \"RMAIL\" mail reader for Emacs"
-        (mail))
-    ("rmailmsc.el"
-        "miscellaneous support functions for the RMAIL mail reader"
-        (mail))
-    ("rmailout.el"
-        "\"RMAIL\" mail reader for Emacs: output message to a file"
-        (mail))
-    ("rmailsort.el"
-        "Rmail: sort messages"
-        (mail))
-    ("rmailsum.el"
-        "make summary buffers for the mail reader"
-        (mail))
-    ("sendmail.el"
-        "mail sending commands for Emacs."
-        (mail))
-    ("smtpmail.el"
-        "simple SMTP protocol (RFC 821) for sending mail"
-        (mail))
-    ("supercite.el"
-        "minor mode for citing mail and news replies"
-        (mail  news))
-    ("uce.el"
-        "facilitate reply to unsolicited commercial email"
-        (uce  unsolicited commercial email))
-    ("undigest.el"
-        "digest-cracking support for the RMAIL mail reader"
-        (mail))
-    ("unrmail.el"
-        "convert Rmail files to mailbox files"
-        (mail))
-    ("vms-pmail.el"
-        "use Emacs as the editor within VMS mail"
-        (vms))
+    ("ange-ftp.el"
+        "transparent FTP support for GNU Emacs"
+        (comm))
+    ("browse-url.el"
+        "pass a URL to a WWW browser"
+        (hypertext  hypermedia  mouse))
+    ("eudc-bob.el"
+        "Binary Objects Support for EUDC"
+        (help))
+    ("eudc-export.el"
+        "functions to export EUDC query results"
+        (help))
+    ("eudc-hotlist.el"
+        "hotlist management for EUDC"
+        (help))
+    ("eudc-vars.el"
+        "Emacs Unified Directory Client"
+        (help))
+    ("eudc.el"
+        "Emacs Unified Directory Client"
+        (help))
+    ("eudcb-bbdb.el"
+        "Emacs Unified Directory Client - BBDB Backend"
+        (help))
+    ("eudcb-ldap.el"
+        "Emacs Unified Directory Client - LDAP Backend"
+        (help))
+    ("eudcb-ph.el"
+        "Emacs Unified Directory Client - CCSO PH/QI Backend"
+        (help))
+    ("goto-addr.el"
+        "click to browse URL or to send to e-mail address"
+        (mh-e  www  mouse  mail))
+    ("ldap.el"
+        "client interface to LDAP for Emacs"
+        (comm))
+    ("net-utils.el"
+        "network functions"
+        (network communications))
+    ("quickurl.el"
+        "insert an URL based on text at point in buffer"
+        (hypermedia))
+    ("rcompile.el"
+        "run a compilation on a remote machine"
+        (tools  processes))
+    ("rlogin.el"
+        "remote login interface"
+        (unix  comm))
+    ("snmp-mode.el"
+        "SNMP & SNMPv2 MIB major mode"
+        (data))
+    ("telnet.el"
+        "run a telnet session from within an Emacs buffer"
+        (unix  comm))
+    ("webjump.el"
+        "programmable Web hotlist"
+        (comm www))
+    ("zone-mode.el"
+        "major mode for editing DNS zone files"
+        (dns  languages))
     ("5x5.el"
         "simple little puzzle game"
         (games puzzles))
Binary files src-21.1/lisp/finder.elc and src-21.2/lisp/finder.elc differ
Binary files src-21.1/lisp/float-sup.elc and src-21.2/lisp/float-sup.elc differ
Binary files src-21.1/lisp/flow-ctrl.elc and src-21.2/lisp/flow-ctrl.elc differ
Binary files src-21.1/lisp/foldout.elc and src-21.2/lisp/foldout.elc differ
Binary files src-21.1/lisp/follow.elc and src-21.2/lisp/follow.elc differ
diff -ruN src-21.1/lisp/font-lock.el src-21.2/lisp/font-lock.el
--- src-21.1/lisp/font-lock.el	Wed Sep  5 15:36:29 2001
+++ src-21.2/lisp/font-lock.el	Thu Dec 13 08:35:35 2001
@@ -754,7 +754,7 @@
 
   ;; Turn on Font Lock mode.
   (when font-lock-mode
-    (add-hook 'after-change-functions 'font-lock-after-change-function nil t)
+    (add-hook 'after-change-functions 'font-lock-after-change-function t t)
     (font-lock-set-defaults)
     (font-lock-turn-on-thing-lock)
     ;; Fontify the buffer if we have to.
Binary files src-21.1/lisp/font-lock.elc and src-21.2/lisp/font-lock.elc differ
Binary files src-21.1/lisp/format.elc and src-21.2/lisp/format.elc differ
Binary files src-21.1/lisp/forms.elc and src-21.2/lisp/forms.elc differ
diff -ruN src-21.1/lisp/frame.el src-21.2/lisp/frame.el
--- src-21.1/lisp/frame.el	Sun Sep 30 12:47:22 2001
+++ src-21.2/lisp/frame.el	Sat Nov  3 16:56:49 2001
@@ -794,7 +794,9 @@
 To get the frame's current background color, use `frame-parameters'."
   (interactive (list (facemenu-read-color)))
   (modify-frame-parameters (selected-frame)
-			   (list (cons 'background-color color-name))))
+			   (list (cons 'background-color color-name)))
+  (or window-system
+      (face-set-after-frame-default (selected-frame))))
 
 (defun set-foreground-color (color-name)
   "Set the foreground color of the selected frame to COLOR-NAME.
@@ -802,7 +804,9 @@
 To get the frame's current foreground color, use `frame-parameters'."
   (interactive (list (facemenu-read-color)))
   (modify-frame-parameters (selected-frame)
-			   (list (cons 'foreground-color color-name))))
+			   (list (cons 'foreground-color color-name)))
+  (or window-system
+      (face-set-after-frame-default (selected-frame))))
 
 (defun set-cursor-color (color-name)
   "Set the text cursor color of the selected frame to COLOR-NAME.
Binary files src-21.1/lisp/frame.elc and src-21.2/lisp/frame.elc differ
Binary files src-21.1/lisp/generic.elc and src-21.2/lisp/generic.elc differ
diff -ruN src-21.1/lisp/gnus/ChangeLog src-21.2/lisp/gnus/ChangeLog
--- src-21.1/lisp/gnus/ChangeLog	Sat Oct  6 12:19:51 2001
+++ src-21.2/lisp/gnus/ChangeLog	Fri Feb 22 11:51:35 2002
@@ -1,3 +1,206 @@
+2002-02-21  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-art.el (gnus-article-edit-done): Widen the article buffer.
+
+2002-02-19  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mm-encode.el (mm-content-transfer-encoding-defaults): Set
+	default to base64. Add application/emacs-lisp.
+
+	* mail-source.el (mail-source-fetch-directory): Run scripts.
+
+2002-02-16  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-msg.el (gnus-post-method): Fix doc.
+
+	* gnus-sum.el (gnus-rebuild-thread): Count hidden lines too.
+
+2002-02-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-art.el (article-wash-html): Bind url-gateway-unplugged. 
+	* mm-view.el (mm-w3-prepare-buffer): Ditto.
+	(mm-inline-text): Ditto.
+	Suggested by  Dave Love <fx@gnu.org>.
+
+	* mml.el (mml-preview): Disable local map.
+	
+	* mml.el (mml-preview): Bind `q'.
+	From: Karl Kleinpaste <karl@charcoal.com>
+
+2002-02-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* message.el (message-forward-rmail-make-body): Directly use
+	rmail-msg-restore-non-pruned-header to avoid calling
+	vertical-motion.
+
+2002-01-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-start.el (gnus-read-init-file): Cleaned up.
+
+2002-01-03  Dave Love  <d.love@dl.ac.uk>
+
+	* gnus-start.el (gnus-startup-file-coding-system): Removed.
+	(gnus-read-init-file): Don't use it.
+
+2002-01-03  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+	* gnus-start.el (gnus-read-init-file): Don't force coding system
+	for ~/.gnus.  From Dave Love <fx@gnu.org>.
+	
+2002-01-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mm-util.el (mm-charset-to-coding-system): Don't setq charset.
+	* mm-util.el (mm-use-find-coding-systems-region): New variable.
+	(mm-find-mime-charset-region): Use it.
+	* nntp.el (nntp-send-buffer): Use mm-with-unibyte-current-buffer.
+	* nnspool.el (nnspool-request-post): Ditto.
+
+2001-12-12  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
+
+	* gnus-mlspl.el (gnus-group-split-fancy): Doc fix (add reference
+	to variable, follow doc-string conventions).
+
+2001-12-05  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mm-view.el (mm-inline-text): w3-coding-system-for-mime-charset
+	may not defined. From: Raja R Harinath <harinath@cs.umn.edu>.
+
+	* mm-view.el (mm-inline-message): Insert a newline unless bolp.
+
+	* gnus-sum.el (gnus-summary-save-article): Nix
+	gnus-display-mime-function and gnus-article-prepare-hook.
+
+2001-12-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* message.el (message-mail): Add send-actions.
+
+2001-11-28  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-sum.el (gnus-summary-limit-to-author): Fix the number of
+	arguments.
+
+2001-11-25  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* imap.el (imap-interactive-login, imap-open, imap-authenticate):
+	Use make-local-variable rather than make-variable-buffer-local.
+
+2001-11-25  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* message.el (message-forward-rmail-make-body): Use
+	save-window-excursion.
+	(message-encode-message-body): Use noerror when search.
+	(message-setup-1): Convert compose-mail send-actions to
+	message-send-actions.
+
+	* message.el (message-forward-subject-author-subject): Don't use
+	message-news-p, which widens the buffer.
+	(message-forward-make-body): New function.
+	(message-forward): Use it.
+	(message-insinuate-rmail): New function.
+	(message-forward-rmail-make-body): New function.
+
+	* gnus-util.el (gnus-directory-sep-char-regexp): New variable.
+	* gnus-score.el (gnus-score-find-bnews): Use it.
+	* mm-util.el (mm-iso-8859-x-to-15-region): Use
+	insert-before-markers.
+	From Jesper Harder <harder@ifa.au.dk>
+	* mm-util.el (mm-coding-system-priorities): Add backslash in the doc.
+	* mm-util.el (mm-coding-system-priorities): New variable.
+	(mm-sort-coding-systems-predicate): New function.
+	(mm-find-mime-charset-region): Resort coding systems if needed.
+	Suggested by Katsumi Yamaoka <yamaoka@jpl.org>.
+
+	* mm-util.el (mm-iso-8859-15-compatible): Fix doc.
+	(mm-hack-charsets): Fix doc.
+	
+	* mm-util.el (mm-iso-8859-15-compatible): Add inconvertible chars.
+	(mm-iso-8859-x-to-15-table): Ditto.
+	(mm-iso-8859-x-to-15-region): Ditto.
+	(mm-find-mime-charset-region): Ditto.
+	
+	* gnus-sum.el (gnus-summary-limit-to-subject): An exclusion version.
+	(gnus-summary-limit-to-author): Ditto.
+	(gnus-summary-limit-to-extra): Ditto.
+	(gnus-summary-find-matching): Support not-matching argument.
+
+	* message.el (message-wash-subject): Use `insert' rather than
+	`insert-string', which is deprecated.
+	From  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+2001-11-14  Sam Steingold  <sds@gnu.org>
+
+	* gnus-score.el: Fixed some doc strings to properly quote symbols.
+
+2001-11-10  Pavel Jan,Al(Bk  <Pavel@Janik.cz>
+
+	* gnus.el (gnus-local-domain): Reformat the doc-string to refer to
+	function `system-name' instead of both function and variable.
+
+2001-11-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mml.el (mml-preview): Bind mail-header-separator.
+
+2001-11-05  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mml.el (mml-generate-mime-1): Use mm-with-unibyte-current-buffer.
+	Suggested by  Dave Love  <fx@gnu.org>.
+
+2001-11-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mm-util.el (mm-charset-synonym-alist): Revert (some).
+
+2001-10-30  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mm-util.el (mm-iso-8859-x-to-15-region): New function.
+	(mm-hack-charsets): New variable.
+	(mm-iso-8859-15-compatible): New variable.
+	(mm-iso-8859-x-to-15-table): New variable.
+	(mm-find-mime-charset-region): Add parameter hack-charsets.
+
+	* mm-util.el (mm-charset-to-coding-system): Return nil, if charset
+	is nil.
+
+	* nnultimate.el, nnweb.el, nnslashdot.el: Update, because the web
+	pages are changed.
+
+	* mm-util.el (mm-mime-mule-charset-alist): Move down and call
+	mm-coding-system-p. Don't correct it only in XEmacs.
+	(mm-charset-to-coding-system): Use mm-coding-system-p and
+	mm-get-coding-system-list.
+	(mm-emacs-mule, mm-mule4-p): New.
+	(mm-enable-multibyte, mm-disable-multibyte,
+	mm-enable-multibyte-mule4, mm-disable-multibyte-mule4,
+	mm-with-unibyte-current-buffer,
+	mm-with-unibyte-current-buffer-mule4): Use them.
+	(mm-find-mime-charset-region): Treat iso-2022-jp.
+
+	From  Dave Love  <fx@gnu.org>:
+
+	* mm-util.el (mm-mime-mule-charset-alist): Make it correct by
+	construction.
+	(mm-charset-synonym-alist): Remove windows-125[02].  Make other
+	entries conditional on not having a coding system defined for
+	them.
+	(mm-mule-charset-to-mime-charset): Use
+	find-coding-systems-for-charsets if defined.
+	(mm-charset-to-coding-system): Don't use
+	mm-get-coding-system-list.  Look in mm-charset-synonym-alist
+	later.  Add last resort search of coding systems.
+	(mm-enable-multibyte-mule4, mm-disable-multibyte-mule4)
+	(mm-with-unibyte-current-buffer-mule4): Just treat Mule 5 like
+	Mule 4.
+	(mm-find-mime-charset-region): Re-write.
+	(mm-with-unibyte-current-buffer): Restore buffer as well as
+	multibyteness.
+
+2001-10-30  Simon Josefsson  <jas@extundo.com>
+
+	* nnimap.el (nnimap-date-days-ago): Defeat locale.
+
+2001-10-27  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* gnus-msg.el (gnus-setup-message): Setup reaper for MML buffers.
+
 2001-09-27  Gerd Moellmann  <gerd@gnu.org>
 
 	* gnus-ems.el (gnus-article-display-xface): Skip over previously
@@ -5,8 +208,8 @@
 
 2001-09-19  Sam Steingold  <sds@gnu.org>
 
-	* gnus-win.el (gnus-buffer-configuration): Respect
-	`gnus-bug-create-help-buffer'.
+	* gnus-win.el (gnus-buffer-configuration):
+	Respect `gnus-bug-create-help-buffer'.
 
 2001-09-18  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
@@ -16,8 +219,8 @@
 
 2001-09-18  Gerd Moellmann  <gerd@gnu.org>
 
-	* gnus-sum.el (gnus-select-newsgroup): Make
-	`gnus-current-select-method' buffer-local.
+	* gnus-sum.el (gnus-select-newsgroup):
+	Make `gnus-current-select-method' buffer-local.
 	From TSUCHIYA Masatoshi <tsuchiya@pine.kuee.kyoto-u.ac.jp>.
 
 	* gnus-art.el (gnus-request-article-this-buffer): Refer to
@@ -2822,7 +3025,7 @@
 	* gnus-draft.el (gnus-draft-send): Move gnus-draft-setup inside of
 	let.
 
-2000-04-26  Pavel Janik ml. <Pavel.Janik@inet.cz>
+2000-04-26  Pavel Jan,Al(Bk <Pavel@Janik.cz>
 
 	* gnus-draft.el (gnus-draft-setup): Fix comments.
 
@@ -5645,9 +5848,9 @@
 
 	* pop3.el: New version.
 
-1999-07-05  Simon Josefsson
+1999-07-05  Simon Josefsson  <jas@pdc.kth.se>
 
-        * gnus-srvr.el (gnus-browse-foreign-server): Use read.
+	* gnus-srvr.el (gnus-browse-foreign-server): Use read.
 
 1999-07-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -10599,6 +10802,6 @@
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+    Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
Binary files src-21.1/lisp/gnus/binhex.elc and src-21.2/lisp/gnus/binhex.elc differ
Binary files src-21.1/lisp/gnus/earcon.elc and src-21.2/lisp/gnus/earcon.elc differ
Binary files src-21.1/lisp/gnus/flow-fill.elc and src-21.2/lisp/gnus/flow-fill.elc differ
Binary files src-21.1/lisp/gnus/format-spec.elc and src-21.2/lisp/gnus/format-spec.elc differ
Binary files src-21.1/lisp/gnus/gnus-agent.elc and src-21.2/lisp/gnus/gnus-agent.elc differ
diff -ruN src-21.1/lisp/gnus/gnus-art.el src-21.2/lisp/gnus/gnus-art.el
--- src-21.1/lisp/gnus/gnus-art.el	Tue Sep 18 14:25:52 2001
+++ src-21.2/lisp/gnus/gnus-art.el	Fri Feb 22 11:51:35 2002
@@ -1,6 +1,6 @@
 ;;; gnus-art.el --- article mode commands for Gnus
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -1667,6 +1667,7 @@
 	  (narrow-to-region (point) (point-max))
 	  (mm-setup-w3)
 	  (let ((w3-strict-width (window-width))
+		(url-gateway-unplugged t)
 		(url-standalone-mode t))
 	    (condition-case var
 		(w3-region (point-min) (point-max))
@@ -1963,7 +1964,7 @@
 
 (defun gnus-article-check-hidden-text (type arg)
   "Return nil if hiding is necessary.
-Arg can be nil or a number.  Nil and positive means hide, negative
+Arg can be nil or a number.  nil and positive means hide, negative
 means show, 0 means toggle."
   (save-excursion
     (save-restriction
@@ -4184,9 +4185,9 @@
 (defun gnus-article-edit-done (&optional arg)
   "Update the article edits and exit."
   (interactive "P")
+  (widen)
   (save-excursion
     (save-restriction
-      (widen)
       (when (article-goto-body)
 	(let ((lines (count-lines (point) (point-max)))
 	      (length (- (point-max) (point)))
Binary files src-21.1/lisp/gnus/gnus-art.elc and src-21.2/lisp/gnus/gnus-art.elc differ
Binary files src-21.1/lisp/gnus/gnus-async.elc and src-21.2/lisp/gnus/gnus-async.elc differ
Binary files src-21.1/lisp/gnus/gnus-audio.elc and src-21.2/lisp/gnus/gnus-audio.elc differ
Binary files src-21.1/lisp/gnus/gnus-bcklg.elc and src-21.2/lisp/gnus/gnus-bcklg.elc differ
Binary files src-21.1/lisp/gnus/gnus-cache.elc and src-21.2/lisp/gnus/gnus-cache.elc differ
diff -ruN src-21.1/lisp/gnus/gnus-cite.el src-21.2/lisp/gnus/gnus-cite.el
--- src-21.1/lisp/gnus/gnus-cite.el	Wed Dec 20 07:13:15 2000
+++ src-21.2/lisp/gnus/gnus-cite.el	Fri Feb 22 11:51:35 2002
@@ -1,6 +1,6 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus  -*- coding: iso-latin-1 -*-
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
Binary files src-21.1/lisp/gnus/gnus-cite.elc and src-21.2/lisp/gnus/gnus-cite.elc differ
Binary files src-21.1/lisp/gnus/gnus-cus.elc and src-21.2/lisp/gnus/gnus-cus.elc differ
Binary files src-21.1/lisp/gnus/gnus-demon.elc and src-21.2/lisp/gnus/gnus-demon.elc differ
Binary files src-21.1/lisp/gnus/gnus-draft.elc and src-21.2/lisp/gnus/gnus-draft.elc differ
Binary files src-21.1/lisp/gnus/gnus-dup.elc and src-21.2/lisp/gnus/gnus-dup.elc differ
Binary files src-21.1/lisp/gnus/gnus-eform.elc and src-21.2/lisp/gnus/gnus-eform.elc differ
Binary files src-21.1/lisp/gnus/gnus-ems.elc and src-21.2/lisp/gnus/gnus-ems.elc differ
Binary files src-21.1/lisp/gnus/gnus-gl.elc and src-21.2/lisp/gnus/gnus-gl.elc differ
diff -ruN src-21.1/lisp/gnus/gnus-group.el src-21.2/lisp/gnus/gnus-group.el
--- src-21.1/lisp/gnus/gnus-group.el	Wed Nov 22 15:53:54 2000
+++ src-21.2/lisp/gnus/gnus-group.el	Fri Feb 22 11:51:35 2002
@@ -1,5 +1,5 @@
 ;;; gnus-group.el --- group mode commands for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -3462,7 +3462,7 @@
 
 (defun gnus-group-find-new-groups (&optional arg)
   "Search for new groups and add them.
-Each new group will be treated with `gnus-subscribe-newsgroup-method.'
+Each new group will be treated with `gnus-subscribe-newsgroup-method'.
 With 1 C-u, use the `ask-server' method to query the server for new
 groups.
 With 2 C-u's, use most complete method possible to query the server
Binary files src-21.1/lisp/gnus/gnus-group.elc and src-21.2/lisp/gnus/gnus-group.elc differ
Binary files src-21.1/lisp/gnus/gnus-int.elc and src-21.2/lisp/gnus/gnus-int.elc differ
Binary files src-21.1/lisp/gnus/gnus-kill.elc and src-21.2/lisp/gnus/gnus-kill.elc differ
Binary files src-21.1/lisp/gnus/gnus-logic.elc and src-21.2/lisp/gnus/gnus-logic.elc differ
Binary files src-21.1/lisp/gnus/gnus-mh.elc and src-21.2/lisp/gnus/gnus-mh.elc differ
Binary files src-21.1/lisp/gnus/gnus-ml.elc and src-21.2/lisp/gnus/gnus-ml.elc differ
diff -ruN src-21.1/lisp/gnus/gnus-mlspl.el src-21.2/lisp/gnus/gnus-mlspl.el
--- src-21.1/lisp/gnus/gnus-mlspl.el	Sun Jul 15 19:42:53 2001
+++ src-21.2/lisp/gnus/gnus-mlspl.el	Fri Feb 22 11:51:35 2002
@@ -1,5 +1,5 @@
 ;;; gnus-mlspl.el --- a group params-based mail splitting mechanism
-;; Copyright (C) 1998, 1999, 2000
+;; Copyright (C) 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
@@ -98,8 +98,8 @@
 ;;;###autoload
 (defun gnus-group-split-fancy
   (&optional groups no-crosspost catch-all)
-  "Uses information from group parameters in order to split mail.  It
-can be embedded into nnmail-split-fancy lists with the SPLIT
+  "Uses information from group parameters in order to split mail.
+It can be embedded into `nnmail-split-fancy' lists with the SPLIT
 
 \(: gnus-group-split-fancy GROUPS NO-CROSSPOST CATCH-ALL\)
 
Binary files src-21.1/lisp/gnus/gnus-mlspl.elc and src-21.2/lisp/gnus/gnus-mlspl.elc differ
Binary files src-21.1/lisp/gnus/gnus-move.elc and src-21.2/lisp/gnus/gnus-move.elc differ
diff -ruN src-21.1/lisp/gnus/gnus-msg.el src-21.2/lisp/gnus/gnus-msg.el
--- src-21.1/lisp/gnus/gnus-msg.el	Thu Dec 21 20:58:34 2000
+++ src-21.2/lisp/gnus/gnus-msg.el	Fri Feb 22 11:51:35 2002
@@ -1,5 +1,5 @@
 ;;; gnus-msg.el --- mail and post interface for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -37,21 +37,21 @@
 (defcustom gnus-post-method 'current
   "*Preferred method for posting USENET news.
 
-If this variable is `current', Gnus will use the \"current\" select
-method when posting.  If it is nil (which is the default), Gnus will
-use the native select method when posting.
+If this variable is `current' (which is the default), Gnus will use
+the \"current\" select method when posting.  If it is `native', Gnus
+will use the native select method when posting.
 
 This method will not be used in mail groups and the like, only in
 \"real\" newsgroups.
 
-If not nil nor `native', the value must be a valid method as discussed
+If not `native' nor `current', the value must be a valid method as discussed
 in the documentation of `gnus-select-method'.  It can also be a list of
 methods.  If that is the case, the user will be queried for what select
 method to use when posting."
   :group 'gnus-group-foreign
-  :type `(choice (const nil)
-                 (const current)
-		 (const native)
+  :link '(custom-manual "(gnus)Posting Server")
+  :type `(choice (const native)
+		 (const current)
 		 (sexp :tag "Methods" ,gnus-select-method)))
 
 (defvar gnus-outgoing-message-group nil
@@ -233,6 +233,7 @@
 	     (let ((mbl1 mml-buffer-list))
 	       (setq mml-buffer-list mbl)  ;; Global value
 	       (set (make-local-variable 'mml-buffer-list) mbl1);; Local value
+	       (add-hook 'change-major-mode-hook 'mml-destroy-buffers nil t)
 	       (add-hook 'kill-buffer-hook 'mml-destroy-buffers t t))
 	   (mml-destroy-buffers)
 	   (setq mml-buffer-list mbl)))
Binary files src-21.1/lisp/gnus/gnus-msg.elc and src-21.2/lisp/gnus/gnus-msg.elc differ
Binary files src-21.1/lisp/gnus/gnus-mule.elc and src-21.2/lisp/gnus/gnus-mule.elc differ
Binary files src-21.1/lisp/gnus/gnus-nocem.elc and src-21.2/lisp/gnus/gnus-nocem.elc differ
Binary files src-21.1/lisp/gnus/gnus-range.elc and src-21.2/lisp/gnus/gnus-range.elc differ
Binary files src-21.1/lisp/gnus/gnus-salt.elc and src-21.2/lisp/gnus/gnus-salt.elc differ
diff -ruN src-21.1/lisp/gnus/gnus-score.el src-21.2/lisp/gnus/gnus-score.el
--- src-21.1/lisp/gnus/gnus-score.el	Thu Feb  8 01:23:30 2001
+++ src-21.2/lisp/gnus/gnus-score.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; gnus-score.el --- scoring code for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <amanda@iesd.auc.dk>
@@ -59,10 +59,10 @@
 If the name of a group is matched by REGEXP, the corresponding scorefiles
 will be used for that group.
 The first match found is used, subsequent matching entries are ignored (to
-use multiple matches, see gnus-score-file-multiple-match-alist).
+use multiple matches, see `gnus-score-file-multiple-match-alist').
 
 These score files are loaded in addition to any files returned by
-gnus-score-find-score-files-function (which see)."
+`gnus-score-find-score-files-function'."
   :group 'gnus-score-files
   :type '(repeat (cons regexp (repeat file))))
 
@@ -75,10 +75,10 @@
 will be used for that group.
 If multiple REGEXPs match a group, the score files corresponding to each
 match will be used (for only one match to be used, see
-gnus-score-file-single-match-alist).
+`gnus-score-file-single-match-alist').
 
 These score files are loaded in addition to any files returned by
-gnus-score-find-score-files-function (which see)."
+`gnus-score-find-score-files-function'."
   :group 'gnus-score-files
   :type '(repeat (cons regexp (repeat file))))
 
@@ -101,9 +101,9 @@
 
 Predefined values are:
 
-gnus-score-find-single: Only apply the group's own score file.
-gnus-score-find-hierarchical: Also apply score files from parent groups.
-gnus-score-find-bnews: Apply score files whose names matches.
+`gnus-score-find-single': Only apply the group's own score file.
+`gnus-score-find-hierarchical': Also apply score files from parent groups.
+`gnus-score-find-bnews': Apply score files whose names matches.
 
 See the documentation to these functions for more information.
 
@@ -1497,7 +1497,7 @@
 CHILD2 ...])' where PARENT is a header array and each CHILD is a list
 of the same form as THREAD.  The empty list `nil' is valid.  For each
 article in the tree, the score of the corresponding entry in
-GNUS-NEWSGROUP-SCORED is adjusted by SCORE-ADJUST."
+`gnus-newsgroup-scored' is adjusted by SCORE-ADJUST."
   (while thread
     (let ((head (car thread)))
       (if (listp head)
@@ -1515,7 +1515,7 @@
 A root is an article with no references.  An orphan is an article
 which has references, but is not connected via its references to a
 root article.  This function finds all the orphans, and adjusts their
-score in GNUS-NEWSGROUP-SCORED by SCORE."
+score in `gnus-newsgroup-scored' by SCORE."
   (let ((threads (gnus-make-threads)))
     ;; gnus-make-threads produces a list, where each entry is a "thread"
     ;; as described in the gnus-score-lower-thread docs.  This function
@@ -2560,8 +2560,10 @@
 	      ;; too much.
 	      (delete-char (min (1- (point-max)) klen))
 	    (goto-char (point-max))
-	    (search-backward (string directory-sep-char))
-	    (delete-region (1+ (point)) (point-min)))
+	    (if (re-search-backward gnus-directory-sep-char-regexp nil t)
+		(delete-region (1+ (point)) (point-min))
+	      (gnus-message 1 "Can't find directory separator in %s"
+			    (car sfiles))))
 	  ;; If short file names were used, we have to translate slashes.
 	  (goto-char (point-min))
 	  (let ((regexp (concat
@@ -2595,10 +2597,10 @@
 	  ;; we add this score file to the list of score files
 	  ;; applicable to this group.
 	  (when (or (and not-match
- 			 (ignore-errors
+			 (ignore-errors
 			   (not (string-match regexp group-trans))))
-  		    (and (not not-match)
- 			 (ignore-errors (string-match regexp group-trans))))
+		    (and (not not-match)
+			 (ignore-errors (string-match regexp group-trans))))
 	    (push (car sfiles) ofiles)))
 	(setq sfiles (cdr sfiles)))
       (kill-buffer (current-buffer))
@@ -2678,7 +2680,7 @@
 
 (defun gnus-score-find-alist (group)
   "Return list of score files for GROUP.
-The list is determined from the variable gnus-score-file-alist."
+The list is determined from the variable `gnus-score-file-alist'."
   (let ((alist gnus-score-file-multiple-match-alist)
 	score-files)
     ;; if this group has been seen before, return the cached entry
Binary files src-21.1/lisp/gnus/gnus-score.elc and src-21.2/lisp/gnus/gnus-score.elc differ
Binary files src-21.1/lisp/gnus/gnus-setup.elc and src-21.2/lisp/gnus/gnus-setup.elc differ
Binary files src-21.1/lisp/gnus/gnus-soup.elc and src-21.2/lisp/gnus/gnus-soup.elc differ
Binary files src-21.1/lisp/gnus/gnus-spec.elc and src-21.2/lisp/gnus/gnus-spec.elc differ
Binary files src-21.1/lisp/gnus/gnus-srvr.elc and src-21.2/lisp/gnus/gnus-srvr.elc differ
diff -ruN src-21.1/lisp/gnus/gnus-start.el src-21.2/lisp/gnus/gnus-start.el
--- src-21.1/lisp/gnus/gnus-start.el	Wed Aug  1 12:46:23 2001
+++ src-21.2/lisp/gnus/gnus-start.el	Wed Feb  6 12:47:31 2002
@@ -1,5 +1,5 @@
 ;;; gnus-start.el --- startup functions for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -395,11 +395,8 @@
 
 ;;; Internal variables
 
-(defvar gnus-startup-file-coding-system 'binary
-  "*Coding system for startup file.")
-
-(defvar gnus-ding-file-coding-system 'emacs-mule
-  "*Coding system for ding file.")
+(defvar gnus-ding-file-coding-system mm-universal-coding-system
+  "Coding system for ding file.")
 
 (defvar gnus-newsrc-file-version nil)
 (defvar gnus-override-subscribe-method nil)
@@ -427,21 +424,15 @@
     (if gnus-init-inhibit
 	(setq gnus-init-inhibit nil)
       (setq gnus-init-inhibit inhibit-next)
-      (let ((files (list gnus-site-init-file gnus-init-file))
-	    file)
-	(while files
-	  (and (setq file (pop files))
-	       (or (and (file-exists-p file)
-			;; Don't try to load a directory.
-			(not (file-directory-p file)))
-		   (file-exists-p (concat file ".el"))
-		   (file-exists-p (concat file ".elc")))
-	       (condition-case var
-		   (let ((coding-system-for-read
-			  gnus-startup-file-coding-system))
-		     (load file nil t))
-		 (error
-		  (error "Error in %s: %s" file var)))))))))
+      (dolist (file (list gnus-site-init-file gnus-init-file))
+	(when (and file
+		   (locate-library file))
+	  (if (or debug-on-error debug-on-quit)
+	      (load file nil t)
+	    (condition-case var
+		(load file nil t)
+	      (error
+	       (error "Error in %s: %s" file var)))))))))
 
 ;; For subscribing new newsgroup
 
Binary files src-21.1/lisp/gnus/gnus-start.elc and src-21.2/lisp/gnus/gnus-start.elc differ
diff -ruN src-21.1/lisp/gnus/gnus-sum.el src-21.2/lisp/gnus/gnus-sum.el
--- src-21.1/lisp/gnus/gnus-sum.el	Tue Sep 18 14:25:20 2001
+++ src-21.2/lisp/gnus/gnus-sum.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; gnus-sum.el --- summary mode commands for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -3549,7 +3549,7 @@
       (setq thread (gnus-remove-thread id)))
     (setq old-pos (gnus-point-at-bol))
     (setq current (save-excursion
-		    (and (zerop (forward-line -1))
+		    (and (re-search-backward "[\r\n]" nil t)
 			 (gnus-summary-article-number))))
     ;; If this is a gathered thread, we have to go some re-gathering.
     (when (stringp (car thread))
@@ -5972,7 +5972,7 @@
   (unless (eq major-mode 'gnus-summary-mode)
     (set-buffer gnus-summary-buffer))
   (let ((article (or article (gnus-summary-article-number)))
-	(all-headers (not (not all-headers))) ;Must be T or NIL.
+	(all-headers (not (not all-headers))) ;Must be t or nil.
 	gnus-summary-display-article-function)
     (and (not pseudo)
 	 (gnus-summary-article-pseudo-p article)
@@ -6393,24 +6393,35 @@
       (gnus-summary-limit nil 'pop)
     (gnus-summary-position-point)))
 
-(defun gnus-summary-limit-to-subject (subject &optional header)
-  "Limit the summary buffer to articles that have subjects that match a regexp."
-  (interactive "sLimit to subject (regexp): ")
+(defun gnus-summary-limit-to-subject (subject &optional header not-matching)
+  "Limit the summary buffer to articles that have subjects that match a regexp.
+If NOT-MATCHING, excluding articles that have subjects that match a regexp."
+  (interactive 
+   (list (read-string (if current-prefix-arg
+			  "Exclude subject (regexp): "
+			"Limit to subject (regexp): ")) 
+	 nil current-prefix-arg))
   (unless header
     (setq header "subject"))
   (when (not (equal "" subject))
     (prog1
 	(let ((articles (gnus-summary-find-matching
-			 (or header "subject") subject 'all)))
+			 (or header "subject") subject 'all nil nil 
+			 not-matching)))
 	  (unless articles
 	    (error "Found no matches for \"%s\"" subject))
 	  (gnus-summary-limit articles))
       (gnus-summary-position-point))))
 
-(defun gnus-summary-limit-to-author (from)
-  "Limit the summary buffer to articles that have authors that match a regexp."
-  (interactive "sLimit to author (regexp): ")
-  (gnus-summary-limit-to-subject from "from"))
+(defun gnus-summary-limit-to-author (from &optional not-matching)
+  "Limit the summary buffer to articles that have authors that match a regexp.
+If NOT-MATCHING, excluding articles that have authors that match a regexp."
+  (interactive 
+   (list (read-string (if current-prefix-arg
+			  "Exclude author (regexp): "
+			"Limit to author (regexp): ")) 
+	 current-prefix-arg))
+  (gnus-summary-limit-to-subject from "from" not-matching))
 
 (defun gnus-summary-limit-to-age (age &optional younger-p)
   "Limit the summary buffer to articles that are older than (or equal) AGE days.
@@ -6450,25 +6461,31 @@
 	(gnus-summary-limit (nreverse articles)))
     (gnus-summary-position-point)))
 
-(defun gnus-summary-limit-to-extra (header regexp)
+(defun gnus-summary-limit-to-extra (header regexp &optional not-matching)
   "Limit the summary buffer to articles that match an 'extra' header."
   (interactive
    (let ((header
 	  (intern
 	   (gnus-completing-read
 	    (symbol-name (car gnus-extra-headers))
-	    "Limit extra header:"
+	    (if current-prefix-arg
+		"Exclude extra header:"
+	      "Limit extra header:")
 	    (mapcar (lambda (x)
 		      (cons (symbol-name x) x))
 		    gnus-extra-headers)
 	    nil
 	    t))))
      (list header
-	   (read-string (format "Limit to header %s (regexp): " header)))))
+	   (read-string (format "%s header %s (regexp): " 
+				(if current-prefix-arg "Exclude" "Limit to")
+				header))
+	   current-prefix-arg)))
   (when (not (equal "" regexp))
     (prog1
 	(let ((articles (gnus-summary-find-matching
-			 (cons 'extra header) regexp 'all)))
+			 (cons 'extra header) regexp 'all nil nil 
+			 not-matching)))
 	  (unless articles
 	    (error "Found no matches for \"%s\"" regexp))
 	  (gnus-summary-limit articles))
@@ -7215,17 +7232,15 @@
       t)))
 
 (defun gnus-summary-find-matching (header regexp &optional backward unread
-					  not-case-fold)
+					  not-case-fold not-matching)
   "Return a list of all articles that match REGEXP on HEADER.
 The search stars on the current article and goes forwards unless
 BACKWARD is non-nil.  If BACKWARD is `all', do all articles.
 If UNREAD is non-nil, only unread articles will
 be taken into consideration.  If NOT-CASE-FOLD, case won't be folded
-in the comparisons."
-  (let ((data (if (eq backward 'all) gnus-newsgroup-data
-		(gnus-data-find-list
-		 (gnus-summary-article-number) (gnus-data-list backward))))
-	(case-fold-search (not not-case-fold))
+in the comparisons. If NOT-MATCHING, return a list of all articles that 
+not match REGEXP on HEADER."
+  (let ((case-fold-search (not not-case-fold))
 	articles d func)
     (if (consp header)
 	(if (eq (car header) 'extra)
@@ -7237,14 +7252,21 @@
       (unless (fboundp (intern (concat "mail-header-" header)))
 	(error "%s is not a valid header" header))
       (setq func `(lambda (h) (,(intern (concat "mail-header-" header)) h))))
-    (while data
-      (setq d (car data))
-      (and (or (not unread)		; We want all articles...
-	       (gnus-data-unread-p d))	; Or just unreads.
-	   (vectorp (gnus-data-header d)) ; It's not a pseudo.
-	   (string-match regexp (funcall func (gnus-data-header d))) ; Match.
-	   (push (gnus-data-number d) articles)) ; Success!
-      (setq data (cdr data)))
+    (dolist (d (if (eq backward 'all)
+		   gnus-newsgroup-data
+		 (gnus-data-find-list
+		  (gnus-summary-article-number)
+		  (gnus-data-list backward))))
+      (when (and (or (not unread)	; We want all articles...
+		     (gnus-data-unread-p d)) ; Or just unreads.
+		 (vectorp (gnus-data-header d)) ; It's not a pseudo.
+		 (if not-matching
+		     (not (string-match 
+			   regexp
+			   (funcall func (gnus-data-header d))))
+		   (string-match regexp
+				 (funcall func (gnus-data-header d)))))
+	(push (gnus-data-number d) articles))) ; Success!
     (nreverse articles)))
 
 (defun gnus-summary-execute-command (header regexp command &optional backward)
@@ -9126,7 +9148,9 @@
 	    (gnus-message 1 "Article %d is unsaveable" article))
 	;; This is a real article.
 	(save-window-excursion
-	  (gnus-summary-select-article t nil nil article))
+	  (let ((gnus-display-mime-function nil)
+		(gnus-article-prepare-hook nil))
+	    (gnus-summary-select-article t nil nil article)))
 	(save-excursion
 	  (set-buffer save-buffer)
 	  (erase-buffer)
Binary files src-21.1/lisp/gnus/gnus-sum.elc and src-21.2/lisp/gnus/gnus-sum.elc differ
Binary files src-21.1/lisp/gnus/gnus-topic.elc and src-21.2/lisp/gnus/gnus-topic.elc differ
Binary files src-21.1/lisp/gnus/gnus-undo.elc and src-21.2/lisp/gnus/gnus-undo.elc differ
diff -ruN src-21.1/lisp/gnus/gnus-util.el src-21.2/lisp/gnus/gnus-util.el
--- src-21.1/lisp/gnus/gnus-util.el	Sat Aug 18 21:22:22 2001
+++ src-21.2/lisp/gnus/gnus-util.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; gnus-util.el --- utility functions for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -1002,6 +1002,11 @@
     (if start
 	(remove-text-properties start end properties object))
     t))
+
+(defvar gnus-directory-sep-char-regexp "/"
+  "The regexp of directory separator character.
+If you find some problem with the directory separator character, try
+\"[/\\\\\]\" for some systems.")
 
 (provide 'gnus-util)
 
Binary files src-21.1/lisp/gnus/gnus-util.elc and src-21.2/lisp/gnus/gnus-util.elc differ
Binary files src-21.1/lisp/gnus/gnus-uu.elc and src-21.2/lisp/gnus/gnus-uu.elc differ
Binary files src-21.1/lisp/gnus/gnus-vm.elc and src-21.2/lisp/gnus/gnus-vm.elc differ
Binary files src-21.1/lisp/gnus/gnus-win.elc and src-21.2/lisp/gnus/gnus-win.elc differ
diff -ruN src-21.1/lisp/gnus/gnus.el src-21.2/lisp/gnus/gnus.el
--- src-21.1/lisp/gnus/gnus.el	Mon Sep  3 12:32:04 2001
+++ src-21.2/lisp/gnus/gnus.el	Fri Feb 22 11:51:36 2002
@@ -1,6 +1,6 @@
 ;;; gnus.el --- a newsreader for GNU Emacs
-;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996,
-;;        1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997,
+;;               1998, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -1024,7 +1024,7 @@
 (defcustom gnus-local-domain nil
   "Local domain name without a host name.
 The DOMAINNAME environment variable is used instead if it is defined.
-If the `system-name' function returns the full Internet name, there is
+If the function `system-name' returns the full Internet name, there is
 no need to set this variable."
   :group 'gnus-message
   :type '(choice (const :tag "default" nil)
Binary files src-21.1/lisp/gnus/gnus.elc and src-21.2/lisp/gnus/gnus.elc differ
Binary files src-21.1/lisp/gnus/ietf-drums.elc and src-21.2/lisp/gnus/ietf-drums.elc differ
diff -ruN src-21.1/lisp/gnus/imap.el src-21.2/lisp/gnus/imap.el
--- src-21.1/lisp/gnus/imap.el	Fri Aug 31 19:02:20 2001
+++ src-21.2/lisp/gnus/imap.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; imap.el --- imap library
-;; Copyright (C) 1998, 1999, 2000
+;; Copyright (C) 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
@@ -719,8 +719,8 @@
 it where sucessful authenticating itself to the server, nil otherwise.
 Returns t if login was successful, nil otherwise."
   (with-current-buffer buffer
-    (make-variable-buffer-local 'imap-username)
-    (make-variable-buffer-local 'imap-password)
+    (make-local-variable 'imap-username)
+    (make-local-variable 'imap-password)
     (let (user passwd ret)
       ;;      (condition-case ()
       (while (or (not user) (not passwd))
@@ -887,7 +887,7 @@
   (with-current-buffer (get-buffer-create buffer)
     (if (imap-opened buffer)
 	(imap-close buffer))
-    (mapcar 'make-variable-buffer-local imap-local-variables)
+    (mapcar 'make-local-variable imap-local-variables)
     (imap-disable-multibyte)
     (buffer-disable-undo)
     (setq imap-server (or server imap-server))
@@ -957,8 +957,8 @@
 	(or (eq imap-state 'auth)
 	    (eq imap-state 'select)
 	    (eq imap-state 'examine))
-      (make-variable-buffer-local 'imap-username)
-      (make-variable-buffer-local 'imap-password)
+      (make-local-variable 'imap-username)
+      (make-local-variable 'imap-password)
       (if user (setq imap-username user))
       (if passwd (setq imap-password passwd))
       (if (funcall (nth 2 (assq imap-auth imap-authenticator-alist)) buffer)
@@ -1751,21 +1751,21 @@
 ;;
 ;;   addr-adl        = nstring
 ;;                       ; Holds route from [RFC-822] route-addr if
-;;                       ; non-NIL
+;;                       ; non-nil
 ;;
 ;;   addr-host       = nstring
-;;                       ; NIL indicates [RFC-822] group syntax.
+;;                       ; nil indicates [RFC-822] group syntax.
 ;;                       ; Otherwise, holds [RFC-822] domain name
 ;;
 ;;   addr-mailbox    = nstring
-;;                       ; NIL indicates end of [RFC-822] group; if
-;;                       ; non-NIL and addr-host is NIL, holds
+;;                       ; nil indicates end of [RFC-822] group; if
+;;                       ; non-nil and addr-host is nil, holds
 ;;                       ; [RFC-822] group name.
 ;;                       ; Otherwise, holds [RFC-822] local-part
 ;;                       ; after removing [RFC-822] quoting
 ;;
 ;;   addr-name       = nstring
-;;                       ; If non-NIL, holds phrase from [RFC-822]
+;;                       ; If non-nil, holds phrase from [RFC-822]
 ;;                       ; mailbox after removing [RFC-822] quoting
 ;;
 
@@ -2455,7 +2455,7 @@
 	(push (imap-parse-nstring) body);; body-fld-desc
 	(imap-forward)
 	;; next `or' for Sun SIMS bug, it regard body-fld-enc as a
-	;; nstring and return NIL instead of defaulting back to 7BIT
+	;; nstring and return nil instead of defaulting back to 7BIT
 	;; as the standard says.
 	(push (or (imap-parse-nstring) "7BIT") body);; body-fld-enc
 	(imap-forward)
Binary files src-21.1/lisp/gnus/imap.elc and src-21.2/lisp/gnus/imap.elc differ
Binary files src-21.1/lisp/gnus/mail-parse.elc and src-21.2/lisp/gnus/mail-parse.elc differ
Binary files src-21.1/lisp/gnus/mail-prsvr.elc and src-21.2/lisp/gnus/mail-prsvr.elc differ
diff -ruN src-21.1/lisp/gnus/mail-source.el src-21.2/lisp/gnus/mail-source.el
--- src-21.1/lisp/gnus/mail-source.el	Sun Jul 15 19:42:53 2001
+++ src-21.2/lisp/gnus/mail-source.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; mail-source.el --- functions for fetching mail
-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
@@ -276,6 +276,9 @@
        (:path (or (getenv "MAIL")
 		  (expand-file-name (user-login-name) rmail-spool-directory))))
       (directory
+       (:prescript)
+       (:prescript-delay)
+       (:postscript)
        (:path)
        (:suffix ".spool")
        (:predicate identity))
@@ -609,6 +612,9 @@
 (defun mail-source-fetch-directory (source callback)
   "Fetcher for directory sources."
   (mail-source-bind (directory source)
+    (mail-source-run-script
+     prescript (format-spec-make ?t path)
+     prescript-delay)
     (let ((found 0)
 	  (mail-source-string (format "directory:%s" path)))
       (dolist (file (directory-files
@@ -617,6 +623,8 @@
 		   (funcall predicate file)
 		   (mail-source-movemail file mail-source-crash-box))
 	  (incf found (mail-source-callback callback file))))
+      (mail-source-run-script
+       postscript (format-spec-make ?t path))
       found)))
 
 (defun mail-source-fetch-pop (source callback)
Binary files src-21.1/lisp/gnus/mail-source.elc and src-21.2/lisp/gnus/mail-source.elc differ
diff -ruN src-21.1/lisp/gnus/mailcap.el src-21.2/lisp/gnus/mailcap.el
--- src-21.1/lisp/gnus/mailcap.el	Thu Dec  7 13:12:08 2000
+++ src-21.2/lisp/gnus/mailcap.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; mailcap.el --- MIME media types configuration
-;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
 
 ;; Author: William M. Perry <wmperry@aventail.com>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -274,7 +274,7 @@
 
 (defcustom mailcap-download-directory nil
   "*Directory to which `mailcap-save-binary-file' downloads files by default.
-Nil means your home directory."
+nil means your home directory."
   :type '(choice (const :tag "Home directory" nil)
 		 directory)
   :group 'mailcap)
Binary files src-21.1/lisp/gnus/mailcap.elc and src-21.2/lisp/gnus/mailcap.elc differ
diff -ruN src-21.1/lisp/gnus/message.el src-21.2/lisp/gnus/message.el
--- src-21.1/lisp/gnus/message.el	Sat Mar 17 17:02:56 2001
+++ src-21.2/lisp/gnus/message.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; message.el --- composing mail and news messages  -*- coding: iso-latin-1 -*-
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -3635,8 +3635,10 @@
     (push '(message-mode (encrypt . mc-encrypt-message)
 			 (sign . mc-sign-message))
 	  mc-modes-alist))
-  (when actions
-    (setq message-send-actions actions))
+  (dolist (action actions)
+    (condition-case nil
+	(add-to-list 'message-send-actions
+		     `(apply ',(car action) ',(cdr action)))))
   (setq message-reply-buffer replybuffer)
   (goto-char (point-min))
   ;; Insert all the headers.
@@ -3753,7 +3755,7 @@
      (nconc
       `((To . ,(or to "")) (Subject . ,(or subject "")))
       (when other-headers other-headers))
-     replybuffer)
+     replybuffer send-actions)
     ;; FIXME: Should return nil if failure.
     t))
 
@@ -4116,7 +4118,7 @@
   "Remove junk like \"Re:\", \"(fwd)\", etc. added to subject string SUBJECT.
 Previous forwarders, replyers, etc. may add it."
   (with-temp-buffer
-    (insert-string subject)
+    (insert subject)
     (goto-char (point-min))
     ;; strip Re/Fwd stuff off the beginning
     (while (re-search-forward
@@ -4155,8 +4157,8 @@
 the list of newsgroups is was posted to."
   (concat "["
 	   (let ((prefix 
-		  (or (message-fetch-field
-		       (if (message-news-p) "newsgroups" "from"))
+		  (or (message-fetch-field "newsgroups")
+		      (message-fetch-field "from")
 		      "(nowhere)")))
 	     (if message-forward-decoded-p
 		 prefix
@@ -4199,6 +4201,7 @@
 (eval-when-compile
   (defvar gnus-article-decoded-p))
 
+
 ;;;###autoload
 (defun message-forward (&optional news digest)
   "Forward the current message via mail.
@@ -4206,39 +4209,42 @@
 Optional DIGEST will use digest to forward."
   (interactive "P")
   (let* ((cur (current-buffer))
-	 (message-forward-decoded-p 
+	 (message-forward-decoded-p
 	  (if (local-variable-p 'gnus-article-decoded-p (current-buffer))
-	      gnus-article-decoded-p  ;; In an article buffer.
+	      gnus-article-decoded-p ;; In an article buffer.
 	    message-forward-decoded-p))
-	 (subject (message-make-forward-subject))
-	 art-beg)
+	 (subject (message-make-forward-subject)))
     (if news
 	(message-news nil subject)
       (message-mail nil subject))
-    ;; Put point where we want it before inserting the forwarded
-    ;; message.
-    (if message-forward-before-signature
-        (message-goto-body)
-      (goto-char (point-max)))
-    (if message-forward-as-mime
-	(if digest
-	    (insert "\n<#multipart type=digest>\n")
-	  (if message-forward-show-mml
-	      (insert "\n\n<#mml type=message/rfc822 disposition=inline>\n")
-	    (insert "\n\n<#part type=message/rfc822 disposition=inline raw=t>\n")))
-      (insert "\n-------------------- Start of forwarded message --------------------\n"))
-    (let ((b (point)) e)
+    (message-forward-make-body cur digest)))
+
+;;;###autoload
+(defun message-forward-make-body (forward-buffer &optional digest)
+  ;; Put point where we want it before inserting the forwarded
+  ;; message.
+  (if message-forward-before-signature
+      (message-goto-body)
+    (goto-char (point-max)))
+  (if message-forward-as-mime
       (if digest
-	  (if message-forward-as-mime
-	      (insert-buffer-substring cur)
-	    (mml-insert-buffer cur))
-	(if (and message-forward-show-mml
-		 (not message-forward-decoded-p))
-	    (insert
-	     (with-temp-buffer
-	       (mm-disable-multibyte-mule4) ;; Must copy buffer in unibyte mode
+	  (insert "\n<#multipart type=digest>\n")
+	(if message-forward-show-mml
+	    (insert "\n\n<#mml type=message/rfc822 disposition=inline>\n")
+	  (insert "\n\n<#part type=message/rfc822 disposition=inline raw=t>\n")))
+    (insert "\n-------------------- Start of forwarded message --------------------\n"))
+  (let ((b (point)) e)
+    (if digest
+	(if message-forward-as-mime
+	    (insert-buffer-substring forward-buffer)
+	  (mml-insert-buffer forward-buffer))
+      (if (and message-forward-show-mml
+	       (not message-forward-decoded-p))
+	  (insert
+	   (with-temp-buffer
+	     (mm-disable-multibyte-mule4) ;; Must copy buffer in unibyte mode
 	       (insert
-		(with-current-buffer cur
+		(with-current-buffer forward-buffer
 		  (mm-string-as-unibyte (buffer-string))))
 	       (mm-enable-multibyte-mule4)
 	       (mime-to-mml)
@@ -4246,37 +4252,53 @@
 	       (when (looking-at "From ")
 		 (replace-match "X-From-Line: "))
 	       (buffer-string)))
-	  (save-restriction
-	    (narrow-to-region (point) (point))
-	    (mml-insert-buffer cur)
-	    (goto-char (point-min))
-	    (when (looking-at "From ")
-	      (replace-match "X-From-Line: "))
-	    (goto-char (point-max)))))
-      (setq e (point))
-      (if message-forward-as-mime
-	  (if digest
-	      (insert "<#/multipart>\n")
-	    (if message-forward-show-mml
-		(insert "<#/mml>\n")
-	      (insert "<#/part>\n")))
-	(insert "\n-------------------- End of forwarded message --------------------\n"))
-      (if (and digest message-forward-as-mime)
-	  (save-restriction
-	    (narrow-to-region b e)
-	    (goto-char b)
-	    (narrow-to-region (point)
-			      (or (search-forward "\n\n" nil t) (point)))
-	    (delete-region (point-min) (point-max)))
-	(when (and (not current-prefix-arg)
-		   message-forward-ignored-headers)
-	  (save-restriction
-	    (narrow-to-region b e)
-	    (goto-char b)
-	    (narrow-to-region (point)
-			      (or (search-forward "\n\n" nil t) (point)))
-	    (message-remove-header message-forward-ignored-headers t)))))
-    (message-position-point)))
+	(save-restriction
+	  (narrow-to-region (point) (point))
+	  (mml-insert-buffer forward-buffer)
+	  (goto-char (point-min))
+	  (when (looking-at "From ")
+	    (replace-match "X-From-Line: "))
+	  (goto-char (point-max)))))
+    (setq e (point))
+    (if message-forward-as-mime
+	(if digest
+	    (insert "<#/multipart>\n")
+	  (if message-forward-show-mml
+	      (insert "<#/mml>\n")
+	    (insert "<#/part>\n")))
+      (insert "\n-------------------- End of forwarded message --------------------\n"))
+    (if (and digest message-forward-as-mime)
+	(save-restriction
+	  (narrow-to-region b e)
+	  (goto-char b)
+	  (narrow-to-region (point)
+			    (or (search-forward "\n\n" nil t) (point)))
+	  (delete-region (point-min) (point-max)))
+      (when (and (not current-prefix-arg)
+		 message-forward-ignored-headers)
+	(save-restriction
+	  (narrow-to-region b e)
+	  (goto-char b)
+	  (narrow-to-region (point)
+			    (or (search-forward "\n\n" nil t) (point)))
+	  (message-remove-header message-forward-ignored-headers t)))))
+  (message-position-point))
+
+;;;###autoload
+(defun message-forward-rmail-make-body (forward-buffer)
+  (save-window-excursion
+    (set-buffer forward-buffer)
+    (if (rmail-msg-is-pruned)
+	(rmail-msg-restore-non-pruned-header)))
+  (message-forward-make-body forward-buffer))
+
+;;;###autoload
+(defun message-insinuate-rmail ()
+  "Let RMAIL uses message to forward."
+  (interactive)
+  (setq rmail-enable-mime-composing t)
+  (setq rmail-insert-mime-forwarded-message-function 
+	'message-forward-rmail-make-body))
 
 ;;;###autoload
 (defun message-resend (address)
@@ -4648,9 +4670,10 @@
       ;; /usr/bin/mail.
       (unless content-type-p
 	(goto-char (point-min))
-	(re-search-forward "^MIME-Version:")
-	(forward-line 1)
-	(insert "Content-Type: text/plain; charset=us-ascii\n")))))
+	;; For unknown reason, MIME-Version doesn't exist.
+	(when (re-search-forward "^MIME-Version:" nil t)
+	  (forward-line 1)
+	  (insert "Content-Type: text/plain; charset=us-ascii\n"))))))
 
 (defun message-read-from-minibuffer (prompt)
   "Read from the minibuffer while providing abbrev expansion."
Binary files src-21.1/lisp/gnus/message.elc and src-21.2/lisp/gnus/message.elc differ
Binary files src-21.1/lisp/gnus/messcompat.elc and src-21.2/lisp/gnus/messcompat.elc differ
Binary files src-21.1/lisp/gnus/mm-bodies.elc and src-21.2/lisp/gnus/mm-bodies.elc differ
Binary files src-21.1/lisp/gnus/mm-decode.elc and src-21.2/lisp/gnus/mm-decode.elc differ
diff -ruN src-21.1/lisp/gnus/mm-encode.el src-21.2/lisp/gnus/mm-encode.el
--- src-21.1/lisp/gnus/mm-encode.el	Sun Jul 15 19:42:53 2001
+++ src-21.2/lisp/gnus/mm-encode.el	Fri Feb 22 11:51:36 2002
@@ -35,8 +35,9 @@
     ("text/.*" qp-or-base64)
     ("message/rfc822" 8bit)
     ("application/emacs-lisp" 8bit)
+    ("application/x-emacs-lisp" 8bit)
     ("application/x-patch" 8bit)
-    (".*" qp-or-base64))
+    (".*" base64))
   "Alist of regexps that match MIME types and their encodings.
 If the encoding is `qp-or-base64', then either quoted-printable
 or base64 will be used, depending on what is more efficient.")
Binary files src-21.1/lisp/gnus/mm-encode.elc and src-21.2/lisp/gnus/mm-encode.elc differ
Binary files src-21.1/lisp/gnus/mm-partial.elc and src-21.2/lisp/gnus/mm-partial.elc differ
diff -ruN src-21.1/lisp/gnus/mm-util.el src-21.2/lisp/gnus/mm-util.el
--- src-21.1/lisp/gnus/mm-util.el	Tue Sep 18 16:59:24 2001
+++ src-21.2/lisp/gnus/mm-util.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
-;;; mm-util.el --- utility functions for MIME things
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;;; mm-util.el --- Utility functions for Mule and low level things
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -27,63 +27,6 @@
 (eval-when-compile (require 'cl))
 (require 'mail-prsvr)
 
-(defun mm-coding-system-p (sym)
-  "Return non-nil if SYM is a coding system."
-  (or (and (fboundp 'coding-system-p) (coding-system-p sym))
-      (memq sym (mm-get-coding-system-list))))
-
-(defvar mm-mime-mule-charset-alist
-  `((us-ascii ascii)
-    (iso-8859-1 latin-iso8859-1)
-    (iso-8859-2 latin-iso8859-2)
-    (iso-8859-3 latin-iso8859-3)
-    (iso-8859-4 latin-iso8859-4)
-    (iso-8859-5 cyrillic-iso8859-5)
-    ;; Non-mule (X)Emacs uses the last mule-charset for 8bit characters.
-    ;; The fake mule-charset, gnus-koi8-r, tells Gnus that the default 
-    ;; charset is koi8-r, not iso-8859-5.
-    (koi8-r cyrillic-iso8859-5 gnus-koi8-r)
-    (iso-8859-6 arabic-iso8859-6)
-    (iso-8859-7 greek-iso8859-7)
-    (iso-8859-8 hebrew-iso8859-8)
-    (iso-8859-9 latin-iso8859-9)
-    (iso-8859-14 latin-iso8859-14)
-    (iso-8859-15 latin-iso8859-15)
-    (viscii vietnamese-viscii-lower)
-    (iso-2022-jp latin-jisx0201 japanese-jisx0208 japanese-jisx0208-1978)
-    (euc-kr korean-ksc5601)
-    (gb2312 chinese-gb2312)
-    (big5 chinese-big5-1 chinese-big5-2)
-    (tibetan tibetan)
-    (thai-tis620 thai-tis620)
-    (iso-2022-7bit ethiopic arabic-1-column arabic-2-column)
-    (iso-2022-jp-2 latin-iso8859-1 greek-iso8859-7
-		   latin-jisx0201 japanese-jisx0208-1978
-		   chinese-gb2312 japanese-jisx0208
-		   korean-ksc5601 japanese-jisx0212
-		   katakana-jisx0201)
-    (iso-2022-int-1 latin-iso8859-1 greek-iso8859-7
-		    latin-jisx0201 japanese-jisx0208-1978
-		    chinese-gb2312 japanese-jisx0208
-		    korean-ksc5601 japanese-jisx0212
-		    chinese-cns11643-1 chinese-cns11643-2)
-    (iso-2022-int-1 latin-iso8859-1 latin-iso8859-2
-		    cyrillic-iso8859-5 greek-iso8859-7
-		    latin-jisx0201 japanese-jisx0208-1978
-		    chinese-gb2312 japanese-jisx0208
-		    korean-ksc5601 japanese-jisx0212
-		    chinese-cns11643-1 chinese-cns11643-2
-		    chinese-cns11643-3 chinese-cns11643-4
-		    chinese-cns11643-5 chinese-cns11643-6
-		    chinese-cns11643-7)
-    ;; utf-8 comes either from Mule-UCS or Mule 5+.
-    ,@(if (mm-coding-system-p 'utf-8)
-	  (list (cons 'utf-8 (delete 'ascii
-				     (coding-system-get
-				      'mule-utf-8
-				      'safe-charsets))))))
-  "Alist of MIME-charset/MULE-charsets.")
-
 (eval-and-compile
   (mapcar
    (lambda (elem)
@@ -104,12 +47,6 @@
      (make-char
       . (lambda (charset int)
 	  (int-to-char int)))
-     (read-coding-system
-      . (lambda (prompt)
-	  "Prompt the user for a coding system."
-	  (completing-read
-	   prompt (mapcar (lambda (s) (list (symbol-name (car s))))
-			  mm-mime-mule-charset-alist))))
      (read-charset
       . (lambda (prompt)
 	  "Return a charset."
@@ -119,40 +56,86 @@
 	    (mapcar (lambda (e) (list (symbol-name (car e))))
 		    mm-mime-mule-charset-alist)
 	    nil t))))
+     (subst-char-in-string
+      . (lambda (from to string) ;; stolen (and renamed) from nnheader.el
+	  "Replace characters in STRING from FROM to TO."
+	  (let ((string (substring string 0)) ;Copy string.
+		(len (length string))
+		(idx 0))
+	    ;; Replace all occurrences of FROM with TO.
+	    (while (< idx len)
+	      (when (= (aref string idx) from)
+		(aset string idx to))
+	      (setq idx (1+ idx)))
+	    string)))
      (string-as-unibyte . identity)
-     (multibyte-string-p . ignore)
-     )))
+     (string-as-multibyte . identity)
+     (multibyte-string-p . ignore))))
 
 (eval-and-compile
   (defalias 'mm-char-or-char-int-p
-    (cond 
+    (cond
      ((fboundp 'char-or-char-int-p) 'char-or-char-int-p)
-     ((fboundp 'char-valid-p) 'char-valid-p) 
+     ((fboundp 'char-valid-p) 'char-valid-p)
      (t 'identity))))
 
+(eval-and-compile
+  (defalias 'mm-read-coding-system
+    (cond
+     ((fboundp 'read-coding-system)
+      (if (and (featurep 'xemacs)
+	       (<= (string-to-number emacs-version) 21.1))
+	  (lambda (prompt &optional default-coding-system)
+	    (read-coding-system prompt))
+	'read-coding-system))
+     (t (lambda (prompt &optional default-coding-system)
+	  "Prompt the user for a coding system."
+	  (completing-read
+	   prompt (mapcar (lambda (s) (list (symbol-name (car s))))
+			  mm-mime-mule-charset-alist)))))))
+
 (defvar mm-coding-system-list nil)
 (defun mm-get-coding-system-list ()
   "Get the coding system list."
   (or mm-coding-system-list
       (setq mm-coding-system-list (mm-coding-system-list))))
 
+(defun mm-coding-system-p (sym)
+  "Return non-nil if SYM is a coding system."
+  (or (and (fboundp 'coding-system-p) (coding-system-p sym))
+      (memq sym (mm-get-coding-system-list))))
+
 (defvar mm-charset-synonym-alist
-  `((big5 . cn-big5)
-    (gb2312 . cn-gb-2312)
+  `(
+    ;; Perfectly fine?  A valid MIME name, anyhow.
+    ,@(unless (mm-coding-system-p 'big5)
+       '((big5 . cn-big5)))
+    ;; Not in XEmacs, but it's not a proper MIME charset anyhow.
+    ,@(unless (mm-coding-system-p 'x-ctext)
+       '((x-ctext . ctext)))
+    ;; Apparently not defined in Emacs 20, but is a valid MIME name.
+    ,@(unless (mm-coding-system-p 'gb2312)
+       '((gb2312 . cn-gb-2312)))
+    ;; ISO-8859-15 is very similar to ISO-8859-1.
+    ,@(unless (mm-coding-system-p 'iso-8859-15) ; Emacs 21 defines it.
+       '((iso-8859-15 . iso-8859-1)))
     ;; Windows-1252 is actually a superset of Latin-1.  See also
     ;; `gnus-article-dumbquotes-map'.
-    ,(unless (mm-coding-system-p 'windows-1252) ; should be defined eventually
-       '(windows-1252 . iso-8859-1))
+    ,@(unless (mm-coding-system-p 'windows-1252)	
+       (if (mm-coding-system-p 'cp1252)
+	   '((windows-1252 . cp1252))
+	 '((windows-1252 . iso-8859-1))))
     ;; Windows-1250 is a variant of Latin-2 heavily used by Microsoft
     ;; Outlook users in Czech republic. Use this to allow reading of their
     ;; e-mails. cp1250 should be defined by M-x codepage-setup.
-    ,(unless (mm-coding-system-p 'windows-1250)	; should be defined eventually
-       '(windows-1250 . cp1250))
-    (x-ctext . ctext))
+    ,@(if (and (not (mm-coding-system-p 'windows-1250))
+	       (mm-coding-system-p 'cp1250))
+	  '((windows-1250 . cp1250)))
+    )
   "A mapping from invalid charset names to the real charset names.")
 
 (defvar mm-binary-coding-system
-  (cond 
+  (cond
    ((mm-coding-system-p 'binary) 'binary)
    ((mm-coding-system-p 'no-conversion) 'no-conversion)
    (t nil))
@@ -169,30 +152,160 @@
   "Text coding system for write.")
 
 (defvar mm-auto-save-coding-system
-  (cond 
+  (cond
    ((mm-coding-system-p 'emacs-mule)
     (if (memq system-type '(windows-nt ms-dos ms-windows))
-	(if (mm-coding-system-p 'emacs-mule-dos) 
+	(if (mm-coding-system-p 'emacs-mule-dos)
 	    'emacs-mule-dos mm-binary-coding-system)
       'emacs-mule))
    ((mm-coding-system-p 'escape-quoted) 'escape-quoted)
    (t mm-binary-coding-system))
   "Coding system of auto save file.")
 
+(defvar mm-universal-coding-system mm-auto-save-coding-system
+  "The universal coding system.")
+
+;; Fixme: some of the cars here aren't valid MIME charsets.  That
+;; should only matter with XEmacs, though.
+(defvar mm-mime-mule-charset-alist
+  `((us-ascii ascii)
+    (iso-8859-1 latin-iso8859-1)
+    (iso-8859-2 latin-iso8859-2)
+    (iso-8859-3 latin-iso8859-3)
+    (iso-8859-4 latin-iso8859-4)
+    (iso-8859-5 cyrillic-iso8859-5)
+    ;; Non-mule (X)Emacs uses the last mule-charset for 8bit characters.
+    ;; The fake mule-charset, gnus-koi8-r, tells Gnus that the default
+    ;; charset is koi8-r, not iso-8859-5.
+    (koi8-r cyrillic-iso8859-5 gnus-koi8-r)
+    (iso-8859-6 arabic-iso8859-6)
+    (iso-8859-7 greek-iso8859-7)
+    (iso-8859-8 hebrew-iso8859-8)
+    (iso-8859-9 latin-iso8859-9)
+    (iso-8859-14 latin-iso8859-14)
+    (iso-8859-15 latin-iso8859-15)
+    (viscii vietnamese-viscii-lower)
+    (iso-2022-jp latin-jisx0201 japanese-jisx0208 japanese-jisx0208-1978)
+    (euc-kr korean-ksc5601)
+    (gb2312 chinese-gb2312)
+    (big5 chinese-big5-1 chinese-big5-2)
+    (tibetan tibetan)
+    (thai-tis620 thai-tis620)
+    (iso-2022-7bit ethiopic arabic-1-column arabic-2-column)
+    (iso-2022-jp-2 latin-iso8859-1 greek-iso8859-7
+		   latin-jisx0201 japanese-jisx0208-1978
+		   chinese-gb2312 japanese-jisx0208
+		   korean-ksc5601 japanese-jisx0212
+		   katakana-jisx0201)
+    (iso-2022-int-1 latin-iso8859-1 greek-iso8859-7
+		    latin-jisx0201 japanese-jisx0208-1978
+		    chinese-gb2312 japanese-jisx0208
+		    korean-ksc5601 japanese-jisx0212
+		    chinese-cns11643-1 chinese-cns11643-2)
+    (iso-2022-int-1 latin-iso8859-1 latin-iso8859-2
+		    cyrillic-iso8859-5 greek-iso8859-7
+		    latin-jisx0201 japanese-jisx0208-1978
+		    chinese-gb2312 japanese-jisx0208
+		    korean-ksc5601 japanese-jisx0212
+		    chinese-cns11643-1 chinese-cns11643-2
+		    chinese-cns11643-3 chinese-cns11643-4
+		    chinese-cns11643-5 chinese-cns11643-6
+		    chinese-cns11643-7)
+    ,(if (or (not (fboundp 'charsetp)) ;; non-Mule case
+	     (charsetp 'unicode-a)
+	     (not (mm-coding-system-p 'mule-utf-8)))
+	 '(utf-8 unicode-a unicode-b unicode-c unicode-d unicode-e)
+       ;; If we have utf-8 we're in Mule 5+.
+       (append '(utf-8)
+	       (delete 'ascii
+		       (coding-system-get 'mule-utf-8 'safe-charsets)))))
+  "Alist of MIME-charset/MULE-charsets.")
+
+;; Correct by construction, but should be unnecessary:
+;; XEmacs hates it.
+(when (and (not (featurep 'xemacs))
+	   (fboundp 'coding-system-list)
+	   (fboundp 'sort-coding-systems))
+  (setq mm-mime-mule-charset-alist
+	(apply
+	 'nconc
+	 (mapcar
+	  (lambda (cs)
+	    (when (and (coding-system-get cs 'mime-charset)
+		       (not (eq t (coding-system-get cs 'safe-charsets))))
+	      (list (cons (coding-system-get cs 'mime-charset)
+			  (delq 'ascii
+				(coding-system-get cs 'safe-charsets))))))
+	  (sort-coding-systems (coding-system-list 'base-only))))))
+
+(defvar mm-hack-charsets '(iso-8859-15 iso-2022-jp-2)
+  "A list of special charsets.
+Valid elements include:
+`iso-8859-15'    convert ISO-8859-1, -9 to ISO-8859-15 if ISO-8859-15 exists.
+`iso-2022-jp-2'  convert ISO-2022-jp to ISO-2022-jp-2 if ISO-2022-jp-2 exists."
+)
+
+(defvar mm-iso-8859-15-compatible 
+  '((iso-8859-1 "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE")
+    (iso-8859-9 "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE\xD0\xDD\xDE\xF0\xFD\xFE"))
+  "ISO-8859-15 exchangeable coding systems and inconvertible characters.")
+
+(defvar mm-iso-8859-x-to-15-table
+  (and (fboundp 'coding-system-p)
+       (mm-coding-system-p 'iso-8859-15)
+       (mapcar 
+	(lambda (cs)
+	  (if (mm-coding-system-p (car cs))
+	      (let ((c (string-to-char 
+			(decode-coding-string "\341" (car cs)))))
+		(cons (char-charset c)
+		      (cons
+		       (- (string-to-char 
+			   (decode-coding-string "\341" 'iso-8859-15)) c)
+		       (string-to-list (decode-coding-string (car (cdr cs)) 
+							     (car cs))))))
+	    '(gnus-charset 0)))
+	mm-iso-8859-15-compatible))
+  "A table of the difference character between ISO-8859-X and ISO-8859-15.")
+
+(defvar mm-coding-system-priorities nil
+  "Preferred coding systems for encoding outgoing mails.
+
+More than one suitable coding systems may be found for some texts.  By
+default, a coding system with the highest priority is used to encode
+outgoing mails (see `sort-coding-systems').  If this variable is set,
+it overrides the default priority.  For example, Japanese users may
+prefer iso-2022-jp to japanese-shift-jis:
+
+\(setq mm-coding-system-priorities
+  '(iso-2022-jp iso-2022-jp-2 japanese-shift-jis utf-8))
+")
+
+(defvar mm-use-find-coding-systems-region
+  (fboundp 'find-coding-systems-region)
+  "Use `find-coding-systems-region' to find proper coding systems.")
+
 ;;; Internal variables:
 
 ;;; Functions:
 
 (defun mm-mule-charset-to-mime-charset (charset)
   "Return the MIME charset corresponding to the given Mule CHARSET."
-  (let ((alist mm-mime-mule-charset-alist)
-	out)
-    (while alist
-      (when (memq charset (cdar alist))
-	(setq out (caar alist)
-	      alist nil))
-      (pop alist))
-    out))
+  (if (fboundp 'find-coding-systems-for-charsets)
+      (let (mime)
+	(dolist (cs (find-coding-systems-for-charsets (list charset)))
+	  (unless mime
+	    (when cs
+	      (setq mime (coding-system-get cs 'mime-charset)))))
+	mime)
+    (let ((alist mm-mime-mule-charset-alist)
+	  out)
+      (while alist
+	(when (memq charset (cdar alist))
+	  (setq out (caar alist)
+		alist nil))
+	(pop alist))
+      out)))
 
 (defun mm-charset-to-coding-system (charset &optional lbt)
   "Return coding-system corresponding to CHARSET.
@@ -201,12 +314,11 @@
 used as the line break code type of the coding system."
   (when (stringp charset)
     (setq charset (intern (downcase charset))))
-  (setq charset
-	(or (cdr (assq charset mm-charset-synonym-alist))
-	    charset))
   (when lbt
     (setq charset (intern (format "%s-%s" charset lbt))))
   (cond
+   ((null charset)
+    charset)
    ;; Running in a non-MULE environment.
    ((null (mm-get-coding-system-list))
     charset)
@@ -215,63 +327,76 @@
     'ascii)
    ;; Check to see whether we can handle this charset.  (This depends
    ;; on there being some coding system matching each `mime-charset'
-   ;; coding sysytem property defined, as there should be.)
-   ((memq charset (mm-get-coding-system-list))
+   ;; property defined, as there should be.)
+   ((and (mm-coding-system-p charset)
+;;; Doing this would potentially weed out incorrect charsets.
+;;; 	 charset
+;;; 	 (eq charset (coding-system-get charset 'mime-charset))
+	 )
     charset)
-   ;; Nope.
-   (t
-    nil)))
+   ;; Translate invalid charsets.
+   ((let ((cs (cdr (assq charset mm-charset-synonym-alist))))
+      (and cs (mm-coding-system-p charset) cs)))
+   ;; Last resort: search the coding system list for entries which
+   ;; have the right mime-charset in case the canonical name isn't
+   ;; defined (though it should be).
+   ((let (cs)
+      ;; mm-get-coding-system-list returns a list of cs without lbt.
+      ;; Do we need -lbt?
+      (dolist (c (mm-get-coding-system-list))
+	(if (and (null cs)
+		 (eq charset (coding-system-get c 'mime-charset)))
+	    (setq cs c)))
+      cs))))
 
-(if (fboundp 'subst-char-in-string)
-    (defsubst mm-replace-chars-in-string (string from to)
-      (subst-char-in-string from to string))
-  (defun mm-replace-chars-in-string (string from to)
-    "Replace characters in STRING from FROM to TO."
-    (let ((string (substring string 0))	;Copy string.
-	  (len (length string))
-	  (idx 0))
-      ;; Replace all occurrences of FROM with TO.
-      (while (< idx len)
-	(when (= (aref string idx) from)
-	  (aset string idx to))
-	(setq idx (1+ idx)))
-      string)))
+(defsubst mm-replace-chars-in-string (string from to)
+  (mm-subst-char-in-string from to string))
 
-(defsubst mm-enable-multibyte ()
-  "Set the multibyte flag of the current buffer.
+(eval-and-compile
+  (defvar mm-emacs-mule (and (not (featurep 'xemacs))
+			     (boundp 'default-enable-multibyte-characters)
+			     default-enable-multibyte-characters
+			     (fboundp 'set-buffer-multibyte))
+    "Emacs mule.")
+  
+  (defvar mm-mule4-p (and mm-emacs-mule
+			  (fboundp 'charsetp)
+			  (not (charsetp 'eight-bit-control)))
+    "Mule version 4.")
+
+  (if mm-emacs-mule
+      (defun mm-enable-multibyte ()
+	"Set the multibyte flag of the current buffer.
 Only do this if the default value of `enable-multibyte-characters' is
 non-nil.  This is a no-op in XEmacs."
-  (when (and (fboundp 'set-buffer-multibyte)
-             (boundp 'enable-multibyte-characters)
-	     (default-value 'enable-multibyte-characters))
-    (set-buffer-multibyte t)))
+	(set-buffer-multibyte t))
+    (defalias 'mm-enable-multibyte 'ignore))
 
-(defsubst mm-disable-multibyte ()
-  "Unset the multibyte flag of in the current buffer.
+  (if mm-emacs-mule
+      (defun mm-disable-multibyte ()
+	"Unset the multibyte flag of in the current buffer.
 This is a no-op in XEmacs."
-  (when (fboundp 'set-buffer-multibyte)
-    (set-buffer-multibyte nil)))
+	(set-buffer-multibyte nil))
+    (defalias 'mm-disable-multibyte 'ignore))
 
-(defsubst mm-enable-multibyte-mule4 ()
-  "Enable multibyte in the current buffer.
+  (if mm-mule4-p
+      (defun mm-enable-multibyte-mule4  ()
+	"Enable multibyte in the current buffer.
 Only used in Emacs Mule 4."
-  (when (and (fboundp 'set-buffer-multibyte)
-             (boundp 'enable-multibyte-characters)
-	     (default-value 'enable-multibyte-characters)
-	     (not (charsetp 'eight-bit-control)))
-    (set-buffer-multibyte t)))
-
-(defsubst mm-disable-multibyte-mule4 ()
-  "Disable multibyte in the current buffer.
+	(set-buffer-multibyte t))
+    (defalias 'mm-enable-multibyte-mule4 'ignore))
+  
+  (if mm-mule4-p
+      (defun mm-disable-multibyte-mule4 ()
+	"Disable multibyte in the current buffer.
 Only used in Emacs Mule 4."
-  (when (and (fboundp 'set-buffer-multibyte)
-	     (not (charsetp 'eight-bit-control)))
-    (set-buffer-multibyte nil)))
+	(set-buffer-multibyte nil))
+    (defalias 'mm-disable-multibyte-mule4 'ignore)))
 
 (defun mm-preferred-coding-system (charset)
   ;; A typo in some Emacs versions.
-  (or (get-charset-property charset 'prefered-coding-system)
-      (get-charset-property charset 'preferred-coding-system)))
+  (or (get-charset-property charset 'preferred-coding-system)
+      (get-charset-property charset 'prefered-coding-system)))
 
 (defun mm-charset-after (&optional pos)
   "Return charset of a character in current buffer at position POS.
@@ -294,10 +419,10 @@
 	   (progn
 	     (setq mail-parse-mule-charset
 		   (and (boundp 'current-language-environment)
-		      (car (last 
-			    (assq 'charset 
-				  (assoc current-language-environment 
-					 language-info-alist))))))
+			(car (last
+			      (assq 'charset
+				    (assoc current-language-environment
+					   language-info-alist))))))
 	     (if (or (not mail-parse-mule-charset)
 		     (eq mail-parse-mule-charset 'ascii))
 		 (setq mail-parse-mule-charset
@@ -309,6 +434,8 @@
 
 (defun mm-mime-charset (charset)
   "Return the MIME charset corresponding to the given Mule CHARSET."
+  (if (eq charset 'unknown)
+      (error "The message contains non-printable characters, please use attachment"))
   (if (and (fboundp 'coding-system-get) (fboundp 'get-charset-property))
       ;; This exists in Emacs 20.
       (or
@@ -317,6 +444,7 @@
 	     (mm-preferred-coding-system charset) 'mime-charset))
        (and (eq charset 'ascii)
 	    'us-ascii)
+       (mm-preferred-coding-system charset)
        (mm-mule-charset-to-mime-charset charset))
     ;; This is for XEmacs.
     (mm-mule-charset-to-mime-charset charset)))
@@ -330,21 +458,8 @@
       (setq result (cons head result)))
     (nreverse result)))
 
-(defun mm-find-mime-charset-region (b e)
-  "Return the MIME charsets needed to encode the region between B and E."
-  (let ((charsets (mapcar 'mm-mime-charset
-			  (delq 'ascii
-				(mm-find-charset-region b e)))))
-    (when (memq 'iso-2022-jp-2 charsets)
-      (setq charsets (delq 'iso-2022-jp charsets)))
-    (setq charsets (mm-delete-duplicates charsets))
-    (if (and (> (length charsets) 1)
-	     (fboundp 'find-coding-systems-region)
-	     (let ((cs (find-coding-systems-region b e)))
-	       (or (memq 'utf-8 cs) (memq 'mule-utf-8 cs))))
-	'(utf-8)
-      charsets)))
-
+;; It's not clear whether this is supposed to mean the global or local
+;; setting.  I think it's used inconsistently.  -- fx
 (defsubst mm-multibyte-p ()
   "Say whether multibyte is enabled."
   (if (and (not (featurep 'xemacs))
@@ -352,6 +467,71 @@
       enable-multibyte-characters
     (featurep 'mule)))
 
+(defun mm-iso-8859-x-to-15-region (&optional b e)
+  (if (fboundp 'char-charset)
+      (let (charset item c inconvertible)
+	(save-restriction
+	  (if e (narrow-to-region b e))
+	  (goto-char (point-min))
+	  (skip-chars-forward "\0-\177")
+	  (while (not (eobp))
+	    (cond 
+	     ((not (setq item (assq (char-charset (setq c (char-after))) 
+				    mm-iso-8859-x-to-15-table)))
+	      (forward-char))
+	     ((memq c (cdr (cdr item)))
+	      (setq inconvertible t)
+	      (forward-char))
+	     (t
+	      (insert (prog1 (+ c (car (cdr item))) (delete-char 1))))
+	    (skip-chars-forward "\0-\177"))))
+	(not inconvertible))))
+
+(defun mm-sort-coding-systems-predicate (a b)
+  (> (length (memq a mm-coding-system-priorities))
+     (length (memq b mm-coding-system-priorities))))
+
+(defun mm-find-mime-charset-region (b e &optional hack-charsets)
+  "Return the MIME charsets needed to encode the region between B and E.
+nil means ASCII, a single-element list represents an appropriate MIME
+charset, and a longer list means no appropriate charset."
+  (let (charsets)
+    ;; The return possibilities of this function are a mess...
+    (or (and (mm-multibyte-p)
+	     mm-use-find-coding-systems-region
+	     ;; Find the mime-charset of the most preferred coding
+	     ;; system that has one.
+	     (let ((systems (find-coding-systems-region b e)))
+	       (when mm-coding-system-priorities
+		 (setq systems 
+		       (sort systems 'mm-sort-coding-systems-predicate)))
+	       ;; Fixme: The `mime-charset' (`x-ctext') of `compound-text'
+	       ;; is not in the IANA list.
+	       (setq systems (delq 'compound-text systems))
+	       (unless (equal systems '(undecided))
+		 (while systems
+		   (let ((cs (coding-system-get (pop systems) 'mime-charset)))
+		     (if cs
+			 (setq systems nil
+			       charsets (list cs))))))
+	       charsets))
+	;; Otherwise we're not multibyte, XEmacs or a single coding
+	;; system won't cover it.
+	(setq charsets 
+	      (mm-delete-duplicates
+	       (mapcar 'mm-mime-charset
+		       (delq 'ascii
+			     (mm-find-charset-region b e))))))
+    (if (and (memq 'iso-8859-15 charsets)
+	     (memq 'iso-8859-15 hack-charsets)
+	     (save-excursion (mm-iso-8859-x-to-15-region b e)))
+	(mapcar (lambda (x) (setq charsets (delq (car x) charsets)))
+		mm-iso-8859-15-compatible))
+    (if (and (memq 'iso-2022-jp-2 charsets)
+	     (memq 'iso-2022-jp-2 hack-charsets))
+	(setq charsets (delq 'iso-2022-jp charsets)))
+    charsets))
+
 (defmacro mm-with-unibyte-buffer (&rest forms)
   "Create a temporary buffer, and evaluate FORMS there like `progn'.
 Use unibyte mode for this."
@@ -364,15 +544,18 @@
   "Evaluate FORMS with current current buffer temporarily made unibyte.
 Also bind `default-enable-multibyte-characters' to nil.
 Equivalent to `progn' in XEmacs"
-  (let ((multibyte (make-symbol "multibyte")))
-    `(if (fboundp 'set-buffer-multibyte)
-	 (let ((,multibyte enable-multibyte-characters))
+  (let ((multibyte (make-symbol "multibyte"))
+	(buffer (make-symbol "buffer")))
+    `(if mm-emacs-mule 
+ 	 (let ((,multibyte enable-multibyte-characters)
+	       (,buffer (current-buffer)))
 	   (unwind-protect
 	       (let (default-enable-multibyte-characters)
 		 (set-buffer-multibyte nil)
 		 ,@forms)
+	     (set-buffer ,buffer)
 	     (set-buffer-multibyte ,multibyte)))
-       (progn
+       (let (default-enable-multibyte-characters)
 	 ,@forms))))
 (put 'mm-with-unibyte-current-buffer 'lisp-indent-function 0)
 (put 'mm-with-unibyte-current-buffer 'edebug-form-spec '(body))
@@ -380,22 +563,19 @@
 (defmacro mm-with-unibyte-current-buffer-mule4 (&rest forms)
   "Evaluate FORMS there like `progn' in current buffer.
 Mule4 only."
-  (let ((multibyte (make-symbol "multibyte")))
-    `(if (or (featurep 'xemacs)
-	     (not (fboundp 'set-buffer-multibyte))
-	     (charsetp 'eight-bit-control)) ;; For Emacs Mule 4 only.
-	 (progn
-	   ,@forms)
-       (let ((,multibyte (default-value 'enable-multibyte-characters)))
-	 (unwind-protect
-	     (let ((buffer-file-coding-system mm-binary-coding-system)
-		   (coding-system-for-read mm-binary-coding-system)
-		   (coding-system-for-write mm-binary-coding-system))
-	       (set-buffer-multibyte nil)
-	       (setq-default enable-multibyte-characters nil)
-	       ,@forms)
-	   (setq-default enable-multibyte-characters ,multibyte)
-	   (set-buffer-multibyte ,multibyte))))))
+  (let ((multibyte (make-symbol "multibyte"))
+	(buffer (make-symbol "buffer")))
+    `(if mm-mule4-p
+ 	 (let ((,multibyte enable-multibyte-characters)
+	       (,buffer (current-buffer)))
+	   (unwind-protect
+	       (let (default-enable-multibyte-characters)
+		 (set-buffer-multibyte nil)
+		 ,@forms)
+	     (set-buffer ,buffer)
+	     (set-buffer-multibyte ,multibyte)))
+       (let (default-enable-multibyte-characters)
+	 ,@forms))))
 (put 'mm-with-unibyte-current-buffer-mule4 'lisp-indent-function 0)
 (put 'mm-with-unibyte-current-buffer-mule4 'edebug-form-spec '(body))
 
@@ -410,9 +590,14 @@
   "Return a list of Emacs charsets in the region B to E."
   (cond
    ((and (mm-multibyte-p)
- 	 (fboundp 'find-charset-region))
+	 (fboundp 'find-charset-region))
     ;; Remove composition since the base charsets have been included.
-    (delq 'composition (find-charset-region b e)))
+    ;; Remove eight-bit-*, treat them as ascii.
+    (let ((css (find-charset-region b e)))
+      (mapcar (lambda (cs) (setq css (delq cs css)))
+	      '(composition eight-bit-control eight-bit-graphic
+			    control-1))
+      css))
    (t
     ;; We are in a unibyte buffer or XEmacs non-mule, so we futz around a bit.
     (save-excursion
@@ -425,8 +610,8 @@
 	  (let (charset)
 	    (setq charset
 		  (and (boundp 'current-language-environment)
-		       (car (last (assq 'charset 
-					(assoc current-language-environment 
+		       (car (last (assq 'charset
+					(assoc current-language-environment
 					       language-info-alist))))))
 	    (if (eq charset 'ascii) (setq charset nil))
 	    (or charset
@@ -476,15 +661,15 @@
 	(auto-mode-alist (if inhibit nil (mm-auto-mode-alist)))
 	(default-major-mode 'fundamental-mode)
 	(enable-local-variables nil)
-        (after-insert-file-functions nil)
+	(after-insert-file-functions nil)
 	(enable-local-eval nil)
 	(find-file-hooks nil)
-	(inhibit-file-name-operation (if inhibit 
+	(inhibit-file-name-operation (if inhibit
 					 'insert-file-contents
 				       inhibit-file-name-operation))
 	(inhibit-file-name-handlers
 	 (if inhibit
-	     (append mm-inhibit-file-name-handlers 
+	     (append mm-inhibit-file-name-handlers
 		     inhibit-file-name-handlers)
 	   inhibit-file-name-handlers)))
     (insert-file-contents filename visit beg end replace)))
@@ -497,36 +682,46 @@
 Optional fourth argument specifies the coding system to use when
 encoding the file.
 If INHIBIT is non-nil, inhibit mm-inhibit-file-name-handlers."
-  (let ((coding-system-for-write 
-	 (or codesys mm-text-coding-system-for-write 
+  (let ((coding-system-for-write
+	 (or codesys mm-text-coding-system-for-write
 	     mm-text-coding-system))
-	(inhibit-file-name-operation (if inhibit 
+	(inhibit-file-name-operation (if inhibit
 					 'append-to-file
 				       inhibit-file-name-operation))
 	(inhibit-file-name-handlers
 	 (if inhibit
-	     (append mm-inhibit-file-name-handlers 
+	     (append mm-inhibit-file-name-handlers
 		     inhibit-file-name-handlers)
 	   inhibit-file-name-handlers)))
     (append-to-file start end filename)))
 
-(defun mm-write-region (start end filename &optional append visit lockname 
+(defun mm-write-region (start end filename &optional append visit lockname
 			      coding-system inhibit)
 
   "Like `write-region'.
 If INHIBIT is non-nil, inhibit mm-inhibit-file-name-handlers."
-  (let ((coding-system-for-write 
-	 (or coding-system mm-text-coding-system-for-write 
+  (let ((coding-system-for-write
+	 (or coding-system mm-text-coding-system-for-write
 	     mm-text-coding-system))
-	(inhibit-file-name-operation (if inhibit 
+	(inhibit-file-name-operation (if inhibit
 					 'write-region
 				       inhibit-file-name-operation))
 	(inhibit-file-name-handlers
 	 (if inhibit
-	     (append mm-inhibit-file-name-handlers 
+	     (append mm-inhibit-file-name-handlers
 		     inhibit-file-name-handlers)
 	   inhibit-file-name-handlers)))
     (write-region start end filename append visit lockname)))
+
+(defun mm-image-load-path (&optional package)
+  (let (dir result)
+    (dolist (path load-path (nreverse result))
+      (if (file-directory-p
+	   (setq dir (concat (file-name-directory
+			      (directory-file-name path))
+			     "etc/" (or package "gnus/"))))
+	  (push dir result))
+      (push path result))))
 
 (provide 'mm-util)
 
Binary files src-21.1/lisp/gnus/mm-util.elc and src-21.2/lisp/gnus/mm-util.elc differ
Binary files src-21.1/lisp/gnus/mm-uu.elc and src-21.2/lisp/gnus/mm-uu.elc differ
diff -ruN src-21.1/lisp/gnus/mm-view.el src-21.2/lisp/gnus/mm-view.el
--- src-21.1/lisp/gnus/mm-view.el	Wed Aug  1 15:44:45 2001
+++ src-21.2/lisp/gnus/mm-view.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; mm-view.el --- functions for viewing MIME objects
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -50,10 +50,11 @@
      `(lambda () (remove-images ,b (1+ ,b))))))
 
 (defun mm-inline-image-xemacs (handle)
+  (insert "\n")
+  (forward-char -1)
   (let ((b (point))
 	(annot (make-annotation (mm-get-image handle) nil 'text))
 	buffer-read-only)
-    (insert "\n")
     (mm-handle-set-undisplayer
      handle
      `(lambda ()
@@ -88,6 +89,7 @@
       (setq text (mm-get-part handle))
       (let ((b (point))
 	    (url-standalone-mode t)
+	    (url-gateway-unplugged t)
 	    (url-current-object
 	     (url-generic-parse-url (format "cid:%s" (mm-handle-id handle))))
 	    (width (window-width))
@@ -104,11 +106,14 @@
 		    (and (boundp 'w3-meta-charset-content-type-regexp)
 			 (re-search-forward
 			  w3-meta-charset-content-type-regexp nil t)))
-		(setq charset (or (w3-coding-system-for-mime-charset 
-				   (buffer-substring-no-properties 
-				    (match-beginning 2) 
-				    (match-end 2)))
-				  charset)))
+		(setq charset
+		      (or (let ((bsubstr (buffer-substring-no-properties
+					  (match-beginning 2)
+					  (match-end 2))))
+			    (if (fboundp 'w3-coding-system-for-mime-charset)
+				(w3-coding-system-for-mime-charset bsubstr)
+			      (mm-charset-to-coding-system bsubstr)))
+			  charset)))
 	    (delete-region (point-min) (point-max))
 	    (insert (mm-decode-string text charset))
 	    (save-window-excursion
@@ -116,11 +121,24 @@
 		(let ((w3-strict-width width)
 		      ;; Don't let w3 set the global version of
 		      ;; this variable.
-		      (fill-column fill-column)
-		      (url-standalone-mode t))
+		      (fill-column fill-column))
 		  (condition-case var
 		      (w3-region (point-min) (point-max))
-		    (error)))))
+		    (error
+		     (delete-region (point-min) (point-max))
+		     (let ((b (point))
+			   (charset (mail-content-type-get
+				     (mm-handle-type handle) 'charset)))
+		       (if (or (eq charset 'gnus-decoded)
+			       (eq mail-parse-charset 'gnus-decoded))
+			   (save-restriction
+			     (narrow-to-region (point) (point))
+			     (mm-insert-part handle)
+			     (goto-char (point-max)))
+			 (insert (mm-decode-string (mm-get-part handle)
+						   charset))))
+		     (message
+		      "Error while rendering html; showing as text/plain"))))))
 	    (mm-handle-set-undisplayer
 	     handle
 	     `(lambda ()
@@ -133,33 +151,28 @@
 			      '(background background-pixmap foreground)))
 		  (delete-region ,(point-min-marker)
 				 ,(point-max-marker)))))))))
-     ((or (equal type "enriched")
-	  (equal type "richtext"))
-      (save-excursion
-	(mm-with-unibyte-buffer
-	  (mm-insert-part handle)
-	  (save-window-excursion
-	    (enriched-decode (point-min) (point-max))
-	    (setq text (buffer-string)))))
-      (mm-insert-inline handle text))
      ((equal type "x-vcard")
       (mm-insert-inline
        handle
        (concat "\n-- \n"
-	       (if (fboundp 'vcard-pretty-print)
-		   (vcard-pretty-print (mm-get-part handle))
-		 (vcard-format-string
-		  (vcard-parse-string (mm-get-part handle)
-				      'vcard-standard-filter))))))
+	       (ignore-errors
+		 (if (fboundp 'vcard-pretty-print)
+		     (vcard-pretty-print (mm-get-part handle))
+		   (vcard-format-string
+		    (vcard-parse-string (mm-get-part handle)
+					'vcard-standard-filter)))))))
      (t
       (let ((b (point))
 	    (charset (mail-content-type-get
 		      (mm-handle-type handle) 'charset)))
 	(if (or (eq charset 'gnus-decoded)
 		;; This is probably not entirely correct, but
-		;; makes rfc822 parts with embedded multiparts work. 
+		;; makes rfc822 parts with embedded multiparts work.
 		(eq mail-parse-charset 'gnus-decoded))
-	    (mm-insert-part handle)
+	    (save-restriction
+	      (narrow-to-region (point) (point))
+	      (mm-insert-part handle)
+	      (goto-char (point-max)))
 	  (insert (mm-decode-string (mm-get-part handle) charset)))
 	(when (and (equal type "plain")
 		   (equal (cdr (assoc 'format (mm-handle-type handle)))
@@ -172,6 +185,9 @@
 	(save-restriction
 	  (narrow-to-region b (point))
 	  (set-text-properties (point-min) (point-max) nil)
+	  (when (or (equal type "enriched")
+		    (equal type "richtext"))
+	    (enriched-decode (point-min) (point-max)))
 	  (mm-handle-set-undisplayer
 	   handle
 	   `(lambda ()
@@ -198,7 +214,8 @@
 
 (defun mm-w3-prepare-buffer ()
   (require 'w3)
-  (let ((url-standalone-mode t))
+  (let ((url-standalone-mode t)
+	(url-gateway-unplugged t))
     (w3-prepare-buffer)))
 
 (defun mm-view-message ()
@@ -219,6 +236,7 @@
 
 (defun mm-inline-message (handle)
   (let ((b (point))
+	(bolp (bolp))
 	(charset (mail-content-type-get
 		  (mm-handle-type handle) 'charset))
 	gnus-displaying-mime handles)
@@ -232,13 +250,16 @@
 	(narrow-to-region b b)
 	(mm-insert-part handle)
 	(let (gnus-article-mime-handles
-	      ;; disable prepare hook 
-	      gnus-article-prepare-hook  
+	      ;; disable prepare hook
+	      gnus-article-prepare-hook
 	      (gnus-newsgroup-charset
 	       (or charset gnus-newsgroup-charset)))
 	  (run-hooks 'gnus-article-decode-hook)
 	  (gnus-article-prepare-display)
 	  (setq handles gnus-article-mime-handles))
+	(goto-char (point-min))
+	(unless bolp
+	  (insert "\n"))
 	(goto-char (point-max))
 	(unless (bolp)
 	  (insert "\n"))
Binary files src-21.1/lisp/gnus/mm-view.elc and src-21.2/lisp/gnus/mm-view.elc differ
diff -ruN src-21.1/lisp/gnus/mml.el src-21.2/lisp/gnus/mml.el
--- src-21.1/lisp/gnus/mml.el	Sun Jul 15 19:42:53 2001
+++ src-21.2/lisp/gnus/mml.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; mml.el --- package for parsing and validating MML documents
-;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -133,7 +133,7 @@
 	(when (and (not raw) (memq nil charsets))
 	  (if (or (memq 'unknown-encoding mml-confirmation-set)
 		  (prog1 (y-or-n-p
-		   "\
+			  "\
 Message contains characters with unknown encoding.  Really send?")
 		    (set (make-local-variable 'mml-confirmation-set)
 			 (push 'unknown-encoding mml-confirmation-set))))
@@ -252,7 +252,7 @@
   "Return the buffer up till the next part, multipart or closing part or multipart.
 If MML is non-nil, return the buffer up till the correspondent mml tag."
   (let ((beg (point)) (count 1))
-    ;; If the tag ended at the end of the line, we go to the next line.
+   ;; If the tag ended at the end of the line, we go to the next line.
     (when (looking-at "[ \t]*\n")
       (forward-line 1))
     (if mml
@@ -305,43 +305,47 @@
 	(setq type (or (cdr (assq 'type cont)) "text/plain"))
 	(if (and (not raw)
 		 (member (car (split-string type "/")) '("text" "message")))
-	    (with-temp-buffer
-	      (cond
-	       ((cdr (assq 'buffer cont))
-		(insert-buffer-substring (cdr (assq 'buffer cont))))
-	       ((and (setq filename (cdr (assq 'filename cont)))
-		     (not (equal (cdr (assq 'nofile cont)) "yes")))
-		(mm-insert-file-contents filename))
-	       ((eq 'mml (car cont))
-		(insert (cdr (assq 'contents cont))))
-	       (t
-		(save-restriction
-		  (narrow-to-region (point) (point))
-		  (insert (cdr (assq 'contents cont)))
-		  ;; Remove quotes from quoted tags.
-		  (goto-char (point-min))
-		  (while (re-search-forward
-			  "<#!+/?\\(part\\|multipart\\|external\\|mml\\)" nil t)
-		    (delete-region (+ (match-beginning 0) 2)
-				   (+ (match-beginning 0) 3))))))
-	      (cond 
-	       ((eq (car cont) 'mml)
-		(let ((mml-boundary (funcall mml-boundary-function
-					     (incf mml-multipart-number)))
-		      (mml-generate-default-type "text/plain"))
-		  (mml-to-mime))
-		(let ((mm-7bit-chars (concat mm-7bit-chars "\x1b")))
-		  ;; ignore 0x1b, it is part of iso-2022-jp
-		  (setq encoding (mm-body-7-or-8))))
-	       ((string= (car (split-string type "/")) "message")
-		(let ((mm-7bit-chars (concat mm-7bit-chars "\x1b")))
-		  ;; ignore 0x1b, it is part of iso-2022-jp
-		  (setq encoding (mm-body-7-or-8))))
-	       (t 
-		(setq charset (mm-encode-body))
-		(setq encoding (mm-body-encoding
-				charset (cdr (assq 'encoding cont))))))
-	      (setq coded (buffer-string)))
+	    (progn
+	      (with-temp-buffer
+		(cond
+		 ((cdr (assq 'buffer cont))
+		  (insert-buffer-substring (cdr (assq 'buffer cont))))
+		 ((and (setq filename (cdr (assq 'filename cont)))
+		       (not (equal (cdr (assq 'nofile cont)) "yes")))
+		  (mm-insert-file-contents filename))
+		 ((eq 'mml (car cont))
+		  (insert (cdr (assq 'contents cont))))
+		 (t
+		  (save-restriction
+		    (narrow-to-region (point) (point))
+		    (insert (cdr (assq 'contents cont)))
+		    ;; Remove quotes from quoted tags.
+		    (goto-char (point-min))
+		    (while (re-search-forward
+			    "<#!+/?\\(part\\|multipart\\|external\\|mml\\)" nil t)
+		      (delete-region (+ (match-beginning 0) 2)
+				     (+ (match-beginning 0) 3))))))
+		(cond 
+		 ((eq (car cont) 'mml)
+		  (let ((mml-boundary (funcall mml-boundary-function
+					       (incf mml-multipart-number)))
+			(mml-generate-default-type "text/plain"))
+		    (mml-to-mime))
+		  (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b")))
+		    ;; ignore 0x1b, it is part of iso-2022-jp
+		    (setq encoding (mm-body-7-or-8))))
+		 ((string= (car (split-string type "/")) "message")
+		  (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b")))
+		    ;; ignore 0x1b, it is part of iso-2022-jp
+		    (setq encoding (mm-body-7-or-8))))
+		 (t 
+		  (setq charset (mm-encode-body))
+		  (setq encoding (mm-body-encoding
+				  charset (cdr (assq 'encoding cont))))))
+		(setq coded (buffer-string)))
+	      (mml-insert-mime-headers cont type charset encoding)
+	      (insert "\n")
+	      (insert coded))
 	  (mm-with-unibyte-buffer
 	    (cond
 	     ((cdr (assq 'buffer cont))
@@ -353,10 +357,11 @@
 	     (t
 	      (insert (cdr (assq 'contents cont)))))
 	    (setq encoding (mm-encode-buffer type)
-		  coded (buffer-string))))
-	(mml-insert-mime-headers cont type charset encoding)
-	(insert "\n")
-	(insert coded)))
+		  coded (buffer-string)))
+	  (mml-insert-mime-headers cont type charset encoding)
+	  (insert "\n")
+	  (mm-with-unibyte-current-buffer
+	    (insert coded)))))
      ((eq (car cont) 'external)
       (insert "Content-Type: message/external-body")
       (let ((parameters (mml-parameter-string
@@ -378,7 +383,7 @@
 	     (concat "access-type="
 		     (if (member (nth 0 name) '("ftp@" "anonymous@"))
 			 "anon-ftp"
-		       "ftp")))))      
+		       "ftp")))))
 	(when parameters
 	  (mml-insert-parameter-string
 	   cont '(expiration size permission))))
@@ -651,19 +656,19 @@
     main))
 
 (easy-menu-define
- mml-menu mml-mode-map ""
- '("MML"
-   ("Attach"
-    ["File" mml-attach-file t]
-    ["Buffer" mml-attach-buffer t]
-    ["External" mml-attach-external t])
-   ("Insert"
-    ["Multipart" mml-insert-multipart t]
-    ["Part" mml-insert-part t])
-   ;;["Narrow" mml-narrow-to-part t]
-   ["Quote" mml-quote-region t]
-   ["Validate" mml-validate t]
-   ["Preview" mml-preview t]))
+  mml-menu mml-mode-map ""
+  '("MML"
+    ("Attach"
+     ["File" mml-attach-file t]
+     ["Buffer" mml-attach-buffer t]
+     ["External" mml-attach-external t])
+    ("Insert"
+     ["Multipart" mml-insert-multipart t]
+     ["Part" mml-insert-part t])
+    ;;["Narrow" mml-narrow-to-part t]
+    ["Quote" mml-quote-region t]
+    ["Validate" mml-validate t]
+    ["Preview" mml-preview t]))
 
 (defvar mml-mode nil
   "Minor mode for editing MML.")
@@ -692,7 +697,7 @@
 
 (defun mml-minibuffer-read-file (prompt)
   (let ((file (read-file-name prompt nil nil t)))
-    ;; Prevent some common errors.  This is inspired by similar code in
+   ;; Prevent some common errors.  This is inspired by similar code in
     ;; VM.
     (when (file-directory-p file)
       (error "%s is a directory, cannot attach" file))
@@ -836,7 +841,8 @@
     (if (re-search-forward
 	 (concat "^" (regexp-quote mail-header-separator) "\n") nil t)
 	(replace-match "\n"))
-    (mml-to-mime)
+    (let ((mail-header-separator "")) ;; mail-header-separator is removed.
+      (mml-to-mime))
     (if raw
 	(when (fboundp 'set-buffer-multibyte)
 	  (let ((s (buffer-string)))
@@ -848,8 +854,10 @@
 	(run-hooks 'gnus-article-decode-hook)
 	(let ((gnus-newsgroup-name "dummy"))
 	  (gnus-article-prepare-display))))
-    (fundamental-mode)
+    ;; Disable article-mode-map.
+    (use-local-map nil)
     (setq buffer-read-only t)
+    (local-set-key "q" (lambda () (interactive) (kill-buffer nil)))
     (goto-char (point-min))))
 
 (defun mml-validate ()
Binary files src-21.1/lisp/gnus/mml.elc and src-21.2/lisp/gnus/mml.elc differ
Binary files src-21.1/lisp/gnus/nnagent.elc and src-21.2/lisp/gnus/nnagent.elc differ
Binary files src-21.1/lisp/gnus/nnbabyl.elc and src-21.2/lisp/gnus/nnbabyl.elc differ
Binary files src-21.1/lisp/gnus/nndir.elc and src-21.2/lisp/gnus/nndir.elc differ
Binary files src-21.1/lisp/gnus/nndoc.elc and src-21.2/lisp/gnus/nndoc.elc differ
Binary files src-21.1/lisp/gnus/nndraft.elc and src-21.2/lisp/gnus/nndraft.elc differ
Binary files src-21.1/lisp/gnus/nneething.elc and src-21.2/lisp/gnus/nneething.elc differ
diff -ruN src-21.1/lisp/gnus/nnfolder.el src-21.2/lisp/gnus/nnfolder.el
--- src-21.1/lisp/gnus/nnfolder.el	Thu Jul 12 12:14:10 2001
+++ src-21.2/lisp/gnus/nnfolder.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; nnfolder.el --- mail folder access for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Scott Byer <byer@mv.us.adobe.com>
@@ -99,7 +99,7 @@
 (defvoo nnfolder-file-coding-system mm-text-coding-system)
 (defvoo nnfolder-file-coding-system-for-write nnheader-file-coding-system
   "Coding system for save nnfolder file.
-If NIL, NNFOLDER-FILE-CODING-SYSTEM is used.")
+If nil, `nnfolder-file-coding-system' is used.")
 
 
 
Binary files src-21.1/lisp/gnus/nnfolder.elc and src-21.2/lisp/gnus/nnfolder.elc differ
Binary files src-21.1/lisp/gnus/nngateway.elc and src-21.2/lisp/gnus/nngateway.elc differ
Binary files src-21.1/lisp/gnus/nnheader.elc and src-21.2/lisp/gnus/nnheader.elc differ
diff -ruN src-21.1/lisp/gnus/nnimap.el src-21.2/lisp/gnus/nnimap.el
--- src-21.1/lisp/gnus/nnimap.el	Sun Jul 15 19:42:53 2001
+++ src-21.2/lisp/gnus/nnimap.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; nnimap.el --- imap backend for Gnus
-;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;;         Jim Radford <radford@robby.caltech.edu>
@@ -1088,10 +1088,12 @@
 
 (defun nnimap-date-days-ago (daysago)
   "Return date, in format \"3-Aug-1998\", for DAYSAGO days ago."
-  (let ((date (format-time-string "%d-%b-%Y"
-				  (nnimap-time-substract
-				   (current-time)
-				   (days-to-time daysago)))))
+  (let* ((time (nnimap-time-substract (current-time) (days-to-time daysago)))
+	 (date (format-time-string
+		(format "%%d-%s-%%Y"
+			(capitalize (car (rassoc (nth 4 (decode-time time))
+						 parse-time-months))))
+		time)))
     (if (eq ?0 (string-to-char date))
 	(substring date 1)
       date)))
Binary files src-21.1/lisp/gnus/nnimap.elc and src-21.2/lisp/gnus/nnimap.elc differ
Binary files src-21.1/lisp/gnus/nnkiboze.elc and src-21.2/lisp/gnus/nnkiboze.elc differ
Binary files src-21.1/lisp/gnus/nnlistserv.elc and src-21.2/lisp/gnus/nnlistserv.elc differ
diff -ruN src-21.1/lisp/gnus/nnmail.el src-21.2/lisp/gnus/nnmail.el
--- src-21.1/lisp/gnus/nnmail.el	Sat Aug 18 21:22:22 2001
+++ src-21.2/lisp/gnus/nnmail.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; nnmail.el --- mail support functions for the Gnus mail backends
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -318,7 +318,7 @@
 \(FIELD VALUE [- RESTRICT [- RESTRICT [...]]] SPLIT): If the message
   field FIELD (a regexp) contains VALUE (a regexp), store the messages 
   as specified by SPLIT.  If RESTRICT (a regexp) matches some string
-  after FIELD and before the end of the matched VALUE, return NIL,
+  after FIELD and before the end of the matched VALUE, return nil,
   otherwise process SPLIT.  Multiple RESTRICTs add up, further
   restricting the possibility of processing SPLIT.
 
Binary files src-21.1/lisp/gnus/nnmail.elc and src-21.2/lisp/gnus/nnmail.elc differ
Binary files src-21.1/lisp/gnus/nnmbox.elc and src-21.2/lisp/gnus/nnmbox.elc differ
Binary files src-21.1/lisp/gnus/nnmh.elc and src-21.2/lisp/gnus/nnmh.elc differ
Binary files src-21.1/lisp/gnus/nnml.elc and src-21.2/lisp/gnus/nnml.elc differ
Binary files src-21.1/lisp/gnus/nnoo.elc and src-21.2/lisp/gnus/nnoo.elc differ
diff -ruN src-21.1/lisp/gnus/nnslashdot.el src-21.2/lisp/gnus/nnslashdot.el
--- src-21.1/lisp/gnus/nnslashdot.el	Sun Jan 21 06:33:42 2001
+++ src-21.2/lisp/gnus/nnslashdot.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; nnslashdot.el --- interfacing with Slashdot
-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -57,6 +57,9 @@
     "http://slashdot.org/article.pl?sid=%s&mode=nocomment"
   "Where nnslashdot will fetch the article from.")
 
+(defvoo nnslashdot-backslash-url "http://slashdot.org/slashdot.xml"
+  "Where nnslashdot will fetch the stories from.")
+
 (defvoo nnslashdot-threshold -1
   "The article threshold.")
 
@@ -86,19 +89,17 @@
   (nnslashdot-possibly-change-server group server)
   (condition-case why
       (unless gnus-nov-is-evil
-        (if nnslashdot-threaded
-            (nnslashdot-threaded-retrieve-headers articles group)
-          (nnslashdot-sane-retrieve-headers articles group)))
+	(nnslashdot-retrieve-headers-1 articles group))
     (search-failed (nnslashdot-lose why))))
 
-(deffoo nnslashdot-threaded-retrieve-headers (articles group)
-  (let ((last (car (last articles)))
-	(did nil)
-	(start 1)
-	(sid (caddr (assoc group nnslashdot-groups)))
-	(first-comments t)
-	(startats '(1))
-	headers article subject score from date lines parent point s)
+(deffoo nnslashdot-retrieve-headers-1 (articles group)
+  (let* ((last (car (last articles)))
+	 (start (if nnslashdot-threaded 1 (pop articles)))
+	 (entry (assoc group nnslashdot-groups))
+	 (sid (nth 2 entry))
+	 (first-comments t)
+	 headers article subject score from date lines parent point cid 
+	 s startats changed)
     (save-excursion
       (set-buffer nnslashdot-buffer)
       (let ((case-fold-search t))
@@ -107,10 +108,10 @@
 	  (nnweb-insert (format nnslashdot-article-url
 				(nnslashdot-sid-strip sid)) t)
 	  (goto-char (point-min))
-	  (search-forward "Posted by ")
-	  (when (looking-at "<a[^>]+>\\([^<]+\\)")
-	    (setq from (nnweb-decode-entities-string (match-string 1))))
-	  (search-forward " on ")
+	  (re-search-forward "Posted by[ \t\r\n]+")
+	  (when (looking-at "\\(<a[^>]+>\\)?[ \t\r\n]*\\([^<\r\n]+\\)")
+	    (setq from (nnweb-decode-entities-string (match-string 2))))
+	  (search-forward "on ")
 	  (setq date (nnslashdot-date-to-date
 		      (buffer-substring (point) (1- (search-forward "<")))))
 	  (setq lines (/ (- (point)
@@ -123,16 +124,16 @@
 	     1 group from date
 	     (concat "<" (nnslashdot-sid-strip sid) "%1@slashdot>")
 	     "" 0 lines nil nil))
-	   headers))
-	(while (and (setq start (pop startats))
-		    (< start last))
+	   headers)
+	  (setq start (if nnslashdot-threaded 2 (pop articles))))
+	(while (and start (<= start last))
 	  (setq point (goto-char (point-max)))
 	  (nnweb-insert
 	   (format nnslashdot-comments-url
 		   (nnslashdot-sid-strip sid)
-		   nnslashdot-threshold 0 start)
+		   nnslashdot-threshold 0 (- start 2))
 	   t)
-	  (when first-comments
+	  (when (and nnslashdot-threaded first-comments)
 	    (setq first-comments nil)
 	    (goto-char (point-max))
 	    (while (re-search-backward "startat=\\([0-9]+\\)" nil t)
@@ -140,58 +141,68 @@
 	      (unless (memq s startats)
 		(push s startats)))
 	    (setq startats (sort startats '<)))
+	  (setq article (if (and article (< start article)) article start))
 	  (goto-char point)
 	  (while (re-search-forward
 		  "<a name=\"\\([0-9]+\\)\"><\\(b\\|H4\\)>\\([^<]+\\)</\\(b\\|H4\\)>.*score:\\([^)]+\\))"
 		  nil t)
-	    (setq article (string-to-number (match-string 1))
+	    (setq cid (match-string 1)
 		  subject (match-string 3)
 		  score (match-string 5))
+	    (unless (assq article (nth 4 entry))
+	      (setcar (nthcdr 4 entry) (cons (cons article cid) (nth 4 entry)))
+	      (setq changed t))
 	    (when (string-match "^Re: *" subject)
 	      (setq subject (concat "Re: " (substring subject (match-end 0)))))
-            (setq subject (nnweb-decode-entities-string subject))
-	    (forward-line 1)
+	    (setq subject (nnweb-decode-entities-string subject))
+	    (search-forward "<BR>")
 	    (if (looking-at
-		 "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
+		 "by[ \t\n]+<a[^>]+>\\([^<]+\\)</a>[ \t\n]*(\\(<[^>]+>\\)*\\([^<>)]+\\))")
 		(progn
 		  (goto-char (- (match-end 0) 5))
-		  (setq from (concat 
+		  (setq from (concat
 			      (nnweb-decode-entities-string (match-string 1))
-			      " <" (match-string 2) ">")))
+			      " <" (match-string 3) ">")))
 	      (setq from "")
-	      (when (looking-at "by \\(.+\\) on ")
+	      (when (looking-at "by \\([^<>]*\\) on ")
 		(goto-char (- (match-end 0) 5))
 		(setq from (nnweb-decode-entities-string (match-string 1)))))
 	    (search-forward " on ")
 	    (setq date
 		  (nnslashdot-date-to-date
-		   (buffer-substring (point) (progn (end-of-line) (point)))))
-	    (setq lines (/ (abs (- (search-forward "<td ")
+		   (buffer-substring (point) (progn (skip-chars-forward "^()<>\n\r") (point)))))
+	    (setq lines (/ (abs (- (search-forward "<td")
 				   (search-forward "</td>")))
 			   70))
-	    (forward-line 4)
-	    (setq parent
-		  (if (looking-at ".*cid=\\([0-9]+\\)")
-		      (match-string 1)
-		    nil))
-	    (setq did t)
+	    (if (not
+		 (re-search-forward ".*cid=\\([0-9]+\\)\">Parent</A>" nil t))
+		(setq parent nil)
+	      (setq parent (match-string 1))
+	      (when (string= parent "0")
+		(setq parent nil)))
 	    (push
 	     (cons
-	      (1+ article)
+	      article
 	      (make-full-mail-header
-	       (1+ article)
+	       article
 	       (concat subject " (" score ")")
 	       from date
-	       (concat "<" (nnslashdot-sid-strip sid) "%"
-		       (number-to-string (1+ article)) 
-		       "@slashdot>")
+	       (concat "<" (nnslashdot-sid-strip sid) "%" cid "@slashdot>")
 	       (if parent
-		   (concat "<" (nnslashdot-sid-strip sid) "%"
-			   (number-to-string (1+ (string-to-number parent)))
-			   "@slashdot>")
+		   (concat "<" (nnslashdot-sid-strip sid) "%" 
+			   parent "@slashdot>")
 		 "")
 	       0 lines nil nil))
-	     headers)))))
+	     headers)
+	    (while (and articles (<= (car articles) article))
+	      (pop articles))
+	    (setq article (1+ article)))
+	  (if nnslashdot-threaded 
+	      (progn
+		(setq start (pop startats))
+		(if start (setq start (+ start 2))))
+	    (setq start (pop articles))))))
+    (if changed (nnslashdot-write-groups))
     (setq nnslashdot-headers (sort headers 'car-less-than-car))
     (save-excursion
       (set-buffer nntp-server-buffer)
@@ -201,108 +212,6 @@
 	 (nnheader-insert-nov (cdr header)))))
     'nov))
 
-(deffoo nnslashdot-sane-retrieve-headers (articles group)
-  (let ((last (car (last articles)))
-	(did nil)
-	(start (max (1- (car articles)) 1))
-	(sid (caddr (assoc group nnslashdot-groups)))
-	headers article subject score from date lines parent point)
-    (save-excursion
-      (set-buffer nnslashdot-buffer)
-      (erase-buffer)
-      (when (= start 1)
-	(nnweb-insert (format nnslashdot-article-url
-			      (nnslashdot-sid-strip sid)) t)
-	(goto-char (point-min))
-	(search-forward "Posted by ")
-	(when (looking-at "<a[^>]+>\\([^<]+\\)")
-	  (setq from (nnweb-decode-entities-string (match-string 1))))
-	(search-forward " on ")
-	(setq date (nnslashdot-date-to-date
-		    (buffer-substring (point) (1- (search-forward "<")))))
-	(forward-line 2)
-	(setq lines (count-lines (point)
-				 (re-search-forward
-				  "A href=\"\\(http://slashdot.org\\)?/article")))
-	(push
-	 (cons
-	  1
-	  (make-full-mail-header
-	   1 group from date (concat "<" (nnslashdot-sid-strip sid)
-				     "%1@slashdot>")
-	   "" 0 lines nil nil))
-	 headers))
-      (while (or (not article)
-		 (and did
-		      (< article last)))
-	(when article
-	  (setq start (1+ article)))
-	(setq point (goto-char (point-max)))
-	(nnweb-insert
-	 (format nnslashdot-comments-url (nnslashdot-sid-strip sid)
-		 nnslashdot-threshold 4 start)
-	 t)
-	(goto-char point)
-	(while (re-search-forward
-		  "<a name=\"\\([0-9]+\\)\"><\\(b\\|H4\\)>\\([^<]+\\)</\\(b\\|H4\\)>.*score:\\([^)]+\\))"
-		nil t)
-	  (setq article (string-to-number (match-string 1))
-		subject (match-string 3)
-		score (match-string 5))
-	  (when (string-match "^Re: *" subject)
-	    (setq subject (concat "Re: " (substring subject (match-end 0)))))
-          (setq subject (nnweb-decode-entities-string subject))
-	  (forward-line 1)
-	  (if (looking-at
-	       "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
-	      (progn
-		(goto-char (- (match-end 0) 5))
-		(setq from (concat 
-			    (nnweb-decode-entities-string (match-string 1))
-			    " <" (match-string 2) ">")))
-	    (setq from "")
-	    (when (looking-at "by \\(.+\\) on ")
-	      (goto-char (- (match-end 0) 5))
-	      (setq from (nnweb-decode-entities-string (match-string 1)))))
-	  (search-forward " on ")
-	  (setq date
-		(nnslashdot-date-to-date
-		 (buffer-substring (point) (progn (end-of-line) (point)))))
-	  (setq lines (/ (abs (- (search-forward "<td ")
-				 (search-forward "</td>")))
-			 70))
-	  (forward-line 2)
-	  (setq parent
-		(if (looking-at ".*cid=\\([0-9]+\\)")
-		    (match-string 1)
-		  nil))
-	  (setq did t)
-	  (push
-	   (cons
-	    (1+ article)
-	    (make-full-mail-header
-	     (1+ article) (concat subject " (" score ")")
-	     from date
-	     (concat "<" (nnslashdot-sid-strip sid) "%"
-		     (number-to-string (1+ article)) 
-		     "@slashdot>")
-	     (if parent
-		 (concat "<" (nnslashdot-sid-strip sid) "%"
-			 (number-to-string (1+ (string-to-number parent)))
-			 "@slashdot>")
-	       "")
-	     0 lines nil nil))
-	   headers))))
-    (setq nnslashdot-headers
-	  (sort headers (lambda (s1 s2) (< (car s1) (car s2)))))
-    (save-excursion
-      (set-buffer nntp-server-buffer)
-      (erase-buffer)
-      (mm-with-unibyte-current-buffer
-	(dolist (header nnslashdot-headers)
-	  (nnheader-insert-nov (cdr header)))))
-    'nov))
-
 (deffoo nnslashdot-request-group (group &optional server dont-check)
   (nnslashdot-possibly-change-server nil server)
   (let ((elem (assoc group nnslashdot-groups)))
@@ -325,7 +234,7 @@
 
 (deffoo nnslashdot-request-article (article &optional group server buffer)
   (nnslashdot-possibly-change-server group server)
-  (let (contents)
+  (let (contents cid)
     (condition-case why
 	(save-excursion
 	  (set-buffer nnslashdot-buffer)
@@ -333,23 +242,32 @@
 	    (goto-char (point-min))
 	    (when (and (stringp article)
 		       (string-match "%\\([0-9]+\\)@" article))
-	      (setq article (string-to-number (match-string 1 article))))
+	      (setq cid (match-string 1 article))
+	      (let ((map (nth 4 (assoc group nnslashdot-groups))))
+		(while map
+		  (if (equal (cdar map) cid)
+		      (setq article (caar map)
+			    map nil)
+		    (setq map (cdr map))))))
 	    (when (numberp article)
 	      (if (= article 1)
 		  (progn
-		    (re-search-forward "Posted by *<[^>]+>[^>]*<[^>]+> *on ")
+		    (re-search-forward 
+		     "Posted by")
 		    (search-forward "<BR>")
 		    (setq contents
 			  (buffer-substring
 			   (point)
 			   (progn
 			     (re-search-forward
-			      "<p>.*A href=\"\\(http://slashdot.org\\)?/article")
+			      "&lt;&nbsp;[ \t\r\n]*<A HREF=\"\\(\\(http:\\)?//slashdot\\.org\\)?/article")
 			     (match-beginning 0)))))
-		(search-forward (format "<a name=\"%d\">" (1- article)))
+		(setq cid (cdr (assq article 
+				     (nth 4 (assoc group nnslashdot-groups)))))
+		(search-forward (format "<a name=\"%s\">" cid))
 		(setq contents
 		      (buffer-substring
-		       (re-search-forward "<td[^>]+>")
+		       (re-search-forward "<td[^>]*>")
 		       (search-forward "</td>")))))))
       (search-failed (nnslashdot-lose why)))
 
@@ -384,10 +302,10 @@
   (let ((number 0)
 	sid elem description articles gname)
     (condition-case why
-        ;; First we do the Ultramode to get info on all the latest groups.
-	(progn 
+	;; First we do the Ultramode to get info on all the latest groups.
+	(progn
 	  (mm-with-unibyte-buffer
-	    (nnweb-insert "http://slashdot.org/slashdot.xml" t)
+	    (nnweb-insert nnslashdot-backslash-url t)
 	    (goto-char (point-min))
 	    (while (search-forward "<story>" nil t)
 	      (narrow-to-region (point) (search-forward "</story>"))
@@ -404,7 +322,8 @@
 	      (setq gname (concat description " (" sid ")"))
 	      (if (setq elem (assoc gname nnslashdot-groups))
 		  (setcar (cdr elem) articles)
-		(push (list gname articles sid) nnslashdot-groups))
+		(push (list gname articles sid (current-time) nil)
+		      nnslashdot-groups))
 	      (goto-char (point-max))
 	      (widen)))
 	  ;; Then do the older groups.
@@ -425,13 +344,14 @@
 		  (setq gname (concat description " (" sid ")"))
 		  (if (setq elem (assoc gname nnslashdot-groups))
 		      (setcar (cdr elem) articles)
-		    (push (list gname articles sid) nnslashdot-groups)))))
+		    (push (list gname articles sid (current-time) nil)
+			  nnslashdot-groups)))))
 	    (incf number 30)))
       (search-failed (nnslashdot-lose why)))
     (nnslashdot-write-groups)
     (nnslashdot-generate-active)
     t))
-  
+
 (deffoo nnslashdot-request-newgroups (date &optional server)
   (nnslashdot-possibly-change-server nil server)
   (nnslashdot-generate-active)
@@ -496,6 +416,24 @@
   (setq nnslashdot-headers nil
 	nnslashdot-groups nil))
 
+(deffoo nnslashdot-request-expire-articles
+    (articles group &optional server force)
+  (nnslashdot-possibly-change-server group server)
+  (let ((item (assoc group nnslashdot-groups)))
+    (when item
+      (if (fourth item)
+	  (when (and (>= (length articles) (cadr item)) ;; All are expirable.
+		     (nnmail-expired-article-p
+		      group
+		      (fourth item)
+		      force))
+	    (setq nnslashdot-groups (delq item nnslashdot-groups))
+	    (nnslashdot-write-groups)
+	    (setq articles nil)) ;; all expired.
+	(setcdr (cddr item) (list (current-time)))
+	(nnslashdot-write-groups))))
+  articles)
+
 (nnoo-define-skeleton nnslashdot)
 
 ;;; Internal functions
@@ -508,18 +446,32 @@
   (unless nnslashdot-groups
     (nnslashdot-read-groups)))
 
+(defun nnslashdot-make-tuple (tuple n)
+  (prog1
+      tuple
+    (while (> n 1)
+      (unless (cdr tuple)
+	(setcdr tuple (list nil)))
+      (setq tuple (cdr tuple)
+	    n (1- n)))))
+
 (defun nnslashdot-read-groups ()
   (let ((file (expand-file-name "groups" nnslashdot-directory)))
     (when (file-exists-p file)
       (mm-with-unibyte-buffer
 	(insert-file-contents file)
 	(goto-char (point-min))
-	(setq nnslashdot-groups (read (current-buffer)))))))
+	(setq nnslashdot-groups (read (current-buffer))))
+      (if (and nnslashdot-groups (< (length (car nnslashdot-groups)) 5))
+	  (let ((groups nnslashdot-groups))
+	    (while groups
+	      (nnslashdot-make-tuple (car groups) 5)
+	      (setq groups (cdr groups))))))))
 
 (defun nnslashdot-write-groups ()
   (with-temp-file (expand-file-name "groups" nnslashdot-directory)
-    (prin1 nnslashdot-groups (current-buffer))))
-    
+    (gnus-prin1 nnslashdot-groups)))
+
 (defun nnslashdot-init (server)
   "Initialize buffers and such."
   (unless (file-exists-p nnslashdot-directory)
@@ -528,7 +480,8 @@
     (setq nnslashdot-buffer
 	  (save-excursion
 	    (nnheader-set-temp-buffer
-	     (format " *nnslashdot %s*" server))))))
+	     (format " *nnslashdot %s*" server))))
+    (push nnslashdot-buffer gnus-buffers)))
 
 (defun nnslashdot-date-to-date (sdate)
   (condition-case err
@@ -551,11 +504,6 @@
 
 (defun nnslashdot-lose (why)
   (error "Slashdot HTML has changed; please get a new version of nnslashdot"))
-
-;(defun nnslashdot-sid-strip (sid)
-;  (if (string-match "^00/" sid)
-;      (substring sid (match-end 0))
-;    sid))
 
 (defalias 'nnslashdot-sid-strip 'identity)
 
Binary files src-21.1/lisp/gnus/nnslashdot.elc and src-21.2/lisp/gnus/nnslashdot.elc differ
Binary files src-21.1/lisp/gnus/nnsoup.elc and src-21.2/lisp/gnus/nnsoup.elc differ
diff -ruN src-21.1/lisp/gnus/nnspool.el src-21.2/lisp/gnus/nnspool.el
--- src-21.1/lisp/gnus/nnspool.el	Tue Sep 19 15:37:09 2000
+++ src-21.2/lisp/gnus/nnspool.el	Fri Feb 22 11:51:36 2002
@@ -1,7 +1,8 @@
 ;;; nnspool.el --- spool access for GNU Emacs
 
 ;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998,
-;;	2000 Free Software Foundation, Inc.
+;;               2000, 2002 
+;;               Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; 	Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -327,7 +328,8 @@
 	  ()
 	(nnheader-report 'nnspool "")
 	(set-process-sentinel proc 'nnspool-inews-sentinel)
-	(process-send-region proc (point-min) (point-max))
+	(mm-with-unibyte-current-buffer
+	  (process-send-region proc (point-min) (point-max)))
 	;; We slap a condition-case around this, because the process may
 	;; have exited already...
 	(ignore-errors
Binary files src-21.1/lisp/gnus/nnspool.elc and src-21.2/lisp/gnus/nnspool.elc differ
diff -ruN src-21.1/lisp/gnus/nntp.el src-21.2/lisp/gnus/nntp.el
--- src-21.1/lisp/gnus/nntp.el	Mon Jul 23 12:08:15 2001
+++ src-21.2/lisp/gnus/nntp.el	Fri Feb 22 11:51:36 2002
@@ -1,6 +1,6 @@
 ;;; nntp.el --- nntp access for Gnus
 ;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996,
-;;        1997, 1998, 2000, 2001
+;;        1997, 1998, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -397,8 +397,10 @@
       (set-buffer (nntp-find-connection-buffer nntp-server-buffer))
       (erase-buffer)))
   (nntp-encode-text)
-  (process-send-region (nntp-find-connection nntp-server-buffer)
-		       (point-min) (point-max))
+  (mm-with-unibyte-current-buffer
+    ;; Some encoded unicode text contains character 0x80-0x9f e.g. Euro.
+    (process-send-region (nntp-find-connection nntp-server-buffer)
+			 (point-min) (point-max)))
   (nntp-retrieve-data
    nil nntp-address nntp-port-number nntp-server-buffer
    wait-for nnheader-callback-function))
Binary files src-21.1/lisp/gnus/nntp.elc and src-21.2/lisp/gnus/nntp.elc differ
diff -ruN src-21.1/lisp/gnus/nnultimate.el src-21.2/lisp/gnus/nnultimate.el
--- src-21.1/lisp/gnus/nnultimate.el	Fri Nov 10 18:27:58 2000
+++ src-21.2/lisp/gnus/nnultimate.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; nnultimate.el --- interfacing with the Ultimate Bulletin Board system -*- coding: iso-latin-1 -*-
-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -56,6 +56,8 @@
 (defvoo nnultimate-groups nil)
 (defvoo nnultimate-headers nil)
 (defvoo nnultimate-articles nil)
+(defvar nnultimate-table-regexp
+  "postings.*editpost\\|forumdisplay\\|Forum[0-9]+/HTML\\|getbio")
 
 ;;; Interface functions
 
@@ -74,13 +76,17 @@
 	   (old-total (or (nth 6 entry) 1))
 	   (furl "forumdisplay.cgi?action=topics&number=%d&DaysPrune=1000")
 	   (furls (list (concat nnultimate-address (format furl sid))))
+	   (nnultimate-table-regexp
+	    "postings.*editpost\\|forumdisplay\\|getbio")
 	   headers article subject score from date lines parent point
 	   contents tinfo fetchers map elem a href garticles topic old-max
-	   inc datel table string current-page total-contents pages
+	   inc datel table current-page total-contents pages
 	   farticles forum-contents parse furl-fetched mmap farticle)
       (setq map mapping)
       (while (and (setq article (car articles))
 		  map)
+	;; Skip past the articles in the map until we reach the
+	;; article we're looking for.
 	(while (and map
 		    (or (> article (caar map))
 			(< (cadar map) (caar map))))
@@ -101,7 +107,7 @@
 		    fetchers))
 	    (pop articles)
 	    (setq article (car articles)))))
-      ;; Now we have the mapping from/to Gnus/nnultimate article numbers,
+   ;; Now we have the mapping from/to Gnus/nnultimate article numbers,
       ;; so we start fetching the topics that we need to satisfy the
       ;; request.
       (if (not fetchers)
@@ -128,22 +134,27 @@
 	      (setq contents
 		    (ignore-errors (w3-parse-buffer (current-buffer))))
 	      (setq table (nnultimate-find-forum-table contents))
-	      (setq string (mapconcat 'identity (nnweb-text table) ""))
-	      (when (string-match "topic is \\([0-9]\\) pages" string)
-		(setq pages (string-to-number (match-string 1 string)))
-		(setcdr table nil)
-		(setq table (nnultimate-find-forum-table contents)))
+	      (goto-char (point-min))
+	      (when (re-search-forward "topic is \\([0-9]+\\) pages" nil t)
+		(setq pages (string-to-number (match-string 1))))
 	      (setq contents (cdr (nth 2 (car (nth 2 table)))))
 	      (setq total-contents (nconc total-contents contents))
 	      (incf current-page))
-	    ;;(setq total-contents (nreverse total-contents))
-	    (dolist (art (cdr elem))
-	      (if (not (nth (1- (cdr art)) total-contents))
-		  ()			;(debug)
-		(push (list (car art)
-			    (nth (1- (cdr art)) total-contents)
-			    subject)
-		      nnultimate-articles)))))
+	    (when t
+	      (let ((i 0))
+		(dolist (co total-contents)
+		  (push (list (or (nnultimate-topic-article-to-article
+				   group (car elem) (incf i))
+				  1)
+			      co subject)
+			nnultimate-articles))))
+	    (when nil
+	      (dolist (art (cdr elem))
+		(when (nth (1- (cdr art)) total-contents)
+		  (push (list (car art)
+			      (nth (1- (cdr art)) total-contents)
+			      subject)
+			nnultimate-articles))))))
 	(setq nnultimate-articles
 	      (sort nnultimate-articles 'car-less-than-car))
 	;; Now we have all the articles, conveniently in an alist
@@ -161,17 +172,26 @@
 	      (setq date (substring (car datel) (match-end 0))
 		    datel nil))
 	    (pop datel))
-	  (setq date (delete "" (split-string date "[- \n\t\r    ]")))
-	  (if (or (member "AM" date)
-		  (member "PM" date))
+	  (when date
+	    (setq date (delete "" (split-string
+				   date "[-, \n\t\r    ]")))
+	    (if (or (member "AM" date)
+		    (member "PM" date))
+		(setq date (format
+			    "%s %s %s %s"
+			    (nth 1 date)
+			    (if (and (>= (length (nth 0 date)) 3)
+				     (assoc (downcase
+					     (substring (nth 0 date) 0 3))
+					    parse-time-months))
+				(substring (nth 0 date) 0 3)
+			      (car (rassq (string-to-number (nth 0 date))
+					  parse-time-months)))
+			    (nth 2 date) (nth 3 date)))
 	      (setq date (format "%s %s %s %s"
-				 (car (rassq (string-to-number (nth 0 date))
+				 (car (rassq (string-to-number (nth 1 date))
 					     parse-time-months))
-				 (nth 1 date) (nth 2 date) (nth 3 date)))
-	    (setq date (format "%s %s %s %s"
-			       (car (rassq (string-to-number (nth 1 date))
-					   parse-time-months))
-			       (nth 0 date) (nth 2 date) (nth 3 date))))
+				 (nth 0 date) (nth 2 date) (nth 3 date)))))
 	  (push
 	   (cons
 	    article
@@ -180,7 +200,7 @@
 	     from (or date "")
 	     (concat "<" (number-to-string sid) "%"
 		     (number-to-string article)
-		     "@ultimate>")
+		     "@ultimate." server ">")
 	     "" 0
 	     (/ (length (mapconcat
 			 'identity
@@ -199,6 +219,16 @@
 	      (nnheader-insert-nov (cdr header))))))
       'nov)))
 
+(defun nnultimate-topic-article-to-article (group topic article)
+  (catch 'found
+    (dolist (elem (nth 5 (assoc group nnultimate-groups)))
+      (when (and (= topic (nth 2 elem))
+		 (>= article (nth 3 elem))
+		 (< article (+ (- (nth 1 elem) (nth 0 elem)) 1
+			       (nth 3 elem))))
+	(throw 'found
+	       (+ (nth 0 elem) (- article (nth 3 elem))))))))
+
 (deffoo nnultimate-request-group (group &optional server dont-check)
   (nnultimate-possibly-change-server nil server)
   (when (not nnultimate-groups)
@@ -330,7 +360,7 @@
       ;; the group is entered, there's 2 new articles in topic one
       ;; and 1 in topic three.  Then Gnus article number 8-9 be 5-6
       ;; in topic one and 10 will be the 2 in topic three.
-      (dolist (row (reverse forum-contents))
+      (dolist (row (nreverse forum-contents))
 	(setq row (nth 2 row))
 	(when (setq a (nnweb-parse-find 'a row))
 	  (setq subject (car (last (nnweb-text a)))
@@ -403,7 +433,7 @@
 	nnultimate-groups-alist)
   (with-temp-file (expand-file-name "groups" nnultimate-directory)
     (prin1 nnultimate-groups-alist (current-buffer))))
-    
+
 (defun nnultimate-init (server)
   "Initialize buffers and such."
   (unless (file-exists-p nnultimate-directory)
@@ -438,9 +468,7 @@
 		     (nth 2 parse))))
     (let ((href (cdr (assq 'href (nth 1 (nnweb-parse-find 'a parse 20)))))
 	  case-fold-search)
-      (when (and href (string-match
-		       "postings\\|forumdisplay\\|Forum[0-9]+/HTML\\|getbio"
-		       href))
+      (when (and href (string-match nnultimate-table-regexp href))
 	t))))
 
 (provide 'nnultimate)
Binary files src-21.1/lisp/gnus/nnultimate.elc and src-21.2/lisp/gnus/nnultimate.elc differ
Binary files src-21.1/lisp/gnus/nnvirtual.elc and src-21.2/lisp/gnus/nnvirtual.elc differ
Binary files src-21.1/lisp/gnus/nnwarchive.elc and src-21.2/lisp/gnus/nnwarchive.elc differ
diff -ruN src-21.1/lisp/gnus/nnweb.el src-21.2/lisp/gnus/nnweb.el
--- src-21.1/lisp/gnus/nnweb.el	Wed Nov  8 22:04:28 2000
+++ src-21.2/lisp/gnus/nnweb.el	Fri Feb 22 11:51:36 2002
@@ -1,5 +1,5 @@
 ;;; nnweb.el --- retrieving articles via web search engines
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -55,25 +55,48 @@
 (defvoo nnweb-directory (nnheader-concat gnus-directory "nnweb/")
   "Where nnweb will save its files.")
 
-(defvoo nnweb-type 'dejanews
+(defvoo nnweb-type 'google
   "What search engine type is being used.
-Valid types include `dejanews', `dejanewsold', `reference',
+Valid types include `google', `dejanews', `dejanewsold', `reference',
 and `altavista'.")
 
 (defvar nnweb-type-definition
-  '((dejanews
+  '(
+    (google
+     ;;(article . nnweb-google-wash-article)
+     ;;(id . "http://groups.google.com/groups?as_umsgid=%s")
      (article . ignore)
-     (id . "http://search.dejanews.com/msgid.xp?MID=%s&fmt=text")
-     (map . nnweb-dejanews-create-mapping)
-     (search . nnweb-dejanews-search)
-     (address . "http://www.deja.com/=dnc/qs.xp")
-     (identifier . nnweb-dejanews-identity))
-    (dejanewsold
+     (id . "http://groups.google.com/groups?selm=%s&output=gplain")
+     ;;(reference . nnweb-google-reference)
+     (reference . identity)
+     (map . nnweb-google-create-mapping)
+     (search . nnweb-google-search)
+     (address . "http://groups.google.com/groups")
+     (identifier . nnweb-google-identity))
+    (dejanews ;; alias of google
+     ;;(article . nnweb-google-wash-article)
+     ;;(id . "http://groups.google.com/groups?as_umsgid=%s")
      (article . ignore)
-     (map . nnweb-dejanews-create-mapping)
-     (search . nnweb-dejanewsold-search)
-     (address . "http://www.deja.com/dnquery.xp")
-     (identifier . nnweb-dejanews-identity))
+     (id . "http://groups.google.com/groups?selm=%s&output=gplain")
+     ;;(reference . nnweb-google-reference)
+     (reference . identity)
+     (map . nnweb-google-create-mapping)
+     (search . nnweb-google-search)
+     (address . "http://groups.google.com/groups")
+     (identifier . nnweb-google-identity))
+;;;     (dejanews
+;;;      (article . ignore)
+;;;      (id . "http://search.dejanews.com/msgid.xp?MID=%s&fmt=text")
+;;;      (map . nnweb-dejanews-create-mapping)
+;;;      (search . nnweb-dejanews-search)
+;;;      (address . "http://www.deja.com/=dnc/qs.xp")
+;;;      (identifier . nnweb-dejanews-identity))
+;;;     (dejanewsold
+;;;      (article . ignore)
+;;;      (map . nnweb-dejanews-create-mapping)
+;;;      (search . nnweb-dejanewsold-search)
+;;;      (address . "http://www.deja.com/dnquery.xp")
+;;;      (identifier . nnweb-dejanews-identity))
     (reference
      (article . nnweb-reference-wash-article)
      (map . nnweb-reference-create-mapping)
@@ -124,6 +147,8 @@
 
 (deffoo nnweb-request-scan (&optional group server)
   (nnweb-possibly-change-server group server)
+  (if nnweb-ephemeral-p
+      (setq nnweb-hashtb (gnus-make-hashtable 4095)))
   (funcall (nnweb-definition 'map))
   (unless nnweb-ephemeral-p
     (nnweb-write-active)
@@ -134,9 +159,10 @@
   (when (and group
 	     (not (equal group nnweb-group))
 	     (not nnweb-ephemeral-p))
+    (setq nnweb-group group
+	  nnweb-articles nil)
     (let ((info (assoc group nnweb-group-alist)))
       (when info
-	(setq nnweb-group group)
 	(setq nnweb-type (nth 2 info))
 	(setq nnweb-search (nth 3 info))
 	(unless dont-check
@@ -175,17 +201,19 @@
 		(and (stringp article)
 		     (nnweb-definition 'id t)
 		     (let ((fetch (nnweb-definition 'id))
-			   art)
+			   art active)
 		       (when (string-match "^<\\(.*\\)>$" article)
 			 (setq art (match-string 1 article)))
-		       (and fetch
-			    art
-			    (mm-with-unibyte-current-buffer
-			      (nnweb-fetch-url
-			       (format fetch article)))))))
+		       (when (and fetch art)
+			 (setq url (format fetch art))
+			 (mm-with-unibyte-current-buffer
+			   (nnweb-fetch-url url))
+			 (if (nnweb-definition 'reference t)
+			     (setq article
+				   (funcall (nnweb-definition
+					     'reference) article)))))))
 	(unless nnheader-callback-function
-	  (funcall (nnweb-definition 'article))
-	  (nnweb-decode-entities))
+	  (funcall (nnweb-definition 'article)))
 	(nnheader-report 'nnweb "Fetched article %s" article)
 	(cons group (and (numberp article) article))))))
 
@@ -290,10 +318,11 @@
       (nnweb-open-server server)))
   (unless nnweb-group-alist
     (nnweb-read-active))
+  (unless nnweb-hashtb
+    (setq nnweb-hashtb (gnus-make-hashtable 4095)))
   (when group
     (when (and (not nnweb-ephemeral-p)
-	       (not (equal group nnweb-group)))
-      (setq nnweb-hashtb (gnus-make-hashtable 4095))
+	       (equal group nnweb-group))
       (nnweb-request-group group nil t))))
 
 (defun nnweb-init (server)
@@ -393,7 +422,7 @@
 				     (car (rassq (string-to-number
 						  (match-string 2 date))
 						 parse-time-months))
-				     (match-string 3 date) 
+				     (match-string 3 date)
 				     (match-string 1 date)))
 		(setq date "Jan 1 00:00:00 0000"))
 	      (incf i)
@@ -559,6 +588,7 @@
 	(while (search-forward "," nil t)
 	  (replace-match " " t t)))
       (widen)
+      (nnweb-decode-entities)
       (set-marker body nil))))
 
 (defun nnweb-reference-search (search)
@@ -663,7 +693,8 @@
       (while (re-search-forward "<A.*\\?id@\\([^\"]+\\)\">[0-9]+</A>" nil t)
 	(replace-match "&lt;\\1&gt; " t)))
     (widen)
-    (nnweb-remove-markup)))
+    (nnweb-remove-markup)
+    (nnweb-decode-entities)))
 
 (defun nnweb-altavista-search (search &optional part)
   (url-insert-file-contents
@@ -683,13 +714,147 @@
   t)
 
 ;;;
+;;; Deja bought by google.com
+;;;
+
+(defun nnweb-google-wash-article ()
+  (let ((case-fold-search t) url)
+    (goto-char (point-min))
+    (re-search-forward "^<pre>" nil t)
+    (narrow-to-region (point-min) (point))
+    (search-backward "<table " nil t 2)
+    (delete-region (point-min) (point))
+    (if (re-search-forward "Search Result [0-9]+" nil t)
+	(replace-match ""))
+    (if (re-search-forward "View complete thread ([0-9]+ articles?)" nil t)
+	(replace-match ""))
+    (goto-char (point-min))
+    (while (search-forward "<br>" nil t)
+      (replace-match "\n"))
+    (nnweb-remove-markup)
+    (goto-char (point-min))
+    (while (re-search-forward "^[ \t]*\n" nil t)
+      (replace-match ""))
+    (goto-char (point-max))
+    (insert "\n")
+    (widen)
+    (narrow-to-region (point) (point-max))
+    (search-forward "</pre>" nil t)
+    (delete-region (point) (point-max))
+    (nnweb-remove-markup)
+    (widen)))
+
+(defun nnweb-google-parse-1 (&optional Message-ID)
+  (let ((i 0)
+	(case-fold-search t)
+	(active (cadr (assoc nnweb-group nnweb-group-alist)))
+	Subject Score Date Newsgroups From
+	map url mid)
+    (unless active
+      (push (list nnweb-group (setq active (cons 1 0))
+		  nnweb-type nnweb-search)
+	    nnweb-group-alist))
+    ;; Go through all the article hits on this page.
+    (goto-char (point-min))
+    (while (re-search-forward
+	    "a href=/groups\\(\\?[^ \">]*selm=\\([^ &\">]+\\)\\)" nil t)
+      (setq mid (match-string 2)
+	    url (format 
+		 "http://groups.google.com/groups?selm=%s&output=gplain" mid))
+      (narrow-to-region (search-forward ">" nil t)
+			(search-forward "</a>" nil t))
+      (nnweb-remove-markup)
+      (nnweb-decode-entities)
+      (setq Subject (buffer-string))
+      (goto-char (point-max))
+      (widen)
+      (forward-line 1)
+      (when (looking-at "<br><font[^>]+>")
+	(goto-char (match-end 0)))
+      (if (not (looking-at "<a[^>]+>"))
+	  (skip-chars-forward " \t")
+	(narrow-to-region (point)
+			  (search-forward "</a>" nil t))
+	(nnweb-remove-markup)
+	(nnweb-decode-entities)
+	(setq Newsgroups (buffer-string))
+	(goto-char (point-max))
+	(widen)
+	(skip-chars-forward "- \t"))
+      (when (looking-at
+	     "\\([0-9]+[/ ][A-Za-z]+[/ ][0-9]+\\)[ \t]*by[ \t]*\\([^<]*\\) - <a")
+	(setq From (match-string 2)
+	      Date (match-string 1)))
+      (forward-line 1)
+      (incf i)
+      (unless (nnweb-get-hashtb url)
+	(push
+	 (list
+	  (incf (cdr active))
+	  (make-full-mail-header
+	   (cdr active) (if Newsgroups
+			    (concat  "(" Newsgroups ") " Subject)
+			  Subject)
+	   From Date (or Message-ID mid)
+	   nil 0 0 url))
+	 map)
+	(nnweb-set-hashtb (cadar map) (car map))))
+    map))
+
+(defun nnweb-google-reference (id)
+  (let ((map (nnweb-google-parse-1 id)) header)
+    (setq nnweb-articles
+	  (nconc nnweb-articles map))
+    (when (setq header (cadar map))
+      (mm-with-unibyte-current-buffer
+	(nnweb-fetch-url (mail-header-xref header)))
+      (caar map))))
+
+(defun nnweb-google-create-mapping ()
+  "Perform the search and create an number-to-url alist."
+  (save-excursion
+    (set-buffer nnweb-buffer)
+    (erase-buffer)
+    (when (funcall (nnweb-definition 'search) nnweb-search)
+	(let ((more t))
+	  (while more
+	    (setq nnweb-articles
+		  (nconc nnweb-articles (nnweb-google-parse-1)))
+	    ;; FIXME: There is more.
+	    (setq more nil))
+	  ;; Return the articles in the right order.
+	  (setq nnweb-articles
+		(sort nnweb-articles 'car-less-than-car))))))
+
+(defun nnweb-google-search (search)
+  (nnweb-insert
+   (concat
+    (nnweb-definition 'address)
+    "?"
+    (nnweb-encode-www-form-urlencoded
+     `(("q" . ,search)
+       ("num". "100")
+       ("hq" . "")
+       ("hl" . "")
+       ("lr" . "")
+       ("safe" . "off")
+       ("sites" . "groups")))))
+  t)
+
+(defun nnweb-google-identity (url)
+  "Return an unique identifier based on URL."
+  (if (string-match "selm=\\([^ &>]+\\)" url)
+      (match-string 1 url)
+    url))
+
+;;;
 ;;; General web/w3 interface utility functions
 ;;;
 
 (defun nnweb-insert-html (parse)
   "Insert HTML based on a w3 parse tree."
   (if (stringp parse)
-      (insert parse)
+      (insert (nnheader-string-as-multibyte parse))
     (insert "<" (symbol-name (car parse)) " ")
     (insert (mapconcat
 	     (lambda (param)
@@ -729,7 +894,7 @@
   (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+\\);" nil t)
     (let ((elem (if (eq (aref (match-string 1) 0) ?\#)
 			(let ((c
-			       (string-to-number (substring 
+			       (string-to-number (substring
 						  (match-string 1) 1))))
 			  (if (mm-char-or-char-int-p c) c 32))
 		      (or (cdr (assq (intern (match-string 1))
@@ -739,9 +904,9 @@
 	(setq elem (char-to-string elem)))
       (replace-match elem t t))))
 
-(defun nnweb-decode-entities-string (str)
+(defun nnweb-decode-entities-string (string)
   (with-temp-buffer
-    (insert str)
+    (insert string)
     (nnweb-decode-entities)
     (buffer-substring (point-min) (point-max))))
 
@@ -760,12 +925,12 @@
   "Insert the contents from an URL in the current buffer.
 If FOLLOW-REFRESH is non-nil, redirect refresh url in META."
   (let ((name buffer-file-name))
-    (if follow-refresh
+    (if follow-refresh 
 	(save-restriction
 	  (narrow-to-region (point) (point))
 	  (url-insert-file-contents url)
 	  (goto-char (point-min))
-	  (when (re-search-forward 
+	  (when (re-search-forward
 		 "<meta[ \t\r\n]*http-equiv=\"Refresh\"[^>]*URL=\\([^\"]+\\)\"" nil t)
 	    (let ((url (match-string 1)))
 	      (delete-region (point-min) (point-max))
@@ -821,6 +986,11 @@
       (when (and (consp element)
 		 (listp (cdr element)))
 	(nnweb-text-1 element)))))
+
+(defun nnweb-replace-in-string (string match newtext)
+  (while (string-match match string)
+    (setq string (replace-match newtext t t string)))
+  string)
 
 (provide 'nnweb)
 
Binary files src-21.1/lisp/gnus/nnweb.elc and src-21.2/lisp/gnus/nnweb.elc differ
Binary files src-21.1/lisp/gnus/parse-time.elc and src-21.2/lisp/gnus/parse-time.elc differ
Binary files src-21.1/lisp/gnus/pop3.elc and src-21.2/lisp/gnus/pop3.elc differ
Binary files src-21.1/lisp/gnus/qp.elc and src-21.2/lisp/gnus/qp.elc differ
Binary files src-21.1/lisp/gnus/rfc1843.elc and src-21.2/lisp/gnus/rfc1843.elc differ
Binary files src-21.1/lisp/gnus/rfc2045.elc and src-21.2/lisp/gnus/rfc2045.elc differ
Binary files src-21.1/lisp/gnus/rfc2047.elc and src-21.2/lisp/gnus/rfc2047.elc differ
Binary files src-21.1/lisp/gnus/rfc2104.elc and src-21.2/lisp/gnus/rfc2104.elc differ
Binary files src-21.1/lisp/gnus/rfc2231.elc and src-21.2/lisp/gnus/rfc2231.elc differ
Binary files src-21.1/lisp/gnus/score-mode.elc and src-21.2/lisp/gnus/score-mode.elc differ
Binary files src-21.1/lisp/gnus/smiley-ems.elc and src-21.2/lisp/gnus/smiley-ems.elc differ
Binary files src-21.1/lisp/gnus/starttls.elc and src-21.2/lisp/gnus/starttls.elc differ
Binary files src-21.1/lisp/gnus/time-date.elc and src-21.2/lisp/gnus/time-date.elc differ
Binary files src-21.1/lisp/gnus/utf7.elc and src-21.2/lisp/gnus/utf7.elc differ
Binary files src-21.1/lisp/gnus/uudecode.elc and src-21.2/lisp/gnus/uudecode.elc differ
Binary files src-21.1/lisp/gnus/webmail.elc and src-21.2/lisp/gnus/webmail.elc differ
Binary files src-21.1/lisp/gs.elc and src-21.2/lisp/gs.elc differ
diff -ruN src-21.1/lisp/gud.el src-21.2/lisp/gud.el
--- src-21.1/lisp/gud.el	Tue Sep 11 20:28:22 2001
+++ src-21.2/lisp/gud.el	Wed Feb  6 12:47:25 2002
@@ -2335,9 +2335,9 @@
 (defun gud-refresh (&optional arg)
   "Fix up a possibly garbled display, and redraw the arrow."
   (interactive "P")
-  (recenter arg)
   (or gud-last-frame (setq gud-last-frame gud-last-last-frame))
-  (gud-display-frame))
+  (gud-display-frame)
+  (recenter arg))
 
 ;;; Code for parsing expressions out of C code.  The single entry point is
 ;;; find-c-expr, which tries to return an lvalue expression from around point.
Binary files src-21.1/lisp/gud.elc and src-21.2/lisp/gud.elc differ
Binary files src-21.1/lisp/help-macro.elc and src-21.2/lisp/help-macro.elc differ
Binary files src-21.1/lisp/help.elc and src-21.2/lisp/help.elc differ
Binary files src-21.1/lisp/hexl.elc and src-21.2/lisp/hexl.elc differ
diff -ruN src-21.1/lisp/hi-lock.el src-21.2/lisp/hi-lock.el
--- src-21.1/lisp/hi-lock.el	Fri Aug 31 19:51:52 2001
+++ src-21.2/lisp/hi-lock.el	Sat Feb  2 15:47:38 2002
@@ -537,21 +537,22 @@
     (let ((all-patterns nil)
           (target-regexp (concat "\\<" hi-lock-file-patterns-prefix ":")))
       (save-excursion
-        (widen)
-        (goto-char (point-min))
-        (re-search-forward target-regexp
-                           (+ (point) hi-lock-file-patterns-range) t)
-        (beginning-of-line)
-        (while (and (re-search-forward target-regexp (+ (point) 100) t)
-		    (not (looking-at "\\s-*end")))
-          (let ((patterns
-		 (condition-case nil
-		     (read (current-buffer))
-		   (error  (message
-			    (format "Could not read expression at %d"
-				    (hi-lock-current-line))) nil))))
-            (if patterns
-                (setq all-patterns (append patterns all-patterns))))))
+	(save-restriction
+	  (widen)
+	  (goto-char (point-min))
+	  (re-search-forward target-regexp
+			     (+ (point) hi-lock-file-patterns-range) t)
+	  (beginning-of-line)
+	  (while (and (re-search-forward target-regexp (+ (point) 100) t)
+		      (not (looking-at "\\s-*end")))
+	    (let ((patterns
+		   (condition-case nil
+		       (read (current-buffer))
+		     (error  (message
+			      (format "Could not read expression at %d"
+				      (hi-lock-current-line))) nil))))
+	      (if patterns
+		  (setq all-patterns (append patterns all-patterns)))))))
       (when hi-lock-mode (hi-lock-set-file-patterns all-patterns))
       (if (interactive-p)
         (message (format "Hi-lock added %d patterns." (length all-patterns)))))))
Binary files src-21.1/lisp/hi-lock.elc and src-21.2/lisp/hi-lock.elc differ
Binary files src-21.1/lisp/hilit-chg.elc and src-21.2/lisp/hilit-chg.elc differ
Binary files src-21.1/lisp/hippie-exp.elc and src-21.2/lisp/hippie-exp.elc differ
Binary files src-21.1/lisp/hl-line.elc and src-21.2/lisp/hl-line.elc differ
Binary files src-21.1/lisp/icomplete.elc and src-21.2/lisp/icomplete.elc differ
Binary files src-21.1/lisp/ielm.elc and src-21.2/lisp/ielm.elc differ
Binary files src-21.1/lisp/image-file.elc and src-21.2/lisp/image-file.elc differ
diff -ruN src-21.1/lisp/image.el src-21.2/lisp/image.el
--- src-21.1/lisp/image.el	Tue Aug 21 10:11:52 2001
+++ src-21.2/lisp/image.el	Wed Mar 13 20:51:42 2002
@@ -97,6 +97,7 @@
     (setq file (expand-file-name file data-directory)))
   (setq file (expand-file-name file))
   (let ((header (with-temp-buffer
+		  (set-buffer-multibyte nil)
 		  (insert-file-contents-literally file nil 0 256)
 		  (buffer-string))))
     (image-type-from-data header)))
Binary files src-21.1/lisp/image.elc and src-21.2/lisp/image.elc differ
Binary files src-21.1/lisp/imenu.elc and src-21.2/lisp/imenu.elc differ
diff -ruN src-21.1/lisp/indent.el src-21.2/lisp/indent.el
--- src-21.1/lisp/indent.el	Fri Jun 22 13:46:52 2001
+++ src-21.2/lisp/indent.el	Sun Dec  2 04:56:26 2001
@@ -468,8 +468,7 @@
       (setq tabs (cdr tabs)))
     (if tabs
 	(let ((opoint (point)))
-	  (skip-chars-backward " \t")
-	  (delete-region (point) opoint)
+	  (delete-horizontal-space t)
 	  (indent-to (car tabs)))
       (insert ?\ ))))
 
Binary files src-21.1/lisp/indent.elc and src-21.2/lisp/indent.elc differ
Binary files src-21.1/lisp/info-look.elc and src-21.2/lisp/info-look.elc differ
diff -ruN src-21.1/lisp/info.el src-21.2/lisp/info.el
--- src-21.1/lisp/info.el	Wed Sep 26 17:40:48 2001
+++ src-21.2/lisp/info.el	Fri Dec 21 20:08:17 2001
@@ -1000,7 +1000,8 @@
 	(if Info-fontify (Info-fontify-node))
 	(if Info-use-header-line
 	    (Info-setup-header-line)
-	  (setq Info-header-line nil))
+	  (setq Info-header-line nil)
+	  (setq header-line-format nil)) ; so the header line isn't displayed
 	(run-hooks 'Info-selection-hook)))))
 
 (defun Info-set-mode-line ()
@@ -2573,15 +2574,24 @@
 				 'help-echo
 				 (concat "Go to node "
 					 (buffer-substring nbeg nend)))
-	      (let ((fun (cdr (assoc tag '(("Prev" . Info-prev)
-					   ("Next" . Info-next)
-					   ("Up" . Info-up))))))
-		(when fun
-		  (let ((keymap (make-sparse-keymap)))
-		    (define-key keymap [header-line mouse-1] fun)
-		    (define-key keymap [header-line mouse-2] fun)
-		    (put-text-property tbeg nend 'local-map keymap))))
-	      ))))
+		;; Don't bind mouse events on the header line if we
+		;; aren't going to display the header line.
+		(when Info-use-header-line
+		  (let ((fun (cdr (assoc tag '(("Prev" . Info-prev)
+					       ("Next" . Info-next)
+					       ("Up" . Info-up))))))
+		    (when fun
+		      (let ((keymap (make-sparse-keymap)))
+			(define-key keymap [header-line down-mouse-1] fun)
+			(define-key keymap [header-line down-mouse-2] fun)
+			(put-text-property tbeg nend 'local-map keymap)))))
+		(if (not Info-use-header-line)
+		    ;; In case they switched Info-use-header-line off
+		    ;; in the middle of an Info session, some text
+		    ;; properties may have been left lying around from
+		    ;; past visits of this node.  Remove them.
+		    (remove-text-properties tbeg nend '(local-map nil)))
+		  ))))
       (goto-char (point-min))
       (while (re-search-forward "\n\\([^ \t\n].+\\)\n\\(\\*+\\|=+\\|-+\\|\\.+\\)$"
 				nil t)
Binary files src-21.1/lisp/info.elc and src-21.2/lisp/info.elc differ
Binary files src-21.1/lisp/informat.elc and src-21.2/lisp/informat.elc differ
Binary files src-21.1/lisp/international/ccl.elc and src-21.2/lisp/international/ccl.elc differ
Binary files src-21.1/lisp/international/characters.elc and src-21.2/lisp/international/characters.elc differ
Binary files src-21.1/lisp/international/codepage.elc and src-21.2/lisp/international/codepage.elc differ
diff -ruN src-21.1/lisp/international/encoded-kb.el src-21.2/lisp/international/encoded-kb.el
--- src-21.1/lisp/international/encoded-kb.el	Sun Jul 15 21:53:53 2001
+++ src-21.2/lisp/international/encoded-kb.el	Wed Nov 21 11:54:31 2001
@@ -28,12 +28,12 @@
   "Non-nil if in Encoded-kbd minor mode.")
 (put 'encoded-kbd-mode 'permanent-local t)
 
-(let ((slot (assq 'encoded-kbd-mode minor-mode-alist))
-      (name " Encoded-kbd"))
-  (if slot
-      (setcar (cdr slot) name)
-    (setq minor-mode-alist
-	  (cons '(encoded-kbd-mode " Encoded-kbd") minor-mode-alist))))
+;;; (let ((slot (assq 'encoded-kbd-mode minor-mode-alist))
+;;;       (name " Encoded-kbd"))
+;;;   (if slot
+;;;       (setcar (cdr slot) name)
+;;;     (setq minor-mode-alist
+;;; 	  (cons '(encoded-kbd-mode " Encoded-kbd") minor-mode-alist))))
 
 (defconst encoded-kbd-mode-map (make-sparse-keymap)
   "Keymap for Encoded-kbd minor mode.")
Binary files src-21.1/lisp/international/encoded-kb.elc and src-21.2/lisp/international/encoded-kb.elc differ
diff -ruN src-21.1/lisp/international/fontset.el src-21.2/lisp/international/fontset.el
--- src-21.1/lisp/international/fontset.el	Sun Jul 15 21:53:53 2001
+++ src-21.2/lisp/international/fontset.el	Wed Oct 24 13:07:58 2001
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
+;; Copyright (C) 2001 Free Software Foundation, Inc.
 
 ;; Keywords: mule, multilingual, fontset
 
@@ -303,6 +304,27 @@
 backward compatibility."
   (concat "-" (mapconcat (lambda (x) (or x "*")) fields "-")))
 
+
+(defun x-must-resolve-font-name (xlfd-fields)
+  "Like `x-resolve-font-name', but always return a font name.
+XLFD-FIELDS is a vector of XLFD (X Logical Font Description) fields.
+If no font matching XLFD-FIELDS is available, successively replace
+parts of the font name pattern with \"*\" until some font is found.
+Value is name of that font."
+  (let ((ascii-font nil) (index 0))
+    (while (and (null ascii-font) (<= index xlfd-regexp-encoding-subnum))
+      (let ((pattern (x-compose-font-name xlfd-fields)))
+	(condition-case nil
+	    (setq ascii-font (x-resolve-font-name pattern))
+	  (error
+	   (message "Warning: no fonts matching `%s' available" pattern)
+	   (aset xlfd-fields index "*")
+	   (setq index (1+ index))))))
+    (unless ascii-font
+      (error "No fonts founds"))
+    ascii-font))
+
+
 (defun x-complement-fontset-spec (xlfd-fields fontlist)
   "Complement FONTLIST for charsets based on XLFD-FIELDS and return it.
 XLFD-FIELDS is a vector of XLFD (X Logical Font Description) fields.
@@ -324,7 +346,7 @@
       ;; If font for ASCII is not specified, add it.
       (aset xlfd-fields xlfd-regexp-registry-subnum "iso8859")
       (aset xlfd-fields xlfd-regexp-encoding-subnum "1")
-      (setq ascii-font (x-resolve-font-name (x-compose-font-name xlfd-fields)))
+      (setq ascii-font (x-must-resolve-font-name xlfd-fields))
       (setq fontlist (cons (cons 'ascii ascii-font) fontlist)))
 
     ;; If the font for ASCII also supports the other charsets, and
Binary files src-21.1/lisp/international/fontset.elc and src-21.2/lisp/international/fontset.elc differ
Binary files src-21.1/lisp/international/isearch-x.elc and src-21.2/lisp/international/isearch-x.elc differ
diff -ruN src-21.1/lisp/international/iso-acc.el src-21.2/lisp/international/iso-acc.el
--- src-21.1/lisp/international/iso-acc.el	Thu Nov 18 17:36:39 1999
+++ src-21.2/lisp/international/iso-acc.el	Tue Oct 30 17:11:34 2001
@@ -1,6 +1,6 @@
 ;;; iso-acc.el --- minor mode providing electric accent keys
 
-;; Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1996, 2001 Free Software Foundation, Inc.
 
 ;; Author: Johan Vromans
 ;; Maintainer: FSF
@@ -318,8 +318,7 @@
 	     (+ iso-accents-insert-offset entry)
 	   entry))
       ;; Otherwise, advance and schedule the second key for execution.
-      (setq unread-command-events
-	    (cons (list second-char) unread-command-events))
+      (push second-char unread-command-events)
       (vector first-char))))
 
 ;; It is a matter of taste if you want the minor mode indicated
Binary files src-21.1/lisp/international/iso-acc.elc and src-21.2/lisp/international/iso-acc.elc differ
Binary files src-21.1/lisp/international/iso-ascii.elc and src-21.2/lisp/international/iso-ascii.elc differ
Binary files src-21.1/lisp/international/iso-cvt.elc and src-21.2/lisp/international/iso-cvt.elc differ
Binary files src-21.1/lisp/international/iso-insert.elc and src-21.2/lisp/international/iso-insert.elc differ
Binary files src-21.1/lisp/international/iso-swed.elc and src-21.2/lisp/international/iso-swed.elc differ
Binary files src-21.1/lisp/international/iso-transl.elc and src-21.2/lisp/international/iso-transl.elc differ
Binary files src-21.1/lisp/international/ja-dic-cnv.elc and src-21.2/lisp/international/ja-dic-cnv.elc differ
Binary files src-21.1/lisp/international/ja-dic-utl.elc and src-21.2/lisp/international/ja-dic-utl.elc differ
Binary files src-21.1/lisp/international/kinsoku.elc and src-21.2/lisp/international/kinsoku.elc differ
Binary files src-21.1/lisp/international/kkc.elc and src-21.2/lisp/international/kkc.elc differ
Binary files src-21.1/lisp/international/latin1-disp.elc and src-21.2/lisp/international/latin1-disp.elc differ
diff -ruN src-21.1/lisp/international/mule-cmds.el src-21.2/lisp/international/mule-cmds.el
--- src-21.1/lisp/international/mule-cmds.el	Sun Jul 15 21:53:53 2001
+++ src-21.2/lisp/international/mule-cmds.el	Wed Oct 31 23:45:52 2001
@@ -1822,6 +1822,8 @@
     ("sp" . "Latin-5") ; Serbian (Cyrillic alphabet), e.g. X11R6.4
     ("su" . "Latin-1") ; Finnish, e.g. Solaris 2.6
     ("jp" . "Japanese") ; e.g. MS Windows
+    ("chs" . "Chinese-GB") ; MS Windows Chinese Simplified
+    ("cht" . "Chinese-BIG5") ; MS Windows Chinese Traditional
     )
   "List of pairs of locale regexps and language names.
 The first element whose locale regexp matches the start of a downcased locale
Binary files src-21.1/lisp/international/mule-cmds.elc and src-21.2/lisp/international/mule-cmds.elc differ
diff -ruN src-21.1/lisp/international/mule-conf.el src-21.2/lisp/international/mule-conf.el
--- src-21.1/lisp/international/mule-conf.el	Fri Mar  9 01:27:36 2001
+++ src-21.2/lisp/international/mule-conf.el	Wed Mar 13 20:51:55 2002
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
+;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -404,6 +405,189 @@
 
 (define-coding-system-alias 'x-ctext 'compound-text)
 (define-coding-system-alias 'ctext 'compound-text)
+
+;; Same as compound-text, but doesn't produce composition escape
+;; sequences.  Used in post-read and pre-write conversions of
+;; ctext-with-extensions, below.  Note that this should not have a
+;; mime-charset property, to prevent it from showing up close to the
+;; beginning of coding systems ordered by priority.
+(make-coding-system
+ 'ctext-no-compositions 2 ?x
+ "Compound text based generic encoding for decoding unknown messages.
+
+Like `compound-text', but does not produce escape sequences for compositions."
+ '((ascii t) (latin-iso8859-1 katakana-jisx0201 t) t t
+   nil ascii-eol ascii-cntl nil locking-shift single-shift nil nil nil
+   init-bol nil nil)
+ '((safe-charsets . t)))
+
+(defvar non-standard-icccm-encodings-alist
+  '(("ISO8859-15" . latin-iso8859-15)
+    ("ISO8859-14" . latin-iso8859-14)
+    ("KOI8-R" . koi8-r)
+    ("BIG5-0" . big5))
+  "Alist of font charset names defined by XLFD, and the corresponding Emacs
+charsets or coding systems.")
+
+;; Functions to support "Non-Standard Character Set Encodings" defined
+;; by the ICCCM spec.  We support that by converting the leading
+;; sequence of the ``extended segment'' to the corresponding ISO-2022
+;; sequences (if the leading sequence names an Emacs charset), or decode
+;; the segment (if it names a coding system).  Encoding does the reverse.
+(defun ctext-post-read-conversion (len)
+  "Decode LEN characters encoded as Compound Text with Extended Segments."
+  (buffer-disable-undo)	; minimize consing due to insertions and deletions
+  (narrow-to-region (point) (+ (point) len))
+  (save-match-data
+    (let ((pt (point-marker))
+	  (oldpt (point-marker))
+	  (newpt (make-marker))
+	  (modified-p (buffer-modified-p))
+	  (case-fold-search nil)
+	  last-coding-system-used
+	  encoding textlen chset)
+      (while (re-search-forward
+	      "\\(\e\\)%/[0-4]\\([\200-\377][\200-\377]\\)\\([^\002]+\\)\002"
+	      nil 'move)
+	(set-marker newpt (point))
+	(set-marker pt (match-beginning 0))
+	(setq encoding (match-string 3))
+	(setq textlen (- (+ (* (- (aref (match-string 2) 0) 128) 128)
+			    (- (aref (match-string 2) 1) 128))
+			 (1+ (length encoding))))
+	(setq
+	 chset (cdr (assoc-ignore-case encoding
+				       non-standard-icccm-encodings-alist)))
+	(cond ((null chset)
+	       ;; This charset is not supported--leave this extended
+	       ;; segment unaltered and skip over it.
+	       (goto-char (+ (point) textlen)))
+	      ((charsetp chset)
+	     ;; If it's a charset, replace the leading escape sequence
+	     ;; with a standard ISO-2022 sequence.  We will decode all
+	      ;; such segments later, in one go, when we exit the loop
+	       ;; or find an extended segment that names a coding
+	       ;; system, not a charset.
+	       (replace-match
+		(concat "\\1"
+			(if (= 0 (charset-iso-graphic-plane chset))
+			    ;; GL charsets
+			    (if (= 1 (charset-dimension chset)) "(" "$(")
+			  ;; GR charsets
+			  (if (= 96 (charset-chars chset))
+			      "-"
+			    (if (= 1 (charset-dimension chset)) ")" "$)")))
+			(string (charset-iso-final-char chset)))
+		t)
+	       (goto-char (+ (point) textlen)))
+	      ((coding-system-p chset)
+	     ;; If it's a coding system, we need to decode the segment
+	       ;; right away.  But first, decode what we've skipped
+	       ;; across until now.
+	       (when (> pt oldpt)
+		 (decode-coding-region oldpt pt 'ctext-no-compositions))
+	       (delete-region pt newpt)
+	       (set-marker newpt (+ newpt textlen))
+	       (decode-coding-region pt newpt chset)
+	       (goto-char newpt)
+	       (set-marker oldpt newpt))))
+      ;; Decode what's left.
+      (when (> (point) oldpt)
+	(decode-coding-region oldpt (point) 'ctext-no-compositions))
+     ;; This buffer started as unibyte, because the string we get from
+      ;; the X selection is a unibyte string.  We must now make it
+      ;; multibyte, so that the decoded text is inserted as multibyte
+      ;; into its buffer.
+      (set-buffer-multibyte t)
+      (set-buffer-modified-p modified-p)
+      (- (point-max) (point-min)))))
+
+(defvar non-standard-designations-alist
+  '(("$(0" . (big5 "big5-0" 2))
+    ("$(1" . (big5 "big5-0" 2))
+    ("-V"  . (t "iso8859-10" 1))
+    ("-Y"  . (t "iso8859-13" 1))
+    ("-_"  . (t "iso8859-14" 1))
+    ("-b"  . (t "iso8859-15" 1))
+    ("-f"  . (t "iso8859-16" 1)))
+  "Alist of ctext control sequences that introduce character sets which
+are not in the list of approved ICCCM encodings, and the corresponding
+coding system, identifier string, and number of octets per encoded
+character.
+
+Each element has the form (CTLSEQ . (ENCODING CHARSET NOCTETS)).  CTLSEQ
+is the control sequence (sans the leading ESC) that introduces the character
+set in the text encoded by compound-text.  ENCODING is a coding system
+symbol; if it is t, it means that the ctext coding system already encodes
+the text correctly, and only the leading control sequence needs to be altered.
+If ENCODING is a coding system, we need to re-encode the text with that
+coding system.  CHARSET is the ICCCM name of the charset we need to put into
+the leading control sequence.  NOCTETS is the number of octets (bytes) that
+encode each character in this charset.  NOCTETS can be 0 (meaning the number
+of octets per character is variable), 1, 2, 3, or 4.")
+
+(defun ctext-pre-write-conversion (from to)
+  "Encode characters between FROM and TO as Compound Text w/Extended Segments."
+  (buffer-disable-undo)	; minimize consing due to insertions and deletions
+  (narrow-to-region from to)
+  (encode-coding-region from to 'ctext-no-compositions)
+  ;; Replace ISO-2022 charset designations with extended segments, for
+  ;; those charsets that are not part of the official X registry.
+  (save-match-data
+    (goto-char (point-min))
+    (let ((newpt (make-marker))
+	  (case-fold-search nil)
+	  pt desig encode-info encoding chset noctets textlen)
+      (set-buffer-multibyte nil)
+      (while (re-search-forward "\e\\(\$([01]\\|-[VY_bf]\\)" nil 'move)
+	(setq desig (match-string 1)
+	      pt (point-marker)
+	      encode-info (cdr (assoc desig non-standard-designations-alist))
+	      encoding (car encode-info)
+	      chset (cadr encode-info)
+	      noctets (car (cddr encode-info)))
+	(skip-chars-forward "^\e")
+	(set-marker newpt (point))
+	(cond
+	 ((eq encoding t)  ; only the leading sequence needs to be changed
+	  (setq textlen (+ (- newpt pt) (length chset) 1))
+	  (replace-match (format "\e%%/%d%c%c%s"
+				 noctets
+				 (+ (/ textlen 128) 128)
+				 (+ (% textlen 128) 128)
+				 chset)
+			 t t))
+	 ((coding-system-p encoding) ; need to recode the entire segment...
+	  (set-marker pt (match-beginning 0))
+	  (decode-coding-region pt newpt 'ctext-no-compositions)
+	  (set-buffer-multibyte t)
+	  (encode-coding-region pt newpt encoding)
+	  (set-buffer-multibyte nil)
+	  (setq textlen (+ (- newpt pt) (length chset) 1))
+	  (goto-char pt)
+	  (insert (format "\e%%/%d%c%c%s"
+			  noctets
+			  (+ (/ textlen 128) 128)
+			  (+ (% textlen 128) 128)
+			  chset))))
+	(goto-char newpt))))
+  (set-buffer-multibyte t)
+  nil)
+
+(make-coding-system
+ 'compound-text-with-extensions 5 ?x
+ "Compound text encoding with ICCCM Extended Segment extensions.
+
+This coding system should be used only for X selections.  It is inappropriate
+for decoding and encoding files, process I/O, etc."
+ nil
+ '((post-read-conversion . ctext-post-read-conversion)
+   (pre-write-conversion . ctext-pre-write-conversion)))
+
+(define-coding-system-alias
+  'x-ctext-with-extensions 'compound-text-with-extensions)
+(define-coding-system-alias
+  'ctext-with-extensions 'compound-text-with-extensions)
 
 (make-coding-system
  'iso-safe 2 ?-
Binary files src-21.1/lisp/international/mule-diag.elc and src-21.2/lisp/international/mule-diag.elc differ
Binary files src-21.1/lisp/international/mule-util.elc and src-21.2/lisp/international/mule-util.elc differ
diff -ruN src-21.1/lisp/international/mule.el src-21.2/lisp/international/mule.el
--- src-21.1/lisp/international/mule.el	Mon Oct 15 10:44:28 2001
+++ src-21.2/lisp/international/mule.el	Thu Nov 29 13:16:43 2001
@@ -536,21 +536,77 @@
 	  (setq tail (cdr tail)))))
     codings))
 
+(defun map-charset-chars (func charset)
+  "Use FUNC to map over all characters in CHARSET for side effects.
+FUNC is a function of two args, the start and end (inclusive) of a
+character code range.  Thus FUNC should iterate over [START, END]."
+  (let* ((dim (charset-dimension charset))
+	 (chars (charset-chars charset))
+	 (start (if (= chars 94)
+		    33
+		  32)))
+    (if (= dim 1)
+	(funcall func
+		 (make-char charset start)
+		 (make-char charset (+ start chars -1)))
+      (dotimes (i chars)
+	(funcall func
+		 (make-char charset (+ i start) start)
+		 (make-char charset (+ i start) (+ start chars -1)))))))
+
 (defun register-char-codings (coding-system safe-chars)
-  (let ((general (char-table-extra-slot char-coding-system-table 0)))
+  "Add entries for CODING-SYSTEM to `char-coding-system-table'.
+If SAFE-CHARS is a char-table, its non-nil entries specify characters
+which CODING-SYSTEM encodes safely.  If SAFE-CHARS is t, register
+CODING-SYSTEM as a general one which can encode all characters."
+  (let ((general (char-table-extra-slot char-coding-system-table 0))
+	;; Charsets which have some members in the table, but not all
+	;; of them (i.e. not just a generic character):
+	(partials (char-table-extra-slot char-coding-system-table 1)))
     (if (eq safe-chars t)
 	(or (memq coding-system general)
 	    (set-char-table-extra-slot char-coding-system-table 0
 				       (cons coding-system general)))
       (map-char-table
-       (function
-	(lambda (key val)
-	  (if (and (>= key 128) val)
-	      (let ((codings (aref char-coding-system-table key)))
-		(or (memq coding-system codings)
-		    (aset char-coding-system-table key
-			  (cons coding-system codings)))))))
-       safe-chars))))
+       (lambda (key val)
+	 (if (and (>= key 128) val)
+	     (let ((codings (aref char-coding-system-table key))
+		   (charset (char-charset key)))
+	       (unless (memq coding-system codings)
+		 (if (and (generic-char-p key)
+			  (memq charset partials))
+		     ;; The generic char would clobber individual
+		     ;; entries already in the table.  First save the
+		     ;; separate existing entries for all chars of the
+		     ;; charset (with the generic entry added, if
+		     ;; necessary).
+		     (let (entry existing)
+		       (map-charset-chars
+			(lambda (start end)
+			  (while (<= start end)
+			    (setq entry (aref char-coding-system-table start))
+			    (when entry
+			      (push (cons
+				     start
+				     (if (memq coding-system entry)
+					 entry
+				       (cons coding-system entry)))
+				    existing))
+			    (setq start (1+ start))))
+			charset)
+		       ;; Update the generic entry.
+		       (aset char-coding-system-table key
+			     (cons coding-system codings))
+		       ;; Override with the saved entries.
+		       (dolist (elt existing)
+			 (aset char-coding-system-table (car elt) (cdr elt))))
+		   (aset char-coding-system-table key
+			 (cons coding-system codings))
+		   (unless (or (memq charset partials)
+			       (generic-char-p key))
+		     (push charset partials)))))))
+       safe-chars)
+      (set-char-table-extra-slot char-coding-system-table 1 partials))))
 
 
 (defun make-subsidiary-coding-system (coding-system)
@@ -1535,14 +1591,14 @@
 
 (defun make-translation-table (&rest args)
   "Make a translation table from arguments.
-A translation table is a char table intended for for character
+A translation table is a char table intended for character
 translation in CCL programs.
 
-Each argument is a list of elemnts of the form (FROM . TO), where FROM
+Each argument is a list of elements of the form (FROM . TO), where FROM
 is a character to be translated to TO.
 
 FROM can be a generic character (see `make-char').  In this case, TO is
-a generic character containing the same number of characters, or a
+a generic character containing the same number of characters, or an
 ordinary character.  If FROM and TO are both generic characters, all
 characters belonging to FROM are translated to characters belonging to TO
 without changing their position code(s).
Binary files src-21.1/lisp/international/mule.elc and src-21.2/lisp/international/mule.elc differ
Binary files src-21.1/lisp/international/ogonek.elc and src-21.2/lisp/international/ogonek.elc differ
diff -ruN src-21.1/lisp/international/quail.el src-21.2/lisp/international/quail.el
--- src-21.1/lisp/international/quail.el	Wed Sep  5 14:01:51 2001
+++ src-21.2/lisp/international/quail.el	Mon Jan 28 17:32:52 2002
@@ -1340,7 +1340,8 @@
 	     (overriding-terminal-local-map (quail-translation-keymap))
 	     (generated-events nil)
 	     (input-method-function nil)
-	     (modified-p (buffer-modified-p)))
+	     (modified-p (buffer-modified-p))
+	     last-command-event last-command this-command)
 	(setq quail-current-key ""
 	      quail-current-str ""
 	      quail-translating t)
@@ -1357,9 +1358,10 @@
 	    (if (if key
 		    (and (commandp cmd) (not (eq cmd 'quail-other-command)))
 		  (eq cmd 'quail-self-insert-command))
-		(let ((last-command-event (aref keyseq (1- (length keyseq))))
-		      (last-command this-command)
-		      (this-command cmd))
+		(progn
+		  (setq last-command-event (aref keyseq (1- (length keyseq)))
+			last-command this-command
+			this-command cmd)
 		  (setq key t)
 		  (condition-case err
 		      (call-interactively cmd)
@@ -1394,7 +1396,8 @@
 	     (overriding-terminal-local-map (quail-conversion-keymap))
 	     (generated-events nil)
 	     (input-method-function nil)
-	     (modified-p (buffer-modified-p)))
+	     (modified-p (buffer-modified-p))
+	     last-command-event last-command this-command)
 	(setq quail-current-key ""
 	      quail-current-str ""
 	      quail-translating t
@@ -1420,9 +1423,10 @@
 			  nil nil t))
 		 (cmd (lookup-key (quail-conversion-keymap) keyseq)))
 	    (if (if key (commandp cmd) (eq cmd 'quail-self-insert-command))
-		(let ((last-command-event (aref keyseq (1- (length keyseq))))
-		      (last-command this-command)
-		      (this-command cmd))
+		(progn
+		  (setq last-command-event (aref keyseq (1- (length keyseq)))
+			last-command this-command
+			this-command cmd)
 		  (setq key t)
 		  (condition-case err
 		      (call-interactively cmd)
Binary files src-21.1/lisp/international/quail.elc and src-21.2/lisp/international/quail.elc differ
Binary files src-21.1/lisp/international/swedish.elc and src-21.2/lisp/international/swedish.elc differ
Binary files src-21.1/lisp/international/titdic-cnv.elc and src-21.2/lisp/international/titdic-cnv.elc differ
Binary files src-21.1/lisp/international/utf-8.elc and src-21.2/lisp/international/utf-8.elc differ
Binary files src-21.1/lisp/isearch.elc and src-21.2/lisp/isearch.elc differ
Binary files src-21.1/lisp/iswitchb.elc and src-21.2/lisp/iswitchb.elc differ
Binary files src-21.1/lisp/jit-lock.elc and src-21.2/lisp/jit-lock.elc differ
Binary files src-21.1/lisp/jka-compr.elc and src-21.2/lisp/jka-compr.elc differ
Binary files src-21.1/lisp/kermit.elc and src-21.2/lisp/kermit.elc differ
Binary files src-21.1/lisp/language/china-util.elc and src-21.2/lisp/language/china-util.elc differ
Binary files src-21.1/lisp/language/chinese.elc and src-21.2/lisp/language/chinese.elc differ
Binary files src-21.1/lisp/language/cyril-util.elc and src-21.2/lisp/language/cyril-util.elc differ
Binary files src-21.1/lisp/language/cyrillic.elc and src-21.2/lisp/language/cyrillic.elc differ
Binary files src-21.1/lisp/language/czech.elc and src-21.2/lisp/language/czech.elc differ
Binary files src-21.1/lisp/language/devan-util.elc and src-21.2/lisp/language/devan-util.elc differ
Binary files src-21.1/lisp/language/devanagari.elc and src-21.2/lisp/language/devanagari.elc differ
Binary files src-21.1/lisp/language/english.elc and src-21.2/lisp/language/english.elc differ
Binary files src-21.1/lisp/language/ethio-util.elc and src-21.2/lisp/language/ethio-util.elc differ
Binary files src-21.1/lisp/language/ethiopic.elc and src-21.2/lisp/language/ethiopic.elc differ
diff -ruN src-21.1/lisp/language/european.el src-21.2/lisp/language/european.el
--- src-21.1/lisp/language/european.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/language/european.el	Wed Mar 13 20:51:55 2002
@@ -306,7 +306,7 @@
 	   (sample-text . "Er is een aantal manieren waarop je dit kan doen")
 	   (documentation . "\
 This language environment is almost the same as Latin-1,
-but select's the Dutch tutorial."))
+but it selects the Dutch tutorial."))
  '("European"))
 
 ;; For Turkish, the character set ISO-8859-9 (Latin-5) is used.  But,
@@ -522,8 +522,8 @@
 (make-coding-system
  'mac-roman 4 ?M "Mac Roman Encoding"
  '(decode-mac-roman . encode-mac-roman)
- '((safe-chars . mac-roman-encoder)
-   (valid-codes (0 . 255))))
+ (list (cons 'safe-chars (get 'mac-roman-encoder 'translation-table))
+       '(valid-codes (0 . 255))))
 
 (provide 'european)
 
Binary files src-21.1/lisp/language/european.elc and src-21.2/lisp/language/european.elc differ
Binary files src-21.1/lisp/language/greek.elc and src-21.2/lisp/language/greek.elc differ
Binary files src-21.1/lisp/language/hebrew.elc and src-21.2/lisp/language/hebrew.elc differ
Binary files src-21.1/lisp/language/indian.elc and src-21.2/lisp/language/indian.elc differ
Binary files src-21.1/lisp/language/japan-util.elc and src-21.2/lisp/language/japan-util.elc differ
diff -ruN src-21.1/lisp/language/japanese.el src-21.2/lisp/language/japanese.el
--- src-21.1/lisp/language/japanese.el	Sun Jul 15 21:53:53 2001
+++ src-21.2/lisp/language/japanese.el	Wed Mar 13 20:51:55 2002
@@ -48,7 +48,7 @@
 	  latin-jisx0201 japanese-jisx0212
 	  chinese-gb2312 korean-ksc5601) nil
 	  (nil latin-iso8859-1 greek-iso8859-7) nil
- short ascii-eol ascii-cntl seven nil single-shift)
+ short ascii-eol ascii-cntl seven nil single-shift nil nil nil init-bol)
  '((safe-charsets ascii japanese-jisx0208-1978 japanese-jisx0208
 		  latin-jisx0201 japanese-jisx0212
 		  chinese-gb2312 korean-ksc5601
Binary files src-21.1/lisp/language/japanese.elc and src-21.2/lisp/language/japanese.elc differ
Binary files src-21.1/lisp/language/korea-util.elc and src-21.2/lisp/language/korea-util.elc differ
Binary files src-21.1/lisp/language/korean.elc and src-21.2/lisp/language/korean.elc differ
Binary files src-21.1/lisp/language/lao-util.elc and src-21.2/lisp/language/lao-util.elc differ
Binary files src-21.1/lisp/language/lao.elc and src-21.2/lisp/language/lao.elc differ
Binary files src-21.1/lisp/language/misc-lang.elc and src-21.2/lisp/language/misc-lang.elc differ
Binary files src-21.1/lisp/language/romanian.elc and src-21.2/lisp/language/romanian.elc differ
Binary files src-21.1/lisp/language/slovak.elc and src-21.2/lisp/language/slovak.elc differ
Binary files src-21.1/lisp/language/thai-util.elc and src-21.2/lisp/language/thai-util.elc differ
Binary files src-21.1/lisp/language/thai.elc and src-21.2/lisp/language/thai.elc differ
Binary files src-21.1/lisp/language/tibet-util.elc and src-21.2/lisp/language/tibet-util.elc differ
Binary files src-21.1/lisp/language/tibetan.elc and src-21.2/lisp/language/tibetan.elc differ
Binary files src-21.1/lisp/language/viet-util.elc and src-21.2/lisp/language/viet-util.elc differ
Binary files src-21.1/lisp/language/vietnamese.elc and src-21.2/lisp/language/vietnamese.elc differ
Binary files src-21.1/lisp/lazy-lock.elc and src-21.2/lisp/lazy-lock.elc differ
Binary files src-21.1/lisp/ledit.elc and src-21.2/lisp/ledit.elc differ
diff -ruN src-21.1/lisp/loaddefs.el src-21.2/lisp/loaddefs.el
--- src-21.1/lisp/loaddefs.el	Fri Oct 19 16:31:14 2001
+++ src-21.2/lisp/loaddefs.el	Sat Mar 16 12:38:13 2002
@@ -52,7 +52,7 @@
 ;;;***
 
 ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el"
-;;;;;;  (15187 6160))
+;;;;;;  (15347 60264))
 ;;; Generated autoloads from progmodes/ada-mode.el
 
 (autoload (quote ada-add-extensions) "ada-mode" "\
@@ -217,8 +217,8 @@
 ;;;***
 
 ;;;### (autoloads (defadvice ad-add-advice ad-default-compilation-action
-;;;;;;  ad-redefinition-action) "advice" "emacs-lisp/advice.el" (15177
-;;;;;;  44099))
+;;;;;;  ad-redefinition-action) "advice" "emacs-lisp/advice.el" (15384
+;;;;;;  23012))
 ;;; Generated autoloads from emacs-lisp/advice.el
 
 (defvar ad-redefinition-action (quote warn) "\
@@ -385,7 +385,7 @@
 ;;;***
 
 ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp"
-;;;;;;  "net/ange-ftp.el" (15290 12989))
+;;;;;;  "net/ange-ftp.el" (15478 8891))
 ;;; Generated autoloads from net/ange-ftp.el
  (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir)
 
@@ -666,8 +666,8 @@
 
 ;;;***
 
-;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (15187
-;;;;;;  6162))
+;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (15321
+;;;;;;  12873))
 ;;; Generated autoloads from textmodes/artist.el
 
 (autoload (quote artist-mode) "artist" "\
@@ -965,7 +965,7 @@
 ;;;***
 
 ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el"
-;;;;;;  (15187 6160))
+;;;;;;  (15327 25337))
 ;;; Generated autoloads from progmodes/autoconf.el
 
 (autoload (quote autoconf-mode) "autoconf" "\
@@ -1997,7 +1997,7 @@
 ;;;***
 
 ;;;### (autoloads (calculator) "calculator" "calculator.el" (15302
-;;;;;;  45505))
+;;;;;;  45573))
 ;;; Generated autoloads from calculator.el
 
 (autoload (quote calculator) "calculator" "\
@@ -2022,7 +2022,7 @@
 ;;;;;;  calendar-remove-frame-by-deleting mark-diary-entries-in-calendar
 ;;;;;;  number-of-diary-entries view-diary-entries-initially calendar-offset
 ;;;;;;  calendar-week-start-day) "calendar" "calendar/calendar.el"
-;;;;;;  (15288 19950))
+;;;;;;  (15445 32043))
 ;;; Generated autoloads from calendar/calendar.el
 
 (defvar calendar-week-start-day 0 "\
@@ -3293,7 +3293,7 @@
 ;;;### (autoloads (next-error compilation-minor-mode compilation-shell-minor-mode
 ;;;;;;  compilation-mode grep-find grep compile compilation-search-path
 ;;;;;;  compilation-ask-about-save compilation-window-height compilation-mode-hook)
-;;;;;;  "compile" "progmodes/compile.el" (15273 39392))
+;;;;;;  "compile" "progmodes/compile.el" (15402 16831))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -3697,7 +3697,7 @@
 ;;;***
 
 ;;;### (autoloads (cperl-mode) "cperl-mode" "progmodes/cperl-mode.el"
-;;;;;;  (15187 6160))
+;;;;;;  (15354 26268))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 
 (autoload (quote cperl-mode) "cperl-mode" "\
@@ -3948,7 +3948,7 @@
 ;;;;;;  customize-option-other-window customize-changed-options customize-option
 ;;;;;;  customize-group-other-window customize-group customize customize-save-variable
 ;;;;;;  customize-set-variable customize-set-value) "cus-edit" "cus-edit.el"
-;;;;;;  (15256 32347))
+;;;;;;  (15453 9604))
 ;;; Generated autoloads from cus-edit.el
  (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'")
 
@@ -4137,7 +4137,7 @@
 ;;;***
 
 ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode)
-;;;;;;  "cwarn" "progmodes/cwarn.el" (15187 6160))
+;;;;;;  "cwarn" "progmodes/cwarn.el" (15315 20658))
 ;;; Generated autoloads from progmodes/cwarn.el
 
 (autoload (quote cwarn-mode) "cwarn" "\
@@ -4477,8 +4477,8 @@
 
 ;;;***
 
-;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (15206
-;;;;;;  38953))
+;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (15445
+;;;;;;  32035))
 ;;; Generated autoloads from delsel.el
 
 (defalias (quote pending-delete-mode) (quote delete-selection-mode))
@@ -4549,7 +4549,7 @@
 ;;;***
 
 ;;;### (autoloads (desktop-load-default desktop-read) "desktop" "desktop.el"
-;;;;;;  (15224 61468))
+;;;;;;  (15317 30339))
 ;;; Generated autoloads from desktop.el
 
 (autoload (quote desktop-read) "desktop" "\
@@ -4683,7 +4683,7 @@
 ;;;***
 
 ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "diff-mode.el"
-;;;;;;  (15279 8859))
+;;;;;;  (15479 23172))
 ;;; Generated autoloads from diff-mode.el
 
 (autoload (quote diff-mode) "diff-mode" "\
@@ -5039,7 +5039,7 @@
 
 ;;;***
 
-;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (15245 914))
+;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (15325 16433))
 ;;; Generated autoloads from dired-x.el
 
 (autoload (quote dired-jump) "dired-x" "\
@@ -5175,7 +5175,7 @@
 
 ;;;***
 
-;;;### (autoloads (doctor) "doctor" "play/doctor.el" (15186 41423))
+;;;### (autoloads (doctor) "doctor" "play/doctor.el" (15317 38895))
 ;;; Generated autoloads from play/doctor.el
 
 (autoload (quote doctor) "doctor" "\
@@ -5224,7 +5224,7 @@
 
 ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap
 ;;;;;;  easy-mmode-define-global-mode define-minor-mode) "easy-mmode"
-;;;;;;  "emacs-lisp/easy-mmode.el" (15218 41924))
+;;;;;;  "emacs-lisp/easy-mmode.el" (15395 17213))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
 (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode))
@@ -5525,7 +5525,7 @@
 ;;;;;;  ebrowse-back-in-position-stack ebrowse-tags-search-member-use
 ;;;;;;  ebrowse-tags-query-replace ebrowse-tags-loop-continue ebrowse-tags-complete-symbol
 ;;;;;;  ebrowse-electric-choose-tree ebrowse-tree-mode) "ebrowse"
-;;;;;;  "progmodes/ebrowse.el" (15186 41424))
+;;;;;;  "progmodes/ebrowse.el" (15503 44516))
 ;;; Generated autoloads from progmodes/ebrowse.el
 
 (autoload (quote ebrowse-tree-mode) "ebrowse" "\
@@ -6123,7 +6123,7 @@
 ;;;***
 
 ;;;### (autoloads (encoded-kbd-mode) "encoded-kb" "international/encoded-kb.el"
-;;;;;;  (15186 41421))
+;;;;;;  (15355 34791))
 ;;; Generated autoloads from international/encoded-kb.el
 
 (autoload (quote encoded-kbd-mode) "encoded-kb" "\
@@ -6141,7 +6141,7 @@
 ;;;***
 
 ;;;### (autoloads (enriched-decode enriched-encode enriched-mode)
-;;;;;;  "enriched" "enriched.el" (14885 22378))
+;;;;;;  "enriched" "enriched.el" (15325 19202))
 ;;; Generated autoloads from enriched.el
 
 (autoload (quote enriched-mode) "enriched" "\
@@ -6219,7 +6219,7 @@
 ;;;;;;  find-tag find-tag-noselect tags-table-files visit-tags-table
 ;;;;;;  find-tag-default-function find-tag-hook tags-add-tables tags-compression-info-list
 ;;;;;;  tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el"
-;;;;;;  (15127 20500))
+;;;;;;  (15479 23181))
 ;;; Generated autoloads from progmodes/etags.el
 
 (defvar tags-file-name nil "\
@@ -6296,7 +6296,7 @@
 
 If third arg REGEXP-P is non-nil, treat TAGNAME as a regexp.
 
-A marker representing the point when this command is onvoked is pushed
+A marker representing the point when this command is invoked is pushed
 onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
@@ -6315,7 +6315,7 @@
 
 If third arg REGEXP-P is non-nil, treat TAGNAME as a regexp.
 
-A marker representing the point when this command is onvoked is pushed
+A marker representing the point when this command is invoked is pushed
 onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
@@ -6336,7 +6336,7 @@
 
 If third arg REGEXP-P is non-nil, treat TAGNAME as a regexp.
 
-A marker representing the point when this command is onvoked is pushed
+A marker representing the point when this command is invoked is pushed
 onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
@@ -6357,7 +6357,7 @@
 
 If third arg REGEXP-P is non-nil, treat TAGNAME as a regexp.
 
-A marker representing the point when this command is onvoked is pushed
+A marker representing the point when this command is invoked is pushed
 onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
@@ -6376,7 +6376,7 @@
 
 If third arg OTHER-WINDOW is non-nil, select the buffer in another window.
 
-A marker representing the point when this command is onvoked is pushed
+A marker representing the point when this command is invoked is pushed
 onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
@@ -6763,7 +6763,7 @@
 
 ;;;***
 
-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (14969 34760))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (15391 24168))
 ;;; Generated autoloads from progmodes/f90.el
 
 (autoload (quote f90-mode) "f90" "\
@@ -6998,7 +6998,7 @@
 
 ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue
 ;;;;;;  feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts
-;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (15283 1384))
+;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (15445 32053))
 ;;; Generated autoloads from mail/feedmail.el
 
 (autoload (quote feedmail-send-it) "feedmail" "\
@@ -7042,7 +7042,7 @@
 ;;;***
 
 ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu
-;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (15149 49403))
+;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (15478 8880))
 ;;; Generated autoloads from ffap.el
 
 (autoload (quote ffap-next) "ffap" "\
@@ -7105,7 +7105,7 @@
 ;;;***
 
 ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options
-;;;;;;  find-ls-option) "find-dired" "find-dired.el" (15186 41418))
+;;;;;;  find-ls-option) "find-dired" "find-dired.el" (15403 54603))
 ;;; Generated autoloads from find-dired.el
 
 (defvar find-ls-option (if (eq system-type (quote berkeley-unix)) (quote ("-ls" . "-gilsb")) (quote ("-exec ls -ld {} \\;" . "-ld"))) "\
@@ -7481,7 +7481,7 @@
 
 ;;;### (autoloads (font-lock-fontify-buffer global-font-lock-mode
 ;;;;;;  font-lock-remove-keywords font-lock-add-keywords turn-on-font-lock
-;;;;;;  font-lock-mode) "font-lock" "font-lock.el" (15280 18506))
+;;;;;;  font-lock-mode) "font-lock" "font-lock.el" (15384 23111))
 ;;; Generated autoloads from font-lock.el
 
 (make-variable-buffer-local (quote font-lock-defaults))
@@ -7604,7 +7604,7 @@
 ;;;***
 
 ;;;### (autoloads (create-fontset-from-fontset-spec) "fontset" "international/fontset.el"
-;;;;;;  (15186 41421))
+;;;;;;  (15318 41230))
 ;;; Generated autoloads from international/fontset.el
 
 (autoload (quote create-fontset-from-fontset-spec) "fontset" "\
@@ -7676,7 +7676,7 @@
 ;;;***
 
 ;;;### (autoloads (fortran-mode fortran-tab-mode-default) "fortran"
-;;;;;;  "progmodes/fortran.el" (15187 6160))
+;;;;;;  "progmodes/fortran.el" (15366 8793))
 ;;; Generated autoloads from progmodes/fortran.el
 
 (defvar fortran-tab-mode-default nil "\
@@ -7854,7 +7854,7 @@
 ;;;***
 
 ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
-;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (15251 23588))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (15478 8888))
 ;;; Generated autoloads from gnus/gnus.el
 
 (autoload (quote gnus-slave-no-server) "gnus" "\
@@ -7912,7 +7912,7 @@
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (15271 15696))
+;;;;;;  (15478 8887))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload (quote gnus-article-prepare-display) "gnus-art" "\
@@ -7949,7 +7949,7 @@
 ;;;***
 
 ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group)
-;;;;;;  "gnus-group" "gnus/gnus-group.el" (14875 56834))
+;;;;;;  "gnus-group" "gnus/gnus-group.el" (15478 8887))
 ;;; Generated autoloads from gnus/gnus-group.el
 
 (autoload (quote gnus-fetch-group) "gnus-group" "\
@@ -7988,7 +7988,7 @@
 
 ;;;### (autoloads (gnus-group-split-fancy gnus-group-split gnus-group-split-update
 ;;;;;;  gnus-group-split-setup) "gnus-mlspl" "gnus/gnus-mlspl.el"
-;;;;;;  (15186 41421))
+;;;;;;  (15478 8887))
 ;;; Generated autoloads from gnus/gnus-mlspl.el
 
 (autoload (quote gnus-group-split-setup) "gnus-mlspl" "\
@@ -8027,8 +8027,8 @@
 gnus-group-split is a valid value for nnmail-split-methods." nil nil)
 
 (autoload (quote gnus-group-split-fancy) "gnus-mlspl" "\
-Uses information from group parameters in order to split mail.  It
-can be embedded into nnmail-split-fancy lists with the SPLIT
+Uses information from group parameters in order to split mail.
+It can be embedded into `nnmail-split-fancy' lists with the SPLIT
 
 \(: gnus-group-split-fancy GROUPS NO-CROSSPOST CATCH-ALL)
 
@@ -8089,8 +8089,8 @@
 
 ;;;***
 
-;;;### (autoloads (gnus-msg-mail) "gnus-msg" "gnus/gnus-msg.el" (14915
-;;;;;;  6802))
+;;;### (autoloads (gnus-msg-mail) "gnus-msg" "gnus/gnus-msg.el" (15478
+;;;;;;  8887))
 ;;; Generated autoloads from gnus/gnus-msg.el
 
 (autoload (quote gnus-msg-mail) "gnus-msg" "\
@@ -8146,7 +8146,7 @@
 ;;;***
 
 ;;;### (autoloads (gnus-declare-backend gnus-unload) "gnus-start"
-;;;;;;  "gnus/gnus-start.el" (15207 56831))
+;;;;;;  "gnus/gnus-start.el" (15457 6099))
 ;;; Generated autoloads from gnus/gnus-start.el
 
 (autoload (quote gnus-unload) "gnus-start" "\
@@ -8169,7 +8169,7 @@
 
 ;;;***
 
-;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (15149 49403))
+;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (15354 41911))
 ;;; Generated autoloads from play/gomoku.el
 
 (autoload (quote gomoku) "gomoku" "\
@@ -8227,7 +8227,7 @@
 ;;;***
 
 ;;;### (autoloads (jdb pdb perldb xdb dbx sdb gdb) "gud" "gud.el"
-;;;;;;  (15263 18995))
+;;;;;;  (15457 6093))
 ;;; Generated autoloads from gud.el
 
 (autoload (quote gdb) "gud" "\
@@ -8425,8 +8425,8 @@
 
 ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer
 ;;;;;;  hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer
-;;;;;;  hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" (15251
-;;;;;;  11795))
+;;;;;;  hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" (15451
+;;;;;;  64522))
 ;;; Generated autoloads from hi-lock.el
 
 (defgroup hi-lock-interactive-text-highlighting nil "Interactively add and remove font-lock patterns for highlighting text." :group (quote faces))
@@ -8914,7 +8914,7 @@
 ;;;***
 
 ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el"
-;;;;;;  (15187 6160))
+;;;;;;  (15368 55225))
 ;;; Generated autoloads from progmodes/idlw-shell.el
 
 (autoload (quote idlwave-shell) "idlw-shell" "\
@@ -8937,7 +8937,7 @@
 ;;;***
 
 ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el"
-;;;;;;  (15187 6160))
+;;;;;;  (15368 55225))
 ;;; Generated autoloads from progmodes/idlwave.el
 
 (autoload (quote idlwave-mode) "idlwave" "\
@@ -9067,7 +9067,7 @@
 
 ;;;### (autoloads (defimage find-image remove-images insert-image
 ;;;;;;  put-image create-image image-type-available-p image-type-from-file-header
-;;;;;;  image-type-from-data) "image" "image.el" (15234 6088))
+;;;;;;  image-type-from-data) "image" "image.el" (15503 44494))
 ;;; Generated autoloads from image.el
 
 (autoload (quote image-type-from-data) "image" "\
@@ -9417,7 +9417,7 @@
 
 ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node
 ;;;;;;  Info-goto-emacs-command-node Info-directory info-standalone
-;;;;;;  info info-other-window) "info" "info.el" (15281 63232))
+;;;;;;  info info-other-window) "info" "info.el" (15395 34977))
 ;;; Generated autoloads from info.el
 
 (autoload (quote info-other-window) "info" "\
@@ -9551,7 +9551,7 @@
 ;;;***
 
 ;;;### (autoloads (iso-accents-mode) "iso-acc" "international/iso-acc.el"
-;;;;;;  (14388 11031))
+;;;;;;  (15326 53558))
 ;;; Generated autoloads from international/iso-acc.el
 
 (autoload (quote iso-accents-mode) "iso-acc" "\
@@ -9642,7 +9642,7 @@
 ;;;***
 
 ;;;### (autoloads nil "iso-transl" "international/iso-transl.el"
-;;;;;;  (15300 31077))
+;;;;;;  (15300 31086))
 ;;; Generated autoloads from international/iso-transl.el
  (or key-translation-map (setq key-translation-map (make-sparse-keymap)))
  (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map)
@@ -9655,7 +9655,7 @@
 ;;;;;;  ispell-region ispell-change-dictionary ispell-kill-ispell
 ;;;;;;  ispell-help ispell-pdict-save ispell-word ispell-dictionary-alist
 ;;;;;;  ispell-local-dictionary-alist ispell-personal-dictionary)
-;;;;;;  "ispell" "textmodes/ispell.el" (15260 30414))
+;;;;;;  "ispell" "textmodes/ispell.el" (15445 32061))
 ;;; Generated autoloads from textmodes/ispell.el
 
 (defconst xemacsp (string-match "Lucid\\|XEmacs" emacs-version) "\
@@ -10115,7 +10115,7 @@
 ;;;***
 
 ;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el"
-;;;;;;  (15187 65192))
+;;;;;;  (15354 48777))
 ;;; Generated autoloads from play/landmark.el
 
 (defalias (quote landmark-repeat) (quote lm-test-run))
@@ -10806,13 +10806,14 @@
 
 ;;;### (autoloads (unbold-region bold-region message-news-other-frame
 ;;;;;;  message-news-other-window message-mail-other-frame message-mail-other-window
-;;;;;;  message-bounce message-resend message-forward message-recover
+;;;;;;  message-bounce message-resend message-insinuate-rmail message-forward-rmail-make-body
+;;;;;;  message-forward-make-body message-forward message-recover
 ;;;;;;  message-supersede message-cancel-news message-followup message-wide-reply
 ;;;;;;  message-reply message-news message-mail message-mode message-signature-file
 ;;;;;;  message-signature message-indent-citation-function message-cite-function
 ;;;;;;  message-yank-prefix message-citation-line-function message-send-mail-function
 ;;;;;;  message-user-organization-file message-signature-separator
-;;;;;;  message-from-style) "message" "gnus/message.el" (15029 54050))
+;;;;;;  message-from-style) "message" "gnus/message.el" (15478 8888))
 ;;; Generated autoloads from gnus/message.el
 
 (defvar message-from-style (quote default) "\
@@ -10936,6 +10937,13 @@
 Optional NEWS will use news to forward instead of mail.
 Optional DIGEST will use digest to forward." t nil)
 
+(autoload (quote message-forward-make-body) "message" nil nil nil)
+
+(autoload (quote message-forward-rmail-make-body) "message" nil nil nil)
+
+(autoload (quote message-insinuate-rmail) "message" "\
+Let RMAIL uses message to forward." t nil)
+
 (autoload (quote message-resend) "message" "\
 Resend the current article to ADDRESS." t nil)
 
@@ -11109,7 +11117,7 @@
 
 ;;;***
 
-;;;### (autoloads nil "mh-utils" "mail/mh-utils.el" (15190 56023))
+;;;### (autoloads nil "mh-utils" "mail/mh-utils.el" (15319 58876))
 ;;; Generated autoloads from mail/mh-utils.el
 
 (put (quote mh-progs) (quote risky-local-variable) t)
@@ -11573,7 +11581,7 @@
 ;;;### (autoloads (network-connection network-connection-to-service
 ;;;;;;  whois-reverse-lookup whois finger ftp dig nslookup nslookup-host
 ;;;;;;  route arp netstat ipconfig ping traceroute) "net-utils" "net/net-utils.el"
-;;;;;;  (15187 6159))
+;;;;;;  (15445 32056))
 ;;; Generated autoloads from net/net-utils.el
 
 (autoload (quote traceroute) "net-utils" "\
@@ -11632,7 +11640,7 @@
 ;;;;;;  uncomment-region comment-kill comment-set-column comment-indent
 ;;;;;;  comment-indent-default comment-multi-line comment-padding
 ;;;;;;  comment-style comment-column) "newcomment" "newcomment.el"
-;;;;;;  (15283 38536))
+;;;;;;  (15503 44495))
 ;;; Generated autoloads from newcomment.el
 
 (defalias (quote indent-for-comment) (quote comment-indent))
@@ -11683,7 +11691,7 @@
 of the corresponding number of spaces.
 
 Extra spacing between the comment characters and the comment text
-makes the comment easier to read.  Default is 1.  nil means 0.")
+makes the comment easier to read.  Default is \" \".  nil means 0.")
 
 (defvar comment-multi-line nil "\
 *Non-nil means \\[comment-indent-new-line] continues comments, with no new terminator or starter.
@@ -11764,7 +11772,7 @@
 ;;;***
 
 ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el"
-;;;;;;  (15181 30834))
+;;;;;;  (15478 8888))
 ;;; Generated autoloads from gnus/nnfolder.el
 
 (autoload (quote nnfolder-generate-active-file) "nnfolder" "\
@@ -11808,7 +11816,7 @@
 ;;;***
 
 ;;;### (autoloads (disable-command enable-command disabled-command-hook)
-;;;;;;  "novice" "novice.el" (15186 41418))
+;;;;;;  "novice" "novice.el" (15451 64523))
 ;;; Generated autoloads from novice.el
 
 (defvar disabled-command-hook (quote disabled-command-hook) "\
@@ -12041,7 +12049,7 @@
 
 ;;;***
 
-;;;### (autoloads (show-paren-mode) "paren" "paren.el" (15309 23925))
+;;;### (autoloads (show-paren-mode) "paren" "paren.el" (15308 33392))
 ;;; Generated autoloads from paren.el
 
 (defvar show-paren-mode nil "\
@@ -12064,8 +12072,8 @@
 
 ;;;***
 
-;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (14628
-;;;;;;  14481))
+;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (15478
+;;;;;;  8892))
 ;;; Generated autoloads from progmodes/pascal.el
 
 (autoload (quote pascal-mode) "pascal" "\
@@ -12400,7 +12408,7 @@
 ;;;***
 
 ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el"
-;;;;;;  (15149 49404))
+;;;;;;  (15327 25857))
 ;;; Generated autoloads from progmodes/perl-mode.el
 
 (autoload (quote perl-mode) "perl-mode" "\
@@ -12521,7 +12529,7 @@
 
 ;;;***
 
-;;;### (autoloads (pong) "pong" "play/pong.el" (15187 65192))
+;;;### (autoloads (pong) "pong" "play/pong.el" (15457 7261))
 ;;; Generated autoloads from play/pong.el
 
 (autoload (quote pong) "pong" "\
@@ -12584,49 +12592,9 @@
 
 ;;;***
 
-;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (15187
-;;;;;;  6160))
+;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (15321 10699))
 ;;; Generated autoloads from progmodes/ps-mode.el
-
-(autoload (quote ps-mode) "ps-mode" "\
-Major mode for editing PostScript with GNU Emacs.
-
-Entry to this mode calls `ps-mode-hook'.
-
-The following variables hold user options, and can
-be set through the `customize' command:
-
-  ps-mode-auto-indent
-  ps-mode-tab
-  ps-mode-paper-size
-  ps-mode-print-function
-  ps-run-prompt
-  ps-run-font-lock-keywords-2
-  ps-run-x
-  ps-run-dumb
-  ps-run-init
-  ps-run-error-line-numbers
-  ps-run-tmp-dir
-
-Type \\[describe-variable] for documentation on these options.
-
-
-\\{ps-mode-map}
-
-
-When starting an interactive PostScript process with \\[ps-run-start],
-a second window will be displayed, and `ps-run-mode-hook' will be called.
-The keymap for this second window is:
-
-\\{ps-run-mode-map}
-
-
-When Ghostscript encounters an error it displays an error message
-with a file position. Clicking mouse-2 on this number will bring
-point to the corresponding spot in the PostScript window, if input
-to the interpreter was sent from that window.
-Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number has the same effect.
-" t nil)
+ (autoload (quote ps-mode) "ps-mode" "Major mode for editing PostScript with GNU Emacs.\n" t)
 
 ;;;***
 
@@ -12881,7 +12849,7 @@
 ;;;;;;  quail-defrule quail-install-decode-map quail-install-map
 ;;;;;;  quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout
 ;;;;;;  quail-define-package quail-use-package quail-title) "quail"
-;;;;;;  "international/quail.el" (15255 11737))
+;;;;;;  "international/quail.el" (15445 32052))
 ;;; Generated autoloads from international/quail.el
 
 (autoload (quote quail-title) "quail" "\
@@ -13211,8 +13179,8 @@
 ;;;### (autoloads (clear-rectangle string-insert-rectangle string-rectangle
 ;;;;;;  delete-whitespace-rectangle open-rectangle insert-rectangle
 ;;;;;;  yank-rectangle kill-rectangle extract-rectangle delete-extract-rectangle
-;;;;;;  delete-rectangle move-to-column-force) "rect" "rect.el" (15290
-;;;;;;  60827))
+;;;;;;  delete-rectangle move-to-column-force) "rect" "rect.el" (15349
+;;;;;;  45229))
 ;;; Generated autoloads from rect.el
 
 (autoload (quote move-to-column-force) "rect" "\
@@ -13421,7 +13389,7 @@
 ;;;***
 
 ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el"
-;;;;;;  (15186 41419))
+;;;;;;  (15364 21725))
 ;;; Generated autoloads from emacs-lisp/regexp-opt.el
 
 (autoload (quote regexp-opt) "regexp-opt" "\
@@ -13585,7 +13553,7 @@
 ;;;;;;  rmail-mail-new-frame rmail-primary-inbox-list rmail-delete-after-output
 ;;;;;;  rmail-highlight-face rmail-highlighted-headers rmail-retry-ignored-headers
 ;;;;;;  rmail-displayed-headers rmail-ignored-headers rmail-dont-reply-to-names)
-;;;;;;  "rmail" "mail/rmail.el" (15269 48090))
+;;;;;;  "rmail" "mail/rmail.el" (15478 8890))
 ;;; Generated autoloads from mail/rmail.el
 
 (defvar rmail-dont-reply-to-names nil "\
@@ -13681,7 +13649,8 @@
 
 (defvar rmail-insert-mime-forwarded-message-function nil "\
 Function to insert a message in MIME format so it can be forwarded.
-This function is called if `rmail-enable-mime' is non-nil.
+This function is called if `rmail-enable-mime' or 
+`rmail-enable-mime-composing' is non-nil.
 It is called with one argument FORWARD-BUFFER, which is a
 buffer containing the message to forward.  The current buffer
 is the outgoing mail buffer.")
@@ -14435,7 +14404,7 @@
 ;;;;;;  mail-archive-file-name mail-header-separator send-mail-function
 ;;;;;;  mail-yank-ignored-headers mail-interactive mail-self-blind
 ;;;;;;  mail-specify-envelope-from mail-from-style) "sendmail" "mail/sendmail.el"
-;;;;;;  (15283 1872))
+;;;;;;  (15451 64523))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style (quote angles) "\
@@ -14616,7 +14585,7 @@
 ;;;***
 
 ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el"
-;;;;;;  (15187 6162))
+;;;;;;  (15478 8892))
 ;;; Generated autoloads from textmodes/sgml-mode.el
 
 (autoload (quote sgml-mode) "sgml-mode" "\
@@ -15027,8 +14996,8 @@
 
 ;;;***
 
-;;;### (autoloads (smerge-mode) "smerge-mode" "smerge-mode.el" (15206
-;;;;;;  27707))
+;;;### (autoloads (smerge-mode) "smerge-mode" "smerge-mode.el" (15347
+;;;;;;  6605))
 ;;; Generated autoloads from smerge-mode.el
 
 (autoload (quote smerge-mode) "smerge-mode" "\
@@ -15050,7 +15019,7 @@
 ;;;***
 
 ;;;### (autoloads (smtpmail-send-it) "smtpmail" "mail/smtpmail.el"
-;;;;;;  (15215 65188))
+;;;;;;  (15381 4745))
 ;;; Generated autoloads from mail/smtpmail.el
 
 (autoload (quote smtpmail-send-it) "smtpmail" nil nil nil)
@@ -15366,7 +15335,7 @@
 ;;;***
 
 ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar"
-;;;;;;  "speedbar.el" (15187 6159))
+;;;;;;  "speedbar.el" (15337 36886))
 ;;; Generated autoloads from speedbar.el
 
 (defalias (quote speedbar) (quote speedbar-frame-mode))
@@ -15429,7 +15398,7 @@
 
 ;;;### (autoloads (sql-db2 sql-interbase sql-postgres sql-ms sql-ingres
 ;;;;;;  sql-solid sql-mysql sql-informix sql-sybase sql-oracle sql-mode
-;;;;;;  sql-help) "sql" "progmodes/sql.el" (15232 57375))
+;;;;;;  sql-help) "sql" "progmodes/sql.el" (15325 8804))
 ;;; Generated autoloads from progmodes/sql.el
 
 (autoload (quote sql-help) "sql" "\
@@ -15441,10 +15410,10 @@
 Use the following commands to start a specific SQL interpreter:
 
     PostGres: \\[sql-postgres]
+    MySQL: \\[sql-mysql]
 
 Other non-free SQL implementations are also supported:
 
-    MySQL: \\[sql-mysql]
     Solid: \\[sql-solid]
     Oracle: \\[sql-oracle]
     Informix: \\[sql-informix]
@@ -15562,8 +15531,7 @@
 (autoload (quote sql-mysql) "sql" "\
 Run mysql by TcX as an inferior process.
 
-Note that the widespread idea that mysql is free software is inaccurate;
-its license is too restrictive.  We urge you to use PostGres instead.
+Mysql versions 3.23 and up are free software.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
 If buffer exists and a process is running, just switch to buffer
@@ -15844,7 +15812,7 @@
 ;;;***
 
 ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el"
-;;;;;;  (15187 6159))
+;;;;;;  (15325 7296))
 ;;; Generated autoloads from mail/supercite.el
 
 (autoload (quote sc-cite-original) "supercite" "\
@@ -15922,7 +15890,7 @@
 ;;;***
 
 ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl"
-;;;;;;  "progmodes/tcl.el" (15189 19270))
+;;;;;;  "progmodes/tcl.el" (15355 3005))
 ;;; Generated autoloads from progmodes/tcl.el
 
 (autoload (quote tcl-mode) "tcl" "\
@@ -15993,8 +15961,8 @@
 
 ;;;***
 
-;;;### (autoloads (ansi-term term make-term) "term" "term.el" (15186
-;;;;;;  41419))
+;;;### (autoloads (ansi-term term make-term) "term" "term.el" (15453
+;;;;;;  9604))
 ;;; Generated autoloads from term.el
 
 (autoload (quote make-term) "term" "\
@@ -16078,7 +16046,7 @@
 ;;;;;;  tex-start-options-string slitex-run-command latex-run-command
 ;;;;;;  tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp
 ;;;;;;  tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el"
-;;;;;;  (15186 41426))
+;;;;;;  (15503 44517))
 ;;; Generated autoloads from textmodes/tex-mode.el
 
 (defvar tex-shell-file-name nil "\
@@ -16326,7 +16294,7 @@
 ;;;***
 
 ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer)
-;;;;;;  "texinfmt" "textmodes/texinfmt.el" (15187 6162))
+;;;;;;  "texinfmt" "textmodes/texinfmt.el" (15323 52104))
 ;;; Generated autoloads from textmodes/texinfmt.el
 
 (autoload (quote texinfo-format-buffer) "texinfmt" "\
@@ -16558,7 +16526,7 @@
 ;;;***
 
 ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el"
-;;;;;;  (15214 19672))
+;;;;;;  (15503 44517))
 ;;; Generated autoloads from textmodes/tildify.el
 
 (autoload (quote tildify-region) "tildify" "\
@@ -16656,7 +16624,7 @@
 ;;;;;;  timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out
 ;;;;;;  timeclock-change timeclock-status-string timeclock-out timeclock-in
 ;;;;;;  timeclock-modeline-display) "timeclock" "calendar/timeclock.el"
-;;;;;;  (15098 25848))
+;;;;;;  (15332 4236))
 ;;; Generated autoloads from calendar/timeclock.el
 
 (autoload (quote timeclock-modeline-display) "timeclock" "\
@@ -16813,7 +16781,7 @@
 ;;;***
 
 ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm"
-;;;;;;  "tmm.el" (15109 7981))
+;;;;;;  "tmm.el" (15451 64523))
 ;;; Generated autoloads from tmm.el
  (define-key global-map "\M-`" 'tmm-menubar)
  (define-key global-map [f10] 'tmm-menubar)
@@ -16848,7 +16816,7 @@
 
 ;;;### (autoloads (todo-show todo-cp todo-mode todo-print todo-top-priorities
 ;;;;;;  todo-insert-item todo-add-item-non-interactively todo-add-category)
-;;;;;;  "todo-mode" "calendar/todo-mode.el" (15187 6159))
+;;;;;;  "todo-mode" "calendar/todo-mode.el" (15344 40381))
 ;;; Generated autoloads from calendar/todo-mode.el
 
 (autoload (quote todo-add-category) "todo-mode" "\
@@ -16942,7 +16910,7 @@
 ;;;***
 
 ;;;### (autoloads (tooltip-mode tooltip-mode) "tooltip" "tooltip.el"
-;;;;;;  (15106 38001))
+;;;;;;  (15332 9120))
 ;;; Generated autoloads from tooltip.el
 
 (autoload (quote tooltip-mode) "tooltip" "\
@@ -17310,11 +17278,11 @@
 ;;;;;;  vc-resolve-conflicts vc-merge vc-insert-headers vc-version-other-window
 ;;;;;;  vc-diff vc-register vc-next-action vc-do-command edit-vc-file
 ;;;;;;  with-vc-file vc-before-checkin-hook vc-checkin-hook vc-checkout-hook)
-;;;;;;  "vc" "vc.el" (15280 15313))
+;;;;;;  "vc" "vc.el" (15503 44498))
 ;;; Generated autoloads from vc.el
 
 (defvar vc-checkout-hook nil "\
-*Normal hook (list of functions) run after a file has been checked out.
+*Normal hook (list of functions) run after checking out a file.
 See `run-hooks'.")
 
 (defvar vc-checkin-hook nil "\
@@ -17322,11 +17290,11 @@
 See `run-hooks'.")
 
 (defvar vc-before-checkin-hook nil "\
-*Normal hook (list of functions) run before a file gets checked in.
+*Normal hook (list of functions) run before a file is checked in.
 See `run-hooks'.")
 
 (autoload (quote with-vc-file) "vc" "\
-Check out a writable copy of FILE if necessary and execute the body.
+Check out a writable copy of FILE if necessary, then execute BODY.
 Check in FILE with COMMENT (a string) after BODY has been executed.
 FILE is passed through `expand-file-name'; BODY executed within
 `save-excursion'.  If FILE is not under version control, or locked by
@@ -17339,7 +17307,7 @@
 However, before executing BODY, find FILE, and after BODY, save buffer." nil (quote macro))
 
 (autoload (quote vc-do-command) "vc" "\
-Execute a version control command, notifying user and checking for errors.
+Execute a VC command, notifying user and checking for errors.
 Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil or the
 current buffer if BUFFER is t.  If the destination buffer is not
 already current, set it up properly and erase it.  The command is
@@ -17351,7 +17319,7 @@
 that is inserted into the command line before the filename." nil nil)
 
 (autoload (quote vc-next-action) "vc" "\
-Do the next logical checkin or checkout operation on the current file.
+Do the next logical version control operation on the current file.
 
 If you call this from within a VC dired buffer with no files marked,
 it will operate on the file in the current line.
@@ -17405,18 +17373,20 @@
 
 (autoload (quote vc-diff) "vc" "\
 Display diffs between file versions.
-Normally this compares the current file and buffer with the most recent
-checked in version of that file.  This uses no arguments.
-With a prefix argument, it reads the file name to use
-and two version designators specifying which versions to compare." t nil)
+Normally this compares the current file and buffer with the most
+recent checked in version of that file.  This uses no arguments.  With
+a prefix argument HISTORIC, it reads the file name to use and two
+version designators specifying which versions to compare.  The
+optional argument NOT-URGENT non-nil means it is ok to say no to
+saving the buffer." t nil)
 
 (autoload (quote vc-version-other-window) "vc" "\
-Visit version REV of the current buffer in another window.
-If the current buffer is named `F', the version is named `F.~REV~'.
-If `F.~REV~' already exists, it is used instead of being re-created." t nil)
+Visit version REV of the current file in another window.
+If the current file is named `F', the version is named `F.~REV~'.
+If `F.~REV~' already exists, use it instead of checking it out again." t nil)
 
 (autoload (quote vc-insert-headers) "vc" "\
-Insert headers in a file for use with your version control system.
+Insert headers into a file for use with a version control system.
 Headers desired are inserted at point, and are pulled from
 the variable `vc-BACKEND-header'." t nil)
 
@@ -17459,7 +17429,7 @@
 List the change log of the current buffer in a window." t nil)
 
 (autoload (quote vc-revert-buffer) "vc" "\
-Revert the current buffer's file back to the version it was based on.
+Revert the current buffer's file to the version it was based on.
 This asks for confirmation if the buffer contents are not identical
 to that version.  This function does not automatically pick up newer
 changes found in the master file; use \\[universal-argument] \\[vc-next-action] to do so." t nil)
@@ -17532,7 +17502,7 @@
 
 ;;;***
 
-;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (15244 40663))
+;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (15367 37406))
 ;;; Generated autoloads from vc-cvs.el
  (defun vc-cvs-registered (f)
   (when (file-readable-p (expand-file-name
@@ -18324,7 +18294,7 @@
 ;;;***
 
 ;;;### (autoloads (widget-delete widget-create widget-prompt-value)
-;;;;;;  "wid-edit" "wid-edit.el" (15309 54926))
+;;;;;;  "wid-edit" "wid-edit.el" (15309 53363))
 ;;; Generated autoloads from wid-edit.el
 
 (autoload (quote widget-prompt-value) "wid-edit" "\
Binary files src-21.1/lisp/loadhist.elc and src-21.2/lisp/loadhist.elc differ
Binary files src-21.1/lisp/locate.elc and src-21.2/lisp/locate.elc differ
Binary files src-21.1/lisp/log-edit.elc and src-21.2/lisp/log-edit.elc differ
Binary files src-21.1/lisp/log-view.elc and src-21.2/lisp/log-view.elc differ
Binary files src-21.1/lisp/lpr.elc and src-21.2/lisp/lpr.elc differ
Binary files src-21.1/lisp/ls-lisp.elc and src-21.2/lisp/ls-lisp.elc differ
Binary files src-21.1/lisp/macros.elc and src-21.2/lisp/macros.elc differ
Binary files src-21.1/lisp/mail/emacsbug.elc and src-21.2/lisp/mail/emacsbug.elc differ
diff -ruN src-21.1/lisp/mail/feedmail.el src-21.2/lisp/mail/feedmail.el
--- src-21.1/lisp/mail/feedmail.el	Thu Sep 27 12:54:32 2001
+++ src-21.2/lisp/mail/feedmail.el	Mon Jan 28 17:32:53 2002
@@ -308,7 +308,7 @@
 (defgroup feedmail nil
   "Assist other email packages to massage outgoing messages."
   :link '(url-link "http://www.carpenter.org/feedmail/feedmail.html")
-  :link '(emacs-commentary "feedmail")
+  :link '(emacs-commentary-link "feedmail")
   :group 'mail)
 
 (defgroup feedmail-misc nil
Binary files src-21.1/lisp/mail/feedmail.elc and src-21.2/lisp/mail/feedmail.elc differ
Binary files src-21.1/lisp/mail/footnote.elc and src-21.2/lisp/mail/footnote.elc differ
Binary files src-21.1/lisp/mail/mail-extr.elc and src-21.2/lisp/mail/mail-extr.elc differ
Binary files src-21.1/lisp/mail/mail-hist.elc and src-21.2/lisp/mail/mail-hist.elc differ
Binary files src-21.1/lisp/mail/mail-utils.elc and src-21.2/lisp/mail/mail-utils.elc differ
Binary files src-21.1/lisp/mail/mailabbrev.elc and src-21.2/lisp/mail/mailabbrev.elc differ
Binary files src-21.1/lisp/mail/mailalias.elc and src-21.2/lisp/mail/mailalias.elc differ
Binary files src-21.1/lisp/mail/mailheader.elc and src-21.2/lisp/mail/mailheader.elc differ
Binary files src-21.1/lisp/mail/mailpost.elc and src-21.2/lisp/mail/mailpost.elc differ
Binary files src-21.1/lisp/mail/metamail.elc and src-21.2/lisp/mail/metamail.elc differ
Binary files src-21.1/lisp/mail/mh-comp.elc and src-21.2/lisp/mail/mh-comp.elc differ
Binary files src-21.1/lisp/mail/mh-e.elc and src-21.2/lisp/mail/mh-e.elc differ
Binary files src-21.1/lisp/mail/mh-funcs.elc and src-21.2/lisp/mail/mh-funcs.elc differ
Binary files src-21.1/lisp/mail/mh-mime.elc and src-21.2/lisp/mail/mh-mime.elc differ
Binary files src-21.1/lisp/mail/mh-pick.elc and src-21.2/lisp/mail/mh-pick.elc differ
Binary files src-21.1/lisp/mail/mh-seq.elc and src-21.2/lisp/mail/mh-seq.elc differ
diff -ruN src-21.1/lisp/mail/mh-utils.el src-21.2/lisp/mail/mh-utils.el
--- src-21.1/lisp/mail/mh-utils.el	Thu Jul 19 15:04:23 2001
+++ src-21.2/lisp/mail/mh-utils.el	Thu Oct 25 12:14:20 2001
@@ -447,7 +447,7 @@
   ;; window.  (Commands like save-some-buffers can make this false.)
   (if (eq (get-buffer-window (current-buffer))
 	  (selected-window))
-      (recenter (if arg arg '(t)))))
+      (recenter (if arg arg '(4)))))
 
 
 (defun mh-delete-line (lines)
Binary files src-21.1/lisp/mail/mh-utils.elc and src-21.2/lisp/mail/mh-utils.elc differ
Binary files src-21.1/lisp/mail/mspools.elc and src-21.2/lisp/mail/mspools.elc differ
Binary files src-21.1/lisp/mail/reporter.elc and src-21.2/lisp/mail/reporter.elc differ
Binary files src-21.1/lisp/mail/rfc2368.elc and src-21.2/lisp/mail/rfc2368.elc differ
Binary files src-21.1/lisp/mail/rfc822.elc and src-21.2/lisp/mail/rfc822.elc differ
diff -ruN src-21.1/lisp/mail/rmail.el src-21.2/lisp/mail/rmail.el
--- src-21.1/lisp/mail/rmail.el	Sun Sep 16 09:55:19 2001
+++ src-21.2/lisp/mail/rmail.el	Fri Feb 22 11:51:38 2002
@@ -420,6 +420,9 @@
 		 (other :tag "when asked" ask))
   :group 'rmail)
 
+(defvar rmail-enable-mime-composing nil
+  "*If non-nil, RMAIL uses `rmail-insert-mime-forwarded-message-function' to forward.")
+
 ;;;###autoload
 (defvar rmail-show-mime-function nil
   "Function to show MIME decoded message of RMAIL file.
@@ -429,7 +432,8 @@
 ;;;###autoload
 (defvar rmail-insert-mime-forwarded-message-function nil
   "Function to insert a message in MIME format so it can be forwarded.
-This function is called if `rmail-enable-mime' is non-nil.
+This function is called if `rmail-enable-mime' or 
+`rmail-enable-mime-composing' is non-nil.
 It is called with one argument FORWARD-BUFFER, which is a
 buffer containing the message to forward.  The current buffer
 is the outgoing mail buffer.")
@@ -621,7 +625,9 @@
 		   (list (read-file-name "Run rmail on RMAIL file: "))))
   (rmail-require-mime-maybe)
   (let* ((file-name (expand-file-name (or file-name-arg rmail-file-name)))
-	 (existed (get-file-buffer file-name))
+	 ;; Use find-buffer-visiting, not get-file-buffer, for those users
+	 ;; who have find-file-visit-truename set to t.
+	 (existed (find-buffer-visiting file-name))
 	 ;; This binding is necessary because we must decide if we
 	 ;; need code conversion while the buffer is unibyte
 	 ;; (i.e. enable-multibyte-characters is nil).
@@ -2449,43 +2455,51 @@
     (or (eq major-mode 'rmail-mode)
 	(switch-to-buffer rmail-buffer))
     (save-excursion
-      (unwind-protect
-	  (let ((msgbeg (rmail-msgbeg rmail-current-message))
-		(msgend (rmail-msgend rmail-current-message))
-		x-coding-header)
-	    (narrow-to-region msgbeg msgend)
-	    (goto-char (point-min))
-	    (when (search-forward "\n*** EOOH ***\n" (point-max) t)
-	      (narrow-to-region msgbeg (point)))
-	    (goto-char (point-min))
-	    (if (re-search-forward "^X-Coding-System: *\\(.*\\)$" nil t)
-		(let ((old-coding (intern (match-string 1)))
-		      (buffer-read-only nil))
-		  (check-coding-system old-coding)
-		  ;; Make sure the new coding system uses the same EOL
-		  ;; conversion, to prevent ^M characters from popping
-		  ;; up all over the place.
-		  (setq coding
-			(coding-system-change-eol-conversion
-			 coding
-			 (coding-system-eol-type old-coding)))
-		  (setq x-coding-header (point-marker))
-		  (narrow-to-region msgbeg msgend)
-		  (encode-coding-region (point) msgend old-coding)
-		  (decode-coding-region (point) msgend coding)
-		  (setq last-coding-system-used coding)
-		  ;; Rewrite the coding-system header according
-		  ;; to what we did.
- 		  (goto-char x-coding-header)
-		  (delete-region (point)
-				 (save-excursion
-				   (beginning-of-line)
-				   (point)))
-		  (insert "X-Coding-System: "
-			  (symbol-name last-coding-system-used))
-		  (set-marker x-coding-header nil)
-		  (rmail-show-message))
-	      (error "No X-Coding-System header found")))))))
+      (let ((pruned (rmail-msg-is-pruned)))
+	(unwind-protect
+	    (let ((msgbeg (rmail-msgbeg rmail-current-message))
+		  (msgend (rmail-msgend rmail-current-message))
+		  x-coding-header)
+	      ;; We need the message headers pruned (we later restore
+	      ;; the pruned stat to what it was, see the end of
+	      ;; unwind-protect form).
+	      (or pruned
+		  (rmail-toggle-header 1))
+	      (narrow-to-region msgbeg msgend)
+	      (goto-char (point-min))
+	      (when (search-forward "\n*** EOOH ***\n" (point-max) t)
+		(narrow-to-region msgbeg (point)))
+	      (goto-char (point-min))
+	      (if (re-search-forward "^X-Coding-System: *\\(.*\\)$" nil t)
+		  (let ((old-coding (intern (match-string 1)))
+			(buffer-read-only nil))
+		    (check-coding-system old-coding)
+		    ;; Make sure the new coding system uses the same EOL
+		    ;; conversion, to prevent ^M characters from popping
+		    ;; up all over the place.
+		    (setq coding
+			  (coding-system-change-eol-conversion
+			   coding
+			   (coding-system-eol-type old-coding)))
+		    (setq x-coding-header (point-marker))
+		    (narrow-to-region msgbeg msgend)
+		    (encode-coding-region (point) msgend old-coding)
+		    (decode-coding-region (point) msgend coding)
+		    (setq last-coding-system-used coding)
+		    ;; Rewrite the coding-system header according
+		    ;; to what we did.
+		    (goto-char x-coding-header)
+		    (delete-region (point)
+				   (save-excursion
+				     (beginning-of-line)
+				     (point)))
+		    (insert "X-Coding-System: "
+			    (symbol-name last-coding-system-used))
+		    (set-marker x-coding-header nil)
+		    (rmail-show-message))
+		(error "No X-Coding-System header found")))
+	  (or pruned
+	      (rmail-toggle-header 0)))))))
 
 ;; Find all occurrences of certain fields, and highlight them.
 (defun rmail-highlight-headers ()
@@ -3253,7 +3267,7 @@
 	  (save-excursion
 	    ;; Insert after header separator--before signature if any.
 	    (goto-char (mail-text-start))
-	    (if rmail-enable-mime
+	    (if (or rmail-enable-mime rmail-enable-mime-composing)
 		(funcall rmail-insert-mime-forwarded-message-function
 			 forward-buffer)
 	      (insert "------- Start of forwarded message -------\n")
Binary files src-21.1/lisp/mail/rmail.elc and src-21.2/lisp/mail/rmail.elc differ
Binary files src-21.1/lisp/mail/rmailedit.elc and src-21.2/lisp/mail/rmailedit.elc differ
Binary files src-21.1/lisp/mail/rmailkwd.elc and src-21.2/lisp/mail/rmailkwd.elc differ
Binary files src-21.1/lisp/mail/rmailmsc.elc and src-21.2/lisp/mail/rmailmsc.elc differ
Binary files src-21.1/lisp/mail/rmailout.elc and src-21.2/lisp/mail/rmailout.elc differ
Binary files src-21.1/lisp/mail/rmailsort.elc and src-21.2/lisp/mail/rmailsort.elc differ
Binary files src-21.1/lisp/mail/rmailsum.elc and src-21.2/lisp/mail/rmailsum.elc differ
diff -ruN src-21.1/lisp/mail/sendmail.el src-21.2/lisp/mail/sendmail.el
--- src-21.1/lisp/mail/sendmail.el	Thu Sep 27 13:02:40 2001
+++ src-21.2/lisp/mail/sendmail.el	Sat Feb  2 15:47:39 2002
@@ -81,7 +81,8 @@
 If this is nil while `mail-specify-envelope-from' is non-nil, the
 content of `user-mail-address' is used."
   :version "21.1"
-  :type 'boolean
+  :type '(choice (const :tag "Use `user-mail-address'" nil)
+		 string)
   :group 'sendmail)
 
 ;;;###autoload
@@ -494,8 +495,8 @@
   (set (make-local-variable 'comment-start) mail-yank-prefix)
   (make-local-variable 'adaptive-fill-regexp)
   (setq adaptive-fill-regexp
-	(concat adaptive-fill-regexp
-		"\\|[ \t]*[-[:alnum:]]*>+[ \t]*"))
+	(concat "[ \t]*[-[:alnum:]]+>+[ \t]*\\|"
+		adaptive-fill-regexp))
   (make-local-variable 'adaptive-fill-first-line-regexp)
   (setq adaptive-fill-first-line-regexp
 	(concat adaptive-fill-first-line-regexp
@@ -805,7 +806,8 @@
 	(mailbuf (current-buffer))
 	(program (if (boundp 'sendmail-program)
 		     sendmail-program
-		   "/usr/lib/sendmail")))
+		   "/usr/lib/sendmail"))
+	(mail-envelope-from mail-envelope-from))
     (unwind-protect
 	(save-excursion
 	  (set-buffer tembuf)
Binary files src-21.1/lisp/mail/sendmail.elc and src-21.2/lisp/mail/sendmail.elc differ
diff -ruN src-21.1/lisp/mail/smtpmail.el src-21.2/lisp/mail/smtpmail.el
--- src-21.1/lisp/mail/smtpmail.el	Tue Aug  7 16:43:48 2001
+++ src-21.2/lisp/mail/smtpmail.el	Mon Dec 10 20:52:41 2001
@@ -310,7 +310,10 @@
 						   (end-of-line)
 						   (point))))
 	(load file-msg)
-	(setq tembuf (find-file-noselect file-msg))
+	;; Insert the message literally: it is already encoded as per
+	;; the MIME headers, and code conversions might guess the
+	;; encoding wrongly.
+	(setq tembuf (find-file-noselect file-msg nil t))
 	(if (not (null smtpmail-recipient-address-list))
 	    (if (not (smtpmail-via-smtp smtpmail-recipient-address-list 
 					tembuf))
Binary files src-21.1/lisp/mail/smtpmail.elc and src-21.2/lisp/mail/smtpmail.elc differ
diff -ruN src-21.1/lisp/mail/supercite.el src-21.2/lisp/mail/supercite.el
--- src-21.1/lisp/mail/supercite.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/mail/supercite.el	Mon Oct 29 10:08:16 2001
@@ -1,6 +1,6 @@
 ;;; supercite.el --- minor mode for citing mail and news replies
 
-;; Copyright (C) 1993, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1997, 2001 Free Software Foundation, Inc.
 
 ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. <bwarsaw@cen.com>
 ;; Maintainer:    Mark Senn <mds@ecn.purdue.edu>
@@ -513,9 +513,8 @@
 (defconst sc-emacs-features
   (let ((version 'v18)
 	(flavor  'GNU))
-    (if (or
-	 (string= (substring emacs-version 0 2) "19")
-	 (string= (substring emacs-version 0 2) "20"))
+    (if (not
+	 (string= (substring emacs-version 0 2) "18"))
 	(setq version 'v19))
     (if (string-match "Lucid" emacs-version)
 	(setq flavor 'Lucid))
@@ -524,9 +523,9 @@
   "A list describing what version of Emacs we're running on.
 Known flavors are:
 
-Emacs 18        : (v18 GNU)
-Emacs 19 or 20  : (v19 GNU)
-Lucid 19 or 20  : (v19 Lucid)")
+Emacs 18           : (v18 GNU)
+Emacs 19 or later  : (v19 GNU)
+Lucid 19 or later  : (v19 Lucid)")
 
 
 (defvar sc-tmp-nested-regexp nil
Binary files src-21.1/lisp/mail/supercite.elc and src-21.2/lisp/mail/supercite.elc differ
diff -ruN src-21.1/lisp/mail/uce.el src-21.2/lisp/mail/uce.el
--- src-21.1/lisp/mail/uce.el	Fri Jul 13 14:59:13 2001
+++ src-21.2/lisp/mail/uce.el	Sun Feb  3 12:56:52 2002
@@ -222,10 +222,15 @@
 	 (cond ((eq uce-mail-reader 'gnus) gnus-original-article-buffer)
 	       ((eq uce-mail-reader 'rmail) "RMAIL")
 	       (t (error 
-		   "Variable uce-mail-reader set to unrecognized value")))))
+		   "Variable uce-mail-reader set to unrecognized value"))))
+	(full-header-p (and (eq uce-mail-reader 'rmail)
+			    (not (rmail-msg-is-pruned)))))
     (or (get-buffer message-buffer)
 	(error (concat "No buffer " message-buffer ", cannot find UCE")))
     (switch-to-buffer message-buffer)
+    ;; We need the message with headers pruned.
+    (if full-header-p
+	(rmail-toggle-header 1))
     (let ((to (mail-strip-quoted-names (mail-fetch-field "from" t)))
 	  (reply-to (mail-fetch-field "reply-to"))
 	  temp)
@@ -254,6 +259,9 @@
 		 (rmail-maybe-set-message-counters)
 		 (copy-region-as-kill (rmail-msgbeg rmail-current-message) 
 				      (rmail-msgend rmail-current-message))))))
+      ;; Restore the pruned header state we found.
+      (if full-header-p
+	  (rmail-toggle-header 0))
       (switch-to-buffer "*mail*")
       (erase-buffer)
       (setq temp (point))
Binary files src-21.1/lisp/mail/uce.elc and src-21.2/lisp/mail/uce.elc differ
Binary files src-21.1/lisp/mail/undigest.elc and src-21.2/lisp/mail/undigest.elc differ
Binary files src-21.1/lisp/mail/unrmail.elc and src-21.2/lisp/mail/unrmail.elc differ
Binary files src-21.1/lisp/mail/vms-pmail.elc and src-21.2/lisp/mail/vms-pmail.elc differ
Binary files src-21.1/lisp/makesum.elc and src-21.2/lisp/makesum.elc differ
Binary files src-21.1/lisp/man.elc and src-21.2/lisp/man.elc differ
Binary files src-21.1/lisp/map-ynp.elc and src-21.2/lisp/map-ynp.elc differ
diff -ruN src-21.1/lisp/menu-bar.el src-21.2/lisp/menu-bar.el
--- src-21.1/lisp/menu-bar.el	Sun Sep 23 13:57:34 2001
+++ src-21.2/lisp/menu-bar.el	Thu Nov 15 21:29:44 2001
@@ -398,12 +398,17 @@
 	      :help "Paste (yank) text cut or copied earlier"))
 (define-key menu-bar-edit-menu [paste]
   '(menu-item "Paste" yank
-	      :enable (and (x-selection-exists-p) (not buffer-read-only))
+	      :enable (and
+		       ;; Emacs compiled --without-x doesn't have
+		       ;; x-selection-exists-p.
+		       (fboundp 'x-selection-exists-p)
+		       (x-selection-exists-p) (not buffer-read-only))
 	      :help "Paste (yank) text most recently cut/copied"))
 (define-key menu-bar-edit-menu [copy]
   '(menu-item "Copy" menu-bar-kill-ring-save
 	      :enable mark-active
-	      :help "Copy text in region between mark and current position"))
+	      :help "Copy text in region between mark and current position"
+	      :keys "\\[kill-ring-save]"))
 (define-key menu-bar-edit-menu [cut]
   '(menu-item "Cut" kill-region
 	      :enable (and mark-active (not buffer-read-only))
@@ -433,7 +438,8 @@
 (put 'clipboard-kill-region 'menu-enable 'mark-active)
 (put 'clipboard-kill-ring-save 'menu-enable 'mark-active)
 (put 'clipboard-yank 'menu-enable
-     '(or (x-selection-exists-p) (x-selection-exists-p 'CLIPBOARD)))
+     '(or (and (fboundp 'x-selection-exists-p) (x-selection-exists-p))
+	  (x-selection-exists-p 'CLIPBOARD)))
 
 (defun clipboard-yank ()
   "Insert the clipboard contents, or the last stretch of killed text."
Binary files src-21.1/lisp/menu-bar.elc and src-21.2/lisp/menu-bar.elc differ
Binary files src-21.1/lisp/midnight.elc and src-21.2/lisp/midnight.elc differ
Binary files src-21.1/lisp/minibuf-eldef.elc and src-21.2/lisp/minibuf-eldef.elc differ
Binary files src-21.1/lisp/misc.elc and src-21.2/lisp/misc.elc differ
Binary files src-21.1/lisp/mouse-copy.elc and src-21.2/lisp/mouse-copy.elc differ
Binary files src-21.1/lisp/mouse-drag.elc and src-21.2/lisp/mouse-drag.elc differ
Binary files src-21.1/lisp/mouse-sel.elc and src-21.2/lisp/mouse-sel.elc differ
diff -ruN src-21.1/lisp/mouse.el src-21.2/lisp/mouse.el
--- src-21.1/lisp/mouse.el	Tue Aug 28 08:33:37 2001
+++ src-21.2/lisp/mouse.el	Sat Nov  3 17:10:09 2001
@@ -90,7 +90,9 @@
       (message "")
       ;; Maybe try again but with the submap.
       (setq map (if (keymapp cmd) cmd)))
-    (when (functionp cmd)
+    ;; If the user did not cancel by refusing to select,
+    ;; and if the result is a command, run it.
+    (when (and (null map) (commandp cmd))
       (setq prefix-arg prefix)
       ;; `setup-specified-language-environment', for instance,
       ;; expects this to be set from a menu keymap.
Binary files src-21.1/lisp/mouse.elc and src-21.2/lisp/mouse.elc differ
Binary files src-21.1/lisp/msb.elc and src-21.2/lisp/msb.elc differ
Binary files src-21.1/lisp/mwheel.elc and src-21.2/lisp/mwheel.elc differ
diff -ruN src-21.1/lisp/net/ange-ftp.el src-21.2/lisp/net/ange-ftp.el
--- src-21.1/lisp/net/ange-ftp.el	Tue Oct  2 23:33:49 2001
+++ src-21.2/lisp/net/ange-ftp.el	Fri Feb 22 11:51:39 2002
@@ -1528,10 +1528,10 @@
 good, skip, fatal, or unknown."
   (cond ((string-match ange-ftp-xfer-size-msgs line)
 	 (setq ange-ftp-xfer-size
-	       (ash (string-to-int (substring line
-					      (match-beginning 1)
-					      (match-end 1)))
-		    -10)))
+	       (/ (string-to-number (substring line
+					       (match-beginning 1)
+					       (match-end 1)))
+		  1024)))
 	((string-match ange-ftp-skip-msgs line)
 	 t)
 	((string-match ange-ftp-good-msgs line)
@@ -1563,7 +1563,11 @@
 	  (if buf
 	      (save-excursion
 		(set-buffer buf)
-		(setq ange-ftp-xfer-size (ash bytes -10))))))))
+		(setq ange-ftp-xfer-size
+		      ;; For very large files, BYTES can be a float.
+		      (if (integerp bytes)
+			  (ash bytes -10)
+			(/ bytes 1024)))))))))
 
 (defun ange-ftp-process-handle-hash (str)
   "Remove hash marks from STRING and display count so far."
@@ -2092,30 +2096,31 @@
 	;; grab a suitable process.
 	(setq proc (ange-ftp-start-process host user name))
 
-	;; login to FTP server.
-	(if (and (ange-ftp-use-smart-gateway-p host)
-		 ange-ftp-gateway-host)
-	    (ange-ftp-smart-login host user pass account proc)
-	  (ange-ftp-normal-login host user pass account proc))
-
-	;; Tell client to send back hash-marks as progress.  It isn't usually
-	;; fatal if this command fails.
-	(ange-ftp-guess-hash-mark-size proc)
-
-	;; Guess at the host type.
-	(ange-ftp-guess-host-type host user)
-
-	;; Try to use passive mode if asked to.
-	(when ange-ftp-try-passive-mode
-	  (let ((answer (cdr (ange-ftp-raw-send-cmd
-			      proc "passive" "Trying passive mode..." nil))))
-	    (if (string-match "\\?\\|refused" answer)
-		(message "Trying passive mode...ok")
-	      (message "Trying passive mode...failed"))))
-
-	;; Run any user-specified hooks.  Note that proc, host and user are
-	;; dynamically bound at this point.
-	(run-hooks 'ange-ftp-process-startup-hook))
+	(save-match-data
+	  ;; login to FTP server.
+	  (if (and (ange-ftp-use-smart-gateway-p host)
+		   ange-ftp-gateway-host)
+	      (ange-ftp-smart-login host user pass account proc)
+	    (ange-ftp-normal-login host user pass account proc))
+
+	  ;; Tell client to send back hash-marks as progress.  It isn't usually
+	  ;; fatal if this command fails.
+	  (ange-ftp-guess-hash-mark-size proc)
+
+	  ;; Guess at the host type.
+	  (ange-ftp-guess-host-type host user)
+
+	  ;; Try to use passive mode if asked to.
+	  (when ange-ftp-try-passive-mode
+	    (let ((answer (cdr (ange-ftp-raw-send-cmd
+				proc "passive" "Trying passive mode..." nil))))
+	      (if (string-match "\\?\\|refused" answer)
+		  (message "Trying passive mode...ok")
+		(message "Trying passive mode...failed"))))
+
+	  ;; Run any user-specified hooks.  Note that proc, host and user are
+	  ;; dynamically bound at this point.
+	  (run-hooks 'ange-ftp-process-startup-hook)))
       proc)))
 
 ;; Variables for caching host and host-type
@@ -2211,30 +2216,31 @@
 	     host-type (ange-ftp-host-type host user))
        ;; This will trigger an FTP login, if one doesn't exist
        (eq cmd0 'dir))
-      (setq cmd1 (funcall
-		  (or (cdr (assq host-type ange-ftp-fix-dir-name-func-alist))
-		      'identity)
-		  cmd1)
-	    cmd3 (nth 3 cmd))
-      ;; Need to deal with the HP-UX ftp bug. This should also allow
-      ;; us to resolve symlinks to directories on SysV machines. (Sebastian will
-      ;; be happy.)
-      (and (eq host-type 'unix)
-	   (string-match "/$" cmd1)
-	   (not (string-match "R" cmd3))
-	   (setq cmd1 (concat cmd1 ".")))
-
-      ;; If the dir name contains a space, some ftp servers will
-      ;; refuse to list it.  We instead change directory to the
-      ;; directory in question and ls ".".
-      (when (string-match " " cmd1)
-	(ange-ftp-cd host user (nth 1 cmd))
-	(setq cmd1 "."))
-
-      ;; If the remote ls can take switches, put them in
-      (or (memq host-type ange-ftp-dumb-host-types)
-	  (setq cmd0 'ls
-		cmd1 (format "\"%s %s\"" cmd3 cmd1))))
+      (save-match-data
+	(setq cmd1 (funcall
+		    (or (cdr (assq host-type ange-ftp-fix-dir-name-func-alist))
+			'identity)
+		    cmd1)
+	      cmd3 (nth 3 cmd))
+	;; Need to deal with the HP-UX ftp bug. This should also allow
+	;; us to resolve symlinks to directories on SysV machines. (Sebastian will
+	;; be happy.)
+	(and (eq host-type 'unix)
+	     (string-match "/$" cmd1)
+	     (not (string-match "R" cmd3))
+	     (setq cmd1 (concat cmd1 ".")))
+
+	;; If the dir name contains a space, some ftp servers will
+	;; refuse to list it.  We instead change directory to the
+	;; directory in question and ls ".".
+	(when (string-match " " cmd1)
+	  (ange-ftp-cd host user (nth 1 cmd))
+	  (setq cmd1 "."))
+
+	;; If the remote ls can take switches, put them in
+	(or (memq host-type ange-ftp-dumb-host-types)
+	    (setq cmd0 'ls
+		  cmd1 (format "\"%s %s\"" cmd3 cmd1)))))
 
      ;; First argument is the remote name
      ((progn
@@ -2245,9 +2251,9 @@
       (setq cmd1 (funcall fix-name-func cmd1)))
 
      ;; Second argument is the remote name
-     ((memq cmd0 '(append put chmod))
+     ((or (memq cmd0 '(append put chmod))
+          (and (eq cmd0 'quote) (string= cmd1 "mdtm")))
       (setq cmd2 (funcall fix-name-func cmd2)))
-
      ;; Both arguments are remote names
      ((eq cmd0 'rename)
       (setq cmd1 (funcall fix-name-func cmd1)
@@ -2780,24 +2786,31 @@
 ;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid
 ;;     subdirectory. This is of course an OS dependent judgement.
 
+;;; Nowadays, the judgement for #2 is always "no".
+;;; With today's ftp servers on Unix and GNU systems,
+;;; it appears to be impossible to tell from the result
+;;; of the directory listing whether the argument is a directory.
+;;; This appears to be true even in Emacs 20.7
+
 (defmacro ange-ftp-allow-child-lookup (dir file)
-  `(not
-    (let* ((efile ,file) ; expand once.
-           (edir ,dir)
-           (parsed (ange-ftp-ftp-name edir))
-           (host-type (ange-ftp-host-type
-                       (car parsed))))
-      (or
-       ;; Deal with dired
-       (and (boundp 'dired-local-variables-file) ; in the dired-x package
-            (stringp dired-local-variables-file)
-            (string-equal dired-local-variables-file efile))
-       ;; No dots in dir names in vms.
-       (and (eq host-type 'vms)
-            (string-match "\\." efile))
-       ;; No subdirs in mts of cms.
-       (and (memq host-type '(mts cms))
-            (not (string-equal "/" (nth 2 parsed))))))))
+  nil)
+;;;   `(not
+;;;     (let* ((efile ,file) ; expand once.
+;;;            (edir ,dir)
+;;;            (parsed (ange-ftp-ftp-name edir))
+;;;            (host-type (ange-ftp-host-type
+;;;                        (car parsed))))
+;;;       (or
+;;;        ;; Deal with dired
+;;;        (and (boundp 'dired-local-variables-file) ; in the dired-x package
+;;;             (stringp dired-local-variables-file)
+;;;             (string-equal dired-local-variables-file efile))
+;;;        ;; No dots in dir names in vms.
+;;;        (and (eq host-type 'vms)
+;;;             (string-match "\\." efile))
+;;;        ;; No subdirs in mts of cms.
+;;;        (and (memq host-type '(mts cms))
+;;;             (not (string-equal "/" (nth 2 parsed))))))))
 
 (defun ange-ftp-file-entry-p (name)
   "Given NAME, return whether there is a file entry for it."
@@ -3442,7 +3455,7 @@
     ;; Bob@rattlesnake.com reports that is returns something different
     ;; for at least one FTP server.  So, let's use the response only
     ;; if it matches the Internet draft.
-    (when (string-match "^213 [0-9]\\{14\\}$" line)
+    (when (save-match-data (string-match "^213 [0-9]\\{14\\}$" line))
       (setq modtime
 	    (encode-time
 	     (string-to-number (substring line 16 18))
@@ -3840,7 +3853,8 @@
 	     completions)))
 
       (if (or (and (eq system-type 'windows-nt)
-		   (string-match "^[a-zA-Z]:[/\\]$" ange-ftp-this-dir))
+		   (save-match-data
+		     (string-match "^[a-zA-Z]:[/\\]$" ange-ftp-this-dir)))
 	      (string-equal "/" ange-ftp-this-dir))
 	  (nconc (all-completions file (ange-ftp-generate-root-prefixes))
 		 (ange-ftp-real-file-name-all-completions file
@@ -3872,7 +3886,8 @@
 		     (function ange-ftp-file-entry-active-p)))))))
 
       (if (or (and (eq system-type 'windows-nt)
-		   (string-match "^[a-zA-Z]:[/\\]$" ange-ftp-this-dir))
+		   (save-match-data
+		     (string-match "^[a-zA-Z]:[/\\]$" ange-ftp-this-dir)))
 	      (string-equal "/" ange-ftp-this-dir))
 	  (try-completion
 	   file
@@ -4317,15 +4332,23 @@
 ;; So the format conversion should be all that is needed.
 
 (defun ange-ftp-insert-directory (file switches &optional wildcard full)
-  (let ((short (ange-ftp-abbreviate-filename file))
-	(parsed (ange-ftp-ftp-name (expand-file-name file))))
-    (if parsed
-	(insert
-	 (if wildcard
-	     (let ((default-directory (file-name-directory file)))
-	       (ange-ftp-ls (file-name-nondirectory file) switches nil nil t))
-	   (ange-ftp-ls file switches full)))
-      (ange-ftp-real-insert-directory file switches wildcard full))))
+  (save-match-data
+    (let ((short (ange-ftp-abbreviate-filename file))
+	  (parsed (ange-ftp-ftp-name (expand-file-name file)))
+	  tem)
+      (if parsed
+	  (if (and (not wildcard)
+		   (setq tem (file-symlink-p (directory-file-name file))))
+	      (ange-ftp-insert-directory
+	       (ange-ftp-replace-name-component file tem)
+	       switches wildcard full)
+	    (insert
+	     (if wildcard
+		 (let ((default-directory (file-name-directory file)))
+		   (ange-ftp-ls (file-name-nondirectory file)
+				switches nil nil t))
+	       (ange-ftp-ls file switches full))))
+	       (ange-ftp-real-insert-directory file switches wildcard full)))))
 
 (defun ange-ftp-dired-uncache (dir)
   (if (ange-ftp-ftp-name (expand-file-name dir))
@@ -4355,6 +4378,10 @@
 	(ange-ftp-real-shell-command command output-buffer error-buffer)
       (if (> (length name) 0)		; else it's $HOME
 	  (setq command (concat "cd " name "; " command)))
+      ;; Remove port from the hostname.
+      (save-match-data
+	(when (string-match "\\(.*\\)#" host)
+	  (setq host (match-string 1 host))))
       (setq command
 	    (format  "%s %s \"%s\""	; remsh -l USER does not work well
 					; on a hp-ux machine I tried
Binary files src-21.1/lisp/net/ange-ftp.elc and src-21.2/lisp/net/ange-ftp.elc differ
Binary files src-21.1/lisp/net/browse-url.elc and src-21.2/lisp/net/browse-url.elc differ
Binary files src-21.1/lisp/net/eudc-bob.elc and src-21.2/lisp/net/eudc-bob.elc differ
Binary files src-21.1/lisp/net/eudc-export.elc and src-21.2/lisp/net/eudc-export.elc differ
Binary files src-21.1/lisp/net/eudc-hotlist.elc and src-21.2/lisp/net/eudc-hotlist.elc differ
Binary files src-21.1/lisp/net/eudc-vars.elc and src-21.2/lisp/net/eudc-vars.elc differ
Binary files src-21.1/lisp/net/eudc.elc and src-21.2/lisp/net/eudc.elc differ
Binary files src-21.1/lisp/net/eudcb-bbdb.elc and src-21.2/lisp/net/eudcb-bbdb.elc differ
Binary files src-21.1/lisp/net/eudcb-ldap.elc and src-21.2/lisp/net/eudcb-ldap.elc differ
Binary files src-21.1/lisp/net/eudcb-ph.elc and src-21.2/lisp/net/eudcb-ph.elc differ
Binary files src-21.1/lisp/net/goto-addr.elc and src-21.2/lisp/net/goto-addr.elc differ
diff -ruN src-21.1/lisp/net/ldap.el src-21.2/lisp/net/ldap.el
--- src-21.1/lisp/net/ldap.el	Mon Jul 16 09:46:48 2001
+++ src-21.2/lisp/net/ldap.el	Fri Dec 28 07:28:32 2001
@@ -584,9 +584,9 @@
 					       (end-of-line)
 					       (point))))
 	  (forward-line 1)
-	  (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(.*\\)$")
+	  (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$")
 	    (setq name (match-string 1)
-		  value (match-string 2))
+		  value (match-string 3))
 	    (save-excursion
 	      (set-buffer bufval)
 	      (erase-buffer)
Binary files src-21.1/lisp/net/ldap.elc and src-21.2/lisp/net/ldap.elc differ
diff -ruN src-21.1/lisp/net/net-utils.el src-21.2/lisp/net/net-utils.el
--- src-21.1/lisp/net/net-utils.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/net/net-utils.el	Mon Jan 28 17:32:56 2002
@@ -624,7 +624,13 @@
     (cons 'rlogin	513)
     )
   "Alist of services and associated TCP port numbers.
-This list in not complete.")
+This list is not complete.")
+
+(defvar network-connection-service-abbrev-alist nil
+  "Alist of (SERVICE . ABBREVTABLE) for various network services.
+SERVICE can be either a symbol or a number appearing in
+`network-connection-service-alist'.  ABBREVTABLE is the abbrev table
+to use in buffers that talk to that network service.")
 
 ;; Workhorse macro
 (defmacro run-network-program (process-name host port
@@ -804,10 +810,10 @@
   (let ((network-abbrev-table
 	 (or
 	  (assoc service network-connection-service-abbrev-alist)
-	 (and (rassoc service network-connection-service-alist)
-	      (assoc
-	       (elt (rassoc service network-connection-service-alist) 0)
-	       network-connection-service-abbrev-alist)))))
+	  (and (rassoc service network-connection-service-alist)
+	       (assoc
+		(elt (rassoc service network-connection-service-alist) 0)
+		network-connection-service-abbrev-alist)))))
     (make-local-variable 'network-connection-host)
     (setq network-connection-host host)
     (make-local-variable 'network-connection-service)
Binary files src-21.1/lisp/net/net-utils.elc and src-21.2/lisp/net/net-utils.elc differ
Binary files src-21.1/lisp/net/quickurl.elc and src-21.2/lisp/net/quickurl.elc differ
Binary files src-21.1/lisp/net/rcompile.elc and src-21.2/lisp/net/rcompile.elc differ
Binary files src-21.1/lisp/net/rlogin.elc and src-21.2/lisp/net/rlogin.elc differ
Binary files src-21.1/lisp/net/snmp-mode.elc and src-21.2/lisp/net/snmp-mode.elc differ
Binary files src-21.1/lisp/net/telnet.elc and src-21.2/lisp/net/telnet.elc differ
Binary files src-21.1/lisp/net/webjump.elc and src-21.2/lisp/net/webjump.elc differ
Binary files src-21.1/lisp/net/zone-mode.elc and src-21.2/lisp/net/zone-mode.elc differ
diff -ruN src-21.1/lisp/newcomment.el src-21.2/lisp/newcomment.el
--- src-21.1/lisp/newcomment.el	Thu Sep 27 23:13:44 2001
+++ src-21.2/lisp/newcomment.el	Wed Mar 13 20:51:43 2002
@@ -5,7 +5,7 @@
 ;; Author: code extracted from Emacs-20's simple.el
 ;; Maintainer: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: comment uncomment
-;; Revision: $Id: newcomment.el,v 1.35 2001/09/27 21:13:44 monnier Exp $
+;; Revision: $Id: newcomment.el,v 1.35.4.4 2002/03/04 01:17:11 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -179,7 +179,9 @@
 of the corresponding number of spaces.
 
 Extra spacing between the comment characters and the comment text
-makes the comment easier to read.  Default is 1.  nil means 0.")
+makes the comment easier to read.  Default is \" \".  nil means 0."
+  :group 'comment
+  :type '(choice string integer (const nil)))
 
 ;;;###autoload
 (defcustom comment-multi-line nil
@@ -219,6 +221,7 @@
 	       (goto-char (point-min))
 	       (and (forward-comment 1) (eobp))))))
     ;; comment-padding
+    (unless comment-padding (setq comment-padding 0))
     (when (integerp comment-padding)
       (setq comment-padding (make-string comment-padding ? )))
     ;; comment markers
@@ -384,11 +387,11 @@
   (if (< n 0) (error "No comment-backward")
     (if comment-use-syntax (forward-comment n)
       (while (> n 0)
-	(skip-syntax-forward " ")
 	(setq n
-	      (if (and (looking-at comment-start-skip)
-		       (goto-char (match-end 0))
-		       (re-search-forward comment-end-skip nil 'move))
+	      (if (or (forward-comment 1)
+		      (and (looking-at comment-start-skip)
+			   (goto-char (match-end 0))
+			   (re-search-forward comment-end-skip nil 'move)))
 		  (1- n) -1)))
       (= n 0))))
 
@@ -461,11 +464,12 @@
 	  ;; comment-indent-function refuses delegates to indent.
 	  (indent-according-to-mode)
 	;; Avoid moving comments past the fill-column.
-	(setq indent
-	      (min indent
-		   (+ (current-column)
-		      (- fill-column
-			 (save-excursion (end-of-line) (current-column))))))
+	(unless (save-excursion (skip-chars-backward " \t") (bolp))
+	  (setq indent
+		(min indent
+		     (+ (current-column)
+			(- fill-column
+			   (save-excursion (end-of-line) (current-column)))))))
 	(if (= (current-column) indent)
 	    (goto-char begpos)
 	  ;; If that's different from current, change it.
Binary files src-21.1/lisp/newcomment.elc and src-21.2/lisp/newcomment.elc differ
diff -ruN src-21.1/lisp/novice.el src-21.2/lisp/novice.el
--- src-21.1/lisp/novice.el	Sun Jul 15 18:15:34 2001
+++ src-21.2/lisp/novice.el	Sat Feb  2 15:47:39 2002
@@ -107,10 +107,18 @@
 to future sessions."
   (interactive "CEnable command: ")
   (put command 'disabled nil)
-  (let ((init-file user-init-file))
-    (when (or (not (stringp init-file))
-	      (not (file-exists-p init-file)))
-      (setq init-file (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs"))
+  (let ((init-file user-init-file)
+	(default-init-file
+	  (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
+    (when (null init-file)
+      (if (or (file-exists-p default-init-file)
+	      (and (eq system-type 'windows-nt)
+		   (file-exists-p "~/_emacs")))
+	  ;; Started with -q, i.e. the file containing
+	  ;; enabled/disabled commands hasn't been read.  Saving
+	  ;; settings there would overwrite other settings.
+	  (error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
+      (setq init-file default-init-file)
       (if (and (not (file-exists-p init-file))
 	       (eq system-type 'windows-nt)
 	       (file-exists-p "~/_emacs"))
@@ -138,9 +146,25 @@
   (if (not (commandp command))
       (error "Invalid command name `%s'" command))
   (put command 'disabled t)
+  (let ((init-file user-init-file)
+	(default-init-file
+	  (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
+    (when (null init-file)
+      (if (or (file-exists-p default-init-file)
+	      (and (eq system-type 'windows-nt)
+		   (file-exists-p "~/_emacs")))
+	  ;; Started with -q, i.e. the file containing
+	  ;; enabled/disabled commands hasn't been read.  Saving
+	  ;; settings there would overwrite other settings.
+	  (error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
+      (setq init-file default-init-file)
+      (if (and (not (file-exists-p init-file))
+	       (eq system-type 'windows-nt)
+	       (file-exists-p "~/_emacs"))
+	  (setq init-file "~/_emacs")))
   (save-excursion
    (set-buffer (find-file-noselect
-		(substitute-in-file-name user-init-file)))
+		(substitute-in-file-name init-file)))
    (goto-char (point-min))
    (if (search-forward (concat "(put '" (symbol-name command) " ") nil t)
        (delete-region
@@ -148,7 +172,7 @@
 	(progn (forward-line 1) (point))))
    (goto-char (point-max))
    (insert "\n(put '" (symbol-name command) " 'disabled t)\n")
-   (save-buffer)))
+   (save-buffer))))
 
 (provide 'novice)
 
Binary files src-21.1/lisp/novice.elc and src-21.2/lisp/novice.elc differ
Binary files src-21.1/lisp/obsolete/auto-show.elc and src-21.2/lisp/obsolete/auto-show.elc differ
Binary files src-21.1/lisp/obsolete/c-mode.elc and src-21.2/lisp/obsolete/c-mode.elc differ
Binary files src-21.1/lisp/obsolete/cplus-md.elc and src-21.2/lisp/obsolete/cplus-md.elc differ
Binary files src-21.1/lisp/obsolete/hilit19.elc and src-21.2/lisp/obsolete/hilit19.elc differ
Binary files src-21.1/lisp/obsolete/hscroll.elc and src-21.2/lisp/obsolete/hscroll.elc differ
Binary files src-21.1/lisp/obsolete/ooutline.elc and src-21.2/lisp/obsolete/ooutline.elc differ
Binary files src-21.1/lisp/obsolete/profile.elc and src-21.2/lisp/obsolete/profile.elc differ
Binary files src-21.1/lisp/obsolete/rnews.elc and src-21.2/lisp/obsolete/rnews.elc differ
Binary files src-21.1/lisp/obsolete/rnewspost.elc and src-21.2/lisp/obsolete/rnewspost.elc differ
Binary files src-21.1/lisp/obsolete/rsz-mini.elc and src-21.2/lisp/obsolete/rsz-mini.elc differ
Binary files src-21.1/lisp/obsolete/sc.elc and src-21.2/lisp/obsolete/sc.elc differ
Binary files src-21.1/lisp/obsolete/sun-curs.elc and src-21.2/lisp/obsolete/sun-curs.elc differ
Binary files src-21.1/lisp/obsolete/sun-fns.elc and src-21.2/lisp/obsolete/sun-fns.elc differ
Binary files src-21.1/lisp/obsolete/uncompress.elc and src-21.2/lisp/obsolete/uncompress.elc differ
Binary files src-21.1/lisp/obsolete/x-apollo.elc and src-21.2/lisp/obsolete/x-apollo.elc differ
Binary files src-21.1/lisp/obsolete/x-menu.elc and src-21.2/lisp/obsolete/x-menu.elc differ
Binary files src-21.1/lisp/options.elc and src-21.2/lisp/options.elc differ
Binary files src-21.1/lisp/paren.elc and src-21.2/lisp/paren.elc differ
Binary files src-21.1/lisp/pcmpl-cvs.elc and src-21.2/lisp/pcmpl-cvs.elc differ
Binary files src-21.1/lisp/pcmpl-gnu.elc and src-21.2/lisp/pcmpl-gnu.elc differ
Binary files src-21.1/lisp/pcmpl-linux.elc and src-21.2/lisp/pcmpl-linux.elc differ
Binary files src-21.1/lisp/pcmpl-rpm.elc and src-21.2/lisp/pcmpl-rpm.elc differ
Binary files src-21.1/lisp/pcmpl-unix.elc and src-21.2/lisp/pcmpl-unix.elc differ
Binary files src-21.1/lisp/pcomplete.elc and src-21.2/lisp/pcomplete.elc differ
Binary files src-21.1/lisp/pcvs-defs.elc and src-21.2/lisp/pcvs-defs.elc differ
Binary files src-21.1/lisp/pcvs-info.elc and src-21.2/lisp/pcvs-info.elc differ
Binary files src-21.1/lisp/pcvs-parse.elc and src-21.2/lisp/pcvs-parse.elc differ
Binary files src-21.1/lisp/pcvs-util.elc and src-21.2/lisp/pcvs-util.elc differ
Binary files src-21.1/lisp/pcvs.elc and src-21.2/lisp/pcvs.elc differ
Binary files src-21.1/lisp/play/5x5.elc and src-21.2/lisp/play/5x5.elc differ
Binary files src-21.1/lisp/play/animate.elc and src-21.2/lisp/play/animate.elc differ
Binary files src-21.1/lisp/play/blackbox.elc and src-21.2/lisp/play/blackbox.elc differ
Binary files src-21.1/lisp/play/cookie1.elc and src-21.2/lisp/play/cookie1.elc differ
Binary files src-21.1/lisp/play/decipher.elc and src-21.2/lisp/play/decipher.elc differ
Binary files src-21.1/lisp/play/dissociate.elc and src-21.2/lisp/play/dissociate.elc differ
diff -ruN src-21.1/lisp/play/doctor.el src-21.2/lisp/play/doctor.el
--- src-21.1/lisp/play/doctor.el	Sun Jul 15 18:15:35 2001
+++ src-21.2/lisp/play/doctor.el	Tue Oct 23 18:16:47 2001
@@ -206,7 +206,7 @@
 	  (go on\, don\'t be afraid \.)
 	  (i need a little more detail please \.)
 	  (you\'re being a bit brief\, ($ please) go into detail \.)
-	  (can you ($ please) be more explicit \?)
+	  (can you be more explicit \?)
 	  (and \?)
 	  (($ please) go into more detail \?)
 	  (you aren\'t being very talkative today\!)
Binary files src-21.1/lisp/play/doctor.elc and src-21.2/lisp/play/doctor.elc differ
Binary files src-21.1/lisp/play/dunnet.elc and src-21.2/lisp/play/dunnet.elc differ
Binary files src-21.1/lisp/play/fortune.elc and src-21.2/lisp/play/fortune.elc differ
diff -ruN src-21.1/lisp/play/gamegrid.el src-21.2/lisp/play/gamegrid.el
--- src-21.1/lisp/play/gamegrid.el	Mon Jul 16 11:10:19 2001
+++ src-21.2/lisp/play/gamegrid.el	Wed Feb  6 12:50:36 2002
@@ -166,10 +166,10 @@
     face))
 
 (defun gamegrid-make-color-tty-face (color)
-  (let* ((hex (gamegrid-color color 1.0))
-	 (name (intern (format "gamegrid-color-tty-face-%s" hex)))
+  (let* ((color-str (symbol-value color))
+	 (name (intern (format "gamegrid-color-tty-face-%s" color-str)))
 	 (face (make-face name)))
-    (gamegrid-setup-face face color)
+    (gamegrid-setup-face face color-str)
     face))
 
 (defun gamegrid-make-grid-x-face ()
@@ -190,7 +190,7 @@
   (let* ((hex (gamegrid-color color 1.0))
 	 (name (intern (format "gamegrid-color-x-face-%s" hex)))
 	 (face (make-face name)))
-    (gamegrid-setup-face face (gamegrid-color color 1.0))
+    (gamegrid-setup-face face hex)
     face))
 
 (defun gamegrid-make-face (data-spec-list color-spec-list)
@@ -257,6 +257,8 @@
   (let ((window-system-p 
 	 (or (and (fboundp 'console-on-window-system-p)
 		  (console-on-window-system-p))
+	     (and (fboundp 'display-color-p)
+		  (display-color-p))
 	     window-system)))
   (cond ((and gamegrid-use-glyphs
 		window-system-p
Binary files src-21.1/lisp/play/gamegrid.elc and src-21.2/lisp/play/gamegrid.elc differ
Binary files src-21.1/lisp/play/gametree.elc and src-21.2/lisp/play/gametree.elc differ
diff -ruN src-21.1/lisp/play/gomoku.el src-21.2/lisp/play/gomoku.el
--- src-21.1/lisp/play/gomoku.el	Sun Jun 17 13:19:11 2001
+++ src-21.2/lisp/play/gomoku.el	Tue Nov 20 19:40:55 2001
@@ -167,6 +167,9 @@
 (put 'gomoku-mode 'front-sticky
      (put 'gomoku-mode 'rear-nonsticky '(intangible)))
 (put 'gomoku-mode 'intangible 1)
+;; This one is for when they set view-read-only to t: Gomoku cannot
+;; allow View Mode to be activated in its buffer.
+(put 'gomoku-mode 'mode-class 'special)
 
 (defun gomoku-mode ()
   "Major mode for playing Gomoku against Emacs.
Binary files src-21.1/lisp/play/gomoku.elc and src-21.2/lisp/play/gomoku.elc differ
Binary files src-21.1/lisp/play/handwrite.elc and src-21.2/lisp/play/handwrite.elc differ
Binary files src-21.1/lisp/play/hanoi.elc and src-21.2/lisp/play/hanoi.elc differ
diff -ruN src-21.1/lisp/play/landmark.el src-21.2/lisp/play/landmark.el
--- src-21.1/lisp/play/landmark.el	Tue Jul 17 09:37:19 2001
+++ src-21.2/lisp/play/landmark.el	Tue Nov 20 21:35:21 2001
@@ -237,6 +237,9 @@
 (put 'lm-mode 'front-sticky
      (put 'lm-mode 'rear-nonsticky '(intangible)))
 (put 'lm-mode 'intangible 1)
+;; This one is for when they set view-read-only to t: Landmark cannot
+;; allow View Mode to be activated in its buffer.
+(put 'lm-mode 'mode-class 'special)
 
 (defun lm-mode ()
   "Major mode for playing Lm against Emacs.
Binary files src-21.1/lisp/play/landmark.elc and src-21.2/lisp/play/landmark.elc differ
Binary files src-21.1/lisp/play/life.elc and src-21.2/lisp/play/life.elc differ
Binary files src-21.1/lisp/play/meese.elc and src-21.2/lisp/play/meese.elc differ
Binary files src-21.1/lisp/play/morse.elc and src-21.2/lisp/play/morse.elc differ
Binary files src-21.1/lisp/play/mpuz.elc and src-21.2/lisp/play/mpuz.elc differ
diff -ruN src-21.1/lisp/play/pong.el src-21.2/lisp/play/pong.el
--- src-21.1/lisp/play/pong.el	Tue Jul 17 09:37:19 2001
+++ src-21.2/lisp/play/pong.el	Wed Feb  6 13:06:53 2002
@@ -49,7 +49,7 @@
   :group 'pong
   :type '(integer))
 
-(defcustom pong-height 30
+(defcustom pong-height (min 30 (- (frame-height) 6))
   "*Height of the playfield."
   :group 'pong
   :type '(integer))
@@ -156,7 +156,11 @@
      (t ?\+))
     ((color-x color-x)
      (mono-x grid-x))
-    (((glyph color-x) [0.5 0.5 0.5])
+    ;; The colors used to be [0.5 0.5 0.5], but that produces a black
+    ;; color on 8-color tty's, which would make the border invisible.
+    ;; 0.51 produces white on such tty's, and at the same time has
+    ;; almost no effect on X and similar displays.
+    (((glyph color-x) [0.51 0.51 0.51])
      (color-tty pong-border-color))))
 
 (defconst pong-blank	0)
Binary files src-21.1/lisp/play/pong.elc and src-21.2/lisp/play/pong.elc differ
Binary files src-21.1/lisp/play/snake.elc and src-21.2/lisp/play/snake.elc differ
Binary files src-21.1/lisp/play/solitaire.elc and src-21.2/lisp/play/solitaire.elc differ
Binary files src-21.1/lisp/play/spook.elc and src-21.2/lisp/play/spook.elc differ
Binary files src-21.1/lisp/play/studly.elc and src-21.2/lisp/play/studly.elc differ
Binary files src-21.1/lisp/play/tetris.elc and src-21.2/lisp/play/tetris.elc differ
Binary files src-21.1/lisp/play/yow.elc and src-21.2/lisp/play/yow.elc differ
Binary files src-21.1/lisp/play/zone.elc and src-21.2/lisp/play/zone.elc differ
diff -ruN src-21.1/lisp/progmodes/ada-mode.el src-21.2/lisp/progmodes/ada-mode.el
--- src-21.1/lisp/progmodes/ada-mode.el	Mon Jul 16 17:12:19 2001
+++ src-21.2/lisp/progmodes/ada-mode.el	Thu Nov 15 17:20:56 2001
@@ -7,7 +7,7 @@
 ;;      Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Emmanuel Briot  <briot@gnat.com>
 ;; Maintainer: Emmanuel Briot <briot@gnat.com>
-;; Ada Core Technologies's version:   $Revision: 1.43 $
+;; Ada Core Technologies's version:   $Revision: 1.43.4.2 $
 ;; Keywords: languages ada
 
 ;; This file is part of GNU Emacs.
@@ -281,9 +281,9 @@
   "*Non-nil means indent according to the innermost open parenthesis."
   :type 'boolean :group 'ada)
 
-(defcustom ada-fill-comment-prefix "-- "
+(defcustom ada-fill-comment-prefix "--  "
   "*Text inserted in the first columns when filling a comment paragraph.
-Note: if you modify this variable, you will have to restart the ada-mode to
+Note: if you modify this variable, you will have to restart the `ada-mode' to
 reread this variable."
   :type 'string :group 'ada)
 
@@ -937,8 +937,10 @@
         (setcdr tmp (list (cons body (cadr tmp))))
       (add-to-list 'ada-other-file-alist (list reg (list body)))))
 
-  (add-to-list 'auto-mode-alist (cons spec 'ada-mode))
-  (add-to-list 'auto-mode-alist (cons body 'ada-mode))
+  (add-to-list 'auto-mode-alist
+	       (cons (concat (regexp-quote spec) "\\'") 'ada-mode))
+  (add-to-list 'auto-mode-alist
+	       (cons (concat (regexp-quote body) "\\'") 'ada-mode))
 
   (add-to-list 'ada-spec-suffixes spec)
   (add-to-list 'ada-body-suffixes body)
Binary files src-21.1/lisp/progmodes/ada-mode.elc and src-21.2/lisp/progmodes/ada-mode.elc differ
Binary files src-21.1/lisp/progmodes/ada-prj.elc and src-21.2/lisp/progmodes/ada-prj.elc differ
Binary files src-21.1/lisp/progmodes/ada-stmt.elc and src-21.2/lisp/progmodes/ada-stmt.elc differ
Binary files src-21.1/lisp/progmodes/ada-xref.elc and src-21.2/lisp/progmodes/ada-xref.elc differ
Binary files src-21.1/lisp/progmodes/antlr-mode.elc and src-21.2/lisp/progmodes/antlr-mode.elc differ
Binary files src-21.1/lisp/progmodes/asm-mode.elc and src-21.2/lisp/progmodes/asm-mode.elc differ
diff -ruN src-21.1/lisp/progmodes/autoconf.el src-21.2/lisp/progmodes/autoconf.el
--- src-21.1/lisp/progmodes/autoconf.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/progmodes/autoconf.el	Wed Oct 31 03:33:29 2001
@@ -4,7 +4,7 @@
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: languages
-;; $Revision: 1.2 $
+;; $Revision: 1.2.4.1 $
 
 ;; This file is part of GNU Emacs.
 
@@ -93,7 +93,7 @@
   (set (make-local-variable 'defun-prompt-regexp)
        "^[ \t]*A[CM]_\\(\\sw\\|\\s_\\)+")
   (set (make-local-variable 'comment-start) "dnl ")
-  (set (make-local-variable 'comment-start-skip) "\\(\\<dnl\\|#\\) +")
+  (set (make-local-variable 'comment-start-skip) "\\(?:\\<dnl\\|#\\) +")
   (set (make-local-variable 'font-lock-syntactic-keywords)
        autoconf-font-lock-syntactic-keywords)
   (set (make-local-variable 'font-lock-defaults)
Binary files src-21.1/lisp/progmodes/autoconf.elc and src-21.2/lisp/progmodes/autoconf.elc differ
Binary files src-21.1/lisp/progmodes/awk-mode.elc and src-21.2/lisp/progmodes/awk-mode.elc differ
Binary files src-21.1/lisp/progmodes/cc-align.elc and src-21.2/lisp/progmodes/cc-align.elc differ
Binary files src-21.1/lisp/progmodes/cc-bytecomp.elc and src-21.2/lisp/progmodes/cc-bytecomp.elc differ
Binary files src-21.1/lisp/progmodes/cc-cmds.elc and src-21.2/lisp/progmodes/cc-cmds.elc differ
Binary files src-21.1/lisp/progmodes/cc-compat.elc and src-21.2/lisp/progmodes/cc-compat.elc differ
Binary files src-21.1/lisp/progmodes/cc-defs.elc and src-21.2/lisp/progmodes/cc-defs.elc differ
diff -ruN src-21.1/lisp/progmodes/cc-engine.el src-21.2/lisp/progmodes/cc-engine.el
--- src-21.1/lisp/progmodes/cc-engine.el	Mon Jul 16 09:46:48 2001
+++ src-21.2/lisp/progmodes/cc-engine.el	Mon Nov 19 23:54:41 2001
@@ -708,7 +708,7 @@
 			    (<= placeholder here)
 			    (eq (char-after (1- placeholder)) ?\}))
 		       (while t
-			 (setq last-bod (c-safe (scan-lists last-bod -1 1)))
+			 (setq last-bod (c-safe (scan-lists last-pos -1 1)))
 			 (if (not last-bod)
 			     (save-excursion
 			       ;; bogus, but what can we do here?
@@ -1028,31 +1028,30 @@
   (if (eq (char-after) ?,)
       (forward-char 1)
     (c-backward-syntactic-ws limit))
-  (c-with-syntax-table (if (c-major-mode-is 'c++-mode)
-			   c++-template-syntax-table
-			 (syntax-table))
-    (while (and (< limit (point))
-		(eq (char-before) ?,))
-      ;; this will catch member inits with multiple
-      ;; line arglists
-      (forward-char -1)
-      (c-backward-syntactic-ws)
-      (if (eq (char-before) ?\))
-	  (c-backward-sexp 2)
+  (while (and (< limit (point))
+	      (eq (char-before) ?,))
+    ;; this will catch member inits with multiple
+    ;; line arglists
+    (forward-char -1)
+    (c-backward-syntactic-ws limit)
+    (if (eq (char-before) ?\))
 	(c-backward-sexp 1))
-      ;; Skip over any template arg to the class.
-      (if (eq (char-after) ?<)
-	  (c-backward-sexp 1))
-      ;; Skip backwards over a fully::qualified::name.
-      (c-backward-syntactic-ws limit)
-      (while (and (eq (char-before) ?:)
-		  (save-excursion
-		    (forward-char -1)
-		    (eq (char-before) ?:)))
-	(backward-char 2)
-	(c-backward-sexp 1))
-      ;; now continue checking
-      (c-backward-syntactic-ws limit)))
+    (c-backward-syntactic-ws limit)
+    ;; Skip over any template arg to the class.
+    (if (eq (char-before) ?>)
+	(c-with-syntax-table c++-template-syntax-table
+	  (c-backward-sexp 1)))
+    (c-backward-sexp 1)
+    (c-backward-syntactic-ws limit)
+    ;; Skip backwards over a fully::qualified::name.
+    (while (and (eq (char-before) ?:)
+		(save-excursion
+		  (forward-char -1)
+		  (eq (char-before) ?:)))
+      (backward-char 2)
+      (c-backward-sexp 1))
+    ;; now continue checking
+    (c-backward-syntactic-ws limit))
   (and (< limit (point))
        (eq (char-before) ?:)))
 
Binary files src-21.1/lisp/progmodes/cc-engine.elc and src-21.2/lisp/progmodes/cc-engine.elc differ
Binary files src-21.1/lisp/progmodes/cc-langs.elc and src-21.2/lisp/progmodes/cc-langs.elc differ
Binary files src-21.1/lisp/progmodes/cc-menus.elc and src-21.2/lisp/progmodes/cc-menus.elc differ
Binary files src-21.1/lisp/progmodes/cc-mode.elc and src-21.2/lisp/progmodes/cc-mode.elc differ
Binary files src-21.1/lisp/progmodes/cc-styles.elc and src-21.2/lisp/progmodes/cc-styles.elc differ
Binary files src-21.1/lisp/progmodes/cc-vars.elc and src-21.2/lisp/progmodes/cc-vars.elc differ
Binary files src-21.1/lisp/progmodes/cmacexp.elc and src-21.2/lisp/progmodes/cmacexp.elc differ
diff -ruN src-21.1/lisp/progmodes/compile.el src-21.2/lisp/progmodes/compile.el
--- src-21.1/lisp/progmodes/compile.el	Wed Sep 19 22:59:24 2001
+++ src-21.2/lisp/progmodes/compile.el	Wed Dec 26 22:31:43 2001
@@ -1,6 +1,7 @@
 ;;; compile.el --- run compiler as inferior of Emacs, parse error messages
 
-;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 1999, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 1999, 2001
+;;  Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: FSF
@@ -114,6 +115,11 @@
 `compilation-error-list' to a list with an element for each error message
 found.  See that variable for more info.")
 
+(defvar compilation-parse-errors-filename-function nil
+  "Function to call to post-process filenames while parsing error messages.
+It takes one arg FILENAME which is the name of a file as found
+in the compilation output, and should return a transformed file name.")
+
 ;;;###autoload
 (defvar compilation-process-setup-function nil
   "*Function to call to customize the compilation process.
@@ -820,14 +826,24 @@
 	    (funcall compilation-process-setup-function))
 	;; Start the compilation.
 	(if (fboundp 'start-process)
-	    (let* ((process-environment
-		    ;; Don't override users' setting of $EMACS.
-		    (if (getenv "EMACS")
-			process-environment
-		      (cons "EMACS=t" process-environment)))
+	    (let* ((process-environment process-environment)
 		   (proc (start-process-shell-command (downcase mode-name)
 						      outbuf
 						      command)))
+	      ;; Set the terminal type
+	      (setq process-environment
+		    (if (and (boundp 'system-uses-terminfo)
+			     system-uses-terminfo)
+			(list "TERM=dumb" "TERMCAP="
+			      (format "COLUMNS=%d" (window-width)))
+		      (list "TERM=emacs"
+			    (format "TERMCAP=emacs:co#%d:tc=unknown:"
+				    (window-width)))))
+	      ;; Set the EMACS variable, but
+	      ;; don't override users' setting of $EMACS.
+	      (if (getenv "EMACS")
+		  (setq process-environment
+			(cons "EMACS=t" process-environment)))
 	      (set-process-sentinel proc 'compilation-sentinel)
 	      (set-process-filter proc 'compilation-filter)
 	      (set-marker (process-mark proc) (point) outbuf)
@@ -877,7 +893,10 @@
 		 (select-window window)
 		 (enlarge-window (- compilation-window-height
 				    (window-height))))
-	     (select-window w))))))
+	     ;; The enlarge-window above may have deleted W, if
+	     ;; compilation-window-height is large enough.
+	     (when (window-live-p w)
+	       (select-window w)))))))
 
 (defvar compilation-minor-mode-map
   (let ((map (make-sparse-keymap)))
@@ -1873,6 +1892,13 @@
 			 (file-name-absolute-p filename)
 			 (setq filename
 			       (concat comint-file-name-prefix filename)))
+
+		    ;; If compilation-parse-errors-filename-function is
+		    ;; defined, use it to process the filename.
+		    (when compilation-parse-errors-filename-function
+		      (setq filename
+			    (funcall compilation-parse-errors-filename-function
+				     filename)))
 
 		    ;; Some compilers (e.g. Sun's java compiler, reportedly)
 		    ;; produce bogus file names like "./bar//foo.c" for file
Binary files src-21.1/lisp/progmodes/compile.elc and src-21.2/lisp/progmodes/compile.elc differ
diff -ruN src-21.1/lisp/progmodes/cperl-mode.el src-21.2/lisp/progmodes/cperl-mode.el
--- src-21.1/lisp/progmodes/cperl-mode.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/progmodes/cperl-mode.el	Tue Nov 20 15:20:12 2001
@@ -6770,6 +6770,7 @@
                    (error "No perldoc args given")
                  default-entry)
              input))))
+  (require 'man)
   (let* ((is-func (and
 		   (string-match "^[a-z]+$" word)
 		   (string-match (concat "^" word "\\>")
@@ -6777,7 +6778,6 @@
 				  'cperl-short-docs
 				  'variable-documentation))))
 	 (manual-program (if is-func "perldoc -f" "perldoc")))
-    (require 'man)
     (Man-getpage-in-background word)))
 
 (defun cperl-perldoc-at-point ()
Binary files src-21.1/lisp/progmodes/cperl-mode.elc and src-21.2/lisp/progmodes/cperl-mode.elc differ
Binary files src-21.1/lisp/progmodes/cpp.elc and src-21.2/lisp/progmodes/cpp.elc differ
diff -ruN src-21.1/lisp/progmodes/cwarn.el src-21.2/lisp/progmodes/cwarn.el
--- src-21.1/lisp/progmodes/cwarn.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/progmodes/cwarn.el	Mon Oct 22 00:48:18 2001
@@ -1,6 +1,6 @@
 ;;; cwarn.el --- highlight suspicious C and C++ constructions
 
-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren <andersl@andersl.com>
 ;; Keywords: c, languages, faces
@@ -168,7 +168,7 @@
   :type '(alist :key-type (choice (const assign)
 				  (const semicolon)
 				  (const reference))
-		:value-type face)
+		:value-type (sexp :tag "Value"))
   :group 'cwarn)
 
 (defcustom cwarn-verbose t
Binary files src-21.1/lisp/progmodes/cwarn.elc and src-21.2/lisp/progmodes/cwarn.elc differ
Binary files src-21.1/lisp/progmodes/dcl-mode.elc and src-21.2/lisp/progmodes/dcl-mode.elc differ
Binary files src-21.1/lisp/progmodes/delphi.elc and src-21.2/lisp/progmodes/delphi.elc differ
Binary files src-21.1/lisp/progmodes/ebnf-bnf.elc and src-21.2/lisp/progmodes/ebnf-bnf.elc differ
Binary files src-21.1/lisp/progmodes/ebnf-iso.elc and src-21.2/lisp/progmodes/ebnf-iso.elc differ
Binary files src-21.1/lisp/progmodes/ebnf-otz.elc and src-21.2/lisp/progmodes/ebnf-otz.elc differ
Binary files src-21.1/lisp/progmodes/ebnf-yac.elc and src-21.2/lisp/progmodes/ebnf-yac.elc differ
Binary files src-21.1/lisp/progmodes/ebnf2ps.elc and src-21.2/lisp/progmodes/ebnf2ps.elc differ
diff -ruN src-21.1/lisp/progmodes/ebrowse.el src-21.2/lisp/progmodes/ebrowse.el
--- src-21.1/lisp/progmodes/ebrowse.el	Sun Jul 15 18:15:35 2001
+++ src-21.2/lisp/progmodes/ebrowse.el	Wed Mar 13 20:52:04 2002
@@ -1,6 +1,7 @@
 ;;; ebrowse.el --- Emacs C++ class browser & tags facility
 
-;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation Inc.
+;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
+;;  Free Software Foundation Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Maintainer: FSF
@@ -1675,7 +1676,7 @@
   (setf file (ebrowse-find-source-file file tags-file-name))
   ;; If current window is dedicated, use another frame.
   (when (window-dedicated-p (selected-window))
-    (setf where 'other-frame))
+    (setf where 'other-window))
   (cond (view
 	 (setf ebrowse-temp-position-to-view struc
 	       ebrowse-temp-info-to-view info)
@@ -3818,7 +3819,7 @@
   (setq ebrowse-tags-loop-form
 	(list 'and (list 'save-excursion
 			 (list 're-search-forward from nil t))
-	      (list 'not (list 'perform-replace from to nil nil t t nil))))
+	      (list 'not (list 'perform-replace from to t t nil))))
   (ebrowse-tags-loop-continue 'first-time))
 
 
Binary files src-21.1/lisp/progmodes/ebrowse.elc and src-21.2/lisp/progmodes/ebrowse.elc differ
diff -ruN src-21.1/lisp/progmodes/etags.el src-21.2/lisp/progmodes/etags.el
--- src-21.1/lisp/progmodes/etags.el	Thu May 31 16:33:15 2001
+++ src-21.2/lisp/progmodes/etags.el	Sat Feb 23 10:02:05 2002
@@ -832,7 +832,7 @@
 
 If third arg REGEXP-P is non-nil, treat TAGNAME as a regexp.
 
-A marker representing the point when this command is onvoked is pushed
+A marker representing the point when this command is invoked is pushed
 onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
@@ -904,7 +904,7 @@
 
 If third arg REGEXP-P is non-nil, treat TAGNAME as a regexp.
 
-A marker representing the point when this command is onvoked is pushed
+A marker representing the point when this command is invoked is pushed
 onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
@@ -931,7 +931,7 @@
 
 If third arg REGEXP-P is non-nil, treat TAGNAME as a regexp.
 
-A marker representing the point when this command is onvoked is pushed
+A marker representing the point when this command is invoked is pushed
 onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
@@ -972,7 +972,7 @@
 
 If third arg REGEXP-P is non-nil, treat TAGNAME as a regexp.
 
-A marker representing the point when this command is onvoked is pushed
+A marker representing the point when this command is invoked is pushed
 onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
@@ -995,7 +995,7 @@
 
 If third arg OTHER-WINDOW is non-nil, select the buffer in another window.
 
-A marker representing the point when this command is onvoked is pushed
+A marker representing the point when this command is invoked is pushed
 onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
@@ -1743,7 +1743,7 @@
 				   ;; will see it.
 				   '(goto-char (match-beginning 0))))
 	tags-loop-operate (list 'perform-replace
-				(list 'quote from) (list 'quote to) nil nil
+				(list 'quote from) (list 'quote to)
 				t t (list 'quote delimited)))
   (tags-loop-continue (or file-list-form t)))
 
Binary files src-21.1/lisp/progmodes/etags.elc and src-21.2/lisp/progmodes/etags.elc differ
Binary files src-21.1/lisp/progmodes/executable.elc and src-21.2/lisp/progmodes/executable.elc differ
diff -ruN src-21.1/lisp/progmodes/f90.el src-21.2/lisp/progmodes/f90.el
--- src-21.1/lisp/progmodes/f90.el	Thu Feb  1 16:59:04 2001
+++ src-21.2/lisp/progmodes/f90.el	Tue Dec 18 16:19:04 2001
@@ -143,9 +143,6 @@
 
 ;;; Code:
 
-(defconst bug-f90-mode "T.Einarsson@clab.ericsson.se"
-  "Address of mailing list for F90 mode bugs.")
-
 ;; User options
 
 (defgroup f90 nil
@@ -1472,14 +1469,14 @@
   (interactive)
   (let (ctype)
     (cond ((f90-in-string)
-	   (insert "&") (newline) (insert "&"))
+	   (insert "&\n&"))
 	  ((f90-in-comment)
 	   (setq ctype (f90-get-present-comment-type))
-	   (newline)
+	   (newline 1)
 	   (insert ctype))
 	  (t (insert "&")
 	     (if (not no-update) (f90-update-line))
-	     (newline)
+	     (newline 1)
 	     (if f90-beginning-ampersand (insert "&")))))
   (f90-indent-line))
   
Binary files src-21.1/lisp/progmodes/f90.elc and src-21.2/lisp/progmodes/f90.elc differ
diff -ruN src-21.1/lisp/progmodes/fortran.el src-21.2/lisp/progmodes/fortran.el
--- src-21.1/lisp/progmodes/fortran.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/progmodes/fortran.el	Thu Nov 29 12:56:09 2001
@@ -1,6 +1,6 @@
 ;;; fortran.el --- Fortran mode for GNU Emacs
 
-;; Copyright (c) 1986, 93, 94, 95, 97, 98, 99, 2000
+;; Copyright (c) 1986, 93, 94, 95, 97, 98, 99, 2000, 2001
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Michael D. Prange <prange@erl.mit.edu>
@@ -30,7 +30,9 @@
 ;;
 ;; Note that it is for editing Fortran77 or Fortran90 fixed source
 ;; form.  For editing Fortran 90 free format source, use `f90-mode'
-;; (f90.el).
+;; (f90.el).  It is meant to support the GNU Fortran language
+;; implemented by g77 (its extensions to Fortran77 and
+;; interpretations, e.g. of blackslash in strings).
 
 ;;; History:
 
@@ -49,7 +51,7 @@
 ;; * Implement insertion and removal of statement continuations in
 ;;   mixed f77/f90 style, with the first `&' past column 72 and the
 ;;   second in column 6.
-;; * Support any other extensions to f77 grokked by GNU Fortran.
+;; * Support any other extensions to f77 grokked by GNU Fortran I've missed.
 
 (defgroup fortran nil
   "Fortran mode for Emacs"
@@ -232,6 +234,7 @@
     (modify-syntax-entry ?/ "." table)
     (modify-syntax-entry ?\' "\"" table)
     (modify-syntax-entry ?\" "\"" table)
+    ;; Consistent with GNU Fortran -- see the manual.
     (modify-syntax-entry ?\\ "\\" table)
     ;; This might be better as punctuation, as for C, but this way you
     ;; can treat floating-point numbers as symbols.
@@ -292,7 +295,8 @@
          (regexp-opt '("continue" "format" "end" "enddo" "if" "then"
                        "else" "endif" "elseif" "while" "inquire" "stop"
                        "return" "include" "open" "close" "read" "write"
-                       "format" "print" "select" "case" "cycle" "exit"))))
+                       "format" "print" "select" "case" "cycle" "exit"
+		       "rewind" "backspace"))))
       (fortran-logicals
        (eval-when-compile
          (regexp-opt '("and" "or" "not" "lt" "le" "eq" "ge" "gt" "ne"
@@ -361,7 +365,7 @@
           ;; TAB-formatted line.
           '("^     \\([^ 0]\\)" 1 font-lock-string-face)
           '("^\t\\([1-9]\\)" 1 font-lock-string-face))
-	 (list 
+	 (list
 	  ;; cpp stuff (ugh)
 	  '("^# *[a-z]+" . font-lock-keyword-face))
          ;; The list `fortran-font-lock-keywords-2' less that for types
@@ -929,7 +933,7 @@
 ;; Note that you can't just check backwards for `subroutine' &c in
 ;; case of un-marked main programs not at the start of the file.
 (defun fortran-beginning-of-subprogram ()
-  "Moves point to the beginning of the current Fortran subprogram."
+  "Move point to the beginning of the current Fortran subprogram."
   (interactive)
   (save-match-data
     (let ((case-fold-search t))
@@ -941,7 +945,7 @@
 	  (forward-line)))))
 
 (defun fortran-end-of-subprogram ()
-  "Moves point to the end of the current Fortran subprogram."
+  "Move point to the end of the current Fortran subprogram."
   (interactive)
   (save-match-data
     (let ((case-fold-search t))
@@ -959,7 +963,7 @@
 	(forward-line)))))
 
 (defun fortran-previous-statement ()
-  "Moves point to beginning of the previous Fortran statement.
+  "Move point to beginning of the previous Fortran statement.
 Returns `first-statement' if that statement is the first
 non-comment Fortran statement in the file, and nil otherwise."
   (interactive)
@@ -985,7 +989,7 @@
 	   'first-statement))))
 
 (defun fortran-next-statement ()
-  "Moves point to beginning of the next Fortran statement.
+  "Move point to beginning of the next Fortran statement.
 Returns `last-statement' if that statement is the last
 non-comment Fortran statement in the file, and nil otherwise."
   (interactive)
@@ -1097,7 +1101,7 @@
 				(fortran-check-end-prog-re))))
 	    (skip-chars-forward " \t0-9")
 	    (cond ((looking-at
-		    "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[^0-9]")
+		    "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[0-9]")
 		   (setq count (1- count)))
 		  ((looking-at "end[ \t]*do\\b")
 		   (setq count (1+ count)))))
@@ -1214,7 +1218,7 @@
 				  (setq then-test
 					(looking-at
 					 (concat ".*then\\b[ \t]*"
-						 "[^ \t(=a-z[0-9]]"))))))
+						 "[^ \t(=a-z0-9]"))))))
 			    then-test))
 			 (setq count (- count 1)))))
 		  ((looking-at "end[ \t]*if\\b")
@@ -1733,7 +1737,7 @@
 	;; paragraph, delimited either by non-comment lines or empty
 	;; comments.  (Get positions as markers, since the
 	;; `indent-region' below can shift the block's end).
-	(let* ((non-empty-comment 
+	(let* ((non-empty-comment
 		(concat fortran-comment-line-start-skip "[^ \t\n]"))
 	       (start (save-excursion
 			;; Find (start of) first line.
@@ -1744,7 +1748,7 @@
 			(point-marker)))
 	       (end (save-excursion
 		      ;; Find start of first line past region to fill.
-		      (while (progn 
+		      (while (progn
 			       (forward-line)
 			       (looking-at non-empty-comment)))
 		      (point-marker))))
Binary files src-21.1/lisp/progmodes/fortran.elc and src-21.2/lisp/progmodes/fortran.elc differ
Binary files src-21.1/lisp/progmodes/glasses.elc and src-21.2/lisp/progmodes/glasses.elc differ
Binary files src-21.1/lisp/progmodes/hideif.elc and src-21.2/lisp/progmodes/hideif.elc differ
Binary files src-21.1/lisp/progmodes/hideshow.elc and src-21.2/lisp/progmodes/hideshow.elc differ
Binary files src-21.1/lisp/progmodes/icon.elc and src-21.2/lisp/progmodes/icon.elc differ
diff -ruN src-21.1/lisp/progmodes/idlw-rinfo.el src-21.2/lisp/progmodes/idlw-rinfo.el
--- src-21.1/lisp/progmodes/idlw-rinfo.el	Tue Dec 19 12:15:15 2000
+++ src-21.2/lisp/progmodes/idlw-rinfo.el	Sat Dec  1 14:14:33 2001
@@ -2,6 +2,7 @@
 ;; Copyright (c) 1999, 2000 Free Software Foundation
 
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
+;; Maintainer: John-David Smith <jdsmith@astro.cornell.edu>
 ;; Version: 4.7
 ;; Keywords: languages
 
Binary files src-21.1/lisp/progmodes/idlw-rinfo.elc and src-21.2/lisp/progmodes/idlw-rinfo.elc differ
diff -ruN src-21.1/lisp/progmodes/idlw-shell.el src-21.2/lisp/progmodes/idlw-shell.el
--- src-21.1/lisp/progmodes/idlw-shell.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/progmodes/idlw-shell.el	Sat Dec  1 14:14:33 2001
@@ -2,9 +2,9 @@
 ;; Copyright (c) 1999, 2000 Free Software Foundation
 
 ;; Author: Chris Chase <chase@att.com>
-;; Maintainer: Carsten Dominik <dominik@strw.leidenuniv.nl>
+;; Maintainer: John-David Smith <jdsmith@astro.cornell.edu>
 ;; Version: 4.7
-;; Date: $Date: 2001/07/16 12:22:59 $
+;; Date: $Date: 2001/12/01 13:14:33 $
 ;; Keywords: processes
 
 ;; This file is part of GNU Emacs.
Binary files src-21.1/lisp/progmodes/idlw-shell.elc and src-21.2/lisp/progmodes/idlw-shell.elc differ
diff -ruN src-21.1/lisp/progmodes/idlw-toolbar.el src-21.2/lisp/progmodes/idlw-toolbar.el
--- src-21.1/lisp/progmodes/idlw-toolbar.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/progmodes/idlw-toolbar.el	Sat Dec  1 14:14:33 2001
@@ -2,8 +2,9 @@
 ;; Copyright (c) 1999, 2000 Free Software Foundation
 
 ;; Author: Carsten Dominik <dominik@strw.leidenuniv.nl>
+;; Maintainer: John-David Smith <jdsmith@astro.cornell.edu>
 ;; Version: 4.7
-;; Date: $Date: 2001/07/16 12:22:59 $
+;; Date: $Date: 2001/12/01 13:14:33 $
 ;; Keywords: processes
 
 ;; This file is part of GNU Emacs.
Binary files src-21.1/lisp/progmodes/idlw-toolbar.elc and src-21.2/lisp/progmodes/idlw-toolbar.elc differ
diff -ruN src-21.1/lisp/progmodes/idlwave.el src-21.2/lisp/progmodes/idlwave.el
--- src-21.1/lisp/progmodes/idlwave.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/progmodes/idlwave.el	Sat Dec  1 14:14:33 2001
@@ -2,9 +2,9 @@
 ;; Copyright (c) 1999, 2000 Free Software Foundation
 
 ;; Author: Chris Chase <chase@att.com>
-;; Maintainer: Carsten Dominik <dominik@strw.leidenuniv.nl>
+;; Maintainer: John-David Smith <jdsmith@astro.cornell.edu>
 ;; Version: 4.7
-;; Date: $Date: 2001/07/16 12:22:59 $
+;; Date: $Date: 2001/12/01 13:14:33 $
 ;; Keywords: languages
 
 ;; This file is part of GNU Emacs.
Binary files src-21.1/lisp/progmodes/idlwave.elc and src-21.2/lisp/progmodes/idlwave.elc differ
Binary files src-21.1/lisp/progmodes/inf-lisp.elc and src-21.2/lisp/progmodes/inf-lisp.elc differ
Binary files src-21.1/lisp/progmodes/m4-mode.elc and src-21.2/lisp/progmodes/m4-mode.elc differ
Binary files src-21.1/lisp/progmodes/make-mode.elc and src-21.2/lisp/progmodes/make-mode.elc differ
Binary files src-21.1/lisp/progmodes/mantemp.elc and src-21.2/lisp/progmodes/mantemp.elc differ
Binary files src-21.1/lisp/progmodes/meta-mode.elc and src-21.2/lisp/progmodes/meta-mode.elc differ
Binary files src-21.1/lisp/progmodes/modula2.elc and src-21.2/lisp/progmodes/modula2.elc differ
Binary files src-21.1/lisp/progmodes/octave-hlp.elc and src-21.2/lisp/progmodes/octave-hlp.elc differ
Binary files src-21.1/lisp/progmodes/octave-inf.elc and src-21.2/lisp/progmodes/octave-inf.elc differ
Binary files src-21.1/lisp/progmodes/octave-mod.elc and src-21.2/lisp/progmodes/octave-mod.elc differ
diff -ruN src-21.1/lisp/progmodes/pascal.el src-21.2/lisp/progmodes/pascal.el
--- src-21.1/lisp/progmodes/pascal.el	Thu May 18 20:38:09 2000
+++ src-21.2/lisp/progmodes/pascal.el	Fri Feb 22 11:51:40 2002
@@ -100,7 +100,7 @@
   )
 
 (defvar pascal-imenu-generic-expression
-  '("^[ \t]*\\(function\\|procedure\\)[ \t\n]+\\([a-zA-Z0-9_.:]+\\)" . (2))
+  '((nil "^[ \t]*\\(function\\|procedure\\)[ \t\n]+\\([a-zA-Z0-9_.:]+\\)" 2))
   "Imenu expression for Pascal-mode.  See `imenu-generic-expression'.")
 
 (defvar pascal-keywords
Binary files src-21.1/lisp/progmodes/pascal.elc and src-21.2/lisp/progmodes/pascal.elc differ
diff -ruN src-21.1/lisp/progmodes/perl-mode.el src-21.2/lisp/progmodes/perl-mode.el
--- src-21.1/lisp/progmodes/perl-mode.el	Sun Jun 10 20:02:01 2001
+++ src-21.2/lisp/progmodes/perl-mode.el	Wed Oct 31 03:42:09 2001
@@ -475,7 +475,7 @@
     (beginning-of-line)
     (setq beg (point))
     (setq shift-amt
-	  (cond ((= (char-after bof) ?=) 0)
+	  (cond ((eq (char-after bof) ?=) 0)
 		((listp (setq indent (perl-calculate-indent bof))) indent)
 		((looking-at (or nochange perl-nochange)) 0)
 		(t
Binary files src-21.1/lisp/progmodes/perl-mode.elc and src-21.2/lisp/progmodes/perl-mode.elc differ
Binary files src-21.1/lisp/progmodes/prolog.elc and src-21.2/lisp/progmodes/prolog.elc differ
diff -ruN src-21.1/lisp/progmodes/ps-mode.el src-21.2/lisp/progmodes/ps-mode.el
--- src-21.1/lisp/progmodes/ps-mode.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/progmodes/ps-mode.el	Fri Oct 26 11:15:55 2001
@@ -1,11 +1,11 @@
 ;;; ps-mode.el --- PostScript mode for GNU Emacs
 
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001 Free Software Foundation, Inc.
 
 ;; Author:     Peter Kleiweg <kleiweg@let.rug.nl>
 ;; Maintainer: Peter Kleiweg <kleiweg@let.rug.nl>
 ;; Created:    20 Aug 1997
-;; Version:    1.1e, 11 Nov 1999
+;; Version:    1.1f, 25 Oct 2001
 ;; Keywords:   PostScript, languages
 
 ;; This file is part of GNU Emacs.
@@ -30,7 +30,7 @@
 
 ;;; Code:
 
-(defconst ps-mode-version "1.1e, 11 Nov 1999")
+(defconst ps-mode-version "1.1f, 25 Oct 2001")
 (defconst ps-mode-maintainer-address "Peter Kleiweg <kleiweg@let.rug.nl>")
 
 (require 'easymenu)
@@ -104,8 +104,8 @@
 	  (const :tag "dsheet"      (1584 2448))
 	  (const :tag "esheet"      (2448 3168))))
 
-(defcustom ps-mode-print-function 
-  '(lambda ()
+(defcustom ps-mode-print-function
+  (lambda ()
      (let ((lpr-switches nil)
 	   (lpr-command (if (memq system-type '(usg-unix-v dgux hpux irix))
 			    "lp" "lpr")))
@@ -129,7 +129,7 @@
 	     (0 font-lock-keyword-face nil nil))
 	    ("^\\(Error\\|Can't\\).*"
 	     (0 font-lock-warning-face nil nil))
-	    ("^\\(Current file position is\\) \\([0-9]+\\)" 
+	    ("^\\(Current file position is\\) \\([0-9]+\\)"
 	     (1 font-lock-comment-face nil nil)
 	     (2 font-lock-warning-face nil nil))))
   "*Medium level highlighting of messages from the PostScript interpreter.
@@ -162,8 +162,7 @@
 
 Example: \"executive\"
 
-You won't need to set this option for Ghostscript.
-"
+You won't need to set this option for Ghostscript."
   :group 'PostScript-interaction
   :type '(choice (const nil) string))
 
@@ -180,8 +179,7 @@
   1. \"$TEMP\"
   2. \"$TMP\"
   3. \"$HOME/tmp\"
-  4. \"/tmp\"
-"
+  4. \"/tmp\""
   :group 'PostScript-interaction
   :type '(choice (const nil) directory))
 
@@ -204,7 +202,7 @@
 	       "gsave" "grestore" "grestoreall"
 	       "showpage")))
     (concat "\\<" (regexp-opt ops t) "\\>"))
-  "Regexp of PostScript operators that will be fontified")
+  "Regexp of PostScript operators that will be fontified.")
 
 ;; Level 1 font-lock:
 ;;  - Special comments (reference face)
@@ -214,7 +212,7 @@
 ;; Multiline strings are not supported. Strings with nested brackets are.
 (defconst ps-mode-font-lock-keywords-1
   '(("\\`%!PS.*" . font-lock-reference-face)
-    ("^%%BoundingBox:[ \t]+-?[0-9]+[ \t]+-?[0-9]+[ \t]+-?[0-9]+[ \t]+-?[0-9]+[ \t]*$" 
+    ("^%%BoundingBox:[ \t]+-?[0-9]+[ \t]+-?[0-9]+[ \t]+-?[0-9]+[ \t]+-?[0-9]+[ \t]*$"
      . font-lock-reference-face)
     (ps-mode-match-string-or-comment
      (1 font-lock-comment-face nil t)
@@ -258,7 +256,7 @@
    ps-mode-font-lock-keywords-1
    (list
     '("//\\w+" . font-lock-type-face)
-    '("^\\(/\\w+\\)\\>[[ \t]*\\(%.*\\)?\r?$" 
+    '("^\\(/\\w+\\)\\>[[ \t]*\\(%.*\\)?\r?$"
       . (1 font-lock-function-name-face))
     '("^\\(/\\w+\\)\\>\\([ \t]*{\\|[ \t]*<<\\|.*\\<def\\>\\|[ \t]+[0-9]+[ \t]+dict\\>\\)"
       . (1 font-lock-function-name-face))
@@ -361,9 +359,8 @@
     ["8-bit to Octal Buffer" ps-mode-octal-buffer t]
     ["8-bit to Octal Region" ps-mode-octal-region (mark t)]
     "---"
-    ("Auto Indent"
-     ["On" (setq ps-mode-auto-indent t) (not ps-mode-auto-indent)]
-     ["Off" (setq ps-mode-auto-indent nil) ps-mode-auto-indent])
+    ["Auto Indent" (setq ps-mode-auto-indent (not ps-mode-auto-indent))
+     :style toggle :selected ps-mode-auto-indent]
     "---"
     ["Start PostScript"
      ps-run-start
@@ -442,14 +439,14 @@
 
 (unless ps-mode-syntax-table
   (setq ps-mode-syntax-table (make-syntax-table))
-    
+
   (modify-syntax-entry ?\% "< " ps-mode-syntax-table)
   (modify-syntax-entry ?\n "> " ps-mode-syntax-table)
   (modify-syntax-entry ?\r "> " ps-mode-syntax-table)
   (modify-syntax-entry ?\f "> " ps-mode-syntax-table)
   (modify-syntax-entry ?\< "(>" ps-mode-syntax-table)
   (modify-syntax-entry ?\> ")<" ps-mode-syntax-table)
-    
+
   (modify-syntax-entry ?\! "w " ps-mode-syntax-table)
   (modify-syntax-entry ?\" "w " ps-mode-syntax-table)
   (modify-syntax-entry ?\# "w " ps-mode-syntax-table)
@@ -472,7 +469,7 @@
   (modify-syntax-entry ?\` "w " ps-mode-syntax-table)
   (modify-syntax-entry ?\| "w " ps-mode-syntax-table)
   (modify-syntax-entry ?\~ "w " ps-mode-syntax-table)
-    
+
   (let ((i 128))
     (while (< i 256)
       (modify-syntax-entry i "w " ps-mode-syntax-table)
@@ -481,8 +478,9 @@
 
 ;; PostScript mode.
 
-;;;###autoload
-(defun ps-mode ()
+;;;###autoload (autoload (quote ps-mode) "ps-mode" "Major mode for editing PostScript with GNU Emacs.\n" t)
+
+(define-derived-mode ps-mode fundamental-mode "PostScript"
   "Major mode for editing PostScript with GNU Emacs.
 
 Entry to this mode calls `ps-mode-hook'.
@@ -490,17 +488,17 @@
 The following variables hold user options, and can
 be set through the `customize' command:
 
-  ps-mode-auto-indent
-  ps-mode-tab
-  ps-mode-paper-size
-  ps-mode-print-function
-  ps-run-prompt
-  ps-run-font-lock-keywords-2
-  ps-run-x
-  ps-run-dumb
-  ps-run-init
-  ps-run-error-line-numbers
-  ps-run-tmp-dir
+  `ps-mode-auto-indent'
+  `ps-mode-tab'
+  `ps-mode-paper-size'
+  `ps-mode-print-function'
+  `ps-run-prompt'
+  `ps-run-font-lock-keywords-2'
+  `ps-run-x'
+  `ps-run-dumb'
+  `ps-run-init'
+  `ps-run-error-line-numbers'
+  `ps-run-tmp-dir'
 
 Type \\[describe-variable] for documentation on these options.
 
@@ -519,34 +517,23 @@
 with a file position. Clicking mouse-2 on this number will bring
 point to the corresponding spot in the PostScript window, if input
 to the interpreter was sent from that window.
-Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number has the same effect.
-"
-  (interactive)
-  (kill-all-local-variables)
-  (make-local-variable 'font-lock-defaults)
-  (setq font-lock-defaults '((ps-mode-font-lock-keywords
-                              ps-mode-font-lock-keywords-1
-                              ps-mode-font-lock-keywords-2
-                              ps-mode-font-lock-keywords-3)
-                             t)
-        major-mode 'ps-mode
-        mode-name  "PostScript")
-  (use-local-map ps-mode-map)
-  (set-syntax-table ps-mode-syntax-table)
-  (set (make-local-variable 'comment-start) "%")
-  (set (make-local-variable 'comment-start-skip)
-       "\\(\\(^\\|[^\\]\\)\\(\\\\\\\\\\)*\\)\\(%+ *\\)")
-  (run-hooks 'ps-mode-hook))
+Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number has the same effect."
+  (set (make-local-variable 'font-lock-defaults)
+       '((ps-mode-font-lock-keywords
+ 	  ps-mode-font-lock-keywords-1
+ 	  ps-mode-font-lock-keywords-2
+ 	  ps-mode-font-lock-keywords-3)
+ 	 t)))
 
 (defun ps-mode-show-version ()
-  "Show current version of PostScript mode"
+  "Show current version of PostScript mode."
   (interactive)
   (message " *** PostScript Mode (ps-mode) Version %s *** " ps-mode-version))
 
 (defun ps-mode-submit-bug-report ()
-  "Submit via mail a bug report on PostScript mode"
+  "Submit via mail a bug report on PostScript mode."
   (interactive)
-  (when (y-or-n-p "Submit bug report on PostScript mode? ")  
+  (when (y-or-n-p "Submit bug report on PostScript mode? ")
     (let ((reporter-prompt-for-summary-p nil)
 	  (reporter-dont-compact-list '(ps-mode-print-function
 					ps-run-font-lock-keywords-2)))
@@ -604,9 +591,8 @@
   (if (not (re-search-forward "[%(]" limit t))
       ;; Nothing found: return failure.
       nil
-    (let (end)
+    (let ((end (match-end 0)))
       (goto-char (match-beginning 0))
-      (setq end (match-end 0))
       (cond ((looking-at "\\(%.*\\)\\|\\((\\([^()\\\n]\\|\\\\.\\)*)\\)")
 	     ;; It's a comment or string without nested, unescaped brackets.
 	     (goto-char (match-end 0))
@@ -615,7 +601,7 @@
 	     ;; It's a string with nested brackets.
 	     (point))
 	    (t
-	     ;; Try next match. 
+	     ;; Try next match.
 	     (goto-char end)
 	     (ps-mode-match-string-or-comment limit))))))
 
@@ -664,7 +650,7 @@
       (indent-to (ps-mode-target-column))))
 
 (defun ps-mode-tabkey ()
-  "Indent/reindent current line, or insert tab"
+  "Indent/reindent current line, or insert tab."
   (interactive)
   (let ((column (current-column))
 	target)
@@ -675,11 +661,10 @@
       (setq target (ps-mode-target-column))
       (while (<= target column)
 	(setq target (+ target ps-mode-tab)))
-      (delete-horizontal-space)
-      (indent-to target))))
+      (indent-line-to target))))
 
 (defun ps-mode-backward-delete-char ()
-  "Delete backward indentation, or delete backward character"
+  "Delete backward indentation, or delete backward character."
   (interactive)
   (let ((column (current-column))
 	target)
@@ -694,8 +679,7 @@
 	(setq target (- target ps-mode-tab)))
       (if (< target 0)
 	  (setq target 0))
-      (delete-horizontal-space)
-      (indent-to target))))
+      (indent-line-to target))))
 
 (defun ps-mode-r-brace ()
   "Insert `}' and perform balance."
@@ -720,12 +704,11 @@
   (if ps-mode-auto-indent
       (save-excursion
 	(when (re-search-backward (concat "^[ \t]*" (regexp-quote right) "\\=") nil t)
-	  (delete-horizontal-space)
-	  (indent-to (ps-mode-target-column)))))
+	  (indent-line-to (ps-mode-target-column)))))
   (blink-matching-open))
 
 (defun ps-mode-other-newline ()
-  "Perform newline in `*ps run*' buffer"
+  "Perform newline in `*ps run*' buffer."
   (interactive)
   (let ((buf (current-buffer)))
     (set-buffer "*ps run*")
@@ -736,29 +719,23 @@
 ;; Print PostScript.
 
 (defun ps-mode-print-buffer ()
-  "Print buffer as PostScript"
+  "Print buffer as PostScript."
   (interactive)
-  (eval (list ps-mode-print-function)))
+  (funcall ps-mode-print-function))
 
 (defun ps-mode-print-region (begin end)
   "Print region as PostScript, adding minimal header and footer lines:
 
 %!PS
 <region>
-showpage
-"
+showpage"
   (interactive "r")
-  (let ((oldbuf (current-buffer))
-        (tmpbuf (get-buffer-create "*ps print*")))
-    (copy-to-buffer tmpbuf begin end)
-    (set-buffer tmpbuf)
-    (goto-char 1)
-    (insert "%!PS\n")
-    (goto-char (point-max))
-    (insert "\nshowpage\n")
-    (eval (list ps-mode-print-function))
-    (set-buffer oldbuf)
-    (kill-buffer tmpbuf)))
+  (let ((buf (current-buffer)))
+    (with-temp-buffer
+      (insert "%!PS\n")
+      (insert-buffer-substring buf begin end)
+      (insert "\nshowpage\n")
+      (funcall ps-mode-print-function))))
 
 
 ;; Comment Out / Uncomment.
@@ -870,8 +847,7 @@
   "Insert array /ISOLatin1Extended.
 
 This encoding vector contains all the entries from ISOLatin1Encoding
-plus the usually uncoded characters inserted on positions 1 through 28.
-"
+plus the usually uncoded characters inserted on positions 1 through 28."
   (interactive)
   (insert "
 % ISOLatin1Encoding, extended with remaining uncoded glyphs
@@ -994,26 +970,20 @@
 
 ;; Interactive PostScript interpreter.
 
-(defun ps-run-mode ()
+(define-derived-mode ps-run-mode fundamental-mode "Interactive PS"
   "Major mode in interactive PostScript window.
-This mode is invoked from ps-mode and should not be called directly.
+This mode is invoked from `ps-mode' and should not be called directly.
 
-\\{ps-run-mode-map}
-"
-  (kill-all-local-variables)
-  (make-local-variable 'font-lock-defaults)
-  (setq font-lock-defaults '((ps-run-font-lock-keywords
-			      ps-run-font-lock-keywords-1
-			      ps-run-font-lock-keywords-2)
-			     t)
-	major-mode 'ps-run-mode
-	mode-name  "Interactive PS"
-	mode-line-process '(":%s"))
-  (use-local-map ps-run-mode-map)
-  (run-hooks 'ps-run-mode-hook))
+\\{ps-run-mode-map}"
+  (set (make-local-variable 'font-lock-defaults)
+       '((ps-run-font-lock-keywords
+	  ps-run-font-lock-keywords-1
+	  ps-run-font-lock-keywords-2)
+	 t))
+  (setq mode-line-process '(":%s")))
 
 (defun ps-run-running ()
-  "Error if not in ps-mode or not running PostScript."
+  "Error if not in `ps-mode' or not running PostScript."
   (unless (equal major-mode 'ps-mode)
     (error "This function can only be called from PostScript mode"))
   (unless (equal (process-status "ps-run") 'run)
@@ -1022,11 +992,10 @@
 (defun ps-run-start ()
   "Start interactive PostScript."
   (interactive)
-  (let ((command (if (and window-system ps-run-x) ps-run-x ps-run-dumb))
+  (let ((command (or (and window-system ps-run-x) ps-run-dumb))
 	(init-file nil)
 	(process-connection-type nil)
-	(oldwin (selected-window))
-	i)
+	(oldwin (selected-window)))
     (unless command
       (error "No command specified to run interactive PostScript"))
     (unless (and ps-run-mark (markerp ps-run-mark))
@@ -1040,11 +1009,9 @@
     (when (process-status "ps-run")
       (delete-process "ps-run"))
     (erase-buffer)
-    (setq i (append command init-file))
-    (while i
-      (insert (car i) (if (cdr i) " " "\n"))
-      (setq i (cdr i)))
-    (eval (append '(start-process "ps-run" "*ps run*") command init-file))
+    (setq command (append command init-file))
+    (insert (mapconcat 'identity command " ") "\n")
+    (apply 'start-process "ps-run" "*ps run*" command)
     (select-window oldwin)))
 
 (defun ps-run-quit ()
@@ -1082,7 +1049,7 @@
     (ps-run-send-string (format "(%s) run" f) t)))
 
 (defun ps-run-boundingbox ()
-  "View BoundingBox"
+  "View BoundingBox."
   (interactive)
   (ps-run-running)
   (let (x1 y1 x2 y2 f
@@ -1172,7 +1139,7 @@
 	(delete-file i)))))
 
 (defun ps-run-mouse-goto-error (event)
-  "Set point at mouse click, then call ps-run-goto-error."
+  "Set point at mouse click, then call `ps-run-goto-error'."
   (interactive "e")
   (mouse-set-point event)
   (ps-run-goto-error))
@@ -1191,7 +1158,7 @@
 
 (defun ps-run-goto-error ()
   "Jump to buffer position read as integer at point.
-Use line numbers if ps-run-error-line-numbers is not nil"
+Use line numbers if `ps-run-error-line-numbers' is not nil"
   (interactive)
   (let ((p (point)))
     (unless (looking-at "[0-9]")
Binary files src-21.1/lisp/progmodes/ps-mode.elc and src-21.2/lisp/progmodes/ps-mode.elc differ
Binary files src-21.1/lisp/progmodes/scheme.elc and src-21.2/lisp/progmodes/scheme.elc differ
Binary files src-21.1/lisp/progmodes/sh-script.elc and src-21.2/lisp/progmodes/sh-script.elc differ
Binary files src-21.1/lisp/progmodes/simula.elc and src-21.2/lisp/progmodes/simula.elc differ
diff -ruN src-21.1/lisp/progmodes/sql.el src-21.2/lisp/progmodes/sql.el
--- src-21.1/lisp/progmodes/sql.el	Mon Aug 20 12:02:07 2001
+++ src-21.2/lisp/progmodes/sql.el	Mon Oct 29 10:33:24 2001
@@ -4,7 +4,7 @@
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
-;; Version: 1.6.2
+;; Version: 1.6.3
 ;; Keywords: comm languages processes
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode
 
@@ -796,10 +796,10 @@
 Use the following commands to start a specific SQL interpreter:
 
     PostGres: \\[sql-postgres]
+    MySQL: \\[sql-mysql]
 
 Other non-free SQL implementations are also supported:
 
-    MySQL: \\[sql-mysql]
     Solid: \\[sql-solid]
     Oracle: \\[sql-oracle]
     Informix: \\[sql-informix]
@@ -1447,8 +1447,7 @@
 (defun sql-mysql ()
   "Run mysql by TcX as an inferior process.
 
-Note that the widespread idea that mysql is free software is inaccurate;
-its license is too restrictive.  We urge you to use PostGres instead.
+Mysql versions 3.23 and up are free software.
 
 If buffer `*SQL*' exists but no process is running, make a new process.
 If buffer exists and a process is running, just switch to buffer
Binary files src-21.1/lisp/progmodes/sql.elc and src-21.2/lisp/progmodes/sql.elc differ
diff -ruN src-21.1/lisp/progmodes/tcl.el src-21.2/lisp/progmodes/tcl.el
--- src-21.1/lisp/progmodes/tcl.el	Tue Jul 17 20:40:19 2001
+++ src-21.2/lisp/progmodes/tcl.el	Wed Nov 21 03:04:45 2001
@@ -6,7 +6,7 @@
 ;; Author: Tom Tromey <tromey@busco.lanl.gov>
 ;;    Chris Lindblad <cjl@lcs.mit.edu>
 ;; Keywords: languages tcl modes
-;; Version: $Revision: 1.64 $
+;; Version: $Revision: 1.64.4.1 $
 
 ;; This file is part of GNU Emacs.
 
@@ -132,7 +132,7 @@
 	   (require 'imenu))
        ()))
 
-(defconst tcl-version "$Revision: 1.64 $")
+(defconst tcl-version "$Revision: 1.64.4.1 $")
 (defconst tcl-maintainer "Tom Tromey <tromey@drip.colorado.edu>")
 
 ;;
@@ -1877,7 +1877,7 @@
 		(backward-char))))))
   ;; Point is just after the "#" starting a comment.  Move it as
   ;; appropriate.
-  (let* ((indent (funcall comment-indent-function))
+  (let* ((indent (or (funcall comment-indent-function) comment-column))
 	 (begpos (progn
 		   (backward-char)
 		   (point))))
Binary files src-21.1/lisp/progmodes/tcl.elc and src-21.2/lisp/progmodes/tcl.elc differ
Binary files src-21.1/lisp/progmodes/vhdl-mode.elc and src-21.2/lisp/progmodes/vhdl-mode.elc differ
Binary files src-21.1/lisp/ps-bdf.elc and src-21.2/lisp/ps-bdf.elc differ
Binary files src-21.1/lisp/ps-mule.elc and src-21.2/lisp/ps-mule.elc differ
Binary files src-21.1/lisp/ps-print.elc and src-21.2/lisp/ps-print.elc differ
Binary files src-21.1/lisp/recentf.elc and src-21.2/lisp/recentf.elc differ
diff -ruN src-21.1/lisp/rect.el src-21.2/lisp/rect.el
--- src-21.1/lisp/rect.el	Wed Oct  3 12:51:07 2001
+++ src-21.2/lisp/rect.el	Sat Nov 17 01:34:53 2001
@@ -137,13 +137,9 @@
 (defun delete-rectangle-line (startcol endcol fill)
   (let ((pt (line-end-position)))
     (when (= (move-to-column-force startcol (or fill 'coerce)) startcol)
-      (if (and (not fill) (<= pt endcol))
-	  (delete-region (point) pt)
-	;; else
-	(setq pt (point))
-	(move-to-column-force endcol)
-	(delete-region pt (point))))
-    ))
+      (setq pt (point))
+      (move-to-column-force endcol)
+      (delete-region pt (point)))))
 
 (defun delete-extract-rectangle-line (startcol endcol lines fill)
   (let ((pt (point-at-eol)))
Binary files src-21.1/lisp/rect.elc and src-21.2/lisp/rect.elc differ
Binary files src-21.1/lisp/regi.elc and src-21.2/lisp/regi.elc differ
Binary files src-21.1/lisp/register.elc and src-21.2/lisp/register.elc differ
Binary files src-21.1/lisp/repeat.elc and src-21.2/lisp/repeat.elc differ
diff -ruN src-21.1/lisp/replace.el src-21.2/lisp/replace.el
--- src-21.1/lisp/replace.el	Tue Aug 28 10:56:28 2001
+++ src-21.2/lisp/replace.el	Fri Feb 22 11:51:30 2002
@@ -1,6 +1,6 @@
 ;;; replace.el --- replace commands for Emacs
 
-;; Copyright (C) 1985, 86, 87, 92, 94, 96, 1997, 2000, 2001
+;; Copyright (C) 1985, 86, 87, 92, 94, 96, 1997, 2000, 2001, 2002
 ;;  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
@@ -95,7 +95,7 @@
 
 To customize possible responses, change the \"bindings\" in `query-replace-map'."
   (interactive (query-replace-read-args "Query replace" nil))
-  (perform-replace from-string to-string start end t nil delimited))
+  (perform-replace from-string to-string t nil delimited nil nil start end))
 
 (define-key esc-map "%" 'query-replace)
 
@@ -122,7 +122,7 @@
 and `\\=\\N' (where N is a digit) stands for
  whatever what matched the Nth `\\(...\\)' in REGEXP."
   (interactive (query-replace-read-args "Query replace regexp" t))
-  (perform-replace regexp to-string start end t t delimited))
+  (perform-replace regexp to-string t t delimited nil nil start end))
 (define-key esc-map [?\C-%] 'query-replace-regexp)
 
 (defun query-replace-regexp-eval (regexp to-expr &optional delimited start end)
@@ -136,8 +136,8 @@
 `prin1-to-string' with the NOESCAPE argument (which see).
 
 For convenience, when entering TO-EXPR interactively, you can use `\\&' or
-`\0' to stand for whatever matched the whole of REGEXP, and `\N' (where
-N is a digit) to stand for whatever matched the Nth `\(...\)' in REGEXP.
+`\\0' to stand for whatever matched the whole of REGEXP, and `\\N' (where
+N is a digit) to stand for whatever matched the Nth `\\(...\\)' in REGEXP.
 Use `\\#&' or `\\#N' if you want a number instead of a string.
 
 In Transient Mark mode, if the mark is active, operate on the contents
@@ -172,7 +172,7 @@
      (replace-match-string-symbols to)
      (list from (car to) current-prefix-arg start end)))
   (perform-replace regexp (cons 'replace-eval-replacement to-expr)
-		   start end t t delimited))
+		   t t delimited nil nil start end))
 
 (defun map-query-replace-regexp (regexp to-strings &optional n start end)
   "Replace some matches for REGEXP with various strings, in rotation.
@@ -223,7 +223,7 @@
 				       (1+ (string-match " " to-strings))))
 	  (setq replacements (append replacements (list to-strings))
 		to-strings ""))))
-    (perform-replace regexp replacements start end t t nil n)))
+    (perform-replace regexp replacements t t nil n nil start end)))
 
 (defun replace-string (from-string to-string &optional delimited start end)
   "Replace occurrences of FROM-STRING with TO-STRING.
@@ -251,7 +251,7 @@
 \(You may need a more complex loop if FROM-STRING can match the null string
 and TO-STRING is also null.)"
   (interactive (query-replace-read-args "Replace string" nil))
-  (perform-replace from-string to-string start end nil nil delimited))
+  (perform-replace from-string to-string nil nil delimited nil nil start end))
 
 (defun replace-regexp (regexp to-string &optional delimited start end)
   "Replace things after point matching REGEXP with TO-STRING.
@@ -278,7 +278,7 @@
     (replace-match TO-STRING nil nil))
 which will run faster and will not set the mark or print anything."
   (interactive (query-replace-read-args "Replace regexp" t))
-  (perform-replace regexp to-string start end nil t delimited))
+  (perform-replace regexp to-string nil t delimited nil nil start end))
 
 
 (defvar regexp-history nil
@@ -870,9 +870,9 @@
           (aset data 2 (if (consp next) next (aref data 3))))))
   (car (aref data 2)))
 
-(defun perform-replace (from-string replacements start end
+(defun perform-replace (from-string replacements 
 		        query-flag regexp-flag delimited-flag
-			&optional repeat-count map)
+			&optional repeat-count map start end)
   "Subroutine of `query-replace'.  Its complexity handles interactive queries.
 Don't use this in your own program unless you want to query and set the mark
 just as `query-replace' does.  Instead, write a simple loop like this:
Binary files src-21.1/lisp/replace.elc and src-21.2/lisp/replace.elc differ
Binary files src-21.1/lisp/reposition.elc and src-21.2/lisp/reposition.elc differ
Binary files src-21.1/lisp/resume.elc and src-21.2/lisp/resume.elc differ
Binary files src-21.1/lisp/rot13.elc and src-21.2/lisp/rot13.elc differ
Binary files src-21.1/lisp/s-region.elc and src-21.2/lisp/s-region.elc differ
diff -ruN src-21.1/lisp/saveplace.el src-21.2/lisp/saveplace.el
--- src-21.1/lisp/saveplace.el	Sun Jul 15 18:15:34 2001
+++ src-21.2/lisp/saveplace.el	Mon Oct 22 01:04:32 2001
@@ -1,6 +1,6 @@
 ;;; saveplace.el --- automatically save place in files
 
-;; Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2001 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: FSF
@@ -63,6 +63,7 @@
 
 \(setq-default save-place t\)"
   :type 'boolean
+  :require 'saveplace
   :group 'save-place)
 
 (make-variable-buffer-local 'save-place)
Binary files src-21.1/lisp/saveplace.elc and src-21.2/lisp/saveplace.elc differ
Binary files src-21.1/lisp/scroll-all.elc and src-21.2/lisp/scroll-all.elc differ
Binary files src-21.1/lisp/scroll-bar.elc and src-21.2/lisp/scroll-bar.elc differ
Binary files src-21.1/lisp/select.elc and src-21.2/lisp/select.elc differ
Binary files src-21.1/lisp/server.elc and src-21.2/lisp/server.elc differ
Binary files src-21.1/lisp/shadowfile.elc and src-21.2/lisp/shadowfile.elc differ
Binary files src-21.1/lisp/shell.elc and src-21.2/lisp/shell.elc differ
diff -ruN src-21.1/lisp/simple.el src-21.2/lisp/simple.el
--- src-21.1/lisp/simple.el	Thu Oct 18 10:51:20 2001
+++ src-21.2/lisp/simple.el	Wed Mar 13 20:51:45 2002
@@ -1440,7 +1440,7 @@
 	(let ((swap (and replace (< start end))))
 	  ;; Don't muck with mark unless REPLACE says we should.
 	  (goto-char start)
-	  (and replace (push-mark))
+	  (and replace (push-mark (point) 'nomsg))
 	  (setq exit-status
 		(call-process-region start end shell-file-name t
 				     (if error-file
Binary files src-21.1/lisp/simple.elc and src-21.2/lisp/simple.elc differ
Binary files src-21.1/lisp/skeleton.elc and src-21.2/lisp/skeleton.elc differ
diff -ruN src-21.1/lisp/smerge-mode.el src-21.2/lisp/smerge-mode.el
--- src-21.1/lisp/smerge-mode.el	Tue Jul 31 10:28:43 2001
+++ src-21.2/lisp/smerge-mode.el	Thu Nov 15 02:26:37 2001
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: merge diff3 cvs conflict
-;; Revision: $Id: smerge-mode.el,v 1.14 2001/07/31 08:28:43 gerd Exp $
+;; Revision: $Id: smerge-mode.el,v 1.14.4.1 2001/11/15 01:26:37 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -332,7 +332,7 @@
 				  (when base-start (1- base-start)) base-start
 				  (1- other-start) other-start))
 	  t)
-      (error "Point not in conflict region"))))
+      (search-failed (error "Point not in conflict region")))))
 
 (defun smerge-find-conflict (&optional limit)
   "Find and match a conflict region.  Intended as a font-lock MATCHER.
@@ -350,12 +350,18 @@
   (smerge-ensure-match n2)
   (let ((name1 (aref smerge-match-names n1))
 	(name2 (aref smerge-match-names n2))
+	;; Read them before the match-data gets clobbered.
+	(beg1 (match-beginning n1))
+	(end1 (match-end n1))
+	(beg2 (match-beginning n2))
+	(end2 (match-end n2))
 	(file1 (make-temp-file "smerge1"))
 	(file2 (make-temp-file "smerge2"))
 	(dir default-directory)
-	(file (file-relative-name buffer-file-name)))
-    (write-region (match-beginning n1) (match-end n1) file1)
-    (write-region (match-beginning n2) (match-end n2) file2)
+	(file (file-relative-name buffer-file-name))
+	(coding-system-for-read buffer-file-coding-system))
+    (write-region beg1 end1 file1)
+    (write-region beg2 end2 file2)
     (unwind-protect
 	(with-current-buffer (get-buffer-create smerge-diff-buffer-name)
 	  (setq default-directory dir)
Binary files src-21.1/lisp/smerge-mode.elc and src-21.2/lisp/smerge-mode.elc differ
Binary files src-21.1/lisp/sort.elc and src-21.2/lisp/sort.elc differ
Binary files src-21.1/lisp/soundex.elc and src-21.2/lisp/soundex.elc differ
diff -ruN src-21.1/lisp/speedbar.el src-21.2/lisp/speedbar.el
--- src-21.1/lisp/speedbar.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/speedbar.el	Wed Nov  7 20:48:38 2001
@@ -57,14 +57,14 @@
 ;; applicable, tags in the active file can be expanded.
 ;;
 ;;   To add new supported files types into speedbar, use the function
-;; `speedbar-add-supported-extension' If speedbar complains that the
+;; `speedbar-add-supported-extension'.  If speedbar complains that the
 ;; file type is not supported, that means there is no built in
 ;; support from imenu, and the etags part wasn't set up correctly.  You
 ;; may add elements to `speedbar-supported-extension-expressions' as long
 ;; as it is done before speedbar is loaded.
 ;;
 ;;   To prevent speedbar from following you into certain directories
-;; use the function `speedbar-add-ignored-path-regexp' too add a new
+;; use the function `speedbar-add-ignored-path-regexp' to add a new
 ;; regular expression matching a type of path.  You may add list
 ;; elements to `speedbar-ignored-path-expressions' as long as it is
 ;; done before speedbar is loaded.
@@ -90,9 +90,9 @@
 ;; which controls how tags are layed out.  It is actually a list of
 ;; functions that filter the data.  The default groups large tag lists
 ;; into sub-lists.  A long flat list can be used instead if needed.
-;; Other filters could be easily added.
+;; Other filters can be easily added.
 ;;
-;;    AUC-TEX users: The imenu tags for AUC-TEX mode don't work very
+;;    AUC-TEX users: The imenu tags for AUC-TEX mode doesn't work very
 ;; well.  Use the imenu keywords from tex-mode.el for better results.
 ;;
 ;; This file requires the library package assoc (association lists)
@@ -102,7 +102,7 @@
 ;; Adding a speedbar specialized display mode:
 ;;
 ;; Speedbar can be configured to create a special display for certain
-;; modes that do not display tradition file/tag data.  Rmail, Info,
+;; modes that do not display traditional file/tag data.  Rmail, Info,
 ;; and the debugger are examples.  These modes can, however, benefit
 ;; from a speedbar style display in their own way.
 ;;
@@ -116,7 +116,7 @@
 ;; `speedbar-insert-generic-list'.  If you use
 ;; `speedbar-insert-generic-list', also read the doc for
 ;; `speedbar-tag-hierarchy-method' in case you wish to override it.
-;; The function `speedbar-with-attached-buffer' brings you back to the
+;; The macro `speedbar-with-attached-buffer' brings you back to the
 ;; buffer speedbar is displaying for.
 ;;
 ;; For those functions that make buttons, the "function" should be a
@@ -132,7 +132,7 @@
 ;; functions are `speedbar-change-expand-button-char',
 ;; `speedbar-delete-subblock', and `speedbar-center-buffer-smartly'.
 ;; The variable `speedbar-power-click' is set to t in your functions
-;; when the user shift-clicks.  This indications anything from
+;; when the user shift-clicks.  This is an indication of anything from
 ;; refreshing cached data to making a buffer appear in a new frame.
 ;;
 ;; If you wish to add to the default speedbar menu for the case of
@@ -157,14 +157,14 @@
 ;; splice in.  KEYMAP is a symbol holding the keymap to use, and
 ;; BUTTON-FUNCTIONS are the function names to call, in order, to create
 ;; the display.
-;;  Another tweekable variable is `speedbar-stealthy-function-list'
+;;  Another tweakable variable is `speedbar-stealthy-function-list'
 ;; which is of the form (NAME &rest FUNCTION ...).  NAME is the string
 ;; name matching `speedbar-add-expansion-list'.  (It does not need to
 ;; exist.). This provides additional display info which might be
 ;; time-consuming to calculate.
 ;;  Lastly, `speedbar-mode-functions-list' allows you to set special
-;; function overrides.  At the moment very few functions are
-;; over ridable, but more will be added as the need is discovered.
+;; function overrides.  At the moment very few functions may be
+;; overridden, but more will be added as the need is discovered.
 
 ;;; TODO:
 ;; - More functions to create buttons and options
Binary files src-21.1/lisp/speedbar.elc and src-21.2/lisp/speedbar.elc differ
diff -ruN src-21.1/lisp/startup.el src-21.2/lisp/startup.el
--- src-21.1/lisp/startup.el	Wed Oct 10 11:25:50 2001
+++ src-21.2/lisp/startup.el	Thu Nov  1 14:10:34 2001
@@ -480,7 +480,11 @@
 
 	;; Don't do this if we failed to create the initial frame,
 	;; for instance due to a dense colormap.
-	(when frame-initial-frame
+	(when (or frame-initial-frame
+		  ;; If frame-initial-frame has no meaning, do this anyway.
+		  (not (and window-system
+			    (not noninteractive)
+			    (not (eq window-system 'pc)))))
 	  ;; Modify the initial frame based on what .emacs puts into
 	  ;; ...-frame-alist.
 	  (if (fboundp 'frame-notice-user-settings)
@@ -791,7 +795,12 @@
     (when (or (memq system-type '(ms-dos windows-nt))
 	      (and (memq window-system '(x))
 		   (fboundp 'x-backspace-delete-keys-p)
-		   (x-backspace-delete-keys-p)))
+		   (x-backspace-delete-keys-p))
+	      ;; If the terminal Emacs is running on has erase char
+	      ;; set to ^H, use the Backspace key for deleting
+	      ;; backward and, and the Delete key for deleting forward.
+	      (and (null window-system)
+		   (eq tty-erase-char 8)))
       (setq-default normal-erase-is-backspace t)
       (normal-erase-is-backspace-mode 1)))
 
Binary files src-21.1/lisp/startup.elc and src-21.2/lisp/startup.elc differ
Binary files src-21.1/lisp/strokes.elc and src-21.2/lisp/strokes.elc differ
diff -ruN src-21.1/lisp/subdirs.el src-21.2/lisp/subdirs.el
--- src-21.1/lisp/subdirs.el	Sat Oct 20 18:43:16 2001
+++ src-21.2/lisp/subdirs.el	Sat Mar 16 12:36:50 2002
@@ -1,3 +1,3 @@
 ;; In load-path, after this directory should come
 ;; certain of its subdirectories.  Here we specify them.
-(normal-top-level-add-to-load-path '("toolbar" "textmodes" "progmodes" "play" "obsolete" "net" "mail" "language" "international" "gnus" "eshell" "emulation" "emacs-lisp" "calendar" ))
+(normal-top-level-add-to-load-path '("toolbar" "textmodes" "progmodes" "play" "obsolete" "net" "mail" "language" "international" "gnus" "eshell" "emulation" "emacs-lisp" "calendar" "calc" ))
Binary files src-21.1/lisp/subr.elc and src-21.2/lisp/subr.elc differ
Binary files src-21.1/lisp/tabify.elc and src-21.2/lisp/tabify.elc differ
Binary files src-21.1/lisp/talk.elc and src-21.2/lisp/talk.elc differ
Binary files src-21.1/lisp/tar-mode.elc and src-21.2/lisp/tar-mode.elc differ
Binary files src-21.1/lisp/tcp.elc and src-21.2/lisp/tcp.elc differ
Binary files src-21.1/lisp/tempo.elc and src-21.2/lisp/tempo.elc differ
Binary files src-21.1/lisp/term/bg-mouse.elc and src-21.2/lisp/term/bg-mouse.elc differ
Binary files src-21.1/lisp/term/mac-win.elc and src-21.2/lisp/term/mac-win.elc differ
Binary files src-21.1/lisp/term/pc-win.elc and src-21.2/lisp/term/pc-win.elc differ
Binary files src-21.1/lisp/term/sun-mouse.elc and src-21.2/lisp/term/sun-mouse.elc differ
Binary files src-21.1/lisp/term/sun.elc and src-21.2/lisp/term/sun.elc differ
Binary files src-21.1/lisp/term/sup-mouse.elc and src-21.2/lisp/term/sup-mouse.elc differ
Binary files src-21.1/lisp/term/tty-colors.elc and src-21.2/lisp/term/tty-colors.elc differ
Binary files src-21.1/lisp/term/tvi970.elc and src-21.2/lisp/term/tvi970.elc differ
Binary files src-21.1/lisp/term/vt100.elc and src-21.2/lisp/term/vt100.elc differ
diff -ruN src-21.1/lisp/term/w32-win.el src-21.2/lisp/term/w32-win.el
--- src-21.1/lisp/term/w32-win.el	Mon Jul 16 13:39:41 2001
+++ src-21.2/lisp/term/w32-win.el	Sat Nov 10 14:36:53 2001
@@ -79,10 +79,6 @@
 (if (fboundp 'new-fontset)
     (require 'fontset))
 
-;; FIXME: this is temporary for v21.1, since many redisplay problems
-;; happen if redisplay-dont-pause is nil.
-(setq redisplay-dont-pause t)
-
 ;; Because Windows scrollbars look and act quite differently compared
 ;; with the standard X scroll-bars, we don't try to use the normal
 ;; scroll bar routines.
Binary files src-21.1/lisp/term/w32-win.elc and src-21.2/lisp/term/w32-win.elc differ
Binary files src-21.1/lisp/term/x-win.elc and src-21.2/lisp/term/x-win.elc differ
diff -ruN src-21.1/lisp/term.el src-21.2/lisp/term.el
--- src-21.1/lisp/term.el	Sun Jul 15 21:53:53 2001
+++ src-21.2/lisp/term.el	Sun Feb  3 12:56:52 2002
@@ -736,31 +736,22 @@
   (make-face 'term-invisible)
   (make-face 'term-invisible-inv)
 
-  (copy-face 'default 'term-default-fg)
-  (copy-face 'default 'term-default-bg)
   (term-ignore-error
    (set-face-foreground 'term-default-fg term-default-fg-color))
   (term-ignore-error
    (set-face-background 'term-default-bg term-default-bg-color))
 
-  (copy-face 'default 'term-default-fg-inv)
-  (copy-face 'default 'term-default-bg-inv)
   (term-ignore-error
    (set-face-foreground 'term-default-fg-inv term-default-bg-color))
   (term-ignore-error
    (set-face-background 'term-default-bg-inv term-default-fg-color))
 
-  (copy-face 'default 'term-invisible)
   (term-ignore-error
    (set-face-background 'term-invisible term-default-bg-color))
 
-  (copy-face 'default 'term-invisible-inv)
   (term-ignore-error
    (set-face-background 'term-invisible-inv term-default-fg-color))
 
-  (copy-face 'default 'term-bold)
-  (copy-face 'default 'term-underline)
-
   ;; Set the colors of the new faces.
   (term-ignore-error
    (make-face-bold 'term-bold))
@@ -778,28 +769,20 @@
   (make-face 'term-cyan)
   (make-face 'term-white)
 
-  (copy-face 'default 'term-black)
   (term-ignore-error
    (set-face-foreground 'term-black "black"))
-  (copy-face 'default 'term-red)
   (term-ignore-error
    (set-face-foreground 'term-red "red"))
-  (copy-face 'default 'term-green)
   (term-ignore-error
    (set-face-foreground 'term-green "green"))
-  (copy-face 'default 'term-yellow)
   (term-ignore-error
    (set-face-foreground 'term-yellow "yellow"))
-  (copy-face 'default 'term-blue)
   (term-ignore-error
    (set-face-foreground 'term-blue "blue"))
-  (copy-face 'default 'term-magenta)
   (term-ignore-error
    (set-face-foreground 'term-magenta "magenta"))
-  (copy-face 'default 'term-cyan)
   (term-ignore-error
    (set-face-foreground 'term-cyan "cyan"))
-  (copy-face 'default 'term-white)
   (term-ignore-error
    (set-face-foreground 'term-white "white"))
 
@@ -813,28 +796,20 @@
   (make-face 'term-cyanbg)
   (make-face 'term-whitebg)
 
-  (copy-face 'default 'term-blackbg)
   (term-ignore-error
    (set-face-background 'term-blackbg "black"))
-  (copy-face 'default 'term-redbg)
   (term-ignore-error
    (set-face-background 'term-redbg "red"))
-  (copy-face 'default 'term-greenbg)
   (term-ignore-error
    (set-face-background 'term-greenbg "green"))
-  (copy-face 'default 'term-yellowbg)
   (term-ignore-error
    (set-face-background 'term-yellowbg "yellow"))
-  (copy-face 'default 'term-bluebg)
   (term-ignore-error
    (set-face-background 'term-bluebg "blue"))
-  (copy-face 'default 'term-magentabg)
   (term-ignore-error
    (set-face-background 'term-magentabg "magenta"))
-  (copy-face 'default 'term-cyanbg)
   (term-ignore-error
    (set-face-background 'term-cyanbg "cyan"))
-  (copy-face 'default 'term-whitebg)
   (term-ignore-error
    (set-face-background 'term-whitebg "white")))
 
@@ -2855,11 +2830,11 @@
 			   ((eq char ?\^G)
 			    (beep t)) ; Bell
 			   ((eq char ?\032)
-			    (let ((end (string-match "\n" str i)))
+			    (let ((end (string-match "\r?$" str i)))
 			      (if end
 				  (progn (funcall term-command-hook
-						  (substring str (1+ i) (1- end)))
-					 (setq i end))
+						  (substring str (1+ i) end))
+					 (setq i (match-end 0)))
 				(setq term-terminal-parameter
 				      (substring str i))
 				(setq term-terminal-state 4)
Binary files src-21.1/lisp/term.elc and src-21.2/lisp/term.elc differ
Binary files src-21.1/lisp/terminal.elc and src-21.2/lisp/terminal.elc differ
diff -ruN src-21.1/lisp/textmodes/artist.el src-21.2/lisp/textmodes/artist.el
--- src-21.1/lisp/textmodes/artist.el	Mon Jul 16 14:22:59 2001
+++ src-21.2/lisp/textmodes/artist.el	Fri Oct 26 11:52:09 2001
@@ -1,12 +1,12 @@
 ;;; artist.el --- draw ascii graphics with your mouse
 
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author:       Tomas Abrahamsson <tab@lysator.liu.se>
 ;; Maintainer:   Tomas Abrahamsson <tab@lysator.liu.se>
 ;; Keywords:     mouse
-;; Version:	 1.2.2
-;; Release-date: 22-Oct-2000
+;; Version:	 1.2.4
+;; Release-date: 25-Oct-2001
 ;; Location:     http://www.lysator.liu.se/~tab/artist/
 
 ;; This file is part of GNU Emacs.
@@ -136,6 +136,15 @@
 
 ;;; ChangeLog:
 
+;; 1.2.4	25-Oct-2001
+;; Bugfix:	Some operations (the edit menu) got hidden
+;; Bugfix:      The first arrow for poly-lines was always pointing
+;;              to the right
+;; Changed:	Updated with changes made for Emacs 21.1
+;;
+;; 1.2.3	20-Nov-2000
+;; Bugfix:	Autoload cookie corrected
+;;
 ;; 1.2.2	19-Nov-2000
 ;; Changed:	More documentation fixes.
 ;; Bugfix:	The arrow characters (`artist-arrows'), which 
@@ -178,7 +187,7 @@
 
 ;; Variables
 
-(defconst artist-version "1.2.2")
+(defconst artist-version "1.2.4")
 (defconst artist-maintainer-address "tab@lysator.liu.se")
 
 
@@ -701,7 +710,7 @@
 		 2
 		 artist-draw-square
 		 (artist-undraw-square
-		  artist-t artist-cut-square)))))
+		  artist-t artist-cut-square))))))
 
        (graphics-operation
 	("Copy" (("copy rectangle" copy-r "copy-r"
@@ -717,7 +726,7 @@
 		  2
 		  artist-draw-square
 		  (artist-undraw-square
-		   artist-t artist-copy-square)))))
+		   artist-t artist-copy-square))))))
 
        (graphics-operation
 	("Paste" (("paste" paste "paste"
@@ -745,7 +754,7 @@
 			nil nil nil
 			1
 			artist-flood-fill
-			nil)))))))))
+			nil)))))))
 
     (menu
      ("Settings"
@@ -1675,6 +1684,20 @@
   "Call function FN with ARGS iff FN is not nil."
   (list 'if fn (cons 'funcall (cons fn args))))
 
+(defvar artist-butlast-fn 'artist-butlast
+  "The butlast function")
+
+(if (fboundp 'butlast)
+    (setq artist-butlast-fn 'butlast)
+  (setq artist-butlast-fn 'artist-butlast))
+
+(defun artist-butlast (l)
+  "Return the list L with all elements but the last."
+  (cond ((null l) nil)
+	((null (cdr l)) nil)
+	(t (cons (car l) (artist-butlast (cdr l))))))
+
+
 (defun artist-last (seq &optional n)
   "Return the last link in the list SEQ.
 With optional argument N, returns Nth-to-last link (default 1)."
@@ -3341,7 +3364,7 @@
 				       (t c)))))
 	   ;; The cdr and butlast below is so we don't draw the middle top
 	   ;; and middle bottom char twice.
-	   (butlast (cdr (reverse right-half)))))
+	   (funcall artist-butlast-fn (cdr (reverse right-half)))))
     (append right-half left-half)))
 
 
@@ -4952,7 +4975,7 @@
 	 (y2           y1-last)
 	 (is-down      t)
 	 (shape        nil)
-	 (point-list   (list (artist-make-endpoint x1-last y1-last)))
+	 (point-list   nil)
 	 (done         nil))
     (select-window (posn-window ev-start))
     (artist-funcall init-fn x1-last y1-last)
@@ -5125,7 +5148,7 @@
 	(artist-funcall fill-fn point-list))
 
     ;; Maybe set arrow points
-    (if (artist-funcall arrow-pred)
+    (if (and point-list (artist-funcall arrow-pred))
 	(artist-funcall arrow-set-fn point-list)
       (artist-clear-arrow-points))
 
Binary files src-21.1/lisp/textmodes/artist.elc and src-21.2/lisp/textmodes/artist.elc differ
Binary files src-21.1/lisp/textmodes/bib-mode.elc and src-21.2/lisp/textmodes/bib-mode.elc differ
Binary files src-21.1/lisp/textmodes/bibtex.elc and src-21.2/lisp/textmodes/bibtex.elc differ
Binary files src-21.1/lisp/textmodes/fill.elc and src-21.2/lisp/textmodes/fill.elc differ
Binary files src-21.1/lisp/textmodes/flyspell.elc and src-21.2/lisp/textmodes/flyspell.elc differ
diff -ruN src-21.1/lisp/textmodes/ispell.el src-21.2/lisp/textmodes/ispell.el
--- src-21.1/lisp/textmodes/ispell.el	Fri Sep  7 17:35:56 2001
+++ src-21.2/lisp/textmodes/ispell.el	Mon Jan 28 17:33:01 2002
@@ -1886,14 +1886,16 @@
 	      (insert (concat help-1 "\n" help-2 "\n" help-3))
 	      (sit-for 5)
 	      (kill-buffer "*Ispell Help*"))
-	  (select-window (minibuffer-window))
-	  (erase-buffer)
-	  (if (not version18p) (message nil))
-	  ;;(set-minibuffer-window (selected-window))
-	  (enlarge-window 2)
-	  (insert (concat help-1 "\n" help-2 "\n" help-3))
-	  (sit-for 5)
-	  (erase-buffer))))))
+	  (unwind-protect
+	      (progn
+		(select-window (minibuffer-window))
+		(erase-buffer)
+		(if (not version18p) (message nil))
+		;;(set-minibuffer-window (selected-window))
+		(enlarge-window 2)
+		(insert (concat help-1 "\n" help-2 "\n" help-3))
+		(sit-for 5))
+	    (erase-buffer)))))))
 
 
 (defun lookup-words (word &optional lookup-dict)
Binary files src-21.1/lisp/textmodes/ispell.elc and src-21.2/lisp/textmodes/ispell.elc differ
Binary files src-21.1/lisp/textmodes/makeinfo.elc and src-21.2/lisp/textmodes/makeinfo.elc differ
Binary files src-21.1/lisp/textmodes/nroff-mode.elc and src-21.2/lisp/textmodes/nroff-mode.elc differ
Binary files src-21.1/lisp/textmodes/outline.elc and src-21.2/lisp/textmodes/outline.elc differ
Binary files src-21.1/lisp/textmodes/page-ext.elc and src-21.2/lisp/textmodes/page-ext.elc differ
Binary files src-21.1/lisp/textmodes/page.elc and src-21.2/lisp/textmodes/page.elc differ
Binary files src-21.1/lisp/textmodes/paragraphs.elc and src-21.2/lisp/textmodes/paragraphs.elc differ
Binary files src-21.1/lisp/textmodes/picture.elc and src-21.2/lisp/textmodes/picture.elc differ
Binary files src-21.1/lisp/textmodes/refbib.elc and src-21.2/lisp/textmodes/refbib.elc differ
Binary files src-21.1/lisp/textmodes/refer.elc and src-21.2/lisp/textmodes/refer.elc differ
Binary files src-21.1/lisp/textmodes/refill.elc and src-21.2/lisp/textmodes/refill.elc differ
Binary files src-21.1/lisp/textmodes/reftex-auc.elc and src-21.2/lisp/textmodes/reftex-auc.elc differ
Binary files src-21.1/lisp/textmodes/reftex-cite.elc and src-21.2/lisp/textmodes/reftex-cite.elc differ
Binary files src-21.1/lisp/textmodes/reftex-dcr.elc and src-21.2/lisp/textmodes/reftex-dcr.elc differ
Binary files src-21.1/lisp/textmodes/reftex-global.elc and src-21.2/lisp/textmodes/reftex-global.elc differ
Binary files src-21.1/lisp/textmodes/reftex-index.elc and src-21.2/lisp/textmodes/reftex-index.elc differ
Binary files src-21.1/lisp/textmodes/reftex-parse.elc and src-21.2/lisp/textmodes/reftex-parse.elc differ
Binary files src-21.1/lisp/textmodes/reftex-ref.elc and src-21.2/lisp/textmodes/reftex-ref.elc differ
Binary files src-21.1/lisp/textmodes/reftex-sel.elc and src-21.2/lisp/textmodes/reftex-sel.elc differ
Binary files src-21.1/lisp/textmodes/reftex-toc.elc and src-21.2/lisp/textmodes/reftex-toc.elc differ
Binary files src-21.1/lisp/textmodes/reftex-vars.elc and src-21.2/lisp/textmodes/reftex-vars.elc differ
Binary files src-21.1/lisp/textmodes/reftex.elc and src-21.2/lisp/textmodes/reftex.elc differ
Binary files src-21.1/lisp/textmodes/scribe.elc and src-21.2/lisp/textmodes/scribe.elc differ
diff -ruN src-21.1/lisp/textmodes/sgml-mode.el src-21.2/lisp/textmodes/sgml-mode.el
--- src-21.1/lisp/textmodes/sgml-mode.el	Mon Jul 16 13:39:42 2001
+++ src-21.2/lisp/textmodes/sgml-mode.el	Fri Feb 22 11:51:40 2002
@@ -107,6 +107,10 @@
 	      (define-key map "'" 'sgml-name-self))))
     (define-key map (vector (make-char 'latin-iso8859-1))
       'sgml-maybe-name-self)
+    (let ((c 127)
+	  (map (nth 1 map)))
+      (while (< (setq c (1+ c)) 256)
+	(aset map c 'sgml-maybe-name-self)))
     (define-key map [menu-bar sgml] (cons "SGML" menu-map))
     (define-key menu-map [sgml-validate] '("Validate" . sgml-validate))
     (define-key menu-map [sgml-name-8bit-mode]
@@ -143,7 +147,7 @@
 
 
 (defcustom sgml-name-8bit-mode nil
-  "*When non-nil, insert 8 bit characters with their names."
+  "*When non-nil, insert non-ASCII characters as named entities."
   :type 'boolean
   :group 'sgml)
 
@@ -182,6 +186,20 @@
    "oslash" "ugrave" "uacute" "ucirc" "uuml" "yacute" "thorn" "yuml"]
   "Vector of symbolic character names without `&' and `;'.")
 
+(put 'sgml-table 'char-table-extra-slots 0)
+
+(defvar sgml-char-names-table
+  (let ((table (make-char-table 'sgml-table))
+	(i 32)
+	elt)
+    (while (< i 256)
+      (setq elt (aref sgml-char-names i))
+      (if elt (aset table (make-char 'latin-iso8859-1 i) elt))
+      (setq i (1+ i)))
+    table)
+  "A table for mapping non-ASCII characters into SGML entity names.
+Currently, only Latin-1 characters are supported.")
+
 
 ;; nsgmls is a free SGML parser in the SP suite available from
 ;; ftp.jclark.com and otherwise packaged for GNU systems.
@@ -208,17 +226,16 @@
   :group 'sgml)
 
 (defconst sgml-start-tag-regex
-  "<[A-Za-z]\\([-.A-Za-z0-9= \n\t]\\|\"[^\"]*\"\\|'[^']*'\\)*"
+  "<[[:alnum:]]\\([-_.:[:alnum:]= \n\t]\\|\"[^\"]*\"\\|'[^']*'\\)*"
   "Regular expression that matches a non-empty start tag.
 Any terminating `>' or `/' is not matched.")
 
 
 ;; internal
 (defconst sgml-font-lock-keywords-1
-  '(("<\\([!?][a-z][-.a-z0-9]*\\)" 1 font-lock-keyword-face)
-    ("<\\(/?[a-z][-.a-z0-9]*\\)" 1 font-lock-function-name-face)
-    ("[&%][a-z][-.a-z0-9]*;?" . font-lock-variable-name-face)
-    ("<! *--.*-- *>" . font-lock-comment-face)))
+  '(("<\\([!?][[:alnum:]][-_.:[:alnum:]]*\\)" 1 font-lock-keyword-face)
+    ("<\\(/?[[:alnum:]][-_.:[:alnum:]]*\\)" 1 font-lock-function-name-face)
+    ("[&%][[:alpha:]][-_.:[:alnum:]]*;?" . font-lock-variable-name-face)))
 
 (defconst sgml-font-lock-keywords-2 ())
 
@@ -325,9 +342,9 @@
 	;; This is desirable because SGML discards a newline that appears
 	;; immediately after a start tag or immediately before an end tag.
 	paragraph-separate "[ \t]*$\\|\
-\[ \t]*</?\\([A-Za-z]\\([-.A-Za-z0-9= \t\n]\\|\"[^\"]*\"\\|'[^']*'\\)*\\)?>$"
+\[ \t]*</?\\([A-Za-z]\\([-_.:[:alnum:]= \t\n]\\|\"[^\"]*\"\\|'[^']*'\\)*\\)?>$"
 	paragraph-start "[ \t]*$\\|\
-\[ \t]*</?\\([A-Za-z]\\([-.A-Za-z0-9= \t\n]\\|\"[^\"]*\"\\|'[^']*'\\)*\\)?>"
+\[ \t]*</?\\([A-Za-z]\\([-_.:[:alnum:]]= \t\n]\\|\"[^\"]*\"\\|'[^']*'\\)*\\)?>"
 	adaptive-fill-regexp "[ \t]*"
 	comment-start "<!-- "
 	comment-end " -->"
@@ -348,6 +365,8 @@
 			     nil
 			     t)
 	facemenu-add-face-function 'sgml-mode-facemenu-add-face-function)
+  (set (make-local-variable 'font-lock-syntactic-keywords)
+       '(("\\(<\\)! *--.*-- *\\(>\\)" (1 "!") (2 "!"))))
   ;; This will allow existing comments within declarations to be
   ;; recognized.
   (set (make-local-variable 'comment-start-skip) "\\(?:<!\\)?--[ \t]*")
@@ -446,11 +465,14 @@
 					       (point))
 					     (1+ blinkpos))))))))))
 
-
+;; Why doesn't this use the iso-cvt table or, preferably, generate the
+;; inverse of the extensive table in the SGML Quail input method?  -- fx
+;; I guess that's moot since it only works with Latin-1 anyhow.
 (defun sgml-name-char (&optional char)
   "Insert a symbolic character name according to `sgml-char-names'.
-8 bit chars may be inserted with the meta key as in M-SPC for no break space,
-or M-- for a soft hyphen."
+Non-ASCII chars may be inserted either with the meta key, as in M-SPC for
+no-break space or M-- for a soft hyphen; or via an input method or
+encoded keyboard operation."
   (interactive "*")
   (insert ?&)
   (or char
@@ -459,34 +481,44 @@
   (insert char)
   (undo-boundary)
   (delete-backward-char 1)
-  (insert ?&
-	  (or (aref sgml-char-names char)
-	      (format "#%d" char))
-	  ?\;))
-
+  (cond
+   ((< char 256)
+    (insert ?&
+	    (or (aref sgml-char-names char)
+		(format "#%d" char))
+	    ?\;))
+   ((aref sgml-char-names-table char)
+    (insert ?& (aref sgml-char-names-table char) ?\;))
+   ((let ((c (encode-char char 'ucs)))
+      (when c
+	(insert (format "&#%d;" c))
+	t)))
+   (t					; should be an error?  -- fx
+    (insert char))))
 
 (defun sgml-name-self ()
   "Insert a symbolic character name according to `sgml-char-names'."
   (interactive "*")
   (sgml-name-char last-command-char))
 
-
 (defun sgml-maybe-name-self ()
   "Insert a symbolic character name according to `sgml-char-names'."
   (interactive "*")
   (if sgml-name-8bit-mode
-      (sgml-name-char
-       (if (eq (char-charset last-command-char) 'latin-iso8859-1)
-	   (+ 128 (- last-command-char (make-char 'latin-iso8859-1)))
-	 last-command-char))
+      (let ((mc last-command-char))
+	(if (< mc 256)
+	    (setq mc (unibyte-char-to-multibyte mc)))
+	(or mc (setq mc last-command-char))
+	(sgml-name-char mc))
     (self-insert-command 1)))
 
-
+;; Fixme: This should sanity-check for use of Latin-1.
 (defun sgml-name-8bit-mode ()
-  "Toggle insertion of 8 bit characters."
+  "Toggle whether to insert named entities instead of non-ASCII characters.
+This only works for Latin-1 input."
   (interactive)
   (setq sgml-name-8bit-mode (not sgml-name-8bit-mode))
-  (message "sgml name 8 bit mode  is now %s"
+  (message "sgml name entity mode is now %s"
 	   (if sgml-name-8bit-mode "ON" "OFF")))
 
 
Binary files src-21.1/lisp/textmodes/sgml-mode.elc and src-21.2/lisp/textmodes/sgml-mode.elc differ
Binary files src-21.1/lisp/textmodes/spell.elc and src-21.2/lisp/textmodes/spell.elc differ
diff -ruN src-21.1/lisp/textmodes/tex-mode.el src-21.2/lisp/textmodes/tex-mode.el
--- src-21.1/lisp/textmodes/tex-mode.el	Sun Jul 15 18:15:35 2001
+++ src-21.2/lisp/textmodes/tex-mode.el	Wed Mar 13 20:52:05 2002
@@ -1,6 +1,6 @@
 ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands
 
-;; Copyright (C) 1985, 86, 89, 92, 94, 95, 96, 97, 98, 1999
+;; Copyright (C) 1985, 86, 89, 92, 94, 95, 96, 97, 98, 1999, 2002
 ;;       Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -497,12 +497,12 @@
 			t))
 	    ;;
 	    ;; Names of commands that should be fontified.
-	    (specials (regexp-opt
-		       '("\\" "\\*" ;; "-"
-			 "linebreak" "nolinebreak" "pagebreak" "nopagebreak"
-			 "newline" "newpage" "clearpage" "cleardoublepage"
-			 "displaybreak" "allowdisplaybreaks" "enlargethispage")
-		       t))
+	    (specials-1 (regexp-opt '("\\" "\\*") t)) ;; "-"
+	    (specials-2 (regexp-opt
+			 '("linebreak" "nolinebreak" "pagebreak" "nopagebreak"
+			   "newline" "newpage" "clearpage" "cleardoublepage"
+			   "displaybreak" "allowdisplaybreaks"
+			   "enlargethispage") t))
 	    (general "\\([a-zA-Z@]+\\**\\|[^ \t\n]\\)")
 	    ;;
 	    ;; Miscellany.
@@ -521,7 +521,9 @@
 	      'font-lock-string-face)
 	;;
 	;; Command names, special and general.
-	(cons (concat slash specials) 'font-lock-warning-face)
+	(cons (concat slash specials-1) 'font-lock-warning-face)
+	(list (concat "\\(" slash specials-2 "\\)\\([^a-zA-Z@]\\|\\'\\)")
+	      1 'font-lock-warning-face)
 	(concat slash general)
 	;;
 	;; Font environments.  It seems a bit dubious to use `bold' etc. faces
@@ -1408,8 +1410,10 @@
 		     ;; (or (easy-mmode-derived-mode-p 'latex-mode)
 		     ;; 	 (easy-mmode-derived-mode-p 'plain-tex-mode))
 		     (save-excursion
-		       (goto-char (point-min))
-		       (re-search-forward header-re 10000 t)))
+		       (save-restriction
+			 (widen)
+			 (goto-char (point-min))
+			 (re-search-forward header-re 10000 t))))
 	    (throw 'found (expand-file-name buffer-file-name))))))))
 
 (defun tex-main-file ()
Binary files src-21.1/lisp/textmodes/tex-mode.elc and src-21.2/lisp/textmodes/tex-mode.elc differ
diff -ruN src-21.1/lisp/textmodes/texinfmt.el src-21.2/lisp/textmodes/texinfmt.el
--- src-21.1/lisp/textmodes/texinfmt.el	Mon Jul 16 14:23:00 2001
+++ src-21.2/lisp/textmodes/texinfmt.el	Sun Oct 28 10:10:32 2001
@@ -2129,7 +2129,7 @@
     (setq fill-column existing-fill-column)))
 
 
-;;; @ifinfo,  @iftex, @tex, @ifhtml, @html, @ifnottex
+;;; @ifinfo,  @iftex, @tex, @ifhtml, @html, @ifnottex, @ifnotinfo, @ifnothtml
 
 (put 'ifinfo 'texinfo-format 'texinfo-discard-line)
 (put 'ifinfo 'texinfo-end 'texinfo-discard-command)
@@ -2158,8 +2158,17 @@
                  (progn (re-search-forward "@end html[ \t]*\n")
                         (point))))
 
+(put 'ifnotinfo 'texinfo-format 'texinfo-format-ifnotinfo)
+(defun texinfo-format-ifnotinfo ()
+  (delete-region texinfo-command-start
+                 (progn (re-search-forward "@end ifnotinfo[ \t]*\n")
+                        (point))))
+
 (put 'ifnottex 'texinfo-format 'texinfo-discard-line)
 (put 'ifnottex 'texinfo-end 'texinfo-discard-command)
+
+(put 'ifnothtml 'texinfo-format 'texinfo-discard-line)
+(put 'ifnothtml 'texinfo-end 'texinfo-discard-command)
 
 
 ;;; @titlepage
Binary files src-21.1/lisp/textmodes/texinfmt.elc and src-21.2/lisp/textmodes/texinfmt.elc differ
Binary files src-21.1/lisp/textmodes/texinfo.elc and src-21.2/lisp/textmodes/texinfo.elc differ
diff -ruN src-21.1/lisp/textmodes/texnfo-upd.el src-21.2/lisp/textmodes/texnfo-upd.el
--- src-21.1/lisp/textmodes/texnfo-upd.el	Sun Aug 26 18:48:36 2001
+++ src-21.2/lisp/textmodes/texnfo-upd.el	Wed Mar 13 20:52:05 2002
@@ -1,6 +1,6 @@
 ;;; texnfo-upd.el --- utilities for updating nodes and menus in Texinfo files
 
-;; Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Robert J. Chassell
 ;; Maintainer: bug-texinfo@gnu.org
@@ -673,7 +673,7 @@
             "\\|"                              ; or
             "\\(^@ifnottex[ ]*\n\\)"           ; ifnottex line, if any
             "\\)?"                             ; end of expression
-	    "\\)?")
+	    )
 	   nil t)
 	  (progn
 	    (setq title
Binary files src-21.1/lisp/textmodes/texnfo-upd.elc and src-21.2/lisp/textmodes/texnfo-upd.elc differ
Binary files src-21.1/lisp/textmodes/text-mode.elc and src-21.2/lisp/textmodes/text-mode.elc differ
diff -ruN src-21.1/lisp/textmodes/tildify.el src-21.2/lisp/textmodes/tildify.el
--- src-21.1/lisp/textmodes/tildify.el	Sun Aug  5 10:59:42 2001
+++ src-21.2/lisp/textmodes/tildify.el	Wed Mar 13 20:52:05 2002
@@ -1,9 +1,9 @@
 ;;; tildify.el --- adding hard spaces into texts
 
-;; Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
 
 ;; Author:     Milan Zamazal <pdm@zamazal.org>
-;; Version:    4.4
+;; Version:    4.5
 ;; Keywords:   text, TeX, SGML, wp
 
 ;; This file is part of GNU Emacs.
@@ -86,6 +86,7 @@
     (tex-mode . latex-mode)
     (plain-tex-mode . latex-mode)
     (sgml-mode . "&nbsp;")
+    (xml-mode . sgml-mode)
     (html-mode . sgml-mode)
     (t . " "))
   "Alist specifying what is a hard space in the current major mode.
Binary files src-21.1/lisp/textmodes/tildify.elc and src-21.2/lisp/textmodes/tildify.elc differ
Binary files src-21.1/lisp/textmodes/two-column.elc and src-21.2/lisp/textmodes/two-column.elc differ
Binary files src-21.1/lisp/textmodes/underline.elc and src-21.2/lisp/textmodes/underline.elc differ
Binary files src-21.1/lisp/thingatpt.elc and src-21.2/lisp/thingatpt.elc differ
Binary files src-21.1/lisp/time-stamp.elc and src-21.2/lisp/time-stamp.elc differ
Binary files src-21.1/lisp/time.elc and src-21.2/lisp/time.elc differ
Binary files src-21.1/lisp/timer.elc and src-21.2/lisp/timer.elc differ
Binary files src-21.1/lisp/timezone.elc and src-21.2/lisp/timezone.elc differ
diff -ruN src-21.1/lisp/tmm.el src-21.2/lisp/tmm.el
--- src-21.1/lisp/tmm.el	Fri May 18 15:10:05 2001
+++ src-21.2/lisp/tmm.el	Sat Feb  2 15:47:39 2002
@@ -1,10 +1,11 @@
 ;;; tmm.el --- text mode access to menu-bar
 
-;; Copyright (C) 1994, 1995, 1996, 2000, 2001
+;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich <ilya@math.mps.ohio-state.edu>
 ;; Maintainer: FSF
+;; Keywords: convenience
 
 ;; This file is part of GNU Emacs.
 
@@ -25,13 +26,7 @@
 
 ;;; Commentary:
 
-;; To use this package add 
-
-;; (autoload 'tmm-menubar 'tmm "Text mode substitute for menubar" t) 
-;; (global-set-key [f10] 'tmm-menubar)
-;; to your .emacs file. You can also add your own access to different
-;; menus available in Window System Emacs modeling definition after
-;; tmm-menubar.
+;; This package provides text mode access to the menu bar.
 
 ;;; Code:
 
@@ -401,7 +396,7 @@
 `x-popup-menu' argument (when IN-X-MENU is not-nil).
 This function adds the element only if it is not already present.
 It uses the free variable `tmm-table-undef' to keep undefined keys."
-  (let (km str cache plist filter (event (car elt)))
+  (let (km str cache plist filter visible (event (car elt)))
     (setq elt (cdr elt))
     (if (eq elt 'undefined)
 	(setq tmm-table-undef (cons (cons event nil) tmm-table-undef))
@@ -439,6 +434,9 @@
 	       (setq filter (plist-get plist :filter))
 	       (if filter
 		   (setq km (funcall filter km)))
+	       (setq visible (plist-get plist :visible))
+	       (if visible
+		   (setq km (and (eval visible) km)))
 	       (and str
 		    (consp (nth 3 elt))
 		    (stringp (cdr (nth 3 elt))) ; keyseq cache
Binary files src-21.1/lisp/tmm.elc and src-21.2/lisp/tmm.elc differ
Binary files src-21.1/lisp/toolbar/tool-bar.elc and src-21.2/lisp/toolbar/tool-bar.elc differ
diff -ruN src-21.1/lisp/tooltip.el src-21.2/lisp/tooltip.el
--- src-21.1/lisp/tooltip.el	Wed May 16 16:53:37 2001
+++ src-21.2/lisp/tooltip.el	Sat Nov  3 18:04:32 2001
@@ -24,13 +24,6 @@
 
 ;;; Commentary:
 
-;; Put into your `.emacs'
-
-;; (require 'tooltip)
-;; (tooltip-mode 1)
-
-
-
 ;;; Code:
 
 (eval-when-compile
@@ -54,7 +47,7 @@
 
 (defvar tooltip-mode)
 
-(defcustom tooltip-delay 1.0
+(defcustom tooltip-delay 0.7
   "Seconds to wait before displaying a tooltip the first time."
   :tag "Delay"
   :type 'number
@@ -76,7 +69,7 @@
   :group 'tooltip)
 
 
-(defcustom tooltip-hide-delay 5
+(defcustom tooltip-hide-delay 10
   "Hide tooltips automatically after this many seconds."
   :tag "Hide delay"
   :type 'number
@@ -84,10 +77,14 @@
 
 
 (defcustom tooltip-x-offset nil
-  "Specify an X offset for the display of tooltips.
+  "Specify an X offset, in pixels, for the display of tooltips.
 The offset is relative to the position of the mouse.  It must
 be chosen so that the tooltip window doesn't contain the mouse
-when it pops up."
+when it pops up.  If the value is nil, the default offset is 5
+pixels.
+
+If `tooltip-frame-parameters' includes the `left' parameter,
+the value of `tooltip-x-offset' is ignored."
   :tag "X offset"
   :type '(choice (const :tag "Default" nil)
 		 (integer :tag "Offset" :value 1))
@@ -95,10 +92,14 @@
 
 
 (defcustom tooltip-y-offset nil
-  "Specify an Y offset for the display of tooltips.
+  "Specify a Y offset, in pixels, for the display of tooltips.
 The offset is relative to the position of the mouse.  It must
 be chosen so that the tooltip window doesn't contain the mouse
-when it pops up."
+when it pops up.  If the value is nil, the default offset is -10
+pixels.
+
+If `tooltip-frame-parameters' includes the `top' parameter,
+the value of `tooltip-y-offset' is ignored."
   :tag "Y offset"
   :type '(choice (const :tag "Default" nil)
 		 (integer :tag "Offset" :value 1))
@@ -109,7 +110,10 @@
   '((name . "tooltip")
     (internal-border-width . 5)
     (border-width . 1))
-  "Frame parameters used for tooltips."
+  "Frame parameters used for tooltips.
+
+If `left' or `top' parameters are included, they specify the absolute
+position to pop up the tooltip."
   :type 'sexp
   :tag "Frame Parameters"
   :group 'tooltip)
@@ -319,7 +323,7 @@
 ;;; Displaying tips
 
 (defun tooltip-set-param (alist key value)
-  "Change the value of KEY in alist ALIAS to VALUE.
+  "Change the value of KEY in alist ALIST to VALUE.
 If there's no association for KEY in ALIST, add one, otherwise 
 change the existing association.  Value is the resulting alist."
   (let ((param (assq key alist)))
@@ -330,7 +334,15 @@
 
 
 (defun tooltip-show (text)
-  "Show a tooltip window at the current mouse position displaying TEXT."
+  "Show a tooltip window displaying TEXT.
+
+Text larger than `x-max-tooltip-size' (which see) is clipped.
+
+If the alist in `tooltip-frame-parameters' includes `left' and `top'
+parameters, they determine the x and y position where the tooltip
+is displayed.  Otherwise, the tooltip pops at offsets specified by
+`tooltip-x-offset' and `tooltip-y-offset' from the current mouse
+position."
   (if tooltip-use-echo-area
       (message "%s" text)
     (condition-case error
Binary files src-21.1/lisp/tooltip.elc and src-21.2/lisp/tooltip.elc differ
Binary files src-21.1/lisp/type-break.elc and src-21.2/lisp/type-break.elc differ
Binary files src-21.1/lisp/uniquify.elc and src-21.2/lisp/uniquify.elc differ
Binary files src-21.1/lisp/unused.elc and src-21.2/lisp/unused.elc differ
Binary files src-21.1/lisp/userlock.elc and src-21.2/lisp/userlock.elc differ
diff -ruN src-21.1/lisp/vc-cvs.el src-21.2/lisp/vc-cvs.el
--- src-21.1/lisp/vc-cvs.el	Tue Aug 28 19:06:36 2001
+++ src-21.2/lisp/vc-cvs.el	Fri Nov 30 15:05:18 2001
@@ -5,7 +5,7 @@
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-cvs.el,v 1.24 2001/08/28 17:06:36 spiegel Exp $
+;; $Id: vc-cvs.el,v 1.24.4.2 2001/11/30 14:05:18 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -523,6 +523,30 @@
           1 ;; async diff, pessimistic assumption
         status))))
 
+(defun vc-cvs-diff-tree (dir &optional rev1 rev2)
+  "Diff all files at and below DIR."
+  (with-current-buffer "*vc-diff*"
+    (setq default-directory dir)
+    (if (vc-cvs-stay-local-p dir)
+        ;; local diff: do it filewise, and only for files that are modified
+        (vc-file-tree-walk
+         dir
+         (lambda (f)
+           (vc-exec-after
+            `(let ((coding-system-for-read (vc-coding-system-for-diff ',f)))
+               ;; possible optimization: fetch the state of all files
+               ;; in the tree via vc-cvs-dir-state-heuristic
+               (unless (vc-up-to-date-p ',f)
+                 (message "Looking at %s" ',f)
+                 (vc-diff-internal ',f ',rel1 ',rel2))))))
+      ;; cvs diff: use a single call for the entire tree
+      (let ((coding-system-for-read
+             (or coding-system-for-read 'undecided)))
+        (apply 'vc-do-command "*vc-diff*" 1 "cvs" nil "diff"
+               (and rel1 (concat "-r" rel1))
+               (and rel2 (concat "-r" rel2))
+               (vc-diff-switches-list cvs))))))
+
 (defun vc-cvs-annotate-command (file buffer &optional version)
   "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER.
 Optional arg VERSION is a version to annotate from."
@@ -664,19 +688,21 @@
             (setq status (match-string 1)))
           (if (and full
                    (re-search-forward
-		    "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
+                    "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
 \[\t ]+\\([0-9.]+\\)"
                     nil t))
               (vc-file-setprop file 'vc-latest-version (match-string 2)))
-          (cond
-           ((string-match "Up-to-date" status)
-            (vc-file-setprop file 'vc-checkout-time
-                             (nth 5 (file-attributes file)))
-            'up-to-date)
-           ((string-match "Locally Modified"    status) 'edited)
-	   ((string-match "Needs Merge"         status) 'needs-merge)
-	   ((string-match "Needs \\(Checkout\\|Patch\\)" status) 'needs-patch)
-	   (t 'edited)))))))
+          (vc-file-setprop 
+           file 'vc-state
+           (cond
+            ((string-match "Up-to-date" status)
+             (vc-file-setprop file 'vc-checkout-time
+                              (nth 5 (file-attributes file)))
+             'up-to-date)
+            ((string-match "Locally Modified" status)             'edited)
+            ((string-match "Needs Merge" status)                  'needs-merge)
+            ((string-match "Needs \\(Checkout\\|Patch\\)" status) 'needs-patch)
+            (t 'edited))))))))
 
 (defun vc-cvs-dir-state-heuristic (dir)
   "Find the CVS state of all files in DIR, using only local information."
Binary files src-21.1/lisp/vc-cvs.elc and src-21.2/lisp/vc-cvs.elc differ
diff -ruN src-21.1/lisp/vc-hooks.el src-21.2/lisp/vc-hooks.el
--- src-21.1/lisp/vc-hooks.el	Mon Sep 24 18:36:14 2001
+++ src-21.2/lisp/vc-hooks.el	Fri Dec 14 09:19:06 2001
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-hooks.el,v 1.134 2001/09/24 16:36:14 monnier Exp $
+;; $Id: vc-hooks.el,v 1.134.4.2 2001/12/14 08:19:06 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -129,7 +129,7 @@
 \\{vc-prefix-map}")
 
 (defmacro vc-error-occurred (&rest body)
-  (list 'condition-case nil (cons 'progn (append body '(nil))) '(error t)))
+  `(condition-case nil (progn ,@body nil) (error t)))
 
 ;; We need a notion of per-file properties because the version
 ;; control state of a file is expensive to derive --- we compute
@@ -137,7 +137,7 @@
 ;; during any subsequent VC operations, and forget them when
 ;; the buffer is killed.
 
-(defvar vc-file-prop-obarray (make-vector 16 0)
+(defvar vc-file-prop-obarray (make-vector 17 0)
   "Obarray for per-file properties.")
 
 (defvar vc-touched-properties nil)
@@ -304,21 +304,25 @@
 (defun vc-checkout-model (file)
   "Indicate how FILE is checked out.
 
-Possible values:
+If FILE is not registered, this function always returns nil.
+For registered files, the possible values are:
 
-  'implicit   File is always writeable, and checked out `implicitly'
+  'implicit   FILE is always writeable, and checked out `implicitly'
               when the user saves the first changes to the file.
 
-  'locking    File is read-only if up-to-date; user must type
+  'locking    FILE is read-only if up-to-date; user must type
               \\[vc-toggle-read-only] before editing.  Strict locking
               is assumed.
 
-  'announce   File is read-only if up-to-date; user must type
+  'announce   FILE is read-only if up-to-date; user must type
               \\[vc-toggle-read-only] before editing.  But other users
-              may be editing at the same time."
+              may be editing at the same time.
+
+If FILE is not registered, this function always returns nil."
   (or (vc-file-getprop file 'vc-checkout-model)
-      (vc-file-setprop file 'vc-checkout-model
-                       (vc-call checkout-model file))))
+      (if (vc-backend file)
+          (vc-file-setprop file 'vc-checkout-model
+                           (vc-call checkout-model file)))))
 
 (defun vc-user-login-name (&optional uid)
   "Return the name under which the user is logged in, as a string.
@@ -332,7 +336,8 @@
 (defun vc-state (file)
   "Return the version control state of FILE.
 
-The value returned is one of:
+If FILE is not registered, this function always returns nil.
+For registered files, the value returned is one of:
 
   'up-to-date        The working file is unmodified with respect to the
                      latest version on the current branch, and not locked.
@@ -360,8 +365,9 @@
                      should be resolved by the user (vc-next-action will
                      prompt the user to do it)."
   (or (vc-file-getprop file 'vc-state)
-      (vc-file-setprop file 'vc-state
-		       (vc-call state-heuristic file))))
+      (if (vc-backend file)
+          (vc-file-setprop file 'vc-state
+                           (vc-call state-heuristic file)))))
 
 (defsubst vc-up-to-date-p (file)
   "Convenience function that checks whether `vc-state' of FILE is `up-to-date'."
@@ -374,10 +380,12 @@
    (vc-call-backend backend 'state file))
 
 (defun vc-workfile-version (file)
-  "Return version level of the current workfile FILE."
+  "Return the version level of the current workfile FILE.
+If FILE is not registered, this function always returns nil."
   (or (vc-file-getprop file 'vc-workfile-version)
-      (vc-file-setprop file 'vc-workfile-version
-                       (vc-call workfile-version file))))
+      (if (vc-backend file)
+          (vc-file-setprop file 'vc-workfile-version
+                           (vc-call workfile-version file)))))
 
 ;;; actual version-control code starts here
 
@@ -412,8 +420,7 @@
       (if (consp result) (car result) result)))))
 
 (defun vc-check-master-templates (file templates)
-  "Return non-nil if there is a master corresponding to FILE,
-according to any of the elements in TEMPLATES.
+  "Return non-nil if there is a master corresponding to FILE.
 
 TEMPLATES is a list of strings or functions.  If an element is a
 string, it must be a control string as required by `format', with two
@@ -463,8 +470,8 @@
 (define-key global-map "\C-x\C-q" 'vc-toggle-read-only)
 
 (defun vc-default-make-version-backups-p (backend file)
-  "Return non-nil if unmodified repository versions should 
-be backed up locally.  The default is to switch off this feature."
+  "Return non-nil if unmodified versions should be backed up locally.
+The default is to switch off this feature."
   nil)
 
 (defun vc-version-backup-file-name (file &optional rev manual regexp)
Binary files src-21.1/lisp/vc-hooks.elc and src-21.2/lisp/vc-hooks.elc differ
Binary files src-21.1/lisp/vc-rcs.elc and src-21.2/lisp/vc-rcs.elc differ
Binary files src-21.1/lisp/vc-sccs.elc and src-21.2/lisp/vc-sccs.elc differ
diff -ruN src-21.1/lisp/vc.el src-21.2/lisp/vc.el
--- src-21.1/lisp/vc.el	Tue Sep 25 00:29:15 2001
+++ src-21.2/lisp/vc.el	Wed Mar 13 20:51:46 2002
@@ -6,7 +6,7 @@
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 ;; Keywords: tools
 
-;; $Id: vc.el,v 1.311 2001/09/24 22:29:15 monnier Exp $
+;; $Id: vc.el,v 1.311.4.5 2002/03/05 13:41:05 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -289,6 +289,13 @@
 ;;   (no differences found), or 1 (either non-empty diff or the diff is
 ;;   run asynchronously).
 ;;
+;; - diff-tree (dir &optional rev1 rev2) 
+;;
+;;   Insert the diff for all files at and below DIR into the *vc-diff*
+;;   buffer.  The meaning of REV1 and REV2 is the same as for 
+;;   vc-BACKEND-diff.  The default implementation does an explicit tree
+;;   walk, calling vc-BACKEND-diff for each individual file.
+;;
 ;; - annotate-command (file buf rev)
 ;;
 ;;   If this function is provided, it should produce an annotated version
@@ -459,7 +466,7 @@
   :version "20.3")
 
 (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS")
-  "*List of directory names to be ignored while recursively walking file trees."
+  "*List of directory names to be ignored when walking directory trees."
   :type '(repeat string)
   :group 'vc)
 
@@ -484,7 +491,7 @@
 
 ;;;###autoload
 (defcustom vc-checkout-hook nil
-  "*Normal hook (list of functions) run after a file has been checked out.
+  "*Normal hook (list of functions) run after checking out a file.
 See `run-hooks'."
   :type 'hook
   :group 'vc
@@ -500,7 +507,7 @@
 
 ;;;###autoload
 (defcustom vc-before-checkin-hook nil
-  "*Normal hook (list of functions) run before a file gets checked in.
+  "*Normal hook (list of functions) run before a file is checked in.
 See `run-hooks'."
   :type 'hook
   :group 'vc)
@@ -532,13 +539,13 @@
     (421.8750 . "#00B6FF")
     (448.2422 . "#007EFF"))
   "*Association list of age versus color, for \\[vc-annotate].
-Ages are given in units of 2**-16 seconds.
+Ages are given in units of 2**16 seconds.
 Default is eighteen steps using a twenty day increment."
   :type 'alist
   :group 'vc)
 
 (defcustom vc-annotate-very-old-color "#0046FF"
-  "*Color for lines older than CAR of last cons in `vc-annotate-color-map'."
+  "*Color for lines older than current color range in \\[vc-annotate]]."
   :type 'string
   :group 'vc)
 
@@ -582,7 +589,7 @@
 
 (defcustom vc-comment-alist
   '((nroff-mode ".\\\"" ""))
-  "*Special comment delimiters to be used in generating vc headers only.
+  "*Special comment delimiters for generating VC headers.
 Add an entry in this list if you need to override the normal `comment-start'
 and `comment-end' variables.  This will only be necessary if the mode language
 is sensitive to blank lines."
@@ -592,12 +599,12 @@
 		       (string :tag "Comment End")))
   :group 'vc)
 
-;; Default is to be extra careful for super-user.
-;; TODO: This variable is no longer used; the corresponding checks
-;;       are always done now.  If that turns out to be fast enough,
-;;       the variable can be obsoleted.
 (defcustom vc-checkout-carefully (= (user-uid) 0)
-  "*Non-nil means be extra-careful in checkout.
+  "*This variable is obsolete.
+The corresponding checks are always done now.
+From the old doc string:
+
+Non-nil means be extra-careful in checkout.
 Verify that the file really is not locked
 and that its contents match what the master file says."
   :type 'boolean
@@ -683,16 +690,16 @@
 (defun vc-clear-context ()
   "Clear all cached file properties and the comment ring."
   (interactive)
-  (fillarray vc-file-prop-obarray nil)
+  (fillarray vc-file-prop-obarray 0)
   ;; Note: there is potential for minor lossage here if there is an open
   ;; log buffer with a nonzero local value of vc-comment-ring-index.
   (setq vc-comment-ring (make-ring vc-maximum-comment-ring-size)))
 
 (defmacro with-vc-properties (file form settings)
-  "Execute FORM, then set per-file properties for FILE,
-but only those that have not been set during the execution of FORM.
-SETTINGS is a list of two-element lists, each of which has the
-  form (PROPERTY . VALUE)."
+  "Execute FORM, then maybe set per-file properties for FILE.
+SETTINGS is an association list of property/value pairs.  After
+executing FORM, set those properties from SETTINGS that have not yet
+been updated to their corresponding values."
   `(let ((vc-touched-properties (list t))
 	 (filename ,file))
      ,form
@@ -706,13 +713,14 @@
 ;; Random helper functions
 
 (defsubst vc-editable-p (file)
+  "Return non-nil if FILE can be edited."
   (or (eq (vc-checkout-model file) 'implicit)
       (memq (vc-state file) '(edited needs-merge))))
 
 ;; Two macros for elisp programming
 ;;;###autoload
 (defmacro with-vc-file (file comment &rest body)
-  "Check out a writable copy of FILE if necessary and execute the body.
+  "Check out a writable copy of FILE if necessary, then execute BODY.
 Check in FILE with COMMENT (a string) after BODY has been executed.
 FILE is passed through `expand-file-name'; BODY executed within
 `save-excursion'.  If FILE is not under version control, or locked by
@@ -770,7 +778,7 @@
 	(set-marker (process-mark p) (point))))))
 
 (defun vc-setup-buffer (&optional buf)
-  "Prepare BUF for executing a VC command and make it the current buffer.
+  "Prepare BUF for executing a VC command and make it current.
 BUF defaults to \"*vc*\", can be a string and will be created if necessary."
   (unless buf (setq buf "*vc*"))
   (let ((camefrom (current-buffer))
@@ -814,11 +822,11 @@
 (defvar vc-post-command-functions nil
   "Hook run at the end of `vc-do-command'.
 Each function is called inside the buffer in which the command was run
-and is passed 3 argument: the COMMAND, the FILE and the FLAGS.")
+and is passed 3 arguments: the COMMAND, the FILE and the FLAGS.")
 
 ;;;###autoload
 (defun vc-do-command (buffer okstatus command file &rest flags)
-  "Execute a version control command, notifying user and checking for errors.
+  "Execute a VC command, notifying user and checking for errors.
 Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil or the
 current buffer if BUFFER is t.  If the destination buffer is not
 already current, set it up properly and erase it.  The command is
@@ -889,7 +897,8 @@
 			  (min (point-max) (+ posn 100)))))
 
 (defun vc-find-position-by-context (context)
-  "Return the position of CONTEXT in the current buffer, or nil if not found."
+  "Return the position of CONTEXT in the current buffer.
+If CONTEXT cannot be found, return nil."
   (let ((context-string (nth 2 context)))
     (if (equal "" context-string)
 	(point-max)
@@ -985,8 +994,8 @@
            (if new-mark (set-mark new-mark))))))
 
 (defun vc-revert-buffer1 (&optional arg no-confirm)
-  "Revert buffer, trying to keep point and mark where user expects them.
-Tries to be clever in the face of changes due to expanded version control
+  "Revert buffer, keeping point and mark where user expects them.
+Try to be clever in the face of changes due to expanded version control
 key words.  This is important for typeahead to work as expected.
 ARG and NO-CONFIRM are passed on to `revert-buffer'."
   (interactive "P")
@@ -1014,7 +1023,7 @@
 	  (error "Aborted")))))
 
 (defun vc-workfile-unchanged-p (file)
-  "Has FILE changed since last checkout?"
+  "Return non-nil if FILE has not changed since the last checkout."
   (let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
         (lastmod (nth 5 (file-attributes file))))
     (if checkout-time
@@ -1024,12 +1033,14 @@
         unchanged))))
 
 (defun vc-default-workfile-unchanged-p (backend file)
-  "Default check whether FILE is unchanged: diff against master version."
+  "Check if FILE is unchanged by diffing against the master version.
+Return non-nil if FILE is unchanged."
   (zerop (vc-call diff file (vc-workfile-version file))))
 
 (defun vc-default-latest-on-branch-p (backend file)
-  "Default check whether the current workfile version of FILE is the 
-latest on its branch."
+  "Return non-nil if FILE is the latest on its branch.
+This default implementation always returns non-nil, which means that
+editing non-current versions is not supported by default."
   t)
 
 (defun vc-recompute-state (file)
@@ -1039,7 +1050,7 @@
   (vc-file-setprop file 'vc-state (vc-call state file)))
 
 (defun vc-next-action-on-file (file verbose &optional comment)
-  "Do The Right Thing for a given version-controlled FILE.
+  "Do The Right Thing for a given FILE under version control.
 If COMMENT is specified, it will be used as an admin or checkin comment.
 If VERBOSE is non-nil, query the user rather than using default parameters."
   (let ((visited (get-file-buffer file))
@@ -1196,7 +1207,7 @@
 
 ;;;###autoload
 (defun vc-next-action (verbose)
-  "Do the next logical checkin or checkout operation on the current file.
+  "Do the next logical version control operation on the current file.
 
 If you call this from within a VC dired buffer with no files marked,
 it will operate on the file in the current line.
@@ -1524,12 +1535,13 @@
    'vc-checkin-hook))
 
 (defun vc-comment-to-change-log (&optional whoami file-name)
-  "Enter last VC comment into change log file for current buffer's file.
-Optional arg (interactive prefix) non-nil means prompt for user name and site.
-Second arg is file name of change log.  \
-If nil, uses `change-log-default-name'.
+  "Enter last VC comment into the change log for the current file.
+WHOAMI (interactive prefix) non-nil means prompt for user name
+and site.  FILE-NAME is the name of the change log; if nil, use
+`change-log-default-name'.
 
-May be useful as a `vc-checkin-hook' to update change logs automatically."
+This may be useful as a `vc-checkin-hook' to update change logs
+automatically."
   (interactive (if current-prefix-arg
 		   (list current-prefix-arg
 			 (prompt-for-change-log-name))))
@@ -1571,7 +1583,11 @@
 	(insert "\n"))))
 
 (defun vc-finish-logentry (&optional nocomment)
-  "Complete the operation implied by the current log entry."
+  "Complete the operation implied by the current log entry.
+Use the contents of the current buffer as a check-in or registration
+comment.  If the optional arg NOCOMMENT is non-nil, then don't check
+the buffer contents as a comment, and don't add it to
+`vc-comment-ring'."
   (interactive)
   ;; Check and record the comment, if any.
   (unless nocomment
@@ -1625,6 +1641,8 @@
 ;; Code for access to the comment ring
 
 (defun vc-new-comment-index (stride len)
+  "Return the comment index STRIDE elements from the current one.
+LEN is the length of `vc-comment-ring'."
   (mod (cond
 	(vc-comment-ring-index (+ vc-comment-ring-index stride))
 	;; Initialize the index on the first use of this command
@@ -1635,7 +1653,8 @@
        len))
 
 (defun vc-previous-comment (arg)
-  "Cycle backwards through comment history."
+  "Cycle backwards through comment history.
+With a numeric prefix ARG, go back ARG comments."
   (interactive "*p")
   (let ((len (ring-length vc-comment-ring)))
     (if (<= len 0)
@@ -1646,12 +1665,15 @@
       (insert (ring-ref vc-comment-ring vc-comment-ring-index)))))
 
 (defun vc-next-comment (arg)
-  "Cycle forwards through comment history."
+  "Cycle forwards through comment history.
+With a numeric prefix ARG, go forward ARG comments."
   (interactive "*p")
   (vc-previous-comment (- arg)))
 
 (defun vc-comment-search-reverse (str &optional stride)
-  "Search backwards through comment history for substring match."
+  "Search backwards through comment history for substring match of STR.
+If the optional argument STRIDE is present, that is a step-width to use
+when going through the comment ring."
   ;; Why substring rather than regexp ?   -sm
   (interactive
    (list (read-string "Comment substring: " nil nil vc-last-comment-match)))
@@ -1669,7 +1691,7 @@
     (vc-previous-comment 0)))
 
 (defun vc-comment-search-forward (str)
-  "Search forwards through comment history for substring match."
+  "Search forwards through comment history for a substring match of STR."
   (interactive
    (list (read-string "Comment substring: " nil nil vc-last-comment-match)))
   (vc-comment-search-reverse str -1))
@@ -1679,14 +1701,16 @@
 ;;;###autoload
 (defun vc-diff (historic &optional not-urgent)
   "Display diffs between file versions.
-Normally this compares the current file and buffer with the most recent
-checked in version of that file.  This uses no arguments.
-With a prefix argument, it reads the file name to use
-and two version designators specifying which versions to compare."
+Normally this compares the current file and buffer with the most
+recent checked in version of that file.  This uses no arguments.  With
+a prefix argument HISTORIC, it reads the file name to use and two
+version designators specifying which versions to compare.  The
+optional argument NOT-URGENT non-nil means it is ok to say no to
+saving the buffer."
   (interactive (list current-prefix-arg t))
-  (vc-ensure-vc-buffer)
   (if historic
       (call-interactively 'vc-version-diff)
+    (vc-ensure-vc-buffer)
     (let ((file buffer-file-name))
       (vc-buffer-sync not-urgent)
       (if (vc-workfile-unchanged-p buffer-file-name)
@@ -1694,9 +1718,11 @@
 	(vc-version-diff file nil nil)))))
 
 (defun vc-version-diff (file rel1 rel2)
-  "For FILE, report diffs between two stored versions REL1 and REL2 of it.
-If FILE is a directory, generate diffs between versions for all registered
-files in or below it."
+  "List the differences between FILE's versions REL1 and REL2.
+If REL1 is empty or nil it means to use the current workfile version;
+REL2 empty or nil means the current file contents.  FILE may also be
+a directory, in that case, generate diffs between the correponding
+versions of all registered files in or below it."
   (interactive
    (let ((file (expand-file-name
                 (read-file-name (if buffer-file-name
@@ -1741,37 +1767,13 @@
                   " and "
                   (or rel2 "current workfile(s)")
                   ":\n\n"))
-	(setq default-directory (file-name-as-directory file))
-	;; FIXME: this should do a single exec in CVS.
-	(vc-file-tree-walk
-	 default-directory
-	 (lambda (f)
-	   (vc-exec-after
-	    `(progn
-	       (message "Looking at %s" ',f)
-	       (vc-call-backend ',(vc-backend file) 'diff ',f ',rel1 ',rel2)))))
+        (let ((dir (file-name-as-directory file)))
+          (vc-call-backend (vc-responsible-backend dir)
+                           'diff-tree dir rel1 rel2))
 	(vc-exec-after `(let ((inhibit-read-only t))
 			  (insert "\nEnd of diffs.\n"))))
     ;; single file diff
-    (if (or (not rel1) (string-equal rel1 ""))
-	(setq rel1 (vc-workfile-version file)))
-    (if (string-equal rel2 "")
-	(setq rel2 nil))
-    (let ((file-rel1 (vc-version-backup-file file rel1))
-	  (file-rel2 (if (not rel2)
-			 file
-		       (vc-version-backup-file file rel2))))
-      (if (and file-rel1 file-rel2)
-	  (apply 'vc-do-command "*vc-diff*" 1 "diff" nil
-		 (append (if (listp diff-switches)
-			     diff-switches
-			   (list diff-switches))
-                         (if (listp vc-diff-switches)
-                             vc-diff-switches
-                           (list vc-diff-switches))
-			 (list (file-relative-name file-rel1)
-			       (file-relative-name file-rel2))))
-	(vc-call diff file rel1 rel2))))
+    (vc-diff-internal file rel1 rel2))
   (set-buffer "*vc-diff*")
   (if (and (zerop (buffer-size))
 	   (not (get-buffer-process (current-buffer))))
@@ -1793,9 +1795,37 @@
 		      (shrink-window-if-larger-than-buffer)))
     t))
 
+(defun vc-diff-internal (file rel1 rel2)
+  "Run diff to compare FILE's revisions REL1 and REL2.
+Output goes to the current buffer, which is assumed properly set up.
+The exit status of the diff command is returned.
+
+This function takes care to set up a proper coding system for diff output.
+If both revisions are available as local files, then it also does not
+actually call the backend, but performs a local diff."
+  (if (or (not rel1) (string-equal rel1 ""))
+      (setq rel1 (vc-workfile-version file)))
+  (if (string-equal rel2 "")
+      (setq rel2 nil))
+  (let ((file-rel1 (vc-version-backup-file file rel1))
+        (file-rel2 (if (not rel2)
+                       file
+                     (vc-version-backup-file file rel2)))
+        (coding-system-for-read (vc-coding-system-for-diff file)))
+    (if (and file-rel1 file-rel2)
+        (apply 'vc-do-command "*vc-diff*" 1 "diff" nil
+               (append (if (listp diff-switches)
+                           diff-switches
+                         (list diff-switches))
+                       (if (listp vc-diff-switches)
+                           vc-diff-switches
+                         (list vc-diff-switches))
+                       (list (file-relative-name file-rel1)
+                             (file-relative-name file-rel2))))
+      (vc-call diff file rel1 rel2))))
+
 (defmacro vc-diff-switches-list (backend)
-  "Make a list of `diff-switches', `vc-diff-switches', 
-and `vc-BACKEND-diff-switches'."
+  "Return the list of switches to use for executing diff under BACKEND."
   `(append 
     (if (listp diff-switches) diff-switches (list diff-switches))
     (if (listp vc-diff-switches) vc-diff-switches (list vc-diff-switches))
@@ -1804,11 +1834,44 @@
                                  "-diff-switches")))))
       (if (listp backend-switches) backend-switches (list backend-switches)))))
 
+(defun vc-default-diff-tree (backend dir rel1 rel2)
+  "List differences for all registered files at and below DIR.
+The meaning of REL1 and REL2 is the same as for `vc-version-diff'."
+  ;; This implementation does an explicit tree walk, and calls 
+  ;; vc-BACKEND-diff directly for each file.  An optimization
+  ;; would be to use `vc-diff-internal', so that diffs can be local,
+  ;; and to call it only for files that are actually changed.
+  ;; However, this is expensive for some backends, and so it is left
+  ;; to backend-specific implementations.
+  (setq default-directory dir)
+  (vc-file-tree-walk
+   default-directory
+   (lambda (f)
+     (vc-exec-after
+      `(let ((coding-system-for-read (vc-coding-system-for-diff ',f))) 
+         (message "Looking at %s" ',f)
+         (vc-call-backend ',(vc-backend f) 
+                          'diff ',f ',rel1 ',rel2))))))
+
+(defun vc-coding-system-for-diff (file)
+  "Return the coding system for reading diff output for FILE."
+  (or coding-system-for-read
+      ;; if we already have this file open, 
+      ;; use the buffer's coding system
+      (let ((buf (find-buffer-visiting file)))
+        (if buf (with-current-buffer buf
+                  buffer-file-coding-system)))
+      ;; otherwise, try to find one based on the file name
+      (car (find-operation-coding-system 'insert-file-contents
+                                         file))
+      ;; and a final fallback
+      'undecided))
+
 ;;;###autoload
 (defun vc-version-other-window (rev)
-  "Visit version REV of the current buffer in another window.
-If the current buffer is named `F', the version is named `F.~REV~'.
-If `F.~REV~' already exists, it is used instead of being re-created."
+  "Visit version REV of the current file in another window.
+If the current file is named `F', the version is named `F.~REV~'.
+If `F.~REV~' already exists, use it instead of checking it out again."
   (interactive "sVersion to visit (default is workfile version): ")
   (vc-ensure-vc-buffer)
   (let* ((file buffer-file-name)
@@ -1827,7 +1890,7 @@
 
 ;;;###autoload
 (defun vc-insert-headers ()
-  "Insert headers in a file for use with your version control system.
+  "Insert headers into a file for use with a version control system.
 Headers desired are inserted at point, and are pulled from
 the variable `vc-BACKEND-header'."
   (interactive)
@@ -1858,7 +1921,7 @@
 
 (defun vc-clear-headers (&optional file)
   "Clear all version headers in the current buffer (or FILE).
-I.e. reset them to the non-expanded form."
+The headers are reset to their non-expanded form."
   (let* ((filename (or file buffer-file-name))
 	 (visited (find-buffer-visiting filename))
 	 (backend (vc-backend filename)))
@@ -2272,7 +2335,7 @@
 ;; Named-configuration entry points
 
 (defun vc-snapshot-precondition (dir)
-  "Scan the tree below DIR, looking for non-uptodate files.
+  "Scan the tree below DIR, looking for files not up-to-date.
 If any file is not up-to-date, return the name of the first such file.
 \(This means, neither snapshot creation nor retrieval is allowed.\)
 If one or more of the files are currently visited, return `visited'.
@@ -2385,7 +2448,7 @@
 			       ',(vc-workfile-version file))))))))
 
 (defun vc-default-comment-history (backend file)
-  "Return a string with all log entries that were made under BACKEND for FILE."
+  "Return a string with all log entries stored in BACKEND for FILE."
   (if (vc-find-backend-function backend 'print-log)
       (with-temp-buffer
 	(vc-call print-log file)
@@ -2414,12 +2477,15 @@
 
 ;;;###autoload
 (defun vc-revert-buffer ()
-  "Revert the current buffer's file back to the version it was based on.
+  "Revert the current buffer's file to the version it was based on.
 This asks for confirmation if the buffer contents are not identical
 to that version.  This function does not automatically pick up newer
 changes found in the master file; use \\[universal-argument] \\[vc-next-action] to do so."
   (interactive)
   (vc-ensure-vc-buffer)
+  ;; Make sure buffer is saved.  If the user says `no', abort since
+  ;; we cannot show the changes and ask for confirmation to discard them.
+  (vc-buffer-sync nil)
   (let ((file buffer-file-name)
 	;; This operation should always ask for confirmation.
 	(vc-suppress-confirm nil)
@@ -2641,7 +2707,7 @@
 	   templates)))
     (if (or (file-symlink-p oldmaster)
 	    (file-symlink-p (file-name-directory oldmaster)))
-	(error "This unsafe in the presence of symbolic links"))
+	(error "This is unsafe in the presence of symbolic links"))
     (rename-file
      oldmaster
      (catch 'found
@@ -2798,7 +2864,7 @@
   (cdr (assoc buffer vc-annotate-buffers)))
 
 (define-derived-mode vc-annotate-mode fundamental-mode "Annotate"
-  "Major mode for buffers displaying output from the `annotate' command.
+  "Major mode for output buffers of the `vc-annotate' command.
 
 You can use the mode-specific menu to alter the time-span of the used
 colors.  See variable `vc-annotate-menu-elements' for customizing the
@@ -2914,7 +2980,7 @@
     (car (car a-list))))
 
 (defun vc-annotate-time-span (a-list span &optional quantize)
-  "Apply factor SPAN  to the time-span of association list A-LIST.
+  "Apply factor SPAN to the time-span of association list A-LIST.
 Return the new alist.
 Optionally quantize to the factor of QUANTIZE."
   ;; Apply span to each car of every cons
@@ -2926,9 +2992,9 @@
 					     a-list) span quantize))))
 
 (defun vc-annotate-compcar (threshold a-list)
-  "Test successive cons cells of association list A-LIST against THRESHOLD.
-Return the first cons cell which car is not less than THRESHOLD,
-nil otherwise"
+  "Test successive cons cells of A-LIST against THRESHOLD.
+Return the first cons cell with a car that is not less than THRESHOLD,
+nil if no such cell exists."
  (let ((i 1)
        (tmp-cons (car a-list)))
    (while (and tmp-cons (< (car tmp-cons) threshold))
Binary files src-21.1/lisp/vc.elc and src-21.2/lisp/vc.elc differ
Binary files src-21.1/lisp/vcursor.elc and src-21.2/lisp/vcursor.elc differ
diff -ruN src-21.1/lisp/version.el src-21.2/lisp/version.el
--- src-21.1/lisp/version.el	Sat Oct 20 18:12:21 2001
+++ src-21.2/lisp/version.el	Sat Mar 16 11:40:07 2002
@@ -1,6 +1,6 @@
 ;;; version.el --- record version number of Emacs
 
-;;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001
+;;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002
 ;;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -27,7 +27,7 @@
 
 ;;; Code:
 
-(defconst emacs-version "21.1" "\
+(defconst emacs-version "21.2" "\
 Version numbers of this version of Emacs.")
 
 (defconst emacs-major-version
Binary files src-21.1/lisp/view.elc and src-21.2/lisp/view.elc differ
Binary files src-21.1/lisp/vms-patch.elc and src-21.2/lisp/vms-patch.elc differ
Binary files src-21.1/lisp/vmsproc.elc and src-21.2/lisp/vmsproc.elc differ
Binary files src-21.1/lisp/vt-control.elc and src-21.2/lisp/vt-control.elc differ
Binary files src-21.1/lisp/vt100-led.elc and src-21.2/lisp/vt100-led.elc differ
diff -ruN src-21.1/lisp/w32-fns.el src-21.2/lisp/w32-fns.el
--- src-21.1/lisp/w32-fns.el	Tue Sep  4 14:53:49 2001
+++ src-21.2/lisp/w32-fns.el	Wed Mar 13 20:51:46 2002
@@ -296,8 +296,9 @@
             default))))
   (check-coding-system coding-system)
   (setq w32-system-coding-system coding-system))
-;; Set system coding system initially to iso-latin-1
-(set-w32-system-coding-system 'iso-latin-1)
+;; Set system coding system initially from locale-coding-system.
+;; In future, when defvaralias is available, this will become an alias.
+(set-w32-system-coding-system locale-coding-system)
 
 ;;; Set to a system sound if you want a fancy bell.
 (set-message-beep nil)
@@ -402,9 +403,11 @@
       (w32-add-charset-info "mac" 'w32-charset-mac nil)))
 (if (boundp 'w32-unicode-charset-defined)
     (progn
-      (w32-add-charset-info "iso10646" 'w32-charset-unicode t)
-      (w32-add-charset-info "unicode" 'w32-charset-unicode t)))
-
+      (w32-add-charset-info "iso10646-1" 'w32-charset-unicode t)
+      (w32-add-charset-info "unicode" 'w32-charset-unicode t))
+  ;; Most Windows fonts cover a large part of the Unicode range,
+  ;; so use ansi fonts if unicode is not an option.
+  (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))
 
 (make-obsolete-variable 'w32-enable-italics
                         'w32-enable-synthesized-fonts "21.1")
Binary files src-21.1/lisp/w32-fns.elc and src-21.2/lisp/w32-fns.elc differ
Binary files src-21.1/lisp/which-func.elc and src-21.2/lisp/which-func.elc differ
Binary files src-21.1/lisp/whitespace.elc and src-21.2/lisp/whitespace.elc differ
Binary files src-21.1/lisp/wid-browse.elc and src-21.2/lisp/wid-browse.elc differ
Binary files src-21.1/lisp/wid-edit.elc and src-21.2/lisp/wid-edit.elc differ
Binary files src-21.1/lisp/widget.elc and src-21.2/lisp/widget.elc differ
Binary files src-21.1/lisp/windmove.elc and src-21.2/lisp/windmove.elc differ
diff -ruN src-21.1/lisp/window.el src-21.2/lisp/window.el
--- src-21.1/lisp/window.el	Fri Sep  7 13:29:48 2001
+++ src-21.2/lisp/window.el	Fri Feb 22 11:51:33 2002
@@ -127,11 +127,14 @@
   (eq window (active-minibuffer-window)))
 
 (defmacro save-selected-window (&rest body)
-  "Execute BODY, then select the window that was selected before BODY."
+  "Execute BODY, then select the window that was selected before BODY.
+However, if that window has become dead, don't get an error,
+just refrain from switching to it."
   `(let ((save-selected-window-window (selected-window)))
      (unwind-protect
 	 (progn ,@body)
-       (select-window save-selected-window-window))))
+       (if (window-live-p save-selected-window-window)
+	   (select-window save-selected-window-window)))))
 
 (defun count-windows (&optional minibuf)
    "Return the number of visible windows.
Binary files src-21.1/lisp/window.elc and src-21.2/lisp/window.elc differ
Binary files src-21.1/lisp/winner.elc and src-21.2/lisp/winner.elc differ
Binary files src-21.1/lisp/woman.elc and src-21.2/lisp/woman.elc differ
Binary files src-21.1/lisp/xml.elc and src-21.2/lisp/xml.elc differ
Binary files src-21.1/lisp/xscheme.elc and src-21.2/lisp/xscheme.elc differ
Binary files src-21.1/lisp/xt-mouse.elc and src-21.2/lisp/xt-mouse.elc differ
diff -ruN src-21.1/lwlib/ChangeLog src-21.2/lwlib/ChangeLog
--- src-21.1/lwlib/ChangeLog	Sat Oct 20 18:14:32 2001
+++ src-21.2/lwlib/ChangeLog	Sat Mar 16 11:48:54 2002
@@ -1,3 +1,7 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
diff -ruN src-21.1/mac/ChangeLog src-21.2/mac/ChangeLog
--- src-21.1/mac/ChangeLog	Sat Oct 20 18:14:14 2001
+++ src-21.2/mac/ChangeLog	Sat Mar 16 11:49:15 2002
@@ -1,3 +1,7 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
diff -ruN src-21.1/make-dist src-21.2/make-dist
--- src-21.1/make-dist	Sat Sep  1 08:57:51 2001
+++ src-21.2/make-dist	Fri Feb 22 13:34:01 2002
@@ -150,7 +150,7 @@
 
 if [ $update = yes ];
 then
-  if grep -s "GNU Emacs version ${shortversion}" ./man/emacs.texi > /dev/null; then
+  if grep -s "@set EMACSVER  *${shortversion}" ./man/emacs.texi > /dev/null; then
     true
   else
     echo "You must update the version number in \`./man/emacs.texi'"
@@ -231,7 +231,7 @@
 fi
 
 ### Make sure configure is newer than configure.in.
-if [ "x`ls -t configure configure.in | head -1`" != "xconfigure" ]; then
+if [ "x`ls -t configure configure.in | sed q`" != "xconfigure" ]; then
   echo "\`./configure.in' is newer than \`./configure'" >&2
   echo "Running autoconf" >&2
   autoconf || { x=$?; echo Autoconf FAILED! >&2; exit $x; }
@@ -266,7 +266,9 @@
     files="$files $thisdir"
   fi
  done
- head -1 $files | grep '^;' | sed -e 's/;;; //' | sort > MANIFEST)
+ for file in $files
+ do sed -n 's/^;;; //p; q' $file
+ done | sort > MANIFEST)
 
 echo "Creating staging directory: \`${tempparent}'"
 
@@ -287,7 +289,7 @@
 ### tar file; this means that people can start reading the INSTALL and
 ### README while the rest of the tar file is still unpacking.  Whoopee.
 echo "Making links to top-level files"
-ln FTP INSTALL README BUGS move-if-change ${tempdir}
+ln AUTHORS FTP INSTALL README BUGS move-if-change ${tempdir}
 ln ChangeLog Makefile.in configure configure.in aclocal.m4 ${tempdir}
 ln config.bat make-dist update-subdirs vpath.sed ${tempdir}
 ### Copy these files; they're cross-filesystem symlinks.
@@ -382,6 +384,12 @@
      done
    fi
  done )
+
+### Don't distribute an empty calc directory, present due to CVS
+### misfeatures.
+ (cd ./${tempdir}/lisp
+  rm -rf calc
+ )
 
 echo "Making links to \`leim' and its subdirectories for the LEIM distribution"
 ### Don't distribute TAGS, or =*.el files.
diff -ruN src-21.1/man/ChangeLog src-21.2/man/ChangeLog
--- src-21.1/man/ChangeLog	Sat Oct 20 18:14:02 2001
+++ src-21.2/man/ChangeLog	Sat Mar 16 12:06:42 2002
@@ -1,3 +1,19 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
+	* faq.texi, eshell.texi: Update for the 21.2 release.
+
+2001-12-21  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Makefile.in (EMACSSOURCES): Update the list of Emacs manual
+	source files.
+
+2001-12-01  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* idlwave.texi: Update maintainer.
+	(Acknowledgement): Update contributors.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
diff -ruN src-21.1/man/Makefile.in src-21.2/man/Makefile.in
--- src-21.1/man/Makefile.in	Wed Apr 25 19:17:33 2001
+++ src-21.2/man/Makefile.in	Fri Dec 21 09:15:45 2001
@@ -58,6 +58,7 @@
 
 EMACSSOURCES= \
 	${srcdir}/emacs.texi \
+	${srcdir}/doclicense.texi \
 	${srcdir}/screen.texi \
 	${srcdir}/commands.texi \
 	${srcdir}/entering.texi \
@@ -81,6 +82,7 @@
 	${srcdir}/text.texi \
 	${srcdir}/programs.texi \
 	${srcdir}/building.texi \
+	${srcdir}/maintaining.texi \
 	${srcdir}/abbrevs.texi \
 	${srcdir}/picture.texi \
 	${srcdir}/sending.texi \
@@ -92,6 +94,7 @@
 	${srcdir}/trouble.texi \
 	${srcdir}/cmdargs.texi \
 	${srcdir}/anti.texi \
+	${srcdir}/macos.texi \
 	${srcdir}/msdog.texi \
 	${srcdir}/gnu.texi \
 	${srcdir}/glossary.texi \
diff -ruN src-21.1/man/ack.texi src-21.2/man/ack.texi
--- src-21.1/man/ack.texi	Wed Sep 12 23:00:30 2001
+++ src-21.2/man/ack.texi	Mon Jan 28 17:33:09 2002
@@ -1150,7 +1150,7 @@
 buffers.
 
 @item
-Tibor @v{S}imko and Milan Zamzal wrote @file{slovak.el}, support for
+Tibor @v{S}imko and Milan Zamazal wrote @file{slovak.el}, support for
 editing text in Slovak language.
 
 @item 
@@ -1342,7 +1342,7 @@
 a mode for accessing the Emacs menu bar on a text-mode terminal.
 
 @item
-Milan Zamzal wrote @file{czech.el}, support for editing Czech text,
+Milan Zamazal wrote @file{czech.el}, support for editing Czech text,
 @file{glasses.el}, a package for easier reading of source code which
 uses illegible identifier names such as @code{cantReadThisVariable}, and
 @file{tildify.el}, commands for adding hard spaces to text, @TeX{}, and
@@ -1402,7 +1402,6 @@
 Detlev Zundel wrote @file{re-builder.el}, a package for building regexps
 with visual feedback.
 
-@c utf-8.el author?
 @end itemize
 
 Others too numerous to mention have reported and fixed bugs, and added
diff -ruN src-21.1/man/ada-mode.aux src-21.2/man/ada-mode.aux
--- src-21.1/man/ada-mode.aux	Sat Oct 20 18:45:42 2001
+++ src-21.2/man/ada-mode.aux	Thu Jan  1 01:00:00 1970
@@ -1,57 +0,0 @@
-'xrdef {Overview-title}{Overview}
-'xrdef {Overview-pg}{1}
-'xrdef {Overview-snt}{Chapter'tie1}
-'xrdef {Installation-title}{Installation}
-'xrdef {Installation-pg}{2}
-'xrdef {Installation-snt}{Chapter'tie2}
-'xrdef {Customization-title}{Customizing Ada mode}
-'xrdef {Customization-pg}{3}
-'xrdef {Customization-snt}{Chapter'tie3}
-'xrdef {Project files-title}{Project files}
-'xrdef {Project files-pg}{4}
-'xrdef {Project files-snt}{Chapter'tie4}
-'xrdef {Syntax highlighting-title}{Syntax highlighting}
-'xrdef {Syntax highlighting-pg}{7}
-'xrdef {Syntax highlighting-snt}{Chapter'tie5}
-'xrdef {Moving Through Ada Code-title}{Moving Through Ada Code}
-'xrdef {Moving Through Ada Code-pg}{8}
-'xrdef {Moving Through Ada Code-snt}{Chapter'tie6}
-'xrdef {Identifier completion-title}{Identifier completion}
-'xrdef {Identifier completion-pg}{9}
-'xrdef {Identifier completion-snt}{Chapter'tie7}
-'xrdef {Index Menu of Subprograms-title}{Index Menu of Subprograms}
-'xrdef {Index Menu of Subprograms-pg}{10}
-'xrdef {Index Menu of Subprograms-snt}{Chapter'tie8}
-'xrdef {File Browser-title}{File Browser}
-'xrdef {File Browser-pg}{11}
-'xrdef {File Browser-snt}{Chapter'tie9}
-'xrdef {Automatic Smart Indentation-title}{Automatic Smart Indentation}
-'xrdef {Automatic Smart Indentation-pg}{12}
-'xrdef {Automatic Smart Indentation-snt}{Chapter'tie10}
-'xrdef {Formatting Parameter Lists-title}{Formatting Parameter Lists}
-'xrdef {Formatting Parameter Lists-pg}{14}
-'xrdef {Formatting Parameter Lists-snt}{Chapter'tie11}
-'xrdef {Automatic Casing-title}{Automatic Casing}
-'xrdef {Automatic Casing-pg}{15}
-'xrdef {Automatic Casing-snt}{Chapter'tie12}
-'xrdef {Statement Templates-title}{Statement Templates}
-'xrdef {Statement Templates-pg}{17}
-'xrdef {Statement Templates-snt}{Chapter'tie13}
-'xrdef {Comment Handling-title}{Comment Handling}
-'xrdef {Comment Handling-pg}{18}
-'xrdef {Comment Handling-snt}{Chapter'tie14}
-'xrdef {Compiling Executing-title}{Compiling Executing}
-'xrdef {Compiling Executing-pg}{19}
-'xrdef {Compiling Executing-snt}{Chapter'tie15}
-'xrdef {Debugging-title}{Debugging your application}
-'xrdef {Debugging-pg}{20}
-'xrdef {Debugging-snt}{Chapter'tie16}
-'xrdef {Using non-standard file names-title}{Using non-standard file names}
-'xrdef {Using non-standard file names-pg}{21}
-'xrdef {Using non-standard file names-snt}{Chapter'tie17}
-'xrdef {Working Remotely-title}{Working Remotely}
-'xrdef {Working Remotely-pg}{22}
-'xrdef {Working Remotely-snt}{Chapter'tie18}
-'xrdef {Index-title}{Index}
-'xrdef {Index-pg}{24}
-'xrdef {Index-snt}{}
diff -ruN src-21.1/man/ada-mode.fns src-21.2/man/ada-mode.fns
--- src-21.1/man/ada-mode.fns	Sat Oct 20 18:45:41 2001
+++ src-21.2/man/ada-mode.fns	Thu Jan  1 01:00:00 1970
@@ -1,45 +0,0 @@
-\initial {A}
-\entry {\code {ada-adjust-case-buffer}}{16}
-\entry {\code {ada-array}}{17}
-\entry {\code {ada-case}}{17}
-\entry {\code {ada-case-read-exceptions}}{16}
-\entry {\code {ada-change-default-project}}{4}
-\entry {\code {ada-change-prj}}{4}
-\entry {\code {ada-complete-identifier}}{9}
-\entry {\code {ada-create-case-exception}}{15}
-\entry {\code {ada-customize}}{4}
-\entry {\code {ada-declare-block}}{17}
-\entry {\code {ada-else}}{17}
-\entry {\code {ada-elsif}}{17}
-\entry {\code {ada-exception}}{17}
-\entry {\code {ada-exception-block}}{17}
-\entry {\code {ada-exit}}{17}
-\entry {\code {ada-find-references}}{8}
-\entry {\code {ada-for-loop}}{17}
-\entry {\code {ada-format-paramlist}}{14}
-\entry {\code {ada-function-spec}}{17}
-\entry {\code {ada-goto-declaration}}{8}
-\entry {\code {ada-header}}{17}
-\entry {\code {ada-if}}{17}
-\entry {\code {ada-loop}}{17}
-\entry {\code {ada-move-to-end}}{8}
-\entry {\code {ada-move-to-start}}{8}
-\entry {\code {ada-next-package}}{8}
-\entry {\code {ada-next-procedure}}{8}
-\entry {\code {ada-package-body}}{17}
-\entry {\code {ada-package-spec}}{17}
-\entry {\code {ada-prev-package}}{8}
-\entry {\code {ada-previous-procedure}}{8}
-\entry {\code {ada-private}}{17}
-\entry {\code {ada-procedure-spec}}{17}
-\entry {\code {ada-record}}{17}
-\entry {\code {ada-set-default-project-file}}{5}
-\entry {\code {ada-subprogram-body}}{17}
-\entry {\code {ada-subtype}}{17}
-\entry {\code {ada-task-body}}{17}
-\entry {\code {ada-task-spec}}{17}
-\entry {\code {ada-type}}{17}
-\entry {\code {ada-use}}{17}
-\entry {\code {ada-when}}{17}
-\entry {\code {ada-while}}{17}
-\entry {\code {ada-with}}{17}
diff -ruN src-21.1/man/autotype.aux src-21.2/man/autotype.aux
--- src-21.1/man/autotype.aux	Sat Oct 20 18:45:42 2001
+++ src-21.2/man/autotype.aux	Thu Jan  1 01:00:00 1970
@@ -1,48 +0,0 @@
-'xrdef {Top-title}{Autotyping}
-'xrdef {Top-pg}{1}
-'xrdef {Top-snt}{}
-'xrdef {Using Skeletons-title}{Using Skeletons}
-'xrdef {Using Skeletons-pg}{2}
-'xrdef {Using Skeletons-snt}{Chapter'tie1}
-'xrdef {Wrapping Skeletons-title}{Wrapping Skeletons Around Existing Text}
-'xrdef {Wrapping Skeletons-pg}{3}
-'xrdef {Wrapping Skeletons-snt}{Chapter'tie2}
-'xrdef {Skeletons as Abbrevs-title}{Skeletons as Abbrev Expansions}
-'xrdef {Skeletons as Abbrevs-pg}{4}
-'xrdef {Skeletons as Abbrevs-snt}{Chapter'tie3}
-'xrdef {Skeleton Language-title}{Skeleton Language}
-'xrdef {Skeleton Language-pg}{5}
-'xrdef {Skeleton Language-snt}{Chapter'tie4}
-'xrdef {Inserting Pairs-title}{Inserting Matching Pairs of Characters}
-'xrdef {Inserting Pairs-pg}{7}
-'xrdef {Inserting Pairs-snt}{Chapter'tie5}
-'xrdef {Autoinserting-title}{Autoinserting Text in Empty Files}
-'xrdef {Autoinserting-pg}{8}
-'xrdef {Autoinserting-snt}{Chapter'tie6}
-'xrdef {Copyrights-title}{Inserting and Updating Copyrights}
-'xrdef {Copyrights-pg}{10}
-'xrdef {Copyrights-snt}{Chapter'tie7}
-'xrdef {Executables-title}{Making Interpreter Scripts Executable}
-'xrdef {Executables-pg}{11}
-'xrdef {Executables-snt}{Chapter'tie8}
-'xrdef {Timestamps-title}{Maintaining Timestamps in Modified Files}
-'xrdef {Timestamps-pg}{12}
-'xrdef {Timestamps-snt}{Chapter'tie9}
-'xrdef {QuickURL-title}{QuickURL: Inserting URLs Based on Text at Point}
-'xrdef {QuickURL-pg}{13}
-'xrdef {QuickURL-snt}{Chapter'tie10}
-'xrdef {Tempo-title}{Tempo: Flexible Template Insertion}
-'xrdef {Tempo-pg}{14}
-'xrdef {Tempo-snt}{Chapter'tie11}
-'xrdef {Hippie Expand-title}{`Hippie' Expansion}
-'xrdef {Hippie Expand-pg}{15}
-'xrdef {Hippie Expand-snt}{Chapter'tie12}
-'xrdef {Concept Index-title}{Concept Index}
-'xrdef {Concept Index-pg}{16}
-'xrdef {Concept Index-snt}{}
-'xrdef {Command Index-title}{Command Index}
-'xrdef {Command Index-pg}{17}
-'xrdef {Command Index-snt}{}
-'xrdef {Variable Index-title}{Variable Index}
-'xrdef {Variable Index-pg}{18}
-'xrdef {Variable Index-snt}{}
diff -ruN src-21.1/man/autotype.cps src-21.2/man/autotype.cps
--- src-21.1/man/autotype.cps	Sat Oct 20 18:45:42 2001
+++ src-21.2/man/autotype.cps	Thu Jan  1 01:00:00 1970
@@ -1,22 +0,0 @@
-\initial {A}
-\entry {autoinserting}{8}
-\initial {C}
-\entry {copyrights}{10}
-\initial {E}
-\entry {executables}{11}
-\initial {I}
-\entry {inserting pairs}{7}
-\initial {P}
-\entry {pairs}{7}
-\initial {S}
-\entry {skeleton language}{5}
-\entry {skeletons}{2}
-\entry {skeletons as abbrevs}{4}
-\initial {T}
-\entry {templates}{14}
-\entry {timestamps}{12}
-\initial {U}
-\entry {URLs}{13}
-\entry {using skeletons}{2}
-\initial {W}
-\entry {wrapping skeletons}{3}
diff -ruN src-21.1/man/autotype.fns src-21.2/man/autotype.fns
--- src-21.1/man/autotype.fns	Sat Oct 20 18:45:42 2001
+++ src-21.2/man/autotype.fns	Thu Jan  1 01:00:00 1970
@@ -1,26 +0,0 @@
-\initial {A}
-\entry {\code {auto-insert}}{8}
-\initial {C}
-\entry {\code {copyright}}{10}
-\entry {\code {copyright-update}}{10}
-\initial {D}
-\entry {\code {define-auto-insert}}{8}
-\entry {\code {define-skeleton}}{6}
-\initial {E}
-\entry {\code {executable-self-display}}{11}
-\entry {\code {executable-set-magic}}{11}
-\initial {H}
-\entry {\code {hippie-expand}}{15}
-\initial {Q}
-\entry {\code {quickurl}}{13}
-\entry {\code {quickurl-add-url}}{13}
-\entry {\code {quickurl-list}}{13}
-\initial {S}
-\entry {\code {skeleton-further-elements}}{6}
-\entry {\code {skeleton-insert}}{5}
-\entry {\code {skeleton-pair-insert-maybe}}{7}
-\initial {T}
-\entry {\code {tempo-backward-mark}}{14}
-\entry {\code {tempo-define-template}}{14}
-\entry {\code {tempo-forward-mark}}{14}
-\entry {\code {time-stamp}}{12}
diff -ruN src-21.1/man/autotype.kys src-21.2/man/autotype.kys
--- src-21.1/man/autotype.kys	Sat Oct 20 18:45:42 2001
+++ src-21.2/man/autotype.kys	Thu Jan  1 01:00:00 1970
@@ -1,2 +0,0 @@
-\initial {M}
-\entry {\code {M-/}}{15}
diff -ruN src-21.1/man/autotype.vrs src-21.2/man/autotype.vrs
--- src-21.1/man/autotype.vrs	Sat Oct 20 18:45:42 2001
+++ src-21.2/man/autotype.vrs	Thu Jan  1 01:00:00 1970
@@ -1,34 +0,0 @@
-\initial {A}
-\entry {\code {auto-insert}}{8}
-\entry {\code {auto-insert-alist}}{8}
-\entry {\code {auto-insert-prompt}}{9}
-\entry {\code {auto-insert-query}}{9}
-\initial {C}
-\entry {\code {copyright-current-year}}{10}
-\entry {\code {copyright-limit}}{10}
-\entry {\code {copyright-query}}{10}
-\initial {E}
-\entry {\code {executable-chmod}}{11}
-\entry {\code {executable-insert}}{11}
-\entry {\code {executable-magicless-file-regexp}}{11}
-\entry {\code {executable-prefix}}{11}
-\entry {\code {executable-query}}{11}
-\initial {H}
-\entry {\code {hippie-expand-try-functions-list}}{15}
-\initial {Q}
-\entry {\code {quickurl-url-file}}{13}
-\initial {S}
-\entry {\code {skeleton-pair}}{7}
-\entry {\code {skeleton-pair-alist}}{7}
-\entry {\code {skeleton-pair-on-word}}{7}
-\entry {\code {skeleton-transformation}}{5}
-\initial {T}
-\entry {\code {time-stamp-active}}{12}
-\entry {\code {time-stamp-count}}{12}
-\entry {\code {time-stamp-end}}{12}
-\entry {\code {time-stamp-format}}{12}
-\entry {\code {time-stamp-inserts-lines}}{12}
-\entry {\code {time-stamp-line-limit}}{12}
-\entry {\code {time-stamp-start}}{12}
-\initial {W}
-\entry {\code {write-file-hooks}}{12}
diff -ruN src-21.1/man/building.texi src-21.2/man/building.texi
--- src-21.1/man/building.texi	Sat Oct 13 11:57:59 2001
+++ src-21.2/man/building.texi	Wed Mar 13 20:52:10 2002
@@ -714,7 +714,7 @@
 Evaluate all the Lisp expressions in the buffer.
 @end table
 
-@kindex M-:
+@kindex M-@key{colon}
 @findex eval-expression
   @kbd{M-:} (@code{eval-expression}) is the most basic command for evaluating
 a Lisp expression interactively.  It reads the expression using the
diff -ruN src-21.1/man/cc-mode.aux src-21.2/man/cc-mode.aux
--- src-21.1/man/cc-mode.aux	Sat Oct 20 18:45:21 2001
+++ src-21.2/man/cc-mode.aux	Thu Jan  1 01:00:00 1970
@@ -1,129 +0,0 @@
-'xrdef {Introduction-title}{Introduction}
-'xrdef {Introduction-pg}{1}
-'xrdef {Introduction-snt}{Chapter'tie1}
-'xrdef {Getting Connected-title}{Getting Connected}
-'xrdef {Getting Connected-pg}{2}
-'xrdef {Getting Connected-snt}{Chapter'tie2}
-'xrdef {New Indentation Engine-title}{New Indentation Engine}
-'xrdef {New Indentation Engine-pg}{3}
-'xrdef {New Indentation Engine-snt}{Chapter'tie3}
-'xrdef {Syntactic Analysis-title}{Syntactic Analysis}
-'xrdef {Syntactic Analysis-pg}{3}
-'xrdef {Syntactic Analysis-snt}{Section'tie3.1}
-'xrdef {Indentation Calculation-title}{Indentation Calculation}
-'xrdef {Indentation Calculation-pg}{5}
-'xrdef {Indentation Calculation-snt}{Section'tie3.2}
-'xrdef {Minor Modes-title}{Minor Modes}
-'xrdef {Minor Modes-pg}{7}
-'xrdef {Minor Modes-snt}{Chapter'tie4}
-'xrdef {Auto-newline Insertion-title}{Auto-newline Insertion}
-'xrdef {Auto-newline Insertion-pg}{7}
-'xrdef {Auto-newline Insertion-snt}{Section'tie4.1}
-'xrdef {Hanging Braces-title}{Hanging Braces}
-'xrdef {Hanging Braces-pg}{8}
-'xrdef {Hanging Braces-snt}{Section'tie4.1.1}
-'xrdef {Hanging Colons-title}{Hanging Colons}
-'xrdef {Hanging Colons-pg}{9}
-'xrdef {Hanging Colons-snt}{Section'tie4.1.2}
-'xrdef {Hanging Semi-colons and Commas-title}{Hanging Semi-colons and Commas}
-'xrdef {Hanging Semi-colons and Commas-pg}{9}
-'xrdef {Hanging Semi-colons and Commas-snt}{Section'tie4.1.3}
-'xrdef {Other Electric Commands-title}{Other Electric Commands}
-'xrdef {Other Electric Commands-pg}{10}
-'xrdef {Other Electric Commands-snt}{Section'tie4.1.4}
-'xrdef {Clean-ups-title}{Clean-ups}
-'xrdef {Clean-ups-pg}{10}
-'xrdef {Clean-ups-snt}{Section'tie4.1.5}
-'xrdef {Hungry-deletion of Whitespace-title}{Hungry-deletion of Whitespace}
-'xrdef {Hungry-deletion of Whitespace-pg}{13}
-'xrdef {Hungry-deletion of Whitespace-snt}{Section'tie4.2}
-'xrdef {Text Filling and Line Breaking-title}{Text Filling and Line Breaking}
-'xrdef {Text Filling and Line Breaking-pg}{15}
-'xrdef {Text Filling and Line Breaking-snt}{Chapter'tie5}
-'xrdef {Commands-title}{Commands}
-'xrdef {Commands-pg}{18}
-'xrdef {Commands-snt}{Chapter'tie6}
-'xrdef {Indentation Commands-title}{Indentation Commands}
-'xrdef {Indentation Commands-pg}{18}
-'xrdef {Indentation Commands-snt}{Section'tie6.1}
-'xrdef {Movement Commands-title}{Movement Commands}
-'xrdef {Movement Commands-pg}{19}
-'xrdef {Movement Commands-snt}{Section'tie6.2}
-'xrdef {Other Commands-title}{Other Commands}
-'xrdef {Other Commands-pg}{21}
-'xrdef {Other Commands-snt}{Section'tie6.3}
-'xrdef {Customizing Indentation-title}{Customizing Indentation}
-'xrdef {Customizing Indentation-pg}{22}
-'xrdef {Customizing Indentation-snt}{Chapter'tie7}
-'xrdef {Interactive Customization-title}{Interactive Customization}
-'xrdef {Interactive Customization-pg}{23}
-'xrdef {Interactive Customization-snt}{Section'tie7.1}
-'xrdef {Permanent Customization-title}{Permanent Customization}
-'xrdef {Permanent Customization-pg}{25}
-'xrdef {Permanent Customization-snt}{Section'tie7.2}
-'xrdef {Hooks-title}{Hooks}
-'xrdef {Hooks-pg}{26}
-'xrdef {Hooks-snt}{Section'tie7.3}
-'xrdef {Styles-title}{Styles}
-'xrdef {Styles-pg}{26}
-'xrdef {Styles-snt}{Section'tie7.4}
-'xrdef {Built-in Styles-title}{Built-in Styles}
-'xrdef {Built-in Styles-pg}{27}
-'xrdef {Built-in Styles-snt}{Section'tie7.4.1}
-'xrdef {Adding Styles-title}{Adding Styles}
-'xrdef {Adding Styles-pg}{29}
-'xrdef {Adding Styles-snt}{Section'tie7.4.2}
-'xrdef {File Styles-title}{File Styles}
-'xrdef {File Styles-pg}{29}
-'xrdef {File Styles-snt}{Section'tie7.4.3}
-'xrdef {Advanced Customizations-title}{Advanced Customizations}
-'xrdef {Advanced Customizations-pg}{30}
-'xrdef {Advanced Customizations-snt}{Section'tie7.5}
-'xrdef {Custom Indentation Functions-title}{Custom Indentation Functions}
-'xrdef {Custom Indentation Functions-pg}{30}
-'xrdef {Custom Indentation Functions-snt}{Section'tie7.5.1}
-'xrdef {Custom Brace and Colon Hanging-title}{Custom Brace and Colon Hanging}
-'xrdef {Custom Brace and Colon Hanging-pg}{31}
-'xrdef {Custom Brace and Colon Hanging-snt}{Section'tie7.5.2}
-'xrdef {Customizing Semi-colons and Commas-title}{Customizing Semi-colons and Commas}
-'xrdef {Customizing Semi-colons and Commas-pg}{32}
-'xrdef {Customizing Semi-colons and Commas-snt}{Section'tie7.5.3}
-'xrdef {Other Special Indentations-title}{Other Special Indentations}
-'xrdef {Other Special Indentations-pg}{33}
-'xrdef {Other Special Indentations-snt}{Section'tie7.5.4}
-'xrdef {Syntactic Symbols-title}{Syntactic Symbols}
-'xrdef {Syntactic Symbols-pg}{35}
-'xrdef {Syntactic Symbols-snt}{Chapter'tie8}
-'xrdef {Indentation Functions-title}{Indentation Functions}
-'xrdef {Indentation Functions-pg}{48}
-'xrdef {Indentation Functions-snt}{Chapter'tie9}
-'xrdef {Performance Issues-title}{Performance Issues}
-'xrdef {Performance Issues-pg}{54}
-'xrdef {Performance Issues-snt}{Chapter'tie10}
-'xrdef {Limitations and Known Bugs-title}{Limitations and Known Bugs}
-'xrdef {Limitations and Known Bugs-pg}{56}
-'xrdef {Limitations and Known Bugs-snt}{Chapter'tie11}
-'xrdef {Frequently Asked Questions-title}{Frequently Asked Questions}
-'xrdef {Frequently Asked Questions-pg}{57}
-'xrdef {Frequently Asked Questions-snt}{Appendix'tie'char65{}}
-'xrdef {Getting the Latest CC Mode Release-title}{Getting the Latest CC Mode Release}
-'xrdef {Getting the Latest CC Mode Release-pg}{59}
-'xrdef {Getting the Latest CC Mode Release-snt}{Appendix'tie'char66{}}
-'xrdef {Mailing Lists and Submitting Bug Reports-title}{Mailing Lists and Submitting Bug Reports}
-'xrdef {Mailing Lists and Submitting Bug Reports-pg}{60}
-'xrdef {Mailing Lists and Submitting Bug Reports-snt}{Appendix'tie'char67{}}
-'xrdef {Sample .emacs File-title}{Sample .emacs file}
-'xrdef {Sample .emacs File-pg}{61}
-'xrdef {Sample .emacs File-snt}{Appendix'tie'char68{}}
-'xrdef {Concept Index-title}{Concept Index}
-'xrdef {Concept Index-pg}{62}
-'xrdef {Concept Index-snt}{}
-'xrdef {Command Index-title}{Command Index}
-'xrdef {Command Index-pg}{64}
-'xrdef {Command Index-snt}{}
-'xrdef {Key Index-title}{Key Index}
-'xrdef {Key Index-pg}{66}
-'xrdef {Key Index-snt}{}
-'xrdef {Variable Index-title}{Variable Index}
-'xrdef {Variable Index-pg}{67}
-'xrdef {Variable Index-snt}{}
diff -ruN src-21.1/man/cc-mode.cps src-21.2/man/cc-mode.cps
--- src-21.1/man/cc-mode.cps	Sat Oct 20 18:45:20 2001
+++ src-21.2/man/cc-mode.cps	Thu Jan  1 01:00:00 1970
@@ -1,164 +0,0 @@
-\initial {-}
-\entry {-block-intro syntactic symbols}{38}
-\entry {-close syntactic symbols}{38}
-\entry {-cont syntactic symbols}{38}
-\entry {-intro syntactic symbols}{38}
-\entry {-open syntactic symbols}{38}
-\initial {A}
-\entry {access-label syntactic symbol}{39}
-\entry {adaptive fill mode}{15}
-\entry {adding styles}{29}
-\entry {announcement mailing list}{60}
-\entry {arglist-close syntactic symbol}{44}
-\entry {arglist-cont syntactic symbol}{44}
-\entry {arglist-cont-nonempty syntactic symbol}{44}
-\entry {arglist-intro syntactic symbol}{44}
-\entry {auto fill mode}{15}
-\entry {auto-newline insertion}{7}
-\initial {B}
-\entry {block-close syntactic symbol}{8, 41}
-\entry {block-open syntactic symbol}{8, 45}
-\entry {BOCM}{1}
-\entry {brace lists}{42}
-\entry {brace-entry-open syntactic symbol}{8, 42}
-\entry {brace-list-close syntactic symbol}{8, 42}
-\entry {brace-list-entry syntactic symbol}{42}
-\entry {brace-list-intro syntactic symbol}{8, 42}
-\entry {brace-list-open syntactic symbol}{8, 42}
-\entry {BSD style}{28}
-\entry {bug report mailing list}{60}
-\entry {bugs}{56}
-\entry {built-in styles}{27}
-\initial {C}
-\entry {c syntactic symbol}{45}
-\entry {case-label syntactic symbol}{42}
-\entry {catch-clause syntactic symbol}{41}
-\entry {\file {cc-compat.el} file}{1}
-\entry {\file {cc-lobotomy.el} file}{55}
-\entry {\file {cc-mode-18.el} file}{2}
-\entry {class-close syntactic symbol}{8, 39}
-\entry {class-open syntactic symbol}{8, 39}
-\entry {clean-ups}{10}
-\entry {comment line prefix}{15}
-\entry {comment-intro syntactic symbol}{45}
-\entry {comment-only line}{4}
-\entry {cpp-macro syntactic symbol}{45}
-\entry {cpp-macro-cont syntactic symbol}{45}
-\entry {custom indentation functions}{30}
-\entry {customizing brace hanging}{31}
-\entry {customizing colon hanging}{32}
-\entry {customizing indentation}{22}
-\entry {customizing semi-colons and commas}{32}
-\initial {D}
-\entry {defun-block-intro syntactic symbol}{38}
-\entry {defun-close syntactic symbol}{8, 38}
-\entry {defun-open syntactic symbol}{8, 38}
-\entry {do-while-closure syntactic symbol}{41}
-\initial {E}
-\entry {electric characters}{7}
-\entry {electric commands}{7}
-\entry {Ellemtel style}{28}
-\entry {else-clause syntactic symbol}{41}
-\entry {extern-lang-close syntactic symbol}{8, 43}
-\entry {extern-lang-open syntactic symbol}{8, 43}
-\initial {F}
-\entry {FAQ}{57}
-\entry {file styles}{29}
-\entry {Filladapt mode}{16}
-\entry {frequently asked questions}{57}
-\entry {friend syntactic symbol}{40}
-\entry {func-decl-cont syntactic symbol}{45}
-\initial {G}
-\entry {GNU indent program}{18}
-\entry {GNU style}{27}
-\initial {H}
-\entry {hanging braces}{8}
-\entry {hanging colons}{9}
-\entry {hanging commas}{9}
-\entry {hanging semi-colons}{9}
-\entry {hooks}{26}
-\entry {hungry-deletion of whitespace}{13}
-\initial {I}
-\entry {in-class inline methods}{40}
-\entry {inclass syntactic symbol}{39, 43}
-\entry {indentation calculation}{5}
-\entry {indentation commands}{18}
-\entry {indentation engine}{3}
-\entry {indentation functions}{22, 48}
-\entry {inexpr-class syntactic symbol}{46}
-\entry {inexpr-class-close symbol}{8}
-\entry {inexpr-class-open symbol}{8}
-\entry {inexpr-statement syntactic symbol}{46, 47}
-\entry {inextern-lang syntactic symbol}{43}
-\entry {inher-cont syntactic symbol}{39}
-\entry {inher-intro syntactic symbol}{39}
-\entry {inlambda syntactic symbol}{47}
-\entry {inline-close syntactic symbol}{8, 40}
-\entry {inline-open syntactic symbol}{8, 40}
-\entry {innamespace syntactic symbol}{43}
-\entry {interactive customization}{23}
-\initial {J}
-\entry {Java style}{28}
-\entry {Javadoc markup}{17}
-\initial {K}
-\entry {K&R style}{28}
-\entry {knr-argdecl syntactic symbol}{47}
-\entry {knr-argdecl-intro syntactic symbol}{47}
-\initial {L}
-\entry {label syntactic symbol}{45}
-\entry {lambda-intro-cont syntactic symbol}{47}
-\entry {limitations}{56}
-\entry {line-up functions}{48}
-\entry {Linux style}{28}
-\entry {literal}{7, 10, 13, 19}
-\entry {local variables}{29}
-\initial {M}
-\entry {mailing lists}{60}
-\entry {member-init-cont syntactic symbol}{40}
-\entry {member-init-intro syntactic symbol}{40}
-\entry {movement commands}{19}
-\entry {multi-line macros}{45}
-\initial {N}
-\entry {namespace-close syntactic symbol}{8, 43}
-\entry {namespace-open syntactic symbol}{8, 43}
-\initial {O}
-\entry {objc-method-args-cont syntactic symbol}{46}
-\entry {objc-method-call-cont syntactic symbol}{46}
-\entry {objc-method-intro syntactic symbol}{46}
-\initial {P}
-\entry {paragraph fill}{15}
-\entry {performance issues}{54}
-\entry {permanent customization}{25}
-\entry {Pike autodoc markup}{17}
-\entry {Python style}{28}
-\initial {R}
-\entry {relative buffer position}{3}
-\entry {reporting bugs}{60}
-\initial {S}
-\entry {statement syntactic symbol}{39}
-\entry {statement-case-intro syntactic symbol}{42}
-\entry {statement-case-open syntactic symbol}{8, 42}
-\entry {statement-cont syntactic symbol}{39}
-\entry {stream-op syntactic symbol}{31, 45}
-\entry {string syntactic symbol}{45}
-\entry {Stroustrup style}{28}
-\entry {style variables}{27}
-\entry {styles}{26}
-\entry {substatement}{4}
-\entry {substatement block}{4}
-\entry {substatement syntactic symbol}{41}
-\entry {substatement-block-intro syntactic symbol}{41}
-\entry {substatement-open syntactic symbol}{8, 41}
-\entry {syntactic analysis}{3}
-\entry {syntactic component}{3}
-\entry {syntactic component list}{3}
-\entry {syntactic symbol}{3}
-\entry {syntactic symbols}{35}
-\entry {syntactic whitespace}{7, 45}
-\initial {T}
-\entry {topmost-intro syntactic symbol}{38}
-\entry {topmost-intro-cont syntactic symbol}{38}
-\initial {U}
-\entry {User style}{28}
-\initial {W}
-\entry {Whitesmith style}{28}
diff -ruN src-21.1/man/cc-mode.fns src-21.2/man/cc-mode.fns
--- src-21.1/man/cc-mode.fns	Sat Oct 20 18:45:20 2001
+++ src-21.2/man/cc-mode.fns	Thu Jan  1 01:00:00 1970
@@ -1,160 +0,0 @@
-\initial {A}
-\entry {\code {add-style (c-)}}{29}
-\entry {\code {auto-fill-mode}}{15}
-\initial {B}
-\entry {\code {backslash-region (c-)}}{21}
-\entry {\code {backward-conditional (c-)}}{20}
-\entry {\code {backward-delete-char-untabify}}{13}
-\entry {\code {backward-into-nomenclature (c-)}}{21}
-\entry {\code {beginning-of-defun}}{19, 54}
-\entry {\code {beginning-of-defun (c-)}}{19}
-\entry {\code {beginning-of-statement (c-)}}{20}
-\initial {C}
-\entry {\code {c-add-style}}{29}
-\entry {\code {c-backslash-region}}{21}
-\entry {\code {c-backward-conditional}}{20}
-\entry {\code {c-backward-into-nomenclature}}{21}
-\entry {\code {c-beginning-of-defun}}{19}
-\entry {\code {c-beginning-of-statement}}{20}
-\entry {\code {c-context-line-break}}{17}
-\entry {\code {c-down-conditional}}{20}
-\entry {\code {c-down-conditional-with-else}}{20}
-\entry {\code {c-electric-backspace}}{13}
-\entry {\code {c-electric-brace}}{8}
-\entry {\code {c-electric-delete}}{13}
-\entry {\code {c-electric-lt-gt}}{10}
-\entry {\code {c-electric-paren}}{10}
-\entry {\code {c-electric-pound}}{10}
-\entry {\code {c-electric-slash}}{10}
-\entry {\code {c-electric-star}}{10}
-\entry {\code {c-end-of-defun}}{19}
-\entry {\code {c-end-of-statement}}{20}
-\entry {\code {c-fill-paragraph}}{17}
-\entry {\code {c-forward-conditional}}{20}
-\entry {\code {c-forward-into-nomenclature}}{21}
-\entry {\code {c-indent-command}}{18}
-\entry {\code {c-indent-defun}}{18}
-\entry {\code {c-indent-exp}}{18, 56}
-\entry {\code {c-indent-multi-line-block}}{50}
-\entry {\code {c-indent-new-comment-line}}{17}
-\entry {\code {c-indent-one-line-block}}{50}
-\entry {\code {c-lineup-arglist}}{48}
-\entry {\code {c-lineup-arglist-close-under-paren}}{48}
-\entry {\code {c-lineup-arglist-intro-after-paren}}{48}
-\entry {\code {c-lineup-C-comments}}{51}
-\entry {\code {c-lineup-close-paren}}{48}
-\entry {\code {c-lineup-comment}}{51}
-\entry {\code {c-lineup-dont-change}}{53}
-\entry {\code {c-lineup-inexpr-block}}{53}
-\entry {\code {c-lineup-java-inher}}{49}
-\entry {\code {c-lineup-java-throws}}{49}
-\entry {\code {c-lineup-math}}{52}
-\entry {\code {c-lineup-multi-inher}}{49}
-\entry {\code {c-lineup-ObjC-method-args}}{52}
-\entry {\code {c-lineup-ObjC-method-args-2}}{52}
-\entry {\code {c-lineup-ObjC-method-call}}{52}
-\entry {\code {c-lineup-runin-statements}}{52}
-\entry {\code {c-lineup-streamop}}{31, 48}
-\entry {\code {c-lineup-template-args}}{52}
-\entry {\code {c-lineup-whitesmith-in-block}}{53}
-\entry {\code {c-mark-function}}{18}
-\entry {\code {c-mode}}{1}
-\entry {\code {c-scope-operator}}{21}
-\entry {\code {c-semi&comma-inside-parenlist}}{33}
-\entry {\code {c-semi&comma-no-newlines-before-nonblanks}}{33}
-\entry {\code {c-semi&comma-no-newlines-for-oneline-inliners}}{33}
-\entry {\code {c-set-offset}}{22}
-\entry {\code {c-set-style}}{29}
-\entry {\code {c-setup-filladapt}}{16}
-\entry {\code {c-show-syntactic-information}}{3}
-\entry {\code {c-snug-do-while}}{32}
-\entry {\code {c-submit-bug-report}}{60}
-\entry {\code {c-toggle-auto-hungry-state}}{7}
-\entry {\code {c-toggle-auto-state}}{7}
-\entry {\code {c-toggle-hungry-state}}{7}
-\entry {\code {c-up-conditional}}{20}
-\entry {\code {c-up-conditional-with-else}}{20}
-\entry {\code {c-version}}{2}
-\entry {\code {c++-mode}}{1}
-\entry {\code {context-line-break (c-)}}{17}
-\initial {D}
-\entry {\code {defun-prompt-regexp}}{54}
-\entry {\code {delete-char}}{13}
-\entry {\code {down-conditional (c-)}}{20}
-\entry {\code {down-conditional-with-else (c-)}}{20}
-\initial {E}
-\entry {\code {electric-backspace (c-)}}{13}
-\entry {\code {electric-brace (c-)}}{8}
-\entry {\code {electric-delete (c-)}}{13}
-\entry {\code {electric-lt-gt (c-)}}{10}
-\entry {\code {electric-paren (c-)}}{10}
-\entry {\code {electric-pound (c-)}}{10}
-\entry {\code {electric-slash (c-)}}{10}
-\entry {\code {electric-star (c-)}}{10}
-\entry {\code {end-of-defun}}{19}
-\entry {\code {end-of-defun (c-)}}{19}
-\entry {\code {end-of-statement (c-)}}{20}
-\initial {F}
-\entry {\code {fill-paragraph (c-)}}{17}
-\entry {\code {filladapt-mode}}{16}
-\entry {\code {forward-conditional (c-)}}{20}
-\entry {\code {forward-into-nomenclature (c-)}}{21}
-\initial {I}
-\entry {\code {idl-mode}}{1}
-\entry {\code {indent-command (c-)}}{18}
-\entry {\code {indent-defun (c-)}}{18}
-\entry {\code {indent-exp (c-)}}{18, 56}
-\entry {\code {indent-for-comment}}{33}
-\entry {\code {indent-multi-line-block (c-)}}{50}
-\entry {\code {indent-new-comment-line (c-)}}{17}
-\entry {\code {indent-one-line-block (c-)}}{50}
-\entry {\code {indent-region}}{18}
-\initial {J}
-\entry {\code {java-mode}}{1, 28}
-\initial {L}
-\entry {\code {lineup-arglist (c-)}}{48}
-\entry {\code {lineup-arglist-close-under-paren (c-)}}{48}
-\entry {\code {lineup-arglist-intro-after-paren (c-)}}{48}
-\entry {\code {lineup-C-comments (c-)}}{51}
-\entry {\code {lineup-close-paren (c-)}}{48}
-\entry {\code {lineup-comment (c-)}}{51}
-\entry {\code {lineup-dont-change (c-)}}{53}
-\entry {\code {lineup-inexpr-block (c-)}}{53}
-\entry {\code {lineup-java-inher (c-)}}{49}
-\entry {\code {lineup-java-throws (c-)}}{49}
-\entry {\code {lineup-math (c-)}}{52}
-\entry {\code {lineup-multi-inher (c-)}}{49}
-\entry {\code {lineup-ObjC-method-args (c-)}}{52}
-\entry {\code {lineup-ObjC-method-args-2 (c-)}}{52}
-\entry {\code {lineup-ObjC-method-call (c-)}}{52}
-\entry {\code {lineup-runin-statements (c-)}}{52}
-\entry {\code {lineup-streamop (c-)}}{31, 48}
-\entry {\code {lineup-template-args (c-)}}{52}
-\entry {\code {lineup-whitesmith-in-block (c-)}}{53}
-\initial {M}
-\entry {\code {mark-function (c-)}}{18}
-\initial {O}
-\entry {\code {objc-mode}}{1}
-\initial {P}
-\entry {\code {pike-mode}}{1}
-\initial {S}
-\entry {\code {scope-operator (c-)}}{21}
-\entry {\code {semi&comma-inside-parenlist (c-)}}{33}
-\entry {\code {semi&comma-no-newlines-before-nonblanks (c-)}}{33}
-\entry {\code {semi&comma-no-newlines-for-oneline-inliners (c-)}}{33}
-\entry {\code {set-offset (c-)}}{22}
-\entry {\code {set-style (c-)}}{29}
-\entry {\code {setup-filladapt (c-)}}{16}
-\entry {\code {show-syntactic-information (c-)}}{3}
-\entry {\code {snug-do-while (c-)}}{32}
-\entry {\code {submit-bug-report (c-)}}{60}
-\initial {T}
-\entry {\code {tab-to-tab-stop}}{19}
-\entry {\code {toggle-auto-hungry-state (c-)}}{7}
-\entry {\code {toggle-auto-state (c-)}}{7}
-\entry {\code {toggle-hungry-state (c-)}}{7}
-\initial {U}
-\entry {\code {up-conditional (c-)}}{20}
-\entry {\code {up-conditional-with-else (c-)}}{20}
-\initial {V}
-\entry {\code {version (c-)}}{2}
diff -ruN src-21.1/man/cc-mode.kys src-21.2/man/cc-mode.kys
--- src-21.1/man/cc-mode.kys	Sat Oct 20 18:45:20 2001
+++ src-21.2/man/cc-mode.kys	Thu Jan  1 01:00:00 1970
@@ -1,48 +0,0 @@
-\initial {#}
-\entry {\code {#}}{10}
-\initial {(}
-\entry {\code {(}}{10}
-\initial {)}
-\entry {\code {)}}{10}
-\initial {{\tt\gtr}}
-\entry {\code {>}}{10}
-\initial {{\tt\less}}
-\entry {\code {<}}{10}
-\initial {B}
-\entry {\code {Backspace}}{13}
-\initial {C}
-\entry {\code {C-c .}}{29}
-\entry {\code {C-c :}}{21}
-\entry {\code {C-c C-{\tt\rawbackslashxx }}}{21}
-\entry {\code {C-c C-a}}{7}
-\entry {\code {C-c C-b}}{60}
-\entry {\code {C-c C-d}}{7}
-\entry {\code {C-c C-n}}{20}
-\entry {\code {C-c C-o}}{22}
-\entry {\code {C-c C-p}}{20}
-\entry {\code {C-c C-q}}{18}
-\entry {\code {C-c C-s}}{3}
-\entry {\code {C-c C-t}}{7}
-\entry {\code {C-c C-u}}{20}
-\entry {\code {C-j}}{57}
-\entry {\code {C-M-{\tt\rawbackslashxx }}}{57}
-\entry {\code {C-M-q}}{57}
-\entry {\code {C-M-u}}{57}
-\entry {\code {C-M-x}}{57}
-\entry {\code {C-u}}{7}
-\entry {\code {C-x h}}{57}
-\initial {D}
-\entry {\code {DEL}}{13}
-\initial {M}
-\entry {\code {M-;}}{33}
-\entry {\code {M-a}}{20}
-\entry {\code {M-C-{\tt\rawbackslashxx }}}{18}
-\entry {\code {M-C-h}}{18}
-\entry {\code {M-C-q}}{18}
-\entry {\code {M-e}}{20}
-\entry {\code {M-j}}{17}
-\entry {\code {M-q}}{17}
-\initial {R}
-\entry {\code {RET}}{57}
-\initial {T}
-\entry {\code {TAB}}{18, 19}
diff -ruN src-21.1/man/cc-mode.vrs src-21.2/man/cc-mode.vrs
--- src-21.1/man/cc-mode.vrs	Sat Oct 20 18:45:20 2001
+++ src-21.2/man/cc-mode.vrs	Thu Jan  1 01:00:00 1970
@@ -1,112 +0,0 @@
-\initial {A}
-\entry {\code {adaptive-fill-first-line-regexp}}{15}
-\entry {\code {adaptive-fill-mode}}{15}
-\entry {\code {adaptive-fill-regexp}}{15}
-\initial {B}
-\entry {\code {backslash-column (c-)}}{21}
-\entry {\code {backspace-function (c-)}}{13}
-\entry {\code {basic-offset (c-)}}{22}
-\entry {\code {block-comment-prefix (c-)}}{16}
-\initial {C}
-\entry {\code {c-backslash-column}}{21}
-\entry {\code {c-backspace-function}}{13}
-\entry {\code {c-basic-offset}}{22}
-\entry {\code {c-block-comment-prefix}}{16}
-\entry {\code {c-cleanup-list}}{10}
-\entry {\code {c-comment-continuation-stars}}{16}
-\entry {\code {c-comment-only-line-offset}}{51}
-\entry {\code {c-comment-prefix-regexp}}{15}
-\entry {\code {c-default-style}}{28}
-\entry {\code {c-delete-function}}{13}
-\entry {\code {c-echo-syntactic-information-p}}{6}
-\entry {\code {c-electric-pound-behavior}}{10}
-\entry {\code {c-enable-xemacs-performance-kludge-p}}{54}
-\entry {\code {c-file-offsets}}{29}
-\entry {\code {c-file-style}}{29}
-\entry {\code {c-hanging-braces-alist}}{8, 31}
-\entry {\code {c-hanging-colon-alist}}{32}
-\entry {\code {c-hanging-colons-alist}}{9}
-\entry {\code {c-hanging-semi&comma-criteria}}{32}
-\entry {\code {c-ignore-auto-fill}}{16}
-\entry {\code {c-indent-comments-syntactically-p}}{33}
-\entry {\code {c-indentation-style}}{29}
-\entry {\code {c-initialization-hook}}{26}
-\entry {\code {c-insert-tab-function}}{19}
-\entry {\code {c-Java-defun-prompt-regexp}}{54}
-\entry {\code {c-label-minimum-indentation}}{33}
-\entry {\code {c-mode-common-hook}}{26, 28}
-\entry {\code {c-mode-hook}}{26}
-\entry {\code {c-offsets-alist}}{22, 35}
-\entry {\code {c-old-style-variable-behavior}}{27}
-\entry {\code {c-progress-interval}}{19}
-\entry {\code {c-recognize-knr-p}}{54}
-\entry {\code {c-special-indent-hook}}{33}
-\entry {\code {c-strict-syntax-p}}{22}
-\entry {\code {c-style-alist}}{28, 29, 30}
-\entry {\code {c-style-variables-are-local-p}}{25}
-\entry {\code {c-syntactic-context}}{32}
-\entry {\code {c-tab-always-indent}}{19}
-\entry {\code {c++-mode-hook}}{26}
-\entry {\code {cc-lobotomy-pith-list}}{55}
-\entry {\code {cleanup-list (c-)}}{10}
-\entry {\code {comment-column}}{33}
-\entry {\code {comment-continuation-stars (c-)}}{16}
-\entry {\code {comment-end}}{15}
-\entry {\code {comment-multi-line}}{17}
-\entry {\code {comment-only-line-offset (c-)}}{51}
-\entry {\code {comment-prefix-regexp (c-)}}{15}
-\entry {\code {comment-start}}{15}
-\entry {\code {comment-start-skip}}{15, 51}
-\initial {D}
-\entry {\code {default-style (c-)}}{28}
-\entry {\code {delete-function (c-)}}{13}
-\entry {\code {delete-key-deletes-forward}}{13}
-\initial {E}
-\entry {\code {echo-syntactic-information-p (c-)}}{6}
-\entry {\code {electric-pound-behavior (c-)}}{10}
-\entry {\code {enable-xemacs-performance-kludge-p (c-)}}{54}
-\initial {F}
-\entry {\code {file-offsets (c-)}}{29}
-\entry {\code {file-style (c-)}}{29}
-\entry {\code {filladapt-mode}}{16}
-\initial {H}
-\entry {\code {hanging-braces-alist (c-)}}{8, 31}
-\entry {\code {hanging-colon-alist (c-)}}{32}
-\entry {\code {hanging-colons-alist (c-)}}{9}
-\entry {\code {hanging-semi&comma-criteria (c-)}}{32}
-\initial {I}
-\entry {\code {idl-mode-hook}}{26}
-\entry {\code {ignore-auto-fill (c-)}}{16}
-\entry {\code {indent-comments-syntactically-p (c-)}}{33}
-\entry {\code {indent-tabs-mode}}{19}
-\entry {\code {indentation-style (c-)}}{29}
-\entry {\code {initialization-hook (c-)}}{26}
-\entry {\code {insert-tab-function (c-)}}{19}
-\initial {J}
-\entry {\code {Java-defun-prompt-regexp (c-)}}{54}
-\entry {\code {java-mode-hook}}{26}
-\initial {L}
-\entry {\code {label-minimum-indentation (c-)}}{33}
-\initial {M}
-\entry {\code {mode-common-hook (c-)}}{26, 28}
-\initial {O}
-\entry {\code {objc-mode-hook}}{26}
-\entry {\code {offsets-alist (c-)}}{22, 35}
-\entry {\code {old-style-variable-behavior (c-)}}{27}
-\initial {P}
-\entry {\code {paragraph-ignore-fill-prefix}}{15}
-\entry {\code {paragraph-separate}}{15}
-\entry {\code {paragraph-start}}{15}
-\entry {\code {pike-mode-hook}}{26}
-\entry {\code {progress-interval (c-)}}{19}
-\initial {R}
-\entry {\code {recognize-knr-p (c-)}}{54}
-\initial {S}
-\entry {\code {signal-error-on-buffer-boundary}}{56}
-\entry {\code {special-indent-hook (c-)}}{33}
-\entry {\code {strict-syntax-p (c-)}}{22}
-\entry {\code {style-alist (c-)}}{28, 29, 30}
-\entry {\code {style-variables-are-local-p (c-)}}{25}
-\entry {\code {syntactic-context (c-)}}{32}
-\initial {T}
-\entry {\code {tab-always-indent (c-)}}{19}
diff -ruN src-21.1/man/cl.aux src-21.2/man/cl.aux
--- src-21.1/man/cl.aux	Sat Oct 20 18:45:22 2001
+++ src-21.2/man/cl.aux	Thu Jan  1 01:00:00 1970
@@ -1,189 +0,0 @@
-'xrdef {Top-title}{Common Lisp Extensions}
-'xrdef {Top-pg}{1}
-'xrdef {Top-snt}{Chapter'tie1}
-'xrdef {Overview-title}{Overview}
-'xrdef {Overview-pg}{1}
-'xrdef {Overview-snt}{Section'tie1.1}
-'xrdef {Usage-title}{Usage}
-'xrdef {Usage-pg}{1}
-'xrdef {Usage-snt}{Section'tie1.2}
-'xrdef {Organization-title}{Organization}
-'xrdef {Organization-pg}{2}
-'xrdef {Organization-snt}{Section'tie1.3}
-'xrdef {Installation-title}{Installation}
-'xrdef {Installation-pg}{2}
-'xrdef {Installation-snt}{Section'tie1.4}
-'xrdef {Naming Conventions-title}{Naming Conventions}
-'xrdef {Naming Conventions-pg}{3}
-'xrdef {Naming Conventions-snt}{Section'tie1.5}
-'xrdef {Program Structure-title}{Program Structure}
-'xrdef {Program Structure-pg}{4}
-'xrdef {Program Structure-snt}{Chapter'tie5}
-'xrdef {Argument Lists-title}{Argument Lists}
-'xrdef {Argument Lists-pg}{4}
-'xrdef {Argument Lists-snt}{Section'tie5.2}
-'xrdef {Time of Evaluation-title}{Time of Evaluation}
-'xrdef {Time of Evaluation-pg}{6}
-'xrdef {Time of Evaluation-snt}{Section'tie5.3}
-'xrdef {Predicates-title}{Predicates}
-'xrdef {Predicates-pg}{9}
-'xrdef {Predicates-snt}{Chapter'tie6}
-'xrdef {Type Predicates-title}{Type Predicates}
-'xrdef {Type Predicates-pg}{9}
-'xrdef {Type Predicates-snt}{Section'tie6.1}
-'xrdef {Equality Predicates-title}{Equality Predicates}
-'xrdef {Equality Predicates-pg}{10}
-'xrdef {Equality Predicates-snt}{Section'tie6.2}
-'xrdef {Control Structure-title}{Control Structure}
-'xrdef {Control Structure-pg}{12}
-'xrdef {Control Structure-snt}{Chapter'tie7}
-'xrdef {Assignment-title}{Assignment}
-'xrdef {Assignment-pg}{12}
-'xrdef {Assignment-snt}{Section'tie7.1}
-'xrdef {Generalized Variables-title}{Generalized Variables}
-'xrdef {Generalized Variables-pg}{12}
-'xrdef {Generalized Variables-snt}{Section'tie7.2}
-'xrdef {Basic Setf-title}{Basic Setf}
-'xrdef {Basic Setf-pg}{13}
-'xrdef {Basic Setf-snt}{Section'tie7.2.1}
-'xrdef {Modify Macros-title}{Modify Macros}
-'xrdef {Modify Macros-pg}{15}
-'xrdef {Modify Macros-snt}{Section'tie7.2.2}
-'xrdef {Customizing Setf-title}{Customizing Setf}
-'xrdef {Customizing Setf-pg}{18}
-'xrdef {Customizing Setf-snt}{Section'tie7.2.3}
-'xrdef {Variable Bindings-title}{Variable Bindings}
-'xrdef {Variable Bindings-pg}{20}
-'xrdef {Variable Bindings-snt}{Section'tie7.5}
-'xrdef {Dynamic Bindings-title}{Dynamic Bindings}
-'xrdef {Dynamic Bindings-pg}{20}
-'xrdef {Dynamic Bindings-snt}{Section'tie7.5.1}
-'xrdef {Lexical Bindings-title}{Lexical Bindings}
-'xrdef {Lexical Bindings-pg}{21}
-'xrdef {Lexical Bindings-snt}{Section'tie7.5.2}
-'xrdef {Function Bindings-title}{Function Bindings}
-'xrdef {Function Bindings-pg}{22}
-'xrdef {Function Bindings-snt}{Section'tie7.5.3}
-'xrdef {Macro Bindings-title}{Macro Bindings}
-'xrdef {Macro Bindings-pg}{23}
-'xrdef {Macro Bindings-snt}{Section'tie7.5.4}
-'xrdef {Conditionals-title}{Conditionals}
-'xrdef {Conditionals-pg}{24}
-'xrdef {Conditionals-snt}{Section'tie7.6}
-'xrdef {Blocks and Exits-title}{Blocks and Exits}
-'xrdef {Blocks and Exits-pg}{25}
-'xrdef {Blocks and Exits-snt}{Section'tie7.7}
-'xrdef {Iteration-title}{Iteration}
-'xrdef {Iteration-pg}{26}
-'xrdef {Iteration-snt}{Section'tie7.8}
-'xrdef {Loop Facility-title}{Loop Facility}
-'xrdef {Loop Facility-pg}{28}
-'xrdef {Loop Facility-snt}{Section'tie7.9}
-'xrdef {Loop Basics-title}{Loop Basics}
-'xrdef {Loop Basics-pg}{28}
-'xrdef {Loop Basics-snt}{Section'tie7.9.1}
-'xrdef {Loop Examples-title}{Loop Examples}
-'xrdef {Loop Examples-pg}{29}
-'xrdef {Loop Examples-snt}{Section'tie7.9.2}
-'xrdef {For Clauses-title}{For Clauses}
-'xrdef {For Clauses-pg}{30}
-'xrdef {For Clauses-snt}{Section'tie7.9.3}
-'xrdef {Iteration Clauses-title}{Iteration Clauses}
-'xrdef {Iteration Clauses-pg}{34}
-'xrdef {Iteration Clauses-snt}{Section'tie7.9.4}
-'xrdef {Accumulation Clauses-title}{Accumulation Clauses}
-'xrdef {Accumulation Clauses-pg}{35}
-'xrdef {Accumulation Clauses-snt}{Section'tie7.9.5}
-'xrdef {Other Clauses-title}{Other Clauses}
-'xrdef {Other Clauses-pg}{36}
-'xrdef {Other Clauses-snt}{Section'tie7.9.6}
-'xrdef {Multiple Values-title}{Multiple Values}
-'xrdef {Multiple Values-pg}{38}
-'xrdef {Multiple Values-snt}{Section'tie7.10}
-'xrdef {Macros-title}{Macros}
-'xrdef {Macros-pg}{39}
-'xrdef {Macros-snt}{Chapter'tie8}
-'xrdef {Declarations-title}{Declarations}
-'xrdef {Declarations-pg}{41}
-'xrdef {Declarations-snt}{Chapter'tie9}
-'xrdef {Symbols-title}{Symbols}
-'xrdef {Symbols-pg}{44}
-'xrdef {Symbols-snt}{Chapter'tie10}
-'xrdef {Property Lists-title}{Property Lists}
-'xrdef {Property Lists-pg}{44}
-'xrdef {Property Lists-snt}{Section'tie10.1}
-'xrdef {Creating Symbols-title}{Creating Symbols}
-'xrdef {Creating Symbols-pg}{45}
-'xrdef {Creating Symbols-snt}{Section'tie10.3}
-'xrdef {Numbers-title}{Numbers}
-'xrdef {Numbers-pg}{46}
-'xrdef {Numbers-snt}{Chapter'tie12}
-'xrdef {Predicates on Numbers-title}{Predicates on Numbers}
-'xrdef {Predicates on Numbers-pg}{46}
-'xrdef {Predicates on Numbers-snt}{Section'tie12.2}
-'xrdef {Numerical Functions-title}{Numerical Functions}
-'xrdef {Numerical Functions-pg}{46}
-'xrdef {Numerical Functions-snt}{Section'tie12.4}
-'xrdef {Random Numbers-title}{Random Numbers}
-'xrdef {Random Numbers-pg}{48}
-'xrdef {Random Numbers-snt}{Section'tie12.9}
-'xrdef {Implementation Parameters-title}{Implementation Parameters}
-'xrdef {Implementation Parameters-pg}{48}
-'xrdef {Implementation Parameters-snt}{Section'tie12.10}
-'xrdef {Sequences-title}{Sequences}
-'xrdef {Sequences-pg}{51}
-'xrdef {Sequences-snt}{Chapter'tie14}
-'xrdef {Sequence Basics-title}{Sequence Basics}
-'xrdef {Sequence Basics-pg}{51}
-'xrdef {Sequence Basics-snt}{Section'tie14.1}
-'xrdef {Mapping over Sequences-title}{Mapping over Sequences}
-'xrdef {Mapping over Sequences-pg}{52}
-'xrdef {Mapping over Sequences-snt}{Section'tie14.2}
-'xrdef {Sequence Functions-title}{Sequence Functions}
-'xrdef {Sequence Functions-pg}{54}
-'xrdef {Sequence Functions-snt}{Section'tie14.3}
-'xrdef {Searching Sequences-title}{Searching Sequences}
-'xrdef {Searching Sequences-pg}{56}
-'xrdef {Searching Sequences-snt}{Section'tie14.4}
-'xrdef {Sorting Sequences-title}{Sorting Sequences}
-'xrdef {Sorting Sequences-pg}{57}
-'xrdef {Sorting Sequences-snt}{Section'tie14.5}
-'xrdef {Lists-title}{Lists}
-'xrdef {Lists-pg}{58}
-'xrdef {Lists-snt}{Chapter'tie15}
-'xrdef {List Functions-title}{List Functions}
-'xrdef {List Functions-pg}{58}
-'xrdef {List Functions-snt}{Section'tie15.1}
-'xrdef {Substitution of Expressions-title}{Substitution of Expressions}
-'xrdef {Substitution of Expressions-pg}{59}
-'xrdef {Substitution of Expressions-snt}{Section'tie15.4}
-'xrdef {Lists as Sets-title}{Lists as Sets}
-'xrdef {Lists as Sets-pg}{60}
-'xrdef {Lists as Sets-snt}{Section'tie15.5}
-'xrdef {Association Lists-title}{Association Lists}
-'xrdef {Association Lists-pg}{61}
-'xrdef {Association Lists-snt}{Section'tie15.6}
-'xrdef {Structures-title}{Structures}
-'xrdef {Structures-pg}{62}
-'xrdef {Structures-snt}{Chapter'tie19}
-'xrdef {Assertions-title}{Assertions and Errors}
-'xrdef {Assertions-pg}{67}
-'xrdef {Assertions-snt}{Chapter'tie24}
-'xrdef {Efficiency Concerns-title}{Efficiency Concerns}
-'xrdef {Efficiency Concerns-pg}{68}
-'xrdef {Efficiency Concerns-snt}{Appendix'tie'char65{}}
-'xrdef {Common Lisp Compatibility-title}{Common Lisp Compatibility}
-'xrdef {Common Lisp Compatibility-pg}{70}
-'xrdef {Common Lisp Compatibility-snt}{Appendix'tie'char66{}}
-'xrdef {Old CL Compatibility-title}{Old CL Compatibility}
-'xrdef {Old CL Compatibility-pg}{71}
-'xrdef {Old CL Compatibility-snt}{Appendix'tie'char67{}}
-'xrdef {Porting Common Lisp-title}{Porting Common Lisp}
-'xrdef {Porting Common Lisp-pg}{73}
-'xrdef {Porting Common Lisp-snt}{Appendix'tie'char68{}}
-'xrdef {Function Index-title}{Function Index}
-'xrdef {Function Index-pg}{76}
-'xrdef {Function Index-snt}{}
-'xrdef {Variable Index-title}{Variable Index}
-'xrdef {Variable Index-pg}{79}
-'xrdef {Variable Index-snt}{}
diff -ruN src-21.1/man/cl.fns src-21.2/man/cl.fns
--- src-21.1/man/cl.fns	Sat Oct 20 18:45:22 2001
+++ src-21.2/man/cl.fns	Thu Jan  1 01:00:00 1970
@@ -1,191 +0,0 @@
-\initial {A}
-\entry {\code {acons}}{61}
-\entry {\code {adjoin}}{60}
-\entry {\code {assert}}{67}
-\entry {\code {assoc*}}{61}
-\entry {\code {assoc-if}}{61}
-\entry {\code {assoc-if-not}}{61}
-\initial {B}
-\entry {\code {block}}{25}
-\initial {C}
-\entry {\code {caddr}}{58}
-\entry {\code {callf}}{17}
-\entry {\code {callf2}}{17}
-\entry {\code {case}}{24}
-\entry {\code {ceiling*}}{47}
-\entry {\code {check-type}}{67}
-\entry {\code {cl-float-limits}}{49}
-\entry {\code {cl-prettyexpand}}{68}
-\entry {\code {coerce}}{10}
-\entry {\code {compiler-macroexpand}}{39}
-\entry {\code {concatenate}}{54}
-\entry {\code {copy-list}}{59}
-\entry {\code {copy-tree}}{59}
-\entry {\code {count}}{56}
-\entry {\code {count-if}}{56}
-\entry {\code {count-if-not}}{56}
-\initial {D}
-\entry {\code {decf}}{16}
-\entry {\code {declaim}}{41}
-\entry {\code {declare}}{41}
-\entry {\code {define-compiler-macro}}{39}
-\entry {\code {define-modify-macro}}{18}
-\entry {\code {define-setf-method}}{19}
-\entry {\code {defmacro*}}{4}
-\entry {\code {defsetf}}{18, 19}
-\entry {\code {defstruct}}{62}
-\entry {\code {defsubst*}}{4}
-\entry {\code {deftype}}{10}
-\entry {\code {defun*}}{4}
-\entry {\code {delete*}}{55}
-\entry {\code {delete-duplicates}}{55}
-\entry {\code {delete-if}}{55}
-\entry {\code {delete-if-not}}{55}
-\entry {\code {destructuring-bind}}{39}
-\entry {\code {do}}{27}
-\entry {\code {do*}}{27}
-\entry {\code {do-all-symbols}}{28}
-\entry {\code {do-symbols}}{28}
-\entry {\code {dolist}}{27}
-\entry {\code {dotimes}}{28}
-\initial {E}
-\entry {\code {ecase}}{25}
-\entry {\code {endp}}{58}
-\entry {\code {eql}}{10}
-\entry {\code {equalp}}{11}
-\entry {\code {etypecase}}{25}
-\entry {\code {eval-when}}{7}
-\entry {\code {eval-when-compile}}{8}
-\entry {\code {evenp}}{46}
-\entry {\code {every}}{53}
-\initial {F}
-\entry {\code {fill}}{54}
-\entry {\code {find}}{56}
-\entry {\code {find-if}}{56}
-\entry {\code {find-if-not}}{56}
-\entry {\code {first}}{58}
-\entry {\code {flet}}{22}
-\entry {\code {floatp-safe}}{46}
-\entry {\code {floor*}}{47}
-\entry {\code {function*}}{4}
-\initial {G}
-\entry {\code {gcd}}{46}
-\entry {\code {gensym}}{45}
-\entry {\code {gentemp}}{45}
-\entry {\code {get*}}{44}
-\entry {\code {get-setf-method}}{20}
-\entry {\code {getf}}{44}
-\initial {I}
-\entry {\code {ignore-errors}}{67}
-\entry {\code {incf}}{15}
-\entry {\code {intersection}}{60}
-\entry {\code {isqrt}}{47}
-\initial {L}
-\entry {\code {labels}}{23}
-\entry {\code {lcm}}{46}
-\entry {\code {ldiff}}{58}
-\entry {\code {letf}}{16}
-\entry {\code {letf*}}{17}
-\entry {\code {lexical-let}}{21}
-\entry {\code {lexical-let*}}{22}
-\entry {\code {list*}}{58}
-\entry {\code {list-length}}{58}
-\entry {\code {load-time-value}}{8}
-\entry {\code {locally}}{41}
-\entry {\code {loop}}{26, 28}
-\initial {M}
-\entry {\code {macrolet}}{23}
-\entry {\code {make-random-state}}{48}
-\entry {\code {map}}{52}
-\entry {\code {mapc}}{52}
-\entry {\code {mapcan}}{53}
-\entry {\code {mapcar*}}{52}
-\entry {\code {mapcon}}{53}
-\entry {\code {mapl}}{52}
-\entry {\code {maplist}}{52}
-\entry {\code {member*}}{60}
-\entry {\code {member-if}}{60}
-\entry {\code {member-if-not}}{60}
-\entry {\code {merge}}{57}
-\entry {\code {minusp}}{46}
-\entry {\code {mismatch}}{56}
-\entry {\code {mod*}}{47}
-\entry {\code {multiple-value-bind}}{38}
-\entry {\code {multiple-value-setq}}{38}
-\initial {N}
-\entry {\code {nintersection}}{60}
-\entry {\code {notany}}{53}
-\entry {\code {notevery}}{53}
-\entry {\code {nset-difference}}{61}
-\entry {\code {nset-exclusive-or}}{61}
-\entry {\code {nsublis}}{59}
-\entry {\code {nsubst}}{59}
-\entry {\code {nsubst-if}}{59}
-\entry {\code {nsubst-if-not}}{59}
-\entry {\code {nsubstitute}}{55}
-\entry {\code {nsubstitute-if}}{56}
-\entry {\code {nsubstitute-if-not}}{56}
-\entry {\code {nunion}}{60}
-\initial {O}
-\entry {\code {oddp}}{46}
-\initial {P}
-\entry {\code {pairlis}}{61}
-\entry {\code {plusp}}{46}
-\entry {\code {pop}}{16}
-\entry {\code {position}}{56}
-\entry {\code {position-if}}{56}
-\entry {\code {position-if-not}}{56}
-\entry {\code {proclaim}}{41}
-\entry {\code {progv}}{20}
-\entry {\code {psetf}}{15}
-\entry {\code {psetq}}{12}
-\entry {\code {push}}{16}
-\entry {\code {pushnew}}{16}
-\initial {R}
-\entry {\code {random*}}{48}
-\entry {\code {random-state-p}}{48}
-\entry {\code {rassoc*}}{61}
-\entry {\code {rassoc-if}}{61}
-\entry {\code {rassoc-if-not}}{61}
-\entry {\code {reduce}}{53}
-\entry {\code {rem*}}{47}
-\entry {\code {remf}}{45}
-\entry {\code {remove*}}{55}
-\entry {\code {remove-duplicates}}{55}
-\entry {\code {remove-if}}{55}
-\entry {\code {remove-if-not}}{55}
-\entry {\code {remprop}}{44}
-\entry {\code {replace}}{54}
-\entry {\code {rest}}{58}
-\entry {\code {return}}{26}
-\entry {\code {return-from}}{26}
-\entry {\code {rotatef}}{16}
-\entry {\code {round*}}{47}
-\initial {S}
-\entry {\code {search}}{56}
-\entry {\code {set-difference}}{61}
-\entry {\code {set-exclusive-or}}{61}
-\entry {\code {setf}}{13}
-\entry {\code {shiftf}}{16}
-\entry {\code {some}}{53}
-\entry {\code {sort*}}{57}
-\entry {\code {stable-sort}}{57}
-\entry {\code {sublis}}{59}
-\entry {\code {subseq}}{54}
-\entry {\code {subsetp}}{61}
-\entry {\code {subst}}{59}
-\entry {\code {subst-if}}{59}
-\entry {\code {subst-if-not}}{59}
-\entry {\code {substitute}}{55}
-\entry {\code {substitute-if}}{56}
-\entry {\code {substitute-if-not}}{56}
-\entry {\code {symbol-macrolet}}{23}
-\initial {T}
-\entry {\code {tailp}}{60}
-\entry {\code {the}}{41}
-\entry {\code {tree-equal}}{59}
-\entry {\code {truncate*}}{47}
-\entry {\code {typecase}}{25}
-\entry {\code {typep}}{9}
-\initial {U}
-\entry {\code {union}}{60}
diff -ruN src-21.1/man/cl.vrs src-21.2/man/cl.vrs
--- src-21.1/man/cl.vrs	Sat Oct 20 18:45:22 2001
+++ src-21.2/man/cl.vrs	Thu Jan  1 01:00:00 1970
@@ -1,16 +0,0 @@
-\initial {*}
-\entry {\code {*gensym-counter*}}{45}
-\entry {\code {*random-state*}}{48}
-\initial {F}
-\entry {\code {float-epsilon}}{50}
-\entry {\code {float-negative-epsilon}}{50}
-\initial {L}
-\entry {\code {least-negative-float}}{49}
-\entry {\code {least-negative-normalized-float}}{49}
-\entry {\code {least-positive-float}}{49}
-\entry {\code {least-positive-normalized-float}}{49}
-\initial {M}
-\entry {\code {most-negative-fixnum}}{49}
-\entry {\code {most-negative-float}}{49}
-\entry {\code {most-positive-fixnum}}{48}
-\entry {\code {most-positive-float}}{49}
diff -ruN src-21.1/man/dired-x.aux src-21.2/man/dired-x.aux
--- src-21.1/man/dired-x.aux	Sat Oct 20 18:45:23 2001
+++ src-21.2/man/dired-x.aux	Thu Jan  1 01:00:00 1970
@@ -1,75 +0,0 @@
-'xrdef {Introduction-title}{Introduction}
-'xrdef {Introduction-pg}{1}
-'xrdef {Introduction-snt}{Chapter'tie1}
-'xrdef {Features-title}{Features}
-'xrdef {Features-pg}{1}
-'xrdef {Features-snt}{Section'tie1.1}
-'xrdef {Technical Details-title}{Technical Details}
-'xrdef {Technical Details-pg}{1}
-'xrdef {Technical Details-snt}{Section'tie1.2}
-'xrdef {Installation-title}{Installation}
-'xrdef {Installation-pg}{2}
-'xrdef {Installation-snt}{Chapter'tie2}
-'xrdef {Optional Installation Dired Jump-title}{Optional Installation Dired Jump}
-'xrdef {Optional Installation Dired Jump-pg}{2}
-'xrdef {Optional Installation Dired Jump-snt}{Section'tie2.1}
-'xrdef {Optional Installation File At Point-title}{Optional Installation File At Point}
-'xrdef {Optional Installation File At Point-pg}{3}
-'xrdef {Optional Installation File At Point-snt}{Section'tie2.2}
-'xrdef {Omitting Files in Dired-title}{Omitting Files in Dired}
-'xrdef {Omitting Files in Dired-pg}{4}
-'xrdef {Omitting Files in Dired-snt}{Chapter'tie3}
-'xrdef {Omitting Variables-title}{Omitting Variables}
-'xrdef {Omitting Variables-pg}{4}
-'xrdef {Omitting Variables-snt}{Section'tie3.1}
-'xrdef {Omitting Examples-title}{Examples of Omitting Various File Types}
-'xrdef {Omitting Examples-pg}{5}
-'xrdef {Omitting Examples-snt}{Section'tie3.2}
-'xrdef {Omitting Technical-title}{Some Technical Details of Omitting}
-'xrdef {Omitting Technical-pg}{6}
-'xrdef {Omitting Technical-snt}{Section'tie3.3}
-'xrdef {Local Variables-title}{Local Variables for Dired Directories}
-'xrdef {Local Variables-pg}{7}
-'xrdef {Local Variables-snt}{Chapter'tie4}
-'xrdef {Shell Command Guessing-title}{Shell Command Guessing}
-'xrdef {Shell Command Guessing-pg}{8}
-'xrdef {Shell Command Guessing-snt}{Chapter'tie5}
-'xrdef {Virtual Dired-title}{Virtual Dired}
-'xrdef {Virtual Dired-pg}{10}
-'xrdef {Virtual Dired-snt}{Chapter'tie6}
-'xrdef {Advanced Mark Commands-title}{Advanced Mark Commands}
-'xrdef {Advanced Mark Commands-pg}{11}
-'xrdef {Advanced Mark Commands-snt}{Chapter'tie7}
-'xrdef {Advanced Cleaning Functions-title}{Advanced Cleaning Functions}
-'xrdef {Advanced Cleaning Functions-pg}{11}
-'xrdef {Advanced Cleaning Functions-snt}{Section'tie7.1}
-'xrdef {Advanced Cleaning Variables-title}{Advanced Cleaning Variables}
-'xrdef {Advanced Cleaning Variables-pg}{11}
-'xrdef {Advanced Cleaning Variables-snt}{Section'tie7.2}
-'xrdef {Special Marking Function-title}{Special Marking Function}
-'xrdef {Special Marking Function-pg}{12}
-'xrdef {Special Marking Function-snt}{Section'tie7.3}
-'xrdef {Multiple Dired Directories-title}{Multiple Dired Directories and Non-Dired Commands}
-'xrdef {Multiple Dired Directories-pg}{13}
-'xrdef {Multiple Dired Directories-snt}{Chapter'tie8}
-'xrdef {Find File At Point-title}{Find File At Point}
-'xrdef {Find File At Point-pg}{13}
-'xrdef {Find File At Point-snt}{Section'tie8.1}
-'xrdef {Miscellaneous Commands-title}{Miscellaneous Commands}
-'xrdef {Miscellaneous Commands-pg}{15}
-'xrdef {Miscellaneous Commands-snt}{Chapter'tie9}
-'xrdef {Bugs-title}{Bugs}
-'xrdef {Bugs-pg}{17}
-'xrdef {Bugs-snt}{Chapter'tie10}
-'xrdef {Concept Index-title}{Concept Index}
-'xrdef {Concept Index-pg}{18}
-'xrdef {Concept Index-snt}{}
-'xrdef {Command Index-title}{Function Index}
-'xrdef {Command Index-pg}{19}
-'xrdef {Command Index-snt}{}
-'xrdef {Key Index-title}{Key Index}
-'xrdef {Key Index-pg}{20}
-'xrdef {Key Index-snt}{}
-'xrdef {Variable Index-title}{Variable Index}
-'xrdef {Variable Index-pg}{21}
-'xrdef {Variable Index-snt}{}
diff -ruN src-21.1/man/dired-x.cps src-21.2/man/dired-x.cps
--- src-21.1/man/dired-x.cps	Sat Oct 20 18:45:23 2001
+++ src-21.2/man/dired-x.cps	Thu Jan  1 01:00:00 1970
@@ -1,59 +0,0 @@
-\initial {A}
-\entry {Adding to the kill ring in Dired.}{15}
-\entry {Autoloading \code {dired-jump} and \code {dired-jump-other-window}}{2}
-\initial {B}
-\entry {Binding \code {dired-x-find-file}}{3}
-\entry {Bugs}{17}
-\initial {C}
-\entry {Customizing file omitting}{4}
-\initial {D}
-\entry {\file {dired-aux.el}}{1}
-\entry {Dot files, how to omit them in Dired}{6}
-\initial {F}
-\entry {Features}{1}
-\entry {Finding a file at point}{13}
-\initial {G}
-\entry {Guessing shell commands for files.}{8}
-\entry {\code {gzip}}{8}
-\initial {H}
-\entry {How to make omitting the default in Dired}{4}
-\initial {J}
-\entry {Jumping to Dired listing containing file.}{15}
-\initial {L}
-\entry {Lisp expression, marking files with in Dired}{12}
-\entry {Local Variables for Dired Directories}{7}
-\entry {\code {ls} listings, how to peruse them in Dired}{10}
-\initial {M}
-\entry {Mark file by lisp expression}{12}
-\entry {Multiple Dired directories}{13}
-\initial {O}
-\entry {Omitting additional files}{5}
-\entry {Omitting dot files in Dired}{6}
-\entry {Omitting Files in Dired}{4}
-\entry {Omitting RCS files in Dired}{5}
-\entry {Omitting tib files in Dired}{6}
-\initial {P}
-\entry {Passing GNU Tar its \samp {z} switch.}{8}
-\entry {Perusing \code {ls} listings}{10}
-\initial {R}
-\entry {RCS files, how to omit them in Dired}{5}
-\entry {Reading mail.}{16}
-\entry {Redefined functions}{1}
-\entry {Relative symbolic links.}{16}
-\entry {Running info.}{16}
-\entry {Running man.}{16}
-\initial {S}
-\entry {Simultaneous visiting of several files}{11}
-\initial {T}
-\entry {Tib files, how to omit them in Dired}{6}
-\entry {Toggling marks.}{15}
-\initial {U}
-\entry {Uninteresting files}{4}
-\initial {V}
-\entry {Virtual Dired}{10}
-\entry {Visiting a file mentioned in a buffer}{13}
-\entry {Visiting several files at once}{11}
-\initial {W}
-\entry {Working directory}{13}
-\initial {Z}
-\entry {\code {znew}}{9}
diff -ruN src-21.1/man/dired-x.fns src-21.2/man/dired-x.fns
--- src-21.1/man/dired-x.fns	Sat Oct 20 18:45:23 2001
+++ src-21.2/man/dired-x.fns	Thu Jan  1 01:00:00 1970
@@ -1,33 +0,0 @@
-\initial {D}
-\entry {\code {default-directory}}{13}
-\entry {\code {dired-clean-patch}}{11}
-\entry {\code {dired-clean-tex}}{11}
-\entry {\code {dired-copy-filename-as-kill}}{15}
-\entry {\code {dired-do-find-marked-files}}{11}
-\entry {\code {dired-do-relative-symlink}}{16}
-\entry {\code {dired-do-relative-symlink-regexp}}{16}
-\entry {\code {dired-do-toggle}}{15}
-\entry {\code {dired-flag-extension}}{11}
-\entry {\code {dired-goto-file}}{15}
-\entry {\code {dired-goto-subdir}}{15}
-\entry {\code {dired-info}}{16}
-\entry {\code {dired-jump}}{15}
-\entry {\code {dired-jump-other-window}}{16}
-\entry {\code {dired-man}}{16}
-\entry {\code {dired-mark-extension}}{11}
-\entry {\code {dired-mark-sexp}}{12}
-\entry {\code {dired-omit-here-always}}{4}
-\entry {\code {dired-omit-toggle}}{4}
-\entry {\code {dired-rmail}}{16}
-\entry {\code {dired-smart-shell-command}}{15}
-\entry {\code {dired-very-clean-tex}}{11}
-\entry {\code {dired-virtual}}{10}
-\entry {\code {dired-virtual-mode}}{10}
-\entry {\code {dired-virtual-revert}}{10}
-\entry {\code {dired-vm}}{16}
-\entry {\code {dired-x-bind-find-file}}{14}
-\entry {\code {dired-x-find-file}}{13}
-\entry {\code {dired-x-find-file-other-window}}{13}
-\entry {\code {dired-x-submit-report}}{17}
-\initial {S}
-\entry {\code {shell-command}}{15}
diff -ruN src-21.1/man/dired-x.kys src-21.2/man/dired-x.kys
--- src-21.1/man/dired-x.kys	Sat Oct 20 18:45:23 2001
+++ src-21.2/man/dired-x.kys	Thu Jan  1 01:00:00 1970
@@ -1,29 +0,0 @@
-\initial {%}
-\entry {\code {%Y}}{16}
-\initial {C}
-\entry {\code {C-x 4 C-f}}{13}
-\entry {\code {C-x 4 C-j}}{16}
-\entry {\code {C-x C-f}}{13}
-\entry {\code {C-x C-j}}{15}
-\initial {F}
-\entry {\code {F}}{11}
-\initial {G}
-\entry {\code {g}}{10}
-\initial {I}
-\entry {\code {I}}{16}
-\initial {M}
-\entry {\code {M-!}}{15}
-\entry {\code {M-(}}{12}
-\entry {\code {M-g}}{15}
-\entry {\code {M-G}}{15}
-\entry {\code {M-o}}{4}
-\initial {N}
-\entry {\code {N}}{16}
-\initial {T}
-\entry {\code {T}}{15}
-\initial {V}
-\entry {\code {V}}{16}
-\initial {W}
-\entry {\code {w}}{15}
-\initial {Y}
-\entry {\code {Y}}{16}
diff -ruN src-21.1/man/dired-x.vrs src-21.2/man/dired-x.vrs
--- src-21.1/man/dired-x.vrs	Sat Oct 20 18:45:23 2001
+++ src-21.2/man/dired-x.vrs	Thu Jan  1 01:00:00 1970
@@ -1,30 +0,0 @@
-\initial {A}
-\entry {\code {auto-mode-alist}}{10}
-\initial {D}
-\entry {\code {default-directory-alist}}{13}
-\entry {\code {dired-bibtex-unclean-extensions}}{12}
-\entry {\code {dired-bind-info}}{16}
-\entry {\code {dired-bind-jump}}{16}
-\entry {\code {dired-bind-man}}{16}
-\entry {\code {dired-bind-vm}}{16}
-\entry {\code {dired-enable-local-variables}}{7}
-\entry {\code {dired-find-subdir}}{15}
-\entry {\code {dired-guess-shell-alist-default}}{8}
-\entry {\code {dired-guess-shell-alist-user}}{8}
-\entry {\code {dired-guess-shell-gnutar}}{8}
-\entry {\code {dired-guess-shell-gzip-quiet}}{8}
-\entry {\code {dired-guess-shell-znew-switches nil}}{9}
-\entry {\code {dired-latex-unclean-extensions}}{12}
-\entry {\code {dired-local-variables-file}}{7}
-\entry {\code {dired-marked-files}}{15}
-\entry {\code {dired-omit-extensions}}{5}
-\entry {\code {dired-omit-files}}{5}
-\entry {\code {dired-omit-files-p}}{4}
-\entry {\code {dired-omit-localp}}{5}
-\entry {\code {dired-omit-marker-char}}{5}
-\entry {\code {dired-patch-unclean-extensions}}{11}
-\entry {\code {dired-shell-command-history nil}}{9}
-\entry {\code {dired-tex-unclean-extensions}}{12}
-\entry {\code {dired-texinfo-unclean-extensions}}{12}
-\entry {\code {dired-vm-read-only-folders}}{16}
-\entry {\code {dired-x-hands-off-my-keys}}{14}
diff -ruN src-21.1/man/dired.texi src-21.2/man/dired.texi
--- src-21.1/man/dired.texi	Thu Sep 13 17:34:29 2001
+++ src-21.2/man/dired.texi	Wed Feb  6 12:47:36 2002
@@ -20,7 +20,7 @@
 files.
 
   The Dired-X package provides various extra features for Dired mode.
-@xref{Dired-X,,,dired-x, Dired Extra Version 2 User's Manual}.
+@xref{Top, Dired-X,,dired-x, Dired Extra Version 2 User's Manual}.
 
 @menu
 * Enter: Dired Enter.         How to invoke Dired.
@@ -116,6 +116,7 @@
 argument serves as a repeat count.
 
 @vindex dired-recursive-deletes
+@cindex recursive deletion
   The variable @code{dired-recursive-deletes} controls whether the
 delete command will delete non-empty directories (including their
 contents).  The default is to delete only empty directories.
@@ -511,6 +512,7 @@
 as that of the old file.
 
 @vindex dired-recursive-copies
+@cindex recursive copying
 The variable @code{dired-recursive-copies} controls whether
 directories are copied recursively.  The default is to not copy
 recursively, which means that directories cannot be copied.
diff -ruN src-21.1/man/display.texi src-21.2/man/display.texi
--- src-21.1/man/display.texi	Mon Sep 17 16:47:01 2001
+++ src-21.2/man/display.texi	Mon Jan 28 17:33:11 2002
@@ -36,6 +36,11 @@
 and slant of the characters, the foreground and background color, and
 underlining.  But it does not have to specify all of them.
 
+  Emacs on a character terminal supports only part of face attributes.
+Which attributes are supported depends on your display type, but many
+displays support inverse video, bold, and underline attributes, and
+some support colors.
+
   Features which rely on text in multiple faces (such as Font Lock mode)
 will also work on non-windowed terminals that can display more than one
 face, whether by colors or underlining and emboldening.  This includes
diff -ruN src-21.1/man/ebrowse.aux src-21.2/man/ebrowse.aux
--- src-21.1/man/ebrowse.aux	Sat Oct 20 18:45:44 2001
+++ src-21.2/man/ebrowse.aux	Thu Jan  1 01:00:00 1970
@@ -1,123 +0,0 @@
-'xrdef {Overview-title}{Introduction}
-'xrdef {Overview-pg}{1}
-'xrdef {Overview-snt}{Chapter'tie1}
-'xrdef {Generating browser files-title}{Processing Source Files}
-'xrdef {Generating browser files-pg}{3}
-'xrdef {Generating browser files-snt}{Chapter'tie2}
-'xrdef {Input files-title}{Specifying Input Files}
-'xrdef {Input files-pg}{3}
-'xrdef {Input files-snt}{Section'tie2.1}
-'xrdef {Output file-title}{Changing the Output File Name}
-'xrdef {Output file-pg}{3}
-'xrdef {Output file-snt}{Section'tie2.2}
-'xrdef {Structs and unions-title}{Structs and Unions}
-'xrdef {Structs and unions-pg}{4}
-'xrdef {Structs and unions-snt}{Section'tie2.3}
-'xrdef {Matching-title}{Regular Expressions}
-'xrdef {Matching-pg}{4}
-'xrdef {Matching-snt}{Section'tie2.4}
-'xrdef {Verbosity-title}{Verbose Mode}
-'xrdef {Verbosity-pg}{5}
-'xrdef {Verbosity-snt}{Section'tie2.5}
-'xrdef {Loading a Tree-title}{Starting to Browse}
-'xrdef {Loading a Tree-pg}{7}
-'xrdef {Loading a Tree-snt}{Chapter'tie3}
-'xrdef {Tree Buffers-title}{Tree Buffers}
-'xrdef {Tree Buffers-pg}{9}
-'xrdef {Tree Buffers-snt}{Chapter'tie4}
-'xrdef {Source Display-title}{Viewing and Finding Class Declarations}
-'xrdef {Source Display-pg}{9}
-'xrdef {Source Display-snt}{Section'tie4.1}
-'xrdef {Member Display-title}{Displaying Members}
-'xrdef {Member Display-pg}{9}
-'xrdef {Member Display-snt}{Section'tie4.2}
-'xrdef {Go to Class-title}{Finding a Class}
-'xrdef {Go to Class-pg}{10}
-'xrdef {Go to Class-snt}{Section'tie4.3}
-'xrdef {Quitting-title}{Burying a Tree Buffer}
-'xrdef {Quitting-pg}{10}
-'xrdef {Quitting-snt}{Section'tie4.4}
-'xrdef {File Name Display-title}{Displaying File Names}
-'xrdef {File Name Display-pg}{10}
-'xrdef {File Name Display-snt}{Section'tie4.5}
-'xrdef {Expanding and Collapsing-title}{Expanding and Collapsing a Tree}
-'xrdef {Expanding and Collapsing-pg}{10}
-'xrdef {Expanding and Collapsing-snt}{Section'tie4.6}
-'xrdef {Tree Indentation-title}{Changing the Tree Indentation}
-'xrdef {Tree Indentation-pg}{11}
-'xrdef {Tree Indentation-snt}{Section'tie4.7}
-'xrdef {Killing Classes-title}{Removing Classes from the Tree}
-'xrdef {Killing Classes-pg}{11}
-'xrdef {Killing Classes-snt}{Section'tie4.8}
-'xrdef {Saving a Tree-title}{Saving a Tree}
-'xrdef {Saving a Tree-pg}{11}
-'xrdef {Saving a Tree-snt}{Section'tie4.9}
-'xrdef {Member Buffers-title}{Member Buffers}
-'xrdef {Member Buffers-pg}{13}
-'xrdef {Member Buffers-snt}{Chapter'tie5}
-'xrdef {Switching Member Lists-title}{Switching Member Lists}
-'xrdef {Switching Member Lists-pg}{13}
-'xrdef {Switching Member Lists-snt}{Section'tie5.1}
-'xrdef {Finding/Viewing-title}{Finding and Viewing Member Source}
-'xrdef {Finding/Viewing-pg}{13}
-'xrdef {Finding/Viewing-snt}{Section'tie5.2}
-'xrdef {Inherited Members-title}{Display of Inherited Members}
-'xrdef {Inherited Members-pg}{14}
-'xrdef {Inherited Members-snt}{Section'tie5.3}
-'xrdef {Searching Members-title}{Searching Members}
-'xrdef {Searching Members-pg}{14}
-'xrdef {Searching Members-snt}{Section'tie5.4}
-'xrdef {Switching to Tree-title}{Switching to Tree Buffer}
-'xrdef {Switching to Tree-pg}{14}
-'xrdef {Switching to Tree-snt}{Section'tie5.5}
-'xrdef {Filters-title}{Filters}
-'xrdef {Filters-pg}{14}
-'xrdef {Filters-snt}{Section'tie5.6}
-'xrdef {Attributes-title}{Displaying Member Attributes}
-'xrdef {Attributes-pg}{15}
-'xrdef {Attributes-snt}{Section'tie5.7}
-'xrdef {Long and Short Display-title}{Long and Short Member Display}
-'xrdef {Long and Short Display-pg}{15}
-'xrdef {Long and Short Display-snt}{Section'tie5.8}
-'xrdef {Regexp Display-title}{Display of Regular Expressions}
-'xrdef {Regexp Display-pg}{15}
-'xrdef {Regexp Display-snt}{Section'tie5.9}
-'xrdef {Switching Classes-title}{Displaying Another Class}
-'xrdef {Switching Classes-pg}{16}
-'xrdef {Switching Classes-snt}{Section'tie5.10}
-'xrdef {Killing/Burying-title}{Burying a Member Buffer}
-'xrdef {Killing/Burying-pg}{16}
-'xrdef {Killing/Burying-snt}{Section'tie5.11}
-'xrdef {Column Width-title}{Setting the Column Width}
-'xrdef {Column Width-pg}{16}
-'xrdef {Column Width-snt}{Section'tie5.12}
-'xrdef {Redisplay-title}{Forced Redisplay}
-'xrdef {Redisplay-pg}{16}
-'xrdef {Redisplay-snt}{Section'tie5.13}
-'xrdef {Tags-like Functions-title}{Tags-like Functions}
-'xrdef {Tags-like Functions-pg}{17}
-'xrdef {Tags-like Functions-snt}{Chapter'tie6}
-'xrdef {Finding and Viewing-title}{Finding and Viewing Members}
-'xrdef {Finding and Viewing-pg}{17}
-'xrdef {Finding and Viewing-snt}{Section'tie6.1}
-'xrdef {Position Stack-title}{The Position Stack}
-'xrdef {Position Stack-pg}{17}
-'xrdef {Position Stack-snt}{Section'tie6.2}
-'xrdef {Search & Replace-title}{Searching and Replacing}
-'xrdef {Search & Replace-pg}{18}
-'xrdef {Search & Replace-snt}{Section'tie6.3}
-'xrdef {Members in Files-title}{Members in Files}
-'xrdef {Members in Files-pg}{18}
-'xrdef {Members in Files-snt}{Section'tie6.4}
-'xrdef {Apropos-title}{Member Apropos}
-'xrdef {Apropos-pg}{18}
-'xrdef {Apropos-snt}{Section'tie6.5}
-'xrdef {Symbol Completion-title}{Symbol Completion}
-'xrdef {Symbol Completion-pg}{18}
-'xrdef {Symbol Completion-snt}{Section'tie6.6}
-'xrdef {Member Buffer Display-title}{Quick Member Display}
-'xrdef {Member Buffer Display-pg}{18}
-'xrdef {Member Buffer Display-snt}{Section'tie6.7}
-'xrdef {Concept Index-title}{Concept Index}
-'xrdef {Concept Index-pg}{19}
-'xrdef {Concept Index-snt}{}
diff -ruN src-21.1/man/ebrowse.cps src-21.2/man/ebrowse.cps
--- src-21.1/man/ebrowse.cps	Sat Oct 20 18:45:43 2001
+++ src-21.2/man/ebrowse.cps	Thu Jan  1 01:00:00 1970
@@ -1,174 +0,0 @@
-\initial {*}
-\entry {\samp {*Globals*}}{9}
-\entry {\samp {*Members*} buffer}{9}
-\initial {-}
-\entry {\code {--append}}{4}
-\entry {\code {--files}}{3}
-\entry {\code {--help}}{3}
-\entry {\code {--max-regexp-length}}{4}
-\entry {\code {--min-regexp-length}}{4}
-\entry {\code {--no-regexps}}{4}
-\entry {\code {--no-structs-or-unions}}{4}
-\entry {\code {--output-file}}{3}
-\entry {\code {--search-path}}{3}
-\entry {\code {--verbose}}{5}
-\entry {\code {--very-verbose}}{5}
-\initial {A}
-\entry {appending output to class data base}{4}
-\entry {apropos on class members}{18}
-\entry {attributes}{15}
-\initial {B}
-\entry {base class, display}{16}
-\entry {base classes, members}{14}
-\entry {branches of class tree}{10}
-\entry {\file {BROWSE} file}{3}
-\entry {browsing}{7}
-\entry {buffer switching}{14}
-\entry {burying member buffers}{16}
-\entry {burying tree buffer}{10}
-\initial {C}
-\entry {class data base creation}{3}
-\entry {class declaration}{9}
-\entry {class display}{16}
-\entry {class location}{10}
-\entry {class members, types}{13}
-\entry {class statistics}{11}
-\entry {class tree, collapse or expand}{10}
-\entry {class tree, save to a file}{11}
-\entry {class trees}{9}
-\entry {class, remove from tree}{11}
-\entry {collapse tree branch}{10}
-\entry {column width}{16}
-\entry {command line for \command {ebrowse}}{3}
-\entry {completion}{18}
-\entry {\code {const} attribute}{15}
-\entry {\code {const} members}{14}
-\entry {context menu}{7}
-\initial {D}
-\entry {declaration of a member, in member buffers}{13}
-\entry {defines}{13}
-\entry {definition of a member, in member buffers}{13}
-\entry {derived class, display}{16}
-\entry {display form}{15}
-\initial {E}
-\entry {\command {ebrowse}, the program}{3}
-\entry {expand tree branch}{10}
-\entry {expanding branches}{10}
-\entry {\code {explicit} attribute}{15}
-\entry {\code {extern "C"} attribute}{15}
-\initial {F}
-\entry {file names in tree buffers}{10}
-\entry {file, members}{18}
-\entry {files}{18}
-\entry {filters}{14}
-\entry {finding a class}{9}
-\entry {finding class member, in C++ source}{17}
-\entry {finding members, in member buffers}{13}
-\entry {freezing a member buffer}{9}
-\entry {friend functions}{3}
-\entry {friend functions, list}{9}
-\entry {friends}{13}
-\initial {H}
-\entry {header files}{3}
-\entry {help}{16}
-\initial {I}
-\entry {indentation of the tree}{11}
-\entry {indentation, member}{16}
-\entry {inherited members}{14}
-\entry {\code {inline}}{15}
-\entry {\code {inline} members}{14}
-\entry {input files, for \command {ebrowse}}{3}
-\entry {instance member variables, list}{9}
-\initial {K}
-\entry {killing classes}{11}
-\initial {L}
-\entry {list class members in a file}{18}
-\entry {loading}{7}
-\entry {locate class}{10}
-\entry {long display}{15}
-\initial {M}
-\entry {major modes, of Ebrowse buffers}{1}
-\entry {marking classes}{11}
-\entry {maximum regexp length for recording}{4}
-\entry {member attribute display}{15}
-\entry {member buffer}{1}
-\entry {member buffer mode}{13}
-\entry {member buffer, for member at point}{18}
-\entry {member declaration, finding, in C++ source}{17}
-\entry {member declarations, in member buffers}{13}
-\entry {member definition, finding, in C++ source}{17}
-\entry {member definitions, in member buffers}{13}
-\entry {member functions, list}{9}
-\entry {member indentation}{16}
-\entry {member lists, in member buffers}{13}
-\entry {member lists, in tree buffers}{9}
-\entry {members}{13}
-\entry {members in file, listing}{18}
-\entry {members, matching regexp}{18}
-\entry {minimum regexp length for recording}{4}
-\entry {mouse highlight in tree buffers}{7}
-\entry {\code {mutable} attribute}{15}
-\initial {N}
-\entry {next member list}{13}
-\initial {O}
-\entry {operations on marked classes}{11}
-\entry {output file name}{3}
-\initial {P}
-\entry {parser for C++ sources}{1}
-\entry {position stack}{17}
-\entry {previous member list}{13}
-\entry {\code {private} members}{14}
-\entry {\code {protected} members}{14}
-\entry {\code {public} members}{14}
-\entry {pure virtual function attribute}{15}
-\entry {pure virtual members}{14}
-\initial {R}
-\entry {redisplay of member buffers}{16}
-\entry {regular expression display}{15}
-\entry {regular expressions, recording}{4}
-\entry {remove filters}{14}
-\entry {replacing in multiple C++ files}{18}
-\entry {response files}{3}
-\entry {restart tags-operation}{18}
-\entry {return to original position}{17}
-\initial {S}
-\entry {save tree to a file}{11}
-\entry {search for class}{10}
-\entry {searching members}{14}
-\entry {searching multiple C++ files}{18}
-\entry {short display}{15}
-\entry {standard input, specifying input files}{3}
-\entry {static}{13}
-\entry {static member functions, list}{9}
-\entry {static members}{13}
-\entry {static variables, list}{9}
-\entry {statistics for a tree}{11}
-\entry {structs}{4}
-\entry {subclass, display}{16}
-\entry {superclass, display}{16}
-\entry {superclasses, members}{14}
-\entry {switching buffers}{14}
-\entry {symbol completion}{18}
-\initial {T}
-\entry {tags}{17}
-\entry {\code {template} attribute}{15}
-\entry {toggle mark}{11}
-\entry {tree buffer}{1}
-\entry {tree buffer mode}{9}
-\entry {tree buffer, switch to}{14}
-\entry {tree indentation}{11}
-\entry {tree statistics}{11}
-\entry {tree, save to a file}{11}
-\entry {types}{13}
-\entry {types of class members}{13}
-\entry {types, list}{9}
-\initial {U}
-\entry {unions}{4}
-\entry {unmark all}{11}
-\initial {V}
-\entry {verbose operation}{5}
-\entry {viewing class member, in C++ source}{17}
-\entry {viewing members, in member buffers}{13}
-\entry {viewing, class}{9}
-\entry {\code {virtual} attribute}{15}
-\entry {\code {virtual} members}{14}
diff -ruN src-21.1/man/ediff.aux src-21.2/man/ediff.aux
--- src-21.1/man/ediff.aux	Sat Oct 20 18:45:24 2001
+++ src-21.2/man/ediff.aux	Thu Jan  1 01:00:00 1970
@@ -1,72 +0,0 @@
-'xrdef {Introduction-title}{Introduction}
-'xrdef {Introduction-pg}{1}
-'xrdef {Introduction-snt}{Chapter'tie1}
-'xrdef {Major Entry Points-title}{Major Entry Points}
-'xrdef {Major Entry Points-pg}{2}
-'xrdef {Major Entry Points-snt}{Chapter'tie2}
-'xrdef {Session Commands-title}{Session Commands}
-'xrdef {Session Commands-pg}{6}
-'xrdef {Session Commands-snt}{Chapter'tie3}
-'xrdef {Quick Help Commands-title}{Quick Help Commands}
-'xrdef {Quick Help Commands-pg}{6}
-'xrdef {Quick Help Commands-snt}{Section'tie3.1}
-'xrdef {Other Session Commands-title}{Other Session Commands}
-'xrdef {Other Session Commands-pg}{12}
-'xrdef {Other Session Commands-snt}{Section'tie3.2}
-'xrdef {Registry of Ediff Sessions-title}{Registry of Ediff Sessions}
-'xrdef {Registry of Ediff Sessions-pg}{14}
-'xrdef {Registry of Ediff Sessions-snt}{Chapter'tie4}
-'xrdef {Session Groups-title}{Session Groups}
-'xrdef {Session Groups-pg}{15}
-'xrdef {Session Groups-snt}{Chapter'tie5}
-'xrdef {Remote and Compressed Files-title}{Remote and Compressed Files}
-'xrdef {Remote and Compressed Files-pg}{17}
-'xrdef {Remote and Compressed Files-snt}{Chapter'tie6}
-'xrdef {Customization-title}{Customization}
-'xrdef {Customization-pg}{18}
-'xrdef {Customization-snt}{Chapter'tie7}
-'xrdef {Hooks-title}{Hooks}
-'xrdef {Hooks-pg}{18}
-'xrdef {Hooks-snt}{Section'tie7.1}
-'xrdef {Quick Help Customization-title}{Quick Help Customization}
-'xrdef {Quick Help Customization-pg}{20}
-'xrdef {Quick Help Customization-snt}{Section'tie7.2}
-'xrdef {Window and Frame Configuration-title}{Window and Frame Configuration}
-'xrdef {Window and Frame Configuration-pg}{20}
-'xrdef {Window and Frame Configuration-snt}{Section'tie7.3}
-'xrdef {Selective Browsing-title}{Selective Browsing}
-'xrdef {Selective Browsing-pg}{22}
-'xrdef {Selective Browsing-snt}{Section'tie7.4}
-'xrdef {Highlighting Difference Regions-title}{Highlighting Difference Regions}
-'xrdef {Highlighting Difference Regions-pg}{23}
-'xrdef {Highlighting Difference Regions-snt}{Section'tie7.5}
-'xrdef {Narrowing-title}{Narrowing}
-'xrdef {Narrowing-pg}{25}
-'xrdef {Narrowing-snt}{Section'tie7.6}
-'xrdef {Refinement of Difference Regions-title}{Refinement of Difference Regions}
-'xrdef {Refinement of Difference Regions-pg}{26}
-'xrdef {Refinement of Difference Regions-snt}{Section'tie7.7}
-'xrdef {Patch and Diff Programs-title}{Patch and Diff Programs}
-'xrdef {Patch and Diff Programs-pg}{26}
-'xrdef {Patch and Diff Programs-snt}{Section'tie7.8}
-'xrdef {Merging and diff3-title}{Merging and diff3}
-'xrdef {Merging and diff3-pg}{28}
-'xrdef {Merging and diff3-snt}{Section'tie7.9}
-'xrdef {Support for Version Control-title}{Support for Version Control}
-'xrdef {Support for Version Control-pg}{31}
-'xrdef {Support for Version Control-snt}{Section'tie7.10}
-'xrdef {Customizing the Mode Line-title}{Customizing the Mode Line}
-'xrdef {Customizing the Mode Line-pg}{31}
-'xrdef {Customizing the Mode Line-snt}{Section'tie7.11}
-'xrdef {Miscellaneous-title}{Miscellaneous}
-'xrdef {Miscellaneous-pg}{32}
-'xrdef {Miscellaneous-snt}{Section'tie7.12}
-'xrdef {Notes on Heavy-duty Customization-title}{Notes on Heavy-duty Customization}
-'xrdef {Notes on Heavy-duty Customization-pg}{33}
-'xrdef {Notes on Heavy-duty Customization-snt}{Section'tie7.13}
-'xrdef {Credits-title}{Credits}
-'xrdef {Credits-pg}{35}
-'xrdef {Credits-snt}{Chapter'tie8}
-'xrdef {Index-title}{Index}
-'xrdef {Index-pg}{38}
-'xrdef {Index-snt}{}
diff -ruN src-21.1/man/ediff.cps src-21.2/man/ediff.cps
--- src-21.1/man/ediff.cps	Sat Oct 20 18:45:24 2001
+++ src-21.2/man/ediff.cps	Thu Jan  1 01:00:00 1970
@@ -1,250 +0,0 @@
-\initial {!}
-\entry {!}{8}
-\initial {#}
-\entry {##}{9}
-\entry {#f}{9}
-\entry {#h}{9}
-\initial {$}
-\entry {$$}{10}
-\entry {$*}{10}
-\initial {%}
-\entry {%}{10}
-\initial {&}
-\entry {&}{11}
-\initial {*}
-\entry {*}{8}
-\initial {/}
-\entry {/}{11}
-\initial {=}
-\entry {=}{11}
-\initial {?}
-\entry {?}{6}
-\initial {@}
-\entry {@}{8}
-\initial {{\tt\char 124}}
-\entry {|}{8}
-\initial {{\tt\char 126}}
-\entry {~}{9}
-\initial {{\tt\char 43}}
-\entry {+}{11}
-\initial {{\tt\gtr}}
-\entry {>}{6}
-\initial {{\tt\less}}
-\entry {<}{6}
-\initial {A}
-\entry {a}{7}
-\entry {A}{9}
-\entry {ab}{7}
-\entry {ac}{7}
-\initial {B}
-\entry {b}{7}
-\entry {B}{9}
-\entry {ba}{7}
-\entry {bc}{7}
-\initial {C}
-\entry {C}{9}
-\entry {C-l}{10}
-\entry {ca}{7}
-\entry {cb}{7}
-\entry {Comparing files and buffers}{1}
-\initial {D}
-\entry {D}{9}
-\entry {DEL}{7}
-\initial {E}
-\entry {E}{6}
-\entry {ediff}{2}
-\entry {ediff-after-flag-eol}{23}
-\entry {ediff-after-flag-mol}{23}
-\entry {ediff-after-session-group-setup-hook}{20}
-\entry {ediff-after-setup-control-frame-hook}{19}
-\entry {ediff-after-setup-windows-hook}{18}
-\entry {ediff-auto-refine}{26}
-\entry {ediff-auto-refine-limit}{26}
-\entry {ediff-autostore-merges}{15, 19, 30}
-\entry {ediff-before-flag-bol}{23}
-\entry {ediff-before-flag-mol}{23}
-\entry {ediff-before-session-group-setup-hook}{20}
-\entry {ediff-before-setup-control-frame-hook}{19}
-\entry {ediff-before-setup-hook}{18}
-\entry {ediff-before-setup-windows-hook}{18}
-\entry {ediff-brief-help-message-function}{34}
-\entry {ediff-buffers}{2}
-\entry {ediff-buffers3}{2}
-\entry {ediff-cleanup-hook}{19}
-\entry {ediff-coding-system-for-read}{27}
-\entry {ediff-combination-pattern}{28}
-\entry {ediff-control-buffer}{20}
-\entry {ediff-control-frame-parameters}{21}
-\entry {ediff-control-frame-position-function}{21}
-\entry {ediff-control-frame-upward-shift}{21}
-\entry {ediff-current-diff-face-A}{24}
-\entry {ediff-current-diff-face-B}{24}
-\entry {ediff-current-diff-face-C}{24}
-\entry {ediff-custom-diff-options}{28}
-\entry {ediff-custom-diff-program}{28}
-\entry {ediff-default-variant}{28}
-\entry {ediff-diff-options}{27}
-\entry {ediff-diff-program}{26, 27}
-\entry {ediff-diff3-options}{27}
-\entry {ediff-diff3-program}{27}
-\entry {ediff-directories}{2}
-\entry {ediff-directories3}{2}
-\entry {ediff-directory-revisions}{2}
-\entry {ediff-display-help-hook}{19}
-\entry {ediff-documentation}{4}
-\entry {ediff-even-diff-face-A}{24}
-\entry {ediff-even-diff-face-B}{24}
-\entry {ediff-even-diff-face-C}{24}
-\entry {ediff-files}{2}
-\entry {ediff-files3}{2}
-\entry {ediff-fine-diff-face-A}{24}
-\entry {ediff-fine-diff-face-B}{24}
-\entry {ediff-fine-diff-face-C}{24}
-\entry {ediff-force-faces}{24}
-\entry {ediff-forward-word}{26}
-\entry {ediff-forward-word-function}{26}
-\entry {\code {ediff-grab-mouse}}{33}
-\entry {ediff-help-message}{20}
-\entry {ediff-highlight-all-diffs}{24}
-\entry {ediff-ignore-similar-regions}{23}
-\entry {ediff-janitor}{19}
-\entry {ediff-job-name}{34}
-\entry {\code {ediff-keep-variants}}{33}
-\entry {ediff-keymap-setup-hook}{18}
-\entry {ediff-load-hook}{18}
-\entry {ediff-long-help-message-function}{34}
-\entry {ediff-make-buffers-readonly-at-startup}{33}
-\entry {ediff-make-frame-position}{21}
-\entry {ediff-make-wide-display-function}{32}
-\entry {ediff-maybe-save-and-delete-merge}{19, 30}
-\entry {ediff-merge}{3}
-\entry {ediff-merge-buffers}{4}
-\entry {ediff-merge-buffers-with-ancestor}{4}
-\entry {ediff-merge-directories}{4}
-\entry {ediff-merge-directories-with-ancestor}{4}
-\entry {ediff-merge-directory-revisions}{2}
-\entry {ediff-merge-directory-revisions-with-ancestor}{2}
-\entry {ediff-merge-filename-prefix}{31}
-\entry {ediff-merge-files}{3}
-\entry {ediff-merge-files-with-ancestor}{4}
-\entry {ediff-merge-revisions}{4}
-\entry {ediff-merge-revisions-with-ancestor}{4}
-\entry {ediff-merge-split-window-function}{32}
-\entry {ediff-merge-window-share}{30}
-\entry {ediff-merge-with-ancestor}{4}
-\entry {ediff-meta-buffer-keymap-setup-hook}{20}
-\entry {ediff-meta-buffer-map}{20}
-\entry {ediff-mode-hook}{19}
-\entry {ediff-mode-map}{18}
-\entry {ediff-narrow-control-frame-leftward-shift}{21}
-\entry {ediff-no-emacs-help-in-control-buffer}{32}
-\entry {ediff-odd-diff-face-A}{24}
-\entry {ediff-odd-diff-face-B}{24}
-\entry {ediff-odd-diff-face-C}{24}
-\entry {ediff-patch-buffer}{3}
-\entry {ediff-patch-default-directory}{28}
-\entry {ediff-patch-file}{3}
-\entry {ediff-patch-options}{27}
-\entry {ediff-patch-program}{27}
-\entry {ediff-prefer-iconified-control-frame}{21}
-\entry {ediff-prepare-buffer-hook}{19, 32}
-\entry {ediff-profile}{13}
-\entry {ediff-quit-hook}{18}
-\entry {ediff-quit-merge-hook}{19, 30}
-\entry {ediff-quit-session-group-hook}{20}
-\entry {ediff-quit-widened}{25}
-\entry {ediff-regions-linewise}{3}
-\entry {ediff-regions-wordwise}{3}
-\entry {ediff-registry-setup-hook}{19}
-\entry {ediff-revert-buffers-then-recompute-diffs}{12}
-\entry {ediff-revision}{3}
-\entry {ediff-save-buffer}{28}
-\entry {ediff-select-hook}{19}
-\entry {ediff-setup}{34}
-\entry {ediff-setup-windows}{21}
-\entry {ediff-setup-windows-multiframe}{22}
-\entry {ediff-setup-windows-plain}{22}
-\entry {ediff-show-clashes-only}{30}
-\entry {ediff-show-registry}{12}
-\entry {ediff-split-window-function}{32}
-\entry {ediff-start-narrowed}{25}
-\entry {ediff-startup-hook}{19, 20, 34}
-\entry {ediff-suspend-hook}{18}
-\entry {ediff-toggle-multiframe}{12, 22}
-\entry {ediff-toggle-read-only-function}{32}
-\entry {ediff-unselect-hook}{19}
-\entry {\code {ediff-use-last-dir}}{4}
-\entry {ediff-use-last-dir}{32}
-\entry {ediff-use-long-help-message}{20}
-\entry {ediff-version-control-package}{31}
-\entry {ediff-wide-control-frame-rightward-shift}{21}
-\entry {ediff-window-setup-function}{22}
-\entry {ediff-windows-linewise}{2}
-\entry {ediff-windows-wordwise}{2}
-\entry {ediff-word-1}{26}
-\entry {ediff-word-2}{26}
-\entry {ediff-word-3}{26}
-\entry {ediff-word-4}{26}
-\entry {ediff-word-mode}{34}
-\entry {ediff3}{2}
-\entry {edir-merge-revisions}{2}
-\entry {edir-merge-revisions-with-ancestor}{2}
-\entry {edir-revisions}{2}
-\entry {edirs}{2}
-\entry {edirs-merge}{4}
-\entry {edirs-merge-with-ancestor}{4}
-\entry {edirs3}{2}
-\entry {epatch}{3}
-\entry {epatch-buffer}{3}
-\entry {eregistry}{12}
-\initial {F}
-\entry {Finding differences}{1}
-\initial {G}
-\entry {G}{6}
-\entry {ga}{7}
-\entry {gb}{8}
-\entry {gc}{8}
-\entry {\file {generic-sc.el}}{31}
-\initial {H}
-\entry {h}{8}
-\initial {I}
-\entry {i}{9}
-\initial {J}
-\entry {j}{7}
-\initial {M}
-\entry {m}{8}
-\entry {M}{10}
-\entry {Merging files and buffers}{1}
-\entry {\file {mode-line.el}}{32}
-\entry {Multi-file patches}{15}
-\initial {N}
-\entry {n}{7}
-\initial {P}
-\entry {p}{7}
-\entry {Patching files and buffers}{1}
-\entry {\file {pcl-cvs.el}}{31}
-\initial {Q}
-\entry {q}{10}
-\initial {R}
-\entry {r}{8}
-\entry {R}{10}
-\entry {ra}{9}
-\entry {rb}{9}
-\entry {rc}{9}
-\entry {\file {rcs.el}}{31}
-\initial {S}
-\entry {s}{11}
-\entry {SPC}{7}
-\initial {U}
-\entry {\file {uniquify.el}}{32}
-\initial {V}
-\entry {v}{6}
-\entry {V}{6}
-\entry {\file {vc.el}}{31}
-\initial {W}
-\entry {wa}{6}
-\entry {wb}{6}
-\entry {wc}{6}
-\entry {wd}{6}
-\initial {Z}
-\entry {z}{10}
diff -ruN src-21.1/man/emacs-mime.aux src-21.2/man/emacs-mime.aux
--- src-21.1/man/emacs-mime.aux	Sat Oct 20 18:45:45 2001
+++ src-21.2/man/emacs-mime.aux	Thu Jan  1 01:00:00 1970
@@ -1,84 +0,0 @@
-'xrdef {Top-title}{Emacs MIME}
-'xrdef {Top-pg}{1}
-'xrdef {Top-snt}{}
-'xrdef {Interface Functions-title}{Interface Functions}
-'xrdef {Interface Functions-pg}{3}
-'xrdef {Interface Functions-snt}{Chapter'tie1}
-'xrdef {Basic Functions-title}{Basic Functions}
-'xrdef {Basic Functions-pg}{7}
-'xrdef {Basic Functions-snt}{Chapter'tie2}
-'xrdef {rfc2045-title}{rfc2045}
-'xrdef {rfc2045-pg}{7}
-'xrdef {rfc2045-snt}{Section'tie2.1}
-'xrdef {rfc2231-title}{rfc2231}
-'xrdef {rfc2231-pg}{7}
-'xrdef {rfc2231-snt}{Section'tie2.2}
-'xrdef {ietf-drums-title}{ietf-drums}
-'xrdef {ietf-drums-pg}{8}
-'xrdef {ietf-drums-snt}{Section'tie2.3}
-'xrdef {rfc2047-title}{rfc2047}
-'xrdef {rfc2047-pg}{8}
-'xrdef {rfc2047-snt}{Section'tie2.4}
-'xrdef {time-date-title}{time-date}
-'xrdef {time-date-pg}{9}
-'xrdef {time-date-snt}{Section'tie2.5}
-'xrdef {qp-title}{qp}
-'xrdef {qp-pg}{10}
-'xrdef {qp-snt}{Section'tie2.6}
-'xrdef {base64-title}{base64}
-'xrdef {base64-pg}{11}
-'xrdef {base64-snt}{Section'tie2.7}
-'xrdef {binhex-title}{binhex}
-'xrdef {binhex-pg}{11}
-'xrdef {binhex-snt}{Section'tie2.8}
-'xrdef {uudecode-title}{uudecode}
-'xrdef {uudecode-pg}{11}
-'xrdef {uudecode-snt}{Section'tie2.9}
-'xrdef {rfc1843-title}{rfc1843}
-'xrdef {rfc1843-pg}{12}
-'xrdef {rfc1843-snt}{Section'tie2.10}
-'xrdef {mailcap-title}{mailcap}
-'xrdef {mailcap-pg}{12}
-'xrdef {mailcap-snt}{Section'tie2.11}
-'xrdef {Decoding and Viewing-title}{Decoding and Viewing}
-'xrdef {Decoding and Viewing-pg}{15}
-'xrdef {Decoding and Viewing-snt}{Chapter'tie3}
-'xrdef {Dissection-title}{Dissection}
-'xrdef {Dissection-pg}{15}
-'xrdef {Dissection-snt}{Section'tie3.1}
-'xrdef {Handles-title}{Handles}
-'xrdef {Handles-pg}{15}
-'xrdef {Handles-snt}{Section'tie3.2}
-'xrdef {Display-title}{Display}
-'xrdef {Display-pg}{16}
-'xrdef {Display-snt}{Section'tie3.3}
-'xrdef {Customization-title}{Customization}
-'xrdef {Customization-pg}{16}
-'xrdef {Customization-snt}{Section'tie3.4}
-'xrdef {New Viewers-title}{New Viewers}
-'xrdef {New Viewers-pg}{17}
-'xrdef {New Viewers-snt}{Section'tie3.5}
-'xrdef {Composing-title}{Composing}
-'xrdef {Composing-pg}{19}
-'xrdef {Composing-snt}{Chapter'tie4}
-'xrdef {Simple MML Example-title}{Simple MML Example}
-'xrdef {Simple MML Example-pg}{19}
-'xrdef {Simple MML Example-snt}{Section'tie4.1}
-'xrdef {MML Definition-title}{MML Definition}
-'xrdef {MML Definition-pg}{19}
-'xrdef {MML Definition-snt}{Section'tie4.2}
-'xrdef {Advanced MML Example-title}{Advanced MML Example}
-'xrdef {Advanced MML Example-pg}{21}
-'xrdef {Advanced MML Example-snt}{Section'tie4.3}
-'xrdef {Charset Translation-title}{Charset Translation}
-'xrdef {Charset Translation-pg}{22}
-'xrdef {Charset Translation-snt}{Section'tie4.4}
-'xrdef {Conversion-title}{Conversion}
-'xrdef {Conversion-pg}{23}
-'xrdef {Conversion-snt}{Section'tie4.5}
-'xrdef {Standards-title}{Standards}
-'xrdef {Standards-pg}{25}
-'xrdef {Standards-snt}{Chapter'tie5}
-'xrdef {Index-title}{Index}
-'xrdef {Index-pg}{27}
-'xrdef {Index-snt}{Chapter'tie6}
diff -ruN src-21.1/man/emacs-mime.cps src-21.2/man/emacs-mime.cps
--- src-21.1/man/emacs-mime.cps	Sat Oct 20 18:45:45 2001
+++ src-21.2/man/emacs-mime.cps	Thu Jan  1 01:00:00 1970
@@ -1,129 +0,0 @@
-\initial {A}
-\entry {Apple}{11}
-\initial {B}
-\entry {base64}{11}
-\entry {binhex}{11}
-\entry {\code {binhex-decode-region}}{11}
-\initial {C}
-\entry {charsets}{22}
-\entry {Chinese}{12}
-\entry {Composing}{19}
-\initial {D}
-\entry {date-leap-year-p}{9}
-\entry {date-to-time}{9}
-\entry {days-between}{9}
-\entry {days-to-time}{9}
-\initial {H}
-\entry {HZ}{12}
-\initial {I}
-\entry {\code {ietf-drums-get-comment}}{8}
-\entry {\code {ietf-drums-narrow-to-header}}{8}
-\entry {\code {ietf-drums-parse-address}}{8}
-\entry {\code {ietf-drums-parse-addresses}}{8}
-\entry {\code {ietf-drums-parse-date}}{8}
-\entry {\code {ietf-drums-remove-comments}}{8}
-\entry {\code {ietf-drums-remove-whitespace}}{8}
-\entry {interface functions}{3}
-\initial {M}
-\entry {Macintosh}{11}
-\entry {\code {mail-content-type-get}}{3}
-\entry {\code {mail-decode-encoded-word-region}}{5}
-\entry {\code {mail-decode-encoded-word-string}}{5}
-\entry {\code {mail-encode-encoded-word-buffer}}{5}
-\entry {\code {mail-encode-encoded-word-region}}{5}
-\entry {\code {mail-encode-encoded-word-string}}{5}
-\entry {\code {mail-header-encode-parameter}}{4}
-\entry {\code {mail-header-get-comment}}{4}
-\entry {\code {mail-header-narrow-to-field}}{4}
-\entry {\code {mail-header-parse-address}}{4}
-\entry {\code {mail-header-parse-addresses}}{4}
-\entry {\code {mail-header-parse-content-disposition}}{3}
-\entry {\code {mail-header-parse-content-type}}{3}
-\entry {\code {mail-header-parse-date}}{4}
-\entry {\code {mail-header-remove-comments}}{4}
-\entry {\code {mail-header-remove-whitespace}}{4}
-\entry {\code {mail-narrow-to-head}}{4}
-\entry {mail-parse}{3}
-\entry {mail-parse-charset}{22}
-\entry {\code {mailcap-default-mime-data}}{12}
-\entry {\code {mailcap-default-mime-extensions}}{13}
-\entry {\code {mailcap-extension-to-mime}}{14}
-\entry {\code {mailcap-mime-data}}{12}
-\entry {\code {mailcap-mime-extensions}}{13}
-\entry {\code {mailcap-mime-info}}{13}
-\entry {\code {mailcap-mime-types}}{13}
-\entry {\code {mailcap-parse-mailcaps}}{13}
-\entry {\code {mailcap-parse-mimetypes}}{13}
-\entry {MIME Composing}{19}
-\entry {MIME Meta Language}{19}
-\entry {mime-to-mml}{23}
-\entry {\code {mm-attachment-override-types}}{17}
-\entry {\code {mm-automatic-display}}{17}
-\entry {\code {mm-automatic-display-p}}{16}
-\entry {\code {mm-destroy-part}}{16}
-\entry {\code {mm-discouraged-alternatives}}{17}
-\entry {\code {mm-display-part}}{16}
-\entry {\code {mm-get-content-id}}{15}
-\entry {\code {mm-handle-buffer}}{15}
-\entry {\code {mm-handle-disposition}}{15}
-\entry {\code {mm-handle-encoding}}{15}
-\entry {\code {mm-handle-set-undisplayer}}{15}
-\entry {\code {mm-handle-type}}{15}
-\entry {\code {mm-handle-undisplayer}}{15}
-\entry {\code {mm-inlinable-p}}{16}
-\entry {\code {mm-inline-large-images-p}}{17}
-\entry {\code {mm-inline-media-tests}}{16}
-\entry {\code {mm-inline-override-p}}{17}
-\entry {\code {mm-inlined-types}}{17}
-\entry {\code {mm-interactively-view-part}}{16}
-\entry {mm-mime-mule-charset-alist}{22}
-\entry {\code {mm-pipe-part}}{16}
-\entry {\code {mm-remove-part}}{16}
-\entry {\code {mm-save-part}}{16}
-\entry {MML}{19}
-\entry {mml-generate-mime}{19}
-\entry {mml-to-mime}{23}
-\entry {Mule}{22}
-\initial {P}
-\entry {parse-time-string}{9}
-\initial {Q}
-\entry {\code {quoted-printable-decode-region}}{10}
-\entry {\code {quoted-printable-decode-string}}{11}
-\entry {\code {quoted-printable-encode-region}}{11}
-\entry {\code {quoted-printable-encode-string}}{11}
-\initial {R}
-\entry {rfc1843}{12}
-\entry {\code {rfc1843-decode-region}}{12}
-\entry {\code {rfc1843-decode-string}}{12}
-\entry {\code {rfc2045-encode-string}}{7}
-\entry {\code {rfc2047-charset-encoding-alist}}{9}
-\entry {\code {rfc2047-decode-region}}{9}
-\entry {\code {rfc2047-decode-string}}{9}
-\entry {\code {rfc2047-default-charset}}{8}
-\entry {\code {rfc2047-encode-message-header}}{9}
-\entry {\code {rfc2047-encode-region}}{9}
-\entry {\code {rfc2047-encode-string}}{9}
-\entry {\code {rfc2047-encoded-word-regexp}}{9}
-\entry {\code {rfc2047-encoding-function-alist}}{9}
-\entry {\code {rfc2047-header-encoding-list}}{8}
-\entry {\code {rfc2047-narrow-to-field}}{9}
-\entry {\code {rfc2047-q-encoding-alist}}{9}
-\entry {\code {rfc2231-encode-string}}{7}
-\entry {\code {rfc2231-get-value}}{7}
-\entry {\code {rfc2231-parse-string}}{7}
-\initial {S}
-\entry {safe-date-to-time}{10}
-\entry {seconds-to-time}{9}
-\entry {subtract-time}{9}
-\initial {T}
-\entry {time-less-p}{9}
-\entry {time-since}{9}
-\entry {time-to-day}{9}
-\entry {time-to-day-in-year}{9}
-\entry {time-to-seconds}{9}
-\initial {U}
-\entry {Unicode}{22}
-\entry {UTF-8}{22}
-\entry {uudecode}{11}
-\entry {\code {uudecode-decode-region}}{11}
-\entry {uuencode}{11}
diff -ruN src-21.1/man/emacs.aux src-21.2/man/emacs.aux
--- src-21.1/man/emacs.aux	Sat Oct 20 18:45:19 2001
+++ src-21.2/man/emacs.aux	Thu Jan  1 01:00:00 1970
@@ -1,1698 +0,0 @@
-'xrdef {Distrib-title}{Distribution}
-'xrdef {Distrib-pg}{3}
-'xrdef {Distrib-snt}{}
-'xrdef {Copying-title}{GNU GENERAL PUBLIC LICENSE}
-'xrdef {Copying-pg}{5}
-'xrdef {Copying-snt}{}
-'xrdef {GNU Free Documentation License-title}{GNU Free Documentation License}
-'xrdef {GNU Free Documentation License-pg}{13}
-'xrdef {GNU Free Documentation License-snt}{Appendix'tie'char65{}}
-'xrdef {Intro-title}{Introduction}
-'xrdef {Intro-pg}{21}
-'xrdef {Intro-snt}{}
-'xrdef {Screen-title}{The Organization of the Screen}
-'xrdef {Screen-pg}{23}
-'xrdef {Screen-snt}{Chapter'tie1}
-'xrdef {Point-title}{Point}
-'xrdef {Point-pg}{23}
-'xrdef {Point-snt}{Section'tie1.1}
-'xrdef {Echo Area-title}{The Echo Area}
-'xrdef {Echo Area-pg}{24}
-'xrdef {Echo Area-snt}{Section'tie1.2}
-'xrdef {Mode Line-title}{The Mode Line}
-'xrdef {Mode Line-pg}{25}
-'xrdef {Mode Line-snt}{Section'tie1.3}
-'xrdef {Menu Bar-title}{The Menu Bar}
-'xrdef {Menu Bar-pg}{28}
-'xrdef {Menu Bar-snt}{Section'tie1.4}
-'xrdef {User Input-title}{Kinds of User Input}
-'xrdef {User Input-pg}{29}
-'xrdef {User Input-snt}{Section'tie2.1}
-'xrdef {Keys-title}{Keys}
-'xrdef {Keys-pg}{30}
-'xrdef {Keys-snt}{Section'tie2.2}
-'xrdef {Commands-title}{Keys and Commands}
-'xrdef {Commands-pg}{31}
-'xrdef {Commands-snt}{Section'tie2.3}
-'xrdef {Text Characters-title}{Character Set for Text}
-'xrdef {Text Characters-pg}{32}
-'xrdef {Text Characters-snt}{Section'tie2.4}
-'xrdef {Entering Emacs-title}{Entering and Exiting Emacs}
-'xrdef {Entering Emacs-pg}{35}
-'xrdef {Entering Emacs-snt}{Chapter'tie3}
-'xrdef {Exiting-title}{Exiting Emacs}
-'xrdef {Exiting-pg}{35}
-'xrdef {Exiting-snt}{Section'tie3.1}
-'xrdef {Basic-title}{Basic Editing Commands}
-'xrdef {Basic-pg}{39}
-'xrdef {Basic-snt}{Chapter'tie4}
-'xrdef {Inserting Text-title}{Inserting Text}
-'xrdef {Inserting Text-pg}{39}
-'xrdef {Inserting Text-snt}{Section'tie4.1}
-'xrdef {Moving Point-title}{Changing the Location of Point}
-'xrdef {Moving Point-pg}{40}
-'xrdef {Moving Point-snt}{Section'tie4.2}
-'xrdef {Erasing-title}{Erasing Text}
-'xrdef {Erasing-pg}{42}
-'xrdef {Erasing-snt}{Section'tie4.3}
-'xrdef {Undo-title}{Undoing Changes}
-'xrdef {Undo-pg}{43}
-'xrdef {Undo-snt}{Section'tie4.4}
-'xrdef {Basic Files-title}{Files}
-'xrdef {Basic Files-pg}{44}
-'xrdef {Basic Files-snt}{Section'tie4.5}
-'xrdef {Basic Help-title}{Help}
-'xrdef {Basic Help-pg}{45}
-'xrdef {Basic Help-snt}{Section'tie4.6}
-'xrdef {Blank Lines-title}{Blank Lines}
-'xrdef {Blank Lines-pg}{45}
-'xrdef {Blank Lines-snt}{Section'tie4.7}
-'xrdef {Continuation Lines-title}{Continuation Lines}
-'xrdef {Continuation Lines-pg}{46}
-'xrdef {Continuation Lines-snt}{Section'tie4.8}
-'xrdef {Position Info-title}{Cursor Position Information}
-'xrdef {Position Info-pg}{46}
-'xrdef {Position Info-snt}{Section'tie4.9}
-'xrdef {Arguments-title}{Numeric Arguments}
-'xrdef {Arguments-pg}{48}
-'xrdef {Arguments-snt}{Section'tie4.10}
-'xrdef {Repeating-title}{Repeating a Command}
-'xrdef {Repeating-pg}{50}
-'xrdef {Repeating-snt}{Section'tie4.11}
-'xrdef {Minibuffer-title}{The Minibuffer}
-'xrdef {Minibuffer-pg}{51}
-'xrdef {Minibuffer-snt}{Chapter'tie5}
-'xrdef {Minibuffer File-title}{Minibuffers for File Names}
-'xrdef {Minibuffer File-pg}{51}
-'xrdef {Minibuffer File-snt}{Section'tie5.1}
-'xrdef {Minibuffer Edit-title}{Editing in the Minibuffer}
-'xrdef {Minibuffer Edit-pg}{52}
-'xrdef {Minibuffer Edit-snt}{Section'tie5.2}
-'xrdef {Completion-title}{Completion}
-'xrdef {Completion-pg}{53}
-'xrdef {Completion-snt}{Section'tie5.3}
-'xrdef {Completion Example-title}{Completion Example}
-'xrdef {Completion Example-pg}{54}
-'xrdef {Completion Example-snt}{Section'tie5.3.1}
-'xrdef {Completion Commands-title}{Completion Commands}
-'xrdef {Completion Commands-pg}{54}
-'xrdef {Completion Commands-snt}{Section'tie5.3.2}
-'xrdef {Strict Completion-title}{Strict Completion}
-'xrdef {Strict Completion-pg}{55}
-'xrdef {Strict Completion-snt}{Section'tie5.3.3}
-'xrdef {Completion Options-title}{Completion Options}
-'xrdef {Completion Options-pg}{56}
-'xrdef {Completion Options-snt}{Section'tie5.3.4}
-'xrdef {Minibuffer History-title}{Minibuffer History}
-'xrdef {Minibuffer History-pg}{56}
-'xrdef {Minibuffer History-snt}{Section'tie5.4}
-'xrdef {Repetition-title}{Repeating Minibuffer Commands}
-'xrdef {Repetition-pg}{58}
-'xrdef {Repetition-snt}{Section'tie5.5}
-'xrdef {M-x-title}{Running Commands by Name}
-'xrdef {M-x-pg}{59}
-'xrdef {M-x-snt}{Chapter'tie6}
-'xrdef {Help-title}{Help}
-'xrdef {Help-pg}{61}
-'xrdef {Help-snt}{Chapter'tie7}
-'xrdef {Key Help-title}{Documentation for a Key}
-'xrdef {Key Help-pg}{64}
-'xrdef {Key Help-snt}{Section'tie7.1}
-'xrdef {Name Help-title}{Help by Command or Variable Name}
-'xrdef {Name Help-pg}{64}
-'xrdef {Name Help-snt}{Section'tie7.2}
-'xrdef {Apropos-title}{Apropos}
-'xrdef {Apropos-pg}{65}
-'xrdef {Apropos-snt}{Section'tie7.3}
-'xrdef {Library Keywords-title}{Keyword Search for Lisp Libraries}
-'xrdef {Library Keywords-pg}{66}
-'xrdef {Library Keywords-snt}{Section'tie7.4}
-'xrdef {Language Help-title}{Help for International Language Support}
-'xrdef {Language Help-pg}{67}
-'xrdef {Language Help-snt}{Section'tie7.5}
-'xrdef {Help Mode-title}{Help Mode Commands}
-'xrdef {Help Mode-pg}{67}
-'xrdef {Help Mode-snt}{Section'tie7.6}
-'xrdef {Misc Help-title}{Other Help Commands}
-'xrdef {Misc Help-pg}{68}
-'xrdef {Misc Help-snt}{Section'tie7.7}
-'xrdef {Help Echo-title}{Help on Active Text and Tooltips}
-'xrdef {Help Echo-pg}{69}
-'xrdef {Help Echo-snt}{Section'tie7.8}
-'xrdef {Mark-title}{The Mark and the Region}
-'xrdef {Mark-pg}{71}
-'xrdef {Mark-snt}{Chapter'tie8}
-'xrdef {Setting Mark-title}{Setting the Mark}
-'xrdef {Setting Mark-pg}{71}
-'xrdef {Setting Mark-snt}{Section'tie8.1}
-'xrdef {Transient Mark-title}{Transient Mark Mode}
-'xrdef {Transient Mark-pg}{72}
-'xrdef {Transient Mark-snt}{Section'tie8.2}
-'xrdef {Using Region-title}{Operating on the Region}
-'xrdef {Using Region-pg}{74}
-'xrdef {Using Region-snt}{Section'tie8.3}
-'xrdef {Marking Objects-title}{Commands to Mark Textual Objects}
-'xrdef {Marking Objects-pg}{74}
-'xrdef {Marking Objects-snt}{Section'tie8.4}
-'xrdef {Mark Ring-title}{The Mark Ring}
-'xrdef {Mark Ring-pg}{75}
-'xrdef {Mark Ring-snt}{Section'tie8.5}
-'xrdef {Global Mark Ring-title}{The Global Mark Ring}
-'xrdef {Global Mark Ring-pg}{76}
-'xrdef {Global Mark Ring-snt}{Section'tie8.6}
-'xrdef {Killing-title}{Deletion and Killing}
-'xrdef {Killing-pg}{77}
-'xrdef {Killing-snt}{Section'tie9.1}
-'xrdef {Deletion-title}{Deletion}
-'xrdef {Deletion-pg}{78}
-'xrdef {Deletion-snt}{Section'tie9.1.1}
-'xrdef {Killing by Lines-title}{Killing by Lines}
-'xrdef {Killing by Lines-pg}{79}
-'xrdef {Killing by Lines-snt}{Section'tie9.1.2}
-'xrdef {Other Kill Commands-title}{Other Kill Commands}
-'xrdef {Other Kill Commands-pg}{80}
-'xrdef {Other Kill Commands-snt}{Section'tie9.1.3}
-'xrdef {Yanking-title}{Yanking}
-'xrdef {Yanking-pg}{80}
-'xrdef {Yanking-snt}{Section'tie9.2}
-'xrdef {Kill Ring-title}{The Kill Ring}
-'xrdef {Kill Ring-pg}{81}
-'xrdef {Kill Ring-snt}{Section'tie9.2.1}
-'xrdef {Appending Kills-title}{Appending Kills}
-'xrdef {Appending Kills-pg}{81}
-'xrdef {Appending Kills-snt}{Section'tie9.2.2}
-'xrdef {Earlier Kills-title}{Yanking Earlier Kills}
-'xrdef {Earlier Kills-pg}{82}
-'xrdef {Earlier Kills-snt}{Section'tie9.2.3}
-'xrdef {Accumulating Text-title}{Accumulating Text}
-'xrdef {Accumulating Text-pg}{83}
-'xrdef {Accumulating Text-snt}{Section'tie9.3}
-'xrdef {Rectangles-title}{Rectangles}
-'xrdef {Rectangles-pg}{84}
-'xrdef {Rectangles-snt}{Section'tie9.4}
-'xrdef {Registers-title}{Registers}
-'xrdef {Registers-pg}{87}
-'xrdef {Registers-snt}{Chapter'tie10}
-'xrdef {RegPos-title}{Saving Positions in Registers}
-'xrdef {RegPos-pg}{87}
-'xrdef {RegPos-snt}{Section'tie10.1}
-'xrdef {RegText-title}{Saving Text in Registers}
-'xrdef {RegText-pg}{87}
-'xrdef {RegText-snt}{Section'tie10.2}
-'xrdef {RegRect-title}{Saving Rectangles in Registers}
-'xrdef {RegRect-pg}{88}
-'xrdef {RegRect-snt}{Section'tie10.3}
-'xrdef {RegConfig-title}{Saving Window Configurations in Registers}
-'xrdef {RegConfig-pg}{88}
-'xrdef {RegConfig-snt}{Section'tie10.4}
-'xrdef {RegNumbers-title}{Keeping Numbers in Registers}
-'xrdef {RegNumbers-pg}{88}
-'xrdef {RegNumbers-snt}{Section'tie10.5}
-'xrdef {RegFiles-title}{Keeping File Names in Registers}
-'xrdef {RegFiles-pg}{89}
-'xrdef {RegFiles-snt}{Section'tie10.6}
-'xrdef {Bookmarks-title}{Bookmarks}
-'xrdef {Bookmarks-pg}{89}
-'xrdef {Bookmarks-snt}{Section'tie10.7}
-'xrdef {Display-title}{Controlling the Display}
-'xrdef {Display-pg}{91}
-'xrdef {Display-snt}{Chapter'tie11}
-'xrdef {Faces-title}{Using Multiple Typefaces}
-'xrdef {Faces-pg}{91}
-'xrdef {Faces-snt}{Section'tie11.1}
-'xrdef {Font Lock-title}{Font Lock mode}
-'xrdef {Font Lock-pg}{94}
-'xrdef {Font Lock-snt}{Section'tie11.2}
-'xrdef {Highlight Changes-title}{Highlight Changes Mode}
-'xrdef {Highlight Changes-pg}{95}
-'xrdef {Highlight Changes-snt}{Section'tie11.3}
-'xrdef {Highlight Interactively-title}{Interactive Highlighting by Matching}
-'xrdef {Highlight Interactively-pg}{95}
-'xrdef {Highlight Interactively-snt}{Section'tie11.4}
-'xrdef {Trailing Whitespace-title}{Trailing Whitespace}
-'xrdef {Trailing Whitespace-pg}{96}
-'xrdef {Trailing Whitespace-snt}{Section'tie11.5}
-'xrdef {Scrolling-title}{Scrolling}
-'xrdef {Scrolling-pg}{97}
-'xrdef {Scrolling-snt}{Section'tie11.6}
-'xrdef {Horizontal Scrolling-title}{Horizontal Scrolling}
-'xrdef {Horizontal Scrolling-pg}{99}
-'xrdef {Horizontal Scrolling-snt}{Section'tie11.7}
-'xrdef {Follow Mode-title}{Follow Mode}
-'xrdef {Follow Mode-pg}{100}
-'xrdef {Follow Mode-snt}{Section'tie11.8}
-'xrdef {Selective Display-title}{Selective Display}
-'xrdef {Selective Display-pg}{100}
-'xrdef {Selective Display-snt}{Section'tie11.9}
-'xrdef {Optional Mode Line-title}{Optional Mode Line Features}
-'xrdef {Optional Mode Line-pg}{101}
-'xrdef {Optional Mode Line-snt}{Section'tie11.10}
-'xrdef {Text Display-title}{How Text Is Displayed}
-'xrdef {Text Display-pg}{102}
-'xrdef {Text Display-snt}{Section'tie11.11}
-'xrdef {Display Custom-title}{Customization of Display}
-'xrdef {Display Custom-pg}{102}
-'xrdef {Display Custom-snt}{Section'tie11.12}
-'xrdef {Cursor Display-title}{Displaying the Cursor}
-'xrdef {Cursor Display-pg}{104}
-'xrdef {Cursor Display-snt}{Section'tie11.13}
-'xrdef {Search-title}{Searching and Replacement}
-'xrdef {Search-pg}{105}
-'xrdef {Search-snt}{Chapter'tie12}
-'xrdef {Incremental Search-title}{Incremental Search}
-'xrdef {Incremental Search-pg}{105}
-'xrdef {Incremental Search-snt}{Section'tie12.1}
-'xrdef {Nonincremental Search-title}{Nonincremental Search}
-'xrdef {Nonincremental Search-pg}{108}
-'xrdef {Nonincremental Search-snt}{Section'tie12.2}
-'xrdef {Word Search-title}{Word Search}
-'xrdef {Word Search-pg}{109}
-'xrdef {Word Search-snt}{Section'tie12.3}
-'xrdef {Regexp Search-title}{Regular Expression Search}
-'xrdef {Regexp Search-pg}{109}
-'xrdef {Regexp Search-snt}{Section'tie12.4}
-'xrdef {Regexps-title}{Syntax of Regular Expressions}
-'xrdef {Regexps-pg}{110}
-'xrdef {Regexps-snt}{Section'tie12.5}
-'xrdef {Search Case-title}{Searching and Case}
-'xrdef {Search Case-pg}{116}
-'xrdef {Search Case-snt}{Section'tie12.6}
-'xrdef {Replace-title}{Replacement Commands}
-'xrdef {Replace-pg}{116}
-'xrdef {Replace-snt}{Section'tie12.7}
-'xrdef {Unconditional Replace-title}{Unconditional Replacement}
-'xrdef {Unconditional Replace-pg}{117}
-'xrdef {Unconditional Replace-snt}{Section'tie12.7.1}
-'xrdef {Regexp Replace-title}{Regexp Replacement}
-'xrdef {Regexp Replace-pg}{117}
-'xrdef {Regexp Replace-snt}{Section'tie12.7.2}
-'xrdef {Replacement and Case-title}{Replace Commands and Case}
-'xrdef {Replacement and Case-pg}{117}
-'xrdef {Replacement and Case-snt}{Section'tie12.7.3}
-'xrdef {Query Replace-title}{Query Replace}
-'xrdef {Query Replace-pg}{118}
-'xrdef {Query Replace-snt}{Section'tie12.7.4}
-'xrdef {Other Repeating Search-title}{Other Search-and-Loop Commands}
-'xrdef {Other Repeating Search-pg}{120}
-'xrdef {Other Repeating Search-snt}{Section'tie12.8}
-'xrdef {Fixit-title}{Commands for Fixing Typos}
-'xrdef {Fixit-pg}{121}
-'xrdef {Fixit-snt}{Chapter'tie13}
-'xrdef {Kill Errors-title}{Killing Your Mistakes}
-'xrdef {Kill Errors-pg}{121}
-'xrdef {Kill Errors-snt}{Section'tie13.1}
-'xrdef {Transpose-title}{Transposing Text}
-'xrdef {Transpose-pg}{121}
-'xrdef {Transpose-snt}{Section'tie13.2}
-'xrdef {Fixing Case-title}{Case Conversion}
-'xrdef {Fixing Case-pg}{122}
-'xrdef {Fixing Case-snt}{Section'tie13.3}
-'xrdef {Spelling-title}{Checking and Correcting Spelling}
-'xrdef {Spelling-pg}{123}
-'xrdef {Spelling-snt}{Section'tie13.4}
-'xrdef {Files-title}{File Handling}
-'xrdef {Files-pg}{127}
-'xrdef {Files-snt}{Chapter'tie14}
-'xrdef {File Names-title}{File Names}
-'xrdef {File Names-pg}{127}
-'xrdef {File Names-snt}{Section'tie14.1}
-'xrdef {Visiting-title}{Visiting Files}
-'xrdef {Visiting-pg}{128}
-'xrdef {Visiting-snt}{Section'tie14.2}
-'xrdef {Saving-title}{Saving Files}
-'xrdef {Saving-pg}{132}
-'xrdef {Saving-snt}{Section'tie14.3}
-'xrdef {Backup-title}{Backup Files}
-'xrdef {Backup-pg}{134}
-'xrdef {Backup-snt}{Section'tie14.3.1}
-'xrdef {Backup Names-title}{Single or Numbered Backups}
-'xrdef {Backup Names-pg}{134}
-'xrdef {Backup Names-snt}{Section'tie14.3.1.1}
-'xrdef {Backup Deletion-title}{Automatic Deletion of Backups}
-'xrdef {Backup Deletion-pg}{135}
-'xrdef {Backup Deletion-snt}{Section'tie14.3.1.2}
-'xrdef {Backup Copying-title}{Copying vs.\spacefactor =1000  Renaming}
-'xrdef {Backup Copying-pg}{136}
-'xrdef {Backup Copying-snt}{Section'tie14.3.1.3}
-'xrdef {Interlocking-title}{Protection against Simultaneous Editing}
-'xrdef {Interlocking-pg}{137}
-'xrdef {Interlocking-snt}{Section'tie14.3.2}
-'xrdef {File Shadowing-title}{Shadowing Files}
-'xrdef {File Shadowing-pg}{138}
-'xrdef {File Shadowing-snt}{Section'tie14.3.3}
-'xrdef {Time Stamps-title}{Updating Time Stamps Automatically}
-'xrdef {Time Stamps-pg}{139}
-'xrdef {Time Stamps-snt}{Section'tie14.3.4}
-'xrdef {Reverting-title}{Reverting a Buffer}
-'xrdef {Reverting-pg}{139}
-'xrdef {Reverting-snt}{Section'tie14.4}
-'xrdef {Auto Save-title}{Auto-Saving: Protection Against Disasters}
-'xrdef {Auto Save-pg}{140}
-'xrdef {Auto Save-snt}{Section'tie14.5}
-'xrdef {Auto Save Files-title}{Auto-Save Files}
-'xrdef {Auto Save Files-pg}{140}
-'xrdef {Auto Save Files-snt}{Section'tie14.5.1}
-'xrdef {Auto Save Control-title}{Controlling Auto-Saving}
-'xrdef {Auto Save Control-pg}{141}
-'xrdef {Auto Save Control-snt}{Section'tie14.5.2}
-'xrdef {Recover-title}{Recovering Data from Auto-Saves}
-'xrdef {Recover-pg}{142}
-'xrdef {Recover-snt}{Section'tie14.5.3}
-'xrdef {File Aliases-title}{File Name Aliases}
-'xrdef {File Aliases-pg}{143}
-'xrdef {File Aliases-snt}{Section'tie14.6}
-'xrdef {Version Control-title}{Version Control}
-'xrdef {Version Control-pg}{143}
-'xrdef {Version Control-snt}{Section'tie14.7}
-'xrdef {Introduction to VC-title}{Introduction to Version Control}
-'xrdef {Introduction to VC-pg}{144}
-'xrdef {Introduction to VC-snt}{Section'tie14.7.1}
-'xrdef {Version Systems-title}{Supported Version Control Systems}
-'xrdef {Version Systems-pg}{144}
-'xrdef {Version Systems-snt}{Section'tie14.7.1.1}
-'xrdef {VC Concepts-title}{Concepts of Version Control}
-'xrdef {VC Concepts-pg}{144}
-'xrdef {VC Concepts-snt}{Section'tie14.7.1.2}
-'xrdef {VC Mode Line-title}{Version Control and the Mode Line}
-'xrdef {VC Mode Line-pg}{145}
-'xrdef {VC Mode Line-snt}{Section'tie14.7.2}
-'xrdef {Basic VC Editing-title}{Basic Editing under Version Control}
-'xrdef {Basic VC Editing-pg}{145}
-'xrdef {Basic VC Editing-snt}{Section'tie14.7.3}
-'xrdef {VC with Locking-title}{Basic Version Control with Locking}
-'xrdef {VC with Locking-pg}{146}
-'xrdef {VC with Locking-snt}{Section'tie14.7.3.1}
-'xrdef {Without Locking-title}{Basic Version Control without Locking}
-'xrdef {Without Locking-pg}{146}
-'xrdef {Without Locking-snt}{Section'tie14.7.3.2}
-'xrdef {Advanced C-x C-q-title}{Advanced Control in \kbd {C-x C-q}}
-'xrdef {Advanced C-x C-q-pg}{147}
-'xrdef {Advanced C-x C-q-snt}{Section'tie14.7.3.3}
-'xrdef {Log Buffer-title}{Features of the Log Entry Buffer}
-'xrdef {Log Buffer-pg}{147}
-'xrdef {Log Buffer-snt}{Section'tie14.7.3.4}
-'xrdef {Old Versions-title}{Examining And Comparing Old Versions}
-'xrdef {Old Versions-pg}{148}
-'xrdef {Old Versions-snt}{Section'tie14.7.4}
-'xrdef {Secondary VC Commands-title}{The Secondary Commands of VC}
-'xrdef {Secondary VC Commands-pg}{149}
-'xrdef {Secondary VC Commands-snt}{Section'tie14.7.5}
-'xrdef {Registering-title}{Registering a File for Version Control}
-'xrdef {Registering-pg}{149}
-'xrdef {Registering-snt}{Section'tie14.7.5.1}
-'xrdef {VC Status-title}{VC Status Commands}
-'xrdef {VC Status-pg}{150}
-'xrdef {VC Status-snt}{Section'tie14.7.5.2}
-'xrdef {VC Undo-title}{Undoing Version Control Actions}
-'xrdef {VC Undo-pg}{150}
-'xrdef {VC Undo-snt}{Section'tie14.7.5.3}
-'xrdef {VC Dired Mode-title}{Dired under VC}
-'xrdef {VC Dired Mode-pg}{151}
-'xrdef {VC Dired Mode-snt}{Section'tie14.7.5.4}
-'xrdef {VC Dired Commands-title}{VC Dired Commands}
-'xrdef {VC Dired Commands-pg}{152}
-'xrdef {VC Dired Commands-snt}{Section'tie14.7.5.5}
-'xrdef {Branches-title}{Multiple Branches of a File}
-'xrdef {Branches-pg}{152}
-'xrdef {Branches-snt}{Section'tie14.7.6}
-'xrdef {Switching Branches-title}{Switching between Branches}
-'xrdef {Switching Branches-pg}{153}
-'xrdef {Switching Branches-snt}{Section'tie14.7.6.1}
-'xrdef {Creating Branches-title}{Creating New Branches}
-'xrdef {Creating Branches-pg}{153}
-'xrdef {Creating Branches-snt}{Section'tie14.7.6.2}
-'xrdef {Merging-title}{Merging Branches}
-'xrdef {Merging-pg}{154}
-'xrdef {Merging-snt}{Section'tie14.7.6.3}
-'xrdef {Multi-User Branching-title}{Multi-User Branching}
-'xrdef {Multi-User Branching-pg}{155}
-'xrdef {Multi-User Branching-snt}{Section'tie14.7.6.4}
-'xrdef {Remote Repositories-title}{Remote Repositories}
-'xrdef {Remote Repositories-pg}{155}
-'xrdef {Remote Repositories-snt}{Section'tie14.7.7}
-'xrdef {Version Backups-title}{Version Backups}
-'xrdef {Version Backups-pg}{156}
-'xrdef {Version Backups-snt}{Section'tie14.7.7.1}
-'xrdef {Local Version Control-title}{Local Version Control}
-'xrdef {Local Version Control-pg}{157}
-'xrdef {Local Version Control-snt}{Section'tie14.7.7.2}
-'xrdef {Snapshots-title}{Snapshots}
-'xrdef {Snapshots-pg}{158}
-'xrdef {Snapshots-snt}{Section'tie14.7.8}
-'xrdef {Making Snapshots-title}{Making and Using Snapshots}
-'xrdef {Making Snapshots-pg}{158}
-'xrdef {Making Snapshots-snt}{Section'tie14.7.8.1}
-'xrdef {Snapshot Caveats-title}{Snapshot Caveats}
-'xrdef {Snapshot Caveats-pg}{159}
-'xrdef {Snapshot Caveats-snt}{Section'tie14.7.8.2}
-'xrdef {Miscellaneous VC-title}{Miscellaneous Commands and Features of VC}
-'xrdef {Miscellaneous VC-pg}{160}
-'xrdef {Miscellaneous VC-snt}{Section'tie14.7.9}
-'xrdef {Change Logs and VC-title}{Change Logs and VC}
-'xrdef {Change Logs and VC-pg}{160}
-'xrdef {Change Logs and VC-snt}{Section'tie14.7.9.1}
-'xrdef {Renaming and VC-title}{Renaming VC Work Files and Master Files}
-'xrdef {Renaming and VC-pg}{161}
-'xrdef {Renaming and VC-snt}{Section'tie14.7.9.2}
-'xrdef {Version Headers-title}{Inserting Version Control Headers}
-'xrdef {Version Headers-pg}{162}
-'xrdef {Version Headers-snt}{Section'tie14.7.9.3}
-'xrdef {Customizing VC-title}{Customizing VC}
-'xrdef {Customizing VC-pg}{163}
-'xrdef {Customizing VC-snt}{Section'tie14.7.10}
-'xrdef {General VC Options-title}{General Options}
-'xrdef {General VC Options-pg}{163}
-'xrdef {General VC Options-snt}{Section'tie14.7.10.1}
-'xrdef {RCS and SCCS-title}{Options for RCS and SCCS}
-'xrdef {RCS and SCCS-pg}{164}
-'xrdef {RCS and SCCS-snt}{Section'tie14.7.10.2}
-'xrdef {CVS Options-title}{Options specific for CVS}
-'xrdef {CVS Options-pg}{165}
-'xrdef {CVS Options-snt}{Section'tie14.7.10.3}
-'xrdef {Directories-title}{File Directories}
-'xrdef {Directories-pg}{165}
-'xrdef {Directories-snt}{Section'tie14.8}
-'xrdef {Comparing Files-title}{Comparing Files}
-'xrdef {Comparing Files-pg}{166}
-'xrdef {Comparing Files-snt}{Section'tie14.9}
-'xrdef {Misc File Ops-title}{Miscellaneous File Operations}
-'xrdef {Misc File Ops-pg}{167}
-'xrdef {Misc File Ops-snt}{Section'tie14.10}
-'xrdef {Compressed Files-title}{Accessing Compressed Files}
-'xrdef {Compressed Files-pg}{168}
-'xrdef {Compressed Files-snt}{Section'tie14.11}
-'xrdef {File Archives-title}{File Archives}
-'xrdef {File Archives-pg}{169}
-'xrdef {File Archives-snt}{Section'tie14.12}
-'xrdef {Remote Files-title}{Remote Files}
-'xrdef {Remote Files-pg}{170}
-'xrdef {Remote Files-snt}{Section'tie14.13}
-'xrdef {Quoted File Names-title}{Quoted File Names}
-'xrdef {Quoted File Names-pg}{171}
-'xrdef {Quoted File Names-snt}{Section'tie14.14}
-'xrdef {File Name Cache-title}{File Name Cache}
-'xrdef {File Name Cache-pg}{171}
-'xrdef {File Name Cache-snt}{Section'tie14.15}
-'xrdef {File Conveniences-title}{Convenience Features for Finding Files}
-'xrdef {File Conveniences-pg}{172}
-'xrdef {File Conveniences-snt}{Section'tie14.16}
-'xrdef {Buffers-title}{Using Multiple Buffers}
-'xrdef {Buffers-pg}{173}
-'xrdef {Buffers-snt}{Chapter'tie15}
-'xrdef {Select Buffer-title}{Creating and Selecting Buffers}
-'xrdef {Select Buffer-pg}{173}
-'xrdef {Select Buffer-snt}{Section'tie15.1}
-'xrdef {List Buffers-title}{Listing Existing Buffers}
-'xrdef {List Buffers-pg}{174}
-'xrdef {List Buffers-snt}{Section'tie15.2}
-'xrdef {Misc Buffer-title}{Miscellaneous Buffer Operations}
-'xrdef {Misc Buffer-pg}{175}
-'xrdef {Misc Buffer-snt}{Section'tie15.3}
-'xrdef {Kill Buffer-title}{Killing Buffers}
-'xrdef {Kill Buffer-pg}{176}
-'xrdef {Kill Buffer-snt}{Section'tie15.4}
-'xrdef {Several Buffers-title}{Operating on Several Buffers}
-'xrdef {Several Buffers-pg}{177}
-'xrdef {Several Buffers-snt}{Section'tie15.5}
-'xrdef {Indirect Buffers-title}{Indirect Buffers}
-'xrdef {Indirect Buffers-pg}{179}
-'xrdef {Indirect Buffers-snt}{Section'tie15.6}
-'xrdef {Buffer Convenience-title}{Convenience Features and Customization of Buffer Handling}
-'xrdef {Buffer Convenience-pg}{180}
-'xrdef {Buffer Convenience-snt}{Section'tie15.7}
-'xrdef {Uniquify-title}{Making Buffer Names Unique}
-'xrdef {Uniquify-pg}{180}
-'xrdef {Uniquify-snt}{Section'tie15.7.1}
-'xrdef {Iswitchb-title}{Switching Between Buffers using Substrings}
-'xrdef {Iswitchb-pg}{181}
-'xrdef {Iswitchb-snt}{Section'tie15.7.2}
-'xrdef {Buffer Menus-title}{Customizing Buffer Menus}
-'xrdef {Buffer Menus-pg}{181}
-'xrdef {Buffer Menus-snt}{Section'tie15.7.3}
-'xrdef {Windows-title}{Multiple Windows}
-'xrdef {Windows-pg}{183}
-'xrdef {Windows-snt}{Chapter'tie16}
-'xrdef {Basic Window-title}{Concepts of Emacs Windows}
-'xrdef {Basic Window-pg}{183}
-'xrdef {Basic Window-snt}{Section'tie16.1}
-'xrdef {Split Window-title}{Splitting Windows}
-'xrdef {Split Window-pg}{184}
-'xrdef {Split Window-snt}{Section'tie16.2}
-'xrdef {Other Window-title}{Using Other Windows}
-'xrdef {Other Window-pg}{184}
-'xrdef {Other Window-snt}{Section'tie16.3}
-'xrdef {Pop Up Window-title}{Displaying in Another Window}
-'xrdef {Pop Up Window-pg}{185}
-'xrdef {Pop Up Window-snt}{Section'tie16.4}
-'xrdef {Force Same Window-title}{Forcing Display in the Same Window}
-'xrdef {Force Same Window-pg}{186}
-'xrdef {Force Same Window-snt}{Section'tie16.5}
-'xrdef {Change Window-title}{Deleting and Rearranging Windows}
-'xrdef {Change Window-pg}{187}
-'xrdef {Change Window-snt}{Section'tie16.6}
-'xrdef {Window Convenience-title}{Window Handling Convenience Features and Customization}
-'xrdef {Window Convenience-pg}{188}
-'xrdef {Window Convenience-snt}{Section'tie16.7}
-'xrdef {Frames-title}{Frames and X Windows}
-'xrdef {Frames-pg}{191}
-'xrdef {Frames-snt}{Chapter'tie17}
-'xrdef {Mouse Commands-title}{Mouse Commands for Editing}
-'xrdef {Mouse Commands-pg}{191}
-'xrdef {Mouse Commands-snt}{Section'tie17.1}
-'xrdef {Secondary Selection-title}{Secondary Selection}
-'xrdef {Secondary Selection-pg}{193}
-'xrdef {Secondary Selection-snt}{Section'tie17.2}
-'xrdef {Clipboard-title}{Using the Clipboard}
-'xrdef {Clipboard-pg}{194}
-'xrdef {Clipboard-snt}{Section'tie17.3}
-'xrdef {Mouse References-title}{Following References with the Mouse}
-'xrdef {Mouse References-pg}{195}
-'xrdef {Mouse References-snt}{Section'tie17.4}
-'xrdef {Menu Mouse Clicks-title}{Mouse Clicks for Menus}
-'xrdef {Menu Mouse Clicks-pg}{195}
-'xrdef {Menu Mouse Clicks-snt}{Section'tie17.5}
-'xrdef {Mode Line Mouse-title}{Mode Line Mouse Commands}
-'xrdef {Mode Line Mouse-pg}{196}
-'xrdef {Mode Line Mouse-snt}{Section'tie17.6}
-'xrdef {Creating Frames-title}{Creating Frames}
-'xrdef {Creating Frames-pg}{196}
-'xrdef {Creating Frames-snt}{Section'tie17.7}
-'xrdef {Frame Commands-title}{Frame Commands}
-'xrdef {Frame Commands-pg}{197}
-'xrdef {Frame Commands-snt}{Section'tie17.8}
-'xrdef {Speedbar-title}{Making and Using a Speedbar Frame}
-'xrdef {Speedbar-pg}{198}
-'xrdef {Speedbar-snt}{Section'tie17.9}
-'xrdef {Multiple Displays-title}{Multiple Displays}
-'xrdef {Multiple Displays-pg}{198}
-'xrdef {Multiple Displays-snt}{Section'tie17.10}
-'xrdef {Special Buffer Frames-title}{Special Buffer Frames}
-'xrdef {Special Buffer Frames-pg}{199}
-'xrdef {Special Buffer Frames-snt}{Section'tie17.11}
-'xrdef {Frame Parameters-title}{Setting Frame Parameters}
-'xrdef {Frame Parameters-pg}{200}
-'xrdef {Frame Parameters-snt}{Section'tie17.12}
-'xrdef {Scroll Bars-title}{Scroll Bars}
-'xrdef {Scroll Bars-pg}{201}
-'xrdef {Scroll Bars-snt}{Section'tie17.13}
-'xrdef {Wheeled Mice-title}{Scrolling With ``Wheeled'' Mice}
-'xrdef {Wheeled Mice-pg}{202}
-'xrdef {Wheeled Mice-snt}{Section'tie17.14}
-'xrdef {Menu Bars-title}{Menu Bars}
-'xrdef {Menu Bars-pg}{202}
-'xrdef {Menu Bars-snt}{Section'tie17.15}
-'xrdef {Tool Bars-title}{Tool Bars}
-'xrdef {Tool Bars-pg}{202}
-'xrdef {Tool Bars-snt}{Section'tie17.16}
-'xrdef {Dialog Boxes-title}{Using Dialog Boxes}
-'xrdef {Dialog Boxes-pg}{203}
-'xrdef {Dialog Boxes-snt}{Section'tie17.17}
-'xrdef {Tooltips-title}{Tooltips (or ``Balloon Help'')}
-'xrdef {Tooltips-pg}{203}
-'xrdef {Tooltips-snt}{Section'tie17.18}
-'xrdef {Mouse Avoidance-title}{Mouse Avoidance}
-'xrdef {Mouse Avoidance-pg}{203}
-'xrdef {Mouse Avoidance-snt}{Section'tie17.19}
-'xrdef {Non-Window Terminals-title}{Non-Window Terminals}
-'xrdef {Non-Window Terminals-pg}{204}
-'xrdef {Non-Window Terminals-snt}{Section'tie17.20}
-'xrdef {XTerm Mouse-title}{Using a Mouse in Terminal Emulators}
-'xrdef {XTerm Mouse-pg}{204}
-'xrdef {XTerm Mouse-snt}{Section'tie17.21}
-'xrdef {International-title}{International Character Set Support}
-'xrdef {International-pg}{205}
-'xrdef {International-snt}{Chapter'tie18}
-'xrdef {International Chars-title}{Introduction to International Character Sets}
-'xrdef {International Chars-pg}{205}
-'xrdef {International Chars-snt}{Section'tie18.1}
-'xrdef {Enabling Multibyte-title}{Enabling Multibyte Characters}
-'xrdef {Enabling Multibyte-pg}{206}
-'xrdef {Enabling Multibyte-snt}{Section'tie18.2}
-'xrdef {Language Environments-title}{Language Environments}
-'xrdef {Language Environments-pg}{207}
-'xrdef {Language Environments-snt}{Section'tie18.3}
-'xrdef {Input Methods-title}{Input Methods}
-'xrdef {Input Methods-pg}{209}
-'xrdef {Input Methods-snt}{Section'tie18.4}
-'xrdef {Select Input Method-title}{Selecting an Input Method}
-'xrdef {Select Input Method-pg}{211}
-'xrdef {Select Input Method-snt}{Section'tie18.5}
-'xrdef {Multibyte Conversion-title}{Unibyte and Multibyte Non-ASCII characters}
-'xrdef {Multibyte Conversion-pg}{212}
-'xrdef {Multibyte Conversion-snt}{Section'tie18.6}
-'xrdef {Coding Systems-title}{Coding Systems}
-'xrdef {Coding Systems-pg}{212}
-'xrdef {Coding Systems-snt}{Section'tie18.7}
-'xrdef {Recognize Coding-title}{Recognizing Coding Systems}
-'xrdef {Recognize Coding-pg}{214}
-'xrdef {Recognize Coding-snt}{Section'tie18.8}
-'xrdef {Specify Coding-title}{Specifying a Coding System}
-'xrdef {Specify Coding-pg}{218}
-'xrdef {Specify Coding-snt}{Section'tie18.9}
-'xrdef {Fontsets-title}{Fontsets}
-'xrdef {Fontsets-pg}{220}
-'xrdef {Fontsets-snt}{Section'tie18.10}
-'xrdef {Defining Fontsets-title}{Defining fontsets}
-'xrdef {Defining Fontsets-pg}{221}
-'xrdef {Defining Fontsets-snt}{Section'tie18.11}
-'xrdef {Undisplayable Characters-title}{Undisplayable Characters}
-'xrdef {Undisplayable Characters-pg}{223}
-'xrdef {Undisplayable Characters-snt}{Section'tie18.12}
-'xrdef {Single-Byte Character Support-title}{Single-byte Character Set Support}
-'xrdef {Single-Byte Character Support-pg}{223}
-'xrdef {Single-Byte Character Support-snt}{Section'tie18.13}
-'xrdef {Major Modes-title}{Major Modes}
-'xrdef {Major Modes-pg}{225}
-'xrdef {Major Modes-snt}{Chapter'tie19}
-'xrdef {Choosing Modes-title}{How Major Modes are Chosen}
-'xrdef {Choosing Modes-pg}{225}
-'xrdef {Choosing Modes-snt}{Section'tie19.1}
-'xrdef {Indentation-title}{Indentation}
-'xrdef {Indentation-pg}{229}
-'xrdef {Indentation-snt}{Chapter'tie20}
-'xrdef {Indentation Commands-title}{Indentation Commands and Techniques}
-'xrdef {Indentation Commands-pg}{230}
-'xrdef {Indentation Commands-snt}{Section'tie20.1}
-'xrdef {Tab Stops-title}{Tab Stops}
-'xrdef {Tab Stops-pg}{231}
-'xrdef {Tab Stops-snt}{Section'tie20.2}
-'xrdef {Just Spaces-title}{Tabs vs. Spaces}
-'xrdef {Just Spaces-pg}{231}
-'xrdef {Just Spaces-snt}{Section'tie20.3}
-'xrdef {Text-title}{Commands for Human Languages}
-'xrdef {Text-pg}{233}
-'xrdef {Text-snt}{Chapter'tie21}
-'xrdef {Words-title}{Words}
-'xrdef {Words-pg}{233}
-'xrdef {Words-snt}{Section'tie21.1}
-'xrdef {Sentences-title}{Sentences}
-'xrdef {Sentences-pg}{234}
-'xrdef {Sentences-snt}{Section'tie21.2}
-'xrdef {Paragraphs-title}{Paragraphs}
-'xrdef {Paragraphs-pg}{236}
-'xrdef {Paragraphs-snt}{Section'tie21.3}
-'xrdef {Pages-title}{Pages}
-'xrdef {Pages-pg}{237}
-'xrdef {Pages-snt}{Section'tie21.4}
-'xrdef {Filling-title}{Filling Text}
-'xrdef {Filling-pg}{238}
-'xrdef {Filling-snt}{Section'tie21.5}
-'xrdef {Auto Fill-title}{Auto Fill Mode}
-'xrdef {Auto Fill-pg}{238}
-'xrdef {Auto Fill-snt}{Section'tie21.5.1}
-'xrdef {Refill-title}{Refill Mode}
-'xrdef {Refill-pg}{239}
-'xrdef {Refill-snt}{Section'tie21.5.2}
-'xrdef {Fill Commands-title}{Explicit Fill Commands}
-'xrdef {Fill Commands-pg}{239}
-'xrdef {Fill Commands-snt}{Section'tie21.5.3}
-'xrdef {Fill Prefix-title}{The Fill Prefix}
-'xrdef {Fill Prefix-pg}{240}
-'xrdef {Fill Prefix-snt}{Section'tie21.5.4}
-'xrdef {Adaptive Fill-title}{Adaptive Filling}
-'xrdef {Adaptive Fill-pg}{242}
-'xrdef {Adaptive Fill-snt}{Section'tie21.5.5}
-'xrdef {Case-title}{Case Conversion Commands}
-'xrdef {Case-pg}{243}
-'xrdef {Case-snt}{Section'tie21.6}
-'xrdef {Text Mode-title}{Text Mode}
-'xrdef {Text Mode-pg}{243}
-'xrdef {Text Mode-snt}{Section'tie21.7}
-'xrdef {Outline Mode-title}{Outline Mode}
-'xrdef {Outline Mode-pg}{244}
-'xrdef {Outline Mode-snt}{Section'tie21.8}
-'xrdef {Outline Format-title}{Format of Outlines}
-'xrdef {Outline Format-pg}{245}
-'xrdef {Outline Format-snt}{Section'tie21.8.1}
-'xrdef {Outline Motion-title}{Outline Motion Commands}
-'xrdef {Outline Motion-pg}{246}
-'xrdef {Outline Motion-snt}{Section'tie21.8.2}
-'xrdef {Outline Visibility-title}{Outline Visibility Commands}
-'xrdef {Outline Visibility-pg}{247}
-'xrdef {Outline Visibility-snt}{Section'tie21.8.3}
-'xrdef {Outline Views-title}{Viewing One Outline in Multiple Views}
-'xrdef {Outline Views-pg}{248}
-'xrdef {Outline Views-snt}{Section'tie21.8.4}
-'xrdef {Foldout-title}{Folding Editing}
-'xrdef {Foldout-pg}{249}
-'xrdef {Foldout-snt}{Section'tie21.8.5}
-'xrdef {TeX Mode-title}{\TeX{} Mode}
-'xrdef {TeX Mode-pg}{250}
-'xrdef {TeX Mode-snt}{Section'tie21.9}
-'xrdef {TeX Editing-title}{\TeX{} Editing Commands}
-'xrdef {TeX Editing-pg}{251}
-'xrdef {TeX Editing-snt}{Section'tie21.9.1}
-'xrdef {LaTeX Editing-title}{La\TeX{} Editing Commands}
-'xrdef {LaTeX Editing-pg}{252}
-'xrdef {LaTeX Editing-snt}{Section'tie21.9.2}
-'xrdef {TeX Print-title}{\TeX{} Printing Commands}
-'xrdef {TeX Print-pg}{252}
-'xrdef {TeX Print-snt}{Section'tie21.9.3}
-'xrdef {TeX Misc-title}{\TeX{} Mode Miscellany}
-'xrdef {TeX Misc-pg}{255}
-'xrdef {TeX Misc-snt}{Section'tie21.9.4}
-'xrdef {Nroff Mode-title}{Nroff Mode}
-'xrdef {Nroff Mode-pg}{255}
-'xrdef {Nroff Mode-snt}{Section'tie21.10}
-'xrdef {Formatted Text-title}{Editing Formatted Text}
-'xrdef {Formatted Text-pg}{256}
-'xrdef {Formatted Text-snt}{Section'tie21.11}
-'xrdef {Requesting Formatted Text-title}{Requesting to Edit Formatted Text}
-'xrdef {Requesting Formatted Text-pg}{256}
-'xrdef {Requesting Formatted Text-snt}{Section'tie21.11.1}
-'xrdef {Hard and Soft Newlines-title}{Hard and Soft Newlines}
-'xrdef {Hard and Soft Newlines-pg}{257}
-'xrdef {Hard and Soft Newlines-snt}{Section'tie21.11.2}
-'xrdef {Editing Format Info-title}{Editing Format Information}
-'xrdef {Editing Format Info-pg}{257}
-'xrdef {Editing Format Info-snt}{Section'tie21.11.3}
-'xrdef {Format Faces-title}{Faces in Formatted Text}
-'xrdef {Format Faces-pg}{258}
-'xrdef {Format Faces-snt}{Section'tie21.11.4}
-'xrdef {Format Colors-title}{Colors in Formatted Text}
-'xrdef {Format Colors-pg}{259}
-'xrdef {Format Colors-snt}{Section'tie21.11.5}
-'xrdef {Format Indentation-title}{Indentation in Formatted Text}
-'xrdef {Format Indentation-pg}{259}
-'xrdef {Format Indentation-snt}{Section'tie21.11.6}
-'xrdef {Format Justification-title}{Justification in Formatted Text}
-'xrdef {Format Justification-pg}{260}
-'xrdef {Format Justification-snt}{Section'tie21.11.7}
-'xrdef {Format Properties-title}{Setting Other Text Properties}
-'xrdef {Format Properties-pg}{261}
-'xrdef {Format Properties-snt}{Section'tie21.11.8}
-'xrdef {Forcing Enriched Mode-title}{Forcing Enriched Mode}
-'xrdef {Forcing Enriched Mode-pg}{262}
-'xrdef {Forcing Enriched Mode-snt}{Section'tie21.11.9}
-'xrdef {Programs-title}{Editing Programs}
-'xrdef {Programs-pg}{263}
-'xrdef {Programs-snt}{Chapter'tie22}
-'xrdef {Program Modes-title}{Major Modes for Programming Languages}
-'xrdef {Program Modes-pg}{263}
-'xrdef {Program Modes-snt}{Section'tie22.1}
-'xrdef {Defuns-title}{Top-Level Definitions, or Defuns}
-'xrdef {Defuns-pg}{264}
-'xrdef {Defuns-snt}{Section'tie22.2}
-'xrdef {Left Margin Paren-title}{Left Margin Convention}
-'xrdef {Left Margin Paren-pg}{264}
-'xrdef {Left Margin Paren-snt}{Section'tie22.2.1}
-'xrdef {Moving by Defuns-title}{Moving by Defuns}
-'xrdef {Moving by Defuns-pg}{265}
-'xrdef {Moving by Defuns-snt}{Section'tie22.2.2}
-'xrdef {Imenu-title}{Imenu}
-'xrdef {Imenu-pg}{266}
-'xrdef {Imenu-snt}{Section'tie22.2.3}
-'xrdef {Which Function-title}{Which Function Mode}
-'xrdef {Which Function-pg}{266}
-'xrdef {Which Function-snt}{Section'tie22.2.4}
-'xrdef {Program Indent-title}{Indentation for Programs}
-'xrdef {Program Indent-pg}{266}
-'xrdef {Program Indent-snt}{Section'tie22.3}
-'xrdef {Basic Indent-title}{Basic Program Indentation Commands}
-'xrdef {Basic Indent-pg}{267}
-'xrdef {Basic Indent-snt}{Section'tie22.3.1}
-'xrdef {Multi-line Indent-title}{Indenting Several Lines}
-'xrdef {Multi-line Indent-pg}{268}
-'xrdef {Multi-line Indent-snt}{Section'tie22.3.2}
-'xrdef {Lisp Indent-title}{Customizing Lisp Indentation}
-'xrdef {Lisp Indent-pg}{268}
-'xrdef {Lisp Indent-snt}{Section'tie22.3.3}
-'xrdef {C Indent-title}{Commands for C Indentation}
-'xrdef {C Indent-pg}{270}
-'xrdef {C Indent-snt}{Section'tie22.3.4}
-'xrdef {Custom C Indent-title}{Customizing C Indentation}
-'xrdef {Custom C Indent-pg}{270}
-'xrdef {Custom C Indent-snt}{Section'tie22.3.5}
-'xrdef {Parentheses-title}{Commands for Editing with Parentheses}
-'xrdef {Parentheses-pg}{271}
-'xrdef {Parentheses-snt}{Section'tie22.4}
-'xrdef {Expressions-title}{Expressions with Balanced Parentheses}
-'xrdef {Expressions-pg}{272}
-'xrdef {Expressions-snt}{Section'tie22.4.1}
-'xrdef {Moving by Parens-title}{Moving in the Parenthesis Structure}
-'xrdef {Moving by Parens-pg}{273}
-'xrdef {Moving by Parens-snt}{Section'tie22.4.2}
-'xrdef {Matching-title}{Automatic Display Of Matching Parentheses}
-'xrdef {Matching-pg}{274}
-'xrdef {Matching-snt}{Section'tie22.4.3}
-'xrdef {Comments-title}{Manipulating Comments}
-'xrdef {Comments-pg}{274}
-'xrdef {Comments-snt}{Section'tie22.5}
-'xrdef {Comment Commands-title}{Comment Commands}
-'xrdef {Comment Commands-pg}{275}
-'xrdef {Comment Commands-snt}{Section'tie22.5.1}
-'xrdef {Multi-Line Comments-title}{Multiple Lines of Comments}
-'xrdef {Multi-Line Comments-pg}{276}
-'xrdef {Multi-Line Comments-snt}{Section'tie22.5.2}
-'xrdef {Options for Comments-title}{Options Controlling Comments}
-'xrdef {Options for Comments-pg}{277}
-'xrdef {Options for Comments-snt}{Section'tie22.5.3}
-'xrdef {Documentation-title}{Documentation Lookup}
-'xrdef {Documentation-pg}{278}
-'xrdef {Documentation-snt}{Section'tie22.6}
-'xrdef {Info Lookup-title}{Info Documentation Lookup}
-'xrdef {Info Lookup-pg}{278}
-'xrdef {Info Lookup-snt}{Section'tie22.6.1}
-'xrdef {Man Page-title}{Man Page Lookup}
-'xrdef {Man Page-pg}{278}
-'xrdef {Man Page-snt}{Section'tie22.6.2}
-'xrdef {Lisp Doc-title}{Emacs Lisp Documentation Lookup}
-'xrdef {Lisp Doc-pg}{280}
-'xrdef {Lisp Doc-snt}{Section'tie22.6.3}
-'xrdef {Hideshow-title}{Hideshow minor mode}
-'xrdef {Hideshow-pg}{280}
-'xrdef {Hideshow-snt}{Section'tie22.7}
-'xrdef {Symbol Completion-title}{Completion for Symbol Names}
-'xrdef {Symbol Completion-pg}{281}
-'xrdef {Symbol Completion-snt}{Section'tie22.8}
-'xrdef {Glasses-title}{Glasses minor mode}
-'xrdef {Glasses-pg}{282}
-'xrdef {Glasses-snt}{Section'tie22.9}
-'xrdef {Misc for Programs-title}{Other Features Useful for Editing Programs}
-'xrdef {Misc for Programs-pg}{282}
-'xrdef {Misc for Programs-snt}{Section'tie22.10}
-'xrdef {C Modes-title}{C and Related Modes}
-'xrdef {C Modes-pg}{283}
-'xrdef {C Modes-snt}{Section'tie22.11}
-'xrdef {Motion in C-title}{C Mode Motion Commands}
-'xrdef {Motion in C-pg}{283}
-'xrdef {Motion in C-snt}{Section'tie22.11.1}
-'xrdef {Electric C-title}{Electric C Characters}
-'xrdef {Electric C-pg}{284}
-'xrdef {Electric C-snt}{Section'tie22.11.2}
-'xrdef {Hungry Delete-title}{Hungry Delete Feature in C}
-'xrdef {Hungry Delete-pg}{286}
-'xrdef {Hungry Delete-snt}{Section'tie22.11.3}
-'xrdef {Other C Commands-title}{Other Commands for C Mode}
-'xrdef {Other C Commands-pg}{286}
-'xrdef {Other C Commands-snt}{Section'tie22.11.4}
-'xrdef {Comments in C-title}{Comments in C Modes}
-'xrdef {Comments in C-pg}{288}
-'xrdef {Comments in C-snt}{Section'tie22.11.5}
-'xrdef {Fortran-title}{Fortran Mode}
-'xrdef {Fortran-pg}{288}
-'xrdef {Fortran-snt}{Section'tie22.12}
-'xrdef {Fortran Motion-title}{Motion Commands}
-'xrdef {Fortran Motion-pg}{289}
-'xrdef {Fortran Motion-snt}{Section'tie22.12.1}
-'xrdef {Fortran Indent-title}{Fortran Indentation}
-'xrdef {Fortran Indent-pg}{289}
-'xrdef {Fortran Indent-snt}{Section'tie22.12.2}
-'xrdef {ForIndent Commands-title}{Fortran Indentation and Filling Commands}
-'xrdef {ForIndent Commands-pg}{289}
-'xrdef {ForIndent Commands-snt}{Section'tie22.12.2.1}
-'xrdef {ForIndent Cont-title}{Continuation Lines}
-'xrdef {ForIndent Cont-pg}{290}
-'xrdef {ForIndent Cont-snt}{Section'tie22.12.2.2}
-'xrdef {ForIndent Num-title}{Line Numbers}
-'xrdef {ForIndent Num-pg}{290}
-'xrdef {ForIndent Num-snt}{Section'tie22.12.2.3}
-'xrdef {ForIndent Conv-title}{Syntactic Conventions}
-'xrdef {ForIndent Conv-pg}{291}
-'xrdef {ForIndent Conv-snt}{Section'tie22.12.2.4}
-'xrdef {ForIndent Vars-title}{Variables for Fortran Indentation}
-'xrdef {ForIndent Vars-pg}{291}
-'xrdef {ForIndent Vars-snt}{Section'tie22.12.2.5}
-'xrdef {Fortran Comments-title}{Fortran Comments}
-'xrdef {Fortran Comments-pg}{292}
-'xrdef {Fortran Comments-snt}{Section'tie22.12.3}
-'xrdef {Fortran Autofill-title}{Fortran Auto Fill Mode}
-'xrdef {Fortran Autofill-pg}{293}
-'xrdef {Fortran Autofill-snt}{Section'tie22.12.4}
-'xrdef {Fortran Columns-title}{Checking Columns in Fortran}
-'xrdef {Fortran Columns-pg}{294}
-'xrdef {Fortran Columns-snt}{Section'tie22.12.5}
-'xrdef {Fortran Abbrev-title}{Fortran Keyword Abbrevs}
-'xrdef {Fortran Abbrev-pg}{295}
-'xrdef {Fortran Abbrev-snt}{Section'tie22.12.6}
-'xrdef {Asm Mode-title}{Asm Mode}
-'xrdef {Asm Mode-pg}{295}
-'xrdef {Asm Mode-snt}{Section'tie22.13}
-'xrdef {Building-title}{Compiling and Testing Programs}
-'xrdef {Building-pg}{297}
-'xrdef {Building-snt}{Chapter'tie23}
-'xrdef {Compilation-title}{Running Compilations under Emacs}
-'xrdef {Compilation-pg}{297}
-'xrdef {Compilation-snt}{Section'tie23.1}
-'xrdef {Grep Searching-title}{Searching with Grep under Emacs}
-'xrdef {Grep Searching-pg}{298}
-'xrdef {Grep Searching-snt}{Section'tie23.2}
-'xrdef {Compilation Mode-title}{Compilation Mode}
-'xrdef {Compilation Mode-pg}{299}
-'xrdef {Compilation Mode-snt}{Section'tie23.3}
-'xrdef {Compilation Shell-title}{Subshells for Compilation}
-'xrdef {Compilation Shell-pg}{300}
-'xrdef {Compilation Shell-snt}{Section'tie23.4}
-'xrdef {Debuggers-title}{Running Debuggers Under Emacs}
-'xrdef {Debuggers-pg}{300}
-'xrdef {Debuggers-snt}{Section'tie23.5}
-'xrdef {Starting GUD-title}{Starting GUD}
-'xrdef {Starting GUD-pg}{300}
-'xrdef {Starting GUD-snt}{Section'tie23.5.1}
-'xrdef {Debugger Operation-title}{Debugger Operation}
-'xrdef {Debugger Operation-pg}{301}
-'xrdef {Debugger Operation-snt}{Section'tie23.5.2}
-'xrdef {Commands of GUD-title}{Commands of GUD}
-'xrdef {Commands of GUD-pg}{302}
-'xrdef {Commands of GUD-snt}{Section'tie23.5.3}
-'xrdef {GUD Customization-title}{GUD Customization}
-'xrdef {GUD Customization-pg}{304}
-'xrdef {GUD Customization-snt}{Section'tie23.5.4}
-'xrdef {GUD Tooltips-title}{GUD Tooltips}
-'xrdef {GUD Tooltips-pg}{304}
-'xrdef {GUD Tooltips-snt}{Section'tie23.5.5}
-'xrdef {Executing Lisp-title}{Executing Lisp Expressions}
-'xrdef {Executing Lisp-pg}{305}
-'xrdef {Executing Lisp-snt}{Section'tie23.6}
-'xrdef {Lisp Libraries-title}{Libraries of Lisp Code for Emacs}
-'xrdef {Lisp Libraries-pg}{305}
-'xrdef {Lisp Libraries-snt}{Section'tie23.7}
-'xrdef {Lisp Eval-title}{Evaluating Emacs-Lisp Expressions}
-'xrdef {Lisp Eval-pg}{306}
-'xrdef {Lisp Eval-snt}{Section'tie23.8}
-'xrdef {Lisp Interaction-title}{Lisp Interaction Buffers}
-'xrdef {Lisp Interaction-pg}{308}
-'xrdef {Lisp Interaction-snt}{Section'tie23.9}
-'xrdef {External Lisp-title}{Running an External Lisp}
-'xrdef {External Lisp-pg}{308}
-'xrdef {External Lisp-snt}{Section'tie23.10}
-'xrdef {Maintaining-title}{Maintaining Programs}
-'xrdef {Maintaining-pg}{311}
-'xrdef {Maintaining-snt}{Chapter'tie24}
-'xrdef {Change Log-title}{Change Logs}
-'xrdef {Change Log-pg}{311}
-'xrdef {Change Log-snt}{Section'tie24.1}
-'xrdef {Authors-title}{\file {AUTHORS} files}
-'xrdef {Authors-pg}{312}
-'xrdef {Authors-snt}{Section'tie24.2}
-'xrdef {Tags-title}{Tags Tables}
-'xrdef {Tags-pg}{313}
-'xrdef {Tags-snt}{Section'tie24.3}
-'xrdef {Tag Syntax-title}{Source File Tag Syntax}
-'xrdef {Tag Syntax-pg}{313}
-'xrdef {Tag Syntax-snt}{Section'tie24.3.1}
-'xrdef {Create Tags Table-title}{Creating Tags Tables}
-'xrdef {Create Tags Table-pg}{315}
-'xrdef {Create Tags Table-snt}{Section'tie24.3.2}
-'xrdef {Etags Regexps-title}{Etags Regexps}
-'xrdef {Etags Regexps-pg}{316}
-'xrdef {Etags Regexps-snt}{Section'tie24.3.3}
-'xrdef {Select Tags Table-title}{Selecting a Tags Table}
-'xrdef {Select Tags Table-pg}{318}
-'xrdef {Select Tags Table-snt}{Section'tie24.3.4}
-'xrdef {Find Tag-title}{Finding a Tag}
-'xrdef {Find Tag-pg}{319}
-'xrdef {Find Tag-snt}{Section'tie24.3.5}
-'xrdef {Tags Search-title}{Searching and Replacing with Tags Tables}
-'xrdef {Tags Search-pg}{320}
-'xrdef {Tags Search-snt}{Section'tie24.3.6}
-'xrdef {List Tags-title}{Tags Table Inquiries}
-'xrdef {List Tags-pg}{321}
-'xrdef {List Tags-snt}{Section'tie24.3.7}
-'xrdef {Emerge-title}{Merging Files with Emerge}
-'xrdef {Emerge-pg}{322}
-'xrdef {Emerge-snt}{Section'tie24.4}
-'xrdef {Overview of Emerge-title}{Overview of Emerge}
-'xrdef {Overview of Emerge-pg}{322}
-'xrdef {Overview of Emerge-snt}{Section'tie24.4.1}
-'xrdef {Submodes of Emerge-title}{Submodes of Emerge}
-'xrdef {Submodes of Emerge-pg}{323}
-'xrdef {Submodes of Emerge-snt}{Section'tie24.4.2}
-'xrdef {State of Difference-title}{State of a Difference}
-'xrdef {State of Difference-pg}{324}
-'xrdef {State of Difference-snt}{Section'tie24.4.3}
-'xrdef {Merge Commands-title}{Merge Commands}
-'xrdef {Merge Commands-pg}{325}
-'xrdef {Merge Commands-snt}{Section'tie24.4.4}
-'xrdef {Exiting Emerge-title}{Exiting Emerge}
-'xrdef {Exiting Emerge-pg}{326}
-'xrdef {Exiting Emerge-snt}{Section'tie24.4.5}
-'xrdef {Combining in Emerge-title}{Combining the Two Versions}
-'xrdef {Combining in Emerge-pg}{327}
-'xrdef {Combining in Emerge-snt}{Section'tie24.4.6}
-'xrdef {Fine Points of Emerge-title}{Fine Points of Emerge}
-'xrdef {Fine Points of Emerge-pg}{327}
-'xrdef {Fine Points of Emerge-snt}{Section'tie24.4.7}
-'xrdef {Abbrevs-title}{Abbrevs}
-'xrdef {Abbrevs-pg}{329}
-'xrdef {Abbrevs-snt}{Chapter'tie25}
-'xrdef {Abbrev Concepts-title}{Abbrev Concepts}
-'xrdef {Abbrev Concepts-pg}{329}
-'xrdef {Abbrev Concepts-snt}{Section'tie25.1}
-'xrdef {Defining Abbrevs-title}{Defining Abbrevs}
-'xrdef {Defining Abbrevs-pg}{329}
-'xrdef {Defining Abbrevs-snt}{Section'tie25.2}
-'xrdef {Expanding Abbrevs-title}{Controlling Abbrev Expansion}
-'xrdef {Expanding Abbrevs-pg}{330}
-'xrdef {Expanding Abbrevs-snt}{Section'tie25.3}
-'xrdef {Editing Abbrevs-title}{Examining and Editing Abbrevs}
-'xrdef {Editing Abbrevs-pg}{332}
-'xrdef {Editing Abbrevs-snt}{Section'tie25.4}
-'xrdef {Saving Abbrevs-title}{Saving Abbrevs}
-'xrdef {Saving Abbrevs-pg}{332}
-'xrdef {Saving Abbrevs-snt}{Section'tie25.5}
-'xrdef {Dynamic Abbrevs-title}{Dynamic Abbrev Expansion}
-'xrdef {Dynamic Abbrevs-pg}{333}
-'xrdef {Dynamic Abbrevs-snt}{Section'tie25.6}
-'xrdef {Dabbrev Customization-title}{Customizing Dynamic Abbreviation}
-'xrdef {Dabbrev Customization-pg}{334}
-'xrdef {Dabbrev Customization-snt}{Section'tie25.7}
-'xrdef {Picture-title}{Editing Pictures}
-'xrdef {Picture-pg}{337}
-'xrdef {Picture-snt}{Chapter'tie26}
-'xrdef {Basic Picture-title}{Basic Editing in Picture Mode}
-'xrdef {Basic Picture-pg}{337}
-'xrdef {Basic Picture-snt}{Section'tie26.1}
-'xrdef {Insert in Picture-title}{Controlling Motion after Insert}
-'xrdef {Insert in Picture-pg}{338}
-'xrdef {Insert in Picture-snt}{Section'tie26.2}
-'xrdef {Tabs in Picture-title}{Picture Mode Tabs}
-'xrdef {Tabs in Picture-pg}{339}
-'xrdef {Tabs in Picture-snt}{Section'tie26.3}
-'xrdef {Rectangles in Picture-title}{Picture Mode Rectangle Commands}
-'xrdef {Rectangles in Picture-pg}{339}
-'xrdef {Rectangles in Picture-snt}{Section'tie26.4}
-'xrdef {Sending Mail-title}{Sending Mail}
-'xrdef {Sending Mail-pg}{341}
-'xrdef {Sending Mail-snt}{Chapter'tie27}
-'xrdef {Mail Format-title}{The Format of the Mail Buffer}
-'xrdef {Mail Format-pg}{341}
-'xrdef {Mail Format-snt}{Section'tie27.1}
-'xrdef {Mail Headers-title}{Mail Header Fields}
-'xrdef {Mail Headers-pg}{342}
-'xrdef {Mail Headers-snt}{Section'tie27.2}
-'xrdef {Mail Aliases-title}{Mail Aliases}
-'xrdef {Mail Aliases-pg}{344}
-'xrdef {Mail Aliases-snt}{Section'tie27.3}
-'xrdef {Mail Mode-title}{Mail Mode}
-'xrdef {Mail Mode-pg}{346}
-'xrdef {Mail Mode-snt}{Section'tie27.4}
-'xrdef {Mail Sending-title}{Mail Sending}
-'xrdef {Mail Sending-pg}{346}
-'xrdef {Mail Sending-snt}{Section'tie27.4.1}
-'xrdef {Header Editing-title}{Mail Header Editing}
-'xrdef {Header Editing-pg}{346}
-'xrdef {Header Editing-snt}{Section'tie27.4.2}
-'xrdef {Citing Mail-title}{Citing Mail}
-'xrdef {Citing Mail-pg}{347}
-'xrdef {Citing Mail-snt}{Section'tie27.4.3}
-'xrdef {Mail Mode Misc-title}{Mail Mode Miscellany}
-'xrdef {Mail Mode Misc-pg}{348}
-'xrdef {Mail Mode Misc-snt}{Section'tie27.4.4}
-'xrdef {Mail Amusements-title}{Mail Amusements}
-'xrdef {Mail Amusements-pg}{349}
-'xrdef {Mail Amusements-snt}{Section'tie27.5}
-'xrdef {Mail Methods-title}{Mail-Composition Methods}
-'xrdef {Mail Methods-pg}{350}
-'xrdef {Mail Methods-snt}{Section'tie27.6}
-'xrdef {Rmail-title}{Reading Mail with Rmail}
-'xrdef {Rmail-pg}{351}
-'xrdef {Rmail-snt}{Chapter'tie28}
-'xrdef {Rmail Basics-title}{Basic Concepts of Rmail}
-'xrdef {Rmail Basics-pg}{351}
-'xrdef {Rmail Basics-snt}{Section'tie28.1}
-'xrdef {Rmail Scrolling-title}{Scrolling Within a Message}
-'xrdef {Rmail Scrolling-pg}{352}
-'xrdef {Rmail Scrolling-snt}{Section'tie28.2}
-'xrdef {Rmail Motion-title}{Moving Among Messages}
-'xrdef {Rmail Motion-pg}{352}
-'xrdef {Rmail Motion-snt}{Section'tie28.3}
-'xrdef {Rmail Deletion-title}{Deleting Messages}
-'xrdef {Rmail Deletion-pg}{353}
-'xrdef {Rmail Deletion-snt}{Section'tie28.4}
-'xrdef {Rmail Inbox-title}{Rmail Files and Inboxes}
-'xrdef {Rmail Inbox-pg}{354}
-'xrdef {Rmail Inbox-snt}{Section'tie28.5}
-'xrdef {Rmail Files-title}{Multiple Rmail Files}
-'xrdef {Rmail Files-pg}{355}
-'xrdef {Rmail Files-snt}{Section'tie28.6}
-'xrdef {Rmail Output-title}{Copying Messages Out to Files}
-'xrdef {Rmail Output-pg}{356}
-'xrdef {Rmail Output-snt}{Section'tie28.7}
-'xrdef {Rmail Labels-title}{Labels}
-'xrdef {Rmail Labels-pg}{358}
-'xrdef {Rmail Labels-snt}{Section'tie28.8}
-'xrdef {Rmail Attributes-title}{Rmail Attributes}
-'xrdef {Rmail Attributes-pg}{359}
-'xrdef {Rmail Attributes-snt}{Section'tie28.9}
-'xrdef {Rmail Reply-title}{Sending Replies}
-'xrdef {Rmail Reply-pg}{359}
-'xrdef {Rmail Reply-snt}{Section'tie28.10}
-'xrdef {Rmail Summary-title}{Summaries}
-'xrdef {Rmail Summary-pg}{361}
-'xrdef {Rmail Summary-snt}{Section'tie28.11}
-'xrdef {Rmail Make Summary-title}{Making Summaries}
-'xrdef {Rmail Make Summary-pg}{362}
-'xrdef {Rmail Make Summary-snt}{Section'tie28.11.1}
-'xrdef {Rmail Summary Edit-title}{Editing in Summaries}
-'xrdef {Rmail Summary Edit-pg}{363}
-'xrdef {Rmail Summary Edit-snt}{Section'tie28.11.2}
-'xrdef {Rmail Sorting-title}{Sorting the Rmail File}
-'xrdef {Rmail Sorting-pg}{364}
-'xrdef {Rmail Sorting-snt}{Section'tie28.12}
-'xrdef {Rmail Display-title}{Display of Messages}
-'xrdef {Rmail Display-pg}{365}
-'xrdef {Rmail Display-snt}{Section'tie28.13}
-'xrdef {Rmail Coding-title}{Rmail and Coding Systems}
-'xrdef {Rmail Coding-pg}{365}
-'xrdef {Rmail Coding-snt}{Section'tie28.14}
-'xrdef {Rmail Editing-title}{Editing Within a Message}
-'xrdef {Rmail Editing-pg}{366}
-'xrdef {Rmail Editing-snt}{Section'tie28.15}
-'xrdef {Rmail Digest-title}{Digest Messages}
-'xrdef {Rmail Digest-pg}{367}
-'xrdef {Rmail Digest-snt}{Section'tie28.16}
-'xrdef {Out of Rmail-title}{Converting an Rmail File to Inbox Format}
-'xrdef {Out of Rmail-pg}{367}
-'xrdef {Out of Rmail-snt}{Section'tie28.17}
-'xrdef {Rmail Rot13-title}{Reading Rot13 Messages}
-'xrdef {Rmail Rot13-pg}{368}
-'xrdef {Rmail Rot13-snt}{Section'tie28.18}
-'xrdef {Movemail-title}{\code {movemail} and POP}
-'xrdef {Movemail-pg}{368}
-'xrdef {Movemail-snt}{Section'tie28.19}
-'xrdef {Dired-title}{Dired, the Directory Editor}
-'xrdef {Dired-pg}{371}
-'xrdef {Dired-snt}{Chapter'tie29}
-'xrdef {Dired Enter-title}{Entering Dired}
-'xrdef {Dired Enter-pg}{371}
-'xrdef {Dired Enter-snt}{Section'tie29.1}
-'xrdef {Dired Navigation-title}{Navigation in the Dired Buffer}
-'xrdef {Dired Navigation-pg}{371}
-'xrdef {Dired Navigation-snt}{Section'tie29.2}
-'xrdef {Dired Deletion-title}{Deleting Files with Dired}
-'xrdef {Dired Deletion-pg}{372}
-'xrdef {Dired Deletion-snt}{Section'tie29.3}
-'xrdef {Flagging Many Files-title}{Flagging Many Files at Once}
-'xrdef {Flagging Many Files-pg}{372}
-'xrdef {Flagging Many Files-snt}{Section'tie29.4}
-'xrdef {Dired Visiting-title}{Visiting Files in Dired}
-'xrdef {Dired Visiting-pg}{373}
-'xrdef {Dired Visiting-snt}{Section'tie29.5}
-'xrdef {Marks vs Flags-title}{Dired Marks vs. Flags}
-'xrdef {Marks vs Flags-pg}{374}
-'xrdef {Marks vs Flags-snt}{Section'tie29.6}
-'xrdef {Operating on Files-title}{Operating on Files}
-'xrdef {Operating on Files-pg}{376}
-'xrdef {Operating on Files-snt}{Section'tie29.7}
-'xrdef {Shell Commands in Dired-title}{Shell Commands in Dired}
-'xrdef {Shell Commands in Dired-pg}{379}
-'xrdef {Shell Commands in Dired-snt}{Section'tie29.8}
-'xrdef {Transforming File Names-title}{Transforming File Names in Dired}
-'xrdef {Transforming File Names-pg}{379}
-'xrdef {Transforming File Names-snt}{Section'tie29.9}
-'xrdef {Comparison in Dired-title}{File Comparison with Dired}
-'xrdef {Comparison in Dired-pg}{380}
-'xrdef {Comparison in Dired-snt}{Section'tie29.10}
-'xrdef {Subdirectories in Dired-title}{Subdirectories in Dired}
-'xrdef {Subdirectories in Dired-pg}{381}
-'xrdef {Subdirectories in Dired-snt}{Section'tie29.11}
-'xrdef {Subdirectory Motion-title}{Moving Over Subdirectories}
-'xrdef {Subdirectory Motion-pg}{382}
-'xrdef {Subdirectory Motion-snt}{Section'tie29.12}
-'xrdef {Hiding Subdirectories-title}{Hiding Subdirectories}
-'xrdef {Hiding Subdirectories-pg}{382}
-'xrdef {Hiding Subdirectories-snt}{Section'tie29.13}
-'xrdef {Dired Updating-title}{Updating the Dired Buffer}
-'xrdef {Dired Updating-pg}{383}
-'xrdef {Dired Updating-snt}{Section'tie29.14}
-'xrdef {Dired and Find-title}{Dired and \code {find}}
-'xrdef {Dired and Find-pg}{384}
-'xrdef {Dired and Find-snt}{Section'tie29.15}
-'xrdef {Calendar/Diary-title}{The Calendar and the Diary}
-'xrdef {Calendar/Diary-pg}{385}
-'xrdef {Calendar/Diary-snt}{Chapter'tie30}
-'xrdef {Calendar Motion-title}{Movement in the Calendar}
-'xrdef {Calendar Motion-pg}{385}
-'xrdef {Calendar Motion-snt}{Section'tie30.1}
-'xrdef {Calendar Unit Motion-title}{Motion by Standard Lengths of Time}
-'xrdef {Calendar Unit Motion-pg}{385}
-'xrdef {Calendar Unit Motion-snt}{Section'tie30.1.1}
-'xrdef {Move to Beginning or End-title}{Beginning or End of Week, Month or Year}
-'xrdef {Move to Beginning or End-pg}{386}
-'xrdef {Move to Beginning or End-snt}{Section'tie30.1.2}
-'xrdef {Specified Dates-title}{Specified Dates}
-'xrdef {Specified Dates-pg}{386}
-'xrdef {Specified Dates-snt}{Section'tie30.1.3}
-'xrdef {Scroll Calendar-title}{Scrolling in the Calendar}
-'xrdef {Scroll Calendar-pg}{387}
-'xrdef {Scroll Calendar-snt}{Section'tie30.2}
-'xrdef {Counting Days-title}{Counting Days}
-'xrdef {Counting Days-pg}{388}
-'xrdef {Counting Days-snt}{Section'tie30.3}
-'xrdef {General Calendar-title}{Miscellaneous Calendar Commands}
-'xrdef {General Calendar-pg}{388}
-'xrdef {General Calendar-snt}{Section'tie30.4}
-'xrdef {LaTeX Calendar-title}{LaTeX Calendar}
-'xrdef {LaTeX Calendar-pg}{388}
-'xrdef {LaTeX Calendar-snt}{Section'tie30.5}
-'xrdef {Holidays-title}{Holidays}
-'xrdef {Holidays-pg}{389}
-'xrdef {Holidays-snt}{Section'tie30.6}
-'xrdef {Sunrise/Sunset-title}{Times of Sunrise and Sunset}
-'xrdef {Sunrise/Sunset-pg}{391}
-'xrdef {Sunrise/Sunset-snt}{Section'tie30.7}
-'xrdef {Lunar Phases-title}{Phases of the Moon}
-'xrdef {Lunar Phases-pg}{392}
-'xrdef {Lunar Phases-snt}{Section'tie30.8}
-'xrdef {Other Calendars-title}{Conversion To and From Other Calendars}
-'xrdef {Other Calendars-pg}{392}
-'xrdef {Other Calendars-snt}{Section'tie30.9}
-'xrdef {Calendar Systems-title}{Supported Calendar Systems}
-'xrdef {Calendar Systems-pg}{393}
-'xrdef {Calendar Systems-snt}{Section'tie30.9.1}
-'xrdef {To Other Calendar-title}{Converting To Other Calendars}
-'xrdef {To Other Calendar-pg}{394}
-'xrdef {To Other Calendar-snt}{Section'tie30.9.2}
-'xrdef {From Other Calendar-title}{Converting From Other Calendars}
-'xrdef {From Other Calendar-pg}{395}
-'xrdef {From Other Calendar-snt}{Section'tie30.9.3}
-'xrdef {Mayan Calendar-title}{Converting from the Mayan Calendar}
-'xrdef {Mayan Calendar-pg}{396}
-'xrdef {Mayan Calendar-snt}{Section'tie30.9.4}
-'xrdef {Diary-title}{The Diary}
-'xrdef {Diary-pg}{397}
-'xrdef {Diary-snt}{Section'tie30.10}
-'xrdef {Diary Commands-title}{Commands Displaying Diary Entries}
-'xrdef {Diary Commands-pg}{397}
-'xrdef {Diary Commands-snt}{Section'tie30.10.1}
-'xrdef {Format of Diary File-title}{The Diary File}
-'xrdef {Format of Diary File-pg}{399}
-'xrdef {Format of Diary File-snt}{Section'tie30.10.2}
-'xrdef {Date Formats-title}{Date Formats}
-'xrdef {Date Formats-pg}{400}
-'xrdef {Date Formats-snt}{Section'tie30.10.3}
-'xrdef {Adding to Diary-title}{Commands to Add to the Diary}
-'xrdef {Adding to Diary-pg}{401}
-'xrdef {Adding to Diary-snt}{Section'tie30.10.4}
-'xrdef {Special Diary Entries-title}{Special Diary Entries}
-'xrdef {Special Diary Entries-pg}{401}
-'xrdef {Special Diary Entries-snt}{Section'tie30.10.5}
-'xrdef {Appointments-title}{Appointments}
-'xrdef {Appointments-pg}{403}
-'xrdef {Appointments-snt}{Section'tie30.11}
-'xrdef {Daylight Savings-title}{Daylight Savings Time}
-'xrdef {Daylight Savings-pg}{404}
-'xrdef {Daylight Savings-snt}{Section'tie30.12}
-'xrdef {Time Intervals-title}{Summing Time Intervals}
-'xrdef {Time Intervals-pg}{405}
-'xrdef {Time Intervals-snt}{Section'tie30.13}
-'xrdef {Gnus-title}{Gnus}
-'xrdef {Gnus-pg}{407}
-'xrdef {Gnus-snt}{Section'tie31.1}
-'xrdef {Buffers of Gnus-title}{Gnus Buffers}
-'xrdef {Buffers of Gnus-pg}{407}
-'xrdef {Buffers of Gnus-snt}{Section'tie31.1.1}
-'xrdef {Gnus Startup-title}{When Gnus Starts Up}
-'xrdef {Gnus Startup-pg}{407}
-'xrdef {Gnus Startup-snt}{Section'tie31.1.2}
-'xrdef {Summary of Gnus-title}{Summary of Gnus Commands}
-'xrdef {Summary of Gnus-pg}{408}
-'xrdef {Summary of Gnus-snt}{Section'tie31.1.3}
-'xrdef {Shell-title}{Running Shell Commands from Emacs}
-'xrdef {Shell-pg}{409}
-'xrdef {Shell-snt}{Section'tie31.2}
-'xrdef {Single Shell-title}{Single Shell Commands}
-'xrdef {Single Shell-pg}{410}
-'xrdef {Single Shell-snt}{Section'tie31.2.1}
-'xrdef {Interactive Shell-title}{Interactive Inferior Shell}
-'xrdef {Interactive Shell-pg}{411}
-'xrdef {Interactive Shell-snt}{Section'tie31.2.2}
-'xrdef {Shell Mode-title}{Shell Mode}
-'xrdef {Shell Mode-pg}{412}
-'xrdef {Shell Mode-snt}{Section'tie31.2.3}
-'xrdef {Shell History-title}{Shell Command History}
-'xrdef {Shell History-pg}{415}
-'xrdef {Shell History-snt}{Section'tie31.2.4}
-'xrdef {Shell Ring-title}{Shell History Ring}
-'xrdef {Shell Ring-pg}{415}
-'xrdef {Shell Ring-snt}{Section'tie31.2.4.1}
-'xrdef {Shell History Copying-title}{Shell History Copying}
-'xrdef {Shell History Copying-pg}{416}
-'xrdef {Shell History Copying-snt}{Section'tie31.2.4.2}
-'xrdef {History References-title}{Shell History References}
-'xrdef {History References-pg}{416}
-'xrdef {History References-snt}{Section'tie31.2.4.3}
-'xrdef {Directory Tracking-title}{Directory Tracking}
-'xrdef {Directory Tracking-pg}{417}
-'xrdef {Directory Tracking-snt}{Section'tie31.2.5}
-'xrdef {Shell Options-title}{Shell Mode Options}
-'xrdef {Shell Options-pg}{417}
-'xrdef {Shell Options-snt}{Section'tie31.2.6}
-'xrdef {Terminal emulator-title}{Emacs Terminal Emulator}
-'xrdef {Terminal emulator-pg}{418}
-'xrdef {Terminal emulator-snt}{Section'tie31.2.7}
-'xrdef {Term Mode-title}{Term Mode}
-'xrdef {Term Mode-pg}{419}
-'xrdef {Term Mode-snt}{Section'tie31.2.8}
-'xrdef {Paging in Term-title}{Page-At-A-Time Output}
-'xrdef {Paging in Term-pg}{419}
-'xrdef {Paging in Term-snt}{Section'tie31.2.9}
-'xrdef {Remote Host-title}{Remote Host Shell}
-'xrdef {Remote Host-pg}{420}
-'xrdef {Remote Host-snt}{Section'tie31.2.10}
-'xrdef {Emacs Server-title}{Using Emacs as a Server}
-'xrdef {Emacs Server-pg}{420}
-'xrdef {Emacs Server-snt}{Section'tie31.3}
-'xrdef {Invoking emacsclient-title}{Invoking \code {emacsclient}}
-'xrdef {Invoking emacsclient-pg}{421}
-'xrdef {Invoking emacsclient-snt}{Section'tie31.4}
-'xrdef {Hardcopy-title}{Hardcopy Output}
-'xrdef {Hardcopy-pg}{422}
-'xrdef {Hardcopy-snt}{Section'tie31.5}
-'xrdef {PostScript-title}{PostScript Hardcopy}
-'xrdef {PostScript-pg}{422}
-'xrdef {PostScript-snt}{Section'tie31.6}
-'xrdef {PostScript Variables-title}{Variables for PostScript Hardcopy}
-'xrdef {PostScript Variables-pg}{424}
-'xrdef {PostScript Variables-snt}{Section'tie31.7}
-'xrdef {Sorting-title}{Sorting Text}
-'xrdef {Sorting-pg}{425}
-'xrdef {Sorting-snt}{Section'tie31.8}
-'xrdef {Narrowing-title}{Narrowing}
-'xrdef {Narrowing-pg}{427}
-'xrdef {Narrowing-snt}{Section'tie31.9}
-'xrdef {Two-Column-title}{Two-Column Editing}
-'xrdef {Two-Column-pg}{428}
-'xrdef {Two-Column-snt}{Section'tie31.10}
-'xrdef {Editing Binary Files-title}{Editing Binary Files}
-'xrdef {Editing Binary Files-pg}{429}
-'xrdef {Editing Binary Files-snt}{Section'tie31.11}
-'xrdef {Saving Emacs Sessions-title}{Saving Emacs Sessions}
-'xrdef {Saving Emacs Sessions-pg}{430}
-'xrdef {Saving Emacs Sessions-snt}{Section'tie31.12}
-'xrdef {Recursive Edit-title}{Recursive Editing Levels}
-'xrdef {Recursive Edit-pg}{430}
-'xrdef {Recursive Edit-snt}{Section'tie31.13}
-'xrdef {Emulation-title}{Emulation}
-'xrdef {Emulation-pg}{432}
-'xrdef {Emulation-snt}{Section'tie31.14}
-'xrdef {Hyperlinking-title}{Hyperlinking and Navigation Features}
-'xrdef {Hyperlinking-pg}{433}
-'xrdef {Hyperlinking-snt}{Section'tie31.15}
-'xrdef {Browse-URL-title}{Following URLs}
-'xrdef {Browse-URL-pg}{434}
-'xrdef {Browse-URL-snt}{Section'tie31.15.1}
-'xrdef {Goto-address-title}{Activating URLs}
-'xrdef {Goto-address-pg}{434}
-'xrdef {Goto-address-snt}{Section'tie31.15.2}
-'xrdef {FFAP-title}{Finding Files and URLs at Point}
-'xrdef {FFAP-pg}{435}
-'xrdef {FFAP-snt}{Section'tie31.15.3}
-'xrdef {Find-func-title}{Finding Function and Variable Definitions}
-'xrdef {Find-func-pg}{435}
-'xrdef {Find-func-snt}{Section'tie31.15.4}
-'xrdef {Dissociated Press-title}{Dissociated Press}
-'xrdef {Dissociated Press-pg}{436}
-'xrdef {Dissociated Press-snt}{Section'tie31.16}
-'xrdef {Amusements-title}{Other Amusements}
-'xrdef {Amusements-pg}{437}
-'xrdef {Amusements-snt}{Section'tie31.17}
-'xrdef {Customization-title}{Customization}
-'xrdef {Customization-pg}{439}
-'xrdef {Customization-snt}{Chapter'tie32}
-'xrdef {Minor Modes-title}{Minor Modes}
-'xrdef {Minor Modes-pg}{439}
-'xrdef {Minor Modes-snt}{Section'tie32.1}
-'xrdef {Variables-title}{Variables}
-'xrdef {Variables-pg}{441}
-'xrdef {Variables-snt}{Section'tie32.2}
-'xrdef {Examining-title}{Examining and Setting Variables}
-'xrdef {Examining-pg}{442}
-'xrdef {Examining-snt}{Section'tie32.2.1}
-'xrdef {Easy Customization-title}{Easy Customization Interface}
-'xrdef {Easy Customization-pg}{443}
-'xrdef {Easy Customization-snt}{Section'tie32.2.2}
-'xrdef {Customization Groups-title}{Customization Groups}
-'xrdef {Customization Groups-pg}{443}
-'xrdef {Customization Groups-snt}{Section'tie32.2.2.1}
-'xrdef {Changing an Option-title}{Changing an Option}
-'xrdef {Changing an Option-pg}{444}
-'xrdef {Changing an Option-snt}{Section'tie32.2.2.2}
-'xrdef {Face Customization-title}{Customizing Faces}
-'xrdef {Face Customization-pg}{447}
-'xrdef {Face Customization-snt}{Section'tie32.2.2.3}
-'xrdef {Specific Customization-title}{Customizing Specific Items}
-'xrdef {Specific Customization-pg}{448}
-'xrdef {Specific Customization-snt}{Section'tie32.2.2.4}
-'xrdef {Hooks-title}{Hooks}
-'xrdef {Hooks-pg}{449}
-'xrdef {Hooks-snt}{Section'tie32.2.3}
-'xrdef {Locals-title}{Local Variables}
-'xrdef {Locals-pg}{451}
-'xrdef {Locals-snt}{Section'tie32.2.4}
-'xrdef {File Variables-title}{Local Variables in Files}
-'xrdef {File Variables-pg}{452}
-'xrdef {File Variables-snt}{Section'tie32.2.5}
-'xrdef {Keyboard Macros-title}{Keyboard Macros}
-'xrdef {Keyboard Macros-pg}{454}
-'xrdef {Keyboard Macros-snt}{Section'tie32.3}
-'xrdef {Basic Kbd Macro-title}{Basic Use}
-'xrdef {Basic Kbd Macro-pg}{455}
-'xrdef {Basic Kbd Macro-snt}{Section'tie32.3.1}
-'xrdef {Save Kbd Macro-title}{Naming and Saving Keyboard Macros}
-'xrdef {Save Kbd Macro-pg}{456}
-'xrdef {Save Kbd Macro-snt}{Section'tie32.3.2}
-'xrdef {Kbd Macro Query-title}{Executing Macros with Variations}
-'xrdef {Kbd Macro Query-pg}{457}
-'xrdef {Kbd Macro Query-snt}{Section'tie32.3.3}
-'xrdef {Key Bindings-title}{Customizing Key Bindings}
-'xrdef {Key Bindings-pg}{458}
-'xrdef {Key Bindings-snt}{Section'tie32.4}
-'xrdef {Keymaps-title}{Keymaps}
-'xrdef {Keymaps-pg}{458}
-'xrdef {Keymaps-snt}{Section'tie32.4.1}
-'xrdef {Prefix Keymaps-title}{Prefix Keymaps}
-'xrdef {Prefix Keymaps-pg}{459}
-'xrdef {Prefix Keymaps-snt}{Section'tie32.4.2}
-'xrdef {Local Keymaps-title}{Local Keymaps}
-'xrdef {Local Keymaps-pg}{460}
-'xrdef {Local Keymaps-snt}{Section'tie32.4.3}
-'xrdef {Minibuffer Maps-title}{Minibuffer Keymaps}
-'xrdef {Minibuffer Maps-pg}{461}
-'xrdef {Minibuffer Maps-snt}{Section'tie32.4.4}
-'xrdef {Rebinding-title}{Changing Key Bindings Interactively}
-'xrdef {Rebinding-pg}{461}
-'xrdef {Rebinding-snt}{Section'tie32.4.5}
-'xrdef {Init Rebinding-title}{Rebinding Keys in Your Init File}
-'xrdef {Init Rebinding-pg}{462}
-'xrdef {Init Rebinding-snt}{Section'tie32.4.6}
-'xrdef {Function Keys-title}{Rebinding Function Keys}
-'xrdef {Function Keys-pg}{464}
-'xrdef {Function Keys-snt}{Section'tie32.4.7}
-'xrdef {Named ASCII Chars-title}{Named ASCII Control Characters}
-'xrdef {Named ASCII Chars-pg}{465}
-'xrdef {Named ASCII Chars-snt}{Section'tie32.4.8}
-'xrdef {Non-ASCII Rebinding-title}{Non-ASCII Characters on the Keyboard}
-'xrdef {Non-ASCII Rebinding-pg}{465}
-'xrdef {Non-ASCII Rebinding-snt}{Section'tie32.4.9}
-'xrdef {Mouse Buttons-title}{Rebinding Mouse Buttons}
-'xrdef {Mouse Buttons-pg}{466}
-'xrdef {Mouse Buttons-snt}{Section'tie32.4.10}
-'xrdef {Disabling-title}{Disabling Commands}
-'xrdef {Disabling-pg}{468}
-'xrdef {Disabling-snt}{Section'tie32.4.11}
-'xrdef {Keyboard Translations-title}{Keyboard Translations}
-'xrdef {Keyboard Translations-pg}{469}
-'xrdef {Keyboard Translations-snt}{Section'tie32.5}
-'xrdef {Syntax-title}{The Syntax Table}
-'xrdef {Syntax-pg}{469}
-'xrdef {Syntax-snt}{Section'tie32.6}
-'xrdef {Init File-title}{The Init File, \file {~/.emacs}}
-'xrdef {Init File-pg}{470}
-'xrdef {Init File-snt}{Section'tie32.7}
-'xrdef {Init Syntax-title}{Init File Syntax}
-'xrdef {Init Syntax-pg}{471}
-'xrdef {Init Syntax-snt}{Section'tie32.7.1}
-'xrdef {Init Examples-title}{Init File Examples}
-'xrdef {Init Examples-pg}{472}
-'xrdef {Init Examples-snt}{Section'tie32.7.2}
-'xrdef {Terminal Init-title}{Terminal-specific Initialization}
-'xrdef {Terminal Init-pg}{474}
-'xrdef {Terminal Init-snt}{Section'tie32.7.3}
-'xrdef {Find Init-title}{How Emacs Finds Your Init File}
-'xrdef {Find Init-pg}{474}
-'xrdef {Find Init-snt}{Section'tie32.7.4}
-'xrdef {Quitting-title}{Quitting and Aborting}
-'xrdef {Quitting-pg}{477}
-'xrdef {Quitting-snt}{Section'tie33.1}
-'xrdef {Lossage-title}{Dealing with Emacs Trouble}
-'xrdef {Lossage-pg}{478}
-'xrdef {Lossage-snt}{Section'tie33.2}
-'xrdef {DEL Does Not Delete-title}{If \key {DEL} Fails to Delete}
-'xrdef {DEL Does Not Delete-pg}{479}
-'xrdef {DEL Does Not Delete-snt}{Section'tie33.2.1}
-'xrdef {Stuck Recursive-title}{Recursive Editing Levels}
-'xrdef {Stuck Recursive-pg}{480}
-'xrdef {Stuck Recursive-snt}{Section'tie33.2.2}
-'xrdef {Screen Garbled-title}{Garbage on the Screen}
-'xrdef {Screen Garbled-pg}{480}
-'xrdef {Screen Garbled-snt}{Section'tie33.2.3}
-'xrdef {Text Garbled-title}{Garbage in the Text}
-'xrdef {Text Garbled-pg}{480}
-'xrdef {Text Garbled-snt}{Section'tie33.2.4}
-'xrdef {Unasked-for Search-title}{Spontaneous Entry to Incremental Search}
-'xrdef {Unasked-for Search-pg}{481}
-'xrdef {Unasked-for Search-snt}{Section'tie33.2.5}
-'xrdef {Memory Full-title}{Running out of Memory}
-'xrdef {Memory Full-pg}{481}
-'xrdef {Memory Full-snt}{Section'tie33.2.6}
-'xrdef {After a Crash-title}{Recovery After a Crash}
-'xrdef {After a Crash-pg}{481}
-'xrdef {After a Crash-snt}{Section'tie33.2.7}
-'xrdef {Emergency Escape-title}{Emergency Escape}
-'xrdef {Emergency Escape-pg}{482}
-'xrdef {Emergency Escape-snt}{Section'tie33.2.8}
-'xrdef {Total Frustration-title}{Help for Total Frustration}
-'xrdef {Total Frustration-pg}{483}
-'xrdef {Total Frustration-snt}{Section'tie33.2.9}
-'xrdef {Bugs-title}{Reporting Bugs}
-'xrdef {Bugs-pg}{483}
-'xrdef {Bugs-snt}{Section'tie33.3}
-'xrdef {Bug Criteria-title}{When Is There a Bug}
-'xrdef {Bug Criteria-pg}{483}
-'xrdef {Bug Criteria-snt}{Section'tie33.3.1}
-'xrdef {Understanding Bug Reporting-title}{Understanding Bug Reporting}
-'xrdef {Understanding Bug Reporting-pg}{484}
-'xrdef {Understanding Bug Reporting-snt}{Section'tie33.3.2}
-'xrdef {Checklist-title}{Checklist for Bug Reports}
-'xrdef {Checklist-pg}{485}
-'xrdef {Checklist-snt}{Section'tie33.3.3}
-'xrdef {Sending Patches-title}{Sending Patches for GNU Emacs}
-'xrdef {Sending Patches-pg}{491}
-'xrdef {Sending Patches-snt}{Section'tie33.3.4}
-'xrdef {Contributing-title}{Contributing to Emacs Development}
-'xrdef {Contributing-pg}{493}
-'xrdef {Contributing-snt}{Section'tie33.4}
-'xrdef {Service-title}{How To Get Help with GNU Emacs}
-'xrdef {Service-pg}{493}
-'xrdef {Service-snt}{Section'tie33.5}
-'xrdef {Command Arguments-title}{Command Line Arguments}
-'xrdef {Command Arguments-pg}{495}
-'xrdef {Command Arguments-snt}{Appendix'tie'char66{}}
-'xrdef {Action Arguments-title}{Action Arguments}
-'xrdef {Action Arguments-pg}{495}
-'xrdef {Action Arguments-snt}{Section'tie'char66.1}
-'xrdef {Initial Options-title}{Initial Options}
-'xrdef {Initial Options-pg}{496}
-'xrdef {Initial Options-snt}{Section'tie'char66.2}
-'xrdef {Command Example-title}{Command Argument Example}
-'xrdef {Command Example-pg}{498}
-'xrdef {Command Example-snt}{Section'tie'char66.3}
-'xrdef {Resume Arguments-title}{Resuming Emacs with Arguments}
-'xrdef {Resume Arguments-pg}{498}
-'xrdef {Resume Arguments-snt}{Section'tie'char66.4}
-'xrdef {Environment-title}{Environment Variables}
-'xrdef {Environment-pg}{499}
-'xrdef {Environment-snt}{Section'tie'char66.5}
-'xrdef {General Variables-title}{General Variables}
-'xrdef {General Variables-pg}{499}
-'xrdef {General Variables-snt}{Section'tie'char66.5.1}
-'xrdef {Misc Variables-title}{Miscellaneous Variables}
-'xrdef {Misc Variables-pg}{502}
-'xrdef {Misc Variables-snt}{Section'tie'char66.5.2}
-'xrdef {Display X-title}{Specifying the Display Name}
-'xrdef {Display X-pg}{503}
-'xrdef {Display X-snt}{Section'tie'char66.6}
-'xrdef {Font X-title}{Font Specification Options}
-'xrdef {Font X-pg}{504}
-'xrdef {Font X-snt}{Section'tie'char66.7}
-'xrdef {Colors X-title}{Window Color Options}
-'xrdef {Colors X-pg}{505}
-'xrdef {Colors X-snt}{Section'tie'char66.8}
-'xrdef {Window Size X-title}{Options for Window Geometry}
-'xrdef {Window Size X-pg}{506}
-'xrdef {Window Size X-snt}{Section'tie'char66.9}
-'xrdef {Borders X-title}{Internal and External Borders}
-'xrdef {Borders X-pg}{508}
-'xrdef {Borders X-snt}{Section'tie'char66.10}
-'xrdef {Title X-title}{Frame Titles}
-'xrdef {Title X-pg}{508}
-'xrdef {Title X-snt}{Section'tie'char66.11}
-'xrdef {Icons X-title}{Icons}
-'xrdef {Icons X-pg}{508}
-'xrdef {Icons X-snt}{Section'tie'char66.12}
-'xrdef {Resources X-title}{X Resources}
-'xrdef {Resources X-pg}{509}
-'xrdef {Resources X-snt}{Section'tie'char66.13}
-'xrdef {Lucid Resources-title}{Lucid Menu X Resources}
-'xrdef {Lucid Resources-pg}{513}
-'xrdef {Lucid Resources-snt}{Section'tie'char66.14}
-'xrdef {LessTif Resources-title}{LessTif Menu X Resources}
-'xrdef {LessTif Resources-pg}{514}
-'xrdef {LessTif Resources-snt}{Section'tie'char66.15}
-'xrdef {Antinews-title}{Emacs 20 Antinews}
-'xrdef {Antinews-pg}{517}
-'xrdef {Antinews-snt}{Appendix'tie'char67{}}
-'xrdef {Mac OS-title}{Emacs and the Mac OS}
-'xrdef {Mac OS-pg}{523}
-'xrdef {Mac OS-snt}{Appendix'tie'char68{}}
-'xrdef {Mac Input-title}{Keyboard Input on the Mac}
-'xrdef {Mac Input-pg}{523}
-'xrdef {Mac Input-snt}{Section'tie'char68.1}
-'xrdef {Mac International-title}{International Character Set Support on the Mac}
-'xrdef {Mac International-pg}{524}
-'xrdef {Mac International-snt}{Section'tie'char68.2}
-'xrdef {Mac Environment Variables-title}{Environment Variables and Command Line Arguments.}
-'xrdef {Mac Environment Variables-pg}{525}
-'xrdef {Mac Environment Variables-snt}{Section'tie'char68.3}
-'xrdef {Mac Directories-title}{Volumes and Directories on the Mac}
-'xrdef {Mac Directories-pg}{525}
-'xrdef {Mac Directories-snt}{Section'tie'char68.4}
-'xrdef {Mac Font Specs-title}{Specifying Fonts on the Mac}
-'xrdef {Mac Font Specs-pg}{525}
-'xrdef {Mac Font Specs-snt}{Section'tie'char68.5}
-'xrdef {Mac Functions-title}{Mac-Specific Lisp Functions}
-'xrdef {Mac Functions-pg}{526}
-'xrdef {Mac Functions-snt}{Section'tie'char68.6}
-'xrdef {MS-DOS-title}{Emacs and MS-DOS}
-'xrdef {MS-DOS-pg}{527}
-'xrdef {MS-DOS-snt}{Appendix'tie'char69{}}
-'xrdef {MS-DOS Input-title}{Keyboard and Mouse on MS-DOS}
-'xrdef {MS-DOS Input-pg}{527}
-'xrdef {MS-DOS Input-snt}{Section'tie'char69.1}
-'xrdef {MS-DOS Display-title}{Display on MS-DOS}
-'xrdef {MS-DOS Display-pg}{529}
-'xrdef {MS-DOS Display-snt}{Section'tie'char69.2}
-'xrdef {MS-DOS File Names-title}{File Names on MS-DOS}
-'xrdef {MS-DOS File Names-pg}{530}
-'xrdef {MS-DOS File Names-snt}{Section'tie'char69.3}
-'xrdef {Text and Binary-title}{Text Files and Binary Files}
-'xrdef {Text and Binary-pg}{531}
-'xrdef {Text and Binary-snt}{Section'tie'char69.4}
-'xrdef {MS-DOS Printing-title}{Printing and MS-DOS}
-'xrdef {MS-DOS Printing-pg}{533}
-'xrdef {MS-DOS Printing-snt}{Section'tie'char69.5}
-'xrdef {MS-DOS and MULE-title}{International Support on MS-DOS}
-'xrdef {MS-DOS and MULE-pg}{535}
-'xrdef {MS-DOS and MULE-snt}{Section'tie'char69.6}
-'xrdef {MS-DOS Processes-title}{Subprocesses on MS-DOS}
-'xrdef {MS-DOS Processes-pg}{538}
-'xrdef {MS-DOS Processes-snt}{Section'tie'char69.7}
-'xrdef {Windows Processes-title}{Subprocesses on Windows 9X/ME and Windows NT/2K}
-'xrdef {Windows Processes-pg}{539}
-'xrdef {Windows Processes-snt}{Section'tie'char69.8}
-'xrdef {Windows System Menu-title}{Using the System Menu on Windows}
-'xrdef {Windows System Menu-pg}{540}
-'xrdef {Windows System Menu-snt}{Section'tie'char69.9}
-'xrdef {Manifesto-title}{The GNU Manifesto}
-'xrdef {Manifesto-pg}{541}
-'xrdef {Manifesto-snt}{}
-'xrdef {Top-title}{What's GNU? Gnu's Not Unix!}
-'xrdef {Top-pg}{541}
-'xrdef {Top-snt}{}
-'xrdef {Glossary-title}{Glossary}
-'xrdef {Glossary-pg}{551}
-'xrdef {Glossary-snt}{}
-'xrdef {Key Index-title}{Key (Character) Index}
-'xrdef {Key Index-pg}{575}
-'xrdef {Key Index-snt}{}
-'xrdef {Command Index-title}{Command and Function Index}
-'xrdef {Command Index-pg}{585}
-'xrdef {Command Index-snt}{}
-'xrdef {Variable Index-title}{Variable Index}
-'xrdef {Variable Index-pg}{599}
-'xrdef {Variable Index-snt}{}
-'xrdef {Concept Index-title}{Concept Index}
-'xrdef {Concept Index-pg}{607}
-'xrdef {Concept Index-snt}{}
diff -ruN src-21.1/man/emacs.cps src-21.2/man/emacs.cps
--- src-21.1/man/emacs.cps	Sat Oct 20 18:45:15 2001
+++ src-21.2/man/emacs.cps	Thu Jan  1 01:00:00 1970
@@ -1,1188 +0,0 @@
-\initial {(}
-\entry {( in leftmost column}{264}
-\initial {*}
-\entry {\samp {*Messages*} buffer}{25}
-\initial {-}
-\entry {--/---/.-./.../.}{437}
-\initial {.}
-\entry {\file {.mailrc} file}{344}
-\entry {\file {.timelog} file}{405}
-\entry {\file {.Xdefaults} file, and MS-Windows}{509}
-\initial {/}
-\entry {// in file name}{52}
-\initial {?}
-\entry {\samp {?} in display}{206}
-\initial {`}
-\entry {``PC'' key bindings}{432}
-\initial {8}
-\entry {8-bit character codes}{40}
-\entry {8-bit display}{223}
-\entry {8-bit input}{224}
-\initial {A}
-\entry {A and B buffers (Emerge)}{322}
-\entry {Abbrev mode}{329}
-\entry {abbrevs}{329}
-\entry {abnormal hook}{450}
-\entry {aborting recursive edit}{478}
-\entry {accented characters}{223}
-\entry {accessible portion}{427}
-\entry {accumulating scattered text}{83}
-\entry {action options (command line)}{495}
-\entry {active fields (customization buffer)}{443}
-\entry {adaptive filling}{242}
-\entry {againformation}{436}
-\entry {aggressive scrolling}{99}
-\entry {alarm clock}{404}
-\entry {ange-ftp}{170}
-\entry {anonymous FTP}{170}
-\entry {appending kills in the ring}{81}
-\entry {appointment notification}{403}
-\entry {apropos}{65}
-\entry {\code {arc}}{169}
-\entry {Archive mode}{169}
-\entry {arguments (command line)}{495}
-\entry {arguments to commands}{48}
-\entry {arrow keys}{40}
-\entry {ASCII}{29}
-\entry {Asm mode}{295}
-\entry {assembler mode}{295}
-\entry {astronomical day numbers}{393}
-\entry {attribute (Rmail)}{358}
-\entry {attributes of mode line, changing}{101}
-\entry {\file {AUTHORS} file}{312}
-\entry {Auto Compression mode}{168}
-\entry {Auto Fill mode}{238}
-\entry {Auto Save mode}{140}
-\entry {Auto-Lower mode}{200}
-\entry {Auto-Raise mode}{200}
-\entry {Auto-Revert mode}{140}
-\entry {autoload}{306}
-\entry {autoload Lisp libraries}{473}
-\entry {automatic version backups}{156}
-\entry {available colors}{505}
-\entry {avoiding mouse in the way of your typing}{203}
-\entry {Awk mode}{263}
-\initial {B}
-\entry {b2m}{367}
-\entry {Babyl format to Inbox format}{367}
-\entry {back end (version control)}{144}
-\entry {background color, command-line argument}{506}
-\entry {background mode, on \code {xterm}}{502}
-\entry {\key {BACKSPACE} vs \key {DEL}}{479}
-\entry {backtrace for bug reports}{489}
-\entry {backup file}{134}
-\entry {backup file names on MS-DOS}{530}
-\entry {backup, and user-id}{136}
-\entry {backups for remote files}{170}
-\entry {balanced expression}{272}
-\entry {balloon help}{69, 203}
-\entry {base buffer}{179}
-\entry {batch mode}{497}
-\entry {binary files, on MS-DOS/MS-Windows}{532}
-\entry {binding}{31}
-\entry {blank lines}{45}
-\entry {blank lines in programs}{276}
-\entry {body lines (Outline mode)}{245}
-\entry {bold font}{447}
-\entry {bookmarks}{89}
-\entry {border color, command-line argument}{506}
-\entry {border width, command-line argument}{508}
-\entry {borders (X Window System)}{508}
-\entry {boredom}{437}
-\entry {box-drawing characters (MS-DOS)}{537}
-\entry {brace in column zero and fontification}{95}
-\entry {braces, moving across}{273}
-\entry {branch (version control)}{152}
-\entry {Brief emulation}{432}
-\entry {Browse-URL}{434}
-\entry {buffer definitions index}{266}
-\entry {buffer list, customizable}{181}
-\entry {buffer menu}{177, 181}
-\entry {buffer size, maximum}{173}
-\entry {buffers}{173}
-\entry {buggestion}{437}
-\entry {bugs}{483}
-\entry {building programs}{297}
-\entry {button down events}{466}
-\entry {bypassing init and site-start file}{497}
-\entry {byte code}{306}
-\entry {byte-compiling several files (in Dired)}{378}
-\initial {C}
-\entry {C editing}{263, 311}
-\entry {C mode}{283}
-\entry {C-}{29}
-\entry {C++ class browser, tags}{313}
-\entry {C++ mode}{283}
-\entry {cache of file names}{171}
-\entry {calendar}{385}
-\entry {calendar and La\TeX{}}{388}
-\entry {calendar, first day of week}{386}
-\entry {call Lisp functions, command-line argument}{496}
-\entry {capitalizing words}{243}
-\entry {case conversion}{243}
-\entry {case-sensitivity and tags search}{321}
-\entry {categories of characters}{115}
-\entry {Celtic}{205}
-\entry {centering}{240}
-\entry {change buffers}{173}
-\entry {change log}{311}
-\entry {Change Log mode}{312}
-\entry {changes, undoing}{43}
-\entry {changing file group (in Dired)}{377}
-\entry {changing file owner (in Dired)}{378}
-\entry {changing file permissions (in Dired)}{377}
-\entry {character set (keyboard)}{29}
-\entry {characters (in text)}{32, 102}
-\entry {characters which belong to a specific language}{115}
-\entry {checking out files}{144}
-\entry {checking spelling}{123}
-\entry {Chinese}{205}
-\entry {Chinese calendar}{393}
-\entry {choosing a major mode}{225}
-\entry {ciphers}{437}
-\entry {citing mail}{347}
-\entry {class browser, C++}{313}
-\entry {click events}{466}
-\entry {clipboard}{194}
-\entry {clipboard support (Mac OS)}{524}
-\entry {codepage, MS-DOS}{536}
-\entry {coding systems}{212}
-\entry {collision}{137}
-\entry {color emulation on black-and-white printers}{424}
-\entry {color of window}{505}
-\entry {colors}{200}
-\entry {Column Number mode}{101}
-\entry {columns (and rectangles)}{84}
-\entry {columns (indentation)}{229}
-\entry {columns, splitting}{428}
-\entry {Comint mode}{414}
-\entry {\code {comint-highlight-input} face}{411}
-\entry {\code {comint-highlight-prompt} face}{411}
-\entry {command}{31}
-\entry {command history}{58}
-\entry {command line arguments}{495}
-\entry {comments}{274}
-\entry {comments on customized options}{447}
-\entry {compare files (in Dired)}{380}
-\entry {comparing 3 files (\code {diff3})}{167}
-\entry {comparing files}{166}
-\entry {compilation buffer, keeping current position at the end}{298}
-\entry {compilation errors}{297}
-\entry {Compilation mode}{299}
-\entry {compilation under MS-DOS}{538}
-\entry {complete key}{30}
-\entry {completion}{53}
-\entry {completion (Lisp symbols)}{282}
-\entry {completion (symbol names)}{281}
-\entry {compose character}{224}
-\entry {compressing files (in Dired)}{378}
-\entry {compression}{168}
-\entry {conflicts}{154}
-\entry {connecting to remote host}{420}
-\entry {continuation line}{46}
-\entry {Control}{29}
-\entry {control characters}{29}
-\entry {Control-Meta}{272}
-\entry {converting change log date style}{312}
-\entry {converting Rmail file to mailbox format}{367}
-\entry {converting text to upper or lower case}{243}
-\entry {Coptic calendar}{393}
-\entry {copy of every outgoing message}{342}
-\entry {copying files}{168}
-\entry {copying files (in Dired)}{377}
-\entry {copying text}{80}
-\entry {CORBA IDL mode}{283}
-\entry {correcting spelling}{123}
-\entry {CPerl mode}{263}
-\entry {crashes}{140}
-\entry {creating files}{130}
-\entry {creating frames}{196}
-\entry {CRiSP mode}{432}
-\entry {cryptanalysis}{437}
-\entry {current buffer}{173}
-\entry {cursor}{23}
-\entry {cursor color, command-line argument}{506}
-\entry {cursor in non-selected windows}{104}
-\entry {cursor location}{47}
-\entry {cursor location, on MS-DOS}{531}
-\entry {cursor motion}{40}
-\entry {cursor shape on MS-DOS}{529}
-\entry {cursor, blinking}{104}
-\entry {cursor, locating visually}{104}
-\entry {customization}{439}
-\entry {customization buffer}{443}
-\entry {customization groups}{443}
-\entry {customized options, saving}{446}
-\entry {customizing faces}{447}
-\entry {customizing Lisp indentation}{268}
-\entry {cut and paste}{556}
-\entry {cut buffer}{193}
-\entry {cutting and X}{193}
-\entry {cutting text}{77}
-\entry {cvs}{151}
-\entry {CVS}{144}
-\entry {CVS Dired Mode}{151}
-\entry {cvs watch feature}{165}
-\entry {CVSREAD environment variable (CVS)}{165}
-\entry {CWarn mode}{287}
-\entry {Cyrillic}{205}
-\entry {Czech}{205}
-\initial {D}
-\entry {day of year}{388}
-\entry {daylight savings time}{404}
-\entry {DBX}{300}
-\entry {dead character}{224}
-\entry {debuggers}{300}
-\entry {debugging Emacs, tricks and techniques}{489}
-\entry {debugging X problems}{512}
-\entry {decoding mail messages (Rmail)}{365}
-\entry {default argument}{51}
-\entry {default-frame-alist}{197}
-\entry {\file {default.el} file, not loading}{497}
-\entry {\file {default.el}, the default init file}{470}
-\entry {defining keyboard macros}{454}
-\entry {definitions, finding in Lisp sources}{435}
-\entry {defuns}{265}
-\entry {\key {DEL} vs \key {BACKSPACE}}{479}
-\entry {Delete Selection mode}{77}
-\entry {deleting auto-save files}{373}
-\entry {deleting blank lines}{45}
-\entry {deleting characters and lines}{42}
-\entry {deleting files (in Dired)}{372}
-\entry {deleting some backup files}{373}
-\entry {deletion}{77}
-\entry {deletion (of files)}{168}
-\entry {deletion (Rmail)}{353}
-\entry {Delphi mode}{263}
-\entry {desktop}{430}
-\entry {Devanagari}{205}
-\entry {developediment}{437}
-\entry {device for Emacs terminal I/O}{496}
-\entry {dialog boxes}{203}
-\entry {diary}{397}
-\entry {diary file}{399}
-\entry {Diff mode}{167}
-\entry {diffs}{167}
-\entry {digest message}{367}
-\entry {directional window selection}{188}
-\entry {directories in buffer names}{180}
-\entry {directory header lines}{382}
-\entry {directory listing}{165}
-\entry {directory listing on MS-DOS}{539}
-\entry {directory tracking}{417}
-\entry {Dired}{371}
-\entry {Dired sorting}{383}
-\entry {disable window system}{497}
-\entry {disabled command}{468}
-\entry {disabling remote files}{170}
-\entry {\env {DISPLAY} environment variable}{503}
-\entry {display for Emacs frame}{497}
-\entry {display name (X Window System)}{503}
-\entry {display of line number}{101}
-\entry {doctor}{483}
-\entry {DOS codepages}{536}
-\entry {DOS-style end-of-line display}{215}
-\entry {DOS-to-Unix conversion of files}{532}
-\entry {double clicks}{466}
-\entry {double slash in file name}{52}
-\entry {down events}{466}
-\entry {downcase file names}{380}
-\entry {drag events}{466}
-\entry {drastic changes}{139}
-\entry {dribble file}{486}
-\entry {DSSSL mode}{263}
-\entry {Dutch}{205}
-\initial {E}
-\entry {Ebrowse}{313}
-\entry {echo area}{24}
-\entry {Edebug}{488}
-\entry {editable fields (customization buffer)}{443}
-\entry {editing binary files}{429}
-\entry {editing in Picture mode}{337}
-\entry {editing level, recursive}{430}
-\entry {\env {EDITOR} environment variable}{420}
-\entry {EDT}{432}
-\entry {Eldoc mode}{280}
-\entry {Eliza}{483}
-\entry {Emacs as a server}{420}
-\entry {\env {EMACS} environment variable}{412}
-\entry {Emacs icon, a gnu}{509}
-\entry {Emacs initialization file}{470}
-\entry {Emacs-Lisp mode}{306}
-\entry {emacs.bash}{422}
-\entry {emacsclient}{420}
-\entry {Emerge}{322}
-\entry {empty lines}{97}
-\entry {emulating other editors}{432}
-\entry {emulation of Brief}{432}
-\entry {encoding of characters}{205}
-\entry {end-of-line conversion}{213}
-\entry {end-of-line conversion on MS-DOS/MS-Windows}{531}
-\entry {end-of-line conversion, mode-line indication}{27}
-\entry {Enriched mode}{256}
-\entry {entering Emacs}{35}
-\entry {environment variables}{499}
-\entry {environment variables (Mac OS)}{525}
-\entry {environment variables for subshells}{411}
-\entry {environment variables in file names}{128}
-\entry {environment variables, and non-ASCII characters}{207}
-\entry {erasing characters and lines}{42}
-\entry {error log}{297}
-\entry {error message in the echo area}{24}
-\entry {errors in init file}{497}
-\entry {\key {ESC} replacing \key {META} key}{29}
-\entry {escape sequences in files}{215}
-\entry {\env {ESHELL} environment variable}{411}
-\entry {\code {etags} program}{315}
-\entry {Ethiopic}{205}
-\entry {Ethiopic calendar}{393}
-\entry {Euro sign}{207}
-\entry {European character sets}{223}
-\entry {evaluate expression, command-line argument}{496}
-\entry {exiting}{35}
-\entry {exiting recursive edit}{431}
-\entry {expanding subdirectories in Dired}{381}
-\entry {expansion (of abbrevs)}{329}
-\entry {expansion of C macros}{286}
-\entry {expansion of environment variables}{128}
-\entry {expression}{272}
-\entry {expunging (Dired)}{372}
-\entry {expunging (Rmail)}{353}
-\initial {F}
-\entry {face colors, setting}{91}
-\entry {faces}{91}
-\entry {faces for highlighting search matches}{108}
-\entry {faces under MS-DOS}{529}
-\entry {failed merges}{167}
-\entry {FFAP minor mode}{435}
-\entry {file archives}{169}
-\entry {file comparison (in Dired)}{380}
-\entry {file database (locate)}{384}
-\entry {file dates}{137}
-\entry {file directory}{165}
-\entry {file local variables}{452}
-\entry {file management}{371}
-\entry {file name caching}{171}
-\entry {file names}{127}
-\entry {file names (Mac OS)}{525}
-\entry {file names under MS-DOS}{530}
-\entry {file names under Windows 95/NT}{530}
-\entry {file names with non-ASCII characters}{220}
-\entry {file ownership, and backup}{136}
-\entry {file selection dialog}{129}
-\entry {file shadows}{138}
-\entry {file truenames}{143}
-\entry {file version in change log entries}{312}
-\entry {files}{127}
-\entry {files, visiting and saving}{129}
-\entry {fill prefix}{240}
-\entry {filling text}{238}
-\entry {find}{171}
-\entry {\code {find} and Dired}{384}
-\entry {finding file at point}{435}
-\entry {finding files containing regexp matches (in Dired)}{376}
-\entry {finding strings within text}{105}
-\entry {firewall, and accessing remote files}{170}
-\entry {fixing incorrectly decoded mail messages}{366}
-\entry {flagging files (in Dired)}{372}
-\entry {flagging many files for deletion (in Dired)}{372}
-\entry {flow control}{481}
-\entry {Flyspell mode}{123}
-\entry {folding editing}{249}
-\entry {Follow mode}{100}
-\entry {font (default)}{197}
-\entry {font (principal)}{200}
-\entry {font for menus}{511}
-\entry {Font Lock mode}{94}
-\entry {font name (X Window System)}{504}
-\entry {font names (Mac OS)}{525}
-\entry {fonts and faces}{447}
-\entry {fonts for PostScript printing}{424}
-\entry {fonts for various scripts}{208}
-\entry {fonts, emulating under MS-DOS}{529}
-\entry {fontsets}{220}
-\entry {foreground color, command-line argument}{506}
-\entry {formatted text}{256}
-\entry {formfeed}{237}
-\entry {Fortran continuation lines}{290}
-\entry {Fortran mode}{288}
-\entry {Fortran77 and Fortran90}{288}
-\entry {fortune cookies}{350}
-\entry {forwarding a message}{361}
-\entry {frame size under MS-DOS}{529}
-\entry {frame title, command-line argument}{508}
-\entry {frames}{191}
-\entry {frames on MS-DOS}{529}
-\entry {French Revolutionary calendar}{393}
-\entry {fringe}{93}
-\entry {FTP}{170}
-\entry {function definition}{31}
-\entry {function key}{458}
-\entry {function, move to beginning or end}{265}
-\initial {G}
-\entry {gamma correction}{512}
-\entry {gateway, and remote file access with \code {ange-ftp}}{170}
-\entry {GDB}{300}
-\entry {geometry of Emacs window}{506}
-\entry {German}{205}
-\entry {getting help with keys}{45}
-\entry {Glasses mode}{282}
-\entry {Global Auto-Revert mode}{140}
-\entry {global keymap}{458}
-\entry {global mark ring}{76}
-\entry {global substitution}{116}
-\entry {Gnome}{194}
-\entry {Gnus}{407}
-\entry {Go Moku}{437}
-\entry {Goto-address}{434}
-\entry {graphic characters}{39}
-\entry {Greek}{205}
-\entry {Gregorian calendar}{392}
-\entry {growing minibuffer}{52}
-\entry {GUD library}{300}
-\entry {gzip}{168}
-\initial {H}
-\entry {handwriting}{423}
-\entry {hard links (creation)}{168}
-\entry {hard links (in Dired)}{377}
-\entry {hard newline}{257}
-\entry {hardcopy}{422}
-\entry {head version}{153}
-\entry {header (\TeX{} mode)}{254}
-\entry {header line (Dired)}{382}
-\entry {headers (of mail message)}{342}
-\entry {heading lines (Outline mode)}{245}
-\entry {Hebrew}{205}
-\entry {Hebrew calendar}{393}
-\entry {height of minibuffer}{52}
-\entry {help}{61}
-\entry {hex editing}{429}
-\entry {Hexl mode}{429}
-\entry {Hide-ifdef mode}{287}
-\entry {hiding in Dired (Dired)}{382}
-\entry {highlight current line}{104}
-\entry {highlighting by matching}{95}
-\entry {highlighting lines of text}{96}
-\entry {highlighting matching parentheses}{274}
-\entry {highlighting region}{72}
-\entry {Hindi}{205}
-\entry {history of commands}{58}
-\entry {history of minibuffer input}{56}
-\entry {history reference}{416}
-\entry {holidays}{389}
-\entry {home directory shorthand}{128}
-\entry {\env {HOME} directory under MS-DOS}{531}
-\entry {hook}{449}
-\entry {horizontal scrolling}{99}
-\entry {hourglass pointer display}{104}
-\entry {Hyper (under MS-DOS)}{527}
-\entry {hyperlinking}{433}
-\initial {I}
-\entry {IBM graphics characters (MS-DOS)}{537}
-\entry {Icomplete mode}{56}
-\entry {Icon mode}{263}
-\entry {icons (X Window System)}{508}
-\entry {icons, tool bar}{202}
-\entry {identifiers, making long ones readable}{282}
-\entry {IDL mode}{283}
-\entry {ignored file names, in completion}{56}
-\entry {ignoriginal}{436}
-\entry {images, visiting}{172}
-\entry {in-situ subdirectory (Dired)}{381}
-\entry {inbox file}{354}
-\entry {incorrect fontification}{95}
-\entry {incremental search}{105}
-\entry {incremental search, input method interference}{210}
-\entry {indentation}{229}
-\entry {indentation for comments}{275}
-\entry {indentation for programs}{266}
-\entry {index of buffer definitions}{266}
-\entry {indirect buffer}{179}
-\entry {indirect buffers and outlines}{248}
-\entry {inferior process}{297}
-\entry {inferior processes under MS-DOS}{538}
-\entry {Info}{68}
-\entry {Info index completion}{281}
-\entry {init file}{470}
-\entry {init file, and non-ASCII characters}{207}
-\entry {init file, default name under MS-DOS}{530}
-\entry {init file, not loading}{497}
-\entry {initial options (command line)}{495}
-\entry {initial-frame-alist}{197}
-\entry {input event}{30}
-\entry {input method, during incremental search}{106}
-\entry {input methods}{209}
-\entry {input with the keyboard}{29}
-\entry {insert file contents, command-line argument}{496}
-\entry {inserted subdirectory (Dired)}{381}
-\entry {inserting blank lines}{45}
-\entry {insertion}{39}
-\entry {interactive highlighting}{95}
-\entry {international characters in \file {.emacs}}{471}
-\entry {international files from DOS/Windows systems}{213}
-\entry {international scripts}{205}
-\entry {international support \r {(MS-DOS)}}{535}
-\entry {interval operator (in regexps)}{317}
-\entry {Intlfonts for PostScript printing}{424}
-\entry {Intlfonts package, installation}{208}
-\entry {invisible lines}{244}
-\entry {IPA}{205}
-\entry {Islamic calendar}{393}
-\entry {ISO Accents mode}{224}
-\entry {ISO commercial calendar}{393}
-\entry {ISO Latin character sets}{223}
-\entry {\code {iso-acc} library}{224}
-\entry {\code {iso-ascii} library}{223}
-\entry {\code {iso-transl} library}{224}
-\entry {\code {ispell} program}{125}
-\entry {Iswitchb mode}{181}
-\entry {italic font}{447}
-\initial {J}
-\entry {Japanese}{205}
-\entry {\code {jar}}{169}
-\entry {Java class archives}{169}
-\entry {Java mode}{283}
-\entry {JDB}{300}
-\entry {Julian calendar}{393}
-\entry {Julian day numbers}{393}
-\entry {justification}{239}
-\initial {K}
-\entry {Kerberos POP authentication}{369}
-\entry {key}{30}
-\entry {key bindings}{458}
-\entry {key rebinding, permanent}{470}
-\entry {key rebinding, this session}{461}
-\entry {key sequence}{30}
-\entry {keyboard coding (Mac OS)}{523}
-\entry {keyboard input}{29}
-\entry {keyboard macro}{454}
-\entry {keyboard shortcuts}{563}
-\entry {keyboard translations}{469}
-\entry {keymap}{458}
-\entry {kill ring}{80}
-\entry {killing buffers}{176}
-\entry {killing characters and lines}{42}
-\entry {killing Emacs}{35}
-\entry {killing expressions}{272}
-\entry {killing rectangular areas of text}{84}
-\entry {killing text}{77}
-\entry {Korean}{205}
-\initial {L}
-\entry {label (Rmail)}{358}
-\entry {landmark game}{437}
-\entry {language environment, automatic selection on \r {MS-DOS}}{536}
-\entry {language environments}{207}
-\entry {Lao}{205}
-\entry {La\TeX{} mode}{250}
-\entry {La\TeX{} references}{255}
-\entry {Latin}{205}
-\entry {Latin-1 \TeX{} encoding}{255}
-\entry {Latin-1, Latin-2 and Latin-3 input mode}{224}
-\entry {lazy search highlighting}{107}
-\entry {leading}{511}
-\entry {leaving Emacs}{35}
-\entry {Leim package}{211}
-\entry {LessTif Widget X Resources}{514}
-\entry {libraries}{305}
-\entry {Life}{437}
-\entry {line number commands}{47}
-\entry {line number display}{101}
-\entry {line spacing}{511}
-\entry {line wrapping}{46}
-\entry {line-drawing characters (MS-DOS)}{537}
-\entry {lines, highlighting}{96}
-\entry {Lisp definitions, finding in sources}{435}
-\entry {Lisp editing}{263, 311}
-\entry {Lisp files byte-compiled by XEmacs}{306}
-\entry {Lisp files, and multibyte operation}{207}
-\entry {Lisp functions specific to Mac OS}{526}
-\entry {Lisp string syntax}{471}
-\entry {Lisp symbol completion}{282}
-\entry {list commands}{273}
-\entry {listing current buffers}{174}
-\entry {listing system fonts}{505}
-\entry {load init file of another user}{497}
-\entry {loading Lisp code}{305}
-\entry {loading Lisp libraries automatically}{473}
-\entry {loading Lisp libraries, command-line argument}{496}
-\entry {loading several files (in Dired)}{378}
-\entry {local back end (version control)}{157}
-\entry {local keymap}{460}
-\entry {local variables}{451}
-\entry {local variables in files}{452}
-\entry {local version control}{157}
-\entry {locale, date format}{139}
-\entry {locales}{208}
-\entry {location of point}{47}
-\entry {locking (CVS)}{165}
-\entry {locking and version control}{145}
-\entry {locking files}{137}
-\entry {locking, non-strict (RCS)}{164}
-\entry {logging keystrokes}{486}
-\entry {long file names in DOS box under Windows 95/NT}{530}
-\entry {looking for a subject in documentation}{61}
-\entry {lpr usage under MS-DOS}{534}
-\entry {Lucid Widget X Resources}{513}
-\entry {\code {lzh}}{169}
-\initial {M}
-\entry {M-}{29}
-\entry {M4 mode}{263}
-\entry {Mac OS}{523}
-\entry {Mac Roman coding system}{524}
-\entry {Macintosh}{523}
-\entry {Macintosh end-of-line conversion}{213}
-\entry {Macintosh key bindings}{432}
-\entry {macro expansion in C}{286}
-\entry {mail}{341}
-\entry {mail (on mode line)}{101}
-\entry {mail aliases}{344}
-\entry {\env {MAIL} environment variable}{354}
-\entry {Mail mode}{346}
-\entry {mail-composition methods}{350}
-\entry {\env {MAILHOST} environment variable}{368}
-\entry {mailrc file}{344}
-\entry {major modes}{225}
-\entry {make}{297}
-\entry {Makefile mode}{263}
-\entry {making pictures out of text characters}{337}
-\entry {manipulating paragraphs}{236}
-\entry {manipulating sentences}{234}
-\entry {manipulating text}{233}
-\entry {manual page}{278}
-\entry {manual pages, on MS-DOS/MS-Windows}{279}
-\entry {manual version backups}{156}
-\entry {manuals, on-line}{68}
-\entry {Marathi}{205}
-\entry {mark}{71}
-\entry {mark ring}{75}
-\entry {marking executable files (in Dired)}{374}
-\entry {marking many files (in Dired)}{374}
-\entry {marking sections of text}{74}
-\entry {marking subdirectories (in Dired)}{375}
-\entry {marking symlinks (in Dired)}{375}
-\entry {Markov chain}{436}
-\entry {master file}{144}
-\entry {matching parentheses}{274}
-\entry {matching parenthesis and braces, moving to}{273}
-\entry {maximum buffer size exceeded, error message}{130}
-\entry {Mayan calendar}{393}
-\entry {Mayan calendar round}{397}
-\entry {Mayan haab calendar}{396}
-\entry {Mayan long count}{396}
-\entry {Mayan tzolkin calendar}{396}
-\entry {memory full}{481}
-\entry {menu bar}{28}
-\entry {Menu Bar mode}{202}
-\entry {Menu X Resources (LessTif widgets)}{514}
-\entry {Menu X Resources (Lucid widgets)}{513}
-\entry {merge buffer (Emerge)}{322}
-\entry {merges, failed}{167}
-\entry {merging changes}{154}
-\entry {merging files}{322}
-\entry {message}{341}
-\entry {Message mode for sending mail}{350}
-\entry {message number}{351}
-\entry {messages saved from echo area}{25}
-\entry {Meta}{29}
-\entry {Meta (Mac OS)}{523}
-\entry {Meta (under MS-DOS)}{527}
-\entry {Meta commands and words}{233}
-\entry {Metafont mode}{263}
-\entry {MH mail interface}{350}
-\entry {Midnight mode}{177}
-\entry {minibuffer}{51}
-\entry {minibuffer history}{56}
-\entry {minibuffer keymaps}{461}
-\entry {minor mode keymap}{460}
-\entry {minor modes}{439}
-\entry {mistakes, correcting}{121}
-\entry {mode hook}{264}
-\entry {mode line}{25}
-\entry {mode line \r {(MS-DOS)}}{537}
-\entry {mode line, 3D appearance}{101}
-\entry {mode line, mouse}{196}
-\entry {mode, Abbrev}{329}
-\entry {mode, archive}{169}
-\entry {mode, Auto Compression}{168}
-\entry {mode, Auto Fill}{238}
-\entry {mode, Auto Save}{140}
-\entry {mode, Auto-Revert}{140}
-\entry {mode, C}{283}
-\entry {mode, Column Number}{101}
-\entry {mode, Comint}{414}
-\entry {mode, Compilation}{299}
-\entry {mode, CORBA IDL}{283}
-\entry {mode, CRiSP}{432}
-\entry {mode, Delete Selection}{77}
-\entry {mode, Emacs-Lisp}{306}
-\entry {mode, Enriched}{256}
-\entry {mode, Follow}{100}
-\entry {mode, Font Lock}{94}
-\entry {mode, Fortran}{288}
-\entry {mode, Global Auto-Revert}{140}
-\entry {mode, Hexl}{429}
-\entry {mode, Iswitchb}{181}
-\entry {mode, Java}{283}
-\entry {mode, La\TeX{}}{250}
-\entry {mode, Mail}{346}
-\entry {mode, major}{225}
-\entry {mode, Menu Bar}{202}
-\entry {mode, minor}{439}
-\entry {mode, Mouse Wheel}{202}
-\entry {mode, MSB}{181}
-\entry {mode, Objective C}{283}
-\entry {mode, Outline}{244}
-\entry {mode, Overwrite}{440}
-\entry {mode, Paragraph-Indent Text}{244}
-\entry {mode, PC selection}{432}
-\entry {mode, Pike}{283}
-\entry {mode, Scroll Bar}{201}
-\entry {mode, Scroll-all}{189}
-\entry {mode, Shell}{412}
-\entry {mode, Sli\TeX{}}{250}
-\entry {mode, tar}{169}
-\entry {mode, Term}{419}
-\entry {mode, \TeX{}}{250}
-\entry {mode, Text}{243}
-\entry {mode, Tool Bar}{202}
-\entry {mode, Transient Mark}{72}
-\entry {mode, View}{167}
-\entry {mode, Winner}{188}
-\entry {modes for programming languages}{263}
-\entry {modes, Refill}{239}
-\entry {modification dates}{139}
-\entry {modified (buffer)}{129}
-\entry {Modula2 mode}{263}
-\entry {moon, phases of}{392}
-\entry {Morse code}{437}
-\entry {Motif key bindings}{432}
-\entry {mouse}{459}
-\entry {mouse avoidance}{203}
-\entry {mouse button events}{466}
-\entry {mouse buttons (what they do)}{191}
-\entry {mouse on mode line}{196}
-\entry {mouse pointer color, command-line argument}{506}
-\entry {mouse support under MS-DOS}{527}
-\entry {mouse wheel}{202}
-\entry {Mouse Wheel minor mode}{202}
-\entry {mouse, set number of buttons}{528}
-\entry {move to beginning or end of function}{265}
-\entry {movemail}{368}
-\entry {\code {movemail} program}{368}
-\entry {movement}{40}
-\entry {moving inside the calendar}{385}
-\entry {moving point}{40}
-\entry {moving text}{80}
-\entry {moving the cursor}{40}
-\entry {MS Windows}{191}
-\entry {MS-DOG}{527}
-\entry {MS-DOS end-of-line conversion}{213}
-\entry {MS-DOS peculiarities}{527}
-\entry {MS-Windows codepages}{538}
-\entry {MSB mode}{181}
-\entry {MULE}{205}
-\entry {multibyte characters}{205}
-\entry {multibyte operation, and Lisp files}{207}
-\entry {multiple \samp {*info*} and \samp {*Help*} buffers}{179}
-\entry {multiple displays}{198}
-\entry {multiple views of outline}{248}
-\entry {multiple windows in Emacs}{183}
-\entry {multiple-file search and replace}{320}
-\entry {mustatement}{437}
-\initial {N}
-\entry {named configurations (RCS)}{159}
-\entry {narrowing}{427}
-\entry {narrowing, and line number display}{101}
-\entry {navigation}{433}
-\entry {\samp {net use}, and printing on MS-Windows}{533}
-\entry {networked printers (MS-Windows)}{533}
-\entry {newline}{39}
-\entry {newlines, hard and soft}{257}
-\entry {NFS and quitting}{478}
-\entry {nil}{567}
-\entry {non-ASCII characters in \file {.emacs}}{471}
-\entry {non-ASCII keys, binding}{465}
-\entry {non-greedy regexp matching}{111}
-\entry {non-integral number of lines in a window}{101}
-\entry {non-strict locking (RCS)}{164}
-\entry {non-window terminals}{204}
-\entry {nonincremental search}{108}
-\entry {normal hook}{450}
-\entry {nroff}{255}
-\entry {NSA}{349}
-\entry {numeric arguments}{48}
-\initial {O}
-\entry {Objective C mode}{283}
-\entry {Octave mode}{263}
-\entry {on-line manuals}{68}
-\entry {open-parenthesis in leftmost column}{264}
-\entry {OpenWindows}{194}
-\entry {operating on files in Dired}{376}
-\entry {operations on a marked region}{74}
-\entry {option, user}{441}
-\entry {options (command line)}{495}
-\entry {other editors}{432}
-\entry {out of memory}{481}
-\entry {Outline mode}{244}
-\entry {outline with multiple views}{248}
-\entry {outragedy}{437}
-\entry {Overwrite mode}{440}
-\initial {P}
-\entry {page-at-a-time}{419}
-\entry {pages}{237}
-\entry {Paragraph-Indent Text mode}{244}
-\entry {paragraphs}{236}
-\entry {parentheses, displaying matches}{274}
-\entry {parentheses, moving across}{273}
-\entry {parenthesis in column zero and fontification}{95}
-\entry {parenthetical groupings}{273}
-\entry {Partial Completion mode}{56}
-\entry {parts of the screen}{23}
-\entry {pasting}{80}
-\entry {pasting and X}{193}
-\entry {patches}{167}
-\entry {patches, sending}{491}
-\entry {PC key bindings}{432}
-\entry {PC selection}{432}
-\entry {PC Selection minor mode}{432}
-\entry {PCL-CVS}{151}
-\entry {PDB}{300}
-\entry {per-buffer variables}{451}
-\entry {Perl mode}{263}
-\entry {Perldb}{300}
-\entry {Persian calendar}{393}
-\entry {phases of the moon}{392}
-\entry {Picture mode and rectangles}{339}
-\entry {pictures}{337}
-\entry {Pike mode}{283}
-\entry {point}{23}
-\entry {point location}{47}
-\entry {point location, on MS-DOS}{531}
-\entry {Polish}{205}
-\entry {Pong game}{437}
-\entry {POP inboxes}{368}
-\entry {position and size of Emacs frame}{506}
-\entry {PostScript mode}{263}
-\entry {prefix arguments}{48}
-\entry {prefix key}{30}
-\entry {preprocessor highlighting}{287}
-\entry {presidentagon}{436}
-\entry {pretty-printer}{267}
-\entry {primary Rmail file}{351}
-\entry {primary selection}{193}
-\entry {printing files (in Dired)}{378}
-\entry {printing under MS-DOS}{538}
-\entry {program building}{297}
-\entry {program editing}{263, 311}
-\entry {Prolog mode}{263}
-\entry {prompt}{51}
-\entry {prompt, shell}{417}
-\entry {properbose}{437}
-\entry {puzzles}{437}
-\initial {Q}
-\entry {query replace}{118}
-\entry {quitting}{477}
-\entry {quitting (in search)}{107}
-\entry {quitting Emacs}{35}
-\entry {quitting on MS-DOS}{527}
-\entry {quoting}{40}
-\entry {quoting file names}{171}
-\initial {R}
-\entry {RCS}{144}
-\entry {read-only buffer}{175}
-\entry {read-only text, killing}{77}
-\entry {reading mail}{351}
-\entry {reading netnews}{407}
-\entry {rebinding keys, permanently}{470}
-\entry {rebinding major mode keys}{460}
-\entry {rebinding mouse buttons}{466}
-\entry {rebinding non-ASCII keys}{465}
-\entry {rectangle}{84}
-\entry {rectangles and Picture mode}{339}
-\entry {recursive editing level}{430}
-\entry {redefining keys, this session}{461}
-\entry {references, La\TeX{}}{255}
-\entry {Refill minor mode}{239}
-\entry {refilling text, word processor style}{239}
-\entry {refreshing displayed files}{383}
-\entry {Ref\TeX{} package}{255}
-\entry {regexp}{109}
-\entry {region}{71}
-\entry {\code {region} face}{93}
-\entry {region highlighting}{72}
-\entry {registered file}{144}
-\entry {registers}{87}
-\entry {Registry (MS-Windows)}{509}
-\entry {regular expression}{109}
-\entry {related files}{287}
-\entry {reload files}{430}
-\entry {remember editing session}{430}
-\entry {remote file access}{170}
-\entry {remote host}{420}
-\entry {remote repositories (CVS)}{155, 165}
-\entry {renaming files (in Dired)}{377}
-\entry {repeating a command}{50}
-\entry {replacement}{116}
-\entry {reply to a message}{360}
-\entry {\env {REPLYTO} environment variable}{343}
-\entry {reporting bugs}{485}
-\entry {reread a file}{139}
-\entry {resizing minibuffer}{52}
-\entry {resolving conflicts}{154}
-\entry {resource name, command-line argument}{510}
-\entry {resource values, command-line argument}{510}
-\entry {resources}{509}
-\entry {restore session}{430}
-\entry {restriction}{427}
-\entry {retrying a failed message}{360}
-\entry {reverse order in POP inboxes}{369}
-\entry {reverse video, command-line argument}{506}
-\entry {Rlogin}{420}
-\entry {Rmail}{351}
-\entry {Romanian}{205}
-\entry {rot13 code}{368}
-\entry {running a hook}{449}
-\entry {running Lisp functions}{297}
-\initial {S}
-\entry {s-region package}{432}
-\entry {saved echo area messages}{25}
-\entry {Saveplace}{430}
-\entry {saving files}{129}
-\entry {saving keyboard macros}{456}
-\entry {saving option value}{446}
-\entry {saving sessions}{430}
-\entry {SCCS}{144}
-\entry {screen}{23}
-\entry {Scroll Bar mode}{201}
-\entry {Scroll-all mode}{189}
-\entry {scrolling}{97}
-\entry {scrolling all windows}{432}
-\entry {scrolling in the calendar}{387}
-\entry {scrolling windows together}{189}
-\entry {SDB}{300}
-\entry {search and replace in multiple files}{320}
-\entry {search and replace in multiple files (in Dired)}{378}
-\entry {search multiple files (in Dired)}{378}
-\entry {search-and-replace commands}{116}
-\entry {searching}{105}
-\entry {searching documentation efficiently}{61}
-\entry {searching for non-ASCII characters}{106}
-\entry {searching in Rmail}{353}
-\entry {secondary selection}{193}
-\entry {sections of manual pages}{278}
-\entry {selected buffer}{173}
-\entry {selected window}{183}
-\entry {selecting buffers in other windows}{185}
-\entry {selection, PC}{432}
-\entry {selection, primary}{193}
-\entry {selective display}{100}
-\entry {selective undo}{43}
-\entry {self-documentation}{61}
-\entry {sending mail}{341}
-\entry {sending patches for GNU Emacs}{491}
-\entry {sentences}{234}
-\entry {server, using Emacs as}{420}
-\entry {setting a mark}{71}
-\entry {setting option value}{445}
-\entry {setting variables}{442}
-\entry {sexp}{272}
-\entry {shadow files}{138}
-\entry {shell commands}{409}
-\entry {shell commands, Dired}{379}
-\entry {\env {SHELL} environment variable}{411}
-\entry {Shell mode}{412}
-\entry {shell scripts, and local file variables}{452}
-\entry {Shell-script mode}{263}
-\entry {Show Paren mode}{274}
-\entry {shy group, in regexp}{114}
-\entry {Simula mode}{263}
-\entry {simultaneous editing}{137}
-\entry {single-frame terminals}{204}
-\entry {site init file}{470}
-\entry {\file {site-start.el} file, not loading}{497}
-\entry {\file {site-start.el}, the site startup file}{470}
-\entry {size of minibuffer}{52}
-\entry {slashes repeated in file name}{52}
-\entry {Sli\TeX{} mode}{250}
-\entry {Slovak}{205}
-\entry {Slovenian}{205}
-\entry {slow display during scrolling}{95}
-\entry {Smerge mode}{167}
-\entry {Snake}{437}
-\entry {snapshots and version control}{158}
-\entry {soft newline}{257}
-\entry {solitaire}{437}
-\entry {sorting}{425}
-\entry {sorting Dired buffer}{383}
-\entry {Spanish}{205}
-\entry {specify default font from the command line}{504}
-\entry {speedbar}{198}
-\entry {spell-checking the active region}{124}
-\entry {spelling, checking and correcting}{123}
-\entry {splitting columns}{428}
-\entry {standard fontset}{221}
-\entry {start iconified, command-line argument}{509}
-\entry {starting Emacs}{35}
-\entry {startup (command line arguments)}{495}
-\entry {startup (init file)}{470}
-\entry {startup fontset}{221}
-\entry {string substitution}{116}
-\entry {string syntax}{471}
-\entry {StudlyCaps}{437}
-\entry {StudlyCaps, making them readable}{282}
-\entry {style (for indentation)}{270}
-\entry {subdirectories in Dired}{381}
-\entry {subscribe groups}{408}
-\entry {subshell}{409}
-\entry {subtree (Outline mode)}{247}
-\entry {summary (Rmail)}{361}
-\entry {summing time intervals}{405}
-\entry {sunrise and sunset}{391}
-\entry {Super (under MS-DOS)}{527}
-\entry {suspending}{35}
-\entry {suspicious constructions in C, C++}{287}
-\entry {switch buffers}{173}
-\entry {switches (command line)}{495}
-\entry {symlinks (in Dired)}{377}
-\entry {synchronizing windows}{100}
-\entry {synchronous X mode}{512}
-\entry {syntax highlighting and coloring}{94}
-\entry {syntax of regexps}{110}
-\entry {syntax table}{469}
-\initial {T}
-\entry {t}{567}
-\entry {tab stops}{231}
-\entry {tables, indentation for}{231}
-\entry {tags}{266}
-\entry {tags table}{313}
-\entry {tags, C++}{313}
-\entry {tags-based completion}{281}
-\entry {Tar mode}{169}
-\entry {Tcl mode}{263}
-\entry {techniquitous}{436}
-\entry {television}{81}
-\entry {Telnet}{420}
-\entry {\env {TERM} environment variable}{487}
-\entry {Term mode}{419}
-\entry {terminal emulators, mouse support}{204}
-\entry {termscript file}{487}
-\entry {Tetris}{437}
-\entry {\TeX{} mode}{250}
-\entry {\env {TEXEDIT} environment variable}{420}
-\entry {\env {TEXINPUTS} environment variable}{253}
-\entry {text}{233}
-\entry {text and binary files on MS-DOS/MS-Windows}{531}
-\entry {text colors, from command line}{505}
-\entry {Text mode}{243}
-\entry {text/enriched MIME format}{256}
-\entry {Thai}{205}
-\entry {Tibetan}{205}
-\entry {time (on mode line)}{101}
-\entry {time intervals, summing}{405}
-\entry {time stamps}{139}
-\entry {timeclock}{405}
-\entry {toggling marks (in Dired)}{375}
-\entry {Tool Bar mode}{202}
-\entry {tooltips}{69}
-\entry {tooltips with GUD}{304}
-\entry {top level}{25}
-\entry {tower of Hanoi}{437}
-\entry {TPU}{433}
-\entry {trailing whitespace}{96}
-\entry {Transient Mark mode}{72}
-\entry {transposition of expressions}{272}
-\entry {triple clicks}{466}
-\entry {truenames of files}{143}
-\entry {truncation}{46}
-\entry {trunk (version control)}{152}
-\entry {Turkish}{205}
-\entry {turn multibyte support on or off}{206}
-\entry {two directories (in Dired)}{377}
-\entry {two-column editing}{428}
-\entry {typos, fixing}{121}
-\initial {U}
-\entry {unbalanced parentheses and quotes}{271}
-\entry {uncompression}{168}
-\entry {undeletion (Rmail)}{354}
-\entry {undigestify}{367}
-\entry {undisplayable characters}{206}
-\entry {undo}{43}
-\entry {undo limit}{44}
-\entry {undoing window configuration changes}{188}
-\entry {Unibyte operation}{223}
-\entry {unibyte operation \r {(MS-DOS)}}{536}
-\entry {unibyte operation, and Lisp files}{207}
-\entry {unibyte operation, command-line argument}{498}
-\entry {unibyte operation, environment variable}{499}
-\entry {unique buffer names}{180}
-\entry {unmarking files (in Dired)}{375}
-\entry {unsubscribe groups}{408}
-\entry {untranslated file system}{532}
-\entry {unzip archives}{169}
-\entry {upcase file names}{380}
-\entry {updating Dired buffer}{383}
-\entry {URLs}{434}
-\entry {URLs, activating}{434}
-\entry {user name for remote file access}{170}
-\entry {user option}{441}
-\entry {userenced}{437}
-\entry {using tab stops in making tables}{231}
-\entry {usual erasure key}{479}
-\initial {V}
-\entry {variable}{441}
-\entry {vc-resolve-conflicts}{155}
-\entry {version backups}{156}
-\entry {version control}{143}
-\entry {\env {VERSION_CONTROL} environment variable}{135}
-\entry {VHDL mode}{263}
-\entry {vi}{432}
-\entry {Vietnamese}{205}
-\entry {View mode}{167}
-\entry {viewing}{167}
-\entry {views of an outline}{248}
-\entry {visiting files}{128}
-\entry {visiting files, command-line argument}{495}
-\entry {visiting image files}{172}
-\initial {W}
-\entry {watching files (CVS)}{165}
-\entry {Web}{434}
-\entry {weeks, which day they start on}{386}
-\entry {wheel, mouse}{202}
-\entry {whitespace, trailing}{96}
-\entry {wide block cursor}{104}
-\entry {widening}{427}
-\entry {width and height of Emacs frame}{506}
-\entry {width of the scroll bar}{202}
-\entry {wildcard characters in file names}{130}
-\entry {Windmove package}{188}
-\entry {window configuration changes, undoing}{188}
-\entry {Windows clipboard support}{528}
-\entry {windows in Emacs}{183}
-\entry {windows, synchronizing}{100}
-\entry {Winner mode}{188}
-\entry {word processing}{256}
-\entry {word search}{109}
-\entry {word wrap}{238}
-\entry {words}{233}
-\entry {words, case conversion}{243}
-\entry {WordStar}{432}
-\entry {work file}{144}
-\entry {World Wide Web}{434}
-\entry {wrapping}{46}
-\entry {WYSIWYG}{256}
-\initial {X}
-\entry {X clipboard}{194}
-\entry {X cutting and pasting}{193}
-\entry {X resources, \file {~/.Xdefaults} file}{509}
-\entry {XDB}{300}
-\entry {xon-xoff}{481}
-\entry {xterm, mouse support}{204}
-\initial {Y}
-\entry {yahrzeits}{395}
-\entry {yanking}{80}
-\entry {yanking previous kills}{82}
-\initial {Z}
-\entry {\code {zip}}{169}
-\entry {Zippy}{437}
-\entry {Zmacs mode}{74}
-\entry {\code {zoo}}{169}
diff -ruN src-21.1/man/emacs.fns src-21.2/man/emacs.fns
--- src-21.1/man/emacs.fns	Sat Oct 20 18:45:15 2001
+++ src-21.2/man/emacs.fns	Thu Jan  1 01:00:00 1970
@@ -1,1115 +0,0 @@
-\initial {2}
-\entry {\code {2C-associate-buffer}}{428}
-\entry {\code {2C-dissociate}}{429}
-\entry {\code {2C-merge}}{429}
-\entry {\code {2C-newline}}{429}
-\entry {\code {2C-split}}{428}
-\entry {\code {2C-two-columns}}{428}
-\initial {5}
-\entry {\code {5x5}}{437}
-\initial {A}
-\entry {\code {abbrev-mode}}{329}
-\entry {\code {abbrev-prefix-mark}}{331}
-\entry {\code {abort-recursive-edit}}{478}
-\entry {\code {add-change-log-entry-other-window}}{311}
-\entry {\code {add-global-abbrev}}{330}
-\entry {\code {add-mode-abbrev}}{330}
-\entry {\code {add-name-to-file}}{168}
-\entry {\code {add-untranslated-filesystem}}{532}
-\entry {\code {american-calendar}}{400}
-\entry {\code {append-next-kill}}{82}
-\entry {\code {append-to-buffer}}{83}
-\entry {\code {append-to-file}}{83}
-\entry {\code {apply-macro-to-region-lines}}{456}
-\entry {\code {appt-add}}{404}
-\entry {\code {appt-delete}}{404}
-\entry {\code {appt-make-list}}{403}
-\entry {\code {apropos}}{66}
-\entry {\code {apropos-command}}{65}
-\entry {\code {apropos-documentation}}{66}
-\entry {\code {apropos-value}}{66}
-\entry {\code {apropos-variable}}{65}
-\entry {\code {ask-user-about-lock}}{137}
-\entry {\code {authors}}{312}
-\entry {\code {auto-compression-mode}}{168}
-\entry {\code {auto-fill-mode}}{238}
-\entry {\code {auto-image-file-mode}}{172}
-\entry {\code {auto-lower-mode}}{200}
-\entry {\code {auto-raise-mode}}{200}
-\entry {\code {auto-revert-mode}}{140}
-\entry {\code {auto-save-mode}}{141}
-\initial {B}
-\entry {\code {back-to-indentation}}{230}
-\entry {\code {backward-char}}{41}
-\entry {\code {backward-kill-sentence}}{235}
-\entry {\code {backward-kill-sexp}}{272}
-\entry {\code {backward-kill-word}}{234}
-\entry {\code {backward-list}}{273}
-\entry {\code {backward-page}}{237}
-\entry {\code {backward-paragraph}}{236}
-\entry {\code {backward-sentence}}{235}
-\entry {\code {backward-sexp}}{272}
-\entry {\code {backward-text-line}}{255}
-\entry {\code {backward-up-list}}{273}
-\entry {\code {backward-word}}{234}
-\entry {\code {balance-windows}}{188}
-\entry {\code {beginning-of-buffer}}{41}
-\entry {\code {beginning-of-defun}}{265}
-\entry {\code {beginning-of-line}}{41}
-\entry {\code {binary-overwrite-mode}}{440}
-\entry {\code {blackbox}}{437}
-\entry {\code {blink-cursor-mode}}{104}
-\entry {\code {bookmark-delete}}{90}
-\entry {\code {bookmark-insert}}{90}
-\entry {\code {bookmark-insert-location}}{90}
-\entry {\code {bookmark-jump}}{89, 90}
-\entry {\code {bookmark-load}}{90}
-\entry {\code {bookmark-save}}{89}
-\entry {\code {bookmark-set}}{89, 90}
-\entry {\code {bookmark-write}}{90}
-\entry {\code {browse-url}}{434}
-\entry {\code {browse-url-at-mouse}}{434}
-\entry {\code {browse-url-at-point}}{434}
-\entry {\code {bs-show}}{181}
-\entry {\code {buffer-menu}}{177}
-\initial {C}
-\entry {\code {c-backslash-region}}{287}
-\entry {\code {c-backward-conditional}}{283}
-\entry {\code {c-backward-into-nomenclature}}{284}
-\entry {\code {c-beginning-of-statement}}{283}
-\entry {\code {c-electric-backspace}}{263}
-\entry {\code {c-end-of-statement}}{284}
-\entry {\code {c-fill-paragraph}}{286}
-\entry {\code {c-forward-conditional}}{283}
-\entry {\code {c-forward-into-nomenclature}}{284}
-\entry {\code {c-indent-command}}{267, 270}
-\entry {\code {c-indent-defun}}{270}
-\entry {\code {c-indent-exp}}{270}
-\entry {\code {c-macro-expand}}{286}
-\entry {\code {c-mark-function}}{265}
-\entry {\code {c-scope-operator}}{284}
-\entry {\code {c-set-style}}{271}
-\entry {\code {c-show-syntactic-information}}{287}
-\entry {\code {c-toggle-auto-hungry-state}}{286}
-\entry {\code {c-toggle-auto-state}}{284}
-\entry {\code {c-toggle-hungry-state}}{286}
-\entry {\code {c-up-conditional}}{283}
-\entry {\code {calendar}}{385}
-\entry {\code {calendar-backward-day}}{385}
-\entry {\code {calendar-backward-month}}{386}
-\entry {\code {calendar-backward-week}}{385}
-\entry {\code {calendar-beginning-of-month}}{386}
-\entry {\code {calendar-beginning-of-week}}{386}
-\entry {\code {calendar-beginning-of-year}}{386}
-\entry {\code {calendar-count-days-region}}{388}
-\entry {\code {calendar-cursor-holidays}}{390}
-\entry {\code {calendar-end-of-month}}{386}
-\entry {\code {calendar-end-of-week}}{386}
-\entry {\code {calendar-end-of-year}}{386}
-\entry {\code {calendar-forward-day}}{385}
-\entry {\code {calendar-forward-month}}{386}
-\entry {\code {calendar-forward-week}}{385}
-\entry {\code {calendar-forward-year}}{386}
-\entry {\code {calendar-goto-astro-day-number}}{395}
-\entry {\code {calendar-goto-chinese-date}}{395}
-\entry {\code {calendar-goto-coptic-date}}{395}
-\entry {\code {calendar-goto-date}}{387}
-\entry {\code {calendar-goto-ethiopic-date}}{395}
-\entry {\code {calendar-goto-french-date}}{395}
-\entry {\code {calendar-goto-hebrew-date}}{395}
-\entry {\code {calendar-goto-islamic-date}}{395}
-\entry {\code {calendar-goto-iso-date}}{395}
-\entry {\code {calendar-goto-julian-date}}{395}
-\entry {\code {calendar-goto-mayan-long-count-date}}{396}
-\entry {\code {calendar-goto-persian-date}}{395}
-\entry {\code {calendar-goto-today}}{387}
-\entry {\code {calendar-next-calendar-round-date}}{397}
-\entry {\code {calendar-next-haab-date}}{396}
-\entry {\code {calendar-next-tzolkin-date}}{396}
-\entry {\code {calendar-other-month}}{387}
-\entry {\code {calendar-phases-of-moon}}{392}
-\entry {\code {calendar-previous-haab-date}}{396}
-\entry {\code {calendar-previous-tzolkin-date}}{396}
-\entry {\code {calendar-print-astro-day-number}}{394}
-\entry {\code {calendar-print-chinese-date}}{394}
-\entry {\code {calendar-print-coptic-date}}{394}
-\entry {\code {calendar-print-day-of-year}}{388}
-\entry {\code {calendar-print-ethiopic-date}}{394}
-\entry {\code {calendar-print-french-date}}{394}
-\entry {\code {calendar-print-hebrew-date}}{394}
-\entry {\code {calendar-print-islamic-date}}{394}
-\entry {\code {calendar-print-iso-date}}{394}
-\entry {\code {calendar-print-julian-date}}{394}
-\entry {\code {calendar-print-mayan-date}}{394}
-\entry {\code {calendar-print-persian-date}}{394}
-\entry {\code {calendar-sunrise-sunset}}{391}
-\entry {\code {calendar-unmark}}{390}
-\entry {\code {call-last-kbd-macro}}{455}
-\entry {\code {capitalize-word}}{243}
-\entry {\code {cd}}{127}
-\entry {\code {center-line}}{240}
-\entry {\code {change-log-merge}}{312}
-\entry {\code {change-log-mode}}{312}
-\entry {\code {change-log-redate}}{312}
-\entry {\code {check-parens}}{271}
-\entry {\code {choose-completion}}{55}
-\entry {\code {clean-buffer-list}}{177}
-\entry {\code {clear-rectangle}}{85}
-\entry {\code {clone-indirect-buffer}}{179}
-\entry {\code {clone-indirect-buffer-other-window}}{179}
-\entry {\code {codepage-setup}}{537}
-\entry {\code {column-number-mode}}{101}
-\entry {\code {comint-bol-or-process-mark}}{413}
-\entry {\code {comint-continue-subjob}}{414}
-\entry {\code {comint-copy-old-input}}{416}
-\entry {\code {comint-delchar-or-maybe-eof}}{412}
-\entry {\code {comint-delete-output}}{413}
-\entry {\code {comint-dynamic-complete}}{412}
-\entry {\code {comint-dynamic-list-filename\dots {}}}{412}
-\entry {\code {comint-dynamic-list-input-ring}}{414}
-\entry {\code {comint-get-next-from-history}}{415}
-\entry {\code {comint-interrupt-subjob}}{413}
-\entry {\code {comint-kill-input}}{413}
-\entry {\code {comint-magic-space}}{417}
-\entry {\code {comint-next-input}}{415}
-\entry {\code {comint-next-matching-input}}{415}
-\entry {\code {comint-next-prompt}}{416}
-\entry {\code {comint-previous-input}}{415}
-\entry {\code {comint-previous-matching-input}}{415}
-\entry {\code {comint-previous-prompt}}{416}
-\entry {\code {comint-quit-subjob}}{413}
-\entry {\code {comint-run}}{415}
-\entry {\code {comint-send-input}}{412}
-\entry {\code {comint-show-maximum-output}}{413}
-\entry {\code {comint-show-output}}{413}
-\entry {\code {comint-stop-subjob}}{413}
-\entry {\code {comint-strip-ctrl-m}}{414}
-\entry {\code {comint-truncate-buffer}}{414}
-\entry {\code {comint-write-output}}{413}
-\entry {\code {comment-dwim}}{275}
-\entry {\code {comment-indent-new-line}}{276}
-\entry {\code {comment-kill}}{275}
-\entry {\code {comment-region}}{276}
-\entry {\code {comment-set-column}}{277}
-\entry {\code {compare-windows}}{167}
-\entry {\code {compile}}{297}
-\entry {\code {compile \r {(MS-DOS)}}}{538}
-\entry {\code {compile-goto-error}}{299}
-\entry {\code {complete-symbol}}{281}
-\entry {\code {compose-mail}}{341}
-\entry {\code {compose-mail-other-frame}}{341}
-\entry {\code {compose-mail-other-window}}{341}
-\entry {\code {copy-file}}{168}
-\entry {\code {copy-rectangle-to-register}}{88}
-\entry {\code {copy-to-buffer}}{83}
-\entry {\code {copy-to-register}}{88}
-\entry {\code {count-lines-page}}{237}
-\entry {\code {count-lines-region}}{47}
-\entry {\code {count-text-lines}}{255}
-\entry {\code {cpp-highlight-buffer}}{287}
-\entry {\code {create-fontset-from-fontset-spec}}{222}
-\entry {\code {crisp-mode}}{432}
-\entry {\code {customize}}{443}
-\entry {\code {customize-apropos}}{449}
-\entry {\code {customize-browse}}{444}
-\entry {\code {customize-changed-options}}{449}
-\entry {\code {customize-customized}}{449}
-\entry {\code {customize-face}}{449}
-\entry {\code {customize-group}}{449}
-\entry {\code {customize-option}}{449}
-\entry {\code {customize-saved}}{449}
-\entry {\code {cwarn-mode}}{287}
-\initial {D}
-\entry {\code {dabbrev-completion}}{333}
-\entry {\code {dabbrev-expand}}{333}
-\entry {\code {dbx}}{301}
-\entry {\code {debug_print}}{489}
-\entry {\code {decipher}}{437}
-\entry {\code {default-value}}{452}
-\entry {\code {define-abbrevs}}{333}
-\entry {\code {define-key}}{460}
-\entry {\code {define-mail-abbrev}}{345}
-\entry {\code {define-mail-alias}}{344}
-\entry {\code {delete-backward-char}}{78}
-\entry {\code {delete-blank-lines}}{45}
-\entry {\code {delete-char}}{78}
-\entry {\code {delete-file}}{168}
-\entry {\code {delete-frame}}{197}
-\entry {\code {delete-horizontal-space}}{79}
-\entry {\code {delete-indentation}}{230}
-\entry {\code {delete-matching-lines}}{120}
-\entry {\code {delete-non-matching-lines}}{120}
-\entry {\code {delete-other-frames}}{197}
-\entry {\code {delete-other-windows}}{187}
-\entry {\code {delete-rectangle}}{85}
-\entry {\code {delete-selection-mode}}{77}
-\entry {\code {delete-trailing-whitespace}}{96}
-\entry {\code {delete-whitespace-rectangle}}{85}
-\entry {\code {delete-window}}{187}
-\entry {\code {describe-bindings}}{69}
-\entry {\code {describe-categories}}{115}
-\entry {\code {describe-coding-system}}{213}
-\entry {\code {describe-copying}}{69}
-\entry {\code {describe-distribution}}{69}
-\entry {\code {describe-function}}{64}
-\entry {\code {describe-input-method}}{211}
-\entry {\code {describe-key}}{64}
-\entry {\code {describe-key-briefly}}{64}
-\entry {\code {describe-language-environment}}{208}
-\entry {\code {describe-mode}}{68}
-\entry {\code {describe-no-warranty}}{69}
-\entry {\code {describe-project}}{69}
-\entry {\code {describe-syntax}}{470}
-\entry {\code {desktop-save}}{430}
-\entry {\code {diary}}{398}
-\entry {\code {diary-anniversary}}{402}
-\entry {\code {diary-block}}{402}
-\entry {\code {diary-cyclic}}{402}
-\entry {\code {diary-float}}{403}
-\entry {\code {diary-mail-entries}}{399}
-\entry {\code {diff}}{166}
-\entry {\code {diff-backup}}{166}
-\entry {\code {diff-mode}}{167}
-\entry {\code {digit-argument}}{48}
-\entry {\code {dired}}{371}
-\entry {\code {dired-backup-diff}}{381}
-\entry {\code {dired-change-marks}}{375}
-\entry {\code {dired-clean-directory}}{373}
-\entry {\code {dired-create-directory}}{378}
-\entry {\code {dired-diff}}{381}
-\entry {\code {dired-display-file}}{374}
-\entry {\code {dired-do-byte-compile}}{378}
-\entry {\code {dired-do-chgrp}}{377}
-\entry {\code {dired-do-chmod}}{377}
-\entry {\code {dired-do-chown}}{378}
-\entry {\code {dired-do-compress}}{378}
-\entry {\code {dired-do-copy}}{377}
-\entry {\code {dired-do-copy-regexp}}{380}
-\entry {\code {dired-do-delete}}{377}
-\entry {\code {dired-do-flagged-delete}}{372}
-\entry {\code {dired-do-hardlink}}{377}
-\entry {\code {dired-do-hardlink-regexp}}{380}
-\entry {\code {dired-do-kill-lines}}{383}
-\entry {\code {dired-do-load}}{378}
-\entry {\code {dired-do-print}}{378}
-\entry {\code {dired-do-query-replace-regexp}}{378}
-\entry {\code {dired-do-redisplay}}{383}
-\entry {\code {dired-do-rename}}{377}
-\entry {\code {dired-do-rename-regexp}}{380}
-\entry {\code {dired-do-search}}{378}
-\entry {\code {dired-do-shell-command}}{379}
-\entry {\code {dired-do-symlink}}{377}
-\entry {\code {dired-do-symlink-regexp}}{380}
-\entry {\code {dired-do-toggle}}{375}
-\entry {\code {dired-downcase}}{380}
-\entry {\code {dired-find-alternate-file}}{374}
-\entry {\code {dired-find-file}}{374}
-\entry {\code {dired-find-file-other-window}}{374}
-\entry {\code {dired-flag-auto-save-files}}{373}
-\entry {\code {dired-flag-backup-files}}{373}
-\entry {\code {dired-flag-file-deletion}}{372}
-\entry {\code {dired-flag-files-regexp}}{373}
-\entry {\code {dired-flag-garbage-files}}{373}
-\entry {\code {dired-hide-all}}{382}
-\entry {\code {dired-hide-subdir}}{382}
-\entry {\code {dired-mark}}{374}
-\entry {\code {dired-mark-directories}}{375}
-\entry {\code {dired-mark-executables}}{374}
-\entry {\code {dired-mark-files-containing-regexp}}{376}
-\entry {\code {dired-mark-files-regexp}}{376}
-\entry {\code {dired-mark-subdir-files}}{375}
-\entry {\code {dired-mark-symlinks}}{375}
-\entry {\code {dired-maybe-insert-subdir}}{381}
-\entry {\code {dired-mouse-find-file-other-window}}{374}
-\entry {\code {dired-next-dirline}}{382}
-\entry {\code {dired-next-marked-file}}{375}
-\entry {\code {dired-next-subdir}}{382}
-\entry {\code {dired-other-frame}}{371}
-\entry {\code {dired-other-window}}{371}
-\entry {\code {dired-prev-dirline}}{382}
-\entry {\code {dired-prev-marked-file}}{375}
-\entry {\code {dired-prev-subdir}}{382}
-\entry {\code {dired-sort-toggle-or-edit}}{383}
-\entry {\code {dired-tree-down}}{382}
-\entry {\code {dired-tree-up}}{382}
-\entry {\code {dired-undo}}{376}
-\entry {\code {dired-unmark}}{375}
-\entry {\code {dired-unmark-all-files}}{375}
-\entry {\code {dired-unmark-all-marks}}{375}
-\entry {\code {dired-unmark-backward}}{375}
-\entry {\code {dired-up-directory}}{374}
-\entry {\code {dired-upcase}}{380}
-\entry {\code {dired-view-file}}{374}
-\entry {\code {dirs}}{417}
-\entry {\code {dirtrack-mode}}{417}
-\entry {\code {disable-command}}{468}
-\entry {\code {display-time}}{101}
-\entry {\code {dissociated-press}}{436}
-\entry {\code {do-applescript}}{526}
-\entry {\code {do-auto-save}}{142}
-\entry {\code {doctor}}{483}
-\entry {\code {down-list}}{273}
-\entry {\code {downcase-region}}{243}
-\entry {\code {downcase-word}}{243}
-\entry {\code {dunnet}}{437}
-\initial {E}
-\entry {\code {edit-abbrevs}}{332}
-\entry {\code {edit-kbd-macro}}{456}
-\entry {\code {edit-picture}}{337}
-\entry {\code {edit-tab-stops}}{231}
-\entry {\code {edit-tab-stops-note-changes}}{231}
-\entry {\code {edt-emulation-off}}{432}
-\entry {\code {edt-emulation-on}}{432}
-\entry {\code {eldoc-mode}}{280}
-\entry {\code {electric-nroff-mode}}{255}
-\entry {\code {emacs-lisp-mode}}{306}
-\entry {\code {emacs-version}}{484}
-\entry {\code {emerge-auto-advance-mode}}{324}
-\entry {\code {emerge-buffers}}{322}
-\entry {\code {emerge-buffers-with-ancestor}}{322}
-\entry {\code {emerge-files}}{322}
-\entry {\code {emerge-files-with-ancestor}}{322}
-\entry {\code {emerge-skip-prefers-mode}}{324}
-\entry {\code {enable-command}}{468}
-\entry {\code {enable-flow-control}}{481}
-\entry {\code {enable-flow-control-on}}{481}
-\entry {\code {enable-local-eval}}{454}
-\entry {\code {enable-local-variables}}{454}
-\entry {\code {end-kbd-macro}}{455}
-\entry {\code {end-of-buffer}}{41}
-\entry {\code {end-of-defun}}{265}
-\entry {\code {end-of-line}}{41}
-\entry {\code {enlarge-window}}{188}
-\entry {\code {enlarge-window-horizontally}}{188}
-\entry {\code {enriched-mode}}{256}
-\entry {\code {eshell}}{410}
-\entry {\code {european-calendar}}{400}
-\entry {\code {eval-current-buffer}}{307}
-\entry {\code {eval-defun}}{307}
-\entry {\code {eval-expression}}{307}
-\entry {\code {eval-last-sexp}}{307}
-\entry {\code {eval-region}}{307}
-\entry {\code {exchange-point-and-mark}}{72}
-\entry {\code {execute-extended-command}}{60}
-\entry {\code {exit-calendar}}{388}
-\entry {\code {exit-recursive-edit}}{431}
-\entry {\code {expand-abbrev}}{331}
-\entry {\code {expand-mail-aliases}}{345}
-\entry {\code {expand-region-abbrevs}}{331}
-\initial {F}
-\entry {\code {f90-mode}}{288}
-\entry {\code {facemenu-remove-all}}{257}
-\entry {\code {facemenu-remove-props}}{257}
-\entry {\code {facemenu-set-background}}{259}
-\entry {\code {facemenu-set-bold}}{258}
-\entry {\code {facemenu-set-bold-italic}}{258}
-\entry {\code {facemenu-set-default}}{258}
-\entry {\code {facemenu-set-face}}{258}
-\entry {\code {facemenu-set-foreground}}{259}
-\entry {\code {facemenu-set-italic}}{258}
-\entry {\code {facemenu-set-underline}}{258}
-\entry {\code {ff-find-related-file}}{287}
-\entry {\code {ffap}}{435}
-\entry {\code {ffap-dired-at-point}}{435}
-\entry {\code {ffap-menu}}{435}
-\entry {\code {ffap-mode}}{435}
-\entry {\code {ffap-next}}{435}
-\entry {\code {file-cache-add-directory}}{171}
-\entry {\code {file-cache-minibuffer-complete}}{171}
-\entry {\code {fill-individual-paragraphs}}{241}
-\entry {\code {fill-nonuniform-paragraphs}}{241}
-\entry {\code {fill-paragraph}}{239}
-\entry {\code {fill-region}}{239}
-\entry {\code {fill-region-as-paragraph}}{239}
-\entry {\code {find-alternate-file}}{131}
-\entry {\code {find-dired}}{384}
-\entry {\code {find-file}}{129}
-\entry {\code {find-file-at-point}}{435}
-\entry {\code {find-file-literally}}{131}
-\entry {\code {find-file-other-frame}}{131}
-\entry {\code {find-file-other-window}}{131}
-\entry {\code {find-file-read-only}}{131}
-\entry {\code {find-file-read-only-other-frame}}{197}
-\entry {\code {find-function}}{436}
-\entry {\code {find-function-on-key}}{436}
-\entry {\code {find-grep-dired}}{384}
-\entry {\code {find-name-dired}}{384}
-\entry {\code {find-tag}}{319}
-\entry {\code {find-tag-other-frame}}{320}
-\entry {\code {find-tag-other-window}}{320}
-\entry {\code {find-tag-regexp}}{320}
-\entry {\code {find-variable}}{436}
-\entry {\code {finder-by-keyword}}{66}
-\entry {\code {flush-lines}}{120}
-\entry {\code {flyspell-mode}}{123}
-\entry {\code {foldout-exit-fold}}{249}
-\entry {\code {foldout-zoom-subtree}}{249}
-\entry {\code {follow-mode}}{100}
-\entry {\code {font-lock-add-keywords}}{95}
-\entry {\code {font-lock-mode}}{94}
-\entry {\code {font-lock-remove-keywords}}{95}
-\entry {\code {format-find-file}}{262}
-\entry {\code {fortran-auto-fill-mode}}{293}
-\entry {\code {fortran-column-ruler}}{294}
-\entry {\code {fortran-comment-region}}{293}
-\entry {\code {fortran-indent-subprogram}}{289}
-\entry {\code {fortran-join-line}}{289}
-\entry {\code {fortran-mode}}{288}
-\entry {\code {fortran-next-statement}}{289}
-\entry {\code {fortran-previous-statement}}{289}
-\entry {\code {fortran-split-line}}{289}
-\entry {\code {fortran-strip-sequence-nos}}{295}
-\entry {\code {fortran-window-create}}{295}
-\entry {\code {fortran-window-create-momentarily}}{295}
-\entry {\code {fortune-to-signature}}{350}
-\entry {\code {forward-char}}{41}
-\entry {\code {forward-list}}{273}
-\entry {\code {forward-page}}{237}
-\entry {\code {forward-paragraph}}{236}
-\entry {\code {forward-sentence}}{235}
-\entry {\code {forward-sexp}}{272}
-\entry {\code {forward-text-line}}{255}
-\entry {\code {forward-word}}{234}
-\entry {\code {frame-configuration-to-register}}{88}
-\initial {G}
-\entry {\code {gdb}}{301}
-\entry {\code {getenv}}{499}
-\entry {\code {glasses-mode}}{282}
-\entry {\code {global-auto-revert-mode}}{140}
-\entry {\code {global-cwarn-mode}}{287}
-\entry {\code {global-font-lock-mode}}{94}
-\entry {\code {global-set-key}}{461}
-\entry {\code {global-unset-key}}{461}
-\entry {\code {gnus}}{407}
-\entry {\code {gnus-group-exit}}{408}
-\entry {\code {gnus-group-kill-group}}{408}
-\entry {\code {gnus-group-list-all-groups}}{408}
-\entry {\code {gnus-group-list-groups}}{408}
-\entry {\code {gnus-group-next-group}}{409}
-\entry {\code {gnus-group-next-unread-group}}{409}
-\entry {\code {gnus-group-prev-group}}{409}
-\entry {\code {gnus-group-prev-unread-group}}{409}
-\entry {\code {gnus-group-read-group}}{408}
-\entry {\code {gnus-group-unsubscribe-current-group}}{408}
-\entry {\code {gnus-summary-isearch-article}}{409}
-\entry {\code {gnus-summary-next-subject}}{409}
-\entry {\code {gnus-summary-next-unread-article}}{409}
-\entry {\code {gnus-summary-prev-page}}{409}
-\entry {\code {gnus-summary-prev-subject}}{409}
-\entry {\code {gnus-summary-prev-unread-article}}{409}
-\entry {\code {gnus-summary-search-article-forward}}{409}
-\entry {\code {gomoku}}{437}
-\entry {\code {goto-address}}{434}
-\entry {\code {goto-char}}{41}
-\entry {\code {goto-line}}{41}
-\entry {\code {grep}}{298}
-\entry {\code {grep \r {(MS-DOS)}}}{538}
-\entry {\code {grep-find}}{298}
-\entry {\code {gud-cont}}{303}
-\entry {\code {gud-def}}{304}
-\entry {\code {gud-down}}{303}
-\entry {\code {gud-finish}}{303}
-\entry {\code {gud-gdb-complete-command}}{303}
-\entry {\code {gud-next}}{302}
-\entry {\code {gud-refresh}}{302}
-\entry {\code {gud-remove}}{303}
-\entry {\code {gud-step}}{302}
-\entry {\code {gud-stepi}}{303}
-\entry {\code {gud-tbreak}}{303}
-\entry {\code {gud-up}}{303}
-\initial {H}
-\entry {\code {handwrite}}{423}
-\entry {\code {hanoi}}{437}
-\entry {\code {help-command}}{61}
-\entry {\code {help-for-help}}{61}
-\entry {\code {help-next-ref}}{68}
-\entry {\code {help-previous-ref}}{68}
-\entry {\code {help-with-tutorial}}{39}
-\entry {\code {hi-lock-find-patterns}}{96}
-\entry {\code {hi-lock-mode}}{95}
-\entry {\code {hi-lock-write-interactive-patterns}}{96}
-\entry {\code {hide-body}}{248}
-\entry {\code {hide-entry}}{247}
-\entry {\code {hide-ifdef-mode}}{287}
-\entry {\code {hide-leaves}}{248}
-\entry {\code {hide-other}}{248}
-\entry {\code {hide-sublevels}}{248}
-\entry {\code {hide-subtree}}{247}
-\entry {\code {highlight-changes-mode}}{95}
-\entry {\code {highlight-lines-matching-regexp}}{96}
-\entry {\code {highlight-regexp}}{96}
-\entry {\code {hl-line-mode}}{104}
-\entry {\code {holidays}}{390}
-\entry {\code {how-many}}{120}
-\entry {\code {hs-hide-all}}{280}
-\entry {\code {hs-hide-block}}{280}
-\entry {\code {hs-hide-level}}{280}
-\entry {\code {hs-minor-mode}}{280}
-\entry {\code {hs-show-all}}{280}
-\entry {\code {hs-show-block}}{280}
-\entry {\code {hs-show-region}}{280}
-\initial {I}
-\entry {\code {icomplete-mode}}{56}
-\entry {\code {iconify-or-deiconify-frame}}{197}
-\entry {\code {ielm}}{308}
-\entry {\code {imenu}}{266}
-\entry {\code {imenu-add-menubar-index}}{266}
-\entry {\code {increase-left-margin}}{259}
-\entry {\code {increment-register}}{89}
-\entry {\code {indent-code-rigidly}}{268}
-\entry {\code {indent-for-tab-command}}{267}
-\entry {\code {indent-line-function}}{267}
-\entry {\code {indent-region}}{230}
-\entry {\code {indent-relative}}{230}
-\entry {\code {indent-rigidly}}{230}
-\entry {\code {indent-sexp}}{268}
-\entry {\code {info}}{68}
-\entry {\code {Info-goto-emacs-command-node}}{68}
-\entry {\code {Info-goto-emacs-key-command-node}}{68}
-\entry {\code {info-lookup-file}}{278}
-\entry {\code {info-lookup-symbol}}{278}
-\entry {\code {insert-abbrevs}}{333}
-\entry {\code {insert-anniversary-diary-entry}}{402}
-\entry {\code {insert-block-diary-entry}}{402}
-\entry {\code {insert-cyclic-diary-entry}}{402}
-\entry {\code {insert-diary-entry}}{401}
-\entry {\code {insert-file}}{167}
-\entry {\code {insert-kbd-macro}}{457}
-\entry {\code {insert-monthly-diary-entry}}{401}
-\entry {\code {insert-register}}{88}
-\entry {\code {insert-weekly-diary-entry}}{401}
-\entry {\code {insert-yearly-diary-entry}}{401}
-\entry {\code {inverse-add-global-abbrev}}{330}
-\entry {\code {inverse-add-mode-abbrev}}{330}
-\entry {\code {isearch-backward}}{107}
-\entry {\code {isearch-backward-regexp}}{110}
-\entry {\code {isearch-forward}}{105}
-\entry {\code {isearch-forward-regexp}}{110}
-\entry {\code {isearch-toggle-input-method}}{106}
-\entry {\code {isearch-toggle-specified-input-method}}{106}
-\entry {\code {iso-accents-mode}}{224}
-\entry {\code {iso-gtex2iso}}{255}
-\entry {\code {iso-iso2gtex}}{255}
-\entry {\code {iso-iso2tex}}{255}
-\entry {\code {iso-tex2iso}}{255}
-\entry {\code {ispell}}{124}
-\entry {\code {ispell-buffer}}{123}
-\entry {\code {ispell-complete-word}}{125}
-\entry {\code {ispell-kill-ispell}}{125}
-\entry {\code {ispell-message}}{349}
-\entry {\code {ispell-region}}{123}
-\entry {\code {ispell-word}}{123}
-\entry {\code {iswitchb-mode}}{181}
-\initial {J}
-\entry {\code {jdb}}{301}
-\entry {\code {jump-to-register}}{87}
-\entry {\code {just-one-space}}{79}
-\initial {K}
-\entry {\code {kbd-macro-query}}{457}
-\entry {\code {keep-lines}}{120}
-\entry {\code {keyboard-escape-quit}}{478}
-\entry {\code {keyboard-quit}}{477}
-\entry {\code {keyboard-translate}}{469}
-\entry {\code {kill-all-abbrevs}}{330}
-\entry {\code {kill-buffer}}{176}
-\entry {\code {kill-buffer-and-window}}{187}
-\entry {\code {kill-compilation}}{298}
-\entry {\code {kill-line}}{79}
-\entry {\code {kill-local-variable}}{451}
-\entry {\code {kill-rectangle}}{85}
-\entry {\code {kill-region}}{80}
-\entry {\code {kill-ring-save}}{81}
-\entry {\code {kill-sentence}}{235}
-\entry {\code {kill-sexp}}{272}
-\entry {\code {kill-some-buffers}}{176}
-\entry {\code {kill-word}}{234}
-\initial {L}
-\entry {\code {latex-mode}}{250}
-\entry {\code {life}}{437}
-\entry {\code {line-number-mode}}{101}
-\entry {\code {lisp-complete-symbol}}{282}
-\entry {\code {lisp-eval-defun}}{309}
-\entry {\code {lisp-interaction-mode}}{308}
-\entry {\code {lisp-mode}}{309}
-\entry {\code {list-abbrevs}}{332}
-\entry {\code {list-bookmarks}}{89}
-\entry {\code {list-buffers}}{174}
-\entry {\code {list-calendar-holidays}}{390}
-\entry {\code {list-coding-systems}}{213}
-\entry {\code {list-colors-display}}{505}
-\entry {\code {list-command-history}}{58}
-\entry {\code {list-directory}}{166}
-\entry {\code {list-faces-display}}{92}
-\entry {\code {list-holidays}}{390}
-\entry {\code {list-input-methods}}{212}
-\entry {\code {list-matching-lines}}{120}
-\entry {\code {list-tags}}{321}
-\entry {\code {list-text-properties-at}}{257}
-\entry {\code {list-yahrzeit-dates}}{395}
-\entry {\code {lm}}{437}
-\entry {\code {load}}{305}
-\entry {\code {load-file}}{305}
-\entry {\code {load-library}}{305}
-\entry {\code {local-set-key}}{461}
-\entry {\code {local-unset-key}}{461}
-\entry {\code {locate}}{384}
-\entry {\code {locate-with-filter}}{384}
-\entry {\code {lpr-buffer}}{422}
-\entry {\code {lpr-region}}{422}
-\initial {M}
-\entry {\code {mac-file-name-to-posix}}{526}
-\entry {\code {mail-attach-file}}{349}
-\entry {\code {mail-bcc}}{347}
-\entry {\code {mail-cc}}{347}
-\entry {\code {mail-complete}}{347}
-\entry {\code {mail-fcc}}{347}
-\entry {\code {mail-fill-yanked-message}}{348}
-\entry {\code {mail-interactive-insert-alias}}{345}
-\entry {\code {mail-send}}{346}
-\entry {\code {mail-send-and-exit}}{346}
-\entry {\code {mail-signature}}{348}
-\entry {\code {mail-subject}}{347}
-\entry {\code {mail-text}}{348}
-\entry {\code {mail-to}}{347}
-\entry {\code {mail-yank-original}}{348}
-\entry {\code {mail-yank-region}}{348}
-\entry {\code {make-frame-command}}{196}
-\entry {\code {make-frame-on-display}}{198}
-\entry {\code {make-indirect-buffer}}{179}
-\entry {\code {make-local-variable}}{451}
-\entry {\code {make-symbolic-link}}{168}
-\entry {\code {make-variable-buffer-local}}{451}
-\entry {\code {Man-fontify-manpage}}{279}
-\entry {\code {manual-entry}}{278}
-\entry {\code {mark-calendar-holidays}}{390}
-\entry {\code {mark-defun}}{265}
-\entry {\code {mark-diary-entries}}{398}
-\entry {\code {mark-page}}{237}
-\entry {\code {mark-paragraph}}{236}
-\entry {\code {mark-sexp}}{273}
-\entry {\code {mark-whole-buffer}}{75}
-\entry {\code {mark-word}}{234}
-\entry {\code {menu-bar-enable-clipboard}}{194}
-\entry {\code {minibuffer-complete}}{54}
-\entry {\code {minibuffer-complete-word}}{54}
-\entry {\code {mode, auto-image-file}}{172}
-\entry {\code {mode25}}{529}
-\entry {\code {mode4350}}{529}
-\entry {\code {modify-face}}{448}
-\entry {\code {morse-region}}{437}
-\entry {\code {mouse-avoidance-mode}}{204}
-\entry {\code {mouse-buffer-menu}}{181}
-\entry {\code {mouse-choose-completion}}{54}
-\entry {\code {mouse-save-then-click}}{191}
-\entry {\code {mouse-secondary-save-then-kill}}{194}
-\entry {\code {mouse-set-point}}{191}
-\entry {\code {mouse-set-region}}{191}
-\entry {\code {mouse-set-secondary}}{193}
-\entry {\code {mouse-start-secondary}}{194}
-\entry {\code {mouse-wheel-mode}}{202}
-\entry {\code {mouse-yank-at-click}}{191}
-\entry {\code {mouse-yank-secondary}}{194}
-\entry {\code {move-to-window-line}}{41}
-\entry {\code {mpuz}}{437}
-\entry {\code {msb-mode}}{181}
-\entry {\code {msdos-set-mouse-buttons}}{528}
-\initial {N}
-\entry {\code {name-last-kbd-macro}}{456}
-\entry {\code {narrow-to-defun}}{427}
-\entry {\code {narrow-to-page}}{427}
-\entry {\code {narrow-to-region}}{427}
-\entry {\code {negative-argument}}{48}
-\entry {\code {newline}}{40}
-\entry {\code {newline-and-indent}}{267}
-\entry {\code {next-completion}}{55}
-\entry {\code {next-error}}{299}
-\entry {\code {next-history-element}}{57}
-\entry {\code {next-line}}{41}
-\entry {\code {next-matching-history-element}}{57}
-\entry {\code {normal-erase-is-backspace-mode}}{79, 479}
-\entry {\code {normal-mode}}{227}
-\entry {\code {not-modified}}{133}
-\entry {\code {nroff-mode}}{255}
-\entry {\code {number-to-register}}{89}
-\initial {O}
-\entry {\code {occur}}{120}
-\entry {\code {open-dribble-file}}{486}
-\entry {\code {open-line}}{45}
-\entry {\code {open-rectangle}}{85}
-\entry {\code {open-termscript}}{487}
-\entry {\code {other-frame}}{197}
-\entry {\code {other-window}}{185}
-\entry {\code {outline-backward-same-level}}{246}
-\entry {\code {outline-forward-same-level}}{246}
-\entry {\code {outline-minor-mode}}{244}
-\entry {\code {outline-mode}}{244}
-\entry {\code {outline-next-visible-heading}}{246}
-\entry {\code {outline-previous-visible-heading}}{246}
-\entry {\code {outline-up-heading}}{246}
-\entry {\code {overwrite-mode}}{440}
-\initial {P}
-\entry {\code {paragraph-indent-minor-mode}}{244}
-\entry {\code {paragraph-indent-text-mode}}{244}
-\entry {\code {partial-completion-mode}}{56}
-\entry {\code {pc-bindings-mode}}{432}
-\entry {\code {pc-selection-mode}}{432}
-\entry {\code {pdb}}{301}
-\entry {\code {perldb}}{301}
-\entry {\code {phases-of-moon}}{392}
-\entry {\code {picture-backward-clear-column}}{338}
-\entry {\code {picture-backward-column}}{337}
-\entry {\code {picture-clear-column}}{338}
-\entry {\code {picture-clear-line}}{338}
-\entry {\code {picture-clear-rectangle}}{340}
-\entry {\code {picture-clear-rectangle-to-register}}{340}
-\entry {\code {picture-forward-column}}{337}
-\entry {\code {picture-motion}}{339}
-\entry {\code {picture-motion-reverse}}{339}
-\entry {\code {picture-move-down}}{337}
-\entry {\code {picture-move-up}}{337}
-\entry {\code {picture-movement-down}}{338}
-\entry {\code {picture-movement-left}}{338}
-\entry {\code {picture-movement-ne}}{338}
-\entry {\code {picture-movement-nw}}{338}
-\entry {\code {picture-movement-right}}{338}
-\entry {\code {picture-movement-se}}{338}
-\entry {\code {picture-movement-sw}}{338}
-\entry {\code {picture-movement-up}}{338}
-\entry {\code {picture-newline}}{338}
-\entry {\code {picture-open-line}}{338}
-\entry {\code {picture-set-tab-stops}}{339}
-\entry {\code {picture-tab}}{339}
-\entry {\code {picture-tab-search}}{339}
-\entry {\code {picture-yank-rectangle}}{340}
-\entry {\code {picture-yank-rectangle-from-register}}{340}
-\entry {\code {plain-tex-mode}}{250}
-\entry {\code {point-to-register}}{87}
-\entry {\code {pong}}{437}
-\entry {\code {pop-global-mark}}{76}
-\entry {\code {pop-tag-mark}}{320}
-\entry {\code {posix-file-name-to-mac}}{526}
-\entry {\code {prefer-coding-system}}{215}
-\entry {\code {prepend-to-buffer}}{83}
-\entry {\code {previous-completion}}{55}
-\entry {\code {previous-history-element}}{57}
-\entry {\code {previous-line}}{41}
-\entry {\code {previous-matching-history-element}}{57}
-\entry {\code {print-buffer}}{422}
-\entry {\code {print-buffer \r {(MS-DOS)}}}{534}
-\entry {\code {print-region}}{422}
-\entry {\code {print-region \r {(MS-DOS)}}}{534}
-\entry {\code {ps-print-buffer}}{423}
-\entry {\code {ps-print-buffer \r {(MS-DOS)}}}{534}
-\entry {\code {ps-print-buffer-with-faces}}{423}
-\entry {\code {ps-print-region}}{423}
-\entry {\code {ps-print-region-with-faces}}{423}
-\entry {\code {ps-spool-buffer}}{423}
-\entry {\code {ps-spool-buffer \r {(MS-DOS)}}}{534}
-\entry {\code {ps-spool-buffer-with-faces}}{423}
-\entry {\code {ps-spool-region}}{423}
-\entry {\code {ps-spool-region-with-faces}}{423}
-\entry {\code {pwd}}{127}
-\initial {Q}
-\entry {\code {quail-set-keyboard-layout}}{212}
-\entry {\code {query-replace}}{118}
-\entry {\code {query-replace-regexp}}{118}
-\entry {\code {quietly-read-abbrev-file}}{333}
-\entry {\code {quoted-insert}}{40}
-\initial {R}
-\entry {\code {re-search-backward}}{110}
-\entry {\code {re-search-forward}}{110}
-\entry {\code {read-abbrev-file}}{333}
-\entry {\code {recenter}}{97}
-\entry {\code {recentf-edit-list}}{172}
-\entry {\code {recentf-mode}}{172}
-\entry {\code {recentf-save-list}}{172}
-\entry {\code {recompile}}{298}
-\entry {\code {recover-file}}{142}
-\entry {\code {recover-session}}{142}
-\entry {\code {redraw-calendar}}{388}
-\entry {\code {remove-untranslated-filesystem}}{532}
-\entry {\code {rename-buffer}}{175}
-\entry {\code {rename-file}}{168}
-\entry {\code {repeat}}{50}
-\entry {\code {repeat-complex-command}}{58}
-\entry {\code {replace-regexp}}{117}
-\entry {\code {replace-string}}{117}
-\entry {\code {report-emacs-bug}}{486}
-\entry {\code {reposition-window}}{98}
-\entry {\code {revert-buffer}}{139}
-\entry {\code {revert-buffer \r {(Dired)}}}{383}
-\entry {\code {rmail}}{351}
-\entry {\code {rmail-add-label}}{358}
-\entry {\code {rmail-beginning-of-message}}{352}
-\entry {\code {rmail-bury}}{351}
-\entry {\code {rmail-continue}}{361}
-\entry {\code {rmail-delete-backward}}{354}
-\entry {\code {rmail-delete-forward}}{354}
-\entry {\code {rmail-edit-current-message}}{366}
-\entry {\code {rmail-expunge}}{354}
-\entry {\code {rmail-expunge-and-save}}{351}
-\entry {\code {rmail-first-message}}{353}
-\entry {\code {rmail-forward}}{361}
-\entry {\code {rmail-get-new-mail}}{356}
-\entry {\code {rmail-input}}{355}
-\entry {\code {rmail-kill-label}}{358}
-\entry {\code {rmail-last-message}}{353}
-\entry {\code {rmail-mail}}{361}
-\entry {\code {rmail-mode}}{351}
-\entry {\code {rmail-next-labeled-message}}{358}
-\entry {\code {rmail-next-message}}{353}
-\entry {\code {rmail-next-undeleted-message}}{353}
-\entry {\code {rmail-output}}{357}
-\entry {\code {rmail-output-body-to-file}}{357}
-\entry {\code {rmail-output-to-rmail-file}}{357}
-\entry {\code {rmail-previous-labeled-message}}{358}
-\entry {\code {rmail-previous-message}}{353}
-\entry {\code {rmail-previous-undeleted-message}}{353}
-\entry {\code {rmail-quit}}{351}
-\entry {\code {rmail-redecode-body}}{366}
-\entry {\code {rmail-reply}}{360}
-\entry {\code {rmail-resend}}{361}
-\entry {\code {rmail-retry-failure}}{360}
-\entry {\code {rmail-search}}{353}
-\entry {\code {rmail-show-message}}{353}
-\entry {\code {rmail-summary}}{362}
-\entry {\code {rmail-summary-by-labels}}{362}
-\entry {\code {rmail-summary-by-recipients}}{362}
-\entry {\code {rmail-summary-by-regexp}}{362}
-\entry {\code {rmail-summary-by-topic}}{362}
-\entry {\code {rmail-summary-quit}}{364}
-\entry {\code {rmail-summary-wipe}}{364}
-\entry {\code {rmail-toggle-header}}{365}
-\entry {\code {rmail-undelete-previous-message}}{354}
-\entry {\code {rot13-other-window}}{368}
-\entry {\code {run-lisp}}{308}
-\initial {S}
-\entry {\code {save-buffer}}{132}
-\entry {\code {save-buffers-kill-emacs}}{36}
-\entry {\code {save-some-buffers}}{132}
-\entry {\code {scroll-all-mode}}{432}
-\entry {\code {scroll-bar-mode}}{201}
-\entry {\code {scroll-calendar-left}}{387}
-\entry {\code {scroll-calendar-left-three-months}}{387}
-\entry {\code {scroll-calendar-right}}{387}
-\entry {\code {scroll-calendar-right-three-months}}{387}
-\entry {\code {scroll-down}}{97}
-\entry {\code {scroll-left}}{99}
-\entry {\code {scroll-other-window}}{185}
-\entry {\code {scroll-right}}{99}
-\entry {\code {scroll-up}}{97}
-\entry {\code {sdb}}{301}
-\entry {\code {search-backward}}{109}
-\entry {\code {search-forward}}{109}
-\entry {\code {select-frame-by-name}}{204}
-\entry {\code {self-insert}}{40}
-\entry {\code {send-invisible}}{414}
-\entry {\code {server-edit}}{420}
-\entry {\code {set-background-color}}{200}
-\entry {\code {set-border-color}}{200}
-\entry {\code {set-buffer-file-coding-system}}{218}
-\entry {\code {set-buffer-process-coding-system}}{219}
-\entry {\code {set-cursor-color}}{200}
-\entry {\code {set-face-background}}{91}
-\entry {\code {set-face-foreground}}{91}
-\entry {\code {set-fill-column}}{240}
-\entry {\code {set-fill-prefix}}{241}
-\entry {\code {set-foreground-color}}{200}
-\entry {\code {set-frame-font}}{200}
-\entry {\code {set-frame-name}}{204}
-\entry {\code {set-goal-column}}{42}
-\entry {\code {set-input-method}}{211}
-\entry {\code {set-justification-center}}{261}
-\entry {\code {set-justification-full}}{261}
-\entry {\code {set-justification-left}}{261}
-\entry {\code {set-justification-none}}{261}
-\entry {\code {set-justification-right}}{261}
-\entry {\code {set-keyboard-coding-system}}{219}
-\entry {\code {set-language-environment}}{207}
-\entry {\code {set-locale-environment}}{208}
-\entry {\code {set-mark-command}}{71}
-\entry {\code {set-mouse-color}}{200}
-\entry {\code {set-next-selection-coding-system}}{219}
-\entry {\code {set-rmail-inbox-list}}{356}
-\entry {\code {set-selection-coding-system}}{219}
-\entry {\code {set-selective-display}}{100}
-\entry {\code {set-terminal-coding-system}}{219}
-\entry {\code {set-variable}}{442}
-\entry {\code {set-visited-file-name}}{133}
-\entry {\code {setenv}}{499}
-\entry {\code {setq-default}}{452}
-\entry {\code {shell}}{411}
-\entry {\code {shell-backward-command}}{414}
-\entry {\code {shell-command}}{410}
-\entry {\code {shell-command-on-region}}{410}
-\entry {\code {shell-forward-command}}{414}
-\entry {\code {shell-pushd-dextract}}{418}
-\entry {\code {shell-pushd-dunique}}{418}
-\entry {\code {shell-pushd-tohome}}{418}
-\entry {\code {show-all}}{248}
-\entry {\code {show-all-diary-entries}}{398}
-\entry {\code {show-branches}}{248}
-\entry {\code {show-children}}{248}
-\entry {\code {show-entry}}{247}
-\entry {\code {show-paren-mode}}{274}
-\entry {\code {show-subtree}}{247}
-\entry {\code {shrink-window-if-larger-than-buffer}}{188}
-\entry {\code {slitex-mode}}{250}
-\entry {\code {smerge-mode}}{167}
-\entry {\code {snake}}{437}
-\entry {\code {solitaire}}{437}
-\entry {\code {sort-columns}}{426}
-\entry {\code {sort-fields}}{425}
-\entry {\code {sort-lines}}{425}
-\entry {\code {sort-numeric-fields}}{425}
-\entry {\code {sort-pages}}{425}
-\entry {\code {sort-paragraphs}}{425}
-\entry {\code {split-line}}{230}
-\entry {\code {split-window-horizontally}}{184}
-\entry {\code {split-window-vertically}}{184}
-\entry {\code {spook}}{349}
-\entry {\code {standard-display-8bit}}{223}
-\entry {\code {start-kbd-macro}}{455}
-\entry {\code {string-insert-rectangle}}{86}
-\entry {\code {string-rectangle}}{86}
-\entry {\code {studlify-region}}{437}
-\entry {\code {substitute-in-file-name}}{128}
-\entry {\code {substitute-key-definition}}{473}
-\entry {\code {sunrise-sunset}}{391}
-\entry {\code {suspend-emacs}}{36}
-\entry {\code {switch-to-buffer}}{174}
-\entry {\code {switch-to-buffer-other-frame}}{174}
-\entry {\code {switch-to-buffer-other-window}}{174}
-\entry {\code {switch-to-completions}}{54}
-\initial {T}
-\entry {\code {tab-to-tab-stop}}{231}
-\entry {\code {tabify}}{231}
-\entry {\code {tags-apropos}}{322}
-\entry {\code {tags-loop-continue}}{321}
-\entry {\code {tags-query-replace}}{321}
-\entry {\code {tags-search}}{320}
-\entry {\code {term}}{418}
-\entry {\code {term-char-mode}}{419}
-\entry {\code {term-line-mode}}{419}
-\entry {\code {term-pager-toggle}}{419}
-\entry {\code {tetris}}{437}
-\entry {\code {tex-bibtex-file}}{254}
-\entry {\code {tex-buffer}}{253}
-\entry {\code {tex-close-latex-block}}{252}
-\entry {\code {tex-file}}{254}
-\entry {\code {tex-insert-braces}}{251}
-\entry {\code {tex-insert-quote}}{251}
-\entry {\code {tex-kill-job}}{253}
-\entry {\code {tex-latex-block}}{252}
-\entry {\code {tex-mode}}{250}
-\entry {\code {tex-print}}{253}
-\entry {\code {tex-recenter-output-buffer}}{253}
-\entry {\code {tex-region}}{253}
-\entry {\code {tex-show-print-queue}}{253}
-\entry {\code {tex-terminate-paragraph}}{251}
-\entry {\code {tex-validate-region}}{251}
-\entry {\code {tex-view}}{253}
-\entry {\code {text-mode}}{243}
-\entry {\code {time-stamp}}{139}
-\entry {\code {timeclock-in}}{405}
-\entry {\code {timeclock-modeline-display}}{405}
-\entry {\code {timeclock-out}}{405}
-\entry {\code {timeclock-reread-log}}{405}
-\entry {\code {timeclock-when-to-leave}}{405}
-\entry {\code {timeclock-workday-remaining}}{405}
-\entry {\code {tmm-menubar}}{28}
-\entry {\code {toggle-debug-on-error}}{488}
-\entry {\code {toggle-enable-multibyte-characters}}{207}
-\entry {\code {toggle-input-method}}{211}
-\entry {\code {toggle-save-place}}{430}
-\entry {\code {toggle-scroll-bar}}{202}
-\entry {\code {toggle-truncate-lines}}{46}
-\entry {\code {tooltip-mode}}{203}
-\entry {\code {top-level}}{478}
-\entry {\code {tpu-edt-on}}{433}
-\entry {\code {transient-mark-mode}}{73}
-\entry {\code {transpose-chars}}{122}
-\entry {\code {transpose-lines}}{122}
-\entry {\code {transpose-sexps}}{272}
-\entry {\code {transpose-words}}{122}
-\entry {\code {tty-suppress-bold-inverse-default-colors}}{104}
-\entry {\code {turn-on-font-lock}}{94}
-\initial {U}
-\entry {\code {undigestify-rmail-message}}{367}
-\entry {\code {undo}}{43}
-\entry {\code {unexpand-abbrev}}{331}
-\entry {\code {unforward-rmail-message}}{361}
-\entry {\code {unhighlight-regexp}}{96}
-\entry {\code {universal-argument}}{49}
-\entry {\code {universal-coding-system-argument}}{218}
-\entry {\code {unmorse-region}}{437}
-\entry {\code {unrmail}}{367}
-\entry {\code {untabify}}{231}
-\entry {\code {up-list}}{251}
-\entry {\code {upcase-region}}{243}
-\entry {\code {upcase-word}}{243}
-\initial {V}
-\entry {\code {vc-annotate}}{149}
-\entry {\code {vc-cancel-version}}{150}
-\entry {\code {vc-create-snapshot}}{158}
-\entry {\code {vc-diff}}{148}
-\entry {\code {vc-directory}}{151}
-\entry {\code {vc-dired-mark-locked}}{152}
-\entry {\code {vc-dired-toggle-terse-mode}}{152}
-\entry {\code {vc-insert-headers}}{162}
-\entry {\code {vc-merge}}{154}
-\entry {\code {vc-next-action}}{145}
-\entry {\code {vc-print-log}}{150}
-\entry {\code {vc-register}}{149}
-\entry {\code {vc-rename-file}}{161}
-\entry {\code {vc-retrieve-snapshot}}{158}
-\entry {\code {vc-revert-buffer}}{150}
-\entry {\code {vc-switch-backend}}{158}
-\entry {\code {vc-toggle-read-only}}{145}
-\entry {\code {vc-update-change-log}}{160}
-\entry {\code {vc-version-other-window}}{148}
-\entry {\code {vi-mode}}{433}
-\entry {\code {view-buffer}}{176}
-\entry {\code {view-diary-entries}}{398}
-\entry {\code {view-emacs-FAQ}}{69}
-\entry {\code {view-emacs-news}}{69}
-\entry {\code {view-emacs-problems}}{69}
-\entry {\code {view-file}}{167}
-\entry {\code {view-hello-file}}{206}
-\entry {\code {view-lossage}}{68}
-\entry {\code {view-register}}{87}
-\entry {\code {vip-mode}}{433}
-\entry {\code {viper-mode}}{433}
-\entry {\code {visit-tags-table}}{318}
-\initial {W}
-\entry {\code {what-cursor-position}}{47}
-\entry {\code {what-line}}{47}
-\entry {\code {what-page}}{47}
-\entry {\code {where-is}}{64}
-\entry {\code {which-function-mode}}{266}
-\entry {\code {widen}}{428}
-\entry {\code {widget-backward}}{446}
-\entry {\code {widget-complete}}{445}
-\entry {\code {widget-forward}}{446}
-\entry {\code {windmove-default-keybindings}}{188}
-\entry {\code {windmove-right}}{188}
-\entry {\code {window-configuration-to-register}}{88}
-\entry {\code {winner-mode}}{188}
-\entry {\code {woman}}{279}
-\entry {\code {woman-find-file}}{280}
-\entry {\code {word-search-backward}}{109}
-\entry {\code {word-search-forward}}{109}
-\entry {\code {wordstar-mode}}{433}
-\entry {\code {write-abbrev-file}}{333}
-\entry {\code {write-file}}{133}
-\entry {\code {write-region}}{167}
-\initial {X}
-\entry {\code {xdb}}{301}
-\initial {Y}
-\entry {\code {yank}}{81}
-\entry {\code {yank-pop}}{82}
-\entry {\code {yank-rectangle}}{85}
-\entry {\code {yow}}{437}
-\initial {Z}
-\entry {\code {zap-to-char}}{80}
-\entry {\code {zone}}{437}
diff -ruN src-21.1/man/emacs.kys src-21.2/man/emacs.kys
--- src-21.1/man/emacs.kys	Sat Oct 20 18:45:15 2001
+++ src-21.2/man/emacs.kys	Thu Jan  1 01:00:00 1970
@@ -1,736 +0,0 @@
-\initial {!}
-\entry {\code {! \r {(Dired)}}}{379}
-\initial {#}
-\entry {\code {# \r {(Dired)}}}{373}
-\initial {$}
-\entry {\code {$ \r {(Dired)}}}{382}
-\initial {%}
-\entry {\code {% C \r {(Dired)}}}{380}
-\entry {\code {% d \r {(Dired)}}}{373}
-\entry {\code {% g \r {(Dired)}}}{376}
-\entry {\code {% H \r {(Dired)}}}{380}
-\entry {\code {% l \r {(Dired)}}}{380}
-\entry {\code {% m \r {(Dired)}}}{376}
-\entry {\code {% R \r {(Dired)}}}{380}
-\entry {\code {% S \r {(Dired)}}}{380}
-\entry {\code {% u \r {(Dired)}}}{380}
-\initial {&}
-\entry {\code {& \r {(Dired)}}}{373}
-\initial {*}
-\entry {\code {* ! \r {(Dired)}}}{375}
-\entry {\code {* % \r {(Dired)}}}{376}
-\entry {\code {* * \r {(Dired)}}}{374}
-\entry {\code {* / \r {(Dired)}}}{375}
-\entry {\code {* ? \r {(Dired)}}}{375}
-\entry {\code {* @ \r {(Dired)}}}{375}
-\entry {\code {* c \r {(Dired)}}}{375}
-\entry {\code {* C-n \r {(Dired)}}}{375}
-\entry {\code {* C-p \r {(Dired)}}}{375}
-\entry {\code {* DEL \r {(Dired)}}}{375}
-\entry {\code {* m \r {(Dired)}}}{374}
-\entry {\code {* s \r {(Dired)}}}{375}
-\entry {\code {* t \r {(Dired)}}}{375}
-\entry {\code {* u \r {(Dired)}}}{375}
-\initial {.}
-\entry {\code {. \r {(Calendar mode)}}}{387}
-\entry {\code {. \r {(Dired)}}}{373}
-\entry {\code {. \r {(Rmail)}}}{352}
-\initial {=}
-\entry {\code {= \r {(Dired)}}}{381}
-\initial {{\tt\char 126}}
-\entry {\code {~ \r {(Dired)}}}{373}
-\initial {{\tt\char 34}}
-\entry {\code {" \r {(\TeX{} mode)}}}{251}
-\initial {{\tt\char 43}}
-\entry {\code {+ \r {(Dired)}}}{378}
-\initial {{\tt\gtr}}
-\entry {\code {> \r {(Dired)}}}{382}
-\entry {\code {> \r {(Rmail)}}}{353}
-\initial {{\tt\hat}}
-\entry {\code {^ \r {(Dired)}}}{374}
-\initial {{\tt\less}}
-\entry {\code {< \r {(Dired)}}}{382}
-\entry {\code {< \r {(Rmail)}}}{353}
-\initial {A}
-\entry {\code {a \r {(Calendar mode)}}}{390}
-\entry {\code {a \r {(Dired)}}}{374}
-\entry {\code {A \r {(Dired)}}}{378}
-\entry {\code {a \r {(Rmail)}}}{358}
-\initial {B}
-\entry {\code {B \r {(Dired)}}}{378}
-\entry {\code {b \r {(Rmail)}}}{351}
-\entry {\code {BACKSPACE}}{78}
-\entry {\code {BS}}{78}
-\entry {\code {BS \r {(MS-DOS)}}}{527}
-\initial {C}
-\entry {\code {C \r {(Dired)}}}{377}
-\entry {\code {c \r {(Rmail)}}}{361}
-\entry {\code {C-@}}{72}
-\entry {\code {C-]}}{478}
-\entry {\code {C-_}}{43}
-\entry {\code {C-_ \r {(Dired)}}}{376}
-\entry {\code {C-{\tt\rawbackslashxx }}}{211}
-\entry {\code {C-a}}{41}
-\entry {\code {C-a \r {(Calendar mode)}}}{386}
-\entry {\code {C-b}}{41}
-\entry {\code {C-b \r {(Calendar mode)}}}{385}
-\entry {\code {C-BREAK \r {(MS-DOS)}}}{527}
-\entry {\code {C-c ' \r {(Picture mode)}}}{338}
-\entry {\code {C-c . \r {(Picture mode)}}}{338}
-\entry {\code {C-c / \r {(Picture mode)}}}{338}
-\entry {\code {C-c : \r {(C mode)}}}{284}
-\entry {\code {C-c ; \r {(Fortran mode)}}}{293}
-\entry {\code {C-c @ \r {(Outline minor mode)}}}{245}
-\entry {\code {C-c @ C-h}}{280}
-\entry {\code {C-c @ C-l}}{280}
-\entry {\code {C-c @ C-M-h}}{280}
-\entry {\code {C-c @ C-M-s}}{280}
-\entry {\code {C-c @ C-r}}{280}
-\entry {\code {C-c @ C-s}}{280}
-\entry {\code {C-c ` \r {(Picture mode)}}}{338}
-\entry {\code {C-c {\tt\char 123} \r {(\TeX{} mode)}}}{251}
-\entry {\code {C-c {\tt\char 125} \r {(\TeX{} mode)}}}{251}
-\entry {\code {C-c > \r {(GUD)}}}{303}
-\entry {\code {C-c > \r {(Picture mode)}}}{338}
-\entry {\code {C-c ^ \r {(Picture mode)}}}{338}
-\entry {\code {C-c {\tt\rawbackslashxx } \r {(Picture mode)}}}{338}
-\entry {\code {C-c < \r {(GUD)}}}{303}
-\entry {\code {C-c < \r {(Picture mode)}}}{338}
-\entry {\code {C-c C-{\tt\rawbackslashxx } \r {(C mode)}}}{287}
-\entry {\code {C-c C-{\tt\rawbackslashxx } \r {(Shell mode)}}}{413}
-\entry {\code {C-c C-a \r {(C mode)}}}{284}
-\entry {\code {C-c C-a \r {(Mail mode)}}}{345}
-\entry {\code {C-c C-a \r {(Outline mode)}}}{248}
-\entry {\code {C-c C-a \r {(Shell mode)}}}{413}
-\entry {\code {C-c C-b \r {(Outline mode)}}}{246}
-\entry {\code {C-c C-b \r {(Picture mode)}}}{339}
-\entry {\code {C-c C-b \r {(Shell mode)}}}{414}
-\entry {\code {C-c C-b \r {(\TeX{} mode)}}}{253}
-\entry {\code {C-c C-c \r {(Edit Abbrevs)}}}{332}
-\entry {\code {C-c C-c \r {(Edit Tab Stops)}}}{231}
-\entry {\code {C-c C-c \r {(Mail mode)}}}{346}
-\entry {\code {C-c C-c \r {(Outline mode)}}}{247}
-\entry {\code {C-c C-c \r {(Shell mode)}}}{413}
-\entry {\code {C-c C-d \r {(C mode)}}}{286}
-\entry {\code {C-c C-d \r {(Fortran mode)}}}{289}
-\entry {\code {C-c C-d \r {(GUD)}}}{303}
-\entry {\code {C-c C-d \r {(Outline mode)}}}{247}
-\entry {\code {C-c C-d \r {(Picture mode)}}}{338}
-\entry {\code {C-c C-e \r {(C mode)}}}{286}
-\entry {\code {C-c C-e \r {(La\TeX{} mode)}}}{252}
-\entry {\code {C-c C-e \r {(Outline mode)}}}{247}
-\entry {\code {C-c C-e \r {(Shell mode)}}}{413}
-\entry {\code {C-c C-f \r {(GUD)}}}{303}
-\entry {\code {C-c C-f \r {(Outline mode)}}}{246}
-\entry {\code {C-c C-f \r {(Picture mode)}}}{339}
-\entry {\code {C-c C-f \r {(Shell mode)}}}{414}
-\entry {\code {C-c C-f \r {(\TeX{} mode)}}}{254}
-\entry {\code {C-c C-f C-b \r {(Mail mode)}}}{347}
-\entry {\code {C-c C-f C-c \r {(Mail mode)}}}{347}
-\entry {\code {C-c C-f C-f \r {(Mail mode)}}}{347}
-\entry {\code {C-c C-f C-s \r {(Mail mode)}}}{347}
-\entry {\code {C-c C-f C-t \r {(Mail mode)}}}{347}
-\entry {\code {C-c C-i \r {(GUD)}}}{303}
-\entry {\code {C-c C-i \r {(Mail mode)}}}{349}
-\entry {\code {C-c C-i \r {(Outline mode)}}}{248}
-\entry {\code {C-c C-j \r {(Term mode)}}}{419}
-\entry {\code {C-c C-k \r {(Outline mode)}}}{248}
-\entry {\code {C-c C-k \r {(Picture mode)}}}{340}
-\entry {\code {C-c C-k \r {(Term mode)}}}{419}
-\entry {\code {C-c C-k \r {(\TeX{} mode)}}}{253}
-\entry {\code {C-c C-l \r {(Calendar mode)}}}{388}
-\entry {\code {C-c C-l \r {(GUD)}}}{302}
-\entry {\code {C-c C-l \r {(Outline mode)}}}{248}
-\entry {\code {C-c C-l \r {(Shell mode)}}}{414}
-\entry {\code {C-c C-l \r {(\TeX{} mode)}}}{253}
-\entry {\code {C-c C-n \r {(C mode)}}}{283}
-\entry {\code {C-c C-n \r {(Fortran mode)}}}{289}
-\entry {\code {C-c C-n \r {(GUD)}}}{302}
-\entry {\code {C-c C-n \r {(Outline mode)}}}{246}
-\entry {\code {C-c C-n \r {(Shell mode)}}}{416}
-\entry {\code {C-c C-o \r {(La\TeX{} mode)}}}{252}
-\entry {\code {C-c C-o \r {(Outline mode)}}}{248}
-\entry {\code {C-c C-o \r {(Shell mode)}}}{413}
-\entry {\code {C-c C-p \r {(C mode)}}}{283}
-\entry {\code {C-c C-p \r {(Fortran mode)}}}{289}
-\entry {\code {C-c C-p \r {(Outline mode)}}}{246}
-\entry {\code {C-c C-p \r {(Shell mode)}}}{416}
-\entry {\code {C-c C-p \r {(\TeX{} mode)}}}{253}
-\entry {\code {C-c C-q \r {(C mode)}}}{270}
-\entry {\code {C-c C-q \r {(Mail mode)}}}{348}
-\entry {\code {C-c C-q \r {(Outline mode)}}}{248}
-\entry {\code {C-c C-q \r {(Term mode)}}}{419}
-\entry {\code {C-c C-q \r {(\TeX{} mode)}}}{253}
-\entry {\code {C-c C-r \r {(Fortran mode)}}}{294}
-\entry {\code {C-c C-r \r {(GUD)}}}{303}
-\entry {\code {C-c C-r \r {(Mail mode)}}}{348}
-\entry {\code {C-c C-r \r {(Shell mode)}}}{413}
-\entry {\code {C-c C-r \r {(\TeX{} mode)}}}{253}
-\entry {\code {C-c C-s \r {(C mode)}}}{287}
-\entry {\code {C-c C-s \r {(GUD)}}}{302}
-\entry {\code {C-c C-s \r {(Mail mode)}}}{346}
-\entry {\code {C-c C-s \r {(Outline mode)}}}{247}
-\entry {\code {C-c C-s \r {(Shell mode)}}}{413}
-\entry {\code {C-c C-t \r {(C mode)}}}{286}
-\entry {\code {C-c C-t \r {(GUD)}}}{303}
-\entry {\code {C-c C-t \r {(Mail mode)}}}{348}
-\entry {\code {C-c C-t \r {(Outline mode)}}}{248}
-\entry {\code {C-c C-u \r {(C mode)}}}{283}
-\entry {\code {C-c C-u \r {(Outline mode)}}}{246}
-\entry {\code {C-c C-u \r {(Shell mode)}}}{413}
-\entry {\code {C-c C-v \r {(\TeX{} mode)}}}{253}
-\entry {\code {C-c C-w \r {(Fortran mode)}}}{295}
-\entry {\code {C-c C-w \r {(Mail mode)}}}{348}
-\entry {\code {C-c C-w \r {(Picture mode)}}}{340}
-\entry {\code {C-c C-w \r {(Shell mode)}}}{413}
-\entry {\code {C-c C-x}}{249}
-\entry {\code {C-c C-x \r {(Picture mode)}}}{340}
-\entry {\code {C-c C-y \r {(Mail mode)}}}{348}
-\entry {\code {C-c C-y \r {(Picture mode)}}}{340}
-\entry {\code {C-c C-z}}{249}
-\entry {\code {C-c C-z \r {(Shell mode)}}}{413}
-\entry {\code {C-c RET \r {(Shell mode)}}}{416}
-\entry {\code {C-c TAB \r {(Picture mode)}}}{339}
-\entry {\code {C-c TAB \r {(\TeX{} mode)}}}{254}
-\entry {\code {C-d}}{78}
-\entry {\code {C-d \r {(Rmail)}}}{354}
-\entry {\code {C-d \r {(Shell mode)}}}{412}
-\entry {\code {C-Down-Mouse-1}}{181}
-\entry {\code {C-e}}{41}
-\entry {\code {C-e \r {(Calendar mode)}}}{386}
-\entry {\code {C-f}}{41}
-\entry {\code {C-f \r {(Calendar mode)}}}{385}
-\entry {\code {C-g}}{477}
-\entry {\code {C-g \r {(MS-DOS)}}}{527}
-\entry {\code {C-h}}{61}
-\entry {\code {C-h a}}{65}
-\entry {\code {C-h b}}{69}
-\entry {\code {C-h c}}{64}
-\entry {\code {C-h C}}{213}
-\entry {\code {C-h C-{\tt\rawbackslashxx }}}{211}
-\entry {\code {C-h C-c}}{69}
-\entry {\code {C-h C-d}}{69}
-\entry {\code {C-h C-f}}{68}
-\entry {\code {C-h C-h}}{61}
-\entry {\code {C-h C-i}}{278}
-\entry {\code {C-h C-k}}{68}
-\entry {\code {C-h C-p}}{69}
-\entry {\code {C-h C-w}}{69}
-\entry {\code {C-h f}}{64}
-\entry {\code {C-h F}}{69}
-\entry {\code {C-h h}}{206}
-\entry {\code {C-h i}}{68}
-\entry {\code {C-h I}}{211}
-\entry {\code {C-h k}}{64}
-\entry {\code {C-h l}}{68}
-\entry {\code {C-h L}}{208}
-\entry {\code {C-h m}}{68}
-\entry {\code {C-h n}}{69}
-\entry {\code {C-h p}}{66}
-\entry {\code {C-h P}}{69}
-\entry {\code {C-h s}}{470}
-\entry {\code {C-h t}}{39}
-\entry {\code {C-h w}}{64}
-\entry {\code {C-j}}{267}
-\entry {\code {C-j \r {(and major modes)}}}{225}
-\entry {\code {C-j \r {(MS-DOS)}}}{527}
-\entry {\code {C-j \r {(\TeX{} mode)}}}{251}
-\entry {\code {C-k}}{79}
-\entry {\code {C-k \r {(Gnus)}}}{408}
-\entry {\code {C-l}}{97}
-\entry {\code {C-M-%}}{118}
-\entry {\code {C-M-.}}{320}
-\entry {\code {C-M-/}}{333}
-\entry {\code {C-M-@}}{273}
-\entry {\code {C-M-{\tt\rawbackslashxx }}}{230}
-\entry {\code {C-M-a}}{265}
-\entry {\code {C-M-b}}{272}
-\entry {\code {C-M-c}}{431}
-\entry {\code {C-M-d}}{273}
-\entry {\code {C-M-d \r {(Dired)}}}{382}
-\entry {\code {C-M-DEL}}{272}
-\entry {\code {C-M-e}}{265}
-\entry {\code {C-M-f}}{272}
-\entry {\code {C-M-h}}{265}
-\entry {\code {C-M-h \r {(C mode)}}}{265}
-\entry {\code {C-M-j}}{276}
-\entry {\code {C-M-j \r {(Fortran mode)}}}{289}
-\entry {\code {C-M-k}}{272}
-\entry {\code {C-M-l}}{98}
-\entry {\code {C-M-l \r {(Rmail)}}}{362}
-\entry {\code {C-M-l \r {(Shell mode)}}}{413}
-\entry {\code {C-M-n}}{273}
-\entry {\code {C-M-n \r {(Dired)}}}{382}
-\entry {\code {C-M-n \r {(Rmail)}}}{358}
-\entry {\code {C-M-o}}{230}
-\entry {\code {C-M-p}}{273}
-\entry {\code {C-M-p \r {(Dired)}}}{382}
-\entry {\code {C-M-p \r {(Rmail)}}}{358}
-\entry {\code {C-M-q}}{268}
-\entry {\code {C-M-q \r {(C mode)}}}{270}
-\entry {\code {C-M-q \r {(Fortran mode)}}}{289}
-\entry {\code {C-M-r}}{110}
-\entry {\code {C-M-r \r {(Rmail)}}}{362}
-\entry {\code {C-M-s}}{110}
-\entry {\code {C-M-s \r {(Rmail)}}}{362}
-\entry {\code {C-M-t}}{272}
-\entry {\code {C-M-t \r {(Rmail)}}}{362}
-\entry {\code {C-M-u}}{273}
-\entry {\code {C-M-u \r {(Dired)}}}{382}
-\entry {\code {C-M-v}}{185}
-\entry {\code {C-M-w}}{82}
-\entry {\code {C-M-x \r {(Emacs-Lisp mode)}}}{307}
-\entry {\code {C-M-x \r {(Lisp mode)}}}{309}
-\entry {\code {C-Mouse-1}}{195}
-\entry {\code {C-Mouse-2}}{195}
-\entry {\code {C-mouse-2 \r {(mode line)}}}{196}
-\entry {\code {C-Mouse-2 \r {(scroll bar)}}}{184, 196}
-\entry {\code {C-Mouse-3}}{195}
-\entry {\code {C-Mouse-3 \r {(when menu bar is disabled)}}}{202}
-\entry {\code {C-n}}{41}
-\entry {\code {C-n \r {(Calendar mode)}}}{385}
-\entry {\code {C-n \r {(Dired)}}}{371}
-\entry {\code {C-n \r {(Gnus Group mode)}}}{409}
-\entry {\code {C-n \r {(Gnus Summary mode)}}}{409}
-\entry {\code {C-o}}{45}
-\entry {\code {C-o \r {(Dired)}}}{374}
-\entry {\code {C-o \r {(Rmail)}}}{357}
-\entry {\code {C-p}}{41}
-\entry {\code {C-p \r {(Calendar mode)}}}{385}
-\entry {\code {C-p \r {(Dired)}}}{371}
-\entry {\code {C-p \r {(Gnus Group mode)}}}{409}
-\entry {\code {C-p \r {(Gnus Summary mode)}}}{409}
-\entry {\code {C-q}}{40}
-\entry {\code {C-r}}{107}
-\entry {\code {C-s}}{105}
-\entry {\code {C-S-Mouse-3 \r {(FFAP)}}}{435}
-\entry {\code {C-SPC}}{71}
-\entry {\code {C-t}}{122}
-\entry {\code {C-\key {TAB}}}{171}
-\entry {\code {C-u}}{49}
-\entry {\code {C-u C-@}}{75}
-\entry {\code {C-u C-c C-w \r {(Fortran mode)}}}{295}
-\entry {\code {C-u C-SPC}}{75}
-\entry {\code {C-u C-x u}}{43}
-\entry {\code {C-u M-;}}{275}
-\entry {\code {C-u TAB}}{268}
-\entry {\code {C-v}}{97}
-\entry {\code {C-v \r {(Calendar mode)}}}{387}
-\entry {\code {C-w}}{80}
-\entry {\code {C-x #}}{420}
-\entry {\code {C-x $}}{100}
-\entry {\code {C-x (}}{455}
-\entry {\code {C-x )}}{455}
-\entry {\code {C-x -}}{188}
-\entry {\code {C-x .}}{241}
-\entry {\code {C-x ;}}{277}
-\entry {\code {C-x =}}{47}
-\entry {\code {C-x [}}{237}
-\entry {\code {C-x [ \r {(Calendar mode)}}}{386}
-\entry {\code {C-x ]}}{237}
-\entry {\code {C-x ] \r {(Calendar mode)}}}{386}
-\entry {\code {C-x `}}{299}
-\entry {\code {C-x {\tt\char 125}}}{188}
-\entry {\code {C-x +}}{188}
-\entry {\code {C-x >}}{99}
-\entry {\code {C-x > \r {(Calendar mode)}}}{387}
-\entry {\code {C-x ^}}{188}
-\entry {\code {C-x <}}{99}
-\entry {\code {C-x < \r {(Calendar mode)}}}{387}
-\entry {\code {C-x 0}}{187}
-\entry {\code {C-x 1}}{187}
-\entry {\code {C-x 2}}{184}
-\entry {\code {C-x 3}}{184}
-\entry {\code {C-x 4}}{185}
-\entry {\code {C-x 4 .}}{320}
-\entry {\code {C-x 4 0}}{187}
-\entry {\code {C-x 4 a}}{311}
-\entry {\code {C-x 4 b}}{174}
-\entry {\code {C-x 4 b \r {(Iswitchb mode)}}}{181}
-\entry {\code {C-x 4 c}}{179}
-\entry {\code {C-x 4 C-o \r {(Iswitchb mode)}}}{181}
-\entry {\code {C-x 4 d}}{371}
-\entry {\code {C-x 4 f}}{131}
-\entry {\code {C-x 4 f \r {(FFAP)}}}{435}
-\entry {\code {C-x 4 m}}{341}
-\entry {\code {C-x 5}}{196}
-\entry {\code {C-x 5 .}}{320}
-\entry {\code {C-x 5 0}}{197}
-\entry {\code {C-x 5 1}}{197}
-\entry {\code {C-x 5 2}}{196}
-\entry {\code {C-x 5 b}}{174}
-\entry {\code {C-x 5 b \r {(Iswitchb mode)}}}{181}
-\entry {\code {C-x 5 d}}{371}
-\entry {\code {C-x 5 f}}{131}
-\entry {\code {C-x 5 f \r {(FFAP)}}}{435}
-\entry {\code {C-x 5 m}}{341}
-\entry {\code {C-x 5 o}}{197}
-\entry {\code {C-x 5 r}}{197}
-\entry {\code {C-x 6 1}}{429}
-\entry {\code {C-x 6 2}}{428}
-\entry {\code {C-x 6 b}}{428}
-\entry {\code {C-x 6 d}}{429}
-\entry {\code {C-x 6 RET}}{429}
-\entry {\code {C-x 6 s}}{428}
-\entry {\code {C-x 8}}{224}
-\entry {\code {C-x a g}}{330}
-\entry {\code {C-x a i g}}{330}
-\entry {\code {C-x a i l}}{330}
-\entry {\code {C-x a l}}{330}
-\entry {\code {C-x b}}{174}
-\entry {\code {C-x b \r {(Iswitchb mode)}}}{181}
-\entry {\code {C-x C-a \r {(GUD)}}}{302}
-\entry {\code {C-x C-b}}{174}
-\entry {\code {C-x C-c}}{36}
-\entry {\code {C-x C-d}}{166}
-\entry {\code {C-x C-e}}{307}
-\entry {\code {C-x C-f}}{129}
-\entry {\code {C-x C-f \r {(FFAP)}}}{435}
-\entry {\code {C-x C-k}}{456}
-\entry {\code {C-x C-l}}{243}
-\entry {\code {C-x C-n}}{42}
-\entry {\code {C-x C-o}}{45}
-\entry {\code {C-x C-p}}{237}
-\entry {\code {C-x C-q}}{175}
-\entry {\code {C-x C-q \r {(Version Control)}}}{145}
-\entry {\code {C-x C-r}}{131}
-\entry {\code {C-x C-s}}{132}
-\entry {\code {C-x C-\key {SPC}}}{76}
-\entry {\code {C-x C-t}}{122}
-\entry {\code {C-x C-u}}{243}
-\entry {\code {C-x C-v}}{131}
-\entry {\code {C-x C-w}}{133}
-\entry {\code {C-x C-x}}{72}
-\entry {\code {C-x C-z}}{308}
-\entry {\code {C-x d}}{371}
-\entry {\code {C-x d \r {(FFAP)}}}{435}
-\entry {\code {C-x DEL}}{235}
-\entry {\code {C-x e}}{455}
-\entry {\code {C-x ESC ESC}}{58}
-\entry {\code {C-x f}}{240}
-\entry {\code {C-x h}}{75}
-\entry {\code {C-x i}}{167}
-\entry {\code {C-x k}}{176}
-\entry {\code {C-x l}}{237}
-\entry {\code {C-x m}}{341}
-\entry {\code {C-x n d}}{427}
-\entry {\code {C-x n n}}{427}
-\entry {\code {C-x n p}}{427}
-\entry {\code {C-x n w}}{428}
-\entry {\code {C-x o}}{185}
-\entry {\code {C-x q}}{457}
-\entry {\code {C-x r +}}{89}
-\entry {\code {C-x r b}}{90}
-\entry {\code {C-x r d}}{85}
-\entry {\code {C-x r f}}{88}
-\entry {\code {C-x r i}}{88}
-\entry {\code {C-x r j}}{87}
-\entry {\code {C-x r k}}{85}
-\entry {\code {C-x r l}}{90}
-\entry {\code {C-x r m}}{90}
-\entry {\code {C-x r n}}{89}
-\entry {\code {C-x r o}}{85}
-\entry {\code {C-x r r}}{88}
-\entry {\code {C-x r s}}{88}
-\entry {\code {C-x r SPC}}{87}
-\entry {\code {C-x r t}}{86}
-\entry {\code {C-x r w}}{88}
-\entry {\code {C-x r y}}{85}
-\entry {\code {C-x RET}}{206}
-\entry {\code {C-x RET c}}{218}
-\entry {\code {C-x RET C-{\tt\rawbackslashxx }}}{211}
-\entry {\code {C-x RET f}}{218}
-\entry {\code {C-x RET k}}{219}
-\entry {\code {C-x RET p}}{219}
-\entry {\code {C-x RET t}}{219}
-\entry {\code {C-x RET x}}{219}
-\entry {\code {C-x RET X}}{219}
-\entry {\code {C-x s}}{132}
-\entry {\code {C-x SPC}}{302}
-\entry {\code {C-x TAB}}{230}
-\entry {\code {C-x TAB \r {(Enriched mode)}}}{259}
-\entry {\code {C-x u}}{43}
-\entry {\code {C-x v =}}{148}
-\entry {\code {C-x v ~}}{148}
-\entry {\code {C-x v a}}{160}
-\entry {\code {C-x v b}}{158}
-\entry {\code {C-x v c}}{150}
-\entry {\code {C-x v d}}{151}
-\entry {\code {C-x v g}}{149}
-\entry {\code {C-x v h}}{162}
-\entry {\code {C-x v i}}{149}
-\entry {\code {C-x v l}}{150}
-\entry {\code {C-x v m}}{154}
-\entry {\code {C-x v r}}{158}
-\entry {\code {C-x v s}}{158}
-\entry {\code {C-x v u}}{150}
-\entry {\code {C-x v v}}{145}
-\entry {\code {C-x w b}}{96}
-\entry {\code {C-x w h}}{96}
-\entry {\code {C-x w i}}{96}
-\entry {\code {C-x w l}}{96}
-\entry {\code {C-x w r}}{96}
-\entry {\code {C-x z}}{50}
-\entry {\code {C-y}}{81}
-\entry {\code {C-z}}{36}
-\entry {\code {C-z \r {(X windows)}}}{197}
-\initial {D}
-\entry {\code {d \r {(Calendar mode)}}}{398}
-\entry {\code {d \r {(Dired)}}}{372}
-\entry {\code {D \r {(Dired)}}}{377}
-\entry {\code {d \r {(Rmail)}}}{354}
-\entry {\code {DEL}}{78}
-\entry {\code {DEL \r {(and major modes)}}}{225}
-\entry {\code {DEL \r {(Dired)}}}{372}
-\entry {\code {DEL \r {(Gnus)}}}{409}
-\entry {\code {DEL \r {(MS-DOS)}}}{527}
-\entry {\code {DEL \r {(programming modes)}}}{263}
-\entry {\code {DEL \r {(Rmail)}}}{352}
-\entry {\code {DELETE}}{78}
-\entry {\code {DELETE \r {(and mouse selection)}}}{191}
-\entry {\code {DOWN}}{41}
-\initial {E}
-\entry {\code {e \r {(Dired)}}}{374}
-\entry {\code {e \r {(Rmail)}}}{366}
-\entry {\code {ESC a}}{283}
-\entry {\code {ESC e}}{284}
-\entry {\code {ESC ESC ESC}}{478}
-\initial {F}
-\entry {\code {f \r {(Dired)}}}{374}
-\entry {\code {f \r {(Rmail)}}}{361}
-\entry {\code {F1}}{61}
-\entry {\code {F10}}{28}
-\entry {\code {F2 1}}{429}
-\entry {\code {F2 2}}{428}
-\entry {\code {F2 b}}{428}
-\entry {\code {F2 d}}{429}
-\entry {\code {F2 RET}}{429}
-\entry {\code {F2 s}}{428}
-\initial {G}
-\entry {\code {g \r {(Dired)}}}{383}
-\entry {\code {G \r {(Dired)}}}{377}
-\entry {\code {g \r {(Rmail)}}}{356}
-\entry {\code {g \var {char} \r {(Calendar mode)}}}{395}
-\entry {\code {g d \r {(Calendar mode)}}}{387}
-\entry {\code {g m \r {(Calendar mode)}}}{396}
-\initial {H}
-\entry {\code {h \r {(Calendar mode)}}}{390}
-\entry {\code {H \r {(Dired)}}}{377}
-\entry {\code {h \r {(Rmail)}}}{362}
-\entry {\code {Help}}{61}
-\initial {I}
-\entry {\code {i \r {(Dired)}}}{381}
-\entry {\code {i \r {(Rmail)}}}{355}
-\entry {\code {i a \r {(Calendar mode)}}}{402}
-\entry {\code {i b \r {(Calendar mode)}}}{402}
-\entry {\code {i c \r {(Calendar mode)}}}{402}
-\entry {\code {i d \r {(Calendar mode)}}}{401}
-\entry {\code {i m \r {(Calendar mode)}}}{401}
-\entry {\code {i w \r {(Calendar mode)}}}{401}
-\entry {\code {i y \r {(Calendar mode)}}}{401}
-\entry {\code {INSERT}}{440}
-\initial {J}
-\entry {\code {j \r {(Rmail)}}}{353}
-\initial {K}
-\entry {\code {k \r {(Dired)}}}{383}
-\entry {\code {k \r {(Rmail)}}}{358}
-\initial {L}
-\entry {\code {l \r {(Dired)}}}{383}
-\entry {\code {L \r {(Dired)}}}{378}
-\entry {\code {l \r {(Gnus Group mode)}}}{408}
-\entry {\code {L \r {(Gnus Group mode)}}}{408}
-\entry {\code {l \r {(Rmail)}}}{362}
-\entry {\code {LEFT}}{41}
-\initial {M}
-\entry {\code {m \r {(Calendar mode)}}}{398}
-\entry {\code {M \r {(Calendar mode)}}}{392}
-\entry {\code {m \r {(Dired)}}}{374}
-\entry {\code {M \r {(Dired)}}}{377}
-\entry {\code {m \r {(Rmail)}}}{361}
-\entry {\code {M-!}}{410}
-\entry {\code {M-$}}{123}
-\entry {\code {M-$ \r {(Dired)}}}{382}
-\entry {\code {M-%}}{118}
-\entry {\code {M-'}}{331}
-\entry {\code {M-*}}{320}
-\entry {\code {M-,}}{321}
-\entry {\code {M-\t {-}}}{48}
-\entry {\code {M-\t {-} M-c}}{122}
-\entry {\code {M-\t {-} M-l}}{122}
-\entry {\code {M-\t {-} M-u}}{122}
-\entry {\code {M-.}}{319}
-\entry {\code {M-/}}{333}
-\entry {\code {M-:}}{307}
-\entry {\code {M-;}}{275}
-\entry {\code {M-=}}{47}
-\entry {\code {M-= \r {(Calendar mode)}}}{388}
-\entry {\code {M-= \r {(Dired)}}}{381}
-\entry {\code {M-? \r {(Nroff mode)}}}{255}
-\entry {\code {M-? \r {(Shell mode)}}}{412}
-\entry {\code {M-@}}{234}
-\entry {\code {M-`}}{28}
-\entry {\code {M-{\tt\char 123}}}{236}
-\entry {\code {M-{\tt\char 123} \r {(Calendar mode)}}}{386}
-\entry {\code {M-|}}{410}
-\entry {\code {M-{\tt\char 125}}}{236}
-\entry {\code {M-{\tt\char 125} \r {(Calendar mode)}}}{386}
-\entry {\code {M-~}}{133}
-\entry {\code {M->}}{41}
-\entry {\code {M-> \r {(Calendar mode)}}}{386}
-\entry {\code {M-^}}{230}
-\entry {\code {M-^ \r {(Fortran mode)}}}{289}
-\entry {\code {M-{\tt\rawbackslashxx }}}{79}
-\entry {\code {M-<}}{41}
-\entry {\code {M-< \r {(Calendar mode)}}}{386}
-\entry {\code {M-1}}{48}
-\entry {\code {M-a}}{235}
-\entry {\code {M-a \r {(Calendar mode)}}}{386}
-\entry {\code {M-b}}{234}
-\entry {\code {M-c}}{243}
-\entry {\code {M-d}}{234}
-\entry {\code {M-DEL}}{234}
-\entry {\code {M-Drag-Mouse-1}}{193}
-\entry {\code {M-e}}{235}
-\entry {\code {M-e \r {(Calendar mode)}}}{386}
-\entry {\code {M-f}}{234}
-\entry {\code {M-g b \r {(Enriched mode)}}}{258}
-\entry {\code {M-g d \r {(Enriched mode)}}}{258}
-\entry {\code {M-g i \r {(Enriched mode)}}}{258}
-\entry {\code {M-g l \r {(Enriched mode)}}}{258}
-\entry {\code {M-g o \r {(Enriched mode)}}}{258}
-\entry {\code {M-g u \r {(Enriched mode)}}}{258}
-\entry {\code {M-h}}{236}
-\entry {\code {M-i}}{231}
-\entry {\code {M-j c \r {(Enriched mode)}}}{261}
-\entry {\code {M-j f \r {(Enriched mode)}}}{261}
-\entry {\code {M-j l \r {(Enriched mode)}}}{261}
-\entry {\code {M-j r \r {(Enriched mode)}}}{261}
-\entry {\code {M-j u \r {(Enriched mode)}}}{261}
-\entry {\code {M-k}}{235}
-\entry {\code {M-l}}{243}
-\entry {\code {M-m}}{230}
-\entry {\code {M-m \r {(Rmail)}}}{360}
-\entry {\code {M-Mouse-1}}{194}
-\entry {\code {M-Mouse-2}}{194}
-\entry {\code {M-Mouse-3}}{194}
-\entry {\code {M-n \r {(minibuffer history)}}}{57}
-\entry {\code {M-n \r {(Nroff mode)}}}{255}
-\entry {\code {M-n \r {(Rmail)}}}{353}
-\entry {\code {M-n \r {(Shell mode)}}}{415}
-\entry {\code {M-p \r {(minibuffer history)}}}{57}
-\entry {\code {M-p \r {(Nroff mode)}}}{255}
-\entry {\code {M-p \r {(Rmail)}}}{353}
-\entry {\code {M-p \r {(Shell mode)}}}{415}
-\entry {\code {M-q}}{239}
-\entry {\code {M-q \r {(C mode)}}}{286}
-\entry {\code {M-q \r {(Fortran mode)}}}{289}
-\entry {\code {M-r}}{41}
-\entry {\code {M-r \r {(minibuffer history)}}}{57}
-\entry {\code {M-r \r {(Shell mode)}}}{415}
-\entry {\code {M-S \r {(Enriched mode)}}}{261}
-\entry {\code {M-s \r {(Gnus Summary mode)}}}{409}
-\entry {\code {M-s \r {(minibuffer history)}}}{57}
-\entry {\code {M-s \r {(Rmail)}}}{353}
-\entry {\code {M-s \r {(Shell mode)}}}{415}
-\entry {\code {M-s \r {(Text mode)}}}{240}
-\entry {\code {M-SPC}}{79}
-\entry {\code {M-t}}{122}
-\entry {\code {M-TAB}}{281}
-\entry {\code {M-TAB \r {(customization buffer)}}}{445}
-\entry {\code {M-TAB \r {(Mail mode)}}}{347}
-\entry {\code {M-TAB \r {(Picture mode)}}}{339}
-\entry {\code {M-TAB \r {(Text mode)}}}{244}
-\entry {\code {M-u}}{243}
-\entry {\code {M-v}}{97}
-\entry {\code {M-v \r {(Calendar mode)}}}{387}
-\entry {\code {M-w}}{81}
-\entry {\code {M-x}}{59}
-\entry {\code {M-y}}{82}
-\entry {\code {M-z}}{80}
-\entry {\code {Mouse-1}}{191}
-\entry {\code {Mouse-1 \r {(mode line)}}}{196}
-\entry {\code {Mouse-2}}{191}
-\entry {\code {Mouse-2 \r {(mode line)}}}{196}
-\entry {\code {Mouse-2 \r {(selection)}}}{195}
-\entry {\code {Mouse-3}}{191}
-\entry {\code {Mouse-3 \r {(mode line)}}}{196}
-\initial {N}
-\entry {\code {n \r {(Gnus)}}}{409}
-\entry {\code {n \r {(Rmail)}}}{353}
-\entry {\code {NEXT}}{97}
-\initial {O}
-\entry {\code {o \r {(Calendar mode)}}}{387}
-\entry {\code {o \r {(Dired)}}}{374}
-\entry {\code {O \r {(Dired)}}}{378}
-\entry {\code {o \r {(Rmail)}}}{357}
-\initial {P}
-\entry {\code {p \r {(Calendar mode)}}}{394}
-\entry {\code {P \r {(Dired)}}}{378}
-\entry {\code {p \r {(Gnus)}}}{409}
-\entry {\code {p \r {(Rmail)}}}{353}
-\entry {\code {p d \r {(Calendar mode)}}}{388}
-\entry {\code {PAGEDOWN}}{97}
-\entry {\code {PAGEUP}}{97}
-\entry {\code {PRIOR}}{97}
-\initial {Q}
-\entry {\code {q \r {(Calendar mode)}}}{388}
-\entry {\code {Q \r {(Dired)}}}{378}
-\entry {\code {q \r {(Gnus Group mode)}}}{408}
-\entry {\code {q \r {(Rmail summary)}}}{364}
-\entry {\code {Q \r {(Rmail summary)}}}{364}
-\entry {\code {q \r {(Rmail)}}}{351}
-\initial {R}
-\entry {\code {R \r {(Dired)}}}{377}
-\entry {\code {r \r {(Rmail)}}}{360}
-\entry {\code {RET}}{39}
-\entry {\code {RET \r {(Dired)}}}{374}
-\entry {\code {RET \r {(Occur mode)}}}{120}
-\entry {\code {RET \r {(Shell mode)}}}{412}
-\entry {\code {RIGHT}}{41}
-\initial {S}
-\entry {\code {s \r {(Calendar mode)}}}{398}
-\entry {\code {S \r {(Calendar mode)}}}{391}
-\entry {\code {s \r {(Dired)}}}{383}
-\entry {\code {S \r {(Dired)}}}{377}
-\entry {\code {s \r {(Gnus Summary mode)}}}{409}
-\entry {\code {s \r {(Rmail)}}}{351}
-\entry {\code {S-Mouse-1}}{201}
-\entry {\code {S-Mouse-2}}{280}
-\entry {\code {S-Mouse-3 \r {(FFAP)}}}{435}
-\entry {\code {S-TAB \r {(customization buffer)}}}{446}
-\entry {\code {S-\key {TAB} \r {(Help mode)}}}{68}
-\entry {\code {SPC}}{54}
-\entry {\code {SPC \r {(Calendar mode)}}}{388}
-\entry {\code {SPC \r {(Dired)}}}{371}
-\entry {\code {SPC \r {(Gnus)}}}{408}
-\entry {\code {SPC \r {(Rmail)}}}{352}
-\initial {T}
-\entry {\code {t \r {(Calendar mode)}}}{388}
-\entry {\code {t \r {(Rmail)}}}{365}
-\entry {\code {TAB}}{229}
-\entry {\code {TAB \r {(and major modes)}}}{225}
-\entry {\code {TAB \r {(completion)}}}{54}
-\entry {\code {TAB \r {(customization buffer)}}}{446}
-\entry {\code {TAB \r {(GUD)}}}{303}
-\entry {\code {\key {TAB} \r {(Help mode)}}}{68}
-\entry {\code {TAB \r {(programming modes)}}}{267}
-\entry {\code {TAB \r {(Shell mode)}}}{412}
-\entry {\code {TAB \r {(Text mode)}}}{244}
-\initial {U}
-\entry {\code {u \r {(Calendar mode)}}}{390}
-\entry {\code {u \r {(Dired deletion)}}}{372}
-\entry {\code {u \r {(Dired)}}}{375}
-\entry {\code {u \r {(Gnus Group mode)}}}{408}
-\entry {\code {u \r {(Rmail)}}}{354}
-\entry {\code {UP}}{41}
-\initial {V}
-\entry {\code {v \r {(Dired)}}}{374}
-\initial {W}
-\entry {\code {w \r {(Rmail)}}}{357}
-\initial {X}
-\entry {\code {x \r {(Calendar mode)}}}{390}
-\entry {\code {x \r {(Dired)}}}{372}
-\entry {\code {X \r {(Dired)}}}{379}
-\entry {\code {x \r {(Rmail)}}}{354}
-\initial {Z}
-\entry {\code {Z \r {(Dired)}}}{378}
diff -ruN src-21.1/man/emacs.texi src-21.2/man/emacs.texi
--- src-21.1/man/emacs.texi	Sat Oct 20 18:11:48 2001
+++ src-21.2/man/emacs.texi	Sat Mar 16 11:44:43 2002
@@ -8,7 +8,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Fourteenth
-@set EMACSVER  21.1
+@set EMACSVER  21.2
 
 @ifnottex
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
@@ -23,7 +23,7 @@
 59 Temple Place, Suite 330
 Boston, MA  02111-1307 USA
 
-Copyright (C) 1985, 1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001
+Copyright (C) 1985,1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
    Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
@@ -60,12 +60,12 @@
 @center Richard Stallman
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
 @sp 2
 @value{EDITION} Edition @*
 Updated for Emacs Version @value{EMACSVER}, @*
-August 2000
+March 2002
 
 ISBN 1-882114-06-X
 @sp 1
@@ -99,7 +99,7 @@
 display editor.  This Info file describes how to edit with Emacs and
 some of how to customize it; it corresponds to GNU Emacs version
 @value{EMACSVER}.
-For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The
+For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The
 Emacs Lisp Reference Manual}.
 @end ifnottex
 
@@ -576,7 +576,9 @@
 Maintaining Programs
 
 * Change Log::	        Maintaining a change history for your program.
+@ignore
 * Authors::             Maintaining the Emacs @file{AUTHORS} file.
+@end ignore
 * Tags::	        Go direct to any function in your program in one
 			  command.  Tags remembers which file it is in.
 * Emerge::	        A convenient way of merging two versions of a program.
diff -ruN src-21.1/man/emacs.vrs src-21.2/man/emacs.vrs
--- src-21.1/man/emacs.vrs	Sat Oct 20 18:45:15 2001
+++ src-21.2/man/emacs.vrs	Thu Jan  1 01:00:00 1970
@@ -1,524 +0,0 @@
-\initial {A}
-\entry {\code {abbrev-all-caps}}{330}
-\entry {\code {abbrev-file-name}}{333}
-\entry {\code {abbrev-mode}}{329}
-\entry {\code {adaptive-fill-first-line-regexp}}{242}
-\entry {\code {adaptive-fill-function}}{242}
-\entry {\code {adaptive-fill-mode}}{242}
-\entry {\code {adaptive-fill-regexp}}{242}
-\entry {\code {add-log-keep-changes-together}}{312}
-\entry {\code {ange-ftp-default-user}}{170}
-\entry {\code {ange-ftp-gateway-host}}{170}
-\entry {\code {ange-ftp-generate-anonymous-password}}{170}
-\entry {\code {ange-ftp-make-backup-files}}{170}
-\entry {\code {ange-ftp-smart-gateway}}{170}
-\entry {\code {appt-display-diary}}{404}
-\entry {\code {appt-issue-message}}{404}
-\entry {\code {apropos-do-all}}{66}
-\entry {\code {auto-coding-alist}}{216}
-\entry {\code {auto-coding-regexp-alist}}{216}
-\entry {\code {auto-compression-mode}}{168}
-\entry {\code {auto-mode-alist}}{226}
-\entry {\code {auto-revert-interval}}{140}
-\entry {\code {auto-save-default}}{141}
-\entry {\code {auto-save-interval}}{141}
-\entry {\code {auto-save-list-file-prefix}}{142}
-\entry {\code {auto-save-timeout}}{141}
-\entry {\code {auto-save-visited-file-name}}{141}
-\entry {\code {automatic-hscrolling}}{100}
-\initial {B}
-\entry {\code {backup-by-copying}}{136}
-\entry {\code {backup-by-copying-when-linked}}{136}
-\entry {\code {backup-by-copying-when-mismatch}}{136}
-\entry {\code {backup-by-copying-when-privileged-mismatch}}{136}
-\entry {\code {backup-directory-alist}}{134}
-\entry {\code {backup-enable-predicate}}{134}
-\entry {\code {baud-rate}}{103}
-\entry {\code {bdf-directory-list}}{424}
-\entry {\code {blink-matching-delay}}{274}
-\entry {\code {blink-matching-paren}}{274}
-\entry {\code {blink-matching-paren-distance}}{274}
-\entry {\code {bookmark-save-flag}}{90}
-\entry {\code {bookmark-search-size}}{90}
-\entry {\code {browse-url-browser-function}}{434}
-\entry {\code {buffer-file-coding-system}}{216}
-\entry {\code {buffer-read-only}}{175}
-\initial {C}
-\entry {\code {c-comment-only-line-offset}}{288}
-\entry {\code {c-comment-start-regexp}}{288}
-\entry {\code {c-default-style}}{271}
-\entry {\code {c-hanging-comment-ender-p}}{288}
-\entry {\code {c-hanging-comment-starter-p}}{288}
-\entry {\code {c-hungry-delete-key}}{286}
-\entry {\code {c-mode-hook}}{264}
-\entry {\code {c-mode-map}}{460}
-\entry {\code {calendar-daylight-savings-ends}}{404}
-\entry {\code {calendar-daylight-savings-ends-time}}{405}
-\entry {\code {calendar-daylight-savings-starts}}{404}
-\entry {\code {calendar-daylight-time-offset}}{405}
-\entry {\code {calendar-daylight-time-zone-name}}{391}
-\entry {\code {calendar-latitude}}{391}
-\entry {\code {calendar-location-name}}{391}
-\entry {\code {calendar-longitude}}{391}
-\entry {\code {calendar-standard-time-zone-name}}{391}
-\entry {\code {calendar-time-zone}}{391}
-\entry {\code {calendar-week-start-day}}{386}
-\entry {\code {case-fold-search}}{116}
-\entry {\code {case-replace}}{117}
-\entry {\code {change-log-version-info-enabled}}{312}
-\entry {\code {change-log-version-number-regexp-list}}{312}
-\entry {\code {change-major-mode-with-file-name}}{227}
-\entry {\code {coding}}{216}
-\entry {\code {colon-double-space}}{240}
-\entry {\code {comint-completion-addsuffix}}{418}
-\entry {\code {comint-completion-autolist}}{418}
-\entry {\code {comint-completion-fignore}}{412}
-\entry {\code {comint-completion-recexact}}{418}
-\entry {\code {comint-input-autoexpand}}{417}
-\entry {\code {comint-input-ignoredups}}{418}
-\entry {\code {comint-prompt-regexp}}{417}
-\entry {\code {comint-scroll-show-maximum-output}}{417}
-\entry {\code {comint-scroll-to-bottom-on-input}}{417}
-\entry {\code {comint-scroll-to-bottom-on-output}}{417}
-\entry {\code {comint-use-prompt-regexp-instead-of-fields}}{417}
-\entry {\code {command-history}}{58}
-\entry {\code {command-line-args}}{496}
-\entry {\code {comment-column}}{277}
-\entry {\code {comment-end}}{277}
-\entry {\code {comment-indent-function}}{277}
-\entry {\code {comment-line-start}}{293}
-\entry {\code {comment-line-start-skip}}{293}
-\entry {\code {comment-multi-line}}{277}
-\entry {\code {comment-padding}}{277}
-\entry {\code {comment-start}}{277}
-\entry {\code {comment-start-skip}}{277}
-\entry {\code {compare-ignore-case}}{167}
-\entry {\code {compilation-error-regexp-alist}}{299}
-\entry {\code {compilation-scroll-output}}{298}
-\entry {\code {compile-command}}{297}
-\entry {\code {completion-auto-help}}{56}
-\entry {\code {completion-ignored-extensions}}{56}
-\entry {\code {confirm-kill-emacs}}{36}
-\entry {\code {crisp-override-meta-x}}{432}
-\entry {\code {ctl-arrow}}{103}
-\entry {\code {ctl-x-4-map}}{460}
-\entry {\code {ctl-x-map}}{460}
-\entry {\code {current-input-method}}{211}
-\entry {\code {current-language-environment}}{207}
-\entry {\code {cursor-in-non-selected-windows}}{104}
-\entry {\code {custom-buffer-done-function}}{447}
-\initial {D}
-\entry {\code {dabbrev-abbrev-char-regexp}}{335}
-\entry {\code {dabbrev-abbrev-skip-leading-regexp}}{335}
-\entry {\code {dabbrev-case-fold-search}}{334}
-\entry {\code {dabbrev-case-replace}}{334}
-\entry {\code {dabbrev-check-all-buffers}}{334}
-\entry {\code {dabbrev-ignored-buffer-regexps}}{334}
-\entry {\code {dabbrev-limit}}{333}
-\entry {\code {dbx-mode-hook}}{304}
-\entry {\code {default-buffer-file-coding-system}}{219}
-\entry {\code {default-directory}}{127}
-\entry {\code {default-enable-multibyte-characters}}{206}
-\entry {\code {default-indicate-empty-lines}}{97}
-\entry {\code {default-input-method}}{211}
-\entry {\code {default-justification}}{261}
-\entry {\code {default-major-mode}}{227}
-\entry {\code {delete-auto-save-files}}{141}
-\entry {\code {delete-old-versions}}{136}
-\entry {\code {desktop-enable}}{430}
-\entry {\code {desktop-files-not-to-save}}{430}
-\entry {\code {diary-file}}{399}
-\entry {\code {diary-hook}}{403}
-\entry {\code {diary-mail-days}}{399}
-\entry {\code {diff-switches}}{166}
-\entry {\code {dired-chown-program}}{378}
-\entry {\code {dired-copy-preserve-time}}{377}
-\entry {\code {dired-dwim-target}}{377}
-\entry {\code {dired-garbage-files-regexp}}{373}
-\entry {\code {dired-kept-versions}}{373}
-\entry {\code {dired-listing-switches}}{371}
-\entry {\code {dired-listing-switches \r {(MS-DOS)}}}{539}
-\entry {\code {dired-recursive-copies}}{377}
-\entry {\code {dired-recursive-deletes}}{372}
-\entry {\code {display-buffer-reuse-frames}}{174}
-\entry {\code {display-time-24hr-format}}{101}
-\entry {\code {display-time-mail-face}}{101}
-\entry {\code {display-time-use-mail-icon}}{101}
-\entry {\code {dos-codepage}}{536}
-\entry {\code {dos-display-scancodes}}{528}
-\entry {\code {dos-hyper-key}}{527}
-\entry {\code {dos-keypad-mode}}{527}
-\entry {\code {dos-printer}}{535}
-\entry {\code {dos-ps-printer}}{535}
-\entry {\code {dos-super-key}}{527}
-\entry {\code {dos-unsupported-character-glyph}}{537}
-\entry {\code {double-click-fuzz}}{467}
-\entry {\code {double-click-time}}{467}
-\initial {E}
-\entry {\code {echo-keystrokes}}{103}
-\entry {\code {emacs-lisp-mode-hook}}{264}
-\entry {\code {emerge-combine-versions-template}}{327}
-\entry {\code {emerge-startup-hook}}{327}
-\entry {\code {enable-multibyte-characters}}{206}
-\entry {\code {enable-recursive-minibuffers}}{53}
-\entry {\code {enriched-fill-after-visiting}}{256}
-\entry {\code {enriched-translations}}{256}
-\entry {\code {eol-mnemonic-dos}}{27}
-\entry {\code {eol-mnemonic-mac}}{27}
-\entry {\code {eol-mnemonic-undecided}}{27}
-\entry {\code {eol-mnemonic-unix}}{27}
-\entry {\code {esc-map}}{460}
-\entry {\code {european-calendar-style}}{400}
-\entry {\code {eval-expression-debug-on-error}}{308}
-\entry {\code {eval-expression-print-length}}{308}
-\entry {\code {eval-expression-print-level}}{308}
-\entry {\code {even-window-heights}}{174}
-\entry {\code {exit-language-environment-hook}}{209}
-\entry {\code {explicit-shell-file-name}}{411}
-\initial {F}
-\entry {\code {ff-related-file-alist}}{287}
-\entry {\code {file-coding-system-alist}}{215}
-\entry {\code {file-name-buffer-file-type-alist}}{532}
-\entry {\code {file-name-coding-system}}{220}
-\entry {\code {file-name-handler-alist}}{170}
-\entry {\code {fill-column}}{240}
-\entry {\code {fill-prefix}}{241}
-\entry {\code {find-file-existing-other-name}}{143}
-\entry {\code {find-file-hooks}}{131}
-\entry {\code {find-file-not-found-hooks}}{131}
-\entry {\code {find-file-run-dired}}{130}
-\entry {\code {find-file-suppress-same-file-warnings}}{143}
-\entry {\code {find-file-visit-truename}}{143}
-\entry {\code {find-file-wildcards}}{130}
-\entry {\code {find-ls-option}}{384}
-\entry {\code {find-tag-marker-ring-length}}{320}
-\entry {\code {foldout-mouse-modifiers}}{250}
-\entry {\code {font-lock-beginning-of-syntax-function}}{95}
-\entry {\code {font-lock-maximum-decoration}}{94}
-\entry {\code {font-lock-maximum-size}}{94}
-\entry {\code {fortran-analyze-depth}}{290}
-\entry {\code {fortran-break-before-delimiters}}{294}
-\entry {\code {fortran-check-all-num\dots {}}}{291}
-\entry {\code {fortran-column-ruler-fixed}}{294}
-\entry {\code {fortran-column-ruler-tabs}}{294}
-\entry {\code {fortran-comment-indent-char}}{293}
-\entry {\code {fortran-comment-indent-style}}{293}
-\entry {\code {fortran-comment-line-extra-indent}}{293}
-\entry {\code {fortran-comment-region}}{293}
-\entry {\code {fortran-continuation-indent}}{291}
-\entry {\code {fortran-continuation-string}}{290}
-\entry {\code {fortran-do-indent}}{291}
-\entry {\code {fortran-electric-line-number}}{290}
-\entry {\code {fortran-if-indent}}{291}
-\entry {\code {fortran-line-number-indent}}{290}
-\entry {\code {fortran-minimum-statement-indent\dots {}}}{291}
-\entry {\code {fortran-structure-indent}}{291}
-\entry {\code {fortran-tab-mode-default}}{290}
-\initial {G}
-\entry {\code {gdb-mode-hook}}{304}
-\entry {\code {global-font-lock-mode}}{94}
-\entry {\code {grep-regexp-alist}}{299}
-\entry {\code {gud-xdb-directories}}{301}
-\initial {H}
-\entry {\code {help-map}}{460}
-\entry {\code {hi-lock-exclude-modes}}{96}
-\entry {\code {highlight-nonselected-windows}}{73}
-\entry {\code {highlight-wrong-size-font}}{221}
-\entry {\code {history-length}}{57}
-\entry {\code {hourglass-delay}}{104}
-\entry {\code {hs-hide-comments-when-hiding-all}}{281}
-\entry {\code {hs-isearch-open}}{281}
-\entry {\code {hs-special-modes-alist}}{281}
-\initial {I}
-\entry {\code {image-file-name-extensions}}{172}
-\entry {\code {image-file-name-regexps}}{172}
-\entry {\code {imenu-auto-rescan}}{266}
-\entry {\code {imenu-sort-function}}{266}
-\entry {\code {indent-tabs-mode}}{231}
-\entry {\code {indent-tabs-mode \r {(Fortran mode)}}}{290}
-\entry {\code {indicate-empty-lines}}{97}
-\entry {\code {inferior-lisp-program}}{308}
-\entry {\code {inhibit-eol-conversion}}{215}
-\entry {\code {inhibit-iso-escape-detection}}{215}
-\entry {\code {initial-major-mode}}{35}
-\entry {\code {input-method-highlight-flag}}{210}
-\entry {\code {input-method-verbose-flag}}{210}
-\entry {\code {insert-default-directory}}{128}
-\entry {\code {interpreter-mode-alist}}{226}
-\entry {\code {inverse-video}}{102}
-\entry {\code {isearch-lazy-highlight}}{107}
-\entry {\code {isearch-lazy-highlight-face}}{108}
-\entry {\code {isearch-mode-map}}{108}
-\entry {\code {ispell-dictionary}}{125}
-\initial {J}
-\entry {\code {jdb-mode-hook}}{304}
-\initial {K}
-\entry {\code {kept-new-versions}}{135}
-\entry {\code {kept-old-versions}}{135}
-\entry {\code {keyboard-coding-system}}{219}
-\entry {\code {kill-buffer-hook}}{177}
-\entry {\code {kill-read-only-ok}}{77}
-\entry {\code {kill-ring}}{83}
-\entry {\code {kill-ring-max}}{83}
-\entry {\code {kill-whole-line}}{79}
-\initial {L}
-\entry {\code {latex-block-names}}{252}
-\entry {\code {latex-mode-hook}}{255}
-\entry {\code {latex-run-command}}{253}
-\entry {\code {latin1-display}}{223}
-\entry {\code {line-number-display-limit}}{101}
-\entry {\code {line-number-display-limit-width}}{101}
-\entry {\code {lisp-body-indent}}{269}
-\entry {\code {lisp-indent-offset}}{269}
-\entry {\code {lisp-interaction-mode-hook}}{264}
-\entry {\code {lisp-mode-hook}}{264}
-\entry {\code {lisp-mode-map}}{460}
-\entry {\code {list-directory-brief-switches}}{166}
-\entry {\code {list-directory-verbose-switches}}{166}
-\entry {\code {load-dangerous-libraries}}{306}
-\entry {\code {load-path}}{306}
-\entry {\code {locale-charset-language-names}}{208}
-\entry {\code {locale-coding-system}}{220}
-\entry {\code {locale-language-names}}{208}
-\entry {\code {locale-preferred-coding-systems}}{208}
-\entry {\code {locate-command}}{384}
-\entry {\code {lpr-add-switches}}{422}
-\entry {\code {lpr-command \r {(MS-DOS)}}}{534}
-\entry {\code {lpr-commands}}{422}
-\entry {\code {lpr-headers-switches}}{422}
-\entry {\code {lpr-headers-switches \r {(MS-DOS)}}}{534}
-\entry {\code {lpr-switches}}{422}
-\entry {\code {lpr-switches \r {(MS-DOS)}}}{534}
-\initial {M}
-\entry {\code {mac-command-key-is-meta}}{523}
-\entry {\code {mac-keyboard-text-encoding}}{523}
-\entry {\code {mail-abbrevs}}{345}
-\entry {\code {mail-aliases}}{345}
-\entry {\code {mail-archive-file-name}}{343}
-\entry {\code {mail-default-headers}}{344}
-\entry {\code {mail-default-reply-to}}{343}
-\entry {\code {mail-from-style}}{344}
-\entry {\code {mail-mode-hook}}{349}
-\entry {\code {mail-personal-alias-file}}{345}
-\entry {\code {mail-self-blind}}{342}
-\entry {\code {mail-setup-hook}}{349}
-\entry {\code {mail-signature}}{348}
-\entry {\code {mail-user-agent}}{350}
-\entry {\code {mail-yank-prefix}}{348}
-\entry {\code {make-backup-file-name-function}}{134}
-\entry {\code {make-backup-files}}{134}
-\entry {\code {Man-fontify-manpage-flag}}{279}
-\entry {\code {Man-switches}}{279}
-\entry {\code {mark-even-if-inactive}}{74}
-\entry {\code {mark-ring}}{76}
-\entry {\code {mark-ring-max}}{76}
-\entry {\code {max-mini-window-height}}{53}
-\entry {\code {message-log-max}}{25}
-\entry {\code {midnight-hook}}{177}
-\entry {\code {midnight-mode}}{177}
-\entry {\code {minibuffer-local-completion-map}}{461}
-\entry {\code {minibuffer-local-map}}{461}
-\entry {\code {minibuffer-local-must-match-map}}{461}
-\entry {\code {minibuffer-local-ns-map}}{461}
-\entry {\code {mode-line-inverse-video}}{102}
-\entry {\code {mode-specific-map}}{460}
-\entry {\code {mouse-avoidance-mode}}{203}
-\entry {\code {mouse-scroll-min-lines}}{191}
-\entry {\code {mouse-wheel-follow-mouse}}{202}
-\entry {\code {mouse-wheel-scroll-amount}}{202}
-\entry {\code {mouse-yank-at-point}}{193}
-\initial {N}
-\entry {\code {next-line-add-newlines}}{42}
-\entry {\code {next-screen-context-lines}}{97}
-\entry {\code {no-redraw-on-reenter}}{103}
-\entry {\code {normal-erase-is-backspace}}{479}
-\entry {\code {nroff-mode-hook}}{255}
-\initial {O}
-\entry {\code {outline-level}}{246}
-\entry {\code {outline-minor-mode-prefix}}{244}
-\entry {\code {outline-mode-hook}}{245}
-\entry {\code {outline-regexp}}{246}
-\initial {P}
-\entry {\code {page-delimiter}}{237}
-\entry {\code {paragraph-separate}}{236}
-\entry {\code {paragraph-start}}{236}
-\entry {\code {partial-completion-mode}}{56}
-\entry {\code {PC-disable-includes}}{56}
-\entry {\code {PC-include-file-path}}{56}
-\entry {\code {pdb-mode-hook}}{304}
-\entry {\code {perldb-mode-hook}}{304}
-\entry {\code {picture-mode-hook}}{337}
-\entry {\code {picture-tab-chars}}{339}
-\entry {\code {plain-tex-mode-hook}}{255}
-\entry {\code {print-region-function \r {(MS-DOS)}}}{534}
-\entry {\code {printer-name}}{422}
-\entry {\code {printer-name \r {(MS-DOS)}}}{533}
-\entry {\code {ps-font-family}}{424}
-\entry {\code {ps-font-info-database}}{424}
-\entry {\code {ps-font-size}}{424}
-\entry {\code {ps-landscape-mode}}{424}
-\entry {\code {ps-lpr-command}}{424}
-\entry {\code {ps-lpr-command \r {(MS-DOS)}}}{534}
-\entry {\code {ps-lpr-switches}}{424}
-\entry {\code {ps-lpr-switches \r {(MS-DOS)}}}{534}
-\entry {\code {ps-multibyte-buffer}}{424}
-\entry {\code {ps-number-of-columns}}{424}
-\entry {\code {ps-page-dimensions-database}}{424}
-\entry {\code {ps-paper-type}}{424}
-\entry {\code {ps-print-color-p}}{424}
-\entry {\code {ps-print-header}}{424}
-\entry {\code {ps-printer-name}}{424}
-\entry {\code {ps-printer-name \r {(MS-DOS)}}}{534}
-\entry {\code {ps-use-face-background}}{424}
-\initial {R}
-\entry {\code {read-quoted-char-radix}}{40}
-\entry {\code {recentf-mode}}{172}
-\entry {\code {require-final-newline}}{133}
-\entry {\code {resize-mini-windows}}{52}
-\entry {\code {revert-without-query}}{140}
-\entry {\code {rmail-decode-mime-charset}}{217}
-\entry {\code {rmail-delete-after-output}}{357}
-\entry {\code {rmail-delete-message-hook}}{354}
-\entry {\code {rmail-dont-reply-to-names}}{360}
-\entry {\code {rmail-edit-mode-hook}}{367}
-\entry {\code {rmail-file-coding-system}}{217}
-\entry {\code {rmail-file-name}}{351}
-\entry {\code {rmail-highlighted-headers}}{365}
-\entry {\code {rmail-ignored-headers}}{365}
-\entry {\code {rmail-mail-new-frame}}{361}
-\entry {\code {rmail-mode-hook}}{351}
-\entry {\code {rmail-movemail-flags}}{369}
-\entry {\code {rmail-output-file-alist}}{357}
-\entry {\code {rmail-pop-password}}{369}
-\entry {\code {rmail-pop-password-required}}{369}
-\entry {\code {rmail-preserve-inbox}}{368}
-\entry {\code {rmail-primary-inbox-list}}{354}
-\entry {\code {rmail-redisplay-summary}}{364}
-\entry {\code {rmail-retry-ignored-headers}}{360}
-\entry {\code {rmail-secondary-file-directory}}{356}
-\entry {\code {rmail-secondary-file-regexp}}{356}
-\entry {\code {rmail-summary-line-count-flag}}{363}
-\entry {\code {rmail-summary-window-size}}{363}
-\initial {S}
-\entry {\code {same-window-buffer-names}}{186}
-\entry {\code {same-window-regexps}}{186}
-\entry {\code {save-abbrevs}}{333}
-\entry {\code {save-place}}{430}
-\entry {\code {scheme-mode-hook}}{264}
-\entry {\code {scroll-all-mode}}{189}
-\entry {\code {scroll-bar-mode}}{201}
-\entry {\code {scroll-bar-width}}{202}
-\entry {\code {scroll-conservatively}}{98}
-\entry {\code {scroll-down-aggressively}}{99}
-\entry {\code {scroll-margin}}{99}
-\entry {\code {scroll-preserve-screen-position}}{98}
-\entry {\code {scroll-up-aggressively}}{99}
-\entry {\code {sdb-mode-hook}}{304}
-\entry {\code {search-slow-speed}}{108}
-\entry {\code {search-slow-window-lines}}{108}
-\entry {\code {selective-display-ellipses}}{100}
-\entry {\code {sendmail-coding-system}}{217}
-\entry {\code {sentence-end}}{235}
-\entry {\code {sentence-end-double-space}}{240}
-\entry {\code {sentence-end-without-period}}{240}
-\entry {\code {server-kill-new-buffers}}{420}
-\entry {\code {server-temp-file-regexp}}{420}
-\entry {\code {server-window}}{421}
-\entry {\code {set-language-environment-hook}}{209}
-\entry {\code {shell-cd-regexp}}{417}
-\entry {\code {shell-command-default-error-buffer}}{411}
-\entry {\code {shell-command-regexp}}{414}
-\entry {\code {shell-completion-execonly}}{418}
-\entry {\code {shell-completion-fignore}}{412}
-\entry {\code {shell-file-name}}{410}
-\entry {\code {shell-input-ring-file-name}}{416}
-\entry {\code {shell-popd-regexp}}{417}
-\entry {\code {shell-prompt-pattern}}{417}
-\entry {\code {shell-pushd-regexp}}{417}
-\entry {\code {show-trailing-whitespace}}{96}
-\entry {\code {slitex-mode-hook}}{255}
-\entry {\code {slitex-run-command}}{253}
-\entry {\code {small-temporary-file-directory}}{134}
-\entry {\code {sort-fold-case}}{427}
-\entry {\code {sort-numeric-base}}{425}
-\entry {\code {special-display-buffer-names}}{199}
-\entry {\code {special-display-frame-alist}}{199}
-\entry {\code {special-display-regexps}}{199}
-\entry {\code {split-window-keep-point}}{184}
-\entry {\code {standard-fontset-spec}}{221}
-\entry {\code {standard-indent}}{260}
-\entry {\code {suggest-key-bindings}}{59}
-\initial {T}
-\entry {\code {tab-stop-list}}{231}
-\entry {\code {tab-width}}{103}
-\entry {\code {tags-apropos-additional-actions}}{322}
-\entry {\code {tags-apropos-verbose}}{322}
-\entry {\code {tags-case-fold-search}}{321}
-\entry {\code {tags-file-name}}{318}
-\entry {\code {tags-table-list}}{319}
-\entry {\code {tags-tag-face}}{322}
-\entry {\code {temporary-file-directory}}{134}
-\entry {\code {term-file-prefix}}{474}
-\entry {\code {term-setup-hook}}{474}
-\entry {\code {tex-bibtex-command}}{254}
-\entry {\code {tex-default-mode}}{250}
-\entry {\code {tex-directory}}{253}
-\entry {\code {tex-dvi-print-command}}{253}
-\entry {\code {tex-dvi-view-command}}{253}
-\entry {\code {tex-main-file}}{254}
-\entry {\code {tex-mode-hook}}{255}
-\entry {\code {tex-run-command}}{253}
-\entry {\code {tex-shell-hook}}{255}
-\entry {\code {tex-show-queue-command}}{253}
-\entry {\code {tex-start-options-string}}{254}
-\entry {\code {text-mode-hook}}{244}
-\entry {\code {timeclock-ask-before-exiting}}{405}
-\entry {\code {timeclock-file}}{405}
-\entry {\code {timeclock-modeline-display}}{405}
-\entry {\code {track-eol}}{42}
-\entry {\code {truncate-lines}}{46}
-\entry {\code {truncate-partial-width-windows}}{184}
-\initial {U}
-\entry {\code {undo-limit}}{44}
-\entry {\code {undo-strong-limit}}{44}
-\entry {\code {unibyte-display-via-language-environment}}{223}
-\entry {\code {uniquify-buffer-name-style}}{180}
-\entry {\code {use-dialog-box}}{203}
-\entry {\code {user-mail-address}}{472}
-\initial {V}
-\entry {\code {vc-command-messages}}{164}
-\entry {\code {vc-comment-alist}}{162}
-\entry {\code {vc-consult-headers}}{164}
-\entry {\code {vc-cvs-stay-local}}{165}
-\entry {\code {vc-default-init-version}}{149}
-\entry {\code {vc-diff-switches}}{148}
-\entry {\code {vc-directory-exclusion-list}}{152}
-\entry {\code {vc-dired-recurse}}{151}
-\entry {\code {vc-dired-terse-display}}{151}
-\entry {\code {vc-follow-symlinks}}{163}
-\entry {\code {vc-handled-backends}}{163}
-\entry {\code {vc-header-alist}}{162}
-\entry {\code {vc-initial-comment}}{150}
-\entry {\code {vc-keep-workfiles}}{163}
-\entry {\code {vc-log-mode-hook}}{147}
-\entry {\code {vc-make-backup-files}}{134, 163}
-\entry {\code {vc-mistrust-permissions}}{164}
-\entry {\code {vc-path}}{164}
-\entry {\code {vc-rcs-diff-switches}}{148}
-\entry {\code {vc-static-header-alist}}{162}
-\entry {\code {vc-suppress-confirm}}{164}
-\entry {\code {version-control}}{135}
-\entry {\code {visible-bell}}{102}
-\initial {W}
-\entry {\code {w32-pass-alt-to-system}}{540}
-\entry {\code {which-func-modes}}{266}
-\entry {\code {window-min-height}}{188}
-\entry {\code {window-min-width}}{188}
-\entry {\code {woman-dired-keys}}{280}
-\entry {\code {woman-manpath}}{279}
-\entry {\code {woman-path}}{279}
-\initial {X}
-\entry {\code {x-cut-buffer-max}}{193}
-\entry {\code {x-select-enable-clipboard}}{194}
-\entry {\code {x-stretch-cursor}}{104}
-\entry {\code {xdb-mode-hook}}{304}
diff -ruN src-21.1/man/eshell.aux src-21.2/man/eshell.aux
--- src-21.1/man/eshell.aux	Sat Oct 20 18:45:46 2001
+++ src-21.2/man/eshell.aux	Thu Jan  1 01:00:00 1970
@@ -1,102 +0,0 @@
-'xrdef {What is Eshell?-title}{What is Eshell?}
-'xrdef {What is Eshell?-pg}{1}
-'xrdef {What is Eshell?-snt}{Chapter'tie1}
-'xrdef {Contributors to Eshell-title}{Contributors to Eshell}
-'xrdef {Contributors to Eshell-pg}{1}
-'xrdef {Contributors to Eshell-snt}{Section'tie1.1}
-'xrdef {Installation-title}{Installation}
-'xrdef {Installation-pg}{3}
-'xrdef {Installation-snt}{Chapter'tie2}
-'xrdef {Command basics-title}{Basic overview}
-'xrdef {Command basics-pg}{6}
-'xrdef {Command basics-snt}{Chapter'tie3}
-'xrdef {Commands verbs-title}{Commands verbs}
-'xrdef {Commands verbs-pg}{6}
-'xrdef {Commands verbs-snt}{Section'tie3.1}
-'xrdef {Command arguments-title}{Command arguments}
-'xrdef {Command arguments-pg}{6}
-'xrdef {Command arguments-snt}{Section'tie3.2}
-'xrdef {Commands-title}{Commands}
-'xrdef {Commands-pg}{8}
-'xrdef {Commands-snt}{Chapter'tie4}
-'xrdef {Invocation-title}{Invocation}
-'xrdef {Invocation-pg}{8}
-'xrdef {Invocation-snt}{Section'tie4.1}
-'xrdef {Completion-title}{Completion}
-'xrdef {Completion-pg}{8}
-'xrdef {Completion-snt}{Section'tie4.2}
-'xrdef {Aliases-title}{Aliases}
-'xrdef {Aliases-pg}{8}
-'xrdef {Aliases-snt}{Section'tie4.3}
-'xrdef {History-title}{History}
-'xrdef {History-pg}{8}
-'xrdef {History-snt}{Section'tie4.4}
-'xrdef {Scripts-title}{Scripts}
-'xrdef {Scripts-pg}{8}
-'xrdef {Scripts-snt}{Section'tie4.5}
-'xrdef {Arguments-title}{Arguments}
-'xrdef {Arguments-pg}{9}
-'xrdef {Arguments-snt}{Chapter'tie5}
-'xrdef {The Parser-title}{The Parser}
-'xrdef {The Parser-pg}{9}
-'xrdef {The Parser-snt}{Section'tie5.1}
-'xrdef {Variables-title}{Variables}
-'xrdef {Variables-pg}{9}
-'xrdef {Variables-snt}{Section'tie5.2}
-'xrdef {Substitution-title}{Substitution}
-'xrdef {Substitution-pg}{9}
-'xrdef {Substitution-snt}{Section'tie5.3}
-'xrdef {Globbing-title}{Globbing}
-'xrdef {Globbing-pg}{9}
-'xrdef {Globbing-snt}{Section'tie5.4}
-'xrdef {Predicates-title}{Predicates}
-'xrdef {Predicates-pg}{9}
-'xrdef {Predicates-snt}{Section'tie5.5}
-'xrdef {Input/Output-title}{Input/Output}
-'xrdef {Input/Output-pg}{10}
-'xrdef {Input/Output-snt}{Chapter'tie6}
-'xrdef {Process control-title}{Process control}
-'xrdef {Process control-pg}{11}
-'xrdef {Process control-snt}{Chapter'tie7}
-'xrdef {Extension modules-title}{Extension modules}
-'xrdef {Extension modules-pg}{12}
-'xrdef {Extension modules-snt}{Chapter'tie8}
-'xrdef {Writing a module-title}{Writing a module}
-'xrdef {Writing a module-pg}{12}
-'xrdef {Writing a module-snt}{Section'tie8.1}
-'xrdef {Module testing-title}{Module testing}
-'xrdef {Module testing-pg}{12}
-'xrdef {Module testing-snt}{Section'tie8.2}
-'xrdef {Directory handling-title}{Directory handling}
-'xrdef {Directory handling-pg}{12}
-'xrdef {Directory handling-snt}{Section'tie8.3}
-'xrdef {Key rebinding-title}{Key rebinding}
-'xrdef {Key rebinding-pg}{12}
-'xrdef {Key rebinding-snt}{Section'tie8.4}
-'xrdef {Smart scrolling-title}{Smart scrolling}
-'xrdef {Smart scrolling-pg}{12}
-'xrdef {Smart scrolling-snt}{Section'tie8.5}
-'xrdef {Terminal emulation-title}{Terminal emulation}
-'xrdef {Terminal emulation-pg}{12}
-'xrdef {Terminal emulation-snt}{Section'tie8.6}
-'xrdef {Built-in UNIX commands-title}{Built-in UNIX commands}
-'xrdef {Built-in UNIX commands-pg}{12}
-'xrdef {Built-in UNIX commands-snt}{Section'tie8.7}
-'xrdef {Extras and Goodies-title}{Extras and Goodies}
-'xrdef {Extras and Goodies-pg}{13}
-'xrdef {Extras and Goodies-snt}{Chapter'tie9}
-'xrdef {Bugs and ideas-title}{Bugs and ideas}
-'xrdef {Bugs and ideas-pg}{14}
-'xrdef {Bugs and ideas-snt}{Chapter'tie10}
-'xrdef {Known problems-title}{Known problems}
-'xrdef {Known problems-pg}{14}
-'xrdef {Known problems-snt}{Section'tie10.1}
-'xrdef {Concept Index-title}{Concept Index}
-'xrdef {Concept Index-pg}{21}
-'xrdef {Concept Index-snt}{}
-'xrdef {Function and Variable Index-title}{Function and Variable Index}
-'xrdef {Function and Variable Index-pg}{22}
-'xrdef {Function and Variable Index-snt}{}
-'xrdef {Key Index-title}{Key Index}
-'xrdef {Key Index-pg}{23}
-'xrdef {Key Index-snt}{}
diff -ruN src-21.1/man/eshell.cps src-21.2/man/eshell.cps
--- src-21.1/man/eshell.cps	Sat Oct 20 18:45:46 2001
+++ src-21.2/man/eshell.cps	Thu Jan  1 01:00:00 1970
@@ -1,26 +0,0 @@
-\initial {A}
-\entry {author, how to reach}{14}
-\entry {authors}{1}
-\initial {B}
-\entry {bugs, how to report them}{14}
-\entry {bugs, known}{14}
-\initial {C}
-\entry {contributors}{1}
-\initial {D}
-\entry {documentation, printed version}{4}
-\initial {E}
-\entry {email to the author}{14}
-\entry {Eshell, what it is}{1}
-\initial {F}
-\entry {FAQ}{14}
-\initial {I}
-\entry {installation}{3}
-\initial {K}
-\entry {known bugs}{14}
-\initial {P}
-\entry {printed version of documentation}{4}
-\entry {problems, list of common}{14}
-\initial {R}
-\entry {reporting bugs and ideas}{14}
-\initial {W}
-\entry {what is Eshell?}{1}
diff -ruN src-21.1/man/eshell.texi src-21.2/man/eshell.texi
--- src-21.1/man/eshell.texi	Thu Apr 19 17:10:31 2001
+++ src-21.2/man/eshell.texi	Sat Mar 16 12:21:24 2002
@@ -1,6 +1,6 @@
 \input texinfo  @c -*-texinfo-*-
 
-@c "@(#)$Name:  $:$Id: eshell.texi,v 1.12 2001/04/19 15:10:31 gerd Exp $"
+@c "@(#)$Name:  $:$Id: eshell.texi,v 1.12.12.1 2002/03/16 11:21:24 eliz Exp $"
 
 @c Documentation for Eshell: The Emacs Shell.
 @c Copyright (C) 1999, 2000  Free Software Foundation, Inc.
@@ -657,8 +657,8 @@
 @cindex known bugs
 @cindex bugs, known
 
-Below is complete list of known problems with Eshell version 2.4.1,
-which is the version included with Emacs 21.1.
+Below is complete list of known problems with Eshell version 2.4.2,
+which is the version included with Emacs 21.2.
 
 @table @asis
 @item Differentiate between aliases and functions
diff -ruN src-21.1/man/eudc.aux src-21.2/man/eudc.aux
--- src-21.1/man/eudc.aux	Sat Oct 20 18:45:43 2001
+++ src-21.2/man/eudc.aux	Thu Jan  1 01:00:00 1970
@@ -1,69 +0,0 @@
-'xrdef {Overview-title}{Overview}
-'xrdef {Overview-pg}{1}
-'xrdef {Overview-snt}{Chapter'tie1}
-'xrdef {LDAP-title}{LDAP}
-'xrdef {LDAP-pg}{1}
-'xrdef {LDAP-snt}{Section'tie1.1}
-'xrdef {CCSO PH/QI-title}{CCSO PH/QI}
-'xrdef {CCSO PH/QI-pg}{1}
-'xrdef {CCSO PH/QI-snt}{Section'tie1.2}
-'xrdef {BBDB-title}{BBDB}
-'xrdef {BBDB-pg}{2}
-'xrdef {BBDB-snt}{Section'tie1.3}
-'xrdef {Installation-title}{Installation}
-'xrdef {Installation-pg}{3}
-'xrdef {Installation-snt}{Chapter'tie2}
-'xrdef {LDAP Requirements-title}{LDAP Requirements}
-'xrdef {LDAP Requirements-pg}{3}
-'xrdef {LDAP Requirements-snt}{Section'tie2.1}
-'xrdef {Usage-title}{Usage}
-'xrdef {Usage-pg}{4}
-'xrdef {Usage-snt}{Chapter'tie3}
-'xrdef {Querying Servers-title}{Querying Servers}
-'xrdef {Querying Servers-pg}{4}
-'xrdef {Querying Servers-snt}{Section'tie3.1}
-'xrdef {Selecting a Server-title}{Selecting a Server}
-'xrdef {Selecting a Server-pg}{4}
-'xrdef {Selecting a Server-snt}{Section'tie3.1.1}
-'xrdef {Return Attributes-title}{Return Attributes}
-'xrdef {Return Attributes-pg}{4}
-'xrdef {Return Attributes-snt}{Section'tie3.1.2}
-'xrdef {Duplicate Attributes-title}{Duplicate Attributes}
-'xrdef {Duplicate Attributes-pg}{5}
-'xrdef {Duplicate Attributes-snt}{Section'tie3.1.3}
-'xrdef {Query Form-title}{Query Form}
-'xrdef {Query Form-pg}{5}
-'xrdef {Query Form-snt}{Section'tie3.2}
-'xrdef {Display of Query Results-title}{Display of Query Results}
-'xrdef {Display of Query Results-pg}{6}
-'xrdef {Display of Query Results-snt}{Section'tie3.3}
-'xrdef {Inline Query Expansion-title}{Inline Query Expansion}
-'xrdef {Inline Query Expansion-pg}{7}
-'xrdef {Inline Query Expansion-snt}{Section'tie3.4}
-'xrdef {The Server Hotlist-title}{The Server Hotlist}
-'xrdef {The Server Hotlist-pg}{8}
-'xrdef {The Server Hotlist-snt}{Section'tie3.5}
-'xrdef {The Hotlist Edit Buffer-title}{The Hotlist Edit Buffer}
-'xrdef {The Hotlist Edit Buffer-pg}{9}
-'xrdef {The Hotlist Edit Buffer-snt}{Section'tie3.5.1}
-'xrdef {Multi-server Queries-title}{Multi-server Queries}
-'xrdef {Multi-server Queries-pg}{9}
-'xrdef {Multi-server Queries-snt}{Section'tie3.6}
-'xrdef {Creating BBDB Records-title}{Creating BBDB Records}
-'xrdef {Creating BBDB Records-pg}{10}
-'xrdef {Creating BBDB Records-snt}{Section'tie3.7}
-'xrdef {Server/Protocol Locals-title}{Server/Protocol Locals}
-'xrdef {Server/Protocol Locals-pg}{11}
-'xrdef {Server/Protocol Locals-snt}{Section'tie3.8}
-'xrdef {Manipulating local bindings-title}{Manipulating local bindings}
-'xrdef {Manipulating local bindings-pg}{11}
-'xrdef {Manipulating local bindings-snt}{Section'tie3.8.1}
-'xrdef {Credits-title}{Credits}
-'xrdef {Credits-pg}{13}
-'xrdef {Credits-snt}{Chapter'tie4}
-'xrdef {Command and Function Index-title}{Command and Function Index}
-'xrdef {Command and Function Index-pg}{14}
-'xrdef {Command and Function Index-snt}{}
-'xrdef {Variables Index-title}{Variables Index}
-'xrdef {Variables Index-pg}{15}
-'xrdef {Variables Index-snt}{}
diff -ruN src-21.1/man/eudc.fns src-21.2/man/eudc.fns
--- src-21.1/man/eudc.fns	Sat Oct 20 18:45:43 2001
+++ src-21.2/man/eudc.fns	Thu Jan  1 01:00:00 1970
@@ -1,32 +0,0 @@
-\initial {E}
-\entry {\code {eudc-batch-export-records-to-bbdb}}{10}
-\entry {\code {eudc-bbdbify-address}}{11}
-\entry {\code {eudc-bbdbify-phone}}{11}
-\entry {\code {eudc-bookmark-current-server}}{9}
-\entry {\code {eudc-bookmark-server}}{9}
-\entry {\code {eudc-default-set}}{12}
-\entry {\code {eudc-display-generic-binary}}{7}
-\entry {\code {eudc-display-jpeg-as-button}}{7}
-\entry {\code {eudc-display-jpeg-inline}}{7}
-\entry {\code {eudc-display-sound}}{7}
-\entry {\code {eudc-display-url}}{7}
-\entry {\code {eudc-expand-inline}}{7}
-\entry {\code {eudc-get-attribute-list}}{6}
-\entry {\code {eudc-hotlist-add-server}}{9}
-\entry {\code {eudc-hotlist-delete-server}}{9}
-\entry {\code {eudc-hotlist-quit-edit}}{9}
-\entry {\code {eudc-hotlist-select-server}}{9}
-\entry {\code {eudc-hotlist-transpose-servers}}{9}
-\entry {\code {eudc-insert-record-at-point-into-bbdb}}{10}
-\entry {\code {eudc-protocol-local-variable-p}}{11}
-\entry {\code {eudc-protocol-set}}{12}
-\entry {\code {eudc-query-form}}{6}
-\entry {\code {eudc-server-local-variable-p}}{11}
-\entry {\code {eudc-server-set}}{12}
-\entry {\code {eudc-set}}{12}
-\entry {\code {eudc-set-server}}{4}
-\entry {\code {eudc-try-bbdb-insert}}{10}
-\entry {\code {eudc-update-local-variables}}{12}
-\entry {\code {eudc-variable-default-value}}{12}
-\entry {\code {eudc-variable-protocol-value}}{12}
-\entry {\code {eudc-variable-server-value}}{12}
diff -ruN src-21.1/man/eudc.vrs src-21.2/man/eudc.vrs
--- src-21.1/man/eudc.vrs	Sat Oct 20 18:45:43 2001
+++ src-21.2/man/eudc.vrs	Thu Jan  1 01:00:00 1970
@@ -1,18 +0,0 @@
-\initial {E}
-\entry {\code {eudc-attribute-display-method-alist}}{6}
-\entry {\code {eudc-bbdb-conversion-alist}}{10}
-\entry {\code {eudc-default-return-attributes}}{4}
-\entry {\code {eudc-duplicate-attribute-handling-method}}{5}
-\entry {\code {eudc-external-viewers}}{7}
-\entry {\code {eudc-inline-expansion-format}}{8}
-\entry {\code {eudc-inline-expansion-servers}}{9}
-\entry {\code {eudc-inline-query-format}}{7}
-\entry {\code {eudc-max-servers-to-query}}{10}
-\entry {\code {eudc-multiple-match-handling-method}}{8}
-\entry {\code {eudc-options-file}}{9}
-\entry {\code {eudc-protocol}}{4}
-\entry {\code {eudc-query-form-attributes}}{6}
-\entry {\code {eudc-server}}{4}
-\entry {\code {eudc-strict-return-matches}}{5}
-\entry {\code {eudc-use-raw-directory-names}}{6}
-\entry {\code {eudc-user-attribute-names-alist}}{6}
diff -ruN src-21.1/man/faq.aux src-21.2/man/faq.aux
--- src-21.1/man/faq.aux	Sat Oct 20 18:45:41 2001
+++ src-21.2/man/faq.aux	Thu Jan  1 01:00:00 1970
@@ -1,534 +0,0 @@
-'xrdef {FAQ notation-title}{FAQ notation}
-'xrdef {FAQ notation-pg}{3}
-'xrdef {FAQ notation-snt}{Chapter'tie1}
-'xrdef {Basic keys-title}{What do these mean: \kbd {C-h}, \kbd {M-C-a}, \key {RET}, \kbd {\key {ESC} a}, etc.?}
-'xrdef {Basic keys-pg}{3}
-'xrdef {Basic keys-snt}{Section'tie1.1}
-'xrdef {Extended commands-title}{What does \file {M-x \var {command}} mean?}
-'xrdef {Extended commands-pg}{4}
-'xrdef {Extended commands-snt}{Section'tie1.2}
-'xrdef {On-line manual-title}{How do I read topic XXX in the on-line manual?}
-'xrdef {On-line manual-pg}{4}
-'xrdef {On-line manual-snt}{Section'tie1.3}
-'xrdef {File-name conventions-title}{What are \file {etc/SERVICE}, \file {src/config.h}, and \file {lisp/default.el}?}
-'xrdef {File-name conventions-pg}{4}
-'xrdef {File-name conventions-snt}{Section'tie1.4}
-'xrdef {Common acronyms-title}{What are FSF, LPF, OSF, GNU, RMS, FTP, and GPL?}
-'xrdef {Common acronyms-pg}{5}
-'xrdef {Common acronyms-snt}{Section'tie1.5}
-'xrdef {General questions-title}{General questions}
-'xrdef {General questions-pg}{7}
-'xrdef {General questions-snt}{Chapter'tie2}
-'xrdef {The LPF-title}{What is the LPF?}
-'xrdef {The LPF-pg}{7}
-'xrdef {The LPF-snt}{Section'tie2.1}
-'xrdef {Real meaning of copyleft-title}{What is the real legal meaning of the GNU copyleft?}
-'xrdef {Real meaning of copyleft-pg}{7}
-'xrdef {Real meaning of copyleft-snt}{Section'tie2.2}
-'xrdef {Guidelines for newsgroup postings-title}{What are appropriate messages for \uref {news:gnu.emacs.help}, \uref {news:gnu.emacs.bug}, \uref {news:comp.emacs}, etc.?}
-'xrdef {Guidelines for newsgroup postings-pg}{7}
-'xrdef {Guidelines for newsgroup postings-snt}{Section'tie2.3}
-'xrdef {Newsgroup archives-title}{Where can I get old postings to \uref {news:gnu.emacs.help} and other GNU groups?}
-'xrdef {Newsgroup archives-pg}{8}
-'xrdef {Newsgroup archives-snt}{Section'tie2.4}
-'xrdef {Reporting bugs-title}{Where should I report bugs and other problems with Emacs?}
-'xrdef {Reporting bugs-pg}{8}
-'xrdef {Reporting bugs-snt}{Section'tie2.5}
-'xrdef {Unsubscribing from Emacs lists-title}{How do I unsubscribe from this mailing list?}
-'xrdef {Unsubscribing from Emacs lists-pg}{9}
-'xrdef {Unsubscribing from Emacs lists-snt}{Section'tie2.6}
-'xrdef {Contacting the FSF-title}{What is the current address of the FSF?}
-'xrdef {Contacting the FSF-pg}{9}
-'xrdef {Contacting the FSF-snt}{Section'tie2.7}
-'xrdef {Getting help-title}{Getting help}
-'xrdef {Getting help-pg}{11}
-'xrdef {Getting help-snt}{Chapter'tie3}
-'xrdef {Basic editing-title}{I'm just starting Emacs; how do I do basic editing?}
-'xrdef {Basic editing-pg}{11}
-'xrdef {Basic editing-snt}{Section'tie3.1}
-'xrdef {Learning how to do something-title}{How do I find out how to do something in Emacs?}
-'xrdef {Learning how to do something-pg}{11}
-'xrdef {Learning how to do something-snt}{Section'tie3.2}
-'xrdef {Getting a printed manual-title}{How do I get a printed copy of the Emacs manual?}
-'xrdef {Getting a printed manual-pg}{12}
-'xrdef {Getting a printed manual-snt}{Section'tie3.3}
-'xrdef {Emacs Lisp documentation-title}{Where can I get documentation on Emacs Lisp?}
-'xrdef {Emacs Lisp documentation-pg}{12}
-'xrdef {Emacs Lisp documentation-snt}{Section'tie3.4}
-'xrdef {Installing Texinfo documentation-title}{How do I install a piece of Texinfo documentation?}
-'xrdef {Installing Texinfo documentation-pg}{13}
-'xrdef {Installing Texinfo documentation-snt}{Section'tie3.5}
-'xrdef {Printing a Texinfo file-title}{How do I print a Texinfo file?}
-'xrdef {Printing a Texinfo file-pg}{14}
-'xrdef {Printing a Texinfo file-snt}{Section'tie3.6}
-'xrdef {Viewing Info files outside of Emacs-title}{Can I view Info files without using Emacs?}
-'xrdef {Viewing Info files outside of Emacs-pg}{14}
-'xrdef {Viewing Info files outside of Emacs-snt}{Section'tie3.7}
-'xrdef {Informational files for Emacs-title}{What informational files are available for Emacs?}
-'xrdef {Informational files for Emacs-pg}{14}
-'xrdef {Informational files for Emacs-snt}{Section'tie3.8}
-'xrdef {Help installing Emacs-title}{Where can I get help in installing Emacs?}
-'xrdef {Help installing Emacs-pg}{15}
-'xrdef {Help installing Emacs-snt}{Section'tie3.9}
-'xrdef {Obtaining the FAQ-title}{Where can I get the latest version of this FAQ?}
-'xrdef {Obtaining the FAQ-pg}{15}
-'xrdef {Obtaining the FAQ-snt}{Section'tie3.10}
-'xrdef {Status of Emacs-title}{Status of Emacs}
-'xrdef {Status of Emacs-pg}{17}
-'xrdef {Status of Emacs-snt}{Chapter'tie4}
-'xrdef {Origin of the term Emacs-title}{Where does the name ``Emacs'' come from?}
-'xrdef {Origin of the term Emacs-pg}{17}
-'xrdef {Origin of the term Emacs-snt}{Section'tie4.1}
-'xrdef {Latest version of Emacs-title}{What is the latest version of Emacs?}
-'xrdef {Latest version of Emacs-pg}{17}
-'xrdef {Latest version of Emacs-snt}{Section'tie4.2}
-'xrdef {New in Emacs 20-title}{What is different about Emacs 20?}
-'xrdef {New in Emacs 20-pg}{17}
-'xrdef {New in Emacs 20-snt}{Section'tie4.3}
-'xrdef {New in Emacs 21-title}{What is different about Emacs 21?}
-'xrdef {New in Emacs 21-pg}{17}
-'xrdef {New in Emacs 21-snt}{Section'tie4.4}
-'xrdef {Common requests-title}{Common requests}
-'xrdef {Common requests-pg}{19}
-'xrdef {Common requests-snt}{Chapter'tie5}
-'xrdef {Setting up a customization file-title}{How do I set up a \file {.emacs} file properly?}
-'xrdef {Setting up a customization file-pg}{19}
-'xrdef {Setting up a customization file-snt}{Section'tie5.1}
-'xrdef {Colors on a TTY-title}{How do I get colors and syntax highlighting on a TTY?}
-'xrdef {Colors on a TTY-pg}{19}
-'xrdef {Colors on a TTY-snt}{Section'tie5.2}
-'xrdef {Debugging a customization file-title}{How do I debug a \file {.emacs} file?}
-'xrdef {Debugging a customization file-pg}{19}
-'xrdef {Debugging a customization file-snt}{Section'tie5.3}
-'xrdef {Displaying the current line or column-title}{How do I make Emacs display the current line (or column) number?}
-'xrdef {Displaying the current line or column-pg}{20}
-'xrdef {Displaying the current line or column-snt}{Section'tie5.4}
-'xrdef {Displaying the current file name in the titlebar-title}{How can I modify the titlebar to contain the current file name?}
-'xrdef {Displaying the current file name in the titlebar-pg}{20}
-'xrdef {Displaying the current file name in the titlebar-snt}{Section'tie5.5}
-'xrdef {Turning on abbrevs by default-title}{How do I turn on abbrevs by default just in mode \var {mymode}?}
-'xrdef {Turning on abbrevs by default-pg}{20}
-'xrdef {Turning on abbrevs by default-snt}{Section'tie5.6}
-'xrdef {Turning on auto-fill by default-title}{How do I turn on \code {auto-fill-mode} by default?}
-'xrdef {Turning on auto-fill by default-pg}{21}
-'xrdef {Turning on auto-fill by default-snt}{Section'tie5.7}
-'xrdef {Associating modes with files-title}{How do I make Emacs use a certain major mode for certain files?}
-'xrdef {Associating modes with files-pg}{21}
-'xrdef {Associating modes with files-snt}{Section'tie5.8}
-'xrdef {Working with unprintable characters-title}{How do I search for, delete, or replace unprintable (eight-bit or control) characters?}
-'xrdef {Working with unprintable characters-pg}{21}
-'xrdef {Working with unprintable characters-snt}{Section'tie5.9}
-'xrdef {Highlighting a region-title}{How can I highlight a region of text in Emacs?}
-'xrdef {Highlighting a region-pg}{22}
-'xrdef {Highlighting a region-snt}{Section'tie5.10}
-'xrdef {Controlling case sensitivity-title}{How do I control Emacs's case-sensitivity when searching/replacing?}
-'xrdef {Controlling case sensitivity-pg}{22}
-'xrdef {Controlling case sensitivity-snt}{Section'tie5.11}
-'xrdef {Wrapping words automatically-title}{How do I make Emacs wrap words for me?}
-'xrdef {Wrapping words automatically-pg}{22}
-'xrdef {Wrapping words automatically-snt}{Section'tie5.12}
-'xrdef {Spell-checkers-title}{Where can I get a better spelling checker for Emacs?}
-'xrdef {Spell-checkers-pg}{22}
-'xrdef {Spell-checkers-snt}{Section'tie5.13}
-'xrdef {Checking TeX and *roff documents-title}{How can I spell-check \TeX{} or *roff documents?}
-'xrdef {Checking TeX and *roff documents-pg}{22}
-'xrdef {Checking TeX and *roff documents-snt}{Section'tie5.14}
-'xrdef {Changing load-path-title}{How do I change \code {load-path}?}
-'xrdef {Changing load-path-pg}{23}
-'xrdef {Changing load-path-snt}{Section'tie5.15}
-'xrdef {Using an already running Emacs process-title}{How do I use an already running Emacs from another window?}
-'xrdef {Using an already running Emacs process-pg}{23}
-'xrdef {Using an already running Emacs process-snt}{Section'tie5.16}
-'xrdef {Compiler error messages-title}{How do I make Emacs recognize my compiler's funny error messages?}
-'xrdef {Compiler error messages-pg}{24}
-'xrdef {Compiler error messages-snt}{Section'tie5.17}
-'xrdef {Indenting switch statements-title}{How do I change the indentation for \code {switch}?}
-'xrdef {Indenting switch statements-pg}{24}
-'xrdef {Indenting switch statements-snt}{Section'tie5.18}
-'xrdef {Customizing C and C++ indentation-title}{How to customize indentation in C, C\t {++}, and Java buffers?}
-'xrdef {Customizing C and C++ indentation-pg}{25}
-'xrdef {Customizing C and C++ indentation-snt}{Section'tie5.19}
-'xrdef {Horizontal scrolling-title}{How can I make Emacs automatically scroll horizontally?}
-'xrdef {Horizontal scrolling-pg}{26}
-'xrdef {Horizontal scrolling-snt}{Section'tie5.20}
-'xrdef {Overwrite mode-title}{How do I make Emacs "typeover" or "overwrite" instead of inserting?}
-'xrdef {Overwrite mode-pg}{26}
-'xrdef {Overwrite mode-snt}{Section'tie5.21}
-'xrdef {Turning off beeping-title}{How do I stop Emacs from beeping on a terminal?}
-'xrdef {Turning off beeping-pg}{26}
-'xrdef {Turning off beeping-snt}{Section'tie5.22}
-'xrdef {Turning the volume down-title}{How do I turn down the bell volume in Emacs running under X?}
-'xrdef {Turning the volume down-pg}{27}
-'xrdef {Turning the volume down-snt}{Section'tie5.23}
-'xrdef {Automatic indentation-title}{How do I tell Emacs to automatically indent a new line to the indentation of the previous line?}
-'xrdef {Automatic indentation-pg}{27}
-'xrdef {Automatic indentation-snt}{Section'tie5.24}
-'xrdef {Matching parentheses-title}{How do I show which parenthesis matches the one I'm looking at?}
-'xrdef {Matching parentheses-pg}{27}
-'xrdef {Matching parentheses-snt}{Section'tie5.25}
-'xrdef {Hiding #ifdef lines-title}{In C mode, can I show just the lines that will be left after \code {#ifdef} commands are handled by the compiler?}
-'xrdef {Hiding #ifdef lines-pg}{28}
-'xrdef {Hiding #ifdef lines-snt}{Section'tie5.26}
-'xrdef {Repeating commands-title}{Is there an equivalent to the \code {.} (dot) command of vi?}
-'xrdef {Repeating commands-pg}{28}
-'xrdef {Repeating commands-snt}{Section'tie5.27}
-'xrdef {Valid X resources-title}{What are the valid X resource settings (i.e., stuff in .Xdefaults)?}
-'xrdef {Valid X resources-pg}{29}
-'xrdef {Valid X resources-snt}{Section'tie5.28}
-'xrdef {Evaluating Emacs Lisp code-title}{How do I execute ("evaluate") a piece of Emacs Lisp code?}
-'xrdef {Evaluating Emacs Lisp code-pg}{29}
-'xrdef {Evaluating Emacs Lisp code-snt}{Section'tie5.29}
-'xrdef {Changing the length of a Tab-title}{How do I change Emacs's idea of the \key {TAB} character's length?}
-'xrdef {Changing the length of a Tab-pg}{29}
-'xrdef {Changing the length of a Tab-snt}{Section'tie5.30}
-'xrdef {Inserting > at the beginning of each line-title}{How do I insert \samp {>} at the beginning of every line?}
-'xrdef {Inserting > at the beginning of each line-pg}{30}
-'xrdef {Inserting > at the beginning of each line-snt}{Section'tie5.31}
-'xrdef {Underlining paragraphs-title}{How do I insert "_^H" before each character in a region to get an underlined paragraph?}
-'xrdef {Underlining paragraphs-pg}{30}
-'xrdef {Underlining paragraphs-snt}{Section'tie5.32}
-'xrdef {Repeating a command as many times as possible-title}{How do I repeat a command as many times as possible?}
-'xrdef {Repeating a command as many times as possible-pg}{30}
-'xrdef {Repeating a command as many times as possible-snt}{Section'tie5.33}
-'xrdef {Forcing the cursor to remain in the same column-title}{How do I make Emacs behave like this: when I go up or down, the cursor should stay in the same column even if the line is too short?}
-'xrdef {Forcing the cursor to remain in the same column-pg}{30}
-'xrdef {Forcing the cursor to remain in the same column-snt}{Section'tie5.34}
-'xrdef {Forcing Emacs to iconify itself-title}{How do I tell Emacs to iconify itself?}
-'xrdef {Forcing Emacs to iconify itself-pg}{30}
-'xrdef {Forcing Emacs to iconify itself-snt}{Section'tie5.35}
-'xrdef {Using regular expressions-title}{How do I use regexps (regular expressions) in Emacs?}
-'xrdef {Using regular expressions-pg}{30}
-'xrdef {Using regular expressions-snt}{Section'tie5.36}
-'xrdef {Replacing text across multiple files-title}{How do I perform a replace operation across more than one file?}
-'xrdef {Replacing text across multiple files-pg}{31}
-'xrdef {Replacing text across multiple files-snt}{Section'tie5.37}
-'xrdef {Documentation for etags-title}{Where is the documentation for \code {etags}?}
-'xrdef {Documentation for etags-pg}{31}
-'xrdef {Documentation for etags-snt}{Section'tie5.38}
-'xrdef {Disabling backups-title}{How do I disable backup files?}
-'xrdef {Disabling backups-pg}{31}
-'xrdef {Disabling backups-snt}{Section'tie5.39}
-'xrdef {Disabling auto-save-mode-title}{How do I disable \code {auto-save-mode}?}
-'xrdef {Disabling auto-save-mode-pg}{32}
-'xrdef {Disabling auto-save-mode-snt}{Section'tie5.40}
-'xrdef {Going to a line by number-title}{How can I go to a certain line given its number?}
-'xrdef {Going to a line by number-pg}{32}
-'xrdef {Going to a line by number-snt}{Section'tie5.41}
-'xrdef {Modifying pull-down menus-title}{How can I create or modify new pull-down menu options?}
-'xrdef {Modifying pull-down menus-pg}{32}
-'xrdef {Modifying pull-down menus-snt}{Section'tie5.42}
-'xrdef {Deleting menus and menu options-title}{How do I delete menus and menu options?}
-'xrdef {Deleting menus and menu options-pg}{33}
-'xrdef {Deleting menus and menu options-snt}{Section'tie5.43}
-'xrdef {Turning on syntax highlighting-title}{How do I turn on syntax highlighting?}
-'xrdef {Turning on syntax highlighting-pg}{34}
-'xrdef {Turning on syntax highlighting-snt}{Section'tie5.44}
-'xrdef {Scrolling only one line-title}{How can I force Emacs to scroll only one line when I move past the bottom of the screen?}
-'xrdef {Scrolling only one line-pg}{35}
-'xrdef {Scrolling only one line-snt}{Section'tie5.45}
-'xrdef {Replacing highlighted text-title}{How can I replace highlighted text with what I type?}
-'xrdef {Replacing highlighted text-pg}{35}
-'xrdef {Replacing highlighted text-snt}{Section'tie5.46}
-'xrdef {Editing MS-DOS files-title}{How can I edit MS-DOS files using Emacs?}
-'xrdef {Editing MS-DOS files-pg}{35}
-'xrdef {Editing MS-DOS files-snt}{Section'tie5.47}
-'xrdef {Filling paragraphs with a single space-title}{How can I tell Emacs to fill paragraphs with a single space after each period?}
-'xrdef {Filling paragraphs with a single space-pg}{36}
-'xrdef {Filling paragraphs with a single space-snt}{Section'tie5.48}
-'xrdef {Escape sequences in shell output-title}{Why do I get these strange escape sequences when I run}
-'xrdef {Escape sequences in shell output-pg}{36}
-'xrdef {Escape sequences in shell output-snt}{Section'tie5.49}
-'xrdef {Bugs and problems-title}{Bugs and problems}
-'xrdef {Bugs and problems-pg}{37}
-'xrdef {Bugs and problems-snt}{Chapter'tie6}
-'xrdef {Problems with very large files-title}{Does Emacs have problems with files larger than 8 megabytes?}
-'xrdef {Problems with very large files-pg}{37}
-'xrdef {Problems with very large files-snt}{Section'tie6.1}
-'xrdef {^M in the shell buffer-title}{How do I get rid of \samp {^M} or echoed commands in my shell buffer?}
-'xrdef {^M in the shell buffer-pg}{37}
-'xrdef {^M in the shell buffer-snt}{Section'tie6.2}
-'xrdef {Shell process exits abnormally-title}{Why do I get "Process shell exited abnormally with code 1"?}
-'xrdef {Shell process exits abnormally-pg}{38}
-'xrdef {Shell process exits abnormally-snt}{Section'tie6.3}
-'xrdef {Problems with Shell Mode on MS-Windows-title}{Why do I get an error message when I try to run \kbd {M-x shell}?}
-'xrdef {Problems with Shell Mode on MS-Windows-pg}{39}
-'xrdef {Problems with Shell Mode on MS-Windows-snt}{Section'tie6.4}
-'xrdef {Termcap/Terminfo entries for Emacs-title}{Where is the termcap/terminfo entry for terminal type "emacs"?}
-'xrdef {Termcap/Terminfo entries for Emacs-pg}{39}
-'xrdef {Termcap/Terminfo entries for Emacs-snt}{Section'tie6.5}
-'xrdef {Spontaneous entry into isearch-mode-title}{Why does Emacs spontaneously start displaying "I-search:" and beeping?}
-'xrdef {Spontaneous entry into isearch-mode-pg}{39}
-'xrdef {Spontaneous entry into isearch-mode-snt}{Section'tie6.6}
-'xrdef {Problems talking to certain hosts-title}{Why can't Emacs talk to certain hosts (or certain hostnames)?}
-'xrdef {Problems talking to certain hosts-pg}{39}
-'xrdef {Problems talking to certain hosts-snt}{Section'tie6.7}
-'xrdef {Errors with init files-title}{Why does Emacs say "Error in init file"?}
-'xrdef {Errors with init files-pg}{40}
-'xrdef {Errors with init files-snt}{Section'tie6.8}
-'xrdef {Emacs ignores X resources-title}{Why does Emacs ignore my X resources (my .Xdefaults file)?}
-'xrdef {Emacs ignores X resources-pg}{40}
-'xrdef {Emacs ignores X resources-snt}{Section'tie6.9}
-'xrdef {Emacs ignores frame parameters-title}{Why don't my customizations of the frame parameters work?}
-'xrdef {Emacs ignores frame parameters-pg}{41}
-'xrdef {Emacs ignores frame parameters-snt}{Section'tie6.10}
-'xrdef {Emacs takes a long time to visit files-title}{Why does Emacs take 20 seconds to visit a file?}
-'xrdef {Emacs takes a long time to visit files-pg}{41}
-'xrdef {Emacs takes a long time to visit files-snt}{Section'tie6.11}
-'xrdef {Editing files with $ in the name-title}{How do I edit a file with a \samp {$} in its name?}
-'xrdef {Editing files with $ in the name-pg}{41}
-'xrdef {Editing files with $ in the name-snt}{Section'tie6.12}
-'xrdef {Shell mode loses the current directory-title}{Why does shell mode lose track of the shell's current directory?}
-'xrdef {Shell mode loses the current directory-pg}{41}
-'xrdef {Shell mode loses the current directory-snt}{Section'tie6.13}
-'xrdef {Security risks with Emacs-title}{Are there any security risks in Emacs?}
-'xrdef {Security risks with Emacs-pg}{42}
-'xrdef {Security risks with Emacs-snt}{Section'tie6.14}
-'xrdef {Dired claims that no file is on this line-title}{Dired says, "no file on this line" when I try to do something.}
-'xrdef {Dired claims that no file is on this line-pg}{43}
-'xrdef {Dired claims that no file is on this line-snt}{Section'tie6.15}
-'xrdef {Compiling and installing Emacs-title}{Compiling and installing Emacs}
-'xrdef {Compiling and installing Emacs-pg}{45}
-'xrdef {Compiling and installing Emacs-snt}{Chapter'tie7}
-'xrdef {Installing Emacs-title}{How do I install Emacs?}
-'xrdef {Installing Emacs-pg}{45}
-'xrdef {Installing Emacs-snt}{Section'tie7.1}
-'xrdef {Updating Emacs-title}{How do I update Emacs to the latest version?}
-'xrdef {Updating Emacs-pg}{46}
-'xrdef {Updating Emacs-snt}{Section'tie7.2}
-'xrdef {Problems building Emacs-title}{What should I do if I have trouble building Emacs?}
-'xrdef {Problems building Emacs-pg}{46}
-'xrdef {Problems building Emacs-snt}{Section'tie7.3}
-'xrdef {Linking with -lX11 fails-title}{Why does linking Emacs with -lX11 fail?}
-'xrdef {Linking with -lX11 fails-pg}{47}
-'xrdef {Linking with -lX11 fails-snt}{Section'tie7.4}
-'xrdef {Finding Emacs and related packages-title}{Finding Emacs and related packages}
-'xrdef {Finding Emacs and related packages-pg}{49}
-'xrdef {Finding Emacs and related packages-snt}{Chapter'tie8}
-'xrdef {Finding Emacs on the Internet-title}{Where can I get Emacs on the net (or by snail mail)?}
-'xrdef {Finding Emacs on the Internet-pg}{49}
-'xrdef {Finding Emacs on the Internet-snt}{Section'tie8.1}
-'xrdef {Finding a package with particular functionality-title}{How do I find a Emacs Lisp package that does XXX?}
-'xrdef {Finding a package with particular functionality-pg}{49}
-'xrdef {Finding a package with particular functionality-snt}{Section'tie8.2}
-'xrdef {Packages that do not come with Emacs-title}{Where can I get Emacs Lisp packages that don't come with Emacs?}
-'xrdef {Packages that do not come with Emacs-pg}{50}
-'xrdef {Packages that do not come with Emacs-snt}{Section'tie8.3}
-'xrdef {Submitting to the Emacs Lisp Archive-title}{How do I submit code to the Emacs Lisp Archive?}
-'xrdef {Submitting to the Emacs Lisp Archive-pg}{50}
-'xrdef {Submitting to the Emacs Lisp Archive-snt}{Section'tie8.4}
-'xrdef {Current GNU distributions-title}{Where can I get other up-to-date GNU stuff?}
-'xrdef {Current GNU distributions-pg}{50}
-'xrdef {Current GNU distributions-snt}{Section'tie8.5}
-'xrdef {Difference between Emacs and XEmacs-title}{What is the difference between Emacs and XEmacs (formerly "Lucid Emacs")?}
-'xrdef {Difference between Emacs and XEmacs-pg}{51}
-'xrdef {Difference between Emacs and XEmacs-snt}{Section'tie8.6}
-'xrdef {Emacs for MS-DOS-title}{Where can I get Emacs for my PC running MS-DOS?}
-'xrdef {Emacs for MS-DOS-pg}{51}
-'xrdef {Emacs for MS-DOS-snt}{Section'tie8.7}
-'xrdef {Emacs for Windows-title}{Where can I get Emacs for Microsoft Windows}
-'xrdef {Emacs for Windows-pg}{52}
-'xrdef {Emacs for Windows-snt}{Section'tie8.8}
-'xrdef {Emacs for OS/2-title}{Where can I get Emacs for my PC running OS/2?}
-'xrdef {Emacs for OS/2-pg}{53}
-'xrdef {Emacs for OS/2-snt}{Section'tie8.9}
-'xrdef {Emacs for Atari ST-title}{Where can I get Emacs for my Atari ST?}
-'xrdef {Emacs for Atari ST-pg}{53}
-'xrdef {Emacs for Atari ST-snt}{Section'tie8.10}
-'xrdef {Emacs for the Amiga-title}{Where can I get Emacs for my Amiga?}
-'xrdef {Emacs for the Amiga-pg}{53}
-'xrdef {Emacs for the Amiga-snt}{Section'tie8.11}
-'xrdef {Emacs for NeXTSTEP-title}{Where can I get Emacs for NeXTSTEP?}
-'xrdef {Emacs for NeXTSTEP-pg}{53}
-'xrdef {Emacs for NeXTSTEP-snt}{Section'tie8.12}
-'xrdef {Emacs for Apple computers-title}{Where can I get Emacs for my Apple computer?}
-'xrdef {Emacs for Apple computers-pg}{53}
-'xrdef {Emacs for Apple computers-snt}{Section'tie8.13}
-'xrdef {Emacs for VMS and DECwindows-title}{Where do I get Emacs that runs on VMS under DECwindows?}
-'xrdef {Emacs for VMS and DECwindows-pg}{53}
-'xrdef {Emacs for VMS and DECwindows-snt}{Section'tie8.14}
-'xrdef {Modes for various languages-title}{Where can I get modes for Lex, Yacc/Bison, Bourne shell, csh, C\t {++}, Objective-C, Pascal, Java, and Awk?}
-'xrdef {Modes for various languages-pg}{54}
-'xrdef {Modes for various languages-snt}{Section'tie8.15}
-'xrdef {Translating names to IP addresses-title}{What is the IP address of XXX.YYY.ZZZ?}
-'xrdef {Translating names to IP addresses-pg}{54}
-'xrdef {Translating names to IP addresses-snt}{Section'tie8.16}
-'xrdef {Major packages and programs-title}{Major packages and programs}
-'xrdef {Major packages and programs-pg}{55}
-'xrdef {Major packages and programs-snt}{Chapter'tie9}
-'xrdef {VM-title}{VM (View Mail) --- another mail reader within Emacs, with MIME support}
-'xrdef {VM-pg}{55}
-'xrdef {VM-snt}{Section'tie9.1}
-'xrdef {Supercite-title}{Supercite --- mail and news citation package within Emacs}
-'xrdef {Supercite-pg}{55}
-'xrdef {Supercite-snt}{Section'tie9.2}
-'xrdef {Calc-title}{Calc --- poor man's Mathematica within Emacs}
-'xrdef {Calc-pg}{56}
-'xrdef {Calc-snt}{Section'tie9.3}
-'xrdef {VIPER-title}{VIPER --- \code {vi} emulation for Emacs}
-'xrdef {VIPER-pg}{56}
-'xrdef {VIPER-snt}{Section'tie9.4}
-'xrdef {AUC-TeX-title}{AUC TeX --- enhanced LaTeX mode with debugging facilities}
-'xrdef {AUC-TeX-pg}{56}
-'xrdef {AUC-TeX-snt}{Section'tie9.5}
-'xrdef {BBDB-title}{BBDB --- personal Info Rolodex integrated with mail/news readers}
-'xrdef {BBDB-pg}{57}
-'xrdef {BBDB-snt}{Section'tie9.6}
-'xrdef {Ispell-title}{Ispell --- spell checker in C with interface for Emacs}
-'xrdef {Ispell-pg}{57}
-'xrdef {Ispell-snt}{Section'tie9.7}
-'xrdef {w3-mode-title}{w3-mode --- A World Wide Web browser inside of Emacs}
-'xrdef {w3-mode-pg}{57}
-'xrdef {w3-mode-snt}{Section'tie9.8}
-'xrdef {EDB-title}{EDB --- Database program for Emacs; replaces forms editing modes}
-'xrdef {EDB-pg}{58}
-'xrdef {EDB-snt}{Section'tie9.9}
-'xrdef {Mailcrypt-title}{Mailcrypt --- PGP interface within Emacs mail and news}
-'xrdef {Mailcrypt-pg}{58}
-'xrdef {Mailcrypt-snt}{Section'tie9.10}
-'xrdef {JDE-title}{JDE --- Integrated development environment for Java}
-'xrdef {JDE-pg}{58}
-'xrdef {JDE-snt}{Section'tie9.11}
-'xrdef {Patch-title}{Patch --- program to apply "diffs" for updating files}
-'xrdef {Patch-pg}{58}
-'xrdef {Patch-snt}{Section'tie9.12}
-'xrdef {Key bindings-title}{Key bindings}
-'xrdef {Key bindings-pg}{59}
-'xrdef {Key bindings-snt}{Chapter'tie10}
-'xrdef {Binding keys to commands-title}{How do I bind keys (including function keys) to commands?}
-'xrdef {Binding keys to commands-pg}{59}
-'xrdef {Binding keys to commands-snt}{Section'tie10.1}
-'xrdef {Invalid prefix characters-title}{Why does Emacs say "Key sequence XXX uses invalid prefix characters"?}
-'xrdef {Invalid prefix characters-pg}{59}
-'xrdef {Invalid prefix characters-snt}{Section'tie10.2}
-'xrdef {Terminal setup code works after Emacs has begun-title}{Why doesn't this [terminal or window-system setup] code work in my \file {.emacs} file, but it works just fine after Emacs starts up?}
-'xrdef {Terminal setup code works after Emacs has begun-pg}{60}
-'xrdef {Terminal setup code works after Emacs has begun-snt}{Section'tie10.3}
-'xrdef {Using function keys under X-title}{How do I use function keys under X?}
-'xrdef {Using function keys under X-pg}{60}
-'xrdef {Using function keys under X-snt}{Section'tie10.4}
-'xrdef {Working with function and arrow keys-title}{How do I tell what characters or symbols my function or arrow keys emit?}
-'xrdef {Working with function and arrow keys-pg}{60}
-'xrdef {Working with function and arrow keys-snt}{Section'tie10.5}
-'xrdef {X key translations for Emacs-title}{How do I set the X key ``translations'' for Emacs?}
-'xrdef {X key translations for Emacs-pg}{60}
-'xrdef {X key translations for Emacs-snt}{Section'tie10.6}
-'xrdef {Handling C-s and C-q with flow control-title}{How do I handle \kbd {C-s} and \kbd {C-q} being used for flow control?}
-'xrdef {Handling C-s and C-q with flow control-pg}{60}
-'xrdef {Handling C-s and C-q with flow control-snt}{Section'tie10.7}
-'xrdef {Binding C-s and C-q-title}{How do I bind \kbd {C-s} and \kbd {C-q} (or any key) if these keys are filtered out?}
-'xrdef {Binding C-s and C-q-pg}{62}
-'xrdef {Binding C-s and C-q-snt}{Section'tie10.8}
-'xrdef {Backspace invokes help-title}{Why does the \key {Backspace} key invoke help?}
-'xrdef {Backspace invokes help-pg}{62}
-'xrdef {Backspace invokes help-snt}{Section'tie10.9}
-'xrdef {stty and Backspace key-title}{Why doesn't Emacs look at the \file {stty} settings for \key {Backspace} vs. \key {Delete}?}
-'xrdef {stty and Backspace key-pg}{64}
-'xrdef {stty and Backspace key-snt}{Section'tie10.10}
-'xrdef {Swapping keys-title}{How do I swap two keys?}
-'xrdef {Swapping keys-pg}{64}
-'xrdef {Swapping keys-snt}{Section'tie10.11}
-'xrdef {Producing C-XXX with the keyboard-title}{How do I produce C-XXX with my keyboard?}
-'xrdef {Producing C-XXX with the keyboard-pg}{64}
-'xrdef {Producing C-XXX with the keyboard-snt}{Section'tie10.12}
-'xrdef {No Meta key-title}{What if I don't have a \key {Meta} key?}
-'xrdef {No Meta key-pg}{64}
-'xrdef {No Meta key-snt}{Section'tie10.13}
-'xrdef {No Escape key-title}{What if I don't have an \key {Escape} key?}
-'xrdef {No Escape key-pg}{65}
-'xrdef {No Escape key-snt}{Section'tie10.14}
-'xrdef {Compose Character-title}{Can I make my \key {Compose Character} key behave like a \key {Meta} key?}
-'xrdef {Compose Character-pg}{65}
-'xrdef {Compose Character-snt}{Section'tie10.15}
-'xrdef {Binding combinations of modifiers and function keys-title}{How do I bind a combination of modifier key and function key?}
-'xrdef {Binding combinations of modifiers and function keys-pg}{65}
-'xrdef {Binding combinations of modifiers and function keys-snt}{Section'tie10.16}
-'xrdef {Meta key does not work in xterm-title}{Why doesn't my \key {Meta} key work in an \code {xterm} window?}
-'xrdef {Meta key does not work in xterm-pg}{65}
-'xrdef {Meta key does not work in xterm-snt}{Section'tie10.17}
-'xrdef {ExtendChar key does not work as Meta-title}{Why doesn't my \key {ExtendChar} key work as a \key {Meta} key under HP-UX 8.0 and 9.x?}
-'xrdef {ExtendChar key does not work as Meta-pg}{66}
-'xrdef {ExtendChar key does not work as Meta-snt}{Section'tie10.18}
-'xrdef {Alternate character sets-title}{Alternate character sets}
-'xrdef {Alternate character sets-pg}{67}
-'xrdef {Alternate character sets-snt}{Chapter'tie11}
-'xrdef {Emacs does not display 8-bit characters-title}{How do I make Emacs display 8-bit characters?}
-'xrdef {Emacs does not display 8-bit characters-pg}{67}
-'xrdef {Emacs does not display 8-bit characters-snt}{Section'tie11.1}
-'xrdef {Inputting eight-bit characters-title}{How do I input eight-bit characters?}
-'xrdef {Inputting eight-bit characters-pg}{67}
-'xrdef {Inputting eight-bit characters-snt}{Section'tie11.2}
-'xrdef {Kanji and Chinese characters-title}{Where can I get an Emacs that handles kanji, Chinese, or other Far-Eastern character sets?}
-'xrdef {Kanji and Chinese characters-pg}{67}
-'xrdef {Kanji and Chinese characters-snt}{Section'tie11.3}
-'xrdef {Right-to-left alphabets-title}{Where is an Emacs that can handle Semitic (right-to-left) alphabets?}
-'xrdef {Right-to-left alphabets-pg}{67}
-'xrdef {Right-to-left alphabets-snt}{Section'tie11.4}
-'xrdef {Mail and news-title}{Mail and news}
-'xrdef {Mail and news-pg}{69}
-'xrdef {Mail and news-snt}{Chapter'tie12}
-'xrdef {Changing the included text prefix-title}{How do I change the included text prefix in mail/news followups?}
-'xrdef {Changing the included text prefix-pg}{69}
-'xrdef {Changing the included text prefix-snt}{Section'tie12.1}
-'xrdef {Saving a copy of outgoing mail-title}{How do I save a copy of outgoing mail?}
-'xrdef {Saving a copy of outgoing mail-pg}{69}
-'xrdef {Saving a copy of outgoing mail-snt}{Section'tie12.2}
-'xrdef {Expanding aliases when sending mail-title}{Why doesn't Emacs expand my aliases when sending mail?}
-'xrdef {Expanding aliases when sending mail-pg}{69}
-'xrdef {Expanding aliases when sending mail-snt}{Section'tie12.3}
-'xrdef {Rmail thinks all messages are one big one-title}{Why does Rmail think all my saved messages are one big message?}
-'xrdef {Rmail thinks all messages are one big one-pg}{70}
-'xrdef {Rmail thinks all messages are one big one-snt}{Section'tie12.4}
-'xrdef {Sorting the messages in an Rmail folder-title}{How can I sort the messages in my Rmail folder?}
-'xrdef {Sorting the messages in an Rmail folder-pg}{70}
-'xrdef {Sorting the messages in an Rmail folder-snt}{Section'tie12.5}
-'xrdef {Rmail writes to /usr/spool/mail-title}{Why does Rmail need to write to \file {/usr/spool/mail}?}
-'xrdef {Rmail writes to /usr/spool/mail-pg}{70}
-'xrdef {Rmail writes to /usr/spool/mail-snt}{Section'tie12.6}
-'xrdef {Recovering mail files when Rmail munges them-title}{How do I recover my mail files after Rmail munges their format?}
-'xrdef {Recovering mail files when Rmail munges them-pg}{70}
-'xrdef {Recovering mail files when Rmail munges them-snt}{Section'tie12.7}
-'xrdef {Replying to the sender of a message-title}{How can I force Rmail to reply to the sender of a message, but not the other recipients?}
-'xrdef {Replying to the sender of a message-pg}{70}
-'xrdef {Replying to the sender of a message-snt}{Section'tie12.8}
-'xrdef {MIME with Emacs mail packages-title}{How can I get my favorite Emacs mail package to support MIME?}
-'xrdef {MIME with Emacs mail packages-pg}{71}
-'xrdef {MIME with Emacs mail packages-snt}{Section'tie12.9}
-'xrdef {Automatically starting a mail or news reader-title}{How do I make Emacs automatically start my mail/news reader?}
-'xrdef {Automatically starting a mail or news reader-pg}{71}
-'xrdef {Automatically starting a mail or news reader-snt}{Section'tie12.10}
-'xrdef {Reading news with Emacs-title}{How do I read news under Emacs?}
-'xrdef {Reading news with Emacs-pg}{71}
-'xrdef {Reading news with Emacs-snt}{Section'tie12.11}
-'xrdef {Gnus does not work with NNTP-title}{Why doesn't Gnus work via NNTP?}
-'xrdef {Gnus does not work with NNTP-pg}{71}
-'xrdef {Gnus does not work with NNTP-snt}{Section'tie12.12}
-'xrdef {Viewing articles with embedded underlining-title}{How do I view news articles with embedded underlining (e.g., ClariNews)?}
-'xrdef {Viewing articles with embedded underlining-pg}{72}
-'xrdef {Viewing articles with embedded underlining-snt}{Section'tie12.13}
-'xrdef {Saving a multi-part Gnus posting-title}{How do I save all the items of a multi-part posting in Gnus?}
-'xrdef {Saving a multi-part Gnus posting-pg}{73}
-'xrdef {Saving a multi-part Gnus posting-snt}{Section'tie12.14}
-'xrdef {Starting Gnus faster-title}{How do I make Gnus start up faster?}
-'xrdef {Starting Gnus faster-pg}{73}
-'xrdef {Starting Gnus faster-snt}{Section'tie12.15}
-'xrdef {Catching up in all newsgroups-title}{How do I catch up all newsgroups in Gnus?}
-'xrdef {Catching up in all newsgroups-pg}{73}
-'xrdef {Catching up in all newsgroups-snt}{Section'tie12.16}
-'xrdef {Killing based on nonstandard headers-title}{Why can't I kill in Gnus based on the Newsgroups/Keywords/Control headers?}
-'xrdef {Killing based on nonstandard headers-pg}{73}
-'xrdef {Killing based on nonstandard headers-snt}{Section'tie12.17}
-'xrdef {Removing flashing messages-title}{How do I get rid of flashing messages in Gnus for slow connections?}
-'xrdef {Removing flashing messages-pg}{73}
-'xrdef {Removing flashing messages-snt}{Section'tie12.18}
-'xrdef {Catch-up is slow in Gnus-title}{Why is catch up slow in Gnus?}
-'xrdef {Catch-up is slow in Gnus-pg}{73}
-'xrdef {Catch-up is slow in Gnus-snt}{Section'tie12.19}
-'xrdef {Gnus hangs for a long time-title}{Why does Gnus hang for a long time when posting?}
-'xrdef {Gnus hangs for a long time-pg}{74}
-'xrdef {Gnus hangs for a long time-snt}{Section'tie12.20}
-'xrdef {Learning more about Gnus-title}{Where can I find out more about Gnus?}
-'xrdef {Learning more about Gnus-pg}{74}
-'xrdef {Learning more about Gnus-snt}{Section'tie12.21}
-'xrdef {Concept index-title}{Concept Index}
-'xrdef {Concept index-pg}{75}
-'xrdef {Concept index-snt}{}
diff -ruN src-21.1/man/faq.cps src-21.2/man/faq.cps
--- src-21.1/man/faq.cps	Sat Oct 20 18:45:41 2001
+++ src-21.2/man/faq.cps	Thu Jan  1 01:00:00 1970
@@ -1,648 +0,0 @@
-\initial {#}
-\entry {\code {#ifdef}, selective display of}{28}
-\initial {$}
-\entry {\samp {$} in file names}{41}
-\initial {-}
-\entry {\samp {-debug-init} option}{19}
-\initial {.}
-\entry {\code {.}, equivalent to \code {vi} command}{28}
-\entry {\file {.emacs} debugging}{19}
-\entry {\file {.emacs} file, errors in}{40}
-\entry {\file {.emacs} file, setting up}{19}
-\entry {\file {.Xdefaults}}{40}
-\initial {/}
-\entry {\file {/usr/spool/mail} and Rmail}{70}
-\initial {A}
-\entry {Abbrevs, turning on by default}{20}
-\entry {Abnormal exits from \code {shell-mode}}{38}
-\entry {Acronyms, definitions for}{5}
-\entry {Adding to \code {load-path}}{23}
-\entry {Address book}{57}
-\entry {Alternate character sets}{67}
-\entry {Alternative Info file viewers}{14}
-\entry {Alternative mail software}{55}
-\entry {Amiga, Emacs for}{53}
-\entry {Antivirus programs, and Shell Mode}{39}
-\entry {Apple computers, Emacs for}{53}
-\entry {Apropos}{11}
-\entry {Arabic alphabets}{67}
-\entry {Archive, description of the Emacs Lisp}{50}
-\entry {Archive, submitting to the Emacs Lisp}{50}
-\entry {Archived postings from \uref {news:gnu.emacs.help}}{8}
-\entry {Arrow keys, symbols generated by}{60}
-\entry {Associating modes with files}{21}
-\entry {Atari ST, Emacs for}{53}
-\entry {AUC-TeX mode for editing \TeX{}}{56}
-\entry {\code {auto-fill-mode}, activating automatically}{21}
-\entry {\code {auto-fill-mode}, introduction to}{22}
-\entry {\code {auto-mode-alist}, modifying}{21}
-\entry {Auto-saving}{32}
-\entry {Automatic entry to \code {auto-fill-mode}}{21}
-\entry {Automatic filing of outgoing mail}{69}
-\entry {Awk, mode for}{54}
-\entry {\code {awk-mode}}{54}
-\initial {B}
-\entry {Backspace and \file {stty}}{64}
-\entry {Backspace key invokes help}{62}
-\entry {Backup files in a single directory}{31}
-\entry {Backups, disabling}{31}
-\entry {Basic editing with Emacs}{11}
-\entry {Basic keys}{3}
-\entry {BBDB}{57}
-\entry {Beeping without obvious reason}{39}
-\entry {Beeping, turning off}{26}
-\entry {Beginning editing}{11}
-\entry {Bell, visible}{26}
-\entry {Bell, volume of}{27}
-\entry {Big Brother Database}{57}
-\entry {Binding \kbd {C-s} and \kbd {C-q}}{62}
-\entry {Binding function keys}{60}
-\entry {Binding keys to commands}{59}
-\entry {Binding modifiers and function keys}{65}
-\entry {Bison, mode for}{54}
-\entry {Bourne Shell, mode for}{54}
-\entry {Bug reporting}{8}
-\entry {Bugs and problems}{37}
-\entry {Building Emacs from source}{45}
-\initial {C}
-\entry {\kbd {C-h}, definition of}{3}
-\entry {\kbd {C-s} and \kbd {C-q} with flow control}{60}
-\entry {\kbd {C-s} and \kbd {C-q}, binding}{62}
-\entry {C\t {++}, mode for}{54}
-\entry {Calc}{56}
-\entry {\code {calculator}, a package}{56}
-\entry {Case sensitivity in replacements}{22}
-\entry {Case sensitivity of searches}{22}
-\entry {\code {case-fold-search}}{22}
-\entry {\code {case-replace}}{22}
-\entry {Catching up all newsgroups in Gnus}{73}
-\entry {\code {cc-mode}}{54}
-\entry {Checking spelling}{22, 57}
-\entry {Chinese, handling with Emacs}{67}
-\entry {Citations in mail and news}{55}
-\entry {Colorizing text}{34}
-\entry {Colors on a TTY}{19}
-\entry {Colors on text-only terminals}{18}
-\entry {Column, displaying the current}{20}
-\entry {Command description in the manual}{11}
-\entry {Command, repeat last}{28}
-\entry {Commands, binding keys to}{59}
-\entry {Commands, extended}{4}
-\entry {Commands, repeating many times}{30}
-\entry {Common acronyms, definitions for}{5}
-\entry {Common requests}{19}
-\entry {Compilation error messages}{32}
-\entry {Compiler error messages, recognizing}{24}
-\entry {Compiling and installing Emacs}{45}
-\entry {Compiling Emacs for DOS}{51}
-\entry {\key {Compose Character} key, using as \key {Meta}}{65}
-\entry {Console, colors}{19}
-\entry {Contact database}{57}
-\entry {Contracting the FSF}{9}
-\entry {Control characters, generating}{64}
-\entry {Control characters, working with}{21}
-\entry {Control header, killing articles based on}{73}
-\entry {Control key, notation for}{3}
-\entry {Control-Meta characters, notation for}{3}
-\entry {Conventions for file names}{4}
-\entry {Converting from BABYL to Unix mail format}{70}
-\entry {Copying outgoing mail to a file}{69}
-\entry {\file {COPYING}, description of file}{14}
-\entry {Copyleft, real meaning of}{7}
-\entry {Creating new menu options}{32}
-\entry {Crosspostings make Gnus catching up slow}{73}
-\entry {\file {csh} mode}{54}
-\entry {Current directory and \code {shell-mode}}{41}
-\entry {Current GNU distributions}{50}
-\entry {Customization file, setting up}{19}
-\entry {Customize indentation}{25}
-\initial {D}
-\entry {Database}{58}
-\entry {Debugging \file {.emacs} file}{19, 40}
-\entry {Decoration level, in \code {font-lock-mode}}{34}
-\entry {DECwindows, Emacs for}{53}
-\entry {\code {default-tab-width}}{29}
-\entry {DEL key does not delete}{62}
-\entry {\key {DEL}, definition of}{3}
-\entry {Delay when visiting files}{41}
-\entry {Delete and \file {stty}}{64}
-\entry {\code {delete-selection-mode}}{35}
-\entry {Deleting menus and menu options}{33}
-\entry {Difference Emacs and XEmacs}{51}
-\entry {Differences between Emacs 19 and Emacs 20}{17}
-\entry {Differences between Emacs 20 and Emacs 21}{17}
-\entry {Differences between Unix and Emacs regexps}{30}
-\entry {Diffs and patching}{58}
-\entry {Directories and files that come with Emacs}{4}
-\entry {Directory, current in \code {shell-mode}}{41}
-\entry {Dired does not see a file}{43}
-\entry {Disabling \code {auto-save-mode}}{32}
-\entry {Disabling backups}{31}
-\entry {Discussion of the GPL}{7}
-\entry {Displaying eight-bit characters}{67}
-\entry {Displaying the current line or column}{20}
-\entry {\file {DISTRIB}, description of file}{14}
-\entry {Distribution, retrieving Emacs}{49}
-\entry {DNS and IP addresses}{54}
-\entry {\key {Do} key}{4}
-\entry {Documentation for \code {etags}}{31}
-\entry {Documentation on Emacs Lisp}{12}
-\entry {Documentation, installing new Texinfo files}{13}
-\entry {DOS, Emacs for}{51}
-\entry {Downloading and installing Emacs}{45}
-\initial {E}
-\entry {E-mail reader, VM}{55}
-\entry {E-mail, retrieving the FAQ via}{15}
-\entry {Echoed commands in \code {shell-mode}}{37}
-\entry {EDB}{58}
-\entry {Editing files with \samp {$} in the name}{41}
-\entry {Editing MS-DOS files}{35}
-\entry {Eight-bit characters, displaying}{67}
-\entry {Eight-bit characters, entering}{67}
-\entry {Eight-bit characters, working with}{21}
-\entry {Emacs 20, new features in}{17}
-\entry {Emacs 21, new features in}{17}
-\entry {Emacs entries for termcap/terminfo}{39}
-\entry {Emacs for MS-DOS}{51}
-\entry {Emacs for MS-Windows}{52}
-\entry {Emacs Lisp Archive, description of}{50}
-\entry {Emacs Lisp Archive, submissions to}{50}
-\entry {Emacs Lisp Reference Manual}{12}
-\entry {Emacs manual, obtaining a printed copy of}{12}
-\entry {Emacs name origin}{17}
-\entry {Emacs server functions}{23}
-\entry {\code {emacsclient}}{23}
-\entry {Embedded underlining in news articles}{72}
-\entry {Emulation of \code {vi}}{56}
-\entry {Encryption software, interface to}{58}
-\entry {Entering eight-bit characters}{67}
-\entry {Epoch}{51}
-\entry {Error in \file {.emacs}}{40}
-\entry {Error in init file}{40}
-\entry {Errors when building Emacs}{46}
-\entry {Errors, recognizing compiler}{24}
-\entry {\key {ESC}, definition of}{3}
-\entry {Escape key, lacking}{65}
-\entry {Escape sequences in \code {ls} output}{36}
-\entry {\code {etags}, documentation for}{31}
-\entry {Evaluating Lisp code}{29}
-\entry {Expanding aliases when sending mail}{69}
-\entry {\code {explicit-shell-file-name}}{39}
-\entry {Exporting messages as Unix mail files}{70}
-\entry {\key {ExtendChar} key as \key {Meta}}{66}
-\entry {Extended commands}{4}
-\initial {F}
-\entry {FAQ for Gnus}{74}
-\entry {FAQ for MIME and Emacs}{71}
-\entry {FAQ for NT Emacs}{52}
-\entry {FAQ notation}{3}
-\entry {FAQ, \code {font-lock-mode}}{34}
-\entry {FAQ, obtaining the}{15}
-\entry {Faster, starting Gnus}{73}
-\entry {File extensions and modes}{21}
-\entry {File name, displaying in the titlebar}{20}
-\entry {File names containing \samp {$}, editing}{41}
-\entry {\code {file-local-variable} and security}{42}
-\entry {File-name conventions}{4}
-\entry {Files included with Emacs}{14}
-\entry {Files, maximum size}{37}
-\entry {Files, replacing strings across multiple}{31}
-\entry {Files, take a long time to visit}{41}
-\entry {Filing outgoing mail}{69}
-\entry {Fill prefix}{27}
-\entry {\code {fill-column}, default value}{22}
-\entry {Filling automatically}{21}
-\entry {Finding an Emacs Lisp package}{49}
-\entry {Finding commands and variables}{11}
-\entry {Finding current GNU software}{50}
-\entry {Finding Emacs and related packages}{49}
-\entry {Finding Emacs on the Internet}{49}
-\entry {Finding other packages}{50}
-\entry {Finding topics in the on-line manual}{4}
-\entry {Flashing Gnus messages, removing}{73}
-\entry {Flow control, \kbd {C-s} and \kbd {C-q} with}{60}
-\entry {Folder, sorting messages in an Rmail}{70}
-\entry {\code {font-lock-mode}}{34}
-\entry {Forms mode}{58}
-\entry {Frame parameters}{41}
-\entry {\code {frame-title-format}}{20}
-\entry {Free Software Foundation, contacting}{9}
-\entry {FSF, definition of}{5}
-\entry {FTP, definition of}{5}
-\entry {\file {FTP}, description of file}{14}
-\entry {Function documentation}{12}
-\entry {Function keys}{60}
-\entry {Function keys and modifiers}{65}
-\entry {Function keys, symbols generated by}{60}
-\entry {Functionality, finding a particular package}{49}
-\initial {G}
-\entry {General Public License, real meaning of}{7}
-\entry {General questions}{7}
-\entry {Generating control characters}{64}
-\entry {\code {gethostbyname}, problematic version}{39}
-\entry {Getting help}{11}
-\entry {GNU mailing lists}{7}
-\entry {GNU newsgroups, appropriate messages for}{7}
-\entry {GNU, definition of}{5}
-\entry {\file {GNU}, description of file}{14}
-\entry {Gnus and NNTP}{71}
-\entry {Gnus FAQ}{74}
-\entry {Gnus hangs while posting}{74}
-\entry {Gnus is slow when catching up}{73}
-\entry {Gnus newsreader}{71}
-\entry {Gnus, Catching up all newsgroups in}{73}
-\entry {Gnus, flashing messages in}{73}
-\entry {Gnus, saving multi-part postings in}{73}
-\entry {Gnus, starting faster}{73}
-\entry {\code {gnuserv}}{24}
-\entry {Going to a line by number}{32}
-\entry {Good bug reports}{8}
-\entry {GPG}{58}
-\entry {GPL, definition of}{5}
-\entry {GPL, real meaning of}{7}
-\initial {H}
-\entry {Hangs in Gnus}{74}
-\entry {Hebrew, handling with Emacs}{67}
-\entry {Help for Emacs}{11}
-\entry {Help installing Emacs}{15}
-\entry {Help invoked by Backspace}{62}
-\entry {Help system, entering the}{11}
-\entry {\code {hide-ifdef-mode}}{28}
-\entry {Hiding \code {#ifdef} text}{28}
-\entry {Highlighing and replacing text}{35}
-\entry {Highlighting based on syntax}{34}
-\entry {Highlighting matching parentheses}{27}
-\entry {Highlighting text}{22}
-\entry {hilit19 is deprecated}{34}
-\entry {Horizontal scrolling}{26}
-\entry {Hosts, Emacs cannot talk to}{39}
-\entry {How to submit a bug report}{8}
-\entry {HP-UX, the \key {ExtendChar} key}{66}
-\entry {\code {hscroll-mode}}{26}
-\entry {HTML browser in Emacs}{57}
-\initial {I}
-\entry {Iconification under the X Window System}{30}
-\entry {Ignored X resources}{40}
-\entry {Ignoring case in searches}{22}
-\entry {Included text prefix, changing}{69}
-\entry {Indentation, how to customize}{25}
-\entry {Indenting new lines}{27}
-\entry {Indenting of \code {switch}}{24}
-\entry {Index search in a manual}{11}
-\entry {Info file viewers}{14}
-\entry {Info files, how to install}{13}
-\entry {Info, finding topics in}{4}
-\entry {Informational files included with Emacs}{14}
-\entry {Init file debugging}{19}
-\entry {Init file, errors in}{40}
-\entry {Init file, setting up}{19}
-\entry {Input, 8-bit characters}{67}
-\entry {\key {Insert}}{26}
-\entry {Installation help}{15}
-\entry {Installing Emacs}{45}
-\entry {Installing Texinfo documentation}{13}
-\entry {Integrated contact database}{57}
-\entry {Integrated Java development environment}{58}
-\entry {Interface to PGP from Emacs mail and news}{58}
-\entry {Internet, retreiving from}{49}
-\entry {\file {INTERVIEW}, description of file}{14}
-\entry {Invalid prefix characters}{59}
-\entry {IP addresses from names}{54}
-\entry {isearch-mode, spontaneous entry into}{39}
-\entry {Ispell}{57}
-\initial {J}
-\entry {Japanese, handling with Emacs}{67}
-\entry {Java development environment}{58}
-\entry {Java, mode for}{54}
-\entry {JDE}{58}
-\entry {Just-In-Time syntax highlighting}{34}
-\initial {K}
-\entry {Kanji, handling with Emacs}{67}
-\entry {Key bindings}{59}
-\entry {Key translations under X}{60}
-\entry {\code {keyboard-translate}}{64}
-\entry {Keymaps and menus}{32}
-\entry {Keys, binding to commands}{59}
-\entry {Keys, swapping}{64}
-\entry {Keywords header, killing articles based on}{73}
-\entry {Killing articles based on nonstandard headers}{73}
-\entry {Korean, handling with Emacs}{67}
-\initial {L}
-\entry {Lacking an Escape key}{65}
-\entry {Large files, opening}{37}
-\entry {Latest FAQ version, obtaining the}{15}
-\entry {Latest version of Emacs}{17}
-\entry {Lazy font-lock}{34}
-\entry {League for Programming Freedom}{7}
-\entry {Learning more about GNU}{74}
-\entry {Learning to do something in Emacs}{11}
-\entry {Length of tab character}{29}
-\entry {Levels of syntax highlighting}{34}
-\entry {Lex mode}{54}
-\entry {\key {LFD}, definition of}{3}
-\entry {Line number, displaying the current}{20}
-\entry {Line wrap}{22}
-\entry {\code {line-number-mode}}{20}
-\entry {Linking with -lX11 fails}{47}
-\entry {Lisp Archive, submissions to}{50}
-\entry {Lisp forms, evaluating}{29}
-\entry {Lisp packages that do not come with Emacs}{50}
-\entry {\code {load-path}, modifying}{23}
-\entry {Lookup a subject in a manual}{11}
-\entry {LPF, definition of}{5}
-\entry {LPF, description of}{7}
-\entry {\file {LPF}, description of file}{14}
-\entry {\code {ls} in Shell mode}{36}
-\entry {Lucid Emacs}{51}
-\entry {lX11, linking fails with}{47}
-\initial {M}
-\entry {\kbd {M-C-h}, definition of}{3}
-\entry {M-x, meaning of}{4}
-\entry {\file {MACHINES}, description of file}{14}
-\entry {Macintosh, Emacs for}{53}
-\entry {Mail alias expansion}{69}
-\entry {Mail and news}{69}
-\entry {Mail and news citations}{55}
-\entry {Mail files, recovering those munged by Rmail}{70}
-\entry {Mail packages and MIME}{71}
-\entry {Mail reader, starting automatically}{71}
-\entry {Mail replies, inserting a prefix character}{30}
-\entry {Mail, interface to PGP from}{58}
-\entry {Mail, saving outgoing automatically}{69}
-\entry {\code {mail-yank-prefix}}{30}
-\entry {Mailing lists, appropriate messages for}{7}
-\entry {\file {MAILINGLISTS}, description of file}{14}
-\entry {Major mode for shell scripts}{21}
-\entry {Major packages and programs}{55}
-\entry {Manual, obtaining a printed copy of}{12}
-\entry {Matching parentheses}{27}
-\entry {Mathematical package}{56}
-\entry {Maximum file size}{37}
-\entry {Maximum line width, default value}{22}
-\entry {Menus and keymaps}{32}
-\entry {Menus, creating or modifying}{32}
-\entry {Menus, deleting}{33}
-\entry {\key {Meta} key and \code {xterm}}{65}
-\entry {\key {Meta} key, notation for}{3}
-\entry {\key {Meta} key, what to do if you lack it}{64}
-\entry {\key {Meta}, using \key {Compose Character} for}{65}
-\entry {\key {Meta}, using \key {ExtendChar} for}{66}
-\entry {Microsoft files, editing}{35}
-\entry {Microsoft Windows, Emacs for}{52}
-\entry {MIME and Emacs mail packages}{71}
-\entry {Misspecified key sequences}{59}
-\entry {Mode for \TeX{}}{56}
-\entry {\code {mode-line-format}}{20}
-\entry {Modes, associating with file extensions}{21}
-\entry {Modifiers and function keys}{65}
-\entry {Modifying \code {load-path}}{23}
-\entry {Modifying pull-down menus}{32}
-\entry {\samp {movemail} and security}{42}
-\entry {MS-DOS files, editing}{35}
-\entry {MS-DOS, Emacs for}{51}
-\entry {Multi-part postings in Gnus, saving}{73}
-\entry {Multiple files, replacing across}{31}
-\initial {N}
-\entry {New lines, indenting of}{27}
-\entry {New Texinfo files, installing}{13}
-\entry {News and mail citations}{55}
-\entry {News articles with embedded underlining}{72}
-\entry {News reader, starting automatically}{71}
-\entry {News replies, inserting a prefix character}{30}
-\entry {\file {NEWS}, description of file}{14}
-\entry {News, interface to PGP from}{58}
-\entry {Newsgroups header, killing articles based on}{73}
-\entry {Newsgroups, appropriate messages for}{7}
-\entry {NeXTSTEP, Emacs for}{53}
-\entry {NNTP, Gnus fails to work with}{71}
-\entry {No Escape key}{65}
-\entry {No \key {Meta} key}{64}
-\entry {Notation for keys}{3}
-\initial {O}
-\entry {Objective-C, mode for}{54}
-\entry {Official GNU software sites}{50}
-\entry {Old Usenet postings for GNU groups}{8}
-\entry {On-line manual, reading topics in}{4}
-\entry {One space following periods}{36}
-\entry {Opening very large files}{37}
-\entry {Ordering GNU software}{9}
-\entry {Origin of the term ``Emacs''}{17}
-\entry {Original version of Emacs}{17}
-\entry {OS/2, Emacs for}{53}
-\entry {OSF, definition of}{5}
-\entry {Overview of help systems}{11}
-\entry {\code {overwrite-mode}}{26}
-\entry {Overwriting existing text}{26}
-\initial {P}
-\entry {Package, finding}{49}
-\entry {Packages, those that do not come with Emacs}{50}
-\entry {Pairs of parentheses, highlighting}{27}
-\entry {\file {paren.el}}{27}
-\entry {Parentheses, matching}{27}
-\entry {\code {pascal-mode}}{54}
-\entry {\file {patch}}{58}
-\entry {Patching source files with diffs}{58}
-\entry {Patents for software, opposition to}{7}
-\entry {Periods, one space following}{36}
-\entry {PGP}{58}
-\entry {\code {picture-mode}}{30}
-\entry {Postal address of the FSF}{9}
-\entry {Postal service, ordering Emacs via}{49}
-\entry {Posting messages to newsgroups}{7}
-\entry {Posting, Gnus hangs wile}{74}
-\entry {Prefix character, inserting in mail/news replies}{30}
-\entry {Prefix characters, invalid}{59}
-\entry {Prefix in mail/news followups, changing}{69}
-\entry {Prefixing lines}{27}
-\entry {Previous line, indenting according to}{27}
-\entry {Printed Emacs manual, obtaining}{12}
-\entry {Printing a Texinfo file}{14}
-\entry {Printing documentation}{14}
-\entry {Problems building Emacs}{46}
-\entry {Process shell exited}{38}
-\entry {Producing control characters}{64}
-\entry {Programmable calculator}{56}
-\entry {Pull-down menus, creating or modifying}{32}
-\initial {Q}
-\entry {Quoting in mail messages}{69}
-\initial {R}
-\entry {Reading news under Emacs}{71}
-\entry {Reading the Emacs manual}{11}
-\entry {Reading topics in the on-line manual}{4}
-\entry {Recently introduced features}{17}
-\entry {Recognizing non-standard compiler errors}{24}
-\entry {Recompilation}{32}
-\entry {Recovering munged mail files}{70}
-\entry {Reducing the increment when scrollng}{35}
-\entry {Reference card for Emacs}{11}
-\entry {Reference cards, in other languages}{11}
-\entry {Reference manual for Emacs Lisp}{12}
-\entry {Regexps}{30}
-\entry {Regexps and unprintable characters}{21}
-\entry {Regexps for recognizing compiler errors}{24}
-\entry {Region, highlighting a}{22}
-\entry {Regular expressions}{30}
-\entry {Remaining in the same column, regardless of contents}{30}
-\entry {Removing flashing Gnus messages}{73}
-\entry {Removing yourself from GNU mailing lists}{9}
-\entry {Repeating commands as with \code {vi}}{28}
-\entry {Repeating commands many times}{30}
-\entry {Replacing highlighted text}{35}
-\entry {Replacing strings across files}{31}
-\entry {Replacing, and case sensitivity}{22}
-\entry {Replies to mail/news, inserting a prefix character}{30}
-\entry {Replying only to the sender of a message}{70}
-\entry {Reporting bugs}{8}
-\entry {Resources, X}{29}
-\entry {\key {RET}, definition of}{3}
-\entry {Retrieving and installing Emacs}{45}
-\entry {Retrieving the latest FAQ version}{15}
-\entry {Richard Stallman, acronym for}{5}
-\entry {Right-to-left alphabets}{67}
-\entry {Rmail and \file {/usr/spool/mail}}{70}
-\entry {Rmail munged my files}{70}
-\entry {Rmail thinks all messages are one large message}{70}
-\entry {Rmail, replying to the sender of a message in}{70}
-\entry {Rmail, sorting messages in}{70}
-\entry {RMS, definition of}{5}
-\entry {Rolodex-like functionality}{57}
-\initial {S}
-\entry {Saving a copy of outgoing mail}{69}
-\entry {Saving at frequent intervals}{32}
-\entry {Saving multi-part postings in Gnus}{73}
-\entry {Scrolling horizontally}{26}
-\entry {Scrolling only one line}{35}
-\entry {Searching for unprintable characters}{21}
-\entry {Searching without case sensitivity}{22}
-\entry {Security with Emacs}{42}
-\entry {Selectively displaying \code {#ifdef} code}{28}
-\entry {Self-paced tutorial, invoking the}{11}
-\entry {Semitic alphabets}{67}
-\entry {Sender, replying only to}{70}
-\entry {Sending mail with aliases}{69}
-\entry {\file {SERVICE}, description of file}{14}
-\entry {Set number capability in \code {vi} emulators}{20}
-\entry {Setting the included text character}{69}
-\entry {Setting X resources}{29}
-\entry {\code {sh-mode}}{54}
-\entry {Shell buffer, echoed commands and \samp {^M} in}{37}
-\entry {Shell mode}{54}
-\entry {Shell Mode, and MS-Windows}{39}
-\entry {\code {shell-mode} and current directory}{41}
-\entry {\code {shell-mode} exits}{38}
-\entry {Show matching paren as in \code {vi}}{28}
-\entry {Single space following periods}{36}
-\entry {Slow catch up in Gnus}{73}
-\entry {Slow connections causing flashing messages in Gnus}{73}
-\entry {Snail mail address of the FSF}{9}
-\entry {Snail mail, ordering Emacs via}{49}
-\entry {Software patents, opposition to}{7}
-\entry {Sorting messages in an Rmail folder}{70}
-\entry {Source code, building Emacs from}{45}
-\entry {Sources for current GNU distributions}{50}
-\entry {\key {SPC}, definition of}{3}
-\entry {Spell-checker}{57}
-\entry {Spelling, checking \TeX{} documents}{22}
-\entry {Spelling, checking text documents}{22}
-\entry {Spontaneous entry into isearch-mode}{39}
-\entry {Stallman, Richard, acronym for}{5}
-\entry {Starting Gnus faster}{73}
-\entry {Starting mail/news reader automatically}{71}
-\entry {Status of Emacs}{17}
-\entry {\file {stty} and Emacs}{64}
-\entry {Stuff, current GNU}{50}
-\entry {Submitting code to the Emacs Lisp Archive}{50}
-\entry {\file {SUN-SUPPORT}, description of file}{14}
-\entry {Supercite}{55}
-\entry {Superyank}{55}
-\entry {Suspending Emacs}{30}
-\entry {Swapping keys}{64}
-\entry {\code {switch}, indenting}{24}
-\entry {Symbols generated by function keys}{60}
-\entry {Syntax highlighting}{34}
-\entry {Syntax highlighting on a TTY}{19}
-\entry {Synthetic X events and security}{42}
-\initial {T}
-\entry {Tab length}{29}
-\entry {\key {TAB}, definition of}{3}
-\entry {TECO}{17}
-\entry {Termcap}{39}
-\entry {Terminal setup code in \file {.emacs}}{60}
-\entry {Terminfo}{39}
-\entry {\TeX{} documents, checking spelling in}{22}
-\entry {\TeX{} mode}{56}
-\entry {Texinfo documentation, installing}{13}
-\entry {Texinfo file, printing}{14}
-\entry {Text indentation}{27}
-\entry {Text strings, putting regexps in}{30}
-\entry {Text, highlighting}{22}
-\entry {Titlebar, displaying the current file name in}{20}
-\entry {Toggling \code {overwrite-mode}}{26}
-\entry {Toolbar support}{17}
-\entry {Tools needed to compile Emacs under DOS}{51}
-\entry {TOS, Emacs for}{53}
-\entry {\code {transient-mark-mode}}{22}
-\entry {Translating names to IP addresses}{54}
-\entry {Translations for keys under X}{60}
-\entry {TTY colors}{18}
-\entry {Tutorial, invoking the}{11}
-\initial {U}
-\entry {Unbundled packages}{50}
-\entry {\code {underline-region}}{30}
-\entry {Underlining a region of text}{30}
-\entry {Underlining, embedded in news articles}{72}
-\entry {Unix regeps, differences from Emacs}{30}
-\entry {Unix systems, installing Emacs on}{45}
-\entry {Unpacking and installing Emacs}{45}
-\entry {Unprintable characters, working with}{21}
-\entry {\code {unrmail} command}{70}
-\entry {Unsubscribing from GNU mailing lists}{9}
-\entry {Up-to-date GNU stuff}{50}
-\entry {Updating Emacs}{46}
-\entry {Updating files with diffs}{58}
-\entry {Usenet archives for GNU groups}{8}
-\entry {Usenet groups, appropriate messages for}{7}
-\entry {Usenet reader in Emacs}{71}
-\entry {Using an existing Emacs process}{23}
-\entry {Using BIND to translate addresses}{54}
-\initial {V}
-\entry {Variable documentation}{12}
-\entry {Variable-size fonts}{17}
-\entry {Version, latest}{17}
-\entry {Vertical movement in empty documents}{30}
-\entry {Very large files, opening}{37}
-\entry {\code {vi} emulation}{56}
-\entry {View Mail}{55}
-\entry {Viewing Info files}{14}
-\entry {VIPER}{56}
-\entry {Visible bell}{26}
-\entry {Visiting files takes a long time}{41}
-\entry {VM}{55}
-\entry {VMS, Emacs for}{53}
-\entry {Volume of bell}{27}
-\initial {W}
-\entry {\code {w3-mode}}{57}
-\entry {Web browser}{57}
-\entry {Web, reading the FAQ on the}{15}
-\entry {Why Emacs?}{17}
-\entry {Windows 9X, ME, NT, 2K, and CE, Emacs for}{52}
-\entry {Windows files, editing}{35}
-\entry {Working with arrow keys}{60}
-\entry {Working with function keys}{60}
-\entry {Working with unprintable characters}{21}
-\entry {Wrapping lines}{22}
-\entry {Wrapping word automatically}{22}
-\entry {Writing and debugging \TeX{}}{56}
-\entry {WWW browser}{57}
-\initial {X}
-\entry {X events and security}{42}
-\entry {X key translations}{60}
-\entry {X Menus don't work}{47}
-\entry {X resources}{29}
-\entry {X resources being ignored}{40}
-\entry {X Window System and function keys}{60}
-\entry {X Window System and iconification}{30}
-\entry {XEmacs}{51}
-\entry {Xterm and \key {Meta} key}{65}
-\initial {Y}
-\entry {Yacc mode}{54}
diff -ruN src-21.1/man/faq.texi src-21.2/man/faq.texi
--- src-21.1/man/faq.texi	Thu Oct  4 21:40:06 2001
+++ src-21.2/man/faq.texi	Sat Mar 16 12:24:21 2002
@@ -7,7 +7,7 @@
 @setchapternewpage odd
 
 @c This is used in many places
-@set VER 21.1
+@set VER 21.2
 
 @c The @ifinfo stuff only appears in the Info version
 @ifinfo
@@ -1260,7 +1260,7 @@
 @cindex Syntax highlighting on a TTY
 @cindex Console, colors
 
-As of Emacs 21.1, colors and faces are supported in non-windowed mode,
+In Emacs 21.1 and later, colors and faces are supported in non-windowed mode,
 i.e.@: on Unix and GNU/Linux text-only terminals and consoles, and when
 invoked as @samp{emacs -nw} on X and MS-Windows.  (Colors and faces were
 supported in the MS-DOS port since Emacs 19.29.)  Emacs automatically
@@ -3699,10 +3699,10 @@
 and more features can be expected in the future, but there are still many
 differences between the two.
 
-The latest stable version of XEmacs as of this writing is 21.1; you can
+The latest stable version of XEmacs as of this writing is 21.1.14; you can
 get it at
 
-@uref{ftp://ftp.xemacs.org/pub/xemacs/current/xemacs-21.1.13.tar.gz}
+@uref{ftp://ftp.xemacs.org/pub/xemacs/xemacs-21.1/xemacs-21.1.14.tar.gz}
 
 More information about XEmacs, including a list of frequently asked
 questions (FAQ), is available at
@@ -3723,12 +3723,12 @@
 Windows 9X, Windows ME, and Windows 2000.  More information is available
 from
 
-@uref{ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/emacs.README}
+@uref{http://www.simtel.net/pub/gnu/djgpp/v2gnu/emacs.README}
 
 The binary itself is available in the files @file{em*.zip} in the
 directory
 
-@uref{ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/}
+@uref{http://www.simtel.net/pub/gnu/djgpp/v2gnu/}
 
 If you prefer to compile Emacs for yourself, you can do so with the
 current distribution directly.  You will need a 386 (or
@@ -3747,7 +3747,7 @@
 You can get the latest release of DJGPP by retrieving all of
 the files in
 
-@uref{ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2*}
+@uref{http://www.simtel.net/pub/gnu/djgpp/v2*}
 
 @item Unpacking program
 The easiest way is to use @code{djtar} which comes with DJGPP v2.x,
@@ -3766,11 +3766,11 @@
 @item make, mv, sed, and rm
 All of these utilities are available at
 
-@uref{ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu}
+@uref{http://www.simtel.net/pub/gnu/djgpp/v2gnu}
 
 16-bit utilities can be found in GNUish, at
 
-@uref{ftp://ftp.simtel.net/pub/simtelnet/gnu/gnuish}
+@uref{http://www.simtel.net/pub/gnu/gnuish}
 
 @noindent
 (@code{mv} and @code{rm} are in the Fileutils package, @code{sed} and
diff -ruN src-21.1/man/forms.aux src-21.2/man/forms.aux
--- src-21.1/man/forms.aux	Sat Oct 20 18:45:24 2001
+++ src-21.2/man/forms.aux	Thu Jan  1 01:00:00 1970
@@ -1,36 +0,0 @@
-'xrdef {Forms Example-title}{Forms Example}
-'xrdef {Forms Example-pg}{1}
-'xrdef {Forms Example-snt}{Chapter'tie1}
-'xrdef {Entering and Exiting Forms Mode-title}{Entering and Exiting Forms Mode}
-'xrdef {Entering and Exiting Forms Mode-pg}{3}
-'xrdef {Entering and Exiting Forms Mode-snt}{Chapter'tie2}
-'xrdef {Forms Commands-title}{Forms Commands}
-'xrdef {Forms Commands-pg}{5}
-'xrdef {Forms Commands-snt}{Chapter'tie3}
-'xrdef {Data File Format-title}{Data File Format}
-'xrdef {Data File Format-pg}{7}
-'xrdef {Data File Format-snt}{Chapter'tie4}
-'xrdef {Control File Format-title}{Control File Format}
-'xrdef {Control File Format-pg}{9}
-'xrdef {Control File Format-snt}{Chapter'tie5}
-'xrdef {Format Description-title}{The Format Description}
-'xrdef {Format Description-pg}{11}
-'xrdef {Format Description-snt}{Chapter'tie6}
-'xrdef {Modifying Forms Contents-title}{Modifying The Forms Contents}
-'xrdef {Modifying Forms Contents-pg}{13}
-'xrdef {Modifying Forms Contents-snt}{Chapter'tie7}
-'xrdef {Miscellaneous-title}{Miscellaneous}
-'xrdef {Miscellaneous-pg}{15}
-'xrdef {Miscellaneous-snt}{Chapter'tie8}
-'xrdef {Error Messages-title}{Error Messages}
-'xrdef {Error Messages-pg}{17}
-'xrdef {Error Messages-snt}{Chapter'tie9}
-'xrdef {Long Example-title}{Long Example}
-'xrdef {Long Example-pg}{19}
-'xrdef {Long Example-snt}{Chapter'tie10}
-'xrdef {Credits-title}{Credits}
-'xrdef {Credits-pg}{21}
-'xrdef {Credits-snt}{Chapter'tie11}
-'xrdef {Index-title}{Index}
-'xrdef {Index-pg}{23}
-'xrdef {Index-snt}{}
diff -ruN src-21.1/man/forms.cps src-21.2/man/forms.cps
--- src-21.1/man/forms.cps	Sat Oct 20 18:45:24 2001
+++ src-21.2/man/forms.cps	Thu Jan  1 01:00:00 1970
@@ -1,64 +0,0 @@
-\initial {B}
-\entry {\code {begin}}{6}
-\initial {C}
-\entry {\code {C-c >}}{5}
-\entry {\code {C-c <}}{5}
-\entry {\code {C-c C-k}}{5}
-\entry {\code {C-c C-l}}{5}
-\entry {\code {C-c C-n}}{5}
-\entry {\code {C-c C-o}}{5}
-\entry {\code {C-c C-p}}{5}
-\entry {\code {C-c C-q}}{5}
-\entry {\code {C-c C-r \var {regexp} \key {RET}}}{5}
-\entry {\code {C-c C-s \var {regexp} \key {RET}}}{5}
-\entry {\code {C-c TAB}}{5}
-\entry {\code {C-x C-s}}{6}
-\entry {control file}{9}
-\initial {E}
-\entry {\code {end}}{6}
-\initial {F}
-\entry {field}{7}
-\entry {\code {forms-check-number-of-fields}}{10}
-\entry {\code {forms-delete-record}}{5}
-\entry {\code {forms-enumerate}}{15}
-\entry {\code {forms-field-sep}}{7, 9}
-\entry {\code {forms-fields}}{11}
-\entry {\code {forms-file}}{9}
-\entry {\code {forms-find-file}}{3}
-\entry {\code {forms-find-file-other-window}}{3}
-\entry {\code {forms-first-record}}{5}
-\entry {\code {forms-format-list}}{9, 11}
-\entry {\code {forms-insert-after}}{10}
-\entry {\code {forms-insert-record}}{5}
-\entry {\code {forms-jump-record}}{5}
-\entry {\code {forms-last-record}}{5}
-\entry {\code {forms-mode}}{15}
-\entry {\code {forms-mode-hooks}}{3}
-\entry {\code {forms-modified-record-filter}}{10}
-\entry {\code {forms-multi-line}}{7, 9}
-\entry {\code {forms-new-record-filter}}{10}
-\entry {\code {forms-next-field}}{5}
-\entry {\code {forms-next-record}}{5}
-\entry {\code {forms-number-of-fields}}{9}
-\entry {\code {forms-prev-field}}{6}
-\entry {\code {forms-prev-record}}{5}
-\entry {\code {forms-print}}{6}
-\entry {\code {forms-read-file-filter}}{7, 9}
-\entry {\code {forms-read-only}}{9}
-\entry {\code {forms-save-buffer}}{6}
-\entry {\code {forms-search-backward}}{5}
-\entry {\code {forms-search-forward}}{5}
-\entry {\code {forms-toggle-read-only}}{5}
-\entry {\code {forms-version}}{15}
-\entry {\code {forms-write-file-filter}}{7, 10}
-\initial {N}
-\entry {\code {next}}{6}
-\initial {P}
-\entry {\code {prior}}{6}
-\entry {pseudo-newline}{7}
-\initial {R}
-\entry {record}{7}
-\initial {S}
-\entry {\code {S-Tab}}{6}
-\initial {T}
-\entry {\code {TAB}}{5}
diff -ruN src-21.1/man/idlwave.aux src-21.2/man/idlwave.aux
--- src-21.1/man/idlwave.aux	Sat Oct 20 18:45:43 2001
+++ src-21.2/man/idlwave.aux	Thu Jan  1 01:00:00 1970
@@ -1,126 +0,0 @@
-'xrdef {Introduction-title}{Introduction}
-'xrdef {Introduction-pg}{1}
-'xrdef {Introduction-snt}{Chapter'tie1}
-'xrdef {IDLWAVE in a Nutshell-title}{IDLWAVE in a Nutshell}
-'xrdef {IDLWAVE in a Nutshell-pg}{2}
-'xrdef {IDLWAVE in a Nutshell-snt}{Chapter'tie2}
-'xrdef {Getting Started-title}{Getting Started (Tutorial)}
-'xrdef {Getting Started-pg}{3}
-'xrdef {Getting Started-snt}{Chapter'tie3}
-'xrdef {The IDLWAVE Major Mode-title}{The IDLWAVE Major Mode}
-'xrdef {The IDLWAVE Major Mode-pg}{8}
-'xrdef {The IDLWAVE Major Mode-snt}{Chapter'tie4}
-'xrdef {Code Formatting-title}{Code Formatting}
-'xrdef {Code Formatting-pg}{8}
-'xrdef {Code Formatting-snt}{Section'tie4.1}
-'xrdef {Code Indentation-title}{Code Indentation}
-'xrdef {Code Indentation-pg}{8}
-'xrdef {Code Indentation-snt}{Section'tie4.1.1}
-'xrdef {Comment Indentation-title}{Comment Indentation}
-'xrdef {Comment Indentation-pg}{8}
-'xrdef {Comment Indentation-snt}{Section'tie4.1.2}
-'xrdef {Continuation Lines-title}{Continuation Lines and Filling}
-'xrdef {Continuation Lines-pg}{9}
-'xrdef {Continuation Lines-snt}{Section'tie4.1.3}
-'xrdef {Syntax Highlighting-title}{Syntax Highlighting}
-'xrdef {Syntax Highlighting-pg}{10}
-'xrdef {Syntax Highlighting-snt}{Section'tie4.1.4}
-'xrdef {Routine Info-title}{Routine Info}
-'xrdef {Routine Info-pg}{10}
-'xrdef {Routine Info-snt}{Section'tie4.2}
-'xrdef {Online Help-title}{Online Help}
-'xrdef {Online Help-pg}{12}
-'xrdef {Online Help-snt}{Section'tie4.3}
-'xrdef {Completion-title}{Completion}
-'xrdef {Completion-pg}{14}
-'xrdef {Completion-snt}{Section'tie4.4}
-'xrdef {Routine Source-title}{Routine Source}
-'xrdef {Routine Source-pg}{16}
-'xrdef {Routine Source-snt}{Section'tie4.5}
-'xrdef {Resolving Routines-title}{Resolving Routines}
-'xrdef {Resolving Routines-pg}{16}
-'xrdef {Resolving Routines-snt}{Section'tie4.6}
-'xrdef {Code Templates-title}{Code Templates}
-'xrdef {Code Templates-pg}{16}
-'xrdef {Code Templates-snt}{Section'tie4.7}
-'xrdef {Actions-title}{Actions}
-'xrdef {Actions-pg}{17}
-'xrdef {Actions-snt}{Section'tie4.8}
-'xrdef {Block Boundary Check-title}{Block Boundary Check}
-'xrdef {Block Boundary Check-pg}{17}
-'xrdef {Block Boundary Check-snt}{Section'tie4.8.1}
-'xrdef {Padding Operators-title}{Padding Operators}
-'xrdef {Padding Operators-pg}{18}
-'xrdef {Padding Operators-snt}{Section'tie4.8.2}
-'xrdef {Case Changes-title}{Case Changes}
-'xrdef {Case Changes-pg}{18}
-'xrdef {Case Changes-snt}{Section'tie4.8.3}
-'xrdef {Doc Header-title}{Documentation Header}
-'xrdef {Doc Header-pg}{19}
-'xrdef {Doc Header-snt}{Section'tie4.9}
-'xrdef {Motion Commands-title}{Motion Commands}
-'xrdef {Motion Commands-pg}{19}
-'xrdef {Motion Commands-snt}{Section'tie4.10}
-'xrdef {Misc Options-title}{Miscellaneous Options}
-'xrdef {Misc Options-pg}{20}
-'xrdef {Misc Options-snt}{Section'tie4.11}
-'xrdef {The IDLWAVE Shell-title}{The IDLWAVE Shell}
-'xrdef {The IDLWAVE Shell-pg}{21}
-'xrdef {The IDLWAVE Shell-snt}{Chapter'tie5}
-'xrdef {Starting the Shell-title}{Starting the Shell}
-'xrdef {Starting the Shell-pg}{21}
-'xrdef {Starting the Shell-snt}{Section'tie5.1}
-'xrdef {Using the Shell-title}{Using the Shell}
-'xrdef {Using the Shell-pg}{22}
-'xrdef {Using the Shell-snt}{Section'tie5.2}
-'xrdef {Debugging IDL Programs-title}{Debugging IDL Programs}
-'xrdef {Debugging IDL Programs-pg}{23}
-'xrdef {Debugging IDL Programs-snt}{Section'tie5.3}
-'xrdef {Compiling Programs-title}{Compiling Programs}
-'xrdef {Compiling Programs-pg}{24}
-'xrdef {Compiling Programs-snt}{Section'tie5.3.1}
-'xrdef {Breakpoints and Stepping-title}{Breakpoints and Stepping}
-'xrdef {Breakpoints and Stepping-pg}{24}
-'xrdef {Breakpoints and Stepping-snt}{Section'tie5.3.2}
-'xrdef {Examining Variables-title}{Examining Variables}
-'xrdef {Examining Variables-pg}{25}
-'xrdef {Examining Variables-snt}{Section'tie5.3.3}
-'xrdef {Installation-title}{Installation}
-'xrdef {Installation-pg}{27}
-'xrdef {Installation-snt}{Chapter'tie6}
-'xrdef {Installing IDLWAVE-title}{Installing IDLWAVE}
-'xrdef {Installing IDLWAVE-pg}{27}
-'xrdef {Installing IDLWAVE-snt}{Section'tie6.1}
-'xrdef {Installing Online Help-title}{Installing Online Help}
-'xrdef {Installing Online Help-pg}{27}
-'xrdef {Installing Online Help-snt}{Section'tie6.2}
-'xrdef {Upgrading from idl.el-title}{Upgrading from the old \b {\file {idl.el}} file}
-'xrdef {Upgrading from idl.el-pg}{27}
-'xrdef {Upgrading from idl.el-snt}{Section'tie6.3}
-'xrdef {Acknowledgement-title}{Acknowledgement}
-'xrdef {Acknowledgement-pg}{28}
-'xrdef {Acknowledgement-snt}{Chapter'tie7}
-'xrdef {Sources of Routine Info-title}{Sources of Routine Info}
-'xrdef {Sources of Routine Info-pg}{29}
-'xrdef {Sources of Routine Info-snt}{Appendix'tie'char65{}}
-'xrdef {Routine Definitions-title}{Routine Definitions}
-'xrdef {Routine Definitions-pg}{29}
-'xrdef {Routine Definitions-snt}{Section'tie'char65.1}
-'xrdef {Routine Information Sources-title}{Routine Information Sources}
-'xrdef {Routine Information Sources-pg}{29}
-'xrdef {Routine Information Sources-snt}{Section'tie'char65.2}
-'xrdef {Library Catalog-title}{Library Catalog}
-'xrdef {Library Catalog-pg}{30}
-'xrdef {Library Catalog-snt}{Section'tie'char65.3}
-'xrdef {Load-Path Shadows-title}{Load-Path Shadows}
-'xrdef {Load-Path Shadows-pg}{31}
-'xrdef {Load-Path Shadows-snt}{Section'tie'char65.4}
-'xrdef {Documentation Scan-title}{Documentation Scan}
-'xrdef {Documentation Scan-pg}{31}
-'xrdef {Documentation Scan-snt}{Section'tie'char65.5}
-'xrdef {Configuration Examples-title}{Configuration Examples}
-'xrdef {Configuration Examples-pg}{32}
-'xrdef {Configuration Examples-snt}{Appendix'tie'char66{}}
-'xrdef {Index-title}{Index}
-'xrdef {Index-pg}{34}
-'xrdef {Index-snt}{}
diff -ruN src-21.1/man/idlwave.cps src-21.2/man/idlwave.cps
--- src-21.1/man/idlwave.cps	Sat Oct 20 18:45:42 2001
+++ src-21.2/man/idlwave.cps	Thu Jan  1 01:00:00 1970
@@ -1,338 +0,0 @@
-\initial {!}
-\entry {\code {!DIR}, IDL variable}{10, 30, 31}
-\entry {\code {!PATH}, IDL variable}{10, 29}
-\initial {.}
-\entry {\file {.emacs}}{32}
-\initial {A}
-\entry {Abbreviations}{16}
-\entry {Acknowledgement}{28}
-\entry {Actions}{17}
-\entry {Actions, applied to foreign code}{17}
-\entry {Active text, in routine info}{11}
-\entry {Application, testing for shadowing}{31}
-\entry {Authors, of IDLWAVE}{28}
-\entry {\code {auto-fill-mode}}{9}
-\initial {B}
-\entry {Block boundary check}{17}
-\entry {Block, closing}{17}
-\entry {Breakpoints}{24}
-\entry {Buffer, testing for shadowing}{31}
-\entry {Buffers, killing}{16}
-\entry {Buffers, scanning for routine info}{10, 29}
-\entry {Builtin list of routines}{29}
-\initial {C}
-\entry {C-c ?}{10}
-\entry {C-c C-d}{23}
-\entry {C-c C-d C-b}{24}
-\entry {C-c C-d C-c}{24}
-\entry {C-c C-d C-p}{25}
-\entry {C-c C-h}{19}
-\entry {C-c C-i}{10, 14}
-\entry {C-c C-m}{19}
-\entry {C-c C-s}{21}
-\entry {C-c C-v}{16}
-\entry {\code {CALL_EXTERNAL}, IDL routine}{29}
-\entry {Calling sequences}{10}
-\entry {Calling stack, motion}{25}
-\entry {Case changes}{18}
-\entry {Case of completed words}{14}
-\entry {Categories, of routines}{10}
-\entry {cc-mode.el}{1}
-\entry {Changelog, in doc header.}{19}
-\entry {Character input mode (Shell)}{23}
-\entry {Class ambiguity}{15}
-\entry {Class name completion}{14}
-\entry {Class query, forcing}{15}
-\entry {Closing a block}{17}
-\entry {Code formatting}{8}
-\entry {Code indentation}{8}
-\entry {Code structure, moving through}{19}
-\entry {Code templates}{16}
-\entry {Coding standards, enforcing}{17}
-\entry {Comint}{22}
-\entry {Comint, Emacs package}{21}
-\entry {Comment indentation}{8}
-\entry {Compiling library modules}{16}
-\entry {Compiling programs}{24}
-\entry {Completion}{14}
-\entry {Completion, in the shell}{22}
-\entry {Completion, Online Help}{14}
-\entry {Completion, scrolling}{14}
-\entry {Configuration examples}{32}
-\entry {Context, for online help}{12}
-\entry {Continuation lines}{9}
-\entry {Contributors, to IDLWAVE}{28}
-\entry {Copyright, of IDL manual}{27}
-\entry {Copyright, of IDLWAVE}{2}
-\entry {CORBA (Common Object Request Broker Architecture)}{1}
-\initial {D}
-\entry {Debugging}{23}
-\entry {Dedicated frame, for shell buffer}{21}
-\entry {Default command line, executing}{24}
-\entry {Default routine, for info and help}{10}
-\entry {Default settings, of options}{32}
-\entry {DocLib header}{19}
-\entry {DocLib header, as online help}{12}
-\entry {Documentation header}{19}
-\entry {Downcase, enforcing for reserved words}{18}
-\entry {Duplicate routines}{11, 31}
-\initial {E}
-\entry {Emacs, distributed with IDLWAVE}{27}
-\entry {Email address, of Maintainer}{28}
-\entry {\code {END} type checking}{17}
-\entry {\code {END}, automatic insertion}{17}
-\entry {\code {END}, expanding}{17}
-\entry {Example configuration}{32}
-\entry {Executing a default command line}{24}
-\entry {Execution, controlled}{24}
-\entry {Expressions, help}{25}
-\entry {Expressions, printing}{25}
-\entry {External routines}{29}
-\initial {F}
-\entry {Feature overview}{1}
-\entry {Filling}{9}
-\entry {Flags, in routine info}{11}
-\entry {Font lock}{10}
-\entry {Forcing class query.}{15}
-\entry {Foreign code, adapting}{8, 17}
-\entry {Formatting, of code}{8}
-\entry {Frame, for shell buffer}{21}
-\entry {FTP site}{27}
-\entry {\file {Func-menu}, XEmacs package}{19}
-\entry {Function definitions, jumping to}{19}
-\entry {Function name completion}{14}
-\initial {G}
-\entry {\file {get_rinfo}}{31}
-\entry {Getting Started}{3}
-\initial {H}
-\entry {Hanging paragraphs}{8, 9}
-\entry {Header, for file documentation}{19}
-\entry {Help application, key bindings}{13}
-\entry {\code {HELP}, on expressions}{25}
-\entry {Highlighting of syntax}{10}
-\entry {Homepage for IDLWAVE}{27}
-\entry {Hooks}{20, 22}
-\initial {I}
-\entry {IDL library routine info}{30}
-\entry {IDL manual, ASCII version}{12}
-\entry {IDL variable \code {!DIR}}{10, 30, 31}
-\entry {IDL variable \code {!PATH}}{10, 29}
-\entry {IDL, as Emacs subprocess}{21}
-\entry {\file {idl-shell.el}}{1}
-\entry {\file {idl.el}}{1}
-\entry {\file {idlw-help.el}}{12, 31}
-\entry {\file {idlw-help.txt}}{12, 31}
-\entry {\file {idlw-rinfo.el}}{31}
-\entry {IDLWAVE in a Nutshell}{2}
-\entry {IDLWAVE major mode}{8}
-\entry {IDLWAVE shell}{21}
-\entry {IDLWAVE, homepage}{27}
-\entry {\code {idlwave-abbrev-change-case}}{18}
-\entry {\code {idlwave-abbrev-move}}{17}
-\entry {\code {idlwave-abbrev-start-char}}{17}
-\entry {\code {idlwave-auto-fill-split-string}}{9}
-\entry {\code {idlwave-auto-routine-info-updates}}{30}
-\entry {\code {idlwave-begin-line-comment}}{9}
-\entry {\code {idlwave-block-indent}}{8}
-\entry {\code {idlwave-class-arrow-face}}{15}
-\entry {\code {idlwave-code-comment}}{9}
-\entry {\code {idlwave-complete-empty-string-as-lower-case}}{14}
-\entry {\code {idlwave-completion-case}}{14}
-\entry {\code {idlwave-completion-fontify-classes}}{15}
-\entry {\code {idlwave-completion-force-default-case}}{14}
-\entry {\code {idlwave-completion-restore-window-configuration}}{15}
-\entry {\code {idlwave-completion-show-classes}}{15}
-\entry {\code {idlwave-continuation-indent}}{8}
-\entry {\code {idlwave-default-font-lock-items}}{10}
-\entry {\code {idlwave-do-actions}}{17}
-\entry {\code {idlwave-doc-modifications-keyword}}{19}
-\entry {\code {idlwave-doclib-end}}{19}
-\entry {\code {idlwave-doclib-start}}{19}
-\entry {\code {idlwave-end-offset}}{8}
-\entry {\code {idlwave-expand-generic-end}}{17}
-\entry {\code {idlwave-extra-help-function}}{13}
-\entry {\code {idlwave-file-header}}{19}
-\entry {\code {idlwave-fill-comment-line-only}}{9}
-\entry {\code {idlwave-function-completion-adds-paren}}{15}
-\entry {\code {idlwave-hang-indent-regexp}}{9}
-\entry {\code {idlwave-hanging-indent}}{9}
-\entry {\code {idlwave-help-activate-links-agressively}}{13}
-\entry {\code {idlwave-help-application}}{20}
-\entry {\code {idlwave-help-directory}}{13}
-\entry {\code {idlwave-help-fontify-source-code}}{13}
-\entry {\code {idlwave-help-frame-parameters}}{13}
-\entry {\code {idlwave-help-link-face}}{13}
-\entry {\code {idlwave-help-source-try-header}}{13}
-\entry {\code {idlwave-help-use-dedicated-frame}}{13}
-\entry {\code {idlwave-highlight-help-links-in-completion}}{15}
-\entry {\code {idlwave-keyword-completion-adds-equal}}{14}
-\entry {\code {idlwave-libinfo-file}}{30}
-\entry {\code {idlwave-library-path}}{30}
-\entry {\code {idlwave-load-hook}}{20}
-\entry {\code {idlwave-main-block-indent}}{8}
-\entry {\code {idlwave-max-popup-menu-items}}{13}
-\entry {\code {idlwave-mode-hook}}{20}
-\entry {\code {idlwave-no-change-comment}}{8}
-\entry {\code {idlwave-pad-keyword}}{18}
-\entry {\code {idlwave-query-class}}{15}
-\entry {\code {idlwave-query-shell-for-routine-info}}{30}
-\entry {\code {idlwave-reindent-end}}{18}
-\entry {\code {idlwave-reserved-word-upcase}}{19}
-\entry {\code {idlwave-resize-routine-help-window}}{11}
-\entry {\code {idlwave-rinfo-max-source-lines}}{11}
-\entry {\code {idlwave-scan-all-buffers-for-routine-info}}{30}
-\entry {\code {idlwave-shell-activate-prefix-keybindings}}{24}
-\entry {\code {idlwave-shell-arrows-do-history}}{23}
-\entry {\code {idlwave-shell-automatic-start}}{21}
-\entry {\code {idlwave-shell-breakpoint-face}}{25}
-\entry {\code {idlwave-shell-command-line-options}}{21}
-\entry {\code {idlwave-shell-debug-modifiers}}{24}
-\entry {\code {idlwave-shell-explicit-file-name}}{21}
-\entry {\code {idlwave-shell-expression-face}}{25}
-\entry {\code {idlwave-shell-file-name-chars}}{23}
-\entry {\code {idlwave-shell-frame-parameters}}{22}
-\entry {\code {idlwave-shell-graphics-window-size}}{23}
-\entry {\code {idlwave-shell-initial-commands}}{21}
-\entry {\code {idlwave-shell-input-mode-spells}}{23}
-\entry {\code {idlwave-shell-mark-breakpoints}}{25}
-\entry {\code {idlwave-shell-mark-stop-line}}{24}
-\entry {\code {idlwave-shell-mode-hook}}{22}
-\entry {\code {idlwave-shell-overlay-arrow}}{24}
-\entry {\code {idlwave-shell-prefix-key}}{23}
-\entry {\code {idlwave-shell-print-expression-function}}{26}
-\entry {\code {idlwave-shell-process-name}}{21}
-\entry {\code {idlwave-shell-prompt-pattern}}{21}
-\entry {\code {idlwave-shell-stop-line-face}}{24}
-\entry {\code {idlwave-shell-temp-pro-prefix}}{22}
-\entry {\code {idlwave-shell-use-dedicated-frame}}{21}
-\entry {\code {idlwave-shell-use-input-mode-magic}}{23}
-\entry {\code {idlwave-shell-use-toolbar}}{24}
-\entry {\code {idlwave-show-block}}{17}
-\entry {\code {idlwave-special-lib-alist}}{11, 30}
-\entry {\code {idlwave-split-line-string}}{9}
-\entry {\code {idlwave-startup-message}}{20}
-\entry {\code {idlwave-store-inquired-class}}{15}
-\entry {\code {idlwave-support-inheritance}}{15}
-\entry {\code {idlwave-surround-by-blank}}{18}
-\entry {\code {idlwave-system-directory}}{30}
-\entry {\code {idlwave-timestamp-hook}}{19}
-\entry {\code {idlwave-use-last-hang-indent}}{9}
-\entry {\file {Imenu}, Emacs package}{19}
-\entry {Indentation}{8}
-\entry {Indentation, of foreign code}{8}
-\entry {Input mode}{23}
-\entry {Inserting keywords, from routine info}{11}
-\entry {Installation}{27}
-\entry {Installing online help}{12, 27}
-\entry {Interactive Data Language}{1}
-\entry {Interface Definition Language}{1}
-\entry {Interview, with the maintainer}{32}
-\entry {Introduction}{1}
-\initial {K}
-\entry {Key bindings, in help application}{13}
-\entry {Keybindings for debugging}{23}
-\entry {Keyword completion}{14}
-\entry {Keywords of a routine}{10}
-\entry {Killing autoloaded buffers}{16}
-\initial {L}
-\entry {Library catalog}{30}
-\entry {Library scan}{30}
-\entry {Line input mode (Shell)}{23}
-\entry {Line splitting}{9}
-\entry {\code {LINKIMAGE}, IDL routine}{29}
-\entry {Load-path shadows}{10, 31}
-\initial {M}
-\entry {M-?}{12}
-\entry {M-C-{\tt\rawbackslashxx }}{8}
-\entry {M-q}{9}
-\entry {M-\key {RET}}{9}
-\entry {M-\key {TAB}}{14, 27}
-\entry {MacOS}{21, 30, 31}
-\entry {Magic spells, for input mode}{23}
-\entry {Maintainer, of IDLWAVE}{28}
-\entry {Major mode, \code {idlwave-mode}}{8}
-\entry {Major mode, \code {idlwave-shell-mode}}{21}
-\entry {Method completion}{14}
-\entry {Mixed case completion}{14}
-\entry {Modification timestamp}{19}
-\entry {Module source file}{16}
-\entry {Motion commands}{19}
-\entry {Mouse binding to print expressions}{25}
-\entry {Multiply defined routines}{11, 31}
-\initial {N}
-\entry {Nutshell, IDLWAVE in a}{2}
-\initial {O}
-\entry {\code {OBJ_NEW}, special online help}{12}
-\entry {Object method completion}{14}
-\entry {Object methods}{15}
-\entry {Old variables, renaming}{27}
-\entry {Online Help}{12}
-\entry {Online Help from the routine info buffer}{11}
-\entry {Online Help in \file {*Completions*} buffer}{14}
-\entry {Online Help, in the shell}{22}
-\entry {Online Help, Installation}{12, 27}
-\entry {Operators, padding with spaces}{18}
-\initial {P}
-\entry {Padding operators with spaces}{18}
-\entry {Paragraphs, filling}{8}
-\entry {Paragraphs, hanging}{8}
-\entry {Perl program, to create \file {idlw-rinfo.el}}{31}
-\entry {\code {PRINT} expressions}{25}
-\entry {Printing expressions, on calling stack}{25}
-\entry {Procedure definitions, jumping to}{19}
-\entry {Procedure name completion}{14}
-\entry {Program structure, moving through}{19}
-\entry {Programs, compiling}{24}
-\initial {Q}
-\entry {Quick-Start}{3}
-\initial {R}
-\entry {Renaming old variables}{27}
-\entry {\code {RESOLVE_ROUTINE}}{16}
-\entry {Restrictions for expression printing}{25}
-\entry {Routine definitions}{29}
-\entry {Routine definitions, multiple}{11, 31}
-\entry {Routine info}{10}
-\entry {Routine info sources}{29}
-\entry {Routine info, in the shell}{22}
-\entry {Routine source file}{16}
-\entry {Routine source information}{10}
-\entry {ROUTINE_NAMES, IDL procedure}{25}
-\entry {Routines, resolving}{16}
-\initial {S}
-\entry {Scanning buffers for routine info}{10, 29}
-\entry {Scanning the documentation}{31}
-\entry {Scrolling the \file {*Completions*} window}{14}
-\entry {\code {self} object, default class}{15}
-\entry {Shadows, load-path}{10, 31}
-\entry {Shell, basic commands}{22}
-\entry {Shell, querying for routine info}{10, 29}
-\entry {Shell, starting}{21}
-\entry {Source code, as online help}{12}
-\entry {Source file, access from routine info}{11}
-\entry {Source file, of a routine}{16}
-\entry {Sources of routine information}{29}
-\entry {Space, around operators}{18}
-\entry {Speed, of online help}{12}
-\entry {Spells, magic}{23}
-\entry {Splitting, of lines}{9}
-\entry {Starting the shell}{21}
-\entry {Stepping}{24}
-\entry {String splitting}{9}
-\entry {Subprocess of Emacs, IDL}{21}
-\entry {Summary of important commands}{2}
-\entry {Syntax highlighting}{10}
-\initial {T}
-\entry {Templates}{16}
-\entry {Thanks}{28}
-\entry {Timestamp, in doc header.}{19}
-\entry {Toolbar}{23}
-\entry {Tutorial}{3}
-\initial {U}
-\entry {Upcase, enforcing for reserved words}{18}
-\entry {Updating routine info}{10, 29}
-\entry {Upgrading from old \b {\file {idl.el}}}{27}
-\entry {URL, homepage for IDLWAVE}{27}
-\initial {W}
-\entry {Windows}{21, 30, 31}
-\initial {X}
-\entry {XEmacs package IDLWAVE}{27}
diff -ruN src-21.1/man/idlwave.texi src-21.2/man/idlwave.texi
--- src-21.1/man/idlwave.texi	Wed Sep 12 23:00:05 2001
+++ src-21.2/man/idlwave.texi	Sat Dec  1 14:18:45 2001
@@ -17,8 +17,8 @@
 @set DATE December 2000
 @set AUTHOR Carsten Dominik
 @set AUTHOR-EMAIL dominik@@astro.uva.nl
-@set MAINTAINER Carsten Dominik
-@set MAINTAINER-EMAIL dominik@@astro.uva.nl
+@set MAINTAINER John-David Smith
+@set MAINTAINER-EMAIL jdsmith@@astro.cornell.edu
 @set IDLWAVE-HOMEPAGE http://www.strw.leidenuniv.nl/~dominik/Tools/idlwave
 @c %**end of header
 @finalout
@@ -2267,14 +2267,16 @@
 for several years.
 
 @item
-@uref{mailto:dominik@@astro.uva.nl, @b{Carsten Dominik}}, current author
-and maintainer.  I have been in charge of the package since version
-3.0. I am also responsible for the manual.
+@uref{mailto:dominik@@astro.uva.nl, @b{Carsten Dominik}}, who have
+been in charge of the package since version 3.0, and also wrote this
+manual.
 
-@item 
-@uref{mailto:jdsmith@@astrosun.tn.cornell.edu, @b{J.D. Smith}} has
-shaped Object method completion and most new features in version 4.0
-with his ideas, bug reports, and patient explanations of IDL internals. 
+@item
+@uref{mailto: jdsmith@@astro.cornell.edu, @b{John-David Smith}},
+current maintainer, who is also responsible for this manual's
+maintenance.  John-David has also shaped Object method completion and
+most new features in version 4.0 with his ideas, bug reports, and
+patient explanations of IDL internals.
 @end itemize
 
 @noindent
diff -ruN src-21.1/man/maintaining.texi src-21.2/man/maintaining.texi
--- src-21.1/man/maintaining.texi	Sat Oct  6 13:10:13 2001
+++ src-21.2/man/maintaining.texi	Wed Mar 13 20:52:10 2002
@@ -13,7 +13,9 @@
 
 @menu
 * Change Log::	        Maintaining a change history for your program.
+@ignore
 * Authors::             Maintaining the Emacs @file{AUTHORS} file.
+@end ignore
 * Tags::	        Go direct to any function in your program in one
 			  command.  Tags remembers which file it is in.
 * Emerge::	        A convenient way of merging two versions of a program.
@@ -136,6 +138,10 @@
   Version control systems are another way to keep track of changes in your
 program and keep a change log.  @xref{Log Buffer}.
 
+@ignore
+@c This is commented out because the command is specific
+@c to maintenance of Emacs itself.
+
 @node Authors
 @section @file{AUTHORS} files
 @cindex @file{AUTHORS} file
@@ -158,6 +164,7 @@
 assume that a person not listed in the output was not a contributor.
 If you merged in someone's contribution and did not put his name
 in the change log, he won't show up in @kbd{M-x authors} either.
+@end ignore
 
 @node Tags
 @section Tags Tables
@@ -844,7 +851,7 @@
 the same program in two different directions.  To recover from this
 confusion, you need to merge the two versions.  Emerge makes this
 easier.  See also @ref{Comparing Files}, for commands to compare
-in a more manual fashion, and @ref{,Ediff,, ediff, The Ediff Manual}.
+in a more manual fashion, and @ref{Top, Ediff,, ediff, The Ediff Manual}.
 
 @menu
 * Overview of Emerge::	How to start Emerge.  Basic concepts.
diff -ruN src-21.1/man/message.aux src-21.2/man/message.aux
--- src-21.1/man/message.aux	Sat Oct 20 18:45:31 2001
+++ src-21.2/man/message.aux	Thu Jan  1 01:00:00 1970
@@ -1,111 +0,0 @@
-'xrdef {Top-title}{Message}
-'xrdef {Top-pg}{1}
-'xrdef {Top-snt}{}
-'xrdef {Interface-title}{Interface}
-'xrdef {Interface-pg}{3}
-'xrdef {Interface-snt}{Chapter'tie1}
-'xrdef {New Mail Message-title}{New Mail Message}
-'xrdef {New Mail Message-pg}{3}
-'xrdef {New Mail Message-snt}{Section'tie1.1}
-'xrdef {New News Message-title}{New News Message}
-'xrdef {New News Message-pg}{3}
-'xrdef {New News Message-snt}{Section'tie1.2}
-'xrdef {Reply-title}{Reply}
-'xrdef {Reply-pg}{3}
-'xrdef {Reply-snt}{Section'tie1.3}
-'xrdef {Wide Reply-title}{Wide Reply}
-'xrdef {Wide Reply-pg}{4}
-'xrdef {Wide Reply-snt}{Section'tie1.4}
-'xrdef {Followup-title}{Followup}
-'xrdef {Followup-pg}{4}
-'xrdef {Followup-snt}{Section'tie1.5}
-'xrdef {Canceling News-title}{Canceling News}
-'xrdef {Canceling News-pg}{4}
-'xrdef {Canceling News-snt}{Section'tie1.6}
-'xrdef {Superseding-title}{Superseding}
-'xrdef {Superseding-pg}{4}
-'xrdef {Superseding-snt}{Section'tie1.7}
-'xrdef {Forwarding-title}{Forwarding}
-'xrdef {Forwarding-pg}{4}
-'xrdef {Forwarding-snt}{Section'tie1.8}
-'xrdef {Resending-title}{Resending}
-'xrdef {Resending-pg}{5}
-'xrdef {Resending-snt}{Section'tie1.9}
-'xrdef {Bouncing-title}{Bouncing}
-'xrdef {Bouncing-pg}{5}
-'xrdef {Bouncing-snt}{Section'tie1.10}
-'xrdef {Commands-title}{Commands}
-'xrdef {Commands-pg}{7}
-'xrdef {Commands-snt}{Chapter'tie2}
-'xrdef {Buffer Entry-title}{Buffer Entry}
-'xrdef {Buffer Entry-pg}{7}
-'xrdef {Buffer Entry-snt}{Section'tie2.1}
-'xrdef {Header Commands-title}{Header Commands}
-'xrdef {Header Commands-pg}{7}
-'xrdef {Header Commands-snt}{Section'tie2.2}
-'xrdef {Movement-title}{Movement}
-'xrdef {Movement-pg}{8}
-'xrdef {Movement-snt}{Section'tie2.3}
-'xrdef {Insertion-title}{Insertion}
-'xrdef {Insertion-pg}{8}
-'xrdef {Insertion-snt}{Section'tie2.4}
-'xrdef {MIME-title}{MIME}
-'xrdef {MIME-pg}{9}
-'xrdef {MIME-snt}{Section'tie2.5}
-'xrdef {Various Commands-title}{Various Commands}
-'xrdef {Various Commands-pg}{9}
-'xrdef {Various Commands-snt}{Section'tie2.6}
-'xrdef {Sending-title}{Sending}
-'xrdef {Sending-pg}{10}
-'xrdef {Sending-snt}{Section'tie2.7}
-'xrdef {Mail Aliases-title}{Mail Aliases}
-'xrdef {Mail Aliases-pg}{10}
-'xrdef {Mail Aliases-snt}{Section'tie2.8}
-'xrdef {Spelling-title}{Spelling}
-'xrdef {Spelling-pg}{10}
-'xrdef {Spelling-snt}{Section'tie2.9}
-'xrdef {Variables-title}{Variables}
-'xrdef {Variables-pg}{13}
-'xrdef {Variables-snt}{Chapter'tie3}
-'xrdef {Message Headers-title}{Message Headers}
-'xrdef {Message Headers-pg}{13}
-'xrdef {Message Headers-snt}{Section'tie3.1}
-'xrdef {Mail Headers-title}{Mail Headers}
-'xrdef {Mail Headers-pg}{14}
-'xrdef {Mail Headers-snt}{Section'tie3.2}
-'xrdef {Mail Variables-title}{Mail Variables}
-'xrdef {Mail Variables-pg}{14}
-'xrdef {Mail Variables-snt}{Section'tie3.3}
-'xrdef {News Headers-title}{News Headers}
-'xrdef {News Headers-pg}{14}
-'xrdef {News Headers-snt}{Section'tie3.4}
-'xrdef {News Variables-title}{News Variables}
-'xrdef {News Variables-pg}{17}
-'xrdef {News Variables-snt}{Section'tie3.5}
-'xrdef {Various Message Variables-title}{Various Message Variables}
-'xrdef {Various Message Variables-pg}{17}
-'xrdef {Various Message Variables-snt}{Section'tie3.6}
-'xrdef {Sending Variables-title}{Sending Variables}
-'xrdef {Sending Variables-pg}{18}
-'xrdef {Sending Variables-snt}{Section'tie3.7}
-'xrdef {Message Buffers-title}{Message Buffers}
-'xrdef {Message Buffers-pg}{19}
-'xrdef {Message Buffers-snt}{Section'tie3.8}
-'xrdef {Message Actions-title}{Message Actions}
-'xrdef {Message Actions-pg}{19}
-'xrdef {Message Actions-snt}{Section'tie3.9}
-'xrdef {Compatibility-title}{Compatibility}
-'xrdef {Compatibility-pg}{21}
-'xrdef {Compatibility-snt}{Chapter'tie4}
-'xrdef {Appendices-title}{Appendices}
-'xrdef {Appendices-pg}{23}
-'xrdef {Appendices-snt}{Chapter'tie5}
-'xrdef {Responses-title}{Responses}
-'xrdef {Responses-pg}{23}
-'xrdef {Responses-snt}{Section'tie5.1}
-'xrdef {Index-title}{Index}
-'xrdef {Index-pg}{25}
-'xrdef {Index-snt}{Chapter'tie6}
-'xrdef {Key Index-title}{Key Index}
-'xrdef {Key Index-pg}{27}
-'xrdef {Key Index-snt}{Chapter'tie7}
diff -ruN src-21.1/man/message.cps src-21.2/man/message.cps
--- src-21.1/man/message.cps	Sat Oct 20 18:45:31 2001
+++ src-21.2/man/message.cps	Thu Jan  1 01:00:00 1970
@@ -1,157 +0,0 @@
-\initial {A}
-\entry {aliases}{10}
-\entry {approved}{16}
-\entry {attachment}{9}
-\initial {C}
-\entry {charset}{17}
-\entry {compatibility}{21}
-\initial {D}
-\entry {Distribution}{15}
-\initial {E}
-\entry {Expires}{15}
-\initial {F}
-\entry {From}{14}
-\initial {I}
-\entry {ispell-message}{10}
-\entry {ispell-message-dictionary-alist}{11}
-\initial {L}
-\entry {Lines}{15}
-\entry {long lines}{16}
-\initial {M}
-\entry {mail aliases}{10}
-\entry {mail-header-separator}{17}
-\entry {mail-host-address}{15}
-\entry {message-add-header}{18}
-\entry {message-alternative-emails}{13}
-\entry {message-bounce}{5}
-\entry {message-caesar-buffer-body}{9}
-\entry {message-cancel-news}{4}
-\entry {message-citation-line-function}{8}
-\entry {message-cite-function}{8}
-\entry {message-cite-original}{8}
-\entry {message-cite-original-without-signature}{8}
-\entry {message-courtesy-message}{19}
-\entry {message-default-charset}{17}
-\entry {message-default-headers}{13}
-\entry {message-default-mail-headers}{14}
-\entry {message-default-news-headers}{17}
-\entry {message-deletable-headers}{13}
-\entry {message-delete-not-region}{9}
-\entry {message-directory}{17}
-\entry {message-dont-reply-to-names}{4}
-\entry {message-dont-send}{10}
-\entry {message-elide-region}{9}
-\entry {message-exit-actions}{19}
-\entry {message-fcc-handler-function}{18}
-\entry {message-fill-yanked-message}{8}
-\entry {message-followup}{4}
-\entry {message-followup-to-function}{4}
-\entry {message-forward}{4}
-\entry {message-forward-as-mime}{5}
-\entry {message-forward-ignored-headers}{4}
-\entry {message-forward-subject-author-subject}{5}
-\entry {message-from-style}{13}
-\entry {message-generate-headers-first}{13}
-\entry {message-generate-new-buffers}{19}
-\entry {message-goto-bcc}{7}
-\entry {message-goto-body}{8}
-\entry {message-goto-cc}{7}
-\entry {message-goto-distribution}{7}
-\entry {message-goto-fcc}{7}
-\entry {message-goto-followup-to}{7}
-\entry {message-goto-keywords}{7}
-\entry {message-goto-newsgroups}{7}
-\entry {message-goto-reply-to}{7}
-\entry {message-goto-signature}{8}
-\entry {message-goto-subject}{7}
-\entry {message-goto-summary}{7}
-\entry {message-goto-to}{7}
-\entry {message-header-setup-hook}{17}
-\entry {Message-ID}{15}
-\entry {message-ignored-bounced-headers}{5}
-\entry {message-ignored-cited-headers}{8}
-\entry {message-ignored-mail-headers}{14}
-\entry {message-ignored-news-headers}{17}
-\entry {message-ignored-resent-headers}{5}
-\entry {message-ignored-supersedes-headers}{4}
-\entry {message-indent-citation-function}{8}
-\entry {message-indentation-spaces}{8}
-\entry {message-insert-headers}{8}
-\entry {message-insert-newsgroups}{10}
-\entry {message-insert-signature}{8}
-\entry {message-insert-to}{10}
-\entry {message-kill-actions}{19}
-\entry {message-kill-buffer}{10}
-\entry {message-kill-buffer-on-exit}{19}
-\entry {message-kill-to-signature}{9}
-\entry {message-mail}{3}
-\entry {message-mail-alias-type}{10}
-\entry {message-make-forward-subject-function}{5}
-\entry {message-max-buffers}{19}
-\entry {message-mh-deletable-headers}{14}
-\entry {message-mode-syntax-table}{18}
-\entry {message-news}{3}
-\entry {message-post-method}{17}
-\entry {message-postpone-actions}{19}
-\entry {message-rename-buffer}{10}
-\entry {message-reply}{3}
-\entry {message-reply-to-function}{3}
-\entry {message-required-mail-headers}{14}
-\entry {message-required-news-headers}{14}
-\entry {message-resend}{5}
-\entry {message-send}{10}
-\entry {message-send-actions}{19}
-\entry {message-send-and-exit}{10}
-\entry {message-send-hook}{18}
-\entry {message-send-mail-function}{14}
-\entry {message-send-mail-hook}{18}
-\entry {message-send-mail-partially-limit}{14}
-\entry {message-send-method-alist}{18}
-\entry {message-send-news-function}{17}
-\entry {message-send-news-hook}{18}
-\entry {message-send-rename-function}{19}
-\entry {message-sent-hook}{18}
-\entry {message-setup-hook}{17}
-\entry {message-signature}{9}
-\entry {message-signature-file}{9}
-\entry {message-signature-separator}{17}
-\entry {message-signature-setup-hook}{17}
-\entry {message-subject-re-regexp}{13}
-\entry {message-supersede}{4}
-\entry {message-syntax-checks}{15}
-\entry {message-use-followup-to}{4}
-\entry {message-wash-forwarded-subjects}{5}
-\entry {message-wide-reply}{4}
-\entry {message-wide-reply-to-function}{4}
-\entry {message-yank-buffer}{8}
-\entry {message-yank-original}{8}
-\entry {message-yank-prefix}{8}
-\entry {MIME}{9}
-\entry {Mime-Version}{15}
-\entry {MML}{9}
-\entry {multipart}{9}
-\initial {N}
-\entry {Newsgroups}{14}
-\initial {O}
-\entry {organization}{14}
-\initial {P}
-\entry {path}{15}
-\initial {Q}
-\entry {quoting}{8}
-\initial {S}
-\entry {sc-cite-original}{8}
-\entry {Sender}{16}
-\entry {sendsys}{16}
-\entry {spelling}{10}
-\entry {Subject}{14}
-\entry {Sun}{15}
-\entry {Supercite}{8}
-\entry {system-name}{15}
-\initial {U}
-\entry {undo}{7}
-\entry {User-Agent}{15}
-\entry {user-full-name}{14}
-\entry {user-mail-address}{14}
-\initial {Y}
-\entry {yanking}{8}
-\entry {yow}{15}
diff -ruN src-21.1/man/message.kys src-21.2/man/message.kys
--- src-21.1/man/message.kys	Sat Oct 20 18:45:31 2001
+++ src-21.2/man/message.kys	Thu Jan  1 01:00:00 1970
@@ -1,35 +0,0 @@
-\initial {C}
-\entry {\code {C-_}}{7}
-\entry {\code {C-c ?}}{7}
-\entry {\code {C-c C-b}}{8}
-\entry {\code {C-c C-c}}{10}
-\entry {\code {C-c C-d}}{10}
-\entry {\code {C-c C-e}}{9}
-\entry {\code {C-c C-f C-b}}{7}
-\entry {\code {C-c C-f C-c}}{7}
-\entry {\code {C-c C-f C-d}}{7}
-\entry {\code {C-c C-f C-f}}{7}
-\entry {\code {C-c C-f C-k}}{7}
-\entry {\code {C-c C-f C-n}}{7}
-\entry {\code {C-c C-f C-r}}{7}
-\entry {\code {C-c C-f C-s}}{7}
-\entry {\code {C-c C-f C-t}}{7}
-\entry {\code {C-c C-f C-u}}{7}
-\entry {\code {C-c C-f C-w}}{7}
-\entry {\code {C-c C-i}}{8}
-\entry {\code {C-c C-k}}{10}
-\entry {\code {C-c C-n}}{10}
-\entry {\code {C-c C-q}}{8}
-\entry {\code {C-c C-r}}{9}
-\entry {\code {C-c C-s}}{10}
-\entry {\code {C-c C-t}}{10}
-\entry {\code {C-c C-v}}{9}
-\entry {\code {C-c C-w}}{8}
-\entry {\code {C-c C-x}}{9}
-\entry {\code {C-c C-y}}{8}
-\entry {\code {C-c M-C-y}}{8}
-\entry {\code {C-c M-h}}{8}
-\entry {\code {C-c M-r}}{10}
-\initial {M}
-\entry {\code {M-RET}}{9}
-\entry {\code {message-newline-and-reformat}}{9}
diff -ruN src-21.1/man/mh-e.aux src-21.2/man/mh-e.aux
--- src-21.1/man/mh-e.aux	Sat Oct 20 18:45:32 2001
+++ src-21.2/man/mh-e.aux	Thu Jan  1 01:00:00 1970
@@ -1,249 +0,0 @@
-'xrdef {Preface-title}{Preface}
-'xrdef {Preface-pg}{1}
-'xrdef {Preface-snt}{}
-'xrdef {Tour Through mh-e-title}{Tour Through mh-e}
-'xrdef {Tour Through mh-e-pg}{3}
-'xrdef {Tour Through mh-e-snt}{Chapter'tie1}
-'xrdef {Conventions-title}{GNU Emacs Terms and Conventions}
-'xrdef {Conventions-pg}{3}
-'xrdef {Conventions-snt}{Section'tie1.1}
-'xrdef {Getting Started-title}{Getting Started}
-'xrdef {Getting Started-pg}{4}
-'xrdef {Getting Started-snt}{Section'tie1.2}
-'xrdef {Sending Mail Tour-title}{Sending Mail}
-'xrdef {Sending Mail Tour-pg}{5}
-'xrdef {Sending Mail Tour-snt}{Section'tie1.3}
-'xrdef {Reading Mail Tour-title}{Receiving Mail}
-'xrdef {Reading Mail Tour-pg}{6}
-'xrdef {Reading Mail Tour-snt}{Section'tie1.4}
-'xrdef {Processing Mail Tour-title}{Processing Mail}
-'xrdef {Processing Mail Tour-pg}{7}
-'xrdef {Processing Mail Tour-snt}{Section'tie1.5}
-'xrdef {Leaving mh-e-title}{Leaving mh-e}
-'xrdef {Leaving mh-e-pg}{8}
-'xrdef {Leaving mh-e-snt}{Section'tie1.6}
-'xrdef {More About mh-e-title}{More About mh-e}
-'xrdef {More About mh-e-pg}{9}
-'xrdef {More About mh-e-snt}{Section'tie1.7}
-'xrdef {Using mh-e-title}{Using mh-e}
-'xrdef {Using mh-e-pg}{11}
-'xrdef {Using mh-e-snt}{Chapter'tie2}
-'xrdef {Reading Mail-title}{Reading Your Mail}
-'xrdef {Reading Mail-pg}{11}
-'xrdef {Reading Mail-snt}{Section'tie2.1}
-'xrdef {Viewing-title}{Viewing Your Mail}
-'xrdef {Viewing-pg}{12}
-'xrdef {Viewing-snt}{Section'tie2.1.1}
-'xrdef {Reading Digests-title}{Reading Digests}
-'xrdef {Reading Digests-pg}{12}
-'xrdef {Reading Digests-snt}{Section'tie2.1.1.1}
-'xrdef {Reading MIME-title}{Reading Multimedia Mail}
-'xrdef {Reading MIME-pg}{12}
-'xrdef {Reading MIME-snt}{Section'tie2.1.1.2}
-'xrdef {Moving Around-title}{Moving Around}
-'xrdef {Moving Around-pg}{12}
-'xrdef {Moving Around-snt}{Section'tie2.1.2}
-'xrdef {Sending Mail-title}{Sending Mail}
-'xrdef {Sending Mail-pg}{13}
-'xrdef {Sending Mail-snt}{Section'tie2.2}
-'xrdef {Replying-title}{Replying to Mail}
-'xrdef {Replying-pg}{14}
-'xrdef {Replying-snt}{Section'tie2.2.1}
-'xrdef {Forwarding-title}{Forwarding Mail}
-'xrdef {Forwarding-pg}{14}
-'xrdef {Forwarding-snt}{Section'tie2.2.2}
-'xrdef {Redistributing-title}{Redistributing Your Mail}
-'xrdef {Redistributing-pg}{14}
-'xrdef {Redistributing-snt}{Section'tie2.2.3}
-'xrdef {Old Drafts-title}{Editing Old Drafts and Bounced Messages}
-'xrdef {Old Drafts-pg}{15}
-'xrdef {Old Drafts-snt}{Section'tie2.2.4}
-'xrdef {Draft Editing-title}{Editing a Draft}
-'xrdef {Draft Editing-pg}{15}
-'xrdef {Draft Editing-snt}{Section'tie2.3}
-'xrdef {Editing Textual-title}{Editing Textual Messages}
-'xrdef {Editing Textual-pg}{16}
-'xrdef {Editing Textual-snt}{Section'tie2.3.1}
-'xrdef {Inserting Letter-title}{Inserting letter to which you're replying}
-'xrdef {Inserting Letter-pg}{16}
-'xrdef {Inserting Letter-snt}{Section'tie2.3.1.1}
-'xrdef {Inserting Messages-title}{Inserting messages}
-'xrdef {Inserting Messages-pg}{16}
-'xrdef {Inserting Messages-snt}{Section'tie2.3.1.2}
-'xrdef {Header-title}{Editing the header}
-'xrdef {Header-pg}{17}
-'xrdef {Header-snt}{Section'tie2.3.1.3}
-'xrdef {Recipients-title}{Checking recipients}
-'xrdef {Recipients-pg}{17}
-'xrdef {Recipients-snt}{Section'tie2.3.1.4}
-'xrdef {Signature-title}{Inserting your signature}
-'xrdef {Signature-pg}{17}
-'xrdef {Signature-snt}{Section'tie2.3.1.5}
-'xrdef {Editing MIME-title}{Editing Multimedia Messages}
-'xrdef {Editing MIME-pg}{17}
-'xrdef {Editing MIME-snt}{Section'tie2.3.2}
-'xrdef {Forwarding MIME-title}{Forwarding multimedia messages}
-'xrdef {Forwarding MIME-pg}{18}
-'xrdef {Forwarding MIME-snt}{Section'tie2.3.2.1}
-'xrdef {FTP-title}{Including an ftp reference}
-'xrdef {FTP-pg}{18}
-'xrdef {FTP-snt}{Section'tie2.3.2.2}
-'xrdef {Tar-title}{Including tar files}
-'xrdef {Tar-pg}{18}
-'xrdef {Tar-snt}{Section'tie2.3.2.3}
-'xrdef {Other MIME Objects-title}{Including other multimedia objects}
-'xrdef {Other MIME Objects-pg}{18}
-'xrdef {Other MIME Objects-snt}{Section'tie2.3.2.4}
-'xrdef {Sending MIME-title}{Readying multimedia messages for sending}
-'xrdef {Sending MIME-pg}{18}
-'xrdef {Sending MIME-snt}{Section'tie2.3.2.5}
-'xrdef {Sending Message-title}{Sending a Message}
-'xrdef {Sending Message-pg}{20}
-'xrdef {Sending Message-snt}{Section'tie2.3.3}
-'xrdef {Killing Draft-title}{Killing the Draft}
-'xrdef {Killing Draft-pg}{20}
-'xrdef {Killing Draft-snt}{Section'tie2.3.4}
-'xrdef {Moving Mail-title}{Moving Your Mail Around}
-'xrdef {Moving Mail-pg}{20}
-'xrdef {Moving Mail-snt}{Section'tie2.4}
-'xrdef {Incorporating-title}{Incorporating Your Mail}
-'xrdef {Incorporating-pg}{21}
-'xrdef {Incorporating-snt}{Section'tie2.4.1}
-'xrdef {Deleting-title}{Deleting Your Mail}
-'xrdef {Deleting-pg}{22}
-'xrdef {Deleting-snt}{Section'tie2.4.2}
-'xrdef {Organizing-title}{Organizing Your Mail with Folders}
-'xrdef {Organizing-pg}{22}
-'xrdef {Organizing-snt}{Section'tie2.4.3}
-'xrdef {Printing-title}{Printing Your Mail}
-'xrdef {Printing-pg}{22}
-'xrdef {Printing-snt}{Section'tie2.4.4}
-'xrdef {Files and Pipes-title}{Files and Pipes}
-'xrdef {Files and Pipes-pg}{22}
-'xrdef {Files and Pipes-snt}{Section'tie2.4.5}
-'xrdef {Finishing Up-title}{Finishing Up}
-'xrdef {Finishing Up-pg}{23}
-'xrdef {Finishing Up-snt}{Section'tie2.4.6}
-'xrdef {Searching-title}{Searching Through Messages}
-'xrdef {Searching-pg}{23}
-'xrdef {Searching-snt}{Section'tie2.5}
-'xrdef {Sequences-title}{Using Sequences}
-'xrdef {Sequences-pg}{25}
-'xrdef {Sequences-snt}{Section'tie2.6}
-'xrdef {Miscellaneous-title}{Miscellaneous Commands}
-'xrdef {Miscellaneous-pg}{26}
-'xrdef {Miscellaneous-snt}{Section'tie2.7}
-'xrdef {Customizing mh-e-title}{Customizing mh-e}
-'xrdef {Customizing mh-e-pg}{27}
-'xrdef {Customizing mh-e-snt}{Chapter'tie3}
-'xrdef {Customizing Reading-title}{Reading Your Mail}
-'xrdef {Customizing Reading-pg}{28}
-'xrdef {Customizing Reading-snt}{Section'tie3.1}
-'xrdef {Customizing Viewing-title}{Viewing Your Mail}
-'xrdef {Customizing Viewing-pg}{31}
-'xrdef {Customizing Viewing-snt}{Section'tie3.1.1}
-'xrdef {Customizing Moving Around-title}{Moving Around}
-'xrdef {Customizing Moving Around-pg}{32}
-'xrdef {Customizing Moving Around-snt}{Section'tie3.1.2}
-'xrdef {Customizing Sending-title}{Sending Mail}
-'xrdef {Customizing Sending-pg}{32}
-'xrdef {Customizing Sending-snt}{Section'tie3.2}
-'xrdef {Customizing Replying-title}{Replying to Mail}
-'xrdef {Customizing Replying-pg}{34}
-'xrdef {Customizing Replying-snt}{Section'tie3.2.1}
-'xrdef {Customizing Forwarding-title}{Forwarding Mail}
-'xrdef {Customizing Forwarding-pg}{34}
-'xrdef {Customizing Forwarding-snt}{Section'tie3.2.2}
-'xrdef {Customizing Redistributing-title}{Redistributing Your Mail}
-'xrdef {Customizing Redistributing-pg}{35}
-'xrdef {Customizing Redistributing-snt}{Section'tie3.2.3}
-'xrdef {Customizing Old Drafts-title}{Editing Old Drafts and Bounced Messages}
-'xrdef {Customizing Old Drafts-pg}{35}
-'xrdef {Customizing Old Drafts-snt}{Section'tie3.2.4}
-'xrdef {Customizing Draft Editing-title}{Editing a Draft}
-'xrdef {Customizing Draft Editing-pg}{35}
-'xrdef {Customizing Draft Editing-snt}{Section'tie3.3}
-'xrdef {Customizing Editing Textual-title}{Editing Textual Messages}
-'xrdef {Customizing Editing Textual-pg}{36}
-'xrdef {Customizing Editing Textual-snt}{Section'tie3.3.1}
-'xrdef {Customizing Inserting Letter-title}{Inserting letter to which you're replying}
-'xrdef {Customizing Inserting Letter-pg}{36}
-'xrdef {Customizing Inserting Letter-snt}{Section'tie3.3.1.1}
-'xrdef {Customizing Signature-title}{Inserting your signature}
-'xrdef {Customizing Signature-pg}{36}
-'xrdef {Customizing Signature-snt}{Section'tie3.3.1.2}
-'xrdef {Customizing Editing MIME-title}{Editing Multimedia Messages}
-'xrdef {Customizing Editing MIME-pg}{36}
-'xrdef {Customizing Editing MIME-snt}{Section'tie3.3.2}
-'xrdef {Customizing Sending MIME-title}{Readying multimedia messages for sending}
-'xrdef {Customizing Sending MIME-pg}{37}
-'xrdef {Customizing Sending MIME-snt}{Section'tie3.3.2.1}
-'xrdef {Customizing Sending Message-title}{Sending a Message}
-'xrdef {Customizing Sending Message-pg}{37}
-'xrdef {Customizing Sending Message-snt}{Section'tie3.3.3}
-'xrdef {Customizing Moving Mail-title}{Moving Your Mail Around}
-'xrdef {Customizing Moving Mail-pg}{38}
-'xrdef {Customizing Moving Mail-snt}{Section'tie3.4}
-'xrdef {Customizing Incorporating-title}{Incorporating Your Mail}
-'xrdef {Customizing Incorporating-pg}{39}
-'xrdef {Customizing Incorporating-snt}{Section'tie3.4.1}
-'xrdef {Customizing Deleting-title}{Deleting Your Mail}
-'xrdef {Customizing Deleting-pg}{39}
-'xrdef {Customizing Deleting-snt}{Section'tie3.4.2}
-'xrdef {Customizing Organizing-title}{Organizing Your Mail with Folders}
-'xrdef {Customizing Organizing-pg}{39}
-'xrdef {Customizing Organizing-snt}{Section'tie3.4.3}
-'xrdef {Customizing Scan Line Formats-title}{Scan line formatting}
-'xrdef {Customizing Scan Line Formats-pg}{40}
-'xrdef {Customizing Scan Line Formats-snt}{Section'tie3.4.3.1}
-'xrdef {Customizing Printing-title}{Printing Your Mail}
-'xrdef {Customizing Printing-pg}{42}
-'xrdef {Customizing Printing-snt}{Section'tie3.4.4}
-'xrdef {Customizing Files and Pipes-title}{Files and Pipes}
-'xrdef {Customizing Files and Pipes-pg}{42}
-'xrdef {Customizing Files and Pipes-snt}{Section'tie3.4.5}
-'xrdef {Customizing Finishing Up-title}{Finishing Up}
-'xrdef {Customizing Finishing Up-pg}{42}
-'xrdef {Customizing Finishing Up-snt}{Section'tie3.4.6}
-'xrdef {Customizing Searching-title}{Searching Through Messages}
-'xrdef {Customizing Searching-pg}{43}
-'xrdef {Customizing Searching-snt}{Section'tie3.5}
-'xrdef {Odds and Ends-title}{Odds and Ends}
-'xrdef {Odds and Ends-pg}{45}
-'xrdef {Odds and Ends-snt}{Appendix'tie'char65{}}
-'xrdef {Bug Reports-title}{Bug Reports}
-'xrdef {Bug Reports-pg}{45}
-'xrdef {Bug Reports-snt}{Section'tie'char65.1}
-'xrdef {Mailing List-title}{mh-e Mailing List}
-'xrdef {Mailing List-pg}{45}
-'xrdef {Mailing List-snt}{Section'tie'char65.2}
-'xrdef {MH FAQ-title}{MH FAQ}
-'xrdef {MH FAQ-pg}{45}
-'xrdef {MH FAQ-snt}{Section'tie'char65.3}
-'xrdef {Getting mh-e-title}{Getting mh-e}
-'xrdef {Getting mh-e-pg}{45}
-'xrdef {Getting mh-e-snt}{Section'tie'char65.4}
-'xrdef {History-title}{History of mh-e}
-'xrdef {History-pg}{47}
-'xrdef {History-snt}{Appendix'tie'char66{}}
-'xrdef {From Brian Reid-title}{From Brian Reid}
-'xrdef {From Brian Reid-pg}{47}
-'xrdef {From Brian Reid-snt}{Section'tie'char66.1}
-'xrdef {From Jim Larus-title}{From Jim Larus}
-'xrdef {From Jim Larus-pg}{47}
-'xrdef {From Jim Larus-snt}{Section'tie'char66.2}
-'xrdef {From Stephen Gildea-title}{From Stephen Gildea}
-'xrdef {From Stephen Gildea-pg}{48}
-'xrdef {From Stephen Gildea-snt}{Section'tie'char66.3}
-'xrdef {Copying-title}{GNU GENERAL PUBLIC LICENSE}
-'xrdef {Copying-pg}{49}
-'xrdef {Copying-snt}{Appendix'tie'char67{}}
-'xrdef {Command Index-title}{Command Index}
-'xrdef {Command Index-pg}{57}
-'xrdef {Command Index-snt}{}
-'xrdef {Variable Index-title}{Variable Index}
-'xrdef {Variable Index-pg}{59}
-'xrdef {Variable Index-snt}{}
-'xrdef {Concept Index-title}{Concept Index}
-'xrdef {Concept Index-pg}{61}
-'xrdef {Concept Index-snt}{}
diff -ruN src-21.1/man/mh-e.cps src-21.2/man/mh-e.cps
--- src-21.1/man/mh-e.cps	Sat Oct 20 18:45:32 2001
+++ src-21.2/man/mh-e.cps	Thu Jan  1 01:00:00 1970
@@ -1,189 +0,0 @@
-\initial {.}
-\entry {\file {.emacs}}{5, 21, 27, 28, 39, 45}
-\entry {\file {.mh_profile}}{40}
-\entry {\file {.signature}}{17, 36}
-\initial {{\tt\char 126}}
-\entry {~}{5}
-\initial {B}
-\entry {bugs}{45}
-\entry {\code {burst}}{12}
-\initial {C}
-\entry {checking recipients}{17}
-\entry {\code {comp}}{33}
-\entry {\file {components}}{33}
-\entry {content description}{17}
-\entry {content types}{17}
-\initial {D}
-\entry {deleting}{22, 39}
-\entry {digests}{12}
-\entry {\code {dist}}{35}
-\entry {\file {draft}}{15}
-\initial {E}
-\entry {editing draft}{15, 35}
-\entry {editing header}{17}
-\entry {Emacs}{1, 3}
-\entry {Emacs, Emacs Lisp manual}{27}
-\entry {Emacs, file completion}{4}
-\entry {Emacs, functions; describe-mode}{11}
-\entry {Emacs, info}{27}
-\entry {Emacs, interrupting}{4}
-\entry {Emacs, mark}{4, 16}
-\entry {Emacs, minibuffer}{4}
-\entry {Emacs, notification of new mail}{21}
-\entry {Emacs, online help}{11, 27}
-\entry {Emacs, packages, supercite}{36}
-\entry {Emacs, point}{4, 16}
-\entry {Emacs, prefix argument}{3}
-\entry {Emacs, quitting}{4, 8}
-\entry {Emacs, region}{4, 16}
-\entry {Emacs, setting variables}{27}
-\entry {Emacs, terms and conventions}{3}
-\entry {expunging refiles and deletes}{23}
-\initial {F}
-\entry {FAQ}{45}
-\entry {file completion}{4}
-\entry {files, \file {.emacs}}{5, 21, 27, 28, 39, 45}
-\entry {files, \file {.mh_profile}}{40}
-\entry {files, \file {.signature}}{17, 36}
-\entry {files, \file {components}}{33}
-\entry {files, \file {draft}}{15}
-\entry {files, \samp {MH-E-NEWS}}{46}
-\entry {files, \file {mhl.reply}}{14}
-\entry {files, \file {replcomps}}{33}
-\entry {folder}{8}
-\entry {\code {folder}}{22}
-\entry {\code {forw}}{14}
-\entry {forwarding}{14, 34}
-\entry {\code {ftp}}{18}
-\initial {G}
-\entry {Gildea, Stephen}{47, 48}
-\initial {H}
-\entry {history}{1}
-\entry {history of mh-e}{47}
-\initial {I}
-\entry {images}{18}
-\entry {\code {inc}}{6, 39, 41}
-\entry {incorporating}{21, 39}
-\entry {info}{27}
-\entry {inserting messages}{16, 36}
-\entry {inserting signature}{17, 36}
-\entry {\code {install-mh}}{4}
-\entry {interrupting}{4}
-\initial {J}
-\entry {junk mail}{13}
-\initial {K}
-\entry {killing draft}{20}
-\initial {L}
-\entry {Larus, Jim}{47}
-\entry {\code {lpr}}{22, 42}
-\initial {M}
-\entry {Mailer-Daemon}{15}
-\entry {mailing list}{45}
-\entry {mark}{4, 16}
-\entry {\code {mark}}{26}
-\entry {MH commands, \code {burst}}{12}
-\entry {MH commands, \code {comp}}{33}
-\entry {MH commands, \code {dist}}{35}
-\entry {MH commands, \code {folder}}{22}
-\entry {MH commands, \code {forw}}{14}
-\entry {MH commands, \code {inc}}{6, 39, 41}
-\entry {MH commands, \code {install-mh}}{4}
-\entry {MH commands, \code {mark}}{26}
-\entry {MH commands, \code {mhl}}{14, 22, 31}
-\entry {MH commands, \code {mhn}}{17, 19}
-\entry {MH commands, \code {mhshow}}{12}
-\entry {MH commands, \code {pick}}{24, 25}
-\entry {MH commands, \code {refile}}{22}
-\entry {MH commands, \code {repl}}{14, 33}
-\entry {MH commands, \code {scan}}{6, 40, 41}
-\entry {MH commands, \code {send}}{35, 38}
-\entry {MH commands, \code {show}}{12}
-\entry {MH commands, \code {sortm}}{40}
-\entry {MH commands, \code {whom}}{17}
-\entry {MH FAQ}{45}
-\entry {MH profile components, \code {sortm}}{40}
-\entry {MH-Folder mode}{6, 8, 11, 13, 25, 30, 32}
-\entry {MH-Folder Show mode}{12, 13}
-\entry {MH-Letter mode}{5, 6, 13, 14, 15}
-\entry {MH-Show mode}{32}
-\entry {\code {mhl}}{14, 22, 31}
-\entry {\file {mhl.reply}}{14}
-\entry {\code {mhn}}{17, 19}
-\entry {\code {mhshow}}{12}
-\entry {MIME}{12, 17, 36}
-\entry {MIME, content description}{17}
-\entry {MIME, content types}{17}
-\entry {MIME, \code {ftp}}{18}
-\entry {MIME, images}{18}
-\entry {MIME, sound}{18}
-\entry {MIME, \code {tar}}{18}
-\entry {MIME, video}{18}
-\entry {minibuffer}{4}
-\entry {mode}{5}
-\entry {modes, MH-Folder}{6, 8, 11, 13, 25, 30, 32}
-\entry {modes, MH-Folder Show}{12, 13}
-\entry {modes, MH-Letter}{5, 6, 13, 14, 15}
-\entry {modes, MH-Show}{32}
-\entry {moving between messages}{12, 32}
-\entry {multimedia mail}{12, 17, 36}
-\initial {N}
-\entry {new mail}{21}
-\entry {news}{46}
-\entry {notification of new mail}{21}
-\initial {O}
-\entry {obtaining mh-e}{45}
-\entry {online help}{11, 27}
-\initial {P}
-\entry {\code {pick}}{24, 25}
-\entry {point}{4, 16}
-\entry {prefix argument}{3}
-\entry {printing}{22, 42}
-\entry {processing mail}{7, 20, 38}
-\initial {Q}
-\entry {quitting}{4, 8, 42}
-\initial {R}
-\entry {re-editing drafts}{15, 35}
-\entry {reading mail}{6, 11, 28}
-\entry {redistributing}{14, 35}
-\entry {\code {refile}}{22}
-\entry {region}{4, 16}
-\entry {regular expressions}{35}
-\entry {Reid, Brian}{47}
-\entry {\code {repl}}{14, 33}
-\entry {\file {replcomps}}{33}
-\entry {replying}{14, 34}
-\initial {S}
-\entry {\code {scan}}{6, 40, 41}
-\entry {searching}{23, 43}
-\entry {\code {send}}{35, 38}
-\entry {sending mail}{5, 13, 20, 32, 37}
-\entry {sequences}{25}
-\entry {setting variables}{27}
-\entry {\code {shar}}{23, 42}
-\entry {\code {show}}{12}
-\entry {signature}{17, 36}
-\entry {\code {sortm}}{40}
-\entry {sound}{18}
-\entry {SourceForge}{45, 47}
-\entry {spell check}{37}
-\entry {starting from command line}{13}
-\initial {T}
-\entry {\code {tar}}{18}
-\initial {U}
-\entry {Unix commands, Emacs}{1, 3}
-\entry {Unix commands, \code {ftp}}{18}
-\entry {Unix commands, \code {lpr}}{22, 42}
-\entry {Unix commands, \code {shar}}{23, 42}
-\entry {Unix commands, \code {tar}}{18}
-\entry {Unix commands, \code {uuencode}}{23, 42}
-\entry {using files}{22, 42}
-\entry {using folders}{22, 39}
-\entry {using pipes}{22, 42}
-\entry {\code {uuencode}}{23, 42}
-\initial {V}
-\entry {video}{18}
-\initial {W}
-\entry {\code {whom}}{17}
-\entry {Wohler, Bill}{45}
-\initial {X}
-\entry {\code {xmh}, in mh-e history}{48}
diff -ruN src-21.1/man/mh-e.fns src-21.2/man/mh-e.fns
--- src-21.1/man/mh-e.fns	Sat Oct 20 18:45:32 2001
+++ src-21.2/man/mh-e.fns	Thu Jan  1 01:00:00 1970
@@ -1,75 +0,0 @@
-\initial {D}
-\entry {\code {\code {display-time}}}{21}
-\initial {M}
-\entry {\code {\code {mh-burst-digest}}}{12}
-\entry {\code {\code {mh-check-whom}}}{17}
-\entry {\code {\code {mh-copy-msg}}}{22}
-\entry {\code {\code {mh-delete-msg}}}{22}
-\entry {\code {\code {mh-delete-msg-from-seq}}}{26}
-\entry {\code {\code {mh-delete-msg-no-motion}}}{22}
-\entry {\code {\code {mh-delete-seq}}}{26}
-\entry {\code {\code {mh-do-pick-search}}}{25}
-\entry {\code {\code {mh-edit-again}}}{15}
-\entry {\code {\code {mh-edit-mhn}}}{19}
-\entry {\code {\code {mh-execute-commands}}}{23, 39, 42}
-\entry {\code {\code {mh-extract-rejected-mail}}}{15}
-\entry {\code {\code {mh-first-msg}}}{12}
-\entry {\code {\code {mh-forward}}}{14}
-\entry {\code {\code {mh-fully-kill-draft}}}{20}
-\entry {\code {\code {mh-goto-msg}}}{12}
-\entry {\code {\code {mh-header-display}}}{12}
-\entry {\code {\code {mh-inc-folder}}}{21}
-\entry {\code {\code {mh-insert-letter}}}{16}
-\entry {\code {\code {mh-insert-signature}}}{17}
-\entry {\code {\code {mh-insert-signature}, example}}{33}
-\entry {\code {\code {mh-kill-folder}}}{22, 30}
-\entry {\code {\code {mh-last-msg}}}{12}
-\entry {\code {\code {mh-list-folders}}}{22}
-\entry {\code {\code {mh-list-sequences}}}{26}
-\entry {\code {\code {mh-mhn-compose-anon-ftp}}}{18}
-\entry {\code {\code {mh-mhn-compose-external-compressed-tar}}}{18}
-\entry {\code {\code {mh-mhn-compose-forw}}}{18}
-\entry {\code {\code {mh-mhn-compose-insertion}}}{18}
-\entry {\code {\code {mh-msg-is-in-seq}}}{26}
-\entry {\code {\code {mh-narrow-to-seq}}}{25}
-\entry {\code {\code {mh-next-undeleted-msg}}}{12}
-\entry {\code {\code {mh-pack-folder}}}{22}
-\entry {\code {\code {mh-page-digest}}}{12}
-\entry {\code {\code {mh-page-digest-backwards}}}{12}
-\entry {\code {\code {mh-page-msg}}}{12}
-\entry {\code {\code {mh-pipe-msg}}}{23}
-\entry {\code {\code {mh-previous-page}}}{12}
-\entry {\code {\code {mh-previous-undeleted-msg}}}{12}
-\entry {\code {\code {mh-print-msg}}}{22}
-\entry {\code {\code {mh-put-msg-in-seq}}}{25}
-\entry {\code {\code {mh-quit}}}{23}
-\entry {\code {\code {mh-redistribute}}}{14}
-\entry {\code {\code {mh-refile-msg}}}{22, 39}
-\entry {\code {\code {mh-refile-or-write-again}}}{22}
-\entry {\code {\code {mh-reply}}}{14}
-\entry {\code {\code {mh-rescan-folder}}}{22}
-\entry {\code {\code {mh-rescan-folder}, example}}{39}
-\entry {\code {\code {mh-revert-mhn-edit}}}{20}
-\entry {\code {\code {mh-rmail}}}{6, 11, 23}
-\entry {\code {\code {mh-rmail}, example}}{29}
-\entry {\code {\code {mh-search-folder}}}{23}
-\entry {\code {\code {mh-send}}}{13}
-\entry {\code {\code {mh-send-letter}}}{20}
-\entry {\code {\code {mh-show}}}{12}
-\entry {\code {\code {mh-show}, example}}{39}
-\entry {\code {\code {mh-smail}}}{5, 8, 13}
-\entry {\code {\code {mh-smail-other-window}}}{13}
-\entry {\code {\code {mh-sort-folder}}}{22, 40}
-\entry {\code {\code {mh-store-buffer}}}{42}
-\entry {\code {\code {mh-store-msg}}}{23, 42}
-\entry {\code {\code {mh-to-fcc}}}{17, 39}
-\entry {\code {\code {mh-to-field}}}{17, 24}
-\entry {\code {\code {mh-toggle-showing}}}{13}
-\entry {\code {\code {mh-undo}}}{23}
-\entry {\code {\code {mh-undo-folder}}}{23}
-\entry {\code {\code {mh-update-sequences}}}{26}
-\entry {\code {\code {mh-version}}}{26}
-\entry {\code {\code {mh-visit-folder}}}{22}
-\entry {\code {\code {mh-widen}}}{25}
-\entry {\code {\code {mh-write-msg-to-file}}}{22}
-\entry {\code {\code {mh-yank-cur-msg}}}{16}
diff -ruN src-21.1/man/mh-e.vrs src-21.2/man/mh-e.vrs
--- src-21.1/man/mh-e.vrs	Sat Oct 20 18:45:32 2001
+++ src-21.2/man/mh-e.vrs	Thu Jan  1 01:00:00 1970
@@ -1,79 +0,0 @@
-\initial {M}
-\entry {\code {\code {mail-citation-hook}}}{36}
-\entry {\code {\code {mh-auto-folder-collect}}}{39}
-\entry {\code {\code {mh-before-quit-hook}}}{42}
-\entry {\code {\code {mh-before-send-letter-hook}}}{37}
-\entry {\code {\code {mh-before-send-letter-hook}, example}}{37}
-\entry {\code {\code {mh-bury-show-buffer}}}{30}
-\entry {\code {\code {mh-bury-show-buffer}, example}}{27}
-\entry {\code {\code {mh-clean-message-header}}}{31}
-\entry {\code {\code {mh-cmd-note}}}{41}
-\entry {\code {\code {mh-comp-formfile}}}{33}
-\entry {\code {\code {mh-compose-letter-function}}}{34}
-\entry {\code {\code {mh-cur-scan-msg-regexp}}}{41}
-\entry {\code {\code {mh-default-folder-for-message-function}}}{39}
-\entry {\code {\code {mh-default-folder-for-message-function}, example}}{40}
-\entry {\code {\code {mh-delete-msg-hook}}}{39}
-\entry {\code {\code {mh-delete-yanked-msg-window}}}{36}
-\entry {\code {\code {mh-deleted-msg-regexp}}}{41}
-\entry {\code {\code {mh-do-not-confirm}}}{30}
-\entry {\code {\code {mh-folder-mode-hook}}}{30}
-\entry {\code {\code {mh-folder-mode-hook}, example}}{30}
-\entry {\code {\code {mh-forward-subject-format}}}{34}
-\entry {\code {\code {mh-good-msg-regexp}}}{41}
-\entry {\code {\code {mh-inc-folder-hook}}}{39}
-\entry {\code {\code {mh-inc-folder-hook}, example}}{39}
-\entry {\code {\code {mh-inc-prog}}}{39}
-\entry {\code {\code {mh-ins-buf-prefix}}}{36}
-\entry {\code {\code {mh-invisible-headers}}}{31}
-\entry {\code {\code {mh-letter-mode-hook}}}{33}
-\entry {\code {\code {mh-lib}}}{30}
-\entry {\code {\code {mh-lib}, example}}{5}
-\entry {\code {\code {mh-lpr-command-format}}}{42}
-\entry {\code {\code {mh-lpr-command-format}, example}}{27}
-\entry {\code {\code {mh-mhn-args}}}{37}
-\entry {\code {\code {mh-mime-content-types}}}{36}
-\entry {\code {\code {mh-mime-content-types}, example}}{36}
-\entry {\code {\code {mh-msg-number-regexp}}}{41}
-\entry {\code {\code {mh-msg-search-regexp}}}{41}
-\entry {\code {\code {mh-new-draft-cleaned-headers}}}{35}
-\entry {\code {\code {mh-new-draft-cleaned-headers}, example}}{35}
-\entry {\code {\code {mh-note-copied}}}{41}
-\entry {\code {\code {mh-note-cur}}}{42}
-\entry {\code {\code {mh-note-deleted}}}{41}
-\entry {\code {\code {mh-note-dist}}}{42}
-\entry {\code {\code {mh-note-forw}}}{42}
-\entry {\code {\code {mh-note-printed}}}{42}
-\entry {\code {\code {mh-note-refiled}}}{41}
-\entry {\code {\code {mh-note-repl}}}{42}
-\entry {\code {\code {mh-note-seq}}}{42}
-\entry {\code {\code {mh-partial-folder-mode-line-annotation}}}{43}
-\entry {\code {\code {mh-pick-mode-hook}}}{43}
-\entry {\code {\code {mh-print-background}}}{42}
-\entry {\code {\code {mh-progs}}}{30, 39, 40}
-\entry {\code {\code {mh-progs}, example}}{5}
-\entry {\code {\code {mh-quit-hook}}}{42}
-\entry {\code {\code {mh-recenter-summary-p}}}{32}
-\entry {\code {\code {mh-recursive-folders}}}{39}
-\entry {\code {\code {mh-redist-full-contents}}}{35}
-\entry {\code {\code {mh-refile-msg-hook}}}{40}
-\entry {\code {\code {mh-refiled-msg-regexp}}}{41}
-\entry {\code {\code {mh-repl-formfile}}}{33}
-\entry {\code {\code {mh-reply-default-reply-to}}}{34}
-\entry {\code {\code {mh-scan-prog}}}{39, 40}
-\entry {\code {\code {mh-send-prog}}}{38}
-\entry {\code {\code {mh-show-buffer-mode-line-buffer-id}}}{32}
-\entry {\code {\code {mh-show-hook}}}{32}
-\entry {\code {\code {mh-show-hook}, example}}{32}
-\entry {\code {\code {mh-show-mode-hook}}}{31}
-\entry {\code {\code {mh-show-mode-hook}, example}}{32}
-\entry {\code {\code {mh-signature-file-name}}}{36}
-\entry {\code {\code {mh-sortm-args}}}{40}
-\entry {\code {\code {mh-store-default-directory}}}{42}
-\entry {\code {\code {mh-store-default-directory}, example}}{42}
-\entry {\code {\code {mh-summary-height}}}{30}
-\entry {\code {\code {mh-user-path}, example}}{40}
-\entry {\code {\code {mh-valid-scan-line}}}{41}
-\entry {\code {\code {mh-visible-headers}}}{31}
-\entry {\code {\code {mh-yank-from-start-of-msg}}}{36}
-\entry {\code {\code {mhl-formfile}}}{31}
diff -ruN src-21.1/man/mule.texi src-21.2/man/mule.texi
--- src-21.1/man/mule.texi	Wed Sep 12 23:03:06 2001
+++ src-21.2/man/mule.texi	Wed Mar 13 20:52:10 2002
@@ -75,7 +75,9 @@
 appropriate keyboard coding system (@pxref{Specify Coding}), and Emacs
 will accept those characters.  Latin-1 characters can also be input by
 using the @kbd{C-x 8} prefix, see @ref{Single-Byte Character Support,
-C-x 8}.
+C-x 8}.  On X Window systems, your locale should be set to an
+appropriate value to make sure Emacs interprets keyboard input
+correctly, see @ref{Language Environments, locales}.
 @end itemize
 
   The rest of this chapter describes these issues in detail.
@@ -297,8 +299,9 @@
 @code{locale-charset-language-names} and @code{locale-language-names},
 and selects the corresponding language environment if a match is found.
 (The former variable overrides the latter.)  It also adjusts the display
-table and terminal coding system, the locale coding system, and the
-preferred coding system as needed for the locale.
+table and terminal coding system, the locale coding system, the
+preferred coding system as needed for the locale, and---last but not
+least---the way Emacs decodes non-ASCII characters sent by your keyboard.
 
   If you modify the @env{LC_ALL}, @env{LC_CTYPE}, or @env{LANG}
 environment variables while running Emacs, you may want to invoke the
@@ -1056,14 +1059,17 @@
 C-w} to specify a new file name for that buffer.
 
 @vindex locale-coding-system
+@cindex decoding non-ASCII keyboard input on X
   The variable @code{locale-coding-system} specifies a coding system
 to use when encoding and decoding system strings such as system error
-messages and @code{format-time-string} formats and time stamps.  You
-should choose a coding system that is compatible with the underlying
-system's text representation, which is normally specified by one of
-the environment variables @env{LC_ALL}, @env{LC_CTYPE}, and
-@env{LANG}.  (The first one, in the order specified above, whose value
-is nonempty is the one that determines the text representation.)
+messages and @code{format-time-string} formats and time stamps.  That
+coding system is also used for decoding non-ASCII keyboard input on X
+Window systems.  You should choose a coding system that is compatible
+with the underlying system's text representation, which is normally
+specified by one of the environment variables @env{LC_ALL},
+@env{LC_CTYPE}, and @env{LANG}.  (The first one, in the order
+specified above, whose value is nonempty is the one that determines
+the text representation.)
 
 @node Fontsets
 @section Fontsets
diff -ruN src-21.1/man/pcl-cvs.aux src-21.2/man/pcl-cvs.aux
--- src-21.1/man/pcl-cvs.aux	Sat Oct 20 18:45:44 2001
+++ src-21.2/man/pcl-cvs.aux	Thu Jan  1 01:00:00 1970
@@ -1,96 +0,0 @@
-'xrdef {About PCL-CVS-title}{About PCL-CVS}
-'xrdef {About PCL-CVS-pg}{1}
-'xrdef {About PCL-CVS-snt}{Chapter'tie1}
-'xrdef {Contributors-title}{Contributors to PCL-CVS}
-'xrdef {Contributors-pg}{1}
-'xrdef {Contributors-snt}{Section'tie1.1}
-'xrdef {Installation-title}{Installation}
-'xrdef {Installation-pg}{2}
-'xrdef {Installation-snt}{Section'tie1.2}
-'xrdef {Getting started-title}{Getting started}
-'xrdef {Getting started-pg}{3}
-'xrdef {Getting started-snt}{Chapter'tie2}
-'xrdef {Buffer contents-title}{Buffer contents}
-'xrdef {Buffer contents-pg}{4}
-'xrdef {Buffer contents-snt}{Chapter'tie3}
-'xrdef {Selected files-title}{Selected files}
-'xrdef {Selected files-pg}{6}
-'xrdef {Selected files-snt}{Chapter'tie4}
-'xrdef {Commands-title}{Commands}
-'xrdef {Commands-pg}{7}
-'xrdef {Commands-snt}{Chapter'tie5}
-'xrdef {Entering PCL-CVS-title}{Entering PCL-CVS}
-'xrdef {Entering PCL-CVS-pg}{7}
-'xrdef {Entering PCL-CVS-snt}{Section'tie5.1}
-'xrdef {Setting flags-title}{Setting flags for CVS commands}
-'xrdef {Setting flags-pg}{7}
-'xrdef {Setting flags-snt}{Section'tie5.2}
-'xrdef {Updating the buffer-title}{Updating the \samp {*cvs*} buffer}
-'xrdef {Updating the buffer-pg}{8}
-'xrdef {Updating the buffer-snt}{Section'tie5.3}
-'xrdef {Movement commands-title}{Movement Commands}
-'xrdef {Movement commands-pg}{9}
-'xrdef {Movement commands-snt}{Section'tie5.4}
-'xrdef {Marking files-title}{Marking files}
-'xrdef {Marking files-pg}{9}
-'xrdef {Marking files-snt}{Section'tie5.5}
-'xrdef {Committing changes-title}{Committing changes}
-'xrdef {Committing changes-pg}{9}
-'xrdef {Committing changes-snt}{Section'tie5.6}
-'xrdef {Editing files-title}{Editing files}
-'xrdef {Editing files-pg}{10}
-'xrdef {Editing files-snt}{Section'tie5.7}
-'xrdef {Getting info about files-title}{Getting info about files}
-'xrdef {Getting info about files-pg}{10}
-'xrdef {Getting info about files-snt}{Section'tie5.8}
-'xrdef {Adding and removing files-title}{Adding and removing files}
-'xrdef {Adding and removing files-pg}{10}
-'xrdef {Adding and removing files-snt}{Section'tie5.9}
-'xrdef {Undoing changes-title}{Undoing changes}
-'xrdef {Undoing changes-pg}{11}
-'xrdef {Undoing changes-snt}{Section'tie5.10}
-'xrdef {Removing handled entries-title}{Removing handled entries}
-'xrdef {Removing handled entries-pg}{11}
-'xrdef {Removing handled entries-snt}{Section'tie5.11}
-'xrdef {Ignoring files-title}{Ignoring files}
-'xrdef {Ignoring files-pg}{11}
-'xrdef {Ignoring files-snt}{Section'tie5.12}
-'xrdef {Viewing differences-title}{Viewing differences}
-'xrdef {Viewing differences-pg}{12}
-'xrdef {Viewing differences-snt}{Section'tie5.13}
-'xrdef {Invoking Ediff-title}{Running ediff}
-'xrdef {Invoking Ediff-pg}{12}
-'xrdef {Invoking Ediff-snt}{Section'tie5.14}
-'xrdef {Updating files-title}{Updating files}
-'xrdef {Updating files-pg}{12}
-'xrdef {Updating files-snt}{Section'tie5.15}
-'xrdef {Tagging files-title}{Tagging files}
-'xrdef {Tagging files-pg}{12}
-'xrdef {Tagging files-snt}{Section'tie5.16}
-'xrdef {Miscellaneous commands-title}{Miscellaneous commands}
-'xrdef {Miscellaneous commands-pg}{13}
-'xrdef {Miscellaneous commands-snt}{Section'tie5.17}
-'xrdef {Log Edit Mode-title}{Editing a Log Message}
-'xrdef {Log Edit Mode-pg}{14}
-'xrdef {Log Edit Mode-snt}{Chapter'tie6}
-'xrdef {Log View Mode-title}{Browsing a Log of Changes}
-'xrdef {Log View Mode-pg}{15}
-'xrdef {Log View Mode-snt}{Chapter'tie7}
-'xrdef {Customization-title}{Customization}
-'xrdef {Customization-pg}{16}
-'xrdef {Customization-snt}{Chapter'tie8}
-'xrdef {Customizing Faces-title}{Customizing Faces}
-'xrdef {Customizing Faces-pg}{17}
-'xrdef {Customizing Faces-snt}{Section'tie8.1}
-'xrdef {Bugs-title}{Bugs (known and unknown)}
-'xrdef {Bugs-pg}{18}
-'xrdef {Bugs-snt}{Chapter'tie9}
-'xrdef {Function and Variable Index-title}{Function and Variable Index}
-'xrdef {Function and Variable Index-pg}{19}
-'xrdef {Function and Variable Index-snt}{}
-'xrdef {Concept Index-title}{Concept Index}
-'xrdef {Concept Index-pg}{20}
-'xrdef {Concept Index-snt}{}
-'xrdef {Key Index-title}{Key Index}
-'xrdef {Key Index-pg}{22}
-'xrdef {Key Index-snt}{}
diff -ruN src-21.1/man/pcl-cvs.cps src-21.2/man/pcl-cvs.cps
--- src-21.1/man/pcl-cvs.cps	Sat Oct 20 18:45:44 2001
+++ src-21.2/man/pcl-cvs.cps	Thu Jan  1 01:00:00 1970
@@ -1,116 +0,0 @@
-\initial {*}
-\entry {\code {*cvs*} buffer contents}{4}
-\initial {-}
-\entry {\samp {-u} option in modules file}{16}
-\initial {.}
-\entry {\file {.cvsignore} file, sorting}{16}
-\initial {A}
-\entry {About PCL-CVS}{1}
-\entry {Active files}{6}
-\entry {Adding files}{10}
-\entry {Applicable}{6}
-\entry {Author, how to reach}{18}
-\entry {Authors}{1}
-\entry {Automatically inserting newline}{16}
-\entry {Automatically remove handled files}{16}
-\entry {Automatically sorting \file {.cvsignore}}{16}
-\initial {B}
-\entry {Buffer contents}{4}
-\entry {Bugs, how to report them}{18}
-\entry {Bugs, known}{18}
-\entry {Byte compilation}{13}
-\initial {C}
-\entry {\file {ChangeLog} paragraphs}{16}
-\entry {Command-line options to CVS}{7}
-\entry {Commit buffer}{9}
-\entry {Commit message, inserting newline}{16}
-\entry {Committing changes}{9}
-\entry {Conflicts, how to resolve them}{12}
-\entry {Context diff, how to get}{16}
-\entry {Contributors}{1}
-\entry {Creating the *cvs* buffer}{7}
-\entry {Customization}{16}
-\entry {\samp {CVSROOT}, overriding}{16}
-\initial {D}
-\entry {Deleting files}{10}
-\entry {Diff}{12}
-\entry {Dired}{10}
-\initial {E}
-\entry {Ediff}{12}
-\entry {Edit buffer}{9}
-\entry {Editing files}{10}
-\entry {Email to the author}{18}
-\entry {Erasing commit message}{9}
-\entry {Erasing input buffer}{16}
-\entry {Example run}{3}
-\entry {Expunging uninteresting entries}{11}
-\initial {F}
-\entry {FAQ}{18}
-\entry {File selection}{6}
-\entry {Finding files}{10}
-\entry {Flush changes}{11}
-\initial {G}
-\entry {Getting rid of lock files}{13}
-\entry {Getting rid of uninteresting lines}{11}
-\entry {Getting status}{10}
-\initial {H}
-\entry {Handled lines, removing them}{11}
-\entry {Help}{13}
-\initial {I}
-\entry {Ignoring files}{11}
-\entry {Installation}{2}
-\entry {Introduction}{3}
-\entry {Invoking \code {diff}}{12}
-\entry {Invoking dired}{10}
-\entry {Invoking ediff}{12}
-\initial {K}
-\entry {Known bugs}{18}
-\initial {L}
-\entry {Loading files}{10}
-\entry {Lock files}{13}
-\entry {Log (RCS/cvs command)}{10}
-\entry {Log Edit mode}{14}
-\entry {Log View mode}{15}
-\initial {M}
-\entry {Marked files}{6}
-\entry {Marking files}{9}
-\entry {Merging with \code {ediff} and \code {emerge}}{12}
-\entry {mode, Log Edit}{14}
-\entry {mode, Log View}{15}
-\entry {Modules file (\samp {-u} option)}{16}
-\entry {Movement Commands}{9}
-\initial {O}
-\entry {Optional switches to CVS}{7}
-\entry {output, logs}{15}
-\initial {P}
-\entry {Problems, list of common}{18}
-\entry {Putting files under CVS control}{10}
-\initial {Q}
-\entry {Quitting}{13}
-\initial {R}
-\entry {Recompiling elisp files}{13}
-\entry {Removing files}{10}
-\entry {Removing uninteresting (processed) lines}{11}
-\entry {Reporting bugs and ideas}{18}
-\entry {Require final newline}{16}
-\entry {Resolving conflicts}{12}
-\entry {Resurrecting files}{10}
-\entry {Reverting buffers after commit}{9, 16}
-\initial {S}
-\entry {Sample session}{3}
-\entry {Selected files}{6}
-\entry {Selecting files (commands to mark files)}{9}
-\entry {Sorting \file {.cvsignore} file}{16}
-\entry {Special prefix}{8}
-\entry {Status (cvs command)}{10}
-\initial {T}
-\entry {Tagging files}{12}
-\initial {U}
-\entry {Undo changes}{11}
-\entry {Unidiff, how to get}{16}
-\entry {Uninteresting entries, getting rid of them}{11}
-\entry {Update program (\samp {-u} option in modules file)}{16}
-\entry {Updating files}{12}
-\initial {V}
-\entry {Variables, list of all}{16}
-\entry {Viewing differences}{12}
diff -ruN src-21.1/man/pcl-cvs.fns src-21.2/man/pcl-cvs.fns
--- src-21.1/man/pcl-cvs.fns	Sat Oct 20 18:45:44 2001
+++ src-21.2/man/pcl-cvs.fns	Thu Jan  1 01:00:00 1970
@@ -1,73 +0,0 @@
-\initial {C}
-\entry {\code {cvs-allow-dir-commit}}{6}
-\entry {\code {cvs-auto-remove-directories\r { (variable)}}}{16}
-\entry {\code {cvs-auto-remove-handled\r { (variable)}}}{16}
-\entry {\code {cvs-auto-revert\r { (variable)}}}{9, 16}
-\entry {\code {cvs-checkout}}{7}
-\entry {\code {cvs-cvsroot\r { (variable)}}}{16}
-\entry {\code {cvs-dired-action}}{7}
-\entry {\code {cvs-dired-use-hook}}{7}
-\entry {\code {cvs-examine}}{7, 8}
-\entry {\code {cvs-filename-face (face)}}{17}
-\entry {\code {cvs-force-dir-tag\r { (variable)}}}{12}
-\entry {\code {cvs-handled-face (face)}}{17}
-\entry {\code {cvs-header-face (face)}}{17}
-\entry {\code {cvs-help}}{13}
-\entry {\code {cvs-idiff-imerge-handlers\r { (variable)}}}{12}
-\entry {\code {cvs-invert-ignore-marks\r { (variable)}}}{12}
-\entry {\code {cvs-marked-face (face)}}{17}
-\entry {\code {cvs-mode-acknowledge}}{11}
-\entry {\code {cvs-mode-add}}{10}
-\entry {\code {cvs-mode-add-change-log-entry-other-window}}{10}
-\entry {\code {cvs-mode-byte-compile-files}}{13}
-\entry {\code {cvs-mode-changelog-commit}}{16}
-\entry {\code {cvs-mode-commit}}{9}
-\entry {\code {cvs-mode-commit-setup}}{9}
-\entry {\code {cvs-mode-delete-lock}}{13}
-\entry {\code {cvs-mode-diff}}{12}
-\entry {\code {cvs-mode-diff-backup}}{12}
-\entry {\code {cvs-mode-diff-head}}{12}
-\entry {\code {cvs-mode-diff-vendor}}{12}
-\entry {\code {cvs-mode-examine}}{8}
-\entry {\code {cvs-mode-find-file}}{10}
-\entry {\code {cvs-mode-find-file-other-window}}{10}
-\entry {\code {cvs-mode-force-command}}{6}
-\entry {\code {cvs-mode-idiff}}{12}
-\entry {\code {cvs-mode-ignore}}{11}
-\entry {\code {cvs-mode-ignore\r {, and \file {.cvsignore} sorting}}}{17}
-\entry {\code {cvs-mode-imerge}}{12}
-\entry {\code {cvs-mode-log}}{10, 15}
-\entry {\code {cvs-mode-mark}}{9}
-\entry {\code {cvs-mode-mark-all-files}}{9}
-\entry {\code {cvs-mode-mark-matching-files}}{9}
-\entry {\code {cvs-mode-next-line}}{9}
-\entry {\code {cvs-mode-previous-line}}{9}
-\entry {\code {cvs-mode-quit}}{13}
-\entry {\code {cvs-mode-remove-file}}{10}
-\entry {\code {cvs-mode-remove-handled}}{11}
-\entry {\code {cvs-mode-remove-handled\r { (variable)}}}{11}
-\entry {\code {cvs-mode-status}}{8, 10}
-\entry {\code {cvs-mode-tag}}{12}
-\entry {\code {cvs-mode-toggle-marks}}{9}
-\entry {\code {cvs-mode-undo-local-changes}}{11}
-\entry {\code {cvs-mode-unmark}}{9}
-\entry {\code {cvs-mode-unmark-all-files}}{9}
-\entry {\code {cvs-mode-unmark-up}}{9}
-\entry {\code {cvs-mode-untag}}{12}
-\entry {\code {cvs-mode-update}}{8, 12}
-\entry {\code {cvs-need-action-face (face)}}{17}
-\entry {\code {cvs-quickdir}}{7}
-\entry {\code {cvs-rtag}}{12}
-\entry {\code {cvs-sort-ignore-file\r { (variable)}}}{16}
-\entry {\code {cvs-status}}{7, 8}
-\entry {\code {cvs-status-mode}}{8}
-\entry {\code {cvs-unknown-face (face)}}{17}
-\entry {\code {cvs-update}}{7, 8}
-\entry {\code {cvs-update-prog-output-skip-regexp\r { (variable)}}}{16}
-\initial {L}
-\entry {\code {log-edit-changelog-full-paragraphs\r { (variable)}}}{16}
-\entry {\code {log-edit-confirm\r { (variable)}}}{9}
-\entry {\code {log-edit-insert-changelog}}{14}
-\entry {\code {log-edit-require-final-newline\r { (variable)}}}{16}
-\initial {V}
-\entry {\code {vc-print-log}}{15}
diff -ruN src-21.1/man/pcl-cvs.kys src-21.2/man/pcl-cvs.kys
--- src-21.1/man/pcl-cvs.kys	Sat Oct 20 18:45:44 2001
+++ src-21.2/man/pcl-cvs.kys	Thu Jan  1 01:00:00 1970
@@ -1,56 +0,0 @@
-\initial {%}
-\entry {\code {%\r {--mark files matching regexp}}}{9}
-\initial {=}
-\entry {\code {=\r {--run \samp {cvs diff}}}}{12}
-\initial {?}
-\entry {\code {?\r {--help}}}{13}
-\initial {A}
-\entry {\code {a\r {--add a file}}}{10}
-\entry {\code {A\r {--add \file {ChangeLog} entry}}}{10}
-\initial {C}
-\entry {\code {c\r {--commit files}}}{9}
-\entry {\code {C\r {--commit files with \file {ChangeLog} message}}}{9}
-\entry {\code {C-k\r {--remove selected entries}}}{11}
-\initial {D}
-\entry {\code {d=\r {--run \samp {cvs diff}}}}{12}
-\entry {\code {db\r {--diff against base version}}}{12}
-\entry {\code {DEL\r {--unmark previous file}}}{9}
-\entry {\code {dh\r {--diff against head of repository}}}{12}
-\entry {\code {dv\r {--diff against vendor branch}}}{12}
-\initial {E}
-\entry {\code {e\r {--invoke \samp {ediff}}}}{12}
-\entry {\code {ESC DEL\r {--unmark all files}}}{9}
-\initial {F}
-\entry {\code {f\r {--find file or directory}}}{10}
-\initial {H}
-\entry {\code {h\r {--help}}}{13}
-\initial {I}
-\entry {\code {i\r {--ignoring files}}}{11}
-\initial {L}
-\entry {\code {l\r {--run \samp {cvs log}}}}{10}
-\initial {M}
-\entry {\code {m\r {--marking a file}}}{9}
-\entry {\code {M\r {--marking all files}}}{9}
-\entry {\code {M-t\r {--repository tag files}}}{12}
-\initial {N}
-\entry {\code {n\r {--Move down one file}}}{9}
-\initial {O}
-\entry {\code {o\r {--find file in other window}}}{10}
-\entry {\code {O\r {--update files}}}{12}
-\initial {P}
-\entry {\code {p\r {--Move up one file}}}{9}
-\initial {Q}
-\entry {\code {q\r {--quit PCL-CVS}}}{13}
-\initial {R}
-\entry {\code {r\r {--remove a file}}}{10}
-\initial {S}
-\entry {\code {s\r {--run \samp {cvs status}}}}{10}
-\entry {\code {SPC\r {--Move down one file}}}{9}
-\initial {T}
-\entry {\code {t\r {--tag files}}}{12}
-\entry {\code {T\r {--toggle marks}}}{9}
-\initial {U}
-\entry {\code {U\r {--undo changes}}}{11}
-\entry {\code {u\r {--unmark a file}}}{9}
-\initial {X}
-\entry {\code {x\r {--remove processed entries}}}{11}
diff -ruN src-21.1/man/programs.texi src-21.2/man/programs.texi
--- src-21.1/man/programs.texi	Fri Aug 31 17:10:14 2001
+++ src-21.2/man/programs.texi	Wed Mar 13 20:52:11 2002
@@ -303,6 +303,7 @@
 
 @node Which Function
 @subsection Which Function Mode
+@cindex current function name in mode line
 
   Which Function mode is a minor mode that displays the current
 function name in the mode line, updating it as you move around in a
@@ -1555,7 +1556,7 @@
 
 @table @kbd
 @item C-c :
-@kindex C-c : @r{(C mode)}
+@kindex C-c @key{colon} @r{(C mode)}
 @findex c-scope-operator
 Insert a double colon scope operator at point, without reindenting the
 line or adding any newlines (@code{c-scope-operator}).
diff -ruN src-21.1/man/reftex.aux src-21.2/man/reftex.aux
--- src-21.1/man/reftex.aux	Sat Oct 20 18:45:34 2001
+++ src-21.2/man/reftex.aux	Thu Jan  1 01:00:00 1970
@@ -1,195 +0,0 @@
-'xrdef {Introduction-title}{Introduction}
-'xrdef {Introduction-pg}{1}
-'xrdef {Introduction-snt}{Chapter'tie1}
-'xrdef {Installation-title}{Installation}
-'xrdef {Installation-pg}{1}
-'xrdef {Installation-snt}{Section'tie1.1}
-'xrdef {RefTeX in a Nutshell-title}{\b {Ref\TeX{}} in a Nutshell}
-'xrdef {RefTeX in a Nutshell-pg}{2}
-'xrdef {RefTeX in a Nutshell-snt}{Section'tie1.4}
-'xrdef {Table of Contents-title}{Table of Contents}
-'xrdef {Table of Contents-pg}{4}
-'xrdef {Table of Contents-snt}{Chapter'tie2}
-'xrdef {Labels and References-title}{Labels and References}
-'xrdef {Labels and References-pg}{7}
-'xrdef {Labels and References-snt}{Chapter'tie3}
-'xrdef {Creating Labels-title}{Creating Labels}
-'xrdef {Creating Labels-pg}{7}
-'xrdef {Creating Labels-snt}{Section'tie3.1}
-'xrdef {Referencing Labels-title}{Referencing Labels}
-'xrdef {Referencing Labels-pg}{8}
-'xrdef {Referencing Labels-snt}{Section'tie3.2}
-'xrdef {Builtin Label Environments-title}{Builtin Label Environments}
-'xrdef {Builtin Label Environments-pg}{10}
-'xrdef {Builtin Label Environments-snt}{Section'tie3.3}
-'xrdef {Defining Label Environments-title}{Defining Label Environments}
-'xrdef {Defining Label Environments-pg}{11}
-'xrdef {Defining Label Environments-snt}{Section'tie3.4}
-'xrdef {Theorem and Axiom-title}{Theorem and Axiom Environments}
-'xrdef {Theorem and Axiom-pg}{11}
-'xrdef {Theorem and Axiom-snt}{Section'tie3.4.1}
-'xrdef {Quick Equation-title}{Quick Equation Macro}
-'xrdef {Quick Equation-pg}{12}
-'xrdef {Quick Equation-snt}{Section'tie3.4.2}
-'xrdef {Figure Wrapper-title}{Figure Wrapping Macro}
-'xrdef {Figure Wrapper-pg}{13}
-'xrdef {Figure Wrapper-snt}{Section'tie3.4.3}
-'xrdef {Adding Magic Words-title}{Adding Magic Words}
-'xrdef {Adding Magic Words-pg}{14}
-'xrdef {Adding Magic Words-snt}{Section'tie3.4.4}
-'xrdef {Using {\tt\rawbackslashxx }eqref-title}{Using \code {{\tt\rawbackslashxx }eqref}}
-'xrdef {Using {\tt\rawbackslashxx }eqref-pg}{14}
-'xrdef {Using {\tt\rawbackslashxx }eqref-snt}{Section'tie3.4.5}
-'xrdef {Non-Standard Environments-title}{Non-standard Environments}
-'xrdef {Non-Standard Environments-pg}{14}
-'xrdef {Non-Standard Environments-snt}{Section'tie3.4.6}
-'xrdef {Putting it Together-title}{Putting it all together}
-'xrdef {Putting it Together-pg}{16}
-'xrdef {Putting it Together-snt}{Section'tie3.4.7}
-'xrdef {Reference Info-title}{Reference Info}
-'xrdef {Reference Info-pg}{16}
-'xrdef {Reference Info-snt}{Section'tie3.5}
-'xrdef {xr (LaTeX package)-title}{\code {xr}: Cross-Document References}
-'xrdef {xr (LaTeX package)-pg}{16}
-'xrdef {xr (LaTeX package)-snt}{Section'tie3.6}
-'xrdef {varioref (LaTeX package)-title}{\code {varioref}: Variable Page References}
-'xrdef {varioref (LaTeX package)-pg}{17}
-'xrdef {varioref (LaTeX package)-snt}{Section'tie3.7}
-'xrdef {fancyref (LaTeX package)-title}{\code {fancyref}: Fancy Cross References}
-'xrdef {fancyref (LaTeX package)-pg}{17}
-'xrdef {fancyref (LaTeX package)-snt}{Section'tie3.8}
-'xrdef {Citations-title}{Citations}
-'xrdef {Citations-pg}{18}
-'xrdef {Citations-snt}{Chapter'tie4}
-'xrdef {Creating Citations-title}{Creating Citations}
-'xrdef {Creating Citations-pg}{18}
-'xrdef {Creating Citations-snt}{Section'tie4.1}
-'xrdef {Citation Styles-title}{Citation Styles}
-'xrdef {Citation Styles-pg}{19}
-'xrdef {Citation Styles-snt}{Section'tie4.2}
-'xrdef {Citation Info-title}{Citation Info}
-'xrdef {Citation Info-pg}{20}
-'xrdef {Citation Info-snt}{Section'tie4.3}
-'xrdef {Chapterbib and Bibunits-title}{Chapterbib and Bibunits}
-'xrdef {Chapterbib and Bibunits-pg}{20}
-'xrdef {Chapterbib and Bibunits-snt}{Section'tie4.4}
-'xrdef {Citations Outside LaTeX-title}{Citations outside LaTeX}
-'xrdef {Citations Outside LaTeX-pg}{20}
-'xrdef {Citations Outside LaTeX-snt}{Section'tie4.5}
-'xrdef {Index Support-title}{Index Support}
-'xrdef {Index Support-pg}{21}
-'xrdef {Index Support-snt}{Chapter'tie5}
-'xrdef {Creating Index Entries-title}{Creating Index Entries}
-'xrdef {Creating Index Entries-pg}{21}
-'xrdef {Creating Index Entries-snt}{Section'tie5.1}
-'xrdef {The Index Phrases File-title}{The Index Phrases File}
-'xrdef {The Index Phrases File-pg}{22}
-'xrdef {The Index Phrases File-snt}{Section'tie5.2}
-'xrdef {Collecting Phrases-title}{Collecting Phrases}
-'xrdef {Collecting Phrases-pg}{22}
-'xrdef {Collecting Phrases-snt}{Section'tie5.2.1}
-'xrdef {Consistency Checks-title}{Consistency Checks}
-'xrdef {Consistency Checks-pg}{23}
-'xrdef {Consistency Checks-snt}{Section'tie5.2.2}
-'xrdef {Global Indexing-title}{Global Indexing}
-'xrdef {Global Indexing-pg}{24}
-'xrdef {Global Indexing-snt}{Section'tie5.2.3}
-'xrdef {Displaying and Editing the Index-title}{Displaying and Editing the Index}
-'xrdef {Displaying and Editing the Index-pg}{25}
-'xrdef {Displaying and Editing the Index-snt}{Section'tie5.3}
-'xrdef {Builtin Index Macros-title}{Builtin Index Macros}
-'xrdef {Builtin Index Macros-pg}{27}
-'xrdef {Builtin Index Macros-snt}{Section'tie5.4}
-'xrdef {Defining Index Macros-title}{Defining Index Macros}
-'xrdef {Defining Index Macros-pg}{27}
-'xrdef {Defining Index Macros-snt}{Section'tie5.5}
-'xrdef {Viewing Cross-References-title}{Viewing Cross--References}
-'xrdef {Viewing Cross-References-pg}{29}
-'xrdef {Viewing Cross-References-snt}{Chapter'tie6}
-'xrdef {RefTeXs Menu-title}{\b {Ref\TeX{}}'s Menu}
-'xrdef {RefTeXs Menu-pg}{30}
-'xrdef {RefTeXs Menu-snt}{Section'tie7.1}
-'xrdef {Key Bindings-title}{Default Key Bindings}
-'xrdef {Key Bindings-pg}{30}
-'xrdef {Key Bindings-snt}{Section'tie7.2}
-'xrdef {Faces-title}{Faces}
-'xrdef {Faces-pg}{30}
-'xrdef {Faces-snt}{Section'tie7.3}
-'xrdef {Multifile Documents-title}{Multifile Documents}
-'xrdef {Multifile Documents-pg}{31}
-'xrdef {Multifile Documents-snt}{Section'tie7.4}
-'xrdef {Language Support-title}{Language Support}
-'xrdef {Language Support-pg}{31}
-'xrdef {Language Support-snt}{Section'tie7.5}
-'xrdef {Finding Files-title}{Finding Files}
-'xrdef {Finding Files-pg}{32}
-'xrdef {Finding Files-snt}{Section'tie7.6}
-'xrdef {Optimizations-title}{Optimizations}
-'xrdef {Optimizations-pg}{32}
-'xrdef {Optimizations-snt}{Section'tie7.7}
-'xrdef {AUCTeX-title}{\w {AUC \TeX{}}}
-'xrdef {AUCTeX-pg}{35}
-'xrdef {AUCTeX-snt}{Section'tie7.8}
-'xrdef {AUCTeX-RefTeX Interface-title}{The AUC\TeX{}-\b {Ref\TeX{}} Interface}
-'xrdef {AUCTeX-RefTeX Interface-pg}{35}
-'xrdef {AUCTeX-RefTeX Interface-snt}{Section'tie7.8.1}
-'xrdef {Style Files-title}{Style Files}
-'xrdef {Style Files-pg}{36}
-'xrdef {Style Files-snt}{Section'tie7.8.2}
-'xrdef {Bib-Cite-title}{Bib-Cite}
-'xrdef {Bib-Cite-pg}{37}
-'xrdef {Bib-Cite-snt}{Section'tie7.8.3}
-'xrdef {Problems and Work-Arounds-title}{Problems and Work-arounds}
-'xrdef {Problems and Work-Arounds-pg}{38}
-'xrdef {Problems and Work-Arounds-snt}{Section'tie7.9}
-'xrdef {Imprint-title}{Imprint}
-'xrdef {Imprint-pg}{40}
-'xrdef {Imprint-snt}{Section'tie7.10}
-'xrdef {Commands-title}{Commands}
-'xrdef {Commands-pg}{41}
-'xrdef {Commands-snt}{Chapter'tie8}
-'xrdef {Options-title}{Options, Keymaps, Hooks}
-'xrdef {Options-pg}{44}
-'xrdef {Options-snt}{Chapter'tie9}
-'xrdef {Options (Table of Contents)-title}{Table of Contents}
-'xrdef {Options (Table of Contents)-pg}{44}
-'xrdef {Options (Table of Contents)-snt}{Section'tie9.1}
-'xrdef {Options (Defining Label Environments)-title}{Defining Label Environments}
-'xrdef {Options (Defining Label Environments)-pg}{45}
-'xrdef {Options (Defining Label Environments)-snt}{Section'tie9.2}
-'xrdef {Options (Creating Labels)-title}{Creating Labels}
-'xrdef {Options (Creating Labels)-pg}{48}
-'xrdef {Options (Creating Labels)-snt}{Section'tie9.3}
-'xrdef {Options (Referencing Labels)-title}{Referencing Labels}
-'xrdef {Options (Referencing Labels)-pg}{49}
-'xrdef {Options (Referencing Labels)-snt}{Section'tie9.4}
-'xrdef {Options (Creating Citations)-title}{Creating Citations}
-'xrdef {Options (Creating Citations)-pg}{51}
-'xrdef {Options (Creating Citations)-snt}{Section'tie9.5}
-'xrdef {Options (Index Support)-title}{Index Support}
-'xrdef {Options (Index Support)-pg}{53}
-'xrdef {Options (Index Support)-snt}{Section'tie9.6}
-'xrdef {Options (Viewing Cross-References)-title}{Viewing Cross-References}
-'xrdef {Options (Viewing Cross-References)-pg}{56}
-'xrdef {Options (Viewing Cross-References)-snt}{Section'tie9.7}
-'xrdef {Options (Finding Files)-title}{Finding Files}
-'xrdef {Options (Finding Files)-pg}{57}
-'xrdef {Options (Finding Files)-snt}{Section'tie9.8}
-'xrdef {Options (Optimizations)-title}{Optimizations}
-'xrdef {Options (Optimizations)-pg}{59}
-'xrdef {Options (Optimizations)-snt}{Section'tie9.9}
-'xrdef {Options (Fontification)-title}{Fontification}
-'xrdef {Options (Fontification)-pg}{60}
-'xrdef {Options (Fontification)-snt}{Section'tie9.10}
-'xrdef {Options (Misc)-title}{Miscellaneous}
-'xrdef {Options (Misc)-pg}{62}
-'xrdef {Options (Misc)-snt}{Section'tie9.11}
-'xrdef {Keymaps and Hooks-title}{Keymaps and Hooks}
-'xrdef {Keymaps and Hooks-pg}{63}
-'xrdef {Keymaps and Hooks-snt}{Section'tie9.12}
-'xrdef {Changes-title}{Changes}
-'xrdef {Changes-pg}{64}
-'xrdef {Changes-snt}{Chapter'tie10}
-'xrdef {Index-title}{Index}
-'xrdef {Index-pg}{66}
-'xrdef {Index-snt}{}
diff -ruN src-21.1/man/reftex.cps src-21.2/man/reftex.cps
--- src-21.1/man/reftex.cps	Sat Oct 20 18:45:34 2001
+++ src-21.2/man/reftex.cps	Thu Jan  1 01:00:00 1970
@@ -1,462 +0,0 @@
-\initial {*}
-\entry {\file {*toc*} buffer}{4}
-\initial {?}
-\entry {?}{4, 8, 18, 25}
-\initial {{\tt\indexbackslash }}
-\entry {\code {{\tt\rawbackslashxx }bibitem}}{29}
-\entry {\code {{\tt\rawbackslashxx }bibliography}}{18}
-\entry {\code {{\tt\rawbackslashxx }cite}}{18, 29}
-\entry {\code {{\tt\rawbackslashxx }endnote}, LaTeX macro}{10}
-\entry {\code {{\tt\rawbackslashxx }eqref}, AMS-LaTeX macro}{14}
-\entry {\code {{\tt\rawbackslashxx }externaldocument}}{16}
-\entry {\code {{\tt\rawbackslashxx }footnote}, LaTeX macro}{10}
-\entry {\code {{\tt\rawbackslashxx }fref}}{9, 17}
-\entry {\code {{\tt\rawbackslashxx }Fref}}{9, 17}
-\entry {\code {{\tt\rawbackslashxx }index}}{21, 29}
-\entry {\code {{\tt\rawbackslashxx }label}}{7, 29}
-\entry {\code {{\tt\rawbackslashxx }newtheorem}}{11}
-\entry {\code {{\tt\rawbackslashxx }ref}}{8, 29}
-\entry {\code {{\tt\rawbackslashxx }vref}}{9, 17}
-\initial {A}
-\entry {Acknowledgments}{40}
-\entry {\code {align}, AMS-LaTeX environment}{10}
-\entry {\code {alignat}, AMS-LaTeX environment}{10}
-\entry {AMS-LaTeX}{10, 14}
-\entry {\code {amsmath}, LaTeX package}{10}
-\entry {\code {AUCTeX}, Emacs package}{35}
-\entry {Automatic document scans}{33}
-\entry {\code {axiom}, newtheorem}{11}
-\initial {B}
-\entry {\code {Beqnarray}, LaTeX environment}{10}
-\entry {\code {bib-cite}, Emacs package}{37}
-\entry {\code {bib-cite-use-reftex-view-crossref}}{37}
-\entry {\code {BIBINPUTS}, environment variable}{1, 18}
-\entry {Bibliographies, multiple}{20}
-\entry {BibTeX buffer, viewing cite locations from}{29}
-\entry {BibTeX database files, not found}{1}
-\entry {\code {bibunits}, LaTeX package}{20}
-\entry {Bug reports}{40}
-\entry {Builtin index macros}{27}
-\entry {Builtin label environments}{10}
-\initial {C}
-\entry {C-c &}{16, 20, 29, 30}
-\entry {C-c (}{7, 30}
-\entry {C-c )}{8, 30}
-\entry {C-c /}{21, 30}
-\entry {C-c =}{4, 30}
-\entry {C-c [}{18, 30}
-\entry {C-c |}{22, 30}
-\entry {C-c >}{25, 30}
-\entry {C-c {\tt\rawbackslashxx }}{30}
-\entry {C-c <}{21, 30}
-\entry {C-c c}{30}
-\entry {C-c C-e}{35}
-\entry {C-c C-i}{23}
-\entry {C-c C-s}{23, 35}
-\entry {C-c C-t}{23}
-\entry {C-c g}{30}
-\entry {C-c l}{30}
-\entry {C-c r}{30}
-\entry {C-c \key {RET}}{35}
-\entry {C-c s}{30}
-\entry {C-c t}{30}
-\entry {C-c v}{30}
-\entry {Changes}{64}
-\entry {\code {chapterbib}, LaTeX package}{20}
-\entry {\code {chicago}, citation style}{19}
-\entry {Citation info}{20}
-\entry {Citation styles}{19}
-\entry {Citation styles, \code {chicago}}{19}
-\entry {Citation styles, \code {harvard}}{19}
-\entry {Citation styles, \code {natbib}}{19}
-\entry {Citations}{18}
-\entry {Citations outside LaTeX}{20}
-\entry {Citations, creating}{18}
-\entry {Citations, displaying}{20}
-\entry {Collecting index phrases}{22}
-\entry {Commands, list of}{41}
-\entry {Consistency check for index phrases}{23}
-\entry {Creating citations}{18}
-\entry {Creating citations, options}{51}
-\entry {Creating index entries}{21}
-\entry {Creating labels}{7}
-\entry {Creating labels, options}{48}
-\entry {Cross-document references}{16}
-\entry {Cross-references, displaying}{16}
-\initial {D}
-\entry {Defining Index Macros}{27}
-\entry {Defining label environments, options}{45}
-\entry {Displaying citations}{20}
-\entry {Displaying cross-references}{16}
-\entry {Displaying the Index}{25}
-\entry {Document scanning, automatic}{33}
-\entry {Document scanning, partial}{33}
-\entry {Documents, spread over files}{31}
-\initial {E}
-\entry {Editing the Index}{25}
-\entry {Emacs packages, \code {AUCTeX}}{35}
-\entry {Emacs packages, \code {bib-cite}}{37}
-\entry {Emacs packages, \code {iso-cvt}}{38}
-\entry {Emacs packages, \code {isotex}}{38}
-\entry {Emacs packages, \code {x-symbol}}{38}
-\entry {\code {endnote}, LaTeX package}{10}
-\entry {\code {enumerate}, LaTeX environment}{10}
-\entry {Environments without \code {{\tt\rawbackslashxx }begin}}{14}
-\entry {Environments, builtin}{10}
-\entry {\code {eqnarray}, LaTeX environment}{10}
-\entry {\code {equation}, LaTeX environment}{10}
-\entry {External documents}{16}
-\initial {F}
-\entry {Faces}{30}
-\entry {\code {fancybox}, LaTeX package}{10}
-\entry {\code {fancyref}, LaTeX package}{9, 17}
-\entry {Figure wrapping macro}{13}
-\entry {\code {figure*}, LaTeX environment}{10}
-\entry {\code {figure}, LaTeX environment}{10}
-\entry {\code {figwindow}, LaTeX environment}{10}
-\entry {Finding files}{1, 32}
-\entry {Finding files, options}{57}
-\entry {\code {flalign}, AMS-LaTeX environment}{10}
-\entry {\code {floatfig}, LaTeX package}{10}
-\entry {\code {floatingfig}, LaTeX environment}{10}
-\entry {Fontification, options}{60}
-\entry {\code {ftp}, \b {Ref\TeX{}} site}{40}
-\initial {G}
-\entry {\code {gather}, AMS-LaTeX environment}{10}
-\entry {German magic words}{14}
-\entry {Getting Started}{2}
-\entry {Global indexing}{24}
-\initial {H}
-\entry {\code {harvard}, citation style}{19}
-\entry {\code {http}, \b {Ref\TeX{}} home page}{40}
-\initial {I}
-\entry {Idle timer restart}{39}
-\entry {Imprint}{40}
-\entry {Index entries, creating}{21, 25}
-\entry {Index macros, builtin}{27}
-\entry {Index macros, defining}{27}
-\entry {Index phrase file}{22}
-\entry {Index phrases, collection}{22}
-\entry {Index phrases, consistency checks}{23}
-\entry {Index Support}{21}
-\entry {Index support, options}{53}
-\entry {Index, displaying}{25}
-\entry {Index, editing}{25}
-\entry {\code {index}, LaTeX package}{27}
-\entry {Indexing, from \file {phrases} buffer}{24}
-\entry {Indexing, global}{24}
-\entry {Installation}{1}
-\entry {Introduction}{1}
-\entry {\code {iso-cvt}, Emacs package}{38}
-\entry {\code {isotex}, Emacs package}{38}
-\initial {K}
-\entry {Key bindings, problems with Viper mode}{39}
-\entry {Key Bindings, summary}{30}
-\entry {Keymaps}{63}
-\entry {KOMA-Script, LaTeX classes}{5}
-\initial {L}
-\entry {Label category}{7, 14}
-\entry {Label environment}{7}
-\entry {Label environments, builtin}{10}
-\entry {Label environments, defining}{11}
-\entry {Labels in LaTeX}{7}
-\entry {Labels, commented out}{38}
-\entry {Labels, creating}{7}
-\entry {Labels, deriving from context}{7}
-\entry {Labels, referencing}{8}
-\entry {Language support}{31}
-\entry {LaTeX classes, KOMA-Script}{5}
-\entry {LaTeX commands, abbreviated}{15}
-\entry {LaTeX commands, not found}{38}
-\entry {LaTeX core}{10}
-\entry {LaTeX macro \code {footnote}}{10}
-\entry {LaTeX packages, \code {amsmath}}{10}
-\entry {LaTeX packages, \code {endnote}}{10}
-\entry {LaTeX packages, \code {fancybox}}{10}
-\entry {LaTeX packages, \code {fancyref}}{9, 17}
-\entry {LaTeX packages, \code {floatfig}}{10}
-\entry {LaTeX packages, \code {index}}{27}
-\entry {LaTeX packages, \code {linguex}}{15}
-\entry {LaTeX packages, \code {longtable}}{10}
-\entry {LaTeX packages, \code {multind}}{27}
-\entry {LaTeX packages, \code {pf}}{38}
-\entry {LaTeX packages, \code {picinpar}}{10}
-\entry {LaTeX packages, \code {rotating}}{10}
-\entry {LaTeX packages, \code {saferef}}{9}
-\entry {LaTeX packages, \code {sidecap}}{10}
-\entry {LaTeX packages, \code {subfigure}}{10}
-\entry {LaTeX packages, \code {supertab}}{10}
-\entry {LaTeX packages, \code {varioref}}{9, 17}
-\entry {LaTeX packages, \code {wrapfig}}{10}
-\entry {LaTeX packages, \code {xr}}{16}
-\entry {\code {LaTeX-add-environments, \r {AUCTeX}}}{36}
-\entry {\code {LaTeX-label-function, \r {AUCTeX}}}{35}
-\entry {\code {latex-mode-hook}}{1}
-\entry {\code {LaTeX-mode-hook}}{1}
-\entry {\code {LaTeX-section, \r {AUCTeX}}}{35}
-\entry {\code {linguex}, LaTeX package}{15}
-\entry {\code {longtable}, LaTeX environment}{10}
-\entry {\code {longtable}, LaTeX package}{10}
-\initial {M}
-\entry {Macro definition lines, in phrase buffer}{22}
-\entry {Macros as environment wrappers}{12, 13}
-\entry {Magic words}{14}
-\entry {Maintainer}{40}
-\entry {Menu, in the menu bar}{30}
-\entry {Multifile documents}{31}
-\entry {\code {multind}, LaTeX package}{27}
-\entry {Multiple selection buffers}{33}
-\entry {\code {multline}, AMS-LaTeX environment}{10}
-\initial {N}
-\entry {\code {natbib}, citation style}{19}
-\entry {Non-standard environments}{14}
-\entry {Nutshell, RefTeX in a}{2}
-\initial {O}
-\entry {Optimizations}{32}
-\entry {Optimizations, options}{59}
-\entry {Options, creating citations}{51}
-\entry {Options, creating labels}{48}
-\entry {Options, defining label environments}{45}
-\entry {Options, Finding Files}{57}
-\entry {Options, fontification}{60}
-\entry {Options, Index support}{53}
-\entry {Options, list of}{44}
-\entry {Options, misc}{62}
-\entry {Options, optimizations}{59}
-\entry {Options, referencing labels}{49}
-\entry {Options, table of contents}{44}
-\entry {Options, viewing cross-references}{56}
-\initial {P}
-\entry {Parse information, saving to a file}{33}
-\entry {Parser functions, for special environments}{14}
-\entry {Partial documents scans}{33}
-\entry {\code {pf}, LaTeX package}{38}
-\entry {Phrase file}{22}
-\entry {Phrases, collecting}{22}
-\entry {Phrases, consistency checks}{23}
-\entry {\code {picinpar}, LaTeX package}{10}
-\entry {Problems and work-arounds}{38}
-\initial {Q}
-\entry {Quick equation macro}{12}
-\entry {Quick-Start}{2}
-\initial {R}
-\entry {Reference info}{16}
-\entry {References in LaTeX}{7}
-\entry {References to external documents}{16}
-\entry {Referencing labels}{8}
-\entry {Referencing labels, options}{49}
-\entry {RefTeX in a Nutshell}{2}
-\entry {\code {reftex-abbrev-parameters}}{7, 31, 49}
-\entry {\code {reftex-add-index-macros}}{36}
-\entry {\code {reftex-add-label-environments}}{36, 38}
-\entry {\code {reftex-add-section-levels}}{37, 38}
-\entry {\code {reftex-add-to-label-alist}}{36}
-\entry {\code {reftex-allow-automatic-rescan}}{33, 60}
-\entry {\code {reftex-allow-detached-macro-args}}{62}
-\entry {\code {reftex-arg-cite}}{35}
-\entry {\code {reftex-arg-index}}{35}
-\entry {\code {reftex-arg-label}}{35}
-\entry {\code {reftex-arg-ref}}{35}
-\entry {\code {reftex-auto-update-selection-buffers}}{33, 60}
-\entry {\code {reftex-auto-view-crossref}}{57}
-\entry {\code {reftex-bib-author-face}}{61}
-\entry {\code {reftex-bib-extra-face}}{61}
-\entry {\code {reftex-bib-title-face}}{61}
-\entry {\code {reftex-bib-year-face}}{61}
-\entry {\code {reftex-bibfile-ignore-regexps}}{51}
-\entry {\code {reftex-bibpath-environment-variables}}{57}
-\entry {\code {reftex-cache-cite-echo}}{57}
-\entry {\code {reftex-change-label}}{43}
-\entry {\code {reftex-citation}}{18, 41}
-\entry {\code {reftex-cite-comment-format}}{53}
-\entry {\code {reftex-cite-format}}{19, 52}
-\entry {\code {reftex-cite-punctuation}}{31, 53}
-\entry {\code {reftex-cite-view-format}}{57}
-\entry {\code {reftex-comment-citations}}{52}
-\entry {\code {reftex-create-tags-file}}{42}
-\entry {\code {reftex-cursor-selected-face}}{61}
-\entry {\code {reftex-customize}}{43}
-\entry {\code {reftex-default-bibliography}}{20, 51}
-\entry {\code {reftex-default-context-regexps}}{47}
-\entry {\code {reftex-default-label-alist-entries}}{45}
-\entry {\code {reftex-derive-label-parameters}}{7, 31, 49}
-\entry {\code {reftex-display-copied-context-hook}}{51}
-\entry {\code {reftex-display-index}}{25, 42}
-\entry {\code {reftex-enable-partial-scans}}{5, 10, 27, 33, 38, 59}
-\entry {\code {reftex-external-file-finders}}{58}
-\entry {\code {reftex-extra-bindings}}{30, 62}
-\entry {\code {reftex-file-boundary-face}}{61}
-\entry {\code {reftex-file-extensions}}{58}
-\entry {\code {reftex-find-duplicate-labels}}{43}
-\entry {\code {reftex-format-cite-function}}{52}
-\entry {\code {reftex-format-label-function}}{48}
-\entry {\code {reftex-format-ref-function}}{50}
-\entry {\code {reftex-fref-is-default}}{17, 50}
-\entry {\code {reftex-grep-document}}{42}
-\entry {\code {reftex-guess-label-type}}{51}
-\entry {\code {reftex-highlight-selection}}{4, 9, 19, 61}
-\entry {\code {reftex-idle-time}}{57}
-\entry {\code {reftex-index}}{21, 41}
-\entry {\code {reftex-index-default-macro}}{54}
-\entry {\code {reftex-index-default-tag}}{54}
-\entry {\code {reftex-index-face}}{62}
-\entry {\code {reftex-index-follow-mode}}{26, 56}
-\entry {\code {reftex-index-header-face}}{62}
-\entry {\code {reftex-index-include-context}}{26, 56}
-\entry {\code {reftex-index-macros}}{27, 53}
-\entry {\code {reftex-index-map}}{56}
-\entry {\code {reftex-index-math-format}}{54}
-\entry {\code {reftex-index-phrase-file-extension}}{54}
-\entry {\code {reftex-index-phrase-selection-or-word}}{42}
-\entry {\code {reftex-index-phrases-apply-to-region}}{42}
-\entry {\code {reftex-index-phrases-case-fold-search}}{55}
-\entry {\code {reftex-index-phrases-logical-and-regexp}}{55}
-\entry {\code {reftex-index-phrases-logical-or-regexp}}{55}
-\entry {\code {reftex-index-phrases-map}}{56}
-\entry {\code {reftex-index-phrases-mode-hook}}{56}
-\entry {\code {reftex-index-phrases-search-whole-words}}{55}
-\entry {\code {reftex-index-phrases-skip-indexed-matches}}{55}
-\entry {\code {reftex-index-phrases-sort-in-blocks}}{56}
-\entry {\code {reftex-index-phrases-sort-prefers-entry}}{55}
-\entry {\code {reftex-index-phrases-wrap-long-lines}}{55}
-\entry {\code {reftex-index-section-face}}{62}
-\entry {\code {reftex-index-section-letters}}{56}
-\entry {\code {reftex-index-selection-or-word}}{21, 41}
-\entry {\code {reftex-index-special-chars}}{53}
-\entry {\code {reftex-index-tag-face}}{62}
-\entry {\code {reftex-index-visit-phrases-buffer}}{22, 42}
-\entry {\code {reftex-info}}{43}
-\entry {\code {reftex-initialize-temporary-buffers}}{38, 59}
-\entry {\code {reftex-insert-label-flags}}{7, 12, 48}
-\entry {\code {reftex-keep-temporary-buffers}}{32, 38, 59}
-\entry {\code {reftex-label}}{7, 35, 41}
-\entry {\code {reftex-label-alist}}{10, 11, 29, 45}
-\entry {\code {reftex-label-alist-builtin}}{10, 11}
-\entry {\code {reftex-label-face}}{61}
-\entry {\code {reftex-label-illegal-re}}{7, 31, 49}
-\entry {\code {reftex-label-menu-flags}}{9, 12, 49}
-\entry {\code {reftex-level-indent}}{51}
-\entry {\code {reftex-load-hook}}{30, 63}
-\entry {\code {reftex-max-section-depth}}{47}
-\entry {\code {reftex-mode}}{1}
-\entry {\code {reftex-mode-hook}}{63}
-\entry {\code {reftex-mode-map}}{63}
-\entry {\code {reftex-mouse-selected-face}}{61}
-\entry {\code {reftex-mouse-view-crossref}}{16, 20, 29}
-\entry {\code {reftex-multiref-punctuation}}{9, 31, 50}
-\entry {\code {reftex-no-include-regexps}}{59}
-\entry {\code {reftex-parse-document}}{43}
-\entry {\code {reftex-parse-file-extension}}{33, 60}
-\entry {\code {reftex-plug-into-AUCTeX}}{62}
-\entry {\code {reftex-pre-refontification-functions}}{51}
-\entry {\code {reftex-query-replace-document}}{43}
-\entry {\code {reftex-reference}}{8, 41}
-\entry {\code {reftex-refontify-context}}{38, 60}
-\entry {\code {reftex-renumber-simple-labels}}{43}
-\entry {\code {reftex-reset-mode}}{43}
-\entry {\code {reftex-revisit-to-echo}}{57}
-\entry {\code {reftex-revisit-to-follow}}{4, 8, 26, 62}
-\entry {\code {reftex-save-parse-info}}{33, 59}
-\entry {\code {reftex-search-document}}{42}
-\entry {\code {reftex-search-unrecursed-path-first}}{58}
-\entry {\code {reftex-section-heading-face}}{61}
-\entry {\code {reftex-section-levels}}{5, 47}
-\entry {\code {reftex-section-prefixes}}{47}
-\entry {\code {reftex-select-bib-map}}{19, 53}
-\entry {\code {reftex-select-bib-mode-hook}}{53}
-\entry {\code {reftex-select-label-map}}{10, 51}
-\entry {\code {reftex-select-label-mode-hook}}{51}
-\entry {\code {reftex-select-mark-face}}{62}
-\entry {\code {reftex-set-cite-format}}{36, 38}
-\entry {\code {reftex-show-commentary}}{43}
-\entry {\code {reftex-sort-bibtex-matches}}{51}
-\entry {\code {reftex-string-to-label-function}}{48}
-\entry {\code {reftex-support-index}}{53}
-\entry {\code {reftex-texpath-environment-variables}}{57}
-\entry {\code {reftex-toc}}{4, 41}
-\entry {\code {reftex-toc-follow-mode}}{4, 44}
-\entry {\code {reftex-toc-header-face}}{61}
-\entry {\code {reftex-toc-include-context}}{5, 44}
-\entry {\code {reftex-toc-include-file-boundaries}}{5, 44}
-\entry {\code {reftex-toc-include-index-entries}}{5, 44}
-\entry {\code {reftex-toc-include-labels}}{5, 44}
-\entry {\code {reftex-toc-keep-other-windows}}{44}
-\entry {\code {reftex-toc-map}}{5, 44}
-\entry {\code {reftex-toc-max-level}}{5, 44}
-\entry {\code {reftex-toc-mode-hook}}{44}
-\entry {\code {reftex-translate-to-ascii-function}}{7, 31, 48}
-\entry {\code {reftex-use-external-file-finders}}{58}
-\entry {\code {reftex-use-fonts}}{60}
-\entry {\code {reftex-use-itimer-in-xemacs}}{39}
-\entry {\code {reftex-use-multiple-selection-buffers}}{33, 60}
-\entry {\code {reftex-view-crossref}}{16, 20, 29, 42}
-\entry {\code {reftex-view-crossref-extra}}{29, 56}
-\entry {\code {reftex-view-crossref-from-bibtex}}{42}
-\entry {\code {reftex-vref-is-default}}{17, 50}
-\entry {RefTeXs Menu}{30}
-\entry {Removing lookup buffers}{32}
-\entry {\code {rotating}, LaTeX package}{10}
-\initial {S}
-\entry {S-mouse-2}{16, 20, 29, 30}
-\entry {\code {saferef}, LaTeX package}{9}
-\entry {Saving parser information}{33}
-\entry {\code {SCfigure}, LaTeX environment}{10}
-\entry {\code {SCtable}, LaTeX environment}{10}
-\entry {Section numbers, wrong}{38}
-\entry {Sectioning commands}{5}
-\entry {Selection buffer, citations}{18}
-\entry {Selection buffer, labels}{8}
-\entry {Selection buffers, multiple}{33}
-\entry {Selection buffers, updating}{33}
-\entry {Selection process}{8, 18}
-\entry {Settings, local}{38}
-\entry {\code {sidecap}, LaTeX package}{10}
-\entry {\code {sidewaysfigure}, LaTeX environment}{10}
-\entry {\code {sidewaystable}, LaTeX environment}{10}
-\entry {Special parser functions}{14}
-\entry {Style files, AUCTeX}{36}
-\entry {\code {subequations}, AMS-LaTeX environment}{10}
-\entry {\code {subfig}, LaTeX package}{10}
-\entry {\code {subfigure*}, LaTeX environment}{10}
-\entry {\code {subfigure}, LaTeX environment}{10}
-\entry {\code {supertab}, LaTeX package}{10}
-\entry {\code {supertabular}, LaTeX environment}{10}
-\initial {T}
-\entry {Table of contents buffer}{4}
-\entry {Table of contents, options}{44}
-\entry {\code {table*}, LaTeX environment}{10}
-\entry {\code {table}, LaTeX environment}{10}
-\entry {\code {tabwindow}, LaTeX environment}{10}
-\entry {TeX files, not found}{1}
-\entry {\code {TeX-add-style-hook, \r {AUCTeX}}}{36}
-\entry {\code {TeX-arg-cite, \r {AUCTeX function}}}{35}
-\entry {\code {TeX-arg-index, \r {AUCTeX function}}}{35}
-\entry {\code {TeX-arg-label, \r {AUCTeX function}}}{35}
-\entry {\code {TeX-arg-ref, \r {AUCTeX function}}}{35}
-\entry {\code {TeX-insert-macro, \r {AUCTeX}}}{35}
-\entry {\code {TeX-insert-macro, \r {AUCTeX function}}}{35}
-\entry {\code {tex-main-file}}{31}
-\entry {\code {TeX-master}}{31}
-\entry {\code {TEXBIB}, environment variable}{18}
-\entry {\code {TEXINPUTS}, environment variable}{1}
-\entry {Thanks}{40}
-\entry {\code {thebibliography}, LaTeX environment}{18}
-\entry {\code {theorem}, newtheorem}{11}
-\entry {TOC entries for environments}{5}
-\entry {\code {turn-on-reftex}}{1}
-\initial {V}
-\entry {\code {varioref}, LaTeX package}{9, 17}
-\entry {Viewing citations}{20}
-\entry {Viewing cite locations from BibTeX buffer}{29}
-\entry {Viewing cross-references}{16}
-\entry {Viewing cross-references, options}{56}
-\entry {Viper mode}{39}
-\entry {\code {viper-harness-minor-mode}}{39}
-\initial {W}
-\entry {\code {wrapfig}, LaTeX package}{10}
-\entry {\code {wrapfigure}, LaTeX environment}{10}
-\initial {X}
-\entry {\code {x-symbol}, Emacs package}{38}
-\entry {\code {xalignat}, AMS-LaTeX environment}{10}
-\entry {\code {xr}, LaTeX package}{16}
-\entry {\code {xxalignat}, AMS-LaTeX environment}{10}
diff -ruN src-21.1/man/regs.texi src-21.2/man/regs.texi
--- src-21.1/man/regs.texi	Sat Aug 25 22:38:43 2001
+++ src-21.2/man/regs.texi	Wed Oct 24 20:54:08 2001
@@ -37,6 +37,7 @@
 
 @node RegPos
 @section Saving Positions in Registers
+@cindex saving position in a register
 
   Saving a position records a place in a buffer so that you can move
 back there later.  Moving to a saved position switches to that buffer
@@ -70,6 +71,7 @@
 
 @node RegText
 @section Saving Text in Registers
+@cindex saving text in a register
 
   When you want to insert a copy of the same piece of text several
 times, it may be inconvenient to yank it from the kill ring, since each
@@ -81,6 +83,10 @@
 Copy region into register @var{r} (@code{copy-to-register}).
 @item C-x r i @var{r}
 Insert text from register @var{r} (@code{insert-register}).
+@item M-x append-to-register @key{RET} @var{r}
+Append region to text in register @var{r}.
+@item M-x prepend-to-register @key{RET} @var{r}
+Prepend region to text in register @var{r}.
 @end table
 
 @kindex C-x r s
@@ -92,6 +98,16 @@
 command with a numeric argument, deletes the text from the buffer as
 well; you can think of this as ``moving'' the region text into the register.
 
+@findex append-to-register
+@findex prepend-to-register
+  @kbd{M-x append-to-register @key{RET} @var{r}} appends the copy of
+the text in the region to the text already stored in the register
+named @var{r}.  If invoked with a numeric argument, it deletes the
+region after appending it to the register.  A similar command
+@code{prepend-to-register} works the same, except that it
+@emph{prepends} the region text to the text in the register, rather
+than @emph{appending} it.
+
   @kbd{C-x r i @var{r}} inserts in the buffer the text from register
 @var{r}.  Normally it leaves point before the text and places the mark
 after, but with a numeric argument (@kbd{C-u}) it puts point after the
@@ -99,6 +115,7 @@
 
 @node RegRect
 @section Saving Rectangles in Registers
+@cindex saving rectangle in a register
 
   A register can contain a rectangle instead of linear text.  The
 rectangle is represented as a list of strings.  @xref{Rectangles}, for
@@ -125,6 +142,7 @@
 
 @node RegConfig
 @section Saving Window Configurations in Registers
+@cindex saving window configuration in a register
 
 @findex window-configuration-to-register
 @findex frame-configuration-to-register
@@ -151,6 +169,7 @@
 
 @node RegNumbers
 @section Keeping Numbers in Registers
+@cindex saving number in a register
 
   There are commands to store a number in a register, to insert
 the number in the buffer in decimal, and to increment it.  These commands
@@ -177,6 +196,7 @@
 
 @node RegFiles
 @section Keeping File Names in Registers
+@cindex saving fuile name in a register
 
   If you visit certain file names frequently, you can visit them more
 conveniently if you put their names in registers.  Here's the Lisp code
diff -ruN src-21.1/man/sc.aux src-21.2/man/sc.aux
--- src-21.1/man/sc.aux	Sat Oct 20 18:45:35 2001
+++ src-21.2/man/sc.aux	Thu Jan  1 01:00:00 1970
@@ -1,126 +0,0 @@
-'xrdef {Introduction-title}{Introduction}
-'xrdef {Introduction-pg}{1}
-'xrdef {Introduction-snt}{Chapter'tie1}
-'xrdef {Usage Overview-title}{Usage Overview}
-'xrdef {Usage Overview-pg}{1}
-'xrdef {Usage Overview-snt}{Section'tie1.1}
-'xrdef {What Supercite Does Not Do-title}{What Supercite Doesn't Do}
-'xrdef {What Supercite Does Not Do-pg}{2}
-'xrdef {What Supercite Does Not Do-snt}{Section'tie1.2}
-'xrdef {What Supercite Does-title}{What Supercite Does}
-'xrdef {What Supercite Does-pg}{2}
-'xrdef {What Supercite Does-snt}{Section'tie1.3}
-'xrdef {Citations-title}{Citations}
-'xrdef {Citations-pg}{4}
-'xrdef {Citations-snt}{Chapter'tie2}
-'xrdef {Citation Elements-title}{Citation Elements}
-'xrdef {Citation Elements-pg}{4}
-'xrdef {Citation Elements-snt}{Section'tie2.1}
-'xrdef {Recognizing Citations-title}{Recognizing Citations}
-'xrdef {Recognizing Citations-pg}{5}
-'xrdef {Recognizing Citations-snt}{Section'tie2.2}
-'xrdef {Information Keys and the Info Alist-title}{Information Keys and the Info Alist}
-'xrdef {Information Keys and the Info Alist-pg}{6}
-'xrdef {Information Keys and the Info Alist-snt}{Chapter'tie3}
-'xrdef {Reference Headers-title}{Reference Headers}
-'xrdef {Reference Headers-pg}{8}
-'xrdef {Reference Headers-snt}{Chapter'tie4}
-'xrdef {The Built-in Header Rewrite Functions-title}{The Built-in Header Rewrite Functions}
-'xrdef {The Built-in Header Rewrite Functions-pg}{8}
-'xrdef {The Built-in Header Rewrite Functions-snt}{Section'tie4.1}
-'xrdef {Electric References-title}{Electric References}
-'xrdef {Electric References-pg}{9}
-'xrdef {Electric References-snt}{Section'tie4.2}
-'xrdef {Getting Connected-title}{Getting Connected}
-'xrdef {Getting Connected-pg}{11}
-'xrdef {Getting Connected-snt}{Chapter'tie5}
-'xrdef {Emacs 19 MUAs-title}{GNUS, RMAIL, or RNEWS with any Emacs 19}
-'xrdef {Emacs 19 MUAs-pg}{12}
-'xrdef {Emacs 19 MUAs-snt}{Section'tie5.1}
-'xrdef {Emacs 18 MUAs-title}{GNUS, RMAIL, PCMAIL, RNEWS with Emacs 18 or Epoch 4}
-'xrdef {Emacs 18 MUAs-pg}{12}
-'xrdef {Emacs 18 MUAs-snt}{Section'tie5.2}
-'xrdef {MH-E with any Emacsen-title}{MH-E with any Emacsen}
-'xrdef {MH-E with any Emacsen-pg}{12}
-'xrdef {MH-E with any Emacsen-snt}{Section'tie5.3}
-'xrdef {VM with any Emacsen-title}{VM with any Emacsen}
-'xrdef {VM with any Emacsen-pg}{13}
-'xrdef {VM with any Emacsen-snt}{Section'tie5.4}
-'xrdef {GNEWS with any Emacsen-title}{GNEWS with any Emacsen}
-'xrdef {GNEWS with any Emacsen-pg}{13}
-'xrdef {GNEWS with any Emacsen-snt}{Section'tie5.5}
-'xrdef {Overloading for Non-conforming MUAs-title}{Overloading for Non-conforming MUAs}
-'xrdef {Overloading for Non-conforming MUAs-pg}{13}
-'xrdef {Overloading for Non-conforming MUAs-snt}{Section'tie5.6}
-'xrdef {Replying and Yanking-title}{Replying and Yanking}
-'xrdef {Replying and Yanking-pg}{15}
-'xrdef {Replying and Yanking-snt}{Chapter'tie6}
-'xrdef {Reply Buffer Initialization-title}{Reply Buffer Initialization}
-'xrdef {Reply Buffer Initialization-pg}{15}
-'xrdef {Reply Buffer Initialization-snt}{Section'tie6.1}
-'xrdef {Filling Cited Text-title}{Filling Cited Text}
-'xrdef {Filling Cited Text-pg}{17}
-'xrdef {Filling Cited Text-snt}{Section'tie6.2}
-'xrdef {Selecting an Attribution-title}{Selecting an Attribution}
-'xrdef {Selecting an Attribution-pg}{18}
-'xrdef {Selecting an Attribution-snt}{Chapter'tie7}
-'xrdef {Attribution Preferences-title}{Attribution Preferences}
-'xrdef {Attribution Preferences-pg}{18}
-'xrdef {Attribution Preferences-snt}{Section'tie7.1}
-'xrdef {Anonymous Attributions-title}{Anonymous Attributions}
-'xrdef {Anonymous Attributions-pg}{19}
-'xrdef {Anonymous Attributions-snt}{Section'tie7.2}
-'xrdef {Author Names-title}{Author Names}
-'xrdef {Author Names-pg}{20}
-'xrdef {Author Names-snt}{Section'tie7.3}
-'xrdef {Configuring the Citation Engine-title}{Configuring the Citation Engine}
-'xrdef {Configuring the Citation Engine-pg}{22}
-'xrdef {Configuring the Citation Engine-snt}{Chapter'tie8}
-'xrdef {Using Regi-title}{Using Regi}
-'xrdef {Using Regi-pg}{22}
-'xrdef {Using Regi-snt}{Section'tie8.1}
-'xrdef {Frames You Can Customize-title}{Frames You Can Customize}
-'xrdef {Frames You Can Customize-pg}{23}
-'xrdef {Frames You Can Customize-snt}{Section'tie8.2}
-'xrdef {Post-yank Formatting Commands-title}{Post-yank Formatting Commands}
-'xrdef {Post-yank Formatting Commands-pg}{25}
-'xrdef {Post-yank Formatting Commands-snt}{Chapter'tie9}
-'xrdef {Citing Commands-title}{Commands to Manually Cite, Recite, and Uncite}
-'xrdef {Citing Commands-pg}{25}
-'xrdef {Citing Commands-snt}{Section'tie9.1}
-'xrdef {Insertion Commands-title}{Insertion Commands}
-'xrdef {Insertion Commands-pg}{26}
-'xrdef {Insertion Commands-snt}{Section'tie9.2}
-'xrdef {Variable Toggling Shortcuts-title}{Variable Toggling Shortcuts}
-'xrdef {Variable Toggling Shortcuts-pg}{26}
-'xrdef {Variable Toggling Shortcuts-snt}{Section'tie9.3}
-'xrdef {Mail Field Commands-title}{Mail Field Commands}
-'xrdef {Mail Field Commands-pg}{27}
-'xrdef {Mail Field Commands-snt}{Section'tie9.4}
-'xrdef {Miscellaneous Commands-title}{Miscellaneous Commands}
-'xrdef {Miscellaneous Commands-pg}{28}
-'xrdef {Miscellaneous Commands-snt}{Section'tie9.5}
-'xrdef {Hints to MUA Authors-title}{Hints to MUA Authors}
-'xrdef {Hints to MUA Authors-pg}{29}
-'xrdef {Hints to MUA Authors-snt}{Chapter'tie10}
-'xrdef {Version 3 Changes-title}{Version 3 Changes}
-'xrdef {Version 3 Changes-pg}{31}
-'xrdef {Version 3 Changes-snt}{Chapter'tie11}
-'xrdef {Thanks and History-title}{Thanks and History}
-'xrdef {Thanks and History-pg}{32}
-'xrdef {Thanks and History-snt}{Chapter'tie12}
-'xrdef {The Supercite Mailing List-title}{The Supercite Mailing List}
-'xrdef {The Supercite Mailing List-pg}{33}
-'xrdef {The Supercite Mailing List-snt}{Chapter'tie13}
-'xrdef {Concept Index-title}{Concept Index}
-'xrdef {Concept Index-pg}{34}
-'xrdef {Concept Index-snt}{}
-'xrdef {Command Index-title}{Command Index}
-'xrdef {Command Index-pg}{36}
-'xrdef {Command Index-snt}{}
-'xrdef {Key Index-title}{Key Index}
-'xrdef {Key Index-pg}{38}
-'xrdef {Key Index-snt}{}
-'xrdef {Variable Index-title}{Variable Index}
-'xrdef {Variable Index-pg}{39}
-'xrdef {Variable Index-snt}{}
diff -ruN src-21.1/man/sc.cps src-21.2/man/sc.cps
--- src-21.1/man/sc.cps	Sat Oct 20 18:45:35 2001
+++ src-21.2/man/sc.cps	Thu Jan  1 01:00:00 1970
@@ -1,99 +0,0 @@
-\initial {.}
-\entry {.emacs file}{11, 12, 13}
-\initial {A}
-\entry {add-hook substitute}{12}
-\entry {attribute, attributing}{1}
-\entry {attribution info field (sc-)}{6}
-\entry {attribution list}{17}
-\entry {attribution string}{4}
-\entry {author info field (sc-)}{6}
-\entry {author names}{20}
-\entry {autoload}{11}
-\initial {C}
-\entry {citation}{3}
-\entry {citation delimiter}{4}
-\entry {citation info field (sc-)}{6}
-\entry {citation interface specification}{10}
-\entry {citation leader}{4}
-\entry {citation separator}{5}
-\entry {citation string}{4}
-\entry {cite, citing}{1}
-\initial {E}
-\entry {electric references}{9}
-\entry {emailname info field (sc-)}{6}
-\entry {entries (Regi)}{21}
-\initial {F}
-\entry {filladapt}{2, 16}
-\entry {filling paragraphs}{16}
-\entry {firstname info field (sc-)}{6}
-\entry {frames (Regi)}{21}
-\entry {from-address info field (sc-)}{6}
-\initial {G}
-\entry {gin-mode}{2, 16}
-\initial {H}
-\entry {header rewrite functions}{8}
-\entry {header rewrite functions, built-in}{8}
-\entry {Hyperbole}{14}
-\initial {I}
-\entry {info alist}{2}
-\entry {Info Alist}{5}
-\entry {information extracted from mail fields}{5}
-\entry {information keys}{5}
-\entry {initials info field (sc-)}{6}
-\initial {K}
-\entry {keymap prefix}{15}
-\initial {L}
-\entry {lastname info field (sc-)}{7}
-\initial {M}
-\entry {mail-citation-hook}{12}
-\entry {mailing list address}{32}
-\entry {mark}{11}
-\entry {middlename-1 info field (sc-)}{7}
-\entry {modeline}{2, 15}
-\entry {MUA}{1}
-\initial {N}
-\entry {nested citations}{3}
-\entry {non-nested citations}{4}
-\entry {NUA}{1}
-\entry {nuking mail headers}{2}
-\initial {O}
-\entry {overloading}{12, 13}
-\initial {P}
-\entry {point}{11}
-\initial {R}
-\entry {reciting}{24}
-\entry {reference header}{2}
-\entry {reference headers}{7}
-\entry {Regi}{21}
-\entry {regi.el file}{31}
-\entry {reply-address info field (sc-)}{6}
-\entry {reporter.el file}{31}
-\initial {S}
-\entry {sc-attribution info field}{6}
-\entry {sc-author info field}{6}
-\entry {sc-citation info field}{6}
-\entry {sc-elec.el from version 2}{31}
-\entry {sc-emailname info field}{6}
-\entry {sc-firstname info field}{6}
-\entry {sc-from-address info field}{6}
-\entry {sc-initials info field}{6}
-\entry {sc-lastname info field}{7}
-\entry {sc-middlename-1 info field}{7}
-\entry {sc-oloads.el}{13}
-\entry {sc-reply-address info field}{6}
-\entry {sc-sender-address info field}{6}
-\entry {sc-unsupp.el file}{12, 31}
-\entry {sc.el from version 2}{31}
-\entry {sender-address info field (sc-)}{6}
-\entry {sendmail.el}{29}
-\entry {sendmail.el file}{12}
-\entry {setq as a substitute for add-hook}{12}
-\entry {supercite mailing list address}{32}
-\entry {supercite.el file}{31}
-\initial {T}
-\entry {toggling variables}{26}
-\initial {U}
-\entry {unciting}{24}
-\entry {undo boundary}{15}
-\initial {Y}
-\entry {yank}{1}
diff -ruN src-21.1/man/sc.fns src-21.2/man/sc.fns
--- src-21.1/man/sc.fns	Sat Oct 20 18:45:35 2001
+++ src-21.2/man/sc.fns	Thu Jan  1 01:00:00 1970
@@ -1,87 +0,0 @@
-\initial {A}
-\entry {\code {add-hook}}{12}
-\initial {C}
-\entry {\code {cite-original (sc-)}}{11, 15}
-\entry {\code {cite-region (sc-)}}{25}
-\initial {D}
-\entry {\code {defvar}}{29}
-\entry {\code {describe (sc-)}}{28}
-\initial {E}
-\entry {\code {eref-abort (sc-)}}{10}
-\entry {\code {eref-exit (sc-)}}{10}
-\entry {\code {eref-goto (sc-)}}{10}
-\entry {\code {eref-jump (sc-)}}{10}
-\entry {\code {eref-next (sc-)}}{9}
-\entry {\code {eref-prev (sc-)}}{10}
-\entry {\code {eref-setn (sc-)}}{10}
-\entry {\code {eval}}{22}
-\initial {F}
-\entry {\code {fill-paragraph}}{2}
-\initial {H}
-\entry {\code {header-attributed-writes (sc-)}}{9}
-\entry {\code {header-author-writes (sc-)}}{9}
-\entry {\code {header-inarticle-writes (sc-)}}{9}
-\entry {\code {header-on-said (sc-)}}{8}
-\entry {\code {header-regarding-adds (sc-)}}{9}
-\entry {\code {header-verbose (sc-)}}{9}
-\initial {I}
-\entry {\code {insert-citation (sc-)}}{26}
-\entry {\code {insert-reference (sc-)}}{26}
-\initial {L}
-\entry {\code {looking-at}}{22}
-\initial {M}
-\entry {\code {mail-field (sc-)}}{5, 19}
-\entry {\code {mail-field-query (sc-)}}{27}
-\entry {\code {mail-process-headers (sc-)}}{28}
-\entry {\code {mail-yank-original}}{29}
-\initial {N}
-\entry {\code {no-blank-line-or-header (sc-)}}{8}
-\entry {\code {no-header (sc-)}}{8}
-\initial {O}
-\entry {\code {open-line}}{28}
-\entry {\code {open-line (sc-)}}{28}
-\initial {P}
-\entry {\code {perform-overloads (sc-)}}{13}
-\initial {R}
-\entry {\code {recite-region (sc-)}}{25}
-\entry {\code {regi-interpret}}{22}
-\initial {S}
-\entry {\code {sc-cite-original}}{2, 11, 15}
-\entry {\code {sc-cite-region}}{25}
-\entry {\code {sc-describe}}{28}
-\entry {\code {sc-eref-abort}}{10}
-\entry {\code {sc-eref-exit}}{10}
-\entry {\code {sc-eref-goto}}{10}
-\entry {\code {sc-eref-jump}}{10}
-\entry {\code {sc-eref-next}}{9}
-\entry {\code {sc-eref-prev}}{10}
-\entry {\code {sc-eref-setn}}{10}
-\entry {\code {sc-header-attributed-writes}}{9}
-\entry {\code {sc-header-author-writes}}{9}
-\entry {\code {sc-header-inarticle-writes}}{9}
-\entry {\code {sc-header-on-said}}{8}
-\entry {\code {sc-header-regarding-adds}}{9}
-\entry {\code {sc-header-verbose}}{9}
-\entry {\code {sc-insert-citation}}{26}
-\entry {\code {sc-insert-reference}}{26}
-\entry {\code {sc-mail-field}}{5, 19}
-\entry {\code {sc-mail-field-query}}{27}
-\entry {\code {sc-mail-process-headers}}{28}
-\entry {\code {sc-no-blank-line-or-header}}{8}
-\entry {\code {sc-no-header}}{8}
-\entry {\code {sc-open-line}}{28}
-\entry {\code {sc-perform-overloads}}{13}
-\entry {\code {sc-recite-region}}{25}
-\entry {\code {sc-setup-filladapt}}{16}
-\entry {\code {sc-submit-bug-report}}{11, 28}
-\entry {\code {sc-uncite-region}}{25}
-\entry {\code {sc-version}}{28}
-\entry {\code {set-variable}}{27}
-\entry {\code {setq}}{12}
-\entry {\code {setup-filladapt (sc-)}}{16}
-\entry {\code {string-match}}{24}
-\entry {\code {submit-bug-report (sc-)}}{11, 28}
-\initial {U}
-\entry {\code {uncite-region (sc-)}}{25}
-\initial {V}
-\entry {\code {version (sc-)}}{28}
diff -ruN src-21.1/man/sc.kys src-21.2/man/sc.kys
--- src-21.1/man/sc.kys	Sat Oct 20 18:45:35 2001
+++ src-21.2/man/sc.kys	Thu Jan  1 01:00:00 1970
@@ -1,38 +0,0 @@
-\initial {C}
-\entry {\code {C-c C-p}}{15, 24}
-\entry {\code {C-c C-p ?}}{28}
-\entry {\code {C-c C-p c}}{25}
-\entry {\code {C-c C-p C-b}}{28}
-\entry {\code {C-c C-p C-p}}{17, 27}
-\entry {\code {C-c C-p C-t}}{26}
-\entry {\code {C-c C-p f}}{27}
-\entry {\code {C-c C-p g}}{28}
-\entry {\code {C-c C-p h}}{28}
-\entry {\code {C-c C-p i}}{26}
-\entry {\code {C-c C-p o}}{28}
-\entry {\code {C-c C-p r}}{25}
-\entry {\code {C-c C-p u}}{25}
-\entry {\code {C-c C-p v}}{28}
-\entry {\code {C-c C-p w}}{26}
-\entry {\code {C-c C-y}}{1}
-\entry {\code {C-j}}{10}
-\entry {\code {C-u}}{25}
-\initial {F}
-\entry {\code {f}}{1}
-\initial {G}
-\entry {\code {g}}{10}
-\initial {J}
-\entry {\code {j}}{10}
-\initial {N}
-\entry {\code {n}}{9}
-\initial {P}
-\entry {\code {p}}{10}
-\initial {Q}
-\entry {\code {q}}{10}
-\initial {R}
-\entry {\code {r}}{1}
-\entry {\code {RET}}{10}
-\initial {S}
-\entry {\code {s}}{10}
-\initial {X}
-\entry {\code {x}}{10}
diff -ruN src-21.1/man/sc.vrs src-21.2/man/sc.vrs
--- src-21.1/man/sc.vrs	Sat Oct 20 18:45:35 2001
+++ src-21.2/man/sc.vrs	Thu Jan  1 01:00:00 1970
@@ -1,116 +0,0 @@
-\initial {A}
-\entry {\code {attrib-selection-list}}{31}
-\entry {\code {attrib-selection-list (sc-)}}{18, 19}
-\entry {\code {attribs-postselect-hook (sc-)}}{20}
-\entry {\code {attribs-preselect-hook (sc-)}}{20}
-\entry {\code {auto-fill-region-p (sc-)}}{16}
-\initial {B}
-\entry {\code {blank-lines-after-headers (sc-)}}{16}
-\initial {C}
-\entry {\code {citation-delimiter (sc-)}}{4}
-\entry {\code {citation-delimiter-regexp (sc-)}}{5}
-\entry {\code {citation-leader (sc-)}}{4}
-\entry {\code {citation-leader-regexp (sc-)}}{5}
-\entry {\code {citation-nonnested-root-regexp (sc-)}}{5}
-\entry {\code {citation-root-regexp (sc-)}}{5}
-\entry {\code {citation-separator (sc-)}}{5}
-\entry {\code {citation-separator-regexp (sc-)}}{5}
-\entry {\code {cite-blank-lines-p (sc-)}}{16}
-\entry {\code {cite-region-limit}}{31}
-\entry {\code {cite-region-limit (sc-)b}}{16}
-\entry {\code {confirm-always-p}}{25}
-\entry {\code {confirm-always-p (sc-)}}{15, 20, 26}
-\initial {D}
-\entry {\code {default-attribution (sc-)}}{19}
-\entry {\code {default-author-name (sc-)}}{19}
-\entry {\code {downcase-p (sc-)}}{20}
-\initial {E}
-\entry {\code {electric-circular-p (sc-)}}{9}
-\entry {\code {electric-mode-hook (sc-)}}{10}
-\entry {\code {electric-references-p (sc-)}}{9}
-\initial {F}
-\entry {\code {fill-prefix}}{2, 17}
-\entry {\code {fixup-whitespace-p (sc-)}}{17}
-\initial {G}
-\entry {\code {gnews-ready-hook}}{13}
-\initial {H}
-\entry {\code {hyperb:version}}{14}
-\initial {L}
-\entry {\code {load-hook (sc-)}}{11, 16}
-\initial {M}
-\entry {\code {mail-citation-hook}}{11, 12, 13, 29}
-\entry {\code {mail-header-separator}}{2}
-\entry {\code {mail-warn-if-non-rfc822-p (sc-)}}{15}
-\entry {\code {mail-yank-hooks}}{13, 29}
-\entry {\code {mh-yank-from-start-of-msg}}{13}
-\entry {\code {mh-yank-hooks}}{12}
-\entry {\code {mode-map-prefix (sc-)}}{15, 24}
-\entry {\code {mumble (sc-)}}{6}
-\initial {N}
-\entry {\code {name-filter-alist (sc-)}}{20}
-\entry {\code {nested-citation-p (sc-)}}{4}
-\entry {\code {news-reply-mode-hook}}{13, 14}
-\entry {\code {nuke-mail-header-list (sc-)}}{15}
-\entry {\code {nuke-mail-headers (sc-)}}{15}
-\initial {P}
-\entry {\code {post-hook (sc-)}}{16}
-\entry {\code {pre-cite-hook (sc-)}}{25}
-\entry {\code {pre-hook (sc-)}}{11, 15}
-\entry {\code {preferred-attribution-list (sc-)}}{17}
-\entry {\code {preferred-header-style (sc-)}}{8, 26}
-\initial {R}
-\entry {\code {reference-tag-string (sc-)}}{8}
-\entry {\code {rewrite-header-list (sc-)}}{8}
-\initial {S}
-\entry {\code {sc-attrib-selection-list}}{18, 19, 31}
-\entry {\code {sc-attribs-postselect-hook}}{20}
-\entry {\code {sc-attribs-preselect-hook}}{20}
-\entry {\code {sc-auto-fill-region-p}}{16}
-\entry {\code {sc-blank-lines-after-headers}}{16}
-\entry {\code {sc-citation-delimiter}}{4}
-\entry {\code {sc-citation-delimiter-regexp}}{5}
-\entry {\code {sc-citation-leader}}{4}
-\entry {\code {sc-citation-leader-regexp}}{5}
-\entry {\code {sc-citation-nonnested-root-regexp}}{5}
-\entry {\code {sc-citation-root-regexp}}{5}
-\entry {\code {sc-citation-separator}}{5}
-\entry {\code {sc-citation-separator-regexp}}{5}
-\entry {\code {sc-cite-blank-lines-p}}{16}
-\entry {\code {sc-cite-frame-alist}}{24}
-\entry {\code {sc-cite-region-limit}}{16, 25, 31}
-\entry {\code {sc-confirm-always-p}}{15, 20, 25, 26}
-\entry {\code {sc-default-attribution}}{19}
-\entry {\code {sc-default-author-name}}{19}
-\entry {\code {sc-default-cite-frame}}{23}
-\entry {\code {sc-default-recite-frame}}{24}
-\entry {\code {sc-default-uncite-frame}}{24}
-\entry {\code {sc-downcase-p}}{20}
-\entry {\code {sc-electric-circular-p}}{9}
-\entry {\code {sc-electric-mode-hook}}{10}
-\entry {\code {sc-electric-references-p}}{9}
-\entry {\code {sc-fixup-whitespace-p}}{17}
-\entry {\code {sc-load-hook}}{11, 16}
-\entry {\code {sc-mail-field}}{24}
-\entry {\code {sc-mail-warn-if-non-rfc822-p}}{15}
-\entry {\code {sc-mode-map-prefix}}{15, 24}
-\entry {\code {sc-mumble}}{6}
-\entry {\code {sc-name-filter-alist}}{20}
-\entry {\code {sc-nested-citation-p}}{4}
-\entry {\code {sc-nuke-mail-header}}{23}
-\entry {\code {sc-nuke-mail-header-list}}{15}
-\entry {\code {sc-nuke-mail-headers}}{15}
-\entry {\code {sc-post-hook}}{16}
-\entry {\code {sc-pre-cite-hook}}{25}
-\entry {\code {sc-pre-hook}}{11, 15}
-\entry {\code {sc-preferred-attribution-list}}{17}
-\entry {\code {sc-preferred-header-style}}{8, 26}
-\entry {\code {sc-recite-frame-alist}}{24}
-\entry {\code {sc-reference-tag-string}}{8}
-\entry {\code {sc-rewrite-header-list}}{8}
-\entry {\code {sc-titlecue-regexp}}{20}
-\entry {\code {sc-uncite-frame-alist}}{24}
-\entry {\code {sc-use-only-preference-p}}{19}
-\initial {T}
-\entry {\code {titlecue-regexp (sc-)}}{20}
-\initial {U}
-\entry {\code {use-only-preference-p (sc-)}}{19}
diff -ruN src-21.1/man/search.texi src-21.2/man/search.texi
--- src-21.1/man/search.texi	Mon Aug 20 19:00:10 2001
+++ src-21.2/man/search.texi	Thu Oct 25 14:49:02 2001
@@ -720,8 +720,11 @@
 times.
 
   To enter the same regexp interactively, you would type @key{TAB} to
-enter a tab, and @kbd{C-j} to enter a newline.  You would also type
-single backslashes as themselves, instead of doubling them for Lisp syntax.
+enter a tab, and @kbd{C-j} to enter a newline.  (When typed
+interactively, @kbd{C-j} should be preceded by a @kbd{C-q}, to prevent
+Emacs from running the command bound to a newline.)  You would also type
+single backslashes as themselves, instead of doubling them for Lisp
+syntax.
 
 @ignore
 @c I commented this out because it is missing vital information
diff -ruN src-21.1/man/speedbar.aux src-21.2/man/speedbar.aux
--- src-21.1/man/speedbar.aux	Sat Oct 20 18:45:46 2001
+++ src-21.2/man/speedbar.aux	Thu Jan  1 01:00:00 1970
@@ -1,78 +0,0 @@
-'xrdef {Introduction-title}{Introduction}
-'xrdef {Introduction-pg}{2}
-'xrdef {Introduction-snt}{Chapter'tie1}
-'xrdef {Basic Navigation-title}{Basic Navigation}
-'xrdef {Basic Navigation-pg}{3}
-'xrdef {Basic Navigation-snt}{Chapter'tie2}
-'xrdef {Basic Key Bindings-title}{Basic Key Bindings}
-'xrdef {Basic Key Bindings-pg}{3}
-'xrdef {Basic Key Bindings-snt}{Section'tie2.1}
-'xrdef {Basic Visuals-title}{Basic Visuals}
-'xrdef {Basic Visuals-pg}{4}
-'xrdef {Basic Visuals-snt}{Section'tie2.2}
-'xrdef {Mouse Bindings-title}{Mouse Bindings}
-'xrdef {Mouse Bindings-pg}{5}
-'xrdef {Mouse Bindings-snt}{Section'tie2.3}
-'xrdef {Displays Submenu-title}{Displays Submenu}
-'xrdef {Displays Submenu-pg}{6}
-'xrdef {Displays Submenu-snt}{Section'tie2.4}
-'xrdef {File Mode-title}{File Mode}
-'xrdef {File Mode-pg}{7}
-'xrdef {File Mode-snt}{Chapter'tie3}
-'xrdef {Directory Display-title}{Directory Display}
-'xrdef {Directory Display-pg}{7}
-'xrdef {Directory Display-snt}{Section'tie3.1}
-'xrdef {Hidden Files-title}{Hidden Files}
-'xrdef {Hidden Files-pg}{8}
-'xrdef {Hidden Files-snt}{Section'tie3.2}
-'xrdef {File Key Bindings-title}{File Key Bindings}
-'xrdef {File Key Bindings-pg}{8}
-'xrdef {File Key Bindings-snt}{Section'tie3.3}
-'xrdef {Buffer Mode-title}{Buffer Mode}
-'xrdef {Buffer Mode-pg}{10}
-'xrdef {Buffer Mode-snt}{Chapter'tie4}
-'xrdef {Minor Modes-title}{Minor Display Modes}
-'xrdef {Minor Modes-pg}{11}
-'xrdef {Minor Modes-snt}{Chapter'tie5}
-'xrdef {RMAIL-title}{RMAIL}
-'xrdef {RMAIL-pg}{11}
-'xrdef {RMAIL-snt}{Section'tie5.1}
-'xrdef {Info-title}{Info}
-'xrdef {Info-pg}{11}
-'xrdef {Info-snt}{Section'tie5.2}
-'xrdef {GDB-title}{GDB}
-'xrdef {GDB-pg}{11}
-'xrdef {GDB-snt}{Section'tie5.3}
-'xrdef {Customizing-title}{Customizing}
-'xrdef {Customizing-pg}{12}
-'xrdef {Customizing-snt}{Chapter'tie6}
-'xrdef {Frames and Faces-title}{Frames and Faces}
-'xrdef {Frames and Faces-pg}{12}
-'xrdef {Frames and Faces-snt}{Section'tie6.1}
-'xrdef {Tag Hierarchy Methods-title}{Tag Hierarchy Methods}
-'xrdef {Tag Hierarchy Methods-pg}{13}
-'xrdef {Tag Hierarchy Methods-snt}{Section'tie6.2}
-'xrdef {Version Control-title}{Version Control}
-'xrdef {Version Control-pg}{14}
-'xrdef {Version Control-snt}{Section'tie6.3}
-'xrdef {Hooks-title}{Hooks}
-'xrdef {Hooks-pg}{14}
-'xrdef {Hooks-snt}{Section'tie6.4}
-'xrdef {Extending-title}{Extending}
-'xrdef {Extending-pg}{16}
-'xrdef {Extending-snt}{Chapter'tie7}
-'xrdef {Minor Display Modes-title}{Minor Display Modes}
-'xrdef {Minor Display Modes-pg}{16}
-'xrdef {Minor Display Modes-snt}{Section'tie7.1}
-'xrdef {Major Display Modes-title}{Major Display Modes}
-'xrdef {Major Display Modes-pg}{16}
-'xrdef {Major Display Modes-snt}{Section'tie7.2}
-'xrdef {Tagging Extensions-title}{Tagging Extensions}
-'xrdef {Tagging Extensions-pg}{18}
-'xrdef {Tagging Extensions-snt}{Section'tie7.3}
-'xrdef {Creating a display-title}{Creating a display}
-'xrdef {Creating a display-pg}{19}
-'xrdef {Creating a display-snt}{Section'tie7.4}
-'xrdef {Index-title}{Concept Index}
-'xrdef {Index-pg}{21}
-'xrdef {Index-snt}{}
diff -ruN src-21.1/man/speedbar.cps src-21.2/man/speedbar.cps
--- src-21.1/man/speedbar.cps	Sat Oct 20 18:45:46 2001
+++ src-21.2/man/speedbar.cps	Thu Jan  1 01:00:00 1970
@@ -1,102 +0,0 @@
-\initial {B}
-\entry {buffer mode}{10}
-\initial {C}
-\entry {common keys}{3}
-\entry {create major display mode}{16}
-\entry {create minor display mode}{16}
-\entry {creating a display}{19}
-\entry {customizing}{12}
-\initial {D}
-\entry {directory display}{7}
-\entry {displays submenu}{6}
-\initial {E}
-\entry {extending}{16}
-\initial {F}
-\entry {faces}{12}
-\entry {file flags}{7}
-\entry {file key bindings}{8}
-\entry {file mode}{7}
-\entry {frame parameters}{12}
-\initial {G}
-\entry {gdb}{11}
-\entry {groups}{4}
-\entry {gud}{11}
-\initial {H}
-\entry {hidden files}{8}
-\entry {hooks}{14}
-\initial {I}
-\entry {Info}{11}
-\entry {introduction}{2}
-\initial {K}
-\entry {key bindings}{3}
-\initial {M}
-\entry {minor display modes}{11}
-\entry {mode switching hotkeys}{3}
-\entry {mouse bindings}{5}
-\entry {\code {my-fetch-dynamic-tags}}{18}
-\entry {\code {my-insert-tag-list}}{18}
-\initial {N}
-\entry {navigation}{3}
-\initial {P}
-\entry {power click}{5}
-\initial {Q}
-\entry {quitting speedbar}{3}
-\initial {R}
-\entry {refresh speedbar display}{3}
-\entry {RMAIL}{11}
-\initial {S}
-\entry {scrolling in speedbar}{3}
-\entry {slowbar mode}{3}
-\entry {\code {speedbar-before-delete-hook}}{14}
-\entry {\code {speedbar-before-popup-hook}}{14}
-\entry {\code {speedbar-button-face}}{12}
-\entry {\code {speedbar-contract-line}}{17}
-\entry {\code {speedbar-create-tag-hierarchy}}{19}
-\entry {\code {speedbar-directory-face}}{12}
-\entry {\code {speedbar-directory-unshown-regexp}}{14}
-\entry {\code {speedbar-dynamic-tags-function-list}}{19}
-\entry {\code {speedbar-edit-line}}{17}
-\entry {\code {speedbar-expand-line}}{17}
-\entry {\code {speedbar-file-face}}{12}
-\entry {\code {speedbar-frame-parameters}, Emacs}{12}
-\entry {\code {speedbar-frame-plist}, XEmacs}{12}
-\entry {\code {speedbar-get-focus}}{2}
-\entry {\code {speedbar-highlight-face}}{12}
-\entry {\code {speedbar-insert-button}}{19}
-\entry {\code {speedbar-insert-generic-list}}{20}
-\entry {\code {speedbar-item-info}}{18}
-\entry {\code {speedbar-item-info-file-helper}}{18}
-\entry {\code {speedbar-item-info-tag-helper}}{18}
-\entry {\code {speedbar-line-path}}{17}
-\entry {\code {speedbar-load-hook}}{14}
-\entry {\code {speedbar-make-specialized-keymap}}{17}
-\entry {\code {speedbar-make-tag-line}}{19}
-\entry {\code {speedbar-mode-hook}}{14}
-\entry {\code {speedbar-obj-alist}}{7}
-\entry {\code {speedbar-prefix-group-tag-hierarchy}}{13}
-\entry {\code {speedbar-reconfigure-keymaps-hook}}{14}
-\entry {\code {speedbar-scanner-reset-hook}}{14}
-\entry {\code {speedbar-selected-face}}{12}
-\entry {\code {speedbar-simple-group-tag-hierarchy}}{13}
-\entry {\code {speedbar-sort-tag-hierarchy}}{13}
-\entry {\code {speedbar-tag-face}}{12}
-\entry {\code {speedbar-tag-group-name-minimum-length}}{13}
-\entry {\code {speedbar-tag-hierarchy-method}}{13}
-\entry {\code {speedbar-tag-regroup-maximum-length}}{13}
-\entry {\code {speedbar-tag-split-minimum-length}}{13}
-\entry {\code {speedbar-timer-hook}}{14}
-\entry {\code {speedbar-trim-words-tag-hierarchy}}{13}
-\entry {\code {speedbar-vc-in-control-hook}}{14}
-\entry {\code {speedbar-vc-indicator}}{14}
-\entry {\code {speedbar-vc-path-enable-hook}}{14}
-\entry {\code {speedbar-visiting-file-hook}}{14}
-\entry {\code {speedbar-visiting-tag-hook}}{14}
-\initial {T}
-\entry {tag groups}{13}
-\entry {tag hierarchy}{13}
-\entry {tag sorting}{13}
-\entry {tags}{4}
-\initial {V}
-\entry {vc extensions}{14}
-\entry {version control}{14}
-\entry {visuals}{4}
diff -ruN src-21.1/man/speedbar.vrs src-21.2/man/speedbar.vrs
--- src-21.1/man/speedbar.vrs	Sat Oct 20 18:45:46 2001
+++ src-21.2/man/speedbar.vrs	Thu Jan  1 01:00:00 1970
@@ -1,3 +0,0 @@
-\initial {S}
-\entry {\code {speedbar-generic-list-group-expand-button-type}}{20}
-\entry {\code {speedbar-generic-list-tag-button-type}}{20}
diff -ruN src-21.1/man/text.texi src-21.2/man/text.texi
--- src-21.1/man/text.texi	Thu Sep 13 17:44:28 2001
+++ src-21.2/man/text.texi	Tue Nov  6 16:47:22 2001
@@ -1811,20 +1811,22 @@
   There are two ways to alter the formatting information for a formatted
 text file: with keyboard commands, and with the mouse.
 
-  The easiest way to add properties to your document is by using the Text
+  The easiest way to add properties to your document is with the Text
 Properties menu.  You can get to this menu in two ways: from the Edit
-menu in the menu bar, or with @kbd{C-Mouse-2} (hold the @key{CTRL} key
-and press the middle mouse button).
+menu in the menu bar (use @kbd{@key{F10} e t} if you have no mouse),
+or with @kbd{C-Mouse-2} (hold the @key{CTRL} key and press the middle
+mouse button).  There are also keyboard commands described in the
+following section.
 
   Most of the items in the Text Properties menu lead to other submenus.
 These are described in the sections that follow.  Some items run
 commands directly:
 
 @table @code
-@findex facemenu-remove-props
-@item Remove Properties
+@findex facemenu-remove-face-props
+@item Remove Face Properties
 Delete from the region all the text properties that the Text Properties
-menu works with (@code{facemenu-remove-props}).
+menu works with (@code{facemenu-remove-face-props}).
 
 @findex facemenu-remove-all
 @item Remove All
@@ -1837,10 +1839,10 @@
 (@code{list-text-properties-at}).
 
 @item Display Faces
-Display a list of all the defined faces.
+Display a list of all the defined faces (@code{list-faces-display}).
 
 @item Display Colors
-Display a list of all the defined colors.
+Display a list of all the defined colors (@code{list-colors-display}).
 @end table
             
 @node Format Faces
diff -ruN src-21.1/man/vip.aux src-21.2/man/vip.aux
--- src-21.1/man/vip.aux	Sat Oct 20 18:45:36 2001
+++ src-21.2/man/vip.aux	Thu Jan  1 01:00:00 1970
@@ -1,129 +0,0 @@
-'xrdef {Survey-title}{A Survey of VIP}
-'xrdef {Survey-pg}{3}
-'xrdef {Survey-snt}{Chapter'tie1}
-'xrdef {Basic Concepts-title}{Basic Concepts}
-'xrdef {Basic Concepts-pg}{3}
-'xrdef {Basic Concepts-snt}{Section'tie1.1}
-'xrdef {Loading VIP-title}{Loading VIP}
-'xrdef {Loading VIP-pg}{3}
-'xrdef {Loading VIP-snt}{Section'tie1.2}
-'xrdef {Modes in VIP-title}{Modes in VIP}
-'xrdef {Modes in VIP-pg}{4}
-'xrdef {Modes in VIP-snt}{Section'tie1.3}
-'xrdef {Emacs Mode-title}{Emacs Mode}
-'xrdef {Emacs Mode-pg}{4}
-'xrdef {Emacs Mode-snt}{Section'tie1.3.1}
-'xrdef {Vi Mode-title}{Vi Mode}
-'xrdef {Vi Mode-pg}{4}
-'xrdef {Vi Mode-snt}{Section'tie1.3.2}
-'xrdef {Insert Mode-title}{Insert Mode}
-'xrdef {Insert Mode-pg}{5}
-'xrdef {Insert Mode-snt}{Section'tie1.3.3}
-'xrdef {Differences from Vi-title}{Differences from Vi}
-'xrdef {Differences from Vi-pg}{5}
-'xrdef {Differences from Vi-snt}{Section'tie1.4}
-'xrdef {Undoing-title}{Undoing}
-'xrdef {Undoing-pg}{5}
-'xrdef {Undoing-snt}{Section'tie1.4.1}
-'xrdef {Changing-title}{Changing}
-'xrdef {Changing-pg}{5}
-'xrdef {Changing-snt}{Section'tie1.4.2}
-'xrdef {Searching-title}{Searching}
-'xrdef {Searching-pg}{5}
-'xrdef {Searching-snt}{Section'tie1.4.3}
-'xrdef {z Command-title}{z Command}
-'xrdef {z Command-pg}{5}
-'xrdef {z Command-snt}{Section'tie1.4.4}
-'xrdef {Counts-title}{Counts}
-'xrdef {Counts-pg}{6}
-'xrdef {Counts-snt}{Section'tie1.4.5}
-'xrdef {Marking-title}{Marking}
-'xrdef {Marking-pg}{6}
-'xrdef {Marking-snt}{Section'tie1.4.6}
-'xrdef {Region Commands-title}{Region Commands}
-'xrdef {Region Commands-pg}{6}
-'xrdef {Region Commands-snt}{Section'tie1.4.7}
-'xrdef {New Commands-title}{Some New Commands}
-'xrdef {New Commands-pg}{6}
-'xrdef {New Commands-snt}{Section'tie1.4.8}
-'xrdef {New Bindings-title}{New Key Bindings}
-'xrdef {New Bindings-pg}{7}
-'xrdef {New Bindings-snt}{Section'tie1.4.9}
-'xrdef {Window Commands-title}{Window Commands}
-'xrdef {Window Commands-pg}{8}
-'xrdef {Window Commands-snt}{Section'tie1.4.10}
-'xrdef {Buffer Commands-title}{Buffer Commands}
-'xrdef {Buffer Commands-pg}{8}
-'xrdef {Buffer Commands-snt}{Section'tie1.4.11}
-'xrdef {File Commands-title}{File Commands}
-'xrdef {File Commands-pg}{9}
-'xrdef {File Commands-snt}{Section'tie1.4.12}
-'xrdef {Misc Commands-title}{Miscellaneous Commands}
-'xrdef {Misc Commands-pg}{9}
-'xrdef {Misc Commands-snt}{Section'tie1.4.13}
-'xrdef {Vi Commands-title}{Vi Commands}
-'xrdef {Vi Commands-pg}{10}
-'xrdef {Vi Commands-snt}{Chapter'tie2}
-'xrdef {Numeric Arguments-title}{Numeric Arguments}
-'xrdef {Numeric Arguments-pg}{10}
-'xrdef {Numeric Arguments-snt}{Section'tie2.1}
-'xrdef {Important Keys-title}{Important Keys}
-'xrdef {Important Keys-pg}{10}
-'xrdef {Important Keys-snt}{Section'tie2.2}
-'xrdef {Buffers and Windows-title}{Buffers and Windows}
-'xrdef {Buffers and Windows-pg}{10}
-'xrdef {Buffers and Windows-snt}{Section'tie2.3}
-'xrdef {Files-title}{Files}
-'xrdef {Files-pg}{11}
-'xrdef {Files-snt}{Section'tie2.4}
-'xrdef {Viewing the Buffer-title}{Viewing the Buffer}
-'xrdef {Viewing the Buffer-pg}{12}
-'xrdef {Viewing the Buffer-snt}{Section'tie2.5}
-'xrdef {Mark Commands-title}{Mark Commands}
-'xrdef {Mark Commands-pg}{13}
-'xrdef {Mark Commands-snt}{Section'tie2.6}
-'xrdef {Motion Commands-title}{Motion Commands}
-'xrdef {Motion Commands-pg}{14}
-'xrdef {Motion Commands-snt}{Section'tie2.7}
-'xrdef {Searching and Replacing-title}{Searching and Replacing}
-'xrdef {Searching and Replacing-pg}{16}
-'xrdef {Searching and Replacing-snt}{Section'tie2.8}
-'xrdef {Modifying Commands-title}{Modifying Commands}
-'xrdef {Modifying Commands-pg}{16}
-'xrdef {Modifying Commands-snt}{Section'tie2.9}
-'xrdef {Delete Commands-title}{Delete Commands}
-'xrdef {Delete Commands-pg}{17}
-'xrdef {Delete Commands-snt}{Section'tie2.9.1}
-'xrdef {Yank Commands-title}{Yank Commands}
-'xrdef {Yank Commands-pg}{17}
-'xrdef {Yank Commands-snt}{Section'tie2.9.2}
-'xrdef {Put Back Commands-title}{Put Back Commands}
-'xrdef {Put Back Commands-pg}{18}
-'xrdef {Put Back Commands-snt}{Section'tie2.9.3}
-'xrdef {Change Commands-title}{Change Commands}
-'xrdef {Change Commands-pg}{18}
-'xrdef {Change Commands-snt}{Section'tie2.9.4}
-'xrdef {Repeating and Undoing Modifications-title}{Repeating and Undoing Modifications}
-'xrdef {Repeating and Undoing Modifications-pg}{19}
-'xrdef {Repeating and Undoing Modifications-snt}{Section'tie2.9.5}
-'xrdef {Other Vi Commands-title}{Other Vi Commands}
-'xrdef {Other Vi Commands-pg}{19}
-'xrdef {Other Vi Commands-snt}{Section'tie2.10}
-'xrdef {Commands in Insert Mode-title}{Insert Mode}
-'xrdef {Commands in Insert Mode-pg}{20}
-'xrdef {Commands in Insert Mode-snt}{Section'tie2.11}
-'xrdef {Ex Commands-title}{Ex Commands}
-'xrdef {Ex Commands-pg}{22}
-'xrdef {Ex Commands-snt}{Chapter'tie3}
-'xrdef {Ex Command Reference-title}{Ex Command Reference}
-'xrdef {Ex Command Reference-pg}{22}
-'xrdef {Ex Command Reference-snt}{Section'tie3.1}
-'xrdef {Customization-title}{Customization}
-'xrdef {Customization-pg}{26}
-'xrdef {Customization-snt}{Chapter'tie4}
-'xrdef {Customizing Constants-title}{Customizing Constants}
-'xrdef {Customizing Constants-pg}{26}
-'xrdef {Customizing Constants-snt}{Section'tie4.1}
-'xrdef {Customizing Key Bindings-title}{Customizing Key Bindings}
-'xrdef {Customizing Key Bindings-pg}{26}
-'xrdef {Customizing Key Bindings-snt}{Section'tie4.2}
diff -ruN src-21.1/man/vip.cps src-21.2/man/vip.cps
--- src-21.1/man/vip.cps	Sat Oct 20 18:45:36 2001
+++ src-21.2/man/vip.cps	Thu Jan  1 01:00:00 1970
@@ -1,61 +0,0 @@
-\initial {A}
-\entry {address}{22}
-\initial {B}
-\entry {buffer}{3, 10}
-\entry {buffer name completion}{11}
-\initial {C}
-\entry {count}{10}
-\entry {current buffer}{10}
-\initial {D}
-\entry {default directory}{12}
-\initial {E}
-\entry {emacs mode}{4}
-\entry {end (of buffer)}{3}
-\entry {expanding (region)}{17}
-\initial {F}
-\entry {file name completion}{12}
-\entry {flag}{22}
-\initial {G}
-\entry {global keymap}{3}
-\initial {I}
-\entry {insert mode}{4}
-\initial {K}
-\entry {keymap}{3}
-\initial {L}
-\entry {line commands}{16}
-\entry {local keymap}{3, 26}
-\entry {looking at}{3}
-\initial {M}
-\entry {magic}{22}
-\entry {mark}{3}
-\entry {mark ring}{13}
-\entry {mode}{3}
-\entry {mode line}{4}
-\entry {modified (buffer)}{10}
-\initial {N}
-\entry {number register}{18}
-\entry {numeric arguments}{10}
-\initial {P}
-\entry {point}{3}
-\entry {point commands}{16}
-\initial {R}
-\entry {region}{3, 6}
-\entry {regular expression}{22}
-\entry {regular expression (replacement)}{16}
-\entry {regular expression (search)}{16}
-\initial {S}
-\entry {selected buffer}{10}
-\entry {selected tags table}{24}
-\entry {syntax table}{14}
-\initial {T}
-\entry {tag}{24}
-\entry {text}{3}
-\initial {V}
-\entry {vanilla (replacement)}{16}
-\entry {vi mode}{4}
-\entry {visiting (a file)}{12}
-\initial {W}
-\entry {window}{3, 10}
-\entry {word}{14}
-\initial {Y}
-\entry {yank}{17}
diff -ruN src-21.1/man/vip.kys src-21.2/man/vip.kys
--- src-21.1/man/vip.kys	Sat Oct 20 18:45:36 2001
+++ src-21.2/man/vip.kys	Thu Jan  1 01:00:00 1970
@@ -1,160 +0,0 @@
-\initial {0}
-\entry {\code {000 \kbd {C-@} (\code {set-mark-command})}}{20}
-\entry {\code {001 \kbd {C-a} (\code {vip-beginning-of-line})}}{6}
-\entry {\code {002 \kbd {C-b} (\code {vip-scroll-back})}}{13}
-\entry {\code {003 \kbd {C-c} (\code {vip-ctl-c})}}{6, 10}
-\entry {\code {004 \kbd {C-d} (\code {vip-scroll-up})}}{13}
-\entry {\code {005 \kbd {C-e} (\code {vip-scroll-up-one})}}{13}
-\entry {\code {006 \kbd {C-f} (\code {vip-scroll-back})}}{12}
-\entry {\code {007 \kbd {C-g} (\code {vip-keyboard-quit})}}{5, 7, 10}
-\entry {\code {010 \kbd {C-h} (\code {delete-backward-char}) (insert mode)}}{21}
-\entry {\code {010 \kbd {C-h} (\code {vip-delete-backward-char}) (insert mode)}}{5}
-\entry {\code {011 \kbd {TAB} (\code {indent-for-tab-command})}}{20}
-\entry {\code {012 \kbd {C-j} (\code {newline-and-indent})}}{20}
-\entry {\code {013 \kbd {C-k} (\code {kill-line})}}{20}
-\entry {\code {014 \kbd {C-l} (\code {recenter})}}{10, 20}
-\entry {\code {015 \kbd {RET} (\code {vip-scroll-back})}}{8, 13}
-\entry {\code {016 \kbd {C-n} (\code {vip-next-window})}}{6, 8, 11}
-\entry {\code {017 \kbd {C-o} (\code {vip-open-line-at-point})}}{6, 21}
-\entry {\code {020 \kbd {C-p} (\code {previous-line})}}{20}
-\entry {\code {021 \kbd {C-q} (\code {quoted-insert})}}{20}
-\entry {\code {022 \kbd {C-r} (\code {isearch-backward})}}{6, 16, 20}
-\entry {\code {023 \kbd {C-s} (\code {isearch-forward})}}{6, 16, 20}
-\entry {\code {024 \kbd {C-t} (\code {transpose-chars})}}{20}
-\entry {\code {025 \kbd {C-u} (\code {vip-scroll-down})}}{13}
-\entry {\code {026 \kbd {C-v} (\code {scroll-up})}}{20}
-\entry {\code {027 \kbd {C-w} (\code {kill-region})}}{20}
-\entry {\code {027 \kbd {C-w} (\code {vip-delete-backward-word}) (insert mode)}}{5, 21}
-\entry {\code {0300 \kbd {C-x} (\code {vip-ctl-x})}}{6, 10}
-\entry {\code {0301 \kbd {C-x C-z} (\code {suspend-emacs})}}{4}
-\entry {\code {031 \kbd {C-y} (\code {vip-scroll-down-one})}}{13}
-\entry {\code {032 \kbd {C-z} (\code {vip-change-mode-to-vi})}}{4}
-\entry {\code {032 \kbd {C-z} (\code {vip-ESC}) (insert mode)}}{5, 21}
-\entry {\code {033 \kbd {ESC} (\code {vip-change-mode-to-vi}) (insert mode)}}{5, 21}
-\entry {\code {033 \kbd {ESC} (\code {vip-ESC})}}{6, 10}
-\entry {\code {040 \kbd {SPC} (\code {vip-scroll})}}{8, 12}
-\entry {\code {041 \kbd {!} (\code {vip-command-argument})}}{19}
-\entry {\code {042 \kbd {"} (\code {vip-command-argument})}}{17}
-\entry {\code {0430 \kbd {#} (\code {vip-command-argument})}}{7}
-\entry {\code {0431 \kbd {# C} (\code {upcase-region})}}{7}
-\entry {\code {0432 \kbd {# c} (\code {downcase-region})}}{7}
-\entry {\code {0432 \kbd {# g} (\code {vip-global-execute})}}{7}
-\entry {\code {0432 \kbd {# q} (\code {vip-quote-region})}}{7}
-\entry {\code {0432 \kbd {# s} (\code {spell-region})}}{7}
-\entry {\code {044 \kbd {$} (\code {vip-goto-eol})}}{14}
-\entry {\code {045 \kbd {%} (\code {vip-paren-match})}}{15}
-\entry {\code {046 \kbd {&} (\code {vip-nil})}}{20}
-\entry {\code {047 \kbd {'} (\code {vip-goto-mark-and-skip-white})}}{15}
-\entry {\code {050 \kbd {(} (\code {vip-backward-sentence})}}{15}
-\entry {\code {051 \kbd {)} (\code {vip-forward-sentence})}}{15}
-\entry {\code {052 \kbd {*} (\code {vip-call-last-kbd-macro})}}{7, 9, 19}
-\entry {\code {053 \kbd {+} (\code {vip-next-line-at-bol})}}{14}
-\entry {\code {054 \kbd {,} (\code {vip-repeat-find-opposite})}}{15}
-\entry {\code {055 \kbd {-} (\code {vip-previous-line-at-bol})}}{14}
-\entry {\code {056 \kbd {.} (\code {vip-repeat})}}{5, 19}
-\entry {\code {057 \kbd {/} (\code {vip-search-forward})}}{5, 6, 16}
-\entry {\code {060 \kbd {0} (\code {vip-beginning-of-line})}}{14}
-\entry {\code {061 \kbd {1} (numeric argument)}}{10}
-\entry {\code {062 \kbd {2} (numeric argument)}}{10}
-\entry {\code {063 \kbd {3} (numeric argument)}}{10}
-\entry {\code {064 \kbd {4} (numeric argument)}}{10}
-\entry {\code {065 \kbd {5} (numeric argument)}}{10}
-\entry {\code {066 \kbd {6} (numeric argument)}}{10}
-\entry {\code {067 \kbd {7} (numeric argument)}}{10}
-\entry {\code {068 \kbd {8} (numeric argument)}}{10}
-\entry {\code {069 \kbd {9} (numeric argument)}}{10}
-\entry {\code {072 \kbd {:} (\code {vip-ex})}}{22}
-\entry {\code {073 \kbd {;} (\code {vip-repeat-find})}}{15}
-\entry {\code {074 \kbd {<} (\code {vip-command-argument})}}{19}
-\entry {\code {075 \kbd {=} (\code {vip-command-argument})}}{19}
-\entry {\code {076 \kbd {>} (\code {vip-command-argument})}}{19}
-\entry {\code {077 \kbd {?} (\code {vip-search-backward})}}{5, 6, 16}
-\initial {1}
-\entry {\code {100 \kbd {@} (\code {vip-nil})}}{20}
-\entry {\code {101 \kbd {A} (\code {vip-Append})}}{20}
-\entry {\code {102 \kbd {B} (\code {vip-backward-Word})}}{14}
-\entry {\code {103 \kbd {C} (\code {vip-ctl-c-equivalent})}}{8, 10}
-\entry {\code {104 \kbd {D} (\code {vip-kill-line})}}{17}
-\entry {\code {105 \kbd {E} (\code {vip-end-of-Word})}}{14}
-\entry {\code {106 \kbd {F} (\code {vip-find-char-backward})}}{15}
-\entry {\code {107 \kbd {G} (\code {vip-goto-line})}}{15}
-\entry {\code {110 \kbd {H} (\code {vip-window-top})}}{15}
-\entry {\code {111 \kbd {I} (\code {vip-Insert})}}{20}
-\entry {\code {112 \kbd {J} (\code {vip-join-lines})}}{19}
-\entry {\code {113 \kbd {K} (\code {vip-kill-buffer})}}{7, 8, 11}
-\entry {\code {114 \kbd {L} (\code {vip-window-bottom})}}{15}
-\entry {\code {115 \kbd {M} (\code {vip-window-middle})}}{15}
-\entry {\code {116 \kbd {N} (\code {vip-search-Next})}}{16}
-\entry {\code {117 \kbd {O} (\code {vip-Open-line})}}{6, 21}
-\entry {\code {120 \kbd {P} (\code {vip-Put-back})}}{6, 18}
-\entry {\code {121 \kbd {Q} (\code {vip-query-replace})}}{7, 16}
-\entry {\code {122 \kbd {R} (\code {vip-replace-string})}}{7, 16}
-\entry {\code {123 \kbd {S} (\code {vip-switch-to-buffer-other-window})}}{8, 11}
-\entry {\code {124 \kbd {T} (\code {vip-goto-char-backward})}}{15}
-\entry {\code {125 \kbd {U} (\code {vip-nil})}}{20}
-\entry {\code {126 \kbd {V} (\code {vip-find-file-other-window})}}{7, 9, 11}
-\entry {\code {127 \kbd {W} (\code {vip-forward-Word})}}{14}
-\entry {\code {1300 \kbd {X} (\code {vip-ctl-x-equivalent})}}{8, 10}
-\entry {\code {1301 \kbd {X (} (\code {start-kbd-macro})}}{9}
-\entry {\code {1301 \kbd {X )} (\code {end-kbd-macro})}}{9}
-\entry {\code {1301 \kbd {X 1} (\code {delete-other-windows})}}{8, 11}
-\entry {\code {1301 \kbd {X 2} (\code {split-window-vertically})}}{8, 11}
-\entry {\code {1301 \kbd {X 3} (\code {vip-buffer-in-two-windows})}}{8, 11}
-\entry {\code {1302 \kbd {X B} (\code {list-buffers})}}{11}
-\entry {\code {1302 \kbd {X I} (\code {insert-file})}}{9, 12}
-\entry {\code {1302 \kbd {X S} (\code {save-buffer})}}{9, 11}
-\entry {\code {1302 \kbd {X W} (\code {write-file})}}{9, 11}
-\entry {\code {1302 \kbd {X Z} (\code {suspend-emacs})}}{9}
-\entry {\code {131 \kbd {Y} (\code {vip-yank-line})}}{18}
-\entry {\code {132 \kbd {Z Z} (\code {save-buffers-kill-emacs})}}{19}
-\entry {\code {133 \kbd {[} (\code {vip-nil})}}{20}
-\entry {\code {134 \kbd {{\tt\rawbackslashxx }} (\code {vip-escape-to-emacs})}}{7, 10}
-\entry {\code {135 \kbd {]} (\code {vip-nil})}}{20}
-\entry {\code {136 \kbd {^} (\code {vip-bol-and-skip-white})}}{14}
-\entry {\code {137 \kbd {_} (\code {vip-nil})}}{20}
-\entry {\code {140 \kbd {`} (\code {vip-goto-mark})}}{15}
-\entry {\code {141 \kbd {a} (\code {vip-append})}}{20}
-\entry {\code {142 \kbd {b} (\code {vip-backward-word})}}{14}
-\entry {\code {1430 \kbd {c} (\code {vip-command-argument})}}{18}
-\entry {\code {1431 \kbd {c R}}}{19}
-\entry {\code {1432 \kbd {c c}}}{18}
-\entry {\code {1432 \kbd {c r}}}{19}
-\entry {\code {1440 \kbd {d} (\code {vip-command-argument})}}{17}
-\entry {\code {1441 \kbd {d R}}}{17}
-\entry {\code {1442 \kbd {d d}}}{17}
-\entry {\code {1442 \kbd {d r}}}{17}
-\entry {\code {145 \kbd {e} (\code {vip-end-of-word})}}{14}
-\entry {\code {146 \kbd {f} (\code {vip-find-char-forward})}}{15}
-\entry {\code {147 \kbd {g} (\code {vip-info-on-file})}}{7, 12}
-\entry {\code {150 \kbd {h} (\code {vip-backward-char})}}{14}
-\entry {\code {151 \kbd {i} (\code {vip-insert})}}{20}
-\entry {\code {152 \kbd {j} (\code {vip-next-line})}}{14}
-\entry {\code {153 \kbd {k} (\code {vip-previous-line})}}{14}
-\entry {\code {154 \kbd {l} (\code {vip-forward-char})}}{14}
-\entry {\code {155 \kbd {m} (\code {vip-mark-point})}}{6, 13}
-\entry {\code {156 \kbd {n} (\code {vip-search-next})}}{16}
-\entry {\code {157 \kbd {o} (\code {vip-open-line})}}{6, 20}
-\entry {\code {160 \kbd {p} (\code {vip-put-back})}}{6, 18}
-\entry {\code {161 \kbd {q} (\code {vip-nil})}}{20}
-\entry {\code {162 \kbd {r} (\code {vip-replace-char})}}{16}
-\entry {\code {163 \kbd {s} (\code {vip-switch-to-buffer})}}{8, 11}
-\entry {\code {164 \kbd {t} (\code {vip-goto-char-forward})}}{15}
-\entry {\code {165 \kbd {u} (\code {vip-undo})}}{5, 19}
-\entry {\code {166 \kbd {v} (\code {vip-find-file})}}{7, 9, 11}
-\entry {\code {167 \kbd {w} (\code {vip-forward-word})}}{14}
-\entry {\code {170 \kbd {x} (\code {vip-delete-char})}}{17}
-\entry {\code {1710 \kbd {y} (\code {vip-command-argument})}}{18}
-\entry {\code {1711 \kbd {y R}}}{18}
-\entry {\code {1712 \kbd {y r}}}{18}
-\entry {\code {1712 \kbd {y y} (\code {vip-yank-line})}}{18}
-\entry {\code {1721 \kbd {z RET} (\code {vip-line-to-top})}}{5, 13}
-\entry {\code {1722 \kbd {z -} (\code {vip-line-to-bottom})}}{5, 13}
-\entry {\code {1722 \kbd {z .} (\code {vip-line-to-middle})}}{5, 13}
-\entry {\code {1723 \kbd {z H} (\code {vip-line-to-top})}}{5, 13}
-\entry {\code {1723 \kbd {z L} (\code {vip-line-to-bottom})}}{5, 13}
-\entry {\code {1723 \kbd {z M} (\code {vip-line-to-middle})}}{5, 13}
-\entry {\code {173 \kbd {{\tt\char 123}} (\code {vip-backward-paragraph})}}{15}
-\entry {\code {174 \kbd {|} (\code {vip-goto-col})}}{14}
-\entry {\code {175 \kbd {{\tt\char 125}} (\code {vip-forward-paragraph})}}{15}
-\entry {\code {176 \kbd {~} (\code {vip-nil})}}{20}
-\entry {\code {177 \kbd {DEL} (\code {vip-delete-backward-char})}}{17}
diff -ruN src-21.1/man/viper.aux src-21.2/man/viper.aux
--- src-21.1/man/viper.aux	Sat Oct 20 18:45:38 2001
+++ src-21.2/man/viper.aux	Thu Jan  1 01:00:00 1970
@@ -1,159 +0,0 @@
-'xrdef {Overview-title}{Overview of Viper}
-'xrdef {Overview-pg}{3}
-'xrdef {Overview-snt}{Chapter'tie1}
-'xrdef {Emacs Preliminaries-title}{Emacs Preliminaries}
-'xrdef {Emacs Preliminaries-pg}{3}
-'xrdef {Emacs Preliminaries-snt}{Section'tie1.1}
-'xrdef {Loading Viper-title}{Loading Viper}
-'xrdef {Loading Viper-pg}{4}
-'xrdef {Loading Viper-snt}{Section'tie1.2}
-'xrdef {States in Viper-title}{States in Viper}
-'xrdef {States in Viper-pg}{5}
-'xrdef {States in Viper-snt}{Section'tie1.3}
-'xrdef {Emacs State-title}{Emacs State}
-'xrdef {Emacs State-pg}{7}
-'xrdef {Emacs State-snt}{Section'tie1.3.1}
-'xrdef {Vi State-title}{Vi State}
-'xrdef {Vi State-pg}{7}
-'xrdef {Vi State-snt}{Section'tie1.3.2}
-'xrdef {Insert State-title}{Insert State}
-'xrdef {Insert State-pg}{9}
-'xrdef {Insert State-snt}{Section'tie1.3.3}
-'xrdef {Replace State-title}{Replace State}
-'xrdef {Replace State-pg}{10}
-'xrdef {Replace State-snt}{Section'tie1.3.4}
-'xrdef {The Minibuffer-title}{The Minibuffer}
-'xrdef {The Minibuffer-pg}{10}
-'xrdef {The Minibuffer-snt}{Section'tie1.4}
-'xrdef {Multiple Files in Viper-title}{Multiple Files in Viper}
-'xrdef {Multiple Files in Viper-pg}{11}
-'xrdef {Multiple Files in Viper-snt}{Section'tie1.5}
-'xrdef {Unimplemented Features-title}{Unimplemented Features}
-'xrdef {Unimplemented Features-pg}{12}
-'xrdef {Unimplemented Features-snt}{Section'tie1.6}
-'xrdef {Improvements over Vi-title}{Improvements over Vi}
-'xrdef {Improvements over Vi-pg}{13}
-'xrdef {Improvements over Vi-snt}{Chapter'tie2}
-'xrdef {Basics-title}{Basics}
-'xrdef {Basics-pg}{13}
-'xrdef {Basics-snt}{Section'tie2.1}
-'xrdef {Undo and Backups-title}{Undo and Backups}
-'xrdef {Undo and Backups-pg}{13}
-'xrdef {Undo and Backups-snt}{Section'tie2.2}
-'xrdef {History-title}{History}
-'xrdef {History-pg}{14}
-'xrdef {History-snt}{Section'tie2.3}
-'xrdef {Macros and Registers-title}{Macros and Registers}
-'xrdef {Macros and Registers-pg}{14}
-'xrdef {Macros and Registers-snt}{Section'tie2.4}
-'xrdef {Completion-title}{Completion}
-'xrdef {Completion-pg}{15}
-'xrdef {Completion-snt}{Section'tie2.5}
-'xrdef {Improved Search-title}{Improved Search}
-'xrdef {Improved Search-pg}{15}
-'xrdef {Improved Search-snt}{Section'tie2.6}
-'xrdef {Abbreviation Facilities-title}{Abbreviation Facilities}
-'xrdef {Abbreviation Facilities-pg}{16}
-'xrdef {Abbreviation Facilities-snt}{Section'tie2.7}
-'xrdef {Movement and Markers-title}{Movement and Markers}
-'xrdef {Movement and Markers-pg}{16}
-'xrdef {Movement and Markers-snt}{Section'tie2.8}
-'xrdef {New Commands-title}{New Commands}
-'xrdef {New Commands-pg}{17}
-'xrdef {New Commands-snt}{Section'tie2.9}
-'xrdef {Useful Packages-title}{Useful Packages}
-'xrdef {Useful Packages-pg}{19}
-'xrdef {Useful Packages-snt}{Section'tie2.10}
-'xrdef {Customization-title}{Customization}
-'xrdef {Customization-pg}{21}
-'xrdef {Customization-snt}{Chapter'tie3}
-'xrdef {Rudimentary Changes-title}{Rudimentary Changes}
-'xrdef {Rudimentary Changes-pg}{21}
-'xrdef {Rudimentary Changes-snt}{Section'tie3.1}
-'xrdef {Key Bindings-title}{Key Bindings}
-'xrdef {Key Bindings-pg}{27}
-'xrdef {Key Bindings-snt}{Section'tie3.2}
-'xrdef {Packages that Change Keymaps-title}{Packages that Change Keymaps}
-'xrdef {Packages that Change Keymaps-pg}{30}
-'xrdef {Packages that Change Keymaps-snt}{Section'tie3.2.1}
-'xrdef {Viper Specials-title}{Viper Specials}
-'xrdef {Viper Specials-pg}{31}
-'xrdef {Viper Specials-snt}{Section'tie3.3}
-'xrdef {Vi Macros-title}{Vi Macros}
-'xrdef {Vi Macros-pg}{37}
-'xrdef {Vi Macros-snt}{Section'tie3.4}
-'xrdef {Commands-title}{Commands}
-'xrdef {Commands-pg}{42}
-'xrdef {Commands-snt}{Chapter'tie4}
-'xrdef {Groundwork-title}{Groundwork}
-'xrdef {Groundwork-pg}{42}
-'xrdef {Groundwork-snt}{Section'tie4.1}
-'xrdef {Text Handling-title}{Text Handling}
-'xrdef {Text Handling-pg}{44}
-'xrdef {Text Handling-snt}{Section'tie4.2}
-'xrdef {Move Commands-title}{Move Commands}
-'xrdef {Move Commands-pg}{44}
-'xrdef {Move Commands-snt}{Section'tie4.2.1}
-'xrdef {Marking-title}{Marking}
-'xrdef {Marking-pg}{46}
-'xrdef {Marking-snt}{Section'tie4.2.2}
-'xrdef {Appending Text-title}{Appending Text}
-'xrdef {Appending Text-pg}{47}
-'xrdef {Appending Text-snt}{Section'tie4.2.3}
-'xrdef {Editing in Insert State-title}{Editing in Insert State}
-'xrdef {Editing in Insert State-pg}{48}
-'xrdef {Editing in Insert State-snt}{Section'tie4.2.4}
-'xrdef {Deleting Text-title}{Deleting Text}
-'xrdef {Deleting Text-pg}{48}
-'xrdef {Deleting Text-snt}{Section'tie4.2.5}
-'xrdef {Changing Text-title}{Changing Text}
-'xrdef {Changing Text-pg}{49}
-'xrdef {Changing Text-snt}{Section'tie4.2.6}
-'xrdef {Search and Replace-title}{Search and Replace}
-'xrdef {Search and Replace-pg}{50}
-'xrdef {Search and Replace-snt}{Section'tie4.2.7}
-'xrdef {Yanking-title}{Yanking}
-'xrdef {Yanking-pg}{51}
-'xrdef {Yanking-snt}{Section'tie4.2.8}
-'xrdef {Undoing-title}{Undoing}
-'xrdef {Undoing-pg}{51}
-'xrdef {Undoing-snt}{Section'tie4.2.9}
-'xrdef {Display-title}{Display}
-'xrdef {Display-pg}{52}
-'xrdef {Display-snt}{Section'tie4.3}
-'xrdef {File and Buffer Handling-title}{File and Buffer Handling}
-'xrdef {File and Buffer Handling-pg}{52}
-'xrdef {File and Buffer Handling-snt}{Section'tie4.4}
-'xrdef {Mapping-title}{Mapping}
-'xrdef {Mapping-pg}{54}
-'xrdef {Mapping-snt}{Section'tie4.5}
-'xrdef {Shell Commands-title}{Shell Commands}
-'xrdef {Shell Commands-pg}{55}
-'xrdef {Shell Commands-snt}{Section'tie4.6}
-'xrdef {Options-title}{Options}
-'xrdef {Options-pg}{56}
-'xrdef {Options-snt}{Section'tie4.7}
-'xrdef {Emacs Related Commands-title}{Emacs Related Commands}
-'xrdef {Emacs Related Commands-pg}{57}
-'xrdef {Emacs Related Commands-snt}{Section'tie4.8}
-'xrdef {Mouse-bound Commands-title}{Mouse-bound Commands}
-'xrdef {Mouse-bound Commands-pg}{58}
-'xrdef {Mouse-bound Commands-snt}{Section'tie4.9}
-'xrdef {Acknowledgments-title}{Acknowledgments}
-'xrdef {Acknowledgments-pg}{59}
-'xrdef {Acknowledgments-snt}{}
-'xrdef {Key Index-title}{Key Index}
-'xrdef {Key Index-pg}{61}
-'xrdef {Key Index-snt}{}
-'xrdef {Function Index-title}{Function Index}
-'xrdef {Function Index-pg}{65}
-'xrdef {Function Index-snt}{}
-'xrdef {Variable Index-title}{Variable Index}
-'xrdef {Variable Index-pg}{67}
-'xrdef {Variable Index-snt}{}
-'xrdef {Package Index-title}{Package Index}
-'xrdef {Package Index-pg}{68}
-'xrdef {Package Index-snt}{}
-'xrdef {Concept Index-title}{Concept Index}
-'xrdef {Concept Index-pg}{69}
-'xrdef {Concept Index-snt}{}
diff -ruN src-21.1/man/viper.cps src-21.2/man/viper.cps
--- src-21.1/man/viper.cps	Sat Oct 20 18:45:38 2001
+++ src-21.2/man/viper.cps	Thu Jan  1 01:00:00 1970
@@ -1,180 +0,0 @@
-\initial {#}
-\entry {# (Previous file)}{43}
-\entry {\samp {#} (Previous file)}{55}
-\initial {%}
-\entry {% (Current file)}{43, 55}
-\entry {% (Ex address)}{42}
-\entry {\samp {%} (Ex address)}{55}
-\initial {.}
-\entry {.emacs}{21}
-\entry {.viper}{21}
-\initial {{\tt\less}}
-\entry {<a-z>}{42}
-\entry {<address>}{42}
-\entry {<args>}{43}
-\entry {<cmd>}{43}
-\entry {<cr>}{43}
-\entry {<esc>}{43}
-\entry {<ht>}{43}
-\entry {<lf>}{43}
-\entry {<move>}{42}
-\entry {<sp>}{43}
-\initial {A}
-\entry {abbrevs}{16}
-\entry {absolute file names}{12}
-\entry {appending}{47}
-\entry {auto fill}{57}
-\entry {auto save}{13}
-\entry {autoindent}{56}
-\initial {B}
-\entry {backup files}{13, 51}
-\entry {buffer}{3}
-\entry {buffer (modified)}{4}
-\entry {buffer information}{4}
-\entry {buffer search}{15}
-\initial {C}
-\entry {C-c and Viper}{30}
-\entry {case and searching}{56}
-\entry {case-insensitive search}{8, 19, 46}
-\entry {case-sensitive search}{8, 19, 46}
-\entry {changing case}{17, 49}
-\entry {changing tab width}{57}
-\entry {char}{43}
-\entry {CHAR}{43}
-\entry {column movement}{44}
-\entry {Command history}{19}
-\entry {command line}{4}
-\entry {Command ring}{19}
-\entry {compiling}{19}
-\entry {completion}{15}
-\entry {Control keys}{4}
-\entry {customization}{21}
-\entry {cut and paste}{51}
-\initial {D}
-\entry {describing regions}{13}
-\entry {desktop}{20}
-\entry {Destructive command history}{33}
-\entry {Destructive command ring}{33}
-\entry {dired}{20}
-\entry {dynamic abbrevs}{16}
-\initial {E}
-\entry {ediff}{20}
-\entry {Emacs state}{5, 7}
-\entry {email}{20}
-\entry {end (of buffer)}{3}
-\entry {end (of line)}{3}
-\entry {Ex addresses}{42}
-\entry {Ex commands}{5, 8, 44}
-\entry {Ex style motion}{16}
-\entry {expanding (region)}{13}
-\initial {F}
-\entry {font-lock}{20}
-\initial {G}
-\entry {global keymap}{4}
-\initial {H}
-\entry {headings}{33, 44}
-\entry {history}{14}
-\initial {I}
-\entry {incremental search}{15}
-\entry {initialization}{21}
-\entry {Insert state}{5, 9, 48}
-\entry {inserting}{47}
-\entry {Insertion history}{19}
-\entry {Insertion ring}{19, 33}
-\entry {interactive shell}{19}
-\entry {ispell}{20}
-\initial {J}
-\entry {joining lines}{49}
-\initial {K}
-\entry {key bindings}{27, 54}
-\entry {key mapping}{54}
-\entry {keyboard macros}{14, 18}
-\entry {keymap}{4}
-\entry {keymaps}{27}
-\initial {L}
-\entry {last keyboard macro}{15}
-\entry {layout}{57}
-\entry {line commands}{13, 42}
-\entry {line editor motion}{16}
-\entry {literal searching}{56}
-\entry {local keymap}{4}
-\entry {looking at}{3}
-\initial {M}
-\entry {macros}{14}
-\entry {mail}{20}
-\entry {major mode}{4}
-\entry {make}{19}
-\entry {managing multiple files}{11}
-\entry {mark}{3}
-\entry {markers}{11, 14, 44}
-\entry {marking}{46}
-\entry {matching parens}{44, 57}
-\entry {Meta key}{4, 7, 10}
-\entry {Minibuffer}{4, 10, 14}
-\entry {minor mode}{4}
-\entry {mode}{4}
-\entry {mode line}{4, 6}
-\entry {mouse}{35}
-\entry {mouse search}{15}
-\entry {mouse-insert}{36}
-\entry {mouse-search}{35}
-\entry {movement commands}{13, 44}
-\entry {movements}{42}
-\entry {Multifile documents and programs}{34}
-\entry {multiple files}{11, 52}
-\entry {multiple undo}{8}
-\initial {P}
-\entry {paragraphs}{33, 44}
-\entry {paren matching}{44, 57}
-\entry {paste}{47, 51}
-\entry {point}{3}
-\entry {point commands}{13, 42}
-\entry {put}{47}
-\initial {Q}
-\entry {query replace}{15, 17}
-\entry {quoting regions}{49}
-\initial {R}
-\entry {r and R region specifiers}{13, 42}
-\entry {RCS}{20}
-\entry {readonly files}{56}
-\entry {region}{3, 13}
-\entry {region specification}{13}
-\entry {register execution}{14, 18}
-\entry {registers}{11, 14}
-\entry {regular expressions}{8}
-\entry {Replace state}{5, 10}
-\initial {S}
-\entry {scrolling}{52}
-\entry {searching}{44, 57}
-\entry {sections}{33, 44}
-\entry {sentences}{33, 44}
-\entry {setting variables}{21}
-\entry {shell}{19, 57}
-\entry {shell commands}{55}
-\entry {shifting text}{48, 57}
-\entry {substitution}{49}
-\entry {syntax table}{16, 44}
-\initial {T}
-\entry {tabbing}{57}
-\entry {text}{3}
-\entry {text processing}{50}
-\entry {textmarkers}{11, 14, 17, 44}
-\entry {transparent ftp}{20}
-\initial {U}
-\entry {undo}{8, 13, 51}
-\initial {V}
-\entry {vanilla search}{8, 19, 46}
-\entry {variables for customization}{21}
-\entry {version maintenance}{20}
-\entry {Vi macros}{37}
-\entry {Vi options}{56}
-\entry {Vi state}{5, 7}
-\entry {viewing registers and markers}{14}
-\entry {Viper and C-c}{30}
-\entry {Viper as minor mode}{4}
-\initial {W}
-\entry {window}{4}
-\entry {word search}{15}
-\entry {word wrap}{57}
-\entry {words}{43}
-\entry {WORDS}{43}
diff -ruN src-21.1/man/viper.fns src-21.2/man/viper.fns
--- src-21.1/man/viper.fns	Sat Oct 20 18:45:38 2001
+++ src-21.2/man/viper.fns	Thu Jan  1 01:00:00 1970
@@ -1,117 +0,0 @@
-\initial {!}
-\entry {\code {\kbd {!!<cmd>}}}{56}
-\entry {\code {\kbd {!<cmd>}}}{56}
-\entry {\code {\kbd {!<move><cmd>}}}{56}
-\initial {:}
-\entry {\code {\kbd {:!!\spacefactor =1000  <args>}}}{56}
-\entry {\code {\kbd {:!<cmd>}}}{56}
-\entry {\code {\kbd {:<address>r !<cmd>}}}{56}
-\entry {\code {\kbd {:<address>r <name>}}}{56}
-\entry {\code {\kbd {:args}}}{19, 54}
-\entry {\code {\kbd {:cd [<dir>]}}}{54}
-\entry {\code {\kbd {:copy [z]}}}{50}
-\entry {\code {\kbd {:e [<files>]}}}{54}
-\entry {\code {\kbd {:e!}}}{51}
-\entry {\code {\kbd {:e!\spacefactor =1000  [<files>]}}}{54}
-\entry {\code {\kbd {:edit [<files>]}}}{54}
-\entry {\code {\kbd {:edit!\spacefactor =1000  [<files>]}}}{54}
-\entry {\code {\kbd {:f}}}{54}
-\entry {\code {\kbd {:g}}}{51}
-\entry {\code {\kbd {:global}}}{51}
-\entry {\code {\kbd {:k}}}{47}
-\entry {\code {\kbd {:make}}}{56}
-\entry {\code {\kbd {:map}}}{29}
-\entry {\code {\kbd {:map <char> <seq>}}}{55}
-\entry {\code {\kbd {:map!\spacefactor =1000  <char> <seq>}}}{55}
-\entry {\code {\kbd {:mark}}}{47}
-\entry {\code {\kbd {:move [z]}}}{50}
-\entry {\code {\kbd {:n}}}{19}
-\entry {\code {\kbd {:n [<count> | <file>]}}}{54}
-\entry {\code {\kbd {:pre}}}{19, 54}
-\entry {\code {\kbd {:PreviousRelatedFile}}}{19, 35}
-\entry {\code {\kbd {:pwd}}}{19, 54}
-\entry {\code {\kbd {:q}}}{54}
-\entry {\code {\kbd {:q!}}}{51, 54}
-\entry {\code {\kbd {:quit}}}{54}
-\entry {\code {\kbd {:quit!}}}{54}
-\entry {\code {\kbd {:r}}}{54}
-\entry {\code {\kbd {:read}}}{54}
-\entry {\code {\kbd {:rec}}}{51, 54}
-\entry {\code {\kbd {:RelatedFile}}}{19, 35}
-\entry {\code {\kbd {:rew}}}{54}
-\entry {\code {\kbd {:s/<pat>/<repl>/<f>}}}{50}
-\entry {\code {\kbd {:set}}}{21}
-\entry {\code {\kbd {:set <option>}}}{57}
-\entry {\code {\kbd {:set <option>=<value>}}}{57}
-\entry {\code {\kbd {:set ai}}}{57}
-\entry {\code {\kbd {:set autoindent}}}{57}
-\entry {\code {\kbd {:set ic}}}{57}
-\entry {\code {\kbd {:set ignorecase}}}{57}
-\entry {\code {\kbd {:set magic}}}{57}
-\entry {\code {\kbd {:set no<option>}}}{57}
-\entry {\code {\kbd {:set readonly}}}{57}
-\entry {\code {\kbd {:set ro}}}{57}
-\entry {\code {\kbd {:set sh=<string>}}}{57}
-\entry {\code {\kbd {:set shell=<string>}}}{57}
-\entry {\code {\kbd {:set shiftwidth=<count>}}}{57}
-\entry {\code {\kbd {:set showmatch}}}{57}
-\entry {\code {\kbd {:set sm}}}{57}
-\entry {\code {\kbd {:set sw=<count>}}}{57}
-\entry {\code {\kbd {:set tab-stop-local=<count>}}}{57}
-\entry {\code {\kbd {:set tabstop=<count>}}}{57}
-\entry {\code {\kbd {:set ts=<count>}}}{57}
-\entry {\code {\kbd {:set wm=<count>}}}{57}
-\entry {\code {\kbd {:set wrapmargin=<count>}}}{57}
-\entry {\code {\kbd {:set wrapscan}}}{57}
-\entry {\code {\kbd {:set ws}}}{57}
-\entry {\code {\kbd {:sh}}}{56}
-\entry {\code {\kbd {:stop}}}{54}
-\entry {\code {\kbd {:substitute/<pat>/<repl>/<f>}}}{50, 51}
-\entry {\code {\kbd {:suspend}}}{54}
-\entry {\code {\kbd {:t [z]}}}{50}
-\entry {\code {\kbd {:tag <name>}}}{51}
-\entry {\code {\kbd {:unmap <char>}}}{55}
-\entry {\code {\kbd {:unmap!\spacefactor =1000  <char>}}}{55}
-\entry {\code {\kbd {:v}}}{51}
-\entry {\code {\kbd {:vglobal}}}{51}
-\entry {\code {\kbd {:W}}}{54}
-\entry {\code {\kbd {:w !<cmd>}}}{56}
-\entry {\code {\kbd {:w >> <file>}}}{54}
-\entry {\code {\kbd {:w <file>}}}{54}
-\entry {\code {\kbd {:w!\spacefactor =1000  <file>}}}{54}
-\entry {\code {\kbd {:wq}}}{54}
-\entry {\code {\kbd {:Write}}}{54}
-\entry {\code {\kbd {:write >> <file>}}}{54}
-\entry {\code {\kbd {:write <file>}}}{54}
-\entry {\code {\kbd {:write!\spacefactor =1000  <file>}}}{54}
-\entry {\code {\kbd {:WW}}}{54}
-\entry {\code {\kbd {:WWrite}}}{54}
-\entry {\code {\kbd {:x}}}{54}
-\entry {\code {\kbd {:x!}}}{54}
-\entry {\code {\kbd {:x,y w !<cmd>}}}{56}
-\entry {\code {\kbd {:yank}}}{51}
-\initial {A}
-\entry {\code {\code {add-hook}}}{31}
-\initial {R}
-\entry {\code {\code {remove-hook}}}{31}
-\initial {T}
-\entry {\code {\code {toggle-viper-mode}}}{5, 34}
-\initial {V}
-\entry {\code {\code {viper-add-local-keys}}}{30}
-\entry {\code {\code {viper-buffer-search-enable}}}{32}
-\entry {\code {\code {viper-describe-kbd-macros}}}{41}
-\entry {\code {\code {viper-glob-function}}}{24}
-\entry {\code {\code {viper-go-away}}}{5, 34}
-\entry {\code {\code {viper-harness-minor-mode}}}{31}
-\entry {\code {\code {viper-mode}}}{31}
-\entry {\code {\code {viper-modify-major-mode}}}{28}
-\entry {\code {\code {viper-mouse-click-insert-word}}}{36}
-\entry {\code {\code {viper-mouse-click-search-word}}}{36}
-\entry {\code {\code {viper-set-emacs-state-searchstyle-macros}}}{32}
-\entry {\code {\code {viper-set-expert-level}}}{33}
-\entry {\code {\code {viper-set-hooks}}}{31}
-\entry {\code {\code {viper-set-parsing-style-toggling-macro}}}{46}
-\entry {\code {\code {viper-set-searchstyle-toggling-macros}}}{32}
-\entry {\code {\code {viper-set-syntax-preference}}}{17, 44}
-\entry {\code {\code {viper-unrecord-kbd-macro}}}{39}
-\entry {\code {\code {viper-zap-local-keys}}}{30}
diff -ruN src-21.1/man/viper.kys src-21.2/man/viper.kys
--- src-21.1/man/viper.kys	Sat Oct 20 18:45:38 2001
+++ src-21.2/man/viper.kys	Thu Jan  1 01:00:00 1970
@@ -1,219 +0,0 @@
-\initial {#}
-\entry {\code {\kbd {#}}}{17}
-\entry {\code {\kbd {#c<move>}}}{17, 50}
-\entry {\code {\kbd {#C<move>}}}{18, 50}
-\entry {\code {\kbd {#g<move>}}}{18, 51, 55}
-\entry {\code {\kbd {#q<move>}}}{18}
-\entry {\code {\kbd {#q<move> }}}{50}
-\entry {\code {\kbd {#s<move>}}}{18}
-\initial {$}
-\entry {\code {\kbd {$}}}{46}
-\initial {%}
-\entry {\code {\kbd {%}}}{46, 51}
-\initial {&}
-\entry {\code {\kbd {&}}}{50, 51}
-\initial {'}
-\entry {\code {\kbd {''}}}{46, 47}
-\entry {\code {\kbd {'<a-z>}}}{46, 47}
-\initial {(}
-\entry {\code {\kbd {(}}}{46}
-\initial {)}
-\entry {\code {\kbd {)}}}{46}
-\initial {*}
-\entry {\code {\kbd {*}}}{18, 55}
-\initial {,}
-\entry {\code {\kbd {,}}}{46}
-\initial {-}
-\entry {\code {\kbd {-}}}{46}
-\initial {.}
-\entry {\code {\kbd {.}}}{48, 51}
-\initial {/}
-\entry {\code {\kbd {/<cr>}}}{46}
-\entry {\code {\kbd {/<string>}}}{46, 51}
-\initial {;}
-\entry {\code {\kbd {;}}}{46}
-\initial {=}
-\entry {\code {\kbd {=<move>}}}{50}
-\initial {?}
-\entry {\code {\kbd {?<cr>}}}{46}
-\entry {\code {\kbd {?<string>}}}{46, 51}
-\initial {@}
-\entry {\code {\kbd {@!}}}{18}
-\entry {\code {\kbd {@!<a-z>}}}{55}
-\entry {\code {\kbd {@#}}}{18, 55}
-\entry {\code {\kbd {@@}}}{55}
-\entry {\code {\kbd {@<a-z>}}}{18, 55}
-\initial {[}
-\entry {\code {\kbd {[[}}}{46}
-\entry {\code {\kbd {[]}}}{18, 46}
-\entry {\code {\kbd {[<a-z>}}}{18, 46, 48, 51, 55}
-\initial {]}
-\entry {\code {\kbd {]]}}}{46}
-\entry {\code {\kbd {]<a-z>}}}{18, 46, 48, 51, 55}
-\initial {`}
-\entry {\code {\kbd {``}}}{46, 47}
-\entry {\code {\kbd {`<a-z>}}}{46, 47}
-\initial {{\tt\char 123}}
-\entry {\code {\kbd {{\tt\char 123}}}}{46}
-\initial {{\tt\char 124}}
-\entry {\code {\kbd {|}}}{46}
-\initial {{\tt\char 125}}
-\entry {\code {\kbd {{\tt\char 125}}}}{46}
-\initial {{\tt\char 126}}
-\entry {\code {\kbd {~}}}{50}
-\initial {{\tt\char 34}}
-\entry {\code {\kbd {"<a-z>y<move>}}}{51}
-\entry {\code {\kbd {"<A-Z>y<move>}}}{51}
-\entry {\code {\kbd {"<a-z1-9>p}}}{48, 51}
-\entry {\code {\kbd {"<a-z1-9>P}}}{48, 51}
-\initial {{\tt\char 43}}
-\entry {\code {\kbd {+}}}{46}
-\initial {{\tt\gtr}}
-\entry {\code {\kbd {>>}}}{48}
-\entry {\code {\kbd {><move>}}}{48}
-\initial {{\tt\hat}}
-\entry {\code {\kbd {^}}}{46}
-\initial {{\tt\indexbackslash }}
-\entry {\code {\kbd {{\tt\rawbackslashxx }}}}{17}
-\entry {\code {\kbd {{\tt\rawbackslashxx }&}}}{50}
-\initial {{\tt\less}}
-\entry {\code {\kbd {<<}}}{48}
-\entry {\code {\kbd {<<move>}}}{48}
-\entry {\code {<a-z>}}{42}
-\entry {\code {<address>}}{42}
-\entry {\code {<args>}}{43}
-\entry {\code {<cmd>}}{43}
-\entry {\code {\kbd {<cr>}}}{46}
-\entry {\code {\kbd {<lf>}}}{46}
-\entry {\code {<move>}}{42}
-\entry {\code {\kbd {<sp>}}}{46}
-\initial {0}
-\entry {\code {\kbd {0}}}{46}
-\initial {A}
-\entry {\code {\kbd {a}}}{48}
-\entry {\code {\kbd {A}}}{48}
-\initial {B}
-\entry {\code {\kbd {b}}}{46}
-\entry {\code {\kbd {B}}}{46}
-\initial {C}
-\entry {\code {\kbd {C}}}{50}
-\entry {\code {\kbd {C-]}}}{7, 18}
-\entry {\code {\kbd {C-^}}}{54}
-\entry {\code {\kbd {C-{\tt\rawbackslashxx }}}}{7, 58}
-\entry {\code {\kbd {C-b}}}{52}
-\entry {\code {\kbd {C-c}}}{7, 17}
-\entry {\code {\kbd {C-c /}}}{8, 18, 46}
-\entry {\code {\kbd {C-c C-g}}}{18}
-\entry {\code {\kbd {C-c M-n}}}{19, 48, 50}
-\entry {\code {\kbd {C-c M-p}}}{19, 48, 50}
-\entry {\code {\kbd {C-c{\tt\rawbackslashxx }}}}{58}
-\entry {\code {\kbd {C-d}}}{52}
-\entry {\code {\kbd {C-e}}}{52}
-\entry {\code {\kbd {C-f}}}{52}
-\entry {\code {\kbd {C-g}}}{7, 18, 52}
-\entry {\code {\kbd {C-h}}}{46}
-\entry {\code {\kbd {C-l}}}{52}
-\entry {\code {\kbd {C-n}}}{46}
-\entry {\code {\kbd {C-p}}}{46}
-\entry {\code {\kbd {C-u}}}{48, 52}
-\entry {\code {\kbd {C-v}}}{17, 48}
-\entry {\code {\kbd {C-w}}}{48}
-\entry {\code {\kbd {C-x}}}{7, 17}
-\entry {\code {\kbd {C-x0}}}{58}
-\entry {\code {\kbd {C-x1}}}{58}
-\entry {\code {\kbd {C-x2}}}{58}
-\entry {\code {\kbd {C-xC-f}}}{58}
-\entry {\code {\kbd {C-xo}}}{58}
-\entry {\code {\kbd {C-y}}}{52, 58}
-\entry {\code {\kbd {C-z}}}{5, 7, 58}
-\entry {\code {\kbd {c<move>}}}{50}
-\entry {\code {\kbd {cc}}}{50}
-\initial {D}
-\entry {\code {\kbd {D}}}{48}
-\entry {\code {\kbd {d<move>}}}{48}
-\entry {\code {\kbd {dd}}}{48}
-\initial {E}
-\entry {\code {\kbd {e}}}{46}
-\entry {\code {\kbd {E}}}{46}
-\entry {\code {\key {ESC}}}{5}
-\initial {F}
-\entry {\code {\kbd {f<char>}}}{46}
-\entry {\code {\kbd {F<char>}}}{46}
-\initial {G}
-\entry {\code {\kbd {G}}}{46}
-\entry {\code {\kbd {g<move>}}}{51}
-\initial {H}
-\entry {\code {\kbd {h}}}{46}
-\entry {\code {\kbd {H}}}{46}
-\initial {I}
-\entry {\code {\kbd {i}}}{5, 48}
-\initial {J}
-\entry {\code {\kbd {j}}}{46}
-\entry {\code {\kbd {J}}}{50}
-\initial {K}
-\entry {\code {\kbd {k}}}{46}
-\initial {L}
-\entry {\code {\kbd {l}}}{46}
-\entry {\code {\kbd {L}}}{46}
-\initial {M}
-\entry {\code {\kbd {M}}}{46}
-\entry {\code {\kbd {m,}}}{47}
-\entry {\code {\kbd {M-n}}}{19}
-\entry {\code {\kbd {M-p}}}{19}
-\entry {\code {\kbd {M-y}}}{58}
-\entry {\code {\kbd {m.}}}{47}
-\entry {\code {\kbd {m>}}}{47}
-\entry {\code {\kbd {m^}}}{47}
-\entry {\code {\kbd {m<}}}{47}
-\entry {\code {\kbd {m<a-z>}}}{46, 47, 51}
-\entry {\code {\kbd {meta button1up}}}{58}
-\entry {\code {\kbd {meta button2up}}}{58}
-\entry {\code {\kbd {meta shift button1up}}}{36}
-\entry {\code {\kbd {meta shift button2up}}}{36}
-\initial {N}
-\entry {\code {\kbd {n}}}{46, 51}
-\entry {\code {\kbd {N}}}{46, 51}
-\initial {O}
-\entry {\code {\kbd {o}}}{48}
-\entry {\code {\kbd {O}}}{48}
-\initial {P}
-\entry {\code {\kbd {p}}}{48, 51}
-\entry {\code {\kbd {P}}}{48, 51}
-\initial {Q}
-\entry {\code {\kbd {Q}}}{17, 51}
-\initial {R}
-\entry {\code {\kbd {R}}}{50}
-\entry {\code {\kbd {r<char>}}}{50}
-\initial {S}
-\entry {\code {\kbd {s}}}{50}
-\entry {\code {\kbd {S}}}{50}
-\entry {\code {\kbd {S-Mouse-1}}}{36, 58}
-\entry {\code {\kbd {S-Mouse-2}}}{36, 58}
-\initial {T}
-\entry {\code {\kbd {t<char>}}}{46}
-\entry {\code {\kbd {T<char>}}}{46}
-\initial {U}
-\entry {\code {\kbd {u}}}{8, 51}
-\entry {\code {\kbd {U}}}{51}
-\initial {V}
-\entry {\code {\kbd {v}}}{17, 54}
-\entry {\code {\kbd {V}}}{17, 54}
-\initial {W}
-\entry {\code {\kbd {w}}}{46}
-\entry {\code {\kbd {W}}}{46}
-\initial {X}
-\entry {\code {\kbd {x}}}{48}
-\entry {\code {\kbd {X}}}{48}
-\initial {Y}
-\entry {\code {\kbd {Y}}}{51}
-\entry {\code {\kbd {y<move>}}}{51}
-\entry {\code {\kbd {yank}}}{51}
-\entry {\code {\kbd {yy}}}{51}
-\initial {Z}
-\entry {\code {\kbd {z-}}}{52}
-\entry {\code {\kbd {z.}}}{52}
-\entry {\code {\kbd {z<cr>}}}{52}
-\entry {\code {\kbd {zH}}}{52}
-\entry {\code {\kbd {zL}}}{52}
-\entry {\code {\kbd {zM}}}{52}
-\entry {\code {\kbd {ZZ}}}{54}
diff -ruN src-21.1/man/viper.vrs src-21.2/man/viper.vrs
--- src-21.1/man/viper.vrs	Sat Oct 20 18:45:38 2001
+++ src-21.2/man/viper.vrs	Thu Jan  1 01:00:00 1970
@@ -1,65 +0,0 @@
-\initial {B}
-\entry {\code {\code {buffer-read-only}}}{27}
-\initial {E}
-\entry {\code {\code {ex-cycle-other-window}}}{27}
-\entry {\code {\code {ex-cycle-through-non-files}}}{27}
-\initial {F}
-\entry {\code {\code {function-key-map}}}{30}
-\initial {V}
-\entry {\code {\code {viper-allow-multiline-replace-regions}}}{27}
-\entry {\code {\code {viper-always}}}{27, 31}
-\entry {\code {\code {viper-auto-indent}}}{27}
-\entry {\code {\code {viper-buffer-search-char}}}{27, 32}
-\entry {\code {\code {viper-case-fold-search}}}{27}
-\entry {\code {\code {viper-command-ring-size}}}{33}
-\entry {\code {\code {viper-custom-file-name}}}{27}
-\entry {\code {\code {viper-delete-backwards-in-replace}}}{27}
-\entry {\code {\code {viper-dired-modifier-map}}}{32}
-\entry {\code {\code {viper-electric-mode}}}{27}
-\entry {\code {\code {viper-emacs-global-user-map}}}{30}
-\entry {\code {\code {viper-emacs-state-hook}}}{27}
-\entry {\code {\code {viper-emacs-state-mode-list}}}{31}
-\entry {\code {\code {viper-ESC-key}}}{27}
-\entry {\code {\code {viper-ESC-keyseq-timeout}}}{27}
-\entry {\code {\code {viper-ESC-moves-cursor-back}}}{27}
-\entry {\code {\code {viper-ex-style-editing}}}{27}
-\entry {\code {\code {viper-ex-style-motion}}}{27}
-\entry {\code {\code {viper-fast-keyseq-timeout}}}{27}
-\entry {\code {\code {viper-insert-global-user-map}}}{30}
-\entry {\code {\code {viper-insert-state-cursor-color}}}{26}
-\entry {\code {\code {viper-insert-state-hook}}}{27}
-\entry {\code {\code {viper-insert-state-mode-list}}}{31}
-\entry {\code {\code {viper-insertion-ring-size}}}{33}
-\entry {\code {\code {viper-keep-point-on-repeat}}}{27}
-\entry {\code {\code {viper-keep-point-on-undo}}}{27}
-\entry {\code {\code {viper-major-mode-modifier-list}}}{29}
-\entry {\code {\code {viper-mouse-insert-key}}}{35, 36}
-\entry {\code {\code {viper-multiclick-timeout}}}{36}
-\entry {\code {\code {viper-no-multiple-ESC}}}{27}
-\entry {\code {\code {viper-parse-sexp-ignore-comments}}}{46}
-\entry {\code {\code {viper-re-query-replace}}}{27}
-\entry {\code {\code {viper-re-search}}}{27}
-\entry {\code {\var {viper-read-buffer-function}}}{54}
-\entry {\code {\code {viper-replace-overlay-cursor-color}}}{26}
-\entry {\code {\code {viper-replace-overlay-face}}}{27}
-\entry {\code {\code {viper-replace-region-end-symbol}}}{27}
-\entry {\code {\code {viper-replace-region-start-symbol}}}{27}
-\entry {\code {\code {viper-replace-state-hook}}}{27}
-\entry {\code {\code {viper-search-face}}}{15, 27}
-\entry {\code {\code {viper-search-scroll-threshold}}}{27}
-\entry {\code {\code {viper-search-wrap-around}}}{27}
-\entry {\code {\code {viper-shift-width}}}{27}
-\entry {\code {\code {viper-slash-and-colon-map}}}{32}
-\entry {\code {\code {viper-smart-suffix-list}}}{33}
-\entry {\code {\code {viper-spell-function}}}{18, 27}
-\entry {\code {\code {viper-surrounding-word-function}}}{27}
-\entry {\code {\code {viper-syntax-preference}}}{16, 44}
-\entry {\code {\code {viper-tags-file-name}}}{27}
-\entry {\code {\code {viper-toggle-key}}}{27}
-\entry {\code {\code {viper-vi-global-user-map}}}{30}
-\entry {\code {\code {viper-vi-state-hook}}}{27}
-\entry {\code {\code {viper-vi-state-mode-list}}}{31}
-\entry {\code {\code {viper-vi-style-in-minibuffer}}}{27}
-\entry {\code {\code {viper-want-ctl-h-help}}}{27}
-\entry {\code {\code {viper-want-emacs-keys-in-insert}}}{27, 31}
-\entry {\code {\code {viper-want-emacs-keys-in-vi}}}{27, 31}
diff -ruN src-21.1/man/widget.aux src-21.2/man/widget.aux
--- src-21.1/man/widget.aux	Sat Oct 20 18:45:39 2001
+++ src-21.2/man/widget.aux	Thu Jan  1 01:00:00 1970
@@ -1,99 +0,0 @@
-'xrdef {Top-title}{The Emacs Widget Library}
-'xrdef {Top-pg}{1}
-'xrdef {Top-snt}{}
-'xrdef {Introduction-title}{Introduction}
-'xrdef {Introduction-pg}{1}
-'xrdef {Introduction-snt}{}
-'xrdef {User Interface-title}{User Interface}
-'xrdef {User Interface-pg}{2}
-'xrdef {User Interface-snt}{}
-'xrdef {Programming Example-title}{Programming Example}
-'xrdef {Programming Example-pg}{4}
-'xrdef {Programming Example-snt}{}
-'xrdef {Setting Up the Buffer-title}{Setting Up the Buffer}
-'xrdef {Setting Up the Buffer-pg}{6}
-'xrdef {Setting Up the Buffer-snt}{}
-'xrdef {Basic Types-title}{Basic Types}
-'xrdef {Basic Types-pg}{7}
-'xrdef {Basic Types-snt}{}
-'xrdef {link-title}{The \code {link} Widget}
-'xrdef {link-pg}{9}
-'xrdef {link-snt}{}
-'xrdef {url-link-title}{The \code {url-link} Widget}
-'xrdef {url-link-pg}{9}
-'xrdef {url-link-snt}{}
-'xrdef {info-link-title}{The \code {info-link} Widget}
-'xrdef {info-link-pg}{9}
-'xrdef {info-link-snt}{}
-'xrdef {push-button-title}{The \code {push-button} Widget}
-'xrdef {push-button-pg}{10}
-'xrdef {push-button-snt}{}
-'xrdef {editable-field-title}{The \code {editable-field} Widget}
-'xrdef {editable-field-pg}{10}
-'xrdef {editable-field-snt}{}
-'xrdef {text-title}{The \code {text} Widget}
-'xrdef {text-pg}{10}
-'xrdef {text-snt}{}
-'xrdef {menu-choice-title}{The \code {menu-choice} Widget}
-'xrdef {menu-choice-pg}{10}
-'xrdef {menu-choice-snt}{}
-'xrdef {radio-button-choice-title}{The \code {radio-button-choice} Widget}
-'xrdef {radio-button-choice-pg}{11}
-'xrdef {radio-button-choice-snt}{}
-'xrdef {item-title}{The \code {item} Widget}
-'xrdef {item-pg}{11}
-'xrdef {item-snt}{}
-'xrdef {choice-item-title}{The \code {choice-item} Widget}
-'xrdef {choice-item-pg}{12}
-'xrdef {choice-item-snt}{}
-'xrdef {toggle-title}{The \code {toggle} Widget}
-'xrdef {toggle-pg}{12}
-'xrdef {toggle-snt}{}
-'xrdef {checkbox-title}{The \code {checkbox} Widget}
-'xrdef {checkbox-pg}{12}
-'xrdef {checkbox-snt}{}
-'xrdef {checklist-title}{The \code {checklist} Widget}
-'xrdef {checklist-pg}{12}
-'xrdef {checklist-snt}{}
-'xrdef {editable-list-title}{The \code {editable-list} Widget}
-'xrdef {editable-list-pg}{13}
-'xrdef {editable-list-snt}{}
-'xrdef {group-title}{The \code {group} Widget}
-'xrdef {group-pg}{13}
-'xrdef {group-snt}{}
-'xrdef {Sexp Types-title}{Sexp Types}
-'xrdef {Sexp Types-pg}{14}
-'xrdef {Sexp Types-snt}{}
-'xrdef {constants-title}{The Constant Widgets}
-'xrdef {constants-pg}{14}
-'xrdef {constants-snt}{}
-'xrdef {generic-title}{Generic Sexp Widget}
-'xrdef {generic-pg}{14}
-'xrdef {generic-snt}{}
-'xrdef {atoms-title}{Atomic Sexp Widgets}
-'xrdef {atoms-pg}{14}
-'xrdef {atoms-snt}{}
-'xrdef {composite-title}{Composite Sexp Widgets}
-'xrdef {composite-pg}{15}
-'xrdef {composite-snt}{}
-'xrdef {Widget Properties-title}{Properties}
-'xrdef {Widget Properties-pg}{16}
-'xrdef {Widget Properties-snt}{}
-'xrdef {Defining New Widgets-title}{Defining New Widgets}
-'xrdef {Defining New Widgets-pg}{18}
-'xrdef {Defining New Widgets-snt}{}
-'xrdef {Widget Browser-title}{Widget Browser}
-'xrdef {Widget Browser-pg}{20}
-'xrdef {Widget Browser-snt}{}
-'xrdef {Widget Minor Mode-title}{Widget Minor Mode}
-'xrdef {Widget Minor Mode-pg}{20}
-'xrdef {Widget Minor Mode-snt}{}
-'xrdef {Utilities-title}{Utilities.}
-'xrdef {Utilities-pg}{20}
-'xrdef {Utilities-snt}{}
-'xrdef {Widget Wishlist-title}{Wishlist}
-'xrdef {Widget Wishlist-pg}{20}
-'xrdef {Widget Wishlist-snt}{}
-'xrdef {Index-title}{Index}
-'xrdef {Index-pg}{22}
-'xrdef {Index-snt}{}
diff -ruN src-21.1/man/widget.cps src-21.2/man/widget.cps
--- src-21.1/man/widget.cps	Sat Oct 20 18:45:39 2001
+++ src-21.2/man/widget.cps	Thu Jan  1 01:00:00 1970
@@ -1,184 +0,0 @@
-\initial {A}
-\entry {\code {action\r { keyword}}}{19}
-\entry {activate a widget}{17}
-\entry {active widget}{17}
-\entry {\code {append-button-args\r { keyword}}}{13}
-\entry {\code {args\r { keyword}}}{11, 13}
-\entry {atomic sexp widget}{14}
-\initial {B}
-\entry {basic widgets}{1}
-\entry {\code {boolean}}{15}
-\entry {\code {browse-url-browser-function\r {, and \code {url-link} widget}}}{9}
-\entry {button widgets}{3}
-\entry {\code {button-args\r { keyword}}}{11, 13}
-\entry {\code {button-face\r { keyword}}}{7}
-\entry {\code {button-prefix\r { keyword}}}{7}
-\entry {\code {button-suffix\r { keyword}}}{7}
-\entry {\code {buttons\r { keyword}}}{11, 13}
-\initial {C}
-\entry {\code {case-fold\r { keyword}}}{11}
-\entry {\code {character}}{15}
-\entry {\code {checkbox\r { widget}}}{12}
-\entry {\code {checklist\r { widget}}}{12}
-\entry {\code {children\r { keyword}}}{11, 13}
-\entry {\code {choice}}{16}
-\entry {\code {choice\r { keyword}}}{11}
-\entry {\code {choice-item\r { widget}}}{12}
-\entry {composite sexp widgets}{15}
-\entry {\code {cons}}{15}
-\entry {\code {const}}{14}
-\entry {constant widgets}{14}
-\entry {\code {convert-widget\r { keyword}}}{18}
-\entry {\code {create\r { keyword}}}{18}
-\initial {D}
-\entry {deactivate a widget}{17}
-\entry {\code {default}}{19}
-\entry {\code {define-widget}}{18}
-\entry {defining new widgets}{18}
-\entry {\code {delete\r { keyword}}}{18}
-\entry {\code {delete-button-args\r { keyword}}}{13}
-\entry {\code {directory}}{15}
-\entry {\code {doc\r { keyword}}}{8}
-\initial {E}
-\entry {\code {editable-field\r { widget}}}{10}
-\entry {\code {editable-list\r { widget}}}{13}
-\entry {embedded buttons}{3}
-\entry {\code {entry-format\r { keyword}}}{11, 12, 13}
-\entry {example of using widgets}{4}
-\entry {\code {extra-offset\r { keyword}}}{8}
-\initial {F}
-\entry {\code {file}}{15}
-\entry {\code {format\r { keyword}}}{7}
-\entry {\code {format-handler\r { keyword}}}{19}
-\entry {\code {function}}{15}
-\entry {\code {function-item}}{14}
-\initial {G}
-\entry {generic sexp widget}{14}
-\entry {\code {greedy\r { keyword}}}{12}
-\entry {\code {group\r { widget}}}{13}
-\initial {H}
-\entry {\code {help-echo\r { keyword}}}{8}
-\initial {I}
-\entry {inactive widget}{17}
-\entry {\code {indent\r { keyword}}}{8}
-\entry {\code {info-link\r { widget}}}{9}
-\entry {\code {insert-button-args\r { keyword}}}{13}
-\entry {\code {integer}}{15}
-\entry {\code {item\r { widget}}}{11}
-\initial {K}
-\entry {\code {keymap\r { keyword}}}{10}
-\entry {keyword arguments}{7}
-\initial {L}
-\entry {\code {link\r { widget}}}{9}
-\entry {\code {list}}{16}
-\initial {M}
-\entry {\code {match\r { keyword}}}{8}
-\entry {\code {menu-choice\r { widget}}}{10}
-\entry {\code {menu-tag\r { keyword}}}{8}
-\entry {\code {menu-tag-get\r { keyword}}}{8}
-\entry {\code {Mouse-2 \r {(on button widgets})}}{3}
-\entry {\code {must-match\r { keyword}}}{15}
-\initial {N}
-\entry {new widgets}{18}
-\entry {\code {notify\r { keyword}}}{8}
-\entry {\code {number}}{15}
-\initial {O}
-\entry {\code {off-glyph\r { keyword}}}{12}
-\entry {\code {offset\r { keyword}}}{8}
-\entry {\code {on-glyph\r { keyword}}}{12}
-\entry {option field tag}{3}
-\initial {P}
-\entry {\code {parent\r { keyword}}}{9}
-\entry {\code {prompt-value\r { keyword}}}{19}
-\entry {properties of widgets}{16}
-\entry {\code {push-button\r { widget}}}{10}
-\initial {R}
-\entry {\code {radio-button-choice\r { widget}}}{11}
-\entry {\code {regexp}}{15}
-\entry {\code {repeat}}{16}
-\initial {S}
-\entry {\code {secret\r { keyword}}}{10}
-\entry {\code {set}}{16}
-\entry {\code {sexp}}{14}
-\entry {sexp types}{14}
-\entry {\code {sibling-args\r { keyword}}}{9}
-\entry {\code {size\r { keyword}}}{10}
-\entry {\code {string}}{15}
-\entry {\code {symbol}}{15}
-\initial {T}
-\entry {\code {tab-order\r { keyword}}}{8}
-\entry {\code {tag\r { keyword}}}{8}
-\entry {\code {tag-glyph\r { keyword}}}{8}
-\entry {\code {text\r { widget}}}{10}
-\entry {todo}{20}
-\entry {\code {toggle\r { widget}}}{12}
-\initial {U}
-\entry {\code {url-link\r { widget}}}{9}
-\entry {utility functions for widgets}{20}
-\initial {V}
-\entry {\code {valid-regexp\r { keyword}}}{10}
-\entry {\code {validate\r { keyword}}}{8}
-\entry {\code {value\r { keyword}}}{7}
-\entry {\code {value-create\r { keyword}}}{18}
-\entry {\code {value-delete\r { keyword}}}{19}
-\entry {\code {value-face\r { keyword}}}{10}
-\entry {\code {value-get\r { keyword}}}{19}
-\entry {\code {value-to-external\r { keyword}}}{18}
-\entry {\code {value-to-internal\r { keyword}}}{18}
-\entry {\code {variable}}{15}
-\entry {\code {variable-item}}{14}
-\entry {\code {vector}}{16}
-\entry {\code {void\r { keyword}}}{11}
-\initial {W}
-\entry {widget browser}{20}
-\entry {widget buttons}{3}
-\entry {widget library, files}{2}
-\entry {widget library, why use it}{1}
-\entry {widget minor mode}{20}
-\entry {widget properties}{16}
-\entry {\code {widget-backward}}{4}
-\entry {\code {widget-browse}}{20}
-\entry {\code {widget-browse-at}}{20}
-\entry {\code {widget-browse-other-window}}{20}
-\entry {\code {widget-button-click}}{3, 6}
-\entry {\code {widget-button-face}}{4}
-\entry {\code {widget-button-prefix}}{7}
-\entry {\code {widget-button-press}}{3, 6}
-\entry {\code {widget-button-suffix}}{7}
-\entry {\code {widget-children-validate}}{8}
-\entry {\code {widget-children-value-delete}}{19}
-\entry {\code {widget-create}}{6}
-\entry {\code {widget-default-format-handler}}{19}
-\entry {\code {widget-delete}}{6}
-\entry {\code {widget-field-face}}{3}
-\entry {\code {widget-field-keymap}}{10}
-\entry {\code {widget-forward}}{4}
-\entry {\code {widget-get}}{17}
-\entry {\code {widget-get-sibling}}{20}
-\entry {\code {widget-global-map}}{6}
-\entry {\code {widget-glyph-directory}}{9}
-\entry {\code {widget-glyph-enable}}{9}
-\entry {\code {widget-insert}}{6}
-\entry {\code {widget-keymap}}{6}
-\entry {\code {widget-link-prefix}}{9}
-\entry {\code {widget-link-suffix}}{9}
-\entry {\code {widget-member}}{17}
-\entry {\code {widget-minor-mode}}{20}
-\entry {\code {widget-minor-mode-keymap}}{20}
-\entry {\code {widget-mouse-face}}{4}
-\entry {\code {widget-parent-action}}{19}
-\entry {\code {widget-prompt-value}}{20}
-\entry {\code {widget-push-button-prefix}}{10}
-\entry {\code {widget-push-button-suffix}}{10}
-\entry {\code {widget-put}}{17}
-\entry {\code {widget-radio-add-item}}{11}
-\entry {\code {widget-setup}}{6}
-\entry {\code {widget-text-keymap}}{10}
-\entry {\code {widget-type}}{17}
-\entry {\code {widget-types-convert-widget}}{18}
-\entry {\code {widget-value}}{16}
-\entry {\code {widget-value-convert-widget}}{18}
-\entry {\code {widget-value-set}}{16}
-\entry {\code {widget-value-value-get}}{19}
-\entry {widgets, basic types}{1}
-\entry {widgets, programming example}{4}
diff -ruN src-21.1/man/woman.aux src-21.2/man/woman.aux
--- src-21.1/man/woman.aux	Sat Oct 20 18:45:45 2001
+++ src-21.2/man/woman.aux	Thu Jan  1 01:00:00 1970
@@ -1,102 +0,0 @@
-'xrdef {Introduction-title}{Introduction}
-'xrdef {Introduction-pg}{1}
-'xrdef {Introduction-snt}{Chapter'tie1}
-'xrdef {Background-title}{Background}
-'xrdef {Background-pg}{1}
-'xrdef {Background-snt}{Chapter'tie2}
-'xrdef {Installation-title}{Installation and Setup}
-'xrdef {Installation-pg}{3}
-'xrdef {Installation-snt}{Chapter'tie3}
-'xrdef {Autoloading-title}{Autoloading}
-'xrdef {Autoloading-pg}{4}
-'xrdef {Autoloading-snt}{Section'tie3.1}
-'xrdef {Search Path-title}{Search Path}
-'xrdef {Search Path-pg}{4}
-'xrdef {Search Path-snt}{Section'tie3.2}
-'xrdef {Auto Bindings-title}{Preloading Menu and Key Bindings}
-'xrdef {Auto Bindings-pg}{4}
-'xrdef {Auto Bindings-snt}{Section'tie3.3}
-'xrdef {Auto Customization-title}{Preloading Customization}
-'xrdef {Auto Customization-pg}{5}
-'xrdef {Auto Customization-snt}{Section'tie3.4}
-'xrdef {Command Line-title}{Command Line Access}
-'xrdef {Command Line-pg}{5}
-'xrdef {Command Line-snt}{Section'tie3.5}
-'xrdef {Finding-title}{Finding and Formatting Man Pages}
-'xrdef {Finding-pg}{5}
-'xrdef {Finding-snt}{Chapter'tie4}
-'xrdef {Topic-title}{Topic Interface}
-'xrdef {Topic-pg}{6}
-'xrdef {Topic-snt}{Section'tie4.1}
-'xrdef {Cache-title}{The WoMan Topic Cache}
-'xrdef {Cache-pg}{6}
-'xrdef {Cache-snt}{Section'tie4.1.1}
-'xrdef {Word at point-title}{Using the ``Word at Point'' as a Topic Suggestion}
-'xrdef {Word at point-pg}{7}
-'xrdef {Word at point-snt}{Section'tie4.1.2}
-'xrdef {Filename-title}{Filename Interface}
-'xrdef {Filename-pg}{7}
-'xrdef {Filename-snt}{Section'tie4.2}
-'xrdef {Automatic-title}{Automatic Interface}
-'xrdef {Automatic-pg}{8}
-'xrdef {Automatic-snt}{Section'tie4.3}
-'xrdef {Browsing-title}{Browsing Man Pages}
-'xrdef {Browsing-pg}{8}
-'xrdef {Browsing-snt}{Chapter'tie5}
-'xrdef {Fonts-title}{Fonts and Faces}
-'xrdef {Fonts-pg}{8}
-'xrdef {Fonts-snt}{Section'tie5.1}
-'xrdef {Navigation-title}{Navigation}
-'xrdef {Navigation-pg}{9}
-'xrdef {Navigation-snt}{Section'tie5.2}
-'xrdef {References-title}{Following References}
-'xrdef {References-pg}{9}
-'xrdef {References-snt}{Section'tie5.3}
-'xrdef {Changing-title}{Changing the Current Man Page}
-'xrdef {Changing-pg}{9}
-'xrdef {Changing-snt}{Section'tie5.4}
-'xrdef {Convenience-title}{Convenience Key Bindings}
-'xrdef {Convenience-pg}{10}
-'xrdef {Convenience-snt}{Section'tie5.5}
-'xrdef {Imenu-title}{Imenu Support; Contents Menu}
-'xrdef {Imenu-pg}{10}
-'xrdef {Imenu-snt}{Section'tie5.6}
-'xrdef {Customization-title}{Customization}
-'xrdef {Customization-pg}{11}
-'xrdef {Customization-snt}{Chapter'tie6}
-'xrdef {Interface Options-title}{Interface Options}
-'xrdef {Interface Options-pg}{11}
-'xrdef {Interface Options-snt}{Section'tie6.1}
-'xrdef {Formatting Options-title}{Formatting Options}
-'xrdef {Formatting Options-pg}{14}
-'xrdef {Formatting Options-snt}{Section'tie6.2}
-'xrdef {Faces-title}{Faces}
-'xrdef {Faces-pg}{15}
-'xrdef {Faces-snt}{Section'tie6.3}
-'xrdef {Special symbols-title}{Special symbols}
-'xrdef {Special symbols-pg}{15}
-'xrdef {Special symbols-snt}{Section'tie6.4}
-'xrdef {Log-title}{The *WoMan-Log* Buffer}
-'xrdef {Log-pg}{16}
-'xrdef {Log-snt}{Chapter'tie7}
-'xrdef {Technical-title}{Technical Details}
-'xrdef {Technical-pg}{16}
-'xrdef {Technical-snt}{Chapter'tie8}
-'xrdef {Bugs-title}{Reporting Bugs}
-'xrdef {Bugs-pg}{16}
-'xrdef {Bugs-snt}{Chapter'tie9}
-'xrdef {Acknowledgements-title}{Acknowledgements}
-'xrdef {Acknowledgements-pg}{17}
-'xrdef {Acknowledgements-snt}{Chapter'tie10}
-'xrdef {Command Index-title}{Command Index}
-'xrdef {Command Index-pg}{18}
-'xrdef {Command Index-snt}{}
-'xrdef {Variable Index-title}{Variable Index}
-'xrdef {Variable Index-pg}{18}
-'xrdef {Variable Index-snt}{}
-'xrdef {Keystroke Index-title}{Keystroke Index}
-'xrdef {Keystroke Index-pg}{19}
-'xrdef {Keystroke Index-snt}{}
-'xrdef {Concept Index-title}{Concept Index}
-'xrdef {Concept Index-pg}{20}
-'xrdef {Concept Index-snt}{}
diff -ruN src-21.1/man/woman.cps src-21.2/man/woman.cps
--- src-21.1/man/woman.cps	Sat Oct 20 18:45:45 2001
+++ src-21.2/man/woman.cps	Thu Jan  1 01:00:00 1970
@@ -1,76 +0,0 @@
-\initial {A}
-\entry {acknowledgements}{17}
-\entry {autoloading}{4}
-\entry {automatic interface}{8}
-\initial {B}
-\entry {background}{1}
-\entry {bindings, preloading}{4}
-\entry {browsing man pages}{8}
-\entry {buffer, log}{16}
-\entry {bugs, reporting}{16}
-\initial {C}
-\entry {cache, topic}{6}
-\entry {case-sensitivity}{5}
-\entry {changing current man page}{9}
-\entry {command line access}{5}
-\entry {contents menu}{10}
-\entry {convenience key bindings}{10}
-\entry {current man page, changing}{9}
-\entry {customization}{11}
-\entry {customization, preloading}{5}
-\initial {D}
-\entry {directory separator character}{12}
-\initial {F}
-\entry {faces}{8, 15}
-\entry {filename interface}{7}
-\entry {finding man pages}{5}
-\entry {following references}{9}
-\entry {fonts}{8}
-\entry {formatting man pages}{5}
-\entry {formatting options}{14}
-\initial {H}
-\entry {horizontal spacing}{16}
-\initial {I}
-\entry {imenu support}{10}
-\entry {installation}{3}
-\entry {interface options}{11}
-\entry {introduction}{1}
-\initial {K}
-\entry {key bindings, convenience}{10}
-\entry {key bindings, preloading}{4}
-\initial {L}
-\entry {log buffer}{16}
-\initial {M}
-\entry {man pages, browsing}{8}
-\entry {man pages, finding}{5}
-\entry {man pages, formatting}{5}
-\entry {\code {MANPATH}, directory separator}{12}
-\entry {\code {MANPATH}, environment variable}{12}
-\entry {menu bindings, preloading}{4}
-\initial {N}
-\entry {navigation}{9}
-\initial {P}
-\entry {point, word at}{7}
-\entry {preloading customization}{5}
-\entry {preloading menu and key bindings}{4}
-\initial {R}
-\entry {references}{9}
-\entry {reporting bugs}{16}
-\entry {resolution}{16}
-\initial {S}
-\entry {search path}{4}
-\entry {setup}{3}
-\entry {spacing, horizontal and vertical}{16}
-\entry {special symbols}{15}
-\initial {T}
-\entry {technical details}{16}
-\entry {topic cache}{6}
-\entry {topic interface}{6}
-\initial {U}
-\entry {using, browsing man pages}{8}
-\entry {using, finding man pages}{5}
-\entry {using, formatting man pages}{5}
-\initial {V}
-\entry {vertical spacing}{16}
-\initial {W}
-\entry {word at point}{7}
diff -ruN src-21.1/man/woman.fns src-21.2/man/woman.fns
--- src-21.1/man/woman.fns	Sat Oct 20 18:45:45 2001
+++ src-21.2/man/woman.fns	Thu Jan  1 01:00:00 1970
@@ -1,32 +0,0 @@
-\initial {B}
-\entry {\code {beginning-of-buffer}}{10}
-\initial {D}
-\entry {\code {describe-mode}}{10}
-\entry {\code {digit-argument}}{10}
-\initial {E}
-\entry {\code {end-of-buffer}}{10}
-\initial {M}
-\entry {\code {man}}{10}
-\entry {\code {man-follow}}{9}
-\entry {\code {Man-follow-manual-reference}}{9}
-\entry {\code {Man-goto-section}}{9}
-\entry {\code {Man-goto-see-also-section}}{9}
-\entry {\code {Man-kill}}{10}
-\entry {\code {Man-next-section}}{9}
-\entry {\code {Man-previous-section}}{9}
-\entry {\code {Man-quit}}{10}
-\initial {N}
-\entry {\code {negative-argument}}{10}
-\initial {S}
-\entry {\code {scroll-down}}{9}
-\entry {\code {scroll-up}}{9}
-\initial {W}
-\entry {\code {woman}}{10}
-\entry {\code {woman-decode-buffer}}{8}
-\entry {\code {woman-dired-find-file}}{7}
-\entry {\code {woman-find-file}}{7}
-\entry {\code {woman-mouse-2}}{9}
-\entry {\code {WoMan-next-manpage}}{10}
-\entry {\code {WoMan-previous-manpage}}{10}
-\entry {\code {woman-reformat-last-file}}{10}
-\entry {\code {woman-tar-extract-file}}{7}
diff -ruN src-21.1/man/woman.kys src-21.2/man/woman.kys
--- src-21.1/man/woman.kys	Sat Oct 20 18:45:45 2001
+++ src-21.2/man/woman.kys	Thu Jan  1 01:00:00 1970
@@ -1,38 +0,0 @@
-\initial {-}
-\entry {\code {-}}{10}
-\initial {.}
-\entry {\code {.}}{10}
-\initial {?}
-\entry {\code {?}}{10}
-\initial {{\tt\gtr}}
-\entry {\code {>}}{10}
-\initial {{\tt\less}}
-\entry {\code {<}}{10}
-\initial {0}
-\entry {\code {0 .. 9}}{10}
-\initial {D}
-\entry {\code {DEL}}{9}
-\initial {G}
-\entry {\code {g}}{9}
-\initial {K}
-\entry {\code {k}}{10}
-\initial {M}
-\entry {\code {m}}{10}
-\entry {\code {M-n}}{10}
-\entry {\code {M-p}}{10}
-\entry {\code {Mouse-2}}{9}
-\initial {N}
-\entry {\code {n}}{9}
-\initial {P}
-\entry {\code {p}}{9}
-\initial {Q}
-\entry {\code {q}}{10}
-\initial {R}
-\entry {\code {r}}{9}
-\entry {\code {R}}{10}
-\entry {\code {RET}}{9}
-\initial {S}
-\entry {\code {s}}{9}
-\entry {\code {SPC}}{9}
-\initial {W}
-\entry {\code {w}}{10}
diff -ruN src-21.1/man/woman.vrs src-21.2/man/woman.vrs
--- src-21.1/man/woman.vrs	Sat Oct 20 18:45:45 2001
+++ src-21.2/man/woman.vrs	Thu Jan  1 01:00:00 1970
@@ -1,35 +0,0 @@
-\initial {W}
-\entry {\code {w32-downcase-file-names}}{5}
-\entry {\code {woman-addition-face}}{15}
-\entry {\code {woman-bold-face}}{15}
-\entry {\code {woman-bold-headings}}{14}
-\entry {\code {woman-cache-filename}}{13}
-\entry {\code {woman-cache-level}}{12}
-\entry {\code {woman-default-indent}}{14}
-\entry {\code {woman-dired-keys}}{13}
-\entry {\code {woman-emulation}}{15}
-\entry {\code {woman-file-compression-regexp}}{14}
-\entry {\code {woman-fill-column}}{14}
-\entry {\code {woman-fill-frame}}{14}
-\entry {\code {woman-fontify}}{15}
-\entry {\code {woman-ignore}}{14}
-\entry {\code {woman-imenu}}{13}
-\entry {\code {woman-imenu-generic-expression}}{13}
-\entry {\code {woman-imenu-title}}{13}
-\entry {\code {woman-italic-face}}{15}
-\entry {\code {woman-man.conf-path}}{11}
-\entry {\code {woman-manpath}}{12}
-\entry {\code {woman-manpath-man-regexp}}{12}
-\entry {\code {woman-path}}{12}
-\entry {\code {woman-post-format-hook}}{11}
-\entry {\code {woman-pre-format-hook}}{11}
-\entry {\code {woman-preserve-ascii}}{14}
-\entry {\code {woman-show-log}}{11}
-\entry {\code {woman-symbol-font}}{15}
-\entry {\code {woman-topic-at-point}}{13}
-\entry {\code {woman-topic-at-point-default}}{13}
-\entry {\code {woman-uncompressed-file-regexp}}{14}
-\entry {\code {woman-unknown-face}}{15}
-\entry {\code {woman-use-extended-font}}{15}
-\entry {\code {woman-use-own-frame}}{14}
-\entry {\code {woman-use-symbol-font}}{15}
diff -ruN src-21.1/msdos/ChangeLog src-21.2/msdos/ChangeLog
--- src-21.1/msdos/ChangeLog	Sat Oct 20 18:13:49 2001
+++ src-21.2/msdos/ChangeLog	Sat Mar 16 11:50:11 2002
@@ -1,3 +1,7 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
diff -ruN src-21.1/nt/ChangeLog src-21.2/nt/ChangeLog
--- src-21.1/nt/ChangeLog	Sat Oct 20 18:13:37 2001
+++ src-21.2/nt/ChangeLog	Sat Mar 16 11:50:33 2002
@@ -1,3 +1,32 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
+2002-02-18  Jason Rumney  <jasonr@gnu.org>
+
+	* emacs.rc: Define VS_VERSION_INFO if not already.
+	Update version info.
+
+2002-02-11  Andrew Innes  <andrewi@gnu.org>
+
+	* gmake.defs (CFLAGS): Define _WIN32_WINNT as 0x0400, in order to
+	pick up relevant bits of the Windows API definitions.
+
+	* nmake.defs (CFLAGS): Define _WIN32_WINNT as 0x0400, in order to
+	pick up relevant bits of the Windows API definitions.
+
+2001-11-20  Jason Rumney  <jasonr@gnu.org>
+
+	* INSTALL: Update table of versions of make that are suitable
+	for building Emacs, based on recent feedback.
+
+	* TODO, _emacs, emacs.bat.in, debug.bat.in: Removed.
+
+2001-11-17  Jason Rumney  <jasonr@gnu.org>
+
+	* nmake.defs (SYS_LDFLAGS): Add setargv.obj for wildcard
+	expansion.  From Juanma Barranquero <lektu@terra.es>.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
diff -ruN src-21.1/nt/INSTALL src-21.2/nt/INSTALL
--- src-21.1/nt/INSTALL	Wed Sep 26 21:04:28 2001
+++ src-21.2/nt/INSTALL	Wed Nov 21 00:13:40 2001
@@ -25,27 +25,35 @@
 
   For reference, here is a list of which builds of GNU make are known
   to work or not, and whether they work in the presence and/or absence
-  of sh.exe, the Cygwin port of Bash.
+  of sh.exe, the Cygwin port of Bash. Note that any version of make
+  that is compiled with Cygwin will only work with Cygwin tools, due to
+  the use of cygwin style paths. This means Cygwin make is unsuitable
+  for building parts of Emacs that need to invoke Emacs itself (leim and
+  "make bootstrap", for example). Also see the Trouble-shooting section
+  below if you decide to go ahead and use Cygwin make.
  
                                          sh exists     no sh
 
-    cygwin b20.1 make (3.75):            okay[1]       fails[2]
+    cygwin b20.1 make (3.75):            fails[1, 5]   fails[2, 5]
     MSVC compiled gmake 3.77:            okay          okay
     MSVC compiled gmake 3.78.1:          okay          okay
     MSVC compiled gmake 3.79.1:          okay          okay
     mingw32/gcc-2.92.2 make (3.77):      okay          okay[4]
-    cygwin compiled gmake 3.77:          okay[1]       fails[2]
-    cygwin compiled make 3.78.1:         okay          fails[2]
-    cygwin compiled make 3.79.1:         couldn't build make[3]
+    cygwin compiled gmake 3.77:          fails[1, 5]   fails[2, 5]
+    cygwin compiled make 3.78.1:         fails[5]      fails[2, 5]
+    cygwin compiled make 3.79.1:         fails[3, 5]   fails[2?, 5]
+    mingw32 compiled make 3.79.1:        okay          okay 
 
   Notes:
 
     [1] doesn't cope with makefiles with DOS line endings, so must mount
         emacs source with text!=binary.
     [2] fails when needs to invoke shell commands; okay invoking gcc etc.
-    [3] requires LC_MESSAGES support to build; maybe 2.95.x update to
-        cygwin provides this?
+    [3] requires LC_MESSAGES support to build; cannot build with early
+        versions of cygwin.
     [4] may fail on Windows 9X and Windows ME; if so, install Bash.
+    [5] fails when building leim due to the use of cygwin style paths.
+        May work if building emacs without leim.
 
 * Configuring
 
diff -ruN src-21.1/nt/TODO src-21.2/nt/TODO
--- src-21.1/nt/TODO	Sun Oct  3 17:28:50 1999
+++ src-21.2/nt/TODO	Thu Jan  1 01:00:00 1970
@@ -1,28 +0,0 @@
-
-This is a list of known problems to date with the Windows NT/95 port of
-GNU Emacs.
-
-* Handle wildcards in ls-lisp (e.g., C-x d *.c).
-
-* Interactive subprocess output is buffered in jerky
-
-* Presently, C:\foo\bar and C:/foo/bar bring up two buffers on the same file.
-  Solve this by adding a switch that canonicalizes path separators
-  (e.g., make them all / or all \)?
-
-* call-process-region: Another tricky situation with binary and text modes.
-  An example by dsrosing@reston.ingr.com: use crypt++ to load compressed
-  data into a buffer, edit the buffer, save the data back out.  (Also
-  need to propagate the "/C" switch change sent the shell in crypt++.el
-  back to the author.)
-
-* Dired uses ls-lisp, which reports all files as being owned by the
-  current user.  Need to dig through the security descriptor to extract
-  the owner of the file (and the group?) using LookupAccountSid.
-
-* Integrate the build for NT into the GNU config process once
-  a decent shell becomes freely available
-
-* Integrate networking.
-
-* Fix Win95 subprocesses.
diff -ruN src-21.1/nt/_emacs src-21.2/nt/_emacs
--- src-21.1/nt/_emacs	Tue May  9 03:48:06 1995
+++ src-21.2/nt/_emacs	Thu Jan  1 01:00:00 1970
@@ -1,3 +0,0 @@
-;;; This is the user emacs startup file (.emacs in Unix land).
-
-(put 'eval-expression 'disabled nil)
diff -ruN src-21.1/nt/debug.bat.in src-21.2/nt/debug.bat.in
--- src-21.1/nt/debug.bat.in	Thu Sep 11 07:33:51 1997
+++ src-21.2/nt/debug.bat.in	Thu Jan  1 01:00:00 1970
@@ -1,31 +0,0 @@
-
-REM Here begins debug.bat.in
-
-REM Set OS specific values.
-REM   none needed
-  
-REM Use new proxy shell by default.
-set SHELL=%emacs_dir%\bin\cmdproxy.exe
-
-set EMACSLOADPATH=%emacs_dir%\site-lisp;%emacs_dir%\lisp
-set EMACSDATA=%emacs_dir%\etc
-set EMACSPATH=%emacs_dir%\bin
-set EMACSLOCKDIR=%emacs_dir%\lock
-set INFOPATH=%emacs_dir%\info
-set EMACSDOC=%emacs_dir%\etc
-set TERM=CMD
-
-REM The variable HOME is used to find the startup file, ~\_emacs.  Ideally,
-REM this will not be set in this file but should already be set before
-REM this file is invoked.  If HOME is not set, use some generic default.
-
-set HOME_SAVE=%HOME%
-set HOME_EXISTS=yes
-set HOME_DEFAULT=C:\
-set HOME=
-if "%HOME%" == "%HOME_SAVE%" set HOME_EXISTS=no
-if "%HOME_EXISTS%" == "yes" set HOME=%HOME_SAVE%
-if "%HOME_EXISTS%" == "no" set HOME=%HOME_DEFAULT%
-if "%HOME_EXISTS%" == "no" echo HOME is not set!  Using %HOME% as a default...
-
-start msdev -nologo %emacs_dir%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
diff -ruN src-21.1/nt/emacs.bat.in src-21.2/nt/emacs.bat.in
--- src-21.1/nt/emacs.bat.in	Mon Nov 22 15:37:38 1999
+++ src-21.2/nt/emacs.bat.in	Thu Jan  1 01:00:00 1970
@@ -1,28 +0,0 @@
-
-REM Here begins emacs.bat.in
-
-REM Use new proxy shell by default.
-set SHELL=%emacs_dir%\bin\cmdproxy.exe
-
-set EMACSLOADPATH=%emacs_dir%\site-lisp;%emacs_dir%\lisp;%emacs_dir%\leim
-set EMACSDATA=%emacs_dir%\etc
-set EMACSPATH=%emacs_dir%\bin
-set EMACSLOCKDIR=%emacs_dir%\lock
-REM set INFOPATH=%emacs_dir%\info
-set EMACSDOC=%emacs_dir%\etc
-set TERM=CMD
-
-REM The variable HOME is used to find the startup file, ~\_emacs.  Ideally,
-REM this will not be set in this file but should already be set before
-REM this file is invoked.  If HOME is not set, use some generic default.
-
-set HOME_SAVE=%HOME%
-set HOME_EXISTS=yes
-set HOME_DEFAULT=C:\
-set HOME=
-if "%HOME%" == "%HOME_SAVE%" set HOME_EXISTS=no
-if "%HOME_EXISTS%" == "yes" set HOME=%HOME_SAVE%
-if "%HOME_EXISTS%" == "no" set HOME=%HOME_DEFAULT%
-if "%HOME_EXISTS%" == "no" echo HOME is not set!  Using %HOME% as a default...
-
-%emacs_dir%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
diff -ruN src-21.1/nt/emacs.rc src-21.2/nt/emacs.rc
--- src-21.1/nt/emacs.rc	Wed Jun 16 21:55:59 1999
+++ src-21.2/nt/emacs.rc	Fri Feb 22 11:51:45 2002
@@ -1,8 +1,12 @@
 Emacs ICON    icons\gnu2a32t.ico
 
+#ifndef VS_VERSION_INFO
+#define VS_VERSION_INFO 1
+#endif
+
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,4,0,0
- PRODUCTVERSION 20,4,0,0
+ FILEVERSION 21,2,0,0
+ PRODUCTVERSION 21,2,0,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -18,13 +22,13 @@
 	BLOCK "040904B0"
 	BEGIN
 	    VALUE "CompanyName", "Free Software Foundation\0"
-	    VALUE "FileDescription", "GNU Emacs for Windows NT and Windows 95/98\0"
-	    VALUE "FileVersion", "20, 4, 0, 0\0"
+	    VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
+	    VALUE "FileVersion", "21, 2, 0, 0\0"
 	    VALUE "InternalName", "Emacs\0"
-	    VALUE "LegalCopyright", "Copyright (C) 1998\0"
+	    VALUE "LegalCopyright", "Copyright (C) 2002\0"
 	    VALUE "OriginalFilename", "emacs.exe"
 	    VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
-	    VALUE "ProductVersion", "20, 4, 0, 0\0"
+	    VALUE "ProductVersion", "21, 2, 0, 0\0"
 	    VALUE "OLESelfRegister", "\0"
 	 END
      END
diff -ruN src-21.1/nt/gmake.defs src-21.2/nt/gmake.defs
--- src-21.1/nt/gmake.defs	Fri Jun  1 15:18:27 2001
+++ src-21.2/nt/gmake.defs	Fri Feb 22 11:51:45 2002
@@ -172,7 +172,7 @@
 else
 DEBUG_CFLAGS	= 
 endif
-CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN $(ARCH_CFLAGS) -D$(ARCH) \
+CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 $(ARCH_CFLAGS) -D$(ARCH) \
 		  -D_CRTAPI1=_cdecl \
 		  $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
 EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1
diff -ruN src-21.1/nt/nmake.defs src-21.2/nt/nmake.defs
--- src-21.1/nt/nmake.defs	Wed Apr 18 16:07:15 2001
+++ src-21.2/nt/nmake.defs	Fri Feb 22 11:51:45 2002
@@ -129,11 +129,11 @@
 !else
 DEBUG_CFLAGS	= 
 !endif
-CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN $(ARCH_CFLAGS) -D$(ARCH) \
+CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 $(ARCH_CFLAGS) -D$(ARCH) \
 		  -D_CRTAPI1=_cdecl $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
 EMACS_EXTRA_C_FLAGS =
 
-SYS_LDFLAGS	= -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net
+SYS_LDFLAGS	= -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj
 
 # see comments in allocate_heap in w32heap.c before changing any of the
 # -stack, -heap, or -base settings.
diff -ruN src-21.1/oldXMenu/Activate.c src-21.2/oldXMenu/Activate.c
--- src-21.1/oldXMenu/Activate.c	Fri Jul 21 16:36:24 2000
+++ src-21.2/oldXMenu/Activate.c	Fri Jul 21 16:36:24 2000
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/Activate.c,v 1.3 2000/07/21 14:36:24 gerd Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/Activate.c,v 1.3 2000/07/21 14:36:24 gerd Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 #include "copyright.h"
diff -ruN src-21.1/oldXMenu/AddPane.c src-21.2/oldXMenu/AddPane.c
--- src-21.1/oldXMenu/AddPane.c	Sun Oct  3 21:34:51 1999
+++ src-21.2/oldXMenu/AddPane.c	Sun Oct  3 21:34:51 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/AddPane.c,v 1.1 1999/10/03 19:34:51 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/AddPane.c,v 1.1 1999/10/03 19:34:51 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/AddSel.c src-21.2/oldXMenu/AddSel.c
--- src-21.1/oldXMenu/AddSel.c	Thu Jan 27 16:30:18 2000
+++ src-21.2/oldXMenu/AddSel.c	Thu Jan 27 16:30:18 2000
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/AddSel.c,v 1.2 2000/01/27 15:30:18 gerd Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/AddSel.c,v 1.2 2000/01/27 15:30:18 gerd Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/ChangeLog src-21.2/oldXMenu/ChangeLog
--- src-21.1/oldXMenu/ChangeLog	Sat Oct 20 18:13:25 2001
+++ src-21.2/oldXMenu/ChangeLog	Sat Mar 16 12:19:01 2002
@@ -1,3 +1,7 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
diff -ruN src-21.1/oldXMenu/ChgPane.c src-21.2/oldXMenu/ChgPane.c
--- src-21.1/oldXMenu/ChgPane.c	Sun Oct  3 21:34:53 1999
+++ src-21.2/oldXMenu/ChgPane.c	Sun Oct  3 21:34:53 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/ChgPane.c,v 1.1 1999/10/03 19:34:53 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/ChgPane.c,v 1.1 1999/10/03 19:34:53 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/ChgSel.c src-21.2/oldXMenu/ChgSel.c
--- src-21.1/oldXMenu/ChgSel.c	Sun Oct  3 21:34:54 1999
+++ src-21.2/oldXMenu/ChgSel.c	Sun Oct  3 21:34:54 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/ChgSel.c,v 1.1 1999/10/03 19:34:54 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/ChgSel.c,v 1.1 1999/10/03 19:34:54 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/Create.c src-21.2/oldXMenu/Create.c
--- src-21.1/oldXMenu/Create.c	Sun Oct  3 21:34:56 1999
+++ src-21.2/oldXMenu/Create.c	Sun Oct  3 21:34:56 1999
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/Create.c,v 1.1 1999/10/03 19:34:56 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/Create.c,v 1.1 1999/10/03 19:34:56 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 #include "copyright.h"
diff -ruN src-21.1/oldXMenu/DelPane.c src-21.2/oldXMenu/DelPane.c
--- src-21.1/oldXMenu/DelPane.c	Sun Oct  3 21:34:57 1999
+++ src-21.2/oldXMenu/DelPane.c	Sun Oct  3 21:34:57 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/DelPane.c,v 1.1 1999/10/03 19:34:57 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/DelPane.c,v 1.1 1999/10/03 19:34:57 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/DelSel.c src-21.2/oldXMenu/DelSel.c
--- src-21.1/oldXMenu/DelSel.c	Sun Oct  3 21:34:58 1999
+++ src-21.2/oldXMenu/DelSel.c	Sun Oct  3 21:34:58 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/DelSel.c,v 1.1 1999/10/03 19:34:58 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/DelSel.c,v 1.1 1999/10/03 19:34:58 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/Destroy.c src-21.2/oldXMenu/Destroy.c
--- src-21.1/oldXMenu/Destroy.c	Sun Oct  3 21:34:59 1999
+++ src-21.2/oldXMenu/Destroy.c	Sun Oct  3 21:34:59 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/Destroy.c,v 1.1 1999/10/03 19:34:59 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/Destroy.c,v 1.1 1999/10/03 19:34:59 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/Error.c src-21.2/oldXMenu/Error.c
--- src-21.1/oldXMenu/Error.c	Sun Oct  3 21:35:00 1999
+++ src-21.2/oldXMenu/Error.c	Sun Oct  3 21:35:00 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/Error.c,v 1.1 1999/10/03 19:35:00 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/Error.c,v 1.1 1999/10/03 19:35:00 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/EvHand.c src-21.2/oldXMenu/EvHand.c
--- src-21.1/oldXMenu/EvHand.c	Sun Oct  3 21:35:01 1999
+++ src-21.2/oldXMenu/EvHand.c	Sun Oct  3 21:35:01 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/EvHand.c,v 1.1 1999/10/03 19:35:01 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/EvHand.c,v 1.1 1999/10/03 19:35:01 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/FindPane.c src-21.2/oldXMenu/FindPane.c
--- src-21.1/oldXMenu/FindPane.c	Sun Oct  3 21:35:02 1999
+++ src-21.2/oldXMenu/FindPane.c	Sun Oct  3 21:35:02 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/FindPane.c,v 1.1 1999/10/03 19:35:02 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/FindPane.c,v 1.1 1999/10/03 19:35:02 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/FindSel.c src-21.2/oldXMenu/FindSel.c
--- src-21.1/oldXMenu/FindSel.c	Sun Oct  3 21:35:03 1999
+++ src-21.2/oldXMenu/FindSel.c	Sun Oct  3 21:35:03 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/FindSel.c,v 1.1 1999/10/03 19:35:03 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/FindSel.c,v 1.1 1999/10/03 19:35:03 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/InsPane.c src-21.2/oldXMenu/InsPane.c
--- src-21.1/oldXMenu/InsPane.c	Sun Oct  3 21:35:04 1999
+++ src-21.2/oldXMenu/InsPane.c	Sun Oct  3 21:35:04 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/InsPane.c,v 1.1 1999/10/03 19:35:04 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/InsPane.c,v 1.1 1999/10/03 19:35:04 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/InsSel.c src-21.2/oldXMenu/InsSel.c
--- src-21.1/oldXMenu/InsSel.c	Sun Oct  3 21:35:05 1999
+++ src-21.2/oldXMenu/InsSel.c	Sun Oct  3 21:35:05 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/InsSel.c,v 1.1 1999/10/03 19:35:05 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/InsSel.c,v 1.1 1999/10/03 19:35:05 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/Internal.c src-21.2/oldXMenu/Internal.c
--- src-21.1/oldXMenu/Internal.c	Sun Oct  3 21:35:07 1999
+++ src-21.2/oldXMenu/Internal.c	Sun Oct  3 21:35:07 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/Internal.c,v 1.1 1999/10/03 19:35:07 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/Internal.c,v 1.1 1999/10/03 19:35:07 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/Locate.c src-21.2/oldXMenu/Locate.c
--- src-21.1/oldXMenu/Locate.c	Sun Oct  3 21:35:09 1999
+++ src-21.2/oldXMenu/Locate.c	Sun Oct  3 21:35:09 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/Locate.c,v 1.1 1999/10/03 19:35:09 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/Locate.c,v 1.1 1999/10/03 19:35:09 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/Post.c src-21.2/oldXMenu/Post.c
--- src-21.1/oldXMenu/Post.c	Thu Jan 27 16:30:47 2000
+++ src-21.2/oldXMenu/Post.c	Thu Jan 27 16:30:47 2000
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/Post.c,v 1.2 2000/01/27 15:30:47 gerd Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/Post.c,v 1.2 2000/01/27 15:30:47 gerd Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/Recomp.c src-21.2/oldXMenu/Recomp.c
--- src-21.1/oldXMenu/Recomp.c	Sun Oct  3 21:35:11 1999
+++ src-21.2/oldXMenu/Recomp.c	Sun Oct  3 21:35:11 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/Recomp.c,v 1.1 1999/10/03 19:35:11 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/Recomp.c,v 1.1 1999/10/03 19:35:11 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/SetAEQ.c src-21.2/oldXMenu/SetAEQ.c
--- src-21.1/oldXMenu/SetAEQ.c	Sun Oct  3 21:35:12 1999
+++ src-21.2/oldXMenu/SetAEQ.c	Sun Oct  3 21:35:12 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/SetAEQ.c,v 1.1 1999/10/03 19:35:12 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetAEQ.c,v 1.1 1999/10/03 19:35:12 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/SetFrz.c src-21.2/oldXMenu/SetFrz.c
--- src-21.1/oldXMenu/SetFrz.c	Sun Oct  3 21:35:13 1999
+++ src-21.2/oldXMenu/SetFrz.c	Sun Oct  3 21:35:13 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/SetFrz.c,v 1.1 1999/10/03 19:35:13 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetFrz.c,v 1.1 1999/10/03 19:35:13 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/SetPane.c src-21.2/oldXMenu/SetPane.c
--- src-21.1/oldXMenu/SetPane.c	Sun Oct  3 21:35:14 1999
+++ src-21.2/oldXMenu/SetPane.c	Sun Oct  3 21:35:14 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/SetPane.c,v 1.1 1999/10/03 19:35:14 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetPane.c,v 1.1 1999/10/03 19:35:14 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/SetSel.c src-21.2/oldXMenu/SetSel.c
--- src-21.1/oldXMenu/SetSel.c	Sun Oct  3 21:35:15 1999
+++ src-21.2/oldXMenu/SetSel.c	Sun Oct  3 21:35:15 1999
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/SetSel.c,v 1.1 1999/10/03 19:35:15 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetSel.c,v 1.1 1999/10/03 19:35:15 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/X10.h src-21.2/oldXMenu/X10.h
--- src-21.1/oldXMenu/X10.h	Sun Oct  3 21:35:16 1999
+++ src-21.2/oldXMenu/X10.h	Sun Oct  3 21:35:16 1999
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/X10.h,v 1.1 1999/10/03 19:35:16 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/X10.h,v 1.1 1999/10/03 19:35:16 fx Exp $ */
 /* 
  * Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
  *
diff -ruN src-21.1/oldXMenu/XMenu.h src-21.2/oldXMenu/XMenu.h
--- src-21.1/oldXMenu/XMenu.h	Thu Jan 27 16:29:38 2000
+++ src-21.2/oldXMenu/XMenu.h	Thu Jan 27 16:29:38 2000
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/XMenu.h,v 1.2 2000/01/27 15:29:38 gerd Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/XMenu.h,v 1.2 2000/01/27 15:29:38 gerd Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/XMenuInt.h src-21.2/oldXMenu/XMenuInt.h
--- src-21.1/oldXMenu/XMenuInt.h	Sun Oct  3 21:35:24 1999
+++ src-21.2/oldXMenu/XMenuInt.h	Sun Oct  3 21:35:24 1999
@@ -1,5 +1,5 @@
 
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/XMenuInt.h,v 1.1 1999/10/03 19:35:24 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/XMenuInt.h,v 1.1 1999/10/03 19:35:24 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
diff -ruN src-21.1/oldXMenu/copyright.h src-21.2/oldXMenu/copyright.h
--- src-21.1/oldXMenu/copyright.h	Sun Oct  3 21:35:25 1999
+++ src-21.2/oldXMenu/copyright.h	Sun Oct  3 21:35:25 1999
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/copyright.h,v 1.1 1999/10/03 19:35:25 fx Exp $ */
+/* $Header: /cvsroot/emacs/emacs/oldXMenu/copyright.h,v 1.1 1999/10/03 19:35:25 fx Exp $ */
 /*
 
 Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
diff -ruN src-21.1/src/ChangeLog src-21.2/src/ChangeLog
--- src-21.1/src/ChangeLog	Sat Oct 20 18:12:53 2001
+++ src-21.2/src/ChangeLog	Sat Mar 16 11:51:02 2002
@@ -1,3 +1,698 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* Version 21.2 released.
+
+2002-03-15  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* xterm.c (x_set_toolkit_scroll_bar_thumb, xm_scroll_callback)
+	(XTread_socket): Undo last change: too late for this release.
+
+2002-03-13  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* xterm.c (x_set_toolkit_scroll_bar_thumb) <USE_MOTIF>:
+	Use a fixed-size thumb (based on an ad-hoc estimate of 30 chars per
+	line) to avoid annoying flicker.
+	(xm_scroll_callback): Get rid of the now unnecessary kludge.
+	(XTread_socket): Mark it static.
+
+2002-03-12  Juanma Barranquero  <lektu@terra.es>
+
+	* editfns.c (syms_of_editfns): Fix typo.
+
+2002-03-09  Jason Rumney  <jasonr@gnu.org>
+
+	* fileio.c (Fcopy_file) [WINDOWS_NT]: Ensure file is not
+	read-only when setting modified time.
+
+2002-03-08  Juanma Barranquero  <lektu@terra.es>
+
+	* w32fns.c (Fx_display_color_cells): Force 24+ bit color depths to
+	24-bit.
+
+2002-03-08  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (move_it_vertically_backward): At the end of the
+	function, when moving forward by lines, treat terminal frames
+	specially.
+
+2002-02-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* coding.h (run_pre_post_conversion_on_str): Add prototype.
+
+	* xselect.c (selection_data_to_lisp_data): Fix last change.
+
+2002-02-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* puresize.h (BASE_PURESIZE): Increase to 710000.
+
+2002-02-22  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	Support for ICCCM  Extended Segments in X selections:
+
+	* xselect.c <Qcompound_text_with_extensions>: New variable.
+	(syms_of_xselect): Intern and staticpro it.
+	(selection_data_to_lisp_data): Run post-read-conversion on decoded
+	selection text.
+	(lisp_data_to_selection_data): If next-selection-coding-system is
+	compound-text-with-extensions, set the type of selection to be
+	compound-text.
+
+	* xterm.h (x_encode_text): Update prototype.
+
+	* xfns.c (x_encode_text): Accept additional arg SELECTIONP; all
+	callers changed.  If SELECTIONP is non-zero, run the
+	pre-write-conversion function before encoding the selection text.
+
+2002-02-20  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+	* xfns.c (gif_load): Use correct width and height for GIF images.
+
+2002-02-18  Jason Rumney  <jasonr@gnu.org>
+
+	* w32term.c (glyph_rect): Determine the row and glyph more precisely.
+
+2002-02-11  Jason Rumney  <jasonr@gnu.org>
+
+	* w32term.c (show_mouse_face): Fix bug setting a row's
+	mouse_face_p flag unconditionally.
+	(x_scroll_run): Revert to BitBlt.
+
+2002-02-09  Jason Rumney  <jasonr@gnu.org>
+
+	* w32fns.c (enum_font_cb2): Don't let charsets unknown to Windows
+	match each other.
+	(w32_load_system_font): Prevent Cleartype fonts from loading.
+
+2002-02-08  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* floatfns.c (Fround): Doc fix.
+
+2002-02-07  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* lisp.h (Fx_file_dialog): Export (for Motif code in fileio.c).
+
+2002-02-06  Jason Rumney  <jasonr@gnu.org>
+
+	* w32term.c (w32_native_per_char_metric):  Disable 2002-01-20 change.
+
+2002-02-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* charset.c (get_charset_id): Use if-else instead of ?:.
+
+2001-02-06  Richard M. Stallman  <rms@gnu.org>
+
+	* coding.c (code_convert_region): Update coding->cmp_data->char_offset
+	before calling decode_coding.
+
+	* charset.c (Fdefine_charset): Call Fupdate_coding_systems_internal.
+
+2002-02-05  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* keymap.c (current_minor_maps): `override' only shadows its
+	correspondent in minor-mode-map-alist, not the whole tail.
+
+2002-02-02  Richard M. Stallman  <rms@gnu.org>
+
+	* window.c (enlarge_window): Fix last change.
+
+2002-02-01  Kim F. Storm  <storm@cua.dk>
+
+	* xterm.c (x_erase_phys_cursor): Don't erase cursor if cursor row
+	is invisible.  This can happen if cursor is on top line of a
+	window, and we switch to a buffer with a header line.
+
+	* w32term.c (x_erase_phys_cursor): Ditto.
+
+2002-02-01  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* coding.c (decode_composition_emacs_mule): Give up if NCOMPONENT
+	gets too large to index `component'.
+
+2002-01-28  Richard M. Stallman  <rms@gnu.org>
+
+	* buffer.c (syms_of_buffer): Doc fixes for scroll-...-aggressively.
+
+	* xdisp.c (try_scrolling): Exchange uses of scroll_down_aggressively
+	and scroll_up_aggressively.
+
+2002-01-26  Jason Rumney  <jasonr@gnu.org>
+
+	* w32term.c (note_mouse_highlight): Reset help_echo.
+
+2002-01-24  Jason Rumney  <jasonr@gnu.org>
+
+	* w32term.c (x_scroll_run): Use ScrollWindowEx in place of BitBlt.
+	If region left to draw is not what was expected, mark the frame as
+	garbaged.
+
+	* w32fns.c (w32_wnd_proc) <WM_PAINT>: Initialize update_rect.
+	Combine the regions returned by BeginPaint and GetUpdateRect.
+
+2002-01-20  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* unexelf.c (unexec) [__sgi]: Support the .got sections.
+
+2002-01-20  Jason Rumney  <jasonr@gnu.org>
+
+	* w32term.c (w32_native_per_char_metric): Don't trust the metrics
+	that Windows returns.  If a double check fails, try to guess how
+	ExtTextOut is going to act.
+
+	* w32fns.c (w32_load_system_font, w32_to_x_charset): Use strnicmp
+	in place of stricmp.
+	(w32_list_synthesized_fonts): Removed.
+	(w32_to_all_x_charsets, enum_font_maybe_add_to_list): New functions.
+	(struct enumfont_t): New element; list.
+	(enum_font_cb2): List all style and charset variations of a font.
+	(Fw32_select_font): Exclude vertical fonts.
+	(w32_enable_synthesized_fonts): Change to a boolean.
+	(Fw32_send_sys_command): Doc fix.
+
+2002-01-19  Jason Rumney  <jasonr@gnu.org>
+
+	* w32fns.c (Fx_create_frame): Bind redisplay-dont-pause around
+	call to face-set-after-frame-default.
+
+2002-01-17  Richard M. Stallman  <rms@gnu.org>
+
+	* window.c (enlarge_window): When exceeding size of parent,
+	directly delete all the siblings instead of trying to resize it.
+
+2002-01-15  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* xdisp.c (display_mode_element): When computing charpos, depend
+	on multibyteness of elt, not the text in field.
+
+2002-01-14  Andreas Schwab  <schwab@suse.de>
+
+	* unexelf.c [!defined MAP_ANON]: Define MAP_ANON to MAP_ANONYMOUS
+	if defined, 0 otherwise.
+	(MAP_FAILED): Define if not defined and use it to test mmap failure.
+	(unexec) [!MAP_ANON]: Use /dev/zero as file to map.
+
+2002-01-14  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+	* sound.c (Fplay_sound): Initialize header_size also for :data case.
+
+2002-01-13  Andreas Schwab  <schwab@suse.de>
+
+	* xterm.c (x_load_font): Never set fonts_changed_p to zero.
+
+2002-01-07  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* process.c (send_process): Set src_multibyte to 1 after the call
+	top setup_coding_system, not before the call.
+
+2002-01-05  Jason Rumney  <jasonr@gnu.org>
+
+	* w32term.c (x_draw_glyphs): Don't call notice_overwritten_cursor
+	if OVERLAPS_P.
+
+2001-12-30  Richard M. Stallman  <rms@gnu.org>
+
+	* s/sco5.h (sigprocmask_set): Conditionalize decl on ! NOT_C_CODE.
+
+2001-12-30  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* s/sco5.h (sigprocmask_set): Declare as extern SIGMASKTYPE.
+	(SIGMASKTYPE): Define.
+
+	* syssignal.h (sigunblock): Don't define if already defined.
+
+2001-12-29  Richard M. Stallman  <rms@gnu.org>
+
+	* s/sco5.h (LIBX11_SYSTEM) [MOTIF]: Add -lgen.
+
+2001-12-28  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (try_scrolling) <PT below scroll margin>: Add the
+	height of the cursor line to the amount to scroll.
+
+2001-12-21  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* coding.c (DECODE_COMPOSITION_END): Fix last change.
+
+2001-12-17  Richard M. Stallman  <rms@gnu.org>
+
+	* coding.c (DECODE_COMPOSITION_END): Check for ! COMPOSING (coding)
+	instead of only for COMPOSITION_DISABLED.
+
+	* Makefile.in (xmenu.o, xterm.o, fontset.o): Depend on buffer.h.
+
+2001-12-12  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (move_it_vertically_backward): Change heuristic
+	for the case that we didn't move far enough initially.
+
+	* window.c (Frecenter): Simplify computation in the case of window
+	system frames and ARG < 0; use window_box_height.
+
+2001-12-09  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* s/hpux10.h (random): Undefine.
+	(srand48): Don't undefine.
+
+2001-12-09  Andreas Schwab  <schwab@suse.de>
+
+	* xdisp.c (display_mode_element): Don't read past end of string if
+	it ends with '%'.
+
+2001-12-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* xterm.c (x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
+	scroll bars of the frame before deleting the frame itself.
+
+2001-12-05  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* s/sol2-5.h (HAVE_VFORK): Define if undefined.
+
+2001-11-29  Dave Love  <fx@gnu.org>
+
+	* coding.c (syms_of_coding) <Qchar_coding_system>: Give it an
+	extra extra slot.
+
+2001-11-28  Gerd Moellmann  <gerd@gnu.org>
+
+	* xterm.c (x_draw_glyphs): Don't call notice_overwritten_cursor if
+	OVERLAPS_P.
+
+2001-11-25  Richard M. Stallman  <rms@gnu.org>
+
+	* unexelf.c (unexec): Index by n, not nn, when checking for ".sbss".
+
+2001-11-25  Richard M. Stallman  <rms@gnu.org>
+
+	* callproc.c (Fcall_process): When we make a bigger buffer for bufptr,
+	don't lose the data in it.
+
+2001-11-25  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* window.c (Fset_window_vscroll): Doc fix.  From Kalle Olavi
+	Niemitalo <kon@iki.fi>.
+
+2001-11-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* msdos.c (IT_clear_screen): If the frame's faces are not yet
+	realized, use the initial screen colors to clear the screen.
+
+2001-11-19  Richard M. Stallman  <rms@gnu.org>
+
+	* sysdep.c (child_setup_tty): Don't clear ICRNL or INLCR.
+
+2001-11-18  Jason Rumney  <jasonr@gnu.org>
+
+	* w32term.c (x_draw_bar_cursor): Get glyph's face.
+	(note_mouse_highlight): Fix type of variable `ignore'.
+
+2001-11-17  Andreas Schwab  <schwab@suse.de>
+
+	* xterm.c (note_mouse_highlight): Fix type of variable `ignore'.
+
+2001-11-17  Jason Rumney  <jasonr@gnu.org>
+
+	* xterm.c (notice_overwritten_cursor): Take care of end < 0 case.
+
+	* w32fns.c (x_set_internal_border_width): Set frame garbaged
+	when X window doesn't exist yet.
+
+	* w32term.c (x_draw_bar_cursor): If the background color of the
+	glyph under the cursor equals the frame's cursor color, use
+	the glyph's foreground color for drawing the bar cursor.
+	(x_after_update_window_line): Clear internal border
+	in different circumstances.
+	(w32_set_vertical_scroll_bar): Check for width and height > 0.
+	(w32_draw_relief_rect): Correct relief by 1 pixel.
+	(x_set_glyph_string_background_width): Set
+	extends_to_end_of_line_p if the row's fill_line_p is set and
+	drawing the last glyph with DRAW_IMAGE_{RAISED,SUNKEN}.
+	(x_display_and_set_cursor): If cursor_in_echo_area,
+	use NO_CURSOR if cursor_in_non_selected_windows is false.
+	(show_mouse_face): Clean up.  Recognize overwritten
+	cursor differently.
+	(x_draw_glyphs): Remove parameters READ_START and
+	REAL_END.  Notice if cursor gets overwritten.
+	(notice_overwritten_cursor): Renamed from
+	note_overwritten_text_cursor.  Rewritten to take glyph widths
+	into account, and to take X positions as parameters.
+	(x_draw_phys_cursor_glyph): Save state of w->phys_cursor_on_p
+	around call to x_draw_glyphs.
+
+2001-11-17  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (tool_bar_item_info): Avoid calling Fget_text_property
+	with invalid position.
+
+2001-11-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* syswait.h (HAVE_SYS_WAIT_H): Undef for ISC 4.1.  Reported by
+	Andrew Wiseman <a.wiseman@btclick.com>.
+
+	* unexec.c (coff.h): Don't include on ISC 4.1.
+
+2001-11-15  Jason Rumney  <jasonr@gnu.org>
+
+	* w32menu.c (add_menu_item): Make help_echo and radio buttons
+	work for most menu items.  From David Ponce
+	<david.ponce@wanadoo.fr>.
+
+2001-11-15  Gerd Moellmann  <gerd@gnu.org>
+
+	* xterm.c (x_draw_bar_cursor): If the background color of the
+	glyph under the cursor equals the frame's cursor color, use
+	the glyph's foreground color for drawing the bar cursor.
+
+	* dispnew.c (direct_output_forward_char): Fix character/byte
+	position comparison.
+
+2001-11-12  Jason Rumney  <jasonr@gnu.org>
+
+	* w32fns.c (Fx_open_connection): Only execute once.
+
+2001-11-12  Richard M. Stallman  <rms@gnu.org>
+
+	* xterm.c (XTread_socket): Don't update focus for EnterNotify or
+	LeaveNotify events.  Only FocusIn and FocusOut do that now.
+	(x_display_and_set_cursor): Do display hollow cursors in active
+	minibuffer windows when they are not selected.
+
+2001-11-10  Jason Rumney  <jasonr@gnu.org>
+
+	* w32fns.c (Fx_file_dialog): Pass a filter to GetOpenFileName.
+	(enum_font_cb2): Ignore fonts starting with @, unless explicitly
+	specified.
+
+	* w32term.c (remember_mouse_glyph): New function.
+	(w32_mouse_position): Use it.
+	(note_mouse_movement): If the mouse moved off the glyph, remember
+	its new position.
+
+	* w32term.h (struct w32_output): Correct spelling of x_compatible.
+	(w32_display_info): Add mouse_face_overlay.
+
+	* w32term.c (x_y_to_hpos_vpos): Add parameter BUFFER_ONLY_P.
+	(fast_find_string_pos): New function.
+	(fast_find_position): Return the correct vpos.  Add parameter
+	STOP.  In the final row, stop before glyphs having STOP as object.
+	Don't consider glyphs that are not from a buffer.
+	(expose_window_tree, expose_frame): Don't compute intersections here.
+	(expose_window): Do it here instead.
+	(expose_window_tree, expose_window, expose_line): Return 1 when
+	overwriting mouse-face.
+	(expose_window): If W is the window currently being updated, mark
+	the frame garbaged.
+	(expose_frame): If mouse-face was overwritten, redo it.
+	(x_draw_glyph_string): Restore clipping after drawing box.
+	Fix a computation of the underline position.
+	(w32_get_glyph_string_clip_rect): Minor cleanup.
+	(x_fill_stretch_glyph_string): Remove an assertion.
+	(x_produce_glyphs): Don't convert multibyte characters
+	to unibyte characters in unibyte buffers.
+	(cursor_in_mouse_face_p): New function.
+	(x_draw_stretch_glyph_string): Use it to choose a different GC
+	when drawing a cursor within highlighted text.  Don't draw
+	background again if it has already been drawn.
+	(x_draw_glyph_string_box): Don't draw a full-width
+	box just because the glyph row's full_width_p flag is set.
+	(x_draw_glyphs): Fix computation of rightmost x for
+	full-width rows.
+	(w32_draw_relief_rect): Extend left shadow to the bottom and left;
+	change bottom shadow accordingly. Some cleanup.
+	(x_update_window_end): Handle overwritten mouse face
+	also for tool bar windows.
+	(show_mouse_face): Set the glyph row's mouse_face_p flag also when
+	DRAW is DRAW_IMAGE_RAISED.
+	(clear_mouse_face): Return 1 if text with mouse face was
+	actually redrawn.  Make the function static.  Reset
+	dpyinfo->mouse_face_overlay otherwise note_mouse_highlight might
+	optimize away highlighting if we pass over that same overlay again.
+	(note_mouse_highlight): Call mouse_face_overlay_overlaps
+	to detect a case where we have to highlight a different region
+	despite not having left the currently highlighted region.
+	Set mouse_face_overlay in the x_display_info.  Avoid changing the
+	mouse pointer shape when show_mouse_face has already done it, or
+	there is no need.  Handle mouse-face and help-echo in strings.
+	(glyph_rect): New function.
+	(w32_mouse_position): Use it to raise the threshold for mouse
+	movement event generation.
+	(w32_initialize_display_info): Initialize the x_display_info's
+	mouse_face_overlay.
+	(w32_set_vertical_scroll_bar): Don't clear a zero height
+	or width area.
+	(w32_set_vertical_scroll_bar, x_scroll_bar_create): Don't configure
+	a widget to zero height.
+
+	* w32fns.c (x_set_foreground_color): Set frame's cursor_pixel.
+	(x_set_font): Handle case of x_new_fontset returning the same name
+	as before, although there was a change in fontsets.
+
+	* w32menu.c (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:
+	Protect unibyte strings created by replacing their multibyte
+	equivalents in menu_items.
+	(w32_menu_show): Don't overwrite an item's name with its key
+	description in case the description is a multibyte string.
+	(single_submenu): Some cleanup.
+
+2001-11-10  Gerd Moellmann  <gerd@gnu.org>
+
+	* unexelf.c (unexec): Use mmap/munmap to allocate buffers 
+	instead of malloc/free.
+
+2001-11-05  Richard M. Stallman  <rms@gnu.org>
+
+	* m/news-risc.h (BROKEN_PROTOTYPES): Defined.
+
+	* buffer.c (Fkill_buffer): Don't delete auto save file
+	if buffer is modified.
+
+2001-11-05  Andreas Schwab  <schwab@suse.de>
+
+	* sound.c (sound_perror): Save errno from being clobbered.
+
+2001-11-05  Dale Hagglund  <rdh@yottayotta.com>
+
+	* unexelf.c (unexec): Don't use `mmap'.  Instead, read and write
+	the program image directly.
+
+2001-11-04  Richard M. Stallman  <rms@gnu.org>
+
+	* gmalloc.c: Test BROKEN_PROTOTYPES.
+
+	* xfns.c: Include unistd.h, if it exists.
+
+	* editfns.c: Move the include of ctype.h after unistd.h.
+
+2001-11-03  Richard M. Stallman  <rms@gnu.org>
+
+	* data.c (Fmake_local_variable): Doc fix.
+
+	* eval.c (Frun_hooks, Frun_hook_with_args_until_failure): Doc fix.
+	(Frun_hook_with_args_until_success, Frun_hook_with_args): Doc fix.
+
+2001-11-02  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* regex.c (regcomp, regexec): Don't forget the __restrict.
+
+2001-11-01  Gerd Moellmann  <gerd@gnu.org>
+
+	* xterm.c (x_scroll_bar_create): Check for width and height > 0.
+	(XTset_vertical_scroll_bar): Likewise.
+
+	* buffer.c (Fset_buffer_major_mode): Use initial-major-mode for
+	*scratch*.
+
+	* xfaces.c (Finternal_set_lisp_face_attribute_from_resource):
+	Handle :box so that it is possible to specify sexprs.
+
+2001-10-31  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* s/hpux11.h: New file.
+
+2001-10-31  Gerd Moellmann  <gerd@gnu.org>
+
+	* xfaces.c (realize_x_face): If C is not a single-byte character,
+	set the face's colors_copied_bitwise_p instead of the defaulted_p
+	members which have a different meaning.
+	(free_face_colors): Do nothing for a face whose colors have been
+	copied bitwise.
+
+	* dispextern.h (struct face) <colors_copied_bitwise_p>: New member.
+
+	* window.c (grow_mini_window): Handle case that the root
+	window is already smaller than the nominal mininum height.
+
+2001-10-31  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+	* keyboard.c (Freset_this_command_lengths): Doc fix.
+	(timer-list): Doc fix.
+	(timer-idle-list): Doc fix.
+	(disable-point-adjustment): Doc fix.
+
+2001-10-30  Jason Rumney  <jasonr@gnu.org>
+
+	* w32fns.c (w32_to_x_charset): Increase size of XLFD charset buffer.
+	(enum_font_cb2): Ignore fonts with vertical orientation.
+
+2001-10-30  Gerd Moellmann  <gerd@gnu.org>
+
+	* xterm.c (x_after_update_window_line): Don't run the code
+	clearing in borders for rows whose visible height is 0.
+
+	* xdisp.c (clear_garbaged_frames): Redraw the frame only if its
+	resized_p flag is set.  If not set, use the much less flickering
+	method previously used.
+
+	* dispnew.c (change_frame_size_1): Set frame's resized_p.
+
+	* frame.h (struct frame) <resized_p>: New member.
+
+	* lread.c (to_multibyte): Ensure read_buffer is at least twice
+	as large as the number of bytes to convert.
+	
+	* lread.c (to_multibyte): New function.
+	(read1): Use it.
+
+	* xterm.c (x_draw_relief_rect): Correct bottom relief by 1 pixel.
+	(x_set_glyph_string_background_width): Set
+	extends_to_end_of_line_p if the row's fill_line_p is set and
+	drawing the last glyph with DRAW_IMAGE_{RAISED,SUNKEN}.
+
+	* xdisp.c (clear_garbaged_frames): Call Fredraw_frame.
+
+2001-10-29  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* coding.c (syms_of_coding): Document that locale-coding-system is
+	used for decoding input on X.
+
+	* window.c (Fscroll_left, Fscroll_right): Doc fix.
+
+2001-10-29  Gerd Moellmann  <gerd@gnu.org>
+
+	* xterm.c (x_display_and_set_cursor): If cursor_in_echo_area,
+	use NO_CURSOR if cursor_in_non_selected_windows is false.
+
+	* xfaces.c (Fface_font): Use UNSPECIFIEDP instead of NILP for
+	the slant attribute if FRAME is t.
+	
+2001-10-29  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* emacs.c (Finvocation_directory): Doc fix.
+	(USAGE2): Fix typos; from Pavel Janik <Pavel@Janik.cz>.
+
+2001-10-29  Gerd Moellmann  <gerd@gnu.org>
+
+	* xfns.c (x_set_internal_border_width): Set frame garbaged
+	when X window doesn't exist yet.
+
+	* xterm.c (x_after_update_window_line): Clear internal border
+	in different circumstances.
+	
+	* xterm.c (XTread_socket) <KeyPress>: Don't use
+	STRING_CHAR_AND_LENGTH if nchars == nbytes.  From Kenichi Handa
+	<handa@etl.go.jp>.
+
+2001-10-28  Gerd Moellmann  <gerd@gnu.org>
+
+	* xfns.c (x_build_heuristic_mask): Use x_alloc_image_color.
+	
+	* xfns.c (x_build_heuristic_mask): Fix a bug not incrementing
+	a loop counter.
+
+2001-10-27  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (move_it_vertically_backward): Use 2/3 line_height
+	instead of 1/2 line_height in the heuristic for skipping 
+	farther backward when target_y was not reached.
+
+	* sound.c (sound_perror): Unblock SIGIO, turn on atimers.
+	Display errno only if non-zero.
+	(sound_warning): New function.
+	(vox_configure): Don't treat failing to set sample rate as error.
+	(various places): Improve error messages.
+
+2001-10-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* dispnew.c (syms_of_display) <visible-bell>: Add a reference to
+	ring-bell-function.  Suggested by Alf-Ivar Holm <alfh@ifi.uio.no>
+
+2001-10-26  Gerd Moellmann  <gerd@gnu.org>
+
+	* insdel.c (insert_1_both): Do nothing if NCHARS == 0.
+
+	* xterm.c (XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
+	Fix clearing in the case of scroll bars on the right.
+	
+	* xfns.c (XScreenNumberOfScreen): Fix struct to pointer
+	comparison.
+
+2001-10-25  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* frame.c (Fframe_parameter): Fix last change.
+
+2001-10-25  Gerd Moellmann  <gerd@gnu.org>
+
+	* frame.c (Fframe_parameter): Fix a bug whereby some
+	``artificial'' frame parameters, like `minibuffer' were not
+	obtained by calling Fframe_parameters.
+
+	* xterm.c (show_mouse_face): Clean up.  Recognize overwritten
+	cursor differently.
+
+	* xdisp.c (move_it_vertically_backward): Compute line height
+	differently.  Add heuristic to try to be more compatible to 20.x.
+
+2001-10-24  Gerd Moellmann  <gerd@gnu.org>
+
+	* xterm.c (x_draw_glyphs): Don't check for cursor overwriting
+	in full-width rows.
+
+	* xterm.c (XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
+	Fix clearing of area not covered by scroll bar.
+
+	* xdisp.c: Change #ifdef GLYPH_DEBUG to #if.
+
+	* xdisp.c (try_window_reusing_current_matrix): Use row_containing_pos.
+	(row_containing_pos): Take additional argument DY.  Treat rows ending
+	in middle of char differently.
+	(display_line): Handle tabs on window systems differently.
+
+	* xterm.c (fast_find_position): Call row_containing_pos
+	with additional argument.
+
+	* dispextern.h (row_containing_pos): Adjust prototype.
+
+	* xdisp.c (inhibit_try_window_id, inhibit_try_window_reusing)
+	(inhibit_try_cursor_movement) [GLYPH_DEBUG]: New variables.
+	(try_window_id, try_window_reusing_current_matrix)
+	(try_cursor_movement) [GLYPH_DEBUG]: Don't run if inhibited.
+	(syms_of_xdisp) [GLYPH_DEBUG]:  DEFVAR_BOOL the variables.
+
+2001-10-23  Gerd Moellmann  <gerd@gnu.org>
+
+	* dispnew.c (sync_window_with_frame_matrix_rows):
+	Fix handling of windows which aren't full-width, fix handling
+	of marginal areas.
+
+	* lread.c (syms_of_lread)<recursive-load-depth-limit>: Raise to 50.
+
+	* xterm.c (x_draw_glyphs): Remove parameters READ_START and
+	REAL_END.  Notice if cursor gets overwritten.
+	(notice_overwritten_cursor): Take X positions as parameters.
+	(x_draw_phys_cursor_glyph): Save state of w->phys_cursor_on_p
+	around call to x_draw_glyphs.
+
+	* xdisp.c (display_line): For a tab continued to the next line,
+	set row's ends_in_middle_of_char_p.
+
+2001-10-23  Andreas Schwab  <schwab@suse.de>
+
+	* m/macppc.h [LINUX]: Undef LD_SWITCH_SYSTEM_TEMACS and override
+	LD_SWITCH_MACHINE_TEMACS with "-Xlinker -znocombreloc".
+
+2001-10-22  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (display_line): Fix computation of continuation lines
+	width for TABs.
+
 2001-10-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 21.1 released.
diff -ruN src-21.1/src/Makefile.in src-21.2/src/Makefile.in
--- src-21.1/src/Makefile.in	Mon Oct  8 17:43:18 2001
+++ src-21.2/src/Makefile.in	Mon Dec 17 15:09:32 2001
@@ -1044,7 +1044,7 @@
 filemode.o: filemode.c  $(config_h)
 frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
    buffer.h charset.h fontset.h msdos.h dosfns.h dispextern.h $(config_h)
-fontset.o: dispextern.h fontset.h fontset.c ccl.h charset.h frame.h \
+fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \
    keyboard.h $(config_h)
 getloadavg.o: getloadavg.c $(config_h)
 indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \
@@ -1115,9 +1115,9 @@
    $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \
    charset.h $(config_h)
 xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h keyboard.h \
-   $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h msdos.h \
-   $(config_h)
-xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h \
+   buffer.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h \
+   msdos.h $(config_h)
+xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \
   dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \
   keyboard.h gnu.h charset.h ccl.h fontset.h composite.h \
   coding.h $(config_h)
diff -ruN src-21.1/src/buffer.c src-21.2/src/buffer.c
--- src-21.1/src/buffer.c	Tue Sep 18 15:51:22 2001
+++ src-21.2/src/buffer.c	Mon Jan 28 17:55:08 2002
@@ -1310,10 +1310,12 @@
   frames_discard_buffer (buf);
   Vinhibit_quit = tem;
 
-  /* Delete any auto-save file, if we saved it in this session.  */
+  /* Delete any auto-save file, if we saved it in this session.
+     But not if the buffer is modified.  */
   if (STRINGP (b->auto_save_file_name)
       && b->auto_save_modified != 0
-      && BUF_SAVE_MODIFF (b) < b->auto_save_modified)
+      && BUF_SAVE_MODIFF (b) < b->auto_save_modified
+      && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b))
     {
       Lisp_Object tem;
       tem = Fsymbol_value (intern ("delete-auto-save-files"));
@@ -1444,7 +1446,9 @@
 }
 
 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0,
-  "Set an appropriate major mode for BUFFER, according to `default-major-mode'.\n\
+  "Set an appropriate major mode for BUFFER.\n\
+For the *scratch* buffer use `initial-major-mode', otherwise choose a\n\
+mode according to `default-major-mode'.\n\
 Use this function before selecting the buffer, since it may need to inspect\n\
 the current buffer's major mode.")
   (buffer)
@@ -1453,10 +1457,17 @@
   int count;
   Lisp_Object function;
 
-  function = buffer_defaults.major_mode;
-  if (NILP (function) && NILP (Fget (current_buffer->major_mode, Qmode_class)))
-    function = current_buffer->major_mode;
-
+  if (STRINGP (XBUFFER (buffer)->name)
+      && strcmp (XSTRING (XBUFFER (buffer)->name)->data, "*scratch*") == 0)
+    function = find_symbol_value (intern ("initial-major-mode"));
+  else
+    {
+      function = buffer_defaults.major_mode;
+      if (NILP (function)
+	  && NILP (Fget (current_buffer->major_mode, Qmode_class)))
+	function = current_buffer->major_mode;
+    }
+  
   if (NILP (function) || EQ (function, Qfundamental_mode))
     return Qnil;
 
@@ -5381,17 +5392,17 @@
   DEFVAR_PER_BUFFER ("scroll-up-aggressively",
 		     &current_buffer->scroll_up_aggressively, Qnil,
     "*If a number, scroll display up aggressively.\n\
-If scrolling a window because point is above the window start, choose\n\
+If scrolling a window because point is below the window end, choose\n\
 a new window start so that point ends up that fraction of the window's\n\
-height from the top of the window.\n\
+height from the bottom of the window.\n\
 Automatically becomes buffer-local when set in any fashion.");
   
   DEFVAR_PER_BUFFER ("scroll-down-aggressively",
 		     &current_buffer->scroll_down_aggressively, Qnil,
     "*If a number, scroll display down aggressively.\n\
-If scrolling a window because point is below the window end, choose\n\
+If scrolling a window because point is above the window start, choose\n\
 a new window start so that point ends up that fraction of the window's\n\
-height from the bottom of the window.\n\
+height from the top of the window.\n\
 Automatically becomes buffer-local when set in any fashion.");
   
 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol,
diff -ruN src-21.1/src/callproc.c src-21.2/src/callproc.c
--- src-21.1/src/callproc.c	Wed Oct  3 03:12:03 2001
+++ src-21.2/src/callproc.c	Mon Nov 26 01:37:40 2001
@@ -896,8 +896,12 @@
 	   but not past 64k.  */
 	if (bufsize < 64 * 1024 && total_read > 32 * bufsize)
 	  {
+	    char *tempptr;
 	    bufsize *= 2;
-	    bufptr = (char *) alloca (bufsize);
+
+	    tempptr = (char *) alloca (bufsize);
+	    bcopy (bufptr, tempptr, bufsize / 2);
+	    bufptr = tempptr;
 	  }
 
 	if (!NILP (display) && INTERACTIVE)
diff -ruN src-21.1/src/charset.c src-21.2/src/charset.c
--- src-21.1/src/charset.c	Fri Jul 13 11:30:42 2001
+++ src-21.2/src/charset.c	Fri Feb 22 11:51:46 2002
@@ -599,11 +599,15 @@
   Lisp_Object val;
   int charset;
 
-  return ((SYMBOLP (charset_symbol)
-	   && (val = Fget (charset_symbol, Qcharset), VECTORP (val))
-	   && (charset = XINT (XVECTOR (val)->contents[CHARSET_ID_IDX]),
-	       CHARSET_VALID_P (charset)))
-	  ? charset : -1);
+  /* This originally used a ?: operator, but reportedly the HP-UX
+     compiler version HP92453-01 A.10.32.22 miscompiles that.  */
+  if (SYMBOLP (charset_symbol)
+      && VECTORP (val = Fget (charset_symbol, Qcharset))
+      && CHARSET_VALID_P (charset =
+			  XINT (XVECTOR (val)->contents[CHARSET_ID_IDX])))
+    return charset;
+  else
+    return -1;
 }
 
 /* Return an identification number for a new private charset of
@@ -710,6 +714,7 @@
   Fput (charset_symbol, Qcharset, CHARSET_TABLE_ENTRY (XINT (charset_id)));
   CHARSET_SYMBOL (XINT (charset_id)) = charset_symbol;
   Vcharset_list = Fcons (charset_symbol, Vcharset_list);
+  Fupdate_coding_systems_internal ();
   return Qnil;
 }
 
diff -ruN src-21.1/src/coding.c src-21.2/src/coding.c
--- src-21.1/src/coding.c	Mon Jul 23 11:26:46 2001
+++ src-21.2/src/coding.c	Fri Feb 22 11:51:46 2002
@@ -811,6 +811,10 @@
 	return 0;
       for (ncomponent = 0; src < src_base + data_len; ncomponent++)
 	{
+	  /* If it is longer than this, it can't be valid.  */
+	  if (ncomponent >= COMPOSITION_DATA_MAX_BUNCH_LENGTH)
+	    return 0;
+
 	  if (ncomponent % 2 && with_rule)
 	    {
 	      ONE_MORE_BYTE (gref);
@@ -1665,7 +1669,7 @@
 
 #define DECODE_COMPOSITION_END(c1)					\
   do {									\
-    if (coding->composing == COMPOSITION_DISABLED)			\
+    if (! COMPOSING_P (coding))						\
       {									\
 	*dst++ = ISO_CODE_ESC;						\
 	*dst++ = c1;							\
@@ -5518,7 +5522,11 @@
       if (encodep)
 	result = encode_coding (coding, src, dst, len_byte, 0);
       else
-	result = decode_coding (coding, src, dst, len_byte, 0);
+	{
+	  if (coding->composing != COMPOSITION_DISABLED)
+	    coding->cmp_data->char_offset = from + inserted;
+	  result = decode_coding (coding, src, dst, len_byte, 0);
+	}
 
       /* The buffer memory is now:
 	 +--------+-------converted-text----+--+------original-text----+---+
@@ -7106,7 +7114,7 @@
      But don't staticpro it here--that is done in alloc.c.  */
   Qchar_table_extra_slots = intern ("char-table-extra-slots");
   Fput (Qsafe_chars, Qchar_table_extra_slots, make_number (0));
-  Fput (Qchar_coding_system, Qchar_table_extra_slots, make_number (1));
+  Fput (Qchar_coding_system, Qchar_table_extra_slots, make_number (2));
 
   Qvalid_codes = intern ("valid-codes");
   staticpro (&Qvalid_codes);
@@ -7263,7 +7271,8 @@
   Vnetwork_coding_system_alist = Qnil;
 
   DEFVAR_LISP ("locale-coding-system", &Vlocale_coding_system,
-    "Coding system to use with system messages.");
+    "Coding system to use with system messages.  Also used for decoding\n\
+keyboard input on X Window system.");
   Vlocale_coding_system = Qnil;
 
   /* The eol mnemonics are reset in startup.el system-dependently.  */
diff -ruN src-21.1/src/coding.h src-21.2/src/coding.h
--- src-21.1/src/coding.h	Thu Feb 15 00:51:03 2001
+++ src-21.2/src/coding.h	Wed Mar 13 20:52:14 2002
@@ -620,6 +620,9 @@
 					    Lisp_Object));
 extern int code_convert_region P_ ((int, int, int, int, struct coding_system *,
 				    int, int));
+extern Lisp_Object run_pre_post_conversion_on_str P_ ((Lisp_Object,
+						       struct coding_system *,
+						       int));
 extern int decoding_buffer_size P_ ((struct coding_system *, int));
 extern int encoding_buffer_size P_ ((struct coding_system *, int));
 extern void detect_coding P_ ((struct coding_system *, unsigned char *, int));
diff -ruN src-21.1/src/data.c src-21.2/src/data.c
--- src-21.1/src/data.c	Thu Mar 29 15:58:30 2001
+++ src-21.2/src/data.c	Sat Nov  3 17:14:45 2001
@@ -1413,7 +1413,7 @@
 works.\n\
 \n\
 Do not use `make-local-variable' to make a hook variable buffer-local.\n\
-Use `make-local-hook' instead.")
+Instead, use `add-hook' and specify t for the LOCAL argument.")
   (variable)
      register Lisp_Object variable;
 {
diff -ruN src-21.1/src/dispextern.h src-21.2/src/dispextern.h
--- src-21.1/src/dispextern.h	Mon Oct  1 12:53:18 2001
+++ src-21.2/src/dispextern.h	Wed Oct 31 12:13:07 2001
@@ -1317,6 +1317,11 @@
   unsigned tty_reverse_p : 1;
   unsigned tty_blinking_p : 1;
 
+  /* 1 means that colors of this face may not be freed because they
+     have been copied bitwise from a base face (see
+     realize_x_face).  */
+  unsigned colors_copied_bitwise_p : 1;
+
   /* Next and previous face in hash collision list of face cache.  */
   struct face *next, *prev;
 
@@ -2162,7 +2167,7 @@
 
 struct glyph_row *row_containing_pos P_ ((struct window *, int,
 					  struct glyph_row *,
-					  struct glyph_row *));
+					  struct glyph_row *, int));
 int string_buffer_position P_ ((struct window *, Lisp_Object, int));
 int line_bottom_y P_ ((struct it *));
 int display_prop_intangible_p P_ ((Lisp_Object));
diff -ruN src-21.1/src/dispnew.c src-21.2/src/dispnew.c
--- src-21.1/src/dispnew.c	Wed Sep 26 13:15:40 2001
+++ src-21.2/src/dispnew.c	Thu Nov 15 11:30:41 2001
@@ -3022,8 +3022,7 @@
 
 
 /* Synchronize glyph pointers in the current matrix of window W with
-   the current frame matrix.  W must be full-width, and be on a tty
-   frame.  */
+   the current frame matrix.  */
 
 static void
 sync_window_with_frame_matrix_rows (w)
@@ -3031,27 +3030,31 @@
 {
   struct frame *f = XFRAME (w->frame);
   struct glyph_row *window_row, *window_row_end, *frame_row;
+  int area, left, right, x, width;
 
-  /* Preconditions: W must be a leaf window and full-width.  Its frame
-     must have a frame matrix.  */
+  /* Preconditions: W must be a leaf window on a tty frame.  */
   xassert (NILP (w->hchild) && NILP (w->vchild));
-  xassert (WINDOW_FULL_WIDTH_P (w));
   xassert (!FRAME_WINDOW_P (f));
 
-  /* If W is a full-width window, glyph pointers in W's current matrix
-     have, by definition, to be the same as glyph pointers in the
-     corresponding frame matrix.  */
+  left = margin_glyphs_to_reserve (w, 1, w->left_margin_width);
+  right = margin_glyphs_to_reserve (w, 1, w->right_margin_width);
+  x = w->current_matrix->matrix_x;
+  width = w->current_matrix->matrix_w;
+
   window_row = w->current_matrix->rows;
   window_row_end = window_row + w->current_matrix->nrows;
   frame_row = f->current_matrix->rows + XFASTINT (w->top);
-  while (window_row < window_row_end)
+  
+  for (; window_row < window_row_end; ++window_row, ++frame_row)
     {
-      int area;
-      
-      for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area)
-	window_row->glyphs[area] = frame_row->glyphs[area];
-
-      ++window_row, ++frame_row;
+      window_row->glyphs[LEFT_MARGIN_AREA]
+	= frame_row->glyphs[0] + x;
+      window_row->glyphs[TEXT_AREA]
+	= window_row->glyphs[LEFT_MARGIN_AREA] + left;
+      window_row->glyphs[LAST_AREA]
+	= window_row->glyphs[LEFT_MARGIN_AREA] + width;
+      window_row->glyphs[RIGHT_MARGIN_AREA]
+	= window_row->glyphs[LAST_AREA] - right;
     }
 }
 
@@ -3738,8 +3741,8 @@
   row = MATRIX_ROW (w->current_matrix, w->cursor.vpos);
 
   /* Give up if PT is outside of the last known cursor row.  */
-  if (PT <= MATRIX_ROW_START_BYTEPOS (row)
-      || PT >= MATRIX_ROW_END_BYTEPOS (row))
+  if (PT <= MATRIX_ROW_START_CHARPOS (row)
+      || PT >= MATRIX_ROW_END_CHARPOS (row))
     return 0;
 
   set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
@@ -6022,8 +6025,9 @@
   }
 
   adjust_glyphs (f);
-  SET_FRAME_GARBAGED (f);
   calculate_costs (f);
+  SET_FRAME_GARBAGED (f);
+  f->resized_p = 1;
 
   UNBLOCK_INPUT;
 
@@ -6652,7 +6656,9 @@
 This means everything is in inverse video which otherwise would not be.");
   
   DEFVAR_BOOL ("visible-bell", &visible_bell,
-    "*Non-nil means try to flash the frame to represent a bell.");
+    "*Non-nil means try to flash the frame to represent a bell.\n\
+\n\
+See also `ring-bell-function'.");
   
   DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter,
     "*Non-nil means no need to redraw entire frame after suspending.\n\
diff -ruN src-21.1/src/editfns.c src-21.2/src/editfns.c
--- src-21.1/src/editfns.c	Fri Oct 19 18:35:21 2001
+++ src-21.2/src/editfns.c	Wed Mar 13 20:52:17 2002
@@ -33,6 +33,8 @@
 #include <unistd.h>
 #endif
 
+#include <ctype.h>
+
 #include "lisp.h"
 #include "intervals.h"
 #include "buffer.h"
@@ -3943,7 +3945,7 @@
   staticpro (&Qbuffer_access_fontify_functions);
 
   DEFVAR_LISP ("inhibit-field-text-motion", &Vinhibit_field_text_motion,
-    "Non-nil means.text motion commands don't notice fields.");
+    "Non-nil means text motion commands don't notice fields.");
   Vinhibit_field_text_motion = Qnil;
 
   DEFVAR_LISP ("buffer-access-fontify-functions",
diff -ruN src-21.1/src/emacs.c src-21.2/src/emacs.c
--- src-21.1/src/emacs.c	Thu Aug 30 15:36:24 2001
+++ src-21.2/src/emacs.c	Mon Oct 29 12:31:07 2001
@@ -261,7 +261,7 @@
 --border-width, -bw WIDTH	width of main border\n\
 --cursor-color, -cr COLOR	color of the Emacs cursor indicating point\n\
 --display, -d DISPLAY		use X server DISPLAY\n\
---font, -fn FONT		default font; must be fixed-widthp\n\
+--font, -fn FONT		default font; must be fixed-width\n\
 --foreground-color, -fg COLOR	window foreground color\n\
 --geometry, -g GEOMETRY		window geometry\n\
 --iconic			start Emacs in iconified state\n\
@@ -271,7 +271,7 @@
 --mouse-color, -ms COLOR 	mouse cursor color in Emacs window\n\
 --name NAME			title of main Emacs window\n\
 --reverse-video, -r, -rv	switch foreground and background\n\
---title, -T, -wn, TITLE		title for Emacs windows\n\
+--title, -T, -wn TITLE		title for Emacs windows\n\
 --vertical-scroll-bars, -vb	enable vertical scroll bars\n\
 --xrm XRESOURCES		set additional X resources\n\
 \n\
@@ -542,7 +542,7 @@
 
 DEFUN ("invocation-directory", Finvocation_directory, Sinvocation_directory,
   0, 0, 0,
-  "Return the directory name in which the Emacs executable was located")
+  "Return the directory name in which the Emacs executable was located.")
   ()
 {
   return Fcopy_sequence (Vinvocation_directory);
diff -ruN src-21.1/src/eval.c src-21.2/src/eval.c
--- src-21.1/src/eval.c	Sat Oct 20 10:51:26 2001
+++ src-21.2/src/eval.c	Sat Nov  3 17:29:25 2001
@@ -2182,7 +2182,8 @@
 If the value is a function, it is called with no arguments.\n\
 If it is a list, the elements are called, in order, with no arguments.\n\
 \n\
-To make a hook variable buffer-local, use `make-local-hook',\n\
+Do not use `make-local-variable' to make a hook variable buffer-local.\n\
+Instead, use `add-hook' and specify t for the LOCAL argument.\n\
 not `make-local-variable'.")
   (nargs, args)
      int nargs;
@@ -2212,7 +2213,8 @@
 It is best not to depend on the value return by `run-hook-with-args',\n\
 as that may change.\n\
 \n\
-To make a hook variable buffer-local, use `make-local-hook',\n\
+Do not use `make-local-variable' to make a hook variable buffer-local.\n\
+Instead, use `add-hook' and specify t for the LOCAL argument.\n\
 not `make-local-variable'.")
   (nargs, args)
      int nargs;
@@ -2230,7 +2232,8 @@
 returns a non-nil value.  Then we return that value.\n\
 If all the functions return nil, we return nil.\n\
 \n\
-To make a hook variable buffer-local, use `make-local-hook',\n\
+Do not use `make-local-variable' to make a hook variable buffer-local.\n\
+Instead, use `add-hook' and specify t for the LOCAL argument.\n\
 not `make-local-variable'.")
   (nargs, args)
      int nargs;
@@ -2248,7 +2251,8 @@
 returns nil.  Then we return nil.\n\
 If all the functions return non-nil, we return non-nil.\n\
 \n\
-To make a hook variable buffer-local, use `make-local-hook',\n\
+Do not use `make-local-variable' to make a hook variable buffer-local.\n\
+Instead, use `add-hook' and specify t for the LOCAL argument.\n\
 not `make-local-variable'.")
   (nargs, args)
      int nargs;
diff -ruN src-21.1/src/fileio.c src-21.2/src/fileio.c
--- src-21.1/src/fileio.c	Wed Sep 26 17:29:49 2001
+++ src-21.2/src/fileio.c	Wed Mar 13 20:52:18 2002
@@ -2342,12 +2342,25 @@
   else if (NILP (keep_time))
     {
       EMACS_TIME now;
+      DWORD attributes;
+      char * filename;
+
       EMACS_GET_TIME (now);
-      if (set_file_times (XSTRING (encoded_newname)->data,
-			  now, now))
-	Fsignal (Qfile_date_error,
-		 Fcons (build_string ("Cannot set file date"),
-			Fcons (newname, Qnil)));
+      filename = XSTRING (encoded_newname)->data;
+
+      /* Ensure file is writable while its modified time is set.  */
+      attributes = GetFileAttributes (filename);
+      SetFileAttributes (filename, attributes & ~FILE_ATTRIBUTE_READONLY);
+      if (set_file_times (filename, now, now))
+	{
+	  /* Restore original attributes.  */
+	  SetFileAttributes (filename, attributes);
+	  Fsignal (Qfile_date_error,
+		   Fcons (build_string ("Cannot set file date"),
+			  Fcons (newname, Qnil)));
+	}
+      /* Restore original attributes.  */
+      SetFileAttributes (filename, attributes);
     }
 #else /* not WINDOWSNT */
   ifd = emacs_open (XSTRING (encoded_file)->data, O_RDONLY, 0);
diff -ruN src-21.1/src/floatfns.c src-21.2/src/floatfns.c
--- src-21.1/src/floatfns.c	Wed Aug 23 00:19:26 2000
+++ src-21.2/src/floatfns.c	Fri Feb 22 11:51:46 2002
@@ -857,7 +857,12 @@
 
 DEFUN ("round", Fround, Sround, 1, 2, 0,
   "Return the nearest integer to ARG.\n\
-With optional DIVISOR, return the nearest integer to ARG/DIVISOR.")
+With optional DIVISOR, return the nearest integer to ARG/DIVISOR.\n\
+\n\
+Rounding a value equidistant between two integers may choose the\n\
+integer closer to zero, or it may prefer an even integer, depending on\n\
+your machine.  For example, \(round 2.5\) can return 3 on some\n\
+systems, but 2 on others.")
   (arg, divisor)
      Lisp_Object arg, divisor;
 {
diff -ruN src-21.1/src/frame.c src-21.2/src/frame.c
--- src-21.1/src/frame.c	Sun Sep 30 12:13:00 2001
+++ src-21.2/src/frame.c	Thu Oct 25 23:03:52 2001
@@ -2077,13 +2077,15 @@
   
   if (FRAME_LIVE_P (f))
     {
+      /* Avoid consing in frequent cases.  */
       if (EQ (parameter, Qname))
 	value = f->name;
 #ifdef HAVE_X_WINDOWS
       else if (EQ (parameter, Qdisplay) && FRAME_X_P (f))
 	value = XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element);
 #endif /* HAVE_X_WINDOWS */
-      else
+      else if (EQ (parameter, Qbackground_color)
+	       || EQ (parameter, Qforeground_color))
 	{
 	  value = Fassq (parameter, f->param_alist);
 	  if (CONSP (value))
@@ -2118,13 +2120,14 @@
 		    }
 		}
 	    }
-	  else if (EQ (parameter, Qdisplay_type)
-		   || EQ (parameter, Qbackground_mode))
-	    /* Avoid consing in frequent cases.  */
-	    value = Qnil;
 	  else
 	    value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
 	}
+      else if (EQ (parameter, Qdisplay_type)
+	       || EQ (parameter, Qbackground_mode))
+	value = Fcdr (Fassq (parameter, f->param_alist));
+      else
+	value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
     }
   
   return value;
diff -ruN src-21.1/src/frame.h src-21.2/src/frame.h
--- src-21.1/src/frame.h	Wed Jan 31 21:34:39 2001
+++ src-21.2/src/frame.h	Tue Oct 30 18:04:08 2001
@@ -371,6 +371,10 @@
 
   /* Additional space to put between text lines on this frame.  */
   int extra_line_spacing;
+
+  /* Set to non-zero in change_frame_size when size of frame changed
+     Clear the frame in clear_garbaged_frames if set.  */
+  unsigned resized_p : 1;
 };
 
 #ifdef MULTI_KBOARD
diff -ruN src-21.1/src/gmalloc.c src-21.2/src/gmalloc.c
--- src-21.1/src/gmalloc.c	Wed Apr 18 12:25:48 2001
+++ src-21.2/src/gmalloc.c	Sun Nov  4 18:35:43 2001
@@ -36,8 +36,9 @@
 #include <config.h>
 #endif
 
-#if defined __cplusplus || (defined (__STDC__) && __STDC__) || \
-  defined STDC_HEADERS || defined PROTOTYPES
+#if ((defined __cplusplus || (defined (__STDC__) && __STDC__) \
+      || defined STDC_HEADERS || defined PROTOTYPES) \
+     && ! defined (BROKEN_PROTOTYPES))
 #undef	PP
 #define	PP(args)	args
 #undef	__ptr_t
diff -ruN src-21.1/src/insdel.c src-21.2/src/insdel.c
--- src-21.1/src/insdel.c	Tue Sep 11 14:31:56 2001
+++ src-21.2/src/insdel.c	Fri Oct 26 14:03:11 2001
@@ -916,6 +916,9 @@
      register int nchars, nbytes;
      int inherit, prepare, before_markers;
 {
+  if (nchars == 0)
+    return;
+  
   if (NILP (current_buffer->enable_multibyte_characters))
     nchars = nbytes;
 
diff -ruN src-21.1/src/keyboard.c src-21.2/src/keyboard.c
--- src-21.1/src/keyboard.c	Wed Sep 26 14:01:19 2001
+++ src-21.2/src/keyboard.c	Mon Jan 28 17:33:19 2002
@@ -2968,7 +2968,7 @@
      Lisp_Object c;
 {
   /* Don't record `help-echo' in recent_keys unless it shows some help
-     message, and a different help than the previoiusly recorded
+     message, and a different help than the previously recorded
      event.  */
   if (CONSP (c) && EQ (XCAR (c), Qhelp_echo))
     {
@@ -9570,7 +9570,7 @@
 \n\
 Calling this function directs the translated event to replace\n\
 the original event, so that only one version of the event actually\n\
-appears in the echo area and in the value of `this-command-keys.'.")
+appears in the echo area and in the value of `this-command-keys'.")
   ()
 {
   before_command_restore_flag = 1;
@@ -10779,11 +10779,11 @@
   Vsuggest_key_bindings = Qt;
 
   DEFVAR_LISP ("timer-list", &Vtimer_list,
-    "List of active absolute time timers in order of increasing time");
+    "List of active absolute time timers in order of increasing time.");
   Vtimer_list = Qnil;
 
   DEFVAR_LISP ("timer-idle-list", &Vtimer_idle_list,
-    "List of active idle-time timers in order of increasing time");
+    "List of active idle-time timers in order of increasing time.");
   Vtimer_idle_list = Qnil;
 
   DEFVAR_LISP ("input-method-function", &Vinput_method_function,
@@ -10828,7 +10828,7 @@
 variable to non-nil, then we suppress the point adjustment.\n\
 \n\
 This variable is set to nil before reading a command, and is checked\n\
-just after executing the command");
+just after executing the command.");
   Vdisable_point_adjustment = Qnil;
 
   DEFVAR_LISP ("global-disable-point-adjustment",
diff -ruN src-21.1/src/keymap.c src-21.2/src/keymap.c
--- src-21.1/src/keymap.c	Fri Aug 24 10:42:35 2001
+++ src-21.2/src/keymap.c	Wed Feb  6 12:47:40 2002
@@ -1174,7 +1174,7 @@
 	    {
 	      val = assq_no_quit (var, lists[0]);
 	      if (!NILP (val))
-		break;
+		continue;
 	    }
 
 	  if (i >= cmm_size)
diff -ruN src-21.1/src/lisp.h src-21.2/src/lisp.h
--- src-21.1/src/lisp.h	Wed Sep 26 14:00:56 2001
+++ src-21.2/src/lisp.h	Fri Feb 22 11:51:46 2002
@@ -2926,6 +2926,7 @@
 extern void init_xfns P_ ((void));
 extern Lisp_Object Vx_resource_name;
 EXFUN (Fxw_display_color_p, 1);
+EXFUN (Fx_file_dialog, 4);
 #endif /* HAVE_X_WINDOWS */
 
 /* Defined in xselect.c */
diff -ruN src-21.1/src/lread.c src-21.2/src/lread.c
--- src-21.1/src/lread.c	Sat Jun  2 08:09:41 2001
+++ src-21.2/src/lread.c	Tue Oct 30 17:37:27 2001
@@ -193,6 +193,7 @@
 
 static Lisp_Object Vbytecomp_version_regexp;
 
+static void to_multibyte P_ ((char **, char **, int *));
 static void readevalloop P_ ((Lisp_Object, FILE*, Lisp_Object, 
 			      Lisp_Object (*) (), int,
 			      Lisp_Object, Lisp_Object));
@@ -1757,6 +1758,43 @@
 }
 
 
+/* Convert unibyte text in read_buffer to multibyte.
+
+   Initially, *P is a pointer after the end of the unibyte text, and
+   the pointer *END points after the end of read_buffer.
+
+   If read_buffer doesn't have enough room to hold the result
+   of the conversion, reallocate it and adjust *P and *END.
+
+   At the end, make *P point after the result of the conversion, and
+   return in *NCHARS the number of characters in the converted
+   text.  */
+
+static void
+to_multibyte (p, end, nchars)
+     char **p, **end;
+     int *nchars;
+{
+  int nbytes;
+
+  parse_str_as_multibyte (read_buffer, *p - read_buffer, &nbytes, nchars);
+  if (read_buffer_size < 2 * nbytes)
+    {
+      int offset = *p - read_buffer;
+      read_buffer_size *= 2;
+      read_buffer = (char *) xrealloc (read_buffer, read_buffer_size);
+      *p = read_buffer + offset;
+      *end = read_buffer + read_buffer_size;
+    }
+
+  if (nbytes != *nchars)
+    nbytes = str_as_multibyte (read_buffer, read_buffer_size,
+			       *p - read_buffer, nchars);
+  
+  *p = read_buffer + nbytes;
+}
+
+
 /* If the next token is ')' or ']' or '.', we store that character
    in *PCH and the return value is not interesting.  Else, we store
    zero in *PCH and we read and return one lisp object.
@@ -2110,8 +2148,8 @@
 
     case '"':
       {
-	register char *p = read_buffer;
-	register char *end = read_buffer + read_buffer_size;
+	char *p = read_buffer;
+	char *end = read_buffer + read_buffer_size;
 	register int c;
 	/* Nonzero if we saw an escape sequence specifying
 	   a multibyte character.  */
@@ -2196,15 +2234,13 @@
 	  return make_number (0);
 
 	if (force_multibyte)
-	  p = read_buffer + str_as_multibyte (read_buffer, end - read_buffer,
-					      p - read_buffer, &nchars);
+	  to_multibyte (&p, &end, &nchars);
 	else if (force_singlebyte)
 	  nchars = p - read_buffer;
 	else if (load_convert_to_unibyte)
 	  {
 	    Lisp_Object string;
-	    p = read_buffer + str_as_multibyte (read_buffer, end - read_buffer,
-						p - read_buffer, &nchars);
+	    to_multibyte (&p, &end, &nchars);
 	    if (p - read_buffer != nchars)
 	      {
 		string = make_multibyte_string (read_buffer, nchars,
@@ -2214,13 +2250,14 @@
 	  }
 	else if (EQ (readcharfun, Qget_file_char)
 		 || EQ (readcharfun, Qlambda))
-	  /* Nowadays, reading directly from a file is used only for
-	     compiled Emacs Lisp files, and those always use the
-	     Emacs internal encoding.  Meanwhile, Qlambda is used
-	     for reading dynamic byte code (compiled with
-	     byte-compile-dynamic = t).  */
-	  p = read_buffer + str_as_multibyte (read_buffer, end - read_buffer,
-					      p - read_buffer, &nchars);
+	  {
+	    /* Nowadays, reading directly from a file is used only for
+	       compiled Emacs Lisp files, and those always use the
+	       Emacs internal encoding.  Meanwhile, Qlambda is used
+	       for reading dynamic byte code (compiled with
+	       byte-compile-dynamic = t).  */
+	    to_multibyte (&p, &end, &nchars);
+	  }
 	else
 	  /* In all other cases, if we read these bytes as
 	     separate characters, treat them as separate characters now.  */
@@ -3618,7 +3655,7 @@
     "Limit for depth of recursive loads.\n\
 Value should be either an integer > 0 specifying the limit, or nil for\n\
 no limit.");
-  Vrecursive_load_depth_limit = make_number (10);
+  Vrecursive_load_depth_limit = make_number (50);
 
   /* Vsource_directory was initialized in init_lread.  */
 
diff -ruN src-21.1/src/m/macppc.h src-21.2/src/m/macppc.h
--- src-21.1/src/m/macppc.h	Fri Sep 28 10:03:25 2001
+++ src-21.2/src/m/macppc.h	Tue Oct 23 08:43:33 2001
@@ -96,6 +96,10 @@
 #ifdef LINUX
 #define LINKER $(CC) -nostdlib
 #define LD_SWITCH_MACHINE -Xlinker -m -Xlinker elf32ppc
+/* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here
+   because prefix-args is not used.  */
+#undef LD_SWITCH_SYSTEM_TEMACS
+#define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc
 #endif
 
 #if 0  /* This breaks things on PPC GNU/Linux ecept for Yellowdog,
diff -ruN src-21.1/src/m/news-risc.h src-21.2/src/m/news-risc.h
--- src-21.1/src/m/news-risc.h	Thu Mar  2 11:23:27 2000
+++ src-21.2/src/m/news-risc.h	Tue Nov  6 05:50:33 2001
@@ -51,4 +51,9 @@
 #undef KERNEL_FILE
 #define KERNEL_FILE "/vmunix"
 
+/* System's malloc, realloc, calloc and so on have bad prototypes,
+   using char * instead of void *, so tell gmalloc not to use the
+   prototypes.  */
+#define BROKEN_PROTOTYPES
+
 #endif /* not NEWSOS5 */
diff -ruN src-21.1/src/msdos.c src-21.2/src/msdos.c
--- src-21.1/src/msdos.c	Fri Jul  6 17:31:47 2001
+++ src-21.2/src/msdos.c	Fri Nov 23 18:20:58 2001
@@ -414,6 +414,8 @@
 
 Lisp_Object Qbar;
 
+static int initial_screen_colors[2];
+
 #if __DJGPP__ > 1
 /* Update the screen from a part of relocated DOS/V screen buffer which
    begins at OFFSET and includes COUNT characters.  */
@@ -1801,7 +1803,16 @@
 {
   if (termscript)
     fprintf (termscript, "<CLR:SCR>");
-  IT_set_face (0);
+  /* We are sometimes called (from clear_garbaged_frames) when a new
+     frame is being created, but its faces are not yet realized.  In
+     such a case we cannot call IT_set_face, since it will fail to find
+     any valid faces and will abort.  Instead, use the initial screen
+     colors; that should mimic what a Unix tty does, which simply clears
+     the screen with whatever default colors are in use.  */
+  if (FACE_FROM_ID (SELECTED_FRAME (), DEFAULT_FACE_ID) == NULL)
+    ScreenAttrib = (initial_screen_colors[0] << 4) | initial_screen_colors[1];
+  else
+    IT_set_face (0);
   mouse_off ();
   ScreenClear ();
   if (screen_virtual_segment)
@@ -2299,9 +2310,6 @@
 
 /* Remember the screen colors of the curent frame, to serve as the
    default colors for newly-created frames.  */
-
-static int initial_screen_colors[2];
-
 DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors,
        Smsdos_remember_default_colors, 1, 1, 0,
   "Remember the screen colors of the current frame.")
diff -ruN src-21.1/src/process.c src-21.2/src/process.c
--- src-21.1/src/process.c	Tue Sep 25 10:21:22 2001
+++ src-21.2/src/process.c	Mon Jan  7 22:21:08 2002
@@ -3276,7 +3276,6 @@
 	  && !NILP (XBUFFER (object)->enable_multibyte_characters))
       || EQ (object, Qt))
     {
-      coding->src_multibyte = 1;
       if (!EQ (coding->symbol, XPROCESS (proc)->encode_coding_system))
 	/* The coding system for encoding was changed to raw-text
 	   because we sent a unibyte text previously.  Now we are
@@ -3285,6 +3284,10 @@
 	   process.  */
 	setup_coding_system (XPROCESS (proc)->encode_coding_system,
 			     coding);
+      /* src_multibyte should be set to 1 _after_ a call to
+	 setup_coding_system, since it resets src_multibyte to
+	 zero.  */
+      coding->src_multibyte = 1;
     }
   else
     {
diff -ruN src-21.1/src/puresize.h src-21.2/src/puresize.h
--- src-21.1/src/puresize.h	Mon Feb  5 18:41:40 2001
+++ src-21.2/src/puresize.h	Fri Feb 22 12:20:08 2002
@@ -42,7 +42,7 @@
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (700000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (710000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */
diff -ruN src-21.1/src/regex.c src-21.2/src/regex.c
--- src-21.1/src/regex.c	Sat May 12 12:52:38 2001
+++ src-21.2/src/regex.c	Fri Nov  2 17:10:25 2001
@@ -5833,8 +5833,8 @@
 
 int
 regcomp (preg, pattern, cflags)
-    regex_t *preg;
-    const char *pattern;
+    regex_t *__restrict preg;
+    const char *__restrict pattern;
     int cflags;
 {
   reg_errcode_t ret;
@@ -5918,8 +5918,8 @@
 
 int
 regexec (preg, string, nmatch, pmatch, eflags)
-    const regex_t *preg;
-    const char *string;
+    const regex_t *__restrict preg;
+    const char *__restrict string;
     size_t nmatch;
     regmatch_t pmatch[];
     int eflags;
diff -ruN src-21.1/src/s/hpux10.h src-21.2/src/s/hpux10.h
--- src-21.1/src/s/hpux10.h	Mon Dec 18 19:09:36 2000
+++ src-21.2/src/s/hpux10.h	Sun Dec  9 17:44:12 2001
@@ -8,7 +8,7 @@
    tries to redeclare what was once srandom to be srand48.  So we go
    with HAVE_LRAND48 being defined.  */
 #undef srandom
-#undef srand48
+#undef random
 #undef HAVE_RANDOM
 #define HPUX10
 #define FORCE_ALLOCA_H
diff -ruN src-21.1/src/s/hpux11.h src-21.2/src/s/hpux11.h
--- src-21.1/src/s/hpux11.h	Thu Jan  1 01:00:00 1970
+++ src-21.2/src/s/hpux11.h	Wed Oct 31 18:32:45 2001
@@ -0,0 +1,8 @@
+#include "hpux10.h"
+
+#define HPUX11
+
+#ifdef POSIX_SIGNALS
+#undef POSIX_SIGNALS
+#endif
+#define POSIX_SIGNALS 1
diff -ruN src-21.1/src/s/sco5.h src-21.2/src/s/sco5.h
--- src-21.1/src/s/sco5.h	Mon Aug 28 17:03:56 2000
+++ src-21.2/src/s/sco5.h	Sun Dec 30 23:40:16 2001
@@ -70,7 +70,12 @@
 /* This is safe since we already assumed HAVE_SOCKET
    if using X windows.  */
 #undef LIBX11_SYSTEM
-#define LIBX11_SYSTEM -lpt -lnls -lnsl -lc -lsocket
+#define LIBX11_SYSTEM_COMMON -lpt -lnls -lnsl -lc -lsocket
+#ifdef MOTIF
+# define LIBX11_SYSTEM -lgen LIBX11_SYSTEM_COMMON
+#else /* ndef MOTIF */
+# define LIBX11_SYSTEM LIBX11_SYSTEM_COMMON
+#endif /* ndef MOTIF */
 
 #undef LIB_X11_LIB
 #define LIB_X11_LIB -lX11
@@ -127,6 +132,13 @@
 /* SCO Unix has Posix signals, but in 3.2.5 something broken that causes
  * all keyboard-quit signals to be lost after the first one. */
 #undef POSIX_SIGNALS
+
+#define SIGMASKTYPE long
+
+#ifndef NOT_C_CODE
+extern SIGMASKTYPE sigprocmask_set;
+#endif /* not NOT_C_CODE */
+
 #define sigblock(sig)					\
      (sigprocmask_set = SIGEMPTYMASK | (sig),		\
       sigprocmask (SIG_BLOCK, &sigprocmask_set, NULL))
diff -ruN src-21.1/src/s/sol2-5.h src-21.2/src/s/sol2-5.h
--- src-21.1/src/s/sol2-5.h	Wed Nov 22 11:37:31 2000
+++ src-21.2/src/s/sol2-5.h	Wed Dec  5 19:32:15 2001
@@ -24,6 +24,11 @@
 
 #undef USE_MMAP_FOR_BUFFERS
 
+/* This prevents crashes in "M-x shell".  */
+#ifndef HAVE_VFORK
+#define HAVE_VFORK 1
+#endif
+
 #if 0 /* A recent patch in unexelf.c should eliminate the need for this.  */
 /* Don't use the shared libraries for -lXt and -lXaw,
    to work around a linker bug in Solaris 2.5.
diff -ruN src-21.1/src/sound.c src-21.2/src/sound.c
--- src-21.1/src/sound.c	Mon Jul  9 19:15:27 2001
+++ src-21.2/src/sound.c	Mon Jan 28 17:33:20 2002
@@ -234,6 +234,7 @@
 static void vox_init P_ ((struct sound_device *));
 static void vox_write P_ ((struct sound_device *, char *, int));
 static void sound_perror P_ ((char *));
+static void sound_warning P_ ((char *));
 static int parse_sound P_ ((Lisp_Object, Lisp_Object *));
 static void find_sound_type P_ ((struct sound *));
 static u_int32_t le2hl P_ ((u_int32_t));
@@ -260,7 +261,26 @@
 sound_perror (msg)
      char *msg;
 {
-  error ("%s: %s", msg, strerror (errno));
+  int saved_errno = errno;
+
+  turn_on_atimers (1);
+#ifdef SIGIO
+  sigunblock (sigmask (SIGIO));
+#endif
+  if (saved_errno != 0)
+    error ("%s: %s", msg, strerror (saved_errno));
+  else
+    error ("%s", msg);
+}
+
+
+/* Display a warning message.  */
+
+static void
+sound_warning (msg)
+     char *msg;
+{
+  message (msg);
 }
 
 
@@ -416,18 +436,18 @@
       s.fd = openp (Fcons (Vdata_directory, Qnil),
 		    attrs[SOUND_FILE], "", &file, 0);
       if (s.fd < 0)
-	sound_perror ("Open sound file");
+	sound_perror ("Could not open sound file");
 
       /* Read the first bytes from the file.  */
       s.header_size = emacs_read (s.fd, s.header, MAX_SOUND_HEADER_BYTES);
       if (s.header_size < 0)
-	sound_perror ("Reading sound file header");
+	sound_perror ("Invalid sound file header");
     }
   else
     {
       s.data = attrs[SOUND_DATA];
-      bcopy (XSTRING (s.data)->data, s.header,
-	     min (MAX_SOUND_HEADER_BYTES, STRING_BYTES (XSTRING (s.data))));
+      s.header_size = min (MAX_SOUND_HEADER_BYTES, STRING_BYTES (XSTRING (s.data)));
+      bcopy (XSTRING (s.data)->data, s.header, s.header_size);
     }
 
   /* Find out the type of sound.  Give up if we can't tell.  */
@@ -632,7 +652,7 @@
 	sd->write (sd, buffer, nbytes);
 
       if (nbytes < 0)
-	sound_perror ("Reading sound file");
+	sound_perror ("Error reading sound file");
     }
 }
 
@@ -722,7 +742,7 @@
 	sd->write (sd, buffer, nbytes);
       
       if (nbytes < 0)
-	sound_perror ("Reading sound file");
+	sound_perror ("Error reading sound file");
     }
 }
 
@@ -778,21 +798,22 @@
   val = sd->format;
   if (ioctl (sd->fd, SNDCTL_DSP_SETFMT, &sd->format) < 0
       || val != sd->format)
-    sound_perror ("Set sound format");
+    sound_perror ("Could not set sound format");
 
   val = sd->channels != 1;
   if (ioctl (sd->fd, SNDCTL_DSP_STEREO, &val) < 0
       || val != (sd->channels != 1))
-    sound_perror ("Set stereo/mono");
+    sound_perror ("Could not set stereo/mono");
 
   /* I think bps and sampling_rate are the same, but who knows.
      Check this. and use SND_DSP_SPEED for both.  */
   if (sd->sample_rate > 0)
     {
       val = sd->sample_rate;
-      if (ioctl (sd->fd, SNDCTL_DSP_SPEED, &sd->sample_rate) < 0
-	  || val != sd->sample_rate)
-	sound_perror ("Set sound speed");
+      if (ioctl (sd->fd, SNDCTL_DSP_SPEED, &sd->sample_rate) < 0)
+	sound_perror ("Could not set sound speed");
+      else if (val != sd->sample_rate)
+	sound_warning ("Could not set sample rate");
     }
 
   if (sd->volume > 0)
@@ -911,7 +932,7 @@
 {
   int nwritten = emacs_write (sd->fd, buffer, nbytes);
   if (nwritten < 0)
-    sound_perror ("Writing to sound device");
+    sound_perror ("Error writing to sound device");
 }
 
 
diff -ruN src-21.1/src/sysdep.c src-21.2/src/sysdep.c
--- src-21.1/src/sysdep.c	Mon Oct  8 11:02:08 2001
+++ src-21.2/src/sysdep.c	Mon Nov 19 15:48:11 2001
@@ -590,10 +590,12 @@
 #endif
   s.main.c_lflag &= ~ECHO;	/* Disable echo */
   s.main.c_lflag |= ISIG;	/* Enable signals */
+#if 0  /* This causes bugs in (for instance) telnet to certain sites.  */
   s.main.c_iflag &= ~ICRNL;	/* Disable map of CR to NL on input */
 #ifdef INLCR  /* Just being cautious, since I can't check how
 		 widespread INLCR is--rms.  */
   s.main.c_iflag &= ~INLCR;	/* Disable map of NL to CR on input */
+#endif
 #endif
 #ifdef IUCLC
   s.main.c_iflag &= ~IUCLC;	/* Disable downcasing on input.  */
diff -ruN src-21.1/src/syssignal.h src-21.2/src/syssignal.h
--- src-21.1/src/syssignal.h	Sat Nov 11 02:07:16 2000
+++ src-21.2/src/syssignal.h	Sun Dec 30 23:41:46 2001
@@ -86,19 +86,25 @@
       sigprocmask (SIG_BLOCK, &sigprocmask_set, NULL))
 #endif
 
+#ifndef sigunblock
 #define sigunblock(sig)						\
      (sigprocmask_set = SIGFULLMASK & ~(sig),			\
       sigprocmask (SIG_SETMASK, &sigprocmask_set, NULL))
+#endif
 
 #else
 #ifdef USG
 
+#ifndef sigunblock
 #define sigunblock(sig) 
+#endif
 
 #else
 
+#ifndef sigunblock
 #define sigunblock(SIG) \
 { SIGMASKTYPE omask = sigblock (SIGEMPTYMASK); sigsetmask (omask & ~SIG); }
+#endif
 
 #endif /* ! defined (USG) */
 #endif /* ! defined (USG5_4) */
diff -ruN src-21.1/src/syswait.h src-21.2/src/syswait.h
--- src-21.1/src/syswait.h	Wed Jul 26 13:06:05 2000
+++ src-21.2/src/syswait.h	Fri Nov 16 14:45:29 2001
@@ -38,7 +38,8 @@
    definitions of some of the macros and `the convex' does too.
    HAVE_SYS_WAIT_H probably won't be defined on them if they still get
    used, but for safety...  -- fx */
-#if (defined (HPUX) && !defined (HPUX8)) || defined (convex)
+/* ISC 4.1 doesn't have wait3, but does have sys/wait.h.  */
+#if (defined(HPUX) && !defined(HPUX8)) || defined(convex) || defined(ISC4_1)
 #undef HAVE_SYS_WAIT_H
 #endif
 
diff -ruN src-21.1/src/unexec.c src-21.2/src/unexec.c
--- src-21.1/src/unexec.c	Wed Aug 23 00:41:55 2000
+++ src-21.2/src/unexec.c	Fri Nov 16 14:45:59 2001
@@ -171,7 +171,7 @@
 
 #ifndef CANNOT_DUMP  /* all rest of file!  */
 
-#ifdef COFF
+#if defined(COFF) && !defined(ISC4_1)
 #include <coff.h>
 #ifdef MSDOS
 #if __DJGPP__ > 1
@@ -197,14 +197,14 @@
   unsigned long	 	data_start;/* base of data used for this file */
 };
 #endif /* not MSDOS */
-#else  /* not COFF */
+#else  /* not COFF and ISC4_1 */
 #ifdef COFF_ENCAPSULATE
 int need_coff_header = 1;
 #include <coff-encap/a.out.encap.h> /* The location might be a poor assumption */
 #else  /* not COFF_ENCAPSULATE */
 #include <a.out.h>
 #endif /* not COFF_ENCAPSULATE */
-#endif /* not COFF */
+#endif /* not COFF and ISC4_1 */
 
 /* Define getpagesize if the system does not.
    Note that this may depend on symbols defined in a.out.h.  */
diff -ruN src-21.1/src/unexelf.c src-21.2/src/unexelf.c
--- src-21.1/src/unexelf.c	Tue Sep 26 15:01:57 2000
+++ src-21.2/src/unexelf.c	Mon Jan 28 17:33:22 2002
@@ -1,4 +1,4 @@
-/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000
+/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -404,6 +404,23 @@
 
  */
 
+/*
+ * Modified by rdh@yottayotta.com of Yotta Yotta Incorporated.
+ * 
+ * The code originally used mmap() to create a memory image of the new
+ * and old object files.  This had a few handy features: (1) you get
+ * to use a cool system call like mmap, (2) no need to explicitly
+ * write out the new file before the close, and (3) no swap space
+ * requirements.  Unfortunately, mmap() often fails to work with
+ * nfs-mounted file systems.
+ *
+ * So, instead of relying on the vm subsystem to do the file i/o for
+ * us, it's now done explicitly.  A buffer of the right size for the
+ * file is dynamically allocated, and either the old_name is read into
+ * it, or it is initialized with the correct new executable contents,
+ * and then written to new_name.
+ */
+
 #ifndef emacs
 #define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1)
 #include <string.h>
@@ -431,6 +448,18 @@
 #include <syms.h> /* for HDRR declaration */
 #endif /* __sgi */
 
+#ifndef MAP_ANON
+#ifdef MAP_ANONYMOUS
+#define MAP_ANON MAP_ANONYMOUS
+#else
+#define MAP_ANON 0
+#endif
+#endif
+
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *) -1)
+#endif
+
 #if defined (__alpha__) && !defined (__NetBSD__) && !defined (__OpenBSD__)
 /* Declare COFF debugging symbol table.  This used to be in
    /usr/include/sym.h, but this file is no longer included in Red Hat
@@ -646,6 +675,12 @@
   /* Pointers to the base of the image of the two files. */
   caddr_t old_base, new_base;
 
+#if MAP_ANON == 0
+  int mmap_fd;
+#else
+# define mmap_fd -1
+#endif
+
   /* Pointers to the file, program and section headers for the old and new
    * files.
    */
@@ -666,8 +701,10 @@
   int old_data_index, new_data2_index;
   int old_mdebug_index;
   struct stat stat_buf;
+  int old_file_size;
 
-  /* Open the old file & map it into the address space. */
+  /* Open the old file, allocate a buffer of the right size, and read
+   * in the file contents. */
 
   old_file = open (old_name, O_RDONLY);
 
@@ -677,16 +714,24 @@
   if (fstat (old_file, &stat_buf) == -1)
     fatal ("Can't fstat (%s): errno %d\n", old_name, errno);
 
-  old_base = mmap ((caddr_t) 0, stat_buf.st_size, PROT_READ, MAP_SHARED,
-		   old_file, 0);
+#if MAP_ANON == 0
+  mmap_fd = open ("/dev/zero", O_RDONLY);
+  if (mmap_fd < 0)
+    fatal ("Can't open /dev/zero for reading: errno %d\n", errno);
+#endif
 
-  if (old_base == (caddr_t) -1)
-    fatal ("Can't mmap (%s): errno %d\n", old_name, errno);
+  /* We cannot use malloc here because that may use sbrk.  If it does,
+     we'd dump our temporary buffers with Emacs, and we'd have to be
+     extra careful to use the correct value of sbrk(0) after
+     allocating all buffers in the code below, which we aren't.  */
+  old_file_size = stat_buf.st_size;
+  old_base = mmap (NULL, old_file_size, PROT_READ | PROT_WRITE,
+		   MAP_ANON | MAP_PRIVATE, mmap_fd, 0);
+  if (old_base == MAP_FAILED)
+    fatal ("Can't allocate buffer for %s\n", old_name);
 
-#ifdef DEBUG
-  fprintf (stderr, "mmap (%s, %x) -> %x\n", old_name, stat_buf.st_size,
-	   old_base);
-#endif
+  if (read (old_file, old_base, stat_buf.st_size) != stat_buf.st_size)
+    fatal ("Didn't read all of %s: errno %d\n", old_name, errno);
 
   /* Get pointers to headers & section names */
 
@@ -757,9 +802,9 @@
   if ((unsigned) new_bss_addr < (unsigned) old_bss_addr + old_bss_size)
     fatal (".bss shrank when undumping???\n", 0, 0);
 
-  /* Set the output file to the right size and mmap it.  Set
-   * pointers to various interesting objects.  stat_buf still has
-   * old_file data.
+  /* Set the output file to the right size.  Allocate a buffer to hold
+   * the image of the new file.  Set pointers to various interesting
+   * objects.  stat_buf still has old_file data.
    */
 
   new_file = open (new_name, O_RDWR | O_CREAT, 0666);
@@ -771,16 +816,10 @@
   if (ftruncate (new_file, new_file_size))
     fatal ("Can't ftruncate (%s): errno %d\n", new_name, errno);
 
-#ifdef UNEXEC_USE_MAP_PRIVATE
-  new_base = mmap ((caddr_t) 0, new_file_size, PROT_READ | PROT_WRITE,
-		   MAP_PRIVATE, new_file, 0);
-#else
-  new_base = mmap ((caddr_t) 0, new_file_size, PROT_READ | PROT_WRITE,
-		   MAP_SHARED, new_file, 0);
-#endif
-
-  if (new_base == (caddr_t) -1)
-    fatal ("Can't mmap (%s): errno %d\n", new_name, errno);
+  new_base = mmap (NULL, new_file_size, PROT_READ | PROT_WRITE,
+		   MAP_ANON | MAP_PRIVATE, mmap_fd, 0);
+  if (new_base == MAP_FAILED)
+    fatal ("Can't allocate buffer for %s\n", old_name);
 
   new_file_h = (ElfW(Ehdr) *) new_base;
   new_program_h = (ElfW(Phdr) *) ((byte *) new_base + old_file_h->e_phoff);
@@ -994,11 +1033,20 @@
 		      ".lit4")
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".lit8")
+#if __sgi
+	  /* According to David Kaelbling <drk@bobo.hudson.sgi.com>,
+	     the SGI-specific section below is required to avoid core
+	     dumps during startup (due to SIGBUS) in an X-toolkit
+	     version of Emacs .  That was on Irix 6.5.14f with
+	     development tools versions 7.3.1.3m and 7.2.1.3m.  */
+	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
+		      ".got")
+#endif
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".sdata1")
 	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".data1")
-	  || !strcmp (old_section_names + NEW_SECTION_H (nn).sh_name,
+	  || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
 		      ".sbss"))
 	src = (caddr_t) OLD_SECTION_H (n).sh_addr;
       else
@@ -1172,6 +1220,10 @@
 			".lit4")
 	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
 			".lit8")
+#if __sgi
+	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+			".got")
+#endif
 	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
 			".sdata1")
 	    || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
@@ -1198,21 +1250,30 @@
       }
     }
 
-#ifdef UNEXEC_USE_MAP_PRIVATE
-  if (lseek (new_file, 0, SEEK_SET) == -1)
-    fatal ("Can't rewind (%s): errno %d\n", new_name, errno);
+  /* Write out new_file, close it, and free the buffer containing its
+   * contents */
 
   if (write (new_file, new_base, new_file_size) != new_file_size)
-    fatal ("Can't write (%s): errno %d\n", new_name, errno);
-#endif
+    fatal ("Didn't write %d bytes to %s: errno %d\n", 
+	   new_file_size, new_base, errno);
 
-  /* Close the files and make the new file executable.  */
+  if (close (new_file))
+    fatal ("Can't close (%s): errno %d\n", new_name, errno);
+
+  munmap (new_base, new_file_size);
+
+  /* Close old_file, and free the corresponding buffer */
+
+#if MAP_ANON == 0
+  close (mmap_fd);
+#endif
 
   if (close (old_file))
     fatal ("Can't close (%s): errno %d\n", old_name, errno);
 
-  if (close (new_file))
-    fatal ("Can't close (%s): errno %d\n", new_name, errno);
+  munmap (old_base, old_file_size);
+
+  /* Make the new file executable */
 
   if (stat (new_name, &stat_buf) == -1)
     fatal ("Can't stat (%s): errno %d\n", new_name, errno);
diff -ruN src-21.1/src/w32fns.c src-21.2/src/w32fns.c
--- src-21.1/src/w32fns.c	Thu Oct 18 15:08:33 2001
+++ src-21.2/src/w32fns.c	Wed Mar 13 20:52:22 2002
@@ -52,6 +52,7 @@
 #include <shellapi.h>
 #include <ctype.h>
 
+#define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) > (b) ? (a) : (b))
 
 extern void free_frame_menubar ();
@@ -127,7 +128,7 @@
 
 /* Switch to control whether we inhibit requests for synthesized bold
    and italic versions of fonts.  */
-Lisp_Object Vw32_enable_synthesized_fonts;
+int w32_enable_synthesized_fonts;
 
 /* Enable palette management. */
 Lisp_Object Vw32_enable_palette;
@@ -1956,11 +1957,18 @@
      struct frame *f;
      Lisp_Object arg, oldval;
 {
-  FRAME_FOREGROUND_PIXEL (f)
-    = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
+  struct w32_output *x = f->output_data.w32;
+  PIX_TYPE fg, old_fg;
+
+  fg = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
+  old_fg = FRAME_FOREGROUND_PIXEL (f);
+  FRAME_FOREGROUND_PIXEL (f) = fg;
 
   if (FRAME_W32_WINDOW (f) != 0)
     {
+      if (x->cursor_pixel == old_fg)
+	x->cursor_pixel = fg;
+
       update_face_from_frame_parameter (f, Qforeground_color, arg);
       if (FRAME_VISIBLE_P (f))
         redraw_frame (f);
@@ -2367,6 +2375,7 @@
   Lisp_Object result;
   Lisp_Object fontset_name;
   Lisp_Object frame;
+  int old_fontset = FRAME_FONTSET (f);
 
   CHECK_STRING (arg, 1);
 
@@ -2384,7 +2393,14 @@
     error ("The characters of the given font have varying widths");
   else if (STRINGP (result))
     {
-      if (!NILP (Fequal (result, oldval)))
+      if (STRINGP (fontset_name))
+	{
+	  /* Fontset names are built from ASCII font names, so the
+	     names may be equal despite there was a change.  */
+	  if (old_fontset == FRAME_FONTSET (f))
+	    return;
+	}
+      else if (!NILP (Fequal (result, oldval)))
         return;
       store_frame_param (f, Qfont, result);
       recompute_basic_faces (f);
@@ -2443,6 +2459,8 @@
       SET_FRAME_GARBAGED (f);
       do_pending_window_change (0);
     }
+  else
+    SET_FRAME_GARBAGED (f);
 }
 
 void
@@ -4084,6 +4102,7 @@
       {
   	PAINTSTRUCT paintStruct;
         RECT update_rect;
+	bzero (&update_rect, sizeof (update_rect));
 
 	f = x_window_to_frame (dpyinfo, hwnd);
 	if (f == 0)
@@ -4095,18 +4114,15 @@
         /* MSDN Docs say not to call BeginPaint if GetUpdateRect
            fails.  Apparently this can happen under some
            circumstances.  */
-        if (!w32_strict_painting || GetUpdateRect (hwnd, &update_rect, FALSE))
+        if (GetUpdateRect (hwnd, &update_rect, FALSE) || !w32_strict_painting)
           {
             enter_crit ();
             BeginPaint (hwnd, &paintStruct);
 
-	    if (w32_strict_painting)
-	      /* The rectangles returned by GetUpdateRect and BeginPaint
-		 do not always match.  GetUpdateRect seems to be the
-		 more reliable of the two.  */
-	      wmsg.rect = update_rect;
-	    else
-	      wmsg.rect = paintStruct.rcPaint;
+	    /* The rectangles returned by GetUpdateRect and BeginPaint
+	       do not always match.  Play it safe by assuming both areas
+	       are invalid.  */
+	    UnionRect (&(wmsg.rect), &update_rect, &(paintStruct.rcPaint));
 
 #if defined (W32_DEBUG_DISPLAY)
             DebPrint (("WM_PAINT (frame %p): painting %d,%d-%d,%d\n",
@@ -5445,6 +5461,10 @@
   x_wm_set_size_hint (f, window_prompting, 0);
   UNBLOCK_INPUT;
 
+  /* Avoid a bug that causes the new frame to never become visible if
+     an echo area message is displayed during the following call1.  */
+  specbind(Qredisplay_dont_pause, Qt);
+
   /* Set up faces after all frame parameters are known.  This call
      also merges in face attributes specified for new frames.  If we
      don't do this, the `menu' face for instance won't have the right
@@ -5599,6 +5619,10 @@
            ended up with. */
       return NULL;
 
+    /* Specify anti-aliasing to prevent Cleartype fonts being used,
+       since those fonts leave garbage behind.  */
+    lf.lfQuality = ANTIALIASED_QUALITY;
+
     font = (XFontStruct *) xmalloc (sizeof (XFontStruct));
     bzero (font, sizeof (*font));
 
@@ -5725,7 +5749,7 @@
     /* SJIS fonts need to be set to type 4, all others seem to work as
        type FONT_ENCODING_NOT_DECIDED.  */
     encoding = strrchr (fontp->name, '-');
-    if (encoding && stricmp (encoding+1, "sjis") == 0)
+    if (encoding && strnicmp (encoding+1, "sjis", 4) == 0)
       fontp->encoding[1] = 4;
     else
       fontp->encoding[1] = FONT_ENCODING_NOT_DECIDED;
@@ -5894,7 +5918,7 @@
 
   w32_charset = Fcar (Fcdr (this_entry));
 
-  // Translate Lisp symbol to number.
+  /* Translate Lisp symbol to number.  */
   if (w32_charset == Qw32_charset_ansi)
     return ANSI_CHARSET;
   if (w32_charset == Qw32_charset_symbol)
@@ -5946,7 +5970,7 @@
 w32_to_x_charset (fncharset)
     int fncharset;
 {
-  static char buf[16];
+  static char buf[32];
   Lisp_Object charset_type;
 
   switch (fncharset)
@@ -6070,13 +6094,13 @@
               best_match = x_charset;
             /* If this is an ISO codepage, and the best so far isn't,
                then this is better.  */
-            else if (stricmp (best_match, "iso") != 0
-                     && stricmp (x_charset, "iso") == 0)
+            else if (strnicmp (best_match, "iso", 3) != 0
+                     && strnicmp (x_charset, "iso", 3) == 0)
               best_match = x_charset;
             /* If both are ISO8859 codepages, choose the one with the
                lowest number in the encoding field.  */
-            else if (stricmp (best_match, "iso8859-") == 0
-                     && stricmp (x_charset, "iso8859-") == 0)
+            else if (strnicmp (best_match, "iso8859-", 8) == 0
+                     && strnicmp (x_charset, "iso8859-", 8) == 0)
               {
                 int best_enc = atoi (best_match + 8);
                 int this_enc = atoi (x_charset + 8);
@@ -6093,13 +6117,149 @@
         return buf;
       }
 
-    strncpy(buf, best_match, 15);
-    buf[15] = '\0';
+    strncpy(buf, best_match, 31);
+    buf[31] = '\0';
     return buf;
   }
 }
 
 
+/* Return all the X charsets that map to a font.  */
+static Lisp_Object
+w32_to_all_x_charsets (fncharset)
+    int fncharset;
+{
+  static char buf[32];
+  Lisp_Object charset_type;
+  Lisp_Object retval = Qnil;
+
+  switch (fncharset)
+    {
+    case ANSI_CHARSET:
+      /* Handle startup case of w32-charset-info-alist not
+         being set up yet. */
+      if (NILP(Vw32_charset_info_alist))
+        return "iso8859-1";
+      charset_type = Qw32_charset_ansi;
+      break;
+    case DEFAULT_CHARSET:
+      charset_type = Qw32_charset_default;
+      break;
+    case SYMBOL_CHARSET:
+      charset_type = Qw32_charset_symbol;
+      break;
+    case SHIFTJIS_CHARSET:
+      charset_type = Qw32_charset_shiftjis;
+      break;
+    case HANGEUL_CHARSET:
+      charset_type = Qw32_charset_hangeul;
+      break;
+    case GB2312_CHARSET:
+      charset_type = Qw32_charset_gb2312;
+      break;
+    case CHINESEBIG5_CHARSET:
+      charset_type = Qw32_charset_chinesebig5;
+      break;
+    case OEM_CHARSET:
+      charset_type = Qw32_charset_oem;
+      break;
+
+      /* More recent versions of Windows (95 and NT4.0) define more
+         character sets.  */
+#ifdef EASTEUROPE_CHARSET
+    case EASTEUROPE_CHARSET:
+      charset_type = Qw32_charset_easteurope;
+      break;
+    case TURKISH_CHARSET:
+      charset_type = Qw32_charset_turkish;
+      break;
+    case BALTIC_CHARSET:
+      charset_type = Qw32_charset_baltic;
+      break;
+    case RUSSIAN_CHARSET:
+      charset_type = Qw32_charset_russian;
+      break;
+    case ARABIC_CHARSET:
+      charset_type = Qw32_charset_arabic;
+      break;
+    case GREEK_CHARSET:
+      charset_type = Qw32_charset_greek;
+      break;
+    case HEBREW_CHARSET:
+      charset_type = Qw32_charset_hebrew;
+      break;
+    case VIETNAMESE_CHARSET:
+      charset_type = Qw32_charset_vietnamese;
+      break;
+    case THAI_CHARSET:
+      charset_type = Qw32_charset_thai;
+      break;
+    case MAC_CHARSET:
+      charset_type = Qw32_charset_mac;
+      break;
+    case JOHAB_CHARSET:
+      charset_type = Qw32_charset_johab;
+      break;
+#endif
+
+#ifdef UNICODE_CHARSET
+    case UNICODE_CHARSET:
+      charset_type = Qw32_charset_unicode;
+      break;
+#endif
+    default:
+      /* Encode numerical value of unknown charset.  */
+      sprintf (buf, "*-#%u", fncharset);
+      return Fcons (build_string (buf), Qnil);
+    }
+  
+  {
+    Lisp_Object rest;
+    /* Look through w32-charset-info-alist for the character set.
+       Only return charsets for codepages which are installed.
+
+       Format of each entry in Vw32_charset_info_alist is
+         (CHARSET_NAME . (WINDOWS_CHARSET . CODEPAGE)).
+    */
+    for (rest = Vw32_charset_info_alist; CONSP (rest); rest = XCDR (rest))
+      {
+        Lisp_Object x_charset;
+        Lisp_Object w32_charset;
+        Lisp_Object codepage;
+
+        Lisp_Object this_entry = XCAR (rest);
+
+        /* Skip invalid entries in alist. */
+        if (!CONSP (this_entry) || !STRINGP (XCAR (this_entry))
+            || !CONSP (XCDR (this_entry))
+            || !SYMBOLP (XCAR (XCDR (this_entry))))
+          continue;
+
+        x_charset = XCAR (this_entry);
+        w32_charset = XCAR (XCDR (this_entry));
+        codepage = XCDR (XCDR (this_entry));
+
+        /* Look for Same charset and a valid codepage (or non-int
+           which means ignore).  */
+        if (w32_charset == charset_type
+            && (!INTEGERP (codepage) || codepage == CP_DEFAULT
+                || IsValidCodePage (XINT (codepage))))
+          {
+	    retval = Fcons (x_charset, retval);
+          }
+      }
+
+    /* If no match, encode the numeric value. */
+    if (NILP (retval))
+      {
+        sprintf (buf, "*-#%u", fncharset);
+        return Fcons (build_string (buf), Qnil);
+      }
+
+    return retval;
+  }
+}
+
 /* Get the Windows codepage corresponding to the specified font.  The
    charset info in the font name is used to look up
    w32-charset-to-codepage-alist.  */
@@ -6614,9 +6774,13 @@
   LOGFONT logfont;
   XFontStruct *size_ref;
   Lisp_Object *pattern;
+  Lisp_Object list;
   Lisp_Object *tail;
 } enumfont_t;
 
+static void
+enum_font_maybe_add_to_list (enumfont_t *, LOGFONT *, char *, Lisp_Object);
+
 static int CALLBACK 
 enum_font_cb2 (lplf, lptm, FontType, lpef)
     ENUMLOGFONT * lplf;
@@ -6624,17 +6788,27 @@
     int FontType;
     enumfont_t * lpef;
 {
+  /* Ignore underlined and struck out versions of fonts.  */
   if (lplf->elfLogFont.lfStrikeOut || lplf->elfLogFont.lfUnderline)
-    return (1);
-  
+    return 1;
+
+  /* Only return fonts with names starting with @ if they were
+     explicitly specified, since Microsoft uses an initial @ to
+     denote fonts for vertical writing, without providing a more
+     convenient way of identifying them.  */
+  if (lplf->elfLogFont.lfFaceName[0] == '@'
+      && lpef->logfont.lfFaceName[0] != '@')
+    return 1;
+
   /* Check that the character set matches if it was specified */
   if (lpef->logfont.lfCharSet != DEFAULT_CHARSET &&
       lplf->elfLogFont.lfCharSet != lpef->logfont.lfCharSet)
-    return (1);
+    return 1;
 
   {
     char buf[100];
     Lisp_Object width = Qnil;
+    Lisp_Object charset_list = Qnil;
     char *charset = NULL;
 
     /* Truetype fonts do not report their true metrics until loaded */
@@ -6669,36 +6843,92 @@
       {
         charset = xlfd_charset_of_font (XSTRING(*(lpef->pattern))->data);
 
-        /* Ensure that charset is valid for this font. */
-        if (charset
-            && (x_to_w32_charset (charset) != lplf->elfLogFont.lfCharSet))
-          charset = NULL;
+	/* We already checked charsets above, but DEFAULT_CHARSET
+           slipped through.  So only allow exact matches for DEFAULT_CHARSET.  */
+	if (charset
+	    && strncmp (charset, "*-*", 3) != 0
+	    && lpef->logfont.lfCharSet == DEFAULT_CHARSET
+	    && strcmp (charset, w32_to_x_charset (DEFAULT_CHARSET)) != 0)
+	  return 1;
       }
 
-    /* TODO: List all relevant charsets if charset not specified. */
-    if (!w32_to_x_font (&(lplf->elfLogFont), buf, 100, charset))
-      return (0);
+    if (charset)
+      charset_list = Fcons (build_string (charset), Qnil);
+    else
+      charset_list = w32_to_all_x_charsets (lplf->elfLogFont.lfCharSet);
 
-    if (NILP (*(lpef->pattern))
-        || w32_font_match (buf, XSTRING (*(lpef->pattern))->data))
+    /* Loop through the charsets.  */
+    for ( ; CONSP (charset_list); charset_list = Fcdr (charset_list))
       {
-	*lpef->tail = Fcons (Fcons (build_string (buf), width), Qnil);
-	lpef->tail = &(XCDR (*lpef->tail));
-	lpef->numFonts++;
+	Lisp_Object this_charset = Fcar (charset_list);
+	charset = XSTRING (this_charset)->data;
+
+	/* List bold and italic variations if w32-enable-synthesized-fonts
+	   is non-nil and this is a plain font.  */
+	if (w32_enable_synthesized_fonts
+	    && lplf->elfLogFont.lfWeight == FW_NORMAL
+	    && lplf->elfLogFont.lfItalic == FALSE)
+	  {
+	    enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont),
+					 charset, width);
+	    /* bold.  */
+	    lplf->elfLogFont.lfWeight = FW_BOLD;
+	    enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont),
+					 charset, width);
+	    /* bold italic.  */
+	    lplf->elfLogFont.lfItalic = TRUE;
+	    enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont),
+					 charset, width);
+	    /* italic.  */
+	    lplf->elfLogFont.lfWeight = FW_NORMAL;
+	    enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont),
+					 charset, width);
+	  }
+	else
+	  enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont),
+				       charset, width);
       }
   }
 
-  return (1);
+  return 1;
 }
 
+static void
+enum_font_maybe_add_to_list (lpef, logfont, match_charset, width)
+     enumfont_t * lpef;
+     LOGFONT * logfont;
+     char * match_charset;
+     Lisp_Object width;
+{
+  char buf[100];
+
+  if (!w32_to_x_font (logfont, buf, 100, match_charset))
+    return;
+
+  if (NILP (*(lpef->pattern))
+      || w32_font_match (buf, XSTRING (*(lpef->pattern))->data))
+    {
+      /* Check if we already listed this font.  This may happen if
+         w32_enable_synthesized_fonts is non-nil, and there are real
+         bold and italic versions of the font.  */
+      Lisp_Object font_name = build_string (buf);
+      if (NILP (Fmember (font_name, lpef->list)))
+	{
+	  *lpef->tail = Fcons (Fcons (build_string (buf), width), Qnil);
+	  lpef->tail = &(XCDR (*lpef->tail));
+	  lpef->numFonts++;
+	}
+    }
+}
+
+
 static int CALLBACK 
 enum_font_cb1 (lplf, lptm, FontType, lpef)
      ENUMLOGFONT * lplf;
      NEWTEXTMETRIC * lptm;
      int FontType;
      enumfont_t * lpef;
-{
-  return EnumFontFamilies (lpef->hdc,
+{  return EnumFontFamilies (lpef->hdc,
 			   lplf->elfLogFont.lfFaceName,
 			   (FONTENUMPROC) enum_font_cb2,
 			   (LPARAM) lpef);
@@ -6773,10 +7003,6 @@
   return newlist;
 }
 
-static Lisp_Object w32_list_synthesized_fonts (FRAME_PTR f,
-                                               Lisp_Object pattern,
-                                               int size, int max_names);
-
 /* Return a list of names of available fonts matching PATTERN on frame
    F.  If SIZE is not 0, it is the size (maximum bound width) of fonts
    to be listed.  Frame F NULL means we have not yet created any
@@ -6834,6 +7060,7 @@
       /* At first, put PATTERN in the cache.  */
       list = Qnil;
       ef.pattern = &tpat;
+      ef.list = list;
       ef.tail = &list;
       ef.numFonts = 0;
 
@@ -6847,11 +7074,11 @@
         FARPROC enum_font_families_ex
           = GetProcAddress ( gdi32, "EnumFontFamiliesExA");
 
-        /* We do our own pattern matching so we can handle wildcards.  */
-        font_match_pattern.lfFaceName[0] = 0;
+	/* We do our own pattern matching so we can handle wildcards.  */
+	font_match_pattern.lfFaceName[0] = 0;
         font_match_pattern.lfPitchAndFamily = 0;
-        /* We can use the charset, because if it is a wildcard it will
-           be DEFAULT_CHARSET anyway.  */
+        /* We can use the charset, because if it has a wildcard it will
+           translate to DEFAULT_CHARSET anyway.  */
         font_match_pattern.lfCharSet = ef.logfont.lfCharSet;
 
         ef.hdc = GetDC (dpyinfo->root_window);
@@ -6978,68 +7205,9 @@
     newlist = Fnconc(2, combined);
   }
 
-  /* If we can't find a font that matches, check if Windows would be
-     able to synthesize it from a different style.  */
-  if (NILP (newlist) && !NILP (Vw32_enable_synthesized_fonts))
-    newlist = w32_list_synthesized_fonts (f, pattern, size, maxnames);
-
   return newlist;
 }
 
-static Lisp_Object
-w32_list_synthesized_fonts (f, pattern, size, max_names)
-     FRAME_PTR f;
-     Lisp_Object pattern;
-     int size;
-     int max_names;
-{
-  int fields;
-  char *full_pattn, *new_pattn, foundary[50], family[50], *pattn_part2;
-  char style[20], slant;
-  Lisp_Object matches, tem, synthed_matches = Qnil;
-
-  full_pattn = XSTRING (pattern)->data;
-
-  pattn_part2 = alloca (XSTRING (pattern)->size + 1);
-  /* Allow some space for wildcard expansion.  */
-  new_pattn = alloca (XSTRING (pattern)->size + 100);
-
-  fields = sscanf (full_pattn, "-%49[^-]-%49[^-]-%19[^-]-%c-%s",
-                   foundary, family, style, &slant, pattn_part2);
-  if (fields == EOF || fields < 5)
-    return Qnil;
-
-  /* If the style and slant are wildcards already there is no point
-     checking again (and we don't want to keep recursing).  */
-  if (*style == '*' && slant == '*')
-    return Qnil;
-
-  sprintf (new_pattn, "-%s-%s-*-*-%s", foundary, family, pattn_part2);
-
-  matches = w32_list_fonts (f, build_string (new_pattn), size, max_names);
-
-  for ( ; CONSP (matches); matches = XCDR (matches))
-    {
-      tem = XCAR (matches);
-      if (!STRINGP (tem))
-        continue;
-
-      full_pattn = XSTRING (tem)->data;
-      fields = sscanf (full_pattn, "-%49[^-]-%49[^-]-%*[^-]-%*c-%s",
-                       foundary, family, pattn_part2);
-      if (fields == EOF || fields < 3)
-        continue;
-
-      sprintf (new_pattn, "-%s-%s-%s-%c-%s", foundary, family, style,
-               slant, pattn_part2);
-
-      synthed_matches = Fcons (build_string (new_pattn),
-                               synthed_matches);
-    }
-
-  return synthed_matches;
-}
-
 
 /* Return a pointer to struct font_info of font FONT_IDX of frame F.  */
 struct font_info *
@@ -7283,8 +7451,10 @@
   else
     cap = GetDeviceCaps (hdc,NUMCOLORS);
 
+  /* We force 24+ bit depths to 24-bit, both to prevent an overflow
+     and because probably is more meaningful on Windows anyway */
   if (cap < 0)
-    cap = 1 << (dpyinfo->n_planes * dpyinfo->n_cbits);
+    cap = 1 << min(dpyinfo->n_planes * dpyinfo->n_cbits, 24);
   
   ReleaseDC (dpyinfo->root_window, hdc);
   
@@ -7524,6 +7694,11 @@
   unsigned char *xrm_option;
   struct w32_display_info *dpyinfo;
 
+  /* If initialization has already been done, return now to avoid
+     overwriting critical parts of one_w32_display_info.  */
+  if (w32_in_use)
+    return Qnil;
+
   CHECK_STRING (display, 0);
   if (! NILP (xrm_string))
     CHECK_STRING (xrm_string, 1);
@@ -12887,8 +13062,7 @@
   "Read file name, prompting with PROMPT in directory DIR.\n\
 Use a file selection dialog.\n\
 Select DEFAULT-FILENAME in the dialog's file selection box, if\n\
-specified.  Don't let the user enter a file name in the file\n\
-selection dialog's entry field, if MUSTMATCH is non-nil.")
+specified.  Ensure that file exists if MUSTMATCH is non-nil.")
   (prompt, dir, default_filename, mustmatch)
      Lisp_Object prompt, dir, default_filename, mustmatch;
 {
@@ -12949,6 +13123,9 @@
       bzero (&file_details, sizeof (file_details));
       file_details.lStructSize = sizeof (file_details);
       file_details.hwndOwner = FRAME_W32_WINDOW (f);
+      /* Undocumented Bug in Common File Dialog:
+	 If a filter is not specified, shell links are not resolved.  */
+      file_details.lpstrFilter = "All Files (*.*)\0*.*\0\0";
       file_details.lpstrFile = filename;
       file_details.nMaxFile = sizeof (filename);
       file_details.lpstrInitialDir = init_dir;
@@ -13041,7 +13218,7 @@
 
   cf.lStructSize = sizeof (cf);
   cf.hwndOwner = FRAME_W32_WINDOW (f);
-  cf.Flags = CF_FORCEFONTEXIST | CF_SCREENFONTS;
+  cf.Flags = CF_FORCEFONTEXIST | CF_SCREENFONTS | CF_NOVERTFONTS;
   cf.lpLogFont = &lf;
 
   /* Initialize as much of the font details as we can from the current
@@ -13070,9 +13247,9 @@
 
 DEFUN ("w32-send-sys-command", Fw32_send_sys_command, Sw32_send_sys_command, 1, 2, 0,
    "Send frame a Windows WM_SYSCOMMAND message of type COMMAND.\n\
-Some useful values for command are 0xf030 to maximise frame (0xf020\n\
-to minimize), 0xf120 to restore frame to original size, and 0xf100\n\
-to activate the menubar for keyboard access.  0xf140 activates the\n\
+Some useful values for command are #xf030 to maximise frame (#xf020\n\
+to minimize), #xf120 to restore frame to original size, and #xf100\n\
+to activate the menubar for keyboard access.  #xf140 activates the\n\
 screen saver if defined.\n\
 \n\
 If optional parameter FRAME is not specified, use selected frame.")
@@ -13646,9 +13823,9 @@
 Any other value will cause the key to be ignored.");
   Vw32_apps_modifier = Qnil;
 
-  DEFVAR_LISP ("w32-enable-synthesized-fonts", &Vw32_enable_synthesized_fonts,
+  DEFVAR_BOOL ("w32-enable-synthesized-fonts", &w32_enable_synthesized_fonts,
     "Non-nil enables selection of artificially italicized and bold fonts.");
-  Vw32_enable_synthesized_fonts = Qnil;
+  w32_enable_synthesized_fonts = 0;
 
   DEFVAR_LISP ("w32-enable-palette", &Vw32_enable_palette,
     "Non-nil enables Windows palette management to map colors exactly.");
diff -ruN src-21.1/src/w32menu.c src-21.2/src/w32menu.c
--- src-21.1/src/w32menu.c	Sun Sep 30 23:54:04 2001
+++ src-21.2/src/w32menu.c	Thu Nov 15 23:52:18 2001
@@ -1170,11 +1170,16 @@
 	  /* Create a new pane.  */
 	  Lisp_Object pane_name, prefix;
 	  char *pane_string;
+
 	  pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME];
 	  prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
+
 #ifndef HAVE_MULTILINGUAL_MENU
 	  if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
-	    pane_name = ENCODE_SYSTEM (pane_name);
+	    {
+	      pane_name = ENCODE_SYSTEM (pane_name);
+	      AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name;
+	    }
 #endif
 	  pane_string = (NILP (pane_name)
 			 ? "" : (char *) XSTRING (pane_name)->data);
@@ -1212,21 +1217,27 @@
 	  Lisp_Object item_name, enable, descrip, def, type, selected;
           Lisp_Object help;
 
-	  item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME];
-	  enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE];
-	  descrip
-	    = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY];
-	  def = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_DEFINITION];
-	  type = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_TYPE];
-	  selected = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_SELECTED];
-	  help = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_HELP];
+	  item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);
+	  enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);
+	  descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY);
+	  def = AREF (menu_items, i + MENU_ITEMS_ITEM_DEFINITION);
+	  type = AREF (menu_items, i + MENU_ITEMS_ITEM_TYPE);
+	  selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED);
+	  help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP);
 
 #ifndef HAVE_MULTILINGUAL_MENU
 	  if (STRING_MULTIBYTE (item_name))
-	    item_name = ENCODE_SYSTEM (item_name);
+	    {
+	      item_name = ENCODE_SYSTEM (item_name);
+	      AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name;
+	    }
+
 	  if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
-	    descrip = ENCODE_SYSTEM (descrip);
-#endif
+	    {
+	      descrip = ENCODE_SYSTEM (descrip);
+	      AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip;
+	    }
+#endif /* not HAVE_MULTILINGUAL_MENU */
 
 	  wv = xmalloc_widget_value ();
 	  if (prev_wv) 
@@ -1524,7 +1535,7 @@
     f->output_data.w32->menubar_widget = NULL;
     DestroyMenu (old);
   }
-    
+
   UNBLOCK_INPUT;
 }
 
@@ -1615,11 +1626,14 @@
 	  /* Create a new pane.  */
 	  Lisp_Object pane_name, prefix;
 	  char *pane_string;
-	  pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME];
-	  prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
+	  pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);
+	  prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
 #ifndef HAVE_MULTILINGUAL_MENU
-	  if (!NILP (pane_name) && STRING_MULTIBYTE (pane_name))
-	    pane_name = ENCODE_SYSTEM (pane_name);
+	  if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
+	    {
+	      pane_name = ENCODE_SYSTEM (pane_name);
+	      AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name;
+	    }
 #endif
 	  pane_string = (NILP (pane_name)
 			 ? "" : (char *) XSTRING (pane_name)->data);
@@ -1660,21 +1674,26 @@
 	  /* Create a new item within current pane.  */
 	  Lisp_Object item_name, enable, descrip, def, type, selected, help;
 
-	  item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME];
-	  enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE];
-	  descrip
-	    = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY];
-	  def = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_DEFINITION];
-	  type = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_TYPE];
-	  selected = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_SELECTED];
-          help = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_HELP];
+	  item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);
+	  enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);
+	  descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY);
+	  def = AREF (menu_items, i + MENU_ITEMS_ITEM_DEFINITION);
+	  type = AREF (menu_items, i + MENU_ITEMS_ITEM_TYPE);
+	  selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED);
+          help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP);
 
 #ifndef HAVE_MULTILINGUAL_MENU
           if (STRINGP (item_name) && STRING_MULTIBYTE (item_name))
-            item_name = ENCODE_SYSTEM (item_name);
+	    {
+	      item_name = ENCODE_SYSTEM (item_name);
+	      AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name;
+	    }
           if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
-            descrip = ENCODE_SYSTEM (descrip);
-#endif
+            {
+	      descrip = ENCODE_SYSTEM (descrip);
+	      AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip;
+	    }
+#endif /* not HAVE_MULTILINGUAL_MENU */
 
 	  wv = xmalloc_widget_value ();
 	  if (prev_wv) 
@@ -1700,7 +1719,6 @@
 	    abort ();
 
 	  wv->selected = !NILP (selected);
-
           if (STRINGP (help))
             wv->help = (char *) XSTRING (help)->data;
           else
@@ -2071,7 +2089,7 @@
 	}
       /* Draw radio buttons and tickboxes. */
       else if (wv->selected && (wv->button_type == BUTTON_TYPE_TOGGLE ||
-                           wv->button_type == BUTTON_TYPE_RADIO))
+				wv->button_type == BUTTON_TYPE_RADIO))
 	fuFlags |= MF_CHECKED;
       else
 	fuFlags |= MF_UNCHECKED;
@@ -2087,7 +2105,7 @@
                 out_string );
 
   /* This must be done after the menu item is created.  */
-  if ((fuFlags & MF_STRING) != 0)
+  if (!wv->title && wv->call_data != 0)
     {
       HMODULE user32 = GetModuleHandle ("user32.dll");
       FARPROC set_menu_item_info = GetProcAddress (user32, "SetMenuItemInfoA");
diff -ruN src-21.1/src/w32term.c src-21.2/src/w32term.c
--- src-21.1/src/w32term.c	Thu Oct 18 15:08:33 2001
+++ src-21.2/src/w32term.c	Fri Feb 22 11:51:48 2002
@@ -337,10 +337,12 @@
 static void frame_to_window_pixel_xy P_ ((struct window *, int *, int *));
 void w32_delete_display P_ ((struct w32_display_info *));
 static int fast_find_position P_ ((struct window *, int, int *, int *,
-				   int *, int *));
+				   int *, int *, Lisp_Object));
+static int fast_find_string_pos P_ ((struct window *, int, Lisp_Object,
+				     int *, int *, int*, int*, int));
 static void set_output_cursor P_ ((struct cursor_pos *));
 static struct glyph *x_y_to_hpos_vpos P_ ((struct window *, int, int,
-					   int *, int *, int *));
+					   int *, int *, int *, int));
 static void note_mode_line_highlight P_ ((struct window *, int, int));
 static void note_mouse_highlight P_ ((struct frame *, int, int));
 static void note_tool_bar_highlight P_ ((struct frame *f, int, int));
@@ -348,7 +350,8 @@
                                           struct input_event *));
 static void show_mouse_face P_ ((struct w32_display_info *,
 				 enum draw_glyphs_face));
-void clear_mouse_face P_ ((struct w32_display_info *));
+static int cursor_in_mouse_face_p P_ ((struct window *));
+static int clear_mouse_face P_ ((struct w32_display_info *));
 
 void x_lower_frame P_ ((struct frame *));
 void x_scroll_bar_clear P_ ((struct frame *));
@@ -383,12 +386,12 @@
 static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *));
 static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int));
 static void expose_frame P_ ((struct frame *, int, int, int, int));
-static void expose_window_tree P_ ((struct window *, RECT *));
-static void expose_window P_ ((struct window *, RECT *));
+static int expose_window_tree P_ ((struct window *, RECT *));
+static int expose_window P_ ((struct window *, RECT *));
 static void expose_area P_ ((struct window *, struct glyph_row *,
 			     RECT *, enum glyph_row_area));
-static void expose_line P_ ((struct window *, struct glyph_row *,
-			     RECT *));
+static int expose_line P_ ((struct window *, struct glyph_row *,
+			    RECT *));
 void x_update_cursor P_ ((struct frame *, int));
 static void x_update_cursor_in_window_tree P_ ((struct window *, int));
 static void x_update_window_cursor P_ ((struct window *, int));
@@ -401,7 +404,7 @@
                                  HDC, int));
 static int x_phys_cursor_in_rect_p P_ ((struct window *, RECT *));
 static void x_draw_row_bitmaps P_ ((struct window *, struct glyph_row *));
-static void note_overwritten_text_cursor P_ ((struct window *, int, int));
+static void notice_overwritten_cursor P_ ((struct window *, int, int));
 
 static Lisp_Object Qvendor_specific_keysyms;
 
@@ -642,7 +645,8 @@
       RECT r;
       HDC hdc;
 
-      window_box_edges (w, -1, &r.left, &r.top, &r.right, &r.bottom);
+      window_box_edges (w, -1, (int *) &r.left, (int *) &r.top,
+			(int *) &r.right, (int *) &r.bottom);
       r.left = r.right + FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f);
       r.right = r.left + 1;
       r.bottom -= 1;
@@ -672,22 +676,13 @@
      struct window *w;
      int cursor_on_p, mouse_face_overwritten_p;
 {
+  struct w32_display_info *dpyinfo
+    = FRAME_W32_DISPLAY_INFO (XFRAME (w->frame));
+
   if (!w->pseudo_window_p)
     {
-      struct w32_display_info *dpyinfo
-        = FRAME_W32_DISPLAY_INFO (XFRAME (w->frame));
-
       BLOCK_INPUT;
 
-      /* If a row with mouse-face was overwritten, arrange for
-	 XTframe_up_to_date to redisplay the mouse highlight.  */
-      if (mouse_face_overwritten_p)
-	{
-	  dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
-	  dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1;
-	  dpyinfo->mouse_face_window = Qnil;
-	}
-
       if (cursor_on_p)
 	x_display_and_set_cursor (w, 1, output_cursor.hpos,
 				  output_cursor.vpos,
@@ -696,7 +691,16 @@
       x_draw_vertical_border (w);
       UNBLOCK_INPUT;
     }
-  
+
+  /* If a row with mouse-face was overwritten, arrange for
+     XTframe_up_to_date to redisplay the mouse highlight.  */
+  if (mouse_face_overwritten_p)
+    {
+      dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
+      dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1;
+      dpyinfo->mouse_face_window = Qnil;
+    }
+
   updated_window = NULL;
 }
 
@@ -754,34 +758,48 @@
      struct glyph_row *desired_row;
 {
   struct window *w = updated_window;
-  
+  struct frame *f;
+  int width, height;
+
   xassert (w);
   
   if (!desired_row->mode_line_p && !w->pseudo_window_p)
     {
-      struct frame *f;
-      int width;
-
       BLOCK_INPUT;
       x_draw_row_bitmaps (w, desired_row);
+      UNBLOCK_INPUT;
+    }
 
-      /* When a window has disappeared, make sure that no rest of
-	 full-width rows stays visible in the internal border.  */
-      if (windows_or_buffers_changed
-          && (f = XFRAME (w->frame),
-              width = FRAME_INTERNAL_BORDER_WIDTH (f),
-              width != 0))
-	{
-	  int height = desired_row->visible_height;
-	  int x = (window_box_right (w, -1)
-                   + FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f));
-	  int y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, desired_row->y));
-          HDC hdc = get_frame_dc (f);
+  /* When a window has disappeared, make sure that no rest of
+     full-width rows stays visible in the internal border.  Could
+     check here if updated_window is the leftmost/rightmost window,
+     but I guess it's not worth doing since vertically split windows
+     are almost never used, internal border is rarely set, and the
+     overhead is very small.  */
+  if (windows_or_buffers_changed
+      && desired_row->full_width_p
+      && (f = XFRAME (w->frame),
+	  width = FRAME_INTERNAL_BORDER_WIDTH (f),
+	  width != 0)
+      && (height = desired_row->visible_height,
+	  height > 0))
+    {
+      int y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, desired_row->y));
+
+      /* Internal border is drawn below the tool bar.  */
+      if (WINDOWP (f->tool_bar_window)
+	  && w == XWINDOW (f->tool_bar_window))
+	y -= width;
 
-          w32_clear_area (f, hdc, x, y, width, height);
-          release_frame_dc (f, hdc);
-	}
-      
+      BLOCK_INPUT;
+      {
+	HDC hdc = get_frame_dc (f);
+
+	w32_clear_area (f, hdc, 0, y, width, height);
+	w32_clear_area (f, hdc, f->output_data.w32->pixel_width - width,
+			y, width, height);
+	release_frame_dc (f, hdc);
+      }
       UNBLOCK_INPUT;
     }
 }
@@ -1220,7 +1238,22 @@
 
       if (retval)
 	{
+#if 0
+	  /* Disabled until we can find a way to get the right results
+	     on all versions of Windows.  */
+
+	  /* Don't trust the ABC widths.  For synthesized fonts they are
+	     wrong, and so is the result of GetCharWidth()!  */
+	  int real_width;
+	  GetCharWidth (hdc, *char2b, *char2b, &real_width);
+#endif
 	  pcm->width = char_widths.abcA + char_widths.abcB + char_widths.abcC;
+#if 0
+	  /* As far as I can tell, this is the best way to determine what
+	     ExtTextOut will do with the broken font.  */
+	  if (pcm->width != real_width)
+	    pcm->width = (pcm->width + real_width) / 2;
+#endif
 	  pcm->lbearing = char_widths.abcA;
 	  pcm->rbearing = pcm->width - char_widths.abcC;
 	  pcm->ascent = FONT_BASE (font);
@@ -2036,8 +2069,7 @@
 	  else if (!SINGLE_BYTE_CHAR_P (it->c)
 		   && !it->multibyte_p)
 	    {
-	      it->char_to_display = multibyte_char_to_unibyte (it->c, Qnil);
-              it->multibyte_p = 0;
+	      it->multibyte_p = 1;
 	      it->face_id = FACE_FOR_CHAR (it->f, face, it->char_to_display);
 	      face = FACE_FROM_ID (it->f, it->face_id);
 	    }
@@ -2783,7 +2815,7 @@
                                        enum draw_glyphs_face));
 static int x_draw_glyphs P_ ((struct window *, int , struct glyph_row *,
 			      enum glyph_row_area, int, int,
-			      enum draw_glyphs_face, int *, int *, int));
+			      enum draw_glyphs_face, int));
 static void x_set_glyph_string_clipping P_ ((struct glyph_string *));
 static void x_set_glyph_string_gc P_ ((struct glyph_string *));
 static void x_draw_glyph_string_background P_ ((struct glyph_string *,
@@ -3085,20 +3117,6 @@
       r_height = s->row->visible_height;
     }
 
-  /* Don't use S->y for clipping because it doesn't take partially
-     visible lines into account.  For example, it can be negative for
-     partially visible lines at the top of a window.  */
-  if (!s->row->full_width_p
-      && MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (s->w, s->row))
-    r->top = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (s->w);
-  else
-    r->top = max (0, s->row->y);
-
-  /* If drawing a tool-bar window, draw it over the internal border
-     at the top of the window.  */
-  if (s->w == XWINDOW (s->f->tool_bar_window))
-    r->top -= s->f->output_data.w32->internal_border_width;
-
   /* If S draws overlapping rows, it's sufficient to use the top and
      bottom of the window for clipping because this glyph string
      intentionally draws over other lines.  */
@@ -3107,7 +3125,23 @@
       r->top = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (s->w);
       r_height = window_text_bottom_y (s->w) - r->top;
     }
-      
+  else
+    {
+        /* Don't use S->y for clipping because it doesn't take partially
+	   visible lines into account.  For example, it can be negative for
+	   partially visible lines at the top of a window.  */
+      if (!s->row->full_width_p
+	  && MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (s->w, s->row))
+	r->top = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (s->w);
+      else
+	r->top = max (0, s->row->y);
+
+      /* If drawing a tool-bar window, draw it over the internal border
+	 at the top of the window.  */
+      if (s->w == XWINDOW (s->f->tool_bar_window))
+	r->top -= s->f->output_data.w32->internal_border_width;
+    }
+
   r->top = WINDOW_TO_FRAME_PIXEL_Y (s->w, r->top);
 
   r->bottom = r->top + r_height;
@@ -3704,7 +3738,8 @@
     {
       w32_fill_area (f, hdc, gc.foreground,
                      left_x + i * left_p, top_y + i,
-                     (right_x + 1 - i * right_p) - (left_x + i * left_p), 1);
+                     (right_x + 1 - i * right_p) - (left_x + i * left_p) + 1,
+		     1);
     }
 
   /* Left.  */
@@ -3713,7 +3748,7 @@
       {
         w32_fill_area (f, hdc, gc.foreground,
                        left_x + i, top_y + i, 1,
-                       (bottom_y - i) - (top_y + i));
+                       (bottom_y - i) - (top_y + i) + 2);
       }
 
   w32_set_clip_rectangle (hdc, NULL);
@@ -3731,7 +3766,7 @@
     {
       w32_fill_area (f, hdc, gc.foreground, 
                      left_x + i * left_p, bottom_y - i,
-                     (right_x + 1 - i * right_p) - left_x + i * left_p, 1);
+                     (right_x - i * right_p) - (left_x + i * left_p) + 2, 1);
     }
 
   /* Right.  */
@@ -3740,7 +3775,7 @@
       {
         w32_fill_area (f, hdc, gc.foreground,
                        right_x - i, top_y + i + 1, 1,
-                       (bottom_y - i) - (top_y + i + 1));
+                       (bottom_y - i) - (top_y + i));
       }
 
   w32_set_clip_rectangle (hdc, NULL);
@@ -3819,7 +3854,7 @@
   width = abs (s->face->box_line_width);
   raised_p = s->face->box == FACE_RAISED_BOX;
   left_x = s->x;
-  right_x = ((s->row->full_width_p
+  right_x = ((s->row->full_width_p && s->extends_to_end_of_line_p
 	      ? last_x - 1
 	      : min (last_x, s->x + s->background_width) - 1));
   top_y = s->y;
@@ -4268,6 +4303,16 @@
 	  int w = s->background_width - width, h = s->height;
 	  RECT r;
           HDC hdc = s->hdc;
+
+	  if (s->row->mouse_face_p
+	      && cursor_in_mouse_face_p (s->w))
+	    {
+	      x_set_mouse_face_gc (s);
+	      gc = s->gc;
+	    }
+	  else
+	    gc = s->face->gc;
+
 	  w32_get_glyph_string_clip_rect (s, &r);
 	  w32_set_clip_rectangle (hdc, &r);
 
@@ -4286,7 +4331,7 @@
             }
         }
     }
-  else
+  else if (!s->background_filled_p)
     x_draw_glyph_string_bg_rect (s, s->x, s->y, s->background_width,
 				 s->height);
   
@@ -4315,7 +4360,6 @@
 
   /* Set up S->gc, set clipping and draw S.  */
   x_set_glyph_string_gc (s);
-  x_set_glyph_string_clipping (s);
 
   /* Draw relief (if any) in advance for char/composition so that the
      glyph string can be drawn over it.  */
@@ -4325,10 +4369,14 @@
 	  || s->first_glyph->type == COMPOSITE_GLYPH))
 
     {
+      x_set_glyph_string_clipping (s);
       x_draw_glyph_string_background (s, 1);
       x_draw_glyph_string_box (s);
+      x_set_glyph_string_clipping (s);
       relief_drawn_p = 1;
     }
+  else
+    x_set_glyph_string_clipping (s);
 
   switch (s->first_glyph->type)
     {
@@ -4618,7 +4666,7 @@
   /* Adjust base line for subscript/superscript text.  */
   s->ybase += voffset;
 
-  xassert (s->face && s->face->gc);
+  xassert (s->face);
   return glyph - s->row->glyphs[s->area];
 }
 
@@ -4684,7 +4732,9 @@
 	       || s->face->background != default_face->background
 	       || s->face->stipple != default_face->stipple
 	       || s->row->mouse_face_p))
-	  || s->hl == DRAW_MOUSE_FACE))
+	  || s->hl == DRAW_MOUSE_FACE
+	  || ((s->hl == DRAW_IMAGE_RAISED || s->hl == DRAW_IMAGE_SUNKEN)
+	      && s->row->fill_line_p)))
     s->extends_to_end_of_line_p = 1;
   
   /* If S extends its face to the end of the line, set its
@@ -4886,27 +4936,19 @@
    DRAW_IMAGE_SUNKEN	draw an image with a sunken relief around it
    DRAW_IMAGE_RAISED	draw an image with a raised relief around it
 
-   If REAL_START is non-null, return in *REAL_START the real starting
-   position for display.  This can be different from START in case
-   overlapping glyphs must be displayed.  If REAL_END is non-null,
-   return in *REAL_END the real end position for display.  This can be
-   different from END in case overlapping glyphs must be displayed.
-
    If OVERLAPS_P is non-zero, draw only the foreground of characters
    and clip to the physical height of ROW.
 
    Value is the x-position reached, relative to AREA of W.  */
      
 static int
-x_draw_glyphs (w, x, row, area, start, end, hl, real_start, real_end,
-               overlaps_p)
+x_draw_glyphs (w, x, row, area, start, end, hl, overlaps_p)
      struct window *w;
      int x;
      struct glyph_row *row;
      enum glyph_row_area area;
      int start, end;
      enum draw_glyphs_face hl;
-     int *real_start, *real_end;
      int overlaps_p;
 {
   struct glyph_string *head, *tail;
@@ -4920,10 +4962,6 @@
   end = min (end, row->used[area]);
   start = max (0, start);
   start = min (end, start);
-  if (real_start)
-    *real_start = start;
-  if (real_end)
-    *real_end = end;
 
   /* Translate X to frame coordinates.  Set last_x to the right
      end of the drawing area.  */
@@ -4995,8 +5033,6 @@
 			       DRAW_NORMAL_TEXT, dummy_x, last_x,
                                overlaps_p);
 	  start = i;
-	  if (real_start)
-	    *real_start = start;
 	  x_compute_overhangs_and_x (t, head->x, 1);
 	  x_prepend_glyph_string_lists (&head, &tail, h, t);
 	}
@@ -5016,8 +5052,6 @@
                                overlaps_p);
 	  for (s = h; s; s = s->next)
 	    s->background_filled_p = 1;
-	  if (real_start)
-	    *real_start = i;
 	  x_compute_overhangs_and_x (t, head->x, 1);
 	  x_prepend_glyph_string_lists (&head, &tail, h, t);
 	}
@@ -5034,8 +5068,6 @@
                                overlaps_p);
 	  x_compute_overhangs_and_x (h, tail->x + tail->width, 0);
 	  x_append_glyph_string_lists (&head, &tail, h, t);
-	  if (real_end)
-	    *real_end = i;
 	}
 
       /* Append glyph strings for glyphs following the last glyph
@@ -5053,8 +5085,6 @@
 	    s->background_filled_p = 1;
 	  x_compute_overhangs_and_x (h, tail->x + tail->width, 0);
 	  x_append_glyph_string_lists (&head, &tail, h, t);
-	  if (real_end)
-	    *real_end = i;
 	}
     }
 
@@ -5062,6 +5092,29 @@
   for (s = head; s; s = s->next)
     x_draw_glyph_string (s);
 
+  if (area == TEXT_AREA
+      && !row->full_width_p
+      /* When drawing overlapping rows, only the glyph strings'
+	 foreground is drawn, which doesn't erase a cursor
+	 completely. */
+      && !overlaps_p)
+    {
+      int x0 = head ? head->x : x;
+      int x1 = tail ? tail->x + tail->background_width : x;
+      
+      x0 = FRAME_TO_WINDOW_PIXEL_X (w, x0);
+      x1 = FRAME_TO_WINDOW_PIXEL_X (w, x1);
+      
+      if (!row->full_width_p && XFASTINT (w->left_margin_width) != 0)
+	{
+	  int left_area_width = window_box_width (w, LEFT_MARGIN_AREA);
+	  x0 -= left_area_width;
+	  x1 -= left_area_width;
+	}
+
+      notice_overwritten_cursor (w, x0, x1);
+    }
+
   /* Value is the x-position up to which drawn, relative to AREA of W.
      This doesn't include parts drawn because of overhangs.  */
   x_reached = FRAME_TO_WINDOW_PIXEL_X (w, x_reached);
@@ -5115,8 +5168,7 @@
 
 	  x_draw_glyphs (w, start_x, row, area, start, i,
 			 (row->inverse_p
-			  ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT),
-			 NULL, NULL, 1);
+			  ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT), 1);
 	}
       else
 	{
@@ -5140,7 +5192,7 @@
      struct glyph *start;
      int len;
 {
-  int x, hpos, real_start, real_end;
+  int x, hpos;
 
   xassert (updated_window && updated_row);
   BLOCK_INPUT;
@@ -5153,11 +5205,7 @@
 		     hpos, hpos + len,
 		     (updated_row->inverse_p
 		      ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT),
-		     &real_start, &real_end, 0);
-
-  /* If we drew over the cursor, note that it is not visible any more.  */
-  note_overwritten_text_cursor (updated_window, real_start,
-				real_end - real_start);
+		     0);
 
   UNBLOCK_INPUT;
   
@@ -5179,7 +5227,7 @@
   int line_height, shift_by_width, shifted_region_width;
   struct glyph_row *row;
   struct glyph *glyph;
-  int frame_x, frame_y, hpos, real_start, real_end;
+  int frame_x, frame_y, hpos;
   HDC hdc;
 
   xassert (updated_window && updated_row);
@@ -5212,8 +5260,7 @@
   /* Write the glyphs.  */
   hpos = start - row->glyphs[updated_area];
   x_draw_glyphs (w, output_cursor.x, row, updated_area, hpos, hpos + len,
-		 DRAW_NORMAL_TEXT, &real_start, &real_end, 0);
-  note_overwritten_text_cursor (w, real_start, real_end - real_start);
+		 DRAW_NORMAL_TEXT, 0);
   
   /* Advance the output cursor.  */
   output_cursor.hpos += len;
@@ -5288,7 +5335,7 @@
   
   /* Notice if the cursor will be cleared by this operation.  */
   if (!updated_row->full_width_p)
-    note_overwritten_text_cursor (w, output_cursor.hpos, -1);
+    notice_overwritten_cursor (w, output_cursor.x, -1);
 
   from_x = output_cursor.x;
      
@@ -5436,7 +5483,8 @@
 {
   struct frame *f = XFRAME (w->frame);
   int x, y, width, height, from_y, to_y, bottom_y;
-  HDC hdc = get_frame_dc (f);
+  HWND hwnd = FRAME_W32_WINDOW (f);
+  HRGN expect_dirty;
 
   /* Get frame-relative bounding box of the text display area of W,
      without mode lines.  Include in this box the flags areas to the
@@ -5457,6 +5505,7 @@
 	height = bottom_y - from_y;
       else
 	height = run->height;
+      expect_dirty = CreateRectRgn (x, y + height, x + width, bottom_y);
     }
   else
     {
@@ -5466,6 +5515,7 @@
 	height = bottom_y - to_y;
       else
 	height = run->height;
+      expect_dirty = CreateRectRgn (x, y, x + width, to_y);
     }
 
   BLOCK_INPUT;
@@ -5474,10 +5524,46 @@
   updated_window = w;
   x_clear_cursor (w);
 
-  BitBlt (hdc, x, to_y, width, height, hdc, x, from_y, SRCCOPY);
-  
+#if 0
+  /* The following fixes a bug where Emacs is partially obscured by
+     another Window.  It works perfectly in the CVS head, but leaves
+     a false cursor behind under certain conditions in 21.2.  It's not
+     obvious why, but the blinking cursor seems to pause for an extra
+     second after scrolling in 21.2, and it is when the cursor is moved
+     within that brief period that it gets left behind.  */
+  {
+    RECT from;
+    RECT to;
+    HRGN dirty = CreateRectRgn (0, 0, 0, 0);
+    HRGN combined = CreateRectRgn (0, 0, 0, 0);
+
+    from.left = to.left = x;
+    from.right = to.right = x + width;
+    from.top = from_y;
+    from.bottom = from_y + height;
+    to.top = y;
+    to.bottom = bottom_y;
+
+    ScrollWindowEx (hwnd, 0, to_y - from_y, &from, &to, dirty,
+		    NULL, SW_INVALIDATE);
+
+    /* Combine this with what we expect to be dirty. This covers the
+       case where not all of the region we expect is actually dirty.  */
+    CombineRgn (combined, dirty, expect_dirty, RGN_OR);
+
+    /* If the dirty region is not what we expected, redraw the entire frame.  */
+    if (!EqualRgn (combined, expect_dirty))
+      SET_FRAME_GARBAGED (f);
+  }
+#else
+  {
+    HDC hdc = get_frame_dc (f);
+    BitBlt (hdc, x, to_y, width, height, hdc, x, from_y, SRCCOPY);
+    release_frame_dc (f, hdc);
+  }
+#endif
+
   UNBLOCK_INPUT;
-  release_frame_dc (f, hdc);
 }
 
 
@@ -5497,6 +5583,7 @@
      int x, y, w, h;
 {
   RECT r;
+  int mouse_face_overwritten_p = 0;
 
   TRACE ((stderr, "expose_frame "));
 
@@ -5532,69 +5619,40 @@
     }
 
   TRACE ((stderr, "(%d, %d, %d, %d)\n", r.left, r.top, r.right, r.bottom));
-  expose_window_tree (XWINDOW (f->root_window), &r);
+  mouse_face_overwritten_p = expose_window_tree (XWINDOW (f->root_window), &r);
 
   if (WINDOWP (f->tool_bar_window))
-    {
-      struct window *w = XWINDOW (f->tool_bar_window);
-      RECT window_rect;
-      RECT intersection_rect;
-      int window_x, window_y, window_width, window_height;
-
-      window_box (w, -1, &window_x, &window_y, &window_width, &window_height);
-      window_rect.left = window_x;
-      window_rect.top = window_y;
-      window_rect.right = window_x + window_width;
-      window_rect.bottom = window_y + window_height;
-
-      if (IntersectRect (&intersection_rect, &r, &window_rect))
-	expose_window (w, &intersection_rect);
-    }
+    mouse_face_overwritten_p
+      |= expose_window (XWINDOW (f->tool_bar_window), &r);
 }
 
 
 /* Redraw (parts) of all windows in the window tree rooted at W that
    intersect R.  R contains frame pixel coordinates.  */
 
-static void
+static int
 expose_window_tree (w, r)
      struct window *w;
      RECT *r;
 {
-  while (w)
+  struct frame *f = XFRAME (w->frame);
+  int mouse_face_overwritten_p = 0;
+
+  while (w && !FRAME_GARBAGED_P (f))
     {
       if (!NILP (w->hchild))
-	expose_window_tree (XWINDOW (w->hchild), r);
+	mouse_face_overwritten_p
+	  |= expose_window_tree (XWINDOW (w->hchild), r);
       else if (!NILP (w->vchild))
-	expose_window_tree (XWINDOW (w->vchild), r);
+	mouse_face_overwritten_p
+	  |= expose_window_tree (XWINDOW (w->vchild), r);
       else
-	{
-	  RECT window_rect;
-	  RECT intersection_rect;
-	  struct frame *f = XFRAME (w->frame);
-	  int window_x, window_y, window_width, window_height;
-
-	  /* Frame-relative pixel rectangle of W.  */
-	  window_box (w, -1, &window_x, &window_y, &window_width,
-		      &window_height);
-	  window_rect.left
-	    = (window_x
-	       - FRAME_X_LEFT_FLAGS_AREA_WIDTH (f)
-	       - FRAME_LEFT_SCROLL_BAR_WIDTH (f) * CANON_Y_UNIT (f));
-	  window_rect.top = window_y;
-	  window_rect.right = window_rect.left
-	    + (window_width
-	       + FRAME_X_FLAGS_AREA_WIDTH (f)
-	       + FRAME_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f));
-	  window_rect.bottom = window_rect.top
-	    + window_height + CURRENT_MODE_LINE_HEIGHT (w);
+	mouse_face_overwritten_p |= expose_window (w, r);
 
-	  if (IntersectRect (&intersection_rect, r, &window_rect))
-	    expose_window (w, &intersection_rect);
-	}
-
-      w = NILP (w->next) ? 0 : XWINDOW (w->next);
+      w = NILP (w->next) ? NULL : XWINDOW (w->next);
     }
+
+  return mouse_face_overwritten_p;
 }
 
 
@@ -5618,7 +5676,7 @@
     x_draw_glyphs (w, 0, row, area,
 		   0, row->used[area],
 		   row->inverse_p ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT,
-		   NULL, NULL, 0);
+		   0);
   else
     {
       /* Set START_X to the window-relative start position for drawing glyphs of
@@ -5657,7 +5715,7 @@
                        first - row->glyphs[area],
                        last - row->glyphs[area],
                        row->inverse_p ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT,
-                       NULL, NULL, 0);
+                       0);
     }
 }
 
@@ -5665,7 +5723,7 @@
 /* Redraw the parts of the glyph row ROW on window W intersecting
    rectangle R.  R is in window-relative coordinates.  */
 
-static void
+static int
 expose_line (w, row, r)
      struct window *w;
      struct glyph_row *row;
@@ -5676,7 +5734,7 @@
   if (row->mode_line_p || w->pseudo_window_p)
     x_draw_glyphs (w, 0, row, TEXT_AREA, 0, row->used[TEXT_AREA],
 		   row->inverse_p ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT,
-		   NULL, NULL, 0);
+		   0);
   else
     {
       if (row->used[LEFT_MARGIN_AREA])
@@ -5687,6 +5745,8 @@
 	expose_area (w, row, r, RIGHT_MARGIN_AREA);
       x_draw_row_bitmaps (w, row);
     }
+
+  return row->mouse_face_p;
 }
 
 
@@ -5717,79 +5777,105 @@
 /* Redraw a rectangle of window W.  R is a rectangle in window
    relative coordinates.  Call this function with input blocked.  */
 
-static void
-expose_window (w, r)
+static int
+expose_window (w, fr)
      struct window *w;
-     RECT *r;
+     RECT *fr;
 {
-  struct glyph_row *row;
-  int y;
-  int yb = window_text_bottom_y (w);
-  int cursor_cleared_p;
+  struct frame *f = XFRAME (w->frame);
+  RECT wr, r;
+  int mouse_face_overwritten_p = 0;
 
   /* If window is not yet fully initialized, do nothing.  This can
      happen when toolkit scroll bars are used and a window is split.
      Reconfiguring the scroll bar will generate an expose for a newly
      created window.  */
-  if (w->current_matrix == NULL || w == updated_window)
-    return;
-
-  TRACE ((stderr, "expose_window (%d, %d, %d, %d)\n",
-	  r->left, r->top, r->right, r->bottom));
-
-  /* Convert to window coordinates.  */
-  r->left = FRAME_TO_WINDOW_PIXEL_X (w, r->left);
-  r->top = FRAME_TO_WINDOW_PIXEL_Y (w, r->top);
-  r->right = FRAME_TO_WINDOW_PIXEL_X (w, r->right);
-  r->bottom = FRAME_TO_WINDOW_PIXEL_Y (w, r->bottom);
+  if (w->current_matrix == NULL)
+    return 0;
 
-  /* Turn off the cursor.  */
-  if (!w->pseudo_window_p
-      && x_phys_cursor_in_rect_p (w, r))
+  /* When we're currently updating the window, display and current
+     matrix usually don't agree.  Arrange for a thorough display
+     later.  */
+  if (w == updated_window)
     {
-      x_clear_cursor (w);
-      cursor_cleared_p = 1;
+      SET_FRAME_GARBAGED (f);
+      return 0;
     }
-  else
-    cursor_cleared_p = 0;
 
-  /* Find the first row intersecting the rectangle R.  */
-  row = w->current_matrix->rows;
-  y = 0;
-  while (row->enabled_p
-	 && y < yb
-	 && y + row->height < r->top)
-    {
-      y += row->height;
-      ++row;
-    }
-	
-  /* Display the text in the rectangle, one text line at a time.  */
-  while (row->enabled_p
-	 && y < yb
-	 && y < r->bottom)
+  /* Frame-relative pixel rectangle of W.  */
+  wr.left = XFASTINT (w->left) * CANON_X_UNIT (f);
+  wr.top = XFASTINT (w->top) * CANON_Y_UNIT (f);
+  wr.right = wr.left + XFASTINT (w->width) * CANON_X_UNIT (f);
+  wr.bottom = wr.top + XFASTINT (w->height) * CANON_Y_UNIT (f);
+
+  if (IntersectRect(&r, fr, &wr))
     {
-      expose_line (w, row, r);
-      y += row->height;
-      ++row;
-    }
+      int yb = window_text_bottom_y (w);
+      struct glyph_row *row;
+      int cursor_cleared_p;
 
-  /* Display the mode line if there is one.  */
-  if (WINDOW_WANTS_MODELINE_P (w)
-      && (row = MATRIX_MODE_LINE_ROW (w->current_matrix),
-	  row->enabled_p)
-      && row->y < r->bottom)
-    expose_line (w, row, r);
+      TRACE ((stderr, "expose_window (%d, %d, %d, %d)\n",
+	      r.left, r.top, r.right, r.bottom));
 
-  if (!w->pseudo_window_p)
-    {
-      /* Draw border between windows.  */
-      x_draw_vertical_border (w);
-      
-      /* Turn the cursor on again.  */
-      if (cursor_cleared_p)
-	x_update_window_cursor (w, 1);
+      /* Convert to window coordinates.  */
+      r.left = FRAME_TO_WINDOW_PIXEL_X (w, r.left);
+      r.right = FRAME_TO_WINDOW_PIXEL_X (w, r.right);
+      r.top = FRAME_TO_WINDOW_PIXEL_Y (w, r.top);
+      r.bottom = FRAME_TO_WINDOW_PIXEL_Y (w, r.bottom);
+
+      /* Turn off the cursor.  */
+      if (!w->pseudo_window_p
+	  && x_phys_cursor_in_rect_p (w, &r))
+	{
+	  x_clear_cursor (w);
+	  cursor_cleared_p = 1;
+	}
+      else
+	cursor_cleared_p = 0;
+
+      /* Find the first row intersecting the rectangle R.  */
+      for (row = w->current_matrix->rows;
+	   row->enabled_p;
+	   ++row)
+	{
+	  int y0 = row->y;
+	  int y1 = MATRIX_ROW_BOTTOM_Y (row);
+
+	  if ((y0 >= r.top && y0 < r.bottom)
+	      || (y1 > r.top && y1 < r.bottom)
+	      || (r.top >= y0 && r.top < y1)
+	      || (r.bottom > y0 && r.bottom < y1))
+	    {
+	      if (expose_line (w, row, &r))
+		mouse_face_overwritten_p = 1;
+	    }
+
+	  if (y1 >= yb)
+	    break;
+	}
+
+      /* Display the mode line if there is one.  */
+      if (WINDOW_WANTS_MODELINE_P (w)
+	  && (row = MATRIX_MODE_LINE_ROW (w->current_matrix),
+	      row->enabled_p)
+	  && row->y < r.bottom)
+	{
+	  if (expose_line (w, row, &r))
+	    mouse_face_overwritten_p = 1;
+	}
+
+      if (!w->pseudo_window_p)
+	{
+	  /* Draw border between windows.  */
+	  x_draw_vertical_border (w);
+
+	  /* Turn the cursor on again.  */
+	  if (cursor_cleared_p)
+	    x_update_window_cursor (w, 1);
+	}
     }
+
+  return mouse_face_overwritten_p;
 }
 
 
@@ -6192,11 +6278,16 @@
 static MSG last_mouse_motion_event;
 static Lisp_Object last_mouse_motion_frame;
 
+static void remember_mouse_glyph P_ ((struct frame *, int, int));
+
 static void
 note_mouse_movement (frame, msg)
      FRAME_PTR frame;
      MSG *msg;
 {
+  int mouse_x = LOWORD (msg->lParam);
+  int mouse_y = HIWORD (msg->lParam);
+
   last_mouse_movement_time = msg->time;
   memcpy (&last_mouse_motion_event, msg, sizeof (last_mouse_motion_event));
   XSETFRAME (last_mouse_motion_frame, frame);
@@ -6209,14 +6300,19 @@
     }
 
   /* Has the mouse moved off the glyph it was on at the last sighting?  */
-  else if (LOWORD (msg->lParam) < last_mouse_glyph.left
-	   || LOWORD (msg->lParam) > last_mouse_glyph.right
-	   || HIWORD (msg->lParam) < last_mouse_glyph.top
-	   || HIWORD (msg->lParam) > last_mouse_glyph.bottom)
+  else if (mouse_x < last_mouse_glyph.left
+	   || mouse_x > last_mouse_glyph.right
+	   || mouse_y < last_mouse_glyph.top
+	   || mouse_y > last_mouse_glyph.bottom)
     {
       frame->mouse_moved = 1;
       last_mouse_scroll_bar = Qnil;
-      note_mouse_highlight (frame, LOWORD (msg->lParam), HIWORD (msg->lParam));
+      note_mouse_highlight (frame, mouse_x, mouse_y);
+      /* Remember the mouse position here, as w32_mouse_position only
+	 gets called when mouse tracking is enabled but we also need
+	 to keep track of the mouse for help_echo and highlighting at
+	 other times.  */
+      remember_mouse_glyph (frame, mouse_x, mouse_y);
     }
 }
 
@@ -6239,10 +6335,11 @@
    date.  */
 
 static struct glyph *
-x_y_to_hpos_vpos (w, x, y, hpos, vpos, area)
+x_y_to_hpos_vpos (w, x, y, hpos, vpos, area, buffer_only_p)
      struct window *w;
      int x, y;
      int *hpos, *vpos, *area;
+     int buffer_only_p;
 {
   struct glyph *glyph, *end;
   struct glyph_row *row = NULL;
@@ -6300,7 +6397,7 @@
 	{
 	  if (w->pseudo_window_p)
 	    break;
-	  else if (BUFFERP (glyph->object))
+	  else if (!buffer_only_p || BUFFERP (glyph->object))
 	    break;
 	}
       
@@ -6434,6 +6531,7 @@
   int portion;
   Lisp_Object window;
   struct window *w;
+  struct buffer *b;
 
   /* When a menu is active, don't highlight because this looks odd. */
   if (popup_activated ())
@@ -6467,6 +6565,9 @@
   if (!WINDOWP (window))
     return;
 
+  /* Reset help_echo.  It will get recomputed below.  */
+  help_echo = Qnil;
+
   /* Convert to window-relative pixel coordinates.  */
   w = XWINDOW (window);
   frame_to_window_pixel_xy (w, &x, &y);
@@ -6479,9 +6580,9 @@
       return;
     }
 
+  /* Mouse is on the mode or header line?  */
   if (portion == 1 || portion == 3)
     {
-      /* Mouse is on the mode or top line.  */
       note_mode_line_highlight (w, x, portion == 1);
       return;
     }
@@ -6496,18 +6597,24 @@
 
   /* Are we in a window whose display is up to date?
      And verify the buffer's text has not changed.  */
+  b = XBUFFER (w->buffer);
   if (/* Within text portion of the window.  */
       portion == 0
       && EQ (w->window_end_valid, w->buffer)
-      && XFASTINT (w->last_modified) == BUF_MODIFF (XBUFFER (w->buffer))
-      && (XFASTINT (w->last_overlay_modified)
-	  == BUF_OVERLAY_MODIFF (XBUFFER (w->buffer))))
+      && XFASTINT (w->last_modified) == BUF_MODIFF (b)
+      && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b))
     {
       int hpos, vpos, pos, i, area;
       struct glyph *glyph;
+      Lisp_Object object;
+      Lisp_Object mouse_face = Qnil, overlay = Qnil, position;
+      Lisp_Object *overlay_vec = NULL;
+      int len, noverlays;
+      struct buffer *obuf;
+      int obegv, ozv, same_region;
 
       /* Find the glyph under X/Y.  */
-      glyph = x_y_to_hpos_vpos (w, x, y, &hpos, &vpos, &area);
+      glyph = x_y_to_hpos_vpos (w, x, y, &hpos, &vpos, &area, 0);
 
       /* Clear mouse face if X/Y not over text.  */
       if (glyph == NULL
@@ -6519,192 +6626,318 @@
 	}
 
       pos = glyph->charpos;
-      xassert (w->pseudo_window_p || BUFFERP (glyph->object));
-
-      /* Check for mouse-face and help-echo.  */
-      {
-        Lisp_Object mouse_face, overlay, position;
-        Lisp_Object *overlay_vec;
-        int len, noverlays;
-        struct buffer *obuf;
-        int obegv, ozv;
-
-        /* If we get an out-of-range value, return now; avoid an error.  */
-        if (pos > BUF_Z (XBUFFER (w->buffer)))
-          return;
-
-        /* Make the window's buffer temporarily current for
-           overlays_at and compute_char_face.  */
-        obuf = current_buffer;
-        current_buffer = XBUFFER (w->buffer);
-        obegv = BEGV;
-        ozv = ZV;
-        BEGV = BEG;
-        ZV = Z;
-
-        /* Is this char mouse-active or does it have help-echo?  */
-        XSETINT (position, pos);
-
-	/* Put all the overlays we want in a vector in overlay_vec.
-	   Store the length in len.  If there are more than 10, make
-	   enough space for all, and try again.  */
-        len = 10;
-        overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
-        noverlays =  overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL, 0);
-	if (noverlays > len)
-	  {
-	    len = noverlays;
-	    overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
-	    noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL,0);
-	  }
+      object = glyph->object;
+      if (!STRINGP (object) && !BUFFERP (object))
+	return;
+
+      /* If we get an out-of-range value, return now; avoid an error.  */
+      if (BUFFERP (object) && pos > BUF_Z (b))
+	return;
+
+      /* Make the window's buffer temporarily current for
+	 overlays_at and compute_char_face.  */
+      obuf = current_buffer;
+      current_buffer = b;
+      obegv = BEGV;
+      ozv = ZV;
+      BEGV = BEG;
+      ZV = Z;
+
+      /* Is this char mouse-active or does it have help-echo?  */
+      position = make_number (pos);
+
+      if (BUFFERP (object))
+	{
+	  /* Put all the overlays we want in a vector in overlay_vec.
+	     Store the length in len.  If there are more than 10, make
+	     enough space for all, and try again.  */
+	  len = 10;
+	  overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
+	  noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL, 0);
+	  if (noverlays > len)
+	    {
+	      len = noverlays;
+	      overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
+	      noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL, 0);
+	    }
 
-	/* Sort overlays into increasing priority order.  */
-        noverlays = sort_overlays (overlay_vec, noverlays, w);
+	  /* Sort overlays into increasing priority order.  */
+	  noverlays = sort_overlays (overlay_vec, noverlays, w);
+	}
+      else
+	noverlays = 0;
 
-	/* Check mouse-face highlighting.  */
-	if (! (EQ (window, dpyinfo->mouse_face_window)
-	       && vpos >= dpyinfo->mouse_face_beg_row
-	       && vpos <= dpyinfo->mouse_face_end_row
-	       && (vpos > dpyinfo->mouse_face_beg_row
-		   || hpos >= dpyinfo->mouse_face_beg_col)
-	       && (vpos < dpyinfo->mouse_face_end_row
-		   || hpos < dpyinfo->mouse_face_end_col
-		   || dpyinfo->mouse_face_past_end)))
+      same_region = (EQ (window, dpyinfo->mouse_face_window)
+		     && vpos >= dpyinfo->mouse_face_beg_row
+		     && vpos <= dpyinfo->mouse_face_end_row
+		     && (vpos > dpyinfo->mouse_face_beg_row
+			 || hpos >= dpyinfo->mouse_face_beg_col)
+		     && (vpos < dpyinfo->mouse_face_end_row
+			 || hpos < dpyinfo->mouse_face_end_col
+			 || dpyinfo->mouse_face_past_end));
+
+      if (! same_region
+	  /* If there exists an overlay with mouse-face overlapping
+	     the one we are currently highlighting, we have to
+	     check if we enter the overlapping overlay, and then
+	     highlight that.  */
+	  || (OVERLAYP (dpyinfo->mouse_face_overlay)
+	      && mouse_face_overlay_overlaps (dpyinfo->mouse_face_overlay)))
 	  {
-	    /* Clear the display of the old active region, if any.  */
-	    clear_mouse_face (dpyinfo);
-
-            /* Find the highest priority overlay that has a mouse-face prop.  */
+            /* Find the highest priority overlay that has a mouse-face
+	       property.  */
             overlay = Qnil;
-            for (i = noverlays - 1; i >= 0; --i)
+            for (i = noverlays - 1; i >= 0 && NILP (overlay); --i)
               {
                 mouse_face = Foverlay_get (overlay_vec[i], Qmouse_face);
                 if (!NILP (mouse_face))
-                  {
-                    overlay = overlay_vec[i];
-                    break;
-                  }
+		  overlay = overlay_vec[i];
               }
 
-            /* If no overlay applies, get a text property.  */
-            if (NILP (overlay))
-              mouse_face = Fget_text_property (position, Qmouse_face, w->buffer);
+	  /* If we're actually highlighting the same overlay as
+	     before, there's no need to do that again.  */
+	  if (!NILP (overlay)
+	      && EQ (overlay, dpyinfo->mouse_face_overlay))
+	    goto check_help_echo;
 
-            /* Handle the overlay case.  */
-            if (! NILP (overlay))
-              {
-                /* Find the range of text around this char that
-                   should be active.  */
-                Lisp_Object before, after;
-                int ignore;
-
-                before = Foverlay_start (overlay);
-                after = Foverlay_end (overlay);
-                /* Record this as the current active region.  */
-                fast_find_position (w, XFASTINT (before),
-                                    &dpyinfo->mouse_face_beg_col,
-                                    &dpyinfo->mouse_face_beg_row,
+	  dpyinfo->mouse_face_overlay = overlay;
+
+	  /* Clear the display of the old active region, if any.  */
+	  clear_mouse_face (dpyinfo);
+	  /* TODO: mouse cursor changes.  */
+
+	  /* If no overlay applies, get a text property.  */
+	  if (NILP (overlay))
+	    mouse_face = Fget_text_property (position, Qmouse_face, object);
+
+	  /* Handle the overlay case.  */
+	  if (!NILP (overlay))
+	    {
+	      /* Find the range of text around this char that
+		 should be active.  */
+	      Lisp_Object before, after;
+	      int ignore;
+
+	      before = Foverlay_start (overlay);
+	      after = Foverlay_end (overlay);
+	      /* Record this as the current active region.  */
+	      fast_find_position (w, XFASTINT (before),
+				  &dpyinfo->mouse_face_beg_col,
+				  &dpyinfo->mouse_face_beg_row,
+				  &dpyinfo->mouse_face_beg_x,
+				  &dpyinfo->mouse_face_beg_y, Qnil);
+
+	      dpyinfo->mouse_face_past_end
+		= !fast_find_position (w, XFASTINT (after),
+				       &dpyinfo->mouse_face_end_col,
+				       &dpyinfo->mouse_face_end_row,
+				       &dpyinfo->mouse_face_end_x,
+				       &dpyinfo->mouse_face_end_y, Qnil);
+	      dpyinfo->mouse_face_window = window;
+
+	      dpyinfo->mouse_face_face_id
+		= face_at_buffer_position (w, pos, 0, 0,
+					   &ignore, pos + 1, 1);
+
+	      /* Display it as active.  */
+	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
+	      /* TODO: mouse cursor changes.  */
+	    }
+	  /* Handle the text property case.  */
+	  else if (! NILP (mouse_face) && BUFFERP (object))
+	    {
+	      /* Find the range of text around this char that
+		 should be active.  */
+	      Lisp_Object before, after, beginning, end;
+	      int ignore;
+
+	      beginning = Fmarker_position (w->start);
+	      end = make_number (BUF_Z (XBUFFER (object))
+				 - XFASTINT (w->window_end_pos));
+	      before
+		= Fprevious_single_property_change (make_number (pos + 1),
+						    Qmouse_face,
+						    object, beginning);
+	      after
+		= Fnext_single_property_change (position, Qmouse_face,
+						object, end);
+
+	      /* Record this as the current active region.  */
+	      fast_find_position (w, XFASTINT (before),
+				  &dpyinfo->mouse_face_beg_col,
+				  &dpyinfo->mouse_face_beg_row,
+				  &dpyinfo->mouse_face_beg_x,
+				  &dpyinfo->mouse_face_beg_y, Qnil);
+	      dpyinfo->mouse_face_past_end
+		= !fast_find_position (w, XFASTINT (after),
+				       &dpyinfo->mouse_face_end_col,
+				       &dpyinfo->mouse_face_end_row,
+				       &dpyinfo->mouse_face_end_x,
+				       &dpyinfo->mouse_face_end_y, Qnil);
+	      dpyinfo->mouse_face_window = window;
+
+	      if (BUFFERP (object))
+		dpyinfo->mouse_face_face_id
+		  = face_at_buffer_position (w, pos, 0, 0,
+					     &ignore, pos + 1, 1);
+
+	      /* Display it as active.  */
+	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
+	      /* TODO: mouse cursor changes.  */
+	    }
+	  else if (!NILP (mouse_face) && STRINGP (object))
+	    {
+	      Lisp_Object b, e;
+	      int ignore;
+
+	      b = Fprevious_single_property_change (make_number (pos + 1),
+						    Qmouse_face,
+						    object, Qnil);
+	      e = Fnext_single_property_change (position, Qmouse_face,
+						object, Qnil);
+	      if (NILP (b))
+		b = make_number (0);
+	      if (NILP (e))
+		e = make_number (XSTRING (object)->size - 1);
+	      fast_find_string_pos (w, XINT (b), object,
+				    &dpyinfo->mouse_face_beg_col,
+				    &dpyinfo->mouse_face_beg_row,
 				    &dpyinfo->mouse_face_beg_x,
-				    &dpyinfo->mouse_face_beg_y);
-                dpyinfo->mouse_face_past_end
-                  = !fast_find_position (w, XFASTINT (after),
-                                         &dpyinfo->mouse_face_end_col,
-                                         &dpyinfo->mouse_face_end_row,
-                                         &dpyinfo->mouse_face_end_x,
-                                         &dpyinfo->mouse_face_end_y);
-                dpyinfo->mouse_face_window = window;
-                dpyinfo->mouse_face_face_id
-                  = face_at_buffer_position (w, pos, 0, 0,
-                                             &ignore, pos + 1, 1);
+				    &dpyinfo->mouse_face_beg_y, 0);
+	      fast_find_string_pos (w, XINT (e), object,
+				    &dpyinfo->mouse_face_end_col,
+				    &dpyinfo->mouse_face_end_row,
+				    &dpyinfo->mouse_face_end_x,
+				    &dpyinfo->mouse_face_end_y, 1);
+	      dpyinfo->mouse_face_past_end = 0;
+	      dpyinfo->mouse_face_window = window;
+	      dpyinfo->mouse_face_face_id
+		= face_at_string_position (w, object, pos, 0, 0, 0, &ignore,
+					   glyph->face_id, 1);
+	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
+	      /* TODO: mouse cursor changes.  */
+	    }
+	  else if (STRINGP (object) && NILP (mouse_face))
+	    {
+	      /* A string which doesn't have mouse-face, but
+		 the text ``under'' it might have.  */
+	      struct glyph_row *r = MATRIX_ROW (w->current_matrix, vpos);
+	      int start = MATRIX_ROW_START_CHARPOS (r);
+	      
+	      pos = string_buffer_position (w, object, start);
+	      if (pos > 0)
+		mouse_face = get_char_property_and_overlay (make_number (pos),
+							    Qmouse_face,
+							    w->buffer,
+							    &overlay);
+	      if (!NILP (mouse_face) && !NILP (overlay))
+		{
+		  Lisp_Object before = Foverlay_start (overlay);
+		  Lisp_Object after = Foverlay_end (overlay);
+		  int ignore;
+
+		  /* Note that we might not be able to find position
+		     BEFORE in the glyph matrix if the overlay is
+		     entirely covered by a `display' property.  In
+		     this case, we overshoot.  So let's stop in
+		     the glyph matrix before glyphs for OBJECT.  */
+		  fast_find_position (w, XFASTINT (before),
+				      &dpyinfo->mouse_face_beg_col,
+				      &dpyinfo->mouse_face_beg_row,
+				      &dpyinfo->mouse_face_beg_x,
+				      &dpyinfo->mouse_face_beg_y,
+				      object);
+		       
+		  dpyinfo->mouse_face_past_end
+		    = !fast_find_position (w, XFASTINT (after),
+					   &dpyinfo->mouse_face_end_col,
+					   &dpyinfo->mouse_face_end_row,
+					   &dpyinfo->mouse_face_end_x,
+					   &dpyinfo->mouse_face_end_y,
+					   Qnil);
+		  dpyinfo->mouse_face_window = window;
+		  dpyinfo->mouse_face_face_id
+		    = face_at_buffer_position (w, pos, 0, 0,
+					       &ignore, pos + 1, 1);
+
+		  /* Display it as active.  */
+		  show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
+		  /* TODO: mouse cursor changes.  */
+		}
+	    }
+	}
 
-                /* Display it as active.  */
-                show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
-              }
-            /* Handle the text property case.  */
-            else if (! NILP (mouse_face))
-              {
-                /* Find the range of text around this char that
-                   should be active.  */
-                Lisp_Object before, after, beginning, end;
-                int ignore;
-
-                beginning = Fmarker_position (w->start);
-                XSETINT (end, (BUF_Z (XBUFFER (w->buffer))
-                               - XFASTINT (w->window_end_pos)));
-                before
-                  = Fprevious_single_property_change (make_number (pos + 1),
-                                                      Qmouse_face,
-                                                      w->buffer, beginning);
-                after
-                  = Fnext_single_property_change (position, Qmouse_face,
-                                                  w->buffer, end);
-                /* Record this as the current active region.  */
-                fast_find_position (w, XFASTINT (before),
-                                    &dpyinfo->mouse_face_beg_col,
-                                    &dpyinfo->mouse_face_beg_row,
-                                    &dpyinfo->mouse_face_beg_x,
-                                    &dpyinfo->mouse_face_beg_y);
-                dpyinfo->mouse_face_past_end
-                  = !fast_find_position (w, XFASTINT (after),
-                                         &dpyinfo->mouse_face_end_col,
-                                         &dpyinfo->mouse_face_end_row,
-					 &dpyinfo->mouse_face_end_x,
-					 &dpyinfo->mouse_face_end_y);
-                dpyinfo->mouse_face_window = window;
-                dpyinfo->mouse_face_face_id
-                  = face_at_buffer_position (w, pos, 0, 0,
-                                             &ignore, pos + 1, 1);
+    check_help_echo:
+      /* Look for a `help-echo' property.  */
+      {
+	Lisp_Object help, overlay;
 
-                /* Display it as active.  */
-                show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
-              }
-          }
+	/* Check overlays first.  */
+	help = overlay = Qnil;
+	for (i = noverlays - 1; i >= 0 && NILP (help); --i)
+	  {
+	    overlay = overlay_vec[i];
+	    help = Foverlay_get (overlay, Qhelp_echo); 
+	  }
 
-        /* Look for a `help-echo' property.  */
-        {
-          Lisp_Object help, overlay;
+	if (!NILP (help))
+	  {
+	    help_echo = help;
+	    help_echo_window = window;
+	    help_echo_object = overlay;
+	    help_echo_pos = pos;
+	  }
+	else
+	  {
+	    Lisp_Object object = glyph->object;
+	    int charpos = glyph->charpos;
 
-	  /* Check overlays first.  */
-	  help = overlay = Qnil;
-	  for (i = noverlays - 1; i >= 0 && NILP (help); --i)
-            {
-              overlay = overlay_vec[i];
-              help = Foverlay_get (overlay, Qhelp_echo); 
-            }
+	    /* Try text properties.  */
+	    if (STRINGP (object)
+		&& charpos >= 0
+		&& charpos < XSTRING (object)->size)
+	      {
+		help = Fget_text_property (make_number (glyph->charpos),
+                                           Qhelp_echo, object);
+		if (NILP (help))
+		  {
+		    /* If the string itself doesn't specify a help-echo,
+		       see if the buffer text ``under'' it does.  */
+		    struct glyph_row *r
+		      = MATRIX_ROW (w->current_matrix, vpos);
+		    int start = MATRIX_ROW_START_CHARPOS (r);
+		    int pos = string_buffer_position (w, object, start);
+		    if (pos > 0)
+		      {
+			help = Fget_char_property (make_number (pos),
+						   Qhelp_echo, w->buffer);
+			if (!NILP (help))
+			  {
+			    charpos = pos;
+			    object = w->buffer;
+			  }
+		      }
+		  }
+	      }
+	    else if (BUFFERP (object)
+		     && charpos >= BEGV
+		     && charpos < ZV)
+	      help = Fget_text_property (make_number (charpos), Qhelp_echo,
+					 object);
 
-          if (!NILP (help))
-            {
-              help_echo = help;
-              help_echo_window = window;
-              help_echo_object = overlay;
-              help_echo_pos = pos;
-            }
-          else
-            {
-              /* Try text properties.  */
-              if ((STRINGP (glyph->object)
-		   && glyph->charpos >= 0
-		   && glyph->charpos < XSTRING (glyph->object)->size)
-		  || (BUFFERP (glyph->object)
-		      && glyph->charpos >= BEGV
-		      && glyph->charpos < ZV))
-                help = Fget_text_property (make_number (glyph->charpos),
-                                           Qhelp_echo, glyph->object);
-	    
-              if (!NILP (help))
-                {
-                  help_echo = help;
-                  help_echo_window = window;
-                  help_echo_object = glyph->object;
-                  help_echo_pos = glyph->charpos;
-                }
-            }
-        }
-        
-        BEGV = obegv;
-        ZV = ozv;
-        current_buffer = obuf;
+	    if (!NILP (help))
+	      {
+		help_echo = help;
+		help_echo_window = window;
+		help_echo_object = object;
+		help_echo_pos = charpos;
+	      }
+	  }
       }
+        
+      BEGV = obegv;
+      ZV = ozv;
+      current_buffer = obuf;
     }
 }
 
@@ -6755,7 +6988,7 @@
   int area;
 
   /* Find the glyph under X/Y.  */
-  *glyph = x_y_to_hpos_vpos (w, x, y, hpos, vpos, &area);
+  *glyph = x_y_to_hpos_vpos (w, x, y, hpos, vpos, &area, 0);
   if (*glyph == NULL)
     return -1;
 
@@ -6939,24 +7172,28 @@
    *HPOS, *VPOS, *X, and *Y are set to the positions found.  W's
    current glyphs must be up to date.  If POS is above window start
    return (0, 0, 0, 0).  If POS is after end of W, return end of
-   last line in W.  */
+   last line in W.  In the row containing POS, stop before glyphs
+   having STOP as an object.  */
 
 static int
-fast_find_position (w, pos, hpos, vpos, x, y)
+fast_find_position (w, pos, hpos, vpos, x, y, stop)
      struct window *w;
      int pos;
      int *hpos, *vpos, *x, *y;
+     Lisp_Object stop;
 {
   int i;
   int lastcol;
   int maybe_next_line_p = 0;
   int line_start_position;
   int yb = window_text_bottom_y (w);
-  struct glyph_row *row = MATRIX_ROW (w->current_matrix, 0);
-  struct glyph_row *best_row = row;
-  int row_vpos = 0, best_row_vpos = 0;
+  struct glyph_row *row, *best_row;
+  int row_vpos, best_row_vpos;
   int current_x;
 
+  row = best_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
+  row_vpos = best_row_vpos = MATRIX_ROW_VPOS (row, w->current_matrix);
+
   while (row->y < yb)
     {
       if (row->used[TEXT_AREA])
@@ -6993,20 +7230,25 @@
   for (i = 0; i < best_row->used[TEXT_AREA]; i++)
     {
       struct glyph *glyph = best_row->glyphs[TEXT_AREA] + i;
-      int charpos;
+      int charpos = glyph->charpos;
 
-      charpos = glyph->charpos;
-      if (charpos == pos)
+      if (BUFFERP (glyph->object))
 	{
-	  *hpos = i;
-	  *vpos = best_row_vpos;
-	  *x = current_x;
-	  *y = best_row->y;
-	  return 1;
+	  if (charpos == pos)
+	    {
+	      *hpos = i;
+	      *vpos = best_row_vpos;
+	      *x = current_x;
+	      *y = best_row->y;
+	      return 1;
+	    }
+	  else if (charpos > pos)
+	    break;
 	}
-      else if (charpos > pos)
+      else if (EQ (glyph->object, stop))
 	break;
-      else if (charpos > 0)
+
+      if (charpos > 0)
 	lastcol = i;
 
       current_x += glyph->pixel_width;
@@ -7031,6 +7273,88 @@
 }
 
 
+/* Find the position of the the glyph for position POS in OBJECT in
+   window W's current matrix, and return in *X/*Y the pixel
+   coordinates, and return in *HPOS/*VPOS the column/row of the glyph.
+
+   RIGHT_P non-zero means return the position of the right edge of the
+   glyph, RIGHT_P zero means return the left edge position.
+
+   If no glyph for POS exists in the matrix, return the position of
+   the glyph with the next smaller position that is in the matrix, if
+   RIGHT_P is zero.  If RIGHT_P is non-zero, and no glyph for POS
+   exists in the matrix, return the position of the glyph with the
+   next larger position in OBJECT.
+
+   Value is non-zero if a glyph was found.  */
+
+static int
+fast_find_string_pos (w, pos, object, hpos, vpos, x, y, right_p)
+     struct window *w;
+     int pos;
+     Lisp_Object object;
+     int *hpos, *vpos, *x, *y;
+     int right_p;
+{
+  int yb = window_text_bottom_y (w);
+  struct glyph_row *r;
+  struct glyph *best_glyph = NULL;
+  struct glyph_row *best_row = NULL;
+  int best_x = 0;
+
+  for (r = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
+       r->enabled_p && r->y < yb;
+       ++r)
+    {
+      struct glyph *g = r->glyphs[TEXT_AREA];
+      struct glyph *e = g + r->used[TEXT_AREA];
+      int gx;
+
+      for (gx = r->x; g < e; gx += g->pixel_width, ++g)
+	if (EQ (g->object, object))
+	  {
+	    if (g->charpos == pos)
+	      {
+		best_glyph = g;
+		best_x = gx;
+		best_row = r;
+		goto found;
+	      }
+	    else if (best_glyph == NULL
+		     || ((abs (g->charpos - pos)
+			 < abs (best_glyph->charpos - pos))
+			 && (right_p
+			     ? g->charpos < pos
+			     : g->charpos > pos)))
+	      {
+		best_glyph = g;
+		best_x = gx;
+		best_row = r;
+	      }
+	  }
+    }
+
+ found:
+
+  if (best_glyph)
+    {
+      *x = best_x;
+      *hpos = best_glyph - best_row->glyphs[TEXT_AREA];
+
+      if (right_p)
+	{
+	  *x += best_glyph->pixel_width;
+	  ++*hpos;
+	}
+      
+      *y = best_row->y;
+      *vpos = best_row - w->current_matrix->rows;
+    }
+
+  return best_glyph != NULL;
+}
+
+
 /* Display the active region described by mouse_face_*
    in its mouse-face if HL > 0, in its normal face if HL = 0.  */
 
@@ -7041,81 +7365,59 @@
 {
   struct window *w = XWINDOW (dpyinfo->mouse_face_window);
   struct frame *f = XFRAME (WINDOW_FRAME (w));
-  int i;
-  int cursor_off_p = 0;
-  struct cursor_pos saved_cursor;
-
-  saved_cursor = output_cursor;
   
-  /* If window is in the process of being destroyed, don't bother
-     to do anything.  */
-  if (w->current_matrix == NULL)
-    goto set_x_cursor;
-
-  /* Recognize when we are called to operate on rows that don't exist
-     anymore.  This can happen when a window is split.  */
-  if (dpyinfo->mouse_face_end_row >= w->current_matrix->nrows)
-    goto set_x_cursor;
-
-  set_output_cursor (&w->phys_cursor);
-
-  /* Note that mouse_face_beg_row etc. are window relative.  */
-  for (i = dpyinfo->mouse_face_beg_row;
-       i <= dpyinfo->mouse_face_end_row;
-       i++)
+  if (/* If window is in the process of being destroyed, don't bother
+	 to do anything.  */
+      w->current_matrix != NULL
+      /* Recognize when we are called to operate on rows that don't exist
+	 anymore.  This can happen when a window is split.  */
+      && dpyinfo->mouse_face_end_row < w->current_matrix->nrows)
     {
-      int start_hpos, end_hpos, start_x;
-      struct glyph_row *row = MATRIX_ROW (w->current_matrix, i);
+      int phys_cursor_on_p = w->phys_cursor_on_p;
+      struct glyph_row *row, *first, *last;
 
-      /* Don't do anything if row doesn't have valid contents.  */
-      if (!row->enabled_p)
-	continue;
-
-      /* For all but the first row, the highlight starts at column 0.  */
-      if (i == dpyinfo->mouse_face_beg_row)
-	{
-	  start_hpos = dpyinfo->mouse_face_beg_col;
-	  start_x = dpyinfo->mouse_face_beg_x;
-	}
-      else
+      first = MATRIX_ROW (w->current_matrix, dpyinfo->mouse_face_beg_row);
+      last = MATRIX_ROW (w->current_matrix, dpyinfo->mouse_face_end_row);
+      
+      for (row = first; row <= last && row->enabled_p; ++row)
 	{
-	  start_hpos = 0;
-	  start_x = 0;
-	}
+	  int start_hpos, end_hpos, start_x;
 
-      if (i == dpyinfo->mouse_face_end_row)
-	end_hpos = dpyinfo->mouse_face_end_col;
-      else
-	end_hpos = row->used[TEXT_AREA];
+	  /* For all but the first row, the highlight starts at column 0.  */
+	  if (row == first)
+	    {
+	      start_hpos = dpyinfo->mouse_face_beg_col;
+	      start_x = dpyinfo->mouse_face_beg_x;
+	    }
+	  else
+	    {
+	      start_hpos = 0;
+	      start_x = 0;
+	    }
 
-      /* If the cursor's in the text we are about to rewrite, turn the
-	 cursor off.  */
-      if (!w->pseudo_window_p
-	  && i == output_cursor.vpos
-	  && output_cursor.hpos >= start_hpos - 1
-	  && output_cursor.hpos <= end_hpos)
-	{
-	  x_update_window_cursor (w, 0);
-	  cursor_off_p = 1;
-	}
+	  if (row == last)
+	    end_hpos = dpyinfo->mouse_face_end_col;
+	  else
+	    end_hpos = row->used[TEXT_AREA];
 
-      if (end_hpos > start_hpos)
-        {
-          x_draw_glyphs (w, start_x, row, TEXT_AREA,
-                         start_hpos, end_hpos, draw, NULL, NULL, 0);
-          row->mouse_face_p = draw == DRAW_MOUSE_FACE;
-        }
-    }
+	  if (end_hpos > start_hpos)
+	    {
+	      x_draw_glyphs (w, start_x, row, TEXT_AREA, 
+			     start_hpos, end_hpos, draw, 0);
 
-  /* If we turned the cursor off, turn it back on.  */
-  if (cursor_off_p)
-    x_display_cursor (w, 1,
-		      output_cursor.hpos, output_cursor.vpos,
-		      output_cursor.x, output_cursor.y);
+	      row->mouse_face_p
+		= draw == DRAW_MOUSE_FACE || draw == DRAW_IMAGE_RAISED;
+	    }
+	}
 
-  output_cursor = saved_cursor;
+      /* When we've written over the cursor, arrange for it to
+	 be displayed again.  */
+      if (phys_cursor_on_p && !w->phys_cursor_on_p)
+	x_display_cursor (w, 1,
+			  w->phys_cursor.hpos, w->phys_cursor.vpos,
+			  w->phys_cursor.x, w->phys_cursor.y);
+    }
 
- set_x_cursor:
 #if 0 /* TODO: mouse cursor */
   /* Change the mouse cursor.  */
   if (draw == DRAW_NORMAL_TEXT)
@@ -7128,28 +7430,28 @@
     XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
 		   f->output_data.x->nontext_cursor);
 #endif
-  ;
 }
 
 /* Clear out the mouse-highlighted active region.
    Redraw it un-highlighted first.  */
 
-void
+static int
 clear_mouse_face (dpyinfo)
      struct w32_display_info *dpyinfo;
 {
-#if 0 /* This prevents redrawing tool bar items when changing from one
-	 to another while a tooltip is open, so don't do it.  */
-  if (!NILP (tip_frame))
-    return;
-#endif
+  int cleared = 0;
 
   if (! NILP (dpyinfo->mouse_face_window))
-    show_mouse_face (dpyinfo, DRAW_NORMAL_TEXT);
+    {
+      show_mouse_face (dpyinfo, DRAW_NORMAL_TEXT);
+      cleared = 1;
+    }
 
   dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
   dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1;
   dpyinfo->mouse_face_window = Qnil;
+  dpyinfo->mouse_face_overlay = Qnil;
+  return cleared;
 }
 
 
@@ -7194,6 +7496,107 @@
 
 static struct scroll_bar *x_window_to_scroll_bar ();
 static void x_scroll_bar_report_motion ();
+static int glyph_rect P_ ((struct frame *f, int, int, RECT *));
+
+
+/* Try to determine frame pixel position and size of the glyph under
+   frame pixel coordinates X/Y on frame F .  Return the position and
+   size in *RECT.  Value is non-zero if we could compute these
+   values.  */
+
+static int
+glyph_rect (f, x, y, rect)
+     struct frame *f;
+     int x, y;
+     RECT *rect;
+{
+  Lisp_Object window;
+  int part;
+
+
+  window = window_from_coordinates (f, x, y, &part, 0);
+  if (!NILP (window))
+    {
+      struct window *w = XWINDOW (window);
+      struct glyph_row *r = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
+      struct glyph_row *end = r + w->current_matrix->nrows - 1;
+
+      frame_to_window_pixel_xy (w, &x, &y);
+
+      for (; r < end && r->enabled_p; ++r)
+	if (r->y <= y && r->y + r->height > y)
+	  {
+	    /* Found the row at y.  */
+	    struct glyph *g = r->glyphs[TEXT_AREA];
+	    struct glyph *end = g + r->used[TEXT_AREA];
+	    int gx;
+
+	    rect->top = WINDOW_TO_FRAME_PIXEL_Y (w, r->y);
+	    rect->bottom = rect->top + r->height;
+
+	    if (x < r->x)
+	      {
+		/* x is to the left of the first glyph in the row.  */
+		rect->left = XINT (w->left);
+		rect->right = WINDOW_TO_FRAME_PIXEL_X (w, r->x);
+		return 1;
+	      }
+
+	    for (gx = r->x; g < end; gx += g->pixel_width, ++g)
+	      if (gx <= x && gx + g->pixel_width > x)
+		{
+		  /* x is on a glyph.  */
+		  rect->left = WINDOW_TO_FRAME_PIXEL_X (w, gx);
+		  rect->right = rect->left + g->pixel_width;
+		  return 1;
+		}
+
+	    /* x is to the right of the last glyph in the row.  */
+	    rect->left = WINDOW_TO_FRAME_PIXEL_X (w, gx);
+	    rect->right = XINT (w->left) + XINT (w->width);
+	    return 1;
+	  }
+    }
+
+  /* The y is not on any row.  */
+  return 0;
+}
+
+/* Record the position of the mouse in last_mouse_glyph.  */
+static void
+remember_mouse_glyph (f1, gx, gy)
+     struct frame * f1;
+     int gx, gy;
+{
+  if (!glyph_rect (f1, gx, gy, &last_mouse_glyph))
+    {
+      int width = FRAME_SMALLEST_CHAR_WIDTH (f1);
+      int height = FRAME_SMALLEST_FONT_HEIGHT (f1);
+
+      /* Arrange for the division in PIXEL_TO_CHAR_COL etc. to
+	 round down even for negative values.  */
+      if (gx < 0)
+	gx -= width - 1;
+      if (gy < 0)
+	gy -= height - 1;
+#if 0
+      /* This was the original code from XTmouse_position, but it seems
+	 to give the position of the glyph diagonally next to the one
+	 the mouse is over.  */
+      gx = (gx + width - 1) / width * width;
+      gy = (gy + height - 1) / height * height;
+#else
+      gx = gx / width * width;
+      gy = gy / height * height;
+#endif
+
+      last_mouse_glyph.left = gx;
+      last_mouse_glyph.top = gy;
+      last_mouse_glyph.right  = gx + width;
+      last_mouse_glyph.bottom = gy + height;
+    }
+}
+
 
 /* Return the current position of the mouse.
    *fp should be a frame which indicates which display to ask about.
@@ -7257,8 +7660,8 @@
 	else
 	  {
 	    /* Is window under mouse one of our frames?  */
-	    f1 = x_window_to_frame (FRAME_W32_DISPLAY_INFO (*fp),
-                                    WindowFromPoint (pt));
+	    f1 = x_any_window_to_frame (FRAME_W32_DISPLAY_INFO (*fp),
+					WindowFromPoint (pt));
 	  }
 
 	/* If not, is it one of our scroll bars?  */
@@ -7297,24 +7700,7 @@
 				   || insist);
 #else
 	    ScreenToClient (FRAME_W32_WINDOW (f1), &pt);
-	    {
-	      int width = FRAME_SMALLEST_CHAR_WIDTH (f1);
-	      int height = FRAME_SMALLEST_FONT_HEIGHT (f1);
-	      int x = pt.x;
-	      int y = pt.y;
-	      
-	      /* Arrange for the division in PIXEL_TO_CHAR_COL etc. to
-		 round down even for negative values.  */
-	      if (x < 0)
-		x -= width - 1;
-	      if (y < 0)
-		y -= height - 1;
-	      
-	      last_mouse_glyph.left = (x + width - 1) / width * width;
-	      last_mouse_glyph.top = (y + height - 1) / height * height;
-	      last_mouse_glyph.right  = last_mouse_glyph.left + width;
-	      last_mouse_glyph.bottom = last_mouse_glyph.top + height;
-	    }
+	    remember_mouse_glyph (f1, pt.x, pt.y);
 #endif
 
 	    *bar_window = Qnil;
@@ -7634,9 +8020,12 @@
     {
       HDC hdc;
       BLOCK_INPUT;
-      hdc = get_frame_dc (f);
-      w32_clear_area (f, hdc, left, top, width, height);
-      release_frame_dc (f, hdc);
+      if (width && height)
+	{
+	  hdc = get_frame_dc (f);
+	  w32_clear_area (f, hdc, left, top, width, height);
+	  release_frame_dc (f, hdc);
+	}
       UNBLOCK_INPUT;
 
       bar = x_scroll_bar_create (w, top, sb_left, sb_width, height);
@@ -7664,21 +8053,24 @@
           HDC hdc;
           BLOCK_INPUT;
 
-          hdc = get_frame_dc (f);
-          /* Since Windows scroll bars are smaller than the space reserved
-             for them on the frame, we have to clear "under" them.  */
-          w32_clear_area (f, hdc,
-                          left,
-                          top,
-                          width,
-                          height);
-          release_frame_dc (f, hdc);
+	  if (width > 0 && height > 0)
+	    {
+	      hdc = get_frame_dc (f);
+	      /* Since Windows scroll bars are smaller than the space reserved
+		 for them on the frame, we have to clear "under" them.  */
+	      w32_clear_area (f, hdc,
+			      left,
+			      top,
+			      width,
+			      height);
+	      release_frame_dc (f, hdc);
+	    }
 
           /* Make sure scroll bar is "visible" before moving, to ensure the
              area of the parent window now exposed will be refreshed.  */
           my_show_window (f, hwnd, SW_HIDE);
           MoveWindow (hwnd, sb_left, top,
-                      sb_width, height, TRUE);
+                      sb_width, max (height, 1), TRUE);
           if (pfnSetScrollInfo)
             {
               SCROLLINFO si;
@@ -8233,7 +8625,7 @@
 
 	case WM_MOUSEMOVE:
           previous_help_echo = help_echo;
-          help_echo = help_echo_object = help_echo_window = Qnil;
+          help_echo_object = help_echo_window = Qnil;
           help_echo_pos = -1;
 
 	  if (dpyinfo->grabbed && last_mouse_frame
@@ -8253,8 +8645,7 @@
 
           /* If the contents of the global variable help_echo
              has changed, generate a HELP_EVENT.  */
-          if (!NILP (help_echo)
-              || !NILP (previous_help_echo))
+          if (help_echo != previous_help_echo)
             {
               Lisp_Object frame;
               int n;
@@ -8778,21 +9169,22 @@
 			     Text Cursor
  ***********************************************************************/
 
-/* Note if the text cursor of window W has been overwritten by a
-   drawing operation that outputs N glyphs starting at HPOS in the
-   line given by output_cursor.vpos.  N < 0 means all the rest of the
-   line after HPOS has been written.  */
+/* Notice if the text cursor of window W has been overwritten by a
+   drawing operation that outputs glyphs starting at START_X and
+   ending at END_X in the line given by output_cursor.vpos.
+   Coordinates are area-relative.  END_X < 0 means all the rest of the
+   line after START_X has been written.  */
 
 static void
-note_overwritten_text_cursor (w, hpos, n)
+notice_overwritten_cursor (w, start_x, end_x)
      struct window *w;
-     int hpos, n;
+     int start_x, end_x;
 {
   if (updated_area == TEXT_AREA
+      && w->phys_cursor_on_p
       && output_cursor.vpos == w->phys_cursor.vpos
-      && hpos <= w->phys_cursor.hpos
-      && (n < 0
-	  || hpos + n > w->phys_cursor.hpos))
+      && start_x <= w->phys_cursor.x
+      && (end_x < 0 || end_x > w->phys_cursor.x))
     w->phys_cursor_on_p = 0;
 }
 
@@ -8918,13 +9310,24 @@
     }
   else
     {
+      COLORREF cursor_color = f->output_data.w32->cursor_pixel;
+      struct face *face = FACE_FROM_ID (f, cursor_glyph->face_id);
+
       if (width < 0)
         width = f->output_data.w32->cursor_width;
 
+      /* If the glyph's background equals the color we normally draw
+	 the bar cursor in, the bar cursor in its normal color is
+	 invisible.  Use the glyph's foreground color instead in this
+	 case, on the assumption that the glyph's colors are chosen so
+	 that the glyph is legible.  */
+      if (face->background == cursor_color)
+	cursor_color = face->foreground;
+
       x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
       hdc = get_frame_dc (f);
       w32_clip_to_row (w, row, hdc, 0);
-      w32_fill_area (f, hdc, f->output_data.w32->cursor_pixel,
+      w32_fill_area (f, hdc, cursor_color,
                      x,
                      WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y),
                      min (cursor_glyph->pixel_width, width),
@@ -8961,9 +9364,11 @@
      glyphs and mini-buffer.  */
   if (w->phys_cursor.hpos < row->used[TEXT_AREA])
     {
+      int on_p = w->phys_cursor_on_p;
       x_draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA,
                      w->phys_cursor.hpos, w->phys_cursor.hpos + 1,
-                     hl, 0, 0, 0);
+                     hl, 0);
+      w->phys_cursor_on_p = on_p;
 
       /* When we erase the cursor, and ROW is overlapped by other
 	 rows, make sure that these overlapping parts of other rows
@@ -9014,6 +9419,12 @@
   if (!cursor_row->enabled_p)
     goto mark_cursor_off;
   
+  /* If row is completely invisible, don't attempt to delete a cursor which
+     isn't there.  This can happen if cursor is at top of a window, and
+     we switch to a buffer with a header line in that window.  */
+  if (cursor_row->visible_height <= 0)
+    goto mark_cursor_off;
+  
   /* This can happen when the new row is shorter than the old one.
      In this case, either x_draw_glyphs or clear_end_of_line
      should have cleared the cursor.  Note that we wouldn't be
@@ -9075,6 +9486,36 @@
 }
 
 
+/* Non-zero if physical cursor of window W is within mouse face.  */
+
+static int
+cursor_in_mouse_face_p (w)
+     struct window *w;
+{
+  struct w32_display_info *dpyinfo
+    = FRAME_W32_DISPLAY_INFO (XFRAME (w->frame));
+  int in_mouse_face = 0;
+  
+  if (WINDOWP (dpyinfo->mouse_face_window)
+      && XWINDOW (dpyinfo->mouse_face_window) == w)
+    {
+      int hpos = w->phys_cursor.hpos;
+      int vpos = w->phys_cursor.vpos;
+
+      if (vpos >= dpyinfo->mouse_face_beg_row
+	  && vpos <= dpyinfo->mouse_face_end_row
+	  && (vpos > dpyinfo->mouse_face_beg_row
+	      || hpos >= dpyinfo->mouse_face_beg_col)
+	  && (vpos < dpyinfo->mouse_face_end_row
+	      || hpos < dpyinfo->mouse_face_end_col
+	      || dpyinfo->mouse_face_past_end))
+	in_mouse_face = 1;
+    }
+
+  return in_mouse_face;
+}
+
+
 /* Display or clear cursor of window W.  If ON is zero, clear the
    cursor.  If it is non-zero, display the cursor.  If ON is nonzero,
    where to put the cursor is specified by HPOS, VPOS, X and Y.  */
@@ -9132,8 +9573,10 @@
     {
       if (w == XWINDOW (echo_area_window))
 	new_cursor_type = FRAME_DESIRED_CURSOR (f);
-      else
+      else if (cursor_in_non_selected_windows)
 	new_cursor_type = HOLLOW_BOX_CURSOR;
+      else
+	new_cursor_type = NO_CURSOR;
     }
   else
     {
@@ -10186,7 +10629,7 @@
   dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1;
   dpyinfo->mouse_face_face_id = DEFAULT_FACE_ID;
   dpyinfo->mouse_face_window = Qnil;
-
+  dpyinfo->mouse_face_overlay = Qnil;
   /* TODO: dpyinfo->gray */
 
 }
diff -ruN src-21.1/src/w32term.h src-21.2/src/w32term.h
--- src-21.1/src/w32term.h	Thu Jul 26 12:05:02 2001
+++ src-21.2/src/w32term.h	Sat Nov 10 14:18:40 2001
@@ -181,6 +181,7 @@
   int mouse_face_past_end;
   Lisp_Object mouse_face_window;
   int mouse_face_face_id;
+  Lisp_Object mouse_face_overlay;
 
   /* 1 if a mouse motion event came and we didn't handle it right away because
      gc was in progress.  */
@@ -280,7 +281,7 @@
 struct w32_output
 {
   /* Placeholder for things accessed through output_data.x.  */
-  struct x_output x_compatibile;
+  struct x_output x_compatible;
 
   /* Menubar "widget" handle.  */
   HMENU menubar_widget;
diff -ruN src-21.1/src/window.c src-21.2/src/window.c
--- src-21.1/src/window.c	Mon Oct 15 12:46:09 2001
+++ src-21.2/src/window.c	Sat Feb  2 15:47:41 2002
@@ -3521,11 +3521,36 @@
       register int delta1;
       register int opht = (*sizefun) (parent);
 
-      /* If trying to grow this window to or beyond size of the parent,
-	 make delta1 so big that, on shrinking back down,
-	 all the siblings end up with less than one line and are deleted.  */
       if (opht <= XINT (*sizep) + delta)
-	delta1 = opht * opht * 2;
+	{
+	  /* If trying to grow this window to or beyond size of the parent,
+	     just delete all the sibling windows.  */
+	  Lisp_Object start, tem, next;
+
+	  start = XWINDOW (parent)->vchild;
+	  if (NILP (start))
+	    start = XWINDOW (parent)->hchild;
+
+	  /* Delete any siblings that come after WINDOW.  */
+	  tem = XWINDOW (window)->next;
+	  while (! NILP (tem))
+	    {
+	      next = XWINDOW (tem)->next;
+	      delete_window (tem);
+	      tem = next;
+	    }
+
+	  /* Delete any siblings that come after WINDOW.
+	     Note that if START is not WINDOW, then WINDOW still
+	     Fhas siblings, so WINDOW has not yet replaced its parent.  */
+	  tem = start;
+	  while (! EQ (tem, window))
+	    {
+	      next = XWINDOW (tem)->next;
+	      delete_window (tem);
+	      tem = next;
+	    }
+	}
       else
 	{
 	  /* Otherwise, make delta1 just right so that if we add
@@ -3568,19 +3593,20 @@
 	      ++n;
 
 	  delta1 = n * delta;
-	}
 
-      /* Add delta1 lines or columns to this window, and to the parent,
-	 keeping things consistent while not affecting siblings.  */
-      XSETINT (CURSIZE (parent), opht + delta1);
-      (*setsizefun) (window, XINT (*sizep) + delta1, 0);
-
-      /* Squeeze out delta1 lines or columns from our parent,
-	 shriking this window and siblings proportionately.
-	 This brings parent back to correct size.
-	 Delta1 was calculated so this makes this window the desired size,
-	 taking it all out of the siblings.  */
-      (*setsizefun) (parent, opht, 0);
+	  /* Add delta1 lines or columns to this window, and to the parent,
+	     keeping things consistent while not affecting siblings.  */
+	  XSETINT (CURSIZE (parent), opht + delta1);
+	  (*setsizefun) (window, XINT (*sizep) + delta1, 0);
+
+	  /* Squeeze out delta1 lines or columns from our parent,
+	     shriking this window and siblings proportionately.
+	     This brings parent back to correct size.
+	     Delta1 was calculated so this makes this window the desired size,
+	     taking it all out of the siblings.  */
+	  (*setsizefun) (parent, opht, 0);
+
+	}
     }
 
   XSETFASTINT (p->last_modified, 0);
@@ -3777,7 +3803,9 @@
     {
       int min_height = window_min_size (root, 0, 0, 0);
       if (XFASTINT (root->height) - delta < min_height)
-	delta = XFASTINT (root->height) - min_height;
+	/* Note that the roor window may already be smaller than
+	   min_height.  */
+	delta = max (0, XFASTINT (root->height) - min_height);
     }
     
   if (delta)
@@ -4430,7 +4458,13 @@
 
 DEFUN ("scroll-left", Fscroll_left, Sscroll_left, 0, 1, "P",
   "Scroll selected window display ARG columns left.\n\
-Default for ARG is window width minus 2.")
+Default for ARG is window width minus 2.\n\
+Value is the total amount of leftward horizontal scrolling in\n\
+effect after the change.\n\
+If `automatic-hscrolling' is non-nil, the argument ARG modifies\n\
+a lower bound for automatic scrolling, i.e. automatic scrolling\n\
+will not scroll a window to a column less than the value returned\n\
+by this function.")
   (arg)
      register Lisp_Object arg;
 {
@@ -4454,7 +4488,13 @@
 
 DEFUN ("scroll-right", Fscroll_right, Sscroll_right, 0, 1, "P",
   "Scroll selected window display ARG columns right.\n\
-Default for ARG is window width minus 2.")
+Default for ARG is window width minus 2.\n\
+Value is the total amount of leftward horizontal scrolling in\n\
+effect after the change.\n\
+If `automatic-hscrolling' is non-nil, the argument ARG modifies\n\
+a lower bound for automatic scrolling, i.e. automatic scrolling\n\
+will not scroll a window to a column less than the value returned\n\
+by this function.")
   (arg)
      register Lisp_Object arg;
 {
@@ -4598,18 +4638,17 @@
 	  nlines = - XINT (arg) - 1;
 	  move_it_by_lines (&it, nlines, 1);
 
-	  y1 = it.current_y - y0;
-	  h = line_bottom_y (&it) - y1;
+	  y1 = line_bottom_y (&it);
 
 	  /* If we can't move down NLINES lines because we hit
 	     the end of the buffer, count in some empty lines.  */
 	  if (it.vpos < nlines)
 	    y1 += (nlines - it.vpos) * CANON_Y_UNIT (it.f);
 	  
-	  y0 = it.last_visible_y - y1 - h;
-	  
+	  h = window_box_height (w) - (y1 - y0);
+
 	  start_display (&it, w, pt);
-	  move_it_vertically (&it, - y0);
+	  move_it_vertically (&it, - h);
 	  charpos = IT_CHARPOS (it);
 	  bytepos = IT_BYTEPOS (it);
 	}
@@ -5427,8 +5466,8 @@
 DEFUN ("set-window-vscroll", Fset_window_vscroll, Sset_window_vscroll,
        2, 2, 0,
   "Set amount by which WINDOW should be scrolled vertically to VSCROLL.\n\
-WINDOW nil or omitted means use the selected window.  VSCROLL is a\n\
-non-negative multiple of the canonical character height of WINDOW.")
+WINDOW nil means use the selected window.  VSCROLL is a non-negative\n\
+multiple of the canonical character height of WINDOW.")
   (window, vscroll)
      Lisp_Object window, vscroll;
 {
diff -ruN src-21.1/src/xdisp.c src-21.2/src/xdisp.c
--- src-21.1/src/xdisp.c	Fri Oct 19 13:07:44 2001
+++ src-21.2/src/xdisp.c	Wed Mar 13 20:52:27 2002
@@ -552,6 +552,11 @@
 
 #if GLYPH_DEBUG
 
+/* Variables to turn off display optimizations from Lisp.  */
+
+int inhibit_try_window_id, inhibit_try_window_reusing;
+int inhibit_try_cursor_movement;
+
 /* Non-zero means print traces of redisplay if compiled with
    GLYPH_DEBUG != 0.  */
 
@@ -5314,8 +5319,8 @@
      struct it *it;
      int dy;
 {
-  int nlines, h, line_height;
-  struct it it2;
+  int nlines, h;
+  struct it it2, it3;
   int start_pos = IT_CHARPOS (*it);
   
   xassert (dy >= 0);
@@ -5345,7 +5350,7 @@
   move_it_to (&it2, start_pos, -1, -1, it2.vpos + 1,
 	      MOVE_TO_POS | MOVE_TO_VPOS);
   xassert (IT_CHARPOS (*it) >= BEGV);
-  line_height = it2.max_ascent + it2.max_descent;
+  it3 = it2;
   
   move_it_to (&it2, start_pos, -1, -1, -1, MOVE_TO_POS);
   xassert (IT_CHARPOS (*it) >= BEGV);
@@ -5369,19 +5374,47 @@
       /* The y-position we try to reach.  Note that h has been
          subtracted in front of the if-statement.  */
       int target_y = it->current_y + h - dy;
+      int y0 = it3.current_y;
+      int y1 = line_bottom_y (&it3);
+      int line_height = y1 - y0;
 
       /* If we did not reach target_y, try to move further backward if
 	 we can.  If we moved too far backward, try to move forward.  */
       if (target_y < it->current_y
+	  /* This is heuristic.  In a window that's 3 lines high, with
+	     a line height of 13 pixels each, recentering with point
+	     on the bottom line will try to move -39/2 = 19 pixels
+	     backward.  Try to avoid moving into the first line.  */
+	  && it->current_y - target_y > line_height / 3 * 2
 	  && IT_CHARPOS (*it) > BEGV)
 	{
+	  TRACE_MOVE ((stderr, "  not far enough -> move_vert %d\n",
+		       target_y - it->current_y));
 	  move_it_vertically (it, target_y - it->current_y);
 	  xassert (IT_CHARPOS (*it) >= BEGV);
 	}
       else if (target_y >= it->current_y + line_height
 	       && IT_CHARPOS (*it) < ZV)
 	{
-	  move_it_vertically (it, target_y - (it->current_y + line_height));
+	  /* Should move forward by at least one line, maybe more.
+	     
+	     Note: Calling move_it_by_lines can be expensive on
+	     terminal frames, where compute_motion is used (via
+	     vmotion) to do the job, when there are very long lines
+	     and truncate-lines is nil.  That's the reason for
+	     treating terminal frames specially here.  */
+	  
+	  if (!FRAME_WINDOW_P (it->f))
+	    move_it_vertically (it, target_y - (it->current_y + line_height));
+	  else
+	    {
+	      do
+		{
+		  move_it_by_lines (it, 1, 1);
+		}
+	      while (target_y >= line_bottom_y (it) && IT_CHARPOS (*it) < ZV);
+	    }
+
 	  xassert (IT_CHARPOS (*it) >= BEGV);
 	}
     }
@@ -6969,8 +7002,10 @@
 	  
 	  if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f))
 	    {
+	      if (f->resized_p)
+		Fredraw_frame (frame);
 	      clear_current_matrices (f);
-	      f->garbaged = 0;
+	      f->garbaged = f->resized_p = 0;
 	    }
 	}
 
@@ -7930,11 +7965,18 @@
 {
   Lisp_Object prop;
   int success_p;
+  int charpos;
+
+  /* This function can be called asynchronously, which means we must
+     exclude any possibility that Fget_text_property signals an
+     error.  */
+  charpos = min (XSTRING (f->current_tool_bar_string)->size, glyph->charpos);
+  charpos = max (0, charpos);
   
   /* Get the text property `menu-item' at pos. The value of that
      property is the start index of this item's properties in
      F->tool_bar_items.  */
-  prop = Fget_text_property (make_number (glyph->charpos),
+  prop = Fget_text_property (make_number (charpos),
 			     Qmenu_item, f->current_tool_bar_string);
   if (INTEGERP (prop))
     {
@@ -9455,13 +9497,11 @@
       y0 = it.current_y;
       move_it_to (&it, PT, 0, it.last_visible_y, -1,
 		  MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
-      
-      /* With a scroll_margin of 0, scroll_margin_pos is at the window
-	 end, which is one line below the window.  The iterator's
-	 current_y will be same as y0 in that case, but we have to
-	 scroll a line to make PT visible.  That's the reason why 1 is
-	 added below.  */
-      dy = 1 + it.current_y - y0;
+
+      /* To make point visible, we have to move the window start
+	 down so that the line the cursor is in is visible, which
+	 means we have to add in the height of the cursor line.  */
+      dy = line_bottom_y (&it) - y0;
       
       if (dy > scroll_max)
 	return SCROLLING_FAILED;
@@ -9479,7 +9519,7 @@
 	amount_to_scroll = scroll_max;
       else
 	{
-	  aggressive = current_buffer->scroll_down_aggressively;
+	  aggressive = current_buffer->scroll_up_aggressively;
 	  height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w)
 		    - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w));
 	  if (NUMBERP (aggressive))
@@ -9533,7 +9573,7 @@
 	    amount_to_scroll = scroll_max;
 	  else
 	    {
-	      aggressive = current_buffer->scroll_up_aggressively;
+	      aggressive = current_buffer->scroll_down_aggressively;
 	      height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w)
 			- WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w));
 	      if (NUMBERP (aggressive))
@@ -9686,6 +9726,11 @@
   struct frame *f = XFRAME (w->frame);
   int rc = CURSOR_MOVEMENT_CANNOT_BE_USED;
   
+#if GLYPH_DEBUG
+  if (inhibit_try_cursor_movement)
+    return rc;
+#endif
+
   /* Handle case where text has not changed, only point, and it has
      not moved off the frame.  */
   if (/* Point may be in this window.  */
@@ -10622,6 +10667,11 @@
   struct glyph_row *start_row;
   int start_vpos, min_y, max_y;
 
+#if GLYPH_DEBUG
+  if (inhibit_try_window_reusing)
+    return 0;
+#endif
+
   if (/* This function doesn't handle terminal frames.  */
       !FRAME_WINDOW_P (f)
       /* Don't try to reuse the display if windows have been split
@@ -10698,26 +10748,11 @@
 	      int dy = it.current_y - first_row_y;
 	      
 	      row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
-	      while (MATRIX_ROW_DISPLAYS_TEXT_P (row))
-		{
-		  if (PT >= MATRIX_ROW_START_CHARPOS (row)
-		      && PT < MATRIX_ROW_END_CHARPOS (row))
-		    {
-		      set_cursor_from_row (w, row, w->current_matrix, 0, 0,
-					   dy, nrows_scrolled);
-		      break;
-		    }
-		  
-		  if (MATRIX_ROW_BOTTOM_Y (row) + dy >= it.last_visible_y)
-		    break;
-		  
-		  ++row;
-		}
-	      
-	      /* Give up if point was not found.  This shouldn't
-		 happen often; not more often than with try_window
-		 itself.  */
-	      if (w->cursor.vpos < 0)
+	      row = row_containing_pos (w, PT, row, NULL, dy);
+	      if (row)
+		set_cursor_from_row (w, row, w->current_matrix, 0, 0,
+				     dy, nrows_scrolled);
+	      else
 		{
 		  clear_glyph_matrix (w->desired_matrix);
 		  return 0;
@@ -11193,10 +11228,11 @@
    containing CHARPOS or null.  */
 
 struct glyph_row *
-row_containing_pos (w, charpos, start, end)
+row_containing_pos (w, charpos, start, end, dy)
      struct window *w;
      int charpos;
      struct glyph_row *start, *end;
+     int dy;
 {
   struct glyph_row *row = start;
   int last_y;
@@ -11208,18 +11244,18 @@
   if ((end && row >= end) || !row->enabled_p)
     return NULL;
   
-  last_y = window_text_bottom_y (w);
+  last_y = window_text_bottom_y (w) - dy;
       
   while ((end == NULL || row < end)
+	 && MATRIX_ROW_BOTTOM_Y (row) < last_y
 	 && (MATRIX_ROW_END_CHARPOS (row) < charpos
-	     /* The end position of a row equals the start
-		position of the next row.  If CHARPOS is there, we
-		would rather display it in the next line, except
-		when this line ends in ZV.  */
 	     || (MATRIX_ROW_END_CHARPOS (row) == charpos
-		 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)
-		     || !row->ends_at_zv_p)))
-	 && MATRIX_ROW_BOTTOM_Y (row) < last_y)
+		 /* The end position of a row equals the start
+		    position of the next row.  If CHARPOS is there, we
+		    would rather display it in the next line, except
+		    when this line ends in ZV.  */
+		 && !row->ends_at_zv_p
+		 && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row))))
     ++row;
       
   /* Give up if CHARPOS not found.  */
@@ -11288,6 +11324,11 @@
   struct text_pos start;
   int first_changed_charpos, last_changed_charpos;
 
+#if GLYPH_DEBUG
+  if (inhibit_try_window_id)
+    return 0;
+#endif
+
   /* This is handy for debugging.  */
 #if 0
 #define GIVE_UP(X)						\
@@ -11423,7 +11464,7 @@
 	    }
       
 	  /* Set the cursor.  */
-	  row = row_containing_pos (w, PT, r0, NULL);
+	  row = row_containing_pos (w, PT, r0, NULL, 0);
 	  set_cursor_from_row (w, row, current_matrix, 0, 0, 0, 0);
 	  return 1;
 	}
@@ -11461,7 +11502,7 @@
 	    = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
 
 	  /* Set the cursor.  */
-	  row = row_containing_pos (w, PT, r0, NULL);
+	  row = row_containing_pos (w, PT, r0, NULL, 0);
 	  set_cursor_from_row (w, row, current_matrix, 0, 0, 0, 0);
 	  return 2;
 	}
@@ -11675,7 +11716,7 @@
 	{
 	  row = row_containing_pos (w, PT,
 				    MATRIX_FIRST_TEXT_ROW (w->current_matrix),
-				    last_unchanged_at_beg_row + 1);
+				    last_unchanged_at_beg_row + 1, 0);
 	  if (row)
 	    set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
 	}
@@ -11684,7 +11725,7 @@
       else if (first_unchanged_at_end_row)
 	{
 	  row = row_containing_pos (w, PT - delta,
-				    first_unchanged_at_end_row, NULL);
+				    first_unchanged_at_end_row, NULL, 0);
 	  if (row)
 	    set_cursor_from_row (w, row, w->current_matrix, delta,
 				 delta_bytes, dy, dvpos);
@@ -12949,22 +12990,33 @@
 		      it->max_phys_ascent = phys_ascent;
 		      it->max_phys_descent = phys_descent;
 		    }
+		  else if (it->c == '\t' && FRAME_WINDOW_P (it->f))
+		    {
+		      /* A TAB that extends past the right edge of the
+			 window.  This produces a single glyph on
+			 window system frames.  We leave the glyph in
+			 this row and let it fill the row, but don't
+			 consume the TAB.  */
+		      it->continuation_lines_width += it->last_visible_x;
+		      row->ends_in_middle_of_char_p = 1;
+		      row->continued_p = 1;
+		      glyph->pixel_width = it->last_visible_x - x;
+		      it->starts_in_middle_of_char_p = 1;
+		    }
 		  else
 		    {
-		      /* Display element draws past the right edge of
-			 the window.  Restore positions to values
-			 before the element.  The next line starts
-			 with current_x before the glyph that could
-			 not be displayed, so that TAB works right.  */
+		      /* Something other than a TAB that draws past
+			 the right edge of the window.  Restore
+			 positions to values before the element.  */
 		      row->used[TEXT_AREA] = n_glyphs_before + i;
 		  
 		      /* Display continuation glyphs.  */
 		      if (!FRAME_WINDOW_P (it->f))
 			produce_special_glyphs (it, IT_CONTINUATION);
 		      row->continued_p = 1;
-		      
-		      it->current_x = x;
+
 		      it->continuation_lines_width += x;
+		      
 		      if (nglyphs > 1 && i > 0)
 			{
 			  row->ends_in_middle_of_char_p = 1;
@@ -13533,7 +13585,7 @@
 			
 			nglyphs_before = it->glyph_row->used[TEXT_AREA];
 			bytepos = percent_position - XSTRING (elt)->data;
-			charpos = (multibyte
+			charpos = (STRING_MULTIBYTE (elt)
 				   ? string_byte_to_char (elt, bytepos)
 				   : bytepos);
 			nwritten = display_string (spec, Qnil, elt,
@@ -13561,6 +13613,8 @@
 			  }
 		      }
 		  }
+		else /* c == 0 */
+		  break;
 	      }
 	  }
       }
@@ -14935,6 +14989,20 @@
   DEFVAR_BOOL ("inhibit-eval-during-redisplay", &inhibit_eval_during_redisplay,
     "Non-nil means don't eval Lisp during redisplay.");
   inhibit_eval_during_redisplay = 0;
+
+#if GLYPH_DEBUG
+  DEFVAR_BOOL ("inhibit-try-window-id", &inhibit_try_window_id,
+	       "Inhibit try_window_id display optimization.");
+  inhibit_try_window_id = 0;
+
+  DEFVAR_BOOL ("inhibit-try-window-reusing", &inhibit_try_window_reusing,
+	       "Inhibit try_window_reusing display optimization.");
+  inhibit_try_window_reusing = 0;
+
+  DEFVAR_BOOL ("inhibit-try-cursor-movement", &inhibit_try_cursor_movement,
+	       "Inhibit try_cursor_movement display optimization.");
+  inhibit_try_cursor_movement = 0;
+#endif /* GLYPH_DEBUG */
 }
 
 
diff -ruN src-21.1/src/xfaces.c src-21.2/src/xfaces.c
--- src-21.1/src/xfaces.c	Wed Aug 22 11:44:15 2001
+++ src-21.2/src/xfaces.c	Thu Nov  1 11:14:28 2001
@@ -1665,6 +1665,9 @@
      struct face *face;
 {
 #ifdef HAVE_X_WINDOWS
+  if (face->colors_copied_bitwise_p)
+    return;
+
   BLOCK_INPUT;
 
   if (!face->foreground_defaulted_p)
@@ -4388,8 +4391,7 @@
     value = face_boolean_x_resource_value (value, 1);
   else if (EQ (attr, QCunderline)
 	   || EQ (attr, QCoverline)
-	   || EQ (attr, QCstrike_through)
-	   || EQ (attr, QCbox))
+	   || EQ (attr, QCstrike_through))
     {
       Lisp_Object boolean_value;
 
@@ -4399,6 +4401,8 @@
       if (SYMBOLP (boolean_value))
 	value = boolean_value;
     }
+  else if (EQ (attr, QCbox))
+    value = Fcar (Fread_from_string (value, Qnil, Qnil));
 
   return Finternal_set_lisp_face_attribute (face, attr, value, frame);
 }
@@ -4664,7 +4668,7 @@
 	  && !EQ (LFACE_WEIGHT (lface), Qnormal))
 	result = Fcons (Qbold, result);
 
-      if (!NILP (LFACE_SLANT (lface))
+      if (!UNSPECIFIEDP (LFACE_SLANT (lface))
 	  && !EQ (LFACE_SLANT (lface), Qnormal))
 	result = Fcons (Qitalic, result);
 
@@ -6312,12 +6316,7 @@
       face->gc = 0;
 
       /* Don't try to free the colors copied bitwise from BASE_FACE.  */
-      face->foreground_defaulted_p = 1;
-      face->background_defaulted_p = 1;
-      face->underline_defaulted_p = 1;
-      face->overline_color_defaulted_p = 1;
-      face->strike_through_color_defaulted_p = 1;
-      face->box_color_defaulted_p = 1;
+      face->colors_copied_bitwise_p = 1;
 
       /* to force realize_face to load font */
       face->font = NULL;
diff -ruN src-21.1/src/xfns.c src-21.2/src/xfns.c
--- src-21.1/src/xfns.c	Tue Sep 25 19:42:49 2001
+++ src-21.2/src/xfns.c	Fri Feb 22 11:56:32 2002
@@ -1,5 +1,5 @@
 /* Functions for the X window system.
-   Copyright (C) 1989, 92, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001
+   Copyright (C) 1989, 92, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001, 2002
      Free Software Foundation.
 
 This file is part of GNU Emacs.
@@ -24,6 +24,10 @@
 #include <stdio.h>
 #include <math.h>
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 /* This makes the fields of a Display accessible, in Xlib header files.  */
 
 #define XLIB_ILLEGAL_ACCESS
@@ -1938,6 +1942,8 @@
       SET_FRAME_GARBAGED (f);
       do_pending_window_change (0);
     }
+  else
+    SET_FRAME_GARBAGED (f);
 }
 
 void
@@ -2190,6 +2196,10 @@
    CODING_SYSTEM, and return a newly allocated memory area which
    should be freed by `xfree' by a caller.
 
+   SELECTIONP non-zero means the string is being encoded for an X
+   selection, so it is safe to run pre-write conversions (which
+   may run Lisp code).
+
    Store the byte length of resulting text in *TEXT_BYTES.
 
    If the text contains only ASCII and Latin-1, store 1 in *STRING_P,
@@ -2198,9 +2208,10 @@
    the result should be `COMPOUND_TEXT'.  */
 
 unsigned char *
-x_encode_text (string, coding_system, text_bytes, stringp)
+x_encode_text (string, coding_system, selectionp, text_bytes, stringp)
      Lisp_Object string, coding_system;
      int *text_bytes, *stringp;
+     int selectionp;
 {
   unsigned char *str = XSTRING (string)->data;
   int chars = XSTRING (string)->size;
@@ -2220,6 +2231,15 @@
     }
 
   setup_coding_system (coding_system, &coding);
+  if (selectionp
+      && SYMBOLP (coding.pre_write_conversion)
+      && !NILP (Ffboundp (coding.pre_write_conversion)))
+    {
+      string = run_pre_post_conversion_on_str (string, &coding, 1);
+      str = XSTRING (string)->data;
+      chars = XSTRING (string)->size;
+      bytes = STRING_BYTES (XSTRING (string));
+    }
   coding.src_multibyte = 1;
   coding.dst_multibyte = 0;
   coding.mode |= CODING_MODE_LAST_BLOCK;
@@ -2303,7 +2323,7 @@
 	coding_system = Vlocale_coding_system;
 	if (NILP (coding_system))
 	  coding_system = Qcompound_text;
-	text.value = x_encode_text (name, coding_system, &bytes, &stringp);
+	text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp);
 	text.encoding = (stringp ? XA_STRING
 			 : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
 	text.format = 8;
@@ -2315,7 +2335,7 @@
 	  }
 	else
 	  {
-	    icon.value = x_encode_text (f->icon_name, coding_system,
+	    icon.value = x_encode_text (f->icon_name, coding_system, 0,
 					&bytes, &stringp);
 	    icon.encoding = (stringp ? XA_STRING
 			     : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
@@ -2410,7 +2430,7 @@
 	coding_system = Vlocale_coding_system;
 	if (NILP (coding_system))
 	  coding_system = Qcompound_text;
-	text.value = x_encode_text (name, coding_system, &bytes, &stringp);
+	text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp);
 	text.encoding = (stringp ? XA_STRING
 			 : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
 	text.format = 8;
@@ -2422,7 +2442,7 @@
 	  }
 	else
 	  {
-	    icon.value = x_encode_text (f->icon_name, coding_system,
+	    icon.value = x_encode_text (f->icon_name, coding_system, 0,
 					&bytes, &stringp);
 	    icon.encoding = (stringp ? XA_STRING
 			     : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
@@ -4963,7 +4983,7 @@
   int i;
 
   for (i = 0; i < dpy->nscreens; ++i)
-    if (scr == dpy->screens[i])
+    if (scr == dpy->screens + i)
       break;
 
   return i;
@@ -8053,11 +8073,9 @@
   
   if (CONSP (how))
     {
-      int rgb[3], i = 0;
+      int rgb[3], i;
 
-      while (i < 3
-	     && CONSP (how)
-	     && NATNUMP (XCAR (how)))
+      for (i = 0; i < 3 && CONSP (how) && NATNUMP (XCAR (how)); ++i)
 	{
 	  rgb[i] = XFASTINT (XCAR (how)) & 0xffff;
 	  how = XCDR (how);
@@ -8066,17 +8084,9 @@
       if (i == 3 && NILP (how))
 	{
 	  char color_name[30];
-	  XColor exact, color;
-	  Colormap cmap;
-
 	  sprintf (color_name, "#%04x%04x%04x", rgb[0], rgb[1], rgb[2]);
-	  
-	  cmap = FRAME_X_COLORMAP (f);
-	  if (XLookupColor (dpy, cmap, color_name, &exact, &color))
-	    {
-	      bg = color.pixel;
-	      look_at_corners_p = 0;
-	    }
+	  bg = x_alloc_image_color (f, img, build_string (color_name), 0);
+	  look_at_corners_p = 0;
 	}
     }
   
@@ -9798,8 +9808,8 @@
       return 0;
     }
 
-  width = img->width = gif->SWidth;
-  height = img->height = gif->SHeight;
+  width = img->width = max (gif->SWidth, gif->Image.Left + gif->Image.Width);
+  height = img->height = max (gif->SHeight, gif->Image.Top + gif->Image.Height);
 
   /* Create the X image and pixmap.  */
   if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
diff -ruN src-21.1/src/xselect.c src-21.2/src/xselect.c
--- src-21.1/src/xselect.c	Thu Jul 12 16:38:51 2001
+++ src-21.2/src/xselect.c	Sat Feb 23 10:02:51 2002
@@ -1,5 +1,5 @@
 /* X Selection processing for Emacs.
-   Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001
+   Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002
    Free Software Foundation.
 
 This file is part of GNU Emacs.
@@ -97,6 +97,8 @@
 
 Lisp_Object QCOMPOUND_TEXT;	/* This is a type of selection.  */
 
+Lisp_Object Qcompound_text_with_extensions;
+
 #ifdef CUT_BUFFER_SUPPORT
 Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3,
   QCUT_BUFFER4, QCUT_BUFFER5, QCUT_BUFFER6, QCUT_BUFFER7;
@@ -1650,6 +1652,10 @@
 	  str = make_string_from_bytes ((char *) buf,
 					coding.produced_char, coding.produced);
 	  xfree (buf);
+
+	  if (SYMBOLP (coding.post_read_conversion)
+	      && !NILP (Ffboundp (coding.post_read_conversion)))
+	    str = run_pre_post_conversion_on_str (str, &coding, 0);
 	  Vlast_coding_system_used = coding.symbol;
 	}
       compose_chars_in_text (0, XSTRING (str)->size, str);
@@ -1756,10 +1762,13 @@
 	Vnext_selection_coding_system = Vselection_coding_system;
 
       *format_ret = 8;
-      *data_ret = x_encode_text (obj, Vnext_selection_coding_system,
+      *data_ret = x_encode_text (obj, Vnext_selection_coding_system, 1,
 				 (int *) size_ret, &stringp);
       *nofree_ret = (*data_ret == XSTRING (obj)->data);
-      if (NILP (type))
+      if (EQ (Vnext_selection_coding_system,
+	      Qcompound_text_with_extensions))
+	type = QCOMPOUND_TEXT;
+      else if (NILP (type))
 	type = (stringp ? QSTRING : QCOMPOUND_TEXT);
       Vlast_coding_system_used = (*nofree_ret
 				  ? Qraw_text
@@ -2426,6 +2435,8 @@
   QATOM	     = intern ("ATOM");		staticpro (&QATOM);
   QATOM_PAIR = intern ("ATOM_PAIR");	staticpro (&QATOM_PAIR);
   QNULL	     = intern ("NULL");		staticpro (&QNULL);
+  Qcompound_text_with_extensions = intern ("compound-text-with-extensions");
+  staticpro (&Qcompound_text_with_extensions);
 
 #ifdef CUT_BUFFER_SUPPORT
   QCUT_BUFFER0 = intern ("CUT_BUFFER0"); staticpro (&QCUT_BUFFER0);
diff -ruN src-21.1/src/xterm.c src-21.2/src/xterm.c
--- src-21.1/src/xterm.c	Mon Oct 15 12:13:28 2001
+++ src-21.2/src/xterm.c	Sat Mar 16 11:34:56 2002
@@ -772,33 +772,45 @@
      struct glyph_row *desired_row;
 {
   struct window *w = updated_window;
+  struct frame *f;
+  int width, height;
   
   xassert (w);
   
   if (!desired_row->mode_line_p && !w->pseudo_window_p)
     {
-      struct frame *f;
-      int width;
-      
       BLOCK_INPUT;
       x_draw_row_bitmaps (w, desired_row);
-
-      /* When a window has disappeared, make sure that no rest of
-	 full-width rows stays visible in the internal border.  */
-      if (windows_or_buffers_changed
-	  && (f = XFRAME (w->frame),
-	      width = FRAME_INTERNAL_BORDER_WIDTH (f),
-	      width != 0))
-	{
-	  int height = desired_row->visible_height;
-	  int x = (window_box_right (w, -1)
-		   + FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f));
-	  int y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, desired_row->y));
-
-	  x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-			x, y, width, height, False);
-	}
+      UNBLOCK_INPUT;
+    }
+      
+  /* When a window has disappeared, make sure that no rest of
+     full-width rows stays visible in the internal border.  Could
+     check here if updated_window is the leftmost/rightmost window,
+     but I guess it's not worth doing since vertically split windows
+     are almost never used, internal border is rarely set, and the
+     overhead is very small.  */
+  if (windows_or_buffers_changed
+      && desired_row->full_width_p
+      && (f = XFRAME (w->frame),
+	  width = FRAME_INTERNAL_BORDER_WIDTH (f),
+	  width != 0)
+      && (height = desired_row->visible_height,
+	  height > 0))
+    {
+      int y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, desired_row->y));
+
+      /* Internal border is drawn below the tool bar.  */
+      if (WINDOWP (f->tool_bar_window)
+	  && w == XWINDOW (f->tool_bar_window))
+	y -= width;
       
+      BLOCK_INPUT;
+      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+		    0, y, width, height, False);
+      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+		    f->output_data.x->pixel_width - width,
+		    y, width, height, False);
       UNBLOCK_INPUT;
     }
 }
@@ -2535,7 +2547,7 @@
 					enum draw_glyphs_face));
 static int x_draw_glyphs P_ ((struct window *, int , struct glyph_row *,
 			      enum glyph_row_area, int, int,
-			      enum draw_glyphs_face, int *, int *, int));
+			      enum draw_glyphs_face, int));
 static void x_set_glyph_string_clipping P_ ((struct glyph_string *));
 static void x_set_glyph_string_gc P_ ((struct glyph_string *));
 static void x_draw_glyph_string_background P_ ((struct glyph_string *,
@@ -3922,7 +3934,7 @@
   for (i = 0; i < width; ++i)
     XDrawLine (dpy, window, gc,
 	       left_x + i * left_p, bottom_y - i,
-	       right_x + 2 - i * right_p, bottom_y - i);
+	       right_x + 1 - i * right_p, bottom_y - i);
   
   /* Right.  */
   if (right_p)
@@ -4019,7 +4031,7 @@
 	     || (s->hl == DRAW_MOUSE_FACE
 		 && (s->next == NULL
 		     || s->next->hl != s->hl)));
-  
+
   x_get_glyph_string_clip_rect (s, &clip_rect);
 
   if (s->face->box == FACE_SIMPLE_BOX)
@@ -4843,7 +4855,9 @@
 	       || s->face->background != default_face->background
 	       || s->face->stipple != default_face->stipple
 	       || s->row->mouse_face_p))
-	  || s->hl == DRAW_MOUSE_FACE))
+	  || s->hl == DRAW_MOUSE_FACE
+	  || ((s->hl == DRAW_IMAGE_RAISED || s->hl == DRAW_IMAGE_SUNKEN)
+	      && s->row->fill_line_p)))
       s->extends_to_end_of_line_p = 1;
   
   /* If S extends its face to the end of the line, set its
@@ -5047,27 +5061,19 @@
    DRAW_IMAGE_SUNKEN	draw an image with a sunken relief around it
    DRAW_IMAGE_RAISED	draw an image with a raised relief around it
 
-   If REAL_START is non-null, return in *REAL_START the real starting
-   position for display.  This can be different from START in case
-   overlapping glyphs must be displayed.  If REAL_END is non-null,
-   return in *REAL_END the real end position for display.  This can be
-   different from END in case overlapping glyphs must be displayed.
-
    If OVERLAPS_P is non-zero, draw only the foreground of characters
    and clip to the physical height of ROW.
 
    Value is the x-position reached, relative to AREA of W.  */
      
 static int
-x_draw_glyphs (w, x, row, area, start, end, hl, real_start, real_end,
-	       overlaps_p)
+x_draw_glyphs (w, x, row, area, start, end, hl, overlaps_p)
      struct window *w;
      int x;
      struct glyph_row *row;
      enum glyph_row_area area;
      int start, end;
      enum draw_glyphs_face hl;
-     int *real_start, *real_end;
      int overlaps_p;
 {
   struct glyph_string *head, *tail;
@@ -5080,10 +5086,6 @@
   end = min (end, row->used[area]);
   start = max (0, start);
   start = min (end, start);
-  if (real_start)
-    *real_start = start;
-  if (real_end)
-    *real_end = end;
 
   /* Translate X to frame coordinates.  Set last_x to the right
      end of the drawing area.  */
@@ -5155,8 +5157,6 @@
 			       DRAW_NORMAL_TEXT, dummy_x, last_x,
 			       overlaps_p);
 	  start = i;
-	  if (real_start)
-	    *real_start = start;
 	  x_compute_overhangs_and_x (t, head->x, 1);
 	  x_prepend_glyph_string_lists (&head, &tail, h, t);
 	}
@@ -5176,8 +5176,6 @@
 			       overlaps_p);
 	  for (s = h; s; s = s->next)
 	    s->background_filled_p = 1;
-	  if (real_start)
-	    *real_start = i;
 	  x_compute_overhangs_and_x (t, head->x, 1);
 	  x_prepend_glyph_string_lists (&head, &tail, h, t);
 	}
@@ -5194,8 +5192,6 @@
 			       overlaps_p);
 	  x_compute_overhangs_and_x (h, tail->x + tail->width, 0);
 	  x_append_glyph_string_lists (&head, &tail, h, t);
-	  if (real_end)
-	    *real_end = i;
 	}
 
       /* Append glyph strings for glyphs following the last glyph
@@ -5213,8 +5209,6 @@
 	    s->background_filled_p = 1;
 	  x_compute_overhangs_and_x (h, tail->x + tail->width, 0);
 	  x_append_glyph_string_lists (&head, &tail, h, t);
-	  if (real_end)
-	    *real_end = i;
 	}
     }
 
@@ -5222,12 +5216,35 @@
   for (s = head; s; s = s->next)
     x_draw_glyph_string (s);
 
+  if (area == TEXT_AREA
+      && !row->full_width_p
+      /* When drawing overlapping rows, only the glyph strings'
+	 foreground is drawn, which doesn't erase a cursor
+	 completely. */
+      && !overlaps_p)
+    {
+      int x0 = head ? head->x : x;
+      int x1 = tail ? tail->x + tail->background_width : x;
+      
+      x0 = FRAME_TO_WINDOW_PIXEL_X (w, x0);
+      x1 = FRAME_TO_WINDOW_PIXEL_X (w, x1);
+      
+      if (XFASTINT (w->left_margin_width) != 0)
+	{
+	  int left_area_width = window_box_width (w, LEFT_MARGIN_AREA);
+	  x0 -= left_area_width;
+	  x1 -= left_area_width;
+	}
+
+      notice_overwritten_cursor (w, x0, x1);
+    }
+
   /* Value is the x-position up to which drawn, relative to AREA of W.
      This doesn't include parts drawn because of overhangs.  */
   x_reached = FRAME_TO_WINDOW_PIXEL_X (w, x_reached);
   if (!row->full_width_p)
     {
-      if (area > LEFT_MARGIN_AREA)
+      if (area > LEFT_MARGIN_AREA && XFASTINT (w->left_margin_width) != 0)
 	x_reached -= window_box_width (w, LEFT_MARGIN_AREA);
       if (area > TEXT_AREA)
 	x_reached -= window_box_width (w, TEXT_AREA);
@@ -5274,7 +5291,7 @@
 	  x_draw_glyphs (w, start_x, row, area, start, i,
 			 (row->inverse_p
 			  ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT),
-			 NULL, NULL, 1);
+			 1);
 	}
       else
 	{
@@ -5298,7 +5315,7 @@
      struct glyph *start;
      int len;
 {
-  int x, hpos, real_start, real_end;
+  int x, hpos;
 
   xassert (updated_window && updated_row);
   BLOCK_INPUT;
@@ -5311,11 +5328,7 @@
 		     hpos, hpos + len,
 		     (updated_row->inverse_p
 		      ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT),
-		     &real_start, &real_end, 0);
-
-  /* If we drew over the cursor, note that it is not visible any more.  */
-  notice_overwritten_cursor (updated_window, real_start,
-				real_end - real_start);
+		     0);
 
   UNBLOCK_INPUT;
   
@@ -5370,8 +5383,7 @@
   /* Write the glyphs.  */
   hpos = start - row->glyphs[updated_area];
   x_draw_glyphs (w, output_cursor.x, row, updated_area, hpos, hpos + len,
-		 DRAW_NORMAL_TEXT, &real_start, &real_end, 0);
-  notice_overwritten_cursor (w, real_start, real_end - real_start);
+		 DRAW_NORMAL_TEXT, 0);
   
   /* Advance the output cursor.  */
   output_cursor.hpos += len;
@@ -5450,7 +5462,7 @@
   
   /* Notice if the cursor will be cleared by this operation.  */
   if (!updated_row->full_width_p)
-    notice_overwritten_cursor (w, output_cursor.hpos, -1);
+    notice_overwritten_cursor (w, output_cursor.x, -1);
 
   from_x = output_cursor.x;
      
@@ -5941,7 +5953,7 @@
     x_draw_glyphs (w, 0, row, area,
 		   0, row->used[area],
 		   row->inverse_p ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT,
-		   NULL, NULL, 0);
+		   0);
   else
     {
       /* Set START_X to the window-relative start position for drawing glyphs of
@@ -5980,7 +5992,7 @@
 		       first - row->glyphs[area],
 		       last - row->glyphs[area],
 		       row->inverse_p ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT,
-		       NULL, NULL, 0);
+		       0);
     }
 }
       
@@ -6000,7 +6012,7 @@
   if (row->mode_line_p || w->pseudo_window_p)
     x_draw_glyphs (w, 0, row, TEXT_AREA, 0, row->used[TEXT_AREA],
 		   row->inverse_p ? DRAW_INVERSE_VIDEO : DRAW_NORMAL_TEXT,
-		   NULL, NULL, 0);
+		   0);
   else
     {
       if (row->used[LEFT_MARGIN_AREA])
@@ -7158,7 +7170,7 @@
 		{
 		  Lisp_Object before = Foverlay_start (overlay);
 		  Lisp_Object after = Foverlay_end (overlay);
-		  Lisp_Object ignore;
+		  int ignore;
 
 		  /* Note that we might not be able to find position
 		     BEFORE in the glyph matrix if the overlay is
@@ -7523,7 +7535,7 @@
   int i, past_end = 0;
 
   first = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
-  row = row_containing_pos (w, charpos, first, NULL);
+  row = row_containing_pos (w, charpos, first, NULL, 0);
   if (row == NULL)
     {
       if (charpos < MATRIX_ROW_START_CHARPOS (first))
@@ -7765,82 +7777,58 @@
 {
   struct window *w = XWINDOW (dpyinfo->mouse_face_window);
   struct frame *f = XFRAME (WINDOW_FRAME (w));
-  int i;
-  int cursor_off_p = 0;
-  struct cursor_pos saved_cursor;
-
-  saved_cursor = output_cursor;
-  
-  /* If window is in the process of being destroyed, don't bother
-     to do anything.  */
-  if (w->current_matrix == NULL)
-    goto set_x_cursor;
 
-  /* Recognize when we are called to operate on rows that don't exist
-     anymore.  This can happen when a window is split.  */
-  if (dpyinfo->mouse_face_end_row >= w->current_matrix->nrows)
-    goto set_x_cursor;
-
-  set_output_cursor (&w->phys_cursor);
-
-  /* Note that mouse_face_beg_row etc. are window relative.  */
-  for (i = dpyinfo->mouse_face_beg_row;
-       i <= dpyinfo->mouse_face_end_row;
-       i++)
+  if (/* If window is in the process of being destroyed, don't bother
+	 to do anything.  */
+      w->current_matrix != NULL
+      /* Recognize when we are called to operate on rows that don't exist
+	 anymore.  This can happen when a window is split.  */
+      && dpyinfo->mouse_face_end_row < w->current_matrix->nrows)
     {
-      int start_hpos, end_hpos, start_x;
-      struct glyph_row *row = MATRIX_ROW (w->current_matrix, i);
-
-      /* Don't do anything if row doesn't have valid contents.  */
-      if (!row->enabled_p)
-	continue;
+      int phys_cursor_on_p = w->phys_cursor_on_p;
+      struct glyph_row *row, *first, *last;
 
-      /* For all but the first row, the highlight starts at column 0.  */
-      if (i == dpyinfo->mouse_face_beg_row)
-	{
-	  start_hpos = dpyinfo->mouse_face_beg_col;
-	  start_x = dpyinfo->mouse_face_beg_x;
-	}
-      else
+      first = MATRIX_ROW (w->current_matrix, dpyinfo->mouse_face_beg_row);
+      last = MATRIX_ROW (w->current_matrix, dpyinfo->mouse_face_end_row);
+      
+      for (row = first; row <= last && row->enabled_p; ++row)
 	{
-	  start_hpos = 0;
-	  start_x = 0;
-	}
+	  int start_hpos, end_hpos, start_x;
 
-      if (i == dpyinfo->mouse_face_end_row)
-	end_hpos = dpyinfo->mouse_face_end_col;
-      else
-	end_hpos = row->used[TEXT_AREA];
+	  /* For all but the first row, the highlight starts at column 0.  */
+	  if (row == first)
+	    {
+	      start_hpos = dpyinfo->mouse_face_beg_col;
+	      start_x = dpyinfo->mouse_face_beg_x;
+	    }
+	  else
+	    {
+	      start_hpos = 0;
+	      start_x = 0;
+	    }
 
-      /* If the cursor's in the text we are about to rewrite, turn the
-	 cursor off.  */
-      if (!w->pseudo_window_p
-	  && i == output_cursor.vpos
-	  && output_cursor.hpos >= start_hpos - 1
-	  && output_cursor.hpos <= end_hpos)
-	{
-	  x_update_window_cursor (w, 0);
-	  cursor_off_p = 1;
-	}
+	  if (row == last)
+	    end_hpos = dpyinfo->mouse_face_end_col;
+	  else
+	    end_hpos = row->used[TEXT_AREA];
 
-      if (end_hpos > start_hpos)
-	{
-	  x_draw_glyphs (w, start_x, row, TEXT_AREA, 
-			 start_hpos, end_hpos, draw, NULL, NULL, 0);
-	  row->mouse_face_p = draw == DRAW_MOUSE_FACE || DRAW_IMAGE_RAISED;
-	}
-    }
+	  if (end_hpos > start_hpos)
+	    {
+	      x_draw_glyphs (w, start_x, row, TEXT_AREA, 
+			     start_hpos, end_hpos, draw, 0);
 
-  /* If we turned the cursor off, turn it back on.  */
-  if (cursor_off_p)
-    x_display_cursor (w, 1,
-		      output_cursor.hpos, output_cursor.vpos,
-		      output_cursor.x, output_cursor.y);
+	      row->mouse_face_p = draw == DRAW_MOUSE_FACE || DRAW_IMAGE_RAISED;
+	    }
+	}
 
-  output_cursor = saved_cursor;
+      /* When we've written over the cursor, arrange for it to
+	 be displayed again.  */
+      if (phys_cursor_on_p && !w->phys_cursor_on_p)
+	x_display_cursor (w, 1,
+			  w->phys_cursor.hpos, w->phys_cursor.vpos,
+			  w->phys_cursor.x, w->phys_cursor.y);
+    }
 
- set_x_cursor:
-  
   /* Change the mouse cursor.  */
   if (draw == DRAW_NORMAL_TEXT)
     XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
@@ -8824,13 +8812,13 @@
 
     /* Slider size.  Must be in the range [1 .. MAX - MIN] where MAX
        is the scroll bar's maximum and MIN is the scroll bar's minimum
-       value.  */
-    size = shown * XM_SB_RANGE;
-    size = min (size, XM_SB_RANGE);
-    size = max (size, 1);
+	 value.  */
+      size = shown * XM_SB_RANGE;
+      size = min (size, XM_SB_RANGE);
+      size = max (size, 1);
 
-    /* Position.  Must be in the range [MIN .. MAX - SLIDER_SIZE].  */
-    value = top * XM_SB_RANGE;
+      /* Position.  Must be in the range [MIN .. MAX - SLIDER_SIZE].  */
+      value = top * XM_SB_RANGE;
     value = min (value, XM_SB_MAX - size);
     value = max (value, XM_SB_MIN);
 
@@ -8959,9 +8947,10 @@
     /* Clear the area of W that will serve as a scroll bar.  This is
        for the case that a window has been split horizontally.  In
        this case, no clear_frame is generated to reduce flickering.  */
-    x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-		  left, top, width,
-		  window_box_height (w), False);
+    if (width > 0 && height > 0)
+      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+		    left, top, width,
+		    window_box_height (w), False);
 
     window = XCreateWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
 			    /* Position and size of scroll bar.  */
@@ -9204,11 +9193,14 @@
   /* Does the scroll bar exist yet?  */
   if (NILP (w->vertical_scroll_bar))
     {
-      BLOCK_INPUT;
-      if (width && height)
-	x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-		      left, top, width, height, False);
-      UNBLOCK_INPUT;
+      if (width > 0 && height > 0)
+	{
+	  BLOCK_INPUT;
+	  x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+			left, top, width, height, False);
+	  UNBLOCK_INPUT;
+	}
+      
       bar = x_scroll_bar_create (w, top, sb_left, sb_width, height);
     }
   else
@@ -9233,7 +9225,7 @@
 
       /* Since toolkit scroll bars are smaller than the space reserved
 	 for them on the frame, we have to clear "under" them.  */
-      if (width && height)
+      if (width > 0 && height > 0)
 	x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
 		      left, top, width, height, False);
 
@@ -9267,10 +9259,16 @@
       {
 	int area_width = FRAME_SCROLL_BAR_COLS (f) * CANON_X_UNIT (f);
 	int rest = area_width - sb_width;
-	if (rest > 0)
-	  x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-			left + area_width -  rest, 0,
-			rest, max (height, 1), False);
+	if (rest > 0 && height > 0)
+	  {
+	    if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f))
+	      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+			    left + area_width -  rest, top,
+			    rest, height, False);
+	    else
+	      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+			    left, top, rest, height, False);
+	  }
       }
       
       /* Move/size the scroll bar window.  */
@@ -10600,8 +10598,12 @@
 			     character events.  */
 			  for (i = 0; i < nbytes; i += len)
 			    {
-			      c = STRING_CHAR_AND_LENGTH (copy_bufptr + i,
-							  nbytes - i, len);
+			      if (nchars == nbytes)
+				c = copy_bufptr[i], len = 1;
+			      else
+				c = STRING_CHAR_AND_LENGTH (copy_bufptr + i,
+							    nbytes - i, len);
+			      
 			      bufp->kind = (SINGLE_BYTE_CHAR_P (c)
 					    ? ascii_keystroke
 					    : multibyte_char_keystroke);
@@ -10657,6 +10659,7 @@
 	      {
 		f = x_any_window_to_frame (dpyinfo, event.xcrossing.window);
 
+#if 0
 		if (event.xcrossing.focus)
 		  {
 		    /* Avoid nasty pop/raise loops.  */
@@ -10670,7 +10673,8 @@
 		  }
 		else if (f == dpyinfo->x_focus_frame)
 		  x_new_focus_frame (dpyinfo, 0);
-	      
+#endif
+
 		/* EnterNotify counts as mouse movement,
 		   so update things that depend on mouse position.  */
 		if (f && !f->output_data.x->hourglass_p)
@@ -10734,6 +10738,7 @@
 		      bufp += n, count += n, numchars -= n;
 		    }
 
+#if 0
 		  if (event.xcrossing.focus)
 		    x_mouse_leave (dpyinfo);
 		  else
@@ -10743,6 +10748,7 @@
 		      if (f == dpyinfo->x_focus_frame)
 			x_new_focus_frame (dpyinfo, 0);
 		    }
+#endif
 		}
 	      goto OTHER;
 
@@ -11079,39 +11085,22 @@
  ***********************************************************************/
 
 /* Notice if the text cursor of window W has been overwritten by a
-   drawing operation that outputs N glyphs starting at HPOS in the
-   line given by output_cursor.vpos.
-
-   N < 0 means all the rest of the line after HPOS has been
-   written.  */
+   drawing operation that outputs N glyphs starting at START_X and
+   ending at END_X in the line given by output_cursor.vpos.
+   Coordinates are area-relative.  END_X < 0 means means all the rest
+   of the line after START_X has been written.  */
 
 static void
-notice_overwritten_cursor (w, hpos, n)
+notice_overwritten_cursor (w, start_x, end_x)
      struct window *w;
-     int hpos, n;
+     int start_x, end_x;
 {
   if (updated_area == TEXT_AREA
+      && w->phys_cursor_on_p
       && output_cursor.vpos == w->phys_cursor.vpos
-      && output_cursor.x <= w->phys_cursor.x
-      && w->phys_cursor_on_p)
-    {
-      if (n < 0)
-	w->phys_cursor_on_p = 0;
-      else
-	{
-	  /* It depends on the width of the N glyphs written at HPOS
-	     if the cursor has been overwritten or not.  */
-	  struct glyph *glyph = &updated_row->glyphs[TEXT_AREA][hpos];
-	  struct glyph *end = glyph + n;
-	  int width = 0;
-
-	  for (; glyph < end; ++glyph)
-	    width += glyph->pixel_width;
-
-	  if (output_cursor.x + width > w->phys_cursor.x)
-	    w->phys_cursor_on_p = 0;
-	}
-    }
+      && start_x <= w->phys_cursor.x
+      && (end_x < 0 || end_x > w->phys_cursor.x))
+    w->phys_cursor_on_p = 0;
 }
 
 
@@ -11224,12 +11213,6 @@
 {
   struct frame *f = XFRAME (w->frame);
   struct glyph *cursor_glyph;
-  GC gc;
-  int x;
-  unsigned long mask;
-  XGCValues xgcv;
-  Display *dpy;
-  Window window;
       
   /* If cursor is out of bounds, don't draw garbage.  This can happen
      in mini-buffer windows when switching between echo area glyphs
@@ -11249,13 +11232,23 @@
     }
   else
     {
-      xgcv.background = f->output_data.x->cursor_pixel;
-      xgcv.foreground = f->output_data.x->cursor_pixel;
+      Display *dpy = FRAME_X_DISPLAY (f);
+      Window window = FRAME_X_WINDOW (f);
+      GC gc = FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc;
+      unsigned long mask = GCForeground | GCBackground | GCGraphicsExposures;
+      struct face *face = FACE_FROM_ID (f, cursor_glyph->face_id);
+      XGCValues xgcv;
+
+      /* If the glyph's background equals the color we normally draw
+	 the bar cursor in, the bar cursor in its normal color is
+	 invisible.  Use the glyph's foreground color instead in this
+	 case, on the assumption that the glyph's colors are chosen so
+	 that the glyph is legible.  */
+      if (face->background == f->output_data.x->cursor_pixel)
+	xgcv.background = xgcv.foreground = face->foreground;
+      else
+	xgcv.background = xgcv.foreground = f->output_data.x->cursor_pixel;
       xgcv.graphics_exposures = 0;
-      mask = GCForeground | GCBackground | GCGraphicsExposures;
-      dpy = FRAME_X_DISPLAY (f);
-      window = FRAME_X_WINDOW (f);
-      gc = FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc;
   
       if (gc)
 	XChangeGC (dpy, gc, mask, &xgcv);
@@ -11267,14 +11260,13 @@
   
       if (width < 0)
 	width = f->output_data.x->cursor_width;
+      width = min (cursor_glyph->pixel_width, width);
   
-      x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
       x_clip_to_row (w, row, gc, 0);
       XFillRectangle (dpy, window, gc,
-		      x,
+		      WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x),
 		      WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y),
-		      min (cursor_glyph->pixel_width, width),
-		      row->height);
+		      width, row->height);
       XSetClipMask (dpy, gc, None);
     }
 }
@@ -11307,9 +11299,12 @@
      glyphs and mini-buffer.  */
   if (w->phys_cursor.hpos < row->used[TEXT_AREA])
     {
+      int on_p = w->phys_cursor_on_p;
+      
       x_draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA,
 		     w->phys_cursor.hpos, w->phys_cursor.hpos + 1,
-		     hl, 0, 0, 0);
+		     hl, 0);
+      w->phys_cursor_on_p = on_p;
 
       /* When we erase the cursor, and ROW is overlapped by other
 	 rows, make sure that these overlapping parts of other rows
@@ -11360,6 +11355,12 @@
   if (!cursor_row->enabled_p)
     goto mark_cursor_off;
   
+  /* If row is completely invisible, don't attempt to delete a cursor which
+     isn't there.  This can happen if cursor is at top of a window, and
+     we switch to a buffer with a header line in that window.  */
+  if (cursor_row->visible_height <= 0)
+    goto mark_cursor_off;
+  
   /* This can happen when the new row is shorter than the old one.
      In this case, either x_draw_glyphs or clear_end_of_line
      should have cleared the cursor.  Note that we wouldn't be
@@ -11506,8 +11507,10 @@
     {
       if (w == XWINDOW (echo_area_window))
 	new_cursor_type = FRAME_DESIRED_CURSOR (f);
-      else
+      else if (cursor_in_non_selected_windows)
 	new_cursor_type = HOLLOW_BOX_CURSOR;
+      else
+	new_cursor_type = NO_CURSOR;
     }
   else
     {
@@ -11516,7 +11519,7 @@
 	{
 	  extern int cursor_in_non_selected_windows;
 	  
-	  if (MINI_WINDOW_P (w)
+	  if ((MINI_WINDOW_P (w) && minibuf_level == 0)
 	      || !cursor_in_non_selected_windows
 	      || NILP (XBUFFER (w->buffer)->cursor_type))
 	    new_cursor_type = NO_CURSOR;
@@ -13102,6 +13105,8 @@
      struct frame *f;
 {
   struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
+  Lisp_Object bar;
+  struct scroll_bar *b;
 
   BLOCK_INPUT;
 
@@ -13111,15 +13116,27 @@
     {
       if (f->output_data.x->icon_desc)
 	XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->icon_desc);
-      
+
+#ifdef USE_X_TOOLKIT
+      /* Explicitly destroy the scroll bars of the frame.  Without
+	 this, we get "BadDrawable" errors from the toolkit later on,
+	 presumably from expose events generated for the disappearing
+	 toolkit scroll bars.  */
+      for (bar = FRAME_SCROLL_BARS (f); !NILP (bar); bar = b->next)
+	{
+	  b = XSCROLL_BAR (bar);
+	  x_scroll_bar_remove (b);
+	}
+#endif
+
 #ifdef HAVE_X_I18N
       if (FRAME_XIC (f))
 	free_frame_xic (f);
 #endif
-      
+
       if (FRAME_X_WINDOW (f))
 	XDestroyWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
-      
+
 #ifdef USE_X_TOOLKIT
       if (f->output_data.x->widget)
 	{
@@ -13135,7 +13152,7 @@
       unload_color (f, f->output_data.x->cursor_foreground_pixel);
       unload_color (f, f->output_data.x->border_pixel);
       unload_color (f, f->output_data.x->mouse_pixel);
-      
+
       if (f->output_data.x->scroll_bar_background_pixel != -1)
 	unload_color (f, f->output_data.x->scroll_bar_background_pixel);
       if (f->output_data.x->scroll_bar_foreground_pixel != -1)
@@ -14023,7 +14040,7 @@
        before, or if the font loaded has a smalle>r height than any
        other font loaded before.  If this happens, it will make a
        glyph matrix reallocation necessary.  */
-    fonts_changed_p = x_compute_min_glyph_bounds (f);
+    fonts_changed_p |= x_compute_min_glyph_bounds (f);
     UNBLOCK_INPUT;
     return fontp;
   }
diff -ruN src-21.1/src/xterm.h src-21.2/src/xterm.h
--- src-21.1/src/xterm.h	Mon Jul  2 14:43:25 2001
+++ src-21.2/src/xterm.h	Fri Feb 22 11:51:48 2002
@@ -1028,7 +1028,7 @@
 extern int defined_color P_ ((struct frame *, char *, XColor *, int));
 extern void x_set_border_pixel P_ ((struct frame *, int));
 extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
-extern unsigned char * x_encode_text P_ ((Lisp_Object, Lisp_Object,
+extern unsigned char * x_encode_text P_ ((Lisp_Object, Lisp_Object, int,
 					  int *, int *));
 extern void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
 extern void create_frame_xic P_ ((struct frame *));