Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 164-184)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: man/mh-e.texi (Folders): Various edits.
   - Update from erc--emacs--0

 * gnus--rel--5.10  (patch 62-70)

   - Merge from emacs--devo--0
   - Update from CVS

176 files changed, 5064 insertions, 2701 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 c9a2f69700f..927f4f98b46 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/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/NEWS b/etc/NEWS
index 0a78c5f4f57..29f7269a44e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -399,6 +399,11 @@ cycle for each frame, using the frame-local buffer list.
 converts whitespace around point to N spaces.
 
 ---
+** C-x 5 C-o displays a specified buffer in another frame
+but does not switch to that frame.  It's the multi-frame
+analogue of C-x 4 C-o.
+
+---
 ** New commands to operate on pairs of open and close characters:
 `insert-pair', `delete-pair', `raise-sexp'.
 
@@ -1262,7 +1267,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
@@ -1335,7 +1340,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'.
 
 +++
@@ -1490,7 +1495,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
@@ -1734,7 +1739,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'.
 
 +++
@@ -1923,12 +1928,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
@@ -2061,7 +2069,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.
@@ -2671,6 +2679,12 @@ of BibTeX entry to kill ring (bound to C-c C-t).
 bibtex-autokey-expand-strings control the expansion of strings when
 extracting the content of a BibTeX field.
 
+*** The variables `bibtex-autokey-name-case-convert' and
+`bibtex-autokey-titleword-case-convert' have been renamed to
+`bibtex-autokey-name-case-convert-function' and
+`bibtex-autokey-titleword-case-convert-function'. The old names are
+still available as aliases.
+
 +++
 ** In Enriched mode, `set-left-margin' and `set-right-margin' are now
 by default bound to `C-c [' and `C-c ]' instead of the former `C-c C-l'
@@ -2841,7 +2855,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.
@@ -2967,7 +2981,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
@@ -3190,7 +3204,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
@@ -3251,7 +3265,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
@@ -3387,7 +3401,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'.
 
 ---
@@ -3494,7 +3508,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
@@ -3648,7 +3662,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.
@@ -3837,7 +3851,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.
 
 +++
@@ -4157,7 +4171,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:
@@ -4290,7 +4304,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.
@@ -4682,14 +4696,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.
@@ -4790,7 +4804,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'
@@ -4884,7 +4898,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
@@ -4987,7 +5001,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 ccebfa5e6cd..9c4be6bb815 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,238 @@
+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
+        face-spec set so that `changed' theme is correctly saved.
+        (custom-face-reset-standard): Reset to recalculated face rather
+        than defface spec.
+
+        * custom.el (custom-push-theme): Only save `changed' theme if the
+        current face does not match the defface specs.
+
+2006-03-21  Simon Josefsson  <jas@extundo.com>
+
+        * pgg-gpg.el: Ideas below based on patch from Sascha Wilde
+        <wilde@sha-bang.de>.
+        (pgg-gpg-use-agent): New variable.
+        (pgg-gpg-process-region): Use it.
+        (pgg-gpg-encrypt-region): Likewise.
+        (pgg-gpg-encrypt-symmetric-region): Likewise.
+        (pgg-gpg-decrypt-region): Likewise.
+        (pgg-gpg-sign-region): Likewise.
+        (pgg-gpg-possibly-cache-passphrase): Don't cache a nil password.
+
+2006-03-21  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-open-at-point): Fix bug in wiki-style
+        bracket links.
+
+2006-03-21  Kim F. Storm  <storm@cua.dk>
+
+        * progmodes/gdb-ui.el (gdb-reset): Set buffer local value of
+        fringe-indicator-alist instead of modifying global value.
+        (gdb-frame-handler): Likewise.
+
+2006-03-21  Nick Roberts  <nickrob@snap.net.nz>
+
+        * diff-mode.el (diff-function): Make it inherit from diff-header
+        instead of diff-context.
+
+        * progmodes/gdb-ui.el (hollow-right-triangle): Define as fringe
+        bitmap.
+        (gdb-info-stack-custom): Rename from gdb-info-frames-custom and
+        change names in macro above for consistency.
+        (gdb-frame-handler): Use hollow-right-triangle for all selected
+        frames which except the innermost (where execution has stopped).
+        (gdb-reset): Reset buffer-local values of overlay-arrow.
+
+2006-03-20  Richard Stallman  <rms@gnu.org>
+
+        * simple.el (set-mark-command): Doc fix.
+
+        * files.el (display-buffer-other-frame): New command.
+        (ctl-x-4-map): Bind C-x 5 C-o to it.
+
+2006-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * jit-lock.el (jit-lock-function): Check for the actual defer-timer
+        rather than just defer-time, in case defer-time has been changed but
+        the timer isn't running yet.
+        (jit-lock-deferred-fontify): Correspondingly let-bind defer-timer.
+
+2006-03-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * help-mode.el (help-follow-symbol): New function.
+        Essentially identical to the old `help-follow', but do not let
+        `push-button' do the work when on an xref.
+        (help-mode-map): Bind `help-follow-symbol' to "C-c C-c".
+
+2006-03-19  Richard Stallman  <rms@gnu.org>
+
+        * help-mode.el (help-xref-symbol-regexp): Make no xref for symbol
+        preceded by the word `program'.
+        (help-follow-mouse, help-follow): Throw error if not on xref.
+        Delete no longer used args.
+
+2006-03-20  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-stopped): Even when there is no source
+        annotation ensure gud-overlay-arrow-position is redisplayed.
+
+2006-03-19  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
+
+        * textmodes/bibtex.el (bibtex-include-OPTkey)
+        (bibtex-entry-field-alist, bibtex-generate-url-list): Mark as risky.
+        (bibtex-autokey-name-case-convert)
+        (bibtex-autokey-titleword-case-convert): Make these the aliases
+        for the following two variables.
+        (bibtex-autokey-name-case-convert-function)
+        (bibtex-autokey-titleword-case-convert-function): Make these the
+        real names.
+        (bibtex-font-lock-keywords): Make bibtex-font-lock-url and
+        bibtex-font-lock-crossref sublists.
+        (bibtex-mode): Revert 2005-12-30 change (which made
+        completion-ignore-case buffer-local).
+        (bibtex-url): Simplify.
+
+2006-03-19  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-rect.el (cua--highlight-rectangle): Set overlay
+        cursor property value to 2 (to align with C level change).
+
+2006-03-19  Bill Wohler  <wohler@newt.com>
+
+        * image.el (image-load-path-for-library): Shorten first line in
+        docstring.
+
+2006-03-18  Richard Stallman  <rms@gnu.org>
+
+        * mail/rmail.el (rmail-reply-regexp): Undo previous change.
+
 2006-03-18  Ben North  <ben@redfrontdoor.org>  (tiny change)
 
         * isearch.el (isearch-other-meta-char): Handle user bindings for
@@ -10,8 +245,8 @@
 
 2006-03-18  Eli Zaretskii  <eliz@gnu.org>
 
-        * term/w32-win.el (mouse-set-font): Mention
-        w32-list-proportional-fonts in the doc string.
+        * term/w32-win.el (mouse-set-font):
+        Mention w32-list-proportional-fonts in the doc string.
 
 2006-03-18  Kim F. Storm  <storm@cua.dk>
 
@@ -19,8 +254,8 @@
         (ido-unc-hosts): New user option to explicitly define list of know
         UNC-style hosts for completion.
         (ido-cache-unc-host-shares-time): New user option.
-        (ido-is-unc-root, ido-is-unc-host, ido-cache-unc-valid): New
-        helper functions for UNC file-name support.
+        (ido-is-unc-root, ido-is-unc-host, ido-cache-unc-valid):
+        New helper functions for UNC file-name support.
         (ido-may-cache-directory): Check for UNC host.  Simplify.
         (ido-wash-history): Clean out old UNC hosts.
         (ido-nonreadable-directory-p): UNC hosts are always readable.
@@ -78,7 +313,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>
@@ -114,7 +349,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>
@@ -155,8 +390,8 @@
 
         * progmodes/gdb-ui.el (gdb-var-list): Change order of first two
         elements.
-        (gdb-find-watch-expression): Make it work for arrays too.  Follow
-        change to gdb-var-list.
+        (gdb-find-watch-expression): Make it work for arrays too.
+        Follow change to gdb-var-list.
         (gud-watch): Allow the user to enter variable name with a prexix
         arg.  Create keybindings.
         (gdb-var-create-handler, gdb-var-evaluate-expression-handler)
@@ -164,8 +399,7 @@
         (gdb-var-delete, gdb-edit-value, gdb-speedbar-expand-node)
         (gdb-var-list-children-handler-1, gdb-var-update-handler-1):
         Follow change to gdb-var-list.
-        (gdb-starting): Don't show the overlay arrows when program is
-        running.
+        (gdb-starting): Don't show the overlay arrows when program is running.
 
         * progmodes/gud.el (gud-speedbar-buttons): Follow change to
         gdb-var-list.
@@ -173,27 +407,32 @@
 2006-03-14  Bill Wohler  <wohler@newt.com>
 
         * image.el (image-load-path-for-library): Pass value of path
-        rather than symbol.  Always return list of directories.  Guarantee
-        that image directory comes first.
+        rather than symbol.  Always return list of directories.
+        Guarantee that image directory comes first.
 
 2006-03-14  Alan Mackenzie  <acm@muc.de>
 
-        * font-core.el: New function/variable
-        font-lock-extend-region\(-function\)?.
+        * font-core.el (font-lock-extend-region\(-function\)?.):
+        New function/variable.
 
-        * font-lock.el (font-lock-after-change-function): Call
-        font-lock-extend-region.  Obey font-lock-lines-before.
+        * font-lock.el (font-lock-after-change-function):
+        Call font-lock-extend-region.  Obey font-lock-lines-before.
         (font-lock-default-fontify-region): Remove reference to
         font-lock-lines-before.
 
-        * jit-lock.el (jit-lock-after-change): Call
-        font-lock-extend-region.  Obey font-lock-lines-before.
+        * jit-lock.el (jit-lock-after-change):
+        Call font-lock-extend-region.  Obey font-lock-lines-before.
 
 2006-03-14  David Ponce  <david@dponce.com>
 
         * tree-widget.el (tree-widget-themes-load-path)
         (tree-widget-themes-directory, tree-widget-theme): Doc fix.
 
+2006-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcvs-util.el (cvs-insert-strings): Fix bug with strings longer than
+        wwidth.
+
 2006-03-13  Ryan Yeske  <rcyeske@gmail.com>
 
         * net/rcirc.el (rcirc) <defgroup>: Add link to manual.
@@ -214,8 +453,8 @@
         themes sub-directory found in tree-widget-themes-load-path.
         (tree-widget-themes-directory, tree-widget-theme): Doc fix.
         (tree-widget--locate-sub-directory): Return all occurrences.
-        (tree-widget-themes-path): New function.  Replace
-        tree-widget-themes-directory, and return a list of directories.
+        (tree-widget-themes-path): New function.
+        Replace tree-widget-themes-directory, and return a list of directories.
         (tree-widget-set-parent-theme)
         (tree-widget-lookup-image): Use it.
 
@@ -360,8 +599,8 @@
 
 2006-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
-        * files.el (hack-local-variables-confirm): Set
-        coding-system-for-read to nil before writing to .emacs.
+        * files.el (hack-local-variables-confirm):
+        Set coding-system-for-read to nil before writing to .emacs.
 
         * arc-mode.el (archive-extract): Check if an existing buffer name
         comes from a different archive.
@@ -383,8 +622,8 @@
 
 2006-03-07  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el: Move defvars out of eval-when-compile.  Use
-        buffer-file-name variable.
+        * textmodes/org.el: Move defvars out of eval-when-compile.
+        Use buffer-file-name variable.
         (org-agenda-file-to-end, org-agenda-file-to-front): Remove unused
         arg `file'.
         (org-level-faces): Remove startup dependency.
@@ -399,8 +638,7 @@
         (org-tag): New face.
         (org-get-level-face): New function.
         (org-set-font-lock-defaults): Simplify setup for headlines.
-        (org-complete): Pass common substring to
-        `display-completion-list'.
+        (org-complete): Pass common substring to `display-completion-list'.
 
 2006-03-06  David Ponce  <david@dponce.com>
 
@@ -572,9 +810,8 @@
 
         * t-mouse.el: New file.
         (t-mouse-tty): Use with-temp-buffer.  Add more terminal types.
-        (t-mouse-lispy-buffer-posn-from-coords): Remove.  Use the C
-        primitive...
-        (t-mouse-make-event-element): ...posn-at-x-y instead.
+        (t-mouse-lispy-buffer-posn-from-coords): Remove.
+        (t-mouse-make-event-element): Use posn-at-x-y instead.
         (t-mouse-make-event): Deal with Fedora Core 3.
         (t-mouse-make-event): Don't sink the `stupid text mode menubar'.
         (t-mouse-mouse-position-function): New function.  Use it instead
@@ -607,8 +844,7 @@
         * textmodes/reftex-index.el (reftex-index-map): Add `follow-mouse'
         binding.
 
-        * textmodes/reftex-toc.el (reftex-toc-map): Add `follow-mouse'
-        binding.
+        * textmodes/reftex-toc.el (reftex-toc-map): Add `follow-mouse' binding.
 
         * textmodes/reftex-sel.el (reftex-select-label-map)
         (reftex-select-bib-map): Add `follow-mouse' binding.
@@ -4186,20 +4422,20 @@
         CC Mode update to 5.31.
 
         * progmodes/cc-subword.el: Add a dummy `c-subword-mode' for
-        Emacsen which lack `define-minor-mode'.  (Currently Emacs <21.  We
-        might do this function properly in the future).
+        Emacsen which lack `define-minor-mode'.  (Currently Emacs <21.
+        We might do this function properly in the future).
 
-        * progmodes/cc-cmds.el, cc-defs.el, cc-styles.el, cc-vars.el: New
-        macros c-sentence-end and c-default-value-sentence end, to cope
+        * progmodes/cc-cmds.el, cc-defs.el, cc-styles.el, cc-vars.el:
+        New macros c-sentence-end and c-default-value-sentence end, to cope
         with Emacs 22's new function `sentence-end'.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-cmds.el (c-show-syntactic-information): Solved the
+        * progmodes/cc-cmds.el (c-show-syntactic-information): Solve the
         compat issue using `c-put-overlay' and `c-delete-overlay'.
 
-        * progmodes/cc-defs.el (c-put-overlay, c-delete-overlay): New
-        compat macros to handle overlays/extents.
+        * progmodes/cc-defs.el (c-put-overlay, c-delete-overlay):
+        New compat macros to handle overlays/extents.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4220,20 +4456,19 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-fonts.el (c-make-syntactic-matcher): New internal
-        helper.
+        * progmodes/cc-fonts.el (c-make-syntactic-matcher):
+        New internal helper.
 
         (c-cpp-matchers, c-basic-matchers-before): Use the `eval'
         construct to make the indirect face lookup work in XEmacs.
 
         (c-cpp-matchers): Append the negation char face to the existing
-        fontification, so that the cpp face doesn't disappear.  Use
-        `c-make-syntactic-matcher' to avoid negation chars in comments and
-        strings.
+        fontification, so that the cpp face doesn't disappear.
+        Use `c-make-syntactic-matcher' to avoid negation chars in comments
+        and strings.
 
         * progmodes/cc-fonts.el (c-negation-char-face-name): New variable
-        to map to `font-lock-negation-char-face' in emacsen where it
-        exists.
+        to map to `font-lock-negation-char-face' in emacsen where it exists.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4256,18 +4491,17 @@
         (i) Insert a binding for C-c C-backspace into
         c-bind-special-erase-keys which works in TTYs.
         (ii) Make sure that when file styles are used, any explicitly
-        given style variables take priority over those in the style.  Do
-        this by calling `hack-local-variables' a second time.
+        given style variables take priority over those in the style.
+        Do this by calling `hack-local-variables' a second time.
 
         * progmodes/cc-vars.el: Add language specific customization
         widgets for AWK to c-doc-comment-style, c-require-final-newline
-        and c-default-style.  Add a defcustom for awk-mode-hook.  Give
-        c-syntactic-element and c-syntactic-context doc-strings by
-        directly setting their `variable-documentation' propery.  This
-        allows Emacs 22.1 to read these with C-h v.
+        and c-default-style.  Add a defcustom for awk-mode-hook.
+        Give c-syntactic-element and c-syntactic-context doc-strings by
+        directly setting their `variable-documentation' propery.
+        This allows Emacs 22.1 to read these with C-h v.
 
-        * progmodes/cc-awk.el: Apply a tidy-up patch (from Stefan
-        Monnier).
+        * progmodes/cc-awk.el: Apply a tidy-up patch (from Stefan Monnier).
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
@@ -4293,8 +4527,8 @@
         * progmodes/cc-mode.el: Give c-hungry-backspace and
         c-hungry-delete-forward permanent key bindings.
 
-        * progmodes/cc-cmds.el (c-electric-semi&comma): Bind
-        c-syntactic-context for calls to "criteria functions", for
+        * progmodes/cc-cmds.el (c-electric-semi&comma):
+        Bind c-syntactic-context for calls to "criteria functions", for
         consistency with other calls to user functions.
 
         * progmodes/cc-cmds.el (c-indent-command): Expunge use of
@@ -4308,7 +4542,7 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-engine.el (c-on-identifier): Fixed bug when at the
+        * progmodes/cc-engine.el (c-on-identifier): Fix bug when at the
         first char of an identifier.
 
         * progmodes/cc-engine.el (c-on-identifier): Handle the "operator
@@ -4333,14 +4567,14 @@
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-fonts.el (c-cpp-matchers, c-basic-matchers-before):
-        Incorporated the patterns added in the Emacs development branch
+        Incorporate the patterns added in the Emacs development branch
         for the new Emacs 22 face `font-lock-negation-char-face'.
 
         * progmodes/cc-fonts.el (c-invalid-face-name): Use "red1" instead
         of "red" since it stands out better in xterms and DOS terminals.
 
-        * progmodes/cc-engine.el (c-literal-faces): Added
-        `font-lock-comment-delimiter-face' which is new in Emacs 22.
+        * progmodes/cc-engine.el (c-literal-faces):
+        Add `font-lock-comment-delimiter-face' which is new in Emacs 22.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4348,14 +4582,13 @@
         forcibly enable c-electric-flag.
 
         * progmodes/cc-vars.el, cc-cmds.el: New clean-up
-        `comment-close-slash' on c-electric-slash: if enabled, typing `/'
-        just after the comment-prefix of a C-style comment will close that
-        comment.
+        `comment-close-slash' on c-electric-slash: if enabled, typing `/' just
+        after the comment-prefix of a C-style comment will close that comment.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-fonts.el (c-basic-matchers-before)
-        (c-complex-decl-matchers): Fixed the "not-arrow-prefix" regexp used
+        (c-complex-decl-matchers): Fix the "not-arrow-prefix" regexp used
         in Pike.
 
         * progmodes/cc-langs.el (c-other-op-syntax-tokens): Only C++ has
@@ -4364,10 +4597,10 @@
         * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el
         (c-cpp-message-directives, c-cpp-include-directives)
         (c-opt-cpp-macro-define, c-opt-cpp-macro-define-start)
-        (c-cpp-expr-directives): Introduced new language constants to
+        (c-cpp-expr-directives): Introduce new language constants to
         control cpp syntax in a cleaner way.
 
-        (c-cpp-expr-functions): Renamed from c-cpp-defined-fns.
+        (c-cpp-expr-functions): Rename from c-cpp-defined-fns.
 
         (c-cpp-matchers, c-forward-to-cpp-define-body): Use them.
 
@@ -4399,22 +4632,21 @@
         (c-guess-basic-syntax): Handle C++ operator identifiers in
         declarations.
 
-        * progmodes/cc-langs.el (c-assignment-operators): Added the
+        * progmodes/cc-langs.el (c-assignment-operators): Add the
         trigraph version of ^= too.
 
-        * progmodes/cc-langs.el (c-assignment-operators): Added the
+        * progmodes/cc-langs.el (c-assignment-operators): Add the
         trigraph version of |= in C++.
 
-        * progmodes/cc-fonts.el (c-font-lock-declarators): Handle
-        `c-decl-hangon-kwds' after the identifier name.
+        * progmodes/cc-fonts.el (c-font-lock-declarators):
+        Handle `c-decl-hangon-kwds' after the identifier name.
 
         * progmodes/cc-engine.el (c-guess-basic-syntax): When deciding
         whether an arglist is "nonempty", ignore a comment after the open
-        paren if it isn't followed by a non-comment token on the same
-        line.
+        paren if it isn't followed by a non-comment token on the same line.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Case 4: Enable
-        heuristics below the point to cope with classes inside special
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Case 4:
+        Enable heuristics below the point to cope with classes inside special
         brace lists in Pike.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
@@ -4453,12 +4685,11 @@
         * progmodes/cc-cmds.el: Add `c-bytecomp-defun's for
         c-\(forward\|backward\)-subword.
         (c-update-modeline): Add the new modeline flag `l' for
-        `c-electric-flag'.  Make the auto-newline flag `a' dependent on
-        `l'.
-        (c-toggle-auto-state): Rename it to `c-toggle-auto-newline'.  Make
-        the old name an alias of the new name.
+        `c-electric-flag'.  Make the auto-newline flag `a' dependent on `l'.
+        (c-toggle-auto-state): Rename it to `c-toggle-auto-newline'.
+        Make the old name an alias of the new name.
         (c-toggle-electric-state): New function.
-        c-electric-\(pound\|brace\|slash\|star\|semi&comma\|colon\|lt-gt\|paren\|continued-statement\):
+        (c-electric-\(pound\|brace\|slash\|star\|semi&comma\|colon\|lt-gt\|paren\|continued-statement\)):
         Adapt these functions to do electric things only when
         c-electric-flag is non-nil.
         (c-point-syntax, c-brace-newlines, c-try-oneliner): Extract these
@@ -4474,18 +4705,17 @@
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-cmds.el (c-show-syntactic-information): Show the
-        anchor position(s) using faces.  Thanks to Masatake YAMATO for the
-        idea.
+        anchor position(s) using faces.  Thanks to Masatake YAMATO for the idea.
 
         * progmodes/cc-mode.el, cc-cmds.el, cc-defs.el, cc-engine.el
-        (c-submode-indicators): Changed name from `c-auto-hungry-string'
+        (c-submode-indicators): Change name from `c-auto-hungry-string'
         since it's now used to track another submode.
 
-        (c-update-modeline): Converted to function and extended to check
+        (c-update-modeline): Convert to function and extended to check
         `c-subword-move-mode'.
 
         (c-forward-into-nomenclature, c-backward-into-nomenclature):
-        Converted to compat aliases for `c-forward-subword' and
+        Convert to compat aliases for `c-forward-subword' and
         `c-backward-subword'.
 
         * progmodes/cc-subword.el: New functions and minor mode to handle
@@ -4528,10 +4758,10 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-engine.el (c-forward-label): Fixed fontification of
+        * progmodes/cc-engine.el (c-forward-label): Fix fontification of
         macros inside labels.
 
-        * progmodes/cc-engine.el (c-looking-at-bos): Obsoleted in favor of
+        * progmodes/cc-engine.el (c-looking-at-bos): Obsolete in favor of
         `c-at-statement-start-p' and `c-at-expression-start-p'.
 
         * progmodes/cc-defs.el (c-tnt-chng-record-state): Don't signal an
@@ -4545,9 +4775,8 @@
         like `c-at-statement-start-p' that additionally recognizes commas
         and expression parentheses as delimiters.
 
-        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Added flag
+        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Add flag
         to avoid heuristics that doesn't work for unclosed blocks.
-
         (c-at-statement-start-p): New function.
 
         * progmodes/cc-engine.el, cc-fonts.el: Fixes in handling of
@@ -4562,54 +4791,53 @@
         (c-just-after-func-arglist-p, c-guess-basic-syntax)
         (c-basic-matchers-before): Use it.
 
-        (c-font-lock-objc-iip-decl): Removed.
+        (c-font-lock-objc-iip-decl): Remove.
 
         * progmodes/cc-engine.el (c-guess-basic-syntax): Some improvement
         in the template arglist recognition.
 
-        * progmodes/cc-styles.el (c-style-alist): Fixed several
+        * progmodes/cc-styles.el (c-style-alist): Fix several
         inconsistencies in the Whitesmith style.
 
         * progmodes/cc-align.el (c-lineup-after-whitesmith-blocks):
         New lineup function to get lines after Whitesmith style blocks
         correctly indented.
 
-        (c-lineup-whitesmith-in-block): Backed out the compensation for
+        (c-lineup-whitesmith-in-block): Back out the compensation for
         opening parens since it's done using `add' lists in the style
         definition instead.  Don't use the anchor position since it varies
         too much between the syntactic symbols. :P
 
-        * progmodes/cc-vars.el (c-valid-offset): Updated.
+        * progmodes/cc-vars.el (c-valid-offset): Update.
 
-        * progmodes/cc-engine.el (c-evaluate-offset): Extended to handle
+        * progmodes/cc-engine.el (c-evaluate-offset): Extend to handle
         lists where the offsets are combined according to several
-        different methods: `first', `min', `max', and `add'.  Report
-        offset evaluation errors with `c-benign-error' so that some kind
+        different methods: `first', `min', `max', and `add'.
+        Report offset evaluation errors with `c-benign-error' so that some kind
         of reindentation still is done.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Anchor
-        `arglist-intro' the same way as `arglist-cont-nonempty' and
+        * progmodes/cc-engine.el (c-guess-basic-syntax):
+        Anchor `arglist-intro' the same way as `arglist-cont-nonempty' and
         `arglist-close'.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed similar
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Fix similar
         situations for `arglist-cont-nonempty' and `arglist-close'.
 
-        * progmodes/cc-langs.el (c-opt-identifier-concat-key-depth): New
-        constant.
+        * progmodes/cc-langs.el (c-opt-identifier-concat-key-depth): New const.
 
         * progmodes/cc-defs.el: Use `cc-bytecomp-fboundp' and
         cc-bytecomp-boundp' in a number of places.
 
-        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed a
+        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fix a
         macro related issue.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-awk.el: Change the terminology of regexps: A char
-        list is now [asdf], a char class [:alpha:].  Include code for char
-        classes.  Set c-awk-NL-prop on lines ending in open strings.  (Bug
-        fix.)  Add character classes (e.g. "[:alpha:]") into AWK Mode's
-        regexps.
+        list is now [asdf], a char class [:alpha:].
+        Include code for char classes.
+        Set c-awk-NL-prop on lines ending in open strings.  (Bug fix.)
+        Add character classes (e.g. "[:alpha:]") into AWK Mode's regexps.
 
         Remove (nearly all of) the cruft associated with AWK Mode's former
         concept of "virtual semicolons":
@@ -4648,15 +4876,14 @@
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-awk.el: Regexps for analysing AWK code have been
-        moved to near the start of the file.  ^L now separate sections of
-        the file.  New defconsts: c-awk-non-eol-esc-pair-re,
-        c-awk-blank-or-comment-line-re,
-        c-awk-one-line-possibly-open-string-re,
-        c-awk-regexp-one-line-possibly-open-char-class-re,
-        c-awk-one-line-possibly-open-regexp-re,
-        c-awk-one-line-non-syn-ws*-re.  New functions: c-awk-at-vsemi-p,
-        c-awk-vsemi-status-unknown-p.
+        * progmodes/cc-awk.el: Move regexps for analysing AWK code to near the
+        start of the file.  ^L now separate sections of the file.
+        (c-awk-non-eol-esc-pair-re,     c-awk-blank-or-comment-line-re)
+        (c-awk-one-line-possibly-open-string-re)
+        (c-awk-regexp-one-line-possibly-open-char-class-re)
+        (c-awk-one-line-possibly-open-regexp-re)
+        (c-awk-one-line-non-syn-ws*-re): New defonsts.
+        (c-awk-at-vsemi-p, c-awk-vsemi-status-unknown-p): New functions.
 
         Amend the concept of "virtual semicolons" (in the indentation
         engine) for languages like AWK, such that they are now
@@ -4664,12 +4891,12 @@
         the end of the line.  (In AWK Mode, however, the pertinent text
         property is still physically set on the EOL.)  Remove the specific
         tests for awk-mode, thus facilitating the introduction of other
-        language modes where EOLs can end statements.  (Note: The
-        funtionality in cc-cmds.el, specifically
+        language modes where EOLs can end statements.
+        (Note: The funtionality in cc-cmds.el, specifically
         c-beginning/end-of-statement has yet to be amended.)
 
-        * progmodes/cc-defs.el: New macros c-at-vsemi-p,
-        c-vsemi-status-unknown-p.
+        * progmodes/cc-defs.el (c-at-vsemi-p, c-vsemi-status-unknown-p):
+        New macros.
 
         * progmodes/cc-langs.el: Added `#' into AWK Mode's value of
         c-stmt-delim-chars.  New c-lang-defvars: c-at-vsemi-p-fn,
