Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-173
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-174
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-175
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-176
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-177
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-178
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-179
   Update from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-180
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-181
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-182
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-183
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-184
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-185
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-186
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-187
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-65
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-66
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-67
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-68
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-69
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-70
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-71
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-72
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-542

157 files changed, 4861 insertions, 2527 deletions

diff --git a/FTP b/FTP
index ea3d599d699..14a3ada7bd0 100644
--- a/FTP
+++ b/FTP
@@ -214,7 +214,7 @@ directory for more information.
 
 * GNU Software for VMS
 
-        - ftp.vms.stacken.kth.se/MIRRORS/GNU-VMS/- lots of GNU ports to VMS,
+        - http://www.lp.se/gnu-vms/- lots of GNU ports to VMS,
 including Emacs 19, GCC, Bison, Make, RCS.
 
 * If You Like The Software
diff --git a/INSTALL b/INSTALL
index b18baaa1efa..f4dac28b547 100644
--- a/INSTALL
+++ b/INSTALL
@@ -132,14 +132,14 @@ can be found:
   . libxpm for XPM:   ftp://ftp.x.org/contrib/libraries/
                       Get version 3.4k or later, which lets Emacs
                       use its own color allocation functions.
-  . libpng for PNG:   ftp://www.libpng.org/pub/png/
-  . libz (for PNG):   http://www.info-zip.org/pub/infozip/zlib/
+  . libpng for PNG:   ftp://ftp.simplesystems.org/pub/libpng/png/
+  . libz (for PNG):   http://www.zlib.net/
   . libjpeg for JPEG: ftp://ftp.uu.net/graphics/jpeg/
                       Get version 6b -- 6a is reported to fail in
                       Emacs.
   . libtiff for TIFF: http://www.libtiff.org/
   . libungif for GIF:
-      http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml
+      http://sourceforge.net/projects/libungif
       Ensure you get version 4.1.0b1 or higher of libungif -- a bug in
       4.1.0 can crash Emacs.
 
@@ -157,7 +157,7 @@ must do this yourself.
 
 To take proper advantage of Emacs 21's mule-unicode charsets, you need
 a suitable font.  For `Unicode' (ISO 10646) fonts for X, see
-<URL:http://dvdeug.dhis.org/unifont.html> (packaged in Debian),
+<URL:http://czyborra.com/unifont/> (packaged in Debian),
 <URL:http://openlab.ring.gr.jp/efont/> (packaged in Debian).  (In
 recent Debian versions, there is an extensive `misc-fixed' iso10646-1
 in the default X installation.)  Perhaps also see
@@ -166,7 +166,7 @@ in the default X installation.)  Perhaps also see
 <URL:http://czyborra.com/charsets/> has basic fonts for Emacs's
 ISO-8859 charsets.
 
-XFree86 release 4 (from <URL:ftp://ftp.xfree86.org/> and mirrors)
+XFree86 release 4 (from <URL:ftp://ftp.xfree86.org/pub/XFree86/> and mirrors)
 contains font support for most, if not all, of the charsets that Emacs
 currently supports, including iso10646-1 encoded fonts for use with
 the mule-unicode charsets.  The font files should also be usable with
@@ -176,7 +176,7 @@ etc/PROBLEMS.
 
 BDF fonts etl-unicode.tar.gz used by ps-print and ps-mule to print
 Unicode characters are available from <URL:ftp://ftp.x.org/contrib/fonts/>
-and <URL:ftp://ftp.xfree86.org/pub/X.Org/contrib/fonts/>.
+and <URL:ftp://ftp.xfree86.org/pub/mirror/X.Org/contrib/fonts/>.
 
 * GNU/Linux development packages
 
diff --git a/README b/README
index bf09741a6f5..973b1a04baf 100644
--- a/README
+++ b/README
@@ -95,7 +95,7 @@ version of Emacs (currently based on version 19.28, but soon moving to
 19.34 and then 20.1) that compiles and works on OpenVMS 5.5 and above
 on both VAX and Alpha architectures.  For more information see
 
-  http://vms.gnu.org/software/released1/emacs.html#get_emacs_1928_kit
+  http://www.lp.se/gnu-vms/software/released1/emacs.html
 
 There is also some effort going on with Emacs 21.  Source code is
 available at ftp://ftp.nvg.ntnu.no/pub/vms/emacs/.  Look for most
diff --git a/admin/make-announcement b/admin/make-announcement
index cc9d68726a1..dd55efe360b 100755
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -30,6 +30,7 @@ if [ "$answer" ]; then newtag=$answer; fi
 exec > $outfile
 
 cat <<EOF
+
 There is a new pretest available in
 
   <ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$NEW.tar.gz>
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 10fca7e84ac..0fcba5b40c8 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -69,7 +69,7 @@ For each step, check for possible errors.
     ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at
     ftp://ftp.gnu.org/gnu/emacs/ for a release.
 
-14. For a pretest, let Richard Stallman know about the new pretest and
+14. For a pretest, let Richard Stallman <rms@gnu.org> know about the new pretest and
     tell him to announce it using the announcement you prepared.  Remind
     him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
     For a release, Richard should prepare the announcement himself,
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32
index 14c723129b4..9c9875b44d4 100644
--- a/admin/nt/README-UNDUMP.W32
+++ b/admin/nt/README-UNDUMP.W32
@@ -5,7 +5,7 @@ Emacs for Windows NT/2000/XP and Windows 95/98/Me.  This distribution
 supplements the standard dumped precompiled distribution of Emacs, which
 you can download from:
 
-        ftp://ftp.gnu.org/gnu/windows/emacs/
+        ftp://ftp.gnu.org/gnu/emacs/windows/
 
 If you do not have the "bin" distribution, then you will need to
 download it before you can use this undumped version.  Also note that
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 667f7caa8e9..e351d025309 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -118,7 +118,7 @@
   Programs for handling the distribution file formats can be found in
   the utilities directory: 
 
-    ftp://ftp.gnu.org/gnu/windows/emacs/utilities
+    http://mirrors.sunsite.dk/gnu/windows/emacs/utilities/
 
   For gzipped tar files, you will need either gunzip.exe and tar.exe
   together, or djtarnt.exe.  djtarnt.exe can also unpack .zip files.  I
@@ -226,7 +226,7 @@
   related to the Windows port of Emacs.  For information about the
   list, see this Web page:
 
-        http://mail.gnu.org/mailman/listinfo/help-emacs-windows
+        http://lists.gnu.org/mailman/listinfo/help-emacs-windows
 
   To ask questions on the mailing list, send email to
   help-emacs-windows@gnu.org.  (You don't need to subscribe for that.)
diff --git a/admin/nt/README.W32 b/admin/nt/README.W32
index a3435541d7e..4b2cc4edc98 100644
--- a/admin/nt/README.W32
+++ b/admin/nt/README.W32
@@ -4,7 +4,7 @@
   of GNU Emacs for Windows NT/2000/XP and Windows 95/98/Me.  This
   distribution can be found on the ftp.gnu.org server and its mirrors:
 
-        ftp://ftp.gnu.org/gnu/windows/emacs/
+        ftp://ftp.gnu.org/gnu/emacs/windows/
 
   This server contains other distributions, including the full Emacs
   source distribution and the lisp source distribution, as well as older
@@ -12,10 +12,9 @@
 
   Answers to frequently asked questions, and further information about
   this port of GNU Emacs and related software packages can be found via
-  http or ftp:
+  http:
 
         http://www.gnu.org/software/emacs/windows/ntemacs.html
-        ftp://ftp.gnu.org/gnu/windows/emacs/docs/ntemacs.html
 
 * Preliminaries
 
@@ -138,12 +137,12 @@
   related to the Windows port of Emacs.  For information about the
   list, see this Web page:
 
-        http://mail.gnu.org/mailman/listinfo/help-emacs-windows
+        http://lists.gnu.org/mailman/listinfo/help-emacs-windows
 
   To ask questions on the mailing list, send email to
   help-emacs-windows@gnu.org.  (You don't need to subscribe for that.)
   To subscribe to the list or unsubscribe from it, fill the form you
-  find at http://mail.gnu.org/mailman/listinfo/help-emacs-windows as
+  find at http://lists.gnu.org/mailman/listinfo/help-emacs-windows as
   explained there.
 
   Another valuable source of information and help which should not be
diff --git a/etc/CENSORSHIP b/etc/CENSORSHIP
index ca949aa6b6e..33da02ca100 100644
--- a/etc/CENSORSHIP
+++ b/etc/CENSORSHIP
@@ -82,7 +82,6 @@ Look in their Web site http://www.vtw.org/ for background information
 and political action recommendations.  Censorship won in February, but
 we can beat it in November.
 
-
 Copyright 1996 Richard Stallman
 Verbatim copying and distribution is permitted in any medium
 provided this notice is preserved.
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 391c072ca7b..f38688a3a7c 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,48 @@
+2006-03-28  Bill Wohler  <wohler@newt.com>
+
+        * images/README: Update with following information.
+        
+        * images/data-save.xpm, images/mail/flag-for-followup.xpm:
+        * images/zoom-in.xpm, images/zoom-out.xpm: New images from GNOME
+        2.12.
+
+        * images/contact.pbm, images/data-save.pbm, images/delete.pbm:
+        * images/mail/flag-for-followup.pbm, images/mail/inbox.pbm:
+        * images/mail/move.pbm, images/next-page.pbm, images/zoom-out.pbm:
+        New bitmaps for new images.
+        
+        * images/refresh.xpm, images/sort-ascending.xpm,
+        * images/sort-descending.xpm: Update with GTK 2.x images. Note
+        that the default GTK icons are not overridden by the GNOME theme
+        due to a bug which was fixed in GNOME 2.15. Once GNOME 2.16 is in
+        wide circulation, then the GTK icons should be replaced with the
+        equivalent GNOME icons. Until then, we should be consistent with
+        GTK first, then GNOME.
+        
+        * images/mail/repack.xpm, images/mail/reply-from.xpm:
+        * images/mail/reply-to.xpm, images/search-replace.xpm:
+        * images/separator.xpm, images/show.xpm: Update custom icons to be
+        closer to their GNOME counterparts.
+        
+        * images/attach.pbm, images/exit.pbm, images/mail/compose.pbm:
+        * images/mail/repack.pbm, images/mail/reply-all.pbm:
+        * images/mail/reply-from.pbm, images/mail/reply-to.pbm:
+        * images/mail/reply.pbm, images/mail/send.pbm, images/show.pbm:
+        * images/search-replace.pbm: Update bitmaps.
+        
+        * images/execute.pbm, images/execute.xpm, images/fld-open.pbm:
+        * images/fld-open.xpm, images/highlight.pbm, images/highlight.xpm:
+        * images/mail.pbm, images/mail.xpm, images/mail/alias.pbm:
+        * images/mail/alias.xpm, images/mail/refile.pbm:
+        * images/mail/refile.xpm, images/page-down.pbm:
+        * images/page-down.xpm, images/widen.pbm, images/widen.xpm: Remove
+        custom MH-E icons since MH-E is now using the equivalent GTK/GNOME
+        icons.
+
+2006-03-23  Romain Francoise  <romain@orebokech.com>
+
+        * NEWS: Misc. fixes.
+
 2006-03-15  Carsten Dominik  <dominik@science.uva.nl>
 
         * orgcard.tex: Version number change only.
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index 4032558b023..f13b4fa5dd3 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -357,7 +357,11 @@ format=flowed was present but not documented in earlier versions.
 
 ** The option `mm-fill-flowed' can be used to disable treatment of
 format=flowed messages.  Also, flowed text is disabled when sending
-inline PGP signed messages.  (New in Gnus 5.10.7)
+inline PGP signed messages.  (New in Gnus 5.10.8)
+
+** The tool bar icons are now (de)activated correctly in the group
+buffer, see the variable `gnus-group-update-tool-bar'.  It's default
+value depends on your Emacs version.  (New in Gnus 5.10.8)
 
 ** Gnus supports the generation of RFC 2298 Disposition Notification requests.
 
diff --git a/etc/MACHINES b/etc/MACHINES
index 63f341aade7..ee57fc6d0b0 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -1470,4 +1470,5 @@ mode: indented-text
 fill-prefix: "  "
 End:
 
+
 arch-tag: 7d2e93c7-e982-40ec-9055-3cd064042473
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 1e90298c9f0..3fa5815d55a 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -36,7 +36,7 @@ You might find bug-fixes or enhancements in these places.
 
  * Ada-mode: <URL:http://libre.act-europe.fr/adamode>
 
- * Battery and Info Look: <URL:ftp://ftp.ul.bawue.de/pub/purple/emacs>
+ * Battery and Info Look: <URL:http://www-cdf.fnal.gov/~sthrlnd/emacs/>
 
  * BibTeX:
    <URL:http://www.ida.ing.tu-bs.de/people/dirk/bibtex/index.html>
@@ -69,7 +69,7 @@ You might find bug-fixes or enhancements in these places.
 
  * Hideshow: <URL:http://www.glug.org/people/ttn/software/hideshow/>
 
- * Ispell: <URL:http://www.kdstevens.com/%7Estevens/ispell-page.html>
+ * Ispell: <URL:http://www.eng.utah.edu/~kstevens/ispell-page.html>
 
  * PC Selection: <URL:ftp://ftp.thp.uni-duisburg.de/pub/source/elisp/>
 
@@ -99,7 +99,7 @@ You might find bug-fixes or enhancements in these places.
    * Scheme: <URL:ftp://ftp-swiss.ai.mit.edu/pub/scm/r5rs.info.tar.gz>
    * LaTeX: <URL:ftp://ctan.tug.org/tex-archive/info/latex2e-help-texinfo/
        latex2e.texi> (or CTAN mirrors)
-   * Perl: <URL:ftp://ftp.cpan.org/pub/CPAN/doc/manual/texinfo/perl5/>
+   * Perl: <URL:ftp://ftp.cpan.org/pub/CPAN/doc/manual/texinfo/>
        (or CPAN mirrors)
 
 * Packages and add-ons not bundled with Emacs
@@ -170,7 +170,7 @@ Several are for Debian GNU/Linux in particular.
    <URL:http://www.emacswiki.org/cgi-bin/wiki?EmacsIRCClient>
 
  * Gnuserv:
-   <URL:http://meltin.net/hacks/emacs/>
+   <URL:http://www.hpl.hp.com/personal/ange/gnuserv/home.html>
    Enhanced emacsclient/emacsserver.  Also available from this Web
    page: eiffel-mode.el.
 
@@ -180,11 +180,11 @@ Several are for Debian GNU/Linux in particular.
    <URL:http://www.gnu.org/software/gnugo/gnugo.html>
 
  * hm--html-menus:
-   <URL:ftp://ftp.tnt.uni-hannover.de/pub/editors/xemacs/contrib>
+   <URL:ftp://sunsite.unc.edu/pub/Linux/apps/editors/emacs/>
    HTML-specific editing.  Can work with PSGML.
 
  * Hyperbole:
-   <URL:http://ftp.gnu.org/pub/gnu/hyperbole/hyperbole-4.01.tar.gz>
+   <URL:http://ftp.gnu.org/pub/gnu/hyperbole/>
    Hyperbole is an open, efficient, programmable information
    management and hypertext system.
 
@@ -249,20 +249,19 @@ Several are for Debian GNU/Linux in particular.
  * VM (View Mail): <URL:http://www.wonderworks.com/vm/> Alternative
    mail reader.  There is a VM newsgroup: <URL:news:gnu.emacs.vm.info>
 
- * W3: <URL:http://www.cs.indiana.edu/elisp/w3/docs.html>
+ * W3: <URL:http://savannah.gnu.org/projects/w3/>
    Web browser.  There's a W3 mail list/newsgroup
-   <URL:news://sunsite.auc.dk/emacs.w3> and a W3 development mail
-   list/newsgroup <URL:news://sunsite.auc.dk/emacs.w3.dev>.
+   <URL:http://savannah.gnu.org/mail/?group=w3>.
 
  * Wanderlust: <URL:http://www.gohome.org/wl/>
    Yet Another Message Interface on Emacsen. Wanderlust is a mail/news
    reader supporting IMAP4rev1 for emacsen.
 
- * WhizzyTex: <URL:http://pauillac.inria.fr/whizzytex/>
+ * WhizzyTex: <URL:http://cristal.inria.fr/whizzytex/>
    WhizzyTeX provides a minor mode for Emacs or XEmacs, a (bash)
    shell-script daemon and some LaTeX macros.
 
- * X-Symbol: <URL:http://x-symbol.sf.net/>
+ * X-Symbol: <URL:http://x-symbol.sourceforge.net/>
    Quasi-WYSIWYG editing of TeX & al.  (It will be improved to take
    better advantage of Emacs 21 features.)
 
diff --git a/etc/NEWS b/etc/NEWS
index 02635fae29d..cbb0a8d1b04 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1192,7 +1192,7 @@ fontset appropriately.
 *** Custom themes are collections of customize options.  Create a
 custom theme with M-x customize-create-theme.  Use M-x load-theme to
 load and enable a theme, and M-x disable-theme to disable it.  Use M-x
-enable-theme to renable a disabled theme.
+enable-theme to enable a disabled theme.
 
 +++
 *** The commands M-x customize-face and M-x customize-face-other-window
@@ -1265,7 +1265,7 @@ of marked files with the value entered in the minibuffer.
 control substitution of the file names only when they are surrounded
 by whitespace.  This means you can now use them as shell wildcards
 too.  If you want to use just plain `*' as a wildcard, type `*""'; the
-doublequotes make no difference in the shell, but they prevent
+double quotes make no difference in the shell, but they prevent
 special treatment in `dired-do-shell-command'.
 
 +++
@@ -1420,7 +1420,7 @@ people knowing `find-grep-dired' would probably expect it.
 settings, for grep commands only.
 
 +++
-*** New option `grep-highlight-matches' highlightes matches in *grep*
+*** New option `grep-highlight-matches' highlights matches in *grep*
 buffer.  It uses a special feature of some grep programs which accept
 --color option to output markers around matches.  When going to the next
 match with `next-error' the exact match is highlighted in the source
@@ -1664,7 +1664,7 @@ to increment the SOA serial.
 filenames being entered by the user in the minibuffer are displayed, so
 that it's clear when part of the entered filename will be ignored due to
 emacs' filename parsing rules.  The ignored portion can be made dim,
-invisible, or otherwise less visually noticable.  The display method can
+invisible, or otherwise less visually noticeable.  The display method can
 be displayed by customizing the variable `file-name-shadow-properties'.
 
 +++
@@ -1853,12 +1853,15 @@ boundaries during scrolling.
 * Changes in Specialized Modes and Packages in Emacs 22.1:
 
 ** Changes in Dired
+
++++
 *** Bindings for Tumme added
 Several new keybindings, all starting with the C-t prefix, have been
 added to Dired. They are all bound to commands in Tumme. As a starting
 point, mark some image files in a dired buffer and do C-t d to display
 thumbnails of them in a separate buffer.
-** Changes in Hi Lock:
+
+** Changes in Hi Lock
 
 +++
 *** hi-lock-mode now only affects a single buffer, and a new function
@@ -1991,7 +1994,7 @@ with the number appended to the `*info*' buffer name (e.g. "*info*<2>").
 Before leaving the initial Info node isearch fails once with the error
 message [initial node], and with subsequent C-s/C-r continues through
 other nodes.  When isearch fails for the rest of the manual, it wraps
-aroung the whole manual to the top/final node.  The user option
+around the whole manual to the top/final node.  The user option
 `Info-isearch-search' controls whether to use Info-search for isearch,
 or the default isearch search function that wraps around the current
 Info node.
@@ -2777,7 +2780,7 @@ idle).
 
 ---
 *** New customizable variables:
-  - desktop-save. Determins whether the desktop should be saved when it is
+  - desktop-save. Determines whether the desktop should be saved when it is
     killed.
   - desktop-file-name-format. Format in which desktop file names should be saved.
   - desktop-path. List of directories in which to lookup the desktop file.
@@ -2903,7 +2906,7 @@ specified to etags, variables are tags also.
 The new keywords are def, newcommand, renewcommand, newenvironment and
 renewenvironment.
 
-*** Honour #line directives.
+*** Honor #line directives.
 
 When Etags parses an input file that contains C preprocessor's #line
 directives, it creates tags using the file name and line number
@@ -3126,7 +3129,7 @@ obsolete; use `dframe-update-speed' instead.
 ---
 ** sql changes.
 
-*** The variable `sql-product' controls the highlightng of different
+*** The variable `sql-product' controls the highlighting of different
 SQL dialects.  This variable can be set globally via Customize, on a
 buffer-specific basis via local variable settings, or for the current
 session using the new SQL->Product submenu.  (This menu replaces the
@@ -3187,7 +3190,7 @@ Keyword highlighting of Postgres 7.3 is implemented.  Prompting for
 the username and the pgsql `-U' option is added.
 
 *** MySQL support is enhanced.
-Keyword higlighting of MySql 4.0 is implemented.
+Keyword highlighting of MySql 4.0 is implemented.
 
 *** Imenu support has been enhanced to locate tables, views, indexes,
 packages, procedures, functions, triggers, sequences, rules, and
@@ -3323,7 +3326,7 @@ automatically.  The game uses faces for better visual feedback.
 
 To enable this, set `calculator-output-radix' non-nil.  In this mode a
 separator character is used every few digits, making it easier to see
-byte boundries etc.  For more info, see the documentation of the
+byte boundaries etc.  For more info, see the documentation of the
 variable `calculator-radix-grouping-mode'.
 
 ---
@@ -3430,7 +3433,7 @@ any customizations.
 Previous versions of Emacs erred on the side of having a usable Emacs
 through telnet, even though that was inconvenient if you use Emacs in
 a local console window with a scrollback buffer. The default value of
-w32-use-full-screen-buffer is now nil, which favours local console
+w32-use-full-screen-buffer is now nil, which favors local console
 windows. Recent versions of Windows telnet also work well with this
 setting. If you are using an older telnet server then Emacs detects
 that the console window dimensions that are reported are not sane, and
@@ -3584,7 +3587,7 @@ names.  Usually that default is right, but not always.
 
 A quit inside the body of `with-local-quit' is caught by the
 `with-local-quit' form itself, but another quit will happen later once
-the code that has inhibitted quitting exits.
+the code that has inhibited quitting exits.
 
 This is for use around potentially blocking or long-running code
 inside timer functions and `post-command-hook' functions.
@@ -3773,7 +3776,7 @@ give up and return LIMIT.
 
 +++
 *** Function `pos-visible-in-window-p' now returns the pixel coordinates
-and partial visiblity state of the corresponding row, if the PARTIALLY
+and partial visibility state of the corresponding row, if the PARTIALLY
 arg is non-nil.
 
 +++
@@ -4093,7 +4096,7 @@ of text properties as well as the character code.
 by `syntax-after').
 
 +++
-*** The new function `syntax-ppss' rovides an efficient way to find the
+*** The new function `syntax-ppss' provides an efficient way to find the
 current syntactic context at point.
 
 ** File operation changes:
@@ -4226,7 +4229,7 @@ saying to put all inputs in the history list, even empty ones.
 
 +++
 *** The `read-file-name' function now takes an additional argument which
-specifies a predicate which the file name read must satify.  The
+specifies a predicate which the file name read must satisfy.  The
 new variable `read-file-name-predicate' contains the predicate argument
 while reading the file name from the minibuffer; the predicate in this
 variable is used by read-file-name-internal to filter the completion list.
@@ -4618,14 +4621,14 @@ or bottom edge of a window.  It does not move other window edges.
 `fringe-cursor-alist' maps between logical (internal) fringe indicator
 and cursor symbols and the actual fringe bitmaps to be displayed.
 This decouples the logical meaning of the fringe indicators from the
-physical appearence, as well as allowing different fringe bitmaps to
+physical appearance, as well as allowing different fringe bitmaps to
 be used in different windows showing different buffers.
 
 *** New function `define-fringe-bitmap' can now be used to create new
 fringe bitmaps, as well as change the built-in fringe bitmaps.
 
 To change a built-in bitmap, do (require 'fringe) and use the symbol
-identifing the bitmap such as `left-truncation' or `continued-line'.
+identifying the bitmap such as `left-truncation' or `continued-line'.
 
 *** New function `destroy-fringe-bitmap' deletes a fringe bitmap
 or restores a built-in one to its default value.
@@ -4726,7 +4729,7 @@ does that, this value cannot be accurate.
 *** You can define multiple overlay arrows via the new
 variable `overlay-arrow-variable-list'.
 
-It contains a list of varibles which contain overlay arrow position
+It contains a list of variables which contain overlay arrow position
 markers, including the original `overlay-arrow-position' variable.
 
 Each variable on this list can have individual `overlay-arrow-string'
@@ -4820,7 +4823,7 @@ of the text area.  One of the above window elements (except `text')
 can also be used with :align-to to specify that the position is
 relative to the left edge of the given area.  Once the base offset for
 a relative position has been set (by the first occurrence of one of
-these symbols), further occurences of these symbols are interpreted as
+these symbols), further occurrences of these symbols are interpreted as
 the width of the area.
 
 For example, to align to the center of the left-margin, use
@@ -4923,7 +4926,7 @@ is to use the `arrow' (non-text) pointer.  Other choices are `text'
 
 +++
 *** The mouse pointer shape over ordinary text or images can now be
-controlled/overriden via the `pointer' text property.
+controlled/overridden via the `pointer' text property.
 
 ** Mouse event enhancements:
 
diff --git a/etc/images/README b/etc/images/README
index 229840a2669..0f74a900109 100644
--- a/etc/images/README
+++ b/etc/images/README
@@ -1,17 +1,43 @@
 All of the following icons are not part of Emacs, but distributed and
 used by Emacs.
 
-The following icons are from GTK+ 2.x:
+* The following icons are from GTK+ 2.x:
 
-    close.xpm copy.xpm cut.xpm help.xpm home.xpm
-    index.xpm jump-to.xpm left-arrow.xpm new.xpm open.xpm
-    paste.xpm preferences.xpm print.xpm right-arrow.xpm save.xpm
-    saveas.xpm search.xpm spell.xpm undo.xpm up-arrow.xpm
+    close.xpm copy.xpm cut.xpm find-replace.xpm help.xpm home.xpm
+    index.xpm jump-to.xpm left-arrow.xpm new.xpm open.xpm paste.xpm
+    preferences.xpm print.xpm refresh.xpm right-arrow.xpm save.xpm
+    saveas.xpm search.xpm sort-ascending.xpm sort-descending.xpm
+    spell.xpm undo.xpm up-arrow.xpm
 
     back-arrow.xpm and fwd-arrow.xpm are slightly modified undo and redo.
 
     diropen.xpm is file-manager.png from Gnome hicolor theme.
 
-The following icons are from GNOME 2.10:
+* The following icons are from GNOME 2.x:
+
+    attach.xpm connect.xpm contact.xpm data-save.xpm delete.xpm
+    describe.xpm disconnect.xpm exit.xpm gnus/toggle-subscription.xpm
+    lock-broken.xpm lock-ok.xpm lock.xpm mail/compose.xpm
+    mail/copy.xpm mail/flag-for-followup.xpm mail/forward.xpm
+    mail/inbox.xpm mail/move.xpm mail/not-spam.xpm mail/outbox.xpm
+    mail/preview.xpm mail/reply-all.xpm mail/reply.xpm
+    mail/save-draft.xpm mail/save.xpm mail/send.xpm mail/spam.xpm
+    next-page.xpm refresh.xpm separator.xpm sort-ascending.xpm
+    sort-column-ascending.xpm sort-criteria.xpm sort-descending.xpm
+    sort-row-ascending.xpm zoom-in.xpm zoom-out.xpm 
+
+* Note that the default GTK icons were not overridden by the GNOME theme
+due to a bug which was fixed in GNOME 2.15.  Once GNOME 2.16 is in wide
+circulation, then the GTK icons should be replaced with the equivalent
+GNOME icons.
+
+* Recipe for Creating PBM Versions
+
+1. Edit .xpm image in GIMP.
+2. Image > Mode > Indexed. Check Use Black/White Palette and No
+   Color Dithering.
+3. File > Save As file.xbm.
+4. Run xbmtopbm < file.xbm > file.pbm.
+
+Thanks to jan.h.d@swipnet.se for the help.
 
-    refresh.pbm, refresh.xpm
diff --git a/etc/images/attach.pbm b/etc/images/attach.pbm
index e8fcd988f0c..3ba39538760 100644
--- a/etc/images/attach.pbm
+++ b/etc/images/attach.pbm
diff --git a/etc/images/contact.pbm b/etc/images/contact.pbm
new file mode 100644
index 00000000000..64a50b50b83
--- /dev/null
+++ b/etc/images/contact.pbm
diff --git a/etc/images/data-save.pbm b/etc/images/data-save.pbm
new file mode 100644
index 00000000000..3983b3f3892
--- /dev/null
+++ b/etc/images/data-save.pbm
diff --git a/etc/images/data-save.xpm b/etc/images/data-save.xpm
new file mode 100644
index 00000000000..db7f017991a
--- /dev/null
+++ b/etc/images/data-save.xpm
@@ -0,0 +1,238 @@
+/* XPM */
+static char * data_save_xpm[] = {
+"24 24 211 2",
+"       c None",
+".      c #000000",
+"+      c #C3D7F4",
+"@      c #A9CDE5",
+"#      c #75757A",
+"$      c #EFC5BB",
+"%      c #F1C8BE",
+"&      c #F0C6BC",
+"*      c #EEBCB2",
+"=      c #EEBEB5",
+"-      c #EEC1B8",
+";      c #EDBFB6",
+">      c #E9B7AD",
+",      c #E9B8AF",
+"'      c #E9B9B1",
+")      c #E5BFBA",
+"!      c #737277",
+"~      c #B3CDE3",
+"{      c #A1BED6",
+"]      c #BBD6E8",
+"^      c #8AAAC5",
+"/      c #605F68",
+"(      c #E08D7E",
+"_      c #E0826E",
+":      c #E0806E",
+"<      c #DC7A68",
+"[      c #DC8171",
+"}      c #DA7868",
+"|      c #D48173",
+"1      c #D47D6E",
+"2      c #CE7265",
+"3      c #CF7264",
+"4      c #CE7567",
+"5      c #C4675B",
+"6      c #C36558",
+"7      c #626169",
+"8      c #87A3B7",
+"9      c #567187",
+"0      c #BAD5E9",
+"a      c #88A7C3",
+"b      c #686670",
+"c      c #C8817B",
+"d      c #CB7C74",
+"e      c #CB7A73",
+"f      c #CB7B73",
+"g      c #CC7C72",
+"h      c #CB7D73",
+"i      c #BF6B64",
+"j      c #CC7A70",
+"k      c #C16A62",
+"l      c #CC7C73",
+"m      c #C2655B",
+"n      c #C36459",
+"o      c #BA6C6A",
+"p      c #819EB6",
+"q      c #547086",
+"r      c #B6D3E7",
+"s      c #87ABC1",
+"t      c #737373",
+"u      c #FFFFFF",
+"v      c #83A0B8",
+"w      c #526C80",
+"x      c #B9D3E7",
+"y      c #585858",
+"z      c #4F697C",
+"A      c #B9D3E6",
+"B      c #9E9E9E",
+"C      c #CDCDCD",
+"D      c #BFBFBF",
+"E      c #88A4BB",
+"F      c #486276",
+"G      c #B7D2E7",
+"H      c #C4C4C4",
+"I      c #465E70",
+"J      c #B5CAE5",
+"K      c #87A3BA",
+"L      c #455C6D",
+"M      c #AECCE5",
+"N      c #ACACAC",
+"O      c #C5C5C5",
+"P      c #546069",
+"Q      c #B0D1E4",
+"R      c #515C64",
+"S      c #AACEE3",
+"T      c #6B6F72",
+"U      c #6F6F6F",
+"V      c #696969",
+"W      c #6F777E",
+"X      c #86A2B9",
+"Y      c #3A515D",
+"Z      c #A9C9E2",
+"`      c #647A8D",
+" .     c #829FB7",
+"..     c #7F9DB6",
+"+.     c #7E9CB5",
+"@.     c #7998B2",
+"#.     c #85A1B8",
+"$.     c #8CA7BD",
+"%.     c #8AA5BB",
+"&.     c #364A59",
+"*.     c #ABC4E2",
+"=.     c #556E84",
+"-.     c #7192AE",
+";.     c #414A4E",
+">.     c #424A51",
+",.     c #525B63",
+"'.     c #626F79",
+").     c #5F6C76",
+"!.     c #5C6971",
+"~.     c #5A666F",
+"{.     c #58636B",
+"].     c #57636A",
+"^.     c #3B5360",
+"/.     c #39424B",
+"(.     c #7897B3",
+"_.     c #A4B9CB",
+":.     c #364853",
+"<.     c #AAC9E2",
+"[.     c #7091AA",
+"}.     c #6F8FA7",
+"|.     c #4A5359",
+"1.     c #97938C",
+"2.     c #DFDDDA",
+"3.     c #E3E1DE",
+"4.     c #EBEAE8",
+"5.     c #EAE9E7",
+"6.     c #CFCEC9",
+"7.     c #C9C6C0",
+"8.     c #9B968E",
+"9.     c #566168",
+"0.     c #4B657A",
+"a.     c #54738C",
+"b.     c #AAC6DD",
+"c.     c #34464E",
+"d.     c #AAC9E1",
+"e.     c #6C8EA6",
+"f.     c #6C8CA4",
+"g.     c #40474D",
+"h.     c #DAD8D3",
+"i.     c #E7E6E2",
+"j.     c #67655E",
+"k.     c #524F47",
+"l.     c #D9D7D4",
+"m.     c #C7C5BF",
+"n.     c #C0BCB5",
+"o.     c #B8B3AB",
+"p.     c #434C54",
+"q.     c #4D697F",
+"r.     c #4F6F84",
+"s.     c #B3CADC",
+"t.     c #313E49",
+"u.     c #A8C8E1",
+"v.     c #6B8DA6",
+"w.     c #728FA4",
+"x.     c #E2E1DD",
+"y.     c #F0EFEC",
+"z.     c #CDCAC6",
+"A.     c #C2BFB9",
+"B.     c #CAC6C0",
+"C.     c #DCDAD7",
+"D.     c #4B555D",
+"E.     c #4E697F",
+"F.     c #BACCDC",
+"G.     c #A4C4DE",
+"H.     c #698BA3",
+"I.     c #708AA1",
+"J.     c #383E43",
+"K.     c #E0DEDA",
+"L.     c #514E46",
+"M.     c #4F4C44",
+"N.     c #C7C4BE",
+"O.     c #CBC8C2",
+"P.     c #E1E0DC",
+"Q.     c #E9E8E6",
+"R.     c #475158",
+"S.     c #4E6879",
+"T.     c #4D6C80",
+"U.     c #A3C3DB",
+"V.     c #383F43",
+"W.     c #778999",
+"X.     c #6E899E",
+"Y.     c #65859C",
+"Z.     c #33383C",
+"`.     c #D7D4D0",
+" +     c #D6D4D0",
+".+     c #4E4A43",
+"++     c #4D4942",
+"@+     c #D1CEC9",
+"#+     c #E6E5E2",
+"$+     c #EDECEA",
+"%+     c #454F55",
+"&+     c #486173",
+"*+     c #4D6678",
+"=+     c #A1C1DA",
+"-+     c #373C40",
+";+     c #0C0D0F",
+">+     c #4E5E6A",
+",+     c #5B6E7C",
+"'+     c #4F5B62",
+")+     c #A4A099",
+"!+     c #CCC9C3",
+"~+     c #D7D5D1",
+"{+     c #E4E2E0",
+"]+     c #DDDBD7",
+"^+     c #B8B5B0",
+"/+     c #3E474D",
+"(+     c #4A6176",
+"_+     c #4A6070",
+":+     c #9BC3D8",
+"<+     c #363C41",
+"[+     c #28323E",
+"                                                ",
+"    . . . . . . . . . . . . . . . . . . .       ",
+"  . + @ # $ % & * = - ; > , > , ' ) ! ~ { .     ",
+"  . ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 .     ",
+"  . 0 a b c d e f g h i j k l m n o b p q .     ",
+"  . r s t u u u u u u u u u u u u u t v w .     ",
+"  . x . y u u u u u u u u u u u u u t v z .     ",
+"  . A . . B C C C C C C C C C C C D t E F .     ",
+"  . G . . . H u u u u u u u u u u u t E I .     ",
+"  . J . . . . H u u u u u u u u u u t K L .     ",
+"  . M . . . . . N C C C C C C C C O t K P .     ",
+"  . Q . . . . H u u u u u u u u u u t v R .     ",
+"  . S . . . y t t t t T U t t t t V W X Y .     ",
+"  . Z . . ` X  ...+. .@.X #.#.K  .$.v %.&..     ",
+"  . *.. =.-.;.>.,.'.).!.~.{.].,.^./.(._.:..     ",
+"  . <.[.}.|.1.2.3.4.4.5.2.6.7.8.9.0.a.b.c..     ",
+"  . d.e.f.g.h.i.j.k.k.l.m.n.o.6.p.q.r.s.t..     ",
+"  . u.v.w.g.x.y.j.k.k.z.A.n.B.C.D.E.r.F.t..     ",
+"  . G.H.I.J.K.4.L.M.M.N.n.O.P.Q.R.S.T.U.V..     ",
+"  . W.X.Y.Z.`. +.+++++n.@+#+$+#+%+&+*+=+-+.     ",
+"    ;+>+,+'+)+n.o.!+!+~+{+5.]+^+/+(+_+:+<+.     ",
+"      . . . . . . . . . . . . . . . . [+.       ",
+"                                                ",
+"                                                "};
diff --git a/etc/images/delete.pbm b/etc/images/delete.pbm
new file mode 100644
index 00000000000..886be51fd12
--- /dev/null
+++ b/etc/images/delete.pbm
diff --git a/etc/images/execute.pbm b/etc/images/execute.pbm
deleted file mode 100644
index 84bcbb38428..00000000000
--- a/etc/images/execute.pbm
+++ /dev/null
diff --git a/etc/images/execute.xpm b/etc/images/execute.xpm
deleted file mode 100644
index ce38c629f73..00000000000
--- a/etc/images/execute.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * mail_exec_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 6 1",
-"       c None",
-".      c black",
-"X      c #a5d8a5d89550",
-"o      c #d305d305bc3c",
-"O      c #ea03ea03d271",
-"+      c white",
-/* pixels */
-"                        ",
-"                        ",
-"                        ",
-"                 ..     ",
-"             XX  ..     ",
-"         oo  XX  ..     ",
-"     OO  oo  XX  ..     ",
-"     OO  oo  XX  ..     ",
-"     OO  oo  XX  ..     ",
-"     OO  oo  XX  ..     ",
-"     OO  oo  XX  ..     ",
-"     OO  oo  XX  ..     ",
-"     OO  oo  XX  ..     ",
-"     OO  oo  XX         ",
-"     OO  oo             ",
-"     OO      +   ..     ",
-"             XX  ..     ",
-"         oo  XX         ",
-"     OO  oo             ",
-"     OO                 ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/etc/images/exit.pbm b/etc/images/exit.pbm
index a6dd11e7769..c90b6e69ed1 100644
--- a/etc/images/exit.pbm
+++ b/etc/images/exit.pbm
diff --git a/etc/images/fld-open.pbm b/etc/images/fld-open.pbm
deleted file mode 100644
index 3d2be258a67..00000000000
--- a/etc/images/fld-open.pbm
+++ /dev/null
diff --git a/etc/images/fld-open.xpm b/etc/images/fld-open.xpm
deleted file mode 100644
index 220410003fd..00000000000
--- a/etc/images/fld-open.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 4 1",
-"  c Gray0",
-". c #909090909090",
-"X c #fefefefefefe",
-"o c None",
-/* pixels */
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooo  oooooooo",
-"ooooooooooo   .. ooooooo",
-"oooo  oo   ....XXo   ooo",
-"ooo ..  ....XXXX  .. ooo",
-"ooo .....XXXXX  .... ooo",
-"oooo ..XXXXX  ...... ooo",
-"oooo ..XXX  ........ ooo",
-"ooooo .XX .......... ooo",
-"ooooo ..X .......... ooo",
-"oooooo .X .......... ooo",
-"oooooo .. ........  oooo",
-"ooooooo . ......  oooooo",
-"ooooooo . ..... oooooooo",
-"oooooooo  ...  ooooooooo",
-"oooooooo  .  ooooooooooo",
-"ooooooooo  ooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo",
-"oooooooooooooooooooooooo"
-};
diff --git a/etc/images/highlight.pbm b/etc/images/highlight.pbm
deleted file mode 100644
index 23394f05e27..00000000000
--- a/etc/images/highlight.pbm
+++ /dev/null
diff --git a/etc/images/highlight.xpm b/etc/images/highlight.xpm
deleted file mode 100644
index 1844128f02f..00000000000
--- a/etc/images/highlight.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * highlight_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 4 1",
-"       c None",
-".      c black",
-"X      c #828282827474",
-"o      c #dd00df007e00",
-/* pixels */
-"                 .....  ",
-"                ..XXX.. ",
-"                .XXXXX. ",
-"               .XXXXX.. ",
-"               .XXXXX.  ",
-"               .XXXXX.  ",
-"              .XXXXX.   ",
-"              .ooXX.    ",
-"              ..ooo.    ",
-"       oooo     ....    ",
-"oo.ooo....oo ...        ",
-"o.o.ooo.oo.o.ooo.o      ",
-".ooo.oo.oo.o.ooooo      ",
-".ooo.oo.oo.o.ooooo      ",
-".ooo.oo...oo.ooooo      ",
-".....oo.oo.o.ooooo      ",
-".ooo.oo.oo.o.ooooo      ",
-".ooo.oo.oo.o.ooo.o      ",
-". oo.o....ooo...o       ",
-"         oo oooo        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/etc/images/mail.pbm b/etc/images/mail.pbm
deleted file mode 100644
index 744f38609e8..00000000000
--- a/etc/images/mail.pbm
+++ /dev/null
diff --git a/etc/images/mail.xpm b/etc/images/mail.xpm
deleted file mode 100644
index fc87e3a654a..00000000000
--- a/etc/images/mail.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 5 1",
-"  c Gray0",
-". c #673e666663d4",
-"X c #a852a7bea3d2",
-"o c #eb46ea1de471",
-"O c None",
-/* pixels */
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOO    OOOOOO",
-"OOOOOOOOO     .ooX OOOOO",
-"OOOO     .XooooooX OOOOO",
-"OOO .Xoooooooooo.XX OOOO",
-"OOO o..ooooooooX.Xo OOOO",
-"OOO XoX..oooooo.Xoo OOOO",
-"OOOO oooXX.Xoo...ooX OOO",
-"OOOO oooooXX..XoX.Xo OOO",
-"OOOO Xoooo.ooooooo.X OOO",
-"OOOOO oooXXoooooooo.X OO",
-"OOOOO ooo.oooooooooX  OO",
-"OOOOO XoXXooooooX   OOOO",
-"OOOOOO o.ooooX   OOOOOOO",
-"OOOOOO .XoX   OOOOOOOOOO",
-"OOOOOO ..  OOOOOOOOOOOOO",
-"OOOOOOO  OOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOOOOOOOO"
-};
diff --git a/etc/images/mail/alias.pbm b/etc/images/mail/alias.pbm
deleted file mode 100644
index cdd42c3632c..00000000000
--- a/etc/images/mail/alias.pbm
+++ /dev/null
diff --git a/etc/images/mail/alias.xpm b/etc/images/mail/alias.xpm
deleted file mode 100644
index 8bf75063bdc..00000000000
--- a/etc/images/mail/alias.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * alias_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 4 1",
-"       c None",
-".      c #61b761b7600a",
-"X      c #a5d8a5d89550",
-"o      c black",
-/* pixels */
-"                        ",
-"                        ",
-"                        ",
-"     ......             ",
-"   ...XXXX..XX          ",
-"  o..ooooooo...         ",
-" ooo      oooo..X       ",
-" o.X        ooo...      ",
-" o.X          ooo.XX    ",
-" o.X            oo..    ",
-" o.X             oo.    ",
-" o...            oo..   ",
-"  o.X             o..   ",
-"  o.XX            oX.   ",
-"   o....          oo.   ",
-"    o..XX        oooo   ",
-"     o...XXX   XXoooo   ",
-"      ooo........ooooo  ",
-"        oooooXXooooo.oo ",
-"            ooo    o..oo",
-"                    o...",
-"                     ooo",
-"                      oo",
-"                        "};
diff --git a/etc/images/mail/compose.pbm b/etc/images/mail/compose.pbm
index ca6328d27a5..8c15697fe75 100644
--- a/etc/images/mail/compose.pbm
+++ b/etc/images/mail/compose.pbm
diff --git a/etc/images/mail/flag-for-followup.pbm b/etc/images/mail/flag-for-followup.pbm
new file mode 100644
index 00000000000..9e17cc433e2
--- /dev/null
+++ b/etc/images/mail/flag-for-followup.pbm
diff --git a/etc/images/mail/flag-for-followup.xpm b/etc/images/mail/flag-for-followup.xpm
new file mode 100644
index 00000000000..b671d5b91d7
--- /dev/null
+++ b/etc/images/mail/flag-for-followup.xpm
@@ -0,0 +1,187 @@
+/* XPM */
+static char * flag_for_followup_xpm[] = {
+"24 24 160 2",
+"       c None",
+".      c #5B5457",
+"+      c #322D2E",
+"@      c #463B3F",
+"#      c #63555A",
+"$      c #53484B",
+"%      c #726166",
+"&      c #98868C",
+"*      c #8A727A",
+"=      c #211619",
+"-      c #847B7D",
+";      c #CDBAC0",
+">      c #A58791",
+",      c #82646D",
+"'      c #6B515A",
+")      c #6A5058",
+"!      c #684C56",
+"~      c #6A424F",
+"{      c #3A2A2F",
+"]      c #000000",
+"^      c #5C5457",
+"/      c #D1BEC4",
+"(      c #C3ACB4",
+"_      c #B59AA2",
+":      c #997E87",
+"<      c #80666E",
+"[      c #745A62",
+"}      c #64464F",
+"|      c #603946",
+"1      c #764D5A",
+"2      c #886771",
+"3      c #45373B",
+"4      c #A9979C",
+"5      c #B798A2",
+"6      c #BCA0A9",
+"7      c #BEA4AC",
+"8      c #B89FA7",
+"9      c #9E848C",
+"0      c #8F767E",
+"a      c #785F67",
+"b      c #6A4E57",
+"c      c #6E4F59",
+"d      c #7C5A65",
+"e      c #8E6873",
+"f      c #8C6974",
+"g      c #413337",
+"h      c #251F21",
+"i      c #99717D",
+"j      c #8F606E",
+"k      c #946875",
+"l      c #9E7582",
+"m      c #B08F9A",
+"n      c #AC8C96",
+"o      c #AE929A",
+"p      c #9C8089",
+"q      c #8B7179",
+"r      c #765C65",
+"s      c #745660",
+"t      c #7E5A66",
+"u      c #865E6A",
+"v      c #855D69",
+"w      c #7F5F69",
+"x      c #3B2D32",
+"y      c #40332D",
+"z      c #6F3B4A",
+"A      c #774252",
+"B      c #7D4858",
+"C      c #82505F",
+"D      c #926674",
+"E      c #906572",
+"F      c #966D7A",
+"G      c #A17E89",
+"H      c #A0828B",
+"I      c #90767D",
+"J      c #927780",
+"K      c #8B6E77",
+"L      c #8A6A74",
+"M      c #86626C",
+"N      c #845B68",
+"O      c #8E6673",
+"P      c #6A535A",
+"Q      c #B2997B",
+"R      c #3C2824",
+"S      c #693343",
+"T      c #723A4B",
+"U      c #845261",
+"V      c #8C5E6C",
+"W      c #946A78",
+"X      c #9A737E",
+"Y      c #A1828C",
+"Z      c #947C84",
+"`      c #846B73",
+" .     c #755B64",
+"..     c #57464B",
+"+.     c #59454C",
+"@.     c #5B484E",
+"#.     c #31282B",
+"$.     c #392F23",
+"%.     c #B59C7D",
+"&.     c #372622",
+"*.     c #643040",
+"=.     c #7E4D5B",
+"-.     c #814E5D",
+";.     c #845262",
+">.     c #936876",
+",.     c #976E7B",
+"'.     c #9D7C87",
+").     c #82666F",
+"!.     c #5C4B50",
+"~.     c #3D3326",
+"{.     c #34251F",
+"].     c #7E4C5B",
+"^.     c #8C606E",
+"/.     c #9C7581",
+"(.     c #9B7380",
+"_.     c #997682",
+":.     c #7F656D",
+"<.     c #3A2F22",
+"[.     c #33241F",
+"}.     c #683444",
+"|.     c #875766",
+"1.     c #A17C87",
+"2.     c #A27C88",
+"3.     c #8B6773",
+"4.     c #574249",
+"5.     c #392E21",
+"6.     c #B69C7E",
+"7.     c #30241D",
+"8.     c #64303F",
+"9.     c #804F5E",
+"0.     c #976D7A",
+"a.     c #886670",
+"b.     c #2E2025",
+"c.     c #362C1F",
+"d.     c #2B221A",
+"e.     c #5A2837",
+"f.     c #6E394A",
+"g.     c #73515C",
+"h.     c #0C0809",
+"i.     c #342B1F",
+"j.     c #B69E7F",
+"k.     c #512432",
+"l.     c #683E4B",
+"m.     c #332A1E",
+"n.     c #2D261E",
+"o.     c #4E2330",
+"p.     c #282118",
+"q.     c #32291D",
+"r.     c #B79E80",
+"s.     c #2D261D",
+"t.     c #352B1F",
+"u.     c #B49A7D",
+"v.     c #2E271F",
+"w.     c #352C1F",
+"x.     c #2A221A",
+"y.     c #B49C7E",
+"z.     c #2A241C",
+"A.     c #28221B",
+"B.     c #AE9C88",
+"C.     c #060606",
+"                                                ",
+"                  . +                           ",
+"          @ # $ % & * =                         ",
+"        - ; > , ' ) ! ~ { ]                     ",
+"      ^ / ( _ : < [ } | 1 2 3 ]                 ",
+"      4 5 6 7 8 9 0 a b c d e f g ]             ",
+"    h i j k l m n o p q r s t u v w x ]         ",
+"    y z A B C D E F G H I J K L M N O P         ",
+"  ] Q R S T U V V W X Y Z `  ...+.@.#.          ",
+"    $.%.&.*.=.-.;.>.,.'.).!.                    ",
+"      ~.Q {.*.].^./.(._.:.                      ",
+"        <.%.[.}.|.1.2.3.4.                      ",
+"          5.6.7.8.9.0.a.b.                      ",
+"            c.%.d.e.f.g.h.                      ",
+"              i.j.d.k.l.]                       ",
+"                m.%.n.o.]                       ",
+"                  m.%.p.                        ",
+"                    q.r.s.                      ",
+"                      t.u.v.                    ",
+"                        w.u.x.                  ",
+"                          c.y.z.                ",
+"                            t.u.A.              ",
+"                              c.B.]             ",
+"                                C.              "};
diff --git a/etc/images/mail/inbox.pbm b/etc/images/mail/inbox.pbm
new file mode 100644
index 00000000000..2c93e3c74bb
--- /dev/null
+++ b/etc/images/mail/inbox.pbm
diff --git a/etc/images/mail/move.pbm b/etc/images/mail/move.pbm
new file mode 100644
index 00000000000..b765cc2ed68
--- /dev/null
+++ b/etc/images/mail/move.pbm
diff --git a/etc/images/mail/refile.pbm b/etc/images/mail/refile.pbm
deleted file mode 100644
index 64e534ecc89..00000000000
--- a/etc/images/mail/refile.pbm
+++ /dev/null
diff --git a/etc/images/mail/refile.xpm b/etc/images/mail/refile.xpm
deleted file mode 100644
index 561012d8505..00000000000
--- a/etc/images/mail/refile.xpm
+++ /dev/null
@@ -1,36 +0,0 @@
-/* XPM */
-static char * refile_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 7 1",
-"       c None",
-".      c black",
-"X      c #a5d8a5d89550",
-"o      c #d305d305bc3c",
-"O      c #ea03ea03d271",
-"+      c #828282827474",
-"@      c #61b761b7600a",
-/* pixels */
-"             .          ",
-"           ..X.         ",
-"         ..XoO....      ",
-"       ..XooooO.+.      ",
-"     ..XooooooOX..  ..  ",
-"    .@@ooooooOOO@. ...  ",
-"    .O@oooooOOOOO..@@.  ",
-"    .OO@oooOOOOOO..@@.  ",
-"  ...OO@XooOOOOO...@@.  ",
-" ..+.O@XooOOOO..@@@@@.  ",
-" .++..XooOOOO..@@@@@@.  ",
-" .++.@oooOO...@@@@@@@.  ",
-" ..+.XooOOO..@@@@@@@.   ",
-"  .++.OOOO.@@@@@@@@.    ",
-"   .+.oOO..@@@@@@@.     ",
-"   .++.OO.@@@@@@@.      ",
-"    .++.O.@@@@@..       ",
-"    ..+.O.@@@@@.        ",
-"     .++..@@@@.         ",
-"     ..++.@@@.          ",
-"       .+.@@.           ",
-"       ...@.            ",
-"        ...             ",
-"         .              "};
diff --git a/etc/images/mail/repack.pbm b/etc/images/mail/repack.pbm
index 502b1179939..1f50ae54281 100644
--- a/etc/images/mail/repack.pbm
+++ b/etc/images/mail/repack.pbm
diff --git a/etc/images/mail/repack.xpm b/etc/images/mail/repack.xpm
index b50b8f37551..d7bb76a3e1f 100644
--- a/etc/images/mail/repack.xpm
+++ b/etc/images/mail/repack.xpm
@@ -1,35 +1,67 @@
 /* XPM */
-static char * mail_repack_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 6 1",
+static char * repack_xpm[] = {
+"24 24 40 1",
 "       c None",
-".      c black",
-"X      c #a5d8a5d89550",
-"o      c #d305d305bc3c",
-"O      c #ea03ea03d271",
-"+      c #828282827474",
-/* pixels */
+".      c #000000",
+"+      c #DBD99B",
+"@      c #3A3824",
+"#      c #5E5B3A",
+"$      c #12120B",
+"%      c #7E7A4E",
+"&      c #222114",
+"*      c #A29E6A",
+"=      c #595741",
+"-      c #43412B",
+";      c #5A573B",
+">      c #89865A",
+",      c #8C895C",
+"'      c #CDCBB0",
+")      c #4B4A37",
+"!      c #D1CFB6",
+"~      c #D3D3BC",
+"{      c #1D1C12",
+"]      c #373624",
+"^      c #1F1E13",
+"/      c #928E5F",
+"(      c #413E2A",
+"_      c #79764F",
+":      c #817E54",
+"<      c #B2B097",
+"[      c #17160E",
+"}      c #888458",
+"|      c #4D4A32",
+"1      c #747047",
+"2      c #A6A272",
+"3      c #A9A576",
+"4      c #A7A374",
+"5      c #ABA779",
+"6      c #65623E",
+"7      c #AFAC80",
+"8      c #666443",
+"9      c #E1E1D1",
+"0      c #EBEAE1",
+"a      c #ADA97C",
 "                        ",
 "                        ",
 "       ..............   ",
-"      .XXXXXXXXXXXX..   ",
-"     .XXXXXXXXXXXX.X.   ",
-"    .XXXXXXXXXXXX.oo.   ",
-"   ..............ooo.   ",
-"   .OOOOOOOOOOOO.oo.    ",
-"   .O++++++++++O.oo.    ",
-"   .O+XXXXXXXX+O.o.     ",
-"    .+XXXXXXXX+.o..     ",
-"    .+XX...XXX+....     ",
-"     ....o.......oo.    ",
-"     ....o.....Oooo.    ",
-"    .OOO...OOOO.oooo.   ",
-"    .++++++++++.oooo.   ",
-"    .+XXXXXXXX+.oooo.   ",
-"   .O+XXXXXXXX+O.ooX.   ",
-"   .O+XXXXXXXX+O.oo..   ",
-"   .O++++++++++O.o..    ",
-"  ..OOOOOOOOOOOO...     ",
+"      .++++++++++++..   ",
+"     .++++++++++++.@.   ",
+"    .++++++++++++.@#$   ",
+"   ..............@#%&   ",
+"   .************.#%$    ",
+"   .**=------;**.%#.    ",
+"   .**->>>>>,'**$%.     ",
+"    .*-,*****'*$%$.     ",
+"    .*)*...**!*...$     ",
+"     ....~.......{#.    ",
+"     ....~.....]^#%.    ",
+"    ./(_...::<:.#%%#[   ",
+"    .*(*/::}*!*.%%%%.   ",
+"    .*|******!*$#%%1.   ",
+"   .**|234533!**$%%6.   ",
+"   .**|557777!**.%6..   ",
+"   .**8999999043.6..    ",
+"   .**********4a...     ",
 "  ................      ",
 "                        ",
 "                        "};
diff --git a/etc/images/mail/reply-all.pbm b/etc/images/mail/reply-all.pbm
index 57503cbea7c..fc23f2fd72c 100644
--- a/etc/images/mail/reply-all.pbm
+++ b/etc/images/mail/reply-all.pbm
diff --git a/etc/images/mail/reply-from.pbm b/etc/images/mail/reply-from.pbm
index 99fad608f30..58f79fb75ad 100644
--- a/etc/images/mail/reply-from.pbm
+++ b/etc/images/mail/reply-from.pbm
diff --git a/etc/images/mail/reply-from.xpm b/etc/images/mail/reply-from.xpm
index 543850f4b5e..a04d6760e39 100644
--- a/etc/images/mail/reply-from.xpm
+++ b/etc/images/mail/reply-from.xpm
@@ -1,38 +1,103 @@
 /* XPM */
 static char * reply_from_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 9 1",
+"24 24 76 1",
 "       c None",
-".      c black",
-"X      c #673e666663d4",
-"o      c #eb46ea1de471",
-"O      c #a852a7bea3d2",
-"+      c #ae51c17b9b26",
-"@      c #8d4d97577838",
-"#      c #7c7c8b8b6e6e",
-"$      c #5e0868be52d3",
-/* pixels */
+".      c #000000",
+"+      c #535353",
+"@      c #FFFFFF",
+"#      c #FEFEFE",
+"$      c #FDFDFD",
+"%      c #FCFCFC",
+"&      c #FBFBFB",
+"*      c #F9F9F9",
+"=      c #F8F8F8",
+"-      c #F7F7F7",
+";      c #F6F6F6",
+">      c #F5F5F5",
+",      c #F4F4F4",
+"'      c #E3E3E3",
+")      c #EEEEEE",
+"!      c #4F4F4F",
+"~      c #F3F3F3",
+"{      c #F2F2F2",
+"]      c #F1F1F1",
+"^      c #F0F0F0",
+"/      c #EFEFEF",
+"(      c #EDEDED",
+"_      c #AEAEAE",
+":      c #E4E4E4",
+"<      c #434343",
+"[      c #ACACAC",
+"}      c #C8C8C8",
+"|      c #A0A0A0",
+"1      c #D4D4D4",
+"2      c #ECECEC",
+"3      c #959595",
+"4      c #3E3E3E",
+"5      c #4D4D4D",
+"6      c #818181",
+"7      c #C6C6C6",
+"8      c #3D1A13",
+"9      c #6A6A6A",
+"0      c #636363",
+"a      c #B9B9B9",
+"b      c #737373",
+"c      c #EAC0BA",
+"d      c #7C7C7C",
+"e      c #6E6E6E",
+"f      c #DF9E95",
+"g      c #3F3F3F",
+"h      c #FFE3E0",
+"i      c #FFD5CF",
+"j      c #FFD7D2",
+"k      c #FFD9D3",
+"l      c #E3ABA3",
+"m      c #E2A79E",
+"n      c #E3AAA2",
+"o      c #CC6253",
+"p      c #DD968C",
+"q      c #DE9A90",
+"r      c #DD948A",
+"s      c #B14334",
+"t      c #FFEAE7",
+"u      c #FFDDD7",
+"v      c #FFDCD6",
+"w      c #FFDCD7",
+"x      c #FFDBD6",
+"y      c #FFDDD8",
+"z      c #FFC2BA",
+"A      c #FFD0C8",
+"B      c #FFD0C9",
+"C      c #FFD1CA",
+"D      c #2A2221",
+"E      c #080606",
+"F      c #060404",
+"G      c #1D1716",
+"H      c #FFD1CB",
+"I      c #362927",
+"J      c #201817",
+"K      c #473734",
 "                        ",
 "                        ",
-"              ....      ",
-"         .....XooO.     ",
-"    .....XOooooooO.     ",
-"   .XOooooooooooXOO.    ",
-"   .oXXooooooooOXOo.    ",
-"   .OoOXXooooooXOoo.    ",
-"    .oooOOXOooXXXooO.   ",
-"    ........XXOoOXOo.   ",
-"    ..++++@.ooooooXO.   ",
-"     ..+@@@.oooooooXO.  ",
-"    ..+@@@#.oooooooO..  ",
-"  ..++@@@#$.ooooO...    ",
-"        #.$.oO...       ",
-"   ...O . ....          ",
-"   ...O                 ",
-"   .O                   ",
-"   ...O ..O .... .O O.  ",
-"   ...O ..O .OO. .....  ",
-"   .O   .O  .  . . . .  ",
-"   .O   .O  .OO. . . .  ",
-"   .O   .O  .... . O .  ",
+"                        ",
+"    .................   ",
+"   .+@@@@#$%&*=-;>,'+.  ",
+"   .)!@>,~{{]^^/)('!_.  ",
+"   .@:<$~{{]^/))('![}.  ",
+"   .@>:!&]^^/)(('<|1}.  ",
+"   .@&>:<=^/)(2'!31:}.  ",
+"   .@>>>:4>)(2'567::}.  ",
+"   .@&8>:9<~2'!977>:}.  ",
+"   .@..:0@a!^!37b7>:}.  ",
+"   ..c.0@>:1![7::d::}.  ",
+"   ecfegg....:>>>:d:}.  ",
+"   hijklmnfo.::::::d}.  ",
+"  .....ppqrs.###$$$$ .  ",
+" t.uvwxuuyyz            ",
+"  .ABC.DEFCG..  . .. .. ",
+"  ...H.I  JK .. .. .. . ",
+"  .  H.   .   . .  .  . ",
+"  .   .   .   . .  .  . ",
+"  .   .   .. .. .  .  . ",
+"  .   .    ...  .  .  . ",
 "                        "};
diff --git a/etc/images/mail/reply-to.pbm b/etc/images/mail/reply-to.pbm
index d7dc6391b69..777649301f0 100644
--- a/etc/images/mail/reply-to.pbm
+++ b/etc/images/mail/reply-to.pbm
diff --git a/etc/images/mail/reply-to.xpm b/etc/images/mail/reply-to.xpm
index bce818c4804..bbdc6d12604 100644
--- a/etc/images/mail/reply-to.xpm
+++ b/etc/images/mail/reply-to.xpm
@@ -1,38 +1,206 @@
 /* XPM */
 static char * reply_to_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 9 1",
-"       c None",
-".      c black",
-"X      c #673e666663d4",
-"o      c #eb46ea1de471",
-"O      c #a852a7bea3d2",
-"+      c #ae51c17b9b26",
-"@      c #8d4d97577838",
-"#      c #7c7c8b8b6e6e",
-"$      c #5e0868be52d3",
-/* pixels */
-"                        ",
-"                        ",
-"              ....      ",
-"         .....XooO.     ",
-"    .....XOooooooO.     ",
-"   .XOooooooooooXOO.    ",
-"   .oXXooooooooOXOo.    ",
-"   .OoOXXooooooXOoo.    ",
-"    .oooOOXOooXXXooO.   ",
-"    ........XXOoOXOo.   ",
-"    ..++++@.ooooooXO.   ",
-"     ..+@@@.oooooooXO.  ",
-"    ..+@@@#.oooooooO..  ",
-"  ..++@@@#$.ooooO...    ",
-" .++++@@#.$             ",
-"  .+@@@#.o  ......      ",
-"   .+@#$.   OO.OOO      ",
-"    .#$.      .O        ",
-"     .$.      .O  ....  ",
-"      .       .O  .OO.  ",
-"              .O  .  .  ",
-"              .O  .OO.  ",
-"              .O  ....  ",
-"                        "};
+"24 24 179 2",
+"       c None",
+".      c #000000",
+"+      c #ADA99C",
+"@      c #E6E1D0",
+"#      c #F0EAD9",
+"$      c #A9A598",
+"%      c #141416",
+"&      c #161618",
+"*      c #080809",
+"=      c #DBD6C7",
+"-      c #1B1B1C",
+";      c #050505",
+">      c #5A5A5A",
+",      c #676767",
+"'      c #020202",
+")      c #807D76",
+"!      c #D49A3E",
+"~      c #D2973B",
+"{      c #040402",
+"]      c #6D6B6B",
+"^      c #7A7979",
+"/      c #030100",
+"(      c #040100",
+"_      c #282724",
+":      c #DD9831",
+"<      c #DA962F",
+"[      c #1A0E01",
+"}      c #BC6D1B",
+"|      c #BE6E13",
+"1      c #BE6D13",
+"2      c #BD6C13",
+"3      c #3E3C36",
+"4      c #D69029",
+"5      c #D18D27",
+"6      c #737067",
+"7      c #110900",
+"8      c #CF791C",
+"9      c #CE791C",
+"0      c #CD761A",
+"a      c #C47013",
+"b      c #4A4136",
+"c      c #A0731E",
+"d      c #96691A",
+"e      c #000100",
+"f      c #291703",
+"g      c #BA6613",
+"h      c #8C4E0D",
+"i      c #844A0D",
+"j      c #BF6D13",
+"k      c #1F2A0D",
+"l      c #306220",
+"m      c #4F7242",
+"n      c #448D44",
+"o      c #2E802E",
+"p      c #3A6F3A",
+"q      c #FFFFFF",
+"r      c #535353",
+"s      c #171009",
+"t      c #AC600C",
+"u      c #713F0A",
+"v      c #693A0A",
+"w      c #AA5F0A",
+"x      c #192B10",
+"y      c #275926",
+"z      c #68A769",
+"A      c #358A36",
+"B      c #2D812D",
+"C      c #FBFBFB",
+"D      c #F7F7F7",
+"E      c #FAFAFA",
+"F      c #F5F5F5",
+"G      c #4F4F4F",
+"H      c #AEAEAE",
+"I      c #141517",
+"J      c #6F767C",
+"K      c #534C46",
+"L      c #241609",
+"M      c #23180E",
+"N      c #484644",
+"O      c #354A4D",
+"P      c #050B07",
+"Q      c #4F7E4F",
+"R      c #399239",
+"S      c #2D852D",
+"T      c #297F29",
+"U      c #ACACAC",
+"V      c #C8C8C8",
+"W      c #151618",
+"X      c #6C7C8B",
+"Y      c #728EA9",
+"Z      c #5D6B78",
+"`      c #C8CBCD",
+" .     c #C3C7CD",
+"..     c #8090A2",
+"+.     c #5A728B",
+"@.     c #4E6479",
+"#.     c #111714",
+"$.     c #328732",
+"%.     c #2B7F2C",
+"&.     c #2B772C",
+"*.     c #434343",
+"=.     c #A0A0A0",
+"-.     c #D4D4D4",
+";.     c #25282A",
+">.     c #8A9EB4",
+",.     c #6A86A1",
+"'.     c #596A7C",
+").     c #DDE1E4",
+"!.     c #DCE2E7",
+"~.     c #899CAC",
+"{.     c #687E96",
+"].     c #546D88",
+"^.     c #11171E",
+"/.     c #949494",
+"(.     c #F6F6F6",
+"_.     c #575757",
+":.     c #9F9F9F",
+"<.     c #DADADA",
+"[.     c #E8E8E8",
+"}.     c #D1D1D1",
+"|.     c #23282D",
+"1.     c #8096AB",
+"2.     c #5D7996",
+"3.     c #53687D",
+"4.     c #CDD3D9",
+"5.     c #CBD2DC",
+"6.     c #899BAB",
+"7.     c #CCD4DC",
+"8.     c #5E7790",
+"9.     c #17212C",
+"0.     c #F9F9F9",
+"a.     c #C7C7C7",
+"b.     c #D7D7D7",
+"c.     c #E9E9E9",
+"d.     c #F8F8F8",
+"e.     c #F0F0F0",
+"f.     c #1F252B",
+"g.     c #6B8197",
+"h.     c #536D89",
+"i.     c #4A5D6F",
+"j.     c #81919F",
+"k.     c #8293A4",
+"l.     c #5A7087",
+"m.     c #496481",
+"n.     c #47617E",
+"o.     c #3F4951",
+"p.     c #DEDEDE",
+"q.     c #E6E6E6",
+"r.     c #F1F1F1",
+"s.     c #FDFDFD",
+"t.     c #0E141A",
+"u.     c #0D1319",
+"v.     c #0E141B",
+"w.     c #0E131A",
+"x.     c #161B22",
+"y.     c #DDDDDD",
+"z.     c #636363",
+"A.     c #C6C6C6",
+"B.     c #EDEDED",
+"C.     c #E3E3E3",
+"D.     c #FCFCFC",
+"E.     c #737373",
+"F.     c #FEFEFE",
+"G.     c #313131",
+"H.     c #030303",
+"I.     c #7C7C7C",
+"J.     c #E4E4E4",
+"K.     c #E7E7E7",
+"L.     c #F3F3F3",
+"M.     c #404040",
+"N.     c #4D4D4D",
+"O.     c #F2F2F2",
+"P.     c #BCBCBC",
+"Q.     c #C3C3C3",
+"R.     c #E0E0E0",
+"S.     c #ECECEC",
+"T.     c #EFEFEF",
+"U.     c #060606",
+"V.     c #E5E5E5",
+"                                                ",
+"                  . .                           ",
+"                + @ # $ .                       ",
+"          % & * = # # # .                       ",
+"      - ; > , ' ) ! ~ # .                       ",
+"      { ] ^ / ( _ : < # .                       ",
+"      [ } | 1 2 3 4 5 # 6                       ",
+"      7 8 9 0 a b c d # # . e . . . . . .       ",
+"      f g h i j k l m n o p . q q q q q r .     ",
+"      s t u v w x y z A o B . C D E F G H .     ",
+"    I J K L M N O P Q R S T . F F F G U V .     ",
+"  W X Y Z `  ...+.@.#.$.%.&.. F F *.=.-.V .     ",
+"  ;.>.,.'.).!.~.{.].^.. . . /.(._.:.<.[.}..     ",
+"  |.1.2.3.4.5.6.7.8.9.0.E E E a.b.c.D d.e.      ",
+"  f.g.h.i.j.k.l.m.n.o.E C C p.q.r.0.s.C D       ",
+"    t.u.v.v.v.t.w.x.U y.. . . . . . . C 0.      ",
+"      . q C F z.A.(.r.B.C.c.e.. s.d.C D.E       ",
+"      . q F E.-.F (.E C (.d.s.. s.F.-.G.H..     ",
+"      . q I.-.J.J.K.L.(.D d.0.. C D.M.N.O.. .   ",
+"      . E.P.P.P.P.Q.R.c.S.T.r.. (.d.U.V.    .   ",
+"        . . . . . .           .     .       .   ",
+"                              .     . .   . .   ",
+"                              .       . . .     ",
+"                                                "};
diff --git a/etc/images/mail/reply.pbm b/etc/images/mail/reply.pbm
index f48b34be3ae..fe635ba5ad0 100644
--- a/etc/images/mail/reply.pbm
+++ b/etc/images/mail/reply.pbm
diff --git a/etc/images/mail/send.pbm b/etc/images/mail/send.pbm
index 36b60b7dbdd..cd614beb024 100644
--- a/etc/images/mail/send.pbm
+++ b/etc/images/mail/send.pbm
diff --git a/etc/images/next-page.pbm b/etc/images/next-page.pbm
new file mode 100644
index 00000000000..fbf7eaec0c3
--- /dev/null
+++ b/etc/images/next-page.pbm
diff --git a/etc/images/page-down.pbm b/etc/images/page-down.pbm
deleted file mode 100644
index 2f577146b63..00000000000
--- a/etc/images/page-down.pbm
+++ /dev/null
diff --git a/etc/images/page-down.xpm b/etc/images/page-down.xpm
deleted file mode 100644
index 3ef0f24ee0e..00000000000
--- a/etc/images/page-down.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * mail_page_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 5 1",
-"       c None",
-".      c black",
-"X      c #ea03ea03d271",
-"o      c #a5d8a5d89550",
-"O      c #d305d305bc3c",
-/* pixels */
-"                        ",
-"                        ",
-"   ..................   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XoooooooooooooXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .Xoooooooooo..oXX.   ",
-"   .XXXXXXXXXXX..XXX.   ",
-"   .XXXXXXXXXXX..XXX.   ",
-"   .XooooooXXXX..XXX.   ",
-"   .XXXXXXXXXXX..XXX.   ",
-"   .XXXXXXXXX.O..O.X.   ",
-"   .Xoooooooo.....XX.   ",
-"   .XXXXXXXXXX....XX.   ",
-"   .XXXXXXXXXXX..XXX.   ",
-"   .XXXXXXXXXXXooXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   ..................   ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/etc/images/refresh.xpm b/etc/images/refresh.xpm
index fbf4ce8af07..827ce3f2f17 100644
--- a/etc/images/refresh.xpm
+++ b/etc/images/refresh.xpm
@@ -1,113 +1,153 @@
 /* XPM */
-static char * stock_refresh_xpm[] = {
-"24 24 86 1",
-"       c None",
-".      c #000000",
-"+      c #F3F6F8",
-"@      c #C8D4DF",
-"#      c #F7F9FA",
-"$      c #0D110C",
-"%      c #6286A5",
-"&      c #A0B6C9",
-"*      c #C9D5E0",
-"=      c #F2F5F7",
-"-      c #172116",
-";      c #819EB6",
-">      c #CAD6E1",
-",      c #CCD7E1",
-"'      c #CED9E3",
-")      c #F6F8F9",
-"!      c #7192AE",
-"~      c #587B99",
-"{      c #CDD8E2",
-"]      c #CFDAE4",
-"^      c #D3DDE6",
-"/      c #D5DEE6",
-"(      c #ADC0D0",
-"_      c #90A9BF",
-":      c #537490",
-"<      c #23323E",
-"[      c #85A1B8",
-"}      c #5E83A3",
-"|      c #6084A3",
-"1      c #6689A7",
-"2      c #678AA8",
-"3      c #48657D",
-"4      c #A8BCCD",
-"5      c #7393AE",
-"6      c #6B8DAA",
-"7      c #5C81A1",
-"8      c #5D82A2",
-"9      c #6588A6",
-"0      c #435F76",
-"a      c #B1C3D2",
-"b      c #50718D",
-"c      c #9FB5C8",
-"d      c #94ACC1",
-"e      c #425D73",
-"f      c #435E74",
-"g      c #B4C5D3",
-"h      c #6C8EAB",
-"i      c #C4D2DD",
-"j      c #5B80A0",
-"k      c #456178",
-"l      c #7595B0",
-"m      c #BFCEDA",
-"n      c #597D9C",
-"o      c #A3B8CA",
-"p      c #B0C2D1",
-"q      c #86A2B9",
-"r      c #6E8FAB",
-"s      c #E1E8EE",
-"t      c #B9C9D6",
-"u      c #6387A6",
-"v      c #4C6B85",
-"w      c #7F9DB6",
-"x      c #BCCCD9",
-"y      c #DDE5EC",
-"z      c #E4EAEF",
-"A      c #D8E1E9",
-"B      c #D1DBE4",
-"C      c #C7D3DE",
-"D      c #B7C8D6",
-"E      c #7091AD",
-"F      c #537592",
-"G      c #9DB3C6",
-"H      c #8CA7BD",
-"I      c #304353",
-"J      c #4E6E89",
-"K      c #829FB7",
-"L      c #92ABC0",
-"M      c #C5D3DE",
-"N      c #7C9AB3",
-"O      c #5A7E9D",
-"P      c #47647C",
-"Q      c #6185A4",
-"R      c #5B7F9E",
-"S      c #4F6F8A",
-"T      c #405A71",
-"U      c #283926",
-"       .                ",
-"       ..               ",
-"       .+.              ",
-"    ....@#.             ",
-"   $%&@@**=.     ..     ",
-"  -;@@**>,').   .!~.    ",
-" .%@**>,{]^/(.   ._:.   ",
-" <&@[}}|%123.     .4.   ",
-".5@678|%920.      .ab.  ",
-".cd7e...1f.   .   .gh.  ",
-".ijb.  .k.   ..   .al.  ",
-".mn.   ..   .'.  .op5.  ",
-".qr.   .   .*s...at4u.  ",
-".vw.      .xyzyABCDEF.  ",
-" .G.     .p'B,@ixaH2I.  ",
-" .JK.   .LM@,>>MmNOP.   ",
-"  .F9.   .9|%Q|}7RS..   ",
-"   ..     .|R~~nJT..    ",
-"           .j~....      ",
-"            UO.         ",
-"             ..         ",
-"              .         ",
-"                        ",
-"                        "};
+static char * refresh_xpm[] = {
+"24 24 126 2",
+"       c None",
+".      c #000000",
+"+      c #F0FFEE",
+"@      c #CAE3C6",
+"#      c #F5FFF4",
+"$      c #0D110C",
+"%      c #729C6C",
+"&      c #A6CAA1",
+"*      c #CBE4C7",
+"=      c #EFFDEE",
+"-      c #172116",
+";      c #88B583",
+">      c #CCE5C8",
+",      c #CDE6C9",
+"'      c #CFE7CB",
+")      c #F3FFF2",
+"!      c #7FA879",
+"~      c #689063",
+"{      c #CDE5C9",
+"]      c #CFE7CA",
+"^      c #D0E9CC",
+"/      c #D4EAD0",
+"(      c #D5ECD1",
+"_      c #AED5A9",
+":      c #9ABC95",
+"<      c #63865F",
+"[      c #2B3A29",
+"}      c #8CB887",
+"|      c #70986A",
+"1      c #71986B",
+"2      c #729A6B",
+"3      c #759C6D",
+"4      c #759F6F",
+"5      c #76A170",
+"6      c #567453",
+"7      c #AFCBAC",
+"8      c #7EAB77",
+"9      c #78A472",
+"0      c #6F9669",
+"a      c #70976A",
+"b      c #71996B",
+"c      c #739B6D",
+"d      c #759F6E",
+"e      c #77A170",
+"f      c #526F4C",
+"g      c #B7D2B2",
+"h      c #60835B",
+"i      c #A5C9A0",
+"j      c #9AC195",
+"k      c #4F6B4C",
+"l      c #769F70",
+"m      c #516D4C",
+"n      c #B9D5B4",
+"o      c #7BA574",
+"p      c #C7E0C3",
+"q      c #6D9568",
+"r      c #51714E",
+"s      c #B6D3B2",
+"t      c #81AB7C",
+"u      c #C3DBBF",
+"v      c #6B9265",
+"w      c #C8EFC3",
+"x      c #A7CCA2",
+"y      c #B5D2B1",
+"z      c #80A87A",
+"A      c #90B68B",
+"B      c #79A674",
+"C      c #C6EAC1",
+"D      c #DEF7D9",
+"E      c #B3D7AE",
+"F      c #BBD9B8",
+"G      c #AFCCAB",
+"H      c #749E6D",
+"I      c #5B7B57",
+"J      c #8CB087",
+"K      c #BBE1B6",
+"L      c #DAF5D6",
+"M      c #E1F7DD",
+"N      c #DCF4D6",
+"O      c #D7F0D3",
+"P      c #CFECCB",
+"Q      c #C6E3C3",
+"R      c #BCD6B9",
+"S      c #7EA778",
+"T      c #64885F",
+"U      c #A6C1A3",
+"V      c #B3D5AE",
+"W      c #CDEAC9",
+"X      c #D0EBCB",
+"Y      c #CAE9C5",
+"Z      c #C7E6C3",
+"`      c #C3E3BF",
+" .     c #BDDCBA",
+"..     c #B5D2B2",
+"+.     c #96B991",
+"@.     c #76A071",
+"#.     c #3A4E37",
+"$.     c #5E7F5A",
+"%.     c #8FAF8B",
+"&.     c #9CBE97",
+"*.     c #C7E0C4",
+"=.     c #CBE3C6",
+"-.     c #CDE4C9",
+";.     c #CBE4C8",
+">.     c #C7E1C4",
+",.     c #C2DBBF",
+"'.     c #88AF82",
+").     c #6B9266",
+"!.     c #557451",
+"~.     c #63885E",
+"{.     c #759C70",
+"].     c #749E6F",
+"^.     c #72996B",
+"/.     c #739A6D",
+"(.     c #71996C",
+"_.     c #6E9668",
+":.     c #6C9367",
+"<.     c #5F815A",
+"[.     c #70996B",
+"}.     c #6E9467",
+"|.     c #698F63",
+"1.     c #6B9166",
+"2.     c #5D8059",
+"3.     c #4D6A49",
+"4.     c #6A8F64",
+"5.     c #283926",
+"              .                                 ",
+"              . .                               ",
+"              . + .                             ",
+"        . . . . @ # .                           ",
+"      $ % & @ @ * * = .           . .           ",
+"    - ; @ @ * * > , ' ) .       . ! ~ .         ",
+"  . % @ * * > { ] ^ / ( _ .       . : < .       ",
+"  [ & @ } | 1 2 3 4 5 6 .           . 7 .       ",
+". 8 @ 9 0 a b c d e f .             . g h .     ",
+". i j 0 k . . . l m .       .       . n o .     ",
+". p q h .     . r .       . .       . s t .     ",
+". u v .       . .       . w .     . x y z .     ",
+". A B .       .       . C D . . . E F G H .     ",
+". I J .             . K L M N O P Q R S T .     ",
+"  . U .           . V W X Y Z `  ...+.@.#..     ",
+"  . $.%..       . &.*.=., -.;.>.,.'.).!..       ",
+"    . ~.{..       . ].^.c /.(.| _.:.<.. .       ",
+"      . .           . [.}.|.~ 1.2.3.. .         ",
+"                      . q 4.. . . .             ",
+"                        5.)..                   ",
+"                          . .                   ",
+"                            .                   ",
+"                                                ",
+"                                                "};
diff --git a/etc/images/search-replace.pbm b/etc/images/search-replace.pbm
index 3e444cf7bb6..081d4cab7f1 100644
--- a/etc/images/search-replace.pbm
+++ b/etc/images/search-replace.pbm
diff --git a/etc/images/search-replace.xpm b/etc/images/search-replace.xpm
index 597337f047a..de180a16554 100644
--- a/etc/images/search-replace.xpm
+++ b/etc/images/search-replace.xpm
@@ -1,38 +1,270 @@
 /* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 8 1",
-"  c #01260126010f",
-". c #56004ef93434",
-"X c #5c9c5c9c57c7",
-"o c #8e8e7d7d4545",
-"O c #a72aa72a95e6",
-"+ c #d015d015b9c5",
-"@ c #e90de90dd2e3",
-"# c None",
-/* pixels */
-"########################",
-"################  ######",
-"###############  o #####",
-"########### ##  o ######",
-"#########  O   o #######",
-"#######  O@@  o ########",
-"#####  O+++  o #########",
-"###  O++++  o  #########",
-"## XX++++ .  @.#########",
-"## @.O+++  @@@@ ########",
-"## @@.++++@@@@@O #######",
-"## @@.O+O.  .O@@ #######",
-"## @XO+O.O++O.+@@ ######",
-"##  O++.O@@+OX.@@O #####",
-"## X+++ +#+OOO @@@+ ####",
-"## O++@ +@OOOO @@@O ####",
-"### +@@.OOOOOX.@@  #####",
-"### +@@O.OOOX  + #######",
-"####X@@@O.  .X  ########",
-"#### @@@@@@@+    #######",
-"##### @@@@@O ##   ######",
-"##### O@@+. ####   #####",
-"###### @O #######  #####",
-"#######  ###############"
-};
+static char * search_replace_xpm[] = {
+"24 24 243 2",
+"       c None",
+".      c #000000",
+"+      c #D3D3D3",
+"@      c #F6F6F6",
+"#      c #FFFFFF",
+"$      c #F9F9F9",
+"%      c #DADADA",
+"&      c #585858",
+"*      c #C7C7C7",
+"=      c #D1D1D1",
+"-      c #D6D6D6",
+";      c #BBBBBB",
+">      c #4B4B43",
+",      c #0A0A09",
+"'      c #47473F",
+")      c #B9B9B9",
+"!      c #FDFDFD",
+"~      c #C0C0C0",
+"{      c #E1E1E1",
+"]      c #F0F0F0",
+"^      c #9B9B9B",
+"/      c #353530",
+"(      c #8D8D7F",
+"_      c #C4C4AF",
+":      c #CFCFB9",
+"<      c #9D9D8D",
+"[      c #34342E",
+"}      c #A3A3A2",
+"|      c #F8F8F8",
+"1      c #AFAFAE",
+"2      c #E9E9E9",
+"3      c #DFDFDF",
+"4      c #8F8F8F",
+"5      c #4C4C44",
+"6      c #828274",
+"7      c #B2B29F",
+"8      c #C0C0AC",
+"9      c #EDEDE7",
+"0      c #E2E2D0",
+"a      c #9C9C8C",
+"b      c #46463F",
+"c      c #EAEAE9",
+"d      c #A2A2A1",
+"e      c #F4F4F4",
+"f      c #CFCFCF",
+"g      c #A2A2A2",
+"h      c #080807",
+"i      c #9C9C8F",
+"j      c #A6A695",
+"k      c #B5B5A2",
+"l      c #C3C3AE",
+"m      c #FBFBFA",
+"n      c #D5D5BF",
+"o      c #090908",
+"p      c #D5D5D4",
+"q      c #979797",
+"r      c #FAFAF9",
+"s      c #AEAEA3",
+"t      c #9B9B8B",
+"u      c #AAAA98",
+"v      c #B7B7A4",
+"w      c #DDDDD0",
+"x      c #CACAB5",
+"y      c #090909",
+"z      c #C1C1C0",
+"A      c #E1E0DF",
+"B      c #DCDBDA",
+"C      c #D3D2D0",
+"D      c #B7B7B5",
+"E      c #9E9D9C",
+"F      c #FBE73B",
+"G      c #F2B64D",
+"H      c #F7F7F6",
+"I      c #4C4C45",
+"J      c #CFCFCB",
+"K      c #ACACA1",
+"L      c #9F9F8E",
+"M      c #ADAD9B",
+"N      c #BABAA7",
+"O      c #929283",
+"P      c #474740",
+"Q      c #B9B8B8",
+"R      c #DCDCDA",
+"S      c #E1E1DF",
+"T      c #DAD9D7",
+"U      c #D7D7D5",
+"V      c #FCEB3D",
+"W      c #F7B544",
+"X      c #5D502C",
+"Y      c #F5F5F4",
+"Z      c #010101",
+"`      c #C3C3BE",
+" .     c #AEAEA2",
+"..     c #A0A090",
+"+.     c #878779",
+"@.     c #34342F",
+"#.     c #6D6D6D",
+"$.     c #B8B8B6",
+"%.     c #D9D9D7",
+"&.     c #EBEAE8",
+"*.     c #ECEBE9",
+"=.     c #FCE93B",
+"-.     c #F7B545",
+";.     c #6C5F34",
+">.     c #CACACA",
+",.     c #868585",
+"'.     c #414141",
+").     c #757574",
+"!.     c #A7A7A5",
+"~.     c #BDBDBB",
+"{.     c #DCDBD9",
+"].     c #E9E8E6",
+"^.     c #FAE43A",
+"/.     c #F4B244",
+"(.     c #605737",
+"_.     c #B5B5B3",
+":.     c #A9A9A8",
+"<.     c #A4A4A2",
+"[.     c #A2A1A0",
+"}.     c #A1A19F",
+"|.     c #A7A6A5",
+"1.     c #B5B4B3",
+"2.     c #CECDCB",
+"3.     c #E0DFDD",
+"4.     c #F9DF39",
+"5.     c #F3AF42",
+"6.     c #625637",
+"7.     c #66635C",
+"8.     c #787878",
+"9.     c #BCBCBA",
+"0.     c #B9B9B8",
+"a.     c #B7B6B5",
+"b.     c #B6B5B4",
+"c.     c #CFCECC",
+"d.     c #DFDFDD",
+"e.     c #F9DC38",
+"f.     c #EFB44D",
+"g.     c #665A32",
+"h.     c #9B9997",
+"i.     c #7C786F",
+"j.     c #6F6F6F",
+"k.     c #ACACAB",
+"l.     c #BABAB8",
+"m.     c #D2D2D0",
+"n.     c #D9D8D6",
+"o.     c #D7D6D4",
+"p.     c #DBDAD8",
+"q.     c #E1E0DE",
+"r.     c #F8D837",
+"s.     c #F0A93F",
+"t.     c #655930",
+"u.     c #9B9A97",
+"v.     c #ADACA9",
+"w.     c #8D897E",
+"x.     c #AAAAA8",
+"y.     c #B3B2B1",
+"z.     c #C9C8C7",
+"A.     c #E8E7E5",
+"B.     c #E6E5E2",
+"C.     c #F6D236",
+"D.     c #EDA43E",
+"E.     c #5C5130",
+"F.     c #989794",
+"G.     c #AAA9A6",
+"H.     c #C3C2BE",
+"I.     c #9A948A",
+"J.     c #BABABA",
+"K.     c #B1B1AF",
+"L.     c #C5C4C2",
+"M.     c #E4E3E1",
+"N.     c #E8E7E4",
+"O.     c #E0DFDC",
+"P.     c #D7AE74",
+"Q.     c #61562F",
+"R.     c #989895",
+"S.     c #A9A9A5",
+"T.     c #C2C1BD",
+"U.     c #D3D2CE",
+"V.     c #9F998E",
+"W.     c #CCCCCC",
+"X.     c #C7C6C3",
+"Y.     c #D7D6D3",
+"Z.     c #E2E1DE",
+"`.     c #E5E4E1",
+" +     c #E6E4E1",
+".+     c #E2E1DD",
+"++     c #4F4115",
+"@+     c #C1C0BC",
+"#+     c #D2D0CC",
+"$+     c #D7D5D1",
+"%+     c #9F998D",
+"&+     c #E7E7E7",
+"*+     c #DAD9D6",
+"=+     c #E3E2DE",
+"-+     c #E4E2DF",
+";+     c #E4E3DF",
+">+     c #E1E0DC",
+",+     c #DADAD6",
+"'+     c #969592",
+")+     c #9A9996",
+"!+     c #C2C0BC",
+"~+     c #D3D1CD",
+"{+     c #D8D6D2",
+"]+     c #9E988D",
+"^+     c #EBEBEB",
+"/+     c #E1DFDC",
+"(+     c #E0DFDB",
+"_+     c #DEDDD9",
+":+     c #D1D0CC",
+"<+     c #B2B1AE",
+"[+     c #A09F9D",
+"}+     c #A1A19E",
+"|+     c #AFAEAA",
+"1+     c #C3C1BD",
+"2+     c #D8D6D1",
+"3+     c #9D978B",
+"4+     c #E1DFDB",
+"5+     c #E0DEDA",
+"6+     c #DFDEDA",
+"7+     c #DCDBD7",
+"8+     c #D1CFCB",
+"9+     c #B6B6B2",
+"0+     c #B2B0AD",
+"a+     c #BFBDBA",
+"b+     c #CBC9C6",
+"c+     c #D5D3CF",
+"d+     c #DBD9D5",
+"e+     c #D7D6D1",
+"f+     c #D5D3CE",
+"g+     c #9B958A",
+"h+     c #999891",
+"i+     c #A39E92",
+"j+     c #A49E93",
+"k+     c #A39D92",
+"l+     c #A39D91",
+"m+     c #A09B8F",
+"n+     c #9D978C",
+"o+     c #969186",
+"p+     c #969085",
+"q+     c #9B9589",
+"r+     c #9E988C",
+"s+     c #9B968A",
+"t+     c #676359",
+"                                                ",
+"      . . . . . . . . . . . . .                 ",
+"    . + @ # # # # # # # # $ % & .               ",
+"    . @ # # # # # # # # # # * = - .             ",
+"    . # # # ; > , , ' ) ! ! ~ { ] ^ .           ",
+"    . # # ; / ( _ : < [ } | 1 2 # 3 4 .         ",
+"    . # # 5 6 7 8 9 0 a b c d ] # e f g .       ",
+"    . # ! h i j k l m n o p q . . . . . . .     ",
+"    . # r , s t u v w x y z A B C D E . F G .   ",
+"    . # H I J K L M N O P Q R S T U . V W X .   ",
+"    . # Y Z Z `  ...+.@.#.$.%.&.*.. =.-.;..     ",
+"    . >.Z Z ,.'., , > ).!.~.{.].. ^./.(.. .     ",
+"    . Z Z Z _.:.<.[.}.|.1.2.3.. 4.5.6.. 7..     ",
+"    Z Z . 8._.9.0.a.b.~.c.d.. e.f.g.. h.i..     ",
+"  Z Z Z j.k.l.m.n.o.o.p.q.. r.s.t.. u.v.w..     ",
+"  Z Z 4 x.y.z.d.A.A.B.A.. C.D.E.. F.G.H.I..     ",
+"    . J.K.L.T M.N.N.B.O.. P.Q.. R.S.T.U.V..     ",
+"    . W.X.Y.Z.B.`. +.+. ++. . R.S.@+#+$+%+.     ",
+"    . &+*+O.=+-+;+>+,+. . '+)+S.!+~+$+{+]+.     ",
+"    . ^+O./+>+(+.+_+:+<+[+}+|+1+~+$+2+$+3+.     ",
+"    . = 4+5+6+_+(+7+8+9+0+a+b+c+d+{+e+f+g+.     ",
+"    . h+i+j+k+l+k+m+n+o+p+q+V.r+%+n+n+s+t+.     ",
+"      . . . . . . . . . . . . . . . . . .       ",
+"                                                "};
diff --git a/etc/images/separator.xpm b/etc/images/separator.xpm
index 151f5dfe6eb..0c518fa7599 100644
--- a/etc/images/separator.xpm
+++ b/etc/images/separator.xpm
@@ -1,29 +1,30 @@
 /* XPM */
-static char * sep_xpm[] = {
-"1 24 2 1",
-"       c None s backgroundToolBarColor",
-".      c #776758",
-" ",
-" ",
-" ",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-".",
-" ",
-" ",
-" "};
+static char * separator_xpm[] = {
+"2 24 3 1",
+"       c None",
+".      c #DBD3CB",
+"+      c #FCFBFA",
+"  ",
+"  ",
+"  ",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+".+",
+"  ",
+"  ",
+"  "};
diff --git a/etc/images/show.pbm b/etc/images/show.pbm
index d86b1e6fe77..2d65dfb4027 100644
--- a/etc/images/show.pbm
+++ b/etc/images/show.pbm
diff --git a/etc/images/show.xpm b/etc/images/show.xpm
index 659226b8280..9f3f282fb24 100644
--- a/etc/images/show.xpm
+++ b/etc/images/show.xpm
@@ -1,33 +1,180 @@
 /* XPM */
-static char * mail_show_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 4 1",
-"       c None",
-".      c black",
-"X      c #ea03ea03d271",
-"o      c #a5d8a5d89550",
-/* pixels */
-"                        ",
-"                        ",
-"   ..................   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XoooooooooooooXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XoooooooooooooXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XooooooXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XoooooooooXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   .XXXXXXXXXXXXXXXX.   ",
-"   ..................   ",
-"                        ",
-"                        ",
-"                        "};
+static char * show_xpm[] = {
+"24 24 153 2",
+"       c None",
+".      c #000000",
+"+      c #0E0E0E",
+"@      c #282828",
+"#      c #616161",
+"$      c #D3D3D3",
+"%      c #F6F6F6",
+"&      c #FFFFFF",
+"*      c #F9F9F9",
+"=      c #F9F9F8",
+"-      c #E7E7E7",
+";      c #E4E4E4",
+">      c #CDCDCD",
+",      c #1F1F1F",
+"'      c #EFEFEE",
+")      c #AFAFAE",
+"!      c #E9E9E9",
+"~      c #B3B3B3",
+"{      c #383838",
+"]      c #C1C1C1",
+"^      c #B4B4B4",
+"/      c #A4A4A3",
+"(      c #F0F0F0",
+"_      c #F4F4F4",
+":      c #ABABAB",
+"<      c #050505",
+"[      c #FEFEFE",
+"}      c #FDFDFD",
+"|      c #FCFCFB",
+"1      c #FBFBFB",
+"2      c #F2F2F2",
+"3      c #9E9E9E",
+"4      c #C0C0C0",
+"5      c #BFBFBF",
+"6      c #BFBFBE",
+"7      c #BEBEBE",
+"8      c #BDBDBC",
+"9      c #BCBCBC",
+"0      c #B9B9B9",
+"a      c #A0A0A0",
+"b      c #B9B7B6",
+"c      c #838381",
+"d      c #848381",
+"e      c #6A6763",
+"f      c #FAFAF9",
+"g      c #F8F8F7",
+"h      c #F8F7F6",
+"i      c #F3F2F1",
+"j      c #E0E0DF",
+"k      c #DCDAD8",
+"l      c #CACAC8",
+"m      c #B6B6B4",
+"n      c #72706C",
+"o      c #BCBCBB",
+"p      c #BCBBBA",
+"q      c #BBBAB9",
+"r      c #BABAB9",
+"s      c #B9B8B7",
+"t      c #B6B6B5",
+"u      c #B6B5B3",
+"v      c #E5E4E2",
+"w      c #C4C3C0",
+"x      c #817D74",
+"y      c #F7F6F5",
+"z      c #F6F6F4",
+"A      c #F5F4F3",
+"B      c #F4F3F2",
+"C      c #EBEAE8",
+"D      c #E1DFDC",
+"E      c #8B867D",
+"F      c #B9B9B8",
+"G      c #B8B8B6",
+"H      c #B7B7B6",
+"I      c #B5B5B3",
+"J      c #B4B3B2",
+"K      c #B3B3B2",
+"L      c #ADADAB",
+"M      c #A49E93",
+"N      c #F6F5F4",
+"O      c #F5F5F3",
+"P      c #F3F3F1",
+"Q      c #F2F2F0",
+"R      c #F1F1EF",
+"S      c #F1F0EE",
+"T      c #EEEDEB",
+"U      c #ECEBE9",
+"V      c #E7E6E3",
+"W      c #E2E1DF",
+"X      c #E4E3E0",
+"Y      c #B8B7B6",
+"Z      c #B5B4B3",
+"`      c #B3B2B0",
+" .     c #B0AFAD",
+"..     c #ADADAA",
+"+.     c #ADACAA",
+"@.     c #E2E1DE",
+"#.     c #F0F0EE",
+"$.     c #EFEFED",
+"%.     c #F0EFED",
+"&.     c #EFEEEC",
+"*.     c #E8E7E5",
+"=.     c #E5E4E1",
+"-.     c #B3B3B1",
+";.     c #AFAEAC",
+">.     c #E1E0DC",
+",.     c #E0DFDB",
+"'.     c #A19C90",
+").     c #EDEDEB",
+"!.     c #EDECEA",
+"~.     c #E9E8E5",
+"{.     c #E6E4E1",
+"].     c #E3E2DE",
+"^.     c #DFDEDA",
+"/.     c #DEDDD9",
+"(.     c #DDDCD8",
+"_.     c #A19B90",
+":.     c #B0B0AE",
+"<.     c #AFADAB",
+"[.     c #E4E2DF",
+"}.     c #E2E1DD",
+"|.     c #DCDBD7",
+"1.     c #E6E5E2",
+"2.     c #E5E4E0",
+"3.     c #E4E3DF",
+"4.     c #DBD9D5",
+"5.     c #D9D7D3",
+"6.     c #9F998D",
+"7.     c #E3E2DF",
+"8.     c #DDDBD7",
+"9.     c #DCDAD6",
+"0.     c #D8D6D2",
+"a.     c #9E988D",
+"b.     c #EDEDED",
+"c.     c #E1E0DD",
+"d.     c #E0DEDA",
+"e.     c #D8D6D1",
+"f.     c #D7D5D1",
+"g.     c #9D978B",
+"h.     c #D1D1D1",
+"i.     c #E1DFDB",
+"j.     c #DEDCD8",
+"k.     c #D7D6D1",
+"l.     c #D5D3CE",
+"m.     c #9B958A",
+"n.     c #999891",
+"o.     c #A39E92",
+"p.     c #A39D92",
+"q.     c #A39D91",
+"r.     c #A29C90",
+"s.     c #A19B8F",
+"t.     c #9D978C",
+"u.     c #9B968A",
+"v.     c #676359",
+"                                                ",
+"      . . . . . . . . . . . . . + @ #           ",
+"    . $ % & & & & & & & & * = = - ; > ,         ",
+"    . % & & & & & & & & & & = ' ) ! & ~ {       ",
+"    . & & ] ] ] ] ] ] ] ] ] ] ^ / ( & _ : <     ",
+"    . & & & & & [ } | } | 1 = 2 3 . . . . .     ",
+"    . & & ] 4 5 6 7 8 7 8 9 9 0 a b c d e .     ",
+"    . & [ } | 1 f = g = g h = i j k l m n .     ",
+"    . & | 7 8 9 o p q p q r s t u u v w x .     ",
+"    . & f = g h y z A z A B B B B C D D E .     ",
+"    . & g p q r F s G s G H I J K L D D M .     ",
+"    . & N O B B P Q R Q R S T U V W X D M .     ",
+"    . & B Y H m I m u m u Z `  ...+.@.D M .     ",
+"    . & B i Q #.$.S %.S %.&.U *.=.X @.D M .     ",
+"    . & #.I I Z J -.-.-.-.`  .;.W >.>.,.'..     ",
+"    . & ).!.U U U C ~.C ~.~.=.{.].^./.(._..     ",
+"    . & C :.:. . . .;. .;.<.[.}.,.(.(.|._..     ",
+"    . & V 1.1.1.=.{.2.{.2.3.}.,./.|.4.5.6..     ",
+"    . * X 7.].[.3.}.].}.].>.>./.8.9.5.0.a..     ",
+"    . b.c.D >.,.}.,.>.,.>.^.d.8.9.5.e.f.g..     ",
+"    . h.i.d.^./.,./.d./.d.j.j.9.9.0.k.l.m..     ",
+"    . n.o.M p.q.p.'.r.'.r.s._.6.6.t.t.u.v..     ",
+"      . . . . . . . . . . . . . . . . . .       ",
+"                                                "};
diff --git a/etc/images/sort-ascending.xpm b/etc/images/sort-ascending.xpm
index 5a47e5c5ff0..7f5a8806e05 100644
--- a/etc/images/sort-ascending.xpm
+++ b/etc/images/sort-ascending.xpm
@@ -1,33 +1,61 @@
 /* XPM */
-static char * stock_sort_ascending_xpm[] = {
-"23 23 7 1",
+static char * sort_ascending_xpm[] = {
+"24 24 34 1",
 "       c None",
-".      c #314E6C",
-"+      c #000000",
-"@      c #D1DECF",
-"#      c #7DA377",
-"$      c #E4ECE3",
-"%      c #B3C9AF",
-"                       ",
-"   ....                ",
-"  ..  ..               ",
-"  ..  ..               ",
-"  ......               ",
-"  ..  ..               ",
-"  ..  ..               ",
-"                       ",
-"          +            ",
-"                       ",
-"            +          ",
-"                       ",
-"    +         +        ",
-"   +@+   +             ",
-"  +@##+ ++      ++++++ ",
-"   +###+$+         +++ ",
-"    +##%#+        +++  ",
-"     +%##+       +++   ",
-"    +$###+      +++    ",
-"   +++++++      ++++++ ",
-"                       ",
-"                       ",
-"                       "};
+".      c #000000",
+"+      c #FAFAFA",
+"@      c #DDDFD2",
+"#      c #8B8E7C",
+"$      c #E5E7DD",
+"%      c #84A77E",
+"&      c #586546",
+"*      c #81A57C",
+"=      c #EDEEE8",
+"-      c #81A57B",
+";      c #ECEDE6",
+">      c #7EA379",
+",      c #7DA377",
+"'      c #DDDFD3",
+")      c #7DA378",
+"!      c #C9D5C4",
+"~      c #7EA378",
+"{      c #7C7E73",
+"]      c #DFE7DE",
+"^      c #CCDACA",
+"/      c #90B08C",
+"(      c #76986D",
+"_      c #6C855E",
+":      c #22231E",
+"<      c #3F443B",
+"[      c #C8D8C7",
+"}      c #9DB89A",
+"|      c #76966B",
+"1      c #3D4237",
+"2      c #565B4E",
+"3      c #9EBA9A",
+"4      c #3C4237",
+"5      c #5E6154",
+"                        ",
+"                        ",
+"                        ",
+"               ....     ",
+"     .....    ..  ..    ",
+"     .+@#.    ..  ..    ",
+"     .$%&.    ......    ",
+"     .$*&.    ..  ..    ",
+"     .=-&.    ..  ..    ",
+"     .;-&.              ",
+"     .$*&.      ..      ",
+"     .$*&.      ..      ",
+"     .$>&.              ",
+"     .$,&.      ..      ",
+"     .')&.      ..      ",
+"   ...!~&...            ",
+"   .{]^/(_:.  ......    ",
+"    .<[}|1.      ...    ",
+"     .234.      ...     ",
+"      .5.      ...      ",
+"       .      ...       ",
+"              ......    ",
+"                        ",
+"                        "};
diff --git a/etc/images/sort-descending.xpm b/etc/images/sort-descending.xpm
index 90127ac11d3..dddb6edac44 100644
--- a/etc/images/sort-descending.xpm
+++ b/etc/images/sort-descending.xpm
@@ -1,33 +1,62 @@
 /* XPM */
-static char * stock_sort_descending_xpm[] = {
-"24 23 7 1",
+static char * sort_descending_xpm[] = {
+"24 24 35 1",
 "       c None",
 ".      c #000000",
-"+      c #D1DECF",
-"@      c #7DA377",
-"#      c #314E6C",
-"$      c #E4ECE3",
-"%      c #B3C9AF",
+"+      c #F8F0EE",
+"@      c #E5B9BB",
+"#      c #895F63",
+"$      c #E7BDBC",
+"%      c #C14B35",
+"&      c #922B34",
+"*      c #C24F3C",
+"=      c #942B32",
+"-      c #E8BFBE",
+";      c #E8C2BF",
+">      c #C34E3B",
+",      c #C24F3A",
+"'      c #C24D38",
+")      c #E5B8B9",
+"!      c #C24F38",
+"~      c #E2B1AA",
+"{      c #CC6B5A",
+"]      c #643C3E",
+"^      c #E3B5AC",
+"/      c #E3B3A9",
+"(      c #D07868",
+"_      c #982E19",
+":      c #7E261F",
+"<      c #120C0F",
+"[      c #2B1D1F",
+"}      c #DFAA9E",
+"|      c #D28575",
+"1      c #7D2617",
+"2      c #321C23",
+"3      c #3B262E",
+"4      c #D68A7A",
+"5      c #321C21",
+"6      c #3F2A35",
 "                        ",
 "                        ",
-"  ......                ",
-"     ...                ",
-"    ...                 ",
-"   ...                  ",
-"  ...                   ",
-"  ......                ",
-"          .             ",
-"                        ",
-"            .           ",
-"                        ",
-"    .         .         ",
-"   .+.   .              ",
-"  .+@@. ..       ####   ",
-"   .@@@.$.      ##  ##  ",
-"    .@@%@.      ##  ##  ",
-"     .%@@.      ######  ",
-"    .$@@@.      ##  ##  ",
-"   .......      ##  ##  ",
 "                        ",
+"              ......    ",
+"     .....       ...    ",
+"     .+@#.      ...     ",
+"     .$%&.     ...      ",
+"     .$*=.    ...       ",
+"     .-*=.    ......    ",
+"     .;>=.              ",
+"     .$*=.      ..      ",
+"     .$*=.      ..      ",
+"     .$,=.              ",
+"     .$'=.      ..      ",
+"     .)!=.      ..      ",
+"   ...~{=...            ",
+"   .]^/(_:<.   ....     ",
+"    .[}|12.   ..  ..    ",
+"     .345.    ..  ..    ",
+"      .6.     ......    ",
+"       .      ..  ..    ",
+"              ..  ..    ",
 "                        ",
 "                        "};
diff --git a/etc/images/widen.pbm b/etc/images/widen.pbm
deleted file mode 100644
index 2d9780b9959..00000000000
--- a/etc/images/widen.pbm
+++ /dev/null
diff --git a/etc/images/widen.xpm b/etc/images/widen.xpm
deleted file mode 100644
index 0b87fc9752e..00000000000
--- a/etc/images/widen.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * widen_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 3 1",
-"       c None",
-".      c #8d4d97577838",
-"X      c black",
-/* pixels */
-"                        ",
-"                        ",
-"                        ",
-"  .                  .  ",
-"  .                  .  ",
-"  .                  .  ",
-"  .                  .  ",
-"  .                  .  ",
-"  .   XX        XX   .  ",
-"  .  XX          XX  .  ",
-"  . XX            XX .  ",
-"  .XXXXXXXX  XXXXXXXX.  ",
-"  .XXXXXXXX  XXXXXXXX.  ",
-"  . XX            XX .  ",
-"  .  XX          XX  .  ",
-"  .   XX        XX   .  ",
-"  .                  .  ",
-"  .                  .  ",
-"  .                  .  ",
-"  .                  .  ",
-"  .                  .  ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/etc/images/zoom-in.xpm b/etc/images/zoom-in.xpm
new file mode 100644
index 00000000000..fff888216d9
--- /dev/null
+++ b/etc/images/zoom-in.xpm
@@ -0,0 +1,159 @@
+/* XPM */
+static char * zoom_in_xpm[] = {
+"24 24 132 2",
+"       c None",
+".      c #343434",
+"+      c #2D2D2D",
+"@      c #292929",
+"#      c #262626",
+"$      c #2E2E2E",
+"%      c #303030",
+"&      c #737373",
+"*      c #A1A1A1",
+"=      c #B4B4B4",
+"-      c #B2B2B2",
+";      c #9D9D9D",
+">      c #676767",
+",      c #202020",
+"'      c #1C1C1C",
+")      c #272727",
+"!      c #616161",
+"~      c #CACACA",
+"{      c #CFCFCF",
+"]      c #D0D0D0",
+"^      c #CECECE",
+"/      c #C9C9C9",
+"(      c #C1C1C1",
+"_      c #A7A7A7",
+":      c #4C4C4C",
+"<      c #131313",
+"[      c #222222",
+"}      c #757575",
+"|      c #D3D3D3",
+"1      c #DBDBDB",
+"2      c #E7E7E7",
+"3      c #EFEFEF",
+"4      c #F3F3F3",
+"5      c #F1F1F1",
+"6      c #E5E5E5",
+"7      c #D2D2D2",
+"8      c #BCBCBC",
+"9      c #5E5E5E",
+"0      c #101010",
+"a      c #212121",
+"b      c #5B5B5B",
+"c      c #CCCCCC",
+"d      c #D7D7D7",
+"e      c #F5F5F5",
+"f      c #FAFAFA",
+"g      c #FBFBFB",
+"h      c #F8F8F8",
+"i      c #F0F0F0",
+"j      c #E1E1E1",
+"k      c #C2C2C2",
+"l      c #434343",
+"m      c #0F0F0F",
+"n      c #1F1F1F",
+"o      c #B9B9B9",
+"p      c #D6D6D6",
+"q      c #F9F9F9",
+"r      c #FDFDFD",
+"s      c #454545",
+"t      c #F2F2F2",
+"u      c #ECECEC",
+"v      c #E4E4E4",
+"w      c #ABABAB",
+"x      c #0E0E0E",
+"y      c #1B1B1B",
+"z      c #6D6D6D",
+"A      c #FEFEFE",
+"B      c #FCFCFC",
+"C      c #EEEEEE",
+"D      c #E6E6E6",
+"E      c #575757",
+"F      c #090909",
+"G      c #141414",
+"H      c #A8A8A8",
+"I      c #D8D8D8",
+"J      c #F6F6F6",
+"K      c #F4F4F4",
+"L      c #DCDCDC",
+"M      c #9B9B9B",
+"N      c #060606",
+"O      c #111111",
+"P      c #C5C5C5",
+"Q      c #DFDFDF",
+"R      c #444444",
+"S      c #424242",
+"T      c #EDEDED",
+"U      c #BFBFBF",
+"V      c #C6C6C6",
+"W      c #E3E3E3",
+"X      c #414141",
+"Y      c #EAEAEA",
+"Z      c #E0E0E0",
+"`      c #BABABA",
+" .     c #050505",
+"..     c #0B0B0B",
+"+.     c #A5A5A5",
+"@.     c #D1D1D1",
+"#.     c #939393",
+"$.     c #020202",
+"%.     c #0A0A0A",
+"&.     c #5F5F5F",
+"*.     c #D9D9D9",
+"=.     c #EBEBEB",
+"-.     c #E9E9E9",
+";.     c #D4D4D4",
+">.     c #000000",
+",.     c #E2E2E2",
+"'.     c #3F3F3F",
+").     c #DADADA",
+"!.     c #CBCBCB",
+"~.     c #3B3B3B",
+"{.     c #D5D5D5",
+"].     c #C8C8C8",
+"^.     c #BDBDBD",
+"/.     c #515151",
+"(.     c #C7C7C7",
+"_.     c #CDCDCD",
+":.     c #B8B8B8",
+"<.     c #030303",
+"[.     c #313131",
+"}.     c #999999",
+"|.     c #BBBBBB",
+"1.     c #B6B6B6",
+"2.     c #909090",
+"3.     c #2B2B2B",
+"4.     c #010101",
+"5.     c #7A7A7A",
+"6.     c #9A9A9A",
+"7.     c #777777",
+"8.     c #3C3C3C",
+"9.     c #686868",
+"0.     c #797979",
+"a.     c #3A3A3A",
+"                                                ",
+"              . + @ # # #                       ",
+"          $ % & * = - ; > , '                   ",
+"        ) ! = ~ { ] ^ / ( _ : <                 ",
+"      [ } ~ | 1 2 3 4 5 6 7 8 9 0               ",
+"    a b c d 6 e f g f h e i j k l m             ",
+"    n o p 2 q g r s s g h t u v w x             ",
+"  y z 7 j e f r A s s B q e C D 1 E F           ",
+"  G H I C J q B A s s g h K C D L M N           ",
+"  O P Q 3 e R R s s s R l S T 6 1 U N           ",
+"  x V W u t l R R R R l S X Y Z d `  .          ",
+"  ..+.j 2 T 5 K J l l 4 3 u v 1 @.#.$.          ",
+"  %.&.*.j D =.C 3 X X T -.v 1 ;.~ : >.          ",
+"    %.= I L ,.6 D '.'.W Q ).;.!.* $.            ",
+"    N ~.c 7 ;.).1 ).1 I {.] ].^.$ >.            ",
+"       ./.k (.!.c _.!.!.].k :.s >.              ",
+"        <.[.}.|.^.8 8 8 1.2.3.>.>.>.            ",
+"          4.<.X 5.6.6.7.8.>.>.  >.>.>.>.        ",
+"              >.>.>.>.>.>.        , , >.>.      ",
+"                                  >.9.. >.>.    ",
+"                                    >.0.a.>.>.  ",
+"                                      >.9.n >.  ",
+"                                        >.>.    ",
+"                                                "};
diff --git a/etc/images/zoom-out.pbm b/etc/images/zoom-out.pbm
new file mode 100644
index 00000000000..4957d712114
--- /dev/null
+++ b/etc/images/zoom-out.pbm
diff --git a/etc/images/zoom-out.xpm b/etc/images/zoom-out.xpm
new file mode 100644
index 00000000000..884f2539775
--- /dev/null
+++ b/etc/images/zoom-out.xpm
@@ -0,0 +1,158 @@
+/* XPM */
+static char * zoom_out_xpm[] = {
+"24 24 131 2",
+"       c None",
+".      c #343434",
+"+      c #2D2D2D",
+"@      c #292929",
+"#      c #262626",
+"$      c #2E2E2E",
+"%      c #303030",
+"&      c #737373",
+"*      c #A1A1A1",
+"=      c #B4B4B4",
+"-      c #B2B2B2",
+";      c #9D9D9D",
+">      c #676767",
+",      c #202020",
+"'      c #1C1C1C",
+")      c #272727",
+"!      c #616161",
+"~      c #CACACA",
+"{      c #CFCFCF",
+"]      c #D0D0D0",
+"^      c #CECECE",
+"/      c #C9C9C9",
+"(      c #C1C1C1",
+"_      c #A7A7A7",
+":      c #4C4C4C",
+"<      c #131313",
+"[      c #222222",
+"}      c #757575",
+"|      c #D3D3D3",
+"1      c #DBDBDB",
+"2      c #E7E7E7",
+"3      c #EFEFEF",
+"4      c #F3F3F3",
+"5      c #F1F1F1",
+"6      c #E5E5E5",
+"7      c #D2D2D2",
+"8      c #BCBCBC",
+"9      c #5E5E5E",
+"0      c #101010",
+"a      c #212121",
+"b      c #5B5B5B",
+"c      c #CCCCCC",
+"d      c #D7D7D7",
+"e      c #F5F5F5",
+"f      c #FAFAFA",
+"g      c #FBFBFB",
+"h      c #F8F8F8",
+"i      c #F0F0F0",
+"j      c #E1E1E1",
+"k      c #C2C2C2",
+"l      c #434343",
+"m      c #0F0F0F",
+"n      c #1F1F1F",
+"o      c #B9B9B9",
+"p      c #D6D6D6",
+"q      c #F9F9F9",
+"r      c #FDFDFD",
+"s      c #FCFCFC",
+"t      c #F2F2F2",
+"u      c #ECECEC",
+"v      c #E4E4E4",
+"w      c #ABABAB",
+"x      c #0E0E0E",
+"y      c #1B1B1B",
+"z      c #6D6D6D",
+"A      c #FEFEFE",
+"B      c #EEEEEE",
+"C      c #E6E6E6",
+"D      c #575757",
+"E      c #090909",
+"F      c #141414",
+"G      c #A8A8A8",
+"H      c #D8D8D8",
+"I      c #F6F6F6",
+"J      c #F4F4F4",
+"K      c #DCDCDC",
+"L      c #9B9B9B",
+"M      c #060606",
+"N      c #111111",
+"O      c #C5C5C5",
+"P      c #DFDFDF",
+"Q      c #444444",
+"R      c #454545",
+"S      c #424242",
+"T      c #EDEDED",
+"U      c #BFBFBF",
+"V      c #C6C6C6",
+"W      c #E3E3E3",
+"X      c #414141",
+"Y      c #EAEAEA",
+"Z      c #E0E0E0",
+"`      c #BABABA",
+" .     c #050505",
+"..     c #0B0B0B",
+"+.     c #A5A5A5",
+"@.     c #D1D1D1",
+"#.     c #939393",
+"$.     c #020202",
+"%.     c #0A0A0A",
+"&.     c #5F5F5F",
+"*.     c #D9D9D9",
+"=.     c #EBEBEB",
+"-.     c #E9E9E9",
+";.     c #D4D4D4",
+">.     c #000000",
+",.     c #E2E2E2",
+"'.     c #DADADA",
+").     c #CBCBCB",
+"!.     c #3B3B3B",
+"~.     c #D5D5D5",
+"{.     c #C8C8C8",
+"].     c #BDBDBD",
+"^.     c #515151",
+"/.     c #C7C7C7",
+"(.     c #CDCDCD",
+"_.     c #B8B8B8",
+":.     c #030303",
+"<.     c #313131",
+"[.     c #999999",
+"}.     c #BBBBBB",
+"|.     c #B6B6B6",
+"1.     c #909090",
+"2.     c #2B2B2B",
+"3.     c #010101",
+"4.     c #7A7A7A",
+"5.     c #9A9A9A",
+"6.     c #777777",
+"7.     c #3C3C3C",
+"8.     c #686868",
+"9.     c #797979",
+"0.     c #3A3A3A",
+"                                                ",
+"              . + @ # # #                       ",
+"          $ % & * = - ; > , '                   ",
+"        ) ! = ~ { ] ^ / ( _ : <                 ",
+"      [ } ~ | 1 2 3 4 5 6 7 8 9 0               ",
+"    a b c d 6 e f g f h e i j k l m             ",
+"    n o p 2 q g r r s g h t u v w x             ",
+"  y z 7 j e f r A A r s q e B C 1 D E           ",
+"  F G H B I q s A A r g h J B C K L M           ",
+"  N O P 3 e Q Q R R R Q l S T 6 1 U M           ",
+"  x V W u t l Q Q Q Q l S X Y Z d `  .          ",
+"  ..+.j 2 T 5 J I I e 4 3 u v 1 @.#.$.          ",
+"  %.&.*.j C =.B 3 3 B T -.v 1 ;.~ : >.          ",
+"    %.= H K ,.6 C C 2 W P '.;.).* $.            ",
+"    M !.c 7 ;.'.1 '.1 H ~.] {.].$ >.            ",
+"       .^.k /.).c (.).).{.k _.R >.              ",
+"        :.<.[.}.].8 8 8 |.1.2.>.>.>.            ",
+"          3.:.X 4.5.5.6.7.>.>.  >.>.>.>.        ",
+"              >.>.>.>.>.>.        , , >.>.      ",
+"                                  >.8.. >.>.    ",
+"                                    >.9.0.>.>.  ",
+"                                      >.8.n >.  ",
+"                                        >.>.    ",
+"                                                "};
diff --git a/etc/termcap.src b/etc/termcap.src
index d656d02845c..def2df31ec9 100644
--- a/etc/termcap.src
+++ b/etc/termcap.src
@@ -18,7 +18,7 @@
 #
 # Please e-mail changes to terminfo@thyrsus.com; the old termcap@berkeley.edu
 # address is no longer valid.  The latest version can always be found at
-# <http://www.tuxedo.org/terminfo>.
+# <http://catb.org/esr/terminfo/termtypes.ti.gz>.
 #
 # PURPOSE OF THIS FILE:
 #
@@ -34,7 +34,7 @@
 # termcap/terminfo versions.
 #
 # Pointers to related resources (including the ncurses distribution) may
-# be found at <http://www.tuxedo.org/terminfo>.
+# be found at <http://catb.org/esr/terminfo/termtypes.ti.gz>.
 #
 # INTERNATIONALIZATION:
 #
@@ -2200,7 +2200,7 @@ crt|crt-vt220|CRT 2.3 emulating VT220:\
         :st=\EH:u6=\E[%i%d;%dR:u7=\E[6n:u8=\E[?1;2c:u9=\E[c:\
         :tc=vt220:tc=ecma+color:
 
-# PuTTY 0.51 (released 14 December 2000)
+# PuTTY 0.58 (released 05 April 2005)
 # http://www.chiark.greenend.org.uk/~sgtatham/putty/
 #
 # This emulates vt100 + vt52 (plus a few vt220 features:  ech, SRM, DECTCEM, as
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f59f7296359..72ff56c2dfd 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * b2m.c: Include <limits.h>.
+        (TM_YEAR_IN_ASCTIME_RANGE): New macro.
+        (main): Check for out-of-range time stamps.
+        * fakemail.c: Likewise.
+
 2006-03-18  Andre Spiegel  <spiegel@gnu.org>
 
         * vcdiff: Use "echo" as a default for $echo, otherwise we'll
diff --git a/lib-src/b2m.c b/lib-src/b2m.c
index 5bebe560e2a..adaa736bcd9 100644
--- a/lib-src/b2m.c
+++ b/lib-src/b2m.c
@@ -26,6 +26,7 @@
 #undef static
 #endif
 
+#include <limits.h>
 #include <stdio.h>
 #include <time.h>
 #include <sys/types.h>
@@ -44,6 +45,17 @@
 
 typedef int logical;
 
+/* True if TM_YEAR is a struct tm's tm_year value that is acceptable
+   to asctime.  Glibc asctime returns a useful string unless TM_YEAR
+   is nearly INT_MAX, but the C Standard lets C libraries overrun a
+   buffer if TM_YEAR needs more than 4 bytes.  */
+#ifdef __GLIBC__
+# define TM_YEAR_IN_ASCTIME_RANGE(tm_year) ((tm_year) <= INT_MAX - 1900)
+#else
+# define TM_YEAR_IN_ASCTIME_RANGE(tm_year) \
+    (-999 - 1900 <= (tm_year) && (tm_year) <= 9999 - 1900)
+#endif
+
 /*
  * A `struct linebuffer' is a structure which holds a line of text.
  * `readline' reads a line from a stream into a linebuffer and works
@@ -87,6 +99,7 @@ main (argc, argv)
 {
   logical labels_saved, printing, header;
   time_t ltoday;
+  struct tm *tm;
   char *labels, *p, *today;
   struct linebuffer data;
 
@@ -131,7 +144,13 @@ main (argc, argv)
 
   labels_saved = printing = header = FALSE;
   ltoday = time (0);
-  today = ctime (&ltoday);
+  /* Convert to a string, checking for out-of-range time stamps.
+     Don't use 'ctime', as that might dump core if the hardware clock
+     is set to a bizarre value.  */
+  tm = localtime (&ltoday);
+  if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year)))
+    fatal ("current time is out of range");
+  today = asctime (tm);
   data.size = 200;
   data.buffer = xnew (200, char);
 
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index c8bfcfc0931..2c2b462e366 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -53,6 +53,7 @@ main ()
 #include "ntlib.h"
 #endif
 
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -70,6 +71,17 @@ main ()
 #define true 1
 #define false 0
 
+/* True if TM_YEAR is a struct tm's tm_year value that is acceptable
+   to asctime.  Glibc asctime returns a useful string unless TM_YEAR
+   is nearly INT_MAX, but the C Standard lets C libraries overrun a
+   buffer if TM_YEAR needs more than 4 bytes.  */
+#ifdef __GLIBC__
+# define TM_YEAR_IN_ASCTIME_RANGE(tm_year) ((tm_year) <= INT_MAX - 1900)
+#else
+# define TM_YEAR_IN_ASCTIME_RANGE(tm_year) \
+    (-999 - 1900 <= (tm_year) && (tm_year) <= 9999 - 1900)
+#endif
+
 /* Various lists */
 
 struct line_record
@@ -354,6 +366,7 @@ make_file_preface ()
 {
   char *the_string, *temp;
   long idiotic_interface;
+  struct tm *tm;
   long prefix_length;
   long user_length;
   long date_length;
@@ -361,7 +374,13 @@ make_file_preface ()
 
   prefix_length = strlen (FROM_PREFIX);
   time (&idiotic_interface);
-  the_date = ctime (&idiotic_interface);
+  /* Convert to a string, checking for out-of-range time stamps.
+     Don't use 'ctime', as that might dump core if the hardware clock
+     is set to a bizarre value.  */
+  tm = localtime (&idiotic_interface);
+  if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year)))
+    fatal ("current time is out of range", 0);
+  the_date = asctime (tm);
   /* the_date has an unwanted newline at the end */
   date_length = strlen (the_date) - 1;
   the_date[date_length] = '\0';
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acfc4975c54..ae6a6ae4c31 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,134 @@
+2006-03-30  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * term/mac-win.el (mac-system-coding-system): Define and use after
+        Mac-specific coding systems are ready.
+
+2006-03-27  Romain Francoise  <romain@orebokech.com>
+
+        * net/rcirc.el (rcirc-connect): Add autoload cookie.
+
+        * ldefs-boot.el: Update.
+
+2006-03-27  Daiki Ueno  <ueno@unixuser.org>
+
+        * pgg-gpg.el: Invoke gpg asynchronous, to avoid querying for
+        passphrases when it is not needed.
+        (pgg-gpg-use-agent): Add, to hard code that pgg shouldn't wait for
+        passphrase stuff from gpg, should only be necessary when you use
+        gpg with a smartcard.
+
+2006-03-27  Nick Roberts  <nickrob@snap.net.nz>
+
+        * comint.el (comint-dynamic-list-completions): Allow user to
+        select *Completions* buffer.
+
+2006-03-27  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-get-level-face): Fix bug with level
+        counting.
+
+2006-03-26  Andreas Schwab  <schwab@suse.de>
+
+        * progmodes/gud.el (gdb): Only complain about multiple debugging
+        when the gdb process is still running.
+
+2006-03-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/rmail.el (tool-bar-map): Defvar it.
+        (rmail-tool-bar-map): Tool-bar buttons for Rmail.
+        (rmail-perm-variables): Make rmail-tool-bar-map a local variable.
+
+2006-03-25  Sven Joachim  <svenjoac@gmx.de>  (tiny change)
+
+        * help.el (print-help-return-message): Suggest to use
+        display-buffer instead of switch-to-buffer-other-window to restore
+        the previous window without selecting it.
+
+2006-03-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * frame.el (select-frame-by-name): Call x-focus-frame also when
+        window-system is mac.
+
+        * term/mac-win.el: Adjust Courier font specifications in
+        x-fixed-font-alist.
+        (mac-select-convert-to-string): Use utf-16be-mac or utf-16le-mac
+        when directly encoding to UTF-16 in native byte order, no BOM.
+
+2006-03-25  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-base.el (cua-rectangle-mark-key): New defcustom.
+        (cua--init-keymaps): Use it instead of fixed C-return.
+        (cua-mode): Set after it.
+
+        * emulation/cua-rect.el (cua--init-rectangles): Use
+        cua-rectangle-mark-key instead of fixed C-return.
+
+2006-03-25  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdba): Revert 2006-03-10 change for case of
+        "run" in .gdbinit.
+        (gdb-var-create-regexp): Remove "^done" prefix for gdb-mi.el.
+
+2006-03-24  Romain Francoise  <romain@orebokech.com>
+
+        * files.el (ctl-x-5-map): Really bind C-x 5 C-o to
+        `display-buffer-other-frame'.
+
+2006-03-24  Kim F. Storm  <storm@cua.dk>
+
+        * apropos.el (apropos-synonyms): Add selection => region.
+
+2006-03-24  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-var-create-regexp)
+        (gdb-var-list-children-regexp, gdb-var-update-regexp)
+        (gdb-var-list-children-regexp-1, gdb-var-update-regexp-1)
+        (gdb-data-list-register-values-regexp)
+        (gdb-stack-list-locals-regexp, gdb-stack-list-locals-handler):
+        Future proof against new fields being added to MI output.
+        (gdb-send): Don't treat backslashes for program input as
+        continuations.
+        (gdb-assembler-handler): Don't use window-start for this handler.
+        (gdb-frame-handler): Don't change to hollow arrow if overlay
+        arrow doesn't move to new frame.
+
+2006-03-24  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-continuation): Declare earlier to
+        prevent compiler warnings.
+        (gdb-stopped): Check for gud-last-last-frame (case: signal).
+        (breakpoint-disabled): Make lighter for contrast with overlay
+        arrow.
+        (gdb-assembler-custom): Use hollow-right-triangle for assembler
+        buffer too.
+
+2006-03-23  Reiner Steib  <reinersteib+gmane@imap.cc>
+
+        * pgg-gpg.el (pgg-gpg-update-agent): Check for
+        make-network-process, so we can use the same code in Gnus v5-10
+        too and have this file fully synchronized with that release.
+
+2006-03-23  Romain Francoise  <romain@orebokech.com>
+
+        * ibuf-ext.el (ibuffer-read-filter-group-name):
+        Use `ibuffer-generate-filter-groups' to make completion list match
+        the filter groups that are really displayed in the Ibuffer buffer.
+        (ibuffer-generate-filter-groups): Add new args noempty, nodefault.
+
+2006-03-23  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el (sort-coding-systems): Describe that
+        the argument is modified in docstring.
+
+2006-03-22  Sascha Wilde  <wilde@sha-bang.de>
+
+        * pgg-gpg.el (pgg-gpg-use-agent): Disable by default.
+        (pgg-gpg-update-agent): New function.
+        (pgg-gpg-use-agent-p): New function.
+        (pgg-gpg-process-region, pgg-gpg-encrypt-region)
+        (pgg-gpg-encrypt-symmetric-region, pgg-gpg-decrypt-region)
+        (pgg-gpg-sign-region): Use it.
+
 2006-03-21  Chong Yidong  <cyd@stupidchicken.com>
 
         * cus-edit.el (custom-face-set): Call custom-push-theme before
@@ -22,7 +153,7 @@
 
 2006-03-21  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el: (org-open-at-point): Fixed bug in wiki-style
+        * textmodes/org.el (org-open-at-point): Fix bug in wiki-style
         bracket links.
 
 2006-03-21  Kim F. Storm  <storm@cua.dk>
@@ -187,7 +318,7 @@
         (gdb-force-mode-line-update): New function.
         (gdb-resync, gdb-starting, gdb-signal, gdb-exited, gdb-stopped)
         (gdb-exited): Use them.
-        (gdb-signal): New fuction.
+        (gdb-signal): New function.
         (gdb-annotation-rules): Provide a rule for it.
 
 2006-03-16  Kenichi Handa  <handa@m17n.org>
@@ -223,7 +354,7 @@
 2006-03-15  Bill Wohler  <wohler@newt.com>
 
         * image.el (image-load-path-for-library): Fix example by not
-        recommending that one binds image-load-path. Just defvar it to
+        recommending that one binds image-load-path.  Just defvar it to
         placate compiler and only use it if previously defined.
 
 2006-03-15  Carsten Dominik  <dominik@science.uva.nl>
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 3333981c5e5..b490b8173ba 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -168,7 +168,8 @@ If value is `verbose', the computed score is shown for each match."
 (defvar apropos-synonyms '(
   ("find" "open" "edit")
   ("kill" "cut")
-  ("yank" "paste"))
+  ("yank" "paste")
+  ("region" "selection"))
   "List of synonyms known by apropos.
 Each element is a list of words where the first word is the standard emacs
 term, and the rest of the words are alternative terms.")
diff --git a/lisp/comint.el b/lisp/comint.el
index 0cae078f481..5ab00354f80 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2942,10 +2942,9 @@ Typing SPC flushes the help buffer."
           (progn
             (mouse-choose-completion first)
             (set-window-configuration comint-dynamic-list-completions-config))
-        (unless (eq first ?\s)
-          (setq unread-command-events (listify-key-sequence key)))
-        (unless (eq first ?\t)
-          (set-window-configuration comint-dynamic-list-completions-config))))))
+        (if (eq first ?\s)
+            (set-window-configuration comint-dynamic-list-completions-config)
+          (setq unread-command-events (listify-key-sequence key)))))))
 
 
 (defun comint-get-next-from-history ()
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index d18567580aa..0d38ba03241 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -51,7 +51,8 @@ files.")
      "<Daniel.Pfeiffer@Informatik.START.dbp.de>")
     ("David Gillespie" "Dave Gillespie")
     ("David K,Ae(Bgedal" "David K..edal")
-    ("David M. Koppelman" "David M. Koppelman, Koppel@Ee.Lsu.Edu")
+    ("David M. Koppelman" "David M. Koppelman, Koppel@Ee.Lsu.Edu"
+     "David Koppelman")
     ("David M. Smith" "David Smith" "David M Smith")
     ("Ed L. Cashin" "Ed L Cashin")
     ("Edward M. Reingold" "Ed Reingold" "Edward M Reingold"
@@ -79,6 +80,7 @@ files.")
     ("Jay K. Adams" "jka@ece.cmu.edu" "Jay Adams")
     ("J,Ai(Br,At(Bme Marant" "J,bi(Br,bt(Bme Marant" "Jerome Marant")
     ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen")
+    ("Jeremy Bertram Maitin-Shepard" "Jeremy Maitin-Shepard")
     ("Johan Bockg,Ae(Brd" "Johan Bockgard")
     ("John W. Eaton" "John Eaton")
     ("Jonathan I. Kamens" "Jonathan Kamens")
@@ -163,7 +165,7 @@ listed.")
   '("external-lisp"
     "lock" "share-lib" "local-lisp"
     "noleim-Makefile.in"
-    "NEWS" "PROBLEMS" "FAQ")
+    "NEWS" "PROBLEMS" "FAQ" "AUTHORS")
   "List of files and directories to ignore.
 Changes to files in this list are not listed.")
 
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 594e9617501..e99a280c555 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -370,6 +370,22 @@ and after the region marked by the rectangle to search."
                  (other :tag "Enabled" t))
   :group 'cua)
 
+(defcustom cua-rectangle-mark-key [(control return)]
+  "Global key used to toggle the cua rectangle mark."
+  :set #'(lambda (symbol value)
+           (set symbol value)
+           (when (and (boundp 'cua--keymaps-initalized)
+                      cua--keymaps-initalized)
+             (define-key cua-global-keymap value
+               'cua-set-rectangle-mark)
+             (when (boundp 'cua--rectangle-keymap)
+               (define-key cua--rectangle-keymap value
+                 'cua-clear-rectangle-mark)
+               (define-key cua--region-keymap value
+                 'cua-toggle-rectangle-mark))))
+  :type 'key-sequence
+  :group 'cua)
+
 (defcustom cua-rectangle-modifier-key 'meta
   "*Modifier key used for rectangle commands bindings.
 On non-window systems, always use the meta modifier.
@@ -1275,7 +1291,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
             cua-rectangle-modifier-key
           'meta))
   ;; C-return always toggles rectangle mark
-  (define-key cua-global-keymap [(control return)]      'cua-set-rectangle-mark)
+  (define-key cua-global-keymap cua-rectangle-mark-key  'cua-set-rectangle-mark)
   (unless (eq cua--rectangle-modifier-key 'meta)
     (cua--M/H-key cua-global-keymap ?\s                 'cua-set-rectangle-mark)
     (define-key cua-global-keymap
@@ -1401,7 +1417,8 @@ only want to highlight the region when it is selected using a
 shifted movement key, set `cua-highlight-region-shift-only'."
   :global t
   :group 'cua
-  :set-after '(cua-enable-modeline-indications cua-rectangle-modifier-key)
+  :set-after '(cua-enable-modeline-indications
+               cua-rectangle-mark-key cua-rectangle-modifier-key)
   :require 'cua-base
   :link '(emacs-commentary-link "cua-base.el")
   (setq mark-even-if-inactive t)
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 33b38552595..53056d667fb 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -1413,8 +1413,8 @@ With prefix arg, indent to that column."
   (cua--M/H-key cua--rectangle-keymap key cmd))
 
 (defun cua--init-rectangles ()
-  (define-key cua--rectangle-keymap [(control return)] 'cua-clear-rectangle-mark)
-  (define-key cua--region-keymap    [(control return)] 'cua-toggle-rectangle-mark)
+  (define-key cua--rectangle-keymap cua-rectangle-mark-key 'cua-clear-rectangle-mark)
+  (define-key cua--region-keymap    cua-rectangle-mark-key 'cua-toggle-rectangle-mark)
   (unless (eq cua--rectangle-modifier-key 'meta)
     (cua--rect-M/H-key ?\s                             'cua-clear-rectangle-mark)
     (cua--M/H-key cua--region-keymap ?\s               'cua-toggle-rectangle-mark))
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 92f8c401336..5781a442c08 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,8 +1,37 @@
-2006-02-19  Michael Olson  <mwolson@gnu.org>
+2006-03-26  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el (erc-header-line): New face that will be used to colorize
+        the text of the header-line, provided that
+        `erc-header-line-face-method' is non-nil.
+        (erc-prompt-face): Fix formatting.
+        (erc-header-line-face-method): New option that determines the
+        method used for colorizing header-line text.  This may be a
+        function, nil, or non-nil.
+        (erc-update-mode-line-buffer): Use the aforementioned option and
+        face to colorize the header-line text, if that is what the user
+        wants.
+        (erc-send-input): If flood control is not activated, don't split
+        the input line.
+
+2006-03-25  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati
+        that fixes the case where there is no leading whitespace.  Only
+        remove the first space character, though.
+
+        * erc-identd.el (erc-identd-start): Fix a bug by making sure that
+        erc-identd-process is set properly.
+        (erc-identd-start, erc-identd-stop): Add autoload cookies.
+        (erc-identd-start): Pass :host parameter so this works with Emacs
+        22.
+
+2006-03-09  Diane Murray  <disumu@x3y2z1.net>
+
+        * erc-button.el (erc-button-keymap): Use <backtab> rather than
+        <C-tab> for `erc-button-previous' as it is a more standard key
+        binding for this type of function.
 
-        * erc-capab.el (erc-capab-send-identify-messages): Make sure some
-        parameters are strings before using them.  Thanks to Alejandro
-        Benitez for the report.
+2006-02-19  Michael Olson  <mwolson@gnu.org>
 
         * erc.el (erc-version-string): Release ERC 5.1.2.
 
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 2ec625cc87f..13e2a384735 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -216,7 +216,7 @@ PAR is a number of a regexp grouping whose text will be passed to
         (define-key map (kbd "<button2>") 'erc-button-click-button)
       (define-key map (kbd "<mouse-2>") 'erc-button-click-button))
     (define-key map (kbd "TAB") 'erc-button-next)
-    (define-key map (kbd "<C-tab>") 'erc-button-previous)
+    (define-key map (kbd "<backtab>") 'erc-button-previous)
     (set-keymap-parent map erc-mode-map)
     map)
   "Local keymap for ERC buttons.")
diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el
index e0ccfb40497..0f70aab0fbd 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -46,6 +46,7 @@
                              system-type (user-login-name)))
         (process-send-eof erc-identd-process)))))
 
+;;;###autoload
 (defun erc-identd-start (&optional port)
   "Start an identd server listening to port 8113.
 Port 113 (auth) will need to be redirected to port 8113 on your
@@ -60,15 +61,14 @@ system."
         (setq port (string-to-number port))))
   (if erc-identd-process
       (delete-process erc-identd-process))
-  (if (fboundp 'make-network-process)
-      (setq erc-identd-process
-            (make-network-process :name "identd"
-                                  :buffer (generate-new-buffer "identd")
-                                  :service port :server t :noquery t
-                                  :filter 'erc-identd-filter))
-    (open-network-stream-server "identd" (generate-new-buffer "identd")
-                                port nil 'erc-identd-filter)))
-
+  (setq erc-identd-process
+        (make-network-process :name "identd"
+                              :buffer (generate-new-buffer "identd")
+                              :host 'local :service port
+                              :server t :noquery t
+                              :filter 'erc-identd-filter)))
+
+;;;###autoload
 (defun erc-identd-stop (&rest ignore)
   (interactive)
   (when erc-identd-process
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 63ff60d762e..63aac8a625e 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1116,12 +1116,19 @@ which the local user typed."
   "ERC face used for messages you receive in the main erc buffer."
   :group 'erc-faces)
 
+(defface erc-header-line
+  '((t (:foreground "grey20" :background "grey90")))
+  "ERC face used for the header line.
+
+This will only be used if `erc-header-line-face-method' is non-nil."
+  :group 'erc-faces)
+
 (defface erc-input-face '((t (:foreground "brown")))
   "ERC face used for your input."
   :group 'erc-faces)
 
 (defface erc-prompt-face
-  '((t (:bold t :foreground "Black" :background"lightBlue2")))
+  '((t (:bold t :foreground "Black" :background "lightBlue2")))
   "ERC face for the prompt."
   :group 'erc-faces)
 
@@ -2996,7 +3003,7 @@ Otherwise leave the channel indicated by LINE."
 All the text given as argument is sent to the sever as unmodified,
 just as you provided it.  Use this command with care!"
   (cond
-   ((string-match "^\\s-\\(.+\\)$" line)
+   ((string-match "^ ?\\(.+\\)$" line)
     (erc-server-send (match-string 1 line)))
    (t nil)))
 (put 'erc-cmd-QUOTE 'do-not-parse-args t)
@@ -4850,7 +4857,8 @@ This returns non-nil only iff we actually send anything."
                   (erc-display-msg line)
                   (erc-process-input-line (concat line "\n")
                                           (null erc-flood-protect) t))
-                (erc-split-line line)))
+                (or (and erc-flood-protect (erc-split-line line))
+                    (list line))))
              (split-string str "\n"))
           ;; Insert the prompt along with the command.
           (erc-display-command str)
@@ -5616,6 +5624,17 @@ when you move point into the header line."
   :group 'erc-mode-line-and-header
   :type 'boolean)
 
+(defcustom erc-header-line-face-method nil
+  "Determine what method to use when colorizing the header line text.
+
+If nil, don't colorize the header text.
+If given a function, call it and use the resulting face name.
+Otherwise, use the `erc-header-line' face."
+  :group 'erc-mode-line-and-header
+  :type '(choice (const :tag "Don't colorize" nil)
+                 (const :tag "Use the erc-header-line face" t)
+                 (function :tag "Call a function")))
+
 (defcustom erc-show-channel-key-p t
   "Show the the channel key in the header line."
   :group 'erc-paranoia
@@ -5722,7 +5741,13 @@ if `erc-away' is non-nil."
                                 ((erc-server-process-alive)
                                  "")
                                 (t
-                                 ": CLOSED"))))
+                                 ": CLOSED")))
+          (face (cond ((eq erc-header-line-face-method nil)
+                       nil)
+                      ((functionp erc-header-line-face-method)
+                       (funcall erc-header-line-face-method))
+                      (t
+                       erc-header-line))))
       (cond ((featurep 'xemacs)
              (setq modeline-buffer-identification
                    (list (format-spec erc-mode-line-format spec)))
@@ -5746,7 +5771,10 @@ if `erc-away' is non-nil."
                          (erc-replace-regexp-in-string
                           "%"
                           "%%"
-                          (erc-propertize header 'help-echo help-echo)))))
+                          (if face
+                              (erc-propertize header 'help-echo help-echo
+                                              'face face)
+                            (erc-propertize header 'help-echo help-echo))))))
                 (t (setq header-line-format header))))))
     (if (featurep 'xemacs)
         (redraw-modeline)
diff --git a/lisp/files.el b/lisp/files.el
index e4610ac1d3c..d116a719afb 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5168,7 +5168,7 @@ only these files will be asked to be saved."
 (define-key ctl-x-5-map "f" 'find-file-other-frame)
 (define-key ctl-x-5-map "\C-f" 'find-file-other-frame)
 (define-key ctl-x-5-map "r" 'find-file-read-only-other-frame)
-(define-key ctl-x-4-map "\C-o" 'display-buffer-other-frame)
+(define-key ctl-x-5-map "\C-o" 'display-buffer-other-frame)
 
 ;; arch-tag: bc68d3ea-19ca-468b-aac6-3a4a7766101f
 ;;; files.el ends here
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 966451cce3c..71940cac0db 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,28 @@
+2006-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mml.el (mml-insert-mime): Ignore cached contents of
+        message/external-body part.
+
+        * mm-decode.el (mm-get-part): Add optional 'no-cache' argument.
+        (mm-insert-part): Ditto.
+
+2006-03-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-map-articles): Don't funcall symbol macro.
+        Reported by Ralf Wachinger <rwachinger@gmx.de>.
+
+2006-03-23  Kenichi Handa  <handa@m17n.org>
+
+        * rfc2231.el (rfc2231-encode-string): Use mm-disable-multibyte
+        instead of set-buffer-multibyte.
+
+2006-03-23  Kenichi Handa  <handa@m17n.org>
+
+        * rfc2231.el (rfc2231-decode-encoded-string): Work on unibyte
+        buffer and then decode the buffer text if necessary.
+        (rfc2231-encode-string): Be sure to work on multibyte buffer at
+        first, and after mm-encode-body, change the buffer to unibyte.
+
 2006-03-21  Daniel Pittman <daniel@rimspace.net>
 
         * nnimap.el (nnimap-request-update-info-internal): Optimize.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index e4ca47f1ea2..4fc01a8fad3 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -10619,7 +10619,9 @@ Returns nil if no thread was there to be shown."
 (defun gnus-map-articles (predicate articles)
   "Map PREDICATE over ARTICLES and return non-nil if any predicate is non-nil."
   (apply 'gnus-or (mapcar predicate
-                          (mapcar 'gnus-summary-article-header articles))))
+                          (mapcar (lambda (number)
+                                    (gnus-summary-article-header number))
+                                  articles))))
 
 (defun gnus-summary-hide-all-threads (&optional predicate)
   "Hide all thread subtrees.
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index f0f1ee430ff..60cbb413473 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1103,9 +1103,12 @@ external if displayed external."
 (put 'mm-with-part 'lisp-indent-function 1)
 (put 'mm-with-part 'edebug-form-spec '(body))
 
-(defun mm-get-part (handle)
-  "Return the contents of HANDLE as a string."
-  (if (equal (mm-handle-media-type handle) "message/external-body")
+(defun mm-get-part (handle &optional no-cache)
+  "Return the contents of HANDLE as a string.
+If NO-CACHE is non-nil, cached contents of a message/external-body part
+are ignored."
+  (if (and (not no-cache)
+           (equal (mm-handle-media-type handle) "message/external-body"))
       (progn
         (unless (mm-handle-cache handle)
           (mm-extern-cache-contents handle))
@@ -1114,8 +1117,10 @@ external if displayed external."
     (mm-with-part handle
       (buffer-string))))
 
-(defun mm-insert-part (handle)
-  "Insert the contents of HANDLE in the current buffer."
+(defun mm-insert-part (handle &optional no-cache)
+  "Insert the contents of HANDLE in the current buffer.
+If NO-CACHE is non-nil, cached contents of a message/external-body part
+are ignored."
   (save-excursion
     (insert
      (cond ((eq (mail-content-type-get (mm-handle-type handle) 'charset)
@@ -1123,9 +1128,9 @@ external if displayed external."
             (with-current-buffer (mm-handle-buffer handle)
               (buffer-string)))
            ((mm-multibyte-p)
-            (mm-string-as-multibyte (mm-get-part handle)))
+            (mm-string-as-multibyte (mm-get-part handle no-cache)))
            (t
-            (mm-get-part handle))))))
+            (mm-get-part handle no-cache))))))
 
 (defun mm-file-name-delete-whitespace (file-name)
   "Remove all whitespace characters from FILE-NAME."
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index cf2f527c9d1..5fb6da07668 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -793,7 +793,7 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
       (unless (setq textp (equal (mm-handle-media-supertype handle) "text"))
         (save-excursion
           (set-buffer (setq buffer (mml-generate-new-buffer " *mml*")))
-          (mm-insert-part handle)
+          (mm-insert-part handle 'no-cache)
           (if (setq mmlp (equal (mm-handle-media-type handle)
                                 "message/rfc822"))
               (mime-to-mml)))))
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index 2099b20195d..a5827ecb70c 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -227,7 +227,7 @@ These look like:
   (let ((coding-system (mm-charset-to-coding-system (match-string 2 string)))
         ;;(language (match-string 3 string))
         (value (match-string 4 string)))
-    (mm-with-multibyte-buffer
+    (mm-with-unibyte-buffer
       (insert value)
       (goto-char (point-min))
       (while (search-forward "%" nil t)
@@ -236,9 +236,9 @@ These look like:
              (string-to-number (buffer-substring (point) (+ (point) 2)) 16)
            (delete-region (1- (point)) (+ (point) 2)))))
       ;; Decode using the charset, if any.
-      (unless (memq coding-system '(nil ascii))
-        (mm-decode-coding-region (point-min) (point-max) coding-system))
-      (buffer-string))))
+      (if (memq coding-system '(nil ascii))
+          (buffer-string)
+        (mm-decode-coding-string (buffer-string) coding-system)))))
 
 (defun rfc2231-encode-string (param value)
   "Return and PARAM=VALUE string encoded according to RFC2231.
@@ -252,7 +252,7 @@ the result of this function."
         ;; Don't make lines exceeding 76 column.
         (limit (- 74 (length param)))
         spacep encodep charsetp charset broken)
-    (with-temp-buffer
+    (mm-with-multibyte-buffer
       (insert value)
       (goto-char (point-min))
       (while (not (eobp))
@@ -268,6 +268,7 @@ the result of this function."
         (forward-char 1))
       (when charsetp
         (setq charset (mm-encode-body)))
+      (mm-disable-multibyte)
       (cond
        ((or encodep charsetp
             (progn
diff --git a/lisp/help.el b/lisp/help.el
index 5eef13ff9c9..1661779ca74 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -143,7 +143,7 @@ specifies what to do when the user exits the help buffer."
                     ((not (one-window-p t))
                      (setq help-return-method
                            (cons (selected-window) 'quit-window))
-                     "Type \\[switch-to-buffer-other-window] RET to restore the other window.")
+                     "Type \\[display-buffer] RET to restore the other window.")
                     (pop-up-windows
                      (setq help-return-method (cons (selected-window) t))
                      "Type \\[delete-other-windows] to remove help window.")
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 183da83816d..292e158c097 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -511,9 +511,11 @@ To evaluate a form without viewing the buffer, see `ibuffer-do-eval'."
                    buf
                    (cdr filter))))))))))
 
-(defun ibuffer-generate-filter-groups (bmarklist)
-  (let ((filter-group-alist (append ibuffer-filter-groups
-                                       (list (cons "Default" nil)))))
+(defun ibuffer-generate-filter-groups (bmarklist &optional noempty nodefault)
+  (let ((filter-group-alist (if nodefault
+                                ibuffer-filter-groups
+                              (append ibuffer-filter-groups
+                                      (list (cons "Default" nil))))))
 ;;     (dolist (hidden ibuffer-hidden-filter-groups)
 ;;       (setq filter-group-alist (ibuffer-delete-alist
 ;;                                 hidden filter-group-alist)))
@@ -529,11 +531,13 @@ To evaluate a form without viewing the buffer, see `ibuffer-do-eval'."
             (aset vec i hip-crowd)
             (incf i)
             (setq bmarklist lamers))))
-      (let ((ret nil))
+      (let (ret)
         (dotimes (j i ret)
-          (push (cons (car (nth j filter-group-alist))
-                      (aref vec j))
-                ret))))))
+          (let ((bufs (aref vec j)))
+            (unless (and noempty (null bufs))
+              (push (cons (car (nth j filter-group-alist))
+                          bufs)
+                    ret))))))))
 
 ;;;###autoload
 (defun ibuffer-filters-to-filter-group (name)
@@ -575,11 +579,19 @@ To evaluate a form without viewing the buffer, see `ibuffer-do-eval'."
 (defun ibuffer-read-filter-group-name (msg &optional nodefault noerror)
   (when (and (not noerror) (null ibuffer-filter-groups))
     (error "No filter groups active"))
-  (let ((groups (mapcar #'car ibuffer-filter-groups)))
-    (completing-read msg (if nodefault
-                             groups
-                           (cons "Default" groups))
-                     nil t)))
+  ;; `ibuffer-generate-filter-groups' returns all non-hidden filter
+  ;; groups, possibly excluding empty groups or Default.
+  ;; We add `ibuffer-hidden-filter-groups' to the list, excluding
+  ;; Default if necessary.
+  (completing-read msg (nconc
+                        (ibuffer-generate-filter-groups
+                         (ibuffer-current-state-list)
+                         (not ibuffer-show-empty-filter-groups)
+                         nodefault)
+                        (if nodefault
+                            (remove "Default" ibuffer-hidden-filter-groups)
+                          ibuffer-hidden-filter-groups))
+                   nil t))
 
 ;;;###autoload
 (defun ibuffer-decompose-filter-group (group)
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8e63729b7a5..0aac2fad65e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -419,6 +419,7 @@ The function `sort-coding-systems' use it.")
 
 (defun sort-coding-systems (codings)
   "Sort coding system list CODINGS by a priority of each coding system.
+Returns the sorted list.  CODINGS is modified by side effects.
 
 If a coding system is most preferred, it has the highest priority.
 Otherwise, a coding system corresponds to some MIME charset has higher
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index e9da00deef7..eaf332de6e2 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -4,7 +4,7 @@
 
 ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best
 ;;;;;;  5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5"
-;;;;;;  "play/5x5.el" (17279 27123))
+;;;;;;  "play/5x5.el" (17383 38807))
 ;;; Generated autoloads from play/5x5.el
 
 (autoload (quote 5x5) "5x5" "\
@@ -63,8 +63,19 @@ should return a grid vector array that is the new solution.
 
 ;;;***
 
+;;;### (autoloads (list-one-abbrev-table) "abbrevlist" "abbrevlist.el"
+;;;;;;  (17405 10313))
+;;; Generated autoloads from abbrevlist.el
+
+(autoload (quote list-one-abbrev-table) "abbrevlist" "\
+Display alphabetical listing of ABBREV-TABLE in buffer OUTPUT-BUFFER.
+
+\(fn ABBREV-TABLE OUTPUT-BUFFER)" nil nil)
+
+;;;***
+
 ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el"
-;;;;;;  (17279 27203))
+;;;;;;  (17390 27404))
 ;;; Generated autoloads from progmodes/ada-mode.el
 
 (autoload (quote ada-add-extensions) "ada-mode" "\
@@ -125,7 +136,7 @@ If you use ada-xref.el:
 ;;;***
 
 ;;;### (autoloads (ada-header) "ada-stmt" "progmodes/ada-stmt.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 27404))
 ;;; Generated autoloads from progmodes/ada-stmt.el
 
 (autoload (quote ada-header) "ada-stmt" "\
@@ -136,7 +147,7 @@ Insert a descriptive header at the top of the file.
 ;;;***
 
 ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el"
-;;;;;;  (17279 27172))
+;;;;;;  (17390 27404))
 ;;; Generated autoloads from progmodes/ada-xref.el
 
 (autoload (quote ada-find-file) "ada-xref" "\
@@ -288,8 +299,8 @@ Fix any old-style date entries in the current log file to default format.
 ;;;***
 
 ;;;### (autoloads (defadvice ad-add-advice ad-default-compilation-action
-;;;;;;  ad-redefinition-action) "advice" "emacs-lisp/advice.el" (17279
-;;;;;;  27196))
+;;;;;;  ad-redefinition-action) "advice" "emacs-lisp/advice.el" (17390
+;;;;;;  26937))
 ;;; Generated autoloads from emacs-lisp/advice.el
 
 (defvar ad-redefinition-action (quote warn) "\
@@ -388,7 +399,7 @@ See Info node `(elisp)Advising Functions' for comprehensive documentation.
 
 ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule
 ;;;;;;  align-highlight-rule align-current align-entire align-regexp
-;;;;;;  align) "align" "align.el" (17327 23538))
+;;;;;;  align) "align" "align.el" (17390 26934))
 ;;; Generated autoloads from align.el
 
 (autoload (quote align) "align" "\
@@ -478,11 +489,12 @@ A replacement function for `newline-and-indent', aligning as it goes.
 ;;;***
 
 ;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el"
-;;;;;;  (17307 17624))
+;;;;;;  (17432 19375))
 ;;; Generated autoloads from allout.el
 
 (autoload (quote allout-mode) "allout" "\
 Toggle minor mode for controlling exposure and editing of text outlines.
+\\<allout-mode-map>
 
 Optional arg forces mode to re-initialize iff arg is positive num or
 symbol.  Allout outline mode always runs as a minor mode.
@@ -524,62 +536,69 @@ The bindings are dictated by the `allout-keybindings-list' and
 \\[allout-forward-current-level] allout-forward-current-level    | \\[allout-show-current-entry] allout-show-current-entry
 \\[allout-backward-current-level] allout-backward-current-level   | \\[allout-show-all] allout-show-all
 \\[allout-end-of-entry] allout-end-of-entry
-\\[allout-beginning-of-current-entry,] allout-beginning-of-current-entry, alternately, goes to hot-spot
+\\[allout-beginning-of-current-entry] allout-beginning-of-current-entry, alternately, goes to hot-spot
 
         Topic Header Production:
         -----------------------
-\\[allout-open-sibtopic]  allout-open-sibtopic  Create a new sibling after current topic.
-\\[allout-open-subtopic]  allout-open-subtopic  ... an offspring of current topic.
-\\[allout-open-supertopic]  allout-open-supertopic      ... a sibling of the current topic's parent.
+\\[allout-open-sibtopic]        allout-open-sibtopic    Create a new sibling after current topic.
+\\[allout-open-subtopic]        allout-open-subtopic    ... an offspring of current topic.
+\\[allout-open-supertopic]      allout-open-supertopic  ... a sibling of the current topic's parent.
 
         Topic Level and Prefix Adjustment:
         ---------------------------------
-\\[allout-shift-in]  allout-shift-in    Shift current topic and all offspring deeper.
-\\[allout-shift-out]  allout-shift-out  ... less deep.
-\\[allout-rebullet-current-heading]  allout-rebullet-current-heading Prompt for alternate bullet for
+\\[allout-shift-in]     allout-shift-in Shift current topic and all offspring deeper.
+\\[allout-shift-out]    allout-shift-out        ... less deep.
+\\[allout-rebullet-current-heading]     allout-rebullet-current-heading Prompt for alternate bullet for
                                          current topic.
 \\[allout-rebullet-topic]       allout-rebullet-topic   Reconcile bullets of topic and its offspring
                                 - distinctive bullets are not changed, others
                                   alternated according to nesting depth.
-\\[allout-number-siblings]  allout-number-siblings      Number bullets of topic and siblings - the
+\\[allout-number-siblings]      allout-number-siblings  Number bullets of topic and siblings - the
                                 offspring are not affected.  With repeat
                                 count, revoke numbering.
 
         Topic-oriented Killing and Yanking:
         ----------------------------------
-\\[allout-kill-topic]     allout-kill-topic     Kill current topic, including offspring.
-\\[allout-kill-line]     allout-kill-line       Like kill-line, but reconciles numbering, etc.
-\\[allout-yank]     allout-yank         Yank, adjusting depth of yanked topic to
+\\[allout-kill-topic]   allout-kill-topic       Kill current topic, including offspring.
+\\[allout-kill-line]    allout-kill-line        Like kill-line, but reconciles numbering, etc.
+\\[allout-yank] allout-yank             Yank, adjusting depth of yanked topic to
                                 depth of heading if yanking into bare topic
                                 heading (ie, prefix sans text).
-\\[allout-yank-pop]     allout-yank-pop Is to allout-yank as yank-pop is to yank
+\\[allout-yank-pop]     allout-yank-pop Is to allout-yank as yank-pop is to yank
+
+        Topic-oriented Encryption:
+        -------------------------
+\\[allout-toggle-current-subtree-encryption]    allout-toggle-current-subtree-encryption Encrypt/Decrypt topic content
 
         Misc commands:
         -------------
 M-x outlineify-sticky           Activate outline mode for current buffer,
                                 and establish a default file-var setting
                                 for `allout-layout'.
-\\[allout-mark-topic]     allout-mark-topic
+\\[allout-mark-topic]           allout-mark-topic
 \\[allout-copy-exposed-to-buffer]     allout-copy-exposed-to-buffer
                                 Duplicate outline, sans concealed text, to
                                 buffer with name derived from derived from that
                                 of current buffer - \"*BUFFERNAME exposed*\".
-\\[allout-flatten-exposed-to-buffer]     allout-flatten-exposed-to-buffer
+\\[allout-flatten-exposed-to-buffer]    allout-flatten-exposed-to-buffer
                                 Like above 'copy-exposed', but convert topic
                                 prefixes to section.subsection... numeric
                                 format.
-ESC ESC (allout-init t) Setup Emacs session for outline mode
+\\[eval-expression] (allout-init t)     Setup Emacs session for outline mode
                                 auto-activation.
 
-                  Encrypted Entries
+                  Topic Encryption
 
-Outline mode supports easily togglable gpg encryption of topics, with
-niceties like support for symmetric and key-pair modes, passphrase timeout,
-passphrase consistency checking, user-provided hinting for symmetric key
-mode, and auto-encryption of topics pending encryption on save.  The aim is
-to enable reliable topic privacy while preventing accidents like neglected
-encryption, encryption with a mistaken passphrase, forgetting which
-passphrase was used, and other practical pitfalls.
+Outline mode supports gpg encryption of topics, with support for
+symmetric and key-pair modes, passphrase timeout, passphrase
+consistency checking, user-provided hinting for symmetric key
+mode, and auto-encryption of topics pending encryption on save.
+\(Topics pending encryption are, by default, automatically
+encrypted during file saves; if you're editing the contents of
+such a topic, it is automatically decrypted for continued
+editing.)  The aim is reliable topic privacy while preventing
+accidents like neglected encryption before saves, forgetting
+which passphrase was used, and other practical pitfalls.
 
 See `allout-toggle-current-subtree-encryption' function docstring and
 `allout-encrypt-unencrypted-on-saves' customization variable for details.
@@ -589,22 +608,21 @@ See `allout-toggle-current-subtree-encryption' function docstring and
 Hot-spot operation provides a means for easy, single-keystroke outline
 navigation and exposure control.
 
-\\<allout-mode-map>
 When the text cursor is positioned directly on the bullet character of
 a topic, regular characters (a to z) invoke the commands of the
 corresponding allout-mode keymap control chars.  For example, \"f\"
-would invoke the command typically bound to \"C-c C-f\"
+would invoke the command typically bound to \"C-c<space>C-f\"
 \(\\[allout-forward-current-level] `allout-forward-current-level').
 
-Thus, by positioning the cursor on a topic bullet, you can execute
-the outline navigation and manipulation commands with a single
-keystroke.  Non-literal chars never get this special translation, so
-you can use them to get away from the hot-spot, and back to normal
-operation.
+Thus, by positioning the cursor on a topic bullet, you can
+execute the outline navigation and manipulation commands with a
+single keystroke.  Regular navigation keys (eg, \\[forward-char], \\[next-line]) never get
+this special translation, so you can use them to get out of the
+hot-spot and back to normal operation.
 
 Note that the command `allout-beginning-of-current-entry' (\\[allout-beginning-of-current-entry])
 will move to the hot-spot when the cursor is already located at the
-beginning of the current entry, so you can simply hit \\[allout-beginning-of-current-entry]
+beginning of the current entry, so you usually can hit \\[allout-beginning-of-current-entry]
 twice in a row to get to the hot-spot.
 
                             Terminology
@@ -612,7 +630,7 @@ twice in a row to get to the hot-spot.
 Topic hierarchy constituents - TOPICS and SUBTOPICS:
 
 TOPIC:  A basic, coherent component of an Emacs outline.  It can
-        contain other topics, and it can be subsumed by other topics,
+        contain and be contained by other topics.
 CURRENT topic:
         The visible topic most immediately containing the cursor.
 DEPTH:  The degree of nesting of a topic; it increases with
@@ -656,13 +674,13 @@ PREFIX-LEAD:
         docstring for more detail.
 PREFIX-PADDING:
         Spaces or asterisks which separate the prefix-lead and the
-        bullet, according to the depth of the topic.
+        bullet, determining the depth of the topic.
 BULLET: A character at the end of the topic prefix, it must be one of
         the characters listed on `allout-plain-bullets-string' or
         `allout-distinctive-bullets-string'.  (See the documentation
         for these variables for more details.)  The default choice of
-        bullet when generating varies in a cycle with the depth of the
-        topic.
+        bullet when generating topics varies in a cycle with the depth of
+        the topic.
 ENTRY:  The text contained in a topic before any offspring.
 BODY:   Same as ENTRY.
 
@@ -673,7 +691,6 @@ EXPOSURE:
 CONCEALED:
         Topics and entry text whose display is inhibited.  Contiguous
         units of concealed text is represented by `...' ellipses.
-        (Ref the `selective-display' var.)
 
         Concealed topics are effectively collapsed within an ancestor.
 CLOSED: A topic whose immediate offspring and body-text is concealed.
@@ -694,7 +711,7 @@ setup for auto-startup.
 ;;;***
 
 ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp"
-;;;;;;  "net/ange-ftp.el" (17279 27196))
+;;;;;;  "net/ange-ftp.el" (17390 26944))
 ;;; Generated autoloads from net/ange-ftp.el
 
 (defalias (quote ange-ftp-re-read-dir) (quote ange-ftp-reread-dir))
@@ -716,7 +733,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (animate-birthday-present animate-sequence animate-string)
-;;;;;;  "animate" "play/animate.el" (17279 27172))
+;;;;;;  "animate" "play/animate.el" (17383 38807))
 ;;; Generated autoloads from play/animate.el
 
 (autoload (quote animate-string) "animate" "\
@@ -744,7 +761,7 @@ You can specify the one's name by NAME; the default value is \"Sarah\".
 ;;;***
 
 ;;;### (autoloads (ansi-color-process-output ansi-color-for-comint-mode-on)
-;;;;;;  "ansi-color" "ansi-color.el" (17279 27122))
+;;;;;;  "ansi-color" "ansi-color.el" (17390 26934))
 ;;; Generated autoloads from ansi-color.el
 
 (autoload (quote ansi-color-for-comint-mode-on) "ansi-color" "\
@@ -770,7 +787,7 @@ This is a good function to put in `comint-output-filter-functions'.
 ;;;***
 
 ;;;### (autoloads (antlr-set-tabs antlr-mode antlr-show-makefile-rules)
-;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (17279 27123))
+;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (17390 27404))
 ;;; Generated autoloads from progmodes/antlr-mode.el
 
 (autoload (quote antlr-show-makefile-rules) "antlr-mode" "\
@@ -809,7 +826,7 @@ Used in `antlr-mode'.  Also a useful function in `java-mode-hook'.
 ;;;### (autoloads (appt-activate appt-make-list appt-delete appt-add
 ;;;;;;  appt-display-diary appt-display-duration appt-display-mode-line
 ;;;;;;  appt-msg-window appt-visible appt-audible appt-message-warning-time
-;;;;;;  appt-issue-message) "appt" "calendar/appt.el" (17308 43144))
+;;;;;;  appt-issue-message) "appt" "calendar/appt.el" (17405 10313))
 ;;; Generated autoloads from calendar/appt.el
 
 (defvar appt-issue-message t "\
@@ -897,7 +914,7 @@ ARG is positive, otherwise off.
 
 ;;;### (autoloads (apropos-documentation apropos-value apropos apropos-documentation-property
 ;;;;;;  apropos-command apropos-variable apropos-read-pattern) "apropos"
-;;;;;;  "apropos.el" (17331 26860))
+;;;;;;  "apropos.el" (17454 30835))
 ;;; Generated autoloads from apropos.el
 
 (autoload (quote apropos-read-pattern) "apropos" "\
@@ -993,8 +1010,8 @@ Returns list of symbols and documentation found.
 
 ;;;***
 
-;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17379
-;;;;;;  30027))
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17425
+;;;;;;  24466))
 ;;; Generated autoloads from arc-mode.el
 
 (autoload (quote archive-mode) "arc-mode" "\
@@ -1085,8 +1102,8 @@ Entering array mode calls the function `array-mode-hook'.
 
 ;;;***
 
-;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17279
-;;;;;;  27174))
+;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17390
+;;;;;;  26946))
 ;;; Generated autoloads from textmodes/artist.el
 
 (autoload (quote artist-mode) "artist" "\
@@ -1291,8 +1308,8 @@ Keymap summary
 
 ;;;***
 
-;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17356
-;;;;;;  16046))
+;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17390
+;;;;;;  27404))
 ;;; Generated autoloads from progmodes/asm-mode.el
 
 (autoload (quote asm-mode) "asm-mode" "\
@@ -1336,7 +1353,7 @@ This command is obsolete.
 ;;;***
 
 ;;;### (autoloads (autoarg-kp-mode autoarg-mode) "autoarg" "autoarg.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26935))
 ;;; Generated autoloads from autoarg.el
 
 (defvar autoarg-mode nil "\
@@ -1393,7 +1410,7 @@ This is similar to \\[autoarg-mode] but rebinds the keypad keys `kp-1'
 ;;;***
 
 ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 27404))
 ;;; Generated autoloads from progmodes/autoconf.el
 
 (autoload (quote autoconf-mode) "autoconf" "\
@@ -1404,7 +1421,7 @@ Major mode for editing Autoconf configure.in files.
 ;;;***
 
 ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert)
-;;;;;;  "autoinsert" "autoinsert.el" (17279 27122))
+;;;;;;  "autoinsert" "autoinsert.el" (17390 26935))
 ;;; Generated autoloads from autoinsert.el
 
 (autoload (quote auto-insert) "autoinsert" "\
@@ -1444,7 +1461,7 @@ insert a template for the file depending on the mode of the buffer.
 
 ;;;### (autoloads (batch-update-autoloads update-directory-autoloads
 ;;;;;;  update-file-autoloads) "autoload" "emacs-lisp/autoload.el"
-;;;;;;  (17307 17624))
+;;;;;;  (17411 12435))
 ;;; Generated autoloads from emacs-lisp/autoload.el
 
 (autoload (quote update-file-autoloads) "autoload" "\
@@ -1479,7 +1496,7 @@ Calls `update-directory-autoloads' on the command line arguments.
 
 ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode
 ;;;;;;  auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode)
-;;;;;;  "autorevert" "autorevert.el" (17279 27122))
+;;;;;;  "autorevert" "autorevert.el" (17390 26935))
 ;;; Generated autoloads from autorevert.el
 
 (autoload (quote auto-revert-mode) "autorevert" "\
@@ -1549,7 +1566,7 @@ Use `auto-revert-mode' to revert a particular buffer.
 ;;;***
 
 ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid"
-;;;;;;  "avoid.el" (17279 27122))
+;;;;;;  "avoid.el" (17390 26935))
 ;;; Generated autoloads from avoid.el
 
 (defvar mouse-avoidance-mode nil "\
@@ -1590,7 +1607,7 @@ definition of \"random distance\".)
 ;;;***
 
 ;;;### (autoloads (backquote) "backquote" "emacs-lisp/backquote.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26937))
 ;;; Generated autoloads from emacs-lisp/backquote.el
 
 (autoload (quote backquote) "backquote" "\
@@ -1615,7 +1632,7 @@ Vectors work just like lists.  Nested backquotes are permitted.
 ;;;***
 
 ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el"
-;;;;;;  (17374 21274))
+;;;;;;  (17427 42815))
 ;;; Generated autoloads from battery.el
  (put 'battery-mode-line-string 'risky-local-variable t)
 
@@ -1648,7 +1665,7 @@ seconds.
 ;;;***
 
 ;;;### (autoloads (benchmark benchmark-run-compiled benchmark-run)
-;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (17279 27122))
+;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (17390 26937))
 ;;; Generated autoloads from emacs-lisp/benchmark.el
 
 (autoload (quote benchmark-run) "benchmark" "\
@@ -1680,8 +1697,8 @@ non-interactive use see also `benchmark-run' and
 
 ;;;***
 
-;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17374
-;;;;;;  21275))
+;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17441
+;;;;;;  26667))
 ;;; Generated autoloads from textmodes/bibtex.el
 
 (autoload (quote bibtex-mode) "bibtex" "\
@@ -1743,7 +1760,7 @@ if that value is non-nil.
 
 ;;;### (autoloads (binhex-decode-region binhex-decode-region-external
 ;;;;;;  binhex-decode-region-internal) "binhex" "gnus/binhex.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38804))
 ;;; Generated autoloads from gnus/binhex.el
 
 (defconst binhex-begin-line "^:...............................................................$")
@@ -1766,8 +1783,8 @@ Binhex decode region between START and END.
 
 ;;;***
 
-;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17279
-;;;;;;  27196))
+;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17383
+;;;;;;  38807))
 ;;; Generated autoloads from play/blackbox.el
 
 (autoload (quote blackbox) "blackbox" "\
@@ -1889,7 +1906,7 @@ a reflection.
 ;;;### (autoloads (bookmark-bmenu-list bookmark-load bookmark-save
 ;;;;;;  bookmark-write bookmark-delete bookmark-insert bookmark-rename
 ;;;;;;  bookmark-insert-location bookmark-relocate bookmark-jump
-;;;;;;  bookmark-set) "bookmark" "bookmark.el" (17279 27201))
+;;;;;;  bookmark-set) "bookmark" "bookmark.el" (17390 26935))
 ;;; Generated autoloads from bookmark.el
  (define-key ctl-x-map "rb" 'bookmark-jump)
  (define-key ctl-x-map "rm" 'bookmark-set)
@@ -2079,7 +2096,7 @@ deletion, or > if it is flagged for displaying.
 ;;;;;;  browse-url browse-url-of-region browse-url-of-dired-file
 ;;;;;;  browse-url-of-buffer browse-url-of-file browse-url-url-at-point
 ;;;;;;  browse-url-galeon-program browse-url-firefox-program browse-url-browser-function)
-;;;;;;  "browse-url" "net/browse-url.el" (17283 59911))
+;;;;;;  "browse-url" "net/browse-url.el" (17390 26944))
 ;;; Generated autoloads from net/browse-url.el
 
 (defvar browse-url-browser-function (cond ((memq system-type (quote (windows-nt ms-dos cygwin))) (quote browse-url-default-windows-browser)) ((memq system-type (quote (darwin))) (quote browse-url-default-macosx-browser)) (t (quote browse-url-default-browser))) "\
@@ -2410,8 +2427,8 @@ Default to the URL around or before point.
 
 ;;;***
 
-;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17383
+;;;;;;  38807))
 ;;; Generated autoloads from play/bruce.el
 
 (autoload (quote bruce) "bruce" "\
@@ -2427,7 +2444,7 @@ Return a vector containing the lines from `bruce-phrases-file'.
 ;;;***
 
 ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next)
-;;;;;;  "bs" "bs.el" (17379 24708))
+;;;;;;  "bs" "bs.el" (17396 42170))
 ;;; Generated autoloads from bs.el
 
 (autoload (quote bs-cycle-next) "bs" "\
@@ -2468,8 +2485,8 @@ name of buffer configuration.
 ;;;***
 
 ;;;### (autoloads (insert-text-button make-text-button insert-button
-;;;;;;  make-button define-button-type) "button" "button.el" (17331
-;;;;;;  26860))
+;;;;;;  make-button define-button-type) "button" "button.el" (17390
+;;;;;;  26935))
 ;;; Generated autoloads from button.el
 
 (defvar button-map (let ((map (make-sparse-keymap))) (define-key map "
" (quote push-button)) (define-key map [mouse-2] (quote push-button)) map) "\
@@ -2653,7 +2670,7 @@ and corresponding effects.
 
 ;;;***
 
-;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17308 43144))
+;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17390 27324))
 ;;; Generated autoloads from calendar/cal-dst.el
 
 (put (quote calendar-daylight-savings-starts) (quote risky-local-variable) t)
@@ -2663,7 +2680,7 @@ and corresponding effects.
 ;;;***
 
 ;;;### (autoloads (list-yahrzeit-dates) "cal-hebrew" "calendar/cal-hebrew.el"
-;;;;;;  (17308 43144))
+;;;;;;  (17390 27324))
 ;;; Generated autoloads from calendar/cal-hebrew.el
 
 (autoload (quote list-yahrzeit-dates) "cal-hebrew" "\
@@ -2678,7 +2695,7 @@ from the cursor position.
 ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle
 ;;;;;;  calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc
 ;;;;;;  full-calc calc calc-dispatch calc-settings-file) "calc" "calc/calc.el"
-;;;;;;  (17297 42808))
+;;;;;;  (17383 38804))
 ;;; Generated autoloads from calc/calc.el
 
 (defvar calc-settings-file (convert-standard-filename "~/.calc.el") "\
@@ -2756,8 +2773,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (calculator) "calculator" "calculator.el" (17279
-;;;;;;  27122))
+;;;### (autoloads (calculator) "calculator" "calculator.el" (17390
+;;;;;;  26935))
 ;;; Generated autoloads from calculator.el
 
 (autoload (quote calculator) "calculator" "\
@@ -2785,7 +2802,7 @@ See the documentation for `calculator-mode' for more information.
 ;;;;;;  mark-holidays-in-calendar view-calendar-holidays-initially
 ;;;;;;  calendar-remove-frame-by-deleting mark-diary-entries-in-calendar
 ;;;;;;  view-diary-entries-initially calendar-offset) "calendar"
-;;;;;;  "calendar/calendar.el" (17374 21531))
+;;;;;;  "calendar/calendar.el" (17427 41284))
 ;;; Generated autoloads from calendar/calendar.el
 
 (defvar calendar-offset 0 "\
@@ -3356,7 +3373,7 @@ movement commands will not work correctly.")
 ;;;***
 
 ;;;### (autoloads (canlock-verify canlock-insert-header) "canlock"
-;;;;;;  "gnus/canlock.el" (17279 27122))
+;;;;;;  "gnus/canlock.el" (17383 38804))
 ;;; Generated autoloads from gnus/canlock.el
 
 (autoload (quote canlock-insert-header) "canlock" "\
@@ -3374,7 +3391,7 @@ it fails.
 ;;;***
 
 ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;;  (17319 2459))
+;;;;;;  (17411 11765))
 ;;; Generated autoloads from progmodes/cc-engine.el
 
 (autoload (quote c-guess-basic-syntax) "cc-engine" "\
@@ -3386,7 +3403,7 @@ Return the syntactic context of the current line.
 
 ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode
 ;;;;;;  c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el"
-;;;;;;  (17307 17625))
+;;;;;;  (17411 11765))
 ;;; Generated autoloads from progmodes/cc-mode.el
 
 (autoload (quote c-initialize-cc-mode) "cc-mode" "\
@@ -3544,7 +3561,7 @@ Key bindings:
 ;;;***
 
 ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles"
-;;;;;;  "progmodes/cc-styles.el" (17307 17625))
+;;;;;;  "progmodes/cc-styles.el" (17411 11765))
 ;;; Generated autoloads from progmodes/cc-styles.el
 
 (autoload (quote c-set-style) "cc-styles" "\
@@ -3595,8 +3612,8 @@ and exists only for compatibility reasons.
 
 ;;;***
 
-;;;### (autoloads nil "cc-subword" "progmodes/cc-subword.el" (17307
-;;;;;;  17623))
+;;;### (autoloads nil "cc-subword" "progmodes/cc-subword.el" (17390
+;;;;;;  27407))
 ;;; Generated autoloads from progmodes/cc-subword.el
  (autoload 'c-subword-mode "cc-subword" "Mode enabling subword movement and editing keys." t)
 
@@ -3863,7 +3880,7 @@ See the documentation of `define-ccl-program' for the detail of CCL program.
 ;;;***
 
 ;;;### (autoloads (cfengine-mode) "cfengine" "progmodes/cfengine.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 27407))
 ;;; Generated autoloads from progmodes/cfengine.el
 
 (autoload (quote cfengine-mode) "cfengine" "\
@@ -3885,7 +3902,7 @@ to the action header.
 ;;;;;;  checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer
 ;;;;;;  checkdoc-eval-current-buffer checkdoc-message-interactive
 ;;;;;;  checkdoc-interactive checkdoc) "checkdoc" "emacs-lisp/checkdoc.el"
-;;;;;;  (17279 27171))
+;;;;;;  (17390 26937))
 ;;; Generated autoloads from emacs-lisp/checkdoc.el
 
 (autoload (quote checkdoc) "checkdoc" "\
@@ -4097,7 +4114,7 @@ Encode the text in the current buffer to HZ.
 ;;;***
 
 ;;;### (autoloads (command-history list-command-history repeat-matching-complex-command)
-;;;;;;  "chistory" "chistory.el" (17279 27122))
+;;;;;;  "chistory" "chistory.el" (17390 26936))
 ;;; Generated autoloads from chistory.el
 
 (autoload (quote repeat-matching-complex-command) "chistory" "\
@@ -4136,7 +4153,7 @@ and runs the normal hook `command-history-hook'.
 
 ;;;***
 
-;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17376 5576))
+;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17390 26938))
 ;;; Generated autoloads from emacs-lisp/cl.el
 
 (defvar custom-print-functions nil "\
@@ -4152,7 +4169,7 @@ a future Emacs interpreter will be able to use it.")
 ;;;***
 
 ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emacs-lisp/cl-indent.el
 
 (autoload (quote common-lisp-indent-function) "cl-indent" "\
@@ -4163,7 +4180,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (c-macro-expand) "cmacexp" "progmodes/cmacexp.el"
-;;;;;;  (17279 27172))
+;;;;;;  (17390 27407))
 ;;; Generated autoloads from progmodes/cmacexp.el
 
 (autoload (quote c-macro-expand) "cmacexp" "\
@@ -4183,8 +4200,8 @@ For use inside Lisp programs, see also `c-macro-expansion'.
 
 ;;;***
 
-;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17279
-;;;;;;  27122))
+;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17390
+;;;;;;  26936))
 ;;; Generated autoloads from cmuscheme.el
 
 (autoload (quote run-scheme) "cmuscheme" "\
@@ -4324,7 +4341,7 @@ read/written by MS-DOS software, or for display on the MS-DOS terminal.
 ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list
 ;;;;;;  comint-redirect-send-command-to-process comint-redirect-send-command
 ;;;;;;  comint-run make-comint make-comint-in-buffer) "comint" "comint.el"
-;;;;;;  (17279 27202))
+;;;;;;  (17454 30950))
 ;;; Generated autoloads from comint.el
 
 (defvar comint-output-filter-functions (quote (comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)) "\
@@ -4414,8 +4431,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use.
 
 ;;;***
 
-;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17308
-;;;;;;  43144))
+;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17407
+;;;;;;  3111))
 ;;; Generated autoloads from compare-w.el
 
 (autoload (quote compare-windows) "compare-w" "\
@@ -4452,7 +4469,7 @@ on third call it again advances points to the next difference and so on.
 ;;;;;;  compilation-shell-minor-mode compilation-mode compilation-start
 ;;;;;;  compile compilation-disable-input compile-command compilation-search-path
 ;;;;;;  compilation-ask-about-save compilation-window-height compilation-mode-hook)
-;;;;;;  "compile" "progmodes/compile.el" (17319 1478))
+;;;;;;  "compile" "progmodes/compile.el" (17390 27407))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -4613,7 +4630,7 @@ This is the value of `next-error-function' in Compilation buffers.
 ;;;***
 
 ;;;### (autoloads (partial-completion-mode) "complete" "complete.el"
-;;;;;;  (17319 2459))
+;;;;;;  (17425 24465))
 ;;; Generated autoloads from complete.el
 
 (defvar partial-completion-mode nil "\
@@ -4656,7 +4673,7 @@ second TAB brings up the `*Completions*' buffer.
 ;;;***
 
 ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el"
-;;;;;;  (17374 21534))
+;;;;;;  (17390 26936))
 ;;; Generated autoloads from completion.el
 
 (defvar dynamic-completion-mode nil "\
@@ -4900,7 +4917,7 @@ Optional 3rd arg WITH-COMPOSITION-RULE is ignored.
 
 ;;;### (autoloads (conf-xdefaults-mode conf-ppd-mode conf-colon-mode
 ;;;;;;  conf-space-mode conf-javaprop-mode conf-windows-mode conf-unix-mode
-;;;;;;  conf-mode) "conf-mode" "textmodes/conf-mode.el" (17279 27198))
+;;;;;;  conf-mode) "conf-mode" "textmodes/conf-mode.el" (17390 26946))
 ;;; Generated autoloads from textmodes/conf-mode.el
 
 (autoload (quote conf-mode) "conf-mode" "\
@@ -5049,7 +5066,7 @@ For details see `conf-mode'.  Example:
 ;;;***
 
 ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie)
-;;;;;;  "cookie1" "play/cookie1.el" (17279 27123))
+;;;;;;  "cookie1" "play/cookie1.el" (17383 38807))
 ;;; Generated autoloads from play/cookie1.el
 
 (autoload (quote cookie) "cookie1" "\
@@ -5081,7 +5098,7 @@ Randomly permute the elements of VECTOR (all permutations equally likely).
 ;;;***
 
 ;;;### (autoloads (copyright copyright-fix-years copyright-update)
-;;;;;;  "copyright" "emacs-lisp/copyright.el" (17279 27122))
+;;;;;;  "copyright" "emacs-lisp/copyright.el" (17390 26938))
 ;;; Generated autoloads from emacs-lisp/copyright.el
 
 (autoload (quote copyright-update) "copyright" "\
@@ -5109,7 +5126,7 @@ Insert a copyright by $ORGANIZATION notice at cursor.
 ;;;***
 
 ;;;### (autoloads (cperl-mode) "cperl-mode" "progmodes/cperl-mode.el"
-;;;;;;  (17279 27203))
+;;;;;;  (17390 27408))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 
 (autoload (quote cperl-mode) "cperl-mode" "\
@@ -5282,7 +5299,7 @@ or as help on variables `cperl-tips', `cperl-problems',
 ;;;***
 
 ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el"
-;;;;;;  (17374 21275))
+;;;;;;  (17390 27408))
 ;;; Generated autoloads from progmodes/cpp.el
 
 (autoload (quote cpp-highlight-buffer) "cpp" "\
@@ -5301,7 +5318,7 @@ Edit display information for cpp conditionals.
 ;;;***
 
 ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emulation/crisp.el
 
 (defvar crisp-mode nil "\
@@ -5325,7 +5342,7 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise.
 ;;;***
 
 ;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el"
-;;;;;;  (17319 2459))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emacs-lisp/crm.el
 
 (autoload (quote completing-read-multiple) "crm" "\
@@ -5361,7 +5378,7 @@ INHERIT-INPUT-METHOD.
 ;;;***
 
 ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
-;;;;;;  (17379 24714))
+;;;;;;  (17454 30835))
 ;;; Generated autoloads from emulation/cua-base.el
 
 (defvar cua-mode nil "\
@@ -5428,7 +5445,7 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings.
 ;;;;;;  customize-face customize-changed-options customize-option-other-window
 ;;;;;;  customize-option customize-group-other-window customize-group
 ;;;;;;  customize-mode customize customize-save-variable customize-set-variable
-;;;;;;  customize-set-value) "cus-edit" "cus-edit.el" (17374 21544))
+;;;;;;  customize-set-value) "cus-edit" "cus-edit.el" (17441 26677))
 ;;; Generated autoloads from cus-edit.el
  (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'")
 
@@ -5686,7 +5703,7 @@ The format is suitable for use with `easy-menu-define'.
 ;;;***
 
 ;;;### (autoloads (custom-reset-faces custom-theme-reset-faces custom-set-faces
-;;;;;;  custom-declare-face) "cus-face" "cus-face.el" (17342 36796))
+;;;;;;  custom-declare-face) "cus-face" "cus-face.el" (17390 26936))
 ;;; Generated autoloads from cus-face.el
 
 (autoload (quote custom-declare-face) "cus-face" "\
@@ -5756,7 +5773,7 @@ This means reset FACE to its value in FROM-THEME.
 ;;;***
 
 ;;;### (autoloads (customize-create-theme) "cus-theme" "cus-theme.el"
-;;;;;;  (17356 16191))
+;;;;;;  (17396 42170))
 ;;; Generated autoloads from cus-theme.el
 
 (autoload (quote customize-create-theme) "cus-theme" "\
@@ -5767,7 +5784,7 @@ Create a custom theme.
 ;;;***
 
 ;;;### (autoloads (cvs-status-mode) "cvs-status" "cvs-status.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26936))
 ;;; Generated autoloads from cvs-status.el
 
 (autoload (quote cvs-status-mode) "cvs-status" "\
@@ -5778,7 +5795,7 @@ Mode used for cvs status output.
 ;;;***
 
 ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode)
-;;;;;;  "cwarn" "progmodes/cwarn.el" (17307 17625))
+;;;;;;  "cwarn" "progmodes/cwarn.el" (17390 27408))
 ;;; Generated autoloads from progmodes/cwarn.el
 
 (autoload (quote cwarn-mode) "cwarn" "\
@@ -5851,7 +5868,7 @@ If the argument is nil, we return the display table to its standard state.
 ;;;***
 
 ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el"
-;;;;;;  (17297 42806))
+;;;;;;  (17390 26936))
 ;;; Generated autoloads from dabbrev.el
  (define-key esc-map "/" 'dabbrev-expand)
  (define-key esc-map [?\C-/] 'dabbrev-completion)
@@ -5895,8 +5912,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion].
 
 ;;;***
 
-;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17279
-;;;;;;  27203))
+;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17390
+;;;;;;  27408))
 ;;; Generated autoloads from progmodes/dcl-mode.el
 
 (autoload (quote dcl-mode) "dcl-mode" "\
@@ -6023,7 +6040,7 @@ There is some minimal font-lock support (see vars
 ;;;***
 
 ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug"
-;;;;;;  "emacs-lisp/debug.el" (17279 27196))
+;;;;;;  "emacs-lisp/debug.el" (17390 26938))
 ;;; Generated autoloads from emacs-lisp/debug.el
 
 (setq debugger (quote debug))
@@ -6067,7 +6084,7 @@ To specify a nil argument interactively, exit with an empty minibuffer.
 ;;;***
 
 ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el"
-;;;;;;  (17279 27172))
+;;;;;;  (17383 38807))
 ;;; Generated autoloads from play/decipher.el
 
 (autoload (quote decipher) "decipher" "\
@@ -6096,8 +6113,8 @@ The most useful commands are:
 ;;;***
 
 ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region
-;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (17279
-;;;;;;  27122))
+;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (17390
+;;;;;;  26936))
 ;;; Generated autoloads from delim-col.el
 
 (autoload (quote delimit-columns-customize) "delim-col" "\
@@ -6121,8 +6138,8 @@ START and END delimits the corners of text rectangle.
 
 ;;;***
 
-;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17337
-;;;;;;  56255))
+;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17390
+;;;;;;  27408))
 ;;; Generated autoloads from progmodes/delphi.el
 
 (autoload (quote delphi-mode) "delphi" "\
@@ -6172,8 +6189,8 @@ no args, if that value is non-nil.
 
 ;;;***
 
-;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17279
-;;;;;;  27122))
+;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17390
+;;;;;;  26936))
 ;;; Generated autoloads from delsel.el
 
 (defalias (quote pending-delete-mode) (quote delete-selection-mode))
@@ -6203,7 +6220,7 @@ any selection.
 ;;;***
 
 ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode)
-;;;;;;  "derived" "emacs-lisp/derived.el" (17307 17624))
+;;;;;;  "derived" "emacs-lisp/derived.el" (17390 26938))
 ;;; Generated autoloads from emacs-lisp/derived.el
 
 (autoload (quote define-derived-mode) "derived" "\
@@ -6268,7 +6285,7 @@ the first time the mode is used.
 ;;;***
 
 ;;;### (autoloads (describe-char describe-text-properties) "descr-text"
-;;;;;;  "descr-text.el" (17331 26860))
+;;;;;;  "descr-text.el" (17390 26936))
 ;;; Generated autoloads from descr-text.el
 
 (autoload (quote describe-text-properties) "descr-text" "\
@@ -6293,7 +6310,7 @@ as well as widgets, buttons, overlays, and text properties.
 
 ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir
 ;;;;;;  desktop-load-default desktop-read desktop-locals-to-save
-;;;;;;  desktop-save-mode) "desktop" "desktop.el" (17374 21429))
+;;;;;;  desktop-save-mode) "desktop" "desktop.el" (17390 27404))
 ;;; Generated autoloads from desktop.el
 
 (defvar desktop-save-mode nil "\
@@ -6458,7 +6475,7 @@ Revert to the last loaded desktop.
 ;;;;;;  gnus-article-outlook-repair-attribution gnus-article-outlook-unwrap-lines
 ;;;;;;  gnus-outlook-display-hook gnus-outlook-deuglify-unwrap-max
 ;;;;;;  gnus-outlook-deuglify-unwrap-min) "deuglify" "gnus/deuglify.el"
-;;;;;;  (17279 27079))
+;;;;;;  (17383 38804))
 ;;; Generated autoloads from gnus/deuglify.el
 
 (defvar gnus-outlook-deuglify-unwrap-min 45 "\
@@ -6525,7 +6542,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
-;;;;;;  "calendar/diary-lib.el" (17308 43144))
+;;;;;;  "calendar/diary-lib.el" (17390 27324))
 ;;; Generated autoloads from calendar/diary-lib.el
 
 (autoload (quote diary) "diary-lib" "\
@@ -6571,7 +6588,7 @@ Major mode for editing the diary file.
 ;;;***
 
 ;;;### (autoloads (diff-backup diff diff-command diff-switches) "diff"
-;;;;;;  "diff.el" (17279 27171))
+;;;;;;  "diff.el" (17390 26936))
 ;;; Generated autoloads from diff.el
 
 (defvar diff-switches "-c" "\
@@ -6605,7 +6622,7 @@ With prefix arg, prompt for diff switches.
 ;;;***
 
 ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "diff-mode.el"
-;;;;;;  (17279 27185))
+;;;;;;  (17441 26677))
 ;;; Generated autoloads from diff-mode.el
 
 (autoload (quote diff-mode) "diff-mode" "\
@@ -6634,7 +6651,7 @@ Minor mode for viewing/editing context diffs.
 ;;;;;;  dired dired-copy-preserve-time dired-dwim-target dired-keep-marker-symlink
 ;;;;;;  dired-keep-marker-hardlink dired-keep-marker-copy dired-keep-marker-rename
 ;;;;;;  dired-trivial-filenames dired-ls-F-marks-symlinks dired-listing-switches)
-;;;;;;  "dired" "dired.el" (17374 21275))
+;;;;;;  "dired" "dired.el" (17396 42158))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches "-al" "\
@@ -6839,7 +6856,7 @@ Keybindings:
 ;;;;;;  dired-run-shell-command dired-do-shell-command dired-clean-directory
 ;;;;;;  dired-do-print dired-do-touch dired-do-chown dired-do-chgrp
 ;;;;;;  dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" (17357 6510))
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" (17390 26936))
 ;;; Generated autoloads from dired-aux.el
 
 (autoload (quote dired-diff) "dired-aux" "\
@@ -7247,7 +7264,7 @@ true then the type of the file linked to by FILE is printed instead.
 
 ;;;***
 
-;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17279 27201))
+;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17390 27370))
 ;;; Generated autoloads from dired-x.el
 
 (autoload (quote dired-jump) "dired-x" "\
@@ -7261,7 +7278,7 @@ buffer and try again.
 
 ;;;***
 
-;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17279 27122))
+;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17390 26937))
 ;;; Generated autoloads from dirtrack.el
 
 (autoload (quote dirtrack) "dirtrack" "\
@@ -7280,8 +7297,8 @@ You can enable directory tracking by adding this function to
 
 ;;;***
 
-;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17279
-;;;;;;  27122))
+;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17390
+;;;;;;  26938))
 ;;; Generated autoloads from emacs-lisp/disass.el
 
 (autoload (quote disassemble) "disass" "\
@@ -7299,7 +7316,7 @@ redefine OBJECT if it is a symbol.
 ;;;;;;  standard-display-graphic standard-display-g1 standard-display-ascii
 ;;;;;;  standard-display-default standard-display-8bit describe-current-display-table
 ;;;;;;  describe-display-table set-display-table-slot display-table-slot
-;;;;;;  make-display-table) "disp-table" "disp-table.el" (17307 17624))
+;;;;;;  make-display-table) "disp-table" "disp-table.el" (17390 26937))
 ;;; Generated autoloads from disp-table.el
 
 (autoload (quote make-display-table) "disp-table" "\
@@ -7400,7 +7417,7 @@ for users who call this function in `.emacs'.
 ;;;***
 
 ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17383 38807))
 ;;; Generated autoloads from play/dissociate.el
 
 (autoload (quote dissociated-press) "dissociate" "\
@@ -7416,7 +7433,7 @@ Default is 2.
 
 ;;;***
 
-;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17279 27171))
+;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17390 26937))
 ;;; Generated autoloads from dnd.el
 
 (defvar dnd-protocol-alist (quote (("^file:///" . dnd-open-local-file) ("^file://" . dnd-open-file) ("^file:" . dnd-open-local-file))) "\
@@ -7437,7 +7454,7 @@ if some action was made, or nil if the URL is ignored.")
 ;;;***
 
 ;;;### (autoloads (dns-mode-soa-increment-serial dns-mode) "dns-mode"
-;;;;;;  "textmodes/dns-mode.el" (17279 27123))
+;;;;;;  "textmodes/dns-mode.el" (17390 26946))
 ;;; Generated autoloads from textmodes/dns-mode.el
 
 (autoload (quote dns-mode) "dns-mode" "\
@@ -7471,7 +7488,7 @@ Switch to *doctor* buffer and start giving psychotherapy.
 ;;;***
 
 ;;;### (autoloads (double-mode double-mode) "double" "double.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26937))
 ;;; Generated autoloads from double.el
 
 (defvar double-mode nil "\
@@ -7492,7 +7509,7 @@ when pressed twice.  See variable `double-map' for details.
 
 ;;;***
 
-;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17279 27123))
+;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17383 38807))
 ;;; Generated autoloads from play/dunnet.el
 
 (autoload (quote dunnet) "dunnet" "\
@@ -7503,7 +7520,7 @@ Switch to *dungeon* buffer and start game.
 ;;;***
 
 ;;;### (autoloads (gnus-earcon-display) "earcon" "gnus/earcon.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/earcon.el
 
 (autoload (quote gnus-earcon-display) "earcon" "\
@@ -7515,7 +7532,7 @@ Play sounds in message buffers.
 
 ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap
 ;;;;;;  define-global-minor-mode define-minor-mode) "easy-mmode"
-;;;;;;  "emacs-lisp/easy-mmode.el" (17307 17624))
+;;;;;;  "emacs-lisp/easy-mmode.el" (17390 26938))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
 (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode))
@@ -7607,8 +7624,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX).
 ;;;***
 
 ;;;### (autoloads (easy-menu-change easy-menu-create-menu easy-menu-do-define
-;;;;;;  easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17279
-;;;;;;  27198))
+;;;;;;  easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17390
+;;;;;;  26938))
 ;;; Generated autoloads from emacs-lisp/easymenu.el
 
 (put (quote easy-menu-define) (quote lisp-indent-function) (quote defun))
@@ -7753,7 +7770,7 @@ To implement dynamic menus, either call this from
 ;;;;;;  ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer ebnf-spool-file
 ;;;;;;  ebnf-spool-directory ebnf-print-region ebnf-print-buffer
 ;;;;;;  ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps"
-;;;;;;  "progmodes/ebnf2ps.el" (17279 27172))
+;;;;;;  "progmodes/ebnf2ps.el" (17390 27408))
 ;;; Generated autoloads from progmodes/ebnf2ps.el
 
 (autoload (quote ebnf-customize) "ebnf2ps" "\
@@ -8012,8 +8029,8 @@ See `ebnf-style-database' documentation.
 ;;;;;;  ebrowse-tags-find-declaration-other-window ebrowse-tags-find-definition
 ;;;;;;  ebrowse-tags-view-definition ebrowse-tags-find-declaration
 ;;;;;;  ebrowse-tags-view-declaration ebrowse-member-mode ebrowse-electric-choose-tree
-;;;;;;  ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (17322
-;;;;;;  60506))
+;;;;;;  ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (17396
+;;;;;;  42159))
 ;;; Generated autoloads from progmodes/ebrowse.el
 
 (autoload (quote ebrowse-tree-mode) "ebrowse" "\
@@ -8164,7 +8181,7 @@ Display statistics for a class tree.
 ;;;***
 
 ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el"
-;;;;;;  (17322 60322))
+;;;;;;  (17390 26937))
 ;;; Generated autoloads from ebuff-menu.el
 
 (autoload (quote electric-buffer-list) "ebuff-menu" "\
@@ -8189,7 +8206,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry.
 ;;;***
 
 ;;;### (autoloads (Electric-command-history-redo-expression) "echistory"
-;;;;;;  "echistory.el" (17322 60525))
+;;;;;;  "echistory.el" (17390 26937))
 ;;; Generated autoloads from echistory.el
 
 (autoload (quote Electric-command-history-redo-expression) "echistory" "\
@@ -8202,7 +8219,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing.
 
 ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form
 ;;;;;;  def-edebug-spec edebug-all-forms edebug-all-defs) "edebug"
-;;;;;;  "emacs-lisp/edebug.el" (17331 26267))
+;;;;;;  "emacs-lisp/edebug.el" (17418 6751))
 ;;; Generated autoloads from emacs-lisp/edebug.el
 
 (defvar edebug-all-defs nil "\
@@ -8275,7 +8292,7 @@ Toggle edebugging of all forms.
 ;;;;;;  ediff-merge-directory-revisions ediff-merge-directories-with-ancestor
 ;;;;;;  ediff-merge-directories ediff-directories3 ediff-directory-revisions
 ;;;;;;  ediff-directories ediff-buffers3 ediff-buffers ediff-backup
-;;;;;;  ediff-files3 ediff-files) "ediff" "ediff.el" (17297 42806))
+;;;;;;  ediff-files3 ediff-files) "ediff" "ediff.el" (17401 60343))
 ;;; Generated autoloads from ediff.el
 
 (autoload (quote ediff-files) "ediff" "\
@@ -8513,7 +8530,7 @@ With optional NODE, goes to that node.
 ;;;***
 
 ;;;### (autoloads (ediff-customize) "ediff-help" "ediff-help.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17401 60342))
 ;;; Generated autoloads from ediff-help.el
 
 (autoload (quote ediff-customize) "ediff-help" "\
@@ -8523,7 +8540,7 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17279 27122))
+;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17401 60342))
 ;;; Generated autoloads from ediff-hook.el
 
 (defvar ediff-window-setup-function)
@@ -8536,7 +8553,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el"
-;;;;;;  (17376 5576))
+;;;;;;  (17401 60342))
 ;;; Generated autoloads from ediff-mult.el
 
 (autoload (quote ediff-show-registry) "ediff-mult" "\
@@ -8549,7 +8566,7 @@ Display Ediff's registry.
 ;;;***
 
 ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
-;;;;;;  "ediff-util" "ediff-util.el" (17279 27201))
+;;;;;;  "ediff-util" "ediff-util.el" (17401 60342))
 ;;; Generated autoloads from ediff-util.el
 
 (autoload (quote ediff-toggle-multiframe) "ediff-util" "\
@@ -8570,7 +8587,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see.
 
 ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro
 ;;;;;;  edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el"
-;;;;;;  (17279 27194))
+;;;;;;  (17390 26937))
 ;;; Generated autoloads from edmacro.el
 
 (defvar edmacro-eight-bits nil "\
@@ -8623,7 +8640,7 @@ or nil, use a compact 80-column format.
 ;;;***
 
 ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt"
-;;;;;;  "emulation/edt.el" (17279 27122))
+;;;;;;  "emulation/edt.el" (17390 26938))
 ;;; Generated autoloads from emulation/edt.el
 
 (autoload (quote edt-set-scroll-margins) "edt" "\
@@ -8641,7 +8658,7 @@ Turn on EDT Emulation.
 ;;;***
 
 ;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26937))
 ;;; Generated autoloads from ehelp.el
 
 (autoload (quote with-electric-help) "ehelp" "\
@@ -8679,7 +8696,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string)
-;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (17279 27171))
+;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (17390 26938))
 ;;; Generated autoloads from emacs-lisp/eldoc.el
 
 (defvar eldoc-minor-mode-string " ElDoc" "\
@@ -8717,8 +8734,8 @@ Emacs Lisp mode) that support Eldoc.")
 
 ;;;***
 
-;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17279
-;;;;;;  27122))
+;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17390
+;;;;;;  26937))
 ;;; Generated autoloads from elide-head.el
 
 (autoload (quote elide-head) "elide-head" "\
@@ -8734,7 +8751,7 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks.
 ;;;***
 
 ;;;### (autoloads (elint-initialize) "elint" "emacs-lisp/elint.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emacs-lisp/elint.el
 
 (autoload (quote elint-initialize) "elint" "\
@@ -8745,8 +8762,8 @@ Initialize elint.
 ;;;***
 
 ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list
-;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (17297
-;;;;;;  42808))
+;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (17390
+;;;;;;  26938))
 ;;; Generated autoloads from emacs-lisp/elp.el
 
 (autoload (quote elp-instrument-function) "elp" "\
@@ -8780,7 +8797,7 @@ displayed.
 ;;;***
 
 ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el"
-;;;;;;  (17350 14840))
+;;;;;;  (17444 1970))
 ;;; Generated autoloads from mail/emacsbug.el
 
 (autoload (quote report-emacs-bug) "emacsbug" "\
@@ -8886,7 +8903,7 @@ DISPLAY may be a display id, a frame, or nil for the selected frame's display.
 ;;;***
 
 ;;;### (autoloads (enriched-decode enriched-encode enriched-mode)
-;;;;;;  "enriched" "textmodes/enriched.el" (17279 27123))
+;;;;;;  "enriched" "textmodes/enriched.el" (17390 26946))
 ;;; Generated autoloads from textmodes/enriched.el
 
 (autoload (quote enriched-mode) "enriched" "\
@@ -8917,7 +8934,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (erc-select erc-select-read-args) "erc" "erc/erc.el"
-;;;;;;  (17383 37956))
+;;;;;;  (17454 30949))
 ;;; Generated autoloads from erc/erc.el
 
 (autoload (quote erc-select-read-args) "erc" "\
@@ -8944,21 +8961,14 @@ be invoked for those parameters' values
 
 ;;;***
 
-;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17374
-;;;;;;  21559))
+;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17396
+;;;;;;  42158))
 ;;; Generated autoloads from erc/erc-autoaway.el
  (autoload 'erc-autoaway-mode "erc-autoaway")
 
 ;;;***
 
-;;;### (autoloads nil "erc-autojoin" "erc/erc-autojoin.el" (17383
-;;;;;;  37955))
-;;; Generated autoloads from erc/erc-autojoin.el
- (autoload 'erc-autojoin-mode "erc-autojoin" nil t)
-
-;;;***
-
-;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17374 21559))
+;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17454 30949))
 ;;; Generated autoloads from erc/erc-button.el
  (autoload 'erc-button-mode "erc-button" nil t)
 
@@ -8970,21 +8980,8 @@ be invoked for those parameters' values
 
 ;;;***
 
-;;;### (autoloads (erc-complete) "erc-complete" "erc/erc-complete.el"
-;;;;;;  (17383 37956))
-;;; Generated autoloads from erc/erc-complete.el
-
-(autoload (quote erc-complete) "erc-complete" "\
-Complete nick at point.
-See `erc-try-complete-nick' for more technical info.
-This function is obsolete, use `erc-pcomplete' instead.
-
-\(fn)" t nil)
-
-;;;***
-
 ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC)
-;;;;;;  "erc-dcc" "erc/erc-dcc.el" (17374 21559))
+;;;;;;  "erc-dcc" "erc/erc-dcc.el" (17396 42163))
 ;;; Generated autoloads from erc/erc-dcc.el
 
 (autoload (quote erc-cmd-DCC) "erc-dcc" "\
@@ -9016,7 +9013,7 @@ that subcommand.
 ;;;;;;  erc-ezb-add-session erc-ezb-end-of-session-list erc-ezb-init-session-list
 ;;;;;;  erc-ezb-identify erc-ezb-notice-autodetect erc-ezb-lookup-action
 ;;;;;;  erc-ezb-get-login erc-cmd-ezb) "erc-ezbounce" "erc/erc-ezbounce.el"
-;;;;;;  (17374 21559))
+;;;;;;  (17396 42158))
 ;;; Generated autoloads from erc/erc-ezbounce.el
 
 (autoload (quote erc-cmd-ezb) "erc-ezbounce" "\
@@ -9078,8 +9075,8 @@ Add EZBouncer convenience functions to ERC.
 
 ;;;***
 
-;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17374
-;;;;;;  21559))
+;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17396
+;;;;;;  42158))
 ;;; Generated autoloads from erc/erc-fill.el
  (autoload 'erc-fill-mode "erc-fill" nil t)
 
@@ -9091,8 +9088,36 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'.
 
 ;;;***
 
+;;;### (autoloads nil "erc-hecomplete" "erc/erc-hecomplete.el" (17396
+;;;;;;  42158))
+;;; Generated autoloads from erc/erc-hecomplete.el
+ (autoload 'erc-hecomplete-mode "erc-hecomplete" nil t)
+
+;;;***
+
+;;;### (autoloads (erc-identd-stop erc-identd-start) "erc-identd"
+;;;;;;  "erc/erc-identd.el" (17454 30949))
+;;; Generated autoloads from erc/erc-identd.el
+
+(autoload (quote erc-identd-start) "erc-identd" "\
+Start an identd server listening to port 8113.
+Port 113 (auth) will need to be redirected to port 8113 on your
+machine -- using iptables, or a program like redir which can be
+run from inetd.  The idea is to provide a simple identd server
+when you need one, without having to install one globally on your
+system.
+
+\(fn &optional PORT)" t nil)
+
+(autoload (quote erc-identd-stop) "erc-identd" "\
+Not documented
+
+\(fn &rest IGNORE)" t nil)
+
+;;;***
+
 ;;;### (autoloads (erc-create-imenu-index) "erc-imenu" "erc/erc-imenu.el"
-;;;;;;  (17374 21559))
+;;;;;;  (17396 42158))
 ;;; Generated autoloads from erc/erc-imenu.el
 
 (autoload (quote erc-create-imenu-index) "erc-imenu" "\
@@ -9102,11 +9127,18 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (erc-chanlist erc-cmd-LIST) "erc-list" "erc/erc-list.el"
-;;;;;;  (17374 21559))
+;;;### (autoloads nil "erc-join" "erc/erc-join.el" (17396 42158))
+;;; Generated autoloads from erc/erc-join.el
+ (autoload 'erc-autojoin-mode "erc-join" nil t)
+
+;;;***
+
+;;;### (autoloads (erc-chanlist erc-list-channels) "erc-list" "erc/erc-list.el"
+;;;;;;  (17396 42158))
 ;;; Generated autoloads from erc/erc-list.el
+ (autoload 'erc-list-mode "erc-list")
 
-(autoload (quote erc-cmd-LIST) "erc-list" "\
+(autoload (quote erc-list-channels) "erc-list" "\
 Display a buffer containing a list of channels on the current server.
 Optional argument CHANNEL specifies a single channel to list (instead of every
 available channel).
@@ -9123,7 +9155,7 @@ to RFC and send the LIST header (#321) at start of list transmission.
 ;;;***
 
 ;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log"
-;;;;;;  "erc/erc-log.el" (17374 21559))
+;;;;;;  "erc/erc-log.el" (17396 42158))
 ;;; Generated autoloads from erc/erc-log.el
  (autoload 'erc-log-mode "erc-log" nil t)
 
@@ -9155,7 +9187,7 @@ You can save every individual message by putting this function on
 ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host
 ;;;;;;  erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool
 ;;;;;;  erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el"
-;;;;;;  (17374 21559))
+;;;;;;  (17396 42158))
 ;;; Generated autoloads from erc/erc-match.el
  (autoload 'erc-match-mode "erc-match")
 
@@ -9201,26 +9233,8 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'.
 
 ;;;***
 
-;;;### (autoloads (erc-server-select erc-determine-network) "erc-nets"
-;;;;;;  "erc/erc-nets.el" (17374 21559))
-;;; Generated autoloads from erc/erc-nets.el
-
-(autoload (quote erc-determine-network) "erc-nets" "\
-Return the name of the network or \"Unknown\" as a symbol.  Use the
-server parameter NETWORK if provided, otherwise parse the server name and
-search for a match in `erc-networks-alist'.
-
-\(fn)" nil nil)
-
-(autoload (quote erc-server-select) "erc-nets" "\
-Interactively select a server to connect to using `erc-server-alist'.
-
-\(fn)" t nil)
-
-;;;***
-
 ;;;### (autoloads (erc-cmd-WHOLEFT) "erc-netsplit" "erc/erc-netsplit.el"
-;;;;;;  (17374 21559))
+;;;;;;  (17396 42158))
 ;;; Generated autoloads from erc/erc-netsplit.el
  (autoload 'erc-netsplit-mode "erc-netsplit")
 
@@ -9231,26 +9245,26 @@ Show who's gone.
 
 ;;;***
 
-;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode)
-;;;;;;  "erc-nickserv" "erc/erc-nickserv.el" (17374 21559))
-;;; Generated autoloads from erc/erc-nickserv.el
- (autoload 'erc-services-mode "erc-nickserv" nil t)
+;;;### (autoloads (erc-server-select erc-determine-network) "erc-networks"
+;;;;;;  "erc/erc-networks.el" (17396 42158))
+;;; Generated autoloads from erc/erc-networks.el
 
-(autoload (quote erc-nickserv-identify-mode) "erc-nickserv" "\
-Set up hooks according to which MODE the user has chosen.
+(autoload (quote erc-determine-network) "erc-networks" "\
+Return the name of the network or \"Unknown\" as a symbol.  Use the
+server parameter NETWORK if provided, otherwise parse the server name and
+search for a match in `erc-networks-alist'.
 
-\(fn MODE)" t nil)
+\(fn)" nil nil)
 
-(autoload (quote erc-nickserv-identify) "erc-nickserv" "\
-Send an \"identify <PASSWORD>\" message to NickServ.
-When called interactively, read the password using `read-passwd'.
+(autoload (quote erc-server-select) "erc-networks" "\
+Interactively select a server to connect to using `erc-server-alist'.
 
-\(fn PASSWORD)" t nil)
+\(fn)" t nil)
 
 ;;;***
 
 ;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify"
-;;;;;;  "erc/erc-notify.el" (17374 21559))
+;;;;;;  "erc/erc-notify.el" (17396 42158))
 ;;; Generated autoloads from erc/erc-notify.el
  (autoload 'erc-notify-mode "erc-notify" nil t)
 
@@ -9268,39 +9282,57 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads nil "erc-page" "erc/erc-page.el" (17374 21559))
+;;;### (autoloads nil "erc-page" "erc/erc-page.el" (17396 42158))
 ;;; Generated autoloads from erc/erc-page.el
  (autoload 'erc-page-mode "erc-page")
 
 ;;;***
 
-;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17374
-;;;;;;  21559))
+;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17396
+;;;;;;  42158))
 ;;; Generated autoloads from erc/erc-pcomplete.el
  (autoload 'erc-completion-mode "erc-pcomplete" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (17374 21559))
+;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (17396 42158))
 ;;; Generated autoloads from erc/erc-replace.el
  (autoload 'erc-replace-mode "erc-replace")
 
 ;;;***
 
-;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17374 21559))
+;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17396 42158))
 ;;; Generated autoloads from erc/erc-ring.el
  (autoload 'erc-ring-mode "erc-ring" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (17374 21559))
+;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode)
+;;;;;;  "erc-services" "erc/erc-services.el" (17396 42158))
+;;; Generated autoloads from erc/erc-services.el
+ (autoload 'erc-services-mode "erc-services" nil t)
+
+(autoload (quote erc-nickserv-identify-mode) "erc-services" "\
+Set up hooks according to which MODE the user has chosen.
+
+\(fn MODE)" t nil)
+
+(autoload (quote erc-nickserv-identify) "erc-services" "\
+Send an \"identify <PASSWORD>\" message to NickServ.
+When called interactively, read the password using `read-passwd'.
+
+\(fn PASSWORD)" t nil)
+
+;;;***
+
+;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (17396 42158))
 ;;; Generated autoloads from erc/erc-sound.el
  (autoload 'erc-sound-mode "erc-sound")
 
 ;;;***
 
 ;;;### (autoloads (erc-speedbar-browser) "erc-speedbar" "erc/erc-speedbar.el"
-;;;;;;  (17374 21565))
+;;;;;;  (17396 42158))
 ;;; Generated autoloads from erc/erc-speedbar.el
 
 (autoload (quote erc-speedbar-browser) "erc-speedbar" "\
@@ -9311,20 +9343,20 @@ This will add a speedbar major display mode.
 
 ;;;***
 
-;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17383
-;;;;;;  37956))
+;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17396
+;;;;;;  42158))
 ;;; Generated autoloads from erc/erc-spelling.el
  (autoload 'erc-spelling-mode "erc-spelling" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17383 37955))
+;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17396 42169))
 ;;; Generated autoloads from erc/erc-stamp.el
  (autoload 'erc-timestamp-mode "erc-stamp" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17374 21559))
+;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17396 42158))
 ;;; Generated autoloads from erc/erc-track.el
  (autoload 'erc-track-mode "erc-track" nil t)
  (autoload 'erc-track-when-inactive-mode "erc-track" nil t)
@@ -9332,7 +9364,7 @@ This will add a speedbar major display mode.
 ;;;***
 
 ;;;### (autoloads (erc-truncate-buffer erc-truncate-buffer-to-size)
-;;;;;;  "erc-truncate" "erc/erc-truncate.el" (17374 21559))
+;;;;;;  "erc-truncate" "erc/erc-truncate.el" (17396 42158))
 ;;; Generated autoloads from erc/erc-truncate.el
  (autoload 'erc-truncate-mode "erc-truncate" nil t)
 
@@ -9352,7 +9384,7 @@ Meant to be used in hooks, like `erc-insert-post-hook'.
 ;;;***
 
 ;;;### (autoloads (erc-xdcc-add-file) "erc-xdcc" "erc/erc-xdcc.el"
-;;;;;;  (17374 21559))
+;;;;;;  (17396 42158))
 ;;; Generated autoloads from erc/erc-xdcc.el
 
 (autoload (quote erc-xdcc-add-file) "erc-xdcc" "\
@@ -9362,8 +9394,8 @@ Add a file to `erc-xdcc-files'.
 
 ;;;***
 
-;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17279
-;;;;;;  27122))
+;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17390
+;;;;;;  26939))
 ;;; Generated autoloads from eshell/esh-mode.el
 
 (autoload (quote eshell-mode) "esh-mode" "\
@@ -9375,8 +9407,8 @@ Emacs shell interactive mode.
 
 ;;;***
 
-;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17279
-;;;;;;  27122))
+;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17390
+;;;;;;  26939))
 ;;; Generated autoloads from eshell/esh-test.el
 
 (autoload (quote eshell-test) "esh-test" "\
@@ -9387,7 +9419,7 @@ Test Eshell to verify that it works as expected.
 ;;;***
 
 ;;;### (autoloads (eshell-report-bug eshell-command-result eshell-command
-;;;;;;  eshell) "eshell" "eshell/eshell.el" (17279 27122))
+;;;;;;  eshell) "eshell" "eshell/eshell.el" (17427 42815))
 ;;; Generated autoloads from eshell/eshell.el
 
 (autoload (quote eshell) "eshell" "\
@@ -9433,7 +9465,7 @@ Please include any configuration details that might be involved.
 ;;;;;;  visit-tags-table tags-table-mode 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"
-;;;;;;  (17279 27189))
+;;;;;;  (17411 11766))
 ;;; Generated autoloads from progmodes/etags.el
 
 (defvar tags-file-name nil "\
@@ -9930,7 +9962,7 @@ Transcribe Ethiopic characters in ASCII depending on the file extension.
 
 ;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline
 ;;;;;;  eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el"
-;;;;;;  (17279 27198))
+;;;;;;  (17390 26944))
 ;;; Generated autoloads from net/eudc.el
 
 (autoload (quote eudc-set-server) "eudc" "\
@@ -9986,7 +10018,7 @@ This does nothing except loading eudc by autoload side-effect.
 
 ;;;### (autoloads (eudc-display-jpeg-as-button eudc-display-jpeg-inline
 ;;;;;;  eudc-display-sound eudc-display-mail eudc-display-url eudc-display-generic-binary)
-;;;;;;  "eudc-bob" "net/eudc-bob.el" (17279 27123))
+;;;;;;  "eudc-bob" "net/eudc-bob.el" (17390 26944))
 ;;; Generated autoloads from net/eudc-bob.el
 
 (autoload (quote eudc-display-generic-binary) "eudc-bob" "\
@@ -10022,7 +10054,7 @@ Display a button for the JPEG DATA.
 ;;;***
 
 ;;;### (autoloads (eudc-try-bbdb-insert eudc-insert-record-at-point-into-bbdb)
-;;;;;;  "eudc-export" "net/eudc-export.el" (17279 27123))
+;;;;;;  "eudc-export" "net/eudc-export.el" (17390 26944))
 ;;; Generated autoloads from net/eudc-export.el
 
 (autoload (quote eudc-insert-record-at-point-into-bbdb) "eudc-export" "\
@@ -10039,7 +10071,7 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record.
 ;;;***
 
 ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26944))
 ;;; Generated autoloads from net/eudc-hotlist.el
 
 (autoload (quote eudc-edit-hotlist) "eudc-hotlist" "\
@@ -10052,7 +10084,7 @@ Edit the hotlist of directory servers in a specialized buffer.
 ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p
 ;;;;;;  executable-self-display executable-set-magic executable-interpret
 ;;;;;;  executable-command-find-posix-p) "executable" "progmodes/executable.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 27408))
 ;;; Generated autoloads from progmodes/executable.el
 
 (autoload (quote executable-command-find-posix-p) "executable" "\
@@ -10094,7 +10126,7 @@ file modes.
 ;;;***
 
 ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot
-;;;;;;  expand-add-abbrevs) "expand" "expand.el" (17279 27122))
+;;;;;;  expand-add-abbrevs) "expand" "expand.el" (17390 26939))
 ;;; Generated autoloads from expand.el
 
 (autoload (quote expand-add-abbrevs) "expand" "\
@@ -10137,7 +10169,7 @@ This is used only in conjunction with `expand-add-abbrevs'.
 
 ;;;***
 
-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17279 27203))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17390 27324))
 ;;; Generated autoloads from progmodes/f90.el
 
 (autoload (quote f90-mode) "f90" "\
@@ -10204,7 +10236,7 @@ with no args, if that value is non-nil.
 ;;;;;;  facemenu-remove-all facemenu-remove-face-props facemenu-set-read-only
 ;;;;;;  facemenu-set-intangible facemenu-set-invisible facemenu-set-face-from-menu
 ;;;;;;  facemenu-set-background facemenu-set-foreground facemenu-set-face)
-;;;;;;  "facemenu" "facemenu.el" (17307 25810))
+;;;;;;  "facemenu" "facemenu.el" (17390 26939))
 ;;; Generated autoloads from facemenu.el
  (define-key global-map "\M-o" 'facemenu-keymap)
  (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap)
@@ -10367,7 +10399,7 @@ argument BUFFER-NAME is nil, it defaults to *Colors*.
 ;;;***
 
 ;;;### (autoloads (turn-on-fast-lock fast-lock-mode) "fast-lock"
-;;;;;;  "obsolete/fast-lock.el" (17279 27172))
+;;;;;;  "obsolete/fast-lock.el" (17383 38806))
 ;;; Generated autoloads from obsolete/fast-lock.el
 
 (autoload (quote fast-lock-mode) "fast-lock" "\
@@ -10462,7 +10494,7 @@ you can set feedmail-queue-reminder-alist to nil.
 ;;;***
 
 ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu
-;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (17307 25810))
+;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (17401 60343))
 ;;; Generated autoloads from ffap.el
 
 (autoload (quote ffap-next) "ffap" "\
@@ -10519,7 +10551,7 @@ Evaluate the forms in variable `ffap-bindings'.
 ;;;***
 
 ;;;### (autoloads (file-cache-minibuffer-complete) "filecache" "filecache.el"
-;;;;;;  (17307 25810))
+;;;;;;  (17390 26939))
 ;;; Generated autoloads from filecache.el
 
 (autoload (quote file-cache-minibuffer-complete) "filecache" "\
@@ -10537,8 +10569,8 @@ the name is considered already unique; only the second substitution
 
 ;;;***
 
-;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17307
-;;;;;;  25810))
+;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17390
+;;;;;;  26939))
 ;;; Generated autoloads from filesets.el
 
 (autoload (quote filesets-init) "filesets" "\
@@ -10551,7 +10583,7 @@ Set up hooks, load the cache file -- if existing -- and build the menu.
 
 ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options
 ;;;;;;  find-ls-subdir-switches find-ls-option) "find-dired" "find-dired.el"
-;;;;;;  (17307 25810))
+;;;;;;  (17390 26939))
 ;;; 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"))) "\
@@ -10612,7 +10644,7 @@ Thus ARG can also contain additional grep options.
 
 ;;;### (autoloads (ff-mouse-find-other-file-other-window ff-mouse-find-other-file
 ;;;;;;  ff-find-other-file ff-get-other-file) "find-file" "find-file.el"
-;;;;;;  (17307 25810))
+;;;;;;  (17390 26939))
 ;;; Generated autoloads from find-file.el
 
 (defvar ff-special-constructs (quote (("^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]" lambda nil (setq fname (buffer-substring (match-beginning 2) (match-end 2)))))) "\
@@ -10704,7 +10736,7 @@ Visit the file you click on in another window.
 ;;;;;;  find-variable find-variable-noselect find-function-other-frame
 ;;;;;;  find-function-other-window find-function find-function-noselect
 ;;;;;;  find-function-search-for-symbol find-library) "find-func"
-;;;;;;  "emacs-lisp/find-func.el" (17383 37959))
+;;;;;;  "emacs-lisp/find-func.el" (17411 12435))
 ;;; Generated autoloads from emacs-lisp/find-func.el
 
 (autoload (quote find-library) "find-func" "\
@@ -10852,7 +10884,7 @@ Define some key bindings for the find-function family of functions.
 ;;;***
 
 ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories
-;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (17307 25810))
+;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (17396 42165))
 ;;; Generated autoloads from find-lisp.el
 
 (autoload (quote find-lisp-find-dired) "find-lisp" "\
@@ -10873,7 +10905,7 @@ Change the filter on a find-lisp-find-dired buffer to REGEXP.
 ;;;***
 
 ;;;### (autoloads (finder-by-keyword finder-commentary finder-list-keywords)
-;;;;;;  "finder" "finder.el" (17307 25810))
+;;;;;;  "finder" "finder.el" (17390 26939))
 ;;; Generated autoloads from finder.el
 
 (autoload (quote finder-list-keywords) "finder" "\
@@ -10895,7 +10927,7 @@ Find packages matching a given keyword.
 ;;;***
 
 ;;;### (autoloads (enable-flow-control-on enable-flow-control) "flow-ctrl"
-;;;;;;  "flow-ctrl.el" (17323 25263))
+;;;;;;  "flow-ctrl.el" (17390 26939))
 ;;; Generated autoloads from flow-ctrl.el
 
 (autoload (quote enable-flow-control) "flow-ctrl" "\
@@ -10917,7 +10949,7 @@ to get the effect of a C-q.
 ;;;***
 
 ;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el"
-;;;;;;  (17279 27198))
+;;;;;;  (17412 30474))
 ;;; Generated autoloads from gnus/flow-fill.el
 
 (autoload (quote fill-flowed-encode) "flow-fill" "\
@@ -10933,7 +10965,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode)
-;;;;;;  "flymake" "progmodes/flymake.el" (17350 14840))
+;;;;;;  "flymake" "progmodes/flymake.el" (17396 42171))
 ;;; Generated autoloads from progmodes/flymake.el
 
 (autoload (quote flymake-mode) "flymake" "\
@@ -10957,7 +10989,7 @@ Turn flymake mode off.
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  flyspell-mode flyspell-prog-mode) "flyspell" "textmodes/flyspell.el"
-;;;;;;  (17374 21550))
+;;;;;;  (17427 42815))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload (quote flyspell-prog-mode) "flyspell" "\
@@ -11016,7 +11048,7 @@ Flyspell whole buffer.
 
 ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode
 ;;;;;;  turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el"
-;;;;;;  (17307 25810))
+;;;;;;  (17390 26939))
 ;;; Generated autoloads from follow.el
 
 (autoload (quote turn-on-follow-mode) "follow" "\
@@ -11090,8 +11122,8 @@ in your `~/.emacs' file, replacing [f7] by your favourite key:
 
 ;;;***
 
-;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17390
+;;;;;;  26942))
 ;;; Generated autoloads from mail/footnote.el
 
 (autoload (quote footnote-mode) "footnote" "\
@@ -11112,7 +11144,7 @@ key		binding
 ;;;***
 
 ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode)
-;;;;;;  "forms" "forms.el" (17307 25810))
+;;;;;;  "forms" "forms.el" (17390 26939))
 ;;; Generated autoloads from forms.el
 
 (autoload (quote forms-mode) "forms" "\
@@ -11235,7 +11267,7 @@ with no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region
-;;;;;;  fortune-add-fortune) "fortune" "play/fortune.el" (17279 27123))
+;;;;;;  fortune-add-fortune) "fortune" "play/fortune.el" (17383 38807))
 ;;; Generated autoloads from play/fortune.el
 
 (autoload (quote fortune-add-fortune) "fortune" "\
@@ -11284,79 +11316,8 @@ and choose the directory as the fortune-file.
 
 ;;;***
 
-;;;### (autoloads (set-fringe-style fringe-mode fringe-mode) "fringe"
-;;;;;;  "fringe.el" (17307 25810))
-;;; Generated autoloads from fringe.el
-
-(defvar fringe-mode nil "\
-*Specify appearance of fringes on all frames.
-This variable can be nil (the default) meaning the fringes should have
-the default width (8 pixels), it can be an integer value specifying
-the width of both left and right fringe (where 0 means no fringe), or
-a cons cell where car indicates width of left fringe and cdr indicates
-width of right fringe (where again 0 can be used to indicate no
-fringe).
-To set this variable in a Lisp program, use `set-fringe-mode' to make
-it take real effect.
-Setting the variable with a customization buffer also takes effect.
-If you only want to modify the appearance of the fringe in one frame,
-you can use the interactive function `set-fringe-style'.")
-
-(custom-autoload (quote fringe-mode) "fringe")
-
-(autoload (quote fringe-mode) "fringe" "\
-Set the default appearance of fringes on all frames.
-
-When called interactively, query the user for MODE.  Valid values
-for MODE include `none', `default', `left-only', `right-only',
-`minimal' and `half'.
-
-When used in a Lisp program, MODE can be a cons cell where the
-integer in car specifies the left fringe width and the integer in
-cdr specifies the right fringe width.  MODE can also be a single
-integer that specifies both the left and the right fringe width.
-If a fringe width specification is nil, that means to use the
-default width (8 pixels).  This command may round up the left and
-right width specifications to ensure that their sum is a multiple
-of the character width of a frame.  It never rounds up a fringe
-width of 0.
-
-Fringe widths set by `set-window-fringes' override the default
-fringe widths set by this command.  This command applies to all
-frames that exist and frames to be created in the future.  If you
-want to set the default appearance of fringes on the selected
-frame only, see the command `set-fringe-style'.
-
-\(fn &optional MODE)" t nil)
-
-(autoload (quote set-fringe-style) "fringe" "\
-Set the default appearance of fringes on the selected frame.
-
-When called interactively, query the user for MODE.  Valid values
-for MODE include `none', `default', `left-only', `right-only',
-`minimal' and `half'.
-
-When used in a Lisp program, MODE can be a cons cell where the
-integer in car specifies the left fringe width and the integer in
-cdr specifies the right fringe width.  MODE can also be a single
-integer that specifies both the left and the right fringe width.
-If a fringe width specification is nil, that means to use the
-default width (8 pixels).  This command may round up the left and
-right width specifications to ensure that their sum is a multiple
-of the character width of a frame.  It never rounds up a fringe
-width of 0.
-
-Fringe widths set by `set-window-fringes' override the default
-fringe widths set by this command.  If you want to set the
-default appearance of fringes on all frames, see the command
-`fringe-mode'.
-
-\(fn &optional MODE)" t nil)
-
-;;;***
-
-;;;### (autoloads (gdb-enable-debug-log gdba) "gdb-ui" "progmodes/gdb-ui.el"
-;;;;;;  (17331 26860))
+;;;### (autoloads (gdb-enable-debug gdba) "gdb-ui" "progmodes/gdb-ui.el"
+;;;;;;  (17454 30835))
 ;;; Generated autoloads from progmodes/gdb-ui.el
 
 (autoload (quote gdba) "gdb-ui" "\
@@ -11371,9 +11332,9 @@ other with the source file with the main routine of the inferior.
 
 If `gdb-many-windows' is t, regardless of the value of
 `gdb-show-main', the layout below will appear unless
-`gdb-use-inferior-io-buffer' is nil when the source buffer
-occupies the full width of the frame.  Keybindings are given in
-relevant buffer.
+`gdb-use-separate-io-buffer' is nil when the source buffer
+occupies the full width of the frame.  Keybindings are shown in
+some of the buffers.
 
 Watch expressions appear in the speedbar/slowbar.
 
@@ -11386,41 +11347,41 @@ See Info node `(emacs)GDB Graphical Interface' for a more
 detailed description of this mode.
 
 
-+--------------------------------------------------------------+
-|                           GDB Toolbar                        |
-+-------------------------------+------------------------------+
-| GUD buffer (I/O of GDB)       | Locals buffer                |
-|                               |                              |
-|                               |                              |
-|                               |                              |
-+-------------------------------+------------------------------+
-| Source buffer                 | I/O buffer (of inferior)     |
-|                               | (comint-mode)                |
-|                               |                              |
-|                               |                              |
-|                               |                              |
-|                               |                              |
-|                               |                              |
-|                               |                              |
-+-------------------------------+------------------------------+
-| Stack buffer                  | Breakpoints buffer           |
-| RET      gdb-frames-select    | SPC    gdb-toggle-breakpoint |
-|                               | RET    gdb-goto-breakpoint   |
-|                               | d      gdb-delete-breakpoint |
-+-------------------------------+------------------------------+
++----------------------------------------------------------------------+
+|                               GDB Toolbar                            |
++-----------------------------------+----------------------------------+
+| GUD buffer (I/O of GDB)           | Locals buffer                    |
+|                                   |                                  |
+|                                   |                                  |
+|                                   |                                  |
++-----------------------------------+----------------------------------+
+| Source buffer                     | I/O buffer (of debugged program) |
+|                                   | (comint-mode)                    |
+|                                   |                                  |
+|                                   |                                  |
+|                                   |                                  |
+|                                   |                                  |
+|                                   |                                  |
+|                                   |                                  |
++-----------------------------------+----------------------------------+
+| Stack buffer                      | Breakpoints buffer               |
+| RET      gdb-frames-select        | SPC    gdb-toggle-breakpoint     |
+|                                   | RET    gdb-goto-breakpoint       |
+|                                   | D      gdb-delete-breakpoint     |
++-----------------------------------+----------------------------------+
 
 \(fn COMMAND-LINE)" t nil)
 
-(defvar gdb-enable-debug-log nil "\
-Non-nil means record the process input and output in `gdb-debug-log'.")
+(defvar gdb-enable-debug nil "\
+Non-nil means record the process input and output in `gdb-debug-ring'.")
 
-(custom-autoload (quote gdb-enable-debug-log) "gdb-ui")
+(custom-autoload (quote gdb-enable-debug) "gdb-ui")
 
 ;;;***
 
 ;;;### (autoloads (generic-make-keywords-list generic-mode generic-mode-internal
-;;;;;;  define-generic-mode) "generic" "emacs-lisp/generic.el" (17279
-;;;;;;  27122))
+;;;;;;  define-generic-mode) "generic" "emacs-lisp/generic.el" (17390
+;;;;;;  26938))
 ;;; Generated autoloads from emacs-lisp/generic.el
 
 (defvar generic-mode-list nil "\
@@ -11495,7 +11456,7 @@ regular expression that can be used as an element of
 ;;;***
 
 ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el"
-;;;;;;  (17337 56256))
+;;;;;;  (17407 3111))
 ;;; Generated autoloads from progmodes/glasses.el
 
 (autoload (quote glasses-mode) "glasses" "\
@@ -11508,7 +11469,7 @@ at places they belong to.
 ;;;***
 
 ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
-;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (17319 2463))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (17427 41288))
 ;;; Generated autoloads from gnus/gnus.el
 
 (autoload (quote gnus-slave-no-server) "gnus" "\
@@ -11559,7 +11520,7 @@ prompt the user for the name of an NNTP server to use.
 ;;;;;;  gnus-agent-get-undownloaded-list gnus-agent-delete-group
 ;;;;;;  gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize
 ;;;;;;  gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent"
-;;;;;;  "gnus/gnus-agent.el" (17319 2463))
+;;;;;;  "gnus/gnus-agent.el" (17441 26811))
 ;;; Generated autoloads from gnus/gnus-agent.el
 
 (autoload (quote gnus-unplugged) "gnus-agent" "\
@@ -11650,7 +11611,7 @@ If CLEAN, obsolete (ignore).
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (17374 21536))
+;;;;;;  (17441 26663))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload (quote gnus-article-prepare-display) "gnus-art" "\
@@ -11661,7 +11622,7 @@ Make the current buffer look like a nice article.
 ;;;***
 
 ;;;### (autoloads (gnus-audio-play) "gnus-audio" "gnus/gnus-audio.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/gnus-audio.el
 
 (autoload (quote gnus-audio-play) "gnus-audio" "\
@@ -11673,8 +11634,8 @@ Play a sound FILE through the speaker.
 
 ;;;### (autoloads (gnus-cache-delete-group gnus-cache-rename-group
 ;;;;;;  gnus-cache-generate-nov-databases gnus-cache-generate-active
-;;;;;;  gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17308
-;;;;;;  43142))
+;;;;;;  gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17383
+;;;;;;  38805))
 ;;; Generated autoloads from gnus/gnus-cache.el
 
 (autoload (quote gnus-jog-cache) "gnus-cache" "\
@@ -11716,7 +11677,7 @@ supported.
 ;;;***
 
 ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article)
-;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (17297 42917))
+;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (17383 38805))
 ;;; Generated autoloads from gnus/gnus-delay.el
 
 (autoload (quote gnus-delay-article) "gnus-delay" "\
@@ -11752,7 +11713,7 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil.
 ;;;***
 
 ;;;### (autoloads (turn-on-gnus-dired-mode) "gnus-dired" "gnus/gnus-dired.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/gnus-dired.el
 
 (autoload (quote turn-on-gnus-dired-mode) "gnus-dired" "\
@@ -11763,7 +11724,7 @@ Convenience method to turn on gnus-dired-mode.
 ;;;***
 
 ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17418 6749))
 ;;; Generated autoloads from gnus/gnus-draft.el
 
 (autoload (quote gnus-draft-reminder) "gnus-draft" "\
@@ -11775,8 +11736,8 @@ Reminder user if there are unsent drafts.
 
 ;;;### (autoloads (gnus-convert-png-to-face gnus-convert-face-to-png
 ;;;;;;  gnus-face-from-file gnus-x-face-from-file gnus-insert-random-x-face-header
-;;;;;;  gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (17279
-;;;;;;  27150))
+;;;;;;  gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (17383
+;;;;;;  38805))
 ;;; Generated autoloads from gnus/gnus-fun.el
 
 (autoload (quote gnus-random-x-face) "gnus-fun" "\
@@ -11815,7 +11776,7 @@ FILE should be a PNG file that's 48x48 and smaller than or equal to
 ;;;***
 
 ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group)
-;;;;;;  "gnus-group" "gnus/gnus-group.el" (17357 6512))
+;;;;;;  "gnus-group" "gnus/gnus-group.el" (17427 41288))
 ;;; Generated autoloads from gnus/gnus-group.el
 
 (autoload (quote gnus-fetch-group) "gnus-group" "\
@@ -11832,7 +11793,7 @@ Pop up a frame and enter GROUP.
 ;;;***
 
 ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/gnus-kill.el
 
 (defalias (quote gnus-batch-kill) (quote gnus-batch-score))
@@ -11847,7 +11808,7 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score
 
 ;;;### (autoloads (gnus-mailing-list-mode gnus-mailing-list-insinuate
 ;;;;;;  turn-on-gnus-mailing-list-mode) "gnus-ml" "gnus/gnus-ml.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/gnus-ml.el
 
 (autoload (quote turn-on-gnus-mailing-list-mode) "gnus-ml" "\
@@ -11872,7 +11833,7 @@ Minor mode for providing mailing-list commands.
 
 ;;;### (autoloads (gnus-group-split-fancy gnus-group-split gnus-group-split-update
 ;;;;;;  gnus-group-split-setup) "gnus-mlspl" "gnus/gnus-mlspl.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/gnus-mlspl.el
 
 (autoload (quote gnus-group-split-setup) "gnus-mlspl" "\
@@ -11973,7 +11934,7 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns:
 ;;;***
 
 ;;;### (autoloads (gnus-change-server) "gnus-move" "gnus/gnus-move.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/gnus-move.el
 
 (autoload (quote gnus-change-server) "gnus-move" "\
@@ -11985,7 +11946,7 @@ Update the .newsrc.eld file to reflect the change of nntp server.
 ;;;***
 
 ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail)
-;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (17350 14841))
+;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (17383 38805))
 ;;; Generated autoloads from gnus/gnus-msg.el
 
 (autoload (quote gnus-msg-mail) "gnus-msg" "\
@@ -12009,9 +11970,25 @@ Like `message-reply'.
 
 ;;;***
 
+;;;### (autoloads (gnus-nocem-load-cache gnus-nocem-scan-groups)
+;;;;;;  "gnus-nocem" "gnus/gnus-nocem.el" (17427 41288))
+;;; Generated autoloads from gnus/gnus-nocem.el
+
+(autoload (quote gnus-nocem-scan-groups) "gnus-nocem" "\
+Scan all NoCeM groups for new NoCeM messages.
+
+\(fn)" t nil)
+
+(autoload (quote gnus-nocem-load-cache) "gnus-nocem" "\
+Load the NoCeM cache.
+
+\(fn)" t nil)
+
+;;;***
+
 ;;;### (autoloads (gnus-treat-newsgroups-picon gnus-treat-mail-picon
 ;;;;;;  gnus-treat-from-picon) "gnus-picon" "gnus/gnus-picon.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/gnus-picon.el
 
 (autoload (quote gnus-treat-from-picon) "gnus-picon" "\
@@ -12038,7 +12015,7 @@ If picons are already displayed, remove them.
 ;;;;;;  gnus-sorted-nintersection gnus-sorted-range-intersection
 ;;;;;;  gnus-sorted-intersection gnus-intersection gnus-sorted-complement
 ;;;;;;  gnus-sorted-ndifference gnus-sorted-difference) "gnus-range"
-;;;;;;  "gnus/gnus-range.el" (17279 27122))
+;;;;;;  "gnus/gnus-range.el" (17383 38805))
 ;;; Generated autoloads from gnus/gnus-range.el
 
 (autoload (quote gnus-sorted-difference) "gnus-range" "\
@@ -12106,7 +12083,7 @@ Add NUM into sorted LIST by side effect.
 ;;;***
 
 ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize)
-;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (17279 27122))
+;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (17383 38805))
 ;;; Generated autoloads from gnus/gnus-registry.el
 
 (autoload (quote gnus-registry-initialize) "gnus-registry" "\
@@ -12122,8 +12099,8 @@ Install the registry hooks.
 ;;;***
 
 ;;;### (autoloads (gnus-sieve-article-add-rule gnus-sieve-generate
-;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17279
-;;;;;;  27122))
+;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17383
+;;;;;;  38805))
 ;;; Generated autoloads from gnus/gnus-sieve.el
 
 (autoload (quote gnus-sieve-update) "gnus-sieve" "\
@@ -12151,7 +12128,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (gnus-batch-brew-soup) "gnus-soup" "gnus/gnus-soup.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/gnus-soup.el
 
 (autoload (quote gnus-batch-brew-soup) "gnus-soup" "\
@@ -12171,7 +12148,7 @@ Note -- this function hasn't been implemented yet.
 ;;;***
 
 ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/gnus-spec.el
 
 (autoload (quote gnus-update-format) "gnus-spec" "\
@@ -12182,8 +12159,8 @@ Update the format specification near point.
 ;;;***
 
 ;;;### (autoloads (gnus-fixup-nnimap-unread-after-getting-new-news
-;;;;;;  gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17357
-;;;;;;  6512))
+;;;;;;  gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17427
+;;;;;;  41288))
 ;;; Generated autoloads from gnus/gnus-start.el
 
 (autoload (quote gnus-declare-backend) "gnus-start" "\
@@ -12199,7 +12176,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/gnus-win.el
 
 (autoload (quote gnus-add-configuration) "gnus-win" "\
@@ -12209,7 +12186,7 @@ Add the window configuration CONF to `gnus-buffer-configuration'.
 
 ;;;***
 
-;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17279 27172))
+;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17383 38807))
 ;;; Generated autoloads from play/gomoku.el
 
 (autoload (quote gomoku) "gomoku" "\
@@ -12236,7 +12213,7 @@ Use \\[describe-mode] for more info.
 ;;;***
 
 ;;;### (autoloads (goto-address goto-address-at-point) "goto-addr"
-;;;;;;  "net/goto-addr.el" (17337 56255))
+;;;;;;  "net/goto-addr.el" (17390 26944))
 ;;; Generated autoloads from net/goto-addr.el
 
 (define-obsolete-function-alias (quote goto-address-at-mouse) (quote goto-address-at-point) "22.1")
@@ -12265,7 +12242,7 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and
 
 ;;;### (autoloads (grep-tree grep-find grep-mode grep grep-compute-defaults
 ;;;;;;  grep-process-setup grep-setup-hook grep-find-command grep-command
-;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (17279 27123))
+;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (17441 26652))
 ;;; Generated autoloads from progmodes/grep.el
 
 (defvar grep-window-height nil "\
@@ -12389,7 +12366,7 @@ those sub directories of DIR.
 
 ;;;***
 
-;;;### (autoloads (gs-load-image) "gs" "gs.el" (17279 27123))
+;;;### (autoloads (gs-load-image) "gs" "gs.el" (17390 26939))
 ;;; Generated autoloads from gs.el
 
 (autoload (quote gs-load-image) "gs" "\
@@ -12402,14 +12379,19 @@ the form \"WINDOW-ID PIXMAP-ID\".  Value is non-nil if successful.
 
 ;;;***
 
-;;;### (autoloads (gud-tooltip-mode gdb-script-mode bashdb jdb pdb
-;;;;;;  perldb xdb dbx sdb gdb) "gud" "progmodes/gud.el" (17350 14833))
+;;;### (autoloads (gdb-script-mode bashdb jdb pdb perldb xdb dbx
+;;;;;;  sdb gdb) "gud" "progmodes/gud.el" (17454 30835))
 ;;; Generated autoloads from progmodes/gud.el
 
 (autoload (quote gdb) "gud" "\
 Run gdb on program FILE in buffer *gud-FILE*.
-The directory containing FILE becomes the initial working directory
-and source-file directory for your debugger.
+The directory containing FILE becomes the initial working
+directory and source-file directory for your debugger.  By
+default this command starts GDB using a graphical interface.  See
+`gdba' for more information.
+
+To run GDB in text command mode, set `gud-gdb-command-name' to
+\"gdb --fullname\" and include the pathname, if necessary.
 
 \(fn COMMAND-LINE)" t nil)
 
@@ -12482,25 +12464,10 @@ Major mode for editing GDB scripts
 
 \(fn)" t nil)
 
-(defvar gud-tooltip-mode nil "\
-Non-nil if Gud-Tooltip mode is enabled.
-See the command `gud-tooltip-mode' for a description of this minor-mode.
-Setting this variable directly does not take effect;
-use either \\[customize] or the function `gud-tooltip-mode'.")
-
-(custom-autoload (quote gud-tooltip-mode) "gud")
-
-(put (quote gud-tooltip-mode) (quote custom-set) (quote custom-set-minor-mode))
-
-(autoload (quote gud-tooltip-mode) "gud" "\
-Toggle the display of GUD tooltips.
-
-\(fn &optional ARG)" t nil)
-
 ;;;***
 
-;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17383
+;;;;;;  38807))
 ;;; Generated autoloads from play/handwrite.el
 
 (autoload (quote handwrite) "handwrite" "\
@@ -12548,7 +12515,7 @@ to be updated.
 ;;;### (autoloads (scan-buf-previous-region scan-buf-next-region
 ;;;;;;  scan-buf-move-to-region help-at-pt-display-when-idle help-at-pt-set-timer
 ;;;;;;  help-at-pt-cancel-timer display-local-help help-at-pt-kbd-string
-;;;;;;  help-at-pt-string) "help-at-pt" "help-at-pt.el" (17279 27123))
+;;;;;;  help-at-pt-string) "help-at-pt" "help-at-pt.el" (17390 26939))
 ;;; Generated autoloads from help-at-pt.el
 
 (autoload (quote help-at-pt-string) "help-at-pt" "\
@@ -12678,7 +12645,7 @@ different regions.  With numeric argument ARG, behaves like
 ;;;### (autoloads (describe-categories describe-syntax describe-variable
 ;;;;;;  variable-at-point describe-function-1 describe-simplify-lib-file-name
 ;;;;;;  help-C-file-name describe-function help-with-tutorial) "help-fns"
-;;;;;;  "help-fns.el" (17374 21544))
+;;;;;;  "help-fns.el" (17401 60341))
 ;;; Generated autoloads from help-fns.el
 
 (autoload (quote help-with-tutorial) "help-fns" "\
@@ -12745,7 +12712,7 @@ BUFFER should be a buffer or a buffer name.
 ;;;***
 
 ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el"
-;;;;;;  (17319 2454))
+;;;;;;  (17390 26939))
 ;;; Generated autoloads from help-macro.el
 
 (defvar three-step-help nil "\
@@ -12761,7 +12728,7 @@ A value of nil means skip the middle step, so that
 
 ;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button
 ;;;;;;  help-make-xrefs help-setup-xref help-mode-finish help-mode-setup
-;;;;;;  help-mode) "help-mode" "help-mode.el" (17331 26860))
+;;;;;;  help-mode) "help-mode" "help-mode.el" (17441 26668))
 ;;; Generated autoloads from help-mode.el
 
 (autoload (quote help-mode) "help-mode" "\
@@ -12844,7 +12811,7 @@ Add xrefs for symbols in `pp's output between FROM and TO.
 ;;;***
 
 ;;;### (autoloads (Helper-help Helper-describe-bindings) "helper"
-;;;;;;  "emacs-lisp/helper.el" (17279 27122))
+;;;;;;  "emacs-lisp/helper.el" (17390 26938))
 ;;; Generated autoloads from emacs-lisp/helper.el
 
 (autoload (quote Helper-describe-bindings) "helper" "\
@@ -12860,7 +12827,7 @@ Provide help for current mode.
 ;;;***
 
 ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl"
-;;;;;;  "hexl.el" (17279 27123))
+;;;;;;  "hexl.el" (17390 26939))
 ;;; Generated autoloads from hexl.el
 
 (autoload (quote hexl-mode) "hexl" "\
@@ -12956,7 +12923,7 @@ This discards the buffer's undo information.
 ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer
 ;;;;;;  hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer
 ;;;;;;  global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el"
-;;;;;;  (17379 24714))
+;;;;;;  (17390 26939))
 ;;; Generated autoloads from hi-lock.el
 
 (autoload (quote hi-lock-mode) "hi-lock" "\
@@ -13082,7 +13049,7 @@ be found in variable `hi-lock-interactive-patterns'.
 ;;;***
 
 ;;;### (autoloads (hide-ifdef-lines hide-ifdef-read-only hide-ifdef-initially
-;;;;;;  hide-ifdef-mode) "hideif" "progmodes/hideif.el" (17279 27123))
+;;;;;;  hide-ifdef-mode) "hideif" "progmodes/hideif.el" (17390 27408))
 ;;; Generated autoloads from progmodes/hideif.el
 
 (autoload (quote hide-ifdef-mode) "hideif" "\
@@ -13137,7 +13104,7 @@ how the hiding is done:
 ;;;***
 
 ;;;### (autoloads (hs-minor-mode) "hideshow" "progmodes/hideshow.el"
-;;;;;;  (17279 27169))
+;;;;;;  (17390 27408))
 ;;; Generated autoloads from progmodes/hideshow.el
 
 (defvar hs-special-modes-alist (quote ((c-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (c++-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (bibtex-mode ("^@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning))) "\
@@ -13195,7 +13162,7 @@ Key bindings:
 ;;;;;;  highlight-compare-buffers highlight-changes-rotate-faces
 ;;;;;;  highlight-changes-previous-change highlight-changes-next-change
 ;;;;;;  highlight-changes-mode highlight-changes-remove-highlight)
-;;;;;;  "hilit-chg" "hilit-chg.el" (17379 24711))
+;;;;;;  "hilit-chg" "hilit-chg.el" (17390 27370))
 ;;; Generated autoloads from hilit-chg.el
 
 (autoload (quote highlight-changes-remove-highlight) "hilit-chg" "\
@@ -13325,7 +13292,7 @@ variable `highlight-changes-global-changes-existing-buffers' is non-nil).
 ;;;;;;  hippie-expand-ignore-buffers hippie-expand-max-buffers hippie-expand-no-restriction
 ;;;;;;  hippie-expand-dabbrev-as-symbol hippie-expand-dabbrev-skip-space
 ;;;;;;  hippie-expand-verbose hippie-expand-try-functions-list) "hippie-exp"
-;;;;;;  "hippie-exp.el" (17279 27123))
+;;;;;;  "hippie-exp.el" (17390 26939))
 ;;; Generated autoloads from hippie-exp.el
 
 (defvar hippie-expand-try-functions-list (quote (try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol)) "\
@@ -13440,7 +13407,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
 ;;;***
 
 ;;;### (autoloads (list-holidays holidays) "holidays" "calendar/holidays.el"
-;;;;;;  (17308 43144))
+;;;;;;  (17427 42815))
 ;;; Generated autoloads from calendar/holidays.el
 
 (autoload (quote holidays) "holidays" "\
@@ -13454,8 +13421,21 @@ This function is suitable for execution in a .emacs file.
 (autoload (quote list-holidays) "holidays" "\
 Display holidays for years Y1 to Y2 (inclusive).
 
-The optional list of holidays L defaults to `calendar-holidays'.  See the
-documentation for that variable for a description of holiday lists.
+The optional list of holidays L defaults to `calendar-holidays'.
+If you want to control what holidays are displayed, use a
+different list.  For example,
+
+  (list-holidays 2006 2006
+    (append general-holidays local-holidays other-holidays))
+
+will display holidays for the year 2006 defined in the 3
+mentioned lists, and nothing else.
+
+When called interactively, this command offers a choice of
+holidays, based on the variables `solar-holidays' etc.  See the
+documentation of `calendar-holidays' for a list of the variables
+that control the choices, as well as a description of the format
+of a holiday list.
 
 The optional LABEL is used to label the buffer created.
 
@@ -13464,7 +13444,7 @@ The optional LABEL is used to label the buffer created.
 ;;;***
 
 ;;;### (autoloads (hscroll-global-mode hscroll-mode turn-on-hscroll)
-;;;;;;  "hscroll" "obsolete/hscroll.el" (17279 27123))
+;;;;;;  "hscroll" "obsolete/hscroll.el" (17383 38806))
 ;;; Generated autoloads from obsolete/hscroll.el
 
 (autoload (quote turn-on-hscroll) "hscroll" "\
@@ -13490,8 +13470,8 @@ Also see `automatic-hscrolling'.
 
 ;;;***
 
-;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17279
-;;;;;;  27122))
+;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17396
+;;;;;;  42171))
 ;;; Generated autoloads from gnus/html2text.el
 
 (autoload (quote html2text) "html2text" "\
@@ -13523,7 +13503,7 @@ Convert HTML to plain text in the current buffer.
 ;;;;;;  ibuffer-backward-filter-group ibuffer-forward-filter-group
 ;;;;;;  ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group
 ;;;;;;  ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode
-;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17379 30025))
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17454 30832))
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload (quote ibuffer-auto-mode) "ibuf-ext" "\
@@ -13889,8 +13869,8 @@ defaults to one.
 ;;;***
 
 ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter
-;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17279
-;;;;;;  27171))
+;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17390
+;;;;;;  26939))
 ;;; Generated autoloads from ibuf-macs.el
 
 (autoload (quote define-ibuffer-column) "ibuf-macs" "\
@@ -14017,7 +13997,7 @@ FORMATS is the value to use for `ibuffer-formats'.
 
 ;;;### (autoloads (icalendar-import-buffer icalendar-import-file
 ;;;;;;  icalendar-export-region icalendar-export-file) "icalendar"
-;;;;;;  "calendar/icalendar.el" (17279 27196))
+;;;;;;  "calendar/icalendar.el" (17401 60141))
 ;;; Generated autoloads from calendar/icalendar.el
 
 (autoload (quote icalendar-export-file) "icalendar" "\
@@ -14069,8 +14049,8 @@ buffer `*icalendar-errors*'.
 
 ;;;***
 
-;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17401
+;;;;;;  60148))
 ;;; Generated autoloads from icomplete.el
 
 (defvar icomplete-mode nil "\
@@ -14091,7 +14071,7 @@ With a numeric argument, turn Icomplete mode on iff ARG is positive.
 
 ;;;***
 
-;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17279 27203))
+;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17390 27408))
 ;;; Generated autoloads from progmodes/icon.el
 
 (autoload (quote icon-mode) "icon" "\
@@ -14132,7 +14112,7 @@ with no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el"
-;;;;;;  (17307 17625))
+;;;;;;  (17390 27408))
 ;;; Generated autoloads from progmodes/idlw-shell.el
 
 (autoload (quote idlwave-shell) "idlw-shell" "\
@@ -14158,7 +14138,7 @@ See also the variable `idlwave-shell-prompt-pattern'.
 ;;;***
 
 ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el"
-;;;;;;  (17279 27203))
+;;;;;;  (17390 27408))
 ;;; Generated autoloads from progmodes/idlwave.el
 
 (autoload (quote idlwave-mode) "idlwave" "\
@@ -14294,8 +14274,8 @@ The main features of this mode are
 ;;;;;;  ido-find-alternate-file ido-find-file-other-window ido-find-file
 ;;;;;;  ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
 ;;;;;;  ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
-;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17308
-;;;;;;  43140))
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17441
+;;;;;;  26659))
 ;;; Generated autoloads from ido.el
 
 (defvar ido-mode nil "\
@@ -14556,7 +14536,7 @@ DEF, if non-nil, is the default value.
 
 ;;;***
 
-;;;### (autoloads (ielm) "ielm" "ielm.el" (17279 27123))
+;;;### (autoloads (ielm) "ielm" "ielm.el" (17390 26940))
 ;;; Generated autoloads from ielm.el
  (add-hook 'same-window-buffer-names "*ielm*")
 
@@ -14569,7 +14549,7 @@ Switches to the buffer `*ielm*', or creates it if it does not exist.
 ;;;***
 
 ;;;### (autoloads (iimage-mode turn-on-iimage-mode) "iimage" "iimage.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26940))
 ;;; Generated autoloads from iimage.el
 
 (autoload (quote turn-on-iimage-mode) "iimage" "\
@@ -14587,7 +14567,7 @@ Toggle inline image minor mode.
 ;;;### (autoloads (defimage find-image remove-images insert-sliced-image
 ;;;;;;  insert-image put-image create-image image-type-available-p
 ;;;;;;  image-type-from-file-name image-type-from-file-header image-type-from-buffer
-;;;;;;  image-type-from-data) "image" "image.el" (17279 27196))
+;;;;;;  image-type-from-data) "image" "image.el" (17441 26666))
 ;;; Generated autoloads from image.el
 
 (autoload (quote image-type-from-data) "image" "\
@@ -14738,7 +14718,7 @@ Example:
 
 ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp
 ;;;;;;  image-file-name-regexps image-file-name-extensions) "image-file"
-;;;;;;  "image-file.el" (17279 27123))
+;;;;;;  "image-file.el" (17390 26940))
 ;;; Generated autoloads from image-file.el
 
 (defvar image-file-name-extensions (quote ("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm")) "\
@@ -14801,7 +14781,7 @@ Image files are those whose name has an extension in
 ;;;***
 
 ;;;### (autoloads (image-mode-maybe image-minor-mode image-mode)
-;;;;;;  "image-mode" "image-mode.el" (17376 5576))
+;;;;;;  "image-mode" "image-mode.el" (17390 27370))
 ;;; Generated autoloads from image-mode.el
  (push '("\\.jpe?g\\'"    . image-mode) auto-mode-alist)
  (push '("\\.png\\'"      . image-mode) auto-mode-alist)
@@ -14839,7 +14819,7 @@ information on these modes.
 ;;;***
 
 ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar
-;;;;;;  imenu-sort-function) "imenu" "imenu.el" (17279 27123))
+;;;;;;  imenu-sort-function) "imenu" "imenu.el" (17390 26940))
 ;;; Generated autoloads from imenu.el
 
 (defvar imenu-sort-function nil "\
@@ -15002,7 +14982,7 @@ See also the function `indian-glyph-char'.
 
 ;;;### (autoloads (inferior-lisp inferior-lisp-prompt inferior-lisp-load-command
 ;;;;;;  inferior-lisp-program inferior-lisp-filter-regexp) "inf-lisp"
-;;;;;;  "progmodes/inf-lisp.el" (17279 27123))
+;;;;;;  "progmodes/inf-lisp.el" (17390 27408))
 ;;; Generated autoloads from progmodes/inf-lisp.el
 
 (defvar inferior-lisp-filter-regexp "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'" "\
@@ -15069,7 +15049,7 @@ of `inferior-lisp-program').  Runs the hooks from
 ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node
 ;;;;;;  Info-goto-emacs-command-node Info-mode info-apropos Info-index
 ;;;;;;  Info-directory Info-on-current-buffer info-standalone info-emacs-manual
-;;;;;;  info info-other-window) "info" "info.el" (17383 37904))
+;;;;;;  info info-other-window) "info" "info.el" (17427 42815))
 ;;; Generated autoloads from info.el
 
 (autoload (quote info-other-window) "info" "\
@@ -15190,7 +15170,7 @@ Advanced commands:
 \\[Info-search-case-sensitively]        Search through this Info file for specified regexp case-sensitively.
 \\[Info-search-next]    Search for another occurrence of regexp
           from a previous \\<Info-mode-map>\\[Info-search] command.
-\\[Info-index]  Look up a topic in this manual's Index and move to that index entry.
+\\[Info-index]  Search for a topic in this manual's Index and go to index entry.
 \\[Info-index-next]     (comma) Move to the next match from a previous \\<Info-mode-map>\\[Info-index] command.
 \\[info-apropos]        Look for a string in the indices of all manuals.
 \\[Info-goto-node]      Move to node specified by name.
@@ -15235,7 +15215,7 @@ This will add a speedbar major display mode.
 
 ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file
 ;;;;;;  info-lookup-symbol info-lookup-reset) "info-look" "info-look.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26940))
 ;;; Generated autoloads from info-look.el
 
 (autoload (quote info-lookup-reset) "info-look" "\
@@ -15283,7 +15263,7 @@ Perform completion on file preceding point.
 ;;;***
 
 ;;;### (autoloads (info-xref-check-all-custom info-xref-check-all
-;;;;;;  info-xref-check) "info-xref" "info-xref.el" (17279 27123))
+;;;;;;  info-xref-check) "info-xref" "info-xref.el" (17390 26940))
 ;;; Generated autoloads from info-xref.el
 
 (autoload (quote info-xref-check) "info-xref" "\
@@ -15310,7 +15290,7 @@ quite a while.
 ;;;***
 
 ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-tagify)
-;;;;;;  "informat" "informat.el" (17279 27123))
+;;;;;;  "informat" "informat.el" (17390 26940))
 ;;; Generated autoloads from informat.el
 
 (autoload (quote Info-tagify) "informat" "\
@@ -15371,8 +15351,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17390
+;;;;;;  26940))
 ;;; Generated autoloads from isearchb.el
 
 (autoload (quote isearchb-activate) "isearchb" "\
@@ -15386,7 +15366,7 @@ accessed via isearchb.
 ;;;***
 
 ;;;### (autoloads (iso-accents-mode) "iso-acc" "obsolete/iso-acc.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17383 38806))
 ;;; Generated autoloads from obsolete/iso-acc.el
 
 (autoload (quote iso-accents-mode) "iso-acc" "\
@@ -15516,7 +15496,7 @@ Add submenus to the File menu, to convert to and from various formats.
 ;;;;;;  ispell-region ispell-change-dictionary ispell-kill-ispell
 ;;;;;;  ispell-help ispell-pdict-save ispell-word ispell-local-dictionary-alist
 ;;;;;;  ispell-personal-dictionary) "ispell" "textmodes/ispell.el"
-;;;;;;  (17374 21550))
+;;;;;;  (17441 26660))
 ;;; Generated autoloads from textmodes/ispell.el
 
 (defvar ispell-personal-dictionary nil "\
@@ -15540,7 +15520,7 @@ re-start emacs.")
 
 (setq ispell-dictionary-alist-2 (quote (("czech" "[A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]" "[^A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]" "" nil ("-B") nil iso-8859-2) ("dansk" "[A-Z\306\330\305a-z\346\370\345]" "[^A-Z\306\330\305a-z\346\370\345]" "[']" nil ("-C") nil iso-8859-1) ("deutsch" "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) ("deutsch8" "[a-zA-Z\304\326\334\344\366\337\374]" "[^a-zA-Z\304\326\334\344\366\337\374]" "[']" t ("-C" "-d" "deutsch") "~latin1" iso-8859-1) ("english" "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1))))
 
-(setq ispell-dictionary-alist-3 (quote (("esperanto" "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[-']" t ("-C") "~latin3" iso-8859-1) ("esperanto-tex" "[A-Za-z^\\]" "[^A-Za-z^\\]" "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-1) ("francais7" "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil iso-8859-1) ("francais" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[-'.@]" t nil "~list" iso-8859-1) ("francais-tex" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[-'^`\".@]" t nil "~tex" iso-8859-1))))
+(setq ispell-dictionary-alist-3 (quote (("esperanto" "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[-']" t ("-C") "~latin3" iso-8859-3) ("esperanto-tex" "[A-Za-z^\\]" "[^A-Za-z^\\]" "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-3) ("francais7" "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil iso-8859-1) ("francais" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[-'.@]" t nil "~list" iso-8859-1) ("francais-tex" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[-'^`\".@]" t nil "~tex" iso-8859-1))))
 
 (setq ispell-dictionary-alist-4 (quote (("german" "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) ("german8" "[a-zA-Z\304\326\334\344\366\337\374]" "[^a-zA-Z\304\326\334\344\366\337\374]" "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1) ("italiano" "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[-.]" nil ("-B" "-d" "italian") "~tex" iso-8859-1) ("nederlands" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1) ("nederlands8" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1))))
 
@@ -15616,9 +15596,9 @@ and added as a submenu of the \"Edit\" menu.")
 
 (if ispell-menu-map-needed (progn (define-key ispell-menu-map [ispell-continue] (quote (menu-item "Continue Spell-Checking" ispell-continue :enable (and (boundp (quote ispell-region-end)) (marker-position ispell-region-end) (equal (marker-buffer ispell-region-end) (current-buffer))) :help "Continue spell checking last region"))) (define-key ispell-menu-map [ispell-word] (quote (menu-item "Spell-Check Word" ispell-word :help "Spell-check word at cursor"))) (define-key ispell-menu-map [ispell-comments-and-strings] (quote (menu-item "Spell-Check Comments" ispell-comments-and-strings :help "Spell-check only comments and strings")))))
 
-(if ispell-menu-map-needed (progn (define-key ispell-menu-map [ispell-region] (quote (menu-item "Spell-Check Region" ispell-region :enable mark-active :help "Spell-check text in marked region"))) (define-key ispell-menu-map [ispell-message] (quote (menu-item "Spell-Check Message" ispell-message :help "Skip headers and included message text"))) (define-key ispell-menu-map [ispell-buffer] (quote (menu-item "Spell-Check Buffer" ispell-buffer :help "Check spelling of selected buffer"))) (fset (quote ispell-menu-map) (symbol-value (quote ispell-menu-map)))))
+(if ispell-menu-map-needed (progn (define-key ispell-menu-map [ispell-region] (quote (menu-item "Spell-Check Region" ispell-region :enable mark-active :help "Spell-check text in marked region"))) (define-key ispell-menu-map [ispell-message] (quote (menu-item "Spell-Check Message" ispell-message :visible (eq major-mode (quote mail-mode)) :help "Skip headers and included message text"))) (define-key ispell-menu-map [ispell-buffer] (quote (menu-item "Spell-Check Buffer" ispell-buffer :help "Check spelling of selected buffer"))) (fset (quote ispell-menu-map) (symbol-value (quote ispell-menu-map)))))
 
-(defvar ispell-skip-region-alist (quote ((ispell-words-keyword forward-line) (ispell-dictionary-keyword forward-line) (ispell-pdict-keyword forward-line) (ispell-parsing-keyword forward-line) ("^---*BEGIN PGP [A-Z ]*--*" . "^---*END PGP [A-Z ]*--*") ("^begin [0-9][0-9][0-9] [^   ]+$" . "\nend\n") ("^%!PS-Adobe-[123].0" . "\n%%EOF\n") ("^---* \\(Start of \\)?[Ff]orwarded [Mm]essage" . "^---* End of [Ff]orwarded [Mm]essage") ("\\(--+\\|\\(/\\w\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)"))) "\
+(defvar ispell-skip-region-alist (quote ((ispell-words-keyword forward-line) (ispell-dictionary-keyword forward-line) (ispell-pdict-keyword forward-line) (ispell-parsing-keyword forward-line) ("^---*BEGIN PGP [A-Z ]*--*" . "^---*END PGP [A-Z ]*--*") ("^begin [0-9][0-9][0-9] [^   ]+$" . "\nend\n") ("^%!PS-Adobe-[123].0" . "\n%%EOF\n") ("^---* \\(Start of \\)?[Ff]orwarded [Mm]essage" . "^---* End of [Ff]orwarded [Mm]essage") ("\\(--+\\|_+\\|\\(/\\w\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)"))) "\
 Alist expressing beginning and end of regions not to spell check.
 The alist key must be a regular expression.
 Valid forms include:
@@ -15802,8 +15782,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 
 ;;;***
 
-;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17356
-;;;;;;  16193))
+;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17441
+;;;;;;  26660))
 ;;; Generated autoloads from iswitchb.el
 
 (defvar iswitchb-mode nil "\
@@ -15907,7 +15887,7 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading.
 ;;;***
 
 ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr"
-;;;;;;  "jka-compr.el" (17279 27201))
+;;;;;;  "jka-compr.el" (17411 12435))
 ;;; Generated autoloads from jka-compr.el
 
 (defvar jka-compr-inhibit nil "\
@@ -15932,7 +15912,7 @@ by `jka-compr-installed'.
 
 ;;;### (autoloads (keypad-setup keypad-numlock-shifted-setup keypad-shifted-setup
 ;;;;;;  keypad-numlock-setup keypad-setup) "keypad" "emulation/keypad.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emulation/keypad.el
 
 (defvar keypad-setup nil "\
@@ -16035,7 +16015,7 @@ and the return value is the length of the conversion.
 ;;;### (autoloads (kmacro-end-call-mouse kmacro-end-and-call-macro
 ;;;;;;  kmacro-end-or-call-macro kmacro-start-macro-or-insert-counter
 ;;;;;;  kmacro-call-macro kmacro-end-macro kmacro-start-macro) "kmacro"
-;;;;;;  "kmacro.el" (17279 27123))
+;;;;;;  "kmacro.el" (17390 26941))
 ;;; Generated autoloads from kmacro.el
  (global-set-key "\C-x(" 'kmacro-start-macro)
  (global-set-key "\C-x)" 'kmacro-end-macro)
@@ -16180,7 +16160,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el"
-;;;;;;  (17279 27172))
+;;;;;;  (17396 42165))
 ;;; Generated autoloads from play/landmark.el
 
 (defalias (quote landmark-repeat) (quote lm-test-run))
@@ -16340,7 +16320,7 @@ use either \\[customize] or the function `latin1-display'.")
 ;;;***
 
 ;;;### (autoloads (turn-on-lazy-lock lazy-lock-mode) "lazy-lock"
-;;;;;;  "obsolete/lazy-lock.el" (17279 27123))
+;;;;;;  "obsolete/lazy-lock.el" (17383 38807))
 ;;; Generated autoloads from obsolete/lazy-lock.el
 
 (autoload (quote lazy-lock-mode) "lazy-lock" "\
@@ -16408,7 +16388,7 @@ Unconditionally turn on Lazy Lock mode.
 ;;;***
 
 ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el"
-;;;;;;  (17356 16192))
+;;;;;;  (17390 27408))
 ;;; Generated autoloads from progmodes/ld-script.el
 
 (add-to-list (quote auto-mode-alist) (quote ("\\.ld[si]?\\>" . ld-script-mode)))
@@ -16423,7 +16403,7 @@ A major mode to edit GNU ld script files
 ;;;***
 
 ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26941))
 ;;; Generated autoloads from ledit.el
 
 (defconst ledit-save-files t "\
@@ -16457,7 +16437,7 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (life) "life" "play/life.el" (17279 27123))
+;;;### (autoloads (life) "life" "play/life.el" (17383 38807))
 ;;; Generated autoloads from play/life.el
 
 (autoload (quote life) "life" "\
@@ -16470,8 +16450,8 @@ generations (this defaults to 1).
 
 ;;;***
 
-;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17279
-;;;;;;  27189))
+;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17411
+;;;;;;  12435))
 ;;; Generated autoloads from loadhist.el
 
 (autoload (quote unload-feature) "loadhist" "\
@@ -16494,7 +16474,7 @@ such as redefining an Emacs function.
 ;;;***
 
 ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches)
-;;;;;;  "locate" "locate.el" (17337 56254))
+;;;;;;  "locate" "locate.el" (17441 26651))
 ;;; Generated autoloads from locate.el
 
 (defvar locate-ls-subdir-switches "-al" "\
@@ -16505,21 +16485,43 @@ This should contain the \"-l\" switch, but not the \"-F\" or \"-b\" switches.")
 
 (autoload (quote locate) "locate" "\
 Run the program `locate', putting results in `*Locate*' buffer.
-With prefix arg, prompt for the locate command to run.
+Pass it SEARCH-STRING as argument.  Interactively, prompt for SEARCH-STRING.
+With prefix arg, prompt for the exact shell command to run instead.
+
+This program searches for those file names in a database that match
+SEARCH-STRING and normally outputs all matching absolute file names,
+one per line.  The database normally consists of all files on your
+system, or of all files that you have access to.  Consult the
+documentation of the program for the details about how it determines
+which file names match SEARCH-STRING.  (Those details vary highly with
+the version.)
+
+You can specify another program for this command to run by customizing
+the variables `locate-command' or `locate-make-command-line'.
+
+The main use of FILTER is to implement `locate-with-filter'.  See
+the docstring of that function for its meaning.
 
 \(fn SEARCH-STRING &optional FILTER)" t nil)
 
 (autoload (quote locate-with-filter) "locate" "\
-Run the locate command with a filter.
-
-The filter is a regular expression. Only results matching the filter are
-shown; this is often useful to constrain a big search.
+Run the executable program `locate' with a filter.
+This function is similar to the function `locate', which see.
+The difference is that, when invoked interactively, the present function
+prompts for both SEARCH-STRING and FILTER.  It passes SEARCH-STRING
+to the locate executable program.  It produces a `*Locate*' buffer
+that lists only those lines in the output of the locate program that
+contain a match for the regular expression FILTER; this is often useful
+to constrain a big search.
+
+When called from Lisp, this function is identical with `locate',
+except that FILTER is not optional.
 
 \(fn SEARCH-STRING FILTER)" t nil)
 
 ;;;***
 
-;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17297 42808))
+;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17390 26942))
 ;;; Generated autoloads from log-edit.el
 
 (autoload (quote log-edit) "log-edit" "\
@@ -16540,8 +16542,8 @@ If BUFFER is non-nil `log-edit' will jump to that buffer, use it to edit the
 
 ;;;***
 
-;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17374
-;;;;;;  21531))
+;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17390
+;;;;;;  26942))
 ;;; Generated autoloads from log-view.el
 
 (autoload (quote log-view-mode) "log-view" "\
@@ -16551,8 +16553,8 @@ Major mode for browsing CVS log output.
 
 ;;;***
 
-;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17327
-;;;;;;  23539))
+;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17390
+;;;;;;  26942))
 ;;; Generated autoloads from longlines.el
 
 (autoload (quote longlines-mode) "longlines" "\
@@ -16573,8 +16575,8 @@ are indicated with a symbol.
 ;;;***
 
 ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer
-;;;;;;  lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17279
-;;;;;;  27123))
+;;;;;;  lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17390
+;;;;;;  26942))
 ;;; Generated autoloads from lpr.el
 
 (defvar lpr-windows-system (memq system-type (quote (emx win32 w32 mswindows ms-dos windows-nt))))
@@ -16668,7 +16670,7 @@ for further customization of the printer command.
 ;;;***
 
 ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el"
-;;;;;;  (17297 42802))
+;;;;;;  (17390 26942))
 ;;; Generated autoloads from ls-lisp.el
 
 (defvar ls-lisp-support-shell-wildcards t "\
@@ -16679,8 +16681,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).")
 
 ;;;***
 
-;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17308
-;;;;;;  43144))
+;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17390
+;;;;;;  27324))
 ;;; Generated autoloads from calendar/lunar.el
 
 (autoload (quote phases-of-moon) "lunar" "\
@@ -16693,8 +16695,8 @@ This function is suitable for execution in a .emacs file.
 
 ;;;***
 
-;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17279
-;;;;;;  27203))
+;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17390
+;;;;;;  27408))
 ;;; Generated autoloads from progmodes/m4-mode.el
 
 (autoload (quote m4-mode) "m4-mode" "\
@@ -16706,7 +16708,7 @@ A major mode to edit m4 macro files.
 ;;;***
 
 ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emacs-lisp/macroexp.el
 
 (autoload (quote macroexpand-all) "macroexp" "\
@@ -16720,7 +16722,7 @@ definitions to shadow the loaded ones for use in file byte-compilation.
 ;;;***
 
 ;;;### (autoloads (apply-macro-to-region-lines kbd-macro-query insert-kbd-macro
-;;;;;;  name-last-kbd-macro) "macros" "macros.el" (17279 27123))
+;;;;;;  name-last-kbd-macro) "macros" "macros.el" (17390 26942))
 ;;; Generated autoloads from macros.el
 
 (autoload (quote name-last-kbd-macro) "macros" "\
@@ -16809,7 +16811,7 @@ and then select the region of un-tablified names and use
 ;;;***
 
 ;;;### (autoloads (what-domain mail-extract-address-components) "mail-extr"
-;;;;;;  "mail/mail-extr.el" (17308 43144))
+;;;;;;  "mail/mail-extr.el" (17390 26942))
 ;;; Generated autoloads from mail/mail-extr.el
 
 (autoload (quote mail-extract-address-components) "mail-extr" "\
@@ -16841,7 +16843,7 @@ Convert mail domain DOMAIN to the country it corresponds to.
 
 ;;;### (autoloads (mail-hist-put-headers-into-history mail-hist-keep-history
 ;;;;;;  mail-hist-enable mail-hist-define-keys) "mail-hist" "mail/mail-hist.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26942))
 ;;; Generated autoloads from mail/mail-hist.el
 
 (autoload (quote mail-hist-define-keys) "mail-hist" "\
@@ -16872,8 +16874,8 @@ This function normally would be called when the message is sent.
 
 ;;;### (autoloads (mail-fetch-field mail-unquote-printable-region
 ;;;;;;  mail-unquote-printable mail-quote-printable mail-file-babyl-p
-;;;;;;  mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (17279
-;;;;;;  27123))
+;;;;;;  mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (17390
+;;;;;;  26942))
 ;;; Generated autoloads from mail/mail-utils.el
 
 (defvar mail-use-rfc822 nil "\
@@ -16925,7 +16927,7 @@ If 4th arg LIST is non-nil, return a list of all such fields.
 ;;;***
 
 ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup)
-;;;;;;  "mailabbrev" "mail/mailabbrev.el" (17279 27185))
+;;;;;;  "mailabbrev" "mail/mailabbrev.el" (17390 26942))
 ;;; Generated autoloads from mail/mailabbrev.el
 
 (autoload (quote mail-abbrevs-setup) "mailabbrev" "\
@@ -16948,8 +16950,8 @@ If DEFINITION contains multiple addresses, separate them with commas.
 ;;;***
 
 ;;;### (autoloads (mail-complete define-mail-alias expand-mail-aliases
-;;;;;;  mail-complete-style) "mailalias" "mail/mailalias.el" (17279
-;;;;;;  27123))
+;;;;;;  mail-complete-style) "mailalias" "mail/mailalias.el" (17390
+;;;;;;  26942))
 ;;; Generated autoloads from mail/mailalias.el
 
 (defvar mail-complete-style (quote angles) "\
@@ -16995,7 +16997,7 @@ current header, calls `mail-complete-function' and passes prefix arg if any.
 ;;;***
 
 ;;;### (autoloads (mailclient-send-it) "mailclient" "mail/mailclient.el"
-;;;;;;  (17379 24714))
+;;;;;;  (17390 26942))
 ;;; Generated autoloads from mail/mailclient.el
 
 (autoload (quote mailclient-send-it) "mailclient" "\
@@ -17009,7 +17011,7 @@ The mail client is taken to be the handler of mailto URLs.
 
 ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode
 ;;;;;;  makefile-gmake-mode makefile-automake-mode makefile-mode)
-;;;;;;  "make-mode" "progmodes/make-mode.el" (17374 21244))
+;;;;;;  "make-mode" "progmodes/make-mode.el" (17390 27408))
 ;;; Generated autoloads from progmodes/make-mode.el
 
 (autoload (quote makefile-mode) "make-mode" "\
@@ -17127,8 +17129,8 @@ An adapted `makefile-mode' that knows about imake.
 
 ;;;***
 
-;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17390
+;;;;;;  26943))
 ;;; Generated autoloads from makesum.el
 
 (autoload (quote make-command-summary) "makesum" "\
@@ -17139,7 +17141,7 @@ Previous contents of that buffer are killed first.
 
 ;;;***
 
-;;;### (autoloads (man-follow man) "man" "man.el" (17357 6510))
+;;;### (autoloads (man-follow man) "man" "man.el" (17390 26943))
 ;;; Generated autoloads from man.el
 
 (defalias (quote manual-entry) (quote man))
@@ -17188,8 +17190,8 @@ yourself the value of `master-of' by calling `master-show-slave'.
 
 ;;;***
 
-;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17331
-;;;;;;  26267))
+;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17446
+;;;;;;  41075))
 ;;; Generated autoloads from menu-bar.el
 
 (put (quote menu-bar-mode) (quote standard-value) (quote (t)))
@@ -17225,7 +17227,7 @@ turn on menu bars; otherwise, turn off menu bars.
 ;;;;;;  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" (17379 24711))
+;;;;;;  "gnus/message.el" (17441 26663))
 ;;; Generated autoloads from gnus/message.el
 
 (defvar message-from-style (quote default) "\
@@ -17479,7 +17481,7 @@ which specify the range to operate on.
 ;;;***
 
 ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el"
-;;;;;;  (17279 27203))
+;;;;;;  (17390 27409))
 ;;; Generated autoloads from progmodes/meta-mode.el
 
 (autoload (quote metafont-mode) "meta-mode" "\
@@ -17506,7 +17508,7 @@ Turning on MetaPost mode calls the value of the variable
 
 ;;;### (autoloads (metamail-region metamail-buffer metamail-interpret-body
 ;;;;;;  metamail-interpret-header) "metamail" "mail/metamail.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26942))
 ;;; Generated autoloads from mail/metamail.el
 
 (autoload (quote metamail-interpret-header) "metamail" "\
@@ -17551,7 +17553,7 @@ redisplayed as output is inserted.
 
 ;;;### (autoloads (mh-fully-kill-draft mh-send-letter mh-user-agent-compose
 ;;;;;;  mh-smail-batch mh-smail-other-window mh-smail) "mh-comp"
-;;;;;;  "mh-e/mh-comp.el" (17379 24713))
+;;;;;;  "mh-e/mh-comp.el" (17441 26667))
 ;;; Generated autoloads from mh-e/mh-comp.el
 
 (autoload (quote mh-smail) "mh-comp" "\
@@ -17614,6 +17616,13 @@ The hook `mh-before-send-letter-hook' is run at the beginning of
 this command. For example, if you want to check your spelling in
 your message before sending, add the function `ispell-message'.
 
+Unless `mh-insert-auto-fields' had previously been called
+manually, the function `mh-insert-auto-fields' is called to
+insert fields based upon the recipients. If fields are added, you
+are given a chance to see and to confirm these fields before the
+message is actually sent. You can do away with this confirmation
+by turning off the option `mh-auto-fields-prompt-flag'.
+
 In case the MH \"send\" program is installed under a different name,
 use `mh-send-prog' to tell MH-E the name.
 
@@ -17631,7 +17640,7 @@ delete the draft message.
 
 ;;;***
 
-;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (17383 37960))
+;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (17454 30995))
 ;;; Generated autoloads from mh-e/mh-e.el
 
 (put (quote mh-progs) (quote risky-local-variable) t)
@@ -17648,7 +17657,7 @@ Display version information about MH-E and the MH mail handling system.
 ;;;***
 
 ;;;### (autoloads (mh-folder-mode mh-nmail mh-rmail) "mh-folder"
-;;;;;;  "mh-e/mh-folder.el" (17379 24713))
+;;;;;;  "mh-e/mh-folder.el" (17454 30993))
 ;;; Generated autoloads from mh-e/mh-folder.el
 
 (autoload (quote mh-rmail) "mh-folder" "\
@@ -17730,7 +17739,7 @@ perform the operation on all messages in that region.
 ;;;***
 
 ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight"
-;;;;;;  "midnight.el" (17279 27123))
+;;;;;;  "midnight.el" (17418 6752))
 ;;; Generated autoloads from midnight.el
 
 (autoload (quote clean-buffer-list) "midnight" "\
@@ -17757,7 +17766,7 @@ to its second argument TM.
 ;;;***
 
 ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef"
-;;;;;;  "minibuf-eldef.el" (17279 27123))
+;;;;;;  "minibuf-eldef.el" (17390 26943))
 ;;; Generated autoloads from minibuf-eldef.el
 
 (defvar minibuffer-electric-default-mode nil "\
@@ -17786,7 +17795,7 @@ Returns non-nil if the new state is enabled.
 ;;;***
 
 ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el"
-;;;;;;  (17279 27183))
+;;;;;;  (17390 27409))
 ;;; Generated autoloads from progmodes/mixal-mode.el
 
 (autoload (quote mixal-mode) "mixal-mode" "\
@@ -17823,10 +17832,15 @@ PATTERN regexp.
 
 ;;;***
 
-;;;### (autoloads (mm-inline-external-body) "mm-extern" "gnus/mm-extern.el"
-;;;;;;  (17279 27122))
+;;;### (autoloads (mm-inline-external-body mm-extern-cache-contents)
+;;;;;;  "mm-extern" "gnus/mm-extern.el" (17441 26663))
 ;;; Generated autoloads from gnus/mm-extern.el
 
+(autoload (quote mm-extern-cache-contents) "mm-extern" "\
+Put the external-body part of HANDLE into its cache.
+
+\(fn HANDLE)" nil nil)
+
 (autoload (quote mm-inline-external-body) "mm-extern" "\
 Show the external-body part of HANDLE.
 This function replaces the buffer of HANDLE with a buffer contains
@@ -17838,7 +17852,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing.
 ;;;***
 
 ;;;### (autoloads (mm-inline-partial) "mm-partial" "gnus/mm-partial.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/mm-partial.el
 
 (autoload (quote mm-inline-partial) "mm-partial" "\
@@ -17852,7 +17866,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing.
 ;;;***
 
 ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents)
-;;;;;;  "mm-url" "gnus/mm-url.el" (17319 1473))
+;;;;;;  "mm-url" "gnus/mm-url.el" (17383 38805))
 ;;; Generated autoloads from gnus/mm-url.el
 
 (autoload (quote mm-url-insert-file-contents) "mm-url" "\
@@ -17869,7 +17883,7 @@ Insert file contents of URL using `mm-url-program'.
 ;;;***
 
 ;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu"
-;;;;;;  "gnus/mm-uu.el" (17379 24711))
+;;;;;;  "gnus/mm-uu.el" (17441 26664))
 ;;; Generated autoloads from gnus/mm-uu.el
 
 (autoload (quote mm-uu-dissect) "mm-uu" "\
@@ -17889,7 +17903,7 @@ Assume text has been decoded if DECODED is non-nil.
 ;;;***
 
 ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 27386))
 ;;; Generated autoloads from gnus/mml1991.el
 
 (autoload (quote mml1991-encrypt) "mml1991" "\
@@ -17906,7 +17920,7 @@ Not documented
 
 ;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt
 ;;;;;;  mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt)
-;;;;;;  "mml2015" "gnus/mml2015.el" (17279 27122))
+;;;;;;  "mml2015" "gnus/mml2015.el" (17390 27386))
 ;;; Generated autoloads from gnus/mml2015.el
 
 (autoload (quote mml2015-decrypt) "mml2015" "\
@@ -17979,7 +17993,7 @@ followed by the first character of the construct.
 ;;;***
 
 ;;;### (autoloads (unmorse-region morse-region) "morse" "play/morse.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17383 38807))
 ;;; Generated autoloads from play/morse.el
 
 (autoload (quote morse-region) "morse" "\
@@ -17994,8 +18008,8 @@ Convert morse coded text in region to ordinary ASCII text.
 
 ;;;***
 
-;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17390
+;;;;;;  26943))
 ;;; Generated autoloads from mouse-sel.el
 
 (defvar mouse-sel-mode nil "\
@@ -18048,7 +18062,7 @@ primary selection and region.
 
 ;;;***
 
-;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17279 27172))
+;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17383 38807))
 ;;; Generated autoloads from play/mpuz.el
 
 (autoload (quote mpuz) "mpuz" "\
@@ -18058,7 +18072,7 @@ Multiplication puzzle with GNU Emacs.
 
 ;;;***
 
-;;;### (autoloads (msb-mode) "msb" "msb.el" (17279 27150))
+;;;### (autoloads (msb-mode) "msb" "msb.el" (17390 26943))
 ;;; Generated autoloads from msb.el
 
 (defvar msb-mode nil "\
@@ -18388,7 +18402,7 @@ basis, this may not be accurate.
 ;;;***
 
 ;;;### (autoloads (mwheel-install mouse-wheel-mode) "mwheel" "mwheel.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17396 42167))
 ;;; Generated autoloads from mwheel.el
 
 (defvar mouse-wheel-mode nil "\
@@ -18404,7 +18418,7 @@ use either \\[customize] or the function `mouse-wheel-mode'.")
 (autoload (quote mouse-wheel-mode) "mwheel" "\
 Toggle mouse wheel support.
 With prefix argument ARG, turn on if positive, otherwise off.
-Returns non-nil if the new state is enabled.
+Return non-nil if the new state is enabled.
 
 \(fn &optional ARG)" t nil)
 
@@ -18418,7 +18432,7 @@ Enable mouse wheel support.
 ;;;### (autoloads (network-connection network-connection-to-service
 ;;;;;;  whois-reverse-lookup whois finger ftp run-dig dns-lookup-host
 ;;;;;;  nslookup nslookup-host route arp netstat ipconfig ping traceroute)
-;;;;;;  "net-utils" "net/net-utils.el" (17279 27123))
+;;;;;;  "net-utils" "net/net-utils.el" (17390 26944))
 ;;; Generated autoloads from net/net-utils.el
 
 (autoload (quote traceroute) "net-utils" "\
@@ -18698,7 +18712,7 @@ unless optional argument SOFT is non-nil.
 
 ;;;### (autoloads (newsticker-show-news newsticker-start-ticker newsticker-start
 ;;;;;;  newsticker-ticker-running-p newsticker-running-p) "newsticker"
-;;;;;;  "net/newsticker.el" (17379 30025))
+;;;;;;  "net/newsticker.el" (17390 26944))
 ;;; Generated autoloads from net/newsticker.el
 
 (autoload (quote newsticker-running-p) "newsticker" "\
@@ -18740,7 +18754,7 @@ Switch to newsticker buffer.  You may want to bind this to a key.
 ;;;***
 
 ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/nndiary.el
 
 (autoload (quote nndiary-generate-nov-databases) "nndiary" "\
@@ -18750,8 +18764,8 @@ Generate NOV databases in all nndiary directories.
 
 ;;;***
 
-;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17279
-;;;;;;  27122))
+;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17383
+;;;;;;  38805))
 ;;; Generated autoloads from gnus/nndoc.el
 
 (autoload (quote nndoc-add-type) "nndoc" "\
@@ -18766,7 +18780,7 @@ symbol in the alist.
 ;;;***
 
 ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 27386))
 ;;; Generated autoloads from gnus/nnfolder.el
 
 (autoload (quote nnfolder-generate-active-file) "nnfolder" "\
@@ -18778,7 +18792,7 @@ This command does not work if you use short group names.
 ;;;***
 
 ;;;### (autoloads (nnkiboze-generate-groups) "nnkiboze" "gnus/nnkiboze.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/nnkiboze.el
 
 (autoload (quote nnkiboze-generate-groups) "nnkiboze" "\
@@ -18790,7 +18804,7 @@ Finds out what articles are to be part of the nnkiboze groups.
 ;;;***
 
 ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/nnml.el
 
 (autoload (quote nnml-generate-nov-databases) "nnml" "\
@@ -18801,7 +18815,7 @@ Generate NOV databases in all nnml directories.
 ;;;***
 
 ;;;### (autoloads (nnsoup-revert-variables nnsoup-set-variables nnsoup-pack-replies)
-;;;;;;  "nnsoup" "gnus/nnsoup.el" (17279 27122))
+;;;;;;  "nnsoup" "gnus/nnsoup.el" (17383 38805))
 ;;; Generated autoloads from gnus/nnsoup.el
 
 (autoload (quote nnsoup-pack-replies) "nnsoup" "\
@@ -18822,7 +18836,7 @@ Revert posting and mailing methods to the standard Emacs methods.
 ;;;***
 
 ;;;### (autoloads (disable-command enable-command disabled-command-function)
-;;;;;;  "novice" "novice.el" (17279 27123))
+;;;;;;  "novice" "novice.el" (17390 26944))
 ;;; Generated autoloads from novice.el
 
 (defvar disabled-command-function (quote disabled-command-function) "\
@@ -18855,7 +18869,7 @@ to future sessions.
 ;;;***
 
 ;;;### (autoloads (nroff-mode) "nroff-mode" "textmodes/nroff-mode.el"
-;;;;;;  (17383 37890))
+;;;;;;  (17390 27169))
 ;;; Generated autoloads from textmodes/nroff-mode.el
 
 (autoload (quote nroff-mode) "nroff-mode" "\
@@ -18870,7 +18884,7 @@ closing requests for requests that are used in matched pairs.
 ;;;***
 
 ;;;### (autoloads (octave-help) "octave-hlp" "progmodes/octave-hlp.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 27409))
 ;;; Generated autoloads from progmodes/octave-hlp.el
 
 (autoload (quote octave-help) "octave-hlp" "\
@@ -18884,7 +18898,7 @@ If KEY is not a string, prompt for it with completion.
 ;;;***
 
 ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el"
-;;;;;;  (17297 42806))
+;;;;;;  (17390 27409))
 ;;; Generated autoloads from progmodes/octave-inf.el
 
 (autoload (quote inferior-octave) "octave-inf" "\
@@ -18907,7 +18921,7 @@ startup file, `~/.emacs-octave'.
 ;;;***
 
 ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el"
-;;;;;;  (17308 43144))
+;;;;;;  (17427 42815))
 ;;; Generated autoloads from progmodes/octave-mod.el
 
 (autoload (quote octave-mode) "octave-mod" "\
@@ -19006,7 +19020,7 @@ including a reproducible test case and send the message.
 ;;;***
 
 ;;;### (autoloads (edit-options list-options) "options" "obsolete/options.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17383 38807))
 ;;; Generated autoloads from obsolete/options.el
 
 (autoload (quote list-options) "options" "\
@@ -19031,7 +19045,7 @@ The Custom feature is intended to make this obsolete.
 ;;;;;;  orgtbl-mode turn-on-orgtbl org-remember-handler org-remember-annotation
 ;;;;;;  org-store-link org-tags-view org-diary org-todo-list org-agenda-list
 ;;;;;;  org-agenda org-agenda-mode org-mode) "org" "textmodes/org.el"
-;;;;;;  (17374 21578))
+;;;;;;  (17454 30950))
 ;;; Generated autoloads from textmodes/org.el
 
 (autoload (quote org-mode) "org" "\
@@ -19243,7 +19257,7 @@ The file is stored under the name `org-combined-agenda-icalendar-file'.
 ;;;***
 
 ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el"
-;;;;;;  (17374 21284))
+;;;;;;  (17425 24463))
 ;;; Generated autoloads from outline.el
 
 (autoload (quote outline-mode) "outline" "\
@@ -19298,7 +19312,7 @@ See the command `outline-mode' for more information on this mode.
 
 ;;;***
 
-;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17337 56255))
+;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17390 26944))
 ;;; Generated autoloads from paren.el
 
 (defvar show-paren-mode nil "\
@@ -19324,7 +19338,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time.
 ;;;***
 
 ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el"
-;;;;;;  (17308 43144))
+;;;;;;  (17390 27324))
 ;;; Generated autoloads from calendar/parse-time.el
 
 (autoload (quote parse-time-string) "parse-time" "\
@@ -19336,8 +19350,8 @@ unknown are returned as nil.
 
 ;;;***
 
-;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17279
-;;;;;;  27203))
+;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17390
+;;;;;;  27409))
 ;;; Generated autoloads from progmodes/pascal.el
 
 (autoload (quote pascal-mode) "pascal" "\
@@ -19390,7 +19404,7 @@ no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (pc-bindings-mode) "pc-mode" "emulation/pc-mode.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emulation/pc-mode.el
 
 (autoload (quote pc-bindings-mode) "pc-mode" "\
@@ -19408,7 +19422,7 @@ C-Escape does list-buffers.
 ;;;***
 
 ;;;### (autoloads (pc-selection-mode pc-selection-mode) "pc-select"
-;;;;;;  "emulation/pc-select.el" (17279 27122))
+;;;;;;  "emulation/pc-select.el" (17390 26938))
 ;;; Generated autoloads from emulation/pc-select.el
 
 (defvar pc-selection-mode nil "\
@@ -19485,8 +19499,8 @@ you must modify it using \\[customize] or \\[pc-selection-mode].")
 
 ;;;***
 
-;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17390
+;;;;;;  26944))
 ;;; Generated autoloads from pcmpl-cvs.el
 
 (autoload (quote pcomplete/cvs) "pcmpl-cvs" "\
@@ -19497,7 +19511,7 @@ Completion rules for the `cvs' command.
 ;;;***
 
 ;;;### (autoloads (pcomplete/tar pcomplete/make pcomplete/bzip2 pcomplete/gzip)
-;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (17279 27123))
+;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (17390 26944))
 ;;; Generated autoloads from pcmpl-gnu.el
 
 (autoload (quote pcomplete/gzip) "pcmpl-gnu" "\
@@ -19525,7 +19539,7 @@ Completion for the GNU tar utility.
 ;;;***
 
 ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill)
-;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (17279 27123))
+;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (17390 26944))
 ;;; Generated autoloads from pcmpl-linux.el
 
 (autoload (quote pcomplete/kill) "pcmpl-linux" "\
@@ -19545,8 +19559,8 @@ Completion for GNU/Linux `mount'.
 
 ;;;***
 
-;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17390
+;;;;;;  26944))
 ;;; Generated autoloads from pcmpl-rpm.el
 
 (autoload (quote pcomplete/rpm) "pcmpl-rpm" "\
@@ -19562,7 +19576,7 @@ You can use \\[eshell-report-bug] to do so.
 
 ;;;### (autoloads (pcomplete/chgrp pcomplete/chown pcomplete/which
 ;;;;;;  pcomplete/xargs pcomplete/rm pcomplete/rmdir pcomplete/cd)
-;;;;;;  "pcmpl-unix" "pcmpl-unix.el" (17279 27123))
+;;;;;;  "pcmpl-unix" "pcmpl-unix.el" (17390 26944))
 ;;; Generated autoloads from pcmpl-unix.el
 
 (autoload (quote pcomplete/cd) "pcmpl-unix" "\
@@ -19608,8 +19622,8 @@ Completion for the `chgrp' command.
 
 ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list
 ;;;;;;  pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete
-;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17279
-;;;;;;  27172))
+;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17390
+;;;;;;  26944))
 ;;; Generated autoloads from pcomplete.el
 
 (autoload (quote pcomplete) "pcomplete" "\
@@ -19668,7 +19682,7 @@ Setup shell-mode to use pcomplete.
 
 ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status
 ;;;;;;  cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs"
-;;;;;;  "pcvs.el" (17308 43140))
+;;;;;;  "pcvs.el" (17390 26944))
 ;;; Generated autoloads from pcvs.el
 
 (autoload (quote cvs-checkout) "pcvs" "\
@@ -19745,7 +19759,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
 
 ;;;***
 
-;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17279 27169))
+;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17390 26944))
 ;;; Generated autoloads from pcvs-defs.el
 
 (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] (quote (menu-item "Directory Status" cvs-status :help "A more verbose status of a workarea"))) (define-key m [checkout] (quote (menu-item "Checkout Module" cvs-checkout :help "Check out a module from the repository"))) (define-key m [update] (quote (menu-item "Update Directory" cvs-update :help "Fetch updates from the repository"))) (define-key m [examine] (quote (menu-item "Examine Directory" cvs-examine :help "Examine the current state of a workarea"))) (fset (quote cvs-global-menu) m)))
@@ -19753,7 +19767,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
 ;;;***
 
 ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el"
-;;;;;;  (17279 27203))
+;;;;;;  (17390 27409))
 ;;; Generated autoloads from progmodes/perl-mode.el
 
 (autoload (quote perl-mode) "perl-mode" "\
@@ -19811,7 +19825,7 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'.
 ;;;### (autoloads (pgg-snarf-keys pgg-snarf-keys-region pgg-insert-key
 ;;;;;;  pgg-verify pgg-verify-region pgg-sign pgg-sign-region pgg-decrypt
 ;;;;;;  pgg-decrypt-region pgg-encrypt pgg-encrypt-symmetric pgg-encrypt-symmetric-region
-;;;;;;  pgg-encrypt-region) "pgg" "pgg.el" (17279 27198))
+;;;;;;  pgg-encrypt-region) "pgg" "pgg.el" (17390 26944))
 ;;; Generated autoloads from pgg.el
 
 (autoload (quote pgg-encrypt-region) "pgg" "\
@@ -19944,19 +19958,8 @@ Import public keys in the current buffer.
 
 ;;;***
 
-;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el"
-;;;;;;  (17279 27198))
-;;; Generated autoloads from pgg-gpg.el
-
-(autoload (quote pgg-gpg-symmetric-key-p) "pgg-gpg" "\
-True if decoded armor MESSAGE-KEYS has symmetric encryption indicator.
-
-\(fn MESSAGE-KEYS)" nil nil)
-
-;;;***
-
 ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el"
-;;;;;;  (17327 23539))
+;;;;;;  (17390 26946))
 ;;; Generated autoloads from textmodes/picture.el
 
 (autoload (quote picture-mode) "picture" "\
@@ -20037,7 +20040,7 @@ they are not defaultly assigned to keys.
 ;;;***
 
 ;;;### (autoloads (po-find-file-coding-system) "po" "textmodes/po.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26946))
 ;;; Generated autoloads from textmodes/po.el
 
 (autoload (quote po-find-file-coding-system) "po" "\
@@ -20048,7 +20051,7 @@ Called through `file-coding-system-alist', before the file is visited for real.
 
 ;;;***
 
-;;;### (autoloads (pong) "pong" "play/pong.el" (17279 27123))
+;;;### (autoloads (pong) "pong" "play/pong.el" (17383 38807))
 ;;; Generated autoloads from play/pong.el
 
 (autoload (quote pong) "pong" "\
@@ -20065,7 +20068,7 @@ pong-mode keybindings:\\<pong-mode-map>
 ;;;***
 
 ;;;### (autoloads (pp-eval-last-sexp pp-eval-expression pp pp-buffer
-;;;;;;  pp-to-string) "pp" "emacs-lisp/pp.el" (17279 27122))
+;;;;;;  pp-to-string) "pp" "emacs-lisp/pp.el" (17390 26938))
 ;;; Generated autoloads from emacs-lisp/pp.el
 
 (autoload (quote pp-to-string) "pp" "\
@@ -20123,7 +20126,7 @@ Ignores leading comment characters.
 ;;;;;;  pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview
 ;;;;;;  pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript
 ;;;;;;  pr-ps-directory-preview pr-interface) "printing" "printing.el"
-;;;;;;  (17279 27201))
+;;;;;;  (17390 26944))
 ;;; Generated autoloads from printing.el
 
 (autoload (quote pr-interface) "printing" "\
@@ -20711,7 +20714,7 @@ are both set to t.
 ;;;***
 
 ;;;### (autoloads (run-prolog prolog-mode) "prolog" "progmodes/prolog.el"
-;;;;;;  (17279 27203))
+;;;;;;  (17390 27409))
 ;;; Generated autoloads from progmodes/prolog.el
 
 (autoload (quote prolog-mode) "prolog" "\
@@ -20731,7 +20734,7 @@ Run an inferior Prolog process, input and output via buffer *prolog*.
 
 ;;;***
 
-;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17327 23539))
+;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17390 26944))
 ;;; Generated autoloads from ps-bdf.el
 
 (defvar bdf-directory-list (if (memq system-type (quote (ms-dos windows-nt))) (list (expand-file-name "fonts/bdf" installation-directory)) (quote ("/usr/local/share/emacs/fonts/bdf"))) "\
@@ -20740,8 +20743,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
 
 ;;;***
 
-;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17279
-;;;;;;  27203))
+;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17390
+;;;;;;  27409))
 ;;; Generated autoloads from progmodes/ps-mode.el
 
 (autoload (quote ps-mode) "ps-mode" "\
@@ -20790,7 +20793,7 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number
 ;;;### (autoloads (ps-mule-begin-page ps-mule-begin-job ps-mule-encode-header-string
 ;;;;;;  ps-mule-initialize ps-mule-plot-composition ps-mule-plot-string
 ;;;;;;  ps-mule-set-ascii-font ps-mule-prepare-ascii-font ps-multibyte-buffer)
-;;;;;;  "ps-mule" "ps-mule.el" (17279 27172))
+;;;;;;  "ps-mule" "ps-mule.el" (17390 26944))
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\
@@ -20911,8 +20914,8 @@ Not documented
 ;;;;;;  ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer
 ;;;;;;  ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces
 ;;;;;;  ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type
-;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (17279
-;;;;;;  27172))
+;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (17390
+;;;;;;  26945))
 ;;; Generated autoloads from ps-print.el
 
 (defvar ps-page-dimensions-database (list (list (quote a4) (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list (quote a3) (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list (quote letter) (* 72 8.5) (* 72 11.0) "Letter") (list (quote legal) (* 72 8.5) (* 72 14.0) "Legal") (list (quote letter-small) (* 72 7.68) (* 72 10.16) "LetterSmall") (list (quote tabloid) (* 72 11.0) (* 72 17.0) "Tabloid") (list (quote ledger) (* 72 17.0) (* 72 11.0) "Ledger") (list (quote statement) (* 72 5.5) (* 72 8.5) "Statement") (list (quote executive) (* 72 7.5) (* 72 10.0) "Executive") (list (quote a4small) (* 72 7.47) (* 72 10.85) "A4Small") (list (quote b4) (* 72 10.125) (* 72 14.33) "B4") (list (quote b5) (* 72 7.16) (* 72 10.125) "B5")) "\
@@ -21109,7 +21112,7 @@ If EXTENSION is any other symbol, it is ignored.
 ;;;***
 
 ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el"
-;;;;;;  (17374 21423))
+;;;;;;  (17390 27409))
 ;;; Generated autoloads from progmodes/python.el
 
 (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode)))
@@ -21173,7 +21176,7 @@ Runs `jython-mode-hook' after `python-mode-hook'.
 ;;;***
 
 ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17407 3112))
 ;;; Generated autoloads from gnus/qp.el
 
 (autoload (quote quoted-printable-decode-region) "qp" "\
@@ -21427,8 +21430,8 @@ of each directory.
 
 ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls
 ;;;;;;  quickurl-browse-url-ask quickurl-browse-url quickurl-add-url
-;;;;;;  quickurl-ask quickurl) "quickurl" "net/quickurl.el" (17279
-;;;;;;  27123))
+;;;;;;  quickurl-ask quickurl) "quickurl" "net/quickurl.el" (17390
+;;;;;;  26944))
 ;;; Generated autoloads from net/quickurl.el
 
 (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\
@@ -21499,25 +21502,42 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 
 ;;;***
 
-;;;### (autoloads (rcirc) "rcirc" "net/rcirc.el" (17379 30025))
+;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
+;;;;;;  "net/rcirc.el" (17454 30953))
 ;;; Generated autoloads from net/rcirc.el
 
 (autoload (quote rcirc) "rcirc" "\
 Connect to IRC.
+If ARG is non-nil, prompt for a server to connect to.
 
-If any of the the optional SERVER, PORT, NICK or CHANNELS are not
-supplied, they are taken from the variables `rcirc-server',
-`rcirc-port', `rcirc-nick', and `rcirc-startup-channels-alist',
-respectively.
-
-\(fn &optional SERVER PORT NICK CHANNELS)" t nil)
+\(fn ARG)" t nil)
 
 (defalias (quote irc) (quote rcirc))
 
+(autoload (quote rcirc-connect) "rcirc" "\
+Not documented
+
+\(fn &optional SERVER PORT NICK USER-NAME FULL-NAME STARTUP-CHANNELS)" nil nil)
+
+(defvar rcirc-track-minor-mode nil "\
+Non-nil if Rcirc-Track minor mode is enabled.
+See the command `rcirc-track-minor-mode' for a description of this minor-mode.
+Setting this variable directly does not take effect;
+use either \\[customize] or the function `rcirc-track-minor-mode'.")
+
+(custom-autoload (quote rcirc-track-minor-mode) "rcirc")
+
+(put (quote rcirc-track-minor-mode) (quote custom-set) (quote custom-set-minor-mode))
+
+(autoload (quote rcirc-track-minor-mode) "rcirc" "\
+Global minor mode for tracking activity in rcirc buffers.
+
+\(fn &optional ARG)" t nil)
+
 ;;;***
 
-;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17279
-;;;;;;  27172))
+;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17390
+;;;;;;  26944))
 ;;; Generated autoloads from net/rcompile.el
 
 (autoload (quote remote-compile) "rcompile" "\
@@ -21529,7 +21549,7 @@ See \\[compile].
 ;;;***
 
 ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emacs-lisp/re-builder.el
 
 (defalias (quote regexp-builder) (quote re-builder))
@@ -21541,7 +21561,7 @@ Construct a regexp interactively.
 
 ;;;***
 
-;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17319 2458))
+;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17390 26945))
 ;;; Generated autoloads from recentf.el
 
 (defvar recentf-mode nil "\
@@ -21571,8 +21591,8 @@ that were operated on recently.
 ;;;### (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" (17279
-;;;;;;  27172))
+;;;;;;  delete-rectangle move-to-column-force) "rect" "rect.el" (17390
+;;;;;;  26945))
 ;;; Generated autoloads from rect.el
 
 (autoload (quote move-to-column-force) "rect" "\
@@ -21694,8 +21714,8 @@ rectangle which were empty.
 
 ;;;***
 
-;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17390
+;;;;;;  26946))
 ;;; Generated autoloads from textmodes/refill.el
 
 (autoload (quote refill-mode) "refill" "\
@@ -21711,7 +21731,7 @@ refilling if they would cause auto-filling.
 ;;;***
 
 ;;;### (autoloads (reftex-reset-scanning-information reftex-mode
-;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (17279 27201))
+;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (17405 10316))
 ;;; Generated autoloads from textmodes/reftex.el
 
 (autoload (quote turn-on-reftex) "reftex" "\
@@ -21761,7 +21781,7 @@ This enforces rescanning the buffer on next use.
 ;;;***
 
 ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el"
-;;;;;;  (17279 27172))
+;;;;;;  (17405 10316))
 ;;; Generated autoloads from textmodes/reftex-cite.el
 
 (autoload (quote reftex-citation) "reftex-cite" "\
@@ -21791,7 +21811,7 @@ While entering the regexp, completion on knows citation keys is possible.
 ;;;***
 
 ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el"
-;;;;;;  (17279 27172))
+;;;;;;  (17405 10316))
 ;;; Generated autoloads from textmodes/reftex-global.el
 
 (autoload (quote reftex-isearch-minor-mode) "reftex-global" "\
@@ -21808,7 +21828,7 @@ With no argument, this command toggles
 ;;;***
 
 ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el"
-;;;;;;  (17279 27172))
+;;;;;;  (17418 6743))
 ;;; Generated autoloads from textmodes/reftex-index.el
 
 (autoload (quote reftex-index-phrases-mode) "reftex-index" "\
@@ -21841,7 +21861,7 @@ Here are all local bindings.
 ;;;***
 
 ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el"
-;;;;;;  (17279 27172))
+;;;;;;  (17405 10316))
 ;;; Generated autoloads from textmodes/reftex-parse.el
 
 (autoload (quote reftex-all-document-files) "reftex-parse" "\
@@ -21854,7 +21874,7 @@ of master file.
 ;;;***
 
 ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emacs-lisp/regexp-opt.el
 
 (autoload (quote regexp-opt) "regexp-opt" "\
@@ -21881,7 +21901,7 @@ This means the number of non-shy regexp grouping constructs
 
 ;;;***
 
-;;;### (autoloads (repeat) "repeat" "repeat.el" (17279 27123))
+;;;### (autoloads (repeat) "repeat" "repeat.el" (17390 26945))
 ;;; Generated autoloads from repeat.el
 
 (autoload (quote repeat) "repeat" "\
@@ -21899,7 +21919,7 @@ can be modified by the global variable `repeat-on-final-keystroke'.
 ;;;***
 
 ;;;### (autoloads (reporter-submit-bug-report) "reporter" "mail/reporter.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26943))
 ;;; Generated autoloads from mail/reporter.el
 
 (autoload (quote reporter-submit-bug-report) "reporter" "\
@@ -21931,7 +21951,7 @@ mail-sending package is used for editing and sending the message.
 ;;;***
 
 ;;;### (autoloads (reposition-window) "reposition" "reposition.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26945))
 ;;; Generated autoloads from reposition.el
 
 (autoload (quote reposition-window) "reposition" "\
@@ -21958,8 +21978,8 @@ first comment line visible (if point is in a comment).
 
 ;;;***
 
-;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17390
+;;;;;;  26945))
 ;;; Generated autoloads from resume.el
 
 (autoload (quote resume-suspend-hook) "resume" "\
@@ -22006,7 +22026,7 @@ With zero or negative ARG turn mode off.
 ;;;***
 
 ;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emacs-lisp/ring.el
 
 (autoload (quote ring-p) "ring" "\
@@ -22021,7 +22041,7 @@ Make a ring that can contain SIZE elements.
 
 ;;;***
 
-;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17279 27123))
+;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17390 26944))
 ;;; Generated autoloads from net/rlogin.el
  (add-hook 'same-window-regexps "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)")
 
@@ -22072,8 +22092,8 @@ variable.
 ;;;;;;  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-movemail-variant-p) "rmail" "mail/rmail.el" (17374
-;;;;;;  21275))
+;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17454
+;;;;;;  30835))
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload (quote rmail-movemail-variant-p) "rmail" "\
@@ -22096,7 +22116,7 @@ variable `rmail-dont-reply-to-names', for when the user does not set
 value is the user's email address and name.)
 It is useful to set this variable in the site customization file.")
 
-(defvar rmail-ignored-headers (concat "^via:\\|^mail-from:\\|^origin:\\|^references:\\|^sender:" "\\|^status:\\|^received:\\|^x400-originator:\\|^x400-recipients:" "\\|^x400-received:\\|^x400-mts-identifier:\\|^x400-content-type:" "\\|^\\(resent-\\|\\)message-id:\\|^summary-line:\\|^resent-date:" "\\|^nntp-posting-host:\\|^path:\\|^x-char.*:\\|^x-face:\\|^face:" "\\|^x-mailer:\\|^delivered-to:\\|^lines:" "\\|^content-transfer-encoding:\\|^x-coding-system:" "\\|^return-path:\\|^errors-to:\\|^return-receipt-to:" "\\|^precedence:\\|^list-help:\\|^list-post:\\|^list-subscribe:" "\\|^list-id:\\|^list-unsubscribe:\\|^list-archive:" "\\|^content-length:\\|^nntp-posting-date:\\|^user-agent" "\\|^importance:\\|^envelope-to:\\|^delivery-date\\|^openpgp:" "\\|^mbox-line:\\|^cancel-lock:" "\\|^resent-face:\\|^resent-x.*:\\|^resent-organization:\\|^resent-openpgp:" "\\|^x-.*:") "\
+(defvar rmail-ignored-headers (concat "^via:\\|^mail-from:\\|^origin:\\|^references:\\|^sender:" "\\|^status:\\|^received:\\|^x400-originator:\\|^x400-recipients:" "\\|^x400-received:\\|^x400-mts-identifier:\\|^x400-content-type:" "\\|^\\(resent-\\|\\)message-id:\\|^summary-line:\\|^resent-date:" "\\|^nntp-posting-host:\\|^path:\\|^x-char.*:\\|^x-face:\\|^face:" "\\|^x-mailer:\\|^delivered-to:\\|^lines:" "\\|^content-transfer-encoding:\\|^x-coding-system:" "\\|^return-path:\\|^errors-to:\\|^return-receipt-to:" "\\|^precedence:\\|^list-help:\\|^list-post:\\|^list-subscribe:" "\\|^list-id:\\|^list-unsubscribe:\\|^list-archive:" "\\|^content-length:\\|^nntp-posting-date:\\|^user-agent" "\\|^importance:\\|^envelope-to:\\|^delivery-date\\|^openpgp:" "\\|^mbox-line:\\|^cancel-lock:\\|^DomainKey-Signature:" "\\|^resent-face:\\|^resent-x.*:\\|^resent-organization:\\|^resent-openpgp:" "\\|^x-.*:") "\
 *Regexp to match header fields that Rmail should normally hide.
 \(See also `rmail-nonignored-headers', which overrides this regexp.)
 This variable is used for reformatting the message header,
@@ -22127,7 +22147,7 @@ See also `rmail-highlight-face'.")
 
 (custom-autoload (quote rmail-highlighted-headers) "rmail")
 
-(defvar rmail-highlight-face nil "\
+(defvar rmail-highlight-face (quote rmail-highlight) "\
 *Face used by Rmail for highlighting headers.")
 
 (custom-autoload (quote rmail-highlight-face) "rmail")
@@ -22338,7 +22358,7 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server.
 ;;;***
 
 ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "mail/rmailedit.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26943))
 ;;; Generated autoloads from mail/rmailedit.el
 
 (autoload (quote rmail-edit-current-message) "rmailedit" "\
@@ -22350,7 +22370,7 @@ Edit the contents of this message.
 
 ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message
 ;;;;;;  rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd"
-;;;;;;  "mail/rmailkwd.el" (17279 27123))
+;;;;;;  "mail/rmailkwd.el" (17390 26943))
 ;;; Generated autoloads from mail/rmailkwd.el
 
 (autoload (quote rmail-add-label) "rmailkwd" "\
@@ -22389,7 +22409,7 @@ With prefix argument N moves forward N messages with these labels.
 ;;;***
 
 ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "mail/rmailmsc.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26943))
 ;;; Generated autoloads from mail/rmailmsc.el
 
 (autoload (quote set-rmail-inbox-list) "rmailmsc" "\
@@ -22403,7 +22423,7 @@ If FILE-NAME is empty, remove any existing inbox list.
 
 ;;;### (autoloads (rmail-output-body-to-file rmail-output rmail-fields-not-to-output
 ;;;;;;  rmail-output-to-rmail-file rmail-output-file-alist) "rmailout"
-;;;;;;  "mail/rmailout.el" (17374 21423))
+;;;;;;  "mail/rmailout.el" (17390 26943))
 ;;; Generated autoloads from mail/rmailout.el
 
 (defvar rmail-output-file-alist nil "\
@@ -22470,8 +22490,8 @@ FILE-NAME defaults, interactively, from the Subject field of the message.
 
 ;;;### (autoloads (rmail-sort-by-labels rmail-sort-by-lines rmail-sort-by-correspondent
 ;;;;;;  rmail-sort-by-recipient rmail-sort-by-author rmail-sort-by-subject
-;;;;;;  rmail-sort-by-date) "rmailsort" "mail/rmailsort.el" (17279
-;;;;;;  27123))
+;;;;;;  rmail-sort-by-date) "rmailsort" "mail/rmailsort.el" (17390
+;;;;;;  26943))
 ;;; Generated autoloads from mail/rmailsort.el
 
 (autoload (quote rmail-sort-by-date) "rmailsort" "\
@@ -22523,7 +22543,7 @@ KEYWORDS is a comma-separated list of labels.
 ;;;;;;  rmail-summary-by-senders rmail-summary-by-topic rmail-summary-by-regexp
 ;;;;;;  rmail-summary-by-recipients rmail-summary-by-labels rmail-summary
 ;;;;;;  rmail-summary-line-count-flag rmail-summary-scroll-between-messages)
-;;;;;;  "rmailsum" "mail/rmailsum.el" (17374 21544))
+;;;;;;  "rmailsum" "mail/rmailsum.el" (17427 42815))
 ;;; Generated autoloads from mail/rmailsum.el
 
 (defvar rmail-summary-scroll-between-messages t "\
@@ -22605,7 +22625,7 @@ Setting this variable has an effect only before reading a mail.")
 ;;;***
 
 ;;;### (autoloads (news-post-news) "rnewspost" "obsolete/rnewspost.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17383 38807))
 ;;; Generated autoloads from obsolete/rnewspost.el
 
 (autoload (quote news-post-news) "rnewspost" "\
@@ -22618,7 +22638,7 @@ If NOQUERY is non-nil, we do not query before doing the work.
 ;;;***
 
 ;;;### (autoloads (toggle-rot13-mode rot13-other-window rot13-region
-;;;;;;  rot13-string rot13) "rot13" "rot13.el" (17279 27123))
+;;;;;;  rot13-string rot13) "rot13" "rot13.el" (17390 26945))
 ;;; Generated autoloads from rot13.el
 
 (autoload (quote rot13) "rot13" "\
@@ -22659,7 +22679,7 @@ Toggle the use of rot 13 encoding for the current window.
 ;;;;;;  resize-minibuffer-frame-max-height resize-minibuffer-frame
 ;;;;;;  resize-minibuffer-window-exactly resize-minibuffer-window-max-height
 ;;;;;;  resize-minibuffer-mode) "rsz-mini" "obsolete/rsz-mini.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17383 38807))
 ;;; Generated autoloads from obsolete/rsz-mini.el
 
 (defvar resize-minibuffer-mode nil "\
@@ -22699,8 +22719,8 @@ This function is obsolete.
 
 ;;;***
 
-;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17390
+;;;;;;  26945))
 ;;; Generated autoloads from ruler-mode.el
 
 (autoload (quote ruler-mode) "ruler-mode" "\
@@ -22710,8 +22730,8 @@ Display a ruler in the header line if ARG > 0.
 
 ;;;***
 
-;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17279
-;;;;;;  27122))
+;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17418
+;;;;;;  6751))
 ;;; Generated autoloads from emacs-lisp/rx.el
 
 (autoload (quote rx-to-string) "rx" "\
@@ -23019,7 +23039,7 @@ enclosed in `(and ...)'.
 ;;;***
 
 ;;;### (autoloads (savehist-mode savehist-mode) "savehist" "savehist.el"
-;;;;;;  (17379 24714))
+;;;;;;  (17390 26945))
 ;;; Generated autoloads from savehist.el
 
 (defvar savehist-mode nil "\
@@ -23045,7 +23065,7 @@ which is probably undesirable.
 ;;;***
 
 ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el"
-;;;;;;  (17279 27203))
+;;;;;;  (17390 27409))
 ;;; Generated autoloads from progmodes/scheme.el
 
 (autoload (quote scheme-mode) "scheme" "\
@@ -23087,7 +23107,7 @@ that variable's value is a string.
 ;;;***
 
 ;;;### (autoloads (gnus-score-mode) "score-mode" "gnus/score-mode.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/score-mode.el
 
 (autoload (quote gnus-score-mode) "score-mode" "\
@@ -23100,8 +23120,8 @@ This mode is an extended emacs-lisp mode.
 
 ;;;***
 
-;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17383
+;;;;;;  38807))
 ;;; Generated autoloads from obsolete/scribe.el
 
 (autoload (quote scribe-mode) "scribe" "\
@@ -23126,7 +23146,7 @@ Interesting variables:
 ;;;***
 
 ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26945))
 ;;; Generated autoloads from scroll-all.el
 
 (defvar scroll-all-mode nil "\
@@ -23150,7 +23170,7 @@ apply to all visible windows in the same frame.
 ;;;***
 
 ;;;### (autoloads (scroll-lock-mode) "scroll-lock" "scroll-lock.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26945))
 ;;; Generated autoloads from scroll-lock.el
 
 (autoload (quote scroll-lock-mode) "scroll-lock" "\
@@ -23172,7 +23192,7 @@ during scrolling.
 ;;;;;;  mail-alias-file mail-default-reply-to mail-archive-file-name
 ;;;;;;  mail-header-separator send-mail-function mail-interactive
 ;;;;;;  mail-self-blind mail-specify-envelope-from mail-from-style)
-;;;;;;  "sendmail" "mail/sendmail.el" (17331 26860))
+;;;;;;  "sendmail" "mail/sendmail.el" (17390 26943))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style (quote angles) "\
@@ -23473,7 +23493,7 @@ Like `mail' command, but display mail buffer in another frame.
 ;;;***
 
 ;;;### (autoloads (server-save-buffers-kill-terminal server-mode
-;;;;;;  server-start) "server" "server.el" (17337 53564))
+;;;;;;  server-start) "server" "server.el" (17446 49713))
 ;;; Generated autoloads from server.el
 
 (autoload (quote server-start) "server" "\
@@ -23537,7 +23557,7 @@ These are active only in the minibuffer, when entering or editing a formula:
 ;;;***
 
 ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el"
-;;;;;;  (17357 6510))
+;;;;;;  (17390 26946))
 ;;; Generated autoloads from textmodes/sgml-mode.el
 
 (autoload (quote sgml-mode) "sgml-mode" "\
@@ -23605,7 +23625,7 @@ To work around that, do:
 ;;;***
 
 ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el"
-;;;;;;  (17327 23539))
+;;;;;;  (17411 11766))
 ;;; Generated autoloads from progmodes/sh-script.el
 
 (autoload (quote sh-mode) "sh-script" "\
@@ -23668,7 +23688,7 @@ with your script for an edit-interpret-debug cycle.
 
 ;;;***
 
-;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17279 27122))
+;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17383 38805))
 ;;; Generated autoloads from gnus/sha1.el
 
 (autoload (quote sha1) "sha1" "\
@@ -23683,7 +23703,7 @@ If BINARY is non-nil, return a string in binary form.
 ;;;***
 
 ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el"
-;;;;;;  (17283 59910))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emacs-lisp/shadow.el
 
 (autoload (quote list-load-path-shadows) "shadow" "\
@@ -23730,8 +23750,8 @@ buffer called `*Shadows*'.  Shadowings are located by calling the
 ;;;***
 
 ;;;### (autoloads (shadow-initialize shadow-define-regexp-group shadow-define-literal-group
-;;;;;;  shadow-define-cluster) "shadowfile" "shadowfile.el" (17279
-;;;;;;  27172))
+;;;;;;  shadow-define-cluster) "shadowfile" "shadowfile.el" (17390
+;;;;;;  26945))
 ;;; Generated autoloads from shadowfile.el
 
 (autoload (quote shadow-define-cluster) "shadowfile" "\
@@ -23770,7 +23790,7 @@ Set up file shadowing.
 ;;;***
 
 ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el"
-;;;;;;  (17279 27172))
+;;;;;;  (17390 26945))
 ;;; Generated autoloads from shell.el
 
 (defvar shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" "\
@@ -23817,7 +23837,7 @@ Otherwise, one argument `-i' is passed to the shell.
 ;;;***
 
 ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage)
-;;;;;;  "sieve" "gnus/sieve.el" (17279 27171))
+;;;;;;  "sieve" "gnus/sieve.el" (17383 38805))
 ;;; Generated autoloads from gnus/sieve.el
 
 (autoload (quote sieve-manage) "sieve" "\
@@ -23838,7 +23858,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (sieve-mode) "sieve-mode" "gnus/sieve-mode.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/sieve-mode.el
 
 (autoload (quote sieve-mode) "sieve-mode" "\
@@ -23853,8 +23873,8 @@ Turning on Sieve mode runs `sieve-mode-hook'.
 
 ;;;***
 
-;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17279
-;;;;;;  27203))
+;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17390
+;;;;;;  27409))
 ;;; Generated autoloads from progmodes/simula.el
 
 (autoload (quote simula-mode) "simula" "\
@@ -23903,7 +23923,7 @@ with no arguments, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (skeleton-pair-insert-maybe skeleton-insert skeleton-proxy-new
-;;;;;;  define-skeleton) "skeleton" "skeleton.el" (17279 27123))
+;;;;;;  define-skeleton) "skeleton" "skeleton.el" (17390 26945))
 ;;; Generated autoloads from skeleton.el
 
 (defvar skeleton-filter (quote identity) "\
@@ -24013,7 +24033,7 @@ symmetrical ones, and the same character twice for the others.
 ;;;***
 
 ;;;### (autoloads (smerge-mode smerge-ediff) "smerge-mode" "smerge-mode.el"
-;;;;;;  (17279 27196))
+;;;;;;  (17390 26945))
 ;;; Generated autoloads from smerge-mode.el
 
 (autoload (quote smerge-ediff) "smerge-mode" "\
@@ -24032,7 +24052,7 @@ Minor mode to simplify editing output from the diff3 program.
 ;;;***
 
 ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17441 26811))
 ;;; Generated autoloads from gnus/smiley.el
 
 (autoload (quote smiley-region) "smiley" "\
@@ -24050,7 +24070,7 @@ interactively. If there's no argument, do it at the current buffer
 ;;;***
 
 ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail"
-;;;;;;  "mail/smtpmail.el" (17374 21266))
+;;;;;;  "mail/smtpmail.el" (17390 26943))
 ;;; Generated autoloads from mail/smtpmail.el
 
 (autoload (quote smtpmail-send-it) "smtpmail" "\
@@ -24065,7 +24085,7 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'.
 
 ;;;***
 
-;;;### (autoloads (snake) "snake" "play/snake.el" (17279 27123))
+;;;### (autoloads (snake) "snake" "play/snake.el" (17383 38807))
 ;;; Generated autoloads from play/snake.el
 
 (autoload (quote snake) "snake" "\
@@ -24089,7 +24109,7 @@ Snake mode keybindings:
 ;;;***
 
 ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26944))
 ;;; Generated autoloads from net/snmp-mode.el
 
 (autoload (quote snmp-mode) "snmp-mode" "\
@@ -24120,7 +24140,7 @@ then `snmpv2-mode-hook'.
 
 ;;;### (autoloads (solar-equinoxes-solstices sunrise-sunset calendar-location-name
 ;;;;;;  calendar-longitude calendar-latitude calendar-time-display-form)
-;;;;;;  "solar" "calendar/solar.el" (17308 43144))
+;;;;;;  "solar" "calendar/solar.el" (17390 27324))
 ;;; Generated autoloads from calendar/solar.el
 
 (defvar calendar-time-display-form (quote (12-hours ":" minutes am-pm (if time-zone " (") time-zone (if time-zone ")"))) "\
@@ -24191,8 +24211,8 @@ Requires floating point.
 
 ;;;***
 
-;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17383
+;;;;;;  38807))
 ;;; Generated autoloads from play/solitaire.el
 
 (autoload (quote solitaire) "solitaire" "\
@@ -24269,7 +24289,7 @@ Pick your favourite shortcuts:
 
 ;;;### (autoloads (reverse-region sort-columns sort-regexp-fields
 ;;;;;;  sort-fields sort-numeric-fields sort-pages sort-paragraphs
-;;;;;;  sort-lines sort-subr) "sort" "sort.el" (17279 27123))
+;;;;;;  sort-lines sort-subr) "sort" "sort.el" (17441 26655))
 ;;; Generated autoloads from sort.el
 
 (autoload (quote sort-subr) "sort" "\
@@ -24411,8 +24431,8 @@ From a program takes two point or marker arguments, BEG and END.
 
 ;;;***
 
-;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17374
-;;;;;;  21275))
+;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17441
+;;;;;;  26811))
 ;;; Generated autoloads from gnus/spam.el
 
 (autoload (quote spam-initialize) "spam" "\
@@ -24424,7 +24444,7 @@ Install the spam.el hooks and do other initialization
 
 ;;;### (autoloads (spam-report-deagentize spam-report-agentize spam-report-url-to-file
 ;;;;;;  spam-report-url-ping-mm-url spam-report-process-queue) "spam-report"
-;;;;;;  "gnus/spam-report.el" (17279 27171))
+;;;;;;  "gnus/spam-report.el" (17390 27306))
 ;;; Generated autoloads from gnus/spam-report.el
 
 (autoload (quote spam-report-process-queue) "spam-report" "\
@@ -24467,7 +24487,7 @@ Spam reports will be queued with the method used when
 ;;;***
 
 ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar"
-;;;;;;  "speedbar.el" (17297 42917))
+;;;;;;  "speedbar.el" (17418 6739))
 ;;; Generated autoloads from speedbar.el
 
 (defalias (quote speedbar) (quote speedbar-frame-mode))
@@ -24492,7 +24512,7 @@ selected.  If the speedbar frame is active, then select the attached frame.
 ;;;***
 
 ;;;### (autoloads (spell-string spell-region spell-word spell-buffer)
-;;;;;;  "spell" "textmodes/spell.el" (17279 27123))
+;;;;;;  "spell" "textmodes/spell.el" (17390 26946))
 ;;; Generated autoloads from textmodes/spell.el
 
 (put (quote spell-filter) (quote risky-local-variable) t)
@@ -24528,8 +24548,8 @@ Check spelling of string supplied as argument.
 
 ;;;***
 
-;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17383
+;;;;;;  38807))
 ;;; Generated autoloads from play/spook.el
 
 (autoload (quote spook) "spook" "\
@@ -24547,8 +24567,8 @@ Return a vector containing the lines from `spook-phrases-file'.
 ;;;### (autoloads (sql-linter sql-db2 sql-interbase sql-postgres
 ;;;;;;  sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix
 ;;;;;;  sql-sybase sql-oracle sql-product-interactive sql-mode sql-help
-;;;;;;  sql-add-product-keywords) "sql" "progmodes/sql.el" (17279
-;;;;;;  27123))
+;;;;;;  sql-add-product-keywords) "sql" "progmodes/sql.el" (17390
+;;;;;;  27409))
 ;;; Generated autoloads from progmodes/sql.el
 
 (autoload (quote sql-add-product-keywords) "sql" "\
@@ -24979,8 +24999,8 @@ input.  See `sql-interactive-mode'.
 ;;;;;;  strokes-mode strokes-list-strokes strokes-load-user-strokes
 ;;;;;;  strokes-help strokes-describe-stroke strokes-do-complex-stroke
 ;;;;;;  strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke
-;;;;;;  strokes-global-set-stroke) "strokes" "strokes.el" (17279
-;;;;;;  27172))
+;;;;;;  strokes-global-set-stroke) "strokes" "strokes.el" (17390
+;;;;;;  26945))
 ;;; Generated autoloads from strokes.el
 
 (autoload (quote strokes-global-set-stroke) "strokes" "\
@@ -25111,7 +25131,7 @@ Studlify-case the current buffer.
 
 ;;;***
 
-;;;### (autoloads (locate-library) "subr" "subr.el" (17376 5576))
+;;;### (autoloads (locate-library) "subr" "subr.el" (17427 36476))
 ;;; Generated autoloads from subr.el
 
 (autoload (quote locate-library) "subr" "\
@@ -25133,7 +25153,7 @@ and the file name is displayed in the echo area.
 ;;;***
 
 ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el"
-;;;;;;  (17279 27174))
+;;;;;;  (17390 26943))
 ;;; Generated autoloads from mail/supercite.el
 
 (autoload (quote sc-cite-original) "supercite" "\
@@ -25165,7 +25185,30 @@ before, and `sc-post-hook' is run after the guts of this function.
 
 ;;;***
 
-;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17279 27123))
+;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17425 24371))
+;;; Generated autoloads from t-mouse.el
+
+(defvar t-mouse-mode nil "\
+Non-nil if T-Mouse mode is enabled.
+See the command `t-mouse-mode' for a description of this minor-mode.
+Setting this variable directly does not take effect;
+use either \\[customize] or the function `t-mouse-mode'.")
+
+(custom-autoload (quote t-mouse-mode) "t-mouse")
+
+(put (quote t-mouse-mode) (quote custom-set) (quote custom-set-minor-mode))
+
+(autoload (quote t-mouse-mode) "t-mouse" "\
+Toggle t-mouse mode.
+With prefix arg, turn t-mouse mode on iff arg is positive.
+
+Turn it on to use emacs mouse commands, and off to use t-mouse commands.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
+;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17390 26945))
 ;;; Generated autoloads from tabify.el
 
 (autoload (quote untabify) "tabify" "\
@@ -25788,7 +25831,7 @@ converts a table into plain text without frames.  It is a companion to
 
 ;;;***
 
-;;;### (autoloads (talk talk-connect) "talk" "talk.el" (17332 7267))
+;;;### (autoloads (talk talk-connect) "talk" "talk.el" (17390 26945))
 ;;; Generated autoloads from talk.el
 
 (autoload (quote talk-connect) "talk" "\
@@ -25803,7 +25846,7 @@ Connect to the Emacs talk group from the current X display or tty frame.
 
 ;;;***
 
-;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17279 27201))
+;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17390 26945))
 ;;; Generated autoloads from tar-mode.el
 
 (autoload (quote tar-mode) "tar-mode" "\
@@ -25878,7 +25921,7 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'.
 
 ;;;***
 
-;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17279 27123))
+;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17390 26944))
 ;;; Generated autoloads from net/telnet.el
  (add-hook 'same-window-regexps "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)")
 
@@ -25934,8 +25977,8 @@ Start a terminal-emulator in a new buffer.
 
 ;;;***
 
-;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17279
-;;;;;;  27172))
+;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17390
+;;;;;;  26946))
 ;;; Generated autoloads from terminal.el
 
 (autoload (quote terminal-emulator) "terminal" "\
@@ -25972,7 +26015,7 @@ subprocess started.
 ;;;***
 
 ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emacs-lisp/testcover.el
 
 (autoload (quote testcover-this-defun) "testcover" "\
@@ -25982,7 +26025,7 @@ Start coverage on function under point.
 
 ;;;***
 
-;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17279 27123))
+;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17383 38807))
 ;;; Generated autoloads from play/tetris.el
 
 (autoload (quote tetris) "tetris" "\
@@ -26013,7 +26056,7 @@ tetris-mode keybindings:
 ;;;;;;  tex-start-commands tex-start-options 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"
-;;;;;;  (17279 27185))
+;;;;;;  (17390 26946))
 ;;; Generated autoloads from textmodes/tex-mode.el
 
 (defvar tex-shell-file-name nil "\
@@ -26315,7 +26358,7 @@ Major mode to edit DocTeX files.
 ;;;***
 
 ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer)
-;;;;;;  "texinfmt" "textmodes/texinfmt.el" (17319 2455))
+;;;;;;  "texinfmt" "textmodes/texinfmt.el" (17390 26946))
 ;;; Generated autoloads from textmodes/texinfmt.el
 
 (autoload (quote texinfo-format-buffer) "texinfmt" "\
@@ -26355,7 +26398,7 @@ if large.  You can use Info-split to do this manually.
 ;;;***
 
 ;;;### (autoloads (texinfo-mode texinfo-close-quote texinfo-open-quote)
-;;;;;;  "texinfo" "textmodes/texinfo.el" (17279 27203))
+;;;;;;  "texinfo" "textmodes/texinfo.el" (17390 26946))
 ;;; Generated autoloads from textmodes/texinfo.el
 
 (defvar texinfo-open-quote "``" "\
@@ -26486,7 +26529,7 @@ Minor mode for automatically correct Thai character composition.
 
 ;;;### (autoloads (list-at-point number-at-point symbol-at-point
 ;;;;;;  sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing)
-;;;;;;  "thingatpt" "thingatpt.el" (17279 27123))
+;;;;;;  "thingatpt" "thingatpt.el" (17390 26946))
 ;;; Generated autoloads from thingatpt.el
 
 (autoload (quote forward-thing) "thingatpt" "\
@@ -26543,7 +26586,7 @@ Not documented
 
 ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked
 ;;;;;;  thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el"
-;;;;;;  (17376 5576))
+;;;;;;  (17390 26946))
 ;;; Generated autoloads from thumbs.el
 
 (autoload (quote thumbs-find-thumb) "thumbs" "\
@@ -26661,7 +26704,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el"
-;;;;;;  (17350 14833))
+;;;;;;  (17390 26946))
 ;;; Generated autoloads from textmodes/tildify.el
 
 (autoload (quote tildify-region) "tildify" "\
@@ -26685,7 +26728,7 @@ This function performs no refilling of the changed text.
 ;;;***
 
 ;;;### (autoloads (display-time-mode display-time display-time-day-and-date)
-;;;;;;  "time" "time.el" (17357 6510))
+;;;;;;  "time" "time.el" (17390 26947))
 ;;; Generated autoloads from time.el
 
 (defvar display-time-day-and-date nil "\
@@ -26728,8 +26771,8 @@ This runs the normal hook `display-time-hook' after each update.
 ;;;### (autoloads (safe-date-to-time time-to-days time-to-day-in-year
 ;;;;;;  date-leap-year-p days-between date-to-day time-add time-subtract
 ;;;;;;  time-since days-to-time time-less-p seconds-to-time time-to-seconds
-;;;;;;  date-to-time) "time-date" "calendar/time-date.el" (17308
-;;;;;;  43144))
+;;;;;;  date-to-time) "time-date" "calendar/time-date.el" (17390
+;;;;;;  27324))
 ;;; Generated autoloads from calendar/time-date.el
 
 (autoload (quote date-to-time) "time-date" "\
@@ -26815,7 +26858,7 @@ If DATE is malformed, return a time value of zeros.
 ;;;***
 
 ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp"
-;;;;;;  "time-stamp.el" (17279 27167))
+;;;;;;  "time-stamp.el" (17390 26947))
 ;;; Generated autoloads from time-stamp.el
 
 (autoload (quote time-stamp) "time-stamp" "\
@@ -26851,7 +26894,7 @@ With ARG, turn time stamping on if and only if arg is positive.
 ;;;;;;  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"
-;;;;;;  (17308 43144))
+;;;;;;  (17390 27324))
 ;;; Generated autoloads from calendar/timeclock.el
 
 (autoload (quote timeclock-modeline-display) "timeclock" "\
@@ -26952,7 +26995,7 @@ relative only to the time worked today, and not to past time.
 
 ;;;### (autoloads (with-timeout run-with-idle-timer add-timeout run-with-timer
 ;;;;;;  run-at-time cancel-function-timers cancel-timer) "timer"
-;;;;;;  "emacs-lisp/timer.el" (17279 27198))
+;;;;;;  "emacs-lisp/timer.el" (17390 26938))
 ;;; Generated autoloads from emacs-lisp/timer.el
 
 (defalias (quote disable-timeout) (quote cancel-timer))
@@ -27070,7 +27113,7 @@ PATTERN regexp.
 ;;;***
 
 ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm"
-;;;;;;  "tmm.el" (17279 27123))
+;;;;;;  "tmm.el" (17390 26947))
 ;;; Generated autoloads from tmm.el
  (define-key global-map "\M-`" 'tmm-menubar)
  (define-key global-map [f10] 'tmm-menubar)
@@ -27111,7 +27154,7 @@ Its value should be an event that has a binding in MENU.
 
 ;;;### (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" (17308 43144))
+;;;;;;  "todo-mode" "calendar/todo-mode.el" (17390 27324))
 ;;; Generated autoloads from calendar/todo-mode.el
 
 (autoload (quote todo-add-category) "todo-mode" "\
@@ -27171,10 +27214,16 @@ Show TODO list.
 ;;;***
 
 ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu
-;;;;;;  tool-bar-local-item tool-bar-add-item) "tool-bar" "tool-bar.el"
-;;;;;;  (17331 26268))
+;;;;;;  tool-bar-local-item tool-bar-add-item toggle-tool-bar-mode-from-frame)
+;;;;;;  "tool-bar" "tool-bar.el" (17446 40492))
 ;;; Generated autoloads from tool-bar.el
 
+(autoload (quote toggle-tool-bar-mode-from-frame) "tool-bar" "\
+Toggle tool bar on or off, based on the status of the current frame.
+See `tool-bar-mode' for more information.
+
+\(fn &optional ARG)" t nil)
+
 (put (quote tool-bar-mode) (quote standard-value) (quote (t)))
 
 (autoload (quote tool-bar-add-item) "tool-bar" "\
@@ -27239,7 +27288,7 @@ holds a keymap.
 ;;;***
 
 ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emulation/tpu-edt.el
 
 (defvar tpu-edt-mode nil "\
@@ -27267,7 +27316,7 @@ Turn on TPU/edt emulation.
 ;;;***
 
 ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free tpu-set-scroll-margins)
-;;;;;;  "tpu-extras" "emulation/tpu-extras.el" (17279 27122))
+;;;;;;  "tpu-extras" "emulation/tpu-extras.el" (17390 26938))
 ;;; Generated autoloads from emulation/tpu-extras.el
 
 (autoload (quote tpu-set-scroll-margins) "tpu-extras" "\
@@ -27287,7 +27336,7 @@ Constrain the cursor to the flow of the text.
 
 ;;;***
 
-;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17279 27122))
+;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17390 26938))
 ;;; Generated autoloads from emacs-lisp/tq.el
 
 (autoload (quote tq-create) "tq" "\
@@ -27301,7 +27350,7 @@ to a tcp server on another machine.
 ;;;***
 
 ;;;### (autoloads (trace-function-background trace-function trace-buffer)
-;;;;;;  "trace" "emacs-lisp/trace.el" (17279 27122))
+;;;;;;  "trace" "emacs-lisp/trace.el" (17390 26938))
 ;;; Generated autoloads from emacs-lisp/trace.el
 
 (defvar trace-buffer "*trace-output*" "\
@@ -27335,7 +27384,7 @@ the window or buffer configuration at all.
 ;;;### (autoloads (tramp-unload-tramp tramp-unload-file-name-handler-alist
 ;;;;;;  tramp-completion-file-name-handler tramp-file-name-handler
 ;;;;;;  tramp-completion-file-name-regexp tramp-file-name-regexp)
-;;;;;;  "tramp" "net/tramp.el" (17379 24712))
+;;;;;;  "tramp" "net/tramp.el" (17396 42158))
 ;;; Generated autoloads from net/tramp.el
 
 (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\
@@ -27432,11 +27481,21 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (tumme-setup-dired-keybindings tumme-dired) "tumme"
-;;;;;;  "tumme.el" (17374 21544))
+;;;### (autoloads (tumme-mark-tagged-files tumme-dired-comment-files
+;;;;;;  tumme-display-dired-image tumme-dired-display-external tumme-display-thumb
+;;;;;;  tumme-display-thumbs-append tumme-setup-dired-keybindings
+;;;;;;  tumme-jump-thumbnail-buffer tumme-tag-remove tumme-tag-files
+;;;;;;  tumme-display-thumbs tumme-dired-with-window-configuration
+;;;;;;  tumme-dired-insert-marked-thumbs) "tumme" "tumme.el" (17425
+;;;;;;  24462))
 ;;; Generated autoloads from tumme.el
 
-(autoload (quote tumme-dired) "tumme" "\
+(autoload (quote tumme-dired-insert-marked-thumbs) "tumme" "\
+Insert thumbnails before file names of marked files in the dired buffer.
+
+\(fn)" t nil)
+
+(autoload (quote tumme-dired-with-window-configuration) "tumme" "\
 Open directory DIR and create a default window configuration.
 
 Convenience command that:
@@ -27445,10 +27504,51 @@ Convenience command that:
  - Splits windows in most useful (?) way
  - Set `truncate-lines' to t
 
+After the command has finished, you would typically mark some
+image files in dired and type
+\\[tumme-display-thumbs] (`tumme-display-thumbs').
+
 If called with prefix argument ARG, skip splitting of windows.
 
+The current window configuration is saved and can be restored by
+calling `tumme-restore-window-configuration'.
+
 \(fn DIR &optional ARG)" t nil)
 
+(autoload (quote tumme-display-thumbs) "tumme" "\
+Display thumbnails of all marked files, in `tumme-thumbnail-buffer'.
+If a thumbnail image does not exist for a file, it is created on the
+fly.  With prefix argument ARG, display only thumbnail for file at
+point (this is useful if you have marked some files but want to show
+another one).
+
+Recommended usage is to split the current frame horizontally so that
+you have the dired buffer in the left window and the
+`tumme-thumbnail-buffer' buffer in the right window.
+
+With optional argument APPEND, append thumbnail to thumbnail buffer
+instead of erasing it first.
+
+\(fn &optional ARG APPEND)" t nil)
+
+(defalias (quote tumme) (quote tumme-show-all-from-dir))
+
+(autoload (quote tumme-tag-files) "tumme" "\
+Tag marked file(s) in dired.  With prefix ARG, tag file at point.
+
+\(fn ARG)" t nil)
+
+(autoload (quote tumme-tag-remove) "tumme" "\
+Remove tag for selected file(s).
+With prefix argument ARG, remove tag from file at point.
+
+\(fn ARG)" t nil)
+
+(autoload (quote tumme-jump-thumbnail-buffer) "tumme" "\
+Jump to thumbnail buffer.
+
+\(fn)" t nil)
+
 (autoload (quote tumme-setup-dired-keybindings) "tumme" "\
 Setup easy-to-use keybindings for the commands to be used in dired mode.
 Note that n, p and <down> and <up> will be hijacked and bound to
@@ -27456,10 +27556,47 @@ Note that n, p and <down> and <up> will be hijacked and bound to
 
 \(fn)" t nil)
 
+(autoload (quote tumme-display-thumbs-append) "tumme" "\
+Append thumbnails to `tumme-thumbnail-buffer'.
+
+\(fn)" t nil)
+
+(autoload (quote tumme-display-thumb) "tumme" "\
+Shorthard for `tumme-display-thumbs' with prefix argument.
+
+\(fn)" t nil)
+
+(autoload (quote tumme-dired-display-external) "tumme" "\
+Display file at point using an external viewer.
+
+\(fn)" t nil)
+
+(autoload (quote tumme-display-dired-image) "tumme" "\
+Display current image file.
+See documentation for `tumme-display-image' for more information.
+With prefix argument ARG, display image in its original size.
+
+\(fn &optional ARG)" t nil)
+
+(autoload (quote tumme-dired-comment-files) "tumme" "\
+Add comment to current or marked files in dired.
+
+\(fn)" t nil)
+
+(autoload (quote tumme-mark-tagged-files) "tumme" "\
+Use regexp to mark files with matching tag.
+A `tag' is a keyword, a piece of meta data, associated with an
+image file and stored in tumme's database file.  This command
+lets you input a regexp and this will be matched against all tags
+on all image files in the database file.  The files that have a
+matching tags will be marked in the dired buffer.
+
+\(fn)" t nil)
+
 ;;;***
 
 ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column"
-;;;;;;  "textmodes/two-column.el" (17279 27123))
+;;;;;;  "textmodes/two-column.el" (17390 26946))
 ;;; Generated autoloads from textmodes/two-column.el
  (autoload '2C-command "two-column" () t 'keymap)
  (global-set-key "\C-x6" '2C-command)
@@ -27510,7 +27647,7 @@ First column's text    sSs  Second column's text
 ;;;;;;  type-break type-break-mode type-break-keystroke-threshold
 ;;;;;;  type-break-good-break-interval type-break-good-rest-interval
 ;;;;;;  type-break-interval type-break-mode) "type-break" "type-break.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26947))
 ;;; Generated autoloads from type-break.el
 
 (defvar type-break-mode nil "\
@@ -27693,7 +27830,7 @@ FRAC should be the inverse of the fractional value; for example, a value of
 ;;;***
 
 ;;;### (autoloads (ununderline-region underline-region) "underline"
-;;;;;;  "textmodes/underline.el" (17279 27123))
+;;;;;;  "textmodes/underline.el" (17390 26946))
 ;;; Generated autoloads from textmodes/underline.el
 
 (autoload (quote underline-region) "underline" "\
@@ -27714,7 +27851,7 @@ which specify the range to operate on.
 ;;;***
 
 ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
-;;;;;;  "undigest" "mail/undigest.el" (17279 27123))
+;;;;;;  "undigest" "mail/undigest.el" (17390 26943))
 ;;; Generated autoloads from mail/undigest.el
 
 (autoload (quote undigestify-rmail-message) "undigest" "\
@@ -27733,7 +27870,7 @@ following the containing message.
 ;;;***
 
 ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26943))
 ;;; Generated autoloads from mail/unrmail.el
 
 (autoload (quote batch-unrmail) "unrmail" "\
@@ -27752,8 +27889,8 @@ Convert Rmail file FILE to system inbox format file TO-FILE.
 
 ;;;***
 
-;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17379
-;;;;;;  24712))
+;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17405
+;;;;;;  10313))
 ;;; Generated autoloads from emacs-lisp/unsafep.el
 
 (autoload (quote unsafep) "unsafep" "\
@@ -27766,7 +27903,7 @@ of symbols with local bindings.
 ;;;***
 
 ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url"
-;;;;;;  "url/url.el" (17350 14840))
+;;;;;;  "url/url.el" (17403 14074))
 ;;; Generated autoloads from url/url.el
 
 (autoload (quote url-retrieve) "url" "\
@@ -27796,7 +27933,7 @@ no further processing).  URL is either a string or a parsed URL.
 ;;;***
 
 ;;;### (autoloads (url-register-auth-scheme url-get-authentication)
-;;;;;;  "url-auth" "url/url-auth.el" (17279 27123))
+;;;;;;  "url-auth" "url/url-auth.el" (17383 38807))
 ;;; Generated autoloads from url/url-auth.el
 
 (autoload (quote url-get-authentication) "url-auth" "\
@@ -27864,7 +28001,7 @@ Return t iff a cached file has expired.
 
 ;;;***
 
-;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17279 27123))
+;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17383 38807))
 ;;; Generated autoloads from url/url-cid.el
 
 (autoload (quote url-cid) "url-cid" "\
@@ -27875,7 +28012,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav"
-;;;;;;  "url/url-dav.el" (17279 27123))
+;;;;;;  "url/url-dav.el" (17383 38807))
 ;;; Generated autoloads from url/url-dav.el
 
 (autoload (quote url-dav-supported-p) "url-dav" "\
@@ -27890,8 +28027,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17279
-;;;;;;  27189))
+;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17383
+;;;;;;  38807))
 ;;; Generated autoloads from url/url-file.el
 
 (autoload (quote url-file) "url-file" "\
@@ -27902,7 +28039,7 @@ Handle file: and ftp: URLs.
 ;;;***
 
 ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw"
-;;;;;;  "url/url-gw.el" (17279 27123))
+;;;;;;  "url/url-gw.el" (17383 38807))
 ;;; Generated autoloads from url/url-gw.el
 
 (autoload (quote url-gateway-nslookup-host) "url-gw" "\
@@ -27920,8 +28057,8 @@ Will not make a connection if `url-gateway-unplugged' is non-nil.
 ;;;***
 
 ;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file
-;;;;;;  url-handler-mode) "url-handlers" "url/url-handlers.el" (17337
-;;;;;;  56256))
+;;;;;;  url-handler-mode) "url-handlers" "url/url-handlers.el" (17454
+;;;;;;  30994))
 ;;; Generated autoloads from url/url-handlers.el
 
 (defvar url-handler-mode nil "\
@@ -27966,7 +28103,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p
-;;;;;;  url-http) "url-http" "url/url-http.el" (17283 59911))
+;;;;;;  url-http) "url-http" "url/url-http.el" (17425 24466))
 ;;; Generated autoloads from url/url-http.el
 
 (autoload (quote url-http) "url-http" "\
@@ -27990,7 +28127,7 @@ Not documented
 \(fn URL &optional ID-FORMAT)" nil nil)
 
 (autoload (quote url-http-options) "url-http" "\
-Returns a property list describing options available for URL.
+Return a property list describing options available for URL.
 This list is retrieved using the `OPTIONS' HTTP method.
 
 Property list members:
@@ -28019,7 +28156,7 @@ p3p
 
 ;;;***
 
-;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17279 27123))
+;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17454 30953))
 ;;; Generated autoloads from url/url-irc.el
 
 (autoload (quote url-irc) "url-irc" "\
@@ -28029,8 +28166,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17279
-;;;;;;  27123))
+;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17383
+;;;;;;  38807))
 ;;; Generated autoloads from url/url-ldap.el
 
 (autoload (quote url-ldap) "url-ldap" "\
@@ -28044,7 +28181,7 @@ URL can be a URL string, or a URL vector of the type returned by
 ;;;***
 
 ;;;### (autoloads (url-mailto url-mail) "url-mailto" "url/url-mailto.el"
-;;;;;;  (17279 27172))
+;;;;;;  (17383 38807))
 ;;; Generated autoloads from url/url-mailto.el
 
 (autoload (quote url-mail) "url-mailto" "\
@@ -28060,7 +28197,7 @@ Handle the mailto: URL syntax.
 ;;;***
 
 ;;;### (autoloads (url-data url-generic-emulator-loader url-info
-;;;;;;  url-man) "url-misc" "url/url-misc.el" (17279 27123))
+;;;;;;  url-man) "url-misc" "url/url-misc.el" (17383 38807))
 ;;; Generated autoloads from url/url-misc.el
 
 (autoload (quote url-man) "url-misc" "\
@@ -28109,7 +28246,7 @@ Not documented
 
 ;;;### (autoloads (url-ns-user-pref url-ns-prefs isInNet isResolvable
 ;;;;;;  dnsResolve dnsDomainIs isPlainHostName) "url-ns" "url/url-ns.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17383 38807))
 ;;; Generated autoloads from url/url-ns.el
 
 (autoload (quote isPlainHostName) "url-ns" "\
@@ -28150,7 +28287,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse"
-;;;;;;  "url/url-parse.el" (17279 27123))
+;;;;;;  "url/url-parse.el" (17383 38807))
 ;;; Generated autoloads from url/url-parse.el
 
 (autoload (quote url-recreate-url) "url-parse" "\
@@ -28184,7 +28321,7 @@ Setup variables that expose info about you and your system.
 ;;;;;;  url-strip-leading-spaces url-eat-trailing-space url-get-normalized-date
 ;;;;;;  url-lazy-message url-normalize-url url-insert-entities-in-string
 ;;;;;;  url-parse-args url-debug url-debug) "url-util" "url/url-util.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17383 38807))
 ;;; Generated autoloads from url/url-util.el
 
 (defvar url-debug nil "\
@@ -28309,7 +28446,7 @@ This uses `url-current-object', set locally to the buffer.
 ;;;***
 
 ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock)
-;;;;;;  "userlock" "userlock.el" (17279 27123))
+;;;;;;  "userlock" "userlock.el" (17390 26947))
 ;;; Generated autoloads from userlock.el
 
 (autoload (quote ask-user-about-lock) "userlock" "\
@@ -28345,7 +28482,7 @@ The buffer in question is current when this function is called.
 
 ;;;### (autoloads (uudecode-decode-region uudecode-decode-region-internal
 ;;;;;;  uudecode-decode-region-external) "uudecode" "gnus/uudecode.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17383 38805))
 ;;; Generated autoloads from gnus/uudecode.el
 
 (autoload (quote uudecode-decode-region-external) "uudecode" "\
@@ -28375,7 +28512,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME.
 ;;;;;;  vc-directory 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-branch-part vc-trunk-p vc-before-checkin-hook
-;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17374 21541))
+;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17390 27226))
 ;;; Generated autoloads from vc.el
 
 (defvar vc-checkout-hook nil "\
@@ -28663,7 +28800,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-arch" "vc-arch.el" (17279 27123))
+;;;### (autoloads nil "vc-arch" "vc-arch.el" (17390 26947))
 ;;; Generated autoloads from vc-arch.el
  (defun vc-arch-registered (file)
   (if (vc-find-root file "{arch}/=tagging-method")
@@ -28673,7 +28810,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17279 27198))
+;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17390 26948))
 ;;; Generated autoloads from vc-cvs.el
  (defun vc-cvs-registered (f)
   (when (file-readable-p (expand-file-name
@@ -28683,7 +28820,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17319 2456))
+;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17390 26948))
 ;;; Generated autoloads from vc-mcvs.el
  (defun vc-mcvs-registered (file)
   (if (vc-find-root file "MCVS/CVS")
@@ -28694,7 +28831,7 @@ colors. `vc-annotate-background' specifies the background color.
 ;;;***
 
 ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el"
-;;;;;;  (17374 21550))
+;;;;;;  (17390 26948))
 ;;; Generated autoloads from vc-rcs.el
 
 (defvar vc-rcs-master-templates (quote ("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\
@@ -28707,7 +28844,7 @@ For a description of possible values, see `vc-check-master-templates'.")
 ;;;***
 
 ;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc-sccs.el"
-;;;;;;  (17374 21550))
+;;;;;;  (17390 26948))
 ;;; Generated autoloads from vc-sccs.el
 
 (defvar vc-sccs-master-templates (quote ("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\
@@ -28724,7 +28861,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 
 ;;;***
 
-;;;### (autoloads nil "vc-svn" "vc-svn.el" (17319 1481))
+;;;### (autoloads nil "vc-svn" "vc-svn.el" (17390 27354))
 ;;; Generated autoloads from vc-svn.el
  (defun vc-svn-registered (f)
   (when (file-readable-p (expand-file-name
@@ -28737,7 +28874,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 ;;;***
 
 ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el"
-;;;;;;  (17279 27174))
+;;;;;;  (17390 27409))
 ;;; Generated autoloads from progmodes/vhdl-mode.el
 
 (autoload (quote vhdl-mode) "vhdl-mode" "\
@@ -29379,8 +29516,8 @@ Not documented
 
 ;;;### (autoloads (View-exit-and-edit view-mode-enter view-mode view-buffer-other-frame
 ;;;;;;  view-buffer-other-window view-buffer view-file-other-frame
-;;;;;;  view-file-other-window view-file) "view" "view.el" (17307
-;;;;;;  17625))
+;;;;;;  view-file-other-window view-file) "view" "view.el" (17390
+;;;;;;  26949))
 ;;; Generated autoloads from view.el
 
 (defvar view-mode nil "\
@@ -29589,8 +29726,8 @@ Exit View mode and make the current buffer editable.
 
 ;;;***
 
-;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17279
-;;;;;;  27171))
+;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17390
+;;;;;;  26938))
 ;;; Generated autoloads from emulation/vip.el
 
 (autoload (quote vip-setup) "vip" "\
@@ -29606,7 +29743,7 @@ Turn on VIP emulation of VI.
 ;;;***
 
 ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el"
-;;;;;;  (17374 21575))
+;;;;;;  (17401 60343))
 ;;; Generated autoloads from emulation/viper.el
 
 (autoload (quote toggle-viper-mode) "viper" "\
@@ -29623,7 +29760,7 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Viper'.
 ;;;***
 
 ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el"
-;;;;;;  (17279 27122))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emacs-lisp/warnings.el
 
 (defvar warning-prefix-function nil "\
@@ -29711,7 +29848,7 @@ this is equivalent to `display-warning', using
 ;;;***
 
 ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el"
-;;;;;;  (17356 16048))
+;;;;;;  (17425 24371))
 ;;; Generated autoloads from wdired.el
 
 (autoload (quote wdired-change-to-wdired-mode) "wdired" "\
@@ -29727,7 +29864,7 @@ See `wdired-mode'.
 
 ;;;***
 
-;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17337 56255))
+;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17390 26944))
 ;;; Generated autoloads from net/webjump.el
 
 (autoload (quote webjump) "webjump" "\
@@ -29744,7 +29881,7 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
 ;;;***
 
 ;;;### (autoloads (which-function-mode) "which-func" "progmodes/which-func.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 27409))
 ;;; Generated autoloads from progmodes/which-func.el
  (put 'which-func-format 'risky-local-variable t)
  (put 'which-func-current 'risky-local-variable t)
@@ -29778,7 +29915,7 @@ and off otherwise.
 ;;;;;;  whitespace-buffer whitespace-toggle-ateol-check whitespace-toggle-spacetab-check
 ;;;;;;  whitespace-toggle-indent-check whitespace-toggle-trailing-check
 ;;;;;;  whitespace-toggle-leading-check) "whitespace" "whitespace.el"
-;;;;;;  (17279 27196))
+;;;;;;  (17390 26950))
 ;;; Generated autoloads from whitespace.el
 
 (autoload (quote whitespace-toggle-leading-check) "whitespace" "\
@@ -29868,7 +30005,7 @@ This is meant to be added buffer-locally to `write-file-functions'.
 ;;;***
 
 ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse
-;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (17279 27123))
+;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (17390 26950))
 ;;; Generated autoloads from wid-browse.el
 
 (autoload (quote widget-browse-at) "wid-browse" "\
@@ -29895,8 +30032,8 @@ With arg, turn widget mode on if and only if arg is positive.
 ;;;***
 
 ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create
-;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17374
-;;;;;;  21544))
+;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17401
+;;;;;;  60138))
 ;;; Generated autoloads from wid-edit.el
 
 (autoload (quote widgetp) "wid-edit" "\
@@ -29928,7 +30065,7 @@ Call `insert' with ARGS even if surrounding text is read only.
 
 (defalias (quote advertised-widget-backward) (quote widget-backward))
 
-(defvar widget-keymap (let ((map (make-sparse-keymap))) (define-key map "       " (quote widget-forward)) (define-key map "    " (quote widget-backward)) (define-key map [(shift tab)] (quote advertised-widget-backward)) (define-key map [backtab] (quote widget-backward)) (define-key map [down-mouse-2] (quote widget-button-click)) (define-key map "
" (quote widget-button-press)) map) "\
+(defvar widget-keymap (let ((map (make-sparse-keymap))) (define-key map "       " (quote widget-forward)) (define-key map "    " (quote widget-backward)) (define-key map [(shift tab)] (quote advertised-widget-backward)) (define-key map [backtab] (quote widget-backward)) (define-key map [down-mouse-2] (quote widget-button-click)) (define-key map [down-mouse-1] (quote widget-button-click)) (define-key map "
" (quote widget-button-press)) map) "\
 Keymap containing useful binding for buffers containing widgets.
 Recommended as a parent keymap for modes using widgets.")
 
@@ -29940,8 +30077,8 @@ Setup current buffer so editing string widgets works.
 ;;;***
 
 ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right
-;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (17279
-;;;;;;  27123))
+;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (17390
+;;;;;;  26950))
 ;;; Generated autoloads from windmove.el
 
 (autoload (quote windmove-left) "windmove" "\
@@ -29994,7 +30131,7 @@ Default MODIFIER is 'shift.
 ;;;***
 
 ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el"
-;;;;;;  (17279 27123))
+;;;;;;  (17390 26950))
 ;;; Generated autoloads from winner.el
 
 (defvar winner-mode nil "\
@@ -30013,7 +30150,7 @@ With arg, turn Winner mode on if and only if arg is positive.
 ;;;***
 
 ;;;### (autoloads (woman-find-file woman-dired-find-file woman) "woman"
-;;;;;;  "woman.el" (17279 27185))
+;;;;;;  "woman.el" (17390 26950))
 ;;; Generated autoloads from woman.el
 
 (autoload (quote woman) "woman" "\
@@ -30049,7 +30186,7 @@ decompress the file if appropriate.  See the documentation for the
 ;;;***
 
 ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el"
-;;;;;;  (17279 27171))
+;;;;;;  (17390 26938))
 ;;; Generated autoloads from emulation/ws-mode.el
 
 (autoload (quote wordstar-mode) "ws-mode" "\
@@ -30162,7 +30299,7 @@ The key bindings are:
 ;;;***
 
 ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el"
-;;;;;;  (17379 24713))
+;;;;;;  (17390 26950))
 ;;; Generated autoloads from xml.el
 
 (autoload (quote xml-parse-file) "xml" "\
@@ -30187,8 +30324,8 @@ If PARSE-NS is non-nil, then QNAMES are expanded.
 
 ;;;***
 
-;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17337
-;;;;;;  56257))
+;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17390
+;;;;;;  26950))
 ;;; Generated autoloads from xt-mouse.el
 
 (defvar xterm-mouse-mode nil "\
@@ -30217,7 +30354,7 @@ down the SHIFT key while pressing the mouse button.
 ;;;***
 
 ;;;### (autoloads (yenc-extract-filename yenc-decode-region) "yenc"
-;;;;;;  "gnus/yenc.el" (17279 27122))
+;;;;;;  "gnus/yenc.el" (17383 38805))
 ;;; Generated autoloads from gnus/yenc.el
 
 (autoload (quote yenc-decode-region) "yenc" "\
@@ -30233,7 +30370,7 @@ Extract file name from an yenc header.
 ;;;***
 
 ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism
-;;;;;;  yow) "yow" "play/yow.el" (17307 17624))
+;;;;;;  yow) "yow" "play/yow.el" (17383 38807))
 ;;; Generated autoloads from play/yow.el
 
 (autoload (quote yow) "yow" "\
@@ -30259,7 +30396,7 @@ Zippy goes to the analyst.
 
 ;;;***
 
-;;;### (autoloads (zone) "zone" "play/zone.el" (17279 27174))
+;;;### (autoloads (zone) "zone" "play/zone.el" (17383 38807))
 ;;; Generated autoloads from play/zone.el
 
 (autoload (quote zone) "zone" "\
@@ -30270,7 +30407,7 @@ Zone out, completely.
 ;;;***
 
 ;;;### (autoloads (zone-mode zone-mode-update-serial-hook) "zone-mode"
-;;;;;;  "net/zone-mode.el" (17279 27123))
+;;;;;;  "net/zone-mode.el" (17390 26944))
 ;;; Generated autoloads from net/zone-mode.el
 
 (autoload (quote zone-mode-update-serial-hook) "zone-mode" "\
@@ -30292,8 +30429,8 @@ Zone-mode does two things:
 
 ;;;***
 
-;;;### (autoloads nil nil ("abbrev.el" "abbrevlist.el" "bindings.el"
-;;;;;;  "buff-menu.el" "calc/calc-aent.el" "calc/calc-alg.el" "calc/calc-arith.el"
+;;;### (autoloads nil nil ("abbrev.el" "bindings.el" "buff-menu.el"
+;;;;;;  "calc/calc-aent.el" "calc/calc-alg.el" "calc/calc-arith.el"
 ;;;;;;  "calc/calc-bin.el" "calc/calc-comb.el" "calc/calc-cplx.el"
 ;;;;;;  "calc/calc-embed.el" "calc/calc-ext.el" "calc/calc-fin.el"
 ;;;;;;  "calc/calc-forms.el" "calc/calc-frac.el" "calc/calc-funcs.el"
@@ -30330,7 +30467,7 @@ Zone-mode does two things:
 ;;;;;;  "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el"
 ;;;;;;  "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el"
 ;;;;;;  "env.el" "erc/erc-backend.el" "erc/erc-goodies.el" "erc/erc-ibuffer.el"
-;;;;;;  "erc/erc-identd.el" "erc/erc-lang.el" "erc/erc-menu.el" "erc/erc-nicklist.el"
+;;;;;;  "erc/erc-lang.el" "erc/erc-menu.el" "erc/erc-nicklist.el"
 ;;;;;;  "eshell/em-alias.el" "eshell/em-banner.el" "eshell/em-basic.el"
 ;;;;;;  "eshell/em-cmpl.el" "eshell/em-dirs.el" "eshell/em-glob.el"
 ;;;;;;  "eshell/em-hist.el" "eshell/em-ls.el" "eshell/em-pred.el"
@@ -30342,16 +30479,16 @@ Zone-mode does two things:
 ;;;;;;  "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el"
 ;;;;;;  "ezimage.el" "faces.el" "files.el" "finder-inf.el" "foldout.el"
 ;;;;;;  "font-core.el" "font-lock.el" "format.el" "forms-d2.el" "forms-pass.el"
-;;;;;;  "frame.el" "generic-x.el" "gnus/compface.el" "gnus/dig.el"
-;;;;;;  "gnus/dns.el" "gnus/format-spec.el" "gnus/gnus-async.el"
+;;;;;;  "frame.el" "fringe.el" "generic-x.el" "gnus/compface.el"
+;;;;;;  "gnus/dig.el" "gnus/dns.el" "gnus/format-spec.el" "gnus/gnus-async.el"
 ;;;;;;  "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" "gnus/gnus-cus.el"
 ;;;;;;  "gnus/gnus-demon.el" "gnus/gnus-diary.el" "gnus/gnus-dup.el"
 ;;;;;;  "gnus/gnus-eform.el" "gnus/gnus-ems.el" "gnus/gnus-gl.el"
 ;;;;;;  "gnus/gnus-int.el" "gnus/gnus-logic.el" "gnus/gnus-mh.el"
-;;;;;;  "gnus/gnus-nocem.el" "gnus/gnus-salt.el" "gnus/gnus-score.el"
-;;;;;;  "gnus/gnus-setup.el" "gnus/gnus-srvr.el" "gnus/gnus-sum.el"
-;;;;;;  "gnus/gnus-topic.el" "gnus/gnus-undo.el" "gnus/gnus-util.el"
-;;;;;;  "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/hex-util.el" "gnus/ietf-drums.el"
+;;;;;;  "gnus/gnus-salt.el" "gnus/gnus-score.el" "gnus/gnus-setup.el"
+;;;;;;  "gnus/gnus-srvr.el" "gnus/gnus-sum.el" "gnus/gnus-topic.el"
+;;;;;;  "gnus/gnus-undo.el" "gnus/gnus-util.el" "gnus/gnus-uu.el"
+;;;;;;  "gnus/gnus-vm.el" "gnus/hex-util.el" "gnus/ietf-drums.el"
 ;;;;;;  "gnus/imap.el" "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el"
 ;;;;;;  "gnus/mail-prsvr.el" "gnus/mail-source.el" "gnus/mailcap.el"
 ;;;;;;  "gnus/messcompat.el" "gnus/mm-bodies.el" "gnus/mm-decode.el"
@@ -30407,8 +30544,8 @@ Zone-mode does two things:
 ;;;;;;  "obsolete/sun-fns.el" "obsolete/swedish.el" "obsolete/uncompress.el"
 ;;;;;;  "obsolete/x-apollo.el" "obsolete/x-menu.el" "patcomp.el"
 ;;;;;;  "paths.el" "pcvs-info.el" "pcvs-parse.el" "pcvs-util.el"
-;;;;;;  "pgg-def.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el"
-;;;;;;  "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el"
+;;;;;;  "pgg-def.el" "pgg-gpg.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el"
+;;;;;;  "play/gamegrid.el" "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el"
 ;;;;;;  "progmodes/cc-align.el" "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el"
 ;;;;;;  "progmodes/cc-cmds.el" "progmodes/cc-compat.el" "progmodes/cc-defs.el"
 ;;;;;;  "progmodes/cc-fonts.el" "progmodes/cc-langs.el" "progmodes/cc-menus.el"
@@ -30440,7 +30577,7 @@ Zone-mode does two things:
 ;;;;;;  "url/url-nfs.el" "url/url-proxy.el" "url/url-vars.el" "url/vc-dav.el"
 ;;;;;;  "vc-hooks.el" "vcursor.el" "version.el" "vms-patch.el" "vmsproc.el"
 ;;;;;;  "vt-control.el" "vt100-led.el" "w32-fns.el" "w32-vars.el"
-;;;;;;  "widget.el" "window.el" "x-dnd.el") (17383 38265 629878))
+;;;;;;  "widget.el" "window.el" "x-dnd.el") (17454 31067 173423))
 
 ;;;***
 
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 5c06a1fe1ad..e0fecb4ff28 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -51,6 +51,7 @@
 (defvar rsf-beep)
 (defvar rsf-sleep-after-message)
 (defvar total-messages)
+(defvar tool-bar-map)
 
 ; These variables now declared in paths.el.
 ;(defvar rmail-spool-directory "/usr/spool/mail/"
@@ -1127,6 +1128,38 @@ Note:    it means the file has no messages in it.\n\^_")))
 
 (define-key rmail-mode-map [menu-bar move next]
   '("Next" . rmail-next-message))
+
+;; Rmail toolbar
+(defvar rmail-tool-bar-map
+  (if (display-graphic-p)
+      (let ((map (make-sparse-keymap)))
+        (tool-bar-local-item-from-menu 'rmail-get-new-mail "mail/inbox"
+                                       map rmail-mode-map)
+        (tool-bar-local-item-from-menu 'rmail-next-undeleted-message "right-arrow"
+                                       map rmail-mode-map)
+        (tool-bar-local-item-from-menu 'rmail-previous-undeleted-message "left-arrow"
+                                       map rmail-mode-map)
+        (tool-bar-local-item-from-menu 'rmail-search "search"
+                                       map rmail-mode-map)
+        (tool-bar-local-item-from-menu 'rmail-input "open"
+                                       map rmail-mode-map)
+        (tool-bar-local-item-from-menu 'rmail-mail "mail/compose"
+                                       map rmail-mode-map)
+        (tool-bar-local-item-from-menu 'rmail-reply "mail/reply-all"
+                                       map rmail-mode-map)
+        (tool-bar-local-item-from-menu 'rmail-forward "mail/forward"
+                                       map rmail-mode-map)
+        (tool-bar-local-item-from-menu 'rmail-delete-forward "close"
+                                       map rmail-mode-map)
+        (tool-bar-local-item-from-menu 'rmail-output "mail/move"
+                                       map rmail-mode-map)
+        (tool-bar-local-item-from-menu 'rmail-output-body-to-file "mail/save"
+                                       map rmail-mode-map)
+        (tool-bar-local-item-from-menu 'rmail-expunge "delete"
+                                       map rmail-mode-map)
+        map)))
+
+
 
 ;; Rmail mode is suitable only for specially formatted data.
 (put 'rmail-mode 'mode-class 'special)
@@ -1254,6 +1287,7 @@ Instead, these commands are available:
                            (concat rmail-spool-directory
                                    (user-login-name)))))))
   (make-local-variable 'rmail-keywords)
+  (set (make-local-variable 'tool-bar-map) rmail-tool-bar-map)
   ;; this gets generated as needed
   (setq rmail-keywords nil))
 
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 7a6cf778bbe..64876717392 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,112 @@
+2006-03-30  Bill Wohler  <wohler@newt.com>
+
+        * mh-e.el (mh-defcustom, mh-defface, mh-defgroup): Macros to
+        remove new :package-version keyword in older settings.
+        (customize-package-emacs-version-alist): Add MH-E version to Emacs
+        version mappings.
+        (mh-e, mh-alias, mh-folder, mh-folder-selection)
+        (mh-identity, mh-inc, mh-junk, mh-letter, mh-ranges)
+        (mh-scan-line-formats, mh-search, mh-sending-mail)
+        (mh-sequences, mh-show, mh-speedbar, mh-thread, mh-tool-bar)
+        (mh-hooks, mh-faces): Add :package-version keyword to these
+        groups.
+        (mh-alias-completion-ignore-case-flag)
+        (mh-alias-expand-aliases-flag, mh-alias-flash-on-comma)
+        (mh-alias-insert-file, mh-alias-insertion-location)
+        (mh-alias-local-users, mh-alias-local-users-prefix)
+        (mh-alias-passwd-gecos-comma-separator-flag)
+        (mh-new-messages-folders, mh-ticked-messages-folders)
+        (mh-large-folder, mh-recenter-summary-flag)
+        (mh-recursive-folders-flag, mh-sortm-args)
+        (mh-default-folder-for-message-function)
+        (mh-default-folder-list, mh-default-folder-must-exist-flag)
+        (mh-default-folder-prefix, mh-identity-list)
+        (mh-auto-fields-list, mh-auto-fields-prompt-flag)
+        (mh-identity-default, mh-identity-handlers, mh-inc-prog)
+        (mh-inc-spool-list, mh-junk-background, mh-junk-disposition)
+        (mh-junk-program, mh-compose-insertion)
+        (mh-compose-skipped-header-fields)
+        (mh-compose-space-does-completion-flag)
+        (mh-delete-yanked-msg-window-flag)
+        (mh-extract-from-attribution-verb, mh-ins-buf-prefix)
+        (mh-letter-complete-function, mh-letter-fill-column)
+        (mh-mml-method-default, mh-signature-file-name)
+        (mh-signature-separator-flag, mh-x-face-file)
+        (mh-yank-behavior, mh-interpret-number-as-range-flag)
+        (mh-adaptive-cmd-note-flag, mh-scan-format-file, mh-scan-prog)
+        (mh-search-program, mh-compose-forward-as-mime-flag)
+        (mh-compose-letter-function, mh-compose-prompt-flag)
+        (mh-forward-subject-format, mh-insert-x-mailer-flag)
+        (mh-redist-full-contents-flag, mh-reply-default-reply-to)
+        (mh-reply-show-message-flag)
+        (mh-refile-preserves-sequences-flag, mh-tick-seq)
+        (mh-update-sequences-after-mh-show-flag)
+        (mh-bury-show-buffer-flag, mh-clean-message-header-flag)
+        (mh-decode-mime-flag)
+        (mh-display-buttons-for-alternatives-flag)
+        (mh-display-buttons-for-inline-parts-flag)
+        (mh-do-not-confirm-flag, mh-fetch-x-image-url)
+        (mh-graphical-smileys-flag, mh-graphical-emphasis-flag)
+        (mh-highlight-citation-style, mh-invisible-header-fields)
+        (mh-invisible-header-fields-default, mh-lpr-command-format)
+        (mh-max-inline-image-height, mh-max-inline-image-width)
+        (mh-mhl-format-file, mh-mime-save-parts-default-directory)
+        (mh-print-background-flag, mh-show-maximum-size)
+        (mh-show-use-xface-flag, mh-store-default-directory)
+        (mh-summary-height, mh-speed-update-interval)
+        (mh-show-threads-flag, mh-tool-bar-search-function): Add
+        :package-version keyword to these options.
+        (mh-after-commands-processed-hook)
+        (mh-alias-reloaded-hook, mh-before-commands-processed-hook)
+        (mh-before-quit-hook, mh-before-send-letter-hook)
+        (mh-delete-msg-hook, mh-find-path-hook, mh-folder-mode-hook)
+        (mh-forward-hook, mh-inc-folder-hook)
+        (mh-insert-signature-hook)
+        (mh-kill-folder-suppress-prompt-hooks, mh-letter-mode-hook)
+        (mh-mh-to-mime-hook, mh-search-mode-hook, mh-quit-hook)
+        (mh-refile-msg-hook, mh-show-hook, mh-show-mode-hook)
+        (mh-unseen-updated-hook): Add :package-version keyword to these
+        hooks.
+        (mh-min-colors-defined-flag)
+        (mh-folder-address, mh-folder-body, mh-folder-cur-msg-number)
+        (mh-folder-date, mh-folder-deleted, mh-folder-followup)
+        (mh-folder-msg-number, mh-folder-refiled)
+        (mh-folder-sent-to-me-hint, mh-folder-sent-to-me-sender)
+        (mh-folder-subject, mh-folder-tick, mh-folder-to)
+        (mh-letter-header-field, mh-search-folder, mh-show-cc)
+        (mh-show-date, mh-show-from, mh-show-header, mh-show-pgg-bad)
+        (mh-show-pgg-good, mh-show-pgg-unknown, mh-show-signature)
+        (mh-show-subject, mh-show-to, mh-show-xface)
+        (mh-speedbar-folder, mh-speedbar-folder-with-unseen-messages)
+        (mh-speedbar-selected-folder)
+        (mh-speedbar-selected-folder-with-unseen-messages): : Add
+        :package-version keyword to these faces.
+
+        * mh-tool-bar.el (mh-tool-bar-define): Added commented-out
+        :package-version keywords.
+
+2006-03-28  Bill Wohler  <wohler@newt.com>
+
+        * mh-tool-bar.el: Use clipboard-kill-region,
+        clipboard-kill-ring-save, and clipboard-yank instead of undo,
+        kill-region, and menu-bar-kill-ring-save respectively. In
+        MH-Letter mode, move save-buffer and mh-fully-kill-draft icons in
+        front of mh-compose-insertion to be consistent with other mailers,
+        such as Evolution. In MH-Folder mode, move vanilla reply icon to
+        the left of the other reply icons. Use mail/inbox icon instead of
+        mail, next-page instead of page-down, delete instead of close,
+        mail/move instead of mail/refile, data-save instead of execute,
+        mail/flag-for-followup instead of highlight, contact instead of
+        mail/alias, open instead of fld-open, zoom-out instead of widen.
+
+        * mh-folder.el (mh-execute-commands, mh-rescan-folder): 
+        * mh-funcs.el (mh-pack-folder): Sync docstrings with manual.
+
+2006-03-27  Eric Ding  <ericding@alum.mit.edu>
+
+        * mh-e.el (mh-invisible-header-fields-internal): Add entries
+        "X-AOL-IP:" and "X-MB-Message-" (AOL WebMail)
+
 2006-03-19  Bill Wohler  <wohler@newt.com>
 
         * mh-comp.el (mh-reply): Sync docstring with manual.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 84e569bab81..ce2db4fb66e 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -888,6 +888,58 @@ necessary and can actually cause problems."
 
 
 
+;;; MH-E Customization Support Routines
+
+;; Shush compiler (Emacs 21 and XEmacs).
+(defvar customize-package-emacs-version-alist)
+
+;; Temporary function and data structure used customization.
+;; These will be unbound after the options are defined.
+(defmacro mh-defgroup (symbol members doc &rest args)
+  "Declare SYMBOL as a customization group containing MEMBERS.
+See documentation for `defgroup' for a description of the arguments
+SYMBOL, MEMBERS, DOC and ARGS.
+This macro is used by Emacs versions that lack the :package-version
+keyword, introduced in Emacs 22."
+  (declare (doc-string 3))
+  `(defgroup ,symbol ,members ,doc ,@(mh-strip-package-version args)))
+(put 'mh-defgroup 'lisp-indent-function 'defun)
+
+(defmacro mh-defcustom (symbol value doc &rest args)
+  "Declare SYMBOL as a customizable variable that defaults to VALUE.
+See documentation for `defcustom' for a description of the arguments
+SYMBOL, VALUE, DOC and ARGS.
+This macro is used by Emacs versions that lack the :package-version
+keyword, introduced in Emacs 22."
+  (declare (doc-string 3))
+  `(defcustom ,symbol ,value ,doc ,@(mh-strip-package-version args)))
+(put 'mh-defcustom 'lisp-indent-function 'defun)
+
+(defmacro mh-defface (face spec doc &rest args)
+  "Declare FACE as a customizable face that defaults to SPEC.
+See documentation for `defface' for a description of the arguments
+FACE, SPEC, DOC and ARGS.
+This macro is used by Emacs versions that lack the :package-version
+keyword, introduced in Emacs 22."
+  (declare (doc-string 3))
+  `(defface ,face ,spec ,doc ,@(mh-strip-package-version args)))
+(put 'mh-defface 'lisp-indent-function 'defun)
+
+(defun mh-strip-package-version (args)
+  "Strip :package-version keyword and its value from ARGS.
+In Emacs versions that support the :package-version keyword,
+ARGS is returned unchanged."
+  (if (boundp 'customize-package-emacs-version-alist)
+      args
+    (let (seen)
+      (loop for keyword in args
+            if (cond ((eq keyword ':package-version) (setq seen t) nil)
+                     (seen (setq seen nil) nil)
+                     (t t))
+            collect keyword))))
+
+
+
 ;;; MH-E Customization
 
 ;; All of the defgroups, defcustoms, and deffaces in MH-E are found
@@ -933,135 +985,160 @@ windows in the frame are removed."
   (when delete-other-windows-flag
     (delete-other-windows)))
 
+(if (boundp 'customize-package-emacs-version-alist)
+    (add-to-list 'customize-package-emacs-version-alist
+                 '(MH-E ("6.0" "22.1") ("6.1" "22.1") ("7.0" "22.1")
+                        ("7.1" "22.1") ("7.2" "22.1") ("7.3" "22.1")
+                        ("7.4" "22.1") ("8.0" "22.1"))))
+
 
 
 ;;; MH-E Customization Groups
 
-(defgroup mh-e nil
+(mh-defgroup mh-e nil
   "Emacs interface to the MH mail system.
 MH is the Rand Mail Handler. Other implementations include nmh
 and GNU mailutils."
   :link '(custom-manual "(mh-e)Top")
-  :group 'mail)
+  :group 'mail
+  :package-version '(MH-E "8.0"))
 
-(defgroup mh-alias nil
+(mh-defgroup mh-alias nil
   "Aliases."
   :link '(custom-manual "(mh-e)Aliases")
   :prefix "mh-alias-"
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "7.1"))
 
-(defgroup mh-folder nil
+(mh-defgroup mh-folder nil
   "Organizing your mail with folders."
   :prefix "mh-"
   :link '(custom-manual "(mh-e)Folders")
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "7.1"))
 
-(defgroup mh-folder-selection nil
+(mh-defgroup mh-folder-selection nil
   "Folder selection."
   :prefix "mh-"
   :link '(custom-manual "(mh-e)Folder Selection")
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "8.0"))
 
-(defgroup mh-identity nil
+(mh-defgroup mh-identity nil
   "Identities."
   :link '(custom-manual "(mh-e)Identities")
   :prefix "mh-identity-"
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "7.1"))
 
-(defgroup mh-inc nil
+(mh-defgroup mh-inc nil
   "Incorporating your mail."
   :prefix "mh-inc-"
   :link '(custom-manual "(mh-e)Incorporating Mail")
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "8.0"))
 
-(defgroup mh-junk nil
+(mh-defgroup mh-junk nil
   "Dealing with junk mail."
   :link '(custom-manual "(mh-e)Junk")
   :prefix "mh-junk-"
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "7.3"))
 
-(defgroup mh-letter nil
+(mh-defgroup mh-letter nil
   "Editing a draft."
   :prefix "mh-"
   :link '(custom-manual "(mh-e)Editing Drafts")
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "7.1"))
 
-(defgroup mh-ranges nil
+(mh-defgroup mh-ranges nil
   "Ranges."
   :prefix "mh-"
   :link '(custom-manual "(mh-e)Ranges")
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "8.0"))
 
-(defgroup mh-scan-line-formats nil
+(mh-defgroup mh-scan-line-formats nil
   "Scan line formats."
   :link '(custom-manual "(mh-e)Scan Line Formats")
   :prefix "mh-"
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "8.0"))
 
-(defgroup mh-search nil
+(mh-defgroup mh-search nil
   "Searching."
   :link '(custom-manual "(mh-e)Searching")
   :prefix "mh-search-"
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "8.0"))
 
-(defgroup mh-sending-mail nil
+(mh-defgroup mh-sending-mail nil
   "Sending mail."
   :prefix "mh-"
   :link '(custom-manual "(mh-e)Sending Mail")
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "8.0"))
 
-(defgroup mh-sequences nil
+(mh-defgroup mh-sequences nil
   "Sequences."
   :prefix "mh-"
   :link '(custom-manual "(mh-e)Sequences")
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "8.0"))
 
-(defgroup mh-show nil
+(mh-defgroup mh-show nil
   "Reading your mail."
   :prefix "mh-"
   :link '(custom-manual "(mh-e)Reading Mail")
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "7.1"))
 
-(defgroup mh-speedbar nil
+(mh-defgroup mh-speedbar nil
   "The speedbar."
   :prefix "mh-speed-"
   :link '(custom-manual "(mh-e)Speedbar")
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "8.0"))
 
-(defgroup mh-thread nil
+(mh-defgroup mh-thread nil
   "Threading."
   :prefix "mh-thread-"
   :link '(custom-manual "(mh-e)Threading")
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "8.0"))
 
-(defgroup mh-tool-bar nil
+(mh-defgroup mh-tool-bar nil
   "The tool bar"
   :link '(custom-manual "(mh-e)Tool Bar")
   :prefix "mh-"
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "8.0"))
 
-(defgroup mh-hooks nil
+(mh-defgroup mh-hooks nil
   "MH-E hooks."
   :link '(custom-manual "(mh-e)Top")
   :prefix "mh-"
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "7.1"))
 
-(defgroup mh-faces nil
+(mh-defgroup mh-faces nil
   "Faces used in MH-E."
   :link '(custom-manual "(mh-e)Top")
   :prefix "mh-"
   :group 'faces
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "7.1"))
 
 
 
-;;; Emacs Interface to the MH Mail System (:group mh-e)
+;;; MH-E Customization
 
-;; See Variant Support, above.
+;; See Variant Support, above, for mh-e group.
 
 ;;; Aliases (:group 'mh-alias)
 
-(defcustom mh-alias-completion-ignore-case-flag t
+(mh-defcustom mh-alias-completion-ignore-case-flag t
   "*Non-nil means don't consider case significant in MH alias completion.
 
 As MH ignores case in the aliases, so too does MH-E. However, you
@@ -1069,18 +1146,20 @@ may turn off this option to make case significant which can be
 used to segregate completion of your aliases. You might use
 lowercase for mailing lists and uppercase for people."
   :type 'boolean
-  :group 'mh-alias)
+  :group 'mh-alias
+  :package-version '(MH-E "7.1"))
 
-(defcustom mh-alias-expand-aliases-flag nil
+(mh-defcustom mh-alias-expand-aliases-flag nil
   "*Non-nil means to expand aliases entered in the minibuffer.
 
 In other words, aliases entered in the minibuffer will be
 expanded to the full address in the message draft. By default,
 this expansion is not performed."
   :type 'boolean
-  :group 'mh-alias)
+  :group 'mh-alias
+  :package-version '(MH-E "7.1"))
 
-(defcustom mh-alias-flash-on-comma t
+(mh-defcustom mh-alias-flash-on-comma t
   "*Specify whether to flash address or warn on translation.
 
 This option controls the behavior when a [comma] is pressed while
@@ -1090,9 +1169,10 @@ does not display a warning if the alias is not found."
   :type '(choice (const :tag "Flash but Don't Warn If No Alias" t)
                  (const :tag "Flash and Warn If No Alias" 1)
                  (const :tag "Don't Flash Nor Warn If No Alias" nil))
-  :group 'mh-alias)
+  :group 'mh-alias
+  :package-version '(MH-E "7.1"))
 
-(defcustom mh-alias-insert-file nil
+(mh-defcustom mh-alias-insert-file nil
   "*Filename used to store a new MH-E alias.
 
 The default setting of this option is \"Use Aliasfile Profile
@@ -1103,9 +1183,10 @@ name, MH-E will prompt for one of them when MH-E adds an alias."
   :type '(choice (const :tag "Use Aliasfile Profile Component" nil)
                  (file :tag "Alias File")
                  (repeat :tag "List of Alias Files" file))
-  :group 'mh-alias)
+  :group 'mh-alias
+  :package-version '(MH-E "7.1"))
 
-(defcustom mh-alias-insertion-location 'sorted
+(mh-defcustom mh-alias-insertion-location 'sorted
   "Specifies where new aliases are entered in alias files.
 
 This option is set to \"Alphabetical\" by default. If you organize
@@ -1114,9 +1195,10 @@ or \"Bottom\" of your alias file might be more appropriate."
   :type '(choice (const :tag "Alphabetical" sorted)
                  (const :tag "Top" top)
                  (const :tag "Bottom" bottom))
-  :group 'mh-alias)
+  :group 'mh-alias
+  :package-version '(MH-E "7.1"))
 
-(defcustom mh-alias-local-users t
+(mh-defcustom mh-alias-local-users t
   "*If on, local users are added to alias completion.
 
 Aliases are created from \"/etc/passwd\" entries with a user ID
@@ -1134,9 +1216,10 @@ This option also takes a string which is executed to generate the
 password file. For example, use \"ypcat passwd\" to obtain the
 NIS password file."
   :type '(choice (boolean) (string))
-  :group 'mh-alias)
+  :group 'mh-alias
+  :package-version '(MH-E "7.1"))
 
-(defcustom mh-alias-local-users-prefix "local."
+(mh-defcustom mh-alias-local-users-prefix "local."
   "*String prefixed to the real names of users from the password file.
 This option can also be set to \"Use Login\".
 
@@ -1155,9 +1238,10 @@ This option has no effect if variable `mh-alias-local-users' is
 turned off."
   :type '(choice (const :tag "Use Login" nil)
                  (string))
-  :group 'mh-alias)
+  :group 'mh-alias
+  :package-version '(MH-E "7.4"))
 
-(defcustom mh-alias-passwd-gecos-comma-separator-flag t
+(mh-defcustom mh-alias-passwd-gecos-comma-separator-flag t
   "*Non-nil means the gecos field in the password file uses a comma separator.
 
 In the example in `mh-alias-local-users-prefix', commas are used
@@ -1166,13 +1250,12 @@ This is a fairly common usage. However, in the rare case that the
 gecos field in your password file is not separated by commas and
 whose contents may contain commas, you can turn this option off."
   :type 'boolean
-  :group 'mh-alias)
-
-
+  :group 'mh-alias
+  :package-version '(MH-E "7.4"))
 
 ;;; Organizing Your Mail with Folders (:group 'mh-folder)
 
-(defcustom mh-new-messages-folders t
+(mh-defcustom mh-new-messages-folders t
   "Folders searched for the \"unseen\" sequence.
 
 Set this option to \"Inbox\" to search the \"+inbox\" folder or
@@ -1184,9 +1267,10 @@ See also `mh-recursive-folders-flag'."
   :type '(choice (const :tag "Inbox" t)
                  (const :tag "All" nil)
                  (repeat :tag "Choose Folders" (string :tag "Folder")))
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-ticked-messages-folders t
+(mh-defcustom mh-ticked-messages-folders t
   "Folders searched for `mh-tick-seq'.
 
 Set this option to \"Inbox\" to search the \"+inbox\" folder or
@@ -1198,9 +1282,10 @@ See also `mh-recursive-folders-flag'."
   :type '(choice (const :tag "Inbox" t)
                  (const :tag "All" nil)
                  (repeat :tag "Choose Folders" (string :tag "Folder")))
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-large-folder 200
+(mh-defcustom mh-large-folder 200
   "The number of messages that indicates a large folder.
 
 If a folder is deemed to be large, that is the number of messages
@@ -1209,22 +1294,25 @@ visited. Even when `mh-show-threads-flag' is non-nil, the folder
 is not automatically threaded, if it is large. If set to nil all
 folders are treated as if they are small."
   :type '(choice (const :tag "No Limit") integer)
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-recenter-summary-flag nil
+(mh-defcustom mh-recenter-summary-flag nil
   "*Non-nil means to recenter the summary window.
 
 If this option is turned on, recenter the summary window when the
 show window is toggled off."
   :type 'boolean
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-recursive-folders-flag nil
+(mh-defcustom mh-recursive-folders-flag nil
   "*Non-nil means that commands which operate on folders do so recursively."
   :type 'boolean
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-sortm-args nil
+(mh-defcustom mh-sortm-args nil
   "*Additional arguments for \"sortm\"\\<mh-folder-mode-map>.
 
 This option is consulted when a prefix argument is used with
@@ -1233,13 +1321,12 @@ specified in the MH profile. This option may be used to provide
 an alternate view. For example, \"'(\"-nolimit\" \"-textfield\"
 \"subject\")\" is a useful setting."
   :type 'string
-  :group 'mh-folder)
-
-
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
 ;;; Folder Selection (:group 'mh-folder-selection)
 
-(defcustom mh-default-folder-for-message-function nil
+(mh-defcustom mh-default-folder-for-message-function nil
   "Function to select a default folder for refiling or \"Fcc:\".
 
 When this function is called, the current buffer contains the message
@@ -1248,9 +1335,10 @@ should return the default folder as a string with a leading \"+\"
 sign. It can also return nil so that the last folder name is used as
 the default, or an empty string to suppress the default entirely."
   :type 'function
-  :group 'mh-folder-selection)
+  :group 'mh-folder-selection
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-default-folder-list nil
+(mh-defcustom mh-default-folder-list nil
   "*List of addresses and folders.
 
 The folder name associated with the first address found in this
@@ -1265,9 +1353,10 @@ for more information."
   :type '(repeat (list (regexp :tag "Address")
                        (string :tag "Folder")
                        (boolean :tag "Check Recipient")))
-  :group 'mh-folder-selection)
+  :group 'mh-folder-selection
+  :package-version '(MH-E "7.2"))
 
-(defcustom mh-default-folder-must-exist-flag t
+(mh-defcustom mh-default-folder-must-exist-flag t
   "*Non-nil means guessed folder name must exist to be used.
 
 If the derived folder does not exist, and this option is on, then
@@ -1278,18 +1367,18 @@ them all in the same project folder.
 See `mh-prompt-for-refile-folder' and `mh-folder-from-address'
 for more information."
   :type 'boolean
-  :group 'mh-folder-selection)
+  :group 'mh-folder-selection
+  :package-version '(MH-E "7.2"))
 
-(defcustom mh-default-folder-prefix ""
+(mh-defcustom mh-default-folder-prefix ""
   "*Prefix used for folder names generated from aliases.
 The prefix is used to prevent clutter in your mail directory.
 
 See `mh-prompt-for-refile-folder' and `mh-folder-from-address'
 for more information."
   :type 'string
-  :group 'mh-folder-selection)
-
-
+  :group 'mh-folder-selection
+  :package-version '(MH-E "7.2"))
 
 ;;; Identities (:group 'mh-identity)
 
@@ -1300,7 +1389,7 @@ for more information."
 Real definition will take effect when mh-identity is loaded."
       nil)))
 
-(defcustom mh-identity-list nil
+(mh-defcustom mh-identity-list nil
   "*List of identities.
 
 To customize this option, click on the \"INS\" button and enter a label
@@ -1366,9 +1455,10 @@ fashion."
   :set (lambda (symbol value)
          (set-default symbol value)
          (mh-identity-make-menu-no-autoload))
-  :group 'mh-identity)
+  :group 'mh-identity
+  :package-version '(MH-E "7.1"))
 
-(defcustom mh-auto-fields-list nil
+(mh-defcustom mh-auto-fields-list nil
   "List of recipients for which header lines are automatically inserted.
 
 This option can be used to set the identity depending on the
@@ -1426,15 +1516,17 @@ as the result is undefined."
                          (cons :tag "Other Field"
                                  (string :tag "Field")
                                  (string :tag "Value"))))))
-  :group 'mh-identity)
+  :group 'mh-identity
+  :package-version '(MH-E "7.3"))
 
-(defcustom mh-auto-fields-prompt-flag t
+(mh-defcustom mh-auto-fields-prompt-flag t
   "*Non-nil means to prompt before sending if fields inserted.
 See `mh-auto-fields-list'."
   :type 'boolean
-  :group 'mh-identity)
+  :group 'mh-identity
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-identity-default nil
+(mh-defcustom mh-identity-default nil
   "Default identity to use when `mh-letter-mode' is called.
 See `mh-identity-list'."
   :type (append
@@ -1442,9 +1534,10 @@ See `mh-identity-list'."
          (cons '(const :tag "None" nil)
                (mapcar (function (lambda (arg) `(const ,arg)))
                        (mapcar 'car mh-identity-list))))
-  :group 'mh-identity)
+  :group 'mh-identity
+  :package-version '(MH-E "7.1"))
 
-(defcustom mh-identity-handlers
+(mh-defcustom mh-identity-handlers
   '(("From" . mh-identity-handler-top)
     (":default" . mh-identity-handler-bottom)
     (":attribution-verb" . mh-identity-handler-attribution-verb)
@@ -1475,13 +1568,12 @@ fields (for example, \":signature\"), and the ACTION 'remove or
 'add. If the action is 'add, an additional argument
 containing the VALUE for the field is given."
   :type '(repeat (cons (string :tag "Field") function))
-  :group 'mh-identity)
-
-
+  :group 'mh-identity
+  :package-version '(MH-E "8.0"))
 
 ;;; Incorporating Your Mail (:group 'mh-inc)
 
-(defcustom mh-inc-prog "inc"
+(mh-defcustom mh-inc-prog "inc"
   "*Program to incorporate new mail into a folder.
 
 This program generates a one-line summary for each of the new
@@ -1490,7 +1582,8 @@ to be in the `mh-progs' directory. You may also link a file to
 \"inc\" that uses a different format. You'll then need to modify
 several scan line format variables appropriately."
   :type 'string
-  :group 'mh-inc)
+  :group 'mh-inc
+  :package-version '(MH-E "6.0"))
 
 (eval-and-compile
   (unless (fboundp 'mh-inc-spool-make-no-autoload)
@@ -1499,7 +1592,7 @@ several scan line format variables appropriately."
 Real definition will take effect when mh-inc is loaded."
       nil)))
 
-(defcustom mh-inc-spool-list nil
+(mh-defcustom mh-inc-spool-list nil
   "*Alternate spool files.
 
 You can use the `mh-inc-spool-list' variable to direct MH-E to
@@ -1539,9 +1632,8 @@ fashion."
   :set (lambda (symbol value)
          (set-default symbol value)
          (mh-inc-spool-make-no-autoload))
-  :group 'mh-inc)
-
-
+  :group 'mh-inc
+  :package-version '(MH-E "7.3"))
 
 ;;; Dealing with Junk Mail (:group 'mh-junk)
 
@@ -1573,7 +1665,7 @@ The function is always called with SYMBOL bound to
                   until (executable-find (symbol-name (car element)))
                   finally return (car element)))))
 
-(defcustom mh-junk-background nil
+(mh-defcustom mh-junk-background nil
   "If on, spam programs are run in background.
 
 By default, the programs are run in the foreground, but this can
@@ -1582,15 +1674,17 @@ enough memory or don't junk that many messages at the same time,
 you might try turning on this option."
   :type '(choice (const :tag "Off" nil)
                  (const :tag "On" 0))
-  :group 'mh-junk)
+  :group 'mh-junk
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-junk-disposition nil
+(mh-defcustom mh-junk-disposition nil
   "Disposition of junk mail."
   :type '(choice (const :tag "Delete Spam" nil)
                  (string :tag "Spam Folder"))
-  :group 'mh-junk)
+  :group 'mh-junk
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-junk-program nil
+(mh-defcustom mh-junk-program nil
   "Spam program that MH-E should use.
 
 The default setting of this option is \"Auto-detect\" which means
@@ -1603,13 +1697,12 @@ bogofilter, then you can set this option to \"Bogofilter\"."
                  (const :tag "Bogofilter" bogofilter)
                  (const :tag "SpamProbe" spamprobe))
   :set 'mh-junk-choose
-  :group 'mh-junk)
-
-
+  :group 'mh-junk
+  :package-version '(MH-E "7.3"))
 
 ;;; Editing a Draft (:group 'mh-letter)
 
-(defcustom mh-compose-insertion (if (locate-library "mml") 'mml 'mh)
+(mh-defcustom mh-compose-insertion (if (locate-library "mml") 'mml 'mh)
   "Type of tags used when composing MIME messages.
 
 In addition to MH-style directives, MH-E also supports MML (MIME
@@ -1620,30 +1713,34 @@ lot more functionality. This option can also be set to \"MH\" if
 MH-style directives are preferred."
   :type '(choice (const :tag "MML" mml)
                  (const :tag "MH"  mh))
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-compose-skipped-header-fields
+(mh-defcustom mh-compose-skipped-header-fields
   '("From" "Organization" "References" "In-Reply-To"
     "X-Face" "Face" "X-Image-URL" "X-Mailer")
   "List of header fields to skip over when navigating in draft."
   :type '(repeat (string :tag "Field"))
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "7.4"))
 
-(defcustom mh-compose-space-does-completion-flag nil
+(mh-defcustom mh-compose-space-does-completion-flag nil
   "*Non-nil means \\<mh-letter-mode-map>\\[mh-letter-complete-or-space] does completion in message header."
   :type 'boolean
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "7.4"))
 
-(defcustom mh-delete-yanked-msg-window-flag nil
+(mh-defcustom mh-delete-yanked-msg-window-flag nil
   "*Non-nil means delete any window displaying the message.
 
 This deletes the window containing the original message after
 yanking it with \\<mh-letter-mode-map>\\[mh-yank-cur-msg] to make
 more room on your screen for your reply."
   :type 'boolean
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-extract-from-attribution-verb "wrote:"
+(mh-defcustom mh-extract-from-attribution-verb "wrote:"
   "*Verb to use for attribution when a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
 
 The attribution consists of the sender's name and email address
@@ -1654,9 +1751,10 @@ followed by the content of this option. This option can be set to
                  (const "a écrit:")
                  (const "schrieb:")
                  (string :tag "Custom String"))
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-ins-buf-prefix "> "
+(mh-defcustom mh-ins-buf-prefix "> "
   "*String to put before each line of a yanked or inserted message.
 
 The prefix \"> \" is the default setting of this option. I
@@ -1669,26 +1767,29 @@ This prefix is not inserted if you use one of the supercite
 flavors of `mh-yank-behavior' or you have added a
 `mail-citation-hook'."
   :type 'string
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-letter-complete-function 'ispell-complete-word
+(mh-defcustom mh-letter-complete-function 'ispell-complete-word
   "*Function to call when completing outside of address or folder fields.
 
 In the body of the message,
 \\<mh-letter-mode-map>\\[mh-letter-complete] runs this function,
 which is set to \"ispell-complete-word\" by default."
   :type '(choice function (const nil))
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "7.1"))
 
-(defcustom mh-letter-fill-column 72
+(mh-defcustom mh-letter-fill-column 72
   "*Fill column to use in MH Letter mode.
 
 By default, this option is 72 to allow others to quote your
 message without line wrapping."
   :type 'integer
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-mml-method-default (if mh-pgp-support-flag "pgpmime" "none")
+(mh-defcustom mh-mml-method-default (if mh-pgp-support-flag "pgpmime" "none")
   "Default method to use in security tags.
 
 This option is used to select between a variety of mail security
@@ -1708,9 +1809,10 @@ you write!"
                  (const :tag "PGP" "pgp")
                  (const :tag "S/MIME" "smime")
                  (const :tag "None" "none"))
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-signature-file-name "~/.signature"
+(mh-defcustom mh-signature-file-name "~/.signature"
   "*Source of user's signature.
 
 By default, the text of your signature is taken from the file
@@ -1730,9 +1832,10 @@ The signature is inserted into your message with the command
 \\<mh-letter-mode-map>\\[mh-insert-signature] or with the option
 `mh-identity-list'."
   :type 'file
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-signature-separator-flag t
+(mh-defcustom mh-signature-separator-flag t
   "*Non-nil means a signature separator should be inserted.
 
 It is not recommended that you change this option since various
@@ -1740,9 +1843,10 @@ mail user agents, including MH-E, use the separator to present
 the signature differently, and to suppress the signature when
 replying or yanking a letter into a draft."
   :type 'boolean
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-x-face-file "~/.face"
+(mh-defcustom mh-x-face-file "~/.face"
   "*File containing face header field to insert in outgoing mail.
 
 If the file starts with either of the strings \"X-Face:\", \"Face:\"
@@ -1768,9 +1872,10 @@ To prevent the setting of any of these header fields, either set
 `mh-x-face-file' to nil, or simply ensure that the file defined by
 this option doesn't exist."
   :type 'file
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-yank-behavior 'attribution
+(mh-defcustom mh-yank-behavior 'attribution
   "*Controls which part of a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
 
 To include the entire message, including the entire header, use
@@ -1812,13 +1917,12 @@ inserted."
                  (const :tag "Body With Attribution" attribution)
                  (const :tag "Body With Attribution, Automatically"
                         autoattrib))
-  :group 'mh-letter)
-
-
+  :group 'mh-letter
+  :package-version '(MH-E "8.0"))
 
 ;;; Ranges (:group 'mh-ranges)
 
-(defcustom mh-interpret-number-as-range-flag t
+(mh-defcustom mh-interpret-number-as-range-flag t
   "*Non-nil means interpret a number as a range.
 
 Since one of the most frequent ranges used is \"last:N\", MH-E
@@ -1826,9 +1930,8 @@ will interpret input such as \"200\" as \"last:200\" if this
 option is on (which is the default). If you need to scan just the
 message 200, then use the range \"200:200\"."
   :type 'boolean
-  :group 'mh-ranges)
-
-
+  :group 'mh-ranges
+  :package-version '(MH-E "7.4"))
 
 ;;; Scan Line Formats (:group 'mh-scan-line-formats)
 
@@ -1839,7 +1942,7 @@ message 200, then use the range \"200:200\"."
 Real definition, below, uses variables that aren't defined yet."
       (set-default symbol value))))
 
-(defcustom mh-adaptive-cmd-note-flag t
+(mh-defcustom mh-adaptive-cmd-note-flag t
   "*Non-nil means that the message number width is determined dynamically.
 
 If you've created your own format to handle long message numbers,
@@ -1854,7 +1957,8 @@ call `mh-set-cmd-note' with the width specified by your format file
 you would use \"(mh-set-cmd-note 4)\"."
   :type 'boolean
   :group 'mh-scan-line-formats
-  :set 'mh-adaptive-cmd-note-flag-check)
+  :set 'mh-adaptive-cmd-note-flag-check
+  :package-version '(MH-E "7.0"))
 
 (defun mh-scan-format-file-check (symbol value)
   "Check if desired setting is legal.
@@ -1867,7 +1971,7 @@ set SYMBOL to VALUE."
              "unless you use \"Use MH-E scan Format\"")
     (set-default symbol value)))
 
-(defcustom mh-scan-format-file t
+(mh-defcustom mh-scan-format-file t
   "Specifies the format file to pass to the scan program.
 
 The default setting for this option is \"Use MH-E scan Format\". This
@@ -1892,7 +1996,8 @@ Emacs start with 0)."
                  (const :tag "Use Default scan Format" nil)
                  (file  :tag "Specify a scan Format File"))
   :group 'mh-scan-line-formats
-  :set 'mh-scan-format-file-check)
+  :set 'mh-scan-format-file-check
+  :package-version '(MH-E "6.0"))
 
 (defun mh-adaptive-cmd-note-flag-check (symbol value)
   "Check if desired setting is legal.
@@ -1905,7 +2010,7 @@ Otherwise, set SYMBOL to VALUE."
              "is set to \"Use MH-E scan Format\"")
     (set-default symbol value)))
 
-(defcustom mh-scan-prog "scan"
+(mh-defcustom mh-scan-prog "scan"
   "*Program used to scan messages.
 
 The name of the program that generates a listing of one line per
@@ -1914,14 +2019,13 @@ absolute pathname, it is assumed to be in the `mh-progs'
 directory. You may link another program to `scan' (see
 \"mh-profile(5)\") to produce a different type of listing."
   :type 'string
-  :group 'mh-scan-line-formats)
+  :group 'mh-scan-line-formats
+  :package-version '(MH-E "6.0"))
 (make-variable-buffer-local 'mh-scan-prog)
 
-
-
 ;;; Searching (:group 'mh-search)
 
-(defcustom mh-search-program nil
+(mh-defcustom mh-search-program nil
   "Search program that MH-E shall use.
 
 The default setting of this option is \"Auto-detect\" which means
@@ -1939,13 +2043,12 @@ MH-E can be found in the documentation of `mh-search'."
                  (const :tag "namazu" namazu)
                  (const :tag "pick" pick)
                  (const :tag "grep" grep))
-  :group 'mh-search)
-
-
+  :group 'mh-search
+  :package-version '(MH-E "8.0"))
 
 ;;; Sending Mail (:group 'mh-sending-mail)
 
-(defcustom mh-compose-forward-as-mime-flag t
+(mh-defcustom mh-compose-forward-as-mime-flag t
   "*Non-nil means that messages are forwarded as attachments.
 
 By default, this option is on which means that the forwarded
@@ -1958,9 +2061,10 @@ aware that if you have \"forw: -mime\" in your MH profile, then
 forwarded messages will always be included as attachments
 regardless of the settings of this option."
   :type 'boolean
-  :group 'mh-sending-mail)
+  :group 'mh-sending-mail
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-compose-letter-function nil
+(mh-defcustom mh-compose-letter-function nil
   "Invoked when starting a new draft.
 
 However, it is the last function called before you edit your
@@ -1969,32 +2073,36 @@ to write and send the message for you. This function is passed
 three arguments: the contents of the TO, SUBJECT, and CC header
 fields."
   :type '(choice (const nil) function)
-  :group 'mh-sending-mail)
+  :group 'mh-sending-mail
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-compose-prompt-flag nil
+(mh-defcustom mh-compose-prompt-flag nil
   "*Non-nil means prompt for header fields when composing a new draft."
   :type 'boolean
-  :group 'mh-sending-mail)
+  :group 'mh-sending-mail
+  :package-version '(MH-E "7.4"))
 
-(defcustom mh-forward-subject-format "%s: %s"
+(mh-defcustom mh-forward-subject-format "%s: %s"
   "*Format string for forwarded message subject.
 
 This option is a string which includes two escapes (\"%s\"). The
 first \"%s\" is replaced with the sender of the original message,
 and the second one is replaced with the original \"Subject:\"."
   :type 'string
-  :group 'mh-sending-mail)
+  :group 'mh-sending-mail
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-insert-x-mailer-flag t
+(mh-defcustom mh-insert-x-mailer-flag t
   "*Non-nil means append an \"X-Mailer:\" header field to the header.
 
 This header field includes the version of MH-E and Emacs that you
 are using. If you don't want to participate in our marketing, you
 can turn this option off."
   :type 'boolean
-  :group 'mh-sending-mail)
+  :group 'mh-sending-mail
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-redist-full-contents-flag nil
+(mh-defcustom mh-redist-full-contents-flag nil
   "*Non-nil means the \"dist\" command needs entire letter for redistribution.
 
 This option must be turned on if \"dist\" requires the whole
@@ -2003,9 +2111,10 @@ compiled with the BERK option (which many people abhor). If you
 find that MH will not allow you to redistribute a message that
 has been redistributed before, turn off this option."
   :type 'boolean
-  :group 'mh-sending-mail)
+  :group 'mh-sending-mail
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-reply-default-reply-to nil
+(mh-defcustom mh-reply-default-reply-to nil
   "*Sets the person or persons to whom a reply will be sent.
 
 This option is set to \"Prompt\" by default so that you are
@@ -2018,9 +2127,10 @@ this option to \"cc\". Other choices include \"from\", \"to\", or
                  (const "to")
                  (const "cc")
                  (const "all"))
-  :group 'mh-sending-mail)
+  :group 'mh-sending-mail
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-reply-show-message-flag t
+(mh-defcustom mh-reply-show-message-flag t
   "*Non-nil means the MH-Show buffer is displayed when replying.
 
 If you include the message automatically, you can hide the
@@ -2028,9 +2138,8 @@ MH-Show buffer by turning off this option.
 
 See also `mh-reply'."
   :type 'boolean
-  :group 'mh-sending-mail)
-
-
+  :group 'mh-sending-mail
+  :package-version '(MH-E "7.0"))
 
 ;;; Sequences (:group 'mh-sequences)
 
@@ -2038,7 +2147,7 @@ See also `mh-reply'."
 ;; the docstring: "Additional sequences that should not to be preserved can be
 ;; specified by setting `mh-unpropagated-sequences' appropriately." XXX
 
-(defcustom mh-refile-preserves-sequences-flag t
+(mh-defcustom mh-refile-preserves-sequences-flag t
   "*Non-nil means that sequences are preserved when messages are refiled.
 
 If a message is in any sequence (except \"Previous-Sequence:\"
@@ -2046,9 +2155,10 @@ and \"cur\") when it is refiled, then it will still be in those
 sequences in the destination folder. If this behavior is not
 desired, then turn off this option."
   :type 'boolean
-  :group 'mh-sequences)
+  :group 'mh-sequences
+  :package-version '(MH-E "7.4"))
 
-(defcustom mh-tick-seq 'tick
+(mh-defcustom mh-tick-seq 'tick
   "The name of the MH sequence for ticked messages.
 
 You can customize this option if you already use the \"tick\"
@@ -2057,9 +2167,10 @@ ticking functions by choosing the \"Disable Ticking\" item but
 there isn't much advantage to that."
   :type '(choice (const :tag "Disable Ticking" nil)
                  symbol)
-  :group 'mh-sequences)
+  :group 'mh-sequences
+  :package-version '(MH-E "7.3"))
 
-(defcustom mh-update-sequences-after-mh-show-flag t
+(mh-defcustom mh-update-sequences-after-mh-show-flag t
   "*Non-nil means flush MH sequences to disk after message is shown\\<mh-folder-mode-map>.
 
 Three sequences are maintained internally by MH-E and pushed out
@@ -2071,13 +2182,12 @@ this option. You can then update the state manually with the
 \\[mh-execute-commands], \\[mh-quit], or \\[mh-update-sequences]
 commands."
   :type 'boolean
-  :group 'mh-sequences)
-
-
+  :group 'mh-sequences
+  :package-version '(MH-E "7.0"))
 
 ;;; Reading Your Mail (:group 'mh-show)
 
-(defcustom mh-bury-show-buffer-flag t
+(mh-defcustom mh-bury-show-buffer-flag t
   "*Non-nil means show buffer is buried.
 
 One advantage of not burying the show buffer is that one can
@@ -2085,17 +2195,19 @@ delete the show buffer more easily in an electric buffer list
 because of its proximity to its associated MH-Folder buffer. Try
 running \\[electric-buffer-list] to see what I mean."
   :type 'boolean
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-clean-message-header-flag t
+(mh-defcustom mh-clean-message-header-flag t
   "*Non-nil means remove extraneous header fields.
 
 See also `mh-invisible-header-fields-default' and
 `mh-invisible-header-fields'."
   :type 'boolean
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-decode-mime-flag (not (not (locate-library "mm-decode")))
+(mh-defcustom mh-decode-mime-flag (not (not (locate-library "mm-decode")))
   "*Non-nil means attachments are handled\\<mh-folder-mode-map>.
 
 MH-E can handle attachments as well if the Gnus `mm-decode'
@@ -2110,9 +2222,10 @@ This option also controls the display of quoted-printable
 messages and other graphical widgets. See the options
 `mh-graphical-smileys-flag' and `mh-graphical-emphasis-flag'."
   :type 'boolean
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-display-buttons-for-alternatives-flag nil
+(mh-defcustom mh-display-buttons-for-alternatives-flag nil
   "*Non-nil means display buttons for all alternative attachments.
 
 Sometimes, a mail program will produce multiple alternatives of
@@ -2121,9 +2234,10 @@ original content. By default, only the preferred alternative is
 displayed. If this option is on, then the preferred part is shown
 inline and buttons are shown for each of the other alternatives."
   :type 'boolean
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.4"))
 
-(defcustom mh-display-buttons-for-inline-parts-flag nil
+(mh-defcustom mh-display-buttons-for-inline-parts-flag nil
   "*Non-nil means display buttons for all inline attachments\\<mh-folder-mode-map>.
 
 The sender can request that attachments should be viewed inline so
@@ -2143,9 +2257,10 @@ by turning on this option.
 MH-E cannot display all attachments inline however. It can display
 text (including HTML) and images."
   :type 'boolean
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-do-not-confirm-flag nil
+(mh-defcustom mh-do-not-confirm-flag nil
   "*Non-nil means non-reversible commands do not prompt for confirmation.
 
 Commands such as `mh-pack-folder' prompt to confirm whether to
@@ -2154,9 +2269,10 @@ Turning on this option means that these actions will be
 performed--which is usually desired but cannot be
 retracted--without question."
   :type 'boolean
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-fetch-x-image-url nil
+(mh-defcustom mh-fetch-x-image-url nil
   "*Control fetching of \"X-Image-URL:\" header field image.
 
 Ths option controls the fetching of the \"X-Image-URL:\" header
@@ -2189,9 +2305,10 @@ turned on."
 
   :type '(choice (const :tag "Ask Before Fetching" ask)
                  (const :tag "Never Fetch" nil))
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.3"))
 
-(defcustom mh-graphical-smileys-flag t
+(mh-defcustom mh-graphical-smileys-flag t
   "*Non-nil means graphical smileys are displayed.
 
 It is a long standing custom to inject body language using a
@@ -2203,9 +2320,10 @@ and ;-).
 This option is disabled if the option `mh-decode-mime-flag' is
 turned off."
   :type 'boolean
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-graphical-emphasis-flag t
+(mh-defcustom mh-graphical-emphasis-flag t
   "*Non-nil means graphical emphasis is displayed.
 
 A few typesetting features are indicated in ASCII text with
@@ -2219,9 +2337,10 @@ whole list.
 This option is disabled if the option `mh-decode-mime-flag' is
 turned off."
   :type 'boolean
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-highlight-citation-style 'gnus
+(mh-defcustom mh-highlight-citation-style 'gnus
   "Style for highlighting citations.
 
 If the sender of the message has cited other messages in his
@@ -2234,7 +2353,8 @@ of citations entirely, choose \"None\"."
   :type '(choice (const :tag "Multicolor" gnus)
                  (const :tag "Monochrome" font-lock)
                  (const :tag "None" nil))
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
 ;; Keep fields alphabetized. Mention source, if known.
 (defvar mh-invisible-header-fields-internal
@@ -2295,6 +2415,7 @@ of citations entirely, choose \"None\"."
     "Ua-Content-Id:"                    ; X400
 ;;  "User-Agent:"                       ; Similar to X-Mailer, so display it.
     "Via:"                              ; MH
+    "X-AOL-IP:"                         ; AOL WebMail
     "X-Abuse-Info:"
     "X-Abuse-and-DMCA-"
     "X-Accept-Language:"
@@ -2351,6 +2472,7 @@ of citations entirely, choose \"None\"."
     "X-Loop:"                           ; Unknown mailing list managers
     "X-Lumos-SenderID:"                 ; Roving ConstantContact
     "X-MAIL-INFO:"                      ; NetZero
+    "X-MB-Message-"                     ; AOL WebMail
     "X-MHE-Checksum:"                   ; Checksum added during index search
     "X-MIME-Autoconverted:"             ; sendmail
     "X-MIMETrack:"
@@ -2445,7 +2567,7 @@ Because the function `mh-invisible-headers' uses both
 `mh-invisible-header-fields' and `mh-invisible-header-fields', it
 cannot be run until both variables have been initialized.")
 
-(defcustom mh-invisible-header-fields nil
+(mh-defcustom mh-invisible-header-fields nil
   "*Additional header fields to hide.
 
 Header fields that you would like to hide that aren't listed in
@@ -2463,9 +2585,10 @@ See also `mh-clean-message-header-flag'."
   :set (lambda (symbol value)
          (set-default symbol value)
          (mh-invisible-headers))
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.1"))
 
-(defcustom mh-invisible-header-fields-default nil
+(mh-defcustom mh-invisible-header-fields-default nil
   "*List of hidden header fields.
 
 The header fields listed in this option are hidden, although you
@@ -2480,7 +2603,8 @@ See also `mh-clean-message-header-flag'."
   :set (lambda (symbol value)
          (set-default symbol value)
          (mh-invisible-headers))
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
 (defvar mh-invisible-header-fields-compiled nil
   "*Regexp matching lines in a message header that are not to be shown.
@@ -2517,7 +2641,7 @@ removed and entries from `mh-invisible-header-fields' are added."
 ;; Compile invisible header fields.
 (mh-invisible-headers)
 
-(defcustom mh-lpr-command-format "lpr -J '%s'"
+(mh-defcustom mh-lpr-command-format "lpr -J '%s'"
   "*Command used to print\\<mh-folder-mode-map>.
 
 This option contains the Unix command line which performs the
@@ -2531,9 +2655,10 @@ printer's margins.
 This options is not used by the commands \\[mh-ps-print-msg] or
 \\[mh-ps-print-msg-file]."
   :type 'string
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-max-inline-image-height nil
+(mh-defcustom mh-max-inline-image-height nil
   "*Maximum inline image height if \"Content-Disposition:\" is not present.
 
 Some older mail programs do not insert this needed plumbing to
@@ -2546,9 +2671,10 @@ the options `mh-max-inline-image-width' and
 a large number. The size of your screen is a good choice for
 these numbers."
   :type '(choice (const nil) integer)
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-max-inline-image-width nil
+(mh-defcustom mh-max-inline-image-width nil
   "*Maximum inline image width if \"Content-Disposition:\" is not present.
 
 Some older mail programs do not insert this needed plumbing to
@@ -2561,9 +2687,10 @@ the options `mh-max-inline-image-width' and
 a large number. The size of your screen is a good choice for
 these numbers."
   :type '(choice (const nil) integer)
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-mhl-format-file nil
+(mh-defcustom mh-mhl-format-file nil
   "*Specifies the format file to pass to the \"mhl\" program.
 
 Normally MH-E takes care of displaying messages itself (rather than
@@ -2584,9 +2711,10 @@ file."
   :type '(choice (const :tag "Use Default mhl Format (Printing Only)" nil)
                  (const :tag "Use Default mhl Format" t)
                  (file :tag "Specify an mhl Format File"))
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-mime-save-parts-default-directory t
+(mh-defcustom mh-mime-save-parts-default-directory t
   "Default directory to use for \\<mh-folder-mode-map>\\[mh-mime-save-parts].
 
 The default value for this option is \"Prompt Always\" so that
@@ -2599,9 +2727,10 @@ directory's name."
   :type '(choice (const :tag "Prompt the First Time" nil)
                  (const :tag "Prompt Always" t)
                  directory)
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-print-background-flag nil
+(mh-defcustom mh-print-background-flag nil
   "*Non-nil means messages should be printed in the background\\<mh-folder-mode-map>.
 
 Normally messages are printed in the foreground. If this is slow on
@@ -2614,18 +2743,20 @@ or else the output may be truncated.
 This option is not used by the commands \\[mh-ps-print-msg] or
 \\[mh-ps-print-msg-file]."
   :type 'boolean
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-show-maximum-size 0
+(mh-defcustom mh-show-maximum-size 0
   "*Maximum size of message (in bytes) to display automatically.
 
 This option provides an opportunity to skip over large messages
 which may be slow to load. The default value of 0 means that all
 message are shown regardless of size."
   :type 'integer
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-show-use-xface-flag (>= emacs-major-version 21)
+(mh-defcustom mh-show-use-xface-flag (>= emacs-major-version 21)
   "*Non-nil means display face images in MH-show buffers.
 
 MH-E can display the content of \"Face:\", \"X-Face:\", and
@@ -2662,9 +2793,10 @@ image doesn't need to be transmitted with every single mail.
 The option `mh-fetch-x-image-url' controls the fetching of the
 \"X-Image-URL:\" header field image."
   :type 'boolean
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-store-default-directory nil
+(mh-defcustom mh-store-default-directory nil
   "*Default directory for \\<mh-folder-mode-map>\\[mh-store-msg].
 
 If you would like to change the initial default directory,
@@ -2673,9 +2805,10 @@ customize this option, change the value from \"Current\" to
 the content of these messages."
   :type '(choice (const :tag "Current" nil)
                  directory)
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-summary-height nil
+(mh-defcustom mh-summary-height nil
   "*Number of lines in MH-Folder buffer (including the mode line).
 
 The default value of this option is \"Automatic\" which means
@@ -2685,23 +2818,21 @@ then choose the \"Fixed Size\" option and enter the number of
 lines you'd like to see."
   :type '(choice (const :tag "Automatic" nil)
                  (integer :tag "Fixed Size"))
-  :group 'mh-show)
-
-
+  :group 'mh-show
+  :package-version '(MH-E "7.4"))
 
 ;;; The Speedbar (:group 'mh-speedbar)
 
-(defcustom mh-speed-update-interval 60
+(mh-defcustom mh-speed-update-interval 60
   "Time between speedbar updates in seconds.
 Set to 0 to disable automatic update."
   :type 'integer
-  :group 'mh-speedbar)
-
-
+  :group 'mh-speedbar
+  :package-version '(MH-E "8.0"))
 
 ;;; Threading (:group 'mh-thread)
 
-(defcustom mh-show-threads-flag nil
+(mh-defcustom mh-show-threads-flag nil
   "*Non-nil means new folders start in threaded mode.
 
 Threading large number of messages can be time consuming so this
@@ -2709,16 +2840,15 @@ option is turned off by default. If you turn this option on, then
 threading will be done only if the number of messages being
 threaded is less than `mh-large-folder'."
   :type 'boolean
-  :group 'mh-thread)
-
-
+  :group 'mh-thread
+  :package-version '(MH-E "7.1"))
 
 ;;; The Tool Bar (:group 'mh-tool-bar)
 
 ;; mh-tool-bar-folder-buttons and mh-tool-bar-letter-buttons defined
 ;; dynamically in mh-tool-bar.el.
 
-(defcustom mh-tool-bar-search-function 'mh-search
+(mh-defcustom mh-tool-bar-search-function 'mh-search
   "*Function called by the tool bar search button.
 
 By default, this is set to `mh-search'. You can also choose
@@ -2726,11 +2856,12 @@ By default, this is set to `mh-search'. You can also choose
 of your own choosing."
   :type '(choice (const mh-search)
                  (function :tag "Other Function"))
-  :group 'mh-tool-bar)
+  :group 'mh-tool-bar
+  :package-version '(MH-E "7.0"))
 
 ;; XEmacs has a couple of extra customizations...
 (mh-do-in-xemacs
-  (defcustom mh-xemacs-use-tool-bar-flag mh-xemacs-has-tool-bar-flag
+  (mh-defcustom mh-xemacs-use-tool-bar-flag mh-xemacs-has-tool-bar-flag
     "*If non-nil, use tool bar.
 
 This option controls whether to show the MH-E icons at all. By
@@ -2743,9 +2874,10 @@ won't be able to turn on this option."
            (if (and (eq value t)
                     (not mh-xemacs-has-tool-bar-flag))
                (error "Tool bar not supported"))
-           (set-default symbol value)))
+           (set-default symbol value))
+    :package-version '(MH-E "7.3"))
 
-  (defcustom mh-xemacs-tool-bar-position nil
+  (mh-defcustom mh-xemacs-tool-bar-position nil
     "*Tool bar location.
 
 This option controls the placement of the tool bar along the four
@@ -2760,13 +2892,14 @@ default tool bar."
                   (const :tag "Bottom" :value bottom)
                   (const :tag "Left" :value left)
                   (const :tag "Right" :value right))
-    :group 'mh-tool-bar))
+    :group 'mh-tool-bar
+    :package-version '(MH-E "7.3")))
 
 
 
 ;;; Hooks (:group 'mh-hooks + group where hook described)
 
-(defcustom mh-after-commands-processed-hook nil
+(mh-defcustom mh-after-commands-processed-hook nil
   "Hook run by \\<mh-folder-mode-map>\\[mh-execute-commands] after performing outstanding refile and delete requests.
 
 Variables that are useful in this hook include
@@ -2775,15 +2908,17 @@ deletes and refiles. This list will always include the current
 folder, which is also available in `mh-current-folder'."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-alias-reloaded-hook nil
+(mh-defcustom mh-alias-reloaded-hook nil
   "Hook run by `mh-alias-reload' after loading aliases."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-alias)
+  :group 'mh-alias
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-before-commands-processed-hook nil
+(mh-defcustom mh-before-commands-processed-hook nil
   "Hook run by \\<mh-folder-mode-map>\\[mh-execute-commands] before performing outstanding refile and delete requests.
 
 Variables that are useful in this hook include `mh-delete-list'
@@ -2791,9 +2926,10 @@ and `mh-refile-list' which can be used to see which changes will
 be made to the current folder, `mh-current-folder'."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-before-quit-hook nil
+(mh-defcustom mh-before-quit-hook nil
   "Hook run by \\<mh-folder-mode-map>\\[mh-quit] before quitting MH-E.
 
 This hook is called before the quit occurs, so you might use it
@@ -2803,9 +2939,10 @@ abort the quit or call `mh-execute-commands', for example.
 See also `mh-quit-hook'."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-before-send-letter-hook nil
+(mh-defcustom mh-before-send-letter-hook nil
   "Hook run at the beginning of the \\<mh-letter-mode-map>\\[mh-send-letter] command.
 
 For example, if you want to check your spelling in your message
@@ -2813,18 +2950,20 @@ before sending, add the `ispell-message' function."
   :type 'hook
   :options '(ispell-message)
   :group 'mh-hooks
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-delete-msg-hook nil
+(mh-defcustom mh-delete-msg-hook nil
   "Hook run by \\<mh-letter-mode-map>\\[mh-delete-msg] after marking each message for deletion.
 
 For example, a past maintainer of MH-E used this once when he
 kept statistics on his mail usage."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-find-path-hook nil
+(mh-defcustom mh-find-path-hook nil
   "Hook run by `mh-find-path' after reading the user's MH profile.
 
 This hook can be used the change the value of the variables that
@@ -2832,27 +2971,31 @@ This hook can be used the change the value of the variables that
 between MH and MH-E."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-e)
+  :group 'mh-e
+  :package-version '(MH-E "7.0"))
 
-(defcustom mh-folder-mode-hook nil
+(mh-defcustom mh-folder-mode-hook nil
   "Hook run by `mh-folder-mode' when visiting a new folder."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-forward-hook nil
+(mh-defcustom mh-forward-hook nil
   "Hook run by `mh-forward' on a forwarded letter."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-sending-mail)
+  :group 'mh-sending-mail
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-inc-folder-hook nil
+(mh-defcustom mh-inc-folder-hook nil
   "Hook run by \\<mh-folder-mode-map>\\[mh-inc-folder] after incorporating mail into a folder."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-inc)
+  :group 'mh-inc
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-insert-signature-hook nil
+(mh-defcustom mh-insert-signature-hook nil
   "Hook run by \\<mh-letter-mode-map>\\[mh-insert-signature] after signature has been inserted.
 
 Hook functions may access the actual name of the file or the
@@ -2860,9 +3003,10 @@ function used to insert the signature with
 `mh-signature-file-name'."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-kill-folder-suppress-prompt-hooks '(mh-search-p)
+(mh-defcustom mh-kill-folder-suppress-prompt-hooks '(mh-search-p)
   "Abnormal hook run at the beginning of \\<mh-folder-mode-map>\\[mh-kill-folder].
 
 The hook functions are called with no arguments and should return
@@ -2877,9 +3021,10 @@ which returns t on \"+inbox\" and you hit \\[mh-kill-folder] by
 accident in the \"+inbox\" folder, you will not be happy."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "7.4"))
 
-(defcustom mh-letter-mode-hook nil
+(mh-defcustom mh-letter-mode-hook nil
   "Hook run by `mh-letter-mode' on a new letter.
 
 This hook allows you to do some processing before editing a
@@ -2889,15 +3034,17 @@ letter. For example, you may wish to modify the header after
 go."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-sending-mail)
+  :group 'mh-sending-mail
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-mh-to-mime-hook nil
+(mh-defcustom mh-mh-to-mime-hook nil
   "Hook run on the formatted letter by \\<mh-letter-mode-map>\\[mh-mh-to-mime]."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-search-mode-hook nil
+(mh-defcustom mh-search-mode-hook nil
   "Hook run upon entry to `mh-search-mode'\\<mh-folder-mode-map>.
 
 If you find that you do the same thing over and over when editing
@@ -2906,9 +3053,10 @@ This can be done with this hook which is called when
 \\[mh-search] is run on a new pattern."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-search)
+  :group 'mh-search
+  :package-version '(MH-E "8.0"))
 
-(defcustom mh-quit-hook nil
+(mh-defcustom mh-quit-hook nil
   "Hook run by \\<mh-folder-mode-map>\\[mh-quit] after quitting MH-E.
 
 This hook is not run in an MH-E context, so you might use it to
@@ -2917,15 +3065,17 @@ modify the window setup.
 See also `mh-before-quit-hook'."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-refile-msg-hook nil
+(mh-defcustom mh-refile-msg-hook nil
   "Hook run by \\<mh-folder-mode-map>\\[mh-refile-msg] after marking each message for refiling."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-show-hook nil
+(mh-defcustom mh-show-hook nil
   "Hook run after \\<mh-folder-mode-map>\\[mh-show] shows a message.
 
 It is the last thing called after messages are displayed. It's
@@ -2933,9 +3083,10 @@ used to affect the behavior of MH-E in general or when
 `mh-show-mode-hook' is too early. See `mh-show-mode-hook'."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-show-mode-hook nil
+(mh-defcustom mh-show-mode-hook nil
   "Hook run upon entry to `mh-show-mode'.
 
 This hook is called early on in the process of the message
@@ -2943,9 +3094,10 @@ display. It is usually used to perform some action on the
 message's content. See `mh-show-hook'."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "6.0"))
 
-(defcustom mh-unseen-updated-hook nil
+(mh-defcustom mh-unseen-updated-hook nil
   "Hook run after the unseen sequence has been updated.
 
 The variable `mh-seen-list' can be used by this hook to obtain
@@ -2953,7 +3105,8 @@ the list of messages which were removed from the unseen
 sequence."
   :type 'hook
   :group 'mh-hooks
-  :group 'mh-sequences)
+  :group 'mh-sequences
+  :package-version '(MH-E "6.0"))
 
 
 
@@ -2966,7 +3119,7 @@ sequence."
 ;; These will be unbound after the faces are defined.
 (defvar mh-min-colors-defined-flag (and (not mh-xemacs-flag)
                                         (>= emacs-major-version 22))
-  "Non-nil means defface supports min-colors display requirement.")
+  "Non-nil means `defface' supports min-colors display requirement.")
 
 (defun mh-defface-compat (spec)
   "Convert SPEC for defface if necessary to run on older platforms.
@@ -3158,13 +3311,14 @@ in the inherit parameter are not added to the returned spec."
       inherit
     (mh-defface-compat (cadr (assoc face mh-face-data)))))
 
-(defface mh-folder-address
+(mh-defface mh-folder-address
   (mh-face-data 'mh-folder-subject '((t (:inherit mh-folder-subject))))
   "Recipient face."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-body
+(mh-defface mh-folder-body
   (mh-face-data 'mh-folder-msg-number
                 '((((class color))
                    (:inherit mh-folder-msg-number))
@@ -3172,171 +3326,202 @@ in the inherit parameter are not added to the returned spec."
                    (:inherit mh-folder-msg-number :italic t))))
   "Body text face."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-cur-msg-number
+(mh-defface mh-folder-cur-msg-number
   (mh-face-data 'mh-folder-msg-number
                 '((t (:inherit mh-folder-msg-number :bold t))))
   "Current message number face."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-date
+(mh-defface mh-folder-date
   (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-msg-number))))
   "Date face."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-deleted
+(mh-defface mh-folder-deleted
   (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-msg-number))))
   "Deleted message face."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-followup (mh-face-data 'mh-folder-followup)
+(mh-defface mh-folder-followup (mh-face-data 'mh-folder-followup)
   "\"Re:\" face."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-msg-number (mh-face-data 'mh-folder-msg-number)
+(mh-defface mh-folder-msg-number (mh-face-data 'mh-folder-msg-number)
   "Message number face."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-refiled (mh-face-data 'mh-folder-refiled)
+(mh-defface mh-folder-refiled (mh-face-data 'mh-folder-refiled)
   "Refiled message face."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-sent-to-me-hint
+(mh-defface mh-folder-sent-to-me-hint
   (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-date))))
   "Fontification hint face in messages sent directly to us.
 The detection of messages sent to us is governed by the scan
 format `mh-scan-format-nmh' and the regular expression
 `mh-scan-sent-to-me-sender-regexp'."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-sent-to-me-sender
+(mh-defface mh-folder-sent-to-me-sender
   (mh-face-data 'mh-folder-followup '((t (:inherit mh-folder-followup))))
   "Sender face in messages sent directly to us.
 The detection of messages sent to us is governed by the scan
 format `mh-scan-format-nmh' and the regular expression
 `mh-scan-sent-to-me-sender-regexp'."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-subject (mh-face-data 'mh-folder-subject)
+(mh-defface mh-folder-subject (mh-face-data 'mh-folder-subject)
   "Subject face."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-tick (mh-face-data 'mh-folder-tick)
+(mh-defface mh-folder-tick (mh-face-data 'mh-folder-tick)
   "Ticked message face."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-folder-to (mh-face-data 'mh-folder-to)
+(mh-defface mh-folder-to (mh-face-data 'mh-folder-to)
   "\"To:\" face."
   :group 'mh-faces
-  :group 'mh-folder)
+  :group 'mh-folder
+  :package-version '(MH-E "8.0"))
 
-(defface mh-letter-header-field (mh-face-data 'mh-letter-header-field)
+(mh-defface mh-letter-header-field (mh-face-data 'mh-letter-header-field)
   "Editable header field value face in draft buffers."
   :group 'mh-faces
-  :group 'mh-letter)
+  :group 'mh-letter
+  :package-version '(MH-E "8.0"))
 
-(defface mh-search-folder (mh-face-data 'mh-search-folder)
+(mh-defface mh-search-folder (mh-face-data 'mh-search-folder)
   "Folder heading face in MH-Folder buffers created by searches."
   :group 'mh-faces
-  :group 'mh-search)
+  :group 'mh-search
+  :package-version '(MH-E "8.0"))
 
-(defface mh-show-cc (mh-face-data 'mh-show-cc)
+(mh-defface mh-show-cc (mh-face-data 'mh-show-cc)
   "Face used to highlight \"cc:\" header fields."
   :group 'mh-faces
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defface mh-show-date (mh-face-data 'mh-show-date)
+(mh-defface mh-show-date (mh-face-data 'mh-show-date)
   "Face used to highlight \"Date:\" header fields."
   :group 'mh-faces
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defface mh-show-from (mh-face-data 'mh-show-from)
+(mh-defface mh-show-from (mh-face-data 'mh-show-from)
   "Face used to highlight \"From:\" header fields."
   :group 'mh-faces
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defface mh-show-header (mh-face-data 'mh-show-header)
+(mh-defface mh-show-header (mh-face-data 'mh-show-header)
   "Face used to deemphasize less interesting header fields."
   :group 'mh-faces
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defface mh-show-pgg-bad (mh-face-data 'mh-show-pgg-bad)
+(mh-defface mh-show-pgg-bad (mh-face-data 'mh-show-pgg-bad)
   "Bad PGG signature face."
   :group 'mh-faces
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defface mh-show-pgg-good (mh-face-data 'mh-show-pgg-good)
+(mh-defface mh-show-pgg-good (mh-face-data 'mh-show-pgg-good)
   "Good PGG signature face."
   :group 'mh-faces
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defface mh-show-pgg-unknown (mh-face-data 'mh-show-pgg-unknown)
+(mh-defface mh-show-pgg-unknown (mh-face-data 'mh-show-pgg-unknown)
   "Unknown or untrusted PGG signature face."
   :group 'mh-faces
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defface mh-show-signature (mh-face-data 'mh-show-signature)
+(mh-defface mh-show-signature (mh-face-data 'mh-show-signature)
   "Signature face."
   :group 'mh-faces
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defface mh-show-subject
+(mh-defface mh-show-subject
   (mh-face-data 'mh-folder-subject '((t (:inherit mh-folder-subject))))
   "Face used to highlight \"Subject:\" header fields."
   :group 'mh-faces
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defface mh-show-to (mh-face-data 'mh-show-to)
+(mh-defface mh-show-to (mh-face-data 'mh-show-to)
   "Face used to highlight \"To:\" header fields."
   :group 'mh-faces
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defface mh-show-xface
+(mh-defface mh-show-xface
   (mh-face-data 'mh-show-from '((t (:inherit (mh-show-from highlight)))))
-
 "X-Face image face.
 The background and foreground are used in the image."
   :group 'mh-faces
-  :group 'mh-show)
+  :group 'mh-show
+  :package-version '(MH-E "8.0"))
 
-(defface mh-speedbar-folder (mh-face-data 'mh-speedbar-folder)
+(mh-defface mh-speedbar-folder (mh-face-data 'mh-speedbar-folder)
   "Basic folder face."
   :group 'mh-faces
-  :group 'mh-speedbar)
+  :group 'mh-speedbar
+  :package-version '(MH-E "8.0"))
 
-(defface mh-speedbar-folder-with-unseen-messages
+(mh-defface mh-speedbar-folder-with-unseen-messages
   (mh-face-data 'mh-speedbar-folder
                 '((t (:inherit mh-speedbar-folder :bold t))))
   "Folder face when folder contains unread messages."
   :group 'mh-faces
-  :group 'mh-speedbar)
+  :group 'mh-speedbar
+  :package-version '(MH-E "8.0"))
 
-(defface mh-speedbar-selected-folder
+(mh-defface mh-speedbar-selected-folder
   (mh-face-data 'mh-speedbar-selected-folder)
   "Selected folder face."
   :group 'mh-faces
-  :group 'mh-speedbar)
+  :group 'mh-speedbar
+  :package-version '(MH-E "8.0"))
 
-(defface mh-speedbar-selected-folder-with-unseen-messages
+(mh-defface mh-speedbar-selected-folder-with-unseen-messages
   (mh-face-data 'mh-speedbar-selected-folder
                 '((t (:inherit mh-speedbar-selected-folder :bold t))))
   "Selected folder face when folder contains unread messages."
   :group 'mh-faces
-  :group 'mh-speedbar)
+  :group 'mh-speedbar
+  :package-version '(MH-E "8.0"))
 
 ;; Get rid of temporary functions and data structures.
+(fmakunbound 'mh-defcustom)
+(fmakunbound 'mh-defface)
 (fmakunbound 'mh-defface-compat)
+(fmakunbound 'mh-defgroup)
 (fmakunbound 'mh-face-data)
 (makunbound 'mh-face-data)
 (makunbound 'mh-inherit-face-flag)
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index b1b8c7d859c..8fb65051a86 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -722,7 +722,7 @@ Many MH-E commands that may affect the numbering of the
 messages (such as \\[mh-rescan-folder] or \\[mh-pack-folder])
 will ask if you want to process refiles or deletes first and then
 either run this command for you or undo the pending refiles and
-deletes, which are lost.
+deletes.
 
 This function runs `mh-before-commands-processed-hook' before the
 commands are processed and `mh-after-commands-processed-hook'
@@ -1130,7 +1130,7 @@ interactive use.
 
 This command will ask if you want to process refiles or deletes first
 and then either run \\[mh-execute-commands] for you or undo the
-pending refiles and deletes, which are lost.
+pending refiles and deletes.
 
 In a program, the processing of outstanding commands is not performed
 if DONT-EXEC-PENDING is non-nil."
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index f7abb4cb389..84b04d51c35 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -170,7 +170,7 @@ in interactive use.
 
 This command will ask if you want to process refiles or deletes
 first and then either run \\[mh-execute-commands] for you or undo
-the pending refiles and deletes, which are lost."
+the pending refiles and deletes."
   (interactive (list (if current-prefix-arg
                          (mh-read-range "Scan" mh-current-folder t nil t
                                         mh-interpret-number-as-range-flag)
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index d72fe8e06ce..fccf83cf8d6 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -321,7 +321,9 @@ where,
         :group 'mh-tool-bar :set 'mh-tool-bar-folder-buttons-set
         :type '(set ,@(loop for x in folder-buttons
                             for y in folder-docs
-                            collect `(const :tag ,y ,x))))
+                            collect `(const :tag ,y ,x)))
+        ;;:package-version '(MH-E "7.1")
+        )
        (custom-declare-variable
         'mh-tool-bar-letter-buttons
         '(list ,@(mapcar (lambda (x) `(quote ,x)) letter-defaults))
@@ -329,20 +331,26 @@ where,
         :group 'mh-tool-bar :set 'mh-tool-bar-letter-buttons-set
         :type '(set ,@(loop for x in letter-buttons
                             for y in letter-docs
-                            collect `(const :tag ,y ,x)))))))
+                            collect `(const :tag ,y ,x)))
+        ;;:package-version '(MH-E "7.1")
+       ))))
 
 (mh-tool-bar-define
- ((:folder mh-inc-folder mh-mime-save-parts mh-previous-undeleted-msg
-           mh-page-msg  mh-next-undeleted-msg mh-delete-msg mh-refile-msg
+ ((:folder mh-inc-folder mh-mime-save-parts
+           mh-previous-undeleted-msg mh-page-msg
+           mh-next-undeleted-msg mh-delete-msg mh-refile-msg
            mh-undo mh-execute-commands mh-toggle-tick mh-reply
            mh-alias-grab-from-field mh-send mh-rescan-folder
            mh-tool-bar-search mh-visit-folder
-           mh-tool-bar-customize mh-tool-bar-folder-help mh-widen)
-  (:letter mh-send-letter mh-compose-insertion ispell-message save-buffer
-           undo kill-region menu-bar-kill-ring-save yank mh-fully-kill-draft
-           mh-tool-bar-customize mh-tool-bar-letter-help))
+           mh-tool-bar-customize mh-tool-bar-folder-help
+           mh-widen)
+  (:letter mh-send-letter save-buffer mh-fully-kill-draft
+           mh-compose-insertion ispell-message undo
+           clipboard-kill-region clipboard-kill-ring-save
+           clipboard-yank mh-tool-bar-customize
+           mh-tool-bar-letter-help))
  ;; Folder/Show buffer buttons
- (mh-inc-folder (folder) "mail" "Incorporate new mail in Inbox
+ (mh-inc-folder (folder) "mail/inbox" "Incorporate new mail in Inbox
 This button runs `mh-inc-folder' which drags any
 new mail into your Inbox folder")
  (mh-mime-save-parts (folder) "attach" "Save MIME parts from this message
@@ -351,30 +359,30 @@ different parts into separate files")
  (mh-previous-undeleted-msg (folder) "left-arrow"
                             "Go to the previous undeleted message
 This button runs `mh-previous-undeleted-msg'")
- (mh-page-msg (folder) "page-down" "Page the current message forwards
+ (mh-page-msg (folder) "next-page" "Page the current message forwards
 This button runs `mh-page-msg'")
  (mh-next-undeleted-msg (folder) "right-arrow" "Go to the next undeleted message
 The button runs `mh-next-undeleted-msg'")
- (mh-delete-msg (folder) "close" "Mark this message for deletion
+ (mh-delete-msg (folder) "delete" "Mark this message for deletion
 This button runs `mh-delete-msg'")
- (mh-refile-msg (folder) "mail/refile" "Refile this message
+ (mh-refile-msg (folder) "mail/move" "Refile this message
 This button runs `mh-refile-msg'")
  (mh-undo (folder) "undo" "Undo last operation
 This button runs `undo'"
           (mh-outstanding-commands-p))
- (mh-execute-commands (folder) "execute" "Perform moves and deletes
+ (mh-execute-commands (folder) "data-save" "Perform moves and deletes
 This button runs `mh-execute-commands'"
                       (mh-outstanding-commands-p))
- (mh-toggle-tick (folder) "highlight" "Toggle tick mark
+ (mh-toggle-tick (folder) "mail/flag-for-followup" "Toggle tick mark
 This button runs `mh-toggle-tick'")
  (mh-toggle-showing (folder) "show" "Toggle showing message
 This button runs `mh-toggle-showing'")
+ (mh-reply (folder) "mail/reply" "Reply to this message
+This button runs `mh-reply'")
  (mh-tool-bar-reply-from (folder) "mail/reply-from" "Reply to \"from\"")
  (mh-tool-bar-reply-to (folder) "mail/reply-to" "Reply to \"to\"")
  (mh-tool-bar-reply-all (folder) "mail/reply-all" "Reply to \"all\"")
- (mh-reply (folder) "mail/reply" "Reply to this message
-This button runs `mh-reply'")
- (mh-alias-grab-from-field (folder) "mail/alias" "Grab From alias
+ (mh-alias-grab-from-field (folder) "contact" "Create alias for sender
 This button runs `mh-alias-grab-from-field'"
                            (and (mh-extract-from-header-value)
                                 (not (mh-alias-for-from-p))))
@@ -386,19 +394,22 @@ This button runs `mh-rescan-folder'")
 This button runs `mh-pack-folder'")
  (mh-tool-bar-search (folder) "search" "Search
 This button runs `mh-tool-bar-search-function'")
- (mh-visit-folder (folder) "fld-open" "Visit other folder
+ (mh-visit-folder (folder) "open" "Visit other folder
 This button runs `mh-visit-folder'")
  ;; Letter buffer buttons
  (mh-send-letter (letter) "mail/send" "Send this letter")
- (mh-compose-insertion (letter) "attach" "Insert attachment")
- (ispell-message (letter) "spell" "Check spelling")
  (save-buffer (letter) "save" "Save current buffer to its file"
               (buffer-modified-p))
+ (mh-fully-kill-draft (letter) "delete" "Kill this draft")
+ (mh-compose-insertion (letter) "attach" "Insert attachment")
+ (ispell-message (letter) "spell" "Check spelling")
  (undo (letter) "undo" "Undo last operation")
- (kill-region (letter) "cut" "Cut (kill) text in region")
- (menu-bar-kill-ring-save (letter) "copy" "Copy text in region")
- (yank (letter) "paste" "Paste (yank) text cut or copied earlier")
- (mh-fully-kill-draft (letter) "close" "Kill this draft")
+ (clipboard-kill-region (letter) "cut"
+  "Cut (kill) text in region")
+ (clipboard-kill-ring-save (letter) "copy"
+  "Copy text in region")
+ (clipboard-yank (letter) "paste"
+  "Paste (yank) text cut or copied earlier")
  ;; Common buttons
  (mh-tool-bar-customize (folder letter) "preferences" "MH-E Preferences")
  (mh-tool-bar-folder-help (folder) "help" "Help! (general help)
@@ -406,7 +417,7 @@ This button runs `info'")
  (mh-tool-bar-letter-help (letter) "help" "Help! (general help)
 This button runs `info'")
  ;; Folder narrowed to sequence buttons
- (mh-widen (sequence) "widen" "Widen from the sequence
+ (mh-widen (sequence) "zoom-out" "Widen from the sequence
 This button runs `mh-widen'"))
 
 (provide 'mh-tool-bar)
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 19fc89f4293..1dae0daa247 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -290,6 +290,8 @@ If ARG is non-nil, prompt for a server to connect to."
 (defvar rcirc-topic nil)
 (defvar rcirc-keepalive-timer nil)
 (defvar rcirc-last-server-message-time nil)
+
+;;;###autoload
 (defun rcirc-connect (&optional server port nick user-name full-name startup-channels)
   (add-hook 'window-configuration-change-hook
             'rcirc-window-configuration-change)
diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index a9608b7f4f2..b171929ad41 100644
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -4,7 +4,7 @@
 ;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
-;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de>
+;; Symmetric encryption support added by: Sascha Wilde <wilde@sha-bang.de>
 ;; Created: 1999/10/28
 ;; Keywords: PGP, OpenPGP, GnuPG
 
@@ -28,7 +28,6 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)                         ; for gpg macros
   (require 'pgg))
 
 (defgroup pgg-gpg ()
@@ -51,94 +50,191 @@
   :type '(choice (const :tag "New `--recipient' option" "--recipient")
                  (const :tag "Old `--remote-user' option" "--remote-user")))
 
-(defcustom pgg-gpg-use-agent (if (getenv "GPG_AGENT_INFO") t nil)
-  "Whether to use gnupg agent for key caching.
-By default, it will be enabled iff the environment variable
-\"GPG_AGENT_INFO\" is set."
+(defcustom pgg-gpg-use-agent nil
+  "Whether to use gnupg agent for key caching."
   :group 'pgg-gpg
   :type 'boolean)
 
 (defvar pgg-gpg-user-id nil
   "GnuPG ID of your default identity.")
 
-(defun pgg-gpg-process-region (start end passphrase program args)
+(defvar pgg-gpg-user-id-alist nil
+  "An alist mapping from key ID to user ID.")
+
+(defvar pgg-gpg-read-point nil)
+(defvar pgg-gpg-output-file-name nil)
+(defvar pgg-gpg-pending-status-list nil)
+(defvar pgg-gpg-key-id nil)
+(defvar pgg-gpg-passphrase nil)
+(defvar pgg-gpg-debug nil)
+
+(defun pgg-gpg-start-process (args)
   (let* ((output-file-name (pgg-make-temp-file "pgg-output"))
          (args
-          `("--status-fd" "2"
-            ,@(if pgg-gpg-use-agent '("--use-agent")
-                (if passphrase '("--passphrase-fd" "0")))
-            "--yes" ; overwrite
-            "--output" ,output-file-name
-            ,@pgg-gpg-extra-args ,@args))
-         (output-buffer pgg-output-buffer)
-         (errors-buffer pgg-errors-buffer)
-         (orig-mode (default-file-modes))
+          (append (list "--no-tty"
+                        "--status-fd" "1"
+                        "--command-fd" "0"
+                        "--yes" ; overwrite
+                        "--output" output-file-name)
+                  (if pgg-gpg-use-agent '("--use-agent"))
+                  pgg-gpg-extra-args
+                  args))
+         (coding-system-for-write 'binary)
          (process-connection-type nil)
-         exit-status)
-    (with-current-buffer (get-buffer-create errors-buffer)
-      (buffer-disable-undo)
-      (erase-buffer))
+         (orig-mode (default-file-modes))
+         default-enable-multibyte-characters
+         (buffer (generate-new-buffer " *pgg-gpg*"))
+         process)
+    (with-current-buffer buffer
+      (make-local-variable 'pgg-gpg-read-point)
+      (setq pgg-gpg-read-point (point-min))
+      (make-local-variable 'pgg-gpg-output-file-name)
+      (setq pgg-gpg-output-file-name output-file-name)
+      (make-local-variable 'pgg-gpg-pending-status-list)
+      (setq pgg-gpg-pending-status-list nil)
+      (make-local-variable 'pgg-gpg-key-id)
+      (setq pgg-gpg-key-id nil)
+      (make-local-variable 'pgg-gpg-passphrase)
+      (setq pgg-gpg-passphrase nil))
     (unwind-protect
         (progn
           (set-default-file-modes 448)
-          (let ((coding-system-for-write 'binary)
-                (input (buffer-substring-no-properties start end))
-                (default-enable-multibyte-characters nil))
-            (with-temp-buffer
-              (when passphrase
-                (insert passphrase "\n"))
-              (insert input)
-              (setq exit-status
-                    (apply #'call-process-region (point-min) (point-max) program
-                           nil errors-buffer nil args))))
-          (with-current-buffer (get-buffer-create output-buffer)
-            (buffer-disable-undo)
-            (erase-buffer)
-            (if (file-exists-p output-file-name)
-                (let ((coding-system-for-read (if pgg-text-mode
-                                                  'raw-text
-                                                'binary)))
-                  (insert-file-contents output-file-name)))
-            (set-buffer errors-buffer)
-            (if (not (equal exit-status 0))
-                (insert (format "\n%s exited abnormally: '%s'\n"
-                                program exit-status)))))
-      (if (file-exists-p output-file-name)
-          (delete-file output-file-name))
-      (set-default-file-modes orig-mode))))
-
-(defun pgg-gpg-possibly-cache-passphrase (passphrase &optional key notruncate)
-  (if (and passphrase
-           pgg-cache-passphrase
-           (progn
-             (goto-char (point-min))
-             (re-search-forward "^\\[GNUPG:] \\(GOOD_PASSPHRASE\\>\\)\\|\\(SIG_CREATED\\)" nil t)))
-      (pgg-add-passphrase-to-cache
-       (or key
-           (progn
-             (goto-char (point-min))
-             (if (re-search-forward
-                  "^\\[GNUPG:] NEED_PASSPHRASE\\(_PIN\\)? \\w+ ?\\w*" nil t)
-                 (substring (match-string 0) -8))))
-       passphrase
-       notruncate)))
-
-(defvar pgg-gpg-all-secret-keys 'unknown)
-
-(defun pgg-gpg-lookup-all-secret-keys ()
-  "Return all secret keys present in secret key ring."
-  (when (eq pgg-gpg-all-secret-keys 'unknown)
-    (setq pgg-gpg-all-secret-keys '())
-    (let ((args (list "--with-colons" "--no-greeting" "--batch"
-                      "--list-secret-keys")))
-      (with-temp-buffer
-        (apply #'call-process pgg-gpg-program nil t nil args)
+          (setq process
+                (apply #'start-process "pgg-gpg" buffer pgg-gpg-program args)))
+      (set-default-file-modes orig-mode))
+    (set-process-filter process #'pgg-gpg-process-filter)
+    (set-process-sentinel process #'pgg-gpg-process-sentinel)
+    process))
+
+(defun pgg-gpg-process-filter (process input)
+  (save-excursion
+    (if pgg-gpg-debug
+        (save-excursion
+          (set-buffer (get-buffer-create  " *pgg-gpg-debug*"))
+          (goto-char (point-max))
+          (insert input)))
+    (set-buffer (process-buffer process))
+    (goto-char (point-max))
+    (insert input)
+    (goto-char pgg-gpg-read-point)
+    (beginning-of-line)
+    (while (looking-at ".*\n")          ;the input line is finished
+      (save-excursion
+        (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\)\\>.*")
+            (let* ((status (match-string 1))
+                   (symbol (intern-soft (concat "pgg-gpg-status-" status)))
+                   (entry (member status pgg-gpg-pending-status-list)))
+              (if entry
+                  (setq pgg-gpg-pending-status-list
+                        (delq (car entry)
+                              pgg-gpg-pending-status-list)))
+              (if (and symbol
+                       (fboundp symbol))
+                  (funcall symbol process (buffer-substring (match-beginning 1)
+                                                            (match-end 0)))))))
+      (forward-line))
+    (setq pgg-gpg-read-point (point))))
+
+(defun pgg-gpg-process-sentinel (process status)
+  (set-process-filter process nil)
+  (save-excursion
+    ;; Copy the contents of process-buffer to pgg-errors-buffer.
+    (set-buffer (get-buffer-create pgg-errors-buffer))
+    (buffer-disable-undo)
+    (erase-buffer)
+    (when (buffer-live-p (process-buffer process))
+      (insert-buffer-substring (process-buffer process))
+      (goto-char (point-min))
+      (delete-matching-lines "^\\[GNUPG:] ")
+      (goto-char (point-min))
+      (while (re-search-forward "^gpg: " nil t)
+        (replace-match "")))
+    ;; Read the contents of the output file to pgg-output-buffer.
+    (set-buffer (get-buffer-create pgg-output-buffer))
+    (buffer-disable-undo)
+    (erase-buffer)
+    (if (and (equal status "finished\n")
+             (buffer-live-p (process-buffer process)))
+        (let ((output-file-name (with-current-buffer (process-buffer process)
+                                  pgg-gpg-output-file-name)))
+          (when (file-exists-p output-file-name)
+            (let ((coding-system-for-read (if pgg-text-mode
+                                              'raw-text
+                                            'binary)))
+              (insert-file-contents output-file-name))
+            (delete-file output-file-name))))))
+
+(defun pgg-gpg-wait-for-status (process status-list)
+  (with-current-buffer (process-buffer process)
+    (setq pgg-gpg-pending-status-list status-list)
+    (while (and (eq (process-status process) 'run)
+                pgg-gpg-pending-status-list)
+      (accept-process-output process 1))))
+
+(defun pgg-gpg-wait-for-completion (process &optional status-list)
+  (process-send-eof process)
+  (while (eq (process-status process) 'run)
+    (sit-for 0.1))
+  (save-excursion
+    (set-buffer (process-buffer process))
+    (setq status-list (copy-sequence status-list))
+    (let ((pointer status-list))
+      (while pointer
         (goto-char (point-min))
-        (while (re-search-forward
-                "^\\(sec\\|pub\\):[^:]*:[^:]*:[^:]*:\\([^:]*\\)" nil t)
-          (push (substring (match-string 2) 8)
-                pgg-gpg-all-secret-keys)))))
-  pgg-gpg-all-secret-keys)
+        (unless (re-search-forward
+                 (concat "^\\[GNUPG:] " (car pointer) "\\>")
+                 nil t)
+          (setq status-list (delq (car pointer) status-list)))
+        (setq pointer (cdr pointer))))
+    (kill-buffer (process-buffer process))
+    status-list))
+
+(defun pgg-gpg-status-USERID_HINT (process line)
+  (if (string-match "\\`USERID_HINT \\([^ ]+\\) \\(.*\\)" line)
+      (let* ((key-id (match-string 1 line))
+             (user-id (match-string 2 line))
+             (entry (assoc key-id pgg-gpg-user-id-alist)))
+        (if entry
+            (setcdr entry user-id)
+          (setq pgg-gpg-user-id-alist (cons (cons key-id user-id)
+                                            pgg-gpg-user-id-alist))))))
+
+(defun pgg-gpg-status-NEED_PASSPHRASE (process line)
+  (if (string-match "\\`NEED_PASSPHRASE \\([^ ]+\\)" line)
+      (setq pgg-gpg-key-id (match-string 1 line))))
+
+(defun pgg-gpg-status-NEED_PASSPHRASE_SYM (process line)
+  (setq pgg-gpg-key-id 'SYM))
+
+(defun pgg-gpg-status-NEED_PASSPHRASE_PIN (process line)
+  (setq pgg-gpg-key-id 'PIN))
+
+(defun pgg-gpg-status-GET_HIDDEN (process line)
+  (let ((entry (assoc pgg-gpg-key-id pgg-gpg-user-id-alist)))
+    (if (setq pgg-gpg-passphrase
+              (if (eq pgg-gpg-key-id 'SYM)
+                  (pgg-read-passphrase
+                   "GnuPG passphrase for symmetric encryption: ")
+                (pgg-read-passphrase
+                 (format "GnuPG passphrase for %s: "
+                         (if entry
+                             (cdr entry)
+                           pgg-gpg-key-id))
+                 (if (eq pgg-gpg-key-id 'PIN)
+                     "PIN"
+                   pgg-gpg-key-id))))
+        (process-send-string process (concat pgg-gpg-passphrase "\n")))))
+
+(defun pgg-gpg-status-GOOD_PASSPHRASE (process line)
+  (when (and pgg-gpg-passphrase
+             (stringp pgg-gpg-key-id))
+    (pgg-add-passphrase-to-cache pgg-gpg-key-id pgg-gpg-passphrase)
+    (setq pgg-gpg-passphrase nil)))
+
+(defun pgg-gpg-status-BAD_PASSPHRASE (process line)
+  (when pgg-gpg-passphrase
+    (fillarray pgg-gpg-passphrase 0)
+    (setq pgg-gpg-passphrase nil)))
 
 (defun pgg-gpg-lookup-key (string &optional type)
   "Search keys associated with STRING."
@@ -152,52 +248,15 @@ By default, it will be enabled iff the environment variable
                              nil t)
           (substring (match-string 2) 8)))))
 
-(defun pgg-gpg-lookup-key-owner (string &optional all)
-  "Search keys associated with STRING and return owner of identified key.
-
-The value may be just the bare key id, or it may be a combination of the
-user name associated with the key and the key id, with the key id enclosed
-in \"<...>\" angle brackets.
-
-Optional ALL non-nil means search all keys, including secret keys."
-  (let ((args (list "--with-colons" "--no-greeting" "--batch"
-                    (if all "--list-secret-keys" "--list-keys")
-                    string))
-        (key-regexp (concat "^\\(sec\\|pub\\)"
-                            ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):[^:]*"
-                            ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):")))
-    (with-temp-buffer
-      (apply #'call-process pgg-gpg-program nil t nil args)
-      (goto-char (point-min))
-      (if (re-search-forward key-regexp
-                             nil t)
-          (match-string 3)))))
-
-(defun pgg-gpg-key-id-from-key-owner (key-owner)
-  (cond ((not key-owner) nil)
-        ;; Extract bare key id from outermost paired angle brackets, if any:
-        ((string-match "[^<]*<\\(.+\\)>[^>]*" key-owner)
-         (substring key-owner (match-beginning 1)(match-end 1)))
-        (key-owner)))
-
 (defun pgg-gpg-encrypt-region (start end recipients &optional sign passphrase)
   "Encrypt the current region between START and END.
 
-If optional argument SIGN is non-nil, do a combined sign and encrypt.
-
-If optional PASSPHRASE is not specified, it will be obtained from the
-passphrase cache or user."
+If optional argument SIGN is non-nil, do a combined sign and encrypt."
   (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
-         (passphrase (or passphrase
-                         (when (and sign (not pgg-gpg-use-agent))
-                           (pgg-read-passphrase
-                            (format "GnuPG passphrase for %s: "
-                                    pgg-gpg-user-id)
-                            pgg-gpg-user-id))))
          (args
           (append
-           (list "--batch" "--armor" "--always-trust" "--encrypt")
-           (if pgg-text-mode (list "--textmode"))
+           '("--armor" "--always-trust" "--encrypt")
+           (if pgg-text-mode '("--textmode"))
            (if sign (list "--sign" "--local-user" pgg-gpg-user-id))
            (if recipients
                (apply #'nconc
@@ -205,156 +264,71 @@ passphrase cache or user."
                                 (list pgg-gpg-recipient-argument rcpt))
                               (append recipients
                                       (if pgg-encrypt-for-me
-                                          (list pgg-gpg-user-id)))))))))
-    (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
-    (when sign
-      (with-current-buffer pgg-errors-buffer
-        ;; Possibly cache passphrase under, e.g. "jas", for future sign.
-        (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id)
-        ;; Possibly cache passphrase under, e.g. B565716F, for future decrypt.
-        (pgg-gpg-possibly-cache-passphrase passphrase)))
-    (pgg-process-when-success)))
+                                          (list pgg-gpg-user-id))))))))
+         (process (pgg-gpg-start-process args)))
+    (if (and sign (not pgg-gpg-use-agent))
+        (pgg-gpg-wait-for-status process '("GOOD_PASSPHRASE")))
+    (process-send-region process start end)
+    (pgg-gpg-wait-for-completion process '("SIG_CREATED" "END_ENCRYPTION"))))
 
 (defun pgg-gpg-encrypt-symmetric-region (start end &optional passphrase)
-  "Encrypt the current region between START and END with symmetric cipher.
-
-If optional PASSPHRASE is not specified, it will be obtained from the
-passphrase cache or user."
-  (let* ((passphrase (or passphrase
-                         (when (not pgg-gpg-use-agent)
-                           (pgg-read-passphrase
-                            "GnuPG passphrase for symmetric encryption: "))))
-         (args
-          (append (list "--batch" "--armor" "--symmetric" )
-                  (if pgg-text-mode (list "--textmode")))))
-    (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
-    (pgg-process-when-success)))
+  "Encrypt the current region between START and END with symmetric cipher."
+  (let* ((args
+          (append '("--armor" "--symmetric")
+                  (if pgg-text-mode '("--textmode"))))
+         (process (pgg-gpg-start-process args)))
+    (pgg-gpg-wait-for-status process '("BEGIN_ENCRYPTION"))
+    (process-send-region process start end)
+    (pgg-gpg-wait-for-completion process '("END_ENCRYPTION"))))
 
 (defun pgg-gpg-decrypt-region (start end &optional passphrase)
-  "Decrypt the current region between START and END.
-
-If optional PASSPHRASE is not specified, it will be obtained from the
-passphrase cache or user."
-  (let* ((current-buffer (current-buffer))
-         (message-keys (with-temp-buffer
-                         (insert-buffer-substring current-buffer)
-                         (pgg-decode-armor-region (point-min) (point-max))))
-         (secret-keys (pgg-gpg-lookup-all-secret-keys))
-         ;; XXX the user is stuck if they need to use the passphrase for
-         ;;     any but the first secret key for which the message is
-         ;;     encrypted.  ideally, we would incrementally give them a
-         ;;     chance with subsequent keys each time they fail with one.
-         (key (pgg-gpg-select-matching-key message-keys secret-keys))
-         (key-owner (and key (pgg-gpg-lookup-key-owner key t)))
-         (key-id (pgg-gpg-key-id-from-key-owner key-owner))
-         (pgg-gpg-user-id (or key-id key
-                              pgg-gpg-user-id pgg-default-user-id))
-         (passphrase (or passphrase
-                         (when (not pgg-gpg-use-agent)
-                           (pgg-read-passphrase
-                            (format (if (pgg-gpg-symmetric-key-p message-keys)
-                                        "Passphrase for symmetric decryption: "
-                                      "GnuPG passphrase for %s: ")
-                                    (or key-owner "??"))
-                            pgg-gpg-user-id))))
-         (args '("--batch" "--decrypt")))
-    (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
-    (with-current-buffer pgg-errors-buffer
-      (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id)
-      (goto-char (point-min))
-      (re-search-forward "^\\[GNUPG:] DECRYPTION_OKAY\\>" nil t))))
-
-;;;###autoload
-(defun pgg-gpg-symmetric-key-p (message-keys)
-  "True if decoded armor MESSAGE-KEYS has symmetric encryption indicator."
-  (let (result)
-    (dolist (key message-keys result)
-      (when (and (eq (car key) 3)
-                 (member '(symmetric-key-algorithm) key))
-        (setq result key)))))
-
-(defun pgg-gpg-select-matching-key (message-keys secret-keys)
-  "Choose a key from MESSAGE-KEYS that matches one of the keys in SECRET-KEYS."
-  (loop for message-key in message-keys
-        for message-key-id = (and (equal (car message-key) 1)
-                                  (cdr (assq 'key-identifier
-                                             (cdr message-key))))
-        for key = (and message-key-id (pgg-lookup-key message-key-id 'encrypt))
-        when (and key (member key secret-keys)) return key))
+  "Decrypt the current region between START and END."
+  (let* ((args '("--decrypt"))
+         (process (pgg-gpg-start-process args)))
+    (process-send-region process start end)
+    (pgg-gpg-wait-for-status process '("BEGIN_DECRYPTION"))
+    (pgg-gpg-wait-for-completion process '("GOODSIG" "DECRYPTION_OKAY"))))
 
 (defun pgg-gpg-sign-region (start end &optional cleartext passphrase)
   "Make detached signature from text between START and END."
   (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
-         (passphrase (or passphrase
-                         (when (not pgg-gpg-use-agent)
-                           (pgg-read-passphrase
-                            (format "GnuPG passphrase for %s: "
-                                    pgg-gpg-user-id)
-                            pgg-gpg-user-id))))
          (args
           (append (list (if cleartext "--clearsign" "--detach-sign")
-                        "--armor" "--batch" "--verbose"
+                        "--armor" "--verbose"
                         "--local-user" pgg-gpg-user-id)
-                  (if pgg-text-mode (list "--textmode"))))
-         (inhibit-read-only t)
-         buffer-read-only)
-    (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
-    (with-current-buffer pgg-errors-buffer
-      ;; Possibly cache passphrase under, e.g. "jas", for future sign.
-      (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id)
-      ;; Possibly cache passphrase under, e.g. B565716F, for future decrypt.
-      (pgg-gpg-possibly-cache-passphrase passphrase))
-    (pgg-process-when-success)))
+                  (if pgg-text-mode '("--textmode"))))
+         (process (pgg-gpg-start-process args)))
+    (unless pgg-gpg-use-agent
+      (pgg-gpg-wait-for-status process '("GOOD_PASSPHRASE")))
+    (process-send-region process start end)
+    (pgg-gpg-wait-for-completion process '("SIG_CREATED"))))
 
 (defun pgg-gpg-verify-region (start end &optional signature)
   "Verify region between START and END as the detached signature SIGNATURE."
-  (let ((args '("--batch" "--verify")))
+  (let ((args '("--verify"))
+        process)
     (when (stringp signature)
       (setq args (append args (list signature))))
-    (setq args (append args '("-")))
-    (pgg-gpg-process-region start end nil pgg-gpg-program args)
-    (with-current-buffer pgg-errors-buffer
-      (goto-char (point-min))
-      (while (re-search-forward "^gpg: \\(.*\\)\n" nil t)
-        (with-current-buffer pgg-output-buffer
-          (insert-buffer-substring pgg-errors-buffer
-                                   (match-beginning 1) (match-end 0)))
-        (delete-region (match-beginning 0) (match-end 0)))
-      (goto-char (point-min))
-      (re-search-forward "^\\[GNUPG:] GOODSIG\\>" nil t))))
+    (setq process (pgg-gpg-start-process (append args '("-"))))
+    (process-send-region process start end)
+    (pgg-gpg-wait-for-completion process '("GOODSIG"))))
 
 (defun pgg-gpg-insert-key ()
   "Insert public key at point."
   (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
-         (args (list "--batch" "--export" "--armor"
-                     pgg-gpg-user-id)))
-    (pgg-gpg-process-region (point)(point) nil pgg-gpg-program args)
+         (args (list "--export" "--armor"
+                     pgg-gpg-user-id))
+         (process (pgg-gpg-start-process args)))
+    (pgg-gpg-wait-for-completion process)
     (insert-buffer-substring pgg-output-buffer)))
 
 (defun pgg-gpg-snarf-keys-region (start end)
   "Add all public keys in region between START and END to the keyring."
-  (let ((args '("--import" "--batch" "-")) status)
-    (pgg-gpg-process-region start end nil pgg-gpg-program args)
-    (set-buffer pgg-errors-buffer)
-    (goto-char (point-min))
-    (when (re-search-forward "^\\[GNUPG:] IMPORT_RES\\>" nil t)
-      (setq status (buffer-substring (match-end 0)
-                                     (progn (end-of-line)(point)))
-            status (vconcat (mapcar #'string-to-number (split-string status))))
-      (erase-buffer)
-      (insert (format "Imported %d key(s).
-\tArmor contains %d key(s) [%d bad, %d old].\n"
-                      (+ (aref status 2)
-                         (aref status 10))
-                      (aref status 0)
-                      (aref status 1)
-                      (+ (aref status 4)
-                         (aref status 11)))
-              (if (zerop (aref status 9))
-                  ""
-                "\tSecret keys are imported.\n")))
-    (append-to-buffer pgg-output-buffer (point-min)(point-max))
-    (pgg-process-when-success)))
+  (let* ((args '("--import" "-"))
+         (process (pgg-gpg-start-process args))
+         status)
+    (process-send-region process start end)
+    (pgg-gpg-wait-for-completion process '("IMPORT_RES"))))
 
 (provide 'pgg-gpg)
 
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 5b657b1555b..b969515e2fc 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -78,13 +78,15 @@
 ;; gdb-assembler-custom with a lisp debugger it does!).
 
 ;;; Problems with watch expressions, GDB/MI:
-
 ;; 1) They go out of scope when the inferior is re-run.
 ;; 2) -stack-list-locals has a type field but also prints type in values field.
-;; 3) VARNUM increments even when variable object is not created (maybe trivial).
+;; 3) VARNUM increments even when variable object is not created
+;;    (maybe trivial).
 
-;;; TODO:
+;; Known Bugs:
+;; 1) M-x gdb doesn't work with "run" command in .gdbinit, use M-x gdba instead.
 
+;;; TODO:
 ;; 1) Use MI command -data-read-memory for memory window.
 ;; 2) Use tree-widget.el instead of the speedbar for watch-expressions?
 ;; 3) Mark breakpoint locations on scroll-bar of source buffer?
@@ -126,6 +128,7 @@ and #define directives otherwise.")
 (defvar gdb-signalled nil)
 (defvar gdb-source-window nil)
 (defvar gdb-inferior-status nil)
+(defvar gdb-continuation nil)
 
 (defvar gdb-buffer-type nil
   "One of the symbols bound in `gdb-buffer-rules'.")
@@ -258,7 +261,8 @@ detailed description of this mode.
   (interactive (list (gud-query-cmdline 'gdba)))
   ;;
   ;; Let's start with a basic gud-gdb buffer and then modify it a bit.
-  (gdb command-line))
+  (gdb command-line)
+  (gdb-init-1))
 
 (defcustom gdb-debug-ring-max 128
   "Maximum size of `gdb-debug-ring'."
@@ -702,7 +706,7 @@ With arg, enter name of variable to be watched in the minibuffer."
       (message "gud-watch is a no-op in this mode."))))
 
 (defconst gdb-var-create-regexp
-  "name=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\",type=\"\\(.*?\\)\"")
+  "name=\"\\(.*?\\)\",.*numchild=\"\\(.*?\\)\",.*type=\"\\(.*?\\)\"")
 
 (defun gdb-var-create-handler (expr)
   (goto-char (point-min))
@@ -747,8 +751,8 @@ With arg, enter name of variable to be watched in the minibuffer."
          `(lambda () (gdb-var-list-children-handler ,varnum)))))
 
 (defconst gdb-var-list-children-regexp
- "name=\"\\(.*?\\)\",exp=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\",\
-type=\"\\(.*?\\)\"")
+ "child={.*?name=\"\\(.*?\\)\",.*?exp=\"\\(.*?\\)\",.*?\
+numchild=\"\\(.*?\\)\",.*?type=\"\\(.*?\\)\".*?}")
 
 (defun gdb-var-list-children-handler (varnum)
   (goto-char (point-min))
@@ -784,7 +788,9 @@ type=\"\\(.*?\\)\"")
            'gdb-var-update-handler))
     (push 'gdb-var-update gdb-pending-triggers)))
 
-(defconst gdb-var-update-regexp "name=\"\\(.*?\\)\",in_scope=\"\\(.*?\\)\"")
+(defconst gdb-var-update-regexp
+  "{.*?name=\"\\(.*?\\)\",.*?in_scope=\"\\(.*?\\)\",.*?\
+type_changed=\".*?\".*?}")
 
 (defun gdb-var-update-handler ()
   (dolist (var gdb-var-list)
@@ -1078,7 +1084,6 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
 ;;
 ;; These lists are consumed tail first.
 ;;
-(defvar gdb-continuation nil)
 
 (defun gdb-send (proc string)
   "A comint send filter for gdb.
@@ -1086,15 +1091,16 @@ This filter may simply queue input for a later time."
   (with-current-buffer gud-comint-buffer
     (let ((inhibit-read-only t))
       (remove-text-properties (point-min) (point-max) '(face))))
-  (if (string-match "\\\\$" string)
-      (setq gdb-continuation (concat gdb-continuation string "\n"))
-    (let ((item (concat gdb-continuation string "\n")))
-      (if gud-running
-          (progn
+    (if gud-running
+        (progn
+          (let ((item (concat string "\n")))
             (if gdb-enable-debug (push (cons 'send item) gdb-debug-ring))
-            (process-send-string proc item))
-        (gdb-enqueue-input item)))
-    (setq gdb-continuation nil)))
+            (process-send-string proc item)))
+      (if (string-match "\\\\$" string)
+          (setq gdb-continuation (concat gdb-continuation string "\n"))
+        (let ((item (concat gdb-continuation string "\n")))
+          (gdb-enqueue-input item)
+          (setq gdb-continuation nil)))))
 
 ;; Note: Stuff enqueued here will be sent to the next prompt, even if it
 ;; is a query, or other non-top-level prompt.
@@ -1318,7 +1324,8 @@ directives."
 It is just like `gdb-stopping', except that if we already set the output
 sink to `user' in `gdb-stopping', that is fine."
   (setq gud-running nil)
-  (unless (or gud-overlay-arrow-position gud-last-frame)
+  (unless (or gud-overlay-arrow-position gud-last-frame
+              (not gud-last-last-frame))
     (gud-display-line (car gud-last-last-frame) (cdr gud-last-last-frame)))
   (unless (member gdb-inferior-status '("exited" "signal"))
     (setq gdb-inferior-status "stopped")
@@ -1680,8 +1687,7 @@ static char *magick[] = {
   ;; We use different values of grey for different background types,
   ;; so that on low-color displays it will end up as something visible
   ;; if it has to be approximated.
-  '((((background dark))  :foreground "grey60")
-    (((background light)) :foreground "grey40"))
+  '((t :foreground  "grey70"))
   "Face for disabled breakpoint icon in fringe."
   :group 'gud)
 
@@ -2969,10 +2975,24 @@ BUFFER nil or omitted means use the current buffer."
                       'gdb-assembler-buffer-name
                       'gdb-assembler-mode)
 
-(def-gdb-auto-update-handler gdb-assembler-handler
-  gdb-invalidate-assembler
-  gdb-assembler-buffer
-  gdb-assembler-custom)
+;; We can't use def-gdb-auto-update-handler because we don't want to use
+;; window-start but keep the overlay arrow/current line visible.
+(defun gdb-assembler-handler ()
+  (setq gdb-pending-triggers
+        (delq 'gdb-invalidate-assembler
+              gdb-pending-triggers))
+     (let ((buf (gdb-get-buffer 'gdb-assembler-buffer)))
+       (and buf
+            (with-current-buffer buf
+              (let* ((window (get-buffer-window buf 0))
+                     (p (window-point window))
+                    (buffer-read-only nil))
+                (erase-buffer)
+                (insert-buffer-substring (gdb-get-buffer-create
+                                          'gdb-partial-output-buffer))
+                (set-window-point window p)))))
+     ;; put customisation here
+     (gdb-assembler-custom))
 
 (defun gdb-assembler-custom ()
   (let ((buffer (gdb-get-buffer 'gdb-assembler-buffer))
@@ -2987,6 +3007,10 @@ BUFFER nil or omitted means use the current buffer."
                   (progn
                     (setq pos (point))
                     (beginning-of-line)
+                    (setq fringe-indicator-alist
+                          (if (string-equal gdb-frame-number "0")
+                              nil
+                            '((overlay-arrow . hollow-right-triangle))))
                     (or gdb-overlay-arrow-position
                         (setq gdb-overlay-arrow-position (make-marker)))
                     (set-marker gdb-overlay-arrow-position
@@ -3114,20 +3138,10 @@ BUFFER nil or omitted means use the current buffer."
   (goto-char (point-min))
   (if (re-search-forward  "Stack level \\([0-9]+\\)" nil t)
       (setq gdb-frame-number (match-string 1)))
-  (if gud-overlay-arrow-position
-      (let ((buffer (marker-buffer gud-overlay-arrow-position))
-            (position (marker-position gud-overlay-arrow-position)))
-        (when buffer
-          (with-current-buffer buffer
-            (setq fringe-indicator-alist
-                  (if (string-equal gdb-frame-number "0")
-                      nil
-                    '((overlay-arrow . hollow-right-triangle))))
-            (setq gud-overlay-arrow-position (make-marker))
-            (set-marker gud-overlay-arrow-position position)))))
   (goto-char (point-min))
   (if (re-search-forward
-       ".*=\\s-+0x0*\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*?\\);? " nil t)
+    ".*=\\s-+0x0*\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*?\\) (\\(\\S-*?\\):[0-9]+?);? "
+       nil t)
       (progn
         (setq gdb-selected-frame (match-string 2))
         (if (gdb-get-buffer 'gdb-locals-buffer)
@@ -3137,6 +3151,16 @@ BUFFER nil or omitted means use the current buffer."
             (with-current-buffer (gdb-get-buffer 'gdb-assembler-buffer)
               (setq mode-name (concat "Machine:" gdb-selected-frame))))
         (setq gdb-frame-address (match-string 1))))
+  (if gud-overlay-arrow-position
+      (let ((buffer (marker-buffer gud-overlay-arrow-position))
+            (position (marker-position gud-overlay-arrow-position)))
+        (when (and buffer (string-equal (buffer-name buffer) (match-string 3)))
+          (with-current-buffer buffer
+            (setq fringe-indicator-alist
+                  (if (string-equal gdb-frame-number "0")
+                      nil
+                    '((overlay-arrow . hollow-right-triangle))))
+            (set-marker gud-overlay-arrow-position position)))))
   (goto-char (point-min))
   (if (re-search-forward " source language \\(\\S-*\\)\." nil t)
       (setq gdb-current-language (match-string 1)))
@@ -3175,8 +3199,8 @@ is set in them."
     `(lambda () (gdb-var-list-children-handler-1 ,varnum)))))
 
 (defconst gdb-var-list-children-regexp-1
-  "name=\"\\(.+?\\)\",exp=\"\\(.+?\\)\",numchild=\"\\(.+?\\)\",\
-value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
+  "child={.*?name=\"\\(.+?\\)\",.*?exp=\"\\(.+?\\)\",.*?\
+numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\),.*?type=\"\\(.+?\\)\".*?}")
 
 (defun gdb-var-list-children-handler-1 (varnum)
   (goto-char (point-min))
@@ -3212,7 +3236,8 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
         (push 'gdb-var-update gdb-pending-triggers))))
 
 (defconst gdb-var-update-regexp-1
-  "name=\"\\(.*?\\)\",\\(?:value=\\(\".*?\"\\),\\)?in_scope=\"\\(.*?\\)\"")
+  "{.*?name=\"\\(.*?\\)\",.*?\\(?:value=\\(\".*?\"\\),\\)?.*?\
+in_scope=\"\\(.*?\\)\".*?}")
 
 (defun gdb-var-update-handler-1 ()
   (dolist (var gdb-var-list)
@@ -3249,7 +3274,7 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
     gdb-data-list-register-values-handler)
 
 (defconst gdb-data-list-register-values-regexp
-  "number=\"\\(.*?\\)\",value=\"\\(.*?\\)\"")
+  "{.*?number=\"\\(.*?\\)\",.*?value=\"\\(.*?\\)\".*?}")
 
 (defun gdb-data-list-register-values-handler ()
   (setq gdb-pending-triggers (delq 'gdb-invalidate-registers-1
@@ -3342,7 +3367,7 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
   gdb-stack-list-locals-handler)
 
 (defconst gdb-stack-list-locals-regexp
-  "name=\"\\(.*?\\)\",type=\"\\(.*?\\)\"")
+  "{.*?name=\"\\(.*?\\)\",.*?type=\"\\(.*?\\)\"")
 
 (defvar gdb-locals-watch-map-1
   (let ((map (make-sparse-keymap)))
@@ -3361,7 +3386,7 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
       (let ((local (list (match-string 1)
                          (match-string 2)
                          nil)))
-        (if (looking-at ",value=\\(\".*\"\\)}")
+        (if (looking-at ",value=\\(\".*\"\\).*?}")
             (setcar (nthcdr 2 local) (read (match-string 1))))
         (push local locals-list)))
     (let ((buf (gdb-get-buffer 'gdb-locals-buffer)))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 7fa5a0b6dcc..907a2e7c300 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -683,6 +683,7 @@ To run GDB in text command mode, set `gud-gdb-command-name' to
 
   (if (and gud-comint-buffer
            (buffer-name gud-comint-buffer)
+           (get-buffer-process gud-comint-buffer)
            (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba)))
       (error "Multiple debugging is only supported with \"gdb --fullname\""))
 
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index ba0466f9c6f..ef5e8648b5c 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1103,15 +1103,6 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
     )
   "Alist of Mac script codes vs Emacs coding systems.")
 
-(defconst mac-system-coding-system
-  (let ((base (or (cdr (assq mac-system-script-code
-                             mac-script-code-coding-systems))
-                  'mac-roman)))
-    (if (eq system-type 'darwin)
-        base
-      (coding-system-change-eol-conversion base 'mac)))
-  "Coding system derived from the system script code.")
-
 (defun mac-add-charset-info (xlfd-charset mac-text-encoding)
   "Add a character set to display with Mac fonts.
 Create an entry in `mac-charset-info-alist'.
@@ -1153,9 +1144,6 @@ correspoinding TextEncodingBase value."
 
 ;;;; Selections
 
-;; Setup to use the Mac clipboard.
-(set-selection-coding-system mac-system-coding-system)
-
 ;;; We keep track of the last text selected here, so we can check the
 ;;; current selection against it, and avoid passing back our own text
 ;;; from x-get-selection-value.
@@ -1336,7 +1324,8 @@ in `selection-converter-alist', which see."
               (setq str (or s
                             (encode-coding-string str
                                                   (if (eq (byteorder) ?B)
-                                                      'utf-16be 'utf-16le))))))
+                                                      'utf-16be-mac
+                                                    'utf-16le-mac))))))
            ((eq type 'com.apple.traditional-mac-plain-text)
             (let ((encodables (find-coding-systems-string str))
                   (rest mac-script-code-coding-systems))
@@ -1896,6 +1885,22 @@ It returns a name of the created fontset."
     (fontset-add-mac-fonts fontset t)
     fontset))
 
+;; Adjust Courier font specifications in x-fixed-font-alist.
+(let ((courier-fonts (assoc "Courier" x-fixed-font-alist)))
+  (if courier-fonts
+      (dolist (label-fonts (cdr courier-fonts))
+        (setcdr label-fonts
+                (mapcar
+                 (lambda (font)
+                   (if (string-match "\\`-adobe-courier-\\([^-]*\\)-\\(.\\)-\\(.*\\)-iso8859-1\\'" font)
+                       (replace-match
+                        (if (string= (match-string 2 font) "o")
+                            "-*-courier-\\1-i-\\3-*-*"
+                          "-*-courier-\\1-\\2-\\3-*-*")
+                        t nil font)
+                     font))
+                 (cdr label-fonts))))))
+
 ;; Setup the default fontset.
 (setup-default-fontset)
 (cond ((x-list-fonts "*-iso10646-1")
@@ -2007,6 +2012,17 @@ ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman")
 ;; Enable CLIPBOARD copy/paste through menu bar commands.
 (menu-bar-enable-clipboard)
 
+(defconst mac-system-coding-system
+  (let ((base (or (cdr (assq mac-system-script-code
+                             mac-script-code-coding-systems))
+                  'mac-roman)))
+    (if (eq system-type 'darwin)
+        base
+      (coding-system-change-eol-conversion base 'mac)))
+  "Coding system derived from the system script code.")
+
+(set-selection-coding-system mac-system-coding-system)
+
 (defun mac-drag-n-drop (event)
   "Edit the files listed in the drag-n-drop EVENT.
 Switch to a buffer editing the last file dropped."
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index ad4744adf15..5d1efeb6902 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -2383,7 +2383,7 @@ between words."
   "Get the right face for match N in font-lock matching of healdines."
   (setq org-l (- (match-end 2) (match-beginning 1)))
   (if org-odd-levels-only (setq org-l (1+ (/ org-l 2))))
-  (setq org-f (nth (1- (% org-l org-n-levels)) org-level-faces))
+  (setq org-f (nth (% (1- org-l) org-n-levels) org-level-faces))
   (cond
    ((eq n 1) (if org-hide-leading-stars 'org-hide org-f))
    ((eq n 2) org-f)
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 60a279356b8..7d9e289e8e5 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,14 @@
+2006-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-handlers.el (url-handler-directory-file-name): New handler.
+        (url-file-local-copy): Plug race condition security hole.
+
+2006-03-27  Romain Francoise  <romain@orebokech.com>
+
+        * url-irc.el (url-irc-rcirc, url-irc-erc): New functions.
+        (url-irc-function): Add rcirc and ERC to the list of IRC clients.
+        Default to rcirc, since ZenIRC isn't part of Emacs.
+
 2006-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * url-http.el (url-http-find-free-connection): Fix braino in last fix.
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 0338eefd268..00fc415659e 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -151,6 +151,8 @@ the arguments that would have been passed to OPERATION."
 (put 'substitute-in-file-name 'url-file-handlers 'url-file-handler-identity)
 (put 'file-name-absolute-p 'url-file-handlers (lambda (&rest ignored) t))
 (put 'expand-file-name 'url-file-handlers 'url-handler-expand-file-name)
+(put 'directory-file-name 'url-file-handlers 'url-handler-directory-file-name)
+;; (put 'file-name-as-directory 'url-file-handlers 'url-handler-file-name-as-directory)
 
 ;; These are operations that we do not support yet (DAV!!!)
 (put 'file-writable-p 'url-file-handlers 'ignore)
@@ -160,10 +162,27 @@ the arguments that would have been passed to OPERATION."
 (put 'vc-registered 'url-file-handlers 'ignore)
 
 (defun url-handler-expand-file-name (file &optional base)
+  ;; When we see "/foo/bar" in a file whose working dir is "http://bla/bla",
+  ;; there are two interpretations possible: either it's a local "/foo/bar"
+  ;; or it's "http:/bla/foo/bar".  When working with URLs, the second
+  ;; interpretation is the right one, but when working with Emacs file
+  ;; names, the first is preferred.
   (if (file-name-absolute-p file)
       (expand-file-name file "/")
     (url-expand-file-name file base)))
 
+;; directory-file-name and file-name-as-directory are kind of hard to
+;; implement really right for URLs since URLs can have repeated / chars.
+;; We'd want the following behavior:
+;; idempotence: (d-f-n (d-f-n X) == (d-f-n X)
+;; idempotence: (f-n-a-d (f-n-a-d X) == (f-n-a-d X)
+;; reversible:  (d-f-n (f-n-a-d (d-f-n X))) == (d-f-n X)
+;; reversible:  (f-n-a-d (d-f-n (f-n-a-d X))) == (f-n-a-d X)
+(defun url-handler-directory-file-name (dir)
+  ;; When there's more than a single /, just don't touch the slashes at all.
+  (if (string-match "//\\'" dir) dir
+    (url-run-real-handler 'directory-file-name (list dir))))
+
 ;; The actual implementation
 ;;;###autoload
 (defun url-copy-file (url newname &optional ok-if-already-exists keep-time)
@@ -193,7 +212,7 @@ A prefix arg makes KEEP-TIME non-nil."
   "Copy URL into a temporary file on this machine.
 Returns the name of the local copy, or nil, if FILE is directly
 accessible."
-  (let ((filename (make-temp-name "url")))
+  (let ((filename (make-temp-file "url")))
     (url-copy-file url filename)
     filename))
 
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index a876657d393..6a7a62573e9 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -33,15 +33,17 @@
 
 (defconst url-irc-default-port 6667 "Default port for IRC connections")
 
-(defcustom url-irc-function 'url-irc-zenirc
+(defcustom url-irc-function 'url-irc-rcirc
   "*Function to actually open an IRC connection.
-Should be a function that takes several argument:
+Should be a function that takes several arguments:
     HOST - the hostname of the IRC server to contact
     PORT - the port number of the IRC server to contact
  CHANNEL - What channel on the server to visit right away (can be nil)
     USER - What username to use
 PASSWORD - What password to use"
-  :type '(choice (const :tag "ZEN IRC" :value 'url-irc-zenirc)
+  :type '(choice (const :tag "rcirc" :value url-irc-rcirc)
+                 (const :tag "ERC" :value url-irc-erc)
+                 (const :tag "ZEN IRC" :value url-irc-zenirc)
                  (function :tag "Other"))
   :group 'url)
 
@@ -59,6 +61,17 @@ PASSWORD - What password to use"
       (insert "/join " channel)
       (zenirc-send-line))))
 
+(defun url-irc-rcirc (host port channel user password)
+  (let ((chan (when channel (concat "#" channel))))
+    (rcirc-connect host port user nil nil (when chan (list chan)))
+    (when chan
+      (switch-to-buffer (concat chan "@" host)))))
+
+(defun url-irc-erc (host port channel user password)
+  (erc-select :server host :port port :nick user :password password)
+  (when channel
+    (erc-join-channel channel)))
+
 ;;;###autoload
 (defun url-irc (url)
   (let* ((host (url-host url))
@@ -74,7 +87,7 @@ PASSWORD - What password to use"
         (setq chan nil))
     (funcall url-irc-function host port chan user pass)
     nil))
-    
+
 (provide 'url-irc)
 
 ;;; arch-tag: 2e5eecf8-9eb3-436b-9fbd-c26f2fb2bf3e
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 8438af1698a..2a398b3b52c 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-28  Kim F. Storm  <storm@cua.dk>
+
+        * processes.texi (Accepting Output): Remove obsolete (and incorrect)
+        remarks about systems that don't support fractional seconds.
+
+2006-03-25  Karl Berry  <karl@gnu.org>
+
+        * elisp.texi: use @copyright{} instead of (C), and do not indent
+        the year list.
+
 2006-03-21  Nick Roberts  <nickrob@snap.net.nz>
 
         * display.texi (Fringe Indicators): Fix typos.
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index cae26f360a4..9d99236b629 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -11,7 +11,7 @@
 
 @dircategory Emacs
 @direntry
-* Elisp: (elisp).       The Emacs Lisp Reference Manual.
+* Elisp: (elisp).       The Emacs Lisp Reference Manual.
 @end direntry
 
 @smallbook
@@ -30,8 +30,9 @@
 This is edition @value{VERSION} of the GNU Emacs Lisp
 Reference Manual, corresponding to Emacs version @value{EMACSVER}.
 
-Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
-  2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
+1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/lispref/processes.texi b/lispref/processes.texi
index 4cbc4b72e33..5f0cfb0edf0 100644
--- a/lispref/processes.texi
+++ b/lispref/processes.texi
@@ -1309,12 +1309,6 @@ subprocess output.
 
 The argument @var{seconds} need not be an integer.  If it is a floating
 point number, this function waits for a fractional number of seconds.
-Some systems support only a whole number of seconds; on these systems,
-@var{seconds} is rounded down.
-
-Not all operating systems support waiting periods other than multiples
-of a second; on those that do not, you get an error if you specify
-nonzero @var{millisec}.
 
 @c Emacs 22.1 feature
 If @var{process} is a process, and the argument @var{just-this-one} is
diff --git a/man/ChangeLog b/man/ChangeLog
index 3628ec610c3..e192728c43c 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,51 @@
+2006-03-29  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Top): Add comment about version line.
+
+        * message.texi (Top): Ditto.  Change to take named versions into
+        account.
+
+2006-03-28  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Posting Styles): Add x-face-file to example.
+        (X-Face): Refer to posting styles.
+
+        * gnus-faq.texi ([5.8]): Add x-face-file.
+        ([8.4]): Add links to gmane.emacs.gnus.user and
+        gmane.emacs.gnus.general.
+
+2006-03-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.texi (File Name Cache): Make it clear that the cache is
+        not persistent.
+
+2006-03-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-faq.texi: Use .invalid.
+        ([5.4]): Fix gnus-posting-styles example.
+
+2006-03-27  Romain Francoise  <romain@orebokech.com>
+
+        * faq.texi (Emacs/W3): Rename from `w3-mode'.  Mention that
+        Emacs/W3 needs a new maintainer.
+        (Ispell): Update author and version info.
+        (Mailcrypt): Mention PGG.
+        (New in Emacs 22): Add PGG to the list of new packages.
+        Include minor changes from "Ramprasad B" <ramprasad_i82@yahoo.com>
+        updating dead URLs.
+
+2006-03-25  Karl Berry  <karl@gnu.org>
+
+        * ada-mode.texi, autotype.texi, calc.texi, cc-mode.texi, cl.texi,
+        dired-x.texi, ebrowse.texi, ediff.texi, emacs-mime.texi,
+        emacs-xtra.texi, emacs.texi, erc.texi, eshell.texi, eudc.texi,
+        faq.texi, forms.texi, gnu.texi, gnus.texi, idlwave.texi,
+        info.texi, message.texi, mh-e.texi, pcl-cvs.texi, pgg.texi,
+        rcirc.texi, reftex.texi, sc.texi, ses.texi, sieve.texi,
+        speedbar.texi, url.texi, vip.texi, viper.texi, widget.texi,
+        woman.texi: (1) use @copyright{} instead of (C) in typeset text;
+        (2) do not indent copyright year list (or anything else).
+
 2006-03-21  Bill Wohler  <wohler@newt.com>
 
         * mh-e.texi (Folders): Various edits.
diff --git a/man/ada-mode.texi b/man/ada-mode.texi
index 73896132886..16cb2d11b6e 100644
--- a/man/ada-mode.texi
+++ b/man/ada-mode.texi
@@ -9,7 +9,7 @@
 
 @copying
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/autotype.texi b/man/autotype.texi
index ad29f4295ee..9d707e33243 100644
--- a/man/autotype.texi
+++ b/man/autotype.texi
@@ -13,7 +13,7 @@
 
 @copying
 Copyright @copyright{} 1994, 1995, 1999, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/calc.texi b/man/calc.texi
index 02a542ca761..ea51a896e23 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -83,8 +83,8 @@
 @copying
 This file documents Calc, the GNU Emacs calculator.
 
-Copyright (C) 1990, 1991, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1990, 1991, 2001, 2002, 2003, 2004,
+2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -102,7 +102,7 @@ Software Foundation raise funds for GNU development.''
 
 @dircategory Emacs
 @direntry
-* Calc: (calc).         Advanced desk calculator and mathematical tool.
+* Calc: (calc).         Advanced desk calculator and mathematical tool.
 @end direntry
 
 @titlepage
diff --git a/man/cc-mode.texi b/man/cc-mode.texi
index d541e306ae4..83ed16459aa 100644
--- a/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@ -160,7 +160,7 @@ CC Mode
 This manual is for CC Mode in Emacs.
 
 Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/cl.texi b/man/cl.texi
index c6c0a329cde..051aa18e02c 100644
--- a/man/cl.texi
+++ b/man/cl.texi
@@ -5,7 +5,8 @@
 @copying
 This file documents the GNU Emacs Common Lisp emulation package.
 
-Copyright (C) 1993, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1993, 2002, 2003, 2004, 2005, 2006 Free
+Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/dired-x.texi b/man/dired-x.texi
index 184d25b363a..54069716797 100644
--- a/man/dired-x.texi
+++ b/man/dired-x.texi
@@ -29,7 +29,7 @@ This documents the ``extra'' features for Dired Mode for GNU Emacs found in
 the file @file{dired-x.el}.
 
 Copyright @copyright{} 1993, 1994, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to make and distribute verbatim copies of this
diff --git a/man/ebrowse.texi b/man/ebrowse.texi
index db58c819922..0ffb7173e64 100644
--- a/man/ebrowse.texi
+++ b/man/ebrowse.texi
@@ -11,7 +11,7 @@
 This file documents Ebrowse, a C++ class browser for GNU Emacs.
 
 Copyright @copyright{} 2000, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/ediff.texi b/man/ediff.texi
index 01e79c821d0..3179447fd9a 100644
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -26,7 +26,7 @@ This file documents Ediff, a comprehensive visual interface to Unix diff
 and patch utilities.
 
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/emacs-mime.texi b/man/emacs-mime.texi
index 1049f95b0fd..aec55bd9a01 100644
--- a/man/emacs-mime.texi
+++ b/man/emacs-mime.texi
@@ -9,8 +9,8 @@
 @copying
 This file documents the Emacs MIME interface functionality.
 
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-          Free Software Foundation, Inc.
+Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/emacs-xtra.texi b/man/emacs-xtra.texi
index 34fa1ca70f2..4aff9716f75 100644
--- a/man/emacs-xtra.texi
+++ b/man/emacs-xtra.texi
@@ -10,7 +10,7 @@
 @copying
 This manual describes specialized features of Emacs.
 
-Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/emacs.texi b/man/emacs.texi
index 2c81305083d..60cc975d6ba 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -11,8 +11,9 @@
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
 updated for Emacs version @value{EMACSVER}.
 
-Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997,
+1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/erc.texi b/man/erc.texi
index 4713afa2fbc..b1bea814168 100644
--- a/man/erc.texi
+++ b/man/erc.texi
@@ -6,7 +6,7 @@
 
 @dircategory Emacs
 @direntry
-* ERC: (erc).  Powerful, modular, and extensible IRC client for Emacs.
+* ERC: (erc).           Powerful, modular, and extensible IRC client for Emacs.
 @end direntry
 
 @syncodeindex fn cp
diff --git a/man/eshell.texi b/man/eshell.texi
index e0a59774b42..51f3fb8ae7a 100644
--- a/man/eshell.texi
+++ b/man/eshell.texi
@@ -9,7 +9,7 @@
 This manual is for Eshell, the Emacs shell.
 
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/eudc.texi b/man/eudc.texi
index f402cc31d38..3a1f93dec7c 100644
--- a/man/eudc.texi
+++ b/man/eudc.texi
@@ -12,8 +12,8 @@ EUDC is the Emacs Unified Directory Client, a common interface to
 directory servers using various protocols such as LDAP or the CCSO white
 pages directory system (PH/QI)
 
-Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/faq.texi b/man/faq.texi
index 0c4838d9019..a2ec12f6408 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -14,7 +14,8 @@
 @c appreciate a notice if you do).
 
 @copying
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006 Free
+Software Foundation, Inc.@*
 Copyright 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner@*
 Copyright 1992,1993 Steven Byrnes@*
 Copyright 1990,1991,1992 Joseph Brian Wells@*
@@ -310,7 +311,7 @@ consortium of computer vendors which develops commercial software for
 Unix systems.
 
 The word ``free'' in the title of the Free Software Foundation refers to
-``freedom,'' not ``zero dollars.''  Anyone can charge any price for
+``freedom,'' not ``zero cost.''  Anyone can charge any price for
 GPL-covered software that they want to.  However, in practice, the
 freedom enforced by the GPL leads to low prices, because you can always
 get the software for less money from someone else, since everyone has
@@ -1165,7 +1166,7 @@ operation on X.  Mouse wheel support is now enabled by default.
 @cindex New modes
 Many new modes and packages have been included in Emacs, such as Leim,
 Calc, Tramp and URL, as well as IDO, CUA, rcirc, ERC, conf-mode,
-python-mode, table, tumme, SES, ruler, Flymake, Org, etc.
+python-mode, table, tumme, SES, ruler, Flymake, Org, PGG, etc.
 
 @cindex Documentation
 @cindex Emacs Lisp Manual
@@ -3489,7 +3490,7 @@ For a long time, the Emacs Lisp Archive provided a central repository
 for Emacs packages.  Sadly, it has not been active for some time,
 although you can still access the old files at
 
-@uref{ftp://ftp.cis.ohio-state.edu/pub/emacs-lisp/WWW/index.html}
+@uref{http://www.club.cc.cmu.edu/pub/gnu/elisp-archive/}
 
 Read the file @file{etc/MORE.STUFF} for more information about
 external packages.
@@ -3637,7 +3638,8 @@ lack certain features, such as the Emacs Lisp extension language.
 @cindex Windows 9X, ME, NT, 2K, and CE, Emacs for
 
 For information on Emacs for Windows 95 and NT, read the FAQ produced by
-@email{voelker@@cs.washington.edu, Geoff Voelker}, available at
+@email{voelker@@cs.washington.edu, Geoff Voelker} and currently maintained
+by @email{ramprasad_i82@@yahoo.com, Ramprasad B}, available at
 
 @uref{http://www.gnu.org/software/emacs/windows/ntemacs.html}
 
@@ -3658,17 +3660,17 @@ You will need MSVC 6.0 and a Windows CE SDK to build this port.
 
 Emacs 20.6 is ported for emx on OS/2 2.0 or 2.1, and is available at
 
-@uref{ftp://hobbes.nmsu.edu/pub/os2/apps/editors/emacs/e206*.zip}
+@uref{ftp://hobbes.nmsu.edu/pub/os2/apps/editors/emacs/}
 
 @noindent
 and also at
 
-@uref{http://archiv.leo.org/pub/comp/os/os2/leo/gnu/emacs%2d20/}
+@uref{http://www.dotemacs.de/os2/emacs.html}
 
 Instructions for installation, basic setup, and other useful information
 for OS/2 users of Emacs can be found at
 
-@uref{http://userpage.fu-berlin.de/~oheiabbd/emacs/emacs206-os2.html}
+@uref{http://home.snafu.de/ohei/emacs/emacs206-os2.html}
 
 @node Emacs for Atari ST, Emacs for the Amiga , Emacs for OS/2, Finding Emacs and related packages
 @section Where can I get Emacs for my Atari ST?
@@ -3699,7 +3701,7 @@ beta version of Emacs 19.25 for the Amiga.  You can get the binary at
 Emacs.app is a NeXTSTEP version of Emacs 19.34 which supports colors,
 menus, and multiple frames.  You can get it from
 
-@uref{ftp://next-ftp.peak.org/pub/next/apps/emacs/Emacs_for_NeXTstep.4.20a1.NIHS.b.tar.gz}
+@uref{ftp://next-ftp.peak.org/pub/next-ftp/next/apps/emacs/Emacs_for_NeXTstep.4.20a1.NIHS.b.tar.gz}
 
 @node Emacs for Apple computers, Emacs for VMS and DECwindows, Emacs for NeXTSTEP, Finding Emacs and related packages
 @section Where can I get Emacs for my Apple computer?
@@ -3718,7 +3720,7 @@ Beginning with version 22.1, Emacs supports Mac OS X natively.
 @cindex VMS, Emacs for
 
 Up-to-date information about GNU software (including Emacs) for VMS is
-available at @uref{http://vms.gnu.org/}.
+available at @uref{http://www.lp.se/gnu-vms/}.
 
 @node Modes for various languages,  , Emacs for VMS and DECwindows, Finding Emacs and related packages
 @section Where can I get modes for Lex, Yacc/Bison, Bourne shell, csh, C@t{++}, Objective-C, Pascal, Java, and Awk?
@@ -3758,7 +3760,7 @@ Java code.  It is distributed with Emacs, but has
 * AUCTeX::
 * BBDB::
 * Ispell::
-* w3-mode::
+* Emacs/W3::
 * EDB::
 * Mailcrypt::
 * JDE::
@@ -3874,7 +3876,7 @@ better than the one distributed with Emacs:
 4.3
 
 @item Distribution
-@uref{ftp://archive.cis.ohio-state.edu/pub/emacs-lisp/old-archive/modes/vip-mode.tar.Z}
+@uref{ftp://www.club.cc.cmu.edu/pub/gnu/elisp-archive/modes/vip-mode.tar.Z}
 
 @end table
 
@@ -3946,7 +3948,7 @@ Release announcements: @email{bbdb-announce-request@@lists.sourceforge.net}
 
 @end table
 
-@node Ispell, w3-mode, BBDB, Major packages and programs
+@node Ispell, Emacs/W3, BBDB, Major packages and programs
 @section Ispell --- spell checker in C with interface for Emacs
 @cindex Spell-checker
 @cindex Checking spelling
@@ -3955,33 +3957,24 @@ Release announcements: @email{bbdb-announce-request@@lists.sourceforge.net}
 @table @b
 
 @item Author
-@email{geoff@@itcorp.com, Geoff Kuenning}
+@email{geoff@@cs.hmc.edu, Geoff Kuenning}
 
 @item Latest version
-3.1.20
+3.3.02
 
 @item Distribution
-@uref{ftp://ftp.cs.ucla.edu/pub/ispell/ispell-3.1.20.tar.gz}@*
+@uref{http://fmg-www.cs.ucla.edu/geoff/tars/ispell-3.3.02.tar.gz}@*
 
 @item Web site
 @uref{http://fmg-www.cs.ucla.edu/geoff/ispell.html}
 
 @end table
 
-@itemize @bullet
-
-@item
-Do not ask Geoff to send you the latest version of Ispell. He does not
-have free e-mail.
-
-@item
 This Ispell program is distinct from GNU Ispell 4.0. GNU Ispell 4.0 is
 no longer a supported product.
 
-@end itemize
-
-@node w3-mode, EDB, Ispell, Major packages and programs
-@section w3-mode --- A World Wide Web browser inside of Emacs
+@node Emacs/W3, EDB, Ispell, Major packages and programs
+@section Emacs/W3 --- A World Wide Web browser inside of Emacs
 @cindex WWW browser
 @cindex Web browser
 @cindex HTML browser in Emacs
@@ -3990,22 +3983,26 @@ no longer a supported product.
 @table @b
 
 @item Author
-@email{wmperry@@spry.com, Bill Perry}
+@email{wmperry@@gnu.org, Bill Perry}
+
+@item Maintainer
+Emacs/W3 needs a maintainer. It has lain dormant for several years. If
+you would like to take over the project, please contact
+@email{maintainers@@gnu.org}.
 
 @item Latest version
-4.0pre.39
+4.0pre.47
 
 @item Distribution
-@uref{ftp://ftp.cs.indiana.edu/pub/elisp/w3/w3.tar.gz}
+@uref{http://savannah.gnu.org/projects/w3}
 
 @item Mailing lists
-Receive announcements from @email{w3-announce-request@@indiana.edu}@*
-Become a beta tester at @email{w3-beta-request@@indiana.edu}@*
-Help to develop @code{w3-mode} at @email{w3-dev@@indiana.edu}
+Receive announcements from @email{w3-announce@@gnu.org}@*
+Help to develop Emacs/W3 at @email{w3-dev@@gnu.org}
 
 @end table
 
-@node EDB, Mailcrypt, w3-mode, Major packages and programs
+@node EDB, Mailcrypt, Emacs/W3, Major packages and programs
 @section EDB --- Database program for Emacs; replaces forms editing modes
 @cindex EDB
 @cindex Database
@@ -4052,6 +4049,11 @@ Help to develop @code{w3-mode} at @email{w3-dev@@indiana.edu}
 
 @end table
 
+Note that a new package called PGG is bundled with Emacs starting with
+version 22.1.  It is a modern interface to various PGP implementations,
+including @uref{http://www.gnupg.org/, The GNU Privacy Guard} and
+supports symmetric encryption.
+
 @node JDE, Patch, Mailcrypt, Major packages and programs
 @section JDE --- Integrated development environment for Java
 @cindex Java development environment
@@ -4063,14 +4065,15 @@ Help to develop @code{w3-mode} at @email{w3-dev@@indiana.edu}
 @item Author
 @email{paulk@@mathworks.com, Paul Kinnucan}
 
-@item Mailing list
-jde-subscribe@@sunsite.auc.dk
-
 @item Latest version
-2.1.1
+2.3.5
 
 @item Web site
-@uref{http://sunsite.auc.dk/jde/}
+@uref{http://jdee.sunsite.dk/}
+
+@item Mailing lists
+Subscription requests to @email{jde-subscribe@@sunsite.dk}@*
+Receive announcements from @email{jde-announce-subscribe@@sunsite.dk}
 
 @end table
 
diff --git a/man/files.texi b/man/files.texi
index fa65ef32068..8ed89ac75e1 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -3417,9 +3417,9 @@ file by name, without having to remember exactly where it is located.
 When typing a file name in the minibuffer, @kbd{C-@key{tab}}
 (@code{file-cache-minibuffer-complete}) completes it using the file
 name cache.  If you repeat @kbd{C-@key{tab}}, that cycles through the
-possible completions of what you had originally typed.  Note that the
-@kbd{C-@key{tab}} character cannot be typed on most text-only
-terminals.
+possible completions of what you had originally typed.  (However, note
+that the @kbd{C-@key{tab}} character cannot be typed on most text-only
+terminals.)
 
   The file name cache does not fill up automatically.  Instead, you
 load file names into the cache using these commands:
@@ -3444,6 +3444,10 @@ of directory names.
 Clear the cache; that is, remove all file names from it.
 @end table
 
+  The file name cache is not persistent: it is kept and maintained
+only for the duration of the Emacs session.  You can view the contents
+of the cache with the @code{file-cache-display} command.
+
 @node File Conveniences
 @section Convenience Features for Finding Files
 
diff --git a/man/forms.texi b/man/forms.texi
index efd9368fdb0..561d77c8121 100644
--- a/man/forms.texi
+++ b/man/forms.texi
@@ -18,8 +18,8 @@
 @copying
 This file documents Forms mode, a form-editing major mode for GNU Emacs.
 
-Copyright (C) 1989, 1997, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1997, 2001, 2002, 2003, 2004,
+2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/gnu.texi b/man/gnu.texi
index 758814979d1..c2652d09a7b 100644
--- a/man/gnu.texi
+++ b/man/gnu.texi
@@ -6,8 +6,8 @@
 @unnumbered The GNU Manifesto
 @end ifclear
 @ifset justgnu
-Copyright (C) 1985, 1993, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+Copyright @copyright{} 1985, 1993, 2001, 2002, 2003, 2004,
+2005 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.2 or
diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi
index 742227b64fc..7fa00c37403 100644
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -52,7 +52,7 @@ a subscriber, your submissions will automatically pass.  You can
 also subscribe to the list by sending a blank email to
 @email{faq-discuss-subscribe@@my.gnus.org, faq-discuss-subscribe@@my.gnus.org}
 and @uref{http://mail1.kens.com/cgi-bin/ezmlm-browse?command=monthbythread%26list=faq-discuss, browse
-the archive}.
+the archive (BROKEN)}.
 
 @node FAQ - Changes
 @subheading Changes
@@ -233,10 +233,10 @@ Which version of Emacs do I need?
 
 @subsubheading Answer
 
-Gnus 5.10 requires an Emacs version that is greater
-than or equal to Emacs 20.7 or XEmacs 21.1. The
-development versions of Gnus (aka No Gnus) require Emacs
-21 or XEmacs 21.4.
+Gnus 5.10 requires an Emacs version that is greater than or equal
+to Emacs 20.7 or XEmacs 21.1.
+The development versions of Gnus (aka No Gnus) requires Emacs 21
+or XEmacs 21.4.
 
 @node [1.7]
 @subsubheading Question 1.7
@@ -1197,26 +1197,26 @@ from using them):
 @example
 (setq nnmail-split-methods
   '(("duplicates" "^Gnus-Warning:.*duplicate")
-    ("XEmacs-NT" "^\\(To:\\|CC:\\).*localpart@@xemacs.bla.*")
-    ("Gnus-Tut" "^\\(To:\\|CC:\\).*localpart@@socha.bla.*")
-    ("tcsh" "^\\(To:\\|CC:\\).*localpart@@mx.gw.bla.*")
-    ("BAfH" "^\\(To:\\|CC:\\).*localpart@@.*uni-muenchen.bla.*")
+    ("XEmacs-NT" "^\\(To:\\|CC:\\).*localpart@@xemacs.invalid.*")
+    ("Gnus-Tut" "^\\(To:\\|CC:\\).*localpart@@socha.invalid.*")
+    ("tcsh" "^\\(To:\\|CC:\\).*localpart@@mx.gw.invalid.*")
+    ("BAfH" "^\\(To:\\|CC:\\).*localpart@@.*uni-muenchen.invalid.*")
     ("Hamster-src" "^\\(CC:\\|To:\\).*hamster-sourcen@@yahoogroups.\\(de\\|com\\).*")
-    ("Tagesschau" "^From: tagesschau <localpart@@www.tagesschau.bla>$")
-    ("Replies" "^\\(CC:\\|To:\\).*localpart@@Frank-Schmitt.bla.*")
-    ("EK" "^From:.*\\(localpart@@privateprovider.bla\\|localpart@@workplace.bla\\).*")
+    ("Tagesschau" "^From: tagesschau <localpart@@www.tagesschau.invalid>$")
+    ("Replies" "^\\(CC:\\|To:\\).*localpart@@Frank-Schmitt.invalid.*")
+    ("EK" "^From:.*\\(localpart@@privateprovider.invalid\\|localpart@@workplace.invalid\\).*")
     ("Spam" "^Content-Type:.*\\(ks_c_5601-1987\\|EUC-KR\\|big5\\|iso-2022-jp\\).*")
     ("Spam" "^Subject:.*\\(This really work\\|XINGA\\|ADV:\\|XXX\\|adult\\|sex\\).*")
     ("Spam" "^Subject:.*\\(\=\?ks_c_5601-1987\?\\|\=\?euc-kr\?\\|\=\?big5\?\\).*")
     ("Spam" "^X-Mailer:\\(.*BulkMailer.*\\|.*MIME::Lite.*\\|\\)")
     ("Spam" "^X-Mailer:\\(.*CyberCreek Avalanche\\|.*http\:\/\/GetResponse\.com\\)")
     ("Spam" "^From:.*\\(verizon\.net\\|prontomail\.com\\|money\\|ConsumerDirect\\).*")
-    ("Spam" "^Delivered-To: GMX delivery to spamtrap@@gmx.bla$")
+    ("Spam" "^Delivered-To: GMX delivery to spamtrap@@gmx.invalid$")
     ("Spam" "^Received: from link2buy.com")
-    ("Spam" "^CC: .*azzrael@@t-online.bla")
+    ("Spam" "^CC: .*azzrael@@t-online.invalid")
     ("Spam" "^X-Mailer-Version: 1.50 BETA")
-    ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.bla.*")
-    ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.bla\\|adress@@two.bla\\)")
+    ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.invalid.*")
+    ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|adress@@two.invalid\\)")
     ("Spam" "")))
 @end example
 @noindent
@@ -1314,7 +1314,7 @@ This example should make the syntax clear:
 (setq gnus-posting-styles
   '((".*"
      (name "Frank Schmitt")
-     (address "me@@there.bla")
+     (address "me@@there.invalid")
      (organization "Hamme net, kren mer och nimmi")
      (signature-file "~/.signature")
      ("X-SampleHeader" "foobar")
@@ -1366,21 +1366,21 @@ at the bottom.
 
 @example
 (setq gnus-posting-styles
-  '((".*"  ;;default
-     (name "Frank Schmitt")
-     (organization "Hamme net, kren mer och nimmi")
-     (signature-file "~/.signature")    )
-    ((message-news-p)  ;;Usenet news?
-     (address "mySpamTrap@@Frank-Schmitt.bla")
-     ("Reply-To" "hereRealRepliesOnlyPlease@@Frank-Schmitt.bla")    )
-    ((message-mail-p)  ;;mail?
-     (address "usedForMails@@Frank-Schmitt.bla")    )
-    ("^gmane" ;;this is mail, too in fact
-     (address "usedForMails@@Frank-Schmitt.net")
-     ("Reply-To" nil)    )
-    ("^gmane.mail.spam.spamassassin.general$"
-     (eval (setq mail-envelope-from "Azzrael@@rz-online.de"))
-     (address "Azzrael@@rz-online.de")) ))
+      '((".*" ;;default
+         (name "Frank Schmitt")
+         (organization "Hamme net, kren mer och nimmi")
+         (signature-file "~/.signature"))
+        ((message-news-p) ;;Usenet news?
+         (address "mySpamTrap@@Frank-Schmitt.invalid")
+         (reply-to "hereRealRepliesOnlyPlease@@Frank-Schmitt.invalid"))
+        ((message-mail-p) ;;mail?
+         (address "usedForMails@@Frank-Schmitt.invalid"))
+        ("^gmane" ;;this is mail, too in fact
+         (address "usedForMails@@Frank-Schmitt.invalid")
+         (reply-to nil))
+        ("^gmane\\.mail\\.spam\\.spamassassin\\.general$"
+         (eval (set (make-local-variable 'message-sendmail-envelope-from)
+                    "Azzrael@@rz-online.de")))))
 @end example
 @noindent
 
@@ -1464,7 +1464,7 @@ You can store your mail addresses in a ~/.mailrc file using a simple
 alias syntax:
 
 @example
-alias al        "Al <al@@english-heritage.bla>"
+alias al        "Al <al@@english-heritage.invalid>"
 @end example
 @noindent
 
@@ -1495,8 +1495,8 @@ place them in ~/.emacs:
 (setq bbdb-north-american-phone-numbers-p nil)
 ;;Tell bbdb about your email address:
 (setq bbdb-user-mail-names
-      (regexp-opt '("Your.Email@@here.bla"
-                    "Your.other@@mail.there.bla")))
+      (regexp-opt '("Your.Email@@here.invalid"
+                    "Your.other@@mail.there.invalid")))
 ;;cycling while completing email addresses
 (setq bbdb-complete-name-allow-cycling t)
 ;;No popup-buffers
@@ -1551,12 +1551,19 @@ Now you only have to tell Gnus to include the X-face in your postings by saying
 (setq message-default-headers
         (with-temp-buffer
           (insert "X-Face: ")
-          (insert-file-contents "~/.xemacs/xface")
+          (insert-file-contents "~/.xface")
           (buffer-string)))
 @end example
 @noindent
 
-in ~/.gnus.el.
+in ~/.gnus.el.  If you use Gnus 5.10, you can simply add an entry
+
+@example
+(x-face-file "~/.xface")
+@end example
+@noindent
+
+to gnus-posting-styles.
 
 @node [5.9]
 @subsubheading Question 5.9
@@ -2121,11 +2128,15 @@ Which mailing lists and newsgroups are there?
 
 @subsubheading Answer
 
-There's the newsgroup gnu.emacs.gnus (pull it from
-e.g. news.gnus.org) which deals with general questions and the
-ding mailing list (ding@@gnus.org) dealing with development of
+There's the newsgroup gnu.emacs.gnus
+(also available as
+@uref{http://dir.gmane.org/gmane.emacs.gnus.user, 
+gmane.emacs.gnus.user})
+which deals with general Gnus questions.
+The ding mailing list (ding@@gnus.org) deals with development of
 Gnus. You can read the ding list via NNTP, too under the name
-gmane.emacs.gnus.general from news.gmane.org.
+@uref{http://dir.gmane.org/gmane.emacs.gnus.general, 
+gmane.emacs.gnus.general} from news.gmane.org.
 
 If you want to stay in the big8,
 news.software.newssreaders is also read by some Gnus
diff --git a/man/gnus.texi b/man/gnus.texi
index 7aa367bb310..165f74ec499 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -7,8 +7,8 @@
 @syncodeindex pg cp
 
 @copying
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -49,6 +49,7 @@ license to the document, as described in section 6 of the license.
 \makeindex
 \begin{document}
 
+% Adjust ../Makefile.in if you change the following line:
 \newcommand{\gnusversionname}{Gnus v5.10.6}
 \newcommand{\gnuschaptername}{}
 \newcommand{\gnussectionname}{}
@@ -358,6 +359,7 @@ can be gotten by any nefarious means you can think of---@acronym{NNTP}, local
 spool or your mbox file.  All at the same time, if you want to push your
 luck.
 
+@c Adjust ../Makefile.in if you change the following line:
 This manual corresponds to Gnus v5.10.6.
 
 @end ifinfo
@@ -11913,7 +11915,8 @@ So here's a new example:
       '((".*"
          (signature-file "~/.signature")
          (name "User Name")
-         ("X-Home-Page" (getenv "WWW_HOME"))
+         (x-face-file "~/.xface")
+         (x-url (getenv "WWW_HOME"))
          (organization "People's Front Against MWM"))
         ("^rec.humor"
          (signature my-funny-signature-randomizer))
@@ -22098,8 +22101,10 @@ foreground and background colors of the displayed X-Faces.  The
 default colors are black and white.
 @end table
 
-Gnus provides a few convenience functions and variables to allow
-easier insertion of X-Face headers in outgoing messages.
+If you use posting styles, you can use an @code{x-face-file} entry in
+@code{gnus-posting-styles}, @xref{Posting Styles}.  If you don't, Gnus
+provides a few convenience functions and variables to allow easier
+insertion of X-Face headers in outgoing messages.
 
 @findex gnus-random-x-face
 @vindex gnus-convert-pbm-to-x-face-command
diff --git a/man/idlwave.texi b/man/idlwave.texi
index 7e9e19bb1c8..7af15e58674 100644
--- a/man/idlwave.texi
+++ b/man/idlwave.texi
@@ -30,7 +30,7 @@ This is edition @value{EDITION} of the IDLWAVE User Manual for IDLWAVE
 @value{VERSION}
 
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 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.2 or
@@ -61,7 +61,7 @@ This is edition @value{EDITION} of the @cite{IDLWAVE User Manual} for
 IDLWAVE version @value{VERSION}, @value{DATE}.
 @sp 2
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 Free Software Foundation, Inc.
 @sp 2
 @cindex Copyright, of IDLWAVE
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/info.texi b/man/info.texi
index 76586e5db4e..f33038e0c30 100644
--- a/man/info.texi
+++ b/man/info.texi
@@ -14,8 +14,8 @@
 This file describes how to use Info, the on-line, menu-driven GNU
 documentation system.
 
-Copyright (C) 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/message.texi b/man/message.texi
index 2cb2de02a8b..a099748f1c4 100644
--- a/man/message.texi
+++ b/man/message.texi
@@ -8,8 +8,8 @@
 @copying
 This file documents Message, the Emacs message composition mode.
 
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -67,9 +67,10 @@ Message mode buffers.
 * Key Index::         List of Message mode keys.
 @end menu
 
-This manual corresponds to Message v5.10.6.  Message is distributed
-with the Gnus distribution bearing the same version number as this
-manual.
+@c Adjust ../Makefile.in if you change the following lines:
+Message is distributed with Gnus.  The Gnus distribution
+@c
+corresponding to this manual is Gnus v5.10.6.
 
 
 @node Interface
diff --git a/man/mh-e.texi b/man/mh-e.texi
index 180a093ceb8..ccebaaf7f67 100644
--- a/man/mh-e.texi
+++ b/man/mh-e.texi
@@ -24,8 +24,8 @@
 This is version @value{VERSION}@value{EDITION} of @cite{The MH-E
 Manual}, last updated @value{UPDATED}.
 
-Copyright @copyright{} 1995,
-  2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1995, 2001, 2002, 2003, 2005, 2006 Free
+Software Foundation, Inc.
 
 @quotation
 The MH-E manual is free documentation; you can redistribute it and/or
diff --git a/man/pcl-cvs.texi b/man/pcl-cvs.texi
index dcef68de976..b66585b4883 100644
--- a/man/pcl-cvs.texi
+++ b/man/pcl-cvs.texi
@@ -7,7 +7,7 @@
 
 @copying
 Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/pgg.texi b/man/pgg.texi
index 025420abd4d..80dce7a9639 100644
--- a/man/pgg.texi
+++ b/man/pgg.texi
@@ -6,10 +6,10 @@
 
 
 @copying
-This file describes the PGG.
+This file describes PGG, an Emacs interface to various PGP implementations.
 
-Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-Copyright (C) 2001 Daiki Ueno.
+Copyright @copyright{} 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2001 Daiki Ueno.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/rcirc.texi b/man/rcirc.texi
index 34ef26d8bf6..f904df441f6 100644
--- a/man/rcirc.texi
+++ b/man/rcirc.texi
@@ -5,7 +5,7 @@
 @c %**end of header
 
 @copying
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/reftex.texi b/man/reftex.texi
index a32a0aff543..0586c5851bd 100644
--- a/man/reftex.texi
+++ b/man/reftex.texi
@@ -25,7 +25,8 @@ citations and indices for LaTeX documents with Emacs.
 This is edition @value{EDITION} of the @b{Ref@TeX{}} User Manual for
 @b{Ref@TeX{}} @value{VERSION}
 
-Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+Copyright @copyright{} 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005
+Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/sc.texi b/man/sc.texi
index a26625b3392..185853e108c 100644
--- a/man/sc.texi
+++ b/man/sc.texi
@@ -16,7 +16,7 @@ attributing the replies for various GNU Emacs mail and news reading
 subsystems.
 
 Copyright @copyright{} 1993, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/ses.texi b/man/ses.texi
index c1d7737a09b..a2b70363abd 100644
--- a/man/ses.texi
+++ b/man/ses.texi
@@ -11,8 +11,8 @@
 @copying
 This file documents SES: the Simple Emacs Spreadsheet.
 
-Copyright @copyright{} 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2002, 2003, 2004, 2005, 2006 Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/sieve.texi b/man/sieve.texi
index 7f99cd2cd57..ecd476ee1cd 100644
--- a/man/sieve.texi
+++ b/man/sieve.texi
@@ -7,9 +7,10 @@
 @synindex pg cp
 
 @copying
-This file documents the Emacs Sieve package.
+This file documents the Emacs Sieve package, for server-side mail filtering.
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006 Free
+Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/speedbar.texi b/man/speedbar.texi
index 8a30751d479..73b9d3e9719 100644
--- a/man/speedbar.texi
+++ b/man/speedbar.texi
@@ -5,8 +5,8 @@
 @syncodeindex fn cp
 
 @copying
-Copyright @copyright{} 1999, 2000, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free
+Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/url.texi b/man/url.texi
index afbc96994c8..7bda54a577f 100644
--- a/man/url.texi
+++ b/man/url.texi
@@ -21,9 +21,9 @@
 @ifnottex
 This file documents the URL loading package.
 
-Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004,
-   2005, 2006 Free Software Foundation, Inc.
-Copyright (C) 1993, 1994, 1995, 1996  William M. Perry
+Copyright @copyright{} 1996, 1997, 1998, 1999, 2002, 2004,
+2005, 2006 Free Software Foundation, Inc.@*
+Copyright @copyright{} 1993, 1994, 1995, 1996  William M. Perry
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -52,7 +52,7 @@ License.''
 @vskip 0pt plus 1filll
 Copyright @copyright{} 1993, 1994, 1995, 1996 William M. Perry@*
 Copyright @copyright{} 1996, 1997, 1998, 1999, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 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.2 or
diff --git a/man/vip.texi b/man/vip.texi
index b76003b655d..c8d21c3c533 100644
--- a/man/vip.texi
+++ b/man/vip.texi
@@ -5,7 +5,7 @@
 
 @copying
 Copyright @copyright{} 1987, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/viper.texi b/man/viper.texi
index 46d62670345..7f67f0970fd 100644
--- a/man/viper.texi
+++ b/man/viper.texi
@@ -8,7 +8,7 @@
 
 @copying
 Copyright @copyright{} 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/widget.texi b/man/widget.texi
index 6ce78a9c3cd..8a49fd3dadd 100644
--- a/man/widget.texi
+++ b/man/widget.texi
@@ -11,7 +11,7 @@
 
 @copying
 Copyright @copyright{} 2000, 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
+2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/woman.texi b/man/woman.texi
index a1b6250ef37..70e7974b16f 100644
--- a/man/woman.texi
+++ b/man/woman.texi
@@ -3,7 +3,7 @@
 @setfilename ../info/woman
 @settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man''
 @c Manual last updated:
-@set UPDATED Time-stamp: <2006-02-05 23:30:17 ttn>
+@set UPDATED Time-stamp: <2006-03-25 14:59:03 karl>
 @c Software version:
 @set VERSION 0.54 (beta)
 @afourpaper
@@ -18,7 +18,7 @@ This file documents WoMan: A program to browse Unix manual pages `W.O.
 (without) man'.
 
 Copyright @copyright{} 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/src/.gdbinit b/src/.gdbinit
index 2dada424454..d40286f8679 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -58,8 +58,14 @@ define xgettype
 end
 
 # Set up something to print out s-expressions.
+# We save and restore print_output_debug_flag to prevent the w32 port
+# from calling OutputDebugString, which causes GDB to display each
+# character twice (yuk!).
 define pr
+  set $output_debug = print_output_debug_flag
+  set print_output_debug_flag = 0
   set debug_print ($)
+  set print_output_debug_flag = $output_debug
 end
 document pr
 Print the emacs s-expression which is $.
@@ -69,7 +75,10 @@ end
 # Print out s-expressions
 define pp
   set $tmp = $arg0
+  set $output_debug = print_output_debug_flag
+  set print_output_debug_flag = 0
   set safe_debug_print ($tmp)
+  set print_output_debug_flag = $output_debug
 end
 document pp
 Print the argument as an emacs s-expression
@@ -81,7 +90,10 @@ define pp1
   set $tmp = $arg0
   echo $arg0
   printf " = "
+  set $output_debug = print_output_debug_flag
+  set print_output_debug_flag = 0
   set safe_debug_print ($tmp)
+  set print_output_debug_flag = $output_debug
 end
 document pp1
 Print the argument as an emacs s-expression
@@ -94,7 +106,10 @@ end
 # Print value of lisp variable
 define pv
   set $tmp = "$arg0"
+  set $output_debug = print_output_debug_flag
+  set print_output_debug_flag = 0
   set safe_debug_print ( find_symbol_value (intern ($tmp)))
+  set print_output_debug_flag = $output_debug
 end
 document pv
 Print the value of the lisp variable given as argument.
@@ -106,7 +121,10 @@ define pv1
   set $tmp = "$arg0"
   echo $arg0
   printf " = "
+  set $output_debug = print_output_debug_flag
+  set print_output_debug_flag = 0
   set safe_debug_print (find_symbol_value (intern ($tmp)))
+  set print_output_debug_flag = $output_debug
 end
 document pv1
 Print the value of the lisp variable given as argument.
diff --git a/src/ChangeLog b/src/ChangeLog
index 867306579ab..ba816a9e2f0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,81 @@
+2006-03-31  Kenichi Handa  <handa@m17n.org>
+
+        * xfns.c (xg_set_icon): Delete superfluous UNGCPRO.
+
+2006-03-30  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * xdisp.c (syms_of_xdisp): Fix variable name.
+
+2006-03-30  Kenichi Handa  <handa@m17n.org>
+
+        * xterm.c (x_term_init): Delete superfluous UNGCPRO.
+
+2006-03-29  Juanma Barranquero  <lekktu@gmail.com>
+
+        * keyboard.c (process_tool_bar_item): Reorder dummy args.
+
+2006-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (tool_bar_items): Use map_keymap.
+        (process_tool_bar_item): Add dummy args to fit the required interface.
+
+2006-03-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * .gdbinit (pr, pp, pp1, pv, pv1): Force print_output_debug_flag
+        to zero before calling debug_print or safe_debug_print.
+
+        * print.c (print_output_debug_flag): New global variable.
+        (Fexternal_debugging_output) [WINDOWSNT]: Don't call
+        OutputDebugString if print_output_debug_flag is zero.
+
+2006-03-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * editfns.c (TM_YEAR_BASE): Move up, so the changes below can use it.
+        (Fdecode_time, Fencode_time): Use TM_YEAR_BASE instead of 1900.
+        (Fdecode_time): Cast tm_year to EMACS_INT.
+        (Fcurrent_time_string): Report an invalid time specification if
+        the argument is invalid.  Also, check for out-of-range time stamps.
+
+2006-03-24  Kim F. Storm  <storm@cua.dk>
+
+        * xterm.c (handle_one_xevent):
+        * w32term.c (w32_read_socket):
+        * macterm.c (XTread_socket): Don't let key-press clear mouse face
+        on in toolbar window if mouse-highlight is an integer.
+
+        * fns.c (sxhash_list): Include last non-nil CDR in hash.
+
+2006-03-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (enum mac_menu_kind): New enum.
+        (min_menu_id): New variable.
+        (POPUP_SUBMENU_ID, MIN_POPUP_SUBMENU_ID, MIN_MENU_ID)
+        (MIN_SUBMENU_ID): Remove defines.  All uses are replaced with
+        min_menu_id and enumerators in enum mac_menu_kind.
+        (fill_menu, dispose_menus, install_menu_quit_handler): New arg KIND.
+        All uses changed.  Add range check for menu ID.
+        (fill_menubar): Add range check for menu ID.
+        [HAVE_CANCELMENUTRACKING] (menu_quit_handler): Check error code of
+        GetEventParameter.
+        (set_frame_menubar, mac_menu_show): Call install_menu_quit_handler
+        for each menu kind.
+
+2006-03-22  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c: Undo 2006-03-21 change.
+
+        * term.c: Define aliases for append_glyph and produce_stretch_glyph
+        when `static' is defined to avoid name clash with those in xdisp.c.
+
+        * process.c (Faccept_process_output): Fix to comply with lisp reference.
+        Change arg "timeout" to "seconds" and allow both integer and float value.
+        Change arg "timeout-msec" to "millisec" and interpret" as milliseconds
+        rather than microseconds.  Fix doc string accordingly.
+
 2006-03-21  Ken Raeburn  <raeburn@raeburn.org>
 
-        * xdisp.c (store_next_glyph): Renamed from append_glyph.
-        (generate_stretch_glyph): Renamed from produce_stretch_glyph.
+        * xdisp.c (store_next_glyph): Rename from append_glyph.
+        (generate_stretch_glyph): Rename from produce_stretch_glyph.
         All callers changed accordingly.
 
 2006-03-21  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
@@ -842,8 +916,8 @@
 
         * editfns.c (Fconstrain_to_field): Fix behaviour on field boundaries.
         (find_field): Set before_field to after_field when pos is at BEGV.
-        (Fline_beginning_position, Fline_end_position): Clarify
-        confusing doc string.
+        (Fline_beginning_position, Fline_end_position):
+        Clarify confusing doc string.
 
         * cmds.c (Fbeginning_of_line, Fend_of_line): Clarify confusing doc
         string.
@@ -1772,7 +1846,7 @@
 2005-11-11  David Reitter  <david.reitter@gmail.com>
 
         * macterm.c (syms_of_macterm): Remove macCtrlKey, macShiftKey,
-        macMetaKey, macAltKey. Introduce Qctrl, Qmeta,
+        macMetaKey, macAltKey.  Introduce Qctrl, Qmeta,
         Vmac_control_modifier / mac-control-modifier,
         Vmac_option_modifier / mac-option-modifier,
         Vmac_command_modifier / mac-command-modifier.
diff --git a/src/editfns.c b/src/editfns.c
index b621397eda3..888bbe3062b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -72,6 +72,8 @@ Boston, MA 02110-1301, USA.  */
 extern char **environ;
 #endif
 
+#define TM_YEAR_BASE 1900
+
 extern size_t emacs_strftimeu P_ ((char *, size_t, const char *,
                                    const struct tm *, int));
 static int tm_diff P_ ((struct tm *, struct tm *));
@@ -721,7 +723,7 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil.  */)
   int orig_point = 0;
   int fwd;
   Lisp_Object prev_old, prev_new;
-  
+
   if (NILP (new_pos))
     /* Use the current point, and afterwards, set it.  */
     {
@@ -736,7 +738,7 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil.  */)
 
   prev_old = make_number (XFASTINT (old_pos) - 1);
   prev_new = make_number (XFASTINT (new_pos) - 1);
-  
+
   if (NILP (Vinhibit_field_text_motion)
       && !EQ (new_pos, old_pos)
       && (!NILP (Fget_char_property (new_pos, Qfield, Qnil))
@@ -1722,7 +1724,9 @@ DOW and ZONE.)  */)
   XSETFASTINT (list_args[2], decoded_time->tm_hour);
   XSETFASTINT (list_args[3], decoded_time->tm_mday);
   XSETFASTINT (list_args[4], decoded_time->tm_mon + 1);
-  XSETINT (list_args[5], decoded_time->tm_year + 1900);
+  /* On 64-bit machines an int is narrower than EMACS_INT, thus the
+     cast below avoids overflow in int arithmetics.  */
+  XSETINT (list_args[5], TM_YEAR_BASE + (EMACS_INT) decoded_time->tm_year);
   XSETFASTINT (list_args[6], decoded_time->tm_wday);
   list_args[7] = (decoded_time->tm_isdst)? Qt : Qnil;
 
@@ -1778,7 +1782,7 @@ usage: (encode-time SECOND MINUTE HOUR DAY MONTH YEAR &optional ZONE)  */)
   tm.tm_hour = XINT (args[2]);
   tm.tm_mday = XINT (args[3]);
   tm.tm_mon = XINT (args[4]) - 1;
-  tm.tm_year = XINT (args[5]) - 1900;
+  tm.tm_year = XINT (args[5]) - TM_YEAR_BASE;
   tm.tm_isdst = -1;
 
   if (CONSP (zone))
@@ -1844,11 +1848,25 @@ but this is considered obsolete.  */)
 {
   time_t value;
   char buf[30];
+  struct tm *tm;
   register char *tem;
 
   if (! lisp_time_argument (specified_time, &value, NULL))
-    value = -1;
-  tem = (char *) ctime (&value);
+    error ("Invalid time specification");
+  /* Do not use ctime, since it has undefined behavior with
+     out-of-range time stamps.  This avoids a core dump triggered by
+     (current-time-string '(2814749767106 0)) on 64-bit Solaris 8. See
+     <http://www.opengroup.org/austin/mailarchives/ag/msg09294.html>
+     for more details about this portability problem.  */
+  tm = localtime (&value);
+  /* Checking for out-of-range time stamps avoids buffer overruns that
+     cause core dump on some systems (e.g., 64-bit Solaris), and also
+     preserves the historic behavior of always returning a fixed-size
+     24-character string.  */
+  if (! (tm && -999 - TM_YEAR_BASE <= tm->tm_year
+         && tm->tm_year <= 9999 - TM_YEAR_BASE))
+    error ("Specified time is not representable");
+  tem = asctime (tm);
 
   strncpy (buf, tem, 24);
   buf[24] = 0;
@@ -1856,8 +1874,6 @@ but this is considered obsolete.  */)
   return build_string (buf);
 }
 
-#define TM_YEAR_BASE 1900
-
 /* Yield A - B, measured in seconds.
    This function is copied from the GNU C Library.  */
 static int
diff --git a/src/fns.c b/src/fns.c
index d16222e6fa5..0608fee2df6 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -5119,6 +5119,12 @@ sxhash_list (list, depth)
         hash = SXHASH_COMBINE (hash, hash2);
       }
 
+  if (!NILP (list))
+    {
+      unsigned hash2 = sxhash (list, depth + 1);
+      hash = SXHASH_COMBINE (hash, hash2);
+    }
+
   return hash;
 }
 
diff --git a/src/keyboard.c b/src/keyboard.c
index bcfc9449dae..dff14877103 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7763,7 +7763,7 @@ Lisp_Object QCimage;
 /* Function prototypes.  */
 
 static void init_tool_bar_items P_ ((Lisp_Object));
-static void process_tool_bar_item P_ ((Lisp_Object, Lisp_Object));
+static void process_tool_bar_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, void*));
 static int parse_tool_bar_item P_ ((Lisp_Object, Lisp_Object));
 static void append_tool_bar_item P_ ((void));
 
@@ -7841,17 +7841,7 @@ tool_bar_items (reuse, nitems)
 
         keymap = get_keymap (access_keymap (maps[i], Qtool_bar, 1, 0, 1), 0, 1);
         if (CONSP (keymap))
-          {
-            Lisp_Object tail;
-
-            /* KEYMAP is a list `(keymap (KEY . BINDING) ...)'.  */
-            for (tail = keymap; CONSP (tail); tail = XCDR (tail))
-              {
-                Lisp_Object keydef = XCAR (tail);
-                if (CONSP (keydef))
-                  process_tool_bar_item (XCAR (keydef), XCDR (keydef));
-              }
-          }
+          map_keymap (keymap, process_tool_bar_item, Qnil, NULL, 1);
       }
 
   Vinhibit_quit = oquit;
@@ -7863,8 +7853,9 @@ tool_bar_items (reuse, nitems)
 /* Process the definition of KEY which is DEF.  */
 
 static void
-process_tool_bar_item (key, def)
-     Lisp_Object key, def;
+process_tool_bar_item (key, def, data, args)
+     Lisp_Object key, def, data;
+     void *args;
 {
   int i;
   extern Lisp_Object Qundefined;
diff --git a/src/macmenu.c b/src/macmenu.c
index 8cce41114de..8610ecafd94 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -62,10 +62,17 @@ Boston, MA 02110-1301, USA.  */
 
 #include "dispextern.h"
 
-#define POPUP_SUBMENU_ID 235
-#define MIN_POPUP_SUBMENU_ID 512
-#define MIN_MENU_ID 256
-#define MIN_SUBMENU_ID 1
+enum mac_menu_kind {            /* Menu ID range  */
+  MAC_MENU_APPLE,               /* 0 (Reserved by Apple) */
+  MAC_MENU_MENU_BAR,            /* 1 .. 234       */
+  MAC_MENU_POPUP,               /* 235            */
+  MAC_MENU_DRIVER,              /* 236 .. 255 (Reserved) */
+  MAC_MENU_MENU_BAR_SUB,        /* 256 .. 16383   */
+  MAC_MENU_POPUP_SUB,           /* 16384 .. 32767 */
+  MAC_MENU_END                  /* 32768          */
+};
+
+static const min_menu_id[] = {0, 1, 235, 236, 256, 16384, 32768};
 
 #define DIALOG_WINDOW_RESOURCE 130
 
@@ -189,9 +196,9 @@ static void single_keymap_panes P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
 static void list_of_panes P_ ((Lisp_Object));
 static void list_of_items P_ ((Lisp_Object));
 
-static int fill_menu P_ ((MenuHandle, widget_value *, int));
+static int fill_menu P_ ((MenuHandle, widget_value *, enum mac_menu_kind, int));
 static void fill_menubar P_ ((widget_value *, int));
-static void dispose_menus P_ ((int));
+static void dispose_menus P_ ((enum mac_menu_kind, int));
 
 
 /* This holds a Lisp vector that holds the results of decoding
@@ -1387,19 +1394,21 @@ menu_quit_handler (nextHandler, theEvent, userData)
      EventRef theEvent;
      void* userData;
 {
+  OSStatus err;
   UInt32 keyCode;
   UInt32 keyModifiers;
   extern int mac_quit_char_modifiers;
   extern int mac_quit_char_keycode;
 
-  GetEventParameter (theEvent, kEventParamKeyCode,
-                     typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode);
+  err = GetEventParameter (theEvent, kEventParamKeyCode,
+                           typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode);
 
-  GetEventParameter (theEvent, kEventParamKeyModifiers,
-                     typeUInt32, NULL, sizeof(UInt32),
-                     NULL, &keyModifiers);
+  if (err == noErr)
+    err = GetEventParameter (theEvent, kEventParamKeyModifiers,
+                             typeUInt32, NULL, sizeof(UInt32),
+                             NULL, &keyModifiers);
 
-  if (keyCode == mac_quit_char_keycode
+  if (err == noErr && keyCode == mac_quit_char_keycode
       && keyModifiers == mac_quit_char_modifiers)
     {
       MenuRef menu = userData != 0
@@ -1414,35 +1423,29 @@ menu_quit_handler (nextHandler, theEvent, userData)
 }
 #endif /* HAVE_CANCELMENUTRACKING */
 
-/* Add event handler for MENU_HANDLE so we can detect C-g.
-   If MENU_HANDLE is NULL, install handler for all menus in the menu bar.
+/* Add event handler to all menus that belong to KIND so we can detect C-g.
+   MENU_HANDLE is the root menu of the tracking session to dismiss
+   when C-g is detected.  NULL means the menu bar.
    If CancelMenuTracking isn't available, do nothing.  */
 
 static void
-install_menu_quit_handler (MenuHandle menu_handle)
+install_menu_quit_handler (kind, menu_handle)
+     enum mac_menu_kind kind;
+     MenuHandle menu_handle;
 {
 #ifdef HAVE_CANCELMENUTRACKING
   EventTypeSpec typesList[] = { { kEventClassKeyboard, kEventRawKeyDown } };
-  int i = MIN_MENU_ID;
-  MenuHandle menu = menu_handle ? menu_handle : GetMenuHandle (i);
+  int id;
 
-  while (menu != NULL)
+  for (id = min_menu_id[kind]; id < min_menu_id[kind + 1]; id++)
     {
-      InstallMenuEventHandler (menu, menu_quit_handler,
-                               GetEventTypeCount (typesList),
-                               typesList, menu_handle, NULL);
-      if (menu_handle) break;
-      menu = GetMenuHandle (++i);
-    }
+      MenuHandle menu = GetMenuHandle (id);
 
-  i = menu_handle ? MIN_POPUP_SUBMENU_ID : MIN_SUBMENU_ID;
-  menu = GetMenuHandle (i);
-  while (menu != NULL)
-    {
+      if (menu == NULL)
+        break;
       InstallMenuEventHandler (menu, menu_quit_handler,
                                GetEventTypeCount (typesList),
                                typesList, menu_handle, NULL);
-      menu = GetMenuHandle (++i);
     }
 #endif /* HAVE_CANCELMENUTRACKING */
 }
@@ -1677,7 +1680,8 @@ set_frame_menubar (f, first_time, deep_p)
   fill_menubar (first_wv->contents, deep_p);
 
   /* Add event handler so we can detect C-g. */
-  install_menu_quit_handler (NULL);
+  install_menu_quit_handler (MAC_MENU_MENU_BAR, NULL);
+  install_menu_quit_handler (MAC_MENU_MENU_BAR_SUB, NULL);
   free_menubar_widget_value_tree (first_wv);
 
   UNBLOCK_INPUT;
@@ -1700,7 +1704,7 @@ pop_down_menu (arg)
 {
   struct Lisp_Save_Value *p = XSAVE_VALUE (arg);
   FRAME_PTR f = p->pointer;
-  MenuHandle menu = GetMenuHandle (POPUP_SUBMENU_ID);
+  MenuHandle menu = GetMenuHandle (min_menu_id[MAC_MENU_POPUP]);
 
   BLOCK_INPUT;
 
@@ -1709,8 +1713,8 @@ pop_down_menu (arg)
   FRAME_MAC_DISPLAY_INFO (f)->grabbed = 0;
 
   /* delete all menus */
-  dispose_menus (MIN_POPUP_SUBMENU_ID);
-  DeleteMenu (POPUP_SUBMENU_ID);
+  dispose_menus (MAC_MENU_POPUP_SUB, 0);
+  DeleteMenu (min_menu_id[MAC_MENU_POPUP]);
   DisposeMenu (menu);
 
   UNBLOCK_INPUT;
@@ -1944,9 +1948,10 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
     }
 
   /* Actually create the menu.  */
-  menu = NewMenu (POPUP_SUBMENU_ID, "\p");
+  menu = NewMenu (min_menu_id[MAC_MENU_POPUP], "\p");
   InsertMenu (menu, -1);
-  fill_menu (menu, first_wv->contents, MIN_POPUP_SUBMENU_ID);
+  fill_menu (menu, first_wv->contents, MAC_MENU_POPUP_SUB,
+             min_menu_id[MAC_MENU_POPUP_SUB]);
 
   /* Free the widget_value objects we used to specify the
      contents.  */
@@ -1966,7 +1971,8 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
   record_unwind_protect (pop_down_menu, make_save_value (f, 0));
 
   /* Add event handler so we can detect C-g. */
-  install_menu_quit_handler (menu);
+  install_menu_quit_handler (MAC_MENU_POPUP, menu);
+  install_menu_quit_handler (MAC_MENU_POPUP_SUB, menu);
 
   /* Display the menu.  */
   menu_item_choice = PopUpMenuSelect (menu, pos.v, pos.h, 0);
@@ -2437,9 +2443,10 @@ add_menu_item (menu, pos, wv)
 /* Construct native Mac OS menu based on widget_value tree.  */
 
 static int
-fill_menu (menu, wv, submenu_id)
+fill_menu (menu, wv, kind, submenu_id)
      MenuHandle menu;
      widget_value *wv;
+     enum mac_menu_kind kind;
      int submenu_id;
 {
   int pos;
@@ -2447,13 +2454,13 @@ fill_menu (menu, wv, submenu_id)
   for (pos = 1; wv != NULL; wv = wv->next, pos++)
     {
       add_menu_item (menu, pos, wv);
-      if (wv->contents)
+      if (wv->contents && submenu_id < min_menu_id[kind + 1])
         {
           MenuHandle submenu = NewMenu (submenu_id, "\pX");
 
           InsertMenu (submenu, -1);
           SetMenuItemHierarchicalID (menu, pos, submenu_id);
-          submenu_id = fill_menu (submenu, wv->contents, submenu_id + 1);
+          submenu_id = fill_menu (submenu, wv->contents, kind, submenu_id + 1);
         }
     }
 
@@ -2477,8 +2484,8 @@ fill_menubar (wv, deep_p)
   /* Clean up the menu bar when filled by the entire menu trees.  */
   if (deep_p)
     {
-      dispose_menus (MIN_MENU_ID);
-      dispose_menus (MIN_SUBMENU_ID);
+      dispose_menus (MAC_MENU_MENU_BAR, 0);
+      dispose_menus (MAC_MENU_MENU_BAR_SUB, 0);
 #if !TARGET_API_MAC_CARBON
       title_changed_p = 1;
 #endif
@@ -2486,8 +2493,10 @@ fill_menubar (wv, deep_p)
 
   /* Fill menu bar titles and submenus.  Reuse the existing menu bar
      titles as much as possible to minimize redraw (if !deep_p).  */
-  submenu_id = MIN_SUBMENU_ID;
-  for (id = MIN_MENU_ID; wv != NULL; wv = wv->next, id++)
+  submenu_id = min_menu_id[MAC_MENU_MENU_BAR_SUB];
+  for (id = min_menu_id[MAC_MENU_MENU_BAR];
+       wv != NULL && id < min_menu_id[MAC_MENU_MENU_BAR + 1];
+       wv = wv->next, id++)
     {
       strncpy (title, wv->name, 255);
       title[255] = '\0';
@@ -2523,12 +2532,13 @@ fill_menubar (wv, deep_p)
         }
 
       if (wv->contents)
-        submenu_id = fill_menu (menu, wv->contents, submenu_id);
+        submenu_id = fill_menu (menu, wv->contents, MAC_MENU_MENU_BAR_SUB,
+                                submenu_id);
     }
 
-  if (GetMenuHandle (id))
+  if (id < min_menu_id[MAC_MENU_MENU_BAR + 1] && GetMenuHandle (id))
     {
-      dispose_menus (id);
+      dispose_menus (MAC_MENU_MENU_BAR, id);
 #if !TARGET_API_MAC_CARBON
       title_changed_p = 1;
 #endif
@@ -2540,17 +2550,22 @@ fill_menubar (wv, deep_p)
 #endif
 }
 
+/* Dispose of menus that belong to KIND, and remove them from the menu
+   list.  ID is the lower bound of menu IDs that will be processed.  */
+
 static void
-dispose_menus (id)
+dispose_menus (kind, id)
+     enum mac_menu_kind kind;
      int id;
 {
-  MenuHandle menu;
-
-  while ((menu = GetMenuHandle (id)) != NULL)
+  for (id = max (id, min_menu_id[kind]); id < min_menu_id[kind + 1]; id++)
     {
+      MenuHandle menu = GetMenuHandle (id);
+
+      if (menu == NULL)
+        break;
       DeleteMenu (id);
       DisposeMenu (menu);
-      id++;
     }
 }
 
diff --git a/src/macterm.c b/src/macterm.c
index a51304f21da..77558eb320d 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -10455,7 +10455,8 @@ XTread_socket (sd, expected, hold_quit)
 
             ObscureCursor ();
 
-            if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+            if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
+                && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
               {
                 clear_mouse_face (dpyinfo);
                 dpyinfo->mouse_face_hidden = 1;
diff --git a/src/print.c b/src/print.c
index 28e9e86177e..7e9ed30c32b 100644
--- a/src/print.c
+++ b/src/print.c
@@ -182,6 +182,9 @@ static int max_print;
 
 void print_interval ();
 
+/* GDB resets this to zero on W32 to disable OutputDebugString calls.  */
+int print_output_debug_flag = 1;
+
 
 /* Low level output routines for characters and strings */
 
@@ -909,10 +912,11 @@ to make it write to the debugging output.  */)
 
 #ifdef WINDOWSNT
   /* Send the output to a debugger (nothing happens if there isn't one).  */
-  {
-    char buf[2] = {(char) XINT (character), '\0'};
-    OutputDebugString (buf);
-  }
+  if (print_output_debug_flag)
+    {
+      char buf[2] = {(char) XINT (character), '\0'};
+      OutputDebugString (buf);
+    }
 #endif
 
   return character;
diff --git a/src/process.c b/src/process.c
index a82932ba57b..e3fa187565f 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3843,62 +3843,60 @@ DEFUN ("accept-process-output", Faccept_process_output, Saccept_process_output,
 It is read into the process' buffers or given to their filter functions.
 Non-nil arg PROCESS means do not return until some output has been received
 from PROCESS.
-Non-nil second arg TIMEOUT and third arg TIMEOUT-MSECS are number of
-seconds and microseconds to wait; return after that much time whether
-or not there is input.
+
+Non-nil second arg SECONDS and third arg MILLISEC are number of
+seconds and milliseconds to wait; return after that much time whether
+or not there is input.  If SECONDS is a floating point number,
+it specifies a fractional number of seconds to wait.
+
 If optional fourth arg JUST-THIS-ONE is non-nil, only accept output
 from PROCESS, suspending reading output from other processes.
 If JUST-THIS-ONE is an integer, don't run any timers either.
 Return non-nil iff we received any output before the timeout expired.  */)
-     (process, timeout, timeout_msecs, just_this_one)
-     register Lisp_Object process, timeout, timeout_msecs, just_this_one;
+     (process, seconds, millisec, just_this_one)
+     register Lisp_Object process, seconds, millisec, just_this_one;
 {
-  int seconds;
-  int useconds;
+  int secs, usecs = 0;
 
   if (! NILP (process))
     CHECK_PROCESS (process);
   else
     just_this_one = Qnil;
 
-  if (! NILP (timeout_msecs))
+  if (!NILP (seconds))
     {
-      CHECK_NUMBER (timeout_msecs);
-      useconds = XINT (timeout_msecs);
-      if (!INTEGERP (timeout))
-        XSETINT (timeout, 0);
-
-      {
-        int carry = useconds / 1000000;
-
-        XSETINT (timeout, XINT (timeout) + carry);
-        useconds -= carry * 1000000;
+      if (INTEGERP (seconds))
+        secs = XINT (seconds);
+      else if (FLOATP (seconds))
+        {
+          double timeout = XFLOAT_DATA (seconds);
+          secs = (int) timeout;
+          usecs = (int) ((timeout - (double) secs) * 1000000);
+        }
+      else
+        wrong_type_argument (Qnumberp, seconds);
 
-        /* I think this clause is necessary because C doesn't
-           guarantee a particular rounding direction for negative
-           integers.  */
-        if (useconds < 0)
-          {
-            XSETINT (timeout, XINT (timeout) - 1);
-            useconds += 1000000;
-          }
-      }
-    }
-  else
-    useconds = 0;
+      if (INTEGERP (millisec))
+        {
+          int carry;
+          usecs += XINT (millisec) * 1000;
+          carry = usecs / 1000000;
+          secs += carry;
+          if ((usecs -= carry * 1000000) < 0)
+            {
+              secs--;
+              usecs += 1000000;
+            }
+        }
 
-  if (! NILP (timeout))
-    {
-      CHECK_NUMBER (timeout);
-      seconds = XINT (timeout);
-      if (seconds < 0 || (seconds == 0 && useconds == 0))
-        seconds = -1;
+      if (secs < 0 || (secs == 0 && usecs == 0))
+        secs = -1, usecs = 0;
     }
   else
-    seconds = NILP (process) ? -1 : 0;
+    secs = NILP (process) ? -1 : 0;
 
   return
-    (wait_reading_process_output (seconds, useconds, 0, 0,
+    (wait_reading_process_output (secs, usecs, 0, 0,
                                   Qnil,
                                   !NILP (process) ? XPROCESS (process) : NULL,
                                   NILP (just_this_one) ? 0 :
diff --git a/src/term.c b/src/term.c
index c98c7db2c0d..efa6bc2bcd2 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1322,6 +1322,12 @@ term_get_fkeys_1 ()
                        Character Display Information
  ***********************************************************************/
 
+/* Avoid name clash with functions defined in xterm.c */
+#ifdef static
+#define append_glyph append_glyph_term
+#define produce_stretch_glyph produce_stretch_glyph_term
+#endif
+
 static void append_glyph P_ ((struct it *));
 static void produce_stretch_glyph P_ ((struct it *));
 
diff --git a/src/w32term.c b/src/w32term.c
index d7c9bc8c159..53dae452edc 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4260,7 +4260,8 @@ w32_read_socket (sd, expected, hold_quit)
 
           if (f && !f->iconified)
             {
-              if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+              if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
+                  && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
                 {
                   clear_mouse_face (dpyinfo);
                   dpyinfo->mouse_face_hidden = 1;
@@ -4283,7 +4284,8 @@ w32_read_socket (sd, expected, hold_quit)
 
           if (f && !f->iconified)
             {
-              if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+              if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
+                  && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
                 {
                   clear_mouse_face (dpyinfo);
                   dpyinfo->mouse_face_hidden = 1;
diff --git a/src/xdisp.c b/src/xdisp.c
index b80d21ade80..fb80f349967 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19401,7 +19401,7 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps)
    Called from x_produce_glyphs when IT->glyph_row is non-null.  */
 
 static INLINE void
-store_next_glyph (it)
+append_glyph (it)
      struct it *it;
 {
   struct glyph *glyph;
@@ -19725,7 +19725,7 @@ append_stretch_glyph (it, object, width, height, ascent)
    ASCENT must be in the range 0 <= ASCENT <= 100.  */
 
 static void
-generate_stretch_glyph (it)
+produce_stretch_glyph (it)
      struct it *it;
 {
   /* (space :width WIDTH :height HEIGHT ...)  */
@@ -20151,7 +20151,7 @@ x_produce_glyphs (it)
                                         it->ascent + it->descent, ascent);
                 }
               else
-                store_next_glyph (it);
+                append_glyph (it);
 
               /* If characters with lbearing or rbearing are displayed
                  in this line, record that fact in a flag of the
@@ -20333,7 +20333,7 @@ x_produce_glyphs (it)
           take_vertical_position_into_account (it);
 
           if (it->glyph_row)
-            store_next_glyph (it);
+            append_glyph (it);
         }
       it->multibyte_p = saved_multibyte_p;
     }
@@ -20613,7 +20613,7 @@ x_produce_glyphs (it)
   else if (it->what == IT_IMAGE)
     produce_image_glyph (it);
   else if (it->what == IT_STRETCH)
-    generate_stretch_glyph (it);
+    produce_stretch_glyph (it);
 
   /* Accumulate dimensions.  Note: can't assume that it->descent > 0
      because this isn't true for images with `:ascent 100'.  */
@@ -23819,7 +23819,7 @@ before automatic hscrolling will horizontally scroll the window.  */);
 
   DEFVAR_LISP ("hscroll-step", &Vhscroll_step,
     doc: /* *How many columns to scroll the window when point gets too close to the edge.
-When point is less than `automatic-hscroll-margin' columns from the window
+When point is less than `hscroll-margin' columns from the window
 edge, automatic hscrolling will scroll the window by the amount of columns
 determined by this variable.  If its value is a positive integer, scroll that
 many columns.  If it's a positive floating-point number, it specifies the
diff --git a/src/xfns.c b/src/xfns.c
index 6433f9172ab..a8388721dca 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -827,7 +827,6 @@ xg_set_icon (f, file)
       UNBLOCK_INPUT;
     }
 
-  UNGCPRO;
   return result;
 }
 
diff --git a/src/xterm.c b/src/xterm.c
index c17a25cbd05..73b2e2ae44d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6096,7 +6096,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
 
       f = x_any_window_to_frame (dpyinfo, event.xkey.window);
 
-      if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+      if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
+          && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
         {
           clear_mouse_face (dpyinfo);
           dpyinfo->mouse_face_hidden = 1;
@@ -10260,8 +10261,6 @@ x_term_init (display_name, xrm_option, resource_name)
 
           if (! NILP (abs_file) && !NILP (Ffile_readable_p (abs_file)))
             gtk_rc_parse (SDATA (abs_file));
-
-          UNGCPRO;
         }
 
         XSetErrorHandler (x_error_handler);