@@ -4679,25 +4906,21 @@
         c-crosses-statement-barrier-p, c-guess-basic-syntax, replace
         numerous awkward forms like
         (if (c-major-mode-is 'awk-mode) (c-awk-prev-line-incomplete-p))
-        with
-        (c-at-vsemi-p).  Fix a few typos.  In c-guess-basic-syntax, new
-        variable before-ws-ip, the place just after char-before-ip
-        appears.
+        with (c-at-vsemi-p).  Fix a few typos.  In c-guess-basic-syntax, new
+        variable before-ws-ip, the place just after char-before-ip appears.
 
         * progmodes/cc-mode.el: Fix what's almost a semantic ambiguity in
         a comment.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-cmds.el (c-electric-brace): Cleaned up using
+        * progmodes/cc-cmds.el (c-electric-brace): Clean up using
         `c-tentative-buffer-changes'.
 
-        * progmodes/cc-defs.el (c-region-is-active-p): Simplified and
-        converted to macro to choose between Emacs and XEmacs at compile
-        time.
+        * progmodes/cc-defs.el (c-region-is-active-p): Simplify and
+        convert to macro to choose between Emacs and XEmacs at compile time.
 
-        (c-set-region-active): New set counterpart to
-        `c-region-is-active-p'.
+        (c-set-region-active): New set counterpart to `c-region-is-active-p'.
 
         (c-tentative-buffer-changes): New macro to handle temporary buffer
         changes in a convenient way.
@@ -4705,7 +4928,7 @@
         (c-tnt-chng-record-state, c-tnt-chng-cleanup): Internal helpers
         for `c-tentative-buffer-changes'.
 
-        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Tightened up
+        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Tighten up
         the checks for paren sexps between the point and the keyword, to
         avoid some false alarms.
 
@@ -4714,23 +4937,22 @@
         parens.  Changed to make use of c-keyword-member' to avoid some
         repeated regexp matches.
 
-        (c-opt-lambda-key, c-opt-inexpr-block-key,
-        c-opt-inexpr-class-key): These language variable are no longer
-        necessary.
+        (c-opt-lambda-key, c-opt-inexpr-block-key, c-opt-inexpr-class-key):
+        These language variable are no longer necessary.
 
         (c-block-stmt-kwds): New language constant used by
         c-looking-at-inexpr-block'.
 
-        (c-guess-basic-syntax): Removed an optional check that looked at
+        (c-guess-basic-syntax): Remove an optional check that looked at
         the existence of the now removed language variables.
 
-        * progmodes/cc-engine.el (c-fdoc-shift-type-backward,
-        c-forward-decl-or-cast-1): Fixed invalid recognition of C++ style
+        * progmodes/cc-engine.el (c-fdoc-shift-type-backward)
+        (c-forward-decl-or-cast-1): Fix invalid recognition of C++ style
         object instantiation expressions as declarations in some contexts.
         This bug only affected languages where the declarator can't be
         enclosed in parentheses.
 
-        * progmodes/cc-styles.el (c-style-alist): Fixed the GNU style to
+        * progmodes/cc-styles.el (c-style-alist): Fix the GNU style to
         insert newlines before and after substatement braces.
 
         * progmodes/cc-engine.el: Improved the heuristics for recognizing
@@ -4740,15 +4962,14 @@
         (c-just-after-func-arglist-p): Rewritten to use
         `c-forward-decl-or-cast-1'.  Now behaves a bit differently too.
 
-        (c-beginning-of-member-init-list): Removed since it isn't used
-        anymore.
+        (c-beginning-of-member-init-list): Remove since it isn't used anymore.
 
-        (c-guess-basic-syntax): Case 5B adapted for the new
-        `c-just-after-func-arglist-p'.  Cases 5B.1 and 5B.3 merged.  Cases
-        5D.1 and 5D.2 removed since they aren't trigged anymore (case 5B.1
+        (c-guess-basic-syntax): Adapt case 5B for the new
+        `c-just-after-func-arglist-p'.  Merge cases 5B.1 and 5B.3.
+        Remove cases 5D.1 and 5D.2 since they aren't trigged anymore (case 5B.1
         covers all cases now).
 
-        * progmodes/cc-defs.el (c-point): Added `bosws' and `eosws'.
+        * progmodes/cc-defs.el (c-point): Add `bosws' and `eosws'.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4771,15 +4992,15 @@
         (c-search-uplist-for-classkey): The old one.  It's now a wrapper
         for compatibility.
 
-        (c-add-class-syntax, c-guess-continued-construct,
-        c-guess-basic-syntax): Adapted for `c-looking-at-decl-block'.
+        (c-add-class-syntax, c-guess-continued-construct)
+        (c-guess-basic-syntax): Adapt for `c-looking-at-decl-block'.
 
-        (c-decl-block-key): Changed to tell apart ambiguous and
+        (c-decl-block-key): Change to tell apart ambiguous and
         unambiguous keywords.  Pike specials are now handled directly in
         the code instead.
 
-        (c-block-prefix-disallowed-chars, c-block-prefix-charset): New
-        language constants and variables to make the backward skip in
+        (c-block-prefix-disallowed-chars, c-block-prefix-charset):
+        New language constants and variables to make the backward skip in
         `c-looking-at-decl-block' as tight as possible.
 
         (c-nonsymbol-token-char-list): New language constant.
@@ -4790,7 +5011,7 @@
         * progmodes/cc-defs.el (c-make-bare-char-alt): New helper for
         making char classes for `c-syntactic-skip-backward'.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplified case
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplify case
         16D - can't be a class-close at that point.
 
         * progmodes/cc-engine.el (c-guess-basic-syntax)
@@ -4801,17 +5022,16 @@
         `c-guess-basic-syntax' never will look at things outside the
         current narrowment now.  The anchor position for `topmost-intro'
         is affected by this, but it was so bogus it was basically useless
-        before, and now it's equally bogus but in a slightly different
-        way.
+        before, and now it's equally bogus but in a slightly different way.
 
         (c-narrow-out-enclosing-class): Gone.
 
         (c-most-enclosing-brace, c-least-enclosing-brace): Don't filter to
         the narrowed region.
 
-        (c-least-enclosing-brace): Removed silly optional argument.
+        (c-least-enclosing-brace): Remove silly optional argument.
 
-        * progmodes/cc-engine.el (c-beginning-of-decl-1): Fixed bug where
+        * progmodes/cc-engine.el (c-beginning-of-decl-1): Fix bug where
         the point could be left directly after an open paren when finding
         the beginning of the first decl in the block.
 
@@ -4836,13 +5056,11 @@
         (c-identifier-start, c-identifier-key): Now completely calculated
         from other constants.
 
-        (c-identifier-last-sym-match): Decommissioned since it's no longer
-        used.
+        (c-identifier-last-sym-match): Decommission since it's no longer used.
 
-        (c-operators): Use `c-identifier-ops'.  Documented
-        `postfix-if-paren'.
+        (c-operators): Use `c-identifier-ops'.  Document `postfix-if-paren'.
 
-        * progmodes/cc-engine.el (c-forward-name): Removed the
+        * progmodes/cc-engine.el (c-forward-name): Remove the
         optimization when c-identifier-key is equal to c-symbol-key since
         it doesn't work in byte compiled files.  Don't record empty
         regions as identifiers.
@@ -4858,13 +5076,13 @@
         * progmodes/cc-defs.el (c-lang-const): Fixes to allow use without
         an explicit language in functions.
 
-        * progmodes/cc-defs.el (c-make-keywords-re): Added an appendable
+        * progmodes/cc-defs.el (c-make-keywords-re): Add an appendable
         variant of adornment.
 
-        * progmodes/cc-langs.el (c-any-class-key): Removed unused language
+        * progmodes/cc-langs.el (c-any-class-key): Remove unused language
         variable.
 
-        (c-type-decl-prefix-key): Removed some now unnecessary cruft from
+        (c-type-decl-prefix-key): Remove some now unnecessary cruft from
         the Pike value.
 
         * progmodes/cc-engine.el (c-on-identifier)
@@ -4872,7 +5090,7 @@
         correctly in `skip-chars-backward'.  Affected the operator lfun
         syntax in Pike.
 
-        * progmodes/cc-langs.el (c-make-init-lang-vars-fun): Disabled the
+        * progmodes/cc-langs.el (c-make-init-lang-vars-fun): Disable the
         diagnostic message about precompiled language vars not being used.
 
         * progmodes/cc-langs.el (c-paren-nontype-kwds): The GCC keyword
@@ -4882,9 +5100,9 @@
         (c-specifier-key, c-not-decl-init-keywords): Some cleanup using new
         language constants `c-type-start-kwds' and `c-prefix-spec-kwds'.
 
-        * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el: Internal
-        cleanups to properly detect the declared identifiers in various
-        declarations.
+        * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el:
+        Internal cleanups to properly detect the declared identifiers in
+        various declarations.
 
         (c-decl-start-kwds): New language constant to recognize
         declarations that can start anywhere.  Used for class declarations
@@ -4895,7 +5113,7 @@
         (c-find-decl-spots): Implement `c-decl-start-kwds'.
 
         (c-other-decl-kwds, c-postfix-decl-spec-kwds, c-decl-hangon-kwds)
-        (c-decl-hangon-key, c-forward-decl-or-cast-1): Separated the
+        (c-decl-hangon-key, c-forward-decl-or-cast-1): Separate the
         handling of the compiler specific extension keywords into a new
         language constant `c-decl-hangon-kwds' that defines keyword
         clauses to be ignored in declarations.
@@ -4911,9 +5129,8 @@
         (c-forward-decl-or-cast-1): Recognize the declared identifier in
         class and enum declarations as such and not as part of the type.
 
-        (c-forward-decl-or-cast-1, c-forward-label): Relaxed the
-        interpretation of PRECEDING-TOKEN-END when there's no preceding
-        token.
+        (c-forward-decl-or-cast-1, c-forward-label): Relax the
+        interpretation of PRECEDING-TOKEN-END when there's no preceding token.
 
         (c-forward-decl-or-cast-1): Don't disregard sure signs of
         declarations when there's some syntax error later on.
@@ -4926,7 +5143,7 @@
 
         * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el, cc-menus.el
         * cc-mode.el, cc-styles.el, cc-vars.el, cc-align.el, cc-awk.el
-        * cc-cmds.el, cc-defs.el: Changed the policy for marking up
+        * cc-cmds.el, cc-defs.el: Change the policy for marking up
         functions that might do hidden buffer changes: All such internal
         functions are now marked instead of those that don't.
 
@@ -4941,10 +5158,10 @@
         (c-electric-semi&comma, c-electric-colon, c-electric-lt-gt)
         (c-electric-paren, c-electric-continued-statement, c-indent-command)
         (c-indent-region, c-mask-paragraph, c-indent-new-comment-line)
-        (c-context-line-break): Added `c-save-buffer-state' calls to comply
+        (c-context-line-break): Add `c-save-buffer-state' calls to comply
         with the changed semantics of the functions above.
 
-        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed a bug
+        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fix a bug
         when macros occur in obscure places.  Optimized the sexp movement
         a bit.
 
@@ -4976,13 +5193,13 @@
         * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el: Cleaned up the
         label handling.  Labels are now recognized in a uniform and more
         robust way, regardless of context.  Text properties are put on all
-        labels to recognize the following declarations better.  Multiword
-        labels are handled both in indentation and fontification for the
-        benefit of language extensions like Qt.  For consistency, keywords
-        in labels are now fontified with the label face instead.  That
-        also applies to "case" and "default".
+        labels to recognize the following declarations better.
+        Multiword labels are handled both in indentation and fontification for
+        the benefit of language extensions like Qt.  For consistency, keywords
+        in labels are now fontified with the label face instead.
+        That also applies to "case" and "default".
 
-        (c-beginning-of-statement-1): Fixed some bugs in the label
+        (c-beginning-of-statement-1): Fix some bugs in the label
         handling.  Disregard `c-nonlabel-token-key' in labels that begin
         with `c-label-kwds'.
 
@@ -4994,70 +5211,68 @@
 
         (c-forward-label): New function to recognize labels.
 
-        (c-guess-basic-syntax): Replaced uses of `c-label-key' with
+        (c-guess-basic-syntax): Replace uses of `c-label-key' with
         `c-forward-label'.  Moved the label recognition cases (14 and 15)
         earlier since they aren't so context sensitive now.  Handle labels
         on the top level gracefully.  Moved access label recognition to
         the generic label case (CASE 15) - removed CASE 5E.
 
-        (c-font-lock-declarations): Added recognition of labels in the
+        (c-font-lock-declarations): Add recognition of labels in the
         same round since we need to handle labels in parallell with other
         declarations to recognize both accurately.  It should also improve
         speed.
 
-        (c-simple-decl-matchers, c-basic-matchers-after): Moved
-        `c-font-lock-labels' so that it only is used on decoration level 2
+        (c-simple-decl-matchers, c-basic-matchers-after):
+        Move `c-font-lock-labels' so that it only is used on decoration level 2
         since `c-font-lock-declarations' handles it otherwise.
 
-        (c-complex-decl-matchers): Removed the simplistic recognition of
+        (c-complex-decl-matchers): Remove the simplistic recognition of
         access labels.
 
-        (c-decl-prefix-re): Removed the kludges that was necessary to cope
+        (c-decl-prefix-re): Remove the kludges that was necessary to cope
         with labels earlier.
 
         (c-decl-start-re): New language variable to make
         `c-font-lock-declarations' stop for the special protection labels
         in Objective-C that start with `@'.
 
-        (c-label-key): Removed since it's no longer used.
+        (c-label-key): Remove since it's no longer used.
 
         (c-recognize-colon-labels, c-label-prefix-re): New language
-        constants to support recognition of generic colon-terminated
-        labels.
+        constants to support recognition of generic colon-terminated labels.
 
         (c-type-decl-end-used): `c-decl-end' is now used whenever there
         are colon terminated labels.
 
-        * progmodes/cc-align.el (c-lineup-arglist): Fixed bug when the
+        * progmodes/cc-align.el (c-lineup-arglist): Fix bug when the
         first argument starts with a special brace list.
 
         * progmodes/cc-engine.el, cc-fonts.el (c-forward-decl-or-cast-1)
-        (c-font-lock-declarations): Broke out the declaration and cast
+        (c-font-lock-declarations): Break out the declaration and cast
         recognition from `c-font-lock-declarations' to a new function, so
         that it can be used in the indentation engine.
 
-        * progmodes/cc-engine.el (c-find-decl-spots): Fixed bug in backing
+        * progmodes/cc-engine.el (c-find-decl-spots): Fix bug in backing
         up to the start of the literal.  Fixed bug with the point on the
         wrong side of the search limit that could happen when the start
         position is inside a literal.
 
         * progmodes/cc-engine.el (c-parse-state)
-        (c-invalidate-state-cache): Modified the use of `c-state-cache-end'
+        (c-invalidate-state-cache): Modify the use of `c-state-cache-end'
         so that it's kept a little bit back to increase the hit rate.
 
-        (c-parse-state): Changed the macro handling and fixed some
+        (c-parse-state): Change the macro handling and fixed some
         glitches.  Macro context is checked more often than necessary now,
         but otoh less garbage conses are generated.
 
         * progmodes/cc-engine.el (c-parse-state)
         (c-invalidate-state-cache): Cache the last position where
         `c-state-cache' applies.  This can speed up refontification quite
-        a bit in blocks where there are many non-brace parens before the
-        point.
+        a bit in blocks where there are many non-brace parens before the point.
 
         (c-state-cache-end): New variable for this.
 
-        (c-guess-basic-syntax, c-debug-parse-state): Adapted for the new
+        (c-guess-basic-syntax, c-debug-parse-state): Adapt for the new
         cache variable.
 
         * progmodes/cc-engine.el (c-find-decl-spots): Take more care to
@@ -5068,39 +5283,39 @@
         region is a single line inside a literal or macro (typically when
         the current line is refontified).
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplified calls
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplify calls
         to `c-add-stmt-syntax' - there's no need to explicitly whack off
         entries from the paren state.
 
-        * progmodes/cc-engine.el (c-add-stmt-syntax): Narrowed down the
+        * progmodes/cc-engine.el (c-add-stmt-syntax): Narrow down the
         special case for "else if" clauses.
 
         * progmodes/cc-engine.el (c-looking-at-inexpr-block)
         (c-add-stmt-syntax): Use `c-recognize-paren-inexpr-blocks'.
 
-        * progmodes/cc-langs.el (c-recognize-paren-inexpr-blocks): New
-        language variable to recognize the gcc extension with statement
+        * progmodes/cc-langs.el (c-recognize-paren-inexpr-blocks):
+        New language variable to recognize the gcc extension with statement
         blocks inside expressions.
 
-        * progmodes/cc-engine.el (c-add-stmt-syntax): Restructured to make
+        * progmodes/cc-engine.el (c-add-stmt-syntax): Restructure to make
         it somewhat more comprehensible.  The argument AT-BLOCK-START is
         no longer used and hence removed.
 
-        (c-guess-continued-construct, c-guess-basic-syntax): Updated calls
+        (c-guess-continued-construct, c-guess-basic-syntax): Update calls
         to `c-add-stmt-syntax'.
 
-        * progmodes/cc-engine.el (c-backward-to-decl-anchor): Use
-        `c-beginning-of-statement-1' instead of duplicating parts of it.
+        * progmodes/cc-engine.el (c-backward-to-decl-anchor):
+        Use `c-beginning-of-statement-1' instead of duplicating parts of it.
         This fixes bogus label recognition.
 
         * progmodes/cc-engine.el (c-add-type, c-check-type)
-        (c-forward-name, c-forward-type): Improved storage of template
+        (c-forward-name, c-forward-type): Improve storage of template
         types in `c-found-types' so that they can be recognized better.
 
-        (c-syntactic-content): Added option to skip past nested parens.
+        (c-syntactic-content): Add option to skip past nested parens.
 
-        * progmodes/cc-engine.el (c-forward-name): Set
-        `c-last-identifier-range' all the time.  It's less work that way.
+        * progmodes/cc-engine.el (c-forward-name):
+        Set `c-last-identifier-range' all the time.  It's less work that way.
         Handle that there might not be an identifier to store in
         `c-last-identifier-range'.
 
@@ -5108,7 +5323,7 @@
         nil from `c-forward-name'.
 
         * progmodes/cc-defs.el (c-safe-scan-lists)
-        (c-(go-)?(up|down)-list-(forward|backward)): Added limit arguments.
+        (c-(go-)?(up|down)-list-(forward|backward)): Add limit arguments.
 
         * progmodes/cc-defs.el (c-save-buffer-state): Use `unwind-protect'
         to work even if the form fails.
@@ -5116,14 +5331,13 @@
         * progmodes/cc-engine.el (c-parse-state): Speedup when moving far
         down in a large file in one go.
 
-        (c-get-fallback-start-pos): New helper function for
-        `c-parse-state'.
+        (c-get-fallback-start-pos): New helper function for `c-parse-state'.
 
         * progmodes/cc-align.el (c-lineup-assignments): New lineup
         function which is like `c-lineup-math' but returns nil instead of
         `c-basic-offset' when it doesn't match.
 
-        (c-lineup-math): Changed to use `c-lineup-assignments'.
+        (c-lineup-math): Change to use `c-lineup-assignments'.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -5138,7 +5352,7 @@
         places to use skip by syntax instead of skip by char class.
 
         * progmodes/cc-langs.el (c-unterminated-block-comment-regexp):
-        Fixed a bug in the regexp that caused extreme backtracking.
+        Fix a bug in the regexp that caused extreme backtracking.
 
         * progmodes/cc-langs.el (c-block-comment-starter)
         (c-block-comment-ender): New language constants to specify in a
@@ -5157,18 +5371,16 @@
 
         (c-simple-ws): New language constant for simple whitespace.
 
-        * progmodes/cc-defs.el (c-concat-separated): New convenience
-        function.
+        * progmodes/cc-defs.el (c-concat-separated): New convenience function.
 
-        * progmodes/cc-defs.el (c-make-keywords-re): Added kludge for bug
+        * progmodes/cc-defs.el (c-make-keywords-re): Add kludge for bug
         in `regexp-opt' in Emacs 20 and XEmacs when strings contain
         newlines.  Allow and ignore nil elements in the list.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-cmds.el: Comment out a (n almost certainly
-        superfluous) check, (eq here (point-max)) in
-        c-beginning-of-statement.
+        superfluous) check, (eq here (point-max)) in c-beginning-of-statement.
 
         * progmodes/cc-cmds.el: Tidy up the comments in
         c-beginning-of-statement and subfunctions.
@@ -5177,8 +5389,7 @@
         more flexible c-put-char-property and c-clear-char-properties.
         Add the author's email address.
 
-        * progmodes/cc-langs.el: New variable,
-        c-block-comment-start-regexp.
+        * progmodes/cc-langs.el (c-block-comment-start-regexp): New variable.
 
         * progmodes/cc-cmds.el: Fix bug with M-e, when point is inside the
         closing "*/" of a block comment.
@@ -5202,11 +5413,11 @@
         * progmodes/cc-fonts.el (c-font-lock-invalid-string): Fix when
         there are several strings on the same line.
 
-        * progmodes/cc-engine.el (c-literal-limits): Removed the
+        * progmodes/cc-engine.el (c-literal-limits): Remove the
         compatibility function for older emacsen.  `c-literal-limits-fast'
         has now taken the place of this function.
 
-        * progmodes/cc-vars.el (c-emacs-features): Removed compatibility
+        * progmodes/cc-vars.el (c-emacs-features): Remove compatibility
         with older emacsen: We now require `pps-extended-state'.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
@@ -5222,19 +5433,18 @@
         eachother.  Correct a few incidental bugs.
 
         * progmodes/cc-cmds.el: Restructure c-beginning-of-statement:
-        Improve its doc-string.  Improve the handling of certain specific
-        cases.
+        Improve its doc-string.  Improve the handling of certain specific cases.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el
-        (c-guess-basic-syntax): Changed the way class-level labels are
+        (c-guess-basic-syntax): Change the way class-level labels are
         recognized; they can now contain essentially any symbols.
 
         (c-opt-extra-label-key): New language variable to cope with the
         special protection label syntax in Objective-C.
 
-        (c-opt-access-key): Removed; this is now handled better by
+        (c-opt-access-key): Remove; this is now handled better by
         `c-nonlabel-token-key' and `c-opt-extra-label-key'.
 
         (c-complex-decl-matchers): Update to handle that
@@ -5247,11 +5457,11 @@
         Recognize bitfields better.
 
         * progmodes/cc-engine.el (c-beginning-of-inheritance-list):
-        Removed some cruft and fixed a bug that could cause it to go to a
+        Remove some cruft and fixed a bug that could cause it to go to a
         position further down.
 
         * progmodes/cc-langs.el, cc-engine.el
-        (c-beginning-of-statement-1): Improved detection of labels in
+        (c-beginning-of-statement-1): Improve detection of labels in
         declaration contexts.
 
         (c-beginning-of-decl-1): Use it.
@@ -5259,11 +5469,11 @@
         (c-nonlabel-token-key): New language constant and variable needed
         by `c-beginning-of-statement-1'.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug that
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Fix bug that
         manifested itself due to the correction in `c-forward-sexp'.
 
-        * progmodes/cc-defs.el (c-forward-sexp, c-backward-sexp): Made
-        these behave as documented when used at the buffer limits.
+        * progmodes/cc-defs.el (c-forward-sexp, c-backward-sexp):
+        Make these behave as documented when used at the buffer limits.
 
         * progmodes/cc-mode.el, cc-engine.el, cc-langs.el
         (c-type-decl-end-used): Made this a language variable.
@@ -5272,20 +5482,20 @@
         correctly when `combine-after-change-calls' is used together with
         temporary narrowings.
 
-        * progmodes/cc-engine.el (c-beginning-of-statement-1): Report
-        labels correctly when the start point is immediately after the
+        * progmodes/cc-engine.el (c-beginning-of-statement-1):
+        Report labels correctly when the start point is immediately after the
         colon.
 
-        * progmodes/cc-defs.el (c-parse-sexp-lookup-properties): Removed
-        since it isn't used anymore.
+        * progmodes/cc-defs.el (c-parse-sexp-lookup-properties):
+        Remove since it isn't used anymore.
 
         * progmodes/cc-cmds.el (c-electric-lt-gt): Detect and mark angle
         bracket arglists such as template parens in C++.
 
-        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fixed a bug
+        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fix a bug
         in the last check-in.  Some optimization.
 
-        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fixed bug
+        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fix bug
         where it could stop at the same level in a preceding sexp when
         PAREN-LEVEL is set.
 
@@ -5293,7 +5503,7 @@
         text property lookup only when it's needed.
 
         * progmodes/cc-langs.el, cc-engine.el, cc-fonts.el, cc-mode.el:
-        Changed the policy for paren marked angle brackets to be more
+        Change the policy for paren marked angle brackets to be more
         persistent; once marked they remain marked even when they're found
         to be unbalanced in the searched region.  This should keep the
         paren syntax around even when individual lines are refontified in
@@ -5307,7 +5517,7 @@
         (c-forward-<>-arglist, c-forward-<>-arglist-recur): The reparse
         argument has become `c-parse-and-markup-<>-arglists'.
 
-        (c-remove-<>-arglist-properties): Removed - no longer used.
+        (c-remove-<>-arglist-properties): Remove - no longer used.
 
         (c-after-change-check-<>-operators): New function used on
         `after-change-functions' to avoid that "<" and ">" characters that
@@ -5319,28 +5529,26 @@
         (c-after-change): Call `c-after-change-check-<>-operators'.
 
         (c-font-lock-<>-arglists): Use the context properties set by
-        `c-font-lock-declarations' to set
-        `c-disallow-comma-in-<>-arglists' correctly to avoid doing invalid
-        markup.
+        `c-font-lock-declarations' to set `c-disallow-comma-in-<>-arglists'
+        correctly to avoid doing invalid markup.
 
-        (c-font-lock-declarations): Removed code that undoes the invalid
+        (c-font-lock-declarations): Remove code that undoes the invalid
         markup done by `c-font-lock-<>-arglists'.
 
         (c-complex-decl-matchers): `c-font-lock-<>-arglists' now runs
         after `c-font-lock-declarations'.
 
-        * progmodes/cc-engine.el (c-syntactic-skip-backward): Added
-        paren-level feature.
+        * progmodes/cc-engine.el (c-syntactic-skip-backward):
+        Add paren-level feature.
 
-        (c-guess-basic-syntax): Improved the anchor position for
+        (c-guess-basic-syntax): Improve the anchor position for
         `template-args-cont' in nested template arglists.  There's still
         much to be desired in this area, though.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-cmds.el, cc-engine.el, cc-langs.el, cc-vars.el:
-        Make the "Text Filling and Line Breaking" commands work for AWK
-        buffers.
+        Make the "Text Filling and Line Breaking" commands work for AWK buffers.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
@@ -5379,7 +5587,7 @@
 
 2005-12-08  Kim F. Storm  <storm@cua.dk>
 
-        * emulation/cua-base.el (cua-use-hyper-key): Replaced by ...
+        * emulation/cua-base.el (cua-use-hyper-key): Replace by ...
         (cua-rectangle-modifier-key): ... this.  New defcustom.  Can now
         select either meta, hyper, or super modifier for rectangle commands.
         (cua--rectangle-modifier-key): New defvar.
@@ -5388,8 +5596,8 @@
         on X, to meta otherwise.  Always bind C-return to toggle
         rectangle.  Pass ?\s instead of `space' to cua--M/H-key.
 
-        * emulation/cua-rect.el (cua-help-for-rectangle): Use
-        cua--rectangle-modifier-key.  Handle super modifier too.
+        * emulation/cua-rect.el (cua-help-for-rectangle):
+        Use cua--rectangle-modifier-key.  Handle super modifier too.
         (cua--init-rectangles): Always bind C-return to toggle rectangle.
         Pass ?\s instead of `space' to cua--M/H-key and cua--rect-M/H-key.
 
@@ -5400,8 +5608,8 @@
         keymap if cua--prefix-override-timer is `shift'.
         (cua--shift-control-prefix): New function; emulate "type prefix
         key twice" functionality to handle shifted prefix key override.
-        (cua--shift-control-c-prefix, cua--shift-control-x-prefix): New
-        commands.
+        (cua--shift-control-c-prefix, cua--shift-control-x-prefix):
+        New commands.
         (cua--init-keymaps): Bind them to S-C-c and S-C-x.
 
 2005-12-08  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/cus-edit.el b/lisp/cus-edit.el
index 74e63454ad9..e2275ce356d 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3412,12 +3412,12 @@ Optional EVENT is the location for the menu."
       ;; Make the comment invisible by hand if it's empty
       (custom-comment-hide comment-widget))
     (put symbol 'customized-face value)
+    (custom-push-theme 'theme-face symbol 'user 'set value)
     (if (face-spec-choose value)
         (face-spec-set symbol value)
       ;; face-set-spec ignores empty attribute lists, so just give it
       ;; something harmless instead.
       (face-spec-set symbol '((t :foreground unspecified))))
-    (custom-push-theme 'theme-face symbol 'user 'set value)
     (put symbol 'customized-face-comment comment)
     (put symbol 'face-comment comment)
     (custom-face-state-set widget)
@@ -3490,13 +3490,17 @@ restoring it to the state of a face that has never been customized."
     (put symbol 'customized-face nil)
     (put symbol 'customized-face-comment nil)
     (custom-push-theme 'theme-face symbol 'user 'reset)
+    (face-spec-set symbol value)
     (custom-theme-recalc-face symbol)
     (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment))
       (put symbol 'saved-face nil)
       (put symbol 'saved-face-comment nil)
       (custom-save-all))
     (put symbol 'face-comment nil)
-    (widget-value-set child value)
+    (widget-value-set child
+                      (custom-pre-filter-face-spec
+                       (list (list t (custom-face-attributes-get
+                                      symbol nil)))))
     ;; This call manages the comment visibility
     (widget-value-set comment-widget "")
     (custom-face-state-set widget)
diff --git a/lisp/custom.el b/lisp/custom.el
index 15b5b4a815c..c67f3b06272 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -819,7 +819,8 @@ See `custom-known-themes' for a list of known themes."
                          (not (equal (eval (car (get symbol 'standard-value)))
                                      (symbol-value symbol)))))
                 (setq old (list (list 'changed (symbol-value symbol))))
-              (if (facep symbol)
+              (if (and (facep symbol)
+                       (not (face-spec-match-p symbol (get symbol 'face-defface-spec))))
                   (setq old (list (list 'changed (list
                     (append '(t) (custom-face-attributes-get symbol nil)))))))))
         (put symbol prop (cons (list theme value) old))
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 09645864573..7c7f7902d82 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -274,7 +274,7 @@ when editing big diffs)."
 (defvar diff-indicator-changed-face 'diff-indicator-changed)
 
 (defface diff-function
-  '((t :inherit diff-context))
+  '((t :inherit diff-header))
   "`diff-mode' face used to highlight function names produced by \"diff -p\"."
   :group 'diff-mode)
 ;; backward-compatibility alias
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 cdc0cb7fea3..e7888dbdb0e 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 120866e7925..53056d667fb 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -799,8 +799,8 @@ If command is repeated at same position, delete the rectangle."
                                 (if cua--virtual-edges-debug ?, ?\s))
                                'face rface))
                      (if (cua--rectangle-right-side)
-                         (put-text-property (1- (length ms)) (length ms) 'cursor t ms)
-                       (put-text-property 0 1 'cursor t ms))
+                         (put-text-property (1- (length ms)) (length ms) 'cursor 2 ms)
+                       (put-text-property 0 1 'cursor 2 ms))
                      (setq bs (concat bs ms))
                      (setq rface nil))
                     (t
@@ -810,8 +810,8 @@ If command is repeated at same position, delete the rectangle."
                                 (if cua--virtual-edges-debug ?~ ?\s))
                                'face rface))
                      (if (cua--rectangle-right-side)
-                         (put-text-property (1- (length as)) (length as) 'cursor t as)
-                       (put-text-property 0 1 'cursor t as))
+                         (put-text-property (1- (length as)) (length as) 'cursor 2 as)
+                       (put-text-property 0 1 'cursor 2 as))
                      (if (/= pr le)
                          (setq e (1- e))))))))
              ;; Trim old leading overlays.
@@ -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 c093a5222b2..affb22b2586 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -990,6 +990,20 @@ documentation for additional customization information."
     (pop-to-buffer buffer t norecord)
     (raise-frame (window-frame (selected-window)))))
 
+(defun display-buffer-other-frame (buffer)
+  "Switch to buffer BUFFER in another frame.
+This uses the function `display-buffer' as a subroutine; see its
+documentation for additional customization information."
+  (interactive "BDisplay buffer in other frame: ")
+  (let ((pop-up-frames t)
+        same-window-buffer-names same-window-regexps
+        (old-window (selected-window))
+        new-window)
+    (setq new-window (display-buffer buffer t))
+    (lower-frame (window-frame new-window))
+    (make-frame-invisible (window-frame old-window))
+    (make-frame-visible (window-frame old-window))))
+
 (defvar find-file-default nil
   "Used within `find-file-read-args'.")
 
@@ -5137,6 +5151,7 @@ With prefix arg, silently save all file-visiting buffers, then kill."
 (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-5-map "\C-o" 'display-buffer-other-frame)
 
 ;; arch-tag: bc68d3ea-19ca-468b-aac6-3a4a7766101f
 ;;; files.el ends here
diff --git a/lisp/frame.el b/lisp/frame.el
index 8437475dfd6..d041da254f5 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -767,7 +767,7 @@ If there is no frame by that name, signal an error."
     (raise-frame frame)
     (select-frame frame)
     ;; Ensure, if possible, that frame gets input focus.
-    (cond ((eq window-system 'x)
+    (cond ((memq window-system '(x mac))
            (x-focus-frame frame))
           ((eq window-system 'w32)
            (w32-focus-frame frame)))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 48bbc095375..71940cac0db 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,55 @@
+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.
+        Don't `gnus-uncompress-range' to avoid excessive memory usage.
+
+2006-03-21  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-agent.el (gnus-agent-queue-mail): Fix custom tag for `t'.
+
+        * spam.el (spam-mark-new-messages-in-spam-group-as-spam): Add
+        comment on version.
+
+2006-03-20  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * spam.el (spam-mark-new-messages-in-spam-group-as-spam): New
+        variable.
+        (spam-mark-junk-as-spam-routine): Use it.  Allow to disable
+        assigning the spam-mark to new messages.
+
+2006-03-20  Adam Sj,Ax(Bgren  <asjo@koldfront.dk>  (tiny change)
+
+        (spam-ham-copy-or-move-routine): Don't declare `todo' twice.
+
+2006-03-20  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * smiley.el: Add missing test smiley.
+
 2006-03-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * mm-decode.el (mm-with-part): New macro.
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index c467c296fa0..123ad340ae1 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -204,7 +204,7 @@ queue.  Otherwise, queue if and only if unplugged."
   :group 'gnus-agent
   :type '(radio (const :format "Always" always)
                 (const :format "Never" nil)
-                (const :format "When plugged" t)))
+                (const :format "When unplugged" t)))
 
 (defcustom gnus-agent-prompt-send-queue nil
   "If non-nil, `gnus-group-send-queue' will prompt if called when
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 566aabcc6ba..6ae004a2a3b 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -792,7 +792,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/nnimap.el b/lisp/gnus/nnimap.el
index 3c05b3713ea..bada9da6891 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1127,18 +1127,12 @@ function is generally only called when Gnus is shutting down."
           (let (seen unseen)
             ;; read info could contain articles marked unread by other
             ;; imap clients!  we correct this
-            (setq seen (gnus-uncompress-range (gnus-info-read info))
-                  unseen (imap-search "UNSEEN UNDELETED")
-                  seen (gnus-set-difference seen unseen)
-                  ;; seen might lack articles marked as read by other
-                  ;; imap clients! we correct this
-                  seen (append seen (imap-search "SEEN"))
-                  ;; remove dupes
-                  seen (sort seen '<)
-                  seen (gnus-compress-sequence seen t)
-                  ;; we can't return '(1) since this isn't a "list of ranges",
-                  ;; and we can't return '((1)) since g-list-of-unread-articles
-                  ;; is buggy so we return '((1 . 1)).
+            (setq unseen (gnus-compress-sequence
+                          (imap-search "UNSEEN UNDELETED"))
+                  seen (gnus-range-difference (gnus-info-read info) unseen)
+                  seen (gnus-range-add seen
+                                       (gnus-compress-sequence
+                                        (imap-search "SEEN")))
                   seen (if (and (integerp (car seen))
                                 (null (cdr seen)))
                            (list (cons (car seen) (car seen)))
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/gnus/smiley.el b/lisp/gnus/smiley.el
index e8afe9dd10d..6476340f7bf 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -42,6 +42,7 @@
 ;; indifferent       :-|
 ;; wry               :-/  :-\
 ;; sad               :-(
+;; frown             :-{
 ;; evil              >:-)
 ;; cry               ;-(
 ;; dead              X-)
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index ed5fd6e7980..047035536f2 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -100,6 +100,12 @@ spam groups."
   :type 'boolean
   :group 'spam)
 
+(defcustom spam-mark-new-messages-in-spam-group-as-spam t
+  "Whether new messages in a spam group should get the spam-mark."
+  :type 'boolean
+  ;; :version "22.1" ;; Gnus 5.10.8 / No Gnus 0.3
+  :group 'spam)
+
 (defcustom spam-log-to-registry nil
   "Whether spam/ham processing should be logged in the registry."
   :type 'boolean
@@ -676,15 +682,17 @@ spam-use-* variable.")
   ;; check the global list of group names spam-junk-mailgroups and the
   ;; group parameters
   (when (spam-group-spam-contents-p gnus-newsgroup-name)
-    (gnus-message 5 "Marking %s articles as spam"
+    (gnus-message 6 "Marking %s articles as spam"
                   (if spam-mark-only-unseen-as-spam
                       "unseen"
                     "unread"))
     (let ((articles (if spam-mark-only-unseen-as-spam
                         gnus-newsgroup-unseen
                       gnus-newsgroup-unreads)))
-      (dolist (article articles)
-        (gnus-summary-mark-article article gnus-spam-mark)))))
+      (if spam-mark-new-messages-in-spam-group-as-spam
+          (dolist (article articles)
+            (gnus-summary-mark-article article gnus-spam-mark))
+        (gnus-message 9 "Did not mark new messages as spam.")))))
 
 (defun spam-mark-spam-as-expired-and-move-routine (&rest groups)
   (if (and (car-safe groups) (listp (car-safe groups)))
@@ -732,7 +740,7 @@ spam-use-* variable.")
          (gnus-check-backend-function
           'request-move-article gnus-newsgroup-name))
         (respool-method (gnus-find-method-for-group gnus-newsgroup-name))
-        article mark todo deletep respool)
+        article mark deletep respool)
 
     (when (member 'respool groups)
       (setq respool t)                  ; boolean for later
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index c2e1f59e578..94621535154 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -40,7 +40,7 @@
 
 (define-key help-mode-map [mouse-2] 'help-follow-mouse)
 (define-key help-mode-map "\C-c\C-b" 'help-go-back)
-(define-key help-mode-map "\C-c\C-c" 'help-follow)
+(define-key help-mode-map "\C-c\C-c" 'help-follow-symbol)
 ;; Documentation only, since we use minor-mode-overriding-map-alist.
 (define-key help-mode-map "\r" 'help-follow)
 
@@ -233,10 +233,10 @@ Commands:
   "Label to use by `help-make-xrefs' for the go-back reference.")
 
 (defconst help-xref-symbol-regexp
-  (purecopy (concat "\\(\\<\\(\\(variable\\|option\\)\\|"
-                    "\\(function\\|command\\)\\|"
-                    "\\(face\\)\\|"
-                    "\\(symbol\\)\\|"
+  (purecopy (concat "\\(\\<\\(\\(variable\\|option\\)\\|"  ; Link to var
+                    "\\(function\\|command\\)\\|"          ; Link to function
+                    "\\(face\\)\\|"                        ; Link to face
+                    "\\(symbol\\|program\\)\\|"            ; Don't link
                     "\\(source \\(?:code \\)?\\(?:of\\|for\\)\\)\\)"
                     "[ \t\n]+\\)?"
                     ;; Note starting with word-syntax character:
@@ -584,15 +584,6 @@ help buffer."
 
 ;; Navigation/hyperlinking with xrefs
 
-(defun help-follow-mouse (click)
-  "Follow the cross-reference that you CLICK on."
-  (interactive "e")
-  (let* ((start (event-start click))
-         (window (car start))
-         (pos (car (cdr start))))
-    (with-current-buffer (window-buffer window)
-      (help-follow pos))))
-
 (defun help-xref-go-back (buffer)
   "From BUFFER, go back to previous help buffer text using `help-xref-stack'."
   (let (item position method args)
@@ -627,26 +618,38 @@ a proper [back] button."
   (let ((help-xref-following t))
     (apply function args)))
 
-(defun help-follow (&optional pos)
-  "Follow cross-reference at POS, defaulting to point.
+;; The doc string is meant to explain what buttons do.
+(defun help-follow-mouse ()
+  "Follow the cross-reference that you click on."
+  (interactive)
+  (error "No cross-reference here"))
+
+;; The doc string is meant to explain what buttons do.
+(defun help-follow ()
+  "Follow cross-reference at point.
 
 For the cross-reference format, see `help-make-xrefs'."
+  (interactive)
+  (error "No cross-reference here"))
+
+(defun help-follow-symbol (&optional pos)
+  "In help buffer, show docs for symbol at POS, defaulting to point.
+Show all docs for that symbol as either a variable, function or face."
   (interactive "d")
   (unless pos
     (setq pos (point)))
-  (unless (push-button pos)
-    ;; check if the symbol under point is a function or variable
-    (let ((sym
-           (intern
-            (save-excursion
-              (goto-char pos) (skip-syntax-backward "w_")
-              (buffer-substring (point)
-                                (progn (skip-syntax-forward "w_")
-                                       (point)))))))
-      (when (or (boundp sym)
-                (get sym 'variable-documentation)
-                (fboundp sym) (facep sym))
-        (help-do-xref pos #'help-xref-interned (list sym))))))
+  ;; check if the symbol under point is a function, variable or face
+  (let ((sym
+         (intern
+          (save-excursion
+            (goto-char pos) (skip-syntax-backward "w_")
+            (buffer-substring (point)
+                              (progn (skip-syntax-forward "w_")
+                                     (point)))))))
+    (when (or (boundp sym)
+              (get sym 'variable-documentation)
+              (fboundp sym) (facep sym))
+      (help-do-xref pos #'help-xref-interned (list sym)))))
 
 (defun help-insert-string (string)
   "Insert STRING to the help buffer and install xref info for it.
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/image.el b/lisp/image.el
index 4346d346829..2212b0fb471 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -79,7 +79,7 @@ value is used as a list of directories to search.")
 
 
 (defun image-load-path-for-library (library image &optional path no-error)
-  "Return a suitable search path for images used by the Lisp package LIBRARY.
+  "Return a suitable search path for images used by LIBRARY.
 
 It searches for IMAGE in `image-load-path' (excluding
 \"`data-directory'/images\") and `load-path', followed by a path
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index dcf46878aa2..b9860fd05b6 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -409,6 +409,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/jit-lock.el b/lisp/jit-lock.el
index 84e0dc0cab3..0e131b665ef 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -301,7 +301,7 @@ Only applies to the current buffer."
 This function is added to `fontification-functions' when `jit-lock-mode'
 is active."
   (when (and jit-lock-mode (not memory-full))
-    (if (null jit-lock-defer-time)
+    (if (null jit-lock-defer-timer)
         ;; No deferral.
         (jit-lock-fontify-now start (+ start jit-lock-chunk-size))
       ;; Record the buffer for later fontification.
@@ -510,7 +510,7 @@ This functions is called after Emacs has been idle for
                    (setq pos (next-single-property-change pos 'fontified)))))))))
     (setq jit-lock-defer-buffers nil)
     ;; Force fontification of the visible parts.
-    (let ((jit-lock-defer-time nil))
+    (let ((jit-lock-defer-timer nil))
       ;; (message "Jit-Defer Now")
       (sit-for 0)
       ;; (message "Jit-Defer Done")
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 413a24559fb..6e2bc5c8eb5 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" (17140 20945))
+;;;;;;  "play/5x5.el" (17382 1892))
 ;;; 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"
+;;;;;;  (17403 28587))
+;;; 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"
-;;;;;;  (17276 44726))
+;;;;;;  (17388 18084))
 ;;; 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"
-;;;;;;  (17140 20951))
+;;;;;;  (17388 22063))
 ;;; 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"
-;;;;;;  (17205 6160))
+;;;;;;  (17388 22063))
 ;;; 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" (17245
-;;;;;;  16459))
+;;;;;;  ad-redefinition-action) "advice" "emacs-lisp/advice.el" (17383
+;;;;;;  16118))
 ;;; 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" (17320 4537))
+;;;;;;  align) "align" "align.el" (17383 24123))
 ;;; 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"
-;;;;;;  (17296 51181))
+;;;;;;  (17431 34439))
 ;;; 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" (17244 43756))
+;;;;;;  "net/ange-ftp.el" (17383 13296))
 ;;; 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" (17239 32364))
+;;;;;;  "animate" "play/animate.el" (17382 1892))
 ;;; 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" (17185 27398))
+;;;;;;  "ansi-color" "ansi-color.el" (17383 24123))
 ;;; 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" (17205 20021))
+;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (17388 22063))
 ;;; 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" (17307 14150))
+;;;;;;  appt-issue-message) "appt" "calendar/appt.el" (17403 28563))
 ;;; 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" (17328 26188))
+;;;;;;  "apropos.el" (17443 62455))
 ;;; 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
-;;;;;;  25495))
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17422
+;;;;;;  14887))
 ;;; 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" (17239
-;;;;;;  32406))
+;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17383
+;;;;;;  15658))
 ;;; 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" (17349
-;;;;;;  14590))
+;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17388
+;;;;;;  22063))
 ;;; 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"
-;;;;;;  (17148 24940))
+;;;;;;  (17383 24124))
 ;;; 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"
-;;;;;;  (17185 27619))
+;;;;;;  (17388 22063))
 ;;; 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" (17148 24940))
+;;;;;;  "autoinsert" "autoinsert.el" (17383 24124))
 ;;; 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"
-;;;;;;  (17298 27296))
+;;;;;;  (17410 23724))
 ;;; 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" (17148 24940))
+;;;;;;  "autorevert" "autorevert.el" (17383 24124))
 ;;; 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" (17148 24940))
+;;;;;;  "avoid.el" (17383 24124))
 ;;; 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"
-;;;;;;  (17148 25082))
+;;;;;;  (17383 16118))
 ;;; 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"
-;;;;;;  (17359 55783))
+;;;;;;  (17427 20614))
 ;;; 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" (17148 25082))
+;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (17383 16118))
 ;;; 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" (17359
-;;;;;;  55795))
+;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17437
+;;;;;;  53997))
 ;;; 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"
-;;;;;;  (17148 25105))
+;;;;;;  (17382 1052))
 ;;; 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" (17246
-;;;;;;  40260))
+;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17382
+;;;;;;  1892))
 ;;; 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" (17270 26061))
+;;;;;;  bookmark-set) "bookmark" "bookmark.el" (17383 24124))
 ;;; 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" (17279 31149))
+;;;;;;  "browse-url" "net/browse-url.el" (17383 13296))
 ;;; 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" (17140
-;;;;;;  20945))
+;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17382
+;;;;;;  1892))
 ;;; 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" (17375 39071))
+;;;;;;  "bs" "bs.el" (17395 3136))
 ;;; 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" (17328
-;;;;;;  38637))
+;;;;;;  make-button define-button-type) "button" "button.el" (17383
+;;;;;;  24124))
 ;;; 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" (17307 14150))
+;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17385 41891))
 ;;; 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"
-;;;;;;  (17307 14150))
+;;;;;;  (17385 41891))
 ;;; 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"
-;;;;;;  (17291 34530))
+;;;;;;  (17382 10215))
 ;;; 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" (17148
-;;;;;;  24944))
+;;;### (autoloads (calculator) "calculator" "calculator.el" (17383
+;;;;;;  24124))
 ;;; 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" (17366 25839))
+;;;;;;  "calendar/calendar.el" (17425 13433))
 ;;; 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" (17148 25106))
+;;;;;;  "gnus/canlock.el" (17382 1052))
 ;;; 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"
-;;;;;;  (17315 15382))
+;;;;;;  (17407 10030))
 ;;; 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"
-;;;;;;  (17296 51210))
+;;;;;;  (17407 10030))
 ;;; 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" (17296 51210))
+;;;;;;  "progmodes/cc-styles.el" (17407 10030))
 ;;; 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" (17296
-;;;;;;  15980))
+;;;### (autoloads nil "cc-subword" "progmodes/cc-subword.el" (17388
+;;;;;;  22063))
 ;;; 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"
-;;;;;;  (17140 20960))
+;;;;;;  (17388 22063))
 ;;; 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"
-;;;;;;  (17239 32275))
+;;;;;;  (17383 16118))
 ;;; 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" (17148 24944))
+;;;;;;  "chistory" "chistory.el" (17383 24124))
 ;;; 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" (17374 39354))
+;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17383 16118))
 ;;; 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"
-;;;;;;  (17148 25088))
+;;;;;;  (17383 16118))
 ;;; 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"
-;;;;;;  (17205 6162))
+;;;;;;  (17388 22063))
 ;;; 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" (17148
-;;;;;;  24945))
+;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17383
+;;;;;;  24124))
 ;;; Generated autoloads from cmuscheme.el
 
 (autoload (quote run-scheme) "cmuscheme" "\
@@ -4265,7 +4282,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"
-;;;;;;  (17277 6644))
+;;;;;;  (17447 42828))
 ;;; Generated autoloads from comint.el
 
 (defvar comint-output-filter-functions (quote (comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)) "\
@@ -4355,8 +4372,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use.
 
 ;;;***
 
-;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17305
-;;;;;;  44991))
+;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17406
+;;;;;;  11270))
 ;;; Generated autoloads from compare-w.el
 
 (autoload (quote compare-windows) "compare-w" "\
@@ -4393,7 +4410,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" (17310 14110))
+;;;;;;  "compile" "progmodes/compile.el" (17388 22062))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -4554,7 +4571,7 @@ This is the value of `next-error-function' in Compilation buffers.
 ;;;***
 
 ;;;### (autoloads (partial-completion-mode) "complete" "complete.el"
-;;;;;;  (17315 15381))
+;;;;;;  (17420 38637))
 ;;; Generated autoloads from complete.el
 
 (defvar partial-completion-mode nil "\
@@ -4597,7 +4614,7 @@ second TAB brings up the `*Completions*' buffer.
 ;;;***
 
 ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el"
-;;;;;;  (17366 63944))
+;;;;;;  (17383 24124))
 ;;; Generated autoloads from completion.el
 
 (defvar dynamic-completion-mode nil "\
@@ -4841,7 +4858,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" (17251 52024))
+;;;;;;  conf-mode) "conf-mode" "textmodes/conf-mode.el" (17383 15658))
 ;;; Generated autoloads from textmodes/conf-mode.el
 
 (autoload (quote conf-mode) "conf-mode" "\
@@ -4990,7 +5007,7 @@ For details see `conf-mode'.  Example:
 ;;;***
 
 ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie)
-;;;;;;  "cookie1" "play/cookie1.el" (17140 20945))
+;;;;;;  "cookie1" "play/cookie1.el" (17382 1892))
 ;;; Generated autoloads from play/cookie1.el
 
 (autoload (quote cookie) "cookie1" "\
@@ -5022,7 +5039,7 @@ Randomly permute the elements of VECTOR (all permutations equally likely).
 ;;;***
 
 ;;;### (autoloads (copyright copyright-fix-years copyright-update)
-;;;;;;  "copyright" "emacs-lisp/copyright.el" (17148 25089))
+;;;;;;  "copyright" "emacs-lisp/copyright.el" (17383 16118))
 ;;; Generated autoloads from emacs-lisp/copyright.el
 
 (autoload (quote copyright-update) "copyright" "\
@@ -5050,7 +5067,7 @@ Insert a copyright by $ORGANIZATION notice at cursor.
 ;;;***
 
 ;;;### (autoloads (cperl-mode) "cperl-mode" "progmodes/cperl-mode.el"
-;;;;;;  (17276 44726))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 
 (autoload (quote cperl-mode) "cperl-mode" "\
@@ -5223,7 +5240,7 @@ or as help on variables `cperl-tips', `cperl-problems',
 ;;;***
 
 ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el"
-;;;;;;  (17359 40965))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/cpp.el
 
 (autoload (quote cpp-highlight-buffer) "cpp" "\
@@ -5242,7 +5259,7 @@ Edit display information for cpp conditionals.
 ;;;***
 
 ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el"
-;;;;;;  (17140 20920))
+;;;;;;  (17383 13536))
 ;;; Generated autoloads from emulation/crisp.el
 
 (defvar crisp-mode nil "\
@@ -5266,7 +5283,7 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise.
 ;;;***
 
 ;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el"
-;;;;;;  (17315 15382))
+;;;;;;  (17383 16118))
 ;;; Generated autoloads from emacs-lisp/crm.el
 
 (autoload (quote completing-read-multiple) "crm" "\
@@ -5302,7 +5319,7 @@ INHERIT-INPUT-METHOD.
 ;;;***
 
 ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
-;;;;;;  (17377 26465))
+;;;;;;  (17444 38116))
 ;;; Generated autoloads from emulation/cua-base.el
 
 (defvar cua-mode nil "\
@@ -5369,7 +5386,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" (17369 18480))
+;;;;;;  customize-set-value) "cus-edit" "cus-edit.el" (17440 11610))
 ;;; Generated autoloads from cus-edit.el
  (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'")
 
@@ -5627,7 +5644,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" (17337 17201))
+;;;;;;  custom-declare-face) "cus-face" "cus-face.el" (17383 24124))
 ;;; Generated autoloads from cus-face.el
 
 (autoload (quote custom-declare-face) "cus-face" "\
@@ -5697,7 +5714,7 @@ This means reset FACE to its value in FROM-THEME.
 ;;;***
 
 ;;;### (autoloads (customize-create-theme) "cus-theme" "cus-theme.el"
-;;;;;;  (17351 13490))
+;;;;;;  (17394 38146))
 ;;; Generated autoloads from cus-theme.el
 
 (autoload (quote customize-create-theme) "cus-theme" "\
@@ -5708,7 +5725,7 @@ Create a custom theme.
 ;;;***
 
 ;;;### (autoloads (cvs-status-mode) "cvs-status" "cvs-status.el"
-;;;;;;  (17148 24952))
+;;;;;;  (17383 24124))
 ;;; Generated autoloads from cvs-status.el
 
 (autoload (quote cvs-status-mode) "cvs-status" "\
@@ -5719,7 +5736,7 @@ Mode used for cvs status output.
 ;;;***
 
 ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode)
-;;;;;;  "cwarn" "progmodes/cwarn.el" (17298 27296))
+;;;;;;  "cwarn" "progmodes/cwarn.el" (17388 22062))
 ;;; Generated autoloads from progmodes/cwarn.el
 
 (autoload (quote cwarn-mode) "cwarn" "\
@@ -5792,7 +5809,7 @@ If the argument is nil, we return the display table to its standard state.
 ;;;***
 
 ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el"
-;;;;;;  (17290 15905))
+;;;;;;  (17383 24124))
 ;;; Generated autoloads from dabbrev.el
  (define-key esc-map "/" 'dabbrev-expand)
  (define-key esc-map [?\C-/] 'dabbrev-completion)
@@ -5836,8 +5853,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion].
 
 ;;;***
 
-;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17276
-;;;;;;  44726))
+;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17388
+;;;;;;  22062))
 ;;; Generated autoloads from progmodes/dcl-mode.el
 
 (autoload (quote dcl-mode) "dcl-mode" "\
@@ -5964,7 +5981,7 @@ There is some minimal font-lock support (see vars
 ;;;***
 
 ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug"
-;;;;;;  "emacs-lisp/debug.el" (17244 54746))
+;;;;;;  "emacs-lisp/debug.el" (17438 13119))
 ;;; Generated autoloads from emacs-lisp/debug.el
 
 (setq debugger (quote debug))
@@ -6008,7 +6025,7 @@ To specify a nil argument interactively, exit with an empty minibuffer.
 ;;;***
 
 ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el"
-;;;;;;  (17205 6149))
+;;;;;;  (17382 1892))
 ;;; Generated autoloads from play/decipher.el
 
 (autoload (quote decipher) "decipher" "\
@@ -6037,8 +6054,8 @@ The most useful commands are:
 ;;;***
 
 ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region
-;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (17148
-;;;;;;  24953))
+;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (17383
+;;;;;;  24124))
 ;;; Generated autoloads from delim-col.el
 
 (autoload (quote delimit-columns-customize) "delim-col" "\
@@ -6062,8 +6079,8 @@ START and END delimits the corners of text rectangle.
 
 ;;;***
 
-;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17333
-;;;;;;  17859))
+;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17388
+;;;;;;  22062))
 ;;; Generated autoloads from progmodes/delphi.el
 
 (autoload (quote delphi-mode) "delphi" "\
@@ -6113,8 +6130,8 @@ no args, if that value is non-nil.
 
 ;;;***
 
-;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17159
-;;;;;;  1461))
+;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17383
+;;;;;;  24124))
 ;;; Generated autoloads from delsel.el
 
 (defalias (quote pending-delete-mode) (quote delete-selection-mode))
@@ -6144,7 +6161,7 @@ any selection.
 ;;;***
 
 ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode)
-;;;;;;  "derived" "emacs-lisp/derived.el" (17298 27296))
+;;;;;;  "derived" "emacs-lisp/derived.el" (17383 16118))
 ;;; Generated autoloads from emacs-lisp/derived.el
 
 (autoload (quote define-derived-mode) "derived" "\
@@ -6209,7 +6226,7 @@ the first time the mode is used.
 ;;;***
 
 ;;;### (autoloads (describe-char describe-text-properties) "descr-text"
-;;;;;;  "descr-text.el" (17329 62402))
+;;;;;;  "descr-text.el" (17383 24124))
 ;;; Generated autoloads from descr-text.el
 
 (autoload (quote describe-text-properties) "descr-text" "\
@@ -6234,7 +6251,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" (17364 14032))
+;;;;;;  desktop-save-mode) "desktop" "desktop.el" (17388 29562))
 ;;; Generated autoloads from desktop.el
 
 (defvar desktop-save-mode nil "\
@@ -6399,7 +6416,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"
-;;;;;;  (17102 18579))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/deuglify.el
 
 (defvar gnus-outlook-deuglify-unwrap-min 45 "\
@@ -6466,7 +6483,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
-;;;;;;  "calendar/diary-lib.el" (17307 14150))
+;;;;;;  "calendar/diary-lib.el" (17385 41891))
 ;;; Generated autoloads from calendar/diary-lib.el
 
 (autoload (quote diary) "diary-lib" "\
@@ -6512,7 +6529,7 @@ Major mode for editing the diary file.
 ;;;***
 
 ;;;### (autoloads (diff-backup diff diff-command diff-switches) "diff"
-;;;;;;  "diff.el" (17239 32193))
+;;;;;;  "diff.el" (17383 24124))
 ;;; Generated autoloads from diff.el
 
 (defvar diff-switches "-c" "\
@@ -6546,7 +6563,7 @@ With prefix arg, prompt for diff switches.
 ;;;***
 
 ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "diff-mode.el"
-;;;;;;  (17239 32193))
+;;;;;;  (17439 53835))
 ;;; Generated autoloads from diff-mode.el
 
 (autoload (quote diff-mode) "diff-mode" "\
@@ -6575,7 +6592,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" (17359 58110))
+;;;;;;  "dired" "dired.el" (17391 29732))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches "-al" "\
@@ -6780,7 +6797,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" (17356 25047))
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" (17383 24124))
 ;;; Generated autoloads from dired-aux.el
 
 (autoload (quote dired-diff) "dired-aux" "\
@@ -7188,7 +7205,7 @@ true then the type of the file linked to by FILE is printed instead.
 
 ;;;***
 
-;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17273 1329))
+;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17387 38414))
 ;;; Generated autoloads from dired-x.el
 
 (autoload (quote dired-jump) "dired-x" "\
@@ -7202,7 +7219,7 @@ buffer and try again.
 
 ;;;***
 
-;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17148 24959))
+;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17383 24124))
 ;;; Generated autoloads from dirtrack.el
 
 (autoload (quote dirtrack) "dirtrack" "\
@@ -7221,8 +7238,8 @@ You can enable directory tracking by adding this function to
 
 ;;;***
 
-;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17148
-;;;;;;  25090))
+;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17383
+;;;;;;  16118))
 ;;; Generated autoloads from emacs-lisp/disass.el
 
 (autoload (quote disassemble) "disass" "\
@@ -7240,7 +7257,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" (17297 52532))
+;;;;;;  make-display-table) "disp-table" "disp-table.el" (17383 24124))
 ;;; Generated autoloads from disp-table.el
 
 (autoload (quote make-display-table) "disp-table" "\
@@ -7341,7 +7358,7 @@ for users who call this function in `.emacs'.
 ;;;***
 
 ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el"
-;;;;;;  (17140 20946))
+;;;;;;  (17382 1892))
 ;;; Generated autoloads from play/dissociate.el
 
 (autoload (quote dissociated-press) "dissociate" "\
@@ -7357,7 +7374,7 @@ Default is 2.
 
 ;;;***
 
-;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17205 5985))
+;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17383 24124))
 ;;; Generated autoloads from dnd.el
 
 (defvar dnd-protocol-alist (quote (("^file:///" . dnd-open-local-file) ("^file://" . dnd-open-file) ("^file:" . dnd-open-local-file))) "\
@@ -7378,7 +7395,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" (17148 25205))
+;;;;;;  "textmodes/dns-mode.el" (17383 15658))
 ;;; Generated autoloads from textmodes/dns-mode.el
 
 (autoload (quote dns-mode) "dns-mode" "\
@@ -7412,7 +7429,7 @@ Switch to *doctor* buffer and start giving psychotherapy.
 ;;;***
 
 ;;;### (autoloads (double-mode double-mode) "double" "double.el"
-;;;;;;  (17148 24959))
+;;;;;;  (17383 24125))
 ;;; Generated autoloads from double.el
 
 (defvar double-mode nil "\
@@ -7433,7 +7450,7 @@ when pressed twice.  See variable `double-map' for details.
 
 ;;;***
 
-;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17140 20947))
+;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17382 1892))
 ;;; Generated autoloads from play/dunnet.el
 
 (autoload (quote dunnet) "dunnet" "\
@@ -7444,7 +7461,7 @@ Switch to *dungeon* buffer and start game.
 ;;;***
 
 ;;;### (autoloads (gnus-earcon-display) "earcon" "gnus/earcon.el"
-;;;;;;  (17148 25106))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/earcon.el
 
 (autoload (quote gnus-earcon-display) "earcon" "\
@@ -7456,7 +7473,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" (17298 27296))
+;;;;;;  "emacs-lisp/easy-mmode.el" (17383 16118))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
 (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode))
@@ -7548,8 +7565,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" (17250
-;;;;;;  28361))
+;;;;;;  easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17383
+;;;;;;  16118))
 ;;; Generated autoloads from emacs-lisp/easymenu.el
 
 (put (quote easy-menu-define) (quote lisp-indent-function) (quote defun))
@@ -7694,7 +7711,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" (17239 32372))
+;;;;;;  "progmodes/ebnf2ps.el" (17388 22062))
 ;;; Generated autoloads from progmodes/ebnf2ps.el
 
 (autoload (quote ebnf-customize) "ebnf2ps" "\
@@ -7953,8 +7970,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" (17239
-;;;;;;  32375))
+;;;;;;  ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (17391
+;;;;;;  39495))
 ;;; Generated autoloads from progmodes/ebrowse.el
 
 (autoload (quote ebrowse-tree-mode) "ebrowse" "\
@@ -8105,7 +8122,7 @@ Display statistics for a class tree.
 ;;;***
 
 ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el"
-;;;;;;  (17148 24959))
+;;;;;;  (17383 24125))
 ;;; Generated autoloads from ebuff-menu.el
 
 (autoload (quote electric-buffer-list) "ebuff-menu" "\
@@ -8130,7 +8147,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry.
 ;;;***
 
 ;;;### (autoloads (Electric-command-history-redo-expression) "echistory"
-;;;;;;  "echistory.el" (17205 5985))
+;;;;;;  "echistory.el" (17383 24125))
 ;;; Generated autoloads from echistory.el
 
 (autoload (quote Electric-command-history-redo-expression) "echistory" "\
@@ -8143,7 +8160,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" (17324 31506))
+;;;;;;  "emacs-lisp/edebug.el" (17416 11967))
 ;;; Generated autoloads from emacs-lisp/edebug.el
 
 (defvar edebug-all-defs nil "\
@@ -8216,7 +8233,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" (17287 6474))
+;;;;;;  ediff-files3 ediff-files) "ediff" "ediff.el" (17399 58140))
 ;;; Generated autoloads from ediff.el
 
 (autoload (quote ediff-files) "ediff" "\
@@ -8454,7 +8471,7 @@ With optional NODE, goes to that node.
 ;;;***
 
 ;;;### (autoloads (ediff-customize) "ediff-help" "ediff-help.el"
-;;;;;;  (17148 24960))
+;;;;;;  (17399 58140))
 ;;; Generated autoloads from ediff-help.el
 
 (autoload (quote ediff-customize) "ediff-help" "\
@@ -8464,7 +8481,7 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17148 24960))
+;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17399 58140))
 ;;; Generated autoloads from ediff-hook.el
 
 (defvar ediff-window-setup-function)
@@ -8477,7 +8494,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el"
-;;;;;;  (17374 18401))
+;;;;;;  (17399 58140))
 ;;; Generated autoloads from ediff-mult.el
 
 (autoload (quote ediff-show-registry) "ediff-mult" "\
@@ -8490,7 +8507,7 @@ Display Ediff's registry.
 ;;;***
 
 ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
-;;;;;;  "ediff-util" "ediff-util.el" (17274 24016))
+;;;;;;  "ediff-util" "ediff-util.el" (17399 58140))
 ;;; Generated autoloads from ediff-util.el
 
 (autoload (quote ediff-toggle-multiframe) "ediff-util" "\
@@ -8511,7 +8528,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"
-;;;;;;  (17148 24966))
+;;;;;;  (17383 24125))
 ;;; Generated autoloads from edmacro.el
 
 (defvar edmacro-eight-bits nil "\
@@ -8564,7 +8581,7 @@ or nil, use a compact 80-column format.
 ;;;***
 
 ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt"
-;;;;;;  "emulation/edt.el" (17140 20922))
+;;;;;;  "emulation/edt.el" (17383 13537))
 ;;; Generated autoloads from emulation/edt.el
 
 (autoload (quote edt-set-scroll-margins) "edt" "\
@@ -8582,7 +8599,7 @@ Turn on EDT Emulation.
 ;;;***
 
 ;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el"
-;;;;;;  (17148 24966))
+;;;;;;  (17383 24125))
 ;;; Generated autoloads from ehelp.el
 
 (autoload (quote with-electric-help) "ehelp" "\
@@ -8620,7 +8637,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string)
-;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (17239 32276))
+;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (17383 16118))
 ;;; Generated autoloads from emacs-lisp/eldoc.el
 
 (defvar eldoc-minor-mode-string " ElDoc" "\
@@ -8658,8 +8675,8 @@ Emacs Lisp mode) that support Eldoc.")
 
 ;;;***
 
-;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17148
-;;;;;;  24966))
+;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17383
+;;;;;;  24125))
 ;;; Generated autoloads from elide-head.el
 
 (autoload (quote elide-head) "elide-head" "\
@@ -8675,7 +8692,7 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks.
 ;;;***
 
 ;;;### (autoloads (elint-initialize) "elint" "emacs-lisp/elint.el"
-;;;;;;  (17148 25094))
+;;;;;;  (17383 16118))
 ;;; Generated autoloads from emacs-lisp/elint.el
 
 (autoload (quote elint-initialize) "elint" "\
@@ -8686,8 +8703,8 @@ Initialize elint.
 ;;;***
 
 ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list
-;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (17291
-;;;;;;  34530))
+;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (17383
+;;;;;;  16118))
 ;;; Generated autoloads from emacs-lisp/elp.el
 
 (autoload (quote elp-instrument-function) "elp" "\
@@ -8721,7 +8738,7 @@ displayed.
 ;;;***
 
 ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el"
-;;;;;;  (17347 48575))
+;;;;;;  (17383 16812))
 ;;; Generated autoloads from mail/emacsbug.el
 
 (autoload (quote report-emacs-bug) "emacsbug" "\
@@ -8844,7 +8861,7 @@ as a multilingual text encoded in a coding system set by
 ;;;***
 
 ;;;### (autoloads (enriched-decode enriched-encode enriched-mode)
-;;;;;;  "enriched" "textmodes/enriched.el" (17148 25205))
+;;;;;;  "enriched" "textmodes/enriched.el" (17383 15658))
 ;;; Generated autoloads from textmodes/enriched.el
 
 (autoload (quote enriched-mode) "enriched" "\
@@ -8875,7 +8892,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (erc-select erc-select-read-args) "erc" "erc/erc.el"
-;;;;;;  (17379 25495))
+;;;;;;  (17447 52274))
 ;;; Generated autoloads from erc/erc.el
 
 (autoload (quote erc-select-read-args) "erc" "\
@@ -8902,21 +8919,14 @@ be invoked for those parameters' values
 
 ;;;***
 
-;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17372
-;;;;;;  48745))
+;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17391
+;;;;;;  39324))
 ;;; Generated autoloads from erc/erc-autoaway.el
  (autoload 'erc-autoaway-mode "erc-autoaway")
 
 ;;;***
 
-;;;### (autoloads nil "erc-autojoin" "erc/erc-autojoin.el" (17372
-;;;;;;  48745))
-;;; Generated autoloads from erc/erc-autojoin.el
- (autoload 'erc-autojoin-mode "erc-autojoin" nil t)
-
-;;;***
-
-;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17372 48745))
+;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17447 52274))
 ;;; Generated autoloads from erc/erc-button.el
  (autoload 'erc-button-mode "erc-button" nil t)
 
@@ -8928,21 +8938,8 @@ be invoked for those parameters' values
 
 ;;;***
 
-;;;### (autoloads (erc-complete) "erc-complete" "erc/erc-complete.el"
-;;;;;;  (17372 48745))
-;;; 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" (17372 48745))
+;;;;;;  "erc-dcc" "erc/erc-dcc.el" (17393 3826))
 ;;; Generated autoloads from erc/erc-dcc.el
 
 (autoload (quote erc-cmd-DCC) "erc-dcc" "\
@@ -8974,7 +8971,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"
-;;;;;;  (17372 48745))
+;;;;;;  (17391 39324))
 ;;; Generated autoloads from erc/erc-ezbounce.el
 
 (autoload (quote erc-cmd-ezb) "erc-ezbounce" "\
@@ -9036,8 +9033,8 @@ Add EZBouncer convenience functions to ERC.
 
 ;;;***
 
-;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17372
-;;;;;;  48745))
+;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17391
+;;;;;;  39324))
 ;;; Generated autoloads from erc/erc-fill.el
  (autoload 'erc-fill-mode "erc-fill" nil t)
 
@@ -9049,8 +9046,36 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'.
 
 ;;;***
 
+;;;### (autoloads nil "erc-hecomplete" "erc/erc-hecomplete.el" (17391
+;;;;;;  39324))
+;;; 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" (17447 52274))
+;;; 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"
-;;;;;;  (17372 48745))
+;;;;;;  (17391 39324))
 ;;; Generated autoloads from erc/erc-imenu.el
 
 (autoload (quote erc-create-imenu-index) "erc-imenu" "\
@@ -9060,11 +9085,18 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (erc-chanlist erc-cmd-LIST) "erc-list" "erc/erc-list.el"
-;;;;;;  (17372 48745))
+;;;### (autoloads nil "erc-join" "erc/erc-join.el" (17391 39324))
+;;; 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"
+;;;;;;  (17391 39324))
 ;;; 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).
@@ -9081,7 +9113,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" (17372 48745))
+;;;;;;  "erc/erc-log.el" (17391 39324))
 ;;; Generated autoloads from erc/erc-log.el
  (autoload 'erc-log-mode "erc-log" nil t)
 
@@ -9113,7 +9145,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"
-;;;;;;  (17372 48745))
+;;;;;;  (17391 39324))
 ;;; Generated autoloads from erc/erc-match.el
  (autoload 'erc-match-mode "erc-match")
 
@@ -9159,26 +9191,8 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'.
 
 ;;;***
 
-;;;### (autoloads (erc-server-select erc-determine-network) "erc-nets"
-;;;;;;  "erc/erc-nets.el" (17372 48745))
-;;; 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"
-;;;;;;  (17372 48745))
+;;;;;;  (17391 39324))
 ;;; Generated autoloads from erc/erc-netsplit.el
  (autoload 'erc-netsplit-mode "erc-netsplit")
 
@@ -9189,26 +9203,26 @@ Show who's gone.
 
 ;;;***
 
-;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode)
-;;;;;;  "erc-nickserv" "erc/erc-nickserv.el" (17372 48745))
-;;; 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" (17391 39324))
+;;; 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" (17372 48745))
+;;;;;;  "erc/erc-notify.el" (17391 39324))
 ;;; Generated autoloads from erc/erc-notify.el
  (autoload 'erc-notify-mode "erc-notify" nil t)
 
@@ -9226,39 +9240,57 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads nil "erc-page" "erc/erc-page.el" (17372 48745))
+;;;### (autoloads nil "erc-page" "erc/erc-page.el" (17391 39324))
 ;;; Generated autoloads from erc/erc-page.el
  (autoload 'erc-page-mode "erc-page")
 
 ;;;***
 
-;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17372
-;;;;;;  48745))
+;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17391
+;;;;;;  39324))
 ;;; Generated autoloads from erc/erc-pcomplete.el
  (autoload 'erc-completion-mode "erc-pcomplete" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (17372 48745))
+;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (17391 39324))
 ;;; Generated autoloads from erc/erc-replace.el
  (autoload 'erc-replace-mode "erc-replace")
 
 ;;;***
 
-;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17372 48745))
+;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17391 39324))
 ;;; Generated autoloads from erc/erc-ring.el
  (autoload 'erc-ring-mode "erc-ring" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (17372 48745))
+;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode)
+;;;;;;  "erc-services" "erc/erc-services.el" (17391 39324))
+;;; 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" (17391 39324))
 ;;; Generated autoloads from erc/erc-sound.el
  (autoload 'erc-sound-mode "erc-sound")
 
 ;;;***
 
 ;;;### (autoloads (erc-speedbar-browser) "erc-speedbar" "erc/erc-speedbar.el"
-;;;;;;  (17373 26133))
+;;;;;;  (17391 39324))
 ;;; Generated autoloads from erc/erc-speedbar.el
 
 (autoload (quote erc-speedbar-browser) "erc-speedbar" "\
@@ -9269,20 +9301,20 @@ This will add a speedbar major display mode.
 
 ;;;***
 
-;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17372
-;;;;;;  48745))
+;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17391
+;;;;;;  39324))
 ;;; Generated autoloads from erc/erc-spelling.el
  (autoload 'erc-spelling-mode "erc-spelling" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17374 46377))
+;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17395 55370))
 ;;; Generated autoloads from erc/erc-stamp.el
  (autoload 'erc-timestamp-mode "erc-stamp" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17372 48745))
+;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17391 39324))
 ;;; 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)
@@ -9290,7 +9322,7 @@ This will add a speedbar major display mode.
 ;;;***
 
 ;;;### (autoloads (erc-truncate-buffer erc-truncate-buffer-to-size)
-;;;;;;  "erc-truncate" "erc/erc-truncate.el" (17372 48745))
+;;;;;;  "erc-truncate" "erc/erc-truncate.el" (17391 39324))
 ;;; Generated autoloads from erc/erc-truncate.el
  (autoload 'erc-truncate-mode "erc-truncate" nil t)
 
@@ -9310,7 +9342,7 @@ Meant to be used in hooks, like `erc-insert-post-hook'.
 ;;;***
 
 ;;;### (autoloads (erc-xdcc-add-file) "erc-xdcc" "erc/erc-xdcc.el"
-;;;;;;  (17372 48745))
+;;;;;;  (17391 39324))
 ;;; Generated autoloads from erc/erc-xdcc.el
 
 (autoload (quote erc-xdcc-add-file) "erc-xdcc" "\
@@ -9320,8 +9352,8 @@ Add a file to `erc-xdcc-files'.
 
 ;;;***
 
-;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17140
-;;;;;;  20930))
+;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17383
+;;;;;;  14789))
 ;;; Generated autoloads from eshell/esh-mode.el
 
 (autoload (quote eshell-mode) "esh-mode" "\
@@ -9333,8 +9365,8 @@ Emacs shell interactive mode.
 
 ;;;***
 
-;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17140
-;;;;;;  20931))
+;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17383
+;;;;;;  14789))
 ;;; Generated autoloads from eshell/esh-test.el
 
 (autoload (quote eshell-test) "esh-test" "\
@@ -9345,7 +9377,7 @@ Test Eshell to verify that it works as expected.
 ;;;***
 
 ;;;### (autoloads (eshell-report-bug eshell-command-result eshell-command
-;;;;;;  eshell) "eshell" "eshell/eshell.el" (17148 25104))
+;;;;;;  eshell) "eshell" "eshell/eshell.el" (17426 59663))
 ;;; Generated autoloads from eshell/eshell.el
 
 (autoload (quote eshell) "eshell" "\
@@ -9391,7 +9423,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"
-;;;;;;  (17242 7321))
+;;;;;;  (17407 46937))
 ;;; Generated autoloads from progmodes/etags.el
 
 (defvar tags-file-name nil "\
@@ -9888,7 +9920,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"
-;;;;;;  (17255 34870))
+;;;;;;  (17383 13296))
 ;;; Generated autoloads from net/eudc.el
 
 (autoload (quote eudc-set-server) "eudc" "\
@@ -9944,7 +9976,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" (17140 20940))
+;;;;;;  "eudc-bob" "net/eudc-bob.el" (17383 13296))
 ;;; Generated autoloads from net/eudc-bob.el
 
 (autoload (quote eudc-display-generic-binary) "eudc-bob" "\
@@ -9980,7 +10012,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" (17140 20940))
+;;;;;;  "eudc-export" "net/eudc-export.el" (17383 13296))
 ;;; Generated autoloads from net/eudc-export.el
 
 (autoload (quote eudc-insert-record-at-point-into-bbdb) "eudc-export" "\
@@ -9997,7 +10029,7 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record.
 ;;;***
 
 ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el"
-;;;;;;  (17140 20940))
+;;;;;;  (17383 13296))
 ;;; Generated autoloads from net/eudc-hotlist.el
 
 (autoload (quote eudc-edit-hotlist) "eudc-hotlist" "\
@@ -10010,7 +10042,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"
-;;;;;;  (17140 20967))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/executable.el
 
 (autoload (quote executable-command-find-posix-p) "executable" "\
@@ -10052,7 +10084,7 @@ file modes.
 ;;;***
 
 ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot
-;;;;;;  expand-add-abbrevs) "expand" "expand.el" (17148 24967))
+;;;;;;  expand-add-abbrevs) "expand" "expand.el" (17383 24125))
 ;;; Generated autoloads from expand.el
 
 (autoload (quote expand-add-abbrevs) "expand" "\
@@ -10095,7 +10127,7 @@ This is used only in conjunction with `expand-add-abbrevs'.
 
 ;;;***
 
-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17276 44726))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17385 42553))
 ;;; Generated autoloads from progmodes/f90.el
 
 (autoload (quote f90-mode) "f90" "\
@@ -10162,7 +10194,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" (17148 24967))
+;;;;;;  "facemenu" "facemenu.el" (17383 24125))
 ;;; Generated autoloads from facemenu.el
  (define-key global-map "\M-o" 'facemenu-keymap)
  (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap)
@@ -10325,7 +10357,7 @@ argument BUFFER-NAME is nil, it defaults to *Colors*.
 ;;;***
 
 ;;;### (autoloads (turn-on-fast-lock fast-lock-mode) "fast-lock"
-;;;;;;  "obsolete/fast-lock.el" (17205 6148))
+;;;;;;  "obsolete/fast-lock.el" (17382 34311))
 ;;; Generated autoloads from obsolete/fast-lock.el
 
 (autoload (quote fast-lock-mode) "fast-lock" "\
@@ -10420,7 +10452,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" (17279 16968))
+;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (17400 65127))
 ;;; Generated autoloads from ffap.el
 
 (autoload (quote ffap-next) "ffap" "\
@@ -10477,7 +10509,7 @@ Evaluate the forms in variable `ffap-bindings'.
 ;;;***
 
 ;;;### (autoloads (file-cache-minibuffer-complete) "filecache" "filecache.el"
-;;;;;;  (17239 32205))
+;;;;;;  (17383 24125))
 ;;; Generated autoloads from filecache.el
 
 (autoload (quote file-cache-minibuffer-complete) "filecache" "\
@@ -10495,8 +10527,8 @@ the name is considered already unique; only the second substitution
 
 ;;;***
 
-;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17148
-;;;;;;  24974))
+;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17383
+;;;;;;  24125))
 ;;; Generated autoloads from filesets.el
 
 (autoload (quote filesets-init) "filesets" "\
@@ -10509,7 +10541,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"
-;;;;;;  (17148 24974))
+;;;;;;  (17383 24125))
 ;;; 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"))) "\
@@ -10570,7 +10602,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"
-;;;;;;  (17148 24975))
+;;;;;;  (17383 24125))
 ;;; 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)))))) "\
@@ -10662,7 +10694,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" (17381 36246))
+;;;;;;  "emacs-lisp/find-func.el" (17410 24020))
 ;;; Generated autoloads from emacs-lisp/find-func.el
 
 (autoload (quote find-library) "find-func" "\
@@ -10810,7 +10842,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" (17269 21886))
+;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (17393 12443))
 ;;; Generated autoloads from find-lisp.el
 
 (autoload (quote find-lisp-find-dired) "find-lisp" "\
@@ -10831,7 +10863,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" (17245 51608))
+;;;;;;  "finder" "finder.el" (17383 24125))
 ;;; Generated autoloads from finder.el
 
 (autoload (quote finder-list-keywords) "finder" "\
@@ -10853,7 +10885,7 @@ Find packages matching a given keyword.
 ;;;***
 
 ;;;### (autoloads (enable-flow-control-on enable-flow-control) "flow-ctrl"
-;;;;;;  "flow-ctrl.el" (17148 24975))
+;;;;;;  "flow-ctrl.el" (17383 24125))
 ;;; Generated autoloads from flow-ctrl.el
 
 (autoload (quote enable-flow-control) "flow-ctrl" "\
@@ -10875,7 +10907,7 @@ to get the effect of a C-q.
 ;;;***
 
 ;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el"
-;;;;;;  (17254 33237))
+;;;;;;  (17411 39818))
 ;;; Generated autoloads from gnus/flow-fill.el
 
 (autoload (quote fill-flowed-encode) "flow-fill" "\
@@ -10891,7 +10923,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode)
-;;;;;;  "flymake" "progmodes/flymake.el" (17348 7449))
+;;;;;;  "flymake" "progmodes/flymake.el" (17396 25795))
 ;;; Generated autoloads from progmodes/flymake.el
 
 (autoload (quote flymake-mode) "flymake" "\
@@ -10915,7 +10947,7 @@ Turn flymake mode off.
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  flyspell-mode flyspell-prog-mode) "flyspell" "textmodes/flyspell.el"
-;;;;;;  (17370 39824))
+;;;;;;  (17426 59268))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload (quote flyspell-prog-mode) "flyspell" "\
@@ -10974,7 +11006,7 @@ Flyspell whole buffer.
 
 ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode
 ;;;;;;  turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el"
-;;;;;;  (17194 38158))
+;;;;;;  (17383 24125))
 ;;; Generated autoloads from follow.el
 
 (autoload (quote turn-on-follow-mode) "follow" "\
@@ -11048,8 +11080,8 @@ in your `~/.emacs' file, replacing [f7] by your favourite key:
 
 ;;;***
 
-;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17148
-;;;;;;  25154))
+;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17383
+;;;;;;  16812))
 ;;; Generated autoloads from mail/footnote.el
 
 (autoload (quote footnote-mode) "footnote" "\
@@ -11070,7 +11102,7 @@ key		binding
 ;;;***
 
 ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode)
-;;;;;;  "forms" "forms.el" (17239 32209))
+;;;;;;  "forms" "forms.el" (17383 24125))
 ;;; Generated autoloads from forms.el
 
 (autoload (quote forms-mode) "forms" "\
@@ -11193,7 +11225,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" (17140 20947))
+;;;;;;  fortune-add-fortune) "fortune" "play/fortune.el" (17382 1892))
 ;;; Generated autoloads from play/fortune.el
 
 (autoload (quote fortune-add-fortune) "fortune" "\
@@ -11242,79 +11274,8 @@ and choose the directory as the fortune-file.
 
 ;;;***
 
-;;;### (autoloads (set-fringe-style fringe-mode fringe-mode) "fringe"
-;;;;;;  "fringe.el" (17148 24980))
-;;; 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 18137))
+;;;### (autoloads (gdb-enable-debug gdba) "gdb-ui" "progmodes/gdb-ui.el"
+;;;;;;  (17444 35371))
 ;;; Generated autoloads from progmodes/gdb-ui.el
 
 (autoload (quote gdba) "gdb-ui" "\
@@ -11329,9 +11290,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.
 
@@ -11344,41 +11305,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" (17148
-;;;;;;  25095))
+;;;;;;  define-generic-mode) "generic" "emacs-lisp/generic.el" (17383
+;;;;;;  16118))
 ;;; Generated autoloads from emacs-lisp/generic.el
 
 (defvar generic-mode-list nil "\
@@ -11453,7 +11414,7 @@ regular expression that can be used as an element of
 ;;;***
 
 ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el"
-;;;;;;  (17333 17859))
+;;;;;;  (17405 58461))
 ;;; Generated autoloads from progmodes/glasses.el
 
 (autoload (quote glasses-mode) "glasses" "\
@@ -11466,7 +11427,7 @@ at places they belong to.
 ;;;***
 
 ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
-;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (17316 41648))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (17426 3898))
 ;;; Generated autoloads from gnus/gnus.el
 
 (autoload (quote gnus-slave-no-server) "gnus" "\
@@ -11517,7 +11478,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" (17316 41648))
+;;;;;;  "gnus/gnus-agent.el" (17440 25582))
 ;;; Generated autoloads from gnus/gnus-agent.el
 
 (autoload (quote gnus-unplugged) "gnus-agent" "\
@@ -11608,7 +11569,7 @@ If CLEAN, obsolete (ignore).
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (17367 34952))
+;;;;;;  (17437 45961))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload (quote gnus-article-prepare-display) "gnus-art" "\
@@ -11619,7 +11580,7 @@ Make the current buffer look like a nice article.
 ;;;***
 
 ;;;### (autoloads (gnus-audio-play) "gnus-audio" "gnus/gnus-audio.el"
-;;;;;;  (17148 25111))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/gnus-audio.el
 
 (autoload (quote gnus-audio-play) "gnus-audio" "\
@@ -11631,8 +11592,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" (17305
-;;;;;;  44993))
+;;;;;;  gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17382
+;;;;;;  1052))
 ;;; Generated autoloads from gnus/gnus-cache.el
 
 (autoload (quote gnus-jog-cache) "gnus-cache" "\
@@ -11674,7 +11635,7 @@ supported.
 ;;;***
 
 ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article)
-;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (17294 14916))
+;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (17382 1052))
 ;;; Generated autoloads from gnus/gnus-delay.el
 
 (autoload (quote gnus-delay-article) "gnus-delay" "\
@@ -11710,7 +11671,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"
-;;;;;;  (17148 25112))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/gnus-dired.el
 
 (autoload (quote turn-on-gnus-dired-mode) "gnus-dired" "\
@@ -11721,7 +11682,7 @@ Convenience method to turn on gnus-dired-mode.
 ;;;***
 
 ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el"
-;;;;;;  (17148 25113))
+;;;;;;  (17415 62487))
 ;;; Generated autoloads from gnus/gnus-draft.el
 
 (autoload (quote gnus-draft-reminder) "gnus-draft" "\
@@ -11733,8 +11694,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" (17185
-;;;;;;  27513))
+;;;;;;  gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (17382
+;;;;;;  1052))
 ;;; Generated autoloads from gnus/gnus-fun.el
 
 (autoload (quote gnus-random-x-face) "gnus-fun" "\
@@ -11773,7 +11734,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" (17356 25047))
+;;;;;;  "gnus-group" "gnus/gnus-group.el" (17426 3898))
 ;;; Generated autoloads from gnus/gnus-group.el
 
 (autoload (quote gnus-fetch-group) "gnus-group" "\
@@ -11790,7 +11751,7 @@ Pop up a frame and enter GROUP.
 ;;;***
 
 ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el"
-;;;;;;  (17148 25116))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/gnus-kill.el
 
 (defalias (quote gnus-batch-kill) (quote gnus-batch-score))
@@ -11805,7 +11766,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"
-;;;;;;  (17148 25116))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/gnus-ml.el
 
 (autoload (quote turn-on-gnus-mailing-list-mode) "gnus-ml" "\
@@ -11830,7 +11791,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"
-;;;;;;  (17148 25116))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/gnus-mlspl.el
 
 (autoload (quote gnus-group-split-setup) "gnus-mlspl" "\
@@ -11931,7 +11892,7 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns:
 ;;;***
 
 ;;;### (autoloads (gnus-change-server) "gnus-move" "gnus/gnus-move.el"
-;;;;;;  (17148 25116))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/gnus-move.el
 
 (autoload (quote gnus-change-server) "gnus-move" "\
@@ -11943,7 +11904,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" (17348 27747))
+;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (17382 1052))
 ;;; Generated autoloads from gnus/gnus-msg.el
 
 (autoload (quote gnus-msg-mail) "gnus-msg" "\
@@ -11967,9 +11928,25 @@ Like `message-reply'.
 
 ;;;***
 
+;;;### (autoloads (gnus-nocem-load-cache gnus-nocem-scan-groups)
+;;;;;;  "gnus-nocem" "gnus/gnus-nocem.el" (17426 3898))
+;;; 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"
-;;;;;;  (17148 25117))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/gnus-picon.el
 
 (autoload (quote gnus-treat-from-picon) "gnus-picon" "\
@@ -11996,7 +11973,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" (17148 25118))
+;;;;;;  "gnus/gnus-range.el" (17382 1052))
 ;;; Generated autoloads from gnus/gnus-range.el
 
 (autoload (quote gnus-sorted-difference) "gnus-range" "\
@@ -12064,7 +12041,7 @@ Add NUM into sorted LIST by side effect.
 ;;;***
 
 ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize)
-;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (17148 25118))
+;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (17382 1052))
 ;;; Generated autoloads from gnus/gnus-registry.el
 
 (autoload (quote gnus-registry-initialize) "gnus-registry" "\
@@ -12080,8 +12057,8 @@ Install the registry hooks.
 ;;;***
 
 ;;;### (autoloads (gnus-sieve-article-add-rule gnus-sieve-generate
-;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17148
-;;;;;;  25120))
+;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17382
+;;;;;;  1052))
 ;;; Generated autoloads from gnus/gnus-sieve.el
 
 (autoload (quote gnus-sieve-update) "gnus-sieve" "\
@@ -12109,7 +12086,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (gnus-batch-brew-soup) "gnus-soup" "gnus/gnus-soup.el"
-;;;;;;  (17148 25120))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/gnus-soup.el
 
 (autoload (quote gnus-batch-brew-soup) "gnus-soup" "\
@@ -12129,7 +12106,7 @@ Note -- this function hasn't been implemented yet.
 ;;;***
 
 ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el"
-;;;;;;  (17185 27516))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/gnus-spec.el
 
 (autoload (quote gnus-update-format) "gnus-spec" "\
@@ -12140,8 +12117,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" (17356
-;;;;;;  25047))
+;;;;;;  gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17426
+;;;;;;  3898))
 ;;; Generated autoloads from gnus/gnus-start.el
 
 (autoload (quote gnus-declare-backend) "gnus-start" "\
@@ -12157,7 +12134,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el"
-;;;;;;  (17148 25131))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/gnus-win.el
 
 (autoload (quote gnus-add-configuration) "gnus-win" "\
@@ -12167,7 +12144,7 @@ Add the window configuration CONF to `gnus-buffer-configuration'.
 
 ;;;***
 
-;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17239 32364))
+;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17382 1892))
 ;;; Generated autoloads from play/gomoku.el
 
 (autoload (quote gomoku) "gomoku" "\
@@ -12194,7 +12171,7 @@ Use \\[describe-mode] for more info.
 ;;;***
 
 ;;;### (autoloads (goto-address goto-address-at-point) "goto-addr"
-;;;;;;  "net/goto-addr.el" (17333 17859))
+;;;;;;  "net/goto-addr.el" (17383 13296))
 ;;; Generated autoloads from net/goto-addr.el
 
 (define-obsolete-function-alias (quote goto-address-at-mouse) (quote goto-address-at-point) "22.1")
@@ -12223,7 +12200,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" (17185 27647))
+;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (17432 38016))
 ;;; Generated autoloads from progmodes/grep.el
 
 (defvar grep-window-height nil "\
@@ -12347,7 +12324,7 @@ those sub directories of DIR.
 
 ;;;***
 
-;;;### (autoloads (gs-load-image) "gs" "gs.el" (17148 24982))
+;;;### (autoloads (gs-load-image) "gs" "gs.el" (17383 24126))
 ;;; Generated autoloads from gs.el
 
 (autoload (quote gs-load-image) "gs" "\
@@ -12360,14 +12337,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" (17342 36761))
+;;;### (autoloads (gdb-script-mode bashdb jdb pdb perldb xdb dbx
+;;;;;;  sdb gdb) "gud" "progmodes/gud.el" (17446 52773))
 ;;; 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)
 
@@ -12440,25 +12422,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" (17185
-;;;;;;  27606))
+;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17382
+;;;;;;  1892))
 ;;; Generated autoloads from play/handwrite.el
 
 (autoload (quote handwrite) "handwrite" "\
@@ -12506,7 +12473,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" (17148 24982))
+;;;;;;  help-at-pt-string) "help-at-pt" "help-at-pt.el" (17383 24126))
 ;;; Generated autoloads from help-at-pt.el
 
 (autoload (quote help-at-pt-string) "help-at-pt" "\
@@ -12636,7 +12603,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" (17369 18480))
+;;;;;;  "help-fns.el" (17399 44613))
 ;;; Generated autoloads from help-fns.el
 
 (autoload (quote help-with-tutorial) "help-fns" "\
@@ -12702,7 +12669,7 @@ BUFFER should be a buffer or a buffer name.
 ;;;***
 
 ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el"
-;;;;;;  (17312 51444))
+;;;;;;  (17383 24126))
 ;;; Generated autoloads from help-macro.el
 
 (defvar three-step-help nil "\
@@ -12718,7 +12685,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" (17329 45783))
+;;;;;;  help-mode) "help-mode" "help-mode.el" (17437 64109))
 ;;; Generated autoloads from help-mode.el
 
 (autoload (quote help-mode) "help-mode" "\
@@ -12801,7 +12768,7 @@ Add xrefs for symbols in `pp's output between FROM and TO.
 ;;;***
 
 ;;;### (autoloads (Helper-help Helper-describe-bindings) "helper"
-;;;;;;  "emacs-lisp/helper.el" (17148 25095))
+;;;;;;  "emacs-lisp/helper.el" (17383 16118))
 ;;; Generated autoloads from emacs-lisp/helper.el
 
 (autoload (quote Helper-describe-bindings) "helper" "\
@@ -12817,7 +12784,7 @@ Provide help for current mode.
 ;;;***
 
 ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl"
-;;;;;;  "hexl.el" (17167 2778))
+;;;;;;  "hexl.el" (17383 24126))
 ;;; Generated autoloads from hexl.el
 
 (autoload (quote hexl-mode) "hexl" "\
@@ -12913,7 +12880,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"
-;;;;;;  (17378 6213))
+;;;;;;  (17383 24126))
 ;;; Generated autoloads from hi-lock.el
 
 (autoload (quote hi-lock-mode) "hi-lock" "\
@@ -13039,7 +13006,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" (17140 20971))
+;;;;;;  hide-ifdef-mode) "hideif" "progmodes/hideif.el" (17388 22062))
 ;;; Generated autoloads from progmodes/hideif.el
 
 (autoload (quote hide-ifdef-mode) "hideif" "\
@@ -13094,7 +13061,7 @@ how the hiding is done:
 ;;;***
 
 ;;;### (autoloads (hs-minor-mode) "hideshow" "progmodes/hideshow.el"
-;;;;;;  (17194 38303))
+;;;;;;  (17388 22062))
 ;;; 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))) "\
@@ -13152,7 +13119,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" (17376 48878))
+;;;;;;  "hilit-chg" "hilit-chg.el" (17387 44422))
 ;;; Generated autoloads from hilit-chg.el
 
 (autoload (quote highlight-changes-remove-highlight) "hilit-chg" "\
@@ -13282,7 +13249,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" (17148 24985))
+;;;;;;  "hippie-exp.el" (17383 24126))
 ;;; 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)) "\
@@ -13397,7 +13364,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
 ;;;***
 
 ;;;### (autoloads (list-holidays holidays) "holidays" "calendar/holidays.el"
-;;;;;;  (17307 14150))
+;;;;;;  (17426 49056))
 ;;; Generated autoloads from calendar/holidays.el
 
 (autoload (quote holidays) "holidays" "\
@@ -13411,8 +13378,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.
 
@@ -13421,7 +13401,7 @@ The optional LABEL is used to label the buffer created.
 ;;;***
 
 ;;;### (autoloads (hscroll-global-mode hscroll-mode turn-on-hscroll)
-;;;;;;  "hscroll" "obsolete/hscroll.el" (17148 25179))
+;;;;;;  "hscroll" "obsolete/hscroll.el" (17382 34311))
 ;;; Generated autoloads from obsolete/hscroll.el
 
 (autoload (quote turn-on-hscroll) "hscroll" "\
@@ -13447,8 +13427,8 @@ Also see `automatic-hscrolling'.
 
 ;;;***
 
-;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17148
-;;;;;;  25133))
+;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17396
+;;;;;;  25556))
 ;;; Generated autoloads from gnus/html2text.el
 
 (autoload (quote html2text) "html2text" "\
@@ -13480,7 +13460,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" (17378 33493))
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17442 18621))
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload (quote ibuffer-auto-mode) "ibuf-ext" "\
@@ -13846,8 +13826,8 @@ defaults to one.
 ;;;***
 
 ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter
-;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17205
-;;;;;;  6006))
+;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17383
+;;;;;;  24126))
 ;;; Generated autoloads from ibuf-macs.el
 
 (autoload (quote define-ibuffer-column) "ibuf-macs" "\
@@ -13974,7 +13954,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" (17244 54746))
+;;;;;;  "calendar/icalendar.el" (17397 11797))
 ;;; Generated autoloads from calendar/icalendar.el
 
 (autoload (quote icalendar-export-file) "icalendar" "\
@@ -14026,8 +14006,8 @@ buffer `*icalendar-errors*'.
 
 ;;;***
 
-;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17148
-;;;;;;  24987))
+;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17398
+;;;;;;  17947))
 ;;; Generated autoloads from icomplete.el
 
 (defvar icomplete-mode nil "\
@@ -14048,7 +14028,7 @@ With a numeric argument, turn Icomplete mode on iff ARG is positive.
 
 ;;;***
 
-;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17276 44726))
+;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17388 22062))
 ;;; Generated autoloads from progmodes/icon.el
 
 (autoload (quote icon-mode) "icon" "\
@@ -14089,7 +14069,7 @@ with no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el"
-;;;;;;  (17298 27296))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/idlw-shell.el
 
 (autoload (quote idlwave-shell) "idlw-shell" "\
@@ -14115,7 +14095,7 @@ See also the variable `idlwave-shell-prompt-pattern'.
 ;;;***
 
 ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el"
-;;;;;;  (17276 44726))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/idlwave.el
 
 (autoload (quote idlwave-mode) "idlwave" "\
@@ -14251,8 +14231,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" (17304
-;;;;;;  41554))
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17435
+;;;;;;  26372))
 ;;; Generated autoloads from ido.el
 
 (defvar ido-mode nil "\
@@ -14513,7 +14493,7 @@ DEF, if non-nil, is the default value.
 
 ;;;***
 
-;;;### (autoloads (ielm) "ielm" "ielm.el" (17148 24990))
+;;;### (autoloads (ielm) "ielm" "ielm.el" (17383 24126))
 ;;; Generated autoloads from ielm.el
  (add-hook 'same-window-buffer-names "*ielm*")
 
@@ -14526,7 +14506,7 @@ Switches to the buffer `*ielm*', or creates it if it does not exist.
 ;;;***
 
 ;;;### (autoloads (iimage-mode turn-on-iimage-mode) "iimage" "iimage.el"
-;;;;;;  (17148 24990))
+;;;;;;  (17383 24126))
 ;;; Generated autoloads from iimage.el
 
 (autoload (quote turn-on-iimage-mode) "iimage" "\
@@ -14544,7 +14524,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" (17245 16456))
+;;;;;;  image-type-from-data) "image" "image.el" (17437 41119))
 ;;; Generated autoloads from image.el
 
 (autoload (quote image-type-from-data) "image" "\
@@ -14695,7 +14675,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" (17148 24990))
+;;;;;;  "image-file.el" (17383 24126))
 ;;; Generated autoloads from image-file.el
 
 (defvar image-file-name-extensions (quote ("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm")) "\
@@ -14758,7 +14738,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" (17374 39346))
+;;;;;;  "image-mode" "image-mode.el" (17387 39216))
 ;;; Generated autoloads from image-mode.el
  (push '("\\.jpe?g\\'"    . image-mode) auto-mode-alist)
  (push '("\\.png\\'"      . image-mode) auto-mode-alist)
@@ -14796,7 +14776,7 @@ information on these modes.
 ;;;***
 
 ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar
-;;;;;;  imenu-sort-function) "imenu" "imenu.el" (17148 24991))
+;;;;;;  imenu-sort-function) "imenu" "imenu.el" (17383 24126))
 ;;; Generated autoloads from imenu.el
 
 (defvar imenu-sort-function nil "\
@@ -14959,7 +14939,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" (17140 20976))
+;;;;;;  "progmodes/inf-lisp.el" (17388 22062))
 ;;; Generated autoloads from progmodes/inf-lisp.el
 
 (defvar inferior-lisp-filter-regexp "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'" "\
@@ -15026,7 +15006,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" (17380 50980))
+;;;;;;  info info-other-window) "info" "info.el" (17427 20646))
 ;;; Generated autoloads from info.el
 
 (autoload (quote info-other-window) "info" "\
@@ -15147,7 +15127,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.
@@ -15192,7 +15172,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"
-;;;;;;  (17148 24992))
+;;;;;;  (17383 24126))
 ;;; Generated autoloads from info-look.el
 
 (autoload (quote info-lookup-reset) "info-look" "\
@@ -15240,7 +15220,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" (17167 2962))
+;;;;;;  info-xref-check) "info-xref" "info-xref.el" (17383 24126))
 ;;; Generated autoloads from info-xref.el
 
 (autoload (quote info-xref-check) "info-xref" "\
@@ -15267,7 +15247,7 @@ quite a while.
 ;;;***
 
 ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-tagify)
-;;;;;;  "informat" "informat.el" (17148 24995))
+;;;;;;  "informat" "informat.el" (17383 24126))
 ;;; Generated autoloads from informat.el
 
 (autoload (quote Info-tagify) "informat" "\
@@ -15328,8 +15308,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17148
-;;;;;;  24996))
+;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17383
+;;;;;;  24126))
 ;;; Generated autoloads from isearchb.el
 
 (autoload (quote isearchb-activate) "isearchb" "\
@@ -15343,7 +15323,7 @@ accessed via isearchb.
 ;;;***
 
 ;;;### (autoloads (iso-accents-mode) "iso-acc" "obsolete/iso-acc.el"
-;;;;;;  (17148 25179))
+;;;;;;  (17382 34311))
 ;;; Generated autoloads from obsolete/iso-acc.el
 
 (autoload (quote iso-accents-mode) "iso-acc" "\
@@ -15473,7 +15453,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"
-;;;;;;  (17370 39824))
+;;;;;;  (17436 5419))
 ;;; Generated autoloads from textmodes/ispell.el
 
 (defvar ispell-personal-dictionary nil "\
@@ -15497,7 +15477,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))))
 
@@ -15573,9 +15553,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:
@@ -15759,8 +15739,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 
 ;;;***
 
-;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17354
-;;;;;;  62493))
+;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17435
+;;;;;;  10813))
 ;;; Generated autoloads from iswitchb.el
 
 (defvar iswitchb-mode nil "\
@@ -15864,7 +15844,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" (17355 64266))
+;;;;;;  "jka-compr.el" (17410 23317))
 ;;; Generated autoloads from jka-compr.el
 
 (defvar jka-compr-inhibit nil "\
@@ -15889,7 +15869,7 @@ by `jka-compr-installed'.
 
 ;;;### (autoloads (keypad-setup keypad-numlock-shifted-setup keypad-shifted-setup
 ;;;;;;  keypad-numlock-setup keypad-setup) "keypad" "emulation/keypad.el"
-;;;;;;  (17140 20922))
+;;;;;;  (17383 13537))
 ;;; Generated autoloads from emulation/keypad.el
 
 (defvar keypad-setup nil "\
@@ -15992,7 +15972,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" (17148 24998))
+;;;;;;  "kmacro.el" (17383 24126))
 ;;; Generated autoloads from kmacro.el
  (global-set-key "\C-x(" 'kmacro-start-macro)
  (global-set-key "\C-x)" 'kmacro-end-macro)
@@ -16137,7 +16117,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el"
-;;;;;;  (17239 32365))
+;;;;;;  (17393 12443))
 ;;; Generated autoloads from play/landmark.el
 
 (defalias (quote landmark-repeat) (quote lm-test-run))
@@ -16297,7 +16277,7 @@ use either \\[customize] or the function `latin1-display'.")
 ;;;***
 
 ;;;### (autoloads (turn-on-lazy-lock lazy-lock-mode) "lazy-lock"
-;;;;;;  "obsolete/lazy-lock.el" (17185 27600))
+;;;;;;  "obsolete/lazy-lock.el" (17382 34311))
 ;;; Generated autoloads from obsolete/lazy-lock.el
 
 (autoload (quote lazy-lock-mode) "lazy-lock" "\
@@ -16365,7 +16345,7 @@ Unconditionally turn on Lazy Lock mode.
 ;;;***
 
 ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el"
-;;;;;;  (17352 9346))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/ld-script.el
 
 (add-to-list (quote auto-mode-alist) (quote ("\\.ld[si]?\\>" . ld-script-mode)))
@@ -16380,7 +16360,7 @@ A major mode to edit GNU ld script files
 ;;;***
 
 ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el"
-;;;;;;  (17148 25013))
+;;;;;;  (17383 24126))
 ;;; Generated autoloads from ledit.el
 
 (defconst ledit-save-files t "\
@@ -16414,7 +16394,7 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (life) "life" "play/life.el" (17140 20949))
+;;;### (autoloads (life) "life" "play/life.el" (17382 1892))
 ;;; Generated autoloads from play/life.el
 
 (autoload (quote life) "life" "\
@@ -16427,8 +16407,8 @@ generations (this defaults to 1).
 
 ;;;***
 
-;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17242
-;;;;;;  7308))
+;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17410
+;;;;;;  23522))
 ;;; Generated autoloads from loadhist.el
 
 (autoload (quote unload-feature) "loadhist" "\
@@ -16451,7 +16431,7 @@ such as redefining an Emacs function.
 ;;;***
 
 ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches)
-;;;;;;  "locate" "locate.el" (17333 17859))
+;;;;;;  "locate" "locate.el" (17432 49887))
 ;;; Generated autoloads from locate.el
 
 (defvar locate-ls-subdir-switches "-al" "\
@@ -16462,21 +16442,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" (17291 34530))
+;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17383 24126))
 ;;; Generated autoloads from log-edit.el
 
 (autoload (quote log-edit) "log-edit" "\
@@ -16497,8 +16499,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" (17366
-;;;;;;  32173))
+;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17383
+;;;;;;  24126))
 ;;; Generated autoloads from log-view.el
 
 (autoload (quote log-view-mode) "log-view" "\
@@ -16508,8 +16510,8 @@ Major mode for browsing CVS log output.
 
 ;;;***
 
-;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17320
-;;;;;;  32463))
+;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17383
+;;;;;;  24126))
 ;;; Generated autoloads from longlines.el
 
 (autoload (quote longlines-mode) "longlines" "\
@@ -16530,8 +16532,8 @@ are indicated with a symbol.
 ;;;***
 
 ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer
-;;;;;;  lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17148
-;;;;;;  25014))
+;;;;;;  lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17383
+;;;;;;  24126))
 ;;; Generated autoloads from lpr.el
 
 (defvar lpr-windows-system (memq system-type (quote (emx win32 w32 mswindows ms-dos windows-nt))))
@@ -16625,7 +16627,7 @@ for further customization of the printer command.
 ;;;***
 
 ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el"
-;;;;;;  (17283 35537))
+;;;;;;  (17383 24126))
 ;;; Generated autoloads from ls-lisp.el
 
 (defvar ls-lisp-support-shell-wildcards t "\
@@ -16636,8 +16638,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).")
 
 ;;;***
 
-;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17307
-;;;;;;  14150))
+;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17385
+;;;;;;  41891))
 ;;; Generated autoloads from calendar/lunar.el
 
 (autoload (quote phases-of-moon) "lunar" "\
@@ -16650,8 +16652,8 @@ This function is suitable for execution in a .emacs file.
 
 ;;;***
 
-;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17276
-;;;;;;  44726))
+;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17388
+;;;;;;  22062))
 ;;; Generated autoloads from progmodes/m4-mode.el
 
 (autoload (quote m4-mode) "m4-mode" "\
@@ -16663,7 +16665,7 @@ A major mode to edit m4 macro files.
 ;;;***
 
 ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el"
-;;;;;;  (17148 25097))
+;;;;;;  (17383 16118))
 ;;; Generated autoloads from emacs-lisp/macroexp.el
 
 (autoload (quote macroexpand-all) "macroexp" "\
@@ -16677,7 +16679,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" (17148 25015))
+;;;;;;  name-last-kbd-macro) "macros" "macros.el" (17383 24126))
 ;;; Generated autoloads from macros.el
 
 (autoload (quote name-last-kbd-macro) "macros" "\
@@ -16766,7 +16768,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" (17306 5314))
+;;;;;;  "mail/mail-extr.el" (17383 16812))
 ;;; Generated autoloads from mail/mail-extr.el
 
 (autoload (quote mail-extract-address-components) "mail-extr" "\
@@ -16798,7 +16800,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"
-;;;;;;  (17148 25156))
+;;;;;;  (17383 16812))
 ;;; Generated autoloads from mail/mail-hist.el
 
 (autoload (quote mail-hist-define-keys) "mail-hist" "\
@@ -16829,8 +16831,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" (17148
-;;;;;;  25156))
+;;;;;;  mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (17383
+;;;;;;  16812))
 ;;; Generated autoloads from mail/mail-utils.el
 
 (defvar mail-use-rfc822 nil "\
@@ -16882,7 +16884,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" (17239 32330))
+;;;;;;  "mailabbrev" "mail/mailabbrev.el" (17383 16812))
 ;;; Generated autoloads from mail/mailabbrev.el
 
 (autoload (quote mail-abbrevs-setup) "mailabbrev" "\
@@ -16905,8 +16907,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" (17167
-;;;;;;  2797))
+;;;;;;  mail-complete-style) "mailalias" "mail/mailalias.el" (17383
+;;;;;;  16812))
 ;;; Generated autoloads from mail/mailalias.el
 
 (defvar mail-complete-style (quote angles) "\
@@ -16952,7 +16954,7 @@ current header, calls `mail-complete-function' and passes prefix arg if any.
 ;;;***
 
 ;;;### (autoloads (mailclient-send-it) "mailclient" "mail/mailclient.el"
-;;;;;;  (17378 6213))
+;;;;;;  (17383 16812))
 ;;; Generated autoloads from mail/mailclient.el
 
 (autoload (quote mailclient-send-it) "mailclient" "\
@@ -16966,7 +16968,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" (17357 13476))
+;;;;;;  "make-mode" "progmodes/make-mode.el" (17388 22062))
 ;;; Generated autoloads from progmodes/make-mode.el
 
 (autoload (quote makefile-mode) "make-mode" "\
@@ -17084,8 +17086,8 @@ An adapted `makefile-mode' that knows about imake.
 
 ;;;***
 
-;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17148
-;;;;;;  25015))
+;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17383
+;;;;;;  24126))
 ;;; Generated autoloads from makesum.el
 
 (autoload (quote make-command-summary) "makesum" "\
@@ -17096,7 +17098,7 @@ Previous contents of that buffer are killed first.
 
 ;;;***
 
-;;;### (autoloads (man-follow man) "man" "man.el" (17356 16925))
+;;;### (autoloads (man-follow man) "man" "man.el" (17383 24126))
 ;;; Generated autoloads from man.el
 
 (defalias (quote manual-entry) (quote man))
@@ -17145,8 +17147,8 @@ yourself the value of `master-of' by calling `master-show-slave'.
 
 ;;;***
 
-;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17324
-;;;;;;  9268))
+;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17390
+;;;;;;  3585))
 ;;; Generated autoloads from menu-bar.el
 
 (put (quote menu-bar-mode) (quote standard-value) (quote (t)))
@@ -17182,7 +17184,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" (17376 48878))
+;;;;;;  "gnus/message.el" (17437 45960))
 ;;; Generated autoloads from gnus/message.el
 
 (defvar message-from-style (quote default) "\
@@ -17436,7 +17438,7 @@ which specify the range to operate on.
 ;;;***
 
 ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el"
-;;;;;;  (17276 44726))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/meta-mode.el
 
 (autoload (quote metafont-mode) "meta-mode" "\
@@ -17463,7 +17465,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"
-;;;;;;  (17185 27569))
+;;;;;;  (17383 16812))
 ;;; Generated autoloads from mail/metamail.el
 
 (autoload (quote metamail-interpret-header) "metamail" "\
@@ -17508,7 +17510,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" (17377 23328))
+;;;;;;  "mh-e/mh-comp.el" (17437 48486))
 ;;; Generated autoloads from mh-e/mh-comp.el
 
 (autoload (quote mh-smail) "mh-comp" "\
@@ -17571,6 +17573,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.
 
@@ -17588,7 +17597,7 @@ delete the draft message.
 
 ;;;***
 
-;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (17379 60196))
+;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (17448 13451))
 ;;; Generated autoloads from mh-e/mh-e.el
 
 (put (quote mh-progs) (quote risky-local-variable) t)
@@ -17605,7 +17614,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" (17377 23328))
+;;;;;;  "mh-e/mh-folder.el" (17432 18686))
 ;;; Generated autoloads from mh-e/mh-folder.el
 
 (autoload (quote mh-rmail) "mh-folder" "\
@@ -17687,7 +17696,7 @@ perform the operation on all messages in that region.
 ;;;***
 
 ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight"
-;;;;;;  "midnight.el" (17148 25017))
+;;;;;;  "midnight.el" (17416 12817))
 ;;; Generated autoloads from midnight.el
 
 (autoload (quote clean-buffer-list) "midnight" "\
@@ -17714,7 +17723,7 @@ to its second argument TM.
 ;;;***
 
 ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef"
-;;;;;;  "minibuf-eldef.el" (17148 25017))
+;;;;;;  "minibuf-eldef.el" (17383 24126))
 ;;; Generated autoloads from minibuf-eldef.el
 
 (defvar minibuffer-electric-default-mode nil "\
@@ -17743,7 +17752,7 @@ Returns non-nil if the new state is enabled.
 ;;;***
 
 ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el"
-;;;;;;  (17239 32387))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/mixal-mode.el
 
 (autoload (quote mixal-mode) "mixal-mode" "\
@@ -17780,10 +17789,15 @@ PATTERN regexp.
 
 ;;;***
 
-;;;### (autoloads (mm-inline-external-body) "mm-extern" "gnus/mm-extern.el"
-;;;;;;  (17185 27553))
+;;;### (autoloads (mm-inline-external-body mm-extern-cache-contents)
+;;;;;;  "mm-extern" "gnus/mm-extern.el" (17437 45960))
 ;;; 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
@@ -17795,7 +17809,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing.
 ;;;***
 
 ;;;### (autoloads (mm-inline-partial) "mm-partial" "gnus/mm-partial.el"
-;;;;;;  (17148 25140))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/mm-partial.el
 
 (autoload (quote mm-inline-partial) "mm-partial" "\
@@ -17809,7 +17823,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" (17310 14064))
+;;;;;;  "mm-url" "gnus/mm-url.el" (17382 1052))
 ;;; Generated autoloads from gnus/mm-url.el
 
 (autoload (quote mm-url-insert-file-contents) "mm-url" "\
@@ -17826,7 +17840,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" (17376 48878))
+;;;;;;  "gnus/mm-uu.el" (17437 45961))
 ;;; Generated autoloads from gnus/mm-uu.el
 
 (autoload (quote mm-uu-dissect) "mm-uu" "\
@@ -17846,7 +17860,7 @@ Assume text has been decoded if DECODED is non-nil.
 ;;;***
 
 ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el"
-;;;;;;  (17185 27556))
+;;;;;;  (17388 8140))
 ;;; Generated autoloads from gnus/mml1991.el
 
 (autoload (quote mml1991-encrypt) "mml1991" "\
@@ -17863,7 +17877,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" (17185 27558))
+;;;;;;  "mml2015" "gnus/mml2015.el" (17388 8140))
 ;;; Generated autoloads from gnus/mml2015.el
 
 (autoload (quote mml2015-decrypt) "mml2015" "\
@@ -17936,7 +17950,7 @@ followed by the first character of the construct.
 ;;;***
 
 ;;;### (autoloads (unmorse-region morse-region) "morse" "play/morse.el"
-;;;;;;  (17140 20949))
+;;;;;;  (17382 1892))
 ;;; Generated autoloads from play/morse.el
 
 (autoload (quote morse-region) "morse" "\
@@ -17951,8 +17965,8 @@ Convert morse coded text in region to ordinary ASCII text.
 
 ;;;***
 
-;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17148
-;;;;;;  25018))
+;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17383
+;;;;;;  24126))
 ;;; Generated autoloads from mouse-sel.el
 
 (defvar mouse-sel-mode nil "\
@@ -18005,7 +18019,7 @@ primary selection and region.
 
 ;;;***
 
-;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17239 32365))
+;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17382 1892))
 ;;; Generated autoloads from play/mpuz.el
 
 (autoload (quote mpuz) "mpuz" "\
@@ -18015,7 +18029,7 @@ Multiplication puzzle with GNU Emacs.
 
 ;;;***
 
-;;;### (autoloads (msb-mode) "msb" "msb.el" (17185 27455))
+;;;### (autoloads (msb-mode) "msb" "msb.el" (17383 24126))
 ;;; Generated autoloads from msb.el
 
 (defvar msb-mode nil "\
@@ -18345,7 +18359,7 @@ basis, this may not be accurate.
 ;;;***
 
 ;;;### (autoloads (mwheel-install mouse-wheel-mode) "mwheel" "mwheel.el"
-;;;;;;  (17258 50746))
+;;;;;;  (17393 49300))
 ;;; Generated autoloads from mwheel.el
 
 (defvar mouse-wheel-mode nil "\
@@ -18361,7 +18375,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)
 
@@ -18375,7 +18389,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" (17148 25173))
+;;;;;;  "net-utils" "net/net-utils.el" (17383 13296))
 ;;; Generated autoloads from net/net-utils.el
 
 (autoload (quote traceroute) "net-utils" "\
@@ -18655,7 +18669,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" (17378 16858))
+;;;;;;  "net/newsticker.el" (17383 13296))
 ;;; Generated autoloads from net/newsticker.el
 
 (autoload (quote newsticker-running-p) "newsticker" "\
@@ -18697,7 +18711,7 @@ Switch to newsticker buffer.  You may want to bind this to a key.
 ;;;***
 
 ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el"
-;;;;;;  (17148 25143))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/nndiary.el
 
 (autoload (quote nndiary-generate-nov-databases) "nndiary" "\
@@ -18707,8 +18721,8 @@ Generate NOV databases in all nndiary directories.
 
 ;;;***
 
-;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17148
-;;;;;;  25143))
+;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17382
+;;;;;;  1052))
 ;;; Generated autoloads from gnus/nndoc.el
 
 (autoload (quote nndoc-add-type) "nndoc" "\
@@ -18723,7 +18737,7 @@ symbol in the alist.
 ;;;***
 
 ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el"
-;;;;;;  (17148 25144))
+;;;;;;  (17388 8140))
 ;;; Generated autoloads from gnus/nnfolder.el
 
 (autoload (quote nnfolder-generate-active-file) "nnfolder" "\
@@ -18735,7 +18749,7 @@ This command does not work if you use short group names.
 ;;;***
 
 ;;;### (autoloads (nnkiboze-generate-groups) "nnkiboze" "gnus/nnkiboze.el"
-;;;;;;  (17148 25145))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/nnkiboze.el
 
 (autoload (quote nnkiboze-generate-groups) "nnkiboze" "\
@@ -18747,7 +18761,7 @@ Finds out what articles are to be part of the nnkiboze groups.
 ;;;***
 
 ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el"
-;;;;;;  (17148 25147))
+;;;;;;  (17382 1052))
 ;;; Generated autoloads from gnus/nnml.el
 
 (autoload (quote nnml-generate-nov-databases) "nnml" "\
@@ -18758,7 +18772,7 @@ Generate NOV databases in all nnml directories.
 ;;;***
 
 ;;;### (autoloads (nnsoup-revert-variables nnsoup-set-variables nnsoup-pack-replies)
-;;;;;;  "nnsoup" "gnus/nnsoup.el" (17148 25148))
+;;;;;;  "nnsoup" "gnus/nnsoup.el" (17382 1052))
 ;;; Generated autoloads from gnus/nnsoup.el
 
 (autoload (quote nnsoup-pack-replies) "nnsoup" "\
@@ -18779,7 +18793,7 @@ Revert posting and mailing methods to the standard Emacs methods.
 ;;;***
 
 ;;;### (autoloads (disable-command enable-command disabled-command-function)
-;;;;;;  "novice" "novice.el" (17148 25021))
+;;;;;;  "novice" "novice.el" (17383 24126))
 ;;; Generated autoloads from novice.el
 
 (defvar disabled-command-function (quote disabled-command-function) "\
@@ -18812,7 +18826,7 @@ to future sessions.
 ;;;***
 
 ;;;### (autoloads (nroff-mode) "nroff-mode" "textmodes/nroff-mode.el"
-;;;;;;  (17379 56088))
+;;;;;;  (17383 55314))
 ;;; Generated autoloads from textmodes/nroff-mode.el
 
 (autoload (quote nroff-mode) "nroff-mode" "\
@@ -18827,7 +18841,7 @@ closing requests for requests that are used in matched pairs.
 ;;;***
 
 ;;;### (autoloads (octave-help) "octave-hlp" "progmodes/octave-hlp.el"
-;;;;;;  (17167 26278))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/octave-hlp.el
 
 (autoload (quote octave-help) "octave-hlp" "\
@@ -18841,7 +18855,7 @@ If KEY is not a string, prompt for it with completion.
 ;;;***
 
 ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el"
-;;;;;;  (17288 31060))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/octave-inf.el
 
 (autoload (quote inferior-octave) "octave-inf" "\
@@ -18864,7 +18878,7 @@ startup file, `~/.emacs-octave'.
 ;;;***
 
 ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el"
-;;;;;;  (17307 14151))
+;;;;;;  (17426 59496))
 ;;; Generated autoloads from progmodes/octave-mod.el
 
 (autoload (quote octave-mode) "octave-mod" "\
@@ -18963,7 +18977,7 @@ including a reproducible test case and send the message.
 ;;;***
 
 ;;;### (autoloads (edit-options list-options) "options" "obsolete/options.el"
-;;;;;;  (17148 25181))
+;;;;;;  (17382 34311))
 ;;; Generated autoloads from obsolete/options.el
 
 (autoload (quote list-options) "options" "\
@@ -18988,7 +19002,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"
-;;;;;;  (17373 32426))
+;;;;;;  (17447 40021))
 ;;; Generated autoloads from textmodes/org.el
 
 (autoload (quote org-mode) "org" "\
@@ -19200,7 +19214,7 @@ The file is stored under the name `org-combined-agenda-icalendar-file'.
 ;;;***
 
 ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el"
-;;;;;;  (17360 15348))
+;;;;;;  (17419 48998))
 ;;; Generated autoloads from outline.el
 
 (autoload (quote outline-mode) "outline" "\
@@ -19255,7 +19269,7 @@ See the command `outline-mode' for more information on this mode.
 
 ;;;***
 
-;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17333 17859))
+;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17383 24126))
 ;;; Generated autoloads from paren.el
 
 (defvar show-paren-mode nil "\
@@ -19281,7 +19295,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time.
 ;;;***
 
 ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el"
-;;;;;;  (17307 14150))
+;;;;;;  (17385 41891))
 ;;; Generated autoloads from calendar/parse-time.el
 
 (autoload (quote parse-time-string) "parse-time" "\
@@ -19293,8 +19307,8 @@ unknown are returned as nil.
 
 ;;;***
 
-;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17276
-;;;;;;  44726))
+;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17388
+;;;;;;  22062))
 ;;; Generated autoloads from progmodes/pascal.el
 
 (autoload (quote pascal-mode) "pascal" "\
@@ -19347,7 +19361,7 @@ no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (pc-bindings-mode) "pc-mode" "emulation/pc-mode.el"
-;;;;;;  (17140 20922))
+;;;;;;  (17383 13537))
 ;;; Generated autoloads from emulation/pc-mode.el
 
 (autoload (quote pc-bindings-mode) "pc-mode" "\
@@ -19365,7 +19379,7 @@ C-Escape does list-buffers.
 ;;;***
 
 ;;;### (autoloads (pc-selection-mode pc-selection-mode) "pc-select"
-;;;;;;  "emulation/pc-select.el" (17140 20922))
+;;;;;;  "emulation/pc-select.el" (17383 13537))
 ;;; Generated autoloads from emulation/pc-select.el
 
 (defvar pc-selection-mode nil "\
@@ -19442,8 +19456,8 @@ you must modify it using \\[customize] or \\[pc-selection-mode].")
 
 ;;;***
 
-;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17148
-;;;;;;  25022))
+;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17383
+;;;;;;  24126))
 ;;; Generated autoloads from pcmpl-cvs.el
 
 (autoload (quote pcomplete/cvs) "pcmpl-cvs" "\
@@ -19454,7 +19468,7 @@ Completion rules for the `cvs' command.
 ;;;***
 
 ;;;### (autoloads (pcomplete/tar pcomplete/make pcomplete/bzip2 pcomplete/gzip)
-;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (17148 25022))
+;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (17383 24126))
 ;;; Generated autoloads from pcmpl-gnu.el
 
 (autoload (quote pcomplete/gzip) "pcmpl-gnu" "\
@@ -19482,7 +19496,7 @@ Completion for the GNU tar utility.
 ;;;***
 
 ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill)
-;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (17148 25022))
+;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (17383 24126))
 ;;; Generated autoloads from pcmpl-linux.el
 
 (autoload (quote pcomplete/kill) "pcmpl-linux" "\
@@ -19502,8 +19516,8 @@ Completion for GNU/Linux `mount'.
 
 ;;;***
 
-;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17148
-;;;;;;  25022))
+;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17383
+;;;;;;  24126))
 ;;; Generated autoloads from pcmpl-rpm.el
 
 (autoload (quote pcomplete/rpm) "pcmpl-rpm" "\
@@ -19519,7 +19533,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" (17148 25022))
+;;;;;;  "pcmpl-unix" "pcmpl-unix.el" (17383 24126))
 ;;; Generated autoloads from pcmpl-unix.el
 
 (autoload (quote pcomplete/cd) "pcmpl-unix" "\
@@ -19565,8 +19579,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" (17205
-;;;;;;  6017))
+;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17383
+;;;;;;  24126))
 ;;; Generated autoloads from pcomplete.el
 
 (autoload (quote pcomplete) "pcomplete" "\
@@ -19625,7 +19639,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" (17304 41554))
+;;;;;;  "pcvs.el" (17383 24126))
 ;;; Generated autoloads from pcvs.el
 
 (autoload (quote cvs-checkout) "pcvs" "\
@@ -19702,7 +19716,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
 
 ;;;***
 
-;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17194 38169))
+;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17383 24126))
 ;;; 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)))
@@ -19710,7 +19724,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
 ;;;***
 
 ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el"
-;;;;;;  (17276 44726))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/perl-mode.el
 
 (autoload (quote perl-mode) "perl-mode" "\
@@ -19768,7 +19782,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" (17251 37236))
+;;;;;;  pgg-encrypt-region) "pgg" "pgg.el" (17383 24126))
 ;;; Generated autoloads from pgg.el
 
 (autoload (quote pgg-encrypt-region) "pgg" "\
@@ -19901,19 +19915,8 @@ Import public keys in the current buffer.
 
 ;;;***
 
-;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el"
-;;;;;;  (17251 37235))
-;;; 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"
-;;;;;;  (17316 61871))
+;;;;;;  (17383 15658))
 ;;; Generated autoloads from textmodes/picture.el
 
 (autoload (quote picture-mode) "picture" "\
@@ -19994,7 +19997,7 @@ they are not defaultly assigned to keys.
 ;;;***
 
 ;;;### (autoloads (po-find-file-coding-system) "po" "textmodes/po.el"
-;;;;;;  (17148 25215))
+;;;;;;  (17383 15658))
 ;;; Generated autoloads from textmodes/po.el
 
 (autoload (quote po-find-file-coding-system) "po" "\
@@ -20005,7 +20008,7 @@ Called through `file-coding-system-alist', before the file is visited for real.
 
 ;;;***
 
-;;;### (autoloads (pong) "pong" "play/pong.el" (17140 20949))
+;;;### (autoloads (pong) "pong" "play/pong.el" (17382 1892))
 ;;; Generated autoloads from play/pong.el
 
 (autoload (quote pong) "pong" "\
@@ -20022,7 +20025,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" (17185 27496))
+;;;;;;  pp-to-string) "pp" "emacs-lisp/pp.el" (17383 16118))
 ;;; Generated autoloads from emacs-lisp/pp.el
 
 (autoload (quote pp-to-string) "pp" "\
@@ -20080,7 +20083,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"
-;;;;;;  (17275 51551))
+;;;;;;  (17383 24126))
 ;;; Generated autoloads from printing.el
 
 (autoload (quote pr-interface) "printing" "\
@@ -20668,7 +20671,7 @@ are both set to t.
 ;;;***
 
 ;;;### (autoloads (run-prolog prolog-mode) "prolog" "progmodes/prolog.el"
-;;;;;;  (17276 44726))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/prolog.el
 
 (autoload (quote prolog-mode) "prolog" "\
@@ -20688,7 +20691,7 @@ Run an inferior Prolog process, input and output via buffer *prolog*.
 
 ;;;***
 
-;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17318 56744))
+;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17383 24126))
 ;;; 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"))) "\
@@ -20697,8 +20700,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
 
 ;;;***
 
-;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17276
-;;;;;;  44727))
+;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17388
+;;;;;;  22062))
 ;;; Generated autoloads from progmodes/ps-mode.el
 
 (autoload (quote ps-mode) "ps-mode" "\
@@ -20747,7 +20750,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" (17239 32229))
+;;;;;;  "ps-mule" "ps-mule.el" (17383 24126))
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\
@@ -20868,8 +20871,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" (17239
-;;;;;;  32233))
+;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (17383
+;;;;;;  24126))
 ;;; 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")) "\
@@ -21066,7 +21069,7 @@ If EXTENSION is any other symbol, it is ignored.
 ;;;***
 
 ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el"
-;;;;;;  (17362 20185))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/python.el
 
 (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode)))
@@ -21130,7 +21133,7 @@ Runs `jython-mode-hook' after `python-mode-hook'.
 ;;;***
 
 ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el"
-;;;;;;  (17148 25151))
+;;;;;;  (17406 37716))
 ;;; Generated autoloads from gnus/qp.el
 
 (autoload (quote quoted-printable-decode-region) "qp" "\
@@ -21384,8 +21387,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" (17140
-;;;;;;  20942))
+;;;;;;  quickurl-ask quickurl) "quickurl" "net/quickurl.el" (17383
+;;;;;;  13296))
 ;;; 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" "\
@@ -21456,25 +21459,42 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 
 ;;;***
 
-;;;### (autoloads (rcirc) "rcirc" "net/rcirc.el" (17378 16858))
+;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
+;;;;;;  "net/rcirc.el" (17448 18873))
 ;;; 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" (17239
-;;;;;;  32359))
+;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17383
+;;;;;;  13296))
 ;;; Generated autoloads from net/rcompile.el
 
 (autoload (quote remote-compile) "rcompile" "\
@@ -21486,7 +21506,7 @@ See \\[compile].
 ;;;***
 
 ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el"
-;;;;;;  (17148 25097))
+;;;;;;  (17383 16118))
 ;;; Generated autoloads from emacs-lisp/re-builder.el
 
 (defalias (quote regexp-builder) (quote re-builder))
@@ -21498,7 +21518,7 @@ Construct a regexp interactively.
 
 ;;;***
 
-;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17314 3338))
+;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17383 24126))
 ;;; Generated autoloads from recentf.el
 
 (defvar recentf-mode nil "\
@@ -21528,8 +21548,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" (17239
-;;;;;;  32234))
+;;;;;;  delete-rectangle move-to-column-force) "rect" "rect.el" (17383
+;;;;;;  24127))
 ;;; Generated autoloads from rect.el
 
 (autoload (quote move-to-column-force) "rect" "\
@@ -21651,8 +21671,8 @@ rectangle which were empty.
 
 ;;;***
 
-;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17148
-;;;;;;  25216))
+;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17383
+;;;;;;  15658))
 ;;; Generated autoloads from textmodes/refill.el
 
 (autoload (quote refill-mode) "refill" "\
@@ -21668,7 +21688,7 @@ refilling if they would cause auto-filling.
 ;;;***
 
 ;;;### (autoloads (reftex-reset-scanning-information reftex-mode
-;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (17275 15964))
+;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (17404 10043))
 ;;; Generated autoloads from textmodes/reftex.el
 
 (autoload (quote turn-on-reftex) "reftex" "\
@@ -21718,7 +21738,7 @@ This enforces rescanning the buffer on next use.
 ;;;***
 
 ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el"
-;;;;;;  (17205 6249))
+;;;;;;  (17404 4365))
 ;;; Generated autoloads from textmodes/reftex-cite.el
 
 (autoload (quote reftex-citation) "reftex-cite" "\
@@ -21748,7 +21768,7 @@ While entering the regexp, completion on knows citation keys is possible.
 ;;;***
 
 ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el"
-;;;;;;  (17205 6250))
+;;;;;;  (17404 4365))
 ;;; Generated autoloads from textmodes/reftex-global.el
 
 (autoload (quote reftex-isearch-minor-mode) "reftex-global" "\
@@ -21765,7 +21785,7 @@ With no argument, this command toggles
 ;;;***
 
 ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el"
-;;;;;;  (17239 32421))
+;;;;;;  (17413 18835))
 ;;; Generated autoloads from textmodes/reftex-index.el
 
 (autoload (quote reftex-index-phrases-mode) "reftex-index" "\
@@ -21798,7 +21818,7 @@ Here are all local bindings.
 ;;;***
 
 ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el"
-;;;;;;  (17205 6254))
+;;;;;;  (17404 4365))
 ;;; Generated autoloads from textmodes/reftex-parse.el
 
 (autoload (quote reftex-all-document-files) "reftex-parse" "\
@@ -21811,7 +21831,7 @@ of master file.
 ;;;***
 
 ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el"
-;;;;;;  (17148 25097))
+;;;;;;  (17383 16119))
 ;;; Generated autoloads from emacs-lisp/regexp-opt.el
 
 (autoload (quote regexp-opt) "regexp-opt" "\
@@ -21838,7 +21858,7 @@ This means the number of non-shy regexp grouping constructs
 
 ;;;***
 
-;;;### (autoloads (repeat) "repeat" "repeat.el" (17148 25034))
+;;;### (autoloads (repeat) "repeat" "repeat.el" (17383 24127))
 ;;; Generated autoloads from repeat.el
 
 (autoload (quote repeat) "repeat" "\
@@ -21856,7 +21876,7 @@ can be modified by the global variable `repeat-on-final-keystroke'.
 ;;;***
 
 ;;;### (autoloads (reporter-submit-bug-report) "reporter" "mail/reporter.el"
-;;;;;;  (17148 25157))
+;;;;;;  (17383 16812))
 ;;; Generated autoloads from mail/reporter.el
 
 (autoload (quote reporter-submit-bug-report) "reporter" "\
@@ -21888,7 +21908,7 @@ mail-sending package is used for editing and sending the message.
 ;;;***
 
 ;;;### (autoloads (reposition-window) "reposition" "reposition.el"
-;;;;;;  (17148 25035))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from reposition.el
 
 (autoload (quote reposition-window) "reposition" "\
@@ -21915,8 +21935,8 @@ first comment line visible (if point is in a comment).
 
 ;;;***
 
-;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17148
-;;;;;;  25035))
+;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17383
+;;;;;;  24127))
 ;;; Generated autoloads from resume.el
 
 (autoload (quote resume-suspend-hook) "resume" "\
@@ -21963,7 +21983,7 @@ With zero or negative ARG turn mode off.
 ;;;***
 
 ;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el"
-;;;;;;  (17148 25098))
+;;;;;;  (17383 16119))
 ;;; Generated autoloads from emacs-lisp/ring.el
 
 (autoload (quote ring-p) "ring" "\
@@ -21978,7 +21998,7 @@ Make a ring that can contain SIZE elements.
 
 ;;;***
 
-;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17140 20942))
+;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17383 13296))
 ;;; Generated autoloads from net/rlogin.el
  (add-hook 'same-window-regexps "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)")
 
@@ -22029,8 +22049,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" (17359
-;;;;;;  40965))
+;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17445
+;;;;;;  10908))
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload (quote rmail-movemail-variant-p) "rmail" "\
@@ -22053,7 +22073,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,
@@ -22084,7 +22104,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")
@@ -22295,7 +22315,7 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server.
 ;;;***
 
 ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "mail/rmailedit.el"
-;;;;;;  (17148 25160))
+;;;;;;  (17383 16812))
 ;;; Generated autoloads from mail/rmailedit.el
 
 (autoload (quote rmail-edit-current-message) "rmailedit" "\
@@ -22307,7 +22327,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" (17185 27577))
+;;;;;;  "mail/rmailkwd.el" (17383 16812))
 ;;; Generated autoloads from mail/rmailkwd.el
 
 (autoload (quote rmail-add-label) "rmailkwd" "\
@@ -22346,7 +22366,7 @@ With prefix argument N moves forward N messages with these labels.
 ;;;***
 
 ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "mail/rmailmsc.el"
-;;;;;;  (17185 27577))
+;;;;;;  (17383 16812))
 ;;; Generated autoloads from mail/rmailmsc.el
 
 (autoload (quote set-rmail-inbox-list) "rmailmsc" "\
@@ -22360,7 +22380,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" (17362 20183))
+;;;;;;  "mail/rmailout.el" (17383 16812))
 ;;; Generated autoloads from mail/rmailout.el
 
 (defvar rmail-output-file-alist nil "\
@@ -22427,8 +22447,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" (17148
-;;;;;;  25160))
+;;;;;;  rmail-sort-by-date) "rmailsort" "mail/rmailsort.el" (17383
+;;;;;;  16812))
 ;;; Generated autoloads from mail/rmailsort.el
 
 (autoload (quote rmail-sort-by-date) "rmailsort" "\
@@ -22480,7 +22500,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" (17369 18495))
+;;;;;;  "rmailsum" "mail/rmailsum.el" (17426 63564))
 ;;; Generated autoloads from mail/rmailsum.el
 
 (defvar rmail-summary-scroll-between-messages t "\
@@ -22562,7 +22582,7 @@ Setting this variable has an effect only before reading a mail.")
 ;;;***
 
 ;;;### (autoloads (news-post-news) "rnewspost" "obsolete/rnewspost.el"
-;;;;;;  (17185 27602))
+;;;;;;  (17382 34311))
 ;;; Generated autoloads from obsolete/rnewspost.el
 
 (autoload (quote news-post-news) "rnewspost" "\
@@ -22575,7 +22595,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" (17148 25035))
+;;;;;;  rot13-string rot13) "rot13" "rot13.el" (17383 24127))
 ;;; Generated autoloads from rot13.el
 
 (autoload (quote rot13) "rot13" "\
@@ -22616,7 +22636,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"
-;;;;;;  (17148 25181))
+;;;;;;  (17382 34311))
 ;;; Generated autoloads from obsolete/rsz-mini.el
 
 (defvar resize-minibuffer-mode nil "\
@@ -22656,8 +22676,8 @@ This function is obsolete.
 
 ;;;***
 
-;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17159
-;;;;;;  1467))
+;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17383
+;;;;;;  24127))
 ;;; Generated autoloads from ruler-mode.el
 
 (autoload (quote ruler-mode) "ruler-mode" "\
@@ -22667,8 +22687,8 @@ Display a ruler in the header line if ARG > 0.
 
 ;;;***
 
-;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17148
-;;;;;;  25098))
+;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17416
+;;;;;;  13385))
 ;;; Generated autoloads from emacs-lisp/rx.el
 
 (autoload (quote rx-to-string) "rx" "\
@@ -22976,7 +22996,7 @@ enclosed in `(and ...)'.
 ;;;***
 
 ;;;### (autoloads (savehist-mode savehist-mode) "savehist" "savehist.el"
-;;;;;;  (17378 6213))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from savehist.el
 
 (defvar savehist-mode nil "\
@@ -23002,7 +23022,7 @@ which is probably undesirable.
 ;;;***
 
 ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el"
-;;;;;;  (17276 44727))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/scheme.el
 
 (autoload (quote scheme-mode) "scheme" "\
@@ -23044,7 +23064,7 @@ that variable's value is a string.
 ;;;***
 
 ;;;### (autoloads (gnus-score-mode) "score-mode" "gnus/score-mode.el"
-;;;;;;  (17148 25151))
+;;;;;;  (17382 1051))
 ;;; Generated autoloads from gnus/score-mode.el
 
 (autoload (quote gnus-score-mode) "score-mode" "\
@@ -23057,8 +23077,8 @@ This mode is an extended emacs-lisp mode.
 
 ;;;***
 
-;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17185
-;;;;;;  27603))
+;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17382
+;;;;;;  34311))
 ;;; Generated autoloads from obsolete/scribe.el
 
 (autoload (quote scribe-mode) "scribe" "\
@@ -23083,7 +23103,7 @@ Interesting variables:
 ;;;***
 
 ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el"
-;;;;;;  (17148 25035))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from scroll-all.el
 
 (defvar scroll-all-mode nil "\
@@ -23107,7 +23127,7 @@ apply to all visible windows in the same frame.
 ;;;***
 
 ;;;### (autoloads (scroll-lock-mode) "scroll-lock" "scroll-lock.el"
-;;;;;;  (17167 2786))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from scroll-lock.el
 
 (autoload (quote scroll-lock-mode) "scroll-lock" "\
@@ -23129,7 +23149,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" (17330 49619))
+;;;;;;  "sendmail" "mail/sendmail.el" (17383 16812))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style (quote angles) "\
@@ -23430,7 +23450,7 @@ Like `mail' command, but display mail buffer in another frame.
 ;;;***
 
 ;;;### (autoloads (server-mode server-start) "server" "server.el"
-;;;;;;  (17244 54745))
+;;;;;;  (17417 47894))
 ;;; Generated autoloads from server.el
 
 (autoload (quote server-start) "server" "\
@@ -23483,7 +23503,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"
-;;;;;;  (17356 16925))
+;;;;;;  (17383 15659))
 ;;; Generated autoloads from textmodes/sgml-mode.el
 
 (autoload (quote sgml-mode) "sgml-mode" "\
@@ -23551,7 +23571,7 @@ To work around that, do:
 ;;;***
 
 ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el"
-;;;;;;  (17316 61871))
+;;;;;;  (17408 15904))
 ;;; Generated autoloads from progmodes/sh-script.el
 
 (autoload (quote sh-mode) "sh-script" "\
@@ -23614,7 +23634,7 @@ with your script for an edit-interpret-debug cycle.
 
 ;;;***
 
-;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17148 25151))
+;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17382 1051))
 ;;; Generated autoloads from gnus/sha1.el
 
 (autoload (quote sha1) "sha1" "\
@@ -23629,7 +23649,7 @@ If BINARY is non-nil, return a string in binary form.
 ;;;***
 
 ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el"
-;;;;;;  (17279 31149))
+;;;;;;  (17383 16119))
 ;;; Generated autoloads from emacs-lisp/shadow.el
 
 (autoload (quote list-load-path-shadows) "shadow" "\
@@ -23676,8 +23696,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" (17239
-;;;;;;  32238))
+;;;;;;  shadow-define-cluster) "shadowfile" "shadowfile.el" (17383
+;;;;;;  24127))
 ;;; Generated autoloads from shadowfile.el
 
 (autoload (quote shadow-define-cluster) "shadowfile" "\
@@ -23716,7 +23736,7 @@ Set up file shadowing.
 ;;;***
 
 ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el"
-;;;;;;  (17196 30352))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from shell.el
 
 (defvar shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" "\
@@ -23763,7 +23783,7 @@ Otherwise, one argument `-i' is passed to the shell.
 ;;;***
 
 ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage)
-;;;;;;  "sieve" "gnus/sieve.el" (17205 6100))
+;;;;;;  "sieve" "gnus/sieve.el" (17382 1051))
 ;;; Generated autoloads from gnus/sieve.el
 
 (autoload (quote sieve-manage) "sieve" "\
@@ -23784,7 +23804,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (sieve-mode) "sieve-mode" "gnus/sieve-mode.el"
-;;;;;;  (17148 25152))
+;;;;;;  (17382 1051))
 ;;; Generated autoloads from gnus/sieve-mode.el
 
 (autoload (quote sieve-mode) "sieve-mode" "\
@@ -23799,8 +23819,8 @@ Turning on Sieve mode runs `sieve-mode-hook'.
 
 ;;;***
 
-;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17276
-;;;;;;  44727))
+;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17388
+;;;;;;  22062))
 ;;; Generated autoloads from progmodes/simula.el
 
 (autoload (quote simula-mode) "simula" "\
@@ -23849,7 +23869,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" (17148 25043))
+;;;;;;  define-skeleton) "skeleton" "skeleton.el" (17383 24127))
 ;;; Generated autoloads from skeleton.el
 
 (defvar skeleton-filter (quote identity) "\
@@ -23959,7 +23979,7 @@ symmetrical ones, and the same character twice for the others.
 ;;;***
 
 ;;;### (autoloads (smerge-mode smerge-ediff) "smerge-mode" "smerge-mode.el"
-;;;;;;  (17248 650))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from smerge-mode.el
 
 (autoload (quote smerge-ediff) "smerge-mode" "\
@@ -23978,7 +23998,7 @@ Minor mode to simplify editing output from the diff3 program.
 ;;;***
 
 ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el"
-;;;;;;  (17148 25152))
+;;;;;;  (17440 25582))
 ;;; Generated autoloads from gnus/smiley.el
 
 (autoload (quote smiley-region) "smiley" "\
@@ -23996,7 +24016,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" (17358 48216))
+;;;;;;  "mail/smtpmail.el" (17383 16812))
 ;;; Generated autoloads from mail/smtpmail.el
 
 (autoload (quote smtpmail-send-it) "smtpmail" "\
@@ -24011,7 +24031,7 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'.
 
 ;;;***
 
-;;;### (autoloads (snake) "snake" "play/snake.el" (17140 20949))
+;;;### (autoloads (snake) "snake" "play/snake.el" (17382 1892))
 ;;; Generated autoloads from play/snake.el
 
 (autoload (quote snake) "snake" "\
@@ -24035,7 +24055,7 @@ Snake mode keybindings:
 ;;;***
 
 ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el"
-;;;;;;  (17140 20942))
+;;;;;;  (17383 13296))
 ;;; Generated autoloads from net/snmp-mode.el
 
 (autoload (quote snmp-mode) "snmp-mode" "\
@@ -24066,7 +24086,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" (17307 14150))
+;;;;;;  "solar" "calendar/solar.el" (17385 41891))
 ;;; 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 ")"))) "\
@@ -24137,8 +24157,8 @@ Requires floating point.
 
 ;;;***
 
-;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17140
-;;;;;;  20949))
+;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17382
+;;;;;;  1892))
 ;;; Generated autoloads from play/solitaire.el
 
 (autoload (quote solitaire) "solitaire" "\
@@ -24215,7 +24235,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" (17148 25043))
+;;;;;;  sort-lines sort-subr) "sort" "sort.el" (17434 1454))
 ;;; Generated autoloads from sort.el
 
 (autoload (quote sort-subr) "sort" "\
@@ -24357,8 +24377,8 @@ From a program takes two point or marker arguments, BEG and END.
 
 ;;;***
 
-;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17360
-;;;;;;  3380))
+;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17440
+;;;;;;  25582))
 ;;; Generated autoloads from gnus/spam.el
 
 (autoload (quote spam-initialize) "spam" "\
@@ -24370,7 +24390,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" (17239 32320))
+;;;;;;  "gnus/spam-report.el" (17385 29998))
 ;;; Generated autoloads from gnus/spam-report.el
 
 (autoload (quote spam-report-process-queue) "spam-report" "\
@@ -24413,7 +24433,7 @@ Spam reports will be queued with the method used when
 ;;;***
 
 ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar"
-;;;;;;  "speedbar.el" (17294 14915))
+;;;;;;  "speedbar.el" (17412 50667))
 ;;; Generated autoloads from speedbar.el
 
 (defalias (quote speedbar) (quote speedbar-frame-mode))
@@ -24438,7 +24458,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" (17148 25223))
+;;;;;;  "spell" "textmodes/spell.el" (17383 15659))
 ;;; Generated autoloads from textmodes/spell.el
 
 (put (quote spell-filter) (quote risky-local-variable) t)
@@ -24474,8 +24494,8 @@ Check spelling of string supplied as argument.
 
 ;;;***
 
-;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17140
-;;;;;;  20949))
+;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17382
+;;;;;;  1892))
 ;;; Generated autoloads from play/spook.el
 
 (autoload (quote spook) "spook" "\
@@ -24493,8 +24513,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" (17185
-;;;;;;  27674))
+;;;;;;  sql-add-product-keywords) "sql" "progmodes/sql.el" (17388
+;;;;;;  22062))
 ;;; Generated autoloads from progmodes/sql.el
 
 (autoload (quote sql-add-product-keywords) "sql" "\
@@ -24925,8 +24945,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" (17205
-;;;;;;  6045))
+;;;;;;  strokes-global-set-stroke) "strokes" "strokes.el" (17383
+;;;;;;  24127))
 ;;; Generated autoloads from strokes.el
 
 (autoload (quote strokes-global-set-stroke) "strokes" "\
@@ -25057,7 +25077,7 @@ Studlify-case the current buffer.
 
 ;;;***
 
-;;;### (autoloads (locate-library) "subr" "subr.el" (17374 39354))
+;;;### (autoloads (locate-library) "subr" "subr.el" (17410 23908))
 ;;; Generated autoloads from subr.el
 
 (autoload (quote locate-library) "subr" "\
@@ -25079,7 +25099,7 @@ and the file name is displayed in the echo area.
 ;;;***
 
 ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el"
-;;;;;;  (17239 32335))
+;;;;;;  (17383 16812))
 ;;; Generated autoloads from mail/supercite.el
 
 (autoload (quote sc-cite-original) "supercite" "\
@@ -25111,7 +25131,30 @@ before, and `sc-post-hook' is run after the guts of this function.
 
 ;;;***
 
-;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17148 25050))
+;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17416 55046))
+;;; 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" (17383 24127))
 ;;; Generated autoloads from tabify.el
 
 (autoload (quote untabify) "tabify" "\
@@ -25734,7 +25777,7 @@ converts a table into plain text without frames.  It is a companion to
 
 ;;;***
 
-;;;### (autoloads (talk-connect) "talk" "talk.el" (17148 25050))
+;;;### (autoloads (talk-connect) "talk" "talk.el" (17383 24127))
 ;;; Generated autoloads from talk.el
 
 (autoload (quote talk-connect) "talk" "\
@@ -25744,7 +25787,7 @@ Connect to display DISPLAY for the Emacs talk group.
 
 ;;;***
 
-;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17267 37747))
+;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17383 24127))
 ;;; Generated autoloads from tar-mode.el
 
 (autoload (quote tar-mode) "tar-mode" "\
@@ -25819,7 +25862,7 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'.
 
 ;;;***
 
-;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17140 20942))
+;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17383 13296))
 ;;; Generated autoloads from net/telnet.el
  (add-hook 'same-window-regexps "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)")
 
@@ -25875,8 +25918,8 @@ Start a terminal-emulator in a new buffer.
 
 ;;;***
 
-;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17239
-;;;;;;  32246))
+;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17383
+;;;;;;  24127))
 ;;; Generated autoloads from terminal.el
 
 (autoload (quote terminal-emulator) "terminal" "\
@@ -25913,7 +25956,7 @@ subprocess started.
 ;;;***
 
 ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el"
-;;;;;;  (17159 1472))
+;;;;;;  (17383 16119))
 ;;; Generated autoloads from emacs-lisp/testcover.el
 
 (autoload (quote testcover-this-defun) "testcover" "\
@@ -25923,7 +25966,7 @@ Start coverage on function under point.
 
 ;;;***
 
-;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17140 20949))
+;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17382 1892))
 ;;; Generated autoloads from play/tetris.el
 
 (autoload (quote tetris) "tetris" "\
@@ -25954,7 +25997,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"
-;;;;;;  (17239 32423))
+;;;;;;  (17383 15659))
 ;;; Generated autoloads from textmodes/tex-mode.el
 
 (defvar tex-shell-file-name nil "\
@@ -26256,7 +26299,7 @@ Major mode to edit DocTeX files.
 ;;;***
 
 ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer)
-;;;;;;  "texinfmt" "textmodes/texinfmt.el" (17312 51446))
+;;;;;;  "texinfmt" "textmodes/texinfmt.el" (17383 15659))
 ;;; Generated autoloads from textmodes/texinfmt.el
 
 (autoload (quote texinfo-format-buffer) "texinfmt" "\
@@ -26296,7 +26339,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" (17276 44727))
+;;;;;;  "texinfo" "textmodes/texinfo.el" (17383 15659))
 ;;; Generated autoloads from textmodes/texinfo.el
 
 (defvar texinfo-open-quote "``" "\
@@ -26427,7 +26470,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" (17148 25056))
+;;;;;;  "thingatpt" "thingatpt.el" (17383 24127))
 ;;; Generated autoloads from thingatpt.el
 
 (autoload (quote forward-thing) "thingatpt" "\
@@ -26484,7 +26527,7 @@ Not documented
 
 ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked
 ;;;;;;  thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el"
-;;;;;;  (17374 9567))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from thumbs.el
 
 (autoload (quote thumbs-find-thumb) "thumbs" "\
@@ -26602,7 +26645,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el"
-;;;;;;  (17342 36761))
+;;;;;;  (17383 15659))
 ;;; Generated autoloads from textmodes/tildify.el
 
 (autoload (quote tildify-region) "tildify" "\
@@ -26626,7 +26669,7 @@ This function performs no refilling of the changed text.
 ;;;***
 
 ;;;### (autoloads (display-time-mode display-time display-time-day-and-date)
-;;;;;;  "time" "time.el" (17356 14847))
+;;;;;;  "time" "time.el" (17383 24127))
 ;;; Generated autoloads from time.el
 
 (defvar display-time-day-and-date nil "\
@@ -26669,8 +26712,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" (17307
-;;;;;;  14150))
+;;;;;;  date-to-time) "time-date" "calendar/time-date.el" (17385
+;;;;;;  41891))
 ;;; Generated autoloads from calendar/time-date.el
 
 (autoload (quote date-to-time) "time-date" "\
@@ -26756,7 +26799,7 @@ If DATE is malformed, return a time value of zeros.
 ;;;***
 
 ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp"
-;;;;;;  "time-stamp.el" (17194 38185))
+;;;;;;  "time-stamp.el" (17383 24127))
 ;;; Generated autoloads from time-stamp.el
 
 (autoload (quote time-stamp) "time-stamp" "\
@@ -26792,7 +26835,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"
-;;;;;;  (17307 14150))
+;;;;;;  (17385 41891))
 ;;; Generated autoloads from calendar/timeclock.el
 
 (autoload (quote timeclock-modeline-display) "timeclock" "\
@@ -26893,7 +26936,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" (17251 53836))
+;;;;;;  "emacs-lisp/timer.el" (17383 16119))
 ;;; Generated autoloads from emacs-lisp/timer.el
 
 (defalias (quote disable-timeout) (quote cancel-timer))
@@ -27011,7 +27054,7 @@ PATTERN regexp.
 ;;;***
 
 ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm"
-;;;;;;  "tmm.el" (17148 25058))
+;;;;;;  "tmm.el" (17383 24127))
 ;;; Generated autoloads from tmm.el
  (define-key global-map "\M-`" 'tmm-menubar)
  (define-key global-map [f10] 'tmm-menubar)
@@ -27052,7 +27095,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" (17307 14150))
+;;;;;;  "todo-mode" "calendar/todo-mode.el" (17385 41891))
 ;;; Generated autoloads from calendar/todo-mode.el
 
 (autoload (quote todo-add-category) "todo-mode" "\
@@ -27113,7 +27156,7 @@ 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"
-;;;;;;  (17324 9268))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from tool-bar.el
 
 (put (quote tool-bar-mode) (quote standard-value) (quote (t)))
@@ -27180,7 +27223,7 @@ holds a keymap.
 ;;;***
 
 ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el"
-;;;;;;  (17140 20923))
+;;;;;;  (17383 13537))
 ;;; Generated autoloads from emulation/tpu-edt.el
 
 (defvar tpu-edt-mode nil "\
@@ -27208,7 +27251,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" (17140 20923))
+;;;;;;  "tpu-extras" "emulation/tpu-extras.el" (17383 13537))
 ;;; Generated autoloads from emulation/tpu-extras.el
 
 (autoload (quote tpu-set-scroll-margins) "tpu-extras" "\
@@ -27228,7 +27271,7 @@ Constrain the cursor to the flow of the text.
 
 ;;;***
 
-;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17148 25099))
+;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17383 16119))
 ;;; Generated autoloads from emacs-lisp/tq.el
 
 (autoload (quote tq-create) "tq" "\
@@ -27242,7 +27285,7 @@ to a tcp server on another machine.
 ;;;***
 
 ;;;### (autoloads (trace-function-background trace-function trace-buffer)
-;;;;;;  "trace" "emacs-lisp/trace.el" (17148 25100))
+;;;;;;  "trace" "emacs-lisp/trace.el" (17383 16119))
 ;;; Generated autoloads from emacs-lisp/trace.el
 
 (defvar trace-buffer "*trace-output*" "\
@@ -27276,7 +27319,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" (17377 15371))
+;;;;;;  "tramp" "net/tramp.el" (17391 39172))
 ;;; Generated autoloads from net/tramp.el
 
 (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\
@@ -27373,11 +27416,21 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (tumme-setup-dired-keybindings tumme-dired) "tumme"
-;;;;;;  "tumme.el" (17369 18495))
+;;;### (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" (17418
+;;;;;;  58118))
 ;;; 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:
@@ -27386,10 +27439,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
@@ -27397,10 +27491,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" (17148 25231))
+;;;;;;  "textmodes/two-column.el" (17383 15659))
 ;;; Generated autoloads from textmodes/two-column.el
  (autoload '2C-command "two-column" () t 'keymap)
  (global-set-key "\C-x6" '2C-command)
@@ -27451,7 +27582,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"
-;;;;;;  (17148 25059))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from type-break.el
 
 (defvar type-break-mode nil "\
@@ -27634,7 +27765,7 @@ FRAC should be the inverse of the fractional value; for example, a value of
 ;;;***
 
 ;;;### (autoloads (ununderline-region underline-region) "underline"
-;;;;;;  "textmodes/underline.el" (17148 25231))
+;;;;;;  "textmodes/underline.el" (17383 15659))
 ;;; Generated autoloads from textmodes/underline.el
 
 (autoload (quote underline-region) "underline" "\
@@ -27655,7 +27786,7 @@ which specify the range to operate on.
 ;;;***
 
 ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
-;;;;;;  "undigest" "mail/undigest.el" (17148 25163))
+;;;;;;  "undigest" "mail/undigest.el" (17383 16812))
 ;;; Generated autoloads from mail/undigest.el
 
 (autoload (quote undigestify-rmail-message) "undigest" "\
@@ -27674,7 +27805,7 @@ following the containing message.
 ;;;***
 
 ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el"
-;;;;;;  (17148 25163))
+;;;;;;  (17383 16812))
 ;;; Generated autoloads from mail/unrmail.el
 
 (autoload (quote batch-unrmail) "unrmail" "\
@@ -27693,8 +27824,8 @@ Convert Rmail file FILE to system inbox format file TO-FILE.
 
 ;;;***
 
-;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17376
-;;;;;;  60055))
+;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17403
+;;;;;;  28668))
 ;;; Generated autoloads from emacs-lisp/unsafep.el
 
 (autoload (quote unsafep) "unsafep" "\
@@ -27707,7 +27838,7 @@ of symbols with local bindings.
 ;;;***
 
 ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url"
-;;;;;;  "url/url.el" (17348 7449))
+;;;;;;  "url/url.el" (17402 14976))
 ;;; Generated autoloads from url/url.el
 
 (autoload (quote url-retrieve) "url" "\
@@ -27737,7 +27868,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" (17141 252))
+;;;;;;  "url-auth" "url/url-auth.el" (17382 34555))
 ;;; Generated autoloads from url/url-auth.el
 
 (autoload (quote url-get-authentication) "url-auth" "\
@@ -27805,7 +27936,7 @@ Return t iff a cached file has expired.
 
 ;;;***
 
-;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17141 252))
+;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17382 34555))
 ;;; Generated autoloads from url/url-cid.el
 
 (autoload (quote url-cid) "url-cid" "\
@@ -27816,7 +27947,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav"
-;;;;;;  "url/url-dav.el" (17141 254))
+;;;;;;  "url/url-dav.el" (17382 34555))
 ;;; Generated autoloads from url/url-dav.el
 
 (autoload (quote url-dav-supported-p) "url-dav" "\
@@ -27831,8 +27962,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17240
-;;;;;;  1916))
+;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17382
+;;;;;;  34555))
 ;;; Generated autoloads from url/url-file.el
 
 (autoload (quote url-file) "url-file" "\
@@ -27843,7 +27974,7 @@ Handle file: and ftp: URLs.
 ;;;***
 
 ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw"
-;;;;;;  "url/url-gw.el" (17141 258))
+;;;;;;  "url/url-gw.el" (17382 34555))
 ;;; Generated autoloads from url/url-gw.el
 
 (autoload (quote url-gateway-nslookup-host) "url-gw" "\
@@ -27907,7 +28038,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p
-;;;;;;  url-http) "url-http" "url/url-http.el" (17278 11297))
+;;;;;;  url-http) "url-http" "url/url-http.el" (17421 49420))
 ;;; Generated autoloads from url/url-http.el
 
 (autoload (quote url-http) "url-http" "\
@@ -27931,7 +28062,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:
@@ -27960,7 +28091,7 @@ p3p
 
 ;;;***
 
-;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17141 259))
+;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17448 18899))
 ;;; Generated autoloads from url/url-irc.el
 
 (autoload (quote url-irc) "url-irc" "\
@@ -27970,8 +28101,8 @@ Not documented
 
 ;;;***
 
-;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17141
-;;;;;;  259))
+;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17382
+;;;;;;  34555))
 ;;; Generated autoloads from url/url-ldap.el
 
 (autoload (quote url-ldap) "url-ldap" "\
@@ -27985,7 +28116,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"
-;;;;;;  (17196 9351))
+;;;;;;  (17382 34555))
 ;;; Generated autoloads from url/url-mailto.el
 
 (autoload (quote url-mail) "url-mailto" "\
@@ -28001,7 +28132,7 @@ Handle the mailto: URL syntax.
 ;;;***
 
 ;;;### (autoloads (url-data url-generic-emulator-loader url-info
-;;;;;;  url-man) "url-misc" "url/url-misc.el" (17141 260))
+;;;;;;  url-man) "url-misc" "url/url-misc.el" (17382 34555))
 ;;; Generated autoloads from url/url-misc.el
 
 (autoload (quote url-man) "url-misc" "\
@@ -28050,7 +28181,7 @@ Not documented
 
 ;;;### (autoloads (url-ns-user-pref url-ns-prefs isInNet isResolvable
 ;;;;;;  dnsResolve dnsDomainIs isPlainHostName) "url-ns" "url/url-ns.el"
-;;;;;;  (17141 260))
+;;;;;;  (17382 34555))
 ;;; Generated autoloads from url/url-ns.el
 
 (autoload (quote isPlainHostName) "url-ns" "\
@@ -28091,7 +28222,7 @@ Not documented
 ;;;***
 
 ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse"
-;;;;;;  "url/url-parse.el" (17141 260))
+;;;;;;  "url/url-parse.el" (17382 34555))
 ;;; Generated autoloads from url/url-parse.el
 
 (autoload (quote url-recreate-url) "url-parse" "\
@@ -28125,7 +28256,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"
-;;;;;;  (17185 27762))
+;;;;;;  (17382 34555))
 ;;; Generated autoloads from url/url-util.el
 
 (defvar url-debug nil "\
@@ -28250,7 +28381,7 @@ This uses `url-current-object', set locally to the buffer.
 ;;;***
 
 ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock)
-;;;;;;  "userlock" "userlock.el" (17148 25059))
+;;;;;;  "userlock" "userlock.el" (17383 24127))
 ;;; Generated autoloads from userlock.el
 
 (autoload (quote ask-user-about-lock) "userlock" "\
@@ -28286,7 +28417,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"
-;;;;;;  (17148 25154))
+;;;;;;  (17382 1051))
 ;;; Generated autoloads from gnus/uudecode.el
 
 (autoload (quote uudecode-decode-region-external) "uudecode" "\
@@ -28316,7 +28447,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" (17367 53073))
+;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17384 53717))
 ;;; Generated autoloads from vc.el
 
 (defvar vc-checkout-hook nil "\
@@ -28604,7 +28735,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-arch" "vc-arch.el" (17148 25060))
+;;;### (autoloads nil "vc-arch" "vc-arch.el" (17383 24127))
 ;;; Generated autoloads from vc-arch.el
  (defun vc-arch-registered (file)
   (if (vc-find-root file "{arch}/=tagging-method")
@@ -28614,7 +28745,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17252 55237))
+;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17383 24127))
 ;;; Generated autoloads from vc-cvs.el
  (defun vc-cvs-registered (f)
   (when (file-readable-p (expand-file-name
@@ -28624,7 +28755,7 @@ colors. `vc-annotate-background' specifies the background color.
 
 ;;;***
 
-;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17312 51444))
+;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17383 24127))
 ;;; Generated autoloads from vc-mcvs.el
  (defun vc-mcvs-registered (file)
   (if (vc-find-root file "MCVS/CVS")
@@ -28635,7 +28766,7 @@ colors. `vc-annotate-background' specifies the background color.
 ;;;***
 
 ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el"
-;;;;;;  (17370 39824))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from vc-rcs.el
 
 (defvar vc-rcs-master-templates (quote ("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\
@@ -28648,7 +28779,7 @@ For a description of possible values, see `vc-check-master-templates'.")
 ;;;***
 
 ;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc-sccs.el"
-;;;;;;  (17370 39824))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from vc-sccs.el
 
 (defvar vc-sccs-master-templates (quote ("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\
@@ -28665,7 +28796,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 
 ;;;***
 
-;;;### (autoloads nil "vc-svn" "vc-svn.el" (17311 21875))
+;;;### (autoloads nil "vc-svn" "vc-svn.el" (17386 47924))
 ;;; Generated autoloads from vc-svn.el
  (defun vc-svn-registered (f)
   (when (file-readable-p (expand-file-name
@@ -28678,7 +28809,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 ;;;***
 
 ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el"
-;;;;;;  (17239 32401))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/vhdl-mode.el
 
 (autoload (quote vhdl-mode) "vhdl-mode" "\
@@ -29320,8 +29451,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" (17297
-;;;;;;  52533))
+;;;;;;  view-file-other-window view-file) "view" "view.el" (17383
+;;;;;;  24127))
 ;;; Generated autoloads from view.el
 
 (defvar view-mode nil "\
@@ -29530,8 +29661,8 @@ Exit View mode and make the current buffer editable.
 
 ;;;***
 
-;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17239
-;;;;;;  32279))
+;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17383
+;;;;;;  13537))
 ;;; Generated autoloads from emulation/vip.el
 
 (autoload (quote vip-setup) "vip" "\
@@ -29547,7 +29678,7 @@ Turn on VIP emulation of VI.
 ;;;***
 
 ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el"
-;;;;;;  (17373 34254))
+;;;;;;  (17399 58140))
 ;;; Generated autoloads from emulation/viper.el
 
 (autoload (quote toggle-viper-mode) "viper" "\
@@ -29564,7 +29695,7 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Viper'.
 ;;;***
 
 ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el"
-;;;;;;  (17148 25100))
+;;;;;;  (17383 16119))
 ;;; Generated autoloads from emacs-lisp/warnings.el
 
 (defvar warning-prefix-function nil "\
@@ -29652,7 +29783,7 @@ this is equivalent to `display-warning', using
 ;;;***
 
 ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el"
-;;;;;;  (17350 52783))
+;;;;;;  (17418 2369))
 ;;; Generated autoloads from wdired.el
 
 (autoload (quote wdired-change-to-wdired-mode) "wdired" "\
@@ -29668,7 +29799,7 @@ See `wdired-mode'.
 
 ;;;***
 
-;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17333 17859))
+;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17383 13297))
 ;;; Generated autoloads from net/webjump.el
 
 (autoload (quote webjump) "webjump" "\
@@ -29685,7 +29816,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"
-;;;;;;  (17159 1491))
+;;;;;;  (17388 22062))
 ;;; Generated autoloads from progmodes/which-func.el
  (put 'which-func-format 'risky-local-variable t)
  (put 'which-func-current 'risky-local-variable t)
@@ -29719,7 +29850,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"
-;;;;;;  (17244 43740))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from whitespace.el
 
 (autoload (quote whitespace-toggle-leading-check) "whitespace" "\
@@ -29809,7 +29940,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" (17148 25069))
+;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (17383 24127))
 ;;; Generated autoloads from wid-browse.el
 
 (autoload (quote widget-browse-at) "wid-browse" "\
@@ -29836,8 +29967,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" (17369
-;;;;;;  18495))
+;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17396
+;;;;;;  41256))
 ;;; Generated autoloads from wid-edit.el
 
 (autoload (quote widgetp) "wid-edit" "\
@@ -29869,7 +30000,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.")
 
@@ -29881,8 +30012,8 @@ Setup current buffer so editing string widgets works.
 ;;;***
 
 ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right
-;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (17159
-;;;;;;  1472))
+;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (17383
+;;;;;;  24127))
 ;;; Generated autoloads from windmove.el
 
 (autoload (quote windmove-left) "windmove" "\
@@ -29935,7 +30066,7 @@ Default MODIFIER is 'shift.
 ;;;***
 
 ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el"
-;;;;;;  (17148 25072))
+;;;;;;  (17383 24127))
 ;;; Generated autoloads from winner.el
 
 (defvar winner-mode nil "\
@@ -29954,7 +30085,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" (17239 32255))
+;;;;;;  "woman.el" (17383 24127))
 ;;; Generated autoloads from woman.el
 
 (autoload (quote woman) "woman" "\
@@ -29990,7 +30121,7 @@ decompress the file if appropriate.  See the documentation for the
 ;;;***
 
 ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el"
-;;;;;;  (17205 6084))
+;;;;;;  (17383 13537))
 ;;; Generated autoloads from emulation/ws-mode.el
 
 (autoload (quote wordstar-mode) "ws-mode" "\
@@ -30103,7 +30234,7 @@ The key bindings are:
 ;;;***
 
 ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el"
-;;;;;;  (17377 27370))
+;;;;;;  (17383 24128))
 ;;; Generated autoloads from xml.el
 
 (autoload (quote xml-parse-file) "xml" "\
@@ -30128,8 +30259,8 @@ If PARSE-NS is non-nil, then QNAMES are expanded.
 
 ;;;***
 
-;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17332
-;;;;;;  49142))
+;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17383
+;;;;;;  24128))
 ;;; Generated autoloads from xt-mouse.el
 
 (defvar xterm-mouse-mode nil "\
@@ -30158,7 +30289,7 @@ down the SHIFT key while pressing the mouse button.
 ;;;***
 
 ;;;### (autoloads (yenc-extract-filename yenc-decode-region) "yenc"
-;;;;;;  "gnus/yenc.el" (17148 25154))
+;;;;;;  "gnus/yenc.el" (17382 1051))
 ;;; Generated autoloads from gnus/yenc.el
 
 (autoload (quote yenc-decode-region) "yenc" "\
@@ -30174,7 +30305,7 @@ Extract file name from an yenc header.
 ;;;***
 
 ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism
-;;;;;;  yow) "yow" "play/yow.el" (17297 52533))
+;;;;;;  yow) "yow" "play/yow.el" (17382 1892))
 ;;; Generated autoloads from play/yow.el
 
 (autoload (quote yow) "yow" "\
@@ -30200,7 +30331,7 @@ Zippy goes to the analyst.
 
 ;;;***
 
-;;;### (autoloads (zone) "zone" "play/zone.el" (17239 32366))
+;;;### (autoloads (zone) "zone" "play/zone.el" (17382 1892))
 ;;; Generated autoloads from play/zone.el
 
 (autoload (quote zone) "zone" "\
@@ -30211,7 +30342,7 @@ Zone out, completely.
 ;;;***
 
 ;;;### (autoloads (zone-mode zone-mode-update-serial-hook) "zone-mode"
-;;;;;;  "net/zone-mode.el" (17140 20945))
+;;;;;;  "net/zone-mode.el" (17383 13297))
 ;;; Generated autoloads from net/zone-mode.el
 
 (autoload (quote zone-mode-update-serial-hook) "zone-mode" "\
@@ -30233,8 +30364,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"
@@ -30263,35 +30394,35 @@ Zone-mode does two things:
 ;;;;;;  "emacs-lisp/gulp.el" "emacs-lisp/levents.el" "emacs-lisp/lisp-mnt.el"
 ;;;;;;  "emacs-lisp/lisp-mode.el" "emacs-lisp/lisp.el" "emacs-lisp/lmenu.el"
 ;;;;;;  "emacs-lisp/lselect.el" "emacs-lisp/lucid.el" "emacs-lisp/map-ynp.el"
-;;;;;;  "emacs-lisp/regi.el" "emacs-lisp/sregex.el" "emacs-lisp/tcover-ses.el"
-;;;;;;  "emacs-lisp/tcover-unsafep.el" "emacs-lock.el" "emulation/cua-gmrk.el"
-;;;;;;  "emulation/cua-rect.el" "emulation/edt-lk201.el" "emulation/edt-mapper.el"
-;;;;;;  "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/tpu-mapper.el"
-;;;;;;  "emulation/viper-cmd.el" "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" "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" "eshell/em-prompt.el"
-;;;;;;  "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el"
-;;;;;;  "eshell/em-term.el" "eshell/em-unix.el" "eshell/em-xtra.el"
-;;;;;;  "eshell/esh-arg.el" "eshell/esh-cmd.el" "eshell/esh-ext.el"
-;;;;;;  "eshell/esh-io.el" "eshell/esh-maint.el" "eshell/esh-module.el"
-;;;;;;  "eshell/esh-opt.el" "eshell/esh-proc.el" "eshell/esh-util.el"
-;;;;;;  "eshell/esh-var.el" "ezimage.el" "faces.el" "files.el" "foldout.el"
-;;;;;;  "font-core.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"
+;;;;;;  "emacs-lisp/regi.el" "emacs-lisp/sregex.el" "emacs-lisp/syntax.el"
+;;;;;;  "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el"
+;;;;;;  "emacs-lock.el" "emulation/cua-gmrk.el" "emulation/cua-rect.el"
+;;;;;;  "emulation/edt-lk201.el" "emulation/edt-mapper.el" "emulation/edt-pc.el"
+;;;;;;  "emulation/edt-vt100.el" "emulation/tpu-mapper.el" "emulation/viper-cmd.el"
+;;;;;;  "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-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"
+;;;;;;  "eshell/em-prompt.el" "eshell/em-rebind.el" "eshell/em-script.el"
+;;;;;;  "eshell/em-smart.el" "eshell/em-term.el" "eshell/em-unix.el"
+;;;;;;  "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el"
+;;;;;;  "eshell/esh-ext.el" "eshell/esh-io.el" "eshell/esh-maint.el"
+;;;;;;  "eshell/esh-module.el" "eshell/esh-opt.el" "eshell/esh-proc.el"
+;;;;;;  "eshell/esh-util.el" "eshell/esh-var.el" "ezimage.el" "faces.el"
+;;;;;;  "files.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"
 ;;;;;;  "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"
@@ -30316,22 +30447,23 @@ Zone-mode does two things:
 ;;;;;;  "international/subst-gb2312.el" "international/subst-jis.el"
 ;;;;;;  "international/subst-ksc.el" "international/ucs-tables.el"
 ;;;;;;  "international/utf-16.el" "international/utf-8.el" "isearch.el"
-;;;;;;  "jka-cmpr-hook.el" "kermit.el" "language/chinese.el" "language/cyrillic.el"
-;;;;;;  "language/czech.el" "language/devanagari.el" "language/english.el"
-;;;;;;  "language/ethiopic.el" "language/european.el" "language/georgian.el"
-;;;;;;  "language/greek.el" "language/hebrew.el" "language/indian.el"
-;;;;;;  "language/japanese.el" "language/kannada.el" "language/korean.el"
-;;;;;;  "language/lao.el" "language/malayalam.el" "language/misc-lang.el"
-;;;;;;  "language/romanian.el" "language/slovak.el" "language/tamil.el"
-;;;;;;  "language/thai-word.el" "language/thai.el" "language/tibetan.el"
-;;;;;;  "language/utf-8-lang.el" "language/vietnamese.el" "ldefs-boot.el"
-;;;;;;  "loadup.el" "mail/blessmail.el" "mail/mailheader.el" "mail/mailpost.el"
-;;;;;;  "mail/mspools.el" "mail/rfc2368.el" "mail/rfc822.el" "mail/rmail-spam-filter.el"
-;;;;;;  "mail/uce.el" "mail/vms-pmail.el" "mh-e/mh-acros.el" "mh-e/mh-alias.el"
-;;;;;;  "mh-e/mh-buffers.el" "mh-e/mh-compat.el" "mh-e/mh-funcs.el"
-;;;;;;  "mh-e/mh-gnus.el" "mh-e/mh-identity.el" "mh-e/mh-inc.el"
-;;;;;;  "mh-e/mh-junk.el" "mh-e/mh-letter.el" "mh-e/mh-limit.el"
-;;;;;;  "mh-e/mh-mime.el" "mh-e/mh-print.el" "mh-e/mh-scan.el" "mh-e/mh-search.el"
+;;;;;;  "jit-lock.el" "jka-cmpr-hook.el" "kermit.el" "language/chinese.el"
+;;;;;;  "language/cyrillic.el" "language/czech.el" "language/devanagari.el"
+;;;;;;  "language/english.el" "language/ethiopic.el" "language/european.el"
+;;;;;;  "language/georgian.el" "language/greek.el" "language/hebrew.el"
+;;;;;;  "language/indian.el" "language/japanese.el" "language/kannada.el"
+;;;;;;  "language/korean.el" "language/lao.el" "language/malayalam.el"
+;;;;;;  "language/misc-lang.el" "language/romanian.el" "language/slovak.el"
+;;;;;;  "language/tamil.el" "language/thai-word.el" "language/thai.el"
+;;;;;;  "language/tibetan.el" "language/utf-8-lang.el" "language/vietnamese.el"
+;;;;;;  "ldefs-boot.el" "loadup.el" "mail/blessmail.el" "mail/mailheader.el"
+;;;;;;  "mail/mailpost.el" "mail/mspools.el" "mail/rfc2368.el" "mail/rfc822.el"
+;;;;;;  "mail/rmail-spam-filter.el" "mail/uce.el" "mail/vms-pmail.el"
+;;;;;;  "mh-e/mh-acros.el" "mh-e/mh-alias.el" "mh-e/mh-buffers.el"
+;;;;;;  "mh-e/mh-compat.el" "mh-e/mh-funcs.el" "mh-e/mh-gnus.el"
+;;;;;;  "mh-e/mh-identity.el" "mh-e/mh-inc.el" "mh-e/mh-junk.el"
+;;;;;;  "mh-e/mh-letter.el" "mh-e/mh-limit.el" "mh-e/mh-mime.el"
+;;;;;;  "mh-e/mh-print.el" "mh-e/mh-scan.el" "mh-e/mh-search.el"
 ;;;;;;  "mh-e/mh-seq.el" "mh-e/mh-show.el" "mh-e/mh-speed.el" "mh-e/mh-thread.el"
 ;;;;;;  "mh-e/mh-tool-bar.el" "mh-e/mh-utils.el" "mh-e/mh-xface.el"
 ;;;;;;  "misc.el" "mouse-copy.el" "mouse-drag.el" "mouse.el" "net/eudc-vars.el"
@@ -30356,29 +30488,30 @@ Zone-mode does two things:
 ;;;;;;  "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.el" "progmodes/idlw-complete-structtag.el"
 ;;;;;;  "progmodes/idlw-help.el" "progmodes/idlw-rinfo.el" "progmodes/idlw-toolbar.el"
 ;;;;;;  "progmodes/mantemp.el" "progmodes/xscheme.el" "register.el"
-;;;;;;  "replace.el" "s-region.el" "saveplace.el" "sb-image.el" "scroll-bar.el"
-;;;;;;  "select.el" "simple.el" "soundex.el" "startup.el" "subdirs.el"
-;;;;;;  "tempo.el" "term/AT386.el" "term/apollo.el" "term/bobcat.el"
-;;;;;;  "term/cygwin.el" "term/internal.el" "term/iris-ansi.el" "term/linux.el"
-;;;;;;  "term/lk201.el" "term/mac-win.el" "term/news.el" "term/pc-win.el"
-;;;;;;  "term/rxvt.el" "term/sun-mouse.el" "term/sun.el" "term/sup-mouse.el"
-;;;;;;  "term/tty-colors.el" "term/tvi970.el" "term/vt100.el" "term/vt102.el"
-;;;;;;  "term/vt125.el" "term/vt200.el" "term/vt201.el" "term/vt220.el"
-;;;;;;  "term/vt240.el" "term/vt300.el" "term/vt320.el" "term/vt400.el"
-;;;;;;  "term/vt420.el" "term/w32-win.el" "term/wyse50.el" "term/x-win.el"
-;;;;;;  "term/xterm.el" "textmodes/bib-mode.el" "textmodes/fill.el"
-;;;;;;  "textmodes/makeinfo.el" "textmodes/page-ext.el" "textmodes/page.el"
-;;;;;;  "textmodes/paragraphs.el" "textmodes/refbib.el" "textmodes/refer.el"
-;;;;;;  "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el" "textmodes/reftex-ref.el"
-;;;;;;  "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" "textmodes/reftex-vars.el"
-;;;;;;  "textmodes/texnfo-upd.el" "textmodes/text-mode.el" "timezone.el"
-;;;;;;  "tooltip.el" "tree-widget.el" "uniquify.el" "url/url-about.el"
-;;;;;;  "url/url-dired.el" "url/url-expand.el" "url/url-ftp.el" "url/url-https.el"
-;;;;;;  "url/url-imap.el" "url/url-methods.el" "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") (17381 36573 585655))
+;;;;;;  "replace.el" "rfn-eshadow.el" "s-region.el" "saveplace.el"
+;;;;;;  "sb-image.el" "scroll-bar.el" "select.el" "simple.el" "soundex.el"
+;;;;;;  "startup.el" "subdirs.el" "tempo.el" "term/AT386.el" "term/apollo.el"
+;;;;;;  "term/bobcat.el" "term/cygwin.el" "term/internal.el" "term/iris-ansi.el"
+;;;;;;  "term/linux.el" "term/lk201.el" "term/mac-win.el" "term/news.el"
+;;;;;;  "term/pc-win.el" "term/rxvt.el" "term/sun-mouse.el" "term/sun.el"
+;;;;;;  "term/sup-mouse.el" "term/tty-colors.el" "term/tvi970.el"
+;;;;;;  "term/vt100.el" "term/vt102.el" "term/vt125.el" "term/vt200.el"
+;;;;;;  "term/vt201.el" "term/vt220.el" "term/vt240.el" "term/vt300.el"
+;;;;;;  "term/vt320.el" "term/vt400.el" "term/vt420.el" "term/w32-win.el"
+;;;;;;  "term/wyse50.el" "term/x-win.el" "term/xterm.el" "textmodes/bib-mode.el"
+;;;;;;  "textmodes/fill.el" "textmodes/makeinfo.el" "textmodes/page-ext.el"
+;;;;;;  "textmodes/page.el" "textmodes/paragraphs.el" "textmodes/refbib.el"
+;;;;;;  "textmodes/refer.el" "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el"
+;;;;;;  "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" "textmodes/reftex-toc.el"
+;;;;;;  "textmodes/reftex-vars.el" "textmodes/texnfo-upd.el" "textmodes/text-mode.el"
+;;;;;;  "timezone.el" "tooltip.el" "tree-widget.el" "uniquify.el"
+;;;;;;  "url/url-about.el" "url/url-cookie.el" "url/url-dired.el"
+;;;;;;  "url/url-expand.el" "url/url-ftp.el" "url/url-history.el"
+;;;;;;  "url/url-https.el" "url/url-imap.el" "url/url-methods.el"
+;;;;;;  "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") (17448 19160 944703))
 
 ;;;***
 
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 29f2d95be95..b8b5349c2a5 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 0da950ab177..45ebe7e97f2 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,32 @@
+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.
+
+        * mh-compat.el (mh-image-load-path-for-library): Shorten first line in
+        docstring.
+
 2006-03-17  Bill Wohler  <wohler@newt.com>
 
         * mh-compat.el (mh-image-load-path-for-library): Minor docstring
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 8a7e791d6cd..27806dc9ab9 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -580,14 +580,16 @@ You have several choices here.
 
      Response     Reply Goes To
 
-     from         The person who sent the message.  This is the
+     from         The person who sent the message. This is the
                   default, so <RET> is sufficient.
 
      to           Replies to the sender, plus all recipients in the
                   \"To:\" header field.
 
-     all
-     cc           Forms a reply to the sender, plus all recipients.
+     all cc       Forms a reply to the addresses in the
+                  \"Mail-Followup-To:\" header field if one
+                  exists; otherwise forms a reply to the sender,
+                  plus all recipients.
 
 Depending on your answer, \"repl\" is given a different argument
 to form your reply. Specifically, a choice of \"from\" or none at
@@ -597,7 +599,11 @@ all runs \"repl -nocc all\", and a choice of \"to\" runs \"repl
 
 Two windows are then created. One window contains the message to
 which you are replying in an MH-Show buffer. Your draft, in
-MH-Letter mode (see `mh-letter-mode'), is in the other window.
+MH-Letter mode (*note `mh-letter-mode'), is in the other window.
+If the reply draft was not one that you expected, check the
+things that affect the behavior of \"repl\" which include the
+\"repl:\" profile component and the \"replcomps\" and
+\"replgroupcomps\" files.
 
 If you supply a prefix argument INCLUDEP, the message you are
 replying to is inserted in your reply after having first been run
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index db4bf3754ff..256a8cfe831 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -117,7 +117,7 @@ introduced in Emacs 22."
 
 (mh-defun-compat mh-image-load-path-for-library
   image-load-path-for-library (library image &optional path no-error)
-  "Return a suitable search path for images used by the Lisp package LIBRARY.
+  "Return a suitable search path for images used by LIBRARY.
 
 It searches for IMAGE in `image-load-path' (excluding
 \"`data-directory'/images\") and `load-path', followed by a path
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 84e569bab81..428b4b04555 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2295,6 +2295,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 +2352,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:"
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..24db058721f 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -332,17 +332,21 @@ where,
                             collect `(const :tag ,y ,x)))))))
 
 (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 +355,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 +390,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 +413,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 0c9f45ab5b9..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,85 +50,191 @@
   :type '(choice (const :tag "New `--recipient' option" "--recipient")
                  (const :tag "Old `--remote-user' option" "--remote-user")))
 
+(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 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 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."
@@ -143,54 +248,15 @@
                              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 sign
-                           (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
@@ -198,152 +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
-                         (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
-                         (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
-                         (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 689124944dd..b969515e2fc 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -4,7 +4,7 @@
 ;; Maintainer: FSF
 ;; Keywords: unix, tools
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
@@ -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'."
@@ -327,7 +331,7 @@ of the inferior.  Non-nil means display the layout shown for
                         (process-status (get-buffer-process buffer)) status))
           ;; Force mode line redisplay soon.
           (force-mode-line-update)))))
-    
+
 (defun gdb-many-windows (arg)
   "Toggle the number of windows in the basic arrangement.
 With arg, display additional buffers iff arg is positive."
@@ -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,6 +1324,9 @@ 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
+              (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")
     (gdb-force-mode-line-update gdb-inferior-status))
@@ -1659,10 +1668,13 @@ static char *magick[] = {
 (defvar breakpoint-disabled-icon nil
   "Icon for disabled breakpoint in display margin.")
 
-;; Bitmap for breakpoint in fringe
 (and (display-images-p)
+     ;; Bitmap for breakpoint in fringe
      (define-fringe-bitmap 'breakpoint
-       "\x3c\x7e\xff\xff\xff\xff\x7e\x3c"))
+       "\x3c\x7e\xff\xff\xff\xff\x7e\x3c")
+     ;; Bitmap for gud-overlay-arrow in fringe
+     (define-fringe-bitmap 'hollow-right-triangle
+       "\xe0\x90\x88\x84\x84\x88\x90\xe0"))
 
 (defface breakpoint-enabled
   '((t
@@ -1675,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)
 
@@ -1918,11 +1929,11 @@ static char *magick[] = {
 
 (def-gdb-auto-updated-buffer gdb-stack-buffer
   gdb-invalidate-frames
-  "server where\n"
-  gdb-info-frames-handler
-  gdb-info-frames-custom)
+  "server info stack\n"
+  gdb-info-stack-handler
+  gdb-info-stack-custom)
 
-(defun gdb-info-frames-custom ()
+(defun gdb-info-stack-custom ()
   (with-current-buffer (gdb-get-buffer 'gdb-stack-buffer)
     (save-excursion
       (let ((buffer-read-only nil)
@@ -1983,7 +1994,7 @@ static char *magick[] = {
     map))
 
 (defun gdb-frames-mode ()
-  "Major mode for gdb frames.
+  "Major mode for gdb call stack.
 
 \\{gdb-frames-mode-map}"
   (kill-all-local-variables)
@@ -2064,15 +2075,13 @@ static char *magick[] = {
     map))
 
 (defvar gdb-threads-font-lock-keywords
-  '(
-    (") +\\([^ ]+\\) ("  (1 font-lock-function-name-face))
+  '((") +\\([^ ]+\\) ("  (1 font-lock-function-name-face))
     ("in \\([^ ]+\\) ("  (1 font-lock-function-name-face))
-    ("\\(\\(\\sw\\|[_.]\\)+\\)="  (1 font-lock-variable-name-face))
-    )
+    ("\\(\\(\\sw\\|[_.]\\)+\\)="  (1 font-lock-variable-name-face)))
   "Font lock keywords used in `gdb-threads-mode'.")
 
 (defun gdb-threads-mode ()
-  "Major mode for gdb frames.
+  "Major mode for gdb threads.
 
 \\{gdb-threads-mode-map}"
   (kill-all-local-variables)
@@ -2132,7 +2141,7 @@ static char *magick[] = {
             (unless (string-equal (match-string 0) "The")
               (put-text-property start (match-end 0)
                                  'face font-lock-variable-name-face)
-              (add-text-properties start end 
+              (add-text-properties start end
                                    '(help-echo "mouse-2: edit value"
                                      mouse-face highlight))))
           (forward-line 1))))))
@@ -2785,6 +2794,7 @@ Kills the gdb buffers, and resets variables and the source buffers."
     (setq gdb-overlay-arrow-position nil))
   (setq overlay-arrow-variable-list
         (delq 'gdb-overlay-arrow-position overlay-arrow-variable-list))
+  (setq fringe-indicator-alist '((overlay-arrow . right-triangle)))
   (if (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
       (speedbar-refresh))
   (setq gud-running nil)
@@ -2965,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))
@@ -2983,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
@@ -3112,7 +3140,8 @@ BUFFER nil or omitted means use the current buffer."
       (setq gdb-frame-number (match-string 1)))
   (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)
@@ -3122,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)))
@@ -3154,14 +3193,14 @@ is set in them."
   (gdb-enqueue-input
    (list
     (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
-        (concat "server interpreter mi \"-var-list-children --all-values "  
+        (concat "server interpreter mi \"-var-list-children --all-values "
                 varnum "\"\n")
       (concat "-var-list-children --all-values " varnum "\n"))
     `(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))
@@ -3197,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)
@@ -3234,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
@@ -3283,7 +3323,7 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
             (unless (string-equal (match-string 0) "No registers.")
               (put-text-property start (match-end 0)
                                  'face font-lock-variable-name-face)
-              (add-text-properties start end 
+              (add-text-properties start end
                                    '(help-echo "mouse-2: edit value"
                                      mouse-face highlight))))
           (forward-line 1))))))
@@ -3327,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)))
@@ -3346,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)))
@@ -3365,7 +3405,7 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
                               help-echo "mouse-2: create watch expression"
                               local-map ,gdb-locals-watch-map-1)
                             name))
-                       (insert 
+                       (insert
                         (concat name "\t" (nth 1 local)
                                 "\t" (nth 2 local) "\n")))
                    (set-window-start window start)
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/simple.el b/lisp/simple.el
index d3780dea012..3fffcfb3e8d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3196,6 +3196,9 @@ With a double \\[universal-argument] prefix argument, e.g. \\[universal-argument
 \\[universal-argument] \\[set-mark-command], unconditionally
 set mark where point is.
 
+Setting the mark also sets the \"region\", which is the closest
+equivalent in Emacs to what some editors call the \"selection\".
+
 Novice Emacs Lisp programmers often try to use the mark for the wrong
 purposes.  See the documentation of `set-mark' for more information."
   (interactive "P")
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index b08284731a4..d2f373a1e8c 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1336,7 +1336,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))
@@ -1809,6 +1810,22 @@ It returns a name of the created fontset."
     (new-fontset fontset-name (list (cons 'ascii resolved-font)))
     (fontset-add-mac-fonts fontset-name base-family)))
 
+;; 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)
 
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index f1e055594b7..daca0502454 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -88,6 +88,7 @@ If this is a function, call it to generate the initial field text."
                  (string :tag "Initial text")
                  (function :tag "Initialize Function" :value fun)
                  (other :tag "Default" t)))
+(put 'bibtex-include-OPTkey 'risky-local-variable t)
 
 (defcustom bibtex-user-optional-fields
   '(("annote" "Personal annotation (ignored)"))
@@ -437,6 +438,7 @@ field or a function, which is called to determine the initial content
 of the field, and ALTERNATIVE-FLAG (either nil or t) marks if the
 field is an alternative.  ALTERNATIVE-FLAG may be t only in the
 REQUIRED or CROSSREF-REQUIRED lists.")
+(put 'bibtex-entry-field-alist 'risky-local-variable t)
 
 (defcustom bibtex-comment-start "@Comment"
   "String starting a BibTeX comment."
@@ -595,7 +597,7 @@ See `bibtex-generate-autokey' for details."
   :type '(repeat (cons (regexp :tag "Old")
                        (string :tag "New"))))
 
-(defcustom bibtex-autokey-name-case-convert 'downcase
+(defcustom bibtex-autokey-name-case-convert-function 'downcase
   "Function called for each name to perform case conversion.
 See `bibtex-generate-autokey' for details."
   :group 'bibtex-autokey
@@ -604,6 +606,8 @@ See `bibtex-generate-autokey' for details."
                  (const :tag "Capitalize" capitalize)
                  (const :tag "Upcase" upcase)
                  (function :tag "Conversion function")))
+(defvaralias 'bibtex-autokey-name-case-convert
+  'bibtex-autokey-name-case-convert-function)
 
 (defcustom bibtex-autokey-name-length 'infty
   "Number of characters from name to incorporate into key.
@@ -666,7 +670,7 @@ See `bibtex-generate-autokey' for details."
   :group 'bibtex-autokey
   :type '(repeat regexp))
 
-(defcustom bibtex-autokey-titleword-case-convert 'downcase
+(defcustom bibtex-autokey-titleword-case-convert-function 'downcase
   "Function called for each titleword to perform case conversion.
 See `bibtex-generate-autokey' for details."
   :group 'bibtex-autokey
@@ -675,6 +679,8 @@ See `bibtex-generate-autokey' for details."
                  (const :tag "Capitalize" capitalize)
                  (const :tag "Upcase" upcase)
                  (function :tag "Conversion function")))
+(defvaralias 'bibtex-autokey-titleword-case-convert
+  'bibtex-autokey-titleword-case-convert-function)
 
 (defcustom bibtex-autokey-titleword-abbrevs nil
   "Determines exceptions to the usual abbreviation mechanism.
@@ -847,6 +853,7 @@ The following is a complex example, see http://link.aps.org/linkfaq.html.
                                (choice (string :tag "Replacement")
                                        (integer :tag "Sub-match")
                                        (function :tag "Filter"))))))))
+(put 'bibtex-generate-url-list 'risky-local-variable t)
 
 (defcustom bibtex-expand-strings nil
   "If non-nil, expand strings when extracting the content of a BibTeX field."
@@ -1164,7 +1171,7 @@ The CDRs of the elements are t for header keys and nil for crossref keys.")
     (,(concat "^[ \t]*\\(" bibtex-field-name "\\)[ \t]*=")
      1 font-lock-variable-name-face)
     ;; url
-    bibtex-font-lock-url bibtex-font-lock-crossref)
+    (bibtex-font-lock-url) (bibtex-font-lock-crossref))
   "*Default expressions to highlight in BibTeX mode.")
 
 (defvar bibtex-font-lock-url-regexp
@@ -2085,7 +2092,7 @@ and `bibtex-autokey-names-stretch'."
                       ;; --> take the last token
                       (match-string 1 fullname))
                      (t (error "Name `%s' is incorrectly formed" fullname)))))
-    (funcall bibtex-autokey-name-case-convert
+    (funcall bibtex-autokey-name-case-convert-function
              (bibtex-autokey-abbrev name bibtex-autokey-name-length))))
 
 (defun bibtex-autokey-get-year ()
@@ -2147,7 +2154,7 @@ and `bibtex-autokey-titleword-length'."
       (setq alist (cdr alist)))
     (if alist
         (cdar alist)
-      (funcall bibtex-autokey-titleword-case-convert
+      (funcall bibtex-autokey-titleword-case-convert-function
                (bibtex-autokey-abbrev titleword bibtex-autokey-titleword-length)))))
 
 (defun bibtex-generate-autokey ()
@@ -2167,7 +2174,7 @@ The name part:
     take at least `bibtex-autokey-name-length' characters (truncate only
     after a consonant or at a word end).
  5. Convert all last names using the function
-    `bibtex-autokey-name-case-convert'.
+    `bibtex-autokey-name-case-convert-function'.
  6. Build the name part of the key by concatenating all abbreviated last
     names with the string `bibtex-autokey-name-separator' between any two.
     If there are more names in the name field than names used in the name
@@ -2199,7 +2206,7 @@ The title part
     `bibtex-autokey-titleword-length' characters (truncate only after
     a consonant or at a word end).
  5. Convert all title words using the function
-    `bibtex-autokey-titleword-case-convert'.
+    `bibtex-autokey-titleword-case-convert-function'.
  6. Build the title part by concatenating all abbreviated title words with
     the string `bibtex-autokey-titleword-separator' between any two.
 
@@ -2531,7 +2538,7 @@ Use `bibtex-summary-function' to generate summary."
 Used as default value of `bibtex-summary-function'."
   ;; It would be neat to customize this function.  How?
   (if (looking-at bibtex-entry-maybe-empty-head)
-      (let* ((bibtex-autokey-name-case-convert 'identity)
+      (let* ((bibtex-autokey-name-case-convert-function 'identity)
              (bibtex-autokey-name-length 'infty)
              (bibtex-autokey-names 1)
              (bibtex-autokey-names-stretch 0)
@@ -2542,7 +2549,7 @@ Used as default value of `bibtex-summary-function'."
              (year (bibtex-autokey-get-year))
              (bibtex-autokey-titlewords 5)
              (bibtex-autokey-titlewords-stretch 2)
-             (bibtex-autokey-titleword-case-convert 'identity)
+             (bibtex-autokey-titleword-case-convert-function 'identity)
              (bibtex-autokey-titleword-length 5)
              (bibtex-autokey-titleword-separator " ")
              (title (bibtex-autokey-get-title))
@@ -2785,7 +2792,6 @@ if that value is non-nil.
         (list (list nil bibtex-entry-head bibtex-key-in-head))
         imenu-case-fold-search t)
   (make-local-variable 'choose-completion-string-functions)
-  (make-local-variable 'completion-ignore-case)
   ;; XEmacs needs easy-menu-add, Emacs does not care
   (easy-menu-add bibtex-edit-menu)
   (easy-menu-add bibtex-entry-menu)
@@ -4155,9 +4161,9 @@ An error is signaled if point is outside key or BibTeX field."
 
     (cond ((eq compl 'key)
            ;; key completion: no cleanup needed
-           (setq choose-completion-string-functions nil
-                 completion-ignore-case nil)
-           (bibtex-complete-internal (bibtex-global-key-alist)))
+           (setq choose-completion-string-functions nil)
+           (let (completion-ignore-case)
+             (bibtex-complete-internal (bibtex-global-key-alist))))
 
           ((eq compl 'crossref-key)
            ;; crossref key completion
@@ -4167,40 +4173,35 @@ An error is signaled if point is outside key or BibTeX field."
            ;; non-nil. Therefore, `choose-completion-string-functions' is
            ;; always set (either to non-nil or nil) when a new completion
            ;; is requested.
-           ;; Also, `choose-completion-delete-max-match' requires
-           ;; that we set `completion-ignore-case' (i.e., binding via `let'
-           ;; is not sufficient).
-           (setq completion-ignore-case nil
-                 choose-completion-string-functions
-                 (lambda (choice buffer mini-p base-size)
-                   (setq choose-completion-string-functions nil)
-                   (choose-completion-string choice buffer base-size)
-                   (bibtex-complete-crossref-cleanup choice)
-                   t)) ; needed by choose-completion-string-functions
-
-           (bibtex-complete-crossref-cleanup (bibtex-complete-internal
-                                              (bibtex-global-key-alist))))
+           (let (completion-ignore-case)
+             (setq choose-completion-string-functions
+                   (lambda (choice buffer mini-p base-size)
+                     (setq choose-completion-string-functions nil)
+                     (choose-completion-string choice buffer base-size)
+                     (bibtex-complete-crossref-cleanup choice)
+                     t)) ; needed by choose-completion-string-functions
+             (bibtex-complete-crossref-cleanup
+              (bibtex-complete-internal (bibtex-global-key-alist)))))
 
           ((eq compl 'string)
            ;; string key completion: no cleanup needed
-           (setq choose-completion-string-functions nil
-                 completion-ignore-case t)
-           (bibtex-complete-internal bibtex-strings))
+           (setq choose-completion-string-functions nil)
+           (let ((completion-ignore-case t))
+             (bibtex-complete-internal bibtex-strings)))
 
           (compl
            ;; string completion
-           (setq completion-ignore-case t
-                 choose-completion-string-functions
-                 `(lambda (choice buffer mini-p base-size)
-                    (setq choose-completion-string-functions nil)
-                    (choose-completion-string choice buffer base-size)
-                    (bibtex-complete-string-cleanup choice ',compl)
-                    t)) ; needed by choose-completion-string-functions
-           (bibtex-complete-string-cleanup (bibtex-complete-internal compl)
-                                             compl))
-
-          (t (setq choose-completion-string-functions nil
-                   completion-ignore-case nil) ; default
+           (let ((completion-ignore-case t))
+             (setq choose-completion-string-functions
+                   `(lambda (choice buffer mini-p base-size)
+                      (setq choose-completion-string-functions nil)
+                      (choose-completion-string choice buffer base-size)
+                      (bibtex-complete-string-cleanup choice ',compl)
+                      t)) ; needed by choose-completion-string-functions
+             (bibtex-complete-string-cleanup (bibtex-complete-internal compl)
+                                             compl)))
+
+          (t (setq choose-completion-string-functions nil)
              (error "Point outside key or BibTeX field")))))
 
 (defun bibtex-Article ()
@@ -4334,16 +4335,16 @@ The URL is generated using the schemes defined in `bibtex-generate-url-list'
                       (dolist (step scheme)
                         (setq field (cdr (assoc-string (car step) fields-alist t)))
                         (if (string-match (nth 1 step) field)
-                            (setq field (cond ((functionp (nth 2 step))
-                                               (funcall (nth 2 step) field))
-                                              ((numberp (nth 2 step))
-                                               (match-string (nth 2 step) field))
-                                              (t
-                                               (replace-match (nth 2 step) t nil field))))
+                            (push (cond ((functionp (nth 2 step))
+                                         (funcall (nth 2 step) field))
+                                        ((numberp (nth 2 step))
+                                         (match-string (nth 2 step) field))
+                                        (t
+                                         (replace-match (nth 2 step) t nil field)))
+                                  obj)
                           ;; If the scheme is set up correctly,
                           ;; we should never reach this point
-                          (error "Match failed: %s" field))
-                        (push field obj))
+                          (error "Match failed: %s" field)))
                       (if fmt (apply 'format fmt (nreverse obj))
                         (apply 'concat (nreverse obj)))))
           (browse-url (message "%s" url))))
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index a00a1b247e8..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)
@@ -6833,8 +6833,8 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file."
             (while (string-match " *\n *" link)
               (setq link (replace-match " " t t link)))
             (if (string-match org-link-regexp link)
-                (setq type (match-string 1)
-                      path (match-string 2))
+                (setq type (match-string 1 link)
+                      path (match-string 2 link))
               (setq type "thisfile"
                     path link))
             (throw 'match t)))
@@ -6893,6 +6893,10 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file."
 
       (cond
 
+       ((member type '("http" "https" "ftp" "mailto" "news"))
+        ;; give these to some browser
+        (browse-url (concat type ":" path)))
+
        ((string= type "tags")
         (org-tags-view in-emacs path))
        ((or (string= type "camel")
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 60a279356b8..e7e358bb894 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+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-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 ab3f92564a3..2a398b3b52c 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,28 @@
+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.
+
+2006-03-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * tips.texi (Documentation Tips): One can now also write `program'
+        in front of a quoted symbol in a docstring to prevent making a
+        hyperlink.
+
+2006-03-19  Alan Mackenzie  <acm@muc.de>
+
+        * text.texi (Special Properties): Clarify the definition of
+        'fontified.
+
 2006-03-16  Richard Stallman  <rms@gnu.org>
 
         * display.texi (Defining Images): Minor cleanup.
diff --git a/lispref/display.texi b/lispref/display.texi
index dbe4e650e3a..d9b5a9e5f0b 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -2876,12 +2876,12 @@ used in both left and right fringes.
 When @code{fringe-indicator-alist} has a buffer-local value, and there
 is no bitmap defined for a logical indicator, or the bitmap is
 @code{t}, the corresponding value from the (non-local)
-@code{default-fringes-indicator-alist} is used.
+@code{default-fringe-indicator-alist} is used.
 
 To completely hide a specific indicator, set the bitmap to @code{nil}.
 @end defvar
 
-@defvar default-fringes-indicator-alist
+@defvar default-fringe-indicator-alist
 The value of this variable is the default value for
 @code{fringe-indicator-alist} in buffers that do not override it.
 @end defvar
@@ -2891,7 +2891,7 @@ The value of this variable is the default value for
 @code{left-arrow}, @code{right-arrow}, @code{up-arrow}, @code{down-arrow},
 @code{left-curly-arrow}, @code{right-curly-arrow},
 @code{left-triangle}, @code{right-triangle},
-@code{top-left-angle}, @code{ top-right-angle},
+@code{top-left-angle}, @code{top-right-angle},
 @code{bottom-left-angle}, @code{bottom-right-angle},
 @code{left-bracket}, @code{right-bracket},
 @code{filled-rectangle}, @code{hollow-rectangle},
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 54056dd8a9a..bd2cbee4796 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/lispref/text.texi b/lispref/text.texi
index c68a55bedc7..3a0d4f7a585 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -2994,9 +2994,25 @@ that all text between the character and where the mouse is have the same
 
 @item fontified
 @kindex fontified @r{(text property)}
-This property, if non-@code{nil}, says that text in the buffer has
-had faces assigned automatically by a feature such as Font-Lock mode.
-@xref{Auto Faces}.
+This property says whether the text has had faces assigned to it by
+font locking.  The display engine tests it to decide whether a buffer
+portion needs refontifying before display.  @xref{Auto Faces}.  It
+takes one of these three values---other values are invalid:
+
+@table @asis
+@item @code{nil}
+Font locking is disabled, or the @code{face} properties on the text,
+if any, are invalid.
+
+@item The symbol @code{defer}
+This value states that the text's @code{face} properties are invalid
+and marks it for deferred fontification.  It is used only when ``just
+in time'' font locking is enabled.
+
+@item @code{t}
+The @code{face} properties, or lack of them, on the text are currently
+valid.
+@end table
 
 @item display
 @kindex display @r{(text property)}
diff --git a/lispref/tips.texi b/lispref/tips.texi
index 07689b4c9a4..8b033139275 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -741,8 +741,8 @@ then the hyperlink will refer only to the variable documentation of
 
 If a symbol has a function definition and/or a variable definition, but
 those are irrelevant to the use of the symbol that you are documenting,
-you can write the word @samp{symbol} before the symbol name to prevent
-making any hyperlink.  For example,
+you can write the words @samp{symbol} or @samp{program} before the
+symbol name to prevent making any hyperlink.  For example,
 
 @example
 If the argument KIND-OF-RESULT is the symbol `list',
diff --git a/man/ChangeLog b/man/ChangeLog
index 3bb7d9f5042..55a15f70c51 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,72 @@
+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.
+
+2006-03-20  Romain Francoise  <romain@orebokech.com>
+
+        * gnus.texi (Mail Folders): Grammar fix.
+
+2006-03-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * files.texi (VC Dired Mode): Remove misplaced brackets.
+
+2006-03-21  Andre Spiegel  <spiegel@gnu.org>
+
+        * files.texi: Various updates and clarifications in the VC
+        chapter.
+
+2006-03-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * help.texi (Help Mode): Document "C-c C-c".
+
+2006-03-19  Bill Wohler  <wohler@newt.com>
+
+        * mh-e.texi (Replying): Document Mail-Followup-To.  Change
+        manually-formatted table to multitable.  Add debugging info.
+        Move description of mh-reply-default-reply-to into paragraph
+        that describes its values.
+
 2006-03-17  Bill Wohler  <wohler@newt.com>
 
         * mh-e.texi: Use smallexample and smalllisp consistenly.
@@ -39,12 +108,12 @@
 2006-03-14  Bill Wohler  <wohler@newt.com>
 
         * mh-e.texi: Add index entries around each paragraph rather than
-        depend on entries from beginning of node. Doing so ensures that
+        depend on entries from beginning of node.  Doing so ensures that
         index entries are less likely to be forgotten if text is cut and
         pasted, and are necessary anyway if the references are on a
-        separate page. It seems that makeinfo is now (v. 4.8) only
+        separate page.  It seems that makeinfo is now (v. 4.8) only
         producing one index entry per node, so there is no longer any
-        excuse not to. Use subheading instead of heading. The incorrect
+        excuse not to.  Use subheading instead of heading.  The incorrect
         use of heading produced very large fonts in Info--as large as the
         main heading.
         (From Bill Wohler): MH-E never did appear in Emacs 21--MH-E
@@ -111,9 +180,10 @@
 
 2006-03-06  Bill Wohler  <wohler@newt.com>
 
-        * mh-e.texi: Move from SourceForge repository to Savannah. This is
-        version 7.93, which is a total rewrite from the previous edition
-        1.3 for MH-E version 5.0.2, and corresponds to MH-E version 7.93.
+        * mh-e.texi: Move from SourceForge repository to Savannah.
+        This is version 7.93, which is a total rewrite from the previous
+        edition 1.3 for MH-E version 5.0.2, and corresponds to MH-E
+        version 7.93.
 
 2006-03-03  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -121,12 +191,12 @@
 
 2006-03-01  Carsten Dominik  <dominik@science.uva.nl>
 
-        * org.texi: (Interaction): Added item about `org-mouse.el' by
+        * org.texi (Interaction): Add item about `org-mouse.el' by
         Piotr Zielinski.
-        (Managing links): Documented that also mouse-1 can be used to
+        (Managing links): Document that also mouse-1 can be used to
         activate a link.
-        (Headlines, FAQ): Added entry about hiding leading stars.
-        (Miscellaneous): Resorted the sections in this chapter to a more
+        (Headlines, FAQ): Add entry about hiding leading stars.
+        (Miscellaneous): Resort the sections in this chapter to a more
         logical sequence.
 
 2006-02-28  Andre Spiegel  <spiegel@gnu.org>
@@ -192,7 +262,7 @@
 
         * reftex.texi: Version number and date change only.
 
-        * org.texi: (Internal Links): Rewritten to cover the modified
+        * org.texi (Internal Links): Rewrite to cover the modified
         linking system.
 
 2006-02-21  Nick Roberts  <nickrob@snap.net.nz>
@@ -973,7 +1043,7 @@
         prefix keys even when mark is active.  Decribe that RET moves
         cursor to next corner in rectangle; clarify insert around rectangle.
 
-2005-12-08  Alan Mackenzie <bug-cc-mode@gnu.org>
+2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * cc-mode.texi: The manual has been extensively revised: the
         information about using CC Mode has been separated from the larger
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 647d199f612..306518765c8 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 3d671397b34..8ed89ac75e1 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -1290,7 +1290,7 @@ terms of capabilities, it is the weakest of the six that VC supports.
 VC compensates for certain features missing in SCCS (snapshots, for
 example) by implementing them itself, but some other VC features, such
 as multiple branches, are not available with SCCS.  Since SCCS is
-non-free, not respecting its users freedom,d, you should not use it;
+non-free, not respecting its users freedom, you should not use it;
 use its free replacement CSSC instead.  But you should use CSSC only
 if for some reason you cannot use RCS, or one of the higher-level
 systems such as CVS or GNU Arch.
@@ -1611,8 +1611,8 @@ Examine version @var{version} of the visited file, in a buffer of its
 own.
 
 @item C-x v =
-Compare the current buffer contents with the latest checked-in version
-of the file.
+Compare the current buffer contents with the master version from which
+you started editing.
 
 @item C-u C-x v = @var{file} @key{RET} @var{oldvers} @key{RET} @var{newvers} @key{RET}
 Compare the specified two versions of @var{file}.
@@ -1635,10 +1635,11 @@ and create a branch from it.  @xref{Branches}.)
   It is usually more convenient to compare two versions of the file,
 with the command @kbd{C-x v =} (@code{vc-diff}).  Plain @kbd{C-x v =}
 compares the current buffer contents (saving them in the file if
-necessary) with the last checked-in version of the file.  @kbd{C-u C-x
-v =}, with a numeric argument, reads a file name and two version
-numbers, then compares those versions of the specified file.  Both
-forms display the output in a special buffer in another window.
+necessary) with the master version from which you started editing the
+file (this is not necessarily the latest version of the file).
+@kbd{C-u C-x v =}, with a numeric argument, reads a file name and two
+version numbers, then compares those versions of the specified file.
+Both forms display the output in a special buffer in another window.
 
   You can specify a checked-in version by its number; an empty input
 specifies the current contents of the work file (which may be different
@@ -1669,7 +1670,7 @@ versions are not, in general, present as files on your disk.)
 
 @findex vc-annotate
 @kindex C-x v g
-  For some backends, you can display the file @dfn{annotated} with
+  For some back ends, you can display the file @dfn{annotated} with
 per-line version information and using colors to enhance the visual
 appearance, with the command @kbd{M-x vc-annotate}.
 It creates a new buffer (the ``annotate buffer'') displaying the
@@ -1720,7 +1721,7 @@ line.
 @item W
 Annotate the workfile version--the one you are editing.  If you used
 @kbd{P} and @kbd{N} to browse to other revisions, use this key to
-return to the latest version.
+return to your current version.
 @end table
 
 @node Secondary VC Commands
@@ -1840,7 +1841,8 @@ current line was committed.
 
 @table @kbd
 @item C-x v u
-Revert the buffer and the file to the last checked-in version.
+Revert the buffer and the file to the version from which you started
+editing the file.
 
 @item C-x v c
 Remove the last-entered change from the master for the visited file.
@@ -1850,11 +1852,11 @@ This undoes your last check-in.
 @kindex C-x v u
 @findex vc-revert-buffer
   If you want to discard your current set of changes and revert to the
-last version checked in, use @kbd{C-x v u} (@code{vc-revert-buffer}).
-This leaves the file unlocked; if locking is in use, you must first lock
-the file again before you change it again.  @kbd{C-x v u} requires
-confirmation, unless it sees that you haven't made any changes since the
-last checked-in version.
+version from which you started editing the file, use @kbd{C-x v u}
+(@code{vc-revert-buffer}).  This leaves the file unlocked; if locking
+is in use, you must first lock the file again before you change it
+again.  @kbd{C-x v u} requires confirmation, unless it sees that you
+haven't made any changes with respect to the master version.
 
   @kbd{C-x v u} is also the command to unlock a file if you lock it and
 then decide not to change it.
@@ -1863,9 +1865,11 @@ then decide not to change it.
 @findex vc-cancel-version
   To cancel a change that you already checked in, use @kbd{C-x v c}
 (@code{vc-cancel-version}).  This command discards all record of the
-most recent checked-in version.  @kbd{C-x v c} also offers to revert
-your work file and buffer to the previous version (the one that precedes
-the version that is deleted).
+most recent checked-in version, but only if your work file corresponds
+to that version---you cannot use @kbd{C-x v c} to cancel a version
+that is not the latest on its branch.  @kbd{C-x v c} also offers to
+revert your work file and buffer to the previous version (the one that
+precedes the version that is deleted).
 
   If you answer @kbd{no}, VC keeps your changes in the buffer, and locks
 the file.  The no-revert option is useful when you have checked in a
@@ -1963,6 +1967,24 @@ The files @samp{file1} and @samp{file2} are under version control,
 have also been checked in to the repository---you need to merge them
 with the work file before you can check it in.
 
+@vindex vc-stay-local
+@vindex vc-cvs-stay-local
+  In the above, if the repository were on a remote machine, VC would
+only contact it when the variable @code{vc-stay-local} (or
+@code{vc-cvs-stay-local}) is nil (@pxref{CVS Options}).  This is
+because access to the repository may be slow, or you may be working
+offline and not have access to the repository at all.  As a
+consequence, VC would not be able to tell you that @samp{file3.c} is
+in the ``merge'' state; you would learn that only when you try to
+check-in your modified copy of the file, or use a command such as
+@kbd{C-x v m}.
+
+  In practice, this is not a problem because CVS handles this case
+consistently whenever it arises.  In VC, you'll simply get prompted to
+merge the remote changes into your work file first.  The benefits of
+less network communication usually outweigh the disadvantage of not
+seeing remote changes immediately.
+
 @vindex vc-directory-exclusion-list
   When VC Dired displays subdirectories (in the ``full'' display mode),
 it omits some that should never contain any files under version control.
@@ -2420,12 +2442,16 @@ or a snapshot against a named version.
 support.  They use RCS's native facilities for this, so
 snapshots made using RCS through VC are visible even when you bypass VC.
 
+  With CVS, Meta-CVS, and Subversion, VC also uses the native
+mechanism provided by that back end to make snapshots and retrieve them
+(@dfn{tags} for CVS and Meta-CVS, @dfn{copies} for Subversion).
+
 @c worded verbosely to avoid overfull hbox.
   For SCCS, VC implements snapshots itself.  The files it uses contain
 name/file/version-number triples.  These snapshots are visible only
 through VC.
 
-@c ??? What about CVS?
+  There is no support for VC snapshots using GNU Arch yet.
 
   A snapshot is a set of checked-in versions.  So make sure that all the
 files are checked in and not locked when you make a snapshot.
@@ -2479,9 +2505,8 @@ in that directory, create new entries for versions checked in since the
 most recent entry in the change log file.
 (@code{vc-update-change-log}).
 
-This command works with RCS or CVS only, not with SCCS.
-
-@c ??? What about other back ends?
+This command works with RCS or CVS only, not with any of the other
+back ends.
 
 @item C-u C-x v a
 As above, but only find entries for the current buffer's file.
@@ -2620,7 +2645,7 @@ mention the file, so that they use the new name; despite this, the
 snapshot thus modified may not completely work (@pxref{Snapshot
 Caveats}).
 
-  Some backends do not provide an explicit rename operation to their
+  Some back ends do not provide an explicit rename operation to their
 repositories.  After issuing @code{vc-rename-file}, use @kbd{C-x v v}
 on the original and renamed buffers and provide the necessary edit
 log.
@@ -2634,22 +2659,26 @@ someone else.
    Sometimes it is convenient to put version identification strings
 directly into working files.  Certain special strings called
 @dfn{version headers} are replaced in each successive version by the
-number of that version.
-
-@c ??? How does this relate to CVS?
-
-  If you are using RCS, and version headers are present in your working
-files, Emacs can use them to determine the current version and the
-locking state of the files.  This is more reliable than referring to the
-master files, which is done when there are no version headers.  Note
-that in a multi-branch environment, version headers are necessary to
-make VC behave correctly (@pxref{Multi-User Branching}).
-
-  Searching for version headers is controlled by the variable
+number of that version, the name of the user who created it, and other
+relevant information.  All of the back ends that VC supports have such
+a mechanism, except GNU Arch.
+
+  VC does not normally use the information contained in these headers.
+The exception is RCS---with RCS, version headers are sometimes more
+reliable than the master file to determine which version of the file
+you are editing.  Note that in a multi-branch environment, version
+headers are necessary to make VC behave correctly (@pxref{Multi-User
+Branching}).
+
+  Searching for RCS version headers is controlled by the variable
 @code{vc-consult-headers}.  If it is non-@code{nil} (the default),
 Emacs searches for headers to determine the version number you are
 editing.  Setting it to @code{nil} disables this feature.
 
+  Note that although CVS uses the same kind of version headers as RCS
+does, VC never searches for these headers if you are using CVS,
+regardless of the above setting.
+
 @kindex C-x v h
 @findex vc-insert-headers
   You can use the @kbd{C-x v h} command (@code{vc-insert-headers}) to
@@ -2872,23 +2901,25 @@ and CVS takes care to notify other developers of the fact that you
 intend to change the file.  See the CVS documentation for details on
 using the watch feature.
 
+@vindex vc-stay-local
 @vindex vc-cvs-stay-local
 @cindex remote repositories (CVS)
   When a file's repository is on a remote machine, VC tries to keep
 network interactions to a minimum.  This is controlled by the variable
-@code{vc-cvs-stay-local}.  If it is @code{t} (the default), then VC uses
-only the entry in the local CVS subdirectory to determine the file's
-state (and possibly information returned by previous CVS commands).  One
-consequence of this is that when you have modified a file, and somebody
-else has already checked in other changes to the file, you are not
-notified of it until you actually try to commit.  (But you can try to
-pick up any recent changes from the repository first, using @kbd{C-x v m
-@key{RET}}, @pxref{Merging}).
+@code{vc-cvs-stay-local}.  There is another variable,
+@code{vc-stay-local}, which enables the feature also for other back
+ends that support it, including CVS.  In the following, we will talk
+only about @code{vc-cvs-stay-local}, but everything applies to
+@code{vc-stay-local} as well.
 
-@vindex vc-cvs-global-switches
-  The variable @code{vc-cvs-global-switches}, if non-@code{nil},
-should be a string specifying switches to pass to CVS for all CVS
-operations.
+If @code{vc-cvs-stay-local} is @code{t} (the default), then VC uses
+only the entry in the local CVS subdirectory to determine the file's
+state (and possibly information returned by previous CVS commands).
+One consequence of this is that when you have modified a file, and
+somebody else has already checked in other changes to the file, you
+are not notified of it until you actually try to commit.  (But you can
+try to pick up any recent changes from the repository first, using
+@kbd{C-x v m @key{RET}}, @pxref{Merging}).
 
   When @code{vc-cvs-stay-local} is @code{t}, VC also makes local
 version backups, so that simple diff and revert operations are
@@ -2903,6 +2934,12 @@ repositories.  It also does not make any version backups.
 that is matched against the repository host name; VC then stays local
 only for repositories from hosts that match the pattern.
 
+@vindex vc-cvs-global-switches
+  You can specify additional command line options to pass to all CVS
+operations in the variable @code{vc-cvs-global-switches}.  These
+switches are inserted immediately after the @code{cvs} command, before
+the name of the operation to invoke.
+
 @node Directories
 @section File Directories
 
@@ -3380,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:
@@ -3407,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 c64305a3a66..f2c306cbe23 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
@@ -11913,7 +11913,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))
@@ -15293,7 +15294,7 @@ When the marks file is used (which it is by default), @code{nnfolder}
 servers have the property that you may backup them using @code{tar} or
 similar, and later be able to restore them into Gnus (by adding the
 proper @code{nnfolder} server) and have all your marks be preserved.
-Marks for a group is usually stored in a file named as the mbox file
+Marks for a group are usually stored in a file named as the mbox file
 with @code{.mrk} concatenated to it (but see
 @code{nnfolder-marks-file-suffix}) within the @code{nnfolder}
 directory.  Individual @code{nnfolder} groups are also possible to
@@ -22098,8 +22099,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/help.texi b/man/help.texi
index 634dca792f0..84a3656ad57 100644
--- a/man/help.texi
+++ b/man/help.texi
@@ -482,14 +482,16 @@ Move point back to the previous cross reference.
 @item Mouse-1
 @itemx Mouse-2
 Follow a cross reference that you click on.
+@item C-c C-c
+Show all documentation about the symbol at point.
 @end table
 
-  When a function name (@pxref{M-x,, Running Commands by Name}) or
-variable name (@pxref{Variables}) appears in the documentation, it
-normally appears inside paired single-quotes.  You can click on the
-name with @kbd{Mouse-1} or @kbd{Mouse-2}, or move point there and type
-@key{RET}, to view the documentation of that command or variable.  Use
-@kbd{C-c C-b} to retrace your steps.
+  When a function name (@pxref{M-x,, Running Commands by Name}),
+variable name (@pxref{Variables}), or face name (@pxref{Faces}) appears
+in the documentation, it normally appears inside paired single-quotes.
+You can click on the name with @kbd{Mouse-1} or @kbd{Mouse-2}, or move
+point there and type @key{RET}, to view the documentation of that
+command, variable or face.  Use @kbd{C-c C-b} to retrace your steps.
 
 @cindex URL, viewing in help
 @cindex help, viewing web pages
@@ -510,6 +512,12 @@ the help text.  @key{TAB} (@code{help-next-ref}) moves point down to the
 next cross reference.  Use @kbd{S-@key{TAB}} to move point up to the
 previous cross reference (@code{help-previous-ref}).
 
+To view all documentation about a symbol, whether quoted or not, move
+point over the symbol and type @kbd{C-c C-c}
+(@code{help-follow-symbol}).  This shows all available documentation
+about the symbol as a variable, function or face.  Just like for
+quoted cross references, you can use @kbd{C-c C-b} to retrace your steps.
+
 @node Misc Help
 @section Other Help Commands
 
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..64864e009e2 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
diff --git a/man/mh-e.texi b/man/mh-e.texi
index c3f5c37de91..ccebaaf7f67 100644
--- a/man/mh-e.texi
+++ b/man/mh-e.texi
@@ -11,8 +11,8 @@
 @set VERSION 7.93
 @c Edition of the manual. It is either empty for the first edition or
 @c has the form ", nth Edition" (without the quotes).
-@set EDITION , 4th Edition
-@set UPDATED 2006-03-17
+@set EDITION , 5th Edition
+@set UPDATED 2006-03-19
 @set UPDATE-MONTH March, 2006
 
 @c Other variables.
@@ -22,10 +22,10 @@
 @c Copyright
 @copying
 This is version @value{VERSION}@value{EDITION} of @cite{The MH-E
-Manual}, last updated @value{UPDATED}
+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
@@ -3497,8 +3497,7 @@ ahead and delete or refile the messages, use @kbd{x}
 (@code{mh-execute-commands}). Many MH-E commands that may affect the
 numbering of the messages (such as @kbd{F r} or @kbd{F p}) will ask if
 you want to process refiles or deletes first and then either run
-@kbd{x} for you or undo the pending refiles and deletes, which are
-lost.
+@kbd{x} for you or undo the pending refiles and deletes.
 
 @kindex x
 @vindex mh-after-commands-processed-hook
@@ -3552,12 +3551,13 @@ folder for later examination.
 @kindex t
 @vindex mh-recenter-summary-flag
 
-When you use @kbd{t} to toggle between show mode and scan mode, the
-MH-Show buffer is hidden and the MH-Folder buffer is left alone.
-Setting @code{mh-recenter-summary-flag} to a non-@code{nil} value
-causes the toggle to display as many scan lines as possible, with the
-cursor at the middle. The effect of @code{mh-recenter-summary-flag} is
-rather useful, but it can be annoying on a slow network connection.
+When you use @kbd{t} to toggle from MH-Folder Show mode to MH-Folder
+mode, the MH-Show buffer is hidden and the MH-Folder buffer is left
+alone. Setting @code{mh-recenter-summary-flag} to a non-@code{nil}
+value causes the toggle to display as many scan lines as possible,
+with the cursor at the middle. The effect of
+@code{mh-recenter-summary-flag} is rather useful, but it can be
+annoying on a slow network connection.
 
 @findex mh-visit-folder
 @kindex F v
@@ -3583,8 +3583,6 @@ If you forget where you've refiled your messages, you can find them
 using @kbd{F s} (@code{mh-search}). @xref{Searching}.
 
 @cindex @command{procmail}
-@cindex @command{rcvstore}
-@cindex MH commands, @command{rcvstore}
 @cindex @samp{unseen} sequence
 @cindex sequence, @samp{unseen}
 @cindex Unix commands, @command{procmail}
@@ -3593,14 +3591,14 @@ using @kbd{F s} (@code{mh-search}). @xref{Searching}.
 @kindex F n
 @vindex mh-new-messages-folders
 
-If you use a program such as @command{procmail} to use
-@command{rcvstore} to file your incoming mail automatically, you can
-display new, unseen, messages using the command @kbd{F n}
-(@code{mh-index-new-messages}). All messages in the @samp{unseen}
-sequence from the folders in @code{mh-new-messages-folders} are
-listed. However, this list of folders can be overridden with a prefix
-argument: with a prefix argument, enter a space-separated list of
-folders, or nothing to search all folders.
+If you use a program such as @command{procmail} to file your incoming
+mail automatically, you can display new, unseen, messages using the
+command @kbd{F n} (@code{mh-index-new-messages}). All messages in the
+@samp{unseen} sequence from the folders in
+@code{mh-new-messages-folders} are listed. However, this list of
+folders can be overridden with a prefix argument: with a prefix
+argument, enter a space-separated list of folders, or nothing to
+search all folders.
 
 @cindex @samp{tick} sequence
 @cindex sequence, @samp{tick}
@@ -4055,31 +4053,47 @@ command.
 When you reply to a message, you are first prompted with @samp{Reply
 to whom?}. You have several choices here.
 
-@smallexample
-@group
-@b{Response}     @b{Reply Goes To}
-
-@kbd{from}         @r{The person who sent the message.  This is the default,}
-             @r{so @key{RET} is sufficient.}
-
-@kbd{to}           @r{Replies to the sender, plus all recipients in the}
-             @r{@samp{To:} header field.}
-
-@kbd{all}
-@kbd{cc}           @r{Forms a reply to the sender, plus all recipients.}
-@end group
-@end smallexample
+@quotation
+@multitable @columnfractions .20 .80
+@c @headitem Response @tab Reply Goes To
+@c XXX @headitem not yet supported by SourceForge's texi2pdf.
+@item @b{Response} @tab @b{Reply Goes To}
+@c -------------------------
+@item @kbd{from}
+@tab
+The person who sent the message. This is the default, so @key{RET} is
+sufficient.
+@c -------------------------
+@item @kbd{to}
+@tab
+Replies to the sender, plus all recipients in the @samp{To:} header field.
+@c -------------------------
+@item @kbd{cc}@*@kbd{all}
+@tab
+Forms a reply to the addresses in the @samp{Mail-Followup-To:} header
+field if one exists; otherwise forms a reply to the sender, plus all
+recipients.
+@end multitable
+@end quotation
 
 @cindex @command{repl}
 @cindex MH commands, @command{repl}
+@vindex mh-reply-default-reply-to
 
 Depending on your answer, @command{repl}@footnote{See the section
 @uref{@value{MH-BOOK-HOME}/reprep.htm, Replying to Messages: repl} in
 the MH book.} is given a different argument to form your reply.
 Specifically, a choice of @kbd{from} or none at all runs @samp{repl
 -nocc all}, and a choice of @kbd{to} runs @samp{repl -cc to}. Finally,
-either @kbd{cc} or @kbd{all} runs @samp{repl -cc all -nocc me}.
-
+either @kbd{cc} or @kbd{all} runs @samp{repl -cc all -nocc me}. If you
+find that most of the time you specify one of these choices when you
+reply to a message, you can change the option
+@code{mh-reply-default-reply-to} from its default value of
+@samp{Prompt} to one of the choices listed above. You can always edit
+the recipients in the draft.
+
+@cindex @samp{repl:} MH profile component
+@cindex MH profile component, @samp{repl:}
 @cindex MH-Letter mode
 @cindex MH-Show mode
 @cindex draft
@@ -4088,7 +4102,10 @@ either @kbd{cc} or @kbd{all} runs @samp{repl -cc all -nocc me}.
 
 Two windows are then created. One window contains the message to which
 you are replying in an MH-Show buffer. Your draft, in MH-Letter mode
-(@pxref{Editing Drafts}), is in the other window.
+(@pxref{Editing Drafts}), is in the other window. If the reply draft
+was not one that you expected, check the things that affect the
+behavior of @command{repl} which include the @samp{repl:} profile
+component and the @file{replcomps} and @file{replgroupcomps} files.
 
 If you supply a prefix argument (as in @kbd{C-u r}), the message you
 are replying to is inserted in your reply after having first been run
@@ -4115,15 +4132,6 @@ buffer by turning off the option @code{mh-reply-show-message-flag}.
 If you wish to customize the header or other parts of the reply draft,
 please see @command{repl}(1) and @code{mh-format}(5).
 
-@vindex mh-reply-default-reply-to
-
-The @code{mh-reply-default-reply-to} option is set to @samp{Prompt} by
-default so that you are prompted for the recipient of a reply. If you
-find that most of the time that you specify @kbd{cc} when you reply to
-a message, set this option to @samp{cc}. Other choices include
-@samp{from}, @samp{to}, or @samp{all}. You can always edit the
-recipients in the draft.
-
 @node Forwarding, Redistributing, Replying, Sending Mail
 @section Forwarding Mail
 
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 408e2ab8b9b..af2114ebd18 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 2081b255094..34b99a65a1c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,110 @@
+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.
+        All callers changed accordingly.
+
+2006-03-21  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c: x_session_initialized new variable.
+        (x_term_init): Use x_session_initialized to check if
+        x_session_initialize should be called.
+        (x_initialize): Initialize x_session_initialized.
+
+2006-03-21  Kim F. Storm  <storm@cua.dk>
+
+        * fringe.c (draw_fringe_bitmap): Don't calculate default overlay arrow
+        bitmap here, but ...
+        (update_window_fringes): ... here, so we can test if it has changed.
+
+2006-03-20  Andreas Schwab  <schwab@suse.de>
+
+        * dispnew.c (init_display): Check DISPLAY here.
+
+        * emacs.c (main): Don't check here.
+
+        * xterm.c (x_display_ok): Don't use DISPLAY env var.
+
+2006-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (window_scroll_pixel_based): Yet another int/Lisp_Object
+        mixup (YAILOM).
+
+2006-03-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * emacs.c (main): Fix last change.
+
+2006-03-20  Kenichi Handa  <handa@m17n.org>
+
+        * fileio.c (Fwrite_region): Set visit_file to Qnil before GCPRO it.
+
+        * keymap.c (map_keymap): Set tail to Qnil before GCPRO it.
+
+        * xfns.c (xg_set_icon): Remove unnecessary GCPRO.
+
+        * xterm.c (x_term_init): Remove unnecessary GCPRO.
+
+2006-03-19  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (set_cursor_from_row): Fix cursor property on overlay string,
+        so it doesn't associate overlay string with following glyph by default.
+        Allow integer property value to specify explicit number of buffer
+        positions associate with overlay string.
+
 2006-03-18  Chong Yidong  <cyd@stupidchicken.com>
 
         * xterm.c (x_display_ok): Fix minor bug and compilation warnings.
@@ -41,15 +148,15 @@
         * image.c [MAC_OS] (XPutPixel, XGetPixel)
         [!WORDS_BIG_ENDIAN && USE_CG_DRAWING]: Don't use specialized
         version when depth is 32.
-        (mac_create_cg_image_from_image) [MAC_OS && USE_CG_DRAWING]: New
-        function.
+        (mac_create_cg_image_from_image) [MAC_OS && USE_CG_DRAWING]:
+        New function.
         (prepare_image_for_display) [MAC_OS && USE_CG_DRAWING]: Use it.
         (x_clear_image_1) [MAC_OS && USE_CG_DRAWING]: Release CGImage.
 
         * macterm.c (XCreatePixmap) [!WORDS_BIG_ENDIAN && USE_CG_DRAWING]:
         Create GWorld in ARGB pixel format.
-        (mac_copy_area, mac_copy_area_with_mask) [USE_CG_DRAWING]: Remove
-        functions.
+        (mac_copy_area, mac_copy_area_with_mask) [USE_CG_DRAWING]:
+        Remove functions.
         (x_draw_image_foreground) [USE_CG_DRAWING]: Use mac_draw_cg_image
         instead of mac_copy_area/mac_copy_area_with_mask.
 
@@ -153,8 +260,7 @@
 
 2006-03-11  David Ponce  <david@dponce.com>
 
-        * xfns.c (x_create_tip_frame): Preserve received parms by copying
-        them.
+        * xfns.c (x_create_tip_frame): Preserve received parms by copying them.
 
 2006-03-11  Eli Zaretskii  <eliz@gnu.org>
 
@@ -175,14 +281,14 @@
         * keymap.c (describe_map): Shorten string to indicate shadowed binding.
 
         * vm-limit.c (get_lim_data, lim_data, data_space_start):
-        Moved from mem-limits.h.
+        Move from mem-limits.h.
         (enum warnlevel): New data type.
         (check_memory_limits): Rewrite the logic about warnings.
         Use standard `struct rlimit'.  Check return values for nonsense.
         (memory_warnings): Always clear lim_data.
 
         * mem-limits.h (get_lim_data, lim_data, data_space_start):
-        Moved to vm-limit.c.
+        Move to vm-limit.c.
 
         * xterm.c (x_fully_uncatch_errors, x_catching_errors): New functions.
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 999877001d2..297125063c7 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6650,6 +6650,13 @@ init_display ()
 #endif
 
       display_arg = (display != 0 && *display != 0);
+
+      if (display_arg && !x_display_ok (display))
+        {
+          fprintf (stderr, "Display %s unavailable, simulating -nw\n",
+                   display);
+          inhibit_window_system = 1;
+        }
     }
 
   if (!inhibit_window_system && display_arg
diff --git a/src/editfns.c b/src/editfns.c
index 7c2c2a8edd0..59401fdfecd 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 *));
@@ -719,7 +721,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.  */
     {
@@ -734,7 +736,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))
@@ -1720,7 +1722,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;
 
@@ -1776,7 +1780,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))
@@ -1842,11 +1846,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;
@@ -1854,8 +1872,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/emacs.c b/src/emacs.c
index 5a09f5d762c..41857b7ccb8 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -53,10 +53,6 @@ Boston, MA 02110-1301, USA.  */
 #include "buffer.h"
 #include "window.h"
 
-#ifdef HAVE_X_WINDOWS
-#include "xterm.h"
-#endif
-
 #include "systty.h"
 #include "blockinput.h"
 #include "syssignal.h"
@@ -1490,14 +1486,6 @@ main (argc, argv
 
     /* Don't actually discard this arg.  */
     skip_args = count_before;
-
-    /* Do not be lenient if the user explicitly asked for a named display.  */
-    if (display_arg != 1 && !x_display_ok (displayname))
-      {
-        fprintf (stderr, "Display %s unavailable, simulating -nw\n",
-                 displayname);
-        inhibit_window_system = 1;
-      }
   }
 #endif
 
diff --git a/src/fileio.c b/src/fileio.c
index b1f9b91654a..cf0d84539d6 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4974,6 +4974,7 @@ This does code conversion according to the value of
   if (!NILP (start) && !STRINGP (start))
     validate_region (&start, &end);
 
+  visit_file = Qnil;
   GCPRO5 (start, filename, visit, visit_file, lockname);
 
   filename = Fexpand_file_name (filename, Qnil);
diff --git a/src/fns.c b/src/fns.c
index dd496f4c253..c6ae96e8383 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -4473,6 +4473,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/fringe.c b/src/fringe.c
index 2ce15d27d74..ab55775189f 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -866,10 +866,7 @@ draw_fringe_bitmap (w, row, left_p)
   draw_fringe_bitmap_1 (w, row, left_p, overlay, NO_FRINGE_BITMAP);
 
   if (left_p && row->overlay_arrow_bitmap != NO_FRINGE_BITMAP)
-    draw_fringe_bitmap_1 (w, row, 1, 1,
-                          (row->overlay_arrow_bitmap < 0
-                           ? get_logical_fringe_bitmap (w, Qoverlay_arrow, 0, 0)
-                           : row->overlay_arrow_bitmap));
+    draw_fringe_bitmap_1 (w, row, 1, 1, row->overlay_arrow_bitmap);
 }
 
 
@@ -1151,6 +1148,9 @@ update_window_fringes (w, keep_current_p)
             }
         }
 
+      if (row->overlay_arrow_bitmap < 0)
+        row->overlay_arrow_bitmap = get_logical_fringe_bitmap (w, Qoverlay_arrow, 0, 0);
+
       if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap)
         {
           redraw_p = row->redraw_fringe_bitmaps_p = cur->redraw_fringe_bitmaps_p = 1;
diff --git a/src/keymap.c b/src/keymap.c
index 233dff2c6f2..5e01566efaa 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -676,6 +676,7 @@ map_keymap (map, fun, args, data, autoload)
   struct gcpro gcpro1, gcpro2, gcpro3;
   Lisp_Object tail;
 
+  tail = Qnil;
   GCPRO3 (map, args, tail);
   map = get_keymap (map, 1, autoload);
   for (tail = (CONSP (map) && EQ (Qkeymap, XCAR (map))) ? XCDR (map) : map;
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 b4b096fa541..f09b4918fb9 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -10476,7 +10476,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 5f41f6f7737..cb3378dd2b1 100644
--- a/src/print.c
+++ b/src/print.c
@@ -183,6 +183,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 159f8001bbc..9b47f1cae31 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3839,62 +3839,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 9f360b70baf..48942a46671 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1654,6 +1654,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 92c03e2bf9f..5681b6ee62f 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4411,7 +4411,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;
@@ -4434,7 +4435,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/window.c b/src/window.c
index d4eaa72f579..039e955efd0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4796,8 +4796,8 @@ window_scroll_pixel_based (window, n, whole, noerror)
          possibility of point becoming "stuck" on a tall line when
          scrolling by one line.  */
       if (window_scroll_pixel_based_preserve_y < 0
-          || (current_kboard->Vlast_command != Qscroll_up
-              && current_kboard->Vlast_command != Qscroll_down))
+          || (!EQ (current_kboard->Vlast_command, Qscroll_up)
+              && !EQ (current_kboard->Vlast_command, Qscroll_down)))
         {
           start_display (&it, w, start);
           move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
diff --git a/src/xdisp.c b/src/xdisp.c
index 3bc9d9b55b4..a89a11db300 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11699,7 +11699,7 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
           x += glyph->pixel_width;
           ++glyph;
           if (cursor_from_overlay_pos
-              && last_pos > cursor_from_overlay_pos)
+              && last_pos >= cursor_from_overlay_pos)
             {
               cursor_from_overlay_pos = 0;
               cursor = 0;
@@ -11713,10 +11713,12 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
           /* Skip all glyphs from string.  */
           do
             {
+              Lisp_Object cprop;
               int pos;
               if ((cursor == NULL || glyph > cursor)
-                  && !NILP (Fget_char_property (make_number ((glyph)->charpos),
-                                                Qcursor, (glyph)->object))
+                  && (cprop = Fget_char_property (make_number ((glyph)->charpos),
+                                                  Qcursor, (glyph)->object),
+                      !NILP (cprop))
                   && (pos = string_buffer_position (w, glyph->object,
                                                     string_before_pos),
                       (pos == 0   /* From overlay */
@@ -11727,14 +11729,15 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
                      Add 1 to last_pos so that if point corresponds to the
                      glyph right after the overlay, we still use a 'cursor'
                      property found in that overlay.  */
-                  cursor_from_overlay_pos = pos == 0 ? last_pos+1 : 0;
+                  cursor_from_overlay_pos = (pos ? 0 : last_pos
+                                             + (INTEGERP (cprop) ? XINT (cprop) : 0));
                   cursor = glyph;
                   cursor_x = x;
                 }
               x += glyph->pixel_width;
               ++glyph;
             }
-          while (glyph < end && STRINGP (glyph->object));
+          while (glyph < end && EQ (glyph->object, string_start->object));
         }
     }
 
diff --git a/src/xfns.c b/src/xfns.c
index c811fba2fc8..60516d5a624 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -789,12 +789,9 @@ xg_set_icon (f, file)
     FRAME_PTR f;
     Lisp_Object file;
 {
-  struct gcpro gcpro1;
   int result = 0;
   Lisp_Object found;
 
-  GCPRO1 (found);
-
   found = x_find_image_file (file);
 
   if (! NILP (found))
diff --git a/src/xterm.c b/src/xterm.c
index ec6fb395d12..c406268c606 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6165,7 +6165,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;
@@ -10267,6 +10268,10 @@ static XrmOptionDescRec emacs_options[] = {
 
 static int x_initialized;
 
+#ifdef HAVE_X_SM
+static int x_session_initialized;
+#endif
+
 #ifdef MULTI_KBOARD
 /* Test whether two display-name strings agree up to the dot that separates
    the screen number from the server number.  */
@@ -10351,12 +10356,8 @@ x_display_ok (display)
     int dpy_ok = 1;
     Display *dpy;
 
-    if (!display)
-      display = getenv("DISPLAY");
-    if (!display)
-      return 0;
-
-    if ((dpy = XOpenDisplay (display)))
+    dpy = XOpenDisplay (display);
+    if (dpy)
       XCloseDisplay (dpy);
     else
       dpy_ok = 0;
@@ -10432,11 +10433,9 @@ x_term_init (display_name, xrm_option, resource_name)
 
         /* Load our own gtkrc if it exists.  */
         {
-          struct gcpro gcpro1, gcpro2;
           char *file = "~/.emacs.d/gtkrc";
           Lisp_Object s, abs_file;
 
-          GCPRO2 (s, abs_file);
           s = make_string (file, strlen (file));
           abs_file = Fexpand_file_name (s, Qnil);
 
@@ -10841,7 +10840,7 @@ x_term_init (display_name, xrm_option, resource_name)
 
 #ifdef HAVE_X_SM
   /* Only do this for the first display.  */
-  if (x_initialized == 1)
+  if (!x_session_initialized++)
     x_session_initialize (dpyinfo);
 #endif
 
@@ -11026,6 +11025,9 @@ x_initialize ()
   last_tool_bar_item = -1;
   any_help_event_p = 0;
   ignore_next_mouse_click_timeout = 0;
+#ifdef HAVE_X_SM
+  x_session_initialized = 0;
+#endif
 
 #ifdef USE_GTK
   current_count = -1